From f92a7f650889a8bbbd6ff151a911a35c25fa2901 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 10 Oct 2023 20:25:27 +0000 Subject: luatexja (10oct23) git-svn-id: svn://tug.org/texlive/trunk@68506 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexja/addons/luatexja-ruby.sty | 6 +++--- Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua | 4 ++-- .../texmf-dist/tex/luatex/luatexja/luatexja-core.sty | 18 ++++++++++++------ Master/texmf-dist/tex/luatex/luatexja/luatexja.lua | 5 +++-- Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 4 +--- 5 files changed, 21 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex/luatex') diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty index e24164d1b6a..d0d8e5488dd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty @@ -4,7 +4,7 @@ % LaTeX only! \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-ruby}[2023-01-21 v0.61] +\ProvidesPackage{luatexja-ruby}[2023-10-08 v0.62] \RequirePackage{luatexja} %%------------------ @@ -197,7 +197,7 @@ \directlua{luatexja.ruby.read_old_break_info()}% } \protected\def\ltj@@ruby[#1]#2#3{{% #1: option #2: 親文字群,#3: ルビ文字列群,共に| 区切り - \setkeys[ltj]{ruby}{#1}% + \leavevmode\setkeys[ltj]{ruby}{#1}% \directlua{luatexja.ruby.ruby_tmplist_r = \string{\string}; luatexja.ruby.ruby_tmplist_p = \string{\string}}% \leavevmode\dimen0=\f@size pt\dimen1=\ltj@@rubyip@size\dimen0% @@ -222,7 +222,7 @@ \protected\def\ltjkenten{\@ifnextchar[\ltj@@kenten{\ltj@@kenten[]}}%] \def\ltj@@kenten[#1]#2{{% - \setkeys[ltj]{ruby}{#1, stretchruby=101}% + \leavevmode\setkeys[ltj]{ruby}{#1, stretchruby=101}% \@tfor\ltj@@kenten@temp:=#2\do{\ltj@@ruby[]{\ltj@@kenten@temp}{\ltj@@rubyip@kenten}}% }} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua index ee43ca85955..88352dd5b24 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua @@ -15,7 +15,7 @@ do end local cidfont_data = {} local cache_chars = {} -local cache_ver = 12 +local cache_ver = 13 local identifiers = fonts.hashes.identifiers local cid_reg, cid_order, cid_supp, cid_name @@ -38,7 +38,7 @@ local cid_replace = { return 327680 -- 655360/2 end end}, - ["Adobe-GB1"] = {"UniGB-UTF32", 30283, 5, + ["Adobe-GB1"] = {"UniGB-UTF32", 30571, 6, function (i) if (814<=i and i<=939) or (i==7716) or (22355<=i and i<=22357) then diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index b0c5c805c09..12a7a09eaef 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -61,13 +61,24 @@ \expandafter\ifx\csname RequirePackage\endcsname\relax %<*!LaTeX> \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iffalse\endcsname + \endlinechar=13 % + \input infwarerr.sty + \endlinechar=-1 % \else %<*LaTeX> \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luatexja-core}[2023-04-06 Core of LuaTeX-ja] + \endlinechar=13 % + \RequirePackage{infwarerr} + \endlinechar=-1 % \fi % +%% Check if LuaTeX is used +\expandafter\ifx\csname directlua\endcsname\relax + \@PackageError{luatexja-core}{This package requires Lua(HB)(La)TeX}{} +\expandafter\endinput\fi\relax + %% Load prerequisite packages. \endlinechar=13 % \newif\ifltj@everyhook@avail\ltj@everyhook@availfalse @@ -89,12 +100,7 @@ \fi % \endlinechar=-1 % -%% Check if LuaTeX is used -\ltx@LocalExpandAfter\ifx\csname directlua\endcsname\relax - % Loading is silently aborted, since the notice of the wrong - % engine is already shown in luaotfload. - \ltj@core@AtEnd -\expandafter\endinput\fi\relax +\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs %% Check LuaTeX version. \ifnum\luatexversion<110 diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua index f4536580e36..1013684496a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua @@ -424,7 +424,8 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth) local k = prefix local s local pt, pic = node_type(p.id), (get_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG - local base = prefix .. string.format('%X', pic) .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' + local base = prefix .. '[' .. string.format('%7d', node.direct.todirect(p)) .. '] ' .. + string.format('%X', pic) .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' if pt == 'glyph' then s = base .. ' ' .. (p.char<0xF0000 and utfchar(p.char) or '') @@ -531,7 +532,7 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth) local t = tostring(p.user_id) .. ' (' .. luatexbase.get_user_whatsit_name(p.user_id) .. ') ' if p.type ~= 110 then - s = s .. ' userid:' .. t .. p.value + s = s .. ' userid:' .. t .. tostring(p.value) print_fn(s) else s = s .. ' userid:' .. t .. '(node list)' diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 5d04d1d460d..c22e29d9d98 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{20230503.0} +\def\LuaTeXjaversion{20231010.0} %% Check if LaTeX is used. \begingroup\expandafter\expandafter\expandafter\endgroup @@ -50,8 +50,6 @@ \ProcessOptions\relax \fi % -\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs - %% Load all sub-packages. \ifltj@in@latex %<*LaTeX> %% \RequirePackage{expl3} needed if the version of l3kernel is v6111 -- cgit v1.2.3