summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-25 22:26:12 +0000
committerKarl Berry <karl@freefriends.org>2015-10-25 22:26:12 +0000
commitb21104f52f6a326c74adaf89be9b55745d4e65ba (patch)
tree34821dc6557935976efbcf643c48e7f1d869c3f3 /Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
parenta3456c69107a97f155fa0b80458580d3aced4175 (diff)
luatexja (25oct15)
git-svn-id: svn://tug.org/texlive/trunk@38705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua148
1 files changed, 69 insertions, 79 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
index 179ad55faf4..6bf3075340b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
@@ -10,21 +10,19 @@
luatexja.jfont.define_jfm {
dir = 'tate',
zw = 1.0, zh = 1.0,
- kanjiskip = {0.0, 0.25, 0},
- xkanjiskip = {0.25, 0.25, .125},
+ kanjiskip = { 0.0, 0.25, 0 },
+ xkanjiskip = { 0.25, 0.25, .125 },
[0] = {
align = 'middle', left = 0.00, down = 0.00,
width = 1.0, height = 0.50, depth = 0.50, italic=0.0,
glue = {
- -- [index] = { width, stretch, shrink, [priority, [ratio]] }
- [1] = { 0.5 , 0.0, 0.5, 0, 1 },
- [2] = {0, 0, 0},
- [3] = { 0.25, 0.0, 0.25, 1, 1 },
- [4] = {0, 0, 0},
- [6] = {0, 0, 0},
- [7] = {0, 0, 0},
- [8] = {0, 0, 0},
- [9] = {0, 0, 0},
+ [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [2] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [6] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [7] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [8] = { 0, 0, 0, kanjiskip_shrink=1 },
}
},
@@ -37,16 +35,15 @@ luatexja.jfont.define_jfm {
width = 0.5, height = 0.50, depth = 0.50, italic=0.0,
glue = {
-- 3 のみ四分,あとは0
- [0] = {0, 0, 0},
- [1] = {0, 0, 0},
- [2] = {0, 0, 0},
- [3] = { 0.25, 0.0, 0.25, 1 },
- [4] = {0, 0, 0},
- [5] = {0, 0, 0},
- [6] = {0, 0, 0},
- [7] = {0, 0, 0},
- [8] = {0, 0, 0},
- [9] = {0, 0, 0},
+ [0] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [1] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [2] = { 0, 0, 0, kanjiskip_stretch=1, kanjiskip_shrink=1 },
+ [3] = { 0.25, 0.0, 0.25, priority=1 },
+ [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [5] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [6] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [7] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [8] = { 0, 0, 0, kanjiskip_shrink=1 },
}
},
@@ -59,16 +56,15 @@ luatexja.jfont.define_jfm {
width = 0.5, height = 0.50, depth = 0.50, italic=0.0,
glue = {
-- 3 は四分, 2, 4, 9 は0, あとは0.5
- [0] = { 0.5 , 0.0, 0.5, 0, -1 },
- [1] = { 0.5 , 0.0, 0.5, 0, -1 },
- [2] = {0, 0, 0},
- [3] = { 0.25, 0.0, 0.25, 1, 1 },
- [4] = {0, 0, 0},
- [5] = { 0.5 , 0.0, 0.5, 0, -1 },
- [6] = { 0.5 , 0.0, 0.5, 0, -1 },
- [7] = { 0.5 , 0.0, 0.5, 0, -1 },
- [8] = { 0.5 , 0.0, 0.5, 0, -1 },
- [9] = {0, 0, 0},
+ [0] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [1] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [2] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [5] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
+ [6] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
+ [7] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
+ [8] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
}
},
@@ -79,16 +75,15 @@ luatexja.jfont.define_jfm {
--end_stretch = 0.25,
glue = {
-- 3 のみ 0.5,あとは0.25
- [0] = { 0.25, 0.0, 0.25, 1, 1 },
- [1] = { 0.25, 0.0, 0.25, 1, 1 },
- [2] = { 0.25, 0.0, 0.25, 1, 1 },
- [3] = { 0.5 , 0.0, 0.25 , 1, 0 },
- [4] = { 0.25, 0.0, 0.25, 1, 1 },
- [5] = { 0.25, 0.0, 0.25, 1, 1 },
- [6] = { 0.25, 0.0, 0.25, 1, 1 },
- [7] = { 0.25, 0.0, 0.25, 1, 1 },
- [8] = { 0.25, 0.0, 0.25, 1, 1 },
- [9] = { 0.25, 0.0, 0.25, 1, 1 },
+ [0] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [1] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [2] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [3] = { 0.5 , 0.0, 0.25, priority=1 },
+ [4] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [5] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [6] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [7] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [8] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
}
},
@@ -98,14 +93,13 @@ luatexja.jfont.define_jfm {
width = 0.5, height = 0.50, depth = 0.50, italic=0.0,
glue = {
-- 3 は.75, 2, 4 は0, あとは0.5
- [0] = { 0.5 , 0.0, 0.5, 0, -1 },
- [1] = { 0.5 , 0.0, 0.5, 0, -1 },
- [3] = { 0.75, 0.0, 0.25, 1, -1/3 },
- [5] = { 0.5 , 0.0, 0.5, 0, -1 },
- [6] = { 0.5 , 0.0, 0.5, 0, -1 },
- [7] = { 0.5 , 0.0, 0.5, 0, -1 },
- [8] = { 0.5 , 0.0, 0.5, 0, -1 },
- [9] = { 0.5 , 0.0, 0.5, 0, -1 },
+ [0] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [1] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [3] = { 0.75, 0.0, 0.25, priority=1, ratio=1./3, kanjiskip_stretch=1 },
+ [5] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [6] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [7] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [8] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
}
},
@@ -114,12 +108,11 @@ luatexja.jfont.define_jfm {
align = 'left', left = 0.0, down = 0.0,
width = 1.0, height = 0.50, depth = 0.50, italic=0.0,
glue = {
- [1] = { 0.5 , 0.0, 0.5, 0, 1 },
- [2] = {0, 0, 0},
- [3] = { 0.25, 0.0, 0.25, 1, 1 },
- [4] = {0, 0, 0},
- [6] = {0, 0, 0},
- [9] = {0, 0, 0},
+ [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [2] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [6] = { 0, 0, 0, kanjiskip_shrink=1 },
},
kern = {
[5] = 0.0
@@ -131,15 +124,14 @@ luatexja.jfont.define_jfm {
align = 'left', left = 0.0, down = 0.0,
width = 1.0, height = 0.50, depth = 0.50, italic=0.0,
glue = {
- [0] = { 1.0 , 0.0, 0.5, 0, 1 },
- [1] = { 0.5 , 0.0, 0.5, 0, 1 },
- [2] = {0, 0, 0},
- [3] = { 0.75, 0.0, 0.25, 1, 1 },
- [4] = {0, 0, 0},
- [6] = {0, 0, 0},
- [7] = { 0.5 , 0.0, 0.5, 0, 1 },
- [8] = {0, 0, 0},
- [9] = {0, 0, 0},
+ [0] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [2] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [3] = { 0.75, 0.0, 0.25, priority=1, ratio=1 },
+ [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [6] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [7] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [8] = { 0, 0, 0, kanjiskip_shrink=1 },
},
kern = {
[5] = 0.0
@@ -171,14 +163,13 @@ luatexja.jfont.define_jfm {
align = 'left', left = 0.0, down = 0.0,
width = 0.5, height = 0.5, depth = 0.5, italic=0.0,
glue = {
- [1] = { 0.5 , 0.0, 0.5, 0, 1 },
- [2] = {0, 0, 0},
- [3] = { 0.25, 0.0, 0.25, 1, 1 },
- [4] = {0, 0, 0},
- [6] = {0, 0, 0},
- [7] = {0, 0, 0},
- [8] = {0, 0, 0},
- [9] = {0, 0, 0},
+ [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [2] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [6] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [7] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [8] = { 0, 0, 0, kanjiskip_shrink=1 },
}
},
@@ -204,12 +195,11 @@ luatexja.jfont.define_jfm {
align = 'left', left = 0.0, down = 0.0,
width = 1.0, height = 0.50, depth = 0.50, italic=0.0,
glue = {
- [1] = { 0.5 , 0.0, 0.5, 0, 1 },
- [2] = {0, 0, 0},
- [3] = { 0.25, 0.0, 0.25, 1, 1 },
- [4] = {0, 0, 0},
- [6] = {0, 0, 0},
- [9] = {0, 0, 0},
+ [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [2] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [4] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [6] = { 0, 0, 0, kanjiskip_shrink=1 },
},
kern = {
[8] = 0.0
@@ -219,7 +209,7 @@ luatexja.jfont.define_jfm {
[99] = { -- box末尾
chars = {'boxbdd', 'parbdd'},
glue = {
- [3] = { 0.25, 0.0, 0.25, 1 },
+ [3] = { 0.25, 0.0, 0.25, priority=1 },
}
},