X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fjfm-ujis.lua;h=f64080e02edd50781d83922ddc91d04f9396b023;hb=afb20fe6fa022d226825235b4c3f0a9e565454e5;hp=4b984c56aa1b75d3c604f3da8c54282cccb44de5;hpb=c4d83e95ba030a0137dccb27abe3c9a74d64cfba;p=luatex-ja%2Fluatexja.git

diff --git a/src/jfm-ujis.lua b/src/jfm-ujis.lua
index 4b984c5..f64080e 100644
--- a/src/jfm-ujis.lua
+++ b/src/jfm-ujis.lua
@@ -2,16 +2,28 @@
 -- jfm-ujis.lua: LuaTeX-ja 標準 JFM
 -- based on upnmlminr-h.tfm (a metric in UTF/OTF package used by upTeX).
 
+-- JIS X 4051:2004 では，行末の句読点や中点はベタなのでそれに従う
+-- kanjiskip: 0pt plus .25zw minus 0pt
+-- xkanjiskip: .25zw plus .25zw (or .0833zw) minus .125zw
+
+
 luatexja.jfont.define_jfm {
    dir = 'yoko',
    zw = 1.0, zh = 1.0,
-
+   kanjiskip =  {0.0, 0.05, 0},
+   xkanjiskip = {0.25, 0.25, .125},
    [0] = {
       align = 'left', left = 0.0, down = 0.0,
       width = 1.0, height = 0.88, depth = 0.12, italic=0.0,
       glue = {
-	 [1] = { 0.5 , 0.0, 0.5  },
-	 [3] = { 0.25, 0.0, 0.25 }
+	 [1] = { 0.5 , 0.0, 0.5,  0, 1 },
+	 [2] = {0, 0, 0},
+	 [3] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [4] = {0, 0, 0},
+	 [6] = {0, 0, 0},
+	 [7] = {0, 0, 0},
+         [8] = {0, 0, 0},
+	 [9] = {0, 0, 0},
       }
    },
 
@@ -23,25 +35,39 @@ luatexja.jfont.define_jfm {
       align = 'right', left = 0.0, down = 0.0,
       width = 0.5, height = 0.88, depth = 0.12, italic=0.0,
       glue = {
-	 [3] = { 0.25, 0.0, 0.25 }
+-- 3 のみ四分，あとは0
+         [0] = {0, 0, 0},
+         [1] = {0, 0, 0},
+	 [2] = {0, 0, 0},
+	 [3] = { 0.25, 0.0, 0.25, 1 },
+	 [4] = {0, 0, 0},
+	 [5] = {0, 0, 0},
+	 [6] = {0, 0, 0},
+	 [7] = {0, 0, 0},
+         [8] = {0, 0, 0},
+	 [9] = {0, 0, 0},
       }
    },
 
    [2] = { -- 閉じ括弧類
       chars = {
-	 '’', '”', '、', '〉', '》', '」', '』', '】', '〕', 
-	 '〗', '〙', '〟', '）', '，', '］', '｝', '｠'
+	 '’', '”', '〉', '》', '」', '』', '】', '〕', 
+	 '〗', '〙', '〟', '）', '］', '｝', '｠', '、', '，*'
       },
       align = 'left', left = 0.0, down = 0.0,
       width = 0.5, height = 0.88, depth = 0.12, italic=0.0,
       glue = {
-	 [0] = { 0.5 , 0.0, 0.5  },
-	 [1] = { 0.5 , 0.0, 0.5  },
-	 [3] = { 0.25, 0.0, 0.25 },
-	 [5] = { 0.5 , 0.0, 0.5  },
-	 [6] = { 0.5 , 0.0, 0.5  },
-	 [7] = { 0.5 , 0.0, 0.5  },
-	 [8] = { 0.5 , 0.0, 0.5  },
+-- 3 は四分, 2, 4, 9 は0, あとは0.5
+	 [0] = { 0.5 , 0.0, 0.5, 0, -1 },
+	 [1] = { 0.5 , 0.0, 0.5, 0, -1 },
+         [2] = {0, 0, 0},
+	 [3] = { 0.25, 0.0, 0.25, 1, 1 },
+         [4] = {0, 0, 0},
+	 [5] = { 0.5 , 0.0, 0.5, 0, -1 },
+	 [6] = { 0.5 , 0.0, 0.5, 0, -1 },
+	 [7] = { 0.5 , 0.0, 0.5, 0, -1 },
+	 [8] = { 0.5 , 0.0, 0.5, 0, -1 },
+         [9] = {0, 0, 0},
       }
    },
 
@@ -49,16 +75,19 @@ luatexja.jfont.define_jfm {
       chars = {'・', '：', '；'},
       align = 'middle', left = 0.0, down = 0.0,
       width = 0.5, height = 0.88, depth = 0.12, italic=0.0,
+      --end_stretch = 0.25,
       glue = {
-	 [0] = { 0.25, 0.0, 0.25 },
-	 [1] = { 0.25, 0.0, 0.25 },
-	 [2] = { 0.25, 0.0, 0.25 },
-	 [3] = { 0.5 , 0.0, 0.5  },
-	 [4] = { 0.25, 0.0, 0.25 },
-	 [5] = { 0.25, 0.0, 0.25 },
-	 [6] = { 0.25, 0.0, 0.25 },
-	 [7] = { 0.25, 0.0, 0.25 },
-	 [8] = { 0.25, 0.0, 0.25 },
+-- 3 のみ 0.5，あとは0.25
+	 [0] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [1] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [2] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [3] = { 0.5 , 0.0, 0.5 , 1, 0 },
+	 [4] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [5] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [6] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [7] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [8] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [9] = { 0.25, 0.0, 0.25, 1, 1 },
       }
    },
 
@@ -67,23 +96,29 @@ luatexja.jfont.define_jfm {
       align = 'left', left = 0.0, down = 0.0,
       width = 0.5, height = 0.88, depth = 0.12, italic=0.0,
       glue = {
-	 [0] = { 0.5 , 0.0, 0.0  },
-	 [1] = { 0.5 , 0.0, 0.0  },
-	 [3] = { 0.75, 0.0, 0.25 },
-	 [5] = { 0.5 , 0.0, 0.0  },
-	 [6] = { 0.5 , 0.0, 0.0  },
-	 [7] = { 0.5 , 0.0, 0.0  },
-	 [8] = { 0.5 , 0.0, 0.0  },
+-- 3 は.75, 2, 4 は0, あとは0.5
+	 [0] = { 0.5 , 0.0, 0.5, 0, -1 },
+	 [1] = { 0.5 , 0.0, 0.5, 0, -1 },
+	 [3] = { 0.75, 0.0, 0.25, 1, -1/3 },
+	 [5] = { 0.5 , 0.0, 0.5, 0, -1 },
+	 [6] = { 0.5 , 0.0, 0.5, 0, -1 },
+	 [7] = { 0.5 , 0.0, 0.5, 0, -1 },
+	 [8] = { 0.5 , 0.0, 0.5, 0, -1 },
+         [9] = { 0.5 , 0.0, 0.5, 0, -1 },
       }
    },
 
    [5] = { -- ダッシュ
-      chars = { '—', '―', '‥', '…' },
+      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 , 0.0, 0.5  },
-	 [3] = { 0.25, 0.0, 0.25 }
+	 [1] = { 0.5 , 0.0, 0.5, 0, 1 },
+	 [2] = {0, 0, 0},
+	 [3] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [4] = {0, 0, 0},
+	 [6] = {0, 0, 0},
+	 [9] = {0, 0, 0},
       },
       kern = {
 	 [5] = 0.0
@@ -91,18 +126,22 @@ luatexja.jfont.define_jfm {
    },
 
    [6] = { -- 感嘆符・疑問符
-      chars = { '？', '！' },
+      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.0, 0.5  },
-	 [1] = { 0.5 , 0.0, 0.5  },
-	 [3] = { 0.25, 0.0, 0.25 },
-	 [7] = { 0.5 , 0.0, 0.5  },
+         [0] = {0, 0, 0},
+	 [1] = { 0.5 , 0.0, 0.5, 0, 1 },
+	 [2] = {0, 0, 0},
+	 [3] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [4] = {0, 0, 0},
+	 [6] = {0, 0, 0},
+	 [7] = {0, 0, 0},
+	 [8] = {0, 0, 0},
+	 [9] = {0, 0, 0},
       },
       kern = {
-	 [5] = 0.0,
-	 [8] = 0.0
+	 [5] = 0.0
       }
    },
 
