summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-12-13 21:09:26 +0000
committerKarl Berry <karl@freefriends.org>2022-12-13 21:09:26 +0000
commitf702445ebe8dc7efa88bfa28c7239e63591b90e0 (patch)
treec3748dbcd0c249ca1acb8c534c4c3a872c8baf9c
parent01c2f16795936045fac715892c1376cc04052a43 (diff)
luatexja (13dec22)
git-svn-id: svn://tug.org/texlive/trunk@65267 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/README8
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdfbin717373 -> 717362 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdfbin1149844 -> 1149290 bytes
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty11
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.lua6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty14
7 files changed, 31 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index dfe1dbd8193..37dc20ad33d 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/README
+++ b/Master/texmf-dist/doc/luatex/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20221006.0
+The LuaTeX-ja Package 20221213.0
--------------------------------
Copyright (c) 2011--2022 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 20221006.0 in the Git repository by
+ or tagged as 20221213.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20221006.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20221213.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: Thu Oct 6 19:16:48 2022 +0900
+Last commit date: Tue Dec 13 21:57:47 2022 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index e7bd77b7759..75c901924f5 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
index 7eba86a3c78..d1f16280697 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
index 4e89ecee61e..7e091d161d1 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
@@ -12,7 +12,7 @@
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2021-10-24 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2022-10-15 LaTeX support of LuaTeX-ja]
\endlinechar=13
@@ -135,6 +135,15 @@
\RequirePackage{lltjp-geometry}
+\ltj@ExecuteBeforePackage{breqn}{%
+ \let\ltj@@vadjust@breqn\vadjust \let\ltj@@insert@breqn\insert
+ \let\vadjust\ltj@@orig@vadjust \let\insert\ltj@@orig@insert
+}
+\ltj@ExecuteAfterPackage{breqn}{%
+ \let\vadjust\ltj@@vadjust@breqn \let\insert\ltj@@insert@breqn
+ \let\ltj@@vadjust@breqn\undefined \let\ltj@@insert@breqn\undefined
+}
+
\def\ltj@@q@stop{\ltj@@q@stop}
\ifdefined\ltj@stop@overwrite@primitive
\begingroup
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
index e8f4053c401..31bd0662b38 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
@@ -175,7 +175,7 @@ local cnt_stack = luatexbase.registernumber 'ltj@@stack'
-- EXT: print parameters that don't need arguments
do
- local tex_getattr = tex.getattribute
+ local tex_getattr, getnest = tex.getattribute, tex.getnest
local function getattr(a, d)
local r = tex_getattr(a); d = d or 0
return (r==-0x7FFFFFFF) and d or r
@@ -222,7 +222,7 @@ do
end,
direction = function()
local v = ltjd.get_dir_count()
- if math.abs(tex.getnest().mode) == ltjs.mmode and v == dir_table.dir_tate then
+ if math.abs(getnest().mode) == ltjs.mmode and v == dir_table.dir_tate then
v = dir_table.dir_utod
end
return v
@@ -353,7 +353,7 @@ do
local getnest = tex.getnest
local id_glyph = node.id 'glyph'
function luatexja.pltx_composite_last_node_char()
- local n = getnest()
+ local n = getnest().tail
local r = '-1'
if n then
if n.id==id_glyph then
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 79590b906c5..00c37876845 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{20221006.0}
+\def\LuaTeXjaversion{20221213.0}
%% Check if LaTeX is used.
\begingroup\expandafter\expandafter\expandafter\endgroup
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
index fcc8922fea4..16c13cd7ae4 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
@@ -1,5 +1,5 @@
%
-% lltjp-siunitx.sty 2021-10-31
+% lltjp-siunitx.sty 2022-12-12
%
\NeedsTeXFormat{LaTeX2e}
@@ -34,6 +34,18 @@
\cs_set_eq:NN \ltj_orig__siunitx_table_collect_begin:w \__siunitx_table_collect_begin:w
\cs_set_protected:Npn \__siunitx_table_collect_begin:w #1 \relax
{ \ltj_orig__siunitx_table_collect_begin:w }
+\AtBeginDocument{
+ \cs_if_exist:NT \TblrNum
+ { \RenewDocumentCommand \TblrNum { m }
+ {
+ \__tblr_siunitx_process:Nn
+ { \cs_set_eq:NN \__siunitx_table_collect_begin:w
+ \ltj_orig__siunitx_table_collect_begin:w
+ \tablenum}
+ {#1}
+ }
+ }
+ }
}% siunitx v3.00 end
{% siunitx v2.xx
\cs_generate_variant:Nn \tl_if_in:NnT { coT }