X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fjfm-ujisv.lua;h=ccae212f886e61b550fab6db664c3604b9bce722;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=80f8e889e3e3a55f3a5ebbc4bb3a0c6696a00f3a;hpb=a0d108da7f25fed43afc3a5f0111cee9765a9a2a;p=luatex-ja%2Fluatexja.git

diff --git a/src/jfm-ujisv.lua b/src/jfm-ujisv.lua
index 80f8e88..ccae212 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 },
@@ -25,7 +26,8 @@ local t = {
 	 [107] = { 0, 0, 0, kanjiskip_shrink=1 },
 	 [207] = { 0, 0, 0, kanjiskip_shrink=1 },
          [8] = { 0, 0, 0, kanjiskip_shrink=1 },
-      }
+      },
+      kern = { [307] = 0 },	 
    },
 
    [1] = { -- 開き括弧類
@@ -43,6 +45,7 @@ local t = {
 	 [3] = { 0.25, 0.0, 0.25, priority=1 },
 	 [4] = { 0, 0, 0, kanjiskip_shrink=1 },
 	 [5] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [105] = { 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 },
@@ -65,17 +68,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 },
-	 [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,
@@ -87,6 +91,7 @@ local t = {
 	 [3] = { 0.5 , 0.0, 0.25, priority=1 },
 	 [4] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
 	 [5] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+	 [105] = { 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 },
@@ -105,6 +110,7 @@ local t = {
 	 [1] = { 0.5 , 0.0, 0.5, 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 },
+	 [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 },
@@ -113,7 +119,7 @@ local t = {
       }
    },
 
-   [5] = { -- ダッシュ
+   [5] = { -- 分離禁止文字
       chars = { '—', '―', '‥', '…', '〳', '〴', '〵', },
       align = 'left', left = 0.0, down = 0.0,
       width = 1.0, height = 0.50, depth = 0.50, italic=0.0,
@@ -125,7 +131,25 @@ local t = {
 	 [6] = { 0, 0, 0, kanjiskip_shrink=1 },
       },
       kern = {
-	 [5] = 0.0
+         [5] = 0.0,
+         [105] = 0.0,
+      }
+   },
+
+   [5] = { -- -- 二分（二重）ダッシュ
+      chars = { '゠', '–' },
+      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 },
+	 [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 },
+      },
+      kern = {
+	 [5] = 0.0,
+	 [105] = 0.0
       }
    },
 
@@ -146,7 +170,8 @@ local t = {
 	 [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       },
       kern = {
-	 [5] = 0.0
+	 [5] = 0.0,
+	 [105] = 0.0,
       }
    },
 
@@ -197,10 +222,23 @@ local t = {
 	 [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 },
+	 [207] = { 0, 0, 0, kanjiskip_shrink=1 },
          [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       }
    },
+   [307] = { -- 合成用濁点・半濁点
+      chars = { 0x3099, 0x309A },
+      align = 'right', left = 0.0, down = 0.0,
+      width = 0, 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 },
+    [8] = { 0, 0, 0, kanjiskip_shrink=1 },
+      }
+   },
 
    [8] = { -- 罫線類．
       chars = {
@@ -236,10 +274,7 @@ local t = {
    },
 
    [99] = { -- box末尾
-      chars = {'boxbdd', 'parbdd'},
-      glue = {
-	 [3] = { 0.25, 0.0, 0.25, priority=1 },
-      }
+      chars = {'boxbdd', 'parbdd', 'glue'},
    },
 
 }
@@ -251,5 +286,22 @@ 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
+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)