texlive[68506] Master/texmf-dist: luatexja (10oct23)

commits+karl at tug.org commits+karl at tug.org
Tue Oct 10 22:25:27 CEST 2023 

Revision: 68506
          https://tug.org/svn/texlive?view=revision&revision=68506
Author:   karl
Date:     2023-10-10 22:25:27 +0200 (Tue, 10 Oct 2023)
Log Message:
-----------
luatexja (10oct23)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/luatex/luatexja/README
    trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
    trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
    trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf
    trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
    trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty
    trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
    trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
    trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
    trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty

Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README	2023-10-10 20:25:10 UTC (rev 68505)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README	2023-10-10 20:25:27 UTC (rev 68506)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20230503.0
+The LuaTeX-ja Package 20231010.0
 --------------------------------
 Copyright (c) 2011--2023 The LuaTeX-ja project
 License: modified BSD (see COPYING)
@@ -42,9 +42,9 @@
 2. If you must/want to install manually:
 
    a. Download the source archive from CTAN,
-      or tagged as 20230503.0 in the Git repository by
+      or tagged as 20231010.0 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20230503.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20231010.0;sf=tgz>
 
    b. Extract the archive and process following three files by LuaLaTeX
       to generate classes for Japanese typesetting:
@@ -93,4 +93,4 @@
   This file and ltj-kinsoku.lua are not used anymore.
   (Do not remove ltj-kinsoku.tex.)
 
-Last commit date: Wed May 3 07:10:30 2023 +0900
+Last commit date: Tue Oct 10 18:41:17 2023 +0900

Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx	2023-10-10 20:25:10 UTC (rev 68505)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx	2023-10-10 20:25:27 UTC (rev 68506)
@@ -4280,7 +4280,7 @@
 \jfont\testJ={psft:Ryumin-Light:cid=Adobe-Japan1-7;jfm=jis}    % Japanese
 \jfont\testD={psft:Ryumin-Light:jfm=jis}                       % default: Adobe-Japan1-7
 \jfont\testC={psft:AdobeMingStd-Light:cid=Adobe-CNS1-7;jfm=jis}% Traditional Chinese
-\jfont\testG={psft:SimSun:cid=Adobe-GB1-5;jfm=jis}             % Simplified Chinese
+\jfont\testG={psft:SimSun:cid=Adobe-GB1-6;jfm=jis}             % Simplified Chinese
 \jfont\testK={psft:Batang:cid=Adobe-Korea1-2;jfm=jis}          % Korean
 \jfont\testKR={psft:SourceHanSerifAKR9:cid=Adobe-KR-9;jfm=jis} % Korean
 \end{lstlisting}

Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty	2023-10-10 20:25:10 UTC (rev 68505)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty	2023-10-10 20:25:27 UTC (rev 68506)
@@ -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 at size pt\dimen1=\ltj@@rubyip at 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 at temp:=#2\do{\ltj@@ruby[]{\ltj@@kenten at temp}{\ltj@@rubyip at kenten}}%
 }}
 

Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua	2023-10-10 20:25:10 UTC (rev 68505)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua	2023-10-10 20:25:27 UTC (rev 68506)
@@ -15,7 +15,7 @@
 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 @@
                              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

Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty	2023-10-10 20:25:10 UTC (rev 68505)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty	2023-10-10 20:25:27 UTC (rev 68506)
@@ -61,13 +61,24 @@
 \expandafter\ifx\csname RequirePackage\endcsname\relax %<*!LaTeX>
   \expandafter\let\csname ifltj at in@latex\expandafter\endcsname
     \csname iffalse\endcsname
+  \endlinechar=13 %
+  \input infwarerr.sty
+  \endlinechar=-1 %
 \else                           %<*LaTeX>
   \expandafter\let\csname ifltj at 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                             %</LaTeX>
 
+%% 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 at everyhook@avail\ltj at everyhook@availfalse
@@ -89,12 +100,7 @@
 \fi                             %</LaTeX>
 \endlinechar=-1 %
 
-%% Check if LuaTeX is used
-\ltx at LocalExpandAfter\ifx\csname directlua\endcsname\relax
-  % Loading is silently aborted, since the notice of the wrong
-  % engine is already shown in luaotfload.
-  \ltj at core@AtEnd
-\expandafter\endinput\fi\relax
+\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
 
 %% Check LuaTeX version.
 \ifnum\luatexversion<110

Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua	2023-10-10 20:25:10 UTC (rev 68505)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua	2023-10-10 20:25:27 UTC (rev 68506)
@@ -424,7 +424,8 @@
    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 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)'

Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty	2023-10-10 20:25:10 UTC (rev 68505)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty	2023-10-10 20:25:27 UTC (rev 68506)
@@ -27,7 +27,7 @@
 \newif\ifltj at 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                             %</LaTeX>
 
-\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
-
 %% Load all sub-packages.
 \ifltj at in@latex                 %<*LaTeX>
   %% \RequirePackage{expl3} needed if the version of l3kernel is v6111

More information about the tex-live-commits mailing list.