update jfm-ujisv.lua (halfwidth CID etc.)

diff --git a/src/addons/luatexja-ajmacros.sty b/src/addons/luatexja-ajmacros.sty
index 016fda3..b48e04b 100644 (file)
--- a/src/addons/luatexja-ajmacros.sty
+++ b/src/addons/luatexja-ajmacros.sty
@@ -268,7 +268,7 @@
        \fi
        \ifnum#2>\z@ \shift@CID{#2}{10185}%
        \fi}
-\gdef\ajnenrei#1#2{\hskip\kanjiskip\hbox{\tate\ifnum#2<10
+\gdef\ajnenrei#1#2{\hskip\ltjgetparameter{kanjiskip}\hbox{\tate\ifnum#2<10
        \shift@CID{#2}{10207}\CID{\ifcase#1\or10230\or10232\or10231\or10229\fi}%
        \else\ifnum#2=10\CID{\ifodd#1 10208\else10217\fi}%
                \CID{\ifcase#1\or10218\or10232\or10218\or10229\fi}%

diff --git a/src/jfm-ujisv.lua b/src/jfm-ujisv.lua
index 6bf3075..80f8e88 100644 (file)
--- a/src/jfm-ujisv.lua
+++ b/src/jfm-ujisv.lua
@@ -7,7 +7,7 @@
 -- xkanjiskip: .25zw plus .25zw (or .0833zw) minus .125zw
 
 
-luatexja.jfont.define_jfm {
+local t = {
    dir = 'tate',
    zw = 1.0, zh = 1.0,
    kanjiskip =  { 0.0, 0.25, 0 },
@@ -22,6 +22,8 @@ luatexja.jfont.define_jfm {
         [4] = { 0, 0, 0, kanjiskip_shrink=1 },
         [6] = { 0, 0, 0, kanjiskip_shrink=1 },
         [7] = { 0, 0, 0, kanjiskip_shrink=1 },
+        [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+        [207] = { 0, 0, 0, kanjiskip_shrink=1 },
          [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       }
    },
@@ -43,6 +45,8 @@ luatexja.jfont.define_jfm {
         [5] = { 0, 0, 0, kanjiskip_shrink=1 },
         [6] = { 0, 0, 0, kanjiskip_shrink=1 },
         [7] = { 0, 0, 0, kanjiskip_shrink=1 },
+        [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+        [207] = { 0, 0, 0, kanjiskip_shrink=1 },
          [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       }
    },
@@ -64,6 +68,8 @@ luatexja.jfont.define_jfm {
         [5] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
         [6] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
         [7] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
+        [107] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
+        [207] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
         [8] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
       }
    },
@@ -83,6 +89,8 @@ luatexja.jfont.define_jfm {
         [5] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
         [6] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
         [7] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+        [107] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+        [207] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
         [8] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
       }
    },
@@ -99,6 +107,8 @@ luatexja.jfont.define_jfm {
         [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 },
+        [107] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+        [207] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
         [8] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
       }
    },
@@ -130,7 +140,9 @@ luatexja.jfont.define_jfm {
         [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 },
+        [107] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+        [207] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
         [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       },
       kern = {
@@ -138,7 +150,7 @@ luatexja.jfont.define_jfm {
       }
    },
 
-   [7] = { -- 半角カナ
+   [7] = { -- 半角カナ，その他半角CID
       chars = {
         '｡', '｢', '｣', '､', '･', 'ｦ', 'ｧ', 'ｨ', 'ｩ',
         'ｪ', 'ｫ', 'ｬ', 'ｭ', 'ｮ', 'ｯ', 'ｰ', 'ｱ', 'ｲ',
@@ -147,18 +159,6 @@ luatexja.jfont.define_jfm {
         'ﾅ', 'ﾆ', 'ﾇ', 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ',
         'ﾎ', 'ﾏ', 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ',
         'ﾗ', 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ', 'ﾞ', 'ﾟ',
-        "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, height = 0.5, depth = 0.5, italic=0.0,
@@ -173,6 +173,35 @@ luatexja.jfont.define_jfm {
       }
    },
 
+   [107] = { -- 1/3 角
+      chars = {},
+      align = 'left', left = 0.0, down = 0.0,
+      width = 1/3, height = 0.5, depth = 0.5, italic=0.0,
+      glue = {
+        [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+        [2] = { 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 },
+        [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+         [8] = { 0, 0, 0, kanjiskip_shrink=1 },
+      }
+   },
+   [207] = { -- 1/4 角
+      chars = {},
+      align = 'left', left = 0.0, down = 0.0,
+      width = 1/4, height = 0.5, depth = 0.5, italic=0.0,
+      glue = {
+        [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+        [2] = { 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 },
+        [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+         [8] = { 0, 0, 0, kanjiskip_shrink=1 },
+      }
+   },
+
    [8] = { -- 罫線類．
       chars = {
         '─', '━', '│', '┃', '┄', '┅', '┆', '┇',
@@ -214,3 +243,13 @@ luatexja.jfont.define_jfm {
    },
 
 }
+local ht = t[007].chars
+for i=8950,9353 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+for i=10185,10195 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+local ht = t[107].chars
+for i=13274,13294 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+local ht = t[207].chars
+for i=13254,13273 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+
+
+luatexja.jfont.define_jfm(t)