texlive[42156] Master/texmf-dist: luatexja (26sep16)
commits+karl at tug.org
commits+karl at tug.org
Mon Sep 26 22:53:35 CEST 2016
Revision: 42156
http://tug.org/svn/texlive?view=revision&revision=42156
Author: karl
Date: 2016-09-26 22:53:35 +0200 (Mon, 26 Sep 2016)
Log Message:
-----------
luatexja (26sep16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2016-09-26 20:53:35 UTC (rev 42156)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20160905.0
+The LuaTeX-ja Package 20160926.0
--------------------------------
Copyright (c) 2011--2016 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -34,9 +34,9 @@
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20160905.0 in the Git repository by
+ or tagged as 20160926.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20160905.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20160926.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -81,4 +81,4 @@
* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
-Last commit date: Mon Sep 5 07:29:17 2016 +0900
+Last commit date: Mon Sep 26 19:03:31 2016 +0900
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2016-09-26 20:53:35 UTC (rev 42156)
@@ -4312,9 +4312,9 @@
\toprule
Direction of JFM&\textbf{\texttt{'yoko'} (horizontal)}&\multicolumn{1}{l}{\textbf{\texttt{'tate'} (vertical)}}\\
\midrule
-\texttt{width} field&the width of the ``real'' glyph&1.0~(full-width)\\
-\texttt{height} field&the height of the ``real'' glyph&0.5~(half-width)\\
-\texttt{depth} field&the depth of the ``real'' glyph&0.5~(half-width)\\
+\texttt{width} field&\multicolumn{2}{c}{the width of the ``real'' glyph}\\
+\texttt{height} field&the height of the ``real'' glyph&0.0\\
+\texttt{depth} field&the depth of the ``real'' glyph&0.0\\
\midrule
\texttt{italic} field&\multicolumn{2}{c}{0.0}\\
\bottomrule
@@ -4333,9 +4333,9 @@
\toprule
JFM書字方向&\emph{\texttt{'yoko'}（横組）}&\multicolumn{1}{l}{\emph{\texttt{'tate'}（縦組）}}\\
\midrule
-\texttt{width}&「実際のグリフ」の幅&1.0（全角）\\
-\texttt{height}&「実際のグリフ」の高さ&0.5（二分）\\
-\texttt{depth}&「実際のグリフ」の深さ&0.5（二分）\\
+\texttt{width}&\multicolumn{2}{c}{「実際のグリフ」の幅}\\
+\texttt{height}&「実際のグリフ」の高さ&0.0\\
+\texttt{depth}&「実際のグリフ」の深さ&0.0\\
\midrule
\texttt{italic}&\multicolumn{2}{c}{0.0}\\
\bottomrule
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty 2016-09-26 20:53:35 UTC (rev 42156)
@@ -268,7 +268,7 @@
\fi
\ifnum#2>\z@ \shift at CID{#2}{10185}%
\fi}
-\gdef\ajnenrei#1#2{\hskip\kanjiskip\hbox{\tate\ifnum#2<10
+\gdef\ajnenrei#1#2{\hskip\ltjgetparameter{kanjiskip}\hbox{\tate\ifnum#2<10
\shift at CID{#2}{10207}\CID{\ifcase#1\or10230\or10232\or10231\or10229\fi}%
\else\ifnum#2=10\CID{\ifodd#1 10208\else10217\fi}%
\CID{\ifcase#1\or10218\or10232\or10218\or10229\fi}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua 2016-09-26 20:53:35 UTC (rev 42156)
@@ -7,7 +7,7 @@
-- xkanjiskip: .25zw plus .25zw (or .0833zw) minus .125zw
-luatexja.jfont.define_jfm {
+local t = {
dir = 'yoko',
zw = 1.0, zh = 1.0,
kanjiskip = { 0.0, 0.25, 0 },
@@ -21,7 +21,9 @@
[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 },
+ [007] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [207] = { 0, 0, 0, kanjiskip_shrink=1 },
[8] = { 0, 0, 0, kanjiskip_shrink=1 },
}
},
@@ -42,7 +44,9 @@
[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 },
+ [007] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [207] = { 0, 0, 0, kanjiskip_shrink=1 },
[8] = { 0, 0, 0, kanjiskip_shrink=1 },
}
},
@@ -63,7 +67,9 @@
[4] = { 0, 0, 0, kanjiskip_shrink=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 },
+ [007] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [107] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [207] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
[8] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
}
},
@@ -82,7 +88,9 @@
[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 },
+ [007] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [107] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [207] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
[8] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
}
},
@@ -98,7 +106,9 @@
[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 },
+ [007] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [107] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [207] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
[8] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
}
},
@@ -130,7 +140,9 @@
[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 },
+ [007] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [107] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [207] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
[8] = { 0, 0, 0, kanjiskip_shrink=1 },
},
kern = {
@@ -138,7 +150,7 @@
}
},
- [7] = { -- 半角カナ
+ [007] = { -- 半角カナ，その他半角CID
chars = {
'｡', '｢', '｣', '､', '･', 'ｦ', 'ｧ', 'ｨ', 'ｩ',
'ｪ', 'ｫ', 'ｬ', 'ｭ', 'ｮ', 'ｯ', 'ｰ', 'ｱ', 'ｲ',
@@ -147,18 +159,6 @@
'ﾅ', 'ﾆ', 'ﾇ', 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ',
'ﾎ', 'ﾏ', 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ',
'ﾗ', 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ', 'ﾞ', 'ﾟ',
- "AJ1-516", "AJ1-517", "AJ1-518", "AJ1-519", "AJ1-520", "AJ1-521", "AJ1-522",
- "AJ1-523", "AJ1-524", "AJ1-525", "AJ1-526", "AJ1-527", "AJ1-528", "AJ1-529",
- "AJ1-530", "AJ1-531", "AJ1-532", "AJ1-533", "AJ1-534", "AJ1-535", "AJ1-536",
- "AJ1-537", "AJ1-538", "AJ1-539", "AJ1-540", "AJ1-541", "AJ1-542", "AJ1-543",
- "AJ1-544", "AJ1-545", "AJ1-546", "AJ1-547", "AJ1-548", "AJ1-549", "AJ1-550",
- "AJ1-551", "AJ1-552", "AJ1-553", "AJ1-554", "AJ1-555", "AJ1-556", "AJ1-557",
- "AJ1-558", "AJ1-559", "AJ1-560", "AJ1-561", "AJ1-562", "AJ1-563", "AJ1-564",
- "AJ1-565", "AJ1-566", "AJ1-567", "AJ1-568", "AJ1-569", "AJ1-570", "AJ1-571",
- "AJ1-572", "AJ1-573", "AJ1-574", "AJ1-575", "AJ1-576", "AJ1-577", "AJ1-578",
- "AJ1-579", "AJ1-580", "AJ1-581", "AJ1-582", "AJ1-583", "AJ1-584", "AJ1-585",
- "AJ1-586", "AJ1-587", "AJ1-588", "AJ1-589", "AJ1-590", "AJ1-591", "AJ1-592",
- "AJ1-593", "AJ1-594", "AJ1-595", "AJ1-596", "AJ1-597", "AJ1-598",
},
align = 'left', left = 0.0, down = 0.0,
width = 0.5, height = 0.88, depth = 0.12, italic=0.0,
@@ -168,11 +168,40 @@
[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 },
}
},
+ [107] = { -- 1/3 角
+ chars = {},
+ align = 'left', left = 0.0, down = 0.0,
+ width = 1/3, height = 0.88, depth = 0.12, italic=0.0,
+ glue = {
+ [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 },
+ [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [8] = { 0, 0, 0, kanjiskip_shrink=1 },
+ }
+ },
+
+ [207] = { -- 1/4 角
+ chars = {},
+ align = 'left', left = 0.0, down = 0.0,
+ width = 0.25, height = 0.88, depth = 0.12, italic=0.0,
+ glue = {
+ [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 },
+ [207] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [8] = { 0, 0, 0, kanjiskip_shrink=1 },
+ }
+ },
+
[8] = { -- 罫線類．
chars = {
'─', '━', '│', '┃', '┄', '┅', '┆', '┇',
@@ -215,3 +244,14 @@
},
}
+
+local ht = t[007].chars
+for i=231,632 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+for i=8718,8719 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+for i=12063,12087 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+local ht = t[107].chars
+for i=9758,9778 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+local ht = t[207].chars
+for i=9738,9757 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+
+luatexja.jfont.define_jfm(t)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2016-09-26 20:53:35 UTC (rev 42156)
@@ -7,7 +7,7 @@
-- xkanjiskip: .25zw plus .25zw (or .0833zw) minus .125zw
-luatexja.jfont.define_jfm {
+local t = {
dir = 'tate',
zw = 1.0, zh = 1.0,
kanjiskip = { 0.0, 0.25, 0 },
@@ -22,6 +22,8 @@
[4] = { 0, 0, 0, kanjiskip_shrink=1 },
[6] = { 0, 0, 0, kanjiskip_shrink=1 },
[7] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [207] = { 0, 0, 0, kanjiskip_shrink=1 },
[8] = { 0, 0, 0, kanjiskip_shrink=1 },
}
},
@@ -43,6 +45,8 @@
[5] = { 0, 0, 0, kanjiskip_shrink=1 },
[6] = { 0, 0, 0, kanjiskip_shrink=1 },
[7] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [207] = { 0, 0, 0, kanjiskip_shrink=1 },
[8] = { 0, 0, 0, kanjiskip_shrink=1 },
}
},
@@ -64,6 +68,8 @@
[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 },
+ [107] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
+ [207] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
[8] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 },
}
},
@@ -83,6 +89,8 @@
[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 },
+ [107] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
+ [207] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
[8] = { 0.25, 0.0, 0.25, priority=1, ratio=1 },
}
},
@@ -99,6 +107,8 @@
[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 },
+ [107] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
+ [207] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
[8] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 },
}
},
@@ -130,7 +140,9 @@
[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 },
+ [7] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [107] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
+ [207] = { 1.0 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 },
[8] = { 0, 0, 0, kanjiskip_shrink=1 },
},
kern = {
@@ -138,7 +150,7 @@
}
},
- [7] = { -- 半角カナ
+ [7] = { -- 半角カナ，その他半角CID
chars = {
'｡', '｢', '｣', '､', '･', 'ｦ', 'ｧ', 'ｨ', 'ｩ',
'ｪ', 'ｫ', 'ｬ', 'ｭ', 'ｮ', 'ｯ', 'ｰ', 'ｱ', 'ｲ',
@@ -147,18 +159,6 @@
'ﾅ', 'ﾆ', 'ﾇ', 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ',
'ﾎ', 'ﾏ', 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ',
'ﾗ', 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ', 'ﾞ', 'ﾟ',
- "AJ1-516", "AJ1-517", "AJ1-518", "AJ1-519", "AJ1-520", "AJ1-521", "AJ1-522",
- "AJ1-523", "AJ1-524", "AJ1-525", "AJ1-526", "AJ1-527", "AJ1-528", "AJ1-529",
- "AJ1-530", "AJ1-531", "AJ1-532", "AJ1-533", "AJ1-534", "AJ1-535", "AJ1-536",
- "AJ1-537", "AJ1-538", "AJ1-539", "AJ1-540", "AJ1-541", "AJ1-542", "AJ1-543",
- "AJ1-544", "AJ1-545", "AJ1-546", "AJ1-547", "AJ1-548", "AJ1-549", "AJ1-550",
- "AJ1-551", "AJ1-552", "AJ1-553", "AJ1-554", "AJ1-555", "AJ1-556", "AJ1-557",
- "AJ1-558", "AJ1-559", "AJ1-560", "AJ1-561", "AJ1-562", "AJ1-563", "AJ1-564",
- "AJ1-565", "AJ1-566", "AJ1-567", "AJ1-568", "AJ1-569", "AJ1-570", "AJ1-571",
- "AJ1-572", "AJ1-573", "AJ1-574", "AJ1-575", "AJ1-576", "AJ1-577", "AJ1-578",
- "AJ1-579", "AJ1-580", "AJ1-581", "AJ1-582", "AJ1-583", "AJ1-584", "AJ1-585",
- "AJ1-586", "AJ1-587", "AJ1-588", "AJ1-589", "AJ1-590", "AJ1-591", "AJ1-592",
- "AJ1-593", "AJ1-594", "AJ1-595", "AJ1-596", "AJ1-597", "AJ1-598",
},
align = 'left', left = 0.0, down = 0.0,
width = 0.5, height = 0.5, depth = 0.5, italic=0.0,
@@ -173,6 +173,35 @@
}
},
+ [107] = { -- 1/3 角
+ chars = {},
+ align = 'left', left = 0.0, down = 0.0,
+ width = 1/3, height = 0.5, depth = 0.5, italic=0.0,
+ glue = {
+ [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 },
+ [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [8] = { 0, 0, 0, kanjiskip_shrink=1 },
+ }
+ },
+ [207] = { -- 1/4 角
+ chars = {},
+ align = 'left', left = 0.0, down = 0.0,
+ width = 1/4, height = 0.5, depth = 0.5, italic=0.0,
+ glue = {
+ [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 },
+ [107] = { 0, 0, 0, kanjiskip_shrink=1 },
+ [8] = { 0, 0, 0, kanjiskip_shrink=1 },
+ }
+ },
+
[8] = { -- 罫線類．
chars = {
'─', '━', '│', '┃', '┄', '┅', '┆', '┇',
@@ -214,3 +243,13 @@
},
}
+local ht = t[007].chars
+for i=8950,9353 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+for i=10185,10195 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+local ht = t[107].chars
+for i=13274,13294 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+local ht = t[207].chars
+for i=13254,13273 do ht[#ht+1] = 'AJ1-' .. tostring(i) end
+
+
+luatexja.jfont.define_jfm(t)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2016-09-26 20:53:35 UTC (rev 42156)
@@ -6,6 +6,9 @@
\ProvidesPackage{lltjext}[2015/09/18 v1.2-ltj-4 Macros for vertical writing]
\RequirePackage{luatexja}
+{\catcode`\*=11
+\global\let\ltj at lltjext@orig at tabularS=\tabular*
+}%
\let\ltj at lltjext@orig at tabular=\tabular
\let\ltj at lltjext@orig at array=\array
@@ -743,14 +746,16 @@
\let\@sharp####\let\protect\relax
\let\\\@arraycr\let\tabularnewline\\\let\par\@empty
\lineskip\z at skip\baselineskip\z at skip\@preamble}
- \def\endarray{\crcr\egroup\egroup\@end at alignbox}
+ \def\endarray{\crcr\egroup\egroup\@end at alignbox\@arrayright}
}
\@ifpackageloaded{array}{%
+ \expandafter\let\csname tabular*\endcsname=\ltj at lltjext@orig at tabularS
\let\tabular=\ltj at lltjext@orig at tabular
\let\array=\ltj at lltjext@orig at array
\ltj at lltjext@patch at array
}{%
+ \let\ltj at lltjext@orig at tabularS\relax
\let\ltj at lltjext@orig at tabular\relax
\let\ltj at lltjext@orig at array\relax
\RequirePackage{filehook}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua 2016-09-26 20:53:35 UTC (rev 42156)
@@ -1002,6 +1002,7 @@
if split_dir_head then
list_dir = has_attr(split_dir_head, attr_dir)
hd = insert_before(hd, hd, split_dir_head)
+ split_dir_head=nil
end
if split_dir_whatsit then
-- adjust direction of 'split_keep'
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2016-09-26 20:53:35 UTC (rev 42156)
@@ -87,7 +87,7 @@
v.align = 'left' -- left
end
if type(v.width)~='number' then
- v.width = (jfm_dir=='tate') and 1.0
+ v.width = nil
end
if type(v.height)~='number' then
v.height = (jfm_dir=='tate') and 0.0
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua 2016-09-26 20:53:35 UTC (rev 42156)
@@ -107,7 +107,7 @@
setfield(box, 'depth', fdepth + kbl)
setfield(box, 'dir', dir)
set_attr(box, attr_icflag, PACKED)
- --set_attr(p, attr_icflag, PACKED)
+ set_attr(p, attr_icflag, PROCESSED)
head = p and node_insert_before(head, p, box)
or node_insert_after(head, node_tail(head), box)
return node_next(p), head, p, box
@@ -191,7 +191,7 @@
local function capsule_glyph_math(p, met, char_data)
if not char_data then return nil end
local fwidth, pwidth = char_data.width, getfield(p, 'width')
- fwidth = (fwidth ~= 'prop') and fwidth or pwidth
+ fwidth = fwidth or pwidth
fshift.down = char_data.down; fshift.left = char_data.left
fshift = call_callback("luatexja.set_width", fshift, met, char_data)
local fheight, fdepth = char_data.height, char_data.depth
@@ -219,7 +219,7 @@
return
elseif (has_attr(p, attr_icflag) or 0) ~= PROCESSED then
if pid==id_hlist or pid==id_vlist then
- setfield(p, 'shift', getfield(p, 'shift') + (has_attr(p,attr_ablshift) or 0))
+ setfield(p, 'shift', getfield(p, 'shift') + (has_attr(p,attr_ablshift) or 0))
elseif pid==id_rule then
local v = has_attr(p,attr_ablshift) or 0
setfield(p, 'height', getfield(p, 'height')-v)
@@ -231,6 +231,7 @@
setfield(p, 'yoffset',
getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0))
end
+ set_attr(p, attr_icflag, PROCESSED)
end
end
end
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua 2016-09-26 20:53:10 UTC (rev 42155)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua 2016-09-26 20:53:35 UTC (rev 42156)
@@ -408,7 +408,8 @@
.. tostring(p.font)
.. ' (' .. print_scaled(p.height) .. '+'
.. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
- .. ' xoff: ' .. print_scaled(p.xoffset)
+ .. ' off: (' .. print_scaled(p.xoffset)
+ .. ',' .. print_scaled(p.yoffset) .. ')'
print_fn(s)
elseif pt=='hlist' or pt=='vlist' or pt=='unset'or pt=='ins' then
if pt=='ins' then
More information about the tex-live-commits
mailing list