summaryrefslogtreecommitdiff
path: root/macros/jptex/latex/jlreq/jfm-jlreq.lua
diff options
context:
space:
mode:
Diffstat (limited to 'macros/jptex/latex/jlreq/jfm-jlreq.lua')
-rw-r--r--macros/jptex/latex/jlreq/jfm-jlreq.lua127
1 files changed, 38 insertions, 89 deletions
diff --git a/macros/jptex/latex/jlreq/jfm-jlreq.lua b/macros/jptex/latex/jlreq/jfm-jlreq.lua
index e2a2e0a68d..958f5f952e 100644
--- a/macros/jptex/latex/jlreq/jfm-jlreq.lua
+++ b/macros/jptex/latex/jlreq/jfm-jlreq.lua
@@ -14,41 +14,6 @@ xkanjiskipは{1,-3},kanjiskip={0,0}
local stretch_width = 0.25 -- 空き第四段階の空き量
-local hyphen_glue = {
- [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
- [2] = {0, 0, 0, kanjiskip_natural = 1},
- [300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
- [4] = {0, 0, 0, kanjiskip_natural = 1},
- [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
- [6] = {0, 0, 0, kanjiskip_natural = 1},
- [7] = {0, 0, 0, kanjiskip_natural = 1},
- [8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
- [9] = {0, 0, 0, kanjiskip_natural = 1},
- [10] = {0, 0, 0, kanjiskip_natural = 1},
- [11] = {0, 0, 0, kanjiskip_natural = 1},
- [12] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
- [13] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
- [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
- [15] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
- [16] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
- [0] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
- [27] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
---[[
- [20] = {0, 0, 0},
- [21] = {0, 0, 0},
- [22] = {0, 0, 0},
- [23] = {0, 0, 0},
- [24] = {0, 0, 0},
- [25] = {0, 0, 0},
- [26] = {0, 0, 0},
- [28] = {0, 0, 0},
- [29] = {0, 0, 0},
- [30] = {0, 0, 0},
-]]
-}
-
local jfm = {
dir = 'yoko',
zw = 1.0,
@@ -68,8 +33,6 @@ local jfm = {
[1] = {0, 0, 0, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -110,8 +73,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
- [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
- [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
[4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -148,21 +109,52 @@ local jfm = {
chars = {'‐'},
width = 0.25,height = 0.88,depth = 0.12,
align = 'middle',
- glue = hyphen_glue,-- 上の方で定義
+ glue = {
+ [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+ [2] = {0, 0, 0, kanjiskip_natural = 1},
+ [300] = {0, 0, 0, kanjiskip_natural = 1},
+ [4] = {0, 0, 0, kanjiskip_natural = 1},
+ [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+ [6] = {0, 0, 0, kanjiskip_natural = 1},
+ [7] = {0, 0, 0, kanjiskip_natural = 1},
+ [8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+ [9] = {0, 0, 0, kanjiskip_natural = 1},
+ [10] = {0, 0, 0, kanjiskip_natural = 1},
+ [11] = {0, 0, 0, kanjiskip_natural = 1},
+ [12] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+ [13] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+ [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+ [15] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+ [16] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+ [0] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+ [27] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+--[[
+ [20] = {0, 0, 0},
+ [21] = {0, 0, 0},
+ [22] = {0, 0, 0},
+ [23] = {0, 0, 0},
+ [24] = {0, 0, 0},
+ [25] = {0, 0, 0},
+ [26] = {0, 0, 0},
+ [28] = {0, 0, 0},
+ [29] = {0, 0, 0},
+ [30] = {0, 0, 0},
+]]
+ }
},
[301] = {
chars = {'゠', '–'},
width = 0.5,height = 0.88,depth = 0.12,
align = 'middle',
- glue = hyphen_glue,
+ glue = {} -- 後で処理
},
[302] = {
chars = {'〜'},
width = 1,height = 0.88,depth = 0.12,
align = 'middle',
- glue = hyphen_glue,
+ glue = {} -- 後で処理
},
[4] = { -- 区切り約物
@@ -173,8 +165,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, stretch_width, 0.25, ratio = 1, priority = {-1,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -215,8 +205,6 @@ local jfm = {
[1] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
[2] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
[300] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
- [301] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
- [302] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
[4] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
[5] = {0.5, 0, 0.5, ratio = 0.5, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
@@ -257,8 +245,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
- [301] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
- [302] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
[4] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
[5] = {0.75, 0, 0.25, ratio = 0.33333333, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -299,8 +285,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
- [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
- [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
[4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
[5] = {0.75, 0, 0.75, ratio = 0.33333333, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -340,8 +324,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -380,8 +362,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -420,8 +400,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -460,8 +438,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -500,8 +476,6 @@ local jfm = {
[1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -540,8 +514,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -580,8 +552,6 @@ local jfm = {
[1] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -620,8 +590,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -662,8 +630,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -697,10 +663,10 @@ local jfm = {
},
[161] = { -- 半角カナ
- chars = {'ヲ', 'ァ', 'ィ', 'ゥ', 'ェ', 'ォ', 'ャ', 'ュ', 'ョ', 'ッ', 'ー', 'ア', 'イ', 'ウ', 'エ', 'オ', 'カ', 'キ', 'ク', 'ケ', 'コ', 'サ', 'シ', 'ス', 'セ', 'ソ', 'タ', 'チ', 'ツ', 'テ', 'ト', 'ナ', 'ニ', 'ヌ', 'ネ', 'ノ', 'ハ', 'ヒ', 'フ', 'ヘ', 'ホ', 'マ', 'ミ', 'ム', 'メ', 'モ', 'ヤ', 'ユ', 'ヨ', 'ラ', 'リ', 'ル', 'レ', 'ロ', 'ワ', 'ン'},
+ chars = {'ヲ', 'ァ', 'ィ', 'ゥ', 'ェ', 'ォ', 'ャ', 'ュ', 'ョ', 'ッ', 'ー', 'ア', 'イ', 'ウ', 'エ', 'オ', 'カ', 'キ', 'ク', 'ケ', 'コ', 'サ', 'シ', 'ス', 'セ', 'ソ', 'タ', 'チ', 'ツ', 'テ', 'ト', 'ナ', 'ニ', 'ヌ', 'ネ', 'ノ', 'ハ', 'ヒ', 'フ', 'ヘ', 'ホ', 'マ', 'ミ', 'ム', 'メ', 'モ', 'ヤ', 'ユ', 'ヨ', 'ラ', 'リ', 'ル', 'レ', 'ロ', 'ワ', 'ン','。', '「', '」', '、', '・', '゙', '゚'},
width = 0.5, height = 0.88, depth = 0.12,
align = 'left',
- glue = {} -- あとで
+ glue = {} -- あとで処理
},
@@ -727,8 +693,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -790,8 +754,6 @@ local jfm = {
[1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-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}},
[6] = {0, 0, 0},
@@ -825,8 +787,6 @@ local jfm = {
[1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-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}},
[6] = {0, 0, 0},
@@ -860,8 +820,6 @@ local jfm = {
[1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-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}},
[6] = {0, 0, 0},
@@ -895,8 +853,6 @@ local jfm = {
[1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-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}},
[6] = {0, 0, 0},
@@ -931,8 +887,6 @@ local jfm = {
[1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-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}},
[6] = {0, 0, 0},
@@ -967,8 +921,6 @@ local jfm = {
[1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-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}},-- 注12
[6] = {0, 0, 0},
@@ -1003,8 +955,6 @@ local jfm = {
[1] = {0.5, 0, 0.5, ratio = 1},
[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},
[6] = {0, 0, 0},
@@ -1038,8 +988,6 @@ local jfm = {
[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
[2] = {0, 0, 0, kanjiskip_natural = 1},
[300] = {0, 0, 0, kanjiskip_natural = 1},
- [301] = {0, 0, 0, kanjiskip_natural = 1},
- [302] = {0, 0, 0, kanjiskip_natural = 1},
[4] = {0, 0, 0, kanjiskip_natural = 1},
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
[6] = {0, 0, 0, kanjiskip_natural = 1},
@@ -1238,6 +1186,7 @@ copy_jfm(0,191)
copy_jfm(0,192)
copy_jfm(0,193)
copy_jfm(16,161)
-
+copy_jfm(300,301)
+copy_jfm(300,302)
luatexja.jfont.define_jfm(jfm)