summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-01-28 22:08:35 +0000
committerKarl Berry <karl@freefriends.org>2021-01-28 22:08:35 +0000
commit72d9cea6ec049c84fa9c885c2677b390e93753df (patch)
treee250bf10b5f0dc2e2b29b46f006cb9aca8e7e785 /Master/texmf-dist/tex/luatex
parenta7d0ab866600f867e6a8169c7218a0a815c21f1d (diff)
chinese-jfm (28jan21)
git-svn-id: svn://tug.org/texlive/trunk@57543 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r--Master/texmf-dist/tex/luatex/chinese-jfm/jfm-ja_JP.lua21
-rw-r--r--Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_CN.lua89
-rw-r--r--Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_TW.lua23
3 files changed, 101 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-ja_JP.lua b/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-ja_JP.lua
index 863c89a79b0..e1e75271404 100644
--- a/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-ja_JP.lua
+++ b/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-ja_JP.lua
@@ -1,14 +1,15 @@
-- Chinese JFM for Japanese fonts (ja_JP)
--- v1.0.1
+-- v1.1.0
+-- Copyright (c) 2020 -- 2021 ListLee.
-local is_vt, is_qj, is_bj, is_km, is_prop
+local is_vt, is_qj, is_bj, is_km, is_pr
if luatexja.jfont.jfm_feature then
is_vt = luatexja.jfont.jfm_feature.vert
is_qj = luatexja.jfont.jfm_feature.quanjiao
is_bj = luatexja.jfont.jfm_feature.banjiao
is_km = luatexja.jfont.jfm_feature.kaiming
- is_prop = luatexja.jfont.jfm_feature.prop
+ is_pr = luatexja.jfont.jfm_feature.prop
end
if
@@ -42,7 +43,7 @@ luatexja.jfont.define_jfm {
align = 'middle',
left = 0,
down = 0,
- width = is_prop and 'prop' or 1,
+ width = is_pr and 'prop' or 1,
height = is_vt and 0.5 or 0.88,
depth = is_vt and 0.5 or 0.12,
italic = 0,
@@ -160,7 +161,8 @@ luatexja.jfont.define_jfm {
[3] = aki(0.5, -1),
[4] = aki(0.25),
[41] = aki(0.25),
- [5] = aki(0.25)
+ [5] = aki(0.25),
+ [6] = aki(0.25)
}
},
[3] = {
@@ -182,7 +184,8 @@ luatexja.jfont.define_jfm {
[3] = aki(0.5, -1),
[4] = aki(0.25, -1),
[41] = aki(0.25, -1),
- [5] = aki(0.25, -1)
+ [5] = aki(0.25, -1),
+ [6] = aki(0.25, -1)
}
},
[4] = {
@@ -292,6 +295,10 @@ luatexja.jfont.define_jfm {
},
[6] = {
-- box end
- chars = {'boxbdd', 'parbdd', 'glue'}
+ chars = {'boxbdd', 'parbdd', 'glue'},
+ glue = {
+ [22] = aki(0.25),
+ [3] = aki(0.25, -1)
+ }
}
}
diff --git a/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_CN.lua b/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_CN.lua
index ed161a10a1a..d7213c227a6 100644
--- a/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_CN.lua
+++ b/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_CN.lua
@@ -1,17 +1,19 @@
-- Chinese JFM for Simplified Chinese fonts (zh_CN)
--- v1.0.1
+-- v1.1.0
+-- Copyright (c) 2020 -- 2021 ListLee.
-local is_vt, is_qj, is_bj, is_km, is_hwcl
+local is_vt, is_qj, is_bj, is_km, is_hc, is_fz
if luatexja.jfont.jfm_feature then
is_vt = luatexja.jfont.jfm_feature.vert
is_qj = luatexja.jfont.jfm_feature.quanjiao
is_bj = luatexja.jfont.jfm_feature.banjiao
is_km = luatexja.jfont.jfm_feature.kaiming
- is_hwcl = luatexja.jfont.jfm_feature.hwcl
+ is_hc = luatexja.jfont.jfm_feature.hwcl
+ is_fz = luatexja.jfont.jfm_feature.fzpr
end
-if is_hwcl then
+if is_hc then
if not is_vt then
tex.error('JFM feature "hwcl" can only be used in vertical mode')
end
@@ -54,6 +56,7 @@ luatexja.jfont.define_jfm {
italic = 0,
glue = {
[1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
[3] = aki(0.25, -1)
},
round_threshold = 0.01
@@ -61,8 +64,6 @@ luatexja.jfont.define_jfm {
[1] = {
-- 开括号
chars = {
- '‘',
- '“',
'〈',
'《',
'「',
@@ -77,6 +78,22 @@ luatexja.jfont.define_jfm {
'{',
'⦅'
},
+ align = is_fz and 'middle' or 'right',
+ left = 0,
+ down = 0,
+ width = 0.5,
+ height = is_vt and 0.5 or 0.88,
+ depth = is_vt and 0.5 or 0.12,
+ italic = 0,
+ glue = {
+ [3] = aki(0.25, -1)
+ }
+ },
+ [10] = {
+ chars = {
+ '‘',
+ '“'
+ },
align = 'right',
left = 0,
down = 0,
@@ -91,8 +108,6 @@ luatexja.jfont.define_jfm {
[2] = {
-- 闭括号
chars = {
- '’',
- '”',
'〉',
'》',
'」',
@@ -108,6 +123,28 @@ luatexja.jfont.define_jfm {
'}',
'⦆'
},
+ align = is_fz and 'middle' or 'left',
+ left = 0,
+ down = 0,
+ width = 0.5,
+ height = is_vt and 0.5 or 0.88,
+ depth = is_vt and 0.5 or 0.12,
+ italic = 0,
+ glue = {
+ [0] = aki(0.5, -1),
+ [1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
+ [3] = aki(0.25, -1),
+ [5] = aki(0.5, -1),
+ [51] = aki(0.5, -1),
+ [52] = aki(0.5, -1)
+ }
+ },
+ [20] = {
+ chars = {
+ '’',
+ '”'
+ },
align = 'left',
left = 0,
down = 0,
@@ -118,7 +155,8 @@ luatexja.jfont.define_jfm {
glue = {
[0] = aki(0.5, -1),
[1] = aki(0.5, -1),
- [3] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
+ [3] = aki(0.25, -1),
[5] = aki(0.5, -1),
[51] = aki(0.5, -1),
[52] = aki(0.5, -1)
@@ -137,6 +175,7 @@ luatexja.jfont.define_jfm {
glue = {
[0] = aki(0.5),
[1] = aki(0.5),
+ [10] = aki(0.5),
[3] = aki(0.5),
[5] = aki(0.5),
[51] = aki(0.5),
@@ -149,17 +188,18 @@ luatexja.jfont.define_jfm {
align = 'left',
left = 0,
down = 0,
- width = is_vt and (is_hwcl and 0.5 or 1) or 0.5,
+ width = is_vt and (is_hc and 0.5 or 1) or 0.5,
height = is_vt and 0.5 or 0.88,
depth = is_vt and 0.5 or 0.12,
italic = 0,
glue = {
- [0] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5),
- [1] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5),
- [3] = is_vt and (is_hwcl and aki(0.5) or aki(0.25, 1)) or aki(0.5),
- [5] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5),
- [51] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5),
- [52] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5)
+ [0] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [1] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [10] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [3] = is_vt and (is_hc and aki(0.5) or aki(0.25, 1)) or aki(0.5),
+ [5] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [51] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [52] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5)
}
},
[3] = {
@@ -174,15 +214,18 @@ luatexja.jfont.define_jfm {
italic = 0,
glue = {
[0] = aki(0.25, -1),
- [1] = aki(0.5, -1),
+ [1] = aki(0.25, -1),
+ [10] = aki(0.25, -1),
[2] = aki(0.25, -1),
+ [20] = aki(0.25, -1),
[21] = aki(0.25, -1),
[22] = aki(0.25, -1),
[3] = aki(0.5, -1),
[4] = aki(0.25, -1),
[41] = aki(0.25, -1),
[42] = aki(0.25, -1),
- [5] = aki(0.25, -1)
+ [5] = aki(0.25, -1),
+ [6] = aki(0.25, -1)
}
},
[4] = {
@@ -198,6 +241,7 @@ luatexja.jfont.define_jfm {
glue = {
[0] = aki(0.5, 1, true),
[1] = aki(0.5, 1, true),
+ [10] = aki(0.5, 1, true),
[3] = aki(0.5, 1, true),
[5] = aki(0.5, 1, true),
[51] = aki(0.5, 1, true),
@@ -217,6 +261,7 @@ luatexja.jfont.define_jfm {
glue = {
[0] = is_vt and {} or aki(0.5, 1, true),
[1] = is_vt and {} or aki(0.5, 1, true),
+ [10] = is_vt and {} or aki(0.5, 1, true),
[3] = is_vt and aki(0.25, -1) or aki(0.5, 1, true),
[5] = is_vt and {} or aki(0.5, 1, true),
[51] = is_vt and {} or aki(0.5, 1, true),
@@ -256,6 +301,7 @@ luatexja.jfont.define_jfm {
italic = 0,
glue = {
[1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
[3] = aki(0.25, -1)
},
kern = {
@@ -276,6 +322,7 @@ luatexja.jfont.define_jfm {
italic = 0,
glue = {
[1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
[3] = aki(0.25, -1)
},
kern = {
@@ -296,6 +343,7 @@ luatexja.jfont.define_jfm {
italic = 0,
glue = {
[1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
[3] = aki(0.25, -1)
},
kern = {
@@ -306,6 +354,9 @@ luatexja.jfont.define_jfm {
},
[6] = {
-- box end
- chars = {'boxbdd', 'parbdd', 'glue'}
+ chars = {'boxbdd', 'parbdd', 'glue'},
+ glue = {
+ [3] = aki(0.25, -1)
+ }
}
}
diff --git a/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_TW.lua b/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_TW.lua
index 9000cf0d74a..5a90144b412 100644
--- a/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_TW.lua
+++ b/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_TW.lua
@@ -1,5 +1,6 @@
-- Chinese JFM for Traditional Chinese fonts (zh_TW)
--- v1.0.1
+-- v1.1.0
+-- Copyright (c) 2020 -- 2021 ListLee.
local is_vt, is_qj, is_bj, is_km
@@ -149,7 +150,8 @@ luatexja.jfont.define_jfm {
[41] = aki(0.25),
[5] = aki(0.25),
[51] = aki(0.25),
- [52] = aki(0.25)
+ [52] = aki(0.25),
+ [6] = aki(0.25)
}
},
[22] = {
@@ -176,7 +178,8 @@ luatexja.jfont.define_jfm {
[41] = is_vt and {} or aki(0.25),
[5] = is_vt and {} or aki(0.25),
[51] = is_vt and {} or aki(0.25),
- [52] = is_vt and {} or aki(0.25)
+ [52] = is_vt and {} or aki(0.25),
+ [6] = is_vt and {} or aki(0.25)
}
},
[3] = {
@@ -202,7 +205,8 @@ luatexja.jfont.define_jfm {
[41] = aki(0.25, -1),
[5] = aki(0.25, -1),
[51] = aki(0.25, -1),
- [52] = aki(0.25, -1)
+ [52] = aki(0.25, -1),
+ [6] = aki(0.25, -1)
}
},
[4] = {
@@ -230,7 +234,8 @@ luatexja.jfont.define_jfm {
[41] = aki(0.25, 1, true),
[5] = aki(0.25, 1, true),
[51] = aki(0.25, 1, true),
- [52] = aki(0.25, 1, true)
+ [52] = aki(0.25, 1, true),
+ [6] = aki(0.25, 1, true)
}
},
[41] = {
@@ -328,6 +333,12 @@ luatexja.jfont.define_jfm {
},
[6] = {
-- box end
- chars = {'boxbdd', 'parbdd', 'glue'}
+ chars = {'boxbdd', 'parbdd', 'glue'},
+ glue = {
+ [21] = aki(0.25),
+ [22] = is_vt and {} or aki(0.25),
+ [3] = aki(0.25, -1),
+ [4] = aki(0.25, 1, true)
+ }
}
}