summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua258
1 files changed, 125 insertions, 133 deletions
diff --git a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
index 3ce24664de5..d4ff74d1997 100644
--- a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
+++ b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
@@ -12,8 +12,10 @@ xkanjiskipは{1,-3},kanjiskip={0,0}
\ltjsetparameter{stretch_priority={kanjiskip=0,xkanjiskip=0}}
]]
+local stretch_width = 0.25 -- 空き第四段階の空き量
+
local hyphen_glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {0, 0, 0},
@@ -22,16 +24,17 @@ local hyphen_glue = {
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0, 0},
+ [8] = {0, stretch_width, 0, priority = {-1,0}},
[9] = {0, 0, 0},
[10] = {0, 0, 0},
[11] = {0, 0, 0},
- [12] = {0, 0, 0},
- [13] = {0, 0, 0},
- [14] = {0, 0, 0},
- [15] = {0, 0, 0},
- [16] = {0, 0, 0},
- [0] = {0, 0, 0},
+ [12] = {0, stretch_width, 0, priority = {-1,0}},
+ [13] = {0, stretch_width, 0, priority = {-1,0}},
+ [14] = {0, stretch_width, 0, priority = {-1,0}},
+ [15] = {0, stretch_width, 0, priority = {-1,0}},
+ [16] = {0, stretch_width, 0, priority = {-1,0}},
+ [0] = {0, stretch_width, 0, priority = {-1,0}},
+ [27] = {0, stretch_width, 0, priority = {-1,0}},
--[[
[20] = {0, 0, 0},
[21] = {0, 0, 0},
@@ -40,20 +43,17 @@ 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},
]]
}
-
-
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,7 +84,8 @@ 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},
@@ -92,7 +93,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},
@@ -107,7 +107,7 @@ local jfm = {
width = 0.5,height = 0.88,depth = 0.12,
align = 'left',
glue = {
- [1] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
[301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
@@ -116,16 +116,17 @@ local jfm = {
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
+ [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
[9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
[10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
[11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
- [12] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
- [13] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
- [14] = {0, 0, 0},
- [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}},
+ [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [14] = {0, stretch_width, 0, priority = {-1,0}},
+ [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-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}},
@@ -170,25 +170,26 @@ local jfm = {
width = 1,height = 0.88,depth = 0.12,
align = 'middle',
glue = {
- [1] = {0.5, 0.5, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {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}},
+ [5] = {0.25, stretch_width, 0.25, ratio = 1, priority = {-1,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0, 0},
+ [8] = {0, stretch_width, 0, priority = {-1,0}},
[9] = {0, 0, 0},
[10] = {0, 0, 0},
[11] = {0, 0, 0},
- [12] = {0, 0, 0},
- [13] = {0, 0, 0},
- [14] = {0, 0, 0},
- [15] = {0, 0, 0},
- [16] = {0, 0, 0},
--- [0] = {0, 0, 0},
+ [12] = {0, stretch_width, 0, priority = {-1,0}},
+ [13] = {0, stretch_width, 0, priority = {-1,0}},
+ [14] = {0, stretch_width, 0, priority = {-1,0}},
+ [15] = {0, stretch_width, 0, priority = {-1,0}},
+ [16] = {0, stretch_width, 0, priority = {-1,0}},
+ [0] = {0, stretch_width, 0, priority = {-1,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},
@@ -214,7 +212,7 @@ local jfm = {
width = 0.5,height = 0.88,depth = 0.12,
align = 'middle',
glue = {
- [1] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
+ [1] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
[2] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
[300] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
[301] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
@@ -223,16 +221,17 @@ local jfm = {
[5] = {0.5, 0, 0.5, ratio = 0.5, priority = {0,-1}},
[6] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
[7] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
- [8] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
+ [8] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
[9] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
[10] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
[11] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
- [12] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
- [13] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
- [14] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
- [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}},
+ [12] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
+ [13] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
+ [14] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
+ [15] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
+ [16] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
+ [0] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
+ [27] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-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}},
@@ -258,7 +254,7 @@ local jfm = {
width = 0.5,height = 0.88,depth = 0.12,
align = 'left',
glue = {
- [1] = {0.5, 0, 0, ratio = 0},
+ [1] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
[2] = {0, 0, 0},
[300] = {0.5, 0, 0, ratio = 0},
[301] = {0.5, 0, 0, ratio = 0},
@@ -267,16 +263,17 @@ local jfm = {
[5] = {0.75, 0, 0.25, ratio = 0.33333333, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0.5, 0, 0, ratio = 0},
+ [8] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
[9] = {0.5, 0, 0, ratio = 0},
[10] = {0.5, 0, 0, ratio = 0},
[11] = {0.5, 0, 0, ratio = 0},
- [12] = {0.5, 0, 0, ratio = 0},
- [13] = {0.5, 0, 0, ratio = 0},
- [14] = {0.5, 0, 0, ratio = 0},
- [15] = {0.5, 0, 0, ratio = 0},
- [16] = {0.5, 0, 0, ratio = 0},
- [0] = {0.5, 0, 0, ratio = 0},
+ [12] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
+ [13] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
+ [14] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
+ [15] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
+ [16] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
+ [0] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
+ [27] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,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},
@@ -302,7 +296,7 @@ local jfm = {
width = 0.5,height = 0.88,depth = 0.12,
align = 'left',
glue = {
- [1] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
[301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
@@ -311,16 +305,17 @@ local jfm = {
[5] = {0.75, 0, 0.75, ratio = 0.33333333, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
+ [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
[9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
[10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
[11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
- [12] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
- [13] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
- [14] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
- [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}},
+ [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [14] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+ [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-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}},
@@ -345,7 +337,7 @@ local jfm = {
width = 1,height = 0.88,depth = 0.12,
align = 'middle',
glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {0, 0, 0},
@@ -354,7 +346,7 @@ local jfm = {
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0, 0},
+ [8] = {0, 0, 0}, -- 空き注4
-- [9] = {0, 0.25, 0, priority = {0,0}},
-- [10] = {0, 0.25, 0, priority = {0,0}},
-- [11] = {0, 0.25, 0, priority = {0,0}},
@@ -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}},
@@ -387,7 +377,7 @@ local jfm = {
height = 0.88,depth = 0.12,
align = 'middle',
glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {0, 0, 0},
@@ -396,15 +386,17 @@ local jfm = {
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0, 0},
+ [8] = {0, stretch_width, 0, priority = {-1,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},
+ [14] = {0, stretch_width, 0, priority = {-1,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}},
@@ -428,7 +417,7 @@ local jfm = {
height = 0.88,depth = 0.12,
align = 'middle',
glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {0, 0, 0},
@@ -437,15 +426,17 @@ local jfm = {
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0, 0},
+ [8] = {0, stretch_width, 0, priority = {-1,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},
+ [14] = {0, stretch_width, 0, priority = {-1,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}},
@@ -469,7 +457,7 @@ local jfm = {
height = 0.88,depth = 0.12,
align = 'middle',
glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {0, 0, 0},
@@ -478,15 +466,17 @@ local jfm = {
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0, 0},
+ [8] = {0, stretch_width, 0, priority = {-1,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},
+ [14] = {0, stretch_width, 0, priority = {-1,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, 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}},
@@ -552,7 +537,7 @@ local jfm = {
height = 0.88,depth = 0.12,
align = 'middle',
glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {0, 0, 0},
@@ -567,10 +552,11 @@ local jfm = {
-- [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},
+ [14] = {0, stretch_width, 0, priority = {-1,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, 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}},
@@ -594,7 +577,7 @@ local jfm = {
align = 'middle',
width= 1,height = 0.88,depth = 0.12,
glue = {
- [1] = {0, 0, 0},
+ [1] = {0, stretch_width, 0, priority = {-1,0}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {0, 0, 0},
@@ -603,16 +586,17 @@ local jfm = {
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0, 0},
+ [8] = {0, stretch_width, 0, priority = {-1,0}},
[9] = {0, 0, 0},
[10] = {0, 0, 0},
[11] = {0, 0, 0},
- [12] = {0, 0, 0},
- [13] = {0, 0, 0},
- [14] = {0, 0, 0},
- [15] = {0, 0, 0},
- [16] = {0, 0, 0},
- [0] = {0, 0, 0},
+ [12] = {0, stretch_width, 0, priority = {-1,0}},
+ [13] = {0, stretch_width, 0, priority = {-1,0}},
+ [14] = {0, stretch_width, 0, priority = {-1,0}},
+ [15] = {0, stretch_width, 0, priority = {-1,0}},
+ [16] = {0, stretch_width, 0, priority = {-1,0}},
+ [0] = {0, stretch_width, 0, priority = {-1,0}},
+ [27] = {0, stretch_width, 0, priority = {-1,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},
@@ -636,7 +617,7 @@ local jfm = {
height = 0.88,depth = 0.12,
align = 'middle',
glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {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},
@@ -677,7 +659,7 @@ local jfm = {
height = 0.88,depth = 0.12,
align = 'middle',
glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {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},
@@ -733,7 +716,7 @@ local jfm = {
align = 'middle',
width = 1,height = 0.88,depth = 0.12,
glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
[2] = {0, 0, 0},
[300] = {0, 0, 0},
[301] = {0, 0, 0},
@@ -742,10 +725,17 @@ local jfm = {
[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}},
- [12] = {0, 0.25, 0, priority = {0,0}},
- [13] = {0, 0.25, 0, priority = {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},
+-- [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}},
@@ -754,9 +744,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 +999,31 @@ local jfm = {
[30] = {0, 0, 0},
}
},
-
+]]
[27] = {-- 欧文
- chars = {'jcharbdd'},
+ chars = {'alchar'},
glue = {
- [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-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, 0, 0, ratio = 0, priority = {1,0}},
+--[[
[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 +1035,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 = {