diff options
author | Karl Berry <karl@freefriends.org> | 2017-12-22 21:23:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-12-22 21:23:18 +0000 |
commit | 1746288313031e72e55dfa7fb223cc2e66ce9606 (patch) | |
tree | 036f97c4145bba0ea2aa2bb55ff901355e2c1324 /Master/texmf-dist/tex/luatex | |
parent | 5f5fe28fbae9426236566246501197569514a4bb (diff) |
jlreq (22dec17)
git-svn-id: svn://tug.org/texlive/trunk@46121 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r-- | Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua | 258 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua | 603 |
2 files changed, 557 insertions, 304 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 = { diff --git a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua index fd5213a9b61..dcced2f4e3d 100644 --- a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua +++ b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua @@ -5,9 +5,9 @@ local jfm={ ["glue"]={ { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -21,24 +21,6 @@ local jfm={ }, [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 }, - }, [14]={ 0, 0, 0 }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, @@ -75,6 +57,7 @@ local jfm={ [14]={ 0, 0, 0 }, [15]={ 0, 0, 0 }, [16]={ 0, 0, 0 }, + [27]={ 0, 0, 0 }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, [302]={ 0, 0, 0 }, @@ -90,16 +73,16 @@ local jfm={ ["glue"]={ [0]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, { 0, 0, 0 }, @@ -121,9 +104,9 @@ local jfm={ [7]={ 0, 0, 0 }, [8]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [9]={ @@ -149,31 +132,43 @@ local jfm={ }, [12]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [13]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, - [14]={ 0, 0, 0 }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, [15]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [16]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [27]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [300]={ @@ -206,33 +201,69 @@ local jfm={ ["chars"]={ "!", "?", "‼", "⁇", "⁈", "⁉" }, ["depth"]=0.5, ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, { 0.5, + 0.25, 0.5, - 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, [4]={ 0, 0, 0 }, [5]={ 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=1, }, [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 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 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, [302]={ 0, 0, 0 }, @@ -248,16 +279,16 @@ local jfm={ ["glue"]={ [0]={ 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=0, }, { 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=0, }, { @@ -297,9 +328,9 @@ local jfm={ }, [8]={ 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=0, }, [9]={ @@ -325,44 +356,44 @@ local jfm={ }, [12]={ 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=0, }, [13]={ 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=0, }, [14]={ 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=0, }, [15]={ 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=0, }, [16]={ 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=0, }, [27]={ 0.25, - 0, 0.25, - ["priority"]={ 0, -1 }, + 0.25, + ["priority"]={ -1, -1 }, ["ratio"]=0, }, [300]={ @@ -398,14 +429,16 @@ local jfm={ ["glue"]={ [0]={ 0.5, + 0.25, 0, - 0, + ["priority"]={ -1, 0 }, ["ratio"]=0, }, { 0.5, + 0.25, 0, - 0, + ["priority"]={ -1, 0 }, ["ratio"]=0, }, { 0, 0, 0 }, @@ -426,8 +459,9 @@ local jfm={ [7]={ 0, 0, 0 }, [8]={ 0.5, + 0.25, 0, - 0, + ["priority"]={ -1, 0 }, ["ratio"]=0, }, [9]={ @@ -450,38 +484,44 @@ local jfm={ }, [12]={ 0.5, + 0.25, 0, - 0, + ["priority"]={ -1, 0 }, ["ratio"]=0, }, [13]={ 0.5, + 0.25, 0, - 0, + ["priority"]={ -1, 0 }, ["ratio"]=0, }, [14]={ 0.5, + 0.25, 0, - 0, + ["priority"]={ -1, 0 }, ["ratio"]=0, }, [15]={ 0.5, + 0.25, 0, - 0, + ["priority"]={ -1, 0 }, ["ratio"]=0, }, [16]={ 0.5, + 0.25, 0, - 0, + ["priority"]={ -1, 0 }, ["ratio"]=0, }, [27]={ 0.5, + 0.25, 0, - 0, + ["priority"]={ -1, 0 }, ["ratio"]=0, }, [300]={ @@ -514,16 +554,16 @@ local jfm={ ["glue"]={ [0]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, { 0, 0, 0 }, @@ -545,9 +585,9 @@ local jfm={ [7]={ 0, 0, 0 }, [8]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [9]={ @@ -573,44 +613,44 @@ local jfm={ }, [12]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [13]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [14]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [15]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [16]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [27]={ 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=0, }, [300]={ @@ -651,9 +691,9 @@ local jfm={ }, { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -689,9 +729,9 @@ local jfm={ ["glue"]={ { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -705,14 +745,17 @@ local jfm={ }, [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [27]={ + [8]={ + 0, 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, 0.25, - 0.125, - ["priority"]={ 1, -3 }, - ["ratio"]=0, + 0, + ["priority"]={ -1, 0 }, }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, @@ -727,9 +770,9 @@ local jfm={ ["glue"]={ { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -743,14 +786,17 @@ local jfm={ }, [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [27]={ + [8]={ + 0, 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, 0.25, - 0.125, - ["priority"]={ 1, -3 }, - ["ratio"]=0, + 0, + ["priority"]={ -1, 0 }, }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, @@ -765,9 +811,9 @@ local jfm={ ["glue"]={ { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -781,14 +827,17 @@ local jfm={ }, [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [27]={ + [8]={ + 0, 0.25, 0, - 0.125, - ["priority"]={ 1, -3 }, - ["ratio"]=0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, @@ -801,6 +850,12 @@ local jfm={ ["chars"]={ "¥", "$", "£", "#", "€", "№" }, ["depth"]=0.5, ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, { 0.5, 0, @@ -845,9 +900,9 @@ local jfm={ }, { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -861,7 +916,12 @@ local jfm={ }, [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, [27]={ 0, 0.25, @@ -879,8 +939,18 @@ local jfm={ ["chars"]={ " " }, ["depth"]=0.5, ["glue"]={ - [0]={ 0, 0, 0 }, - { 0, 0, 0 }, + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + { + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, { 0, 0, 0 }, [4]={ 0, 0, 0 }, [5]={ @@ -892,16 +962,51 @@ local jfm={ }, [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 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 }, - [27]={ 0, 0, 0 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, [302]={ 0, 0, 0 }, @@ -916,9 +1021,9 @@ local jfm={ ["glue"]={ { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -933,13 +1038,6 @@ local jfm={ [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, [14]={ 0, 0, 0 }, - [27]={ - 0.25, - 0.25, - 0.125, - ["priority"]={ 1, -3 }, - ["ratio"]=0, - }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, [302]={ 0, 0, 0 }, @@ -953,9 +1051,9 @@ local jfm={ ["glue"]={ { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -970,13 +1068,53 @@ local jfm={ [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, [14]={ 0, 0, 0 }, - [27]={ + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [27]={ + ["chars"]={ "alchar" }, + ["depth"]=0.5, + ["glue"]={ + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ 0.25, + 0, 0.25, - 0.125, - ["priority"]={ 1, -3 }, - ["ratio"]=0, + ["priority"]={ 0, -1 }, + ["ratio"]=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 }, + }, + [14]={ 0, 0, 0 }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, [302]={ 0, 0, 0 }, @@ -996,12 +1134,17 @@ local jfm={ ["chars"]={ "‐" }, ["depth"]=0.5, ["glue"]={ - [0]={ 0, 0, 0 }, + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -1015,15 +1158,51 @@ local jfm={ }, [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 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 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, [302]={ 0, 0, 0 }, @@ -1036,12 +1215,17 @@ local jfm={ ["chars"]={ "゠", "–" }, ["depth"]=0.5, ["glue"]={ - [0]={ 0, 0, 0 }, + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -1055,15 +1239,51 @@ local jfm={ }, [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 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 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, [302]={ 0, 0, 0 }, @@ -1076,12 +1296,17 @@ local jfm={ ["chars"]={ "〜" }, ["depth"]=0.5, ["glue"]={ - [0]={ 0, 0, 0 }, + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, { 0.5, - 0, + 0.25, 0.5, - ["priority"]={ 0, -2 }, + ["priority"]={ -1, -2 }, ["ratio"]=1, }, { 0, 0, 0 }, @@ -1095,15 +1320,51 @@ local jfm={ }, [6]={ 0, 0, 0 }, [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 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 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, [300]={ 0, 0, 0 }, [301]={ 0, 0, 0 }, [302]={ 0, 0, 0 }, @@ -1113,7 +1374,7 @@ local jfm={ }, ["dir"]="tate", ["kanjiskip"]={ 0, 0.25, 0 }, - ["version"]=2, + ["version"]=3, ["xkanjiskip"]={ 0.25, 0.25, 0.125 }, ["zh"]=1, ["zw"]=1, |