summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-06-07 20:08:17 +0000
committerKarl Berry <karl@freefriends.org>2021-06-07 20:08:17 +0000
commit1ac2fcf0f1fa828a6318a0b791f4255f7b2bcadc (patch)
tree173b6ff4c3a73b63c47d1e7d8e975bdf2c12ead5 /Master/texmf-dist/tex/luatex/luatexja
parent8fbbd462135b56104dcbd71eb341ad19abae51d0 (diff)
luatexja (7jun21)
git-svn-id: svn://tug.org/texlive/trunk@59518 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua10
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty9
3 files changed, 12 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
index 47b4aec1d00..d7cdbd9364d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/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/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 0eec4c94c0f..d2646d57858 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/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/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
index 31f0f645d8d..1e9abe047bc 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/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%