diff options
| author | Karl Berry <karl@freefriends.org> | 2020-05-18 20:41:36 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-05-18 20:41:36 +0000 |
| commit | 227ff60d29bb5c5617ced1e1a6ca3c01e8c87e20 (patch) | |
| tree | 5be38897636eb8c145964c68134b3b1978506943 /Master/texmf-dist/tex/luatex | |
| parent | ddad52fbcdd8fdcff155009cf9b0d82a32a8a5b6 (diff) | |
luatexja (18may20)
git-svn-id: svn://tug.org/texlive/trunk@55207 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
4 files changed, 11 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua index e97da057905..7dd0dee9061 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua @@ -139,6 +139,7 @@ do local STCK = luatexja.userid_table.STCK local IHB = luatexja.userid_table.IHB local id_local = node.id('local_par') + local id_dir = node.id('dir') local function test_list(h, lv) if not h then @@ -157,7 +158,7 @@ do flag = 0; break -- error end end - elseif p.id~=id_local then + elseif p.id~=id_local and p.id~=id_dir then flag = 0; break end end @@ -220,6 +221,9 @@ do if lv==0 and not page_direction then page_direction = v -- for first call of \yoko (in luatexja-core.sty) else + if luatexja.debug then + luatexja.ext_show_node_list(node.direct.tonode(h),'>> ', texio.write_nl) + end ltjb.package_error( 'luatexja', "Use `\\" .. tostring(name) .. "' at top of list", diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index cecb8d66250..a15b7616bdd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -188,7 +188,7 @@ do local function myround(a) return floor(a+0.5) end local mult_ignore_key = { round_threshold=true, kanjiskip_natural=true, kanjiskip_stretch=true, kanjiskip_shrink=true, - raio=true, priority=true + ratio=true, priority=true } local function mult_table(old,scale) -- modified from table.fastcopy if old then @@ -226,7 +226,7 @@ do kanjiskip_stretch = w.kanjiskip_stretch, kanjiskip_shrink = w.kanjiskip_shrink, round_threshold = w.round_threshold, - } + } end for k,w in pairs(v.kern) do local g = node_new(id_kern, 1) diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua index df1b57dfe68..1b3bd81612b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua @@ -516,6 +516,9 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth) s = s .. ' (for kinsoku)' end print_fn(s) + elseif pt == 'dir' then + s = base .. ' ' .. tostring(p.dir) .. ' (level ' .. tostring(p.level) .. ')' + print_fn(s) elseif pt == 'whatsit' then s = base if p.subtype==sid_user then diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 68b11f7d875..da8ecf7c89d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -41,7 +41,7 @@ \ProcessOptions\relax \fi %</LaTeX> %%%% VERSION -\def\LuaTeXjaversion{20200517.0} +\def\LuaTeXjaversion{20200518.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs |