summaryrefslogtreecommitdiff
path: root/macros/luatex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-08 03:02:17 +0000
committerNorbert Preining <norbert@preining.info>2021-06-08 03:02:17 +0000
commit19ec3a90133b7827c16b0ffde16152fb4d566138 (patch)
tree056101811eeb7e1bfb0067e3628591dd0e52bc06 /macros/luatex
parent1ba2ae020aea220436899cf65f5a85c1686940cd (diff)
CTAN sync 202106080302
Diffstat (limited to 'macros/luatex')
-rw-r--r--macros/luatex/generic/luatexja/README8
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-en.pdfbin693535 -> 693756 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-ja.pdfbin1130307 -> 1125155 bytes
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-direction.lua10
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.sty4
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjfont.sty9
6 files changed, 16 insertions, 15 deletions
diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README
index 3a433c20d4..9e51dd5766 100644
--- a/macros/luatex/generic/luatexja/README
+++ b/macros/luatex/generic/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20210521.0
+The LuaTeX-ja Package 20210607.0
--------------------------------
Copyright (c) 2011--2021 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 20210521.0 in the Git repository by
+ or tagged as 20210607.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20210521.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20210607.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: Fri May 21 21:07:11 2021 +0900
+Last commit date: Mon Jun 7 20:50:27 2021 +0900
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
index 4a31080cc1..6d9f8a3cd5 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 ba8dad3586..4ca3182ca0 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/src/ltj-direction.lua b/macros/luatex/generic/luatexja/src/ltj-direction.lua
index 47b4aec1d0..d7cdbd9364 100644
--- a/macros/luatex/generic/luatexja/src/ltj-direction.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-direction.lua
@@ -319,7 +319,7 @@ end
local create_dir_whatsit_vbox
do
local wh = {}
- local id_glue, sid_parskip = node.id 'glue', 3
+ local id_glue = node.id 'glue'
create_dir_whatsit_vbox = function (hd, gc)
ltjs.list_dir = get_dir_count()
-- remove dir whatsit
@@ -331,8 +331,8 @@ do
if hd==wh[1] then
ltjs.list_dir =has_attr(hd,attr_dir)
local x = node_next(hd)
- if getid(x)==id_glue and getsubtype(x)==sid_parskip then
- node_remove(hd,x); node_free(x)
+ while x and getid(x)==id_glue and getsubtype(x)==3 do
+ node_remove(hd,x); node_free(x); x = node_next(hd)
end
end
for i=1,#wh do
@@ -345,10 +345,10 @@ do
end
return hd
else
- local n =node_next(hd)
+ local n = node_next(hd)
if gc=='vtop' then
local w = create_dir_whatsit(hd, gc, ltjs.list_dir)
- -- move dir whatsit after hd
+ -- move dir whatsit after hd
setfield(hd, 'next', w); setfield(w, 'next', n)
return hd
else
diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty
index 0eec4c94c0..d2646d5785 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.sty
+++ b/macros/luatex/generic/luatexja/src/luatexja.sty
@@ -35,13 +35,13 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja}[2021-05-21 Japanese Typesetting with Lua(La)TeX]
+ \ProvidesPackage{luatexja}[2021-06-07 Japanese Typesetting with Lua(La)TeX]
\DeclareOption{disablejfam}{\ltj@disablejfamtrue}
\DeclareOption*{}
\ProcessOptions\relax
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20210521.0}
+\def\LuaTeXjaversion{20210607.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
index 31f0f645d8..1e9abe047b 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
@@ -3,14 +3,16 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2021-04-29 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2021-05-26 Patch to NFSS2 for LuaTeX-ja]
%%%%%%%% LaTeX2e version detection
\newcount\ltj@@latex@plv \ltj@@latex@plv=-1
\ifltj@ltfilehook@avail
- \IfHookExistsTF{selectfont}%
+\ExplSyntaxOn
+ \cs_if_exist:NTF \__shipout_execute_main_cont:Nnnn
{\ltj@@latex@plv=1500}% 2021-06-01
- {\ifnum\patch@level>2 \ltj@@latex@plv=1300\else \ltj@@latex@plv=1000\fi}% 2020-10-01
+ {\ifnum\patch@level>2\relax \ltj@@latex@plv=1300\else \ltj@@latex@plv=1000\fi}% 2020-10-01
+\ExplSyntaxOff
\else\ifdefined\@rmfamilyhook % 2020-02-02
\ifx\@forced@seriestrue\@undefined % 2020-02-02 pl0--2
\@latex@error
@@ -27,7 +29,6 @@
\fi
\fi\fi
-
%% patching \DeclareTextComposite
\def\ltj@chardef@text@cmd#1{%
\let\@ifdefinable\@@ifdefinable%