diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua | 146 |
1 files changed, 63 insertions, 83 deletions
diff --git a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua index 39da0c0a9fc..4e96ce261be 100644 --- a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua +++ b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua @@ -198,7 +198,7 @@ local jfm = { [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空けpriority = {0,-1}段階 [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}},-- 空けpriority = {0,-1}段階 --[[ [28] = {0, 0, 0}, [29] = {0, 0, 0}, @@ -355,14 +355,14 @@ local jfm = { [6] = {0, 0, 0}, [7] = {0, 0, 0}, [8] = {0, 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}}, +-- [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}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, [0] = {0, 0.25, 0, priority = {0,0}}, --[[ [20] = {0, 0, 0}, @@ -397,15 +397,14 @@ local jfm = { [6] = {0, 0, 0}, [7] = {0, 0, 0}, [8] = {0, 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}}, +-- [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}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [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}段階 @@ -439,15 +438,14 @@ local jfm = { [6] = {0, 0, 0}, [7] = {0, 0, 0}, [8] = {0, 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}}, +-- [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}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [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}段階 @@ -481,15 +479,14 @@ local jfm = { [6] = {0, 0, 0}, [7] = {0, 0, 0}, [8] = {0, 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}}, +-- [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}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, --[[ [20] = {0, 0, 0}, [21] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}}, @@ -522,16 +519,16 @@ 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}}, - [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}}, +-- [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}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, +-- [0] = {0, 0.25, 0, priority = {0,0}}, --[[ [20] = {0, 0, 0}, [21] = {0, 0.25, 0, priority = {0,0}}, @@ -564,15 +561,15 @@ 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}}, - [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}}, +-- [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}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, [0] = {0, 0.25, 0, priority = {0,0}}, --[[ [20] = {0, 0, 0}, @@ -648,16 +645,15 @@ 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}}, - [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}}, +-- [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}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [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}段階 @@ -690,16 +686,15 @@ 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}}, - [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}}, +-- [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}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [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}段階 @@ -748,15 +743,9 @@ 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}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [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 = {0,-1}段階 @@ -766,7 +755,7 @@ local jfm = { [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階 [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}},-- 空け priority = {0,-1}段階 --[[ [28] = {0, 0.25, 0, priority = {0,0}}, [29] = {0, 0, 0}, @@ -1168,15 +1157,6 @@ local jfm = { }, } -for k,v in pairs(jfm) do - if type(k) == "number" then - for kk,vv in pairs(v.glue) do - vv.kanjiskip_natural = 1 - vv.kanjiskip_stretch = 1 - end - end -end - local function add_space(before,after,glueorkern,space,ratio) if jfm[before][glueorkern] == nil then jfm[before][glueorkern] = {} end if jfm[before][glueorkern][after] == nil then jfm[before][glueorkern][after] = {0} end |