diff options
author | Norbert Preining <norbert@preining.info> | 2023-12-31 03:03:08 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-12-31 03:03:08 +0000 |
commit | 5acd803fa16526d48d5c8e990dc509df22d856b7 (patch) | |
tree | c3ed1afd62a406b906debf826d6f4648e3317e76 /macros/luatex/generic/luatexja/src | |
parent | fb8f0178a957d045f6b876e11ab2beb02d1ac08a (diff) |
CTAN sync 202312310303
Diffstat (limited to 'macros/luatex/generic/luatexja/src')
4 files changed, 13 insertions, 5 deletions
diff --git a/macros/luatex/generic/luatexja/src/ltj-base.sty b/macros/luatex/generic/luatexja/src/ltj-base.sty index ba88ec9450..5b3c77e0ca 100644 --- a/macros/luatex/generic/luatexja/src/ltj-base.sty +++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/ltj-setwidth.lua b/macros/luatex/generic/luatexja/src/ltj-setwidth.lua index 38dec61d2e..5878595f28 100644 --- a/macros/luatex/generic/luatexja/src/ltj-setwidth.lua +++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/luatexja-core.sty b/macros/luatex/generic/luatexja/src/luatexja-core.sty index 12a7a09eae..a5801ed386 100644 --- a/macros/luatex/generic/luatexja/src/luatexja-core.sty +++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty index c22e29d9d9..442e73cf9e 100644 --- a/macros/luatex/generic/luatexja/src/luatexja.sty +++ b/macros/luatex/generic/luatexja/src/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 |