JFM見直し

abenori · Dec 17, 2017 · c16fd42 · c16fd42
1 parent ae2bb86
commit c16fd42
Show file tree

Hide file tree

Showing 3 changed files with 279 additions and 330 deletions.
diff --git a/jfm-jlreq.lua b/jfm-jlreq.lua
@@ -32,6 +32,7 @@ local hyphen_glue = {
 	[15] = {0, 0, 0},
 	[16] = {0, 0, 0},
 	[0] = {0, 0, 0},
+	[27] = {0, 0, 0},
 --[[
 	[20] = {0, 0, 0},
 	[21] = {0, 0, 0},
@@ -40,7 +41,6 @@ local hyphen_glue = {
 	[24] = {0, 0, 0},
 	[25] = {0, 0, 0},
 	[26] = {0, 0, 0},
-	[27] = {0, 0, 0},
 	[28] = {0, 0, 0},
 	[29] = {0, 0, 0},
 	[30] = {0, 0, 0},
@@ -53,7 +53,7 @@ local jfm = {
 	dir = 'yoko',
 	zw = 1.0,
 	zh = 1.0,
-	version = 2,
+	version = 3,
 	-- 文字クラス4,9,10,11,15,16,19との間は(x)kanjiskipで調整する．
 	kanjiskip = {0, 0.25, 0},
 	xkanjiskip = {0.25, 0.25, 0.125},
@@ -84,15 +84,15 @@ local jfm = {
 			[15] = {0, 0, 0},
 			[16] = {0, 0, 0},
 			[0] = {0, 0, 0},
-		--[[
+			[27] = {0, 0, 0},
+--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0, 0},
 			[22] = {0, 0, 0},
 			[23] = {0, 0, 0},
 			[24] = {0, 0, 0},
 			[25] = {0, 0, 0},
 			[26] = {0, 0, 0},
-			[27] = {0, 0, 0},
 			[28] = {0, 0, 0},
 			[29] = {0, 0, 0},
 			[30] = {0, 0, 0},
@@ -126,6 +126,7 @@ local jfm = {
 			[15] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[16] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[0] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
+			[27] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
@@ -134,7 +135,6 @@ local jfm = {
 			[24] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[25] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[26] = {0.5, 0, 0, ratio = 0, priority = {0,-2}},
-			[27] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[28] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[29] = {0, 0, 0},
 			[30] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
@@ -188,7 +188,8 @@ local jfm = {
 			[14] = {0, 0, 0},
 			[15] = {0, 0, 0},
 			[16] = {0, 0, 0},
---			[0] = {0, 0, 0},
+			[0] = {0, 0, 0},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -197,9 +198,6 @@ local jfm = {
 			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[26] = {0, 0, 0},
-		]]
---			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
-		--[[
 			[28] = {0, 0, 0},
 			[29] = {0, 0, 0},
 			[30] = {0, 0, 0},
@@ -233,6 +231,7 @@ local jfm = {
 			[15] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
 			[16] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
 			[0] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
+			[27] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
 		--[[
 			[20] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
 			[21] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
@@ -241,9 +240,6 @@ local jfm = {
 			[24] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
 			[25] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
 			[26] = {0.25, 0, 0, ratio = 0, priority = {0,-1}},
-		]]
-			[27] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-		--[[
 			[28] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
 			[29] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
 			[30] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
@@ -277,6 +273,7 @@ local jfm = {
 			[15] = {0.5, 0, 0, ratio = 0},
 			[16] = {0.5, 0, 0, ratio = 0},
 			[0] = {0.5, 0, 0, ratio = 0},
+			[27] = {0.5, 0, 0, ratio = 0},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.5, 0, 0, ratio = 0},
@@ -285,9 +282,6 @@ local jfm = {
 			[24] = {0.5, 0, 0, ratio = 0},
 			[25] = {0.5, 0, 0, ratio = 0},
 			[26] = {0.5, 0, 0, ratio = 0},
-		]]
-			[27] = {0.5, 0, 0, ratio = 0},
-		--[[
 			[28] = {0.5, 0, 0, ratio = 0},
 			[29] = {0.5, 0, 0, ratio = 0},
 			[30] = {0.5, 0, 0, ratio = 0},
@@ -321,6 +315,7 @@ local jfm = {
 			[15] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[16] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[0] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
+			[27] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
@@ -329,9 +324,6 @@ local jfm = {
 			[24] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[25] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[26] = {0.5, 0, 0, ratio = 0, priority = {0,-2}},
-		]]
-			[27] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-		--[[
 			[28] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[29] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
 			[30] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
@@ -364,6 +356,7 @@ local jfm = {
 --			[15] = {0, 0.25, 0, priority = {0,0}},
 --			[16] = {0, 0.25, 0, priority = {0,0}},
 			[0] = {0, 0.25, 0, priority = {0,0}},
+			[27] = {0, 0.25, 0, priority = {0,0}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0.25, 0, priority = {0,0}},
@@ -372,9 +365,6 @@ local jfm = {
 			[24] = {0, 0, 0},
 			[25] = {0, 0, 0},
 			[26] = {0, 0, 0},
-		]]
-			[27] = {0, 0.25, 0, priority = {0,0}},
-		--[[
 			[28] = {0, 0.25, 0, priority = {0,0}},
 			[29] = {0, 0, 0},
 			[30] = {0, 0.25, 0, priority = {0,0}},
@@ -405,6 +395,8 @@ local jfm = {
 			[14] = {0, 0, 0},
 --			[15] = {0, 0.25, 0, priority = {0,0}},
 --			[16] = {0, 0.25, 0, priority = {0,0}},
+--			[0] = {0, 0.25, 0, priority = {0,0}},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -413,9 +405,6 @@ local jfm = {
 			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[26] = {0, 0, 0},
-		]]
-			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
-		--[[
 			[28] = {0, 0.25, 0, priority = {0,0}},
 			[29] = {0, 0, 0},
 			[30] = {0, 0.25, 0, priority = {0,0}},
@@ -446,6 +435,8 @@ local jfm = {
 			[14] = {0, 0, 0},
 --			[15] = {0, 0.25, 0, priority = {0,0}},
 --			[16] = {0, 0.25, 0, priority = {0,0}},
+--			[0] = {0, 0.25, 0, priority = {0,0}},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -454,9 +445,6 @@ local jfm = {
 			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[26] = {0, 0, 0},
-		]]
-			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
-		--[[
 			[28] = {0, 0.25, 0, priority = {0,0}},
 			[29] = {0, 0, 0},
 			[30] = {0, 0.25, 0, priority = {0,0}},
@@ -487,6 +475,8 @@ local jfm = {
 			[14] = {0, 0, 0},
 --			[15] = {0, 0.25, 0, priority = {0,0}},
 --			[16] = {0, 0.25, 0, priority = {0,0}},
+--			[0] = {0, 0.25, 0, priority = {0,0}},
+--			[27] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}},
@@ -495,9 +485,6 @@ local jfm = {
 			[24] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}},
 			[25] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}},
 			[26] = {0, 0, 0},
-		]]
-			[27] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}},
-		--[[
 			[28] = {0, 0.25, 0, priority = {0,0}},
 			[29] = {0, 0, 0},
 			[30] = {0, 0.25, 0, priority = {0,0}},
@@ -528,7 +515,8 @@ local jfm = {
 			[14] = {0, 0, 0},
 --			[15] = {0, 0.25, 0, priority = {0,0}},
 --			[16] = {0, 0.25, 0, priority = {0,0}},
---			[0] = {0, 0.25, 0, priority = {0,0}},
+			[0] = {0, 0.25, 0, priority = {0,0}},
+			[27] = {0, 0.25, 0, priority = {0,0}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0.25, 0, priority = {0,0}},
@@ -537,9 +525,6 @@ local jfm = {
 			[24] = {0, 0, 0},
 			[25] = {0, 0.25, 0, priority = {0,0}},
 			[26] = {0, 0, 0},
-		]]
-			[27] = {0, 0.25, 0, priority = {0,0}},
-		--[[
 			[28] = {0, 0.25, 0, priority = {0,0}},
 			[29] = {0, 0, 0},
 			[30] = {0, 0.25, 0, priority = {0,0}},
@@ -571,6 +556,7 @@ local jfm = {
 --			[15] = {0, 0.25, 0, priority = {0,0}},
 --			[16] = {0, 0.25, 0, priority = {0,0}},
 			[0] = {0, 0.25, 0, priority = {0,0}},
+			[27] = {0, 0.25, 0, priority = {0,0}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0.25, 0, priority = {0,0}},
@@ -579,9 +565,6 @@ local jfm = {
 			[24] = {0, 0.25, 0, priority = {0,0}},
 			[25] = {0, 0.25, 0, priority = {0,0}},
 			[26] = {0, 0, 0},
-		]]
-			[27] = {0, 0.25, 0, priority = {0,0}},
-		--[[
 			[28] = {0, 0.25, 0, priority = {0,0}},
 			[29] = {0, 0, 0},
 			[30] = {0, 0.25, 0, priority = {0,0}},
@@ -613,6 +596,7 @@ local jfm = {
 			[15] = {0, 0, 0},
 			[16] = {0, 0, 0},
 			[0] = {0, 0, 0},
+			[27] = {0, 0, 0},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0, 0},
@@ -621,9 +605,6 @@ local jfm = {
 			[24] = {0, 0, 0},
 			[25] = {0, 0, 0},
 			[26] = {0, 0, 0},
-		]]
-			[27] = {0, 0, 0},
-		--[[
 			[28] = {0, 0, 0},
 			[29] = {0, 0, 0},
 			[30] = {0, 0, 0},
@@ -654,6 +635,8 @@ local jfm = {
 			[14] = {0, 0, 0},
 --			[15] = {0, 0.25, 0, priority = {0,0}},
 --			[16] = {0, 0.25, 0, priority = {0,0}},
+--			[0] = {0, 0.25, 0, priority = {0,0}},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -663,7 +646,6 @@ local jfm = {
 			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[26] = {0, 0, 0},
 		]]
-			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 		--[[
 			[28] = {0, 0.25, 0, priority = {0,0}},
 			[29] = {0, 0, 0},
@@ -695,6 +677,8 @@ local jfm = {
 			[14] = {0, 0, 0},
 --			[15] = {0, 0.25, 0, priority = {0,0}},
 --			[16] = {0, 0.25, 0, priority = {0,0}},
+--			[0] = {0, 0.25, 0, priority = {0,0}},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -704,7 +688,6 @@ local jfm = {
 			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[26] = {0, 0, 0},
 		]]
-			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 		--[[
 			[28] = {0, 0.25, 0, priority = {0,0}},
 			[29] = {0, 0, 0},
@@ -743,9 +726,14 @@ local jfm = {
 			[6] = {0, 0, 0},
 			[7] = {0, 0, 0},
 			[8] = {0, 0.25, 0, priority = {0,0}},
+--			[9] = {0, 0.25, 0, priority = {0,0}},
+--			[10] = {0, 0.25, 0, priority = {0,0}},
+--			[11] = {0, 0.25, 0, priority = {0,0}},
 			[12] = {0, 0.25, 0, priority = {0,0}},
 			[13] = {0, 0.25, 0, priority = {0,0}},
 			[14] = {0, 0, 0},
+--			[0] = {0, 0.25, 0, priority = {0,0}},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -754,9 +742,6 @@ local jfm = {
 			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[26] = {0, 0, 0},
-		]]
---			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
-		--[[
 			[28] = {0, 0.25, 0, priority = {0,0}},
 			[29] = {0, 0, 0},
 			[30] = {0, 0.25, 0, priority = {0,0}},
@@ -1012,27 +997,31 @@ local jfm = {
 			[30] = {0, 0, 0},
 		}
 	},
-	
+]]
 	[27] = {-- 欧文
-		chars = {'jcharbdd'},
+		chars = {'alchar', 'nox_alchar'},
 		glue = {
 			[1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
 			[2] = {0, 0, 0},
-			[3] = {0, 0, 0},
+			[300] = {0, 0, 0},
+			[301] = {0, 0, 0},
+			[302] = {0, 0, 0},
 			[4] = {0, 0, 0},
 			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
 			[6] = {0, 0, 0},
 			[7] = {0, 0, 0},
 			[8] = {0, 0.25, 0, priority = {0,0}},
-			[9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
-			[10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
-			[11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+--			[9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+--			[10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+--			[11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
 			[12] = {0, 0.25, 0, priority = {0,0}},
 			[13] = {0, 0.25, 0, priority = {0,0}},-- 空け注10
 			[14] = {0, 0, 0},
-			[15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
-			[16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
-			[0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+--			[15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+--			[16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+--			[0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0.25, 0, priority = {0,0}},
 			[22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
@@ -1044,9 +1033,10 @@ local jfm = {
 			[28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
 			[29] = {0, 0, 0},
 			[30] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+--]]
 		}
 	},
-	
+--[[
 	[28] = { -- 割注始め括弧類
 		chars = {'（', '〔', '［'},
 		glue = {