jlreq (29aug17)

git-svn-id: svn://tug.org/texlive/trunk@45162 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 80 insertions, 80 deletions

diff --git a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
index 94631f29ac6..38e22d00526 100644
--- a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
+++ b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
@@ -191,14 +191,14 @@ local jfm = {
 --			[0] = {0, 0, 0},

 		--[[

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空けpriority = {0,-1}段階

+			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[22] = {0, 0, 0},

 			[23] = {0, 0, 0},

-			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空けpriority = {0,-1}段階

-			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空けpriority = {0,-1}段階

+			[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}},-- 空けpriority = {0,-1}段階

+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 		--[[

 			[28] = {0, 0, 0},

 			[29] = {0, 0, 0},

@@ -407,14 +407,14 @@ local jfm = {
 --			[16] = {0, 0.25, 0, priority = {0,0}},

 		--[[

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[22] = {0, 0.25, 0, priority = {0,0}},

 			[23] = {0, 0.25, 0, priority = {0,0}},

-			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

-			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[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}},-- 空け priority = {0,-1}段階

+			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 		--[[

 			[28] = {0, 0.25, 0, priority = {0,0}},

 			[29] = {0, 0, 0},

@@ -448,14 +448,14 @@ local jfm = {
 --			[16] = {0, 0.25, 0, priority = {0,0}},

 		--[[

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[22] = {0, 0.25, 0, priority = {0,0}},

 			[23] = {0, 0.25, 0, priority = {0,0}},

-			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

-			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[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}},-- 空け priority = {0,-1}段階

+			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 		--[[

 			[28] = {0, 0.25, 0, priority = {0,0}},

 			[29] = {0, 0, 0},

@@ -656,14 +656,14 @@ local jfm = {
 --			[16] = {0, 0.25, 0, priority = {0,0}},

 		--[[

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[22] = {0, 0.25, 0, priority = {0,0}},

 			[23] = {0, 0.25, 0, priority = {0,0}},

-			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

-			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[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}},-- 空け priority = {0,-1}段階

+			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 		--[[

 			[28] = {0, 0.25, 0, priority = {0,0}},

 			[29] = {0, 0, 0},

@@ -697,14 +697,14 @@ local jfm = {
 --			[16] = {0, 0.25, 0, priority = {0,0}},

 		--[[

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[22] = {0, 0.25, 0, priority = {0,0}},

 			[23] = {0, 0.25, 0, priority = {0,0}},

-			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

-			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[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}},-- 空け priority = {0,-1}段階

+			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 		--[[

 			[28] = {0, 0.25, 0, priority = {0,0}},

 			[29] = {0, 0, 0},

@@ -748,14 +748,14 @@ local jfm = {
 			[14] = {0, 0, 0},

 		--[[

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[22] = {0, 0.25, 0, priority = {0,0}},

 			[23] = {0, 0.25, 0, priority = {0,0}},

-			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

-			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階

+			[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}},-- 空け priority = {0,-1}段階

+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 		--[[

 			[28] = {0, 0.25, 0, priority = {0,0}},

 			[29] = {0, 0, 0},

@@ -813,26 +813,26 @@ local jfm = {
 			[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}}, -- 空け priority = 二段階

-			[10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階

-			[11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階

+			[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}},

 			[14] = {0, 0, 0},

-			[15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階

-			[16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階

-			[0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階

+			[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}},

 			[20] = {0, 0, 0},

 			[21] = {0, 0, 0},-- 注9，空け注5

-			[22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階

-			[23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階

+			[22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

+			[23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[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.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 三段階，表6と表3が整合的でない

+			[28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},表6と表3が整合的でない

 			[29] = {0, 0, 0},

-			[30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 		},

 	},

 	

@@ -858,13 +858,13 @@ local jfm = {
 			[16] = {0, 0.25, 0, priority = {0,0}},

 			[0] = {0, 0.25, 0, priority = {0,0}},

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階

+			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[22] = {0, 0.25, 0, priority = {0,0}}, -- 空け注10

 			[23] = {0, 0.25, 0, priority = {0,0}},

-			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階

-			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階

+			[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}},-- 空け priority = 二段階

+			[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}},

@@ -893,13 +893,13 @@ local jfm = {
 			[16] = {0, 0.25, 0, priority = {0,0}},

 			[0] = {0, 0.25, 0, priority = {0,0}},

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階

+			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[22] = {0, 0.25, 0, priority = {0,0}},

 			[23] = {0, 0.25, 0, priority = {0,0}},-- 空け注7

-			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階

-			[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階

+			[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}},-- 空け priority = 二段階

+			[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}},

@@ -919,26 +919,26 @@ local jfm = {
 			[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}},-- 空け priority = 二段階

-			[10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[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, 0},-- 空け注8

 			[14] = {0, 0, 0},

-			[15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[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}},

 			[20] = {0, 0, 0},

 			[21] = {0, 0.25, 0, priority = {0,0}},

-			[22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

+			[23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[24] = {0, 0, 0},

 			[25] = {0.25, 0, 0, ratio = 0},

 			[26] = {0, 0, 0},

 			[27] = {0, 0, 0},-- 空け注9

-			[28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階

+			[28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[29] = {0, 0, 0},

-			[30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 		}

 	},

 	

@@ -955,26 +955,26 @@ local jfm = {
 			[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}},-- 空け priority = 二段階

-			[10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[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}},

 			[14] = {0, 0, 0},

-			[15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[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}},

 			[20] = {0, 0, 0},

 			[21] = {0, 0.25, 0, priority = {0,0}},

-			[22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

+			[23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[25] = {0, 0, 0},

 			[26] = {0, 0, 0},

 			[27] = {0, 0, 0},

-			[28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階

+			[28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 			[29] = {0, 0, 0},

-			[30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 		}

 	},

 	

@@ -1024,26 +1024,26 @@ local jfm = {
 			[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}},-- 空け priority = 二段階

-			[10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[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}},-- 空け priority = 二段階

-			[16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[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}},

 			[20] = {0, 0, 0},

 			[21] = {0, 0.25, 0, priority = {0,0}},

-			[22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

-			[23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

+			[23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[24] = {0, 0, 0},

 			[25] = {0.25, 0, 0.125, ratio = 0, priority = {0,-1}},

 			[26] = {0, 0, 0},

 			[27] = {0, 0, 0},

-			[28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階

+			[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}},-- 空け priority = 二段階

+			[30] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},

 		}

 	},

 	

@@ -1102,13 +1102,13 @@ local jfm = {
 			[16] = {0, 0.25, 0, priority = {0,0}},

 			[0] = {0, 0.25, 0, priority = {0,0}},

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[22] = {0, 0.25, 0, priority = {0,0}},

 			[23] = {0, 0.25, 0, priority = {0,0}},

-			[24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3},-- 空け priority = 二段階

-			[25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3},

+			[25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[26] = {0, 0, 0},

-			[27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[28] = {0, 0.25, 0, priority = {0,0}},

 			[29] = {0, 0, 0},

 			[30] = {0, 0.25, 0, priority = {0,0}},

@@ -1135,13 +1135,13 @@ local jfm = {
 			[16] = {0, 0.25, 0, priority = {0,0}},

 			[0] = {0, 0.25, 0, priority = {0,0}},

 			[20] = {0, 0, 0},

-			[21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[22] = {0, 0.25, 0, priority = {0,0}},

 			[23] = {0, 0.25, 0, priority = {0,0}},

-			[24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3},-- 空け priority = 二段階

-			[25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3},

+			[25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[26] = {0, 0, 0},

-			[27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階

+			[27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},

 			[28] = {0, 0.25, 0, priority = {0,0}},

 			[29] = {0, 0, 0},

 			[30] = {0, 0.25, 0, priority = {0,0}},