X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=src%2Fjfm-ujis.lua;h=a0d1675e1272feab28ea95090c49b54682fd783c;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=10a21a38fcf07927baeea6ee5362c85a55740aa1;hpb=4e860e657fcc177e7d28cf83b79a1a8e8cdf55c5;p=luatex-ja%2Fluatexja.git

diff --git a/src/jfm-ujis.lua b/src/jfm-ujis.lua
index 10a21a3..a0d1675 100644
--- a/src/jfm-ujis.lua
+++ b/src/jfm-ujis.lua
@@ -16,16 +16,13 @@ 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 = {
-	 -- [index] = { width, stretch, shrink, [priority, [ratio]],
-         --             ksp_nat=t/f, ksp_stretch=t/f, ksp_shrink=t/f }
-	 [1] = { 0.5 , 0.0, 0.5, rario=1, ksp_stretch=true },
-	 [2] = { 0, 0, 0, ksp_shrink=true },
+	 [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, ksp_shrink=true },
-	 [6] = { 0, 0, 0, ksp_shrink=true },
-	 [7] = { 0, 0, 0, ksp_shrink=true },
-	 [8] = { 0, 0, 0, ksp_shrink=true },
-	 [99] = { 0, 0, 0 },
+	 [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [6] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [7] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       }
    },
 
@@ -38,16 +35,15 @@ luatexja.jfont.define_jfm {
       width = 0.5, height = 0.88, depth = 0.12, italic=0.0,
       glue = {
 -- 3 のみ四分，あとは0
-         [0] = { 0, 0, 0, ksp_shrink=true },
-         [1] = { 0, 0, 0, ksp_shrink=true },
-	 [2] = { 0, 0, 0, ksp_shrink=true },
+         [0] = { 0, 0, 0, kanjiskip_shrink=1 },
+         [1] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [2] = { 0, 0, 0, kanjiskip_shrink=1, kanjiskip_stretch=1 },
 	 [3] = { 0.25, 0.0, 0.25, priority=1 },
-	 [4] = { 0, 0, 0, ksp_shrink=true },
-	 [5] = { 0, 0, 0, ksp_shrink=true },
-	 [6] = { 0, 0, 0, ksp_shrink=true },
-	 [7] = { 0, 0, 0, ksp_shrink=true },
-         [8] = { 0, 0, 0, ksp_shrink=true },
-	 [99] = { 0, 0, 0 },
+	 [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [5] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [6] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [7] = { 0, 0, 0, kanjiskip_shrink=1 },
+         [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       }
    },
 
@@ -60,16 +56,15 @@ luatexja.jfont.define_jfm {
       width = 0.5, height = 0.88, depth = 0.12, italic=0.0,
       glue = {
 -- 3 は四分, 2, 4, 9 は0, あとは0.5
-	 [0] = { 0.5 , 0.0, 0.5, rario=0, ksp_stretch=true },
-	 [1] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-         [2] = { 0, 0, 0, ksp_shrink=true},
+	 [0] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+	 [1] = { 0.5 , 0.0, 0.5, ratio=0, 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, ksp_shrink=true },
-	 [5] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-	 [6] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-	 [7] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-	 [8] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-         [99] = { 0, 0, 0 },
+         [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [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 },
+	 [8] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
       }
    },
 
@@ -89,7 +84,6 @@ luatexja.jfont.define_jfm {
 	 [6] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
 	 [7] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
 	 [8] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
-	 [99] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
       }
    },
 
@@ -99,14 +93,13 @@ luatexja.jfont.define_jfm {
       width = 0.5, height = 0.88, depth = 0.12, italic=0.0,
       glue = {
 -- 3 は.75, 2, 4 は0, あとは0.5
-	 [0] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-	 [1] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-	 [3] = { 0.75, 0.0, 0.25, priority=1, ratio=1/3, ksp_stretch=true },
-	 [5] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-	 [6] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-	 [7] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-	 [8] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
-         [99] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=true },
+	 [0] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+	 [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 },
+	 [6] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+	 [7] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+	 [8] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
       }
    },
 
@@ -115,12 +108,11 @@ 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, ratio=1, ksp_stretch=true },
-	 [2] = { 0, 0, 0, ksp_shrink=true },
+	 [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, ksp_shrink=true },
-	 [6] = { 0, 0, 0, ksp_shrink=true },
-	 [99] = { 0, 0, 0 },
+	 [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [6] = { 0, 0, 0, kanjiskip_shrink=1 },
       },
       kern = {
 	 [5] = 0.0
@@ -132,15 +124,14 @@ 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 = {
-         [0] = { 0.5 , 0.0, 0.5, ratio=1, ksp_stretch=true },
-	 [1] = { 0.5 , 0.0, 0.5, ratio=1, ksp_stretch=true },
-	 [2] = { 0, 0, 0, ksp_shrink=true },
+         [0] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+	 [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+	 [2] = { 0, 0, 0, kanjiskip_shrink=1 },
 	 [3] = { 0.75, 0.0, 0.25, priority=1, ratio=1 },
-	 [4] = { 0, 0, 0, ksp_shrink=true },
-	 [6] = { 0, 0, 0, ksp_shrink=true },
-	 [7] = { 0.5 , 0.0, 0.5, ratio=1, ksp_stretch=true },
-	 [8] = { 0, 0, 0, ksp_shrink=true },
-	 [99] = { 0, 0, 0 },
+	 [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 },
+	 [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       },
       kern = {
 	 [5] = 0.0
@@ -172,14 +163,13 @@ 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, ratio=1, ksp_stretch=true },
-	 [2] = { 0, 0, 0, ksp_shrink=true },
+	 [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, ksp_shrink=true },
-	 [6] = { 0, 0, 0, ksp_shrink=true},
-	 [7] = { 0, 0, 0, ksp_shrink=true },
-         [8] = { 0, 0, 0, ksp_shrink=true},
-	 [99] = { 0, 0, 0 },
+	 [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [6] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [7] = { 0, 0, 0, kanjiskip_shrink=1 },
+         [8] = { 0, 0, 0, kanjiskip_shrink=1 },
       }
    },
 
@@ -205,12 +195,11 @@ 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, 0, 1, ksp_stretch=true },
-	 [2] = { 0, 0, 0, ksp_shrink=true },
-	 [3] = { 0.25, 0.0, 0.25, 1, 1 },
-	 [4] = { 0, 0, 0, ksp_shrink=true },
-	 [6] = { 0, 0, 0, ksp_shrink=true },
-	 [99] = {0, 0, 0},
+	 [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 = {
 	 [8] = 0.0