summaryrefslogtreecommitdiff
path: root/macros/luatex/generic
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-10-11 03:02:59 +0000
committerNorbert Preining <norbert@preining.info>2023-10-11 03:02:59 +0000
commit366cf31a771ded1f10860be3212058d48020398d (patch)
tree99ee483a9fd05dfd4ec908582abb44028bdffbd1 /macros/luatex/generic
parent48eedda2cb4d2644886b862409b24a1d8e9a136f (diff)
CTAN sync 202310110302
Diffstat (limited to 'macros/luatex/generic')
-rw-r--r--macros/luatex/generic/luatexja/README8
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-en.pdfbin702456 -> 702730 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-ja.pdfbin1143943 -> 1144113 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-ruby.pdfbin391556 -> 391680 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja.dtx2
-rw-r--r--macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty6
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-rmlgbm.lua4
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja-core.sty18
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.lua5
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.sty4
10 files changed, 26 insertions, 21 deletions
diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README
index 69b4ebef3a..378db73395 100644
--- a/macros/luatex/generic/luatexja/README
+++ b/macros/luatex/generic/luatexja/README
@@ -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 @@ Installation
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 @@ Notes
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
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
index 794fce564d..9e8f1ec3db 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
index 1aad471bbe..6022f034aa 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf
index fd5a932b75..06cf336b44 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja.dtx b/macros/luatex/generic/luatexja/doc/luatexja.dtx
index a6139ec9c2..46aec6b955 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja.dtx
+++ b/macros/luatex/generic/luatexja/doc/luatexja.dtx
@@ -4280,7 +4280,7 @@ for Chinese or Korean typesetting.
\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}
diff --git a/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty b/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty
index e24164d1b6..d0d8e5488d 100644
--- a/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty
+++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/ltj-rmlgbm.lua b/macros/luatex/generic/luatexja/src/ltj-rmlgbm.lua
index ee43ca8595..88352dd5b2 100644
--- a/macros/luatex/generic/luatexja/src/ltj-rmlgbm.lua
+++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/luatexja-core.sty b/macros/luatex/generic/luatexja/src/luatexja-core.sty
index b0c5c805c0..12a7a09eae 100644
--- a/macros/luatex/generic/luatexja/src/luatexja-core.sty
+++ b/macros/luatex/generic/luatexja/src/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 %</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@everyhook@avail\ltj@everyhook@availfalse
@@ -89,12 +100,7 @@
\fi %</LaTeX>
\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/macros/luatex/generic/luatexja/src/luatexja.lua b/macros/luatex/generic/luatexja/src/luatexja.lua
index f4536580e3..1013684496 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.lua
+++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty
index 5d04d1d460..c22e29d9d9 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{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@in@latex %<*LaTeX>
%% \RequirePackage{expl3} needed if the version of l3kernel is v6111