Merge branch 'kitagawa_test' into cjascale

[luatex-ja/luatexja.git] / src / jfm-ujisv.lua

diff --git a/src/jfm-ujisv.lua b/src/jfm-ujisv.lua
index ea7c9a9..029ff96 100644 (file)
--- a/src/jfm-ujisv.lua
+++ b/src/jfm-ujisv.lua
@@ -8,6 +8,7 @@
 
 
 local t = {
+   version = 3,
    dir = 'tate',
    zw = 1.0, zh = 1.0,
    kanjiskip =  { 0.0, 0.25, 0 },
@@ -66,13 +67,13 @@ local t = {
          [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 },
-        [5] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
-        [105] = { 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 },
+        [5] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+        [105] = { 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 },
       }
    },
 
@@ -136,7 +137,7 @@ local t = {
 
    [5] = { -- -- 二分（二重）ダッシュ
       chars = { '゠', '–' },
-      align = 'center', left = 0.0, down = 0.0,
+      align = 'middle', left = 0.0, down = 0.0,
       width = 0.50, height = 0.50, depth = 0.50, italic=0.0,
       glue = {
         [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
@@ -259,7 +260,7 @@ local t = {
    },
 
    [99] = { -- box末尾
-      chars = {'boxbdd', 'parbdd'},
+      chars = {'boxbdd', 'parbdd', 'glue'},
    },
 
 }
@@ -271,5 +272,23 @@ 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
 
+t[100]=table.fastcopy(t[0])
+t[100].chars={'nox_alchar'}
+for i,v in pairs(t) do
+  if i~=6 and type(i)=='number' and type(v)=='table' then -- 感嘆符以外
+    if v.glue and v.glue[0] then v.glue[100] = v.glue[0] end
+    if v.kern and v.kern[0] then v.kern[100] = v.kern[0] end
+  end
+end
+t[200]=table.fastcopy(t[0])
+t[200].chars={'〱', '〲'}
+t[200].width = 2.0
+t[200].left=-0.5
+for i,v in pairs(t) do
+  if type(v)=='table' then
+    if v.glue and v.glue[0] then v.glue[200] = v.glue[0] end
+    if v.kern and v.kern[0] then v.kern[200] = v.kern[0] end
+  end
+end
 
 luatexja.jfont.define_jfm(t)