From 1ac2fcf0f1fa828a6318a0b791f4255f7b2bcadc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Jun 2021 20:08:17 +0000 Subject: luatexja (7jun21) git-svn-id: svn://tug.org/texlive/trunk@59518 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 ++++---- .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 693535 -> 693756 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 1130307 -> 1125155 bytes .../tex/luatex/luatexja/ltj-direction.lua | 10 +++++----- Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 4 ++-- .../tex/luatex/luatexja/patches/lltjfont.sty | 9 +++++---- 6 files changed, 16 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 3a433c20d48..9e51dd5766b 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 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 + ;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/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index 4a31080cc15..6d9f8a3cd5b 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index ba8dad35868..4ca3182ca0e 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ 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 % %%%% 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% -- cgit v1.2.3