From 5e09eeaa0b8221ee929fa3432354267f16d91002 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 30 Dec 2023 21:26:42 +0000 Subject: luatexja (30dec23) git-svn-id: svn://tug.org/texlive/trunk@69245 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua | 12 ++++++++++-- Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty | 2 +- Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/luatex') diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty index ba88ec9450d..5b3c77e0cad 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty @@ -123,7 +123,7 @@ %! (command_name が "assign_int" であるトークン). %! (注意: まだ文字表記(`A)に対応していません.) \def\ltj@grab@num{ - \directlua{tex.sprint('{' .. token.scan_int() .. '}')} + \directlua{tex.sprint(luatexbase.catcodetables['latex-package'], '{' .. token.scan_int() .. '}')} } %%------------------ Safe passing diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua index 38dec61d2e8..5878595f281 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua @@ -64,6 +64,7 @@ local attr_icflag = luatexbase.attributes['ltj@icflag'] local attr_vert_ori = luatexbase.attributes['ltj@vert@ori'] local ltjf_font_extra_info = ltjf.font_extra_info +local ltjs_orig_char_table = ltjs.orig_char_table local PACKED = luatexja.icflag_table.PACKED local PROCESSED = luatexja.icflag_table.PROCESSED @@ -191,8 +192,15 @@ local function capsule_glyph_tate(p, met, char_data, head, dir) local feir = ltjf_font_extra_info[pf] if met.rotation and met.vert_activated then local f = font_getfont(pf) - local r, l = met.rotation[pc], f.properties and f.properties.language - if ((r==true) or (type(r)=="table" and not r[l])) and (get_attr(p, attr_vert_ori) or 0)<=0 then + local pco = ltjs_orig_char_table[p] or pc + local r = met.rotation[pco] + local l = f.properties and f.properties.language + r = (r==true) or (type(r)=="table" and not r[l]) + if r then + r = met.rotation[pc] + r = (r==true) or (type(r)=="table" and not r[l]) + end + if r and (get_attr(p, attr_vert_ori) or 0)<=0 then return capsule_glyph_tate_rot(p, met, char_data, head, dir, 0.5*(get_ascender(pf)-get_descender(pf))) end diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index 12a7a09eaef..a5801ed386c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -546,7 +546,7 @@ \ltj@reset@globaldefs \begingroup\ltj@curjfnt\m@ne\ltj@curtfnt\m@ne\relax #1\directlua{luatexja.__temp = -(\the\ltj@curjfnt)*(\the\ltj@curtfnt)}\endgroup - \ltj@tempcntc=\directlua{tex.sprint(luatexja.__temp)}\relax + \ltj@tempcntc=\directlua{tex.sprint(-2,luatexja.__temp)}\relax \ifnum\ltj@tempcntc=\m@ne \@PackageError{luatexja-core}% {\string#1 is not a control sequence that represents \MessageBreak diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index c22e29d9d98..442e73cf9e5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -27,7 +27,7 @@ \newif\ifltj@disablejfam %%%% VERSION -\def\LuaTeXjaversion{20231010.0} +\def\LuaTeXjaversion{20231230.0} %% Check if LaTeX is used. \begingroup\expandafter\expandafter\expandafter\endgroup -- cgit v1.2.3