X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fjfm-ujisv.lua;h=6bf3075340b7d4e6972a3b7736c5367ee67305ef;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=1fbde9152190dfe8dd7122c7360b75c8f4d88e0e;hpb=0f323a75810eeac46698f9bf028aed2beecdcee4;p=luatex-ja%2Fluatexja.git

diff --git a/src/jfm-ujisv.lua b/src/jfm-ujisv.lua
index 1fbde91..6bf3075 100644
--- a/src/jfm-ujisv.lua
+++ b/src/jfm-ujisv.lua
@@ -16,15 +16,13 @@ luatexja.jfont.define_jfm {
       align = 'middle', left = 0.00, down = 0.00,
       width = 1.0, height = 0.50, depth = 0.50, 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,  ratio=1, ksp_stretch=1 },
-	 [2] = { 0, 0, 0, ksp_shrink=1 },
+	 [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=1 },
-	 [6] = { 0, 0, 0, ksp_shrink=1 },
-	 [7] = { 0, 0, 0, ksp_shrink=1 },
-         [8] = { 0, 0, 0, ksp_shrink=1 },
+	 [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 },
       }
    },
 
@@ -37,15 +35,15 @@ luatexja.jfont.define_jfm {
       width = 0.5, height = 0.50, depth = 0.50, italic=0.0,
       glue = {
 -- 3 のみ四分，あとは0
-         [0] = { 0, 0, 0, ksp_shrink=1 },
-         [1] = { 0, 0, 0, ksp_shrink=1 },
-	 [2] = { 0, 0, 0, ksp_stretch=1, ksp_shrink=1 },
+         [0] = { 0, 0, 0, kanjiskip_shrink=1 },
+         [1] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [2] = { 0, 0, 0, kanjiskip_stretch=1, kanjiskip_shrink=1 },
 	 [3] = { 0.25, 0.0, 0.25, priority=1 },
-	 [4] = { 0, 0, 0, ksp_shrink=1 },
-	 [5] = { 0, 0, 0, ksp_shrink=1 },
-	 [6] = { 0, 0, 0, ksp_shrink=1 },
-	 [7] = { 0, 0, 0, ksp_shrink=1 },
-         [8] = { 0, 0, 0, ksp_shrink=1 },
+	 [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 },
       }
    },
 
@@ -58,15 +56,15 @@ luatexja.jfont.define_jfm {
       width = 0.5, height = 0.50, depth = 0.50, italic=0.0,
       glue = {
 -- 3 は四分, 2, 4, 9 は0, あとは0.5
-	 [0] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=1 },
-	 [1] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=1 },
-         [2] = { 0, 0, 0, ksp_shrink=1 },
+	 [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=1 },
-	 [5] = { 0.5 , 0.0, 0.5, rario=0, ksp_stretch=1 },
-	 [6] = { 0.5 , 0.0, 0.5, rario=0, ksp_stretch=1 },
-	 [7] = { 0.5 , 0.0, 0.5, rario=0, ksp_stretch=1 },
-	 [8] = { 0.5 , 0.0, 0.5, rario=0, ksp_stretch=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 },
+	 [8] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
       }
    },
 
@@ -95,13 +93,13 @@ luatexja.jfont.define_jfm {
       width = 0.5, height = 0.50, depth = 0.50, italic=0.0,
       glue = {
 -- 3 は.75, 2, 4 は0, あとは0.5
-	 [0] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=1 },
-	 [1] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=1 },
-	 [3] = { 0.75, 0.0, 0.25, priority=1, ratio=1./3, ksp_stretch=1 },
-	 [5] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=1 },
-	 [6] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=1 },
-	 [7] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=1 },
-	 [8] = { 0.5 , 0.0, 0.5, ratio=0, ksp_stretch=1 },
+	 [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 },
       }
    },
 
@@ -110,11 +108,11 @@ luatexja.jfont.define_jfm {
       align = 'left', left = 0.0, down = 0.0,
       width = 1.0, height = 0.50, depth = 0.50, italic=0.0,
       glue = {
-	 [1] = { 0.5 , 0.0, 0.5, ratio=1, ksp_stretch=1 },
-	 [2] = { 0, 0, 0, ksp_shrink=1 },
+	 [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=1 },
-	 [6] = { 0, 0, 0, ksp_shrink=1 },
+	 [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [6] = { 0, 0, 0, kanjiskip_shrink=1 },
       },
       kern = {
 	 [5] = 0.0
@@ -126,14 +124,14 @@ luatexja.jfont.define_jfm {
       align = 'left', left = 0.0, down = 0.0,
       width = 1.0, height = 0.50, depth = 0.50, italic=0.0,
       glue = {
-         [0] = { 1.0 , 0.0, 0.5, ratio=1, ksp_stretch=1 },
-	 [1] = { 0.5 , 0.0, 0.5, ratio=1, ksp_stretch=1 },
-	 [2] = { 0, 0, 0, ksp_shrink=1 },
+         [0] = { 1.0 , 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=1 },
-	 [6] = { 0, 0, 0, ksp_shrink=1 },
-	 [7] = { 0.5 , 0.0, 0.5, ratio=1, ksp_stretch=1 },
-	 [8] = { 0, 0, 0, ksp_shrink=1 },
+	 [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
@@ -165,13 +163,13 @@ luatexja.jfont.define_jfm {
       align = 'left', left = 0.0, down = 0.0,
       width = 0.5, height = 0.5, depth = 0.5, italic=0.0,
       glue = {
-	 [1] = { 0.5 , 0.0, 0.5, ratio=1, ksp_stretch=1 },
-	 [2] = { 0, 0, 0, ksp_shrink=1 },
+	 [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=1 },
-	 [6] = { 0, 0, 0, ksp_shrink=1 },
-	 [7] = { 0, 0, 0, ksp_shrink=1 },
-         [8] = { 0, 0, 0, ksp_shrink=1 },
+	 [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 },
       }
    },
 
@@ -197,11 +195,11 @@ luatexja.jfont.define_jfm {
       align = 'left', left = 0.0, down = 0.0,
       width = 1.0, height = 0.50, depth = 0.50, italic=0.0,
       glue = {
-	 [1] = { 0.5 , 0.0, 0.5, ratio=1, ksp_stretch=1 },
-	 [2] = { 0, 0, 0, ksp_shrink=1 },
+	 [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=1 },
-	 [6] = { 0, 0, 0, ksp_shrink=1 },
+	 [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+	 [6] = { 0, 0, 0, kanjiskip_shrink=1 },
       },
       kern = {
 	 [8] = 0.0