@@ -131,8 +170,14 @@ luatexja.jfont.define_jfm {
       align = 'left', left = 0.0, down = 0.0,
       width = 0.5, height = 0.88, depth = 0.12, italic=0.0,      
       glue = {
-	 [1] = { 0.5 , 0.0, 0.5  },
-	 [3] = { 0.25, 0.0, 0.25 }
+	 [1] = { 0.5 , 0.0, 0.5, 0, 1 },
+	 [2] = {0, 0, 0},
+	 [3] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [4] = {0, 0, 0},
+	 [6] = {0, 0, 0},
+	 [7] = {0, 0, 0},
+         [8] = {0, 0, 0},
+	 [9] = {0, 0, 0},
       }
    },
 
@@ -158,18 +203,43 @@ 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 = {
-	 [1] = { 0.5 , 0.0, 0.5  },
-	 [3] = { 0.25, 0.0, 0.25 }
+	 [1] = { 0.5 , 0.0, 0.5, 0, 1 },
+	 [2] = {0, 0, 0},
+	 [3] = { 0.25, 0.0, 0.25, 1, 1 },
+	 [4] = {0, 0, 0},
+	 [6] = {0, 0, 0},
+	 [9] = {0, 0, 0},
       },
       kern = {
 	 [8] = 0.0
       }
    },
 
+   [9] = { -- 和字間隔
+      chars = {
+	 '　'
+      },
+      align = 'left', left = 0.0, down = 0.0,
+      width = 1.0, height = 0.88, depth = 0.12, italic=0.0,
+      glue = {
+         [0] = {0, 0, 0}, 
+         [1] = {0, 0, 0}, 
+         [2] = {0, 0, 0}, 
+	 [3] = { 0.25, 0.0, 0.25, 1 },
+         [4] = {0, 0, 0}, 
+         [5] = {0, 0, 0}, 
+         [6] = {0, 0, 0}, 
+         [7] = {0, 0, 0}, 
+         [8] = {0, 0, 0}, 
+         [9] = {0, 0, 0}, 
+      },
+   },
+
+
    [99] = { -- box末尾
       chars = {'boxbdd', 'parbdd'},
       glue = {
-	 [3] = { 0.25, 0.0, 0.25 },
+	 [3] = { 0.25, 0.0, 0.25, 1 },
       }
    },