X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fjfm-ujisv.lua;h=9e643c8b81541864651167185fb0f162d0f82854;hb=3fae82d64b193c794fdf2f1262d80bddc98ce5a8;hp=4ea0b3b5bc5c4f8757ee6a6b101da215f87e447e;hpb=e4ee0e50d6c2ca7fb2b75208fb6cd08cf185c0dd;p=luatex-ja%2Fluatexja.git

diff --git a/src/jfm-ujisv.lua b/src/jfm-ujisv.lua
index 4ea0b3b..9e643c8 100644
--- 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,18 +67,18 @@ 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 },
       }
    },
 
    [3] = { -- 中点類
-      chars = {'・', '：', '；'},
+      chars = {'・', '：', '；', '·'},
       align = 'middle', left = 0.0, down = 0.0,
       width = 0.5, height = 0.50, depth = 0.50, italic=0.0,
       --end_stretch = 0.25,
@@ -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,10 +260,7 @@ local t = {
    },
 
    [99] = { -- box末尾
-      chars = {'boxbdd', 'parbdd'},
-      glue = {
-	 [3] = { 0.25, 0.0, 0.25, priority=1 },
-      }
+      chars = {'boxbdd', 'parbdd', 'glue'},
    },
 
 }
@@ -274,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)