forgot to stage some files

diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index ebea7a5..537fee0 100644 (file)
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -7002,7 +7002,7 @@ for making the difference obvious.
 
 指定方法は，<list>の中にkey-value listの形で
 \begin{lstlisting}
-stretch_priority={kanjiskip=-40,xkanjiskip=-30,others=50}
+stretch_priority={kanjiskip=-35,xkanjiskip=-25,others=50}
 \end{lstlisting}
 のようにして行う．キー名\texttt{kanjiskip},~\texttt{xkanjiskip}については
 そのままの意味であり，

diff --git a/test/jfm-hang.lua b/test/jfm-hang.lua
index 792c1b4..8ee874e 100644 (file)
--- a/test/jfm-hang.lua
+++ b/test/jfm-hang.lua
@@ -22,6 +22,21 @@ luatexja.jfont.define_jfm {
         [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       }
    },
+   [100] = { -- 伸び/縮みで異なる優先度の例，
+      chars = { 'ぱ', 'ぴ', 'ぷ', 'ぺ', 'ぽ' },
+      align = 'left', left = 0.0, down = 0.0,
+      width = 1.0, height = 0.88, depth = 0.12, italic=0.0,
+      glue = {
+        [1] = { 0.5 , .5, .5, priority={0, -4}, ratio=1 },
+        [2] = { 0, 0, 0, kanjiskip_shrink=1 },
+        [102] = { 0, 0, 0, kanjiskip_shrink=1 },
+        [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+        [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+        [6] = { 0, 0, 0, kanjiskip_shrink=1 },
+        [7] = { 0, 0, 0, kanjiskip_shrink=1 },
+        [8] = { 0, 0, 0, kanjiskip_shrink=1 },
+      }
+   },
 
    [1] = { -- 開き括弧類
       chars = {
@@ -33,6 +48,7 @@ luatexja.jfont.define_jfm {
       glue = {
 -- 3 のみ四分，あとは0
          [0] = { 0, 0, 0, kanjiskip_shrink=1 },
+         [100] = { 0, 0, 0, kanjiskip_shrink=1 },
          [1] = { 0, 0, 0, kanjiskip_shrink=1 },
         [2] = { 0, 0, 0, kanjiskip_shrink=1, kanjiskip_stretch=1 },
         [102] = { 0, 0, 0, kanjiskip_shrink=1, kanjiskip_stretch=1 },
@@ -56,6 +72,7 @@ luatexja.jfont.define_jfm {
       glue = {
      -- 3 は四分, 2, 4, 9 は0, あとは0.5
         [0] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+        [100] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
         [1] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
          [2] = { 0, 0, 0, kanjiskip_shrink=1},
          [102] = { 0, 0, 0, kanjiskip_shrink=1},
@@ -78,6 +95,7 @@ luatexja.jfont.define_jfm {
       glue = {
      -- 3 は四分, 2, 4, 9 は0, あとは0.5
         [0] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+        [100] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
         [1] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
          [2] = { 0, 0, 0, kanjiskip_shrink=1},
          [102] = { 0, 0, 0, kanjiskip_shrink=1},
@@ -98,6 +116,7 @@ luatexja.jfont.define_jfm {
       glue = {
 -- 3 のみ 0.5，あとは0.25
         [0] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+        [100] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
         [1] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
         [2] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
         [102] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
@@ -118,13 +137,14 @@ luatexja.jfont.define_jfm {
       -- （luatexja-adjust 下では半角取りを認めない）
       glue = {
          -- 3 は.75, 2, 4 は0, あとは0.5
-        [0] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
-        [1] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+        [0] = { 0.5 , 0.0, 0.0, ratio=0, kanjiskip_stretch=1 },
+        [100] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+        [1] = { 0.5 , 0.0, 0.0, ratio=0, kanjiskip_stretch=1 },
         [3] = { 0.75, 0.0, 0.25, priority=1, ratio=1./3, kanjiskip_stretch=1 },
-        [5] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
-        [6] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
-        [7] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
-        [8] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+        [5] = { 0.5 , 0.0, 0.0, ratio=0, kanjiskip_stretch=1 },
+        [6] = { 0.5 , 0.0, 0.0, ratio=0, kanjiskip_stretch=1 },
+        [7] = { 0.5 , 0.0, 0.0, ratio=0, kanjiskip_stretch=1 },
+        [8] = { 0.5 , 0.0, 0.0, ratio=0, kanjiskip_stretch=1 },
       }
    },
 
@@ -150,14 +170,15 @@ luatexja.jfont.define_jfm {
       align = 'left', left = 0.0, down = 0.0,
       width = 1.0, height = 0.88, depth = 0.12, italic=0.0,
       glue = {
-         [0] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
-        [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+         [0] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+         [100] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+        [1] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
         [2] = { 0, 0, 0, kanjiskip_shrink=1 },
         [102] = { 0, 0, 0, kanjiskip_shrink=1 },
         [3] = { 0.75, 0.0, 0.25, priority=1, ratio=1 },
         [4] = { 0, 0, 0, kanjiskip_shrink=1 },
         [6] = { 0, 0, 0, kanjiskip_shrink=1 },
-        [7] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+        [7] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
         [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       },
       kern = {

diff --git a/test/jfm-ujisc33.lua b/test/jfm-ujisc33.lua
new file mode 100644 (file)
index 0000000..ad1d5b8
--- /dev/null
+++ b/test/jfm-ujisc33.lua
@@ -0,0 +1,135 @@
+luatexja.jfont.define_jfm {
+   dir = 'yoko',
+   zw = 1.0, zh = 1.0,
+
+   [0] = {
+      align = 'left', left = 0.0, down = 0.0,
+      width = 1.0*0.67, height = 0.88, depth = 0.12, italic=0.0,
+      glue = {
+        [1] = { 0.5*0.67 , 0.0, 0.5  },
+        [3] = { 0.25*0.67, 0.0, 0.25 }
+      }
+   },
+
+   [1] = { -- 開き括弧類
+      chars = {
+        '‘', '“', '〈', '《', '「', '『', '【', '〔', '〖', 
+        '〘', '〝', '（', '［', '｛', '｟'
+      },
+      align = 'right', left = 0.0, down = 0.0,
+      width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0,
+      glue = {
+        [3] = { 0.25*0.67, 0.0, 0.25 }
+      }
+   },
+
+   [2] = { -- 閉じ括弧類
+      chars = {
+        '’', '”', '、', '〉', '》', '」', '』', '】', '〕', 
+        '〗', '〙', '〟', '）', '，', '］', '｝', '｠'
+      },
+      align = 'left', left = 0.0, down = 0.0,
+      width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0,
+      glue = {
+        [0] = { 0.5*0.67 , 0.0, 0.5  },
+        [1] = { 0.5*0.67 , 0.0, 0.5  },
+        [3] = { 0.25*0.67, 0.0, 0.25 },
+        [5] = { 0.5*0.67 , 0.0, 0.5  },
+        [6] = { 0.5*0.67 , 0.0, 0.5  },
+        [7] = { 0.5*0.67 , 0.0, 0.5  }
+      }
+   },
+
+   [3] = { -- 中点類
+      chars = {'・', '：', '；'},
+      align = 'middle', left = 0.0, down = 0.0,
+      width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0,
+      glue = {
+        [0] = { 0.25*0.67, 0.0, 0.25 },
+        [1] = { 0.25*0.67, 0.0, 0.25 },
+        [2] = { 0.25*0.67, 0.0, 0.25 },
+        [3] = { 0.5*0.67 , 0.0, 0.5  },
+        [4] = { 0.25*0.67, 0.0, 0.25 },
+        [5] = { 0.25*0.67, 0.0, 0.25 },
+        [6] = { 0.25*0.67, 0.0, 0.25 },
+        [7] = { 0.25*0.67, 0.0, 0.25 }
+      }
+   },
+
+   [4] = { -- 句点類
+      chars = {'。', '．'},
+      align = 'left', left = 0.0, down = 0.0,
+      width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0,
+      glue = {
+        [0] = { 0.5*0.67 , 0.0, 0.0  },
+        [1] = { 0.5*0.67 , 0.0, 0.0  },
+        [3] = { 0.75*0.67, 0.0, 0.25 },
+        [5] = { 0.5*0.67 , 0.0, 0.0  },
+        [6] = { 0.5*0.67 , 0.0, 0.0  },
+        [7] = { 0.5*0.67 , 0.0, 0.0  }
+      }
+   },
+
+   [5] = { -- ダッシュ
+      chars = { '―', '‥', '…' },
+      align = 'left', left = 0.0, down = 0.0,
+      width = 1.0*0.67, height = 0.88, depth = 0.12, italic=0.0,
+      glue = {
+        [1] = { 0.5*0.67 , 0.0, 0.5  },
+        [3] = { 0.25*0.67, 0.0, 0.25 }
+      },
+      kern = {
+        [5] = 0.0
+      }
+   },
+
+   [6] = { -- 感嘆符・疑問符
+      chars = { '？', '！' },
+      align = 'left', left = 0.0, down = 0.0,
+      width = 1.0, height = 0.88, depth = 0.12, italic=0.0,
+      glue = {
+        [0] = { 0.5*0.67 , 0.0, 0.5  },
+        [1] = { 0.5*0.67 , 0.0, 0.5  },
+        [3] = { 0.25*0.67, 0.0, 0.25 },
+        [7] = { 0.5*0.67 , 0.0, 0.5  },
+      },
+      kern = {
+        [5] = 0.0
+      }
+   },
+
+   [7] = { -- 半角カナ
+      chars = {
+        '｡', '｢', '｣', '､', '･', 'ｦ', 'ｧ', 'ｨ', 'ｩ', 
+        'ｪ', 'ｫ', 'ｬ', 'ｭ', 'ｮ', 'ｯ', 'ｰ', 'ｱ', 'ｲ', 
+        'ｳ', 'ｴ', 'ｵ', 'ｶ', 'ｷ', 'ｸ', 'ｹ', 'ｺ', 'ｻ', 
+        'ｼ', 'ｽ', 'ｾ', 'ｿ', 'ﾀ', 'ﾁ', 'ﾂ', 'ﾃ', 'ﾄ', 
+        'ﾅ', 'ﾆ', 'ﾇ', 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ', 
+        'ﾎ', 'ﾏ', 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ', 
+        'ﾗ', 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ', 'ﾞ', 'ﾟ',
+        "AJ1-516", "AJ1-517", "AJ1-518", "AJ1-519", "AJ1-520", "AJ1-521", "AJ1-522", 
+        "AJ1-523", "AJ1-524", "AJ1-525", "AJ1-526", "AJ1-527", "AJ1-528", "AJ1-529", 
+        "AJ1-530", "AJ1-531", "AJ1-532", "AJ1-533", "AJ1-534", "AJ1-535", "AJ1-536", 
+        "AJ1-537", "AJ1-538", "AJ1-539", "AJ1-540", "AJ1-541", "AJ1-542", "AJ1-543", 
+        "AJ1-544", "AJ1-545", "AJ1-546", "AJ1-547", "AJ1-548", "AJ1-549", "AJ1-550", 
+        "AJ1-551", "AJ1-552", "AJ1-553", "AJ1-554", "AJ1-555", "AJ1-556", "AJ1-557", 
+        "AJ1-558", "AJ1-559", "AJ1-560", "AJ1-561", "AJ1-562", "AJ1-563", "AJ1-564", 
+        "AJ1-565", "AJ1-566", "AJ1-567", "AJ1-568", "AJ1-569", "AJ1-570", "AJ1-571", 
+        "AJ1-572", "AJ1-573", "AJ1-574", "AJ1-575", "AJ1-576", "AJ1-577", "AJ1-578", 
+        "AJ1-579", "AJ1-580", "AJ1-581", "AJ1-582", "AJ1-583", "AJ1-584", "AJ1-585", 
+        "AJ1-586", "AJ1-587", "AJ1-588", "AJ1-589", "AJ1-590", "AJ1-591", "AJ1-592", 
+        "AJ1-593", "AJ1-594", "AJ1-595", "AJ1-596", "AJ1-597", "AJ1-598",
+      },
+      align = 'left', left = 0.0, down = 0.0,
+      width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0,      
+      glue = {
+        [1] = { 0.5*0.67 , 0.0, 0.5  },
+        [3] = { 0.25*0.67, 0.0, 0.25 }
+      }
+   },
+
+   [99] = { -- box末尾
+      chars = {'boxbdd', 'parbdd'},
+   },
+
+}