From 035250a6634179b98b2c7367d79c07bd2dbd3a32 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 26 Sep 2016 20:53:35 +0000 Subject: luatexja (26sep16) git-svn-id: svn://tug.org/texlive/trunk@42156 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 +- .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 446443 -> 446402 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 839665 -> 839597 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 12 +-- .../luatex/luatexja/addons/luatexja-ajmacros.sty | 2 +- Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua | 82 +++++++++++++++------ .../texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua | 69 +++++++++++++---- Master/texmf-dist/tex/luatex/luatexja/lltjext.sty | 7 +- .../tex/luatex/luatexja/ltj-direction.lua | 1 + .../texmf-dist/tex/luatex/luatexja/ltj-jfont.lua | 2 +- .../tex/luatex/luatexja/ltj-setwidth.lua | 7 +- Master/texmf-dist/tex/luatex/luatexja/luatexja.lua | 3 +- 12 files changed, 140 insertions(+), 53 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 619d9ce6659..6fc6aa519e6 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -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 @@ Installation 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 + ;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 @@ Notes * 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 diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index 7e4af86671e..0210da4ab47 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index 8ba04870ac2..9ddf5ca1518 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index 9814a3548ea..ce67c8c3d38 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -4312,9 +4312,9 @@ This field is a list of characters which are in this character \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 @@ as values of these fields. The default values are shown in Table~\ref{tab-wid}. \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 diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty index 016fda3055b..b48e04bfaf7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty @@ -268,7 +268,7 @@ \fi \ifnum#2>\z@ \shift@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@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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua index 72c1e9c6f8d..e084269a6bb 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua @@ -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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { } }, - [7] = { -- 半角カナ + [007] = { -- 半角カナ,その他半角CID chars = { '。', '「', '」', '、', '・', 'ヲ', 'ァ', 'ィ', 'ゥ', 'ェ', 'ォ', 'ャ', 'ュ', 'ョ', 'ッ', 'ー', 'ア', 'イ', @@ -147,18 +159,6 @@ luatexja.jfont.define_jfm { 'ナ', 'ニ', 'ヌ', 'ネ', 'ノ', 'ハ', 'ヒ', 'フ', 'ヘ', 'ホ', 'マ', 'ミ', 'ム', 'メ', 'モ', 'ヤ', 'ユ', 'ヨ', 'ラ', 'リ', 'ル', 'レ', 'ロ', 'ワ', 'ン', '゙', '゚', - "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,7 +168,36 @@ luatexja.jfont.define_jfm { [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 }, } }, @@ -215,3 +244,14 @@ luatexja.jfont.define_jfm { }, } + +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) diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua index 6bf3075340b..80f8e889e3e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua @@ -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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { [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 @@ luatexja.jfont.define_jfm { } }, - [7] = { -- 半角カナ + [7] = { -- 半角カナ,その他半角CID chars = { '。', '「', '」', '、', '・', 'ヲ', 'ァ', 'ィ', 'ゥ', 'ェ', 'ォ', 'ャ', 'ュ', 'ョ', 'ッ', 'ー', 'ア', 'イ', @@ -147,18 +159,6 @@ luatexja.jfont.define_jfm { 'ナ', 'ニ', 'ヌ', 'ネ', 'ノ', 'ハ', 'ヒ', 'フ', 'ヘ', 'ホ', 'マ', 'ミ', 'ム', 'メ', 'モ', 'ヤ', 'ユ', 'ヨ', 'ラ', 'リ', 'ル', 'レ', 'ロ', 'ワ', 'ン', '゙', '゚', - "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 @@ luatexja.jfont.define_jfm { } }, + [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 @@ luatexja.jfont.define_jfm { }, } +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) diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty index 58451214e33..79030f7c67a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty @@ -6,6 +6,9 @@ \ProvidesPackage{lltjext}[2015/09/18 v1.2-ltj-4 Macros for vertical writing] \RequirePackage{luatexja} +{\catcode`\*=11 +\global\let\ltj@lltjext@orig@tabularS=\tabular* +}% \let\ltj@lltjext@orig@tabular=\tabular \let\ltj@lltjext@orig@array=\array @@ -743,14 +746,16 @@ \let\@sharp####\let\protect\relax \let\\\@arraycr\let\tabularnewline\\\let\par\@empty \lineskip\z@skip\baselineskip\z@skip\@preamble} - \def\endarray{\crcr\egroup\egroup\@end@alignbox} + \def\endarray{\crcr\egroup\egroup\@end@alignbox\@arrayright} } \@ifpackageloaded{array}{% + \expandafter\let\csname tabular*\endcsname=\ltj@lltjext@orig@tabularS \let\tabular=\ltj@lltjext@orig@tabular \let\array=\ltj@lltjext@orig@array \ltj@lltjext@patch@array }{% + \let\ltj@lltjext@orig@tabularS\relax \let\ltj@lltjext@orig@tabular\relax \let\ltj@lltjext@orig@array\relax \RequirePackage{filehook} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua index 61d081929de..0947f34f19d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua @@ -1002,6 +1002,7 @@ do 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' diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index 7355c9eaa6a..1c77e829fa9 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -87,7 +87,7 @@ function define_jfm(t) 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 diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua index 92028582300..2b0c29b8d36 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua @@ -107,7 +107,7 @@ local function capsule_glyph_yoko(p, met, char_data, head, dir) 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 @@ luatexja.setwidth.capsule_glyph_tate = capsule_glyph_tate 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 @@ function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift) 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 @@ function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift) setfield(p, 'yoffset', getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0)) end + set_attr(p, attr_icflag, PROCESSED) end end end diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua index a85e089eb54..b966e8393bd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua @@ -408,7 +408,8 @@ local function debug_show_node_X(p,print_fn, limit) .. 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 -- cgit v1.2.3