diff options
author | Karl Berry <karl@freefriends.org> | 2021-05-17 20:46:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-05-17 20:46:20 +0000 |
commit | 2f50ed54eb4616352e1630c3b1c29c9738682458 (patch) | |
tree | 60cc78334b96801ae8ca471e10a6bc7a7bae725c /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | 898a57f59d62a088d5275d6d4b03a748ec593cab (diff) |
luatexja (17may21)
git-svn-id: svn://tug.org/texlive/trunk@59248 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
7 files changed, 85 insertions, 64 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index 19fe320fad4..19b365ad48f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjcore}[2021-03-19 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2021-03-25 Patch to LaTeX2e Kernel for LuaTeX-ja] \RequirePackage{etoolbox} %%% expl3 @@ -266,44 +266,17 @@ \newif\iffnfixbottom \newif\ifltj@ftn@unvboxed %%% @makecol -\gdef \@makecol {% - \ifvoid\footins - \ltj@ftn@unvboxedfalse - \setbox\@outputbox \box\@cclv - \else - \ltj@ftn@unvboxedtrue - \setbox\@outputbox \vbox {% - \boxmaxdepth \@maxdepth - \unvbox \@cclv - \iffnfixbottom\vskip\z@ \@plus.0001fil\fi - \vskip \skip\footins - \color@begingroup - \normalcolor - \footnoterule - \unvbox \footins - \color@endgroup - }% - \fi - \let\@elt\relax - \xdef\@freelist{\@freelist\@midlist}% - \global \let \@midlist \@empty - \@combinefloats - \ifvbox\@kludgeins - \@makespecialcolbox - \else - \setbox\@outputbox \vbox to\@colht {% - \@texttop - \dimen@ \dp\@outputbox - \unvbox \@outputbox - \unless\ifnum\ltjgetparameter{direction}=4 - \vbox{\primitive\everypar{}\hskip\z@}% - \fi %%% LuaTeX-ja - \vskip -\dimen@ - \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi - }% - \fi - \global \maxdepth \@maxdepth -} +\def\pltx@adjust@wd@outputbox{% + \unless\ifnum\ltjgetparameter{direction}=4 + \vbox{\primitive\everypar{}\hskip\z@}% + \fi} +\patchcmd\@makecol{\vskip -\dimen@\@textbottom}% + {\pltx@adjust@wd@outputbox + \vskip -\dimen@ + \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{} +\patchcmd\@makecol{\vskip\skip\footins}{\iffnfixbottom\vskip\z@\@plus.0001fil\fi\vskip\skip\footins}{}{} +\patchcmd\@makecol{\ifvoid\footins}{\ifvoid\footins\ltj@ftn@unvboxedfalse}{}{} +\patchcmd\@makecol{\setbox\@outputbox \vbox}{\ltj@ftn@unvboxedtrue\setbox\@outputbox \vbox}{}{} \let\ltj@orig@makecol=\@makecol \patchcmd\@makespecialcolbox{\@textbottom}{\ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{} diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 07b2c0d58b1..8bf6bac9f3d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -21,7 +21,7 @@ \ifnum\ltj@@latex@plv<1500 % <=2020-10-01 \kanjiseries{m} \kanjishape{n} -\else % >=2021-05-01 +\else % >=2021-06-01 \def\k@series{m} \def\k@shape{n} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 4932e07480a..31f0f645d8d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -3,13 +3,13 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjfont}[2021-02-14 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2021-04-29 Patch to NFSS2 for LuaTeX-ja] %%%%%%%% LaTeX2e version detection \newcount\ltj@@latex@plv \ltj@@latex@plv=-1 \ifltj@ltfilehook@avail \IfHookExistsTF{selectfont}% - {\ltj@@latex@plv=1500}% 2021-05-01 + {\ltj@@latex@plv=1500}% 2021-06-01 {\ifnum\patch@level>2 \ltj@@latex@plv=1300\else \ltj@@latex@plv=1000\fi}% 2020-10-01 \else\ifdefined\@rmfamilyhook % 2020-02-02 \ifx\@forced@seriestrue\@undefined % 2020-02-02 pl0--2 @@ -451,7 +451,7 @@ \ltj@@EverySelectfont@Init } \EverySelectfont{\ltj@selectfont@patch} -\else % LaTeX2e >=2021-05-01 +\else % LaTeX2e >=2021-06-01 \AddToHook{selectfont}[luatexja]{% \ltj@@start@time@measure{selectfont}% \ifx\delayed@k@adjustment\@empty @@ -473,6 +473,7 @@ \fi \let\delayed@k@adjustment\@empty \fi + \@forced@series@kanjifalse \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \ltj@@is@kyenc{\k@encoding}\ifin@% @@ -806,7 +807,7 @@ \fi \fi } -\else % >=2021-05-01 +\else % >=2021-06-01 \def\merge@kanji@series@#1#2#3\@nil{% \def\reserved@a{#3}% \ifx\reserved@a\@empty @@ -891,6 +892,7 @@ \let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution \fi +\newif\if@forced@series@kanji \ifnum\ltj@@latex@plv=300 % 2020-02-02 pl3, 4 \DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} \DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} @@ -898,20 +900,20 @@ \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} \else\ifnum\ltj@@latex@plv<1500% >=2020-02-02 pl5 and <=2020-10-01 \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}} - \DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}} + \DeclareRobustCommand\kanjiseries[1]{\@forced@series@kanjifalse\merge@kanji@series{#1}} \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}} - \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\edef\k@series{#1}} -\else% >=2021-05-01 + \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@series@kanjitrue\edef\k@series{#1}} +\else% >=2021-06-01 \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\delayed@merge@font@series{#1}}} - \DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse + \DeclareRobustCommand\kanjiseries[1]{\@forced@series@kanjifalse \expandafter\def\expandafter\delayed@k@adjustment\expandafter {\delayed@k@adjustment\delayed@merge@kanji@series{#1}}} \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\edef\f@series{#1}}} - \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue + \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@series@kanjitrue \expandafter\def\expandafter\delayed@k@adjustment\expandafter {\delayed@k@adjustment\edef\k@series{#1}}} \let\delayed@k@adjustment\@empty @@ -930,7 +932,7 @@ \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshapeforce[1]{\set@safe@kanji@shape{#1}{}\romanshapeforce{#1}} -\else% >=2021-05-01 +\else% >=2021-06-01 \DeclareRobustCommand\romanshape[1]{% \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\delayed@merge@font@shape{#1}}} @@ -953,8 +955,20 @@ \expandafter\def\expandafter\delayed@k@adjustment\expandafter {\delayed@k@adjustment\set@safe@kanji@shape{#1}{}}} \fi -\ifnum\ltj@@latex@plv>1000 -%%%% LaTeX >= 2020-10-01 PL3 +\ifnum\ltj@@latex@plv>1499 +%%%% LaTeX >= 2021-06-01 +\DeclareRobustCommand\usekanji[4]{% + \kanjiencoding{#1}\edef\k@family{#2}% + \set@target@series@kanji{#3}\edef\k@shape{#4}% + \let\delayed@k@adjustment\@empty + \selectfont\ignorespaces} +\DeclareRobustCommand\useroman[4]{% + \romanencoding{#1}\edef\f@family{#2}% + \set@target@series{#3}\edef\f@shape{#4}% + \let\delayed@f@adjustment\@empty + \selectfont\ignorespaces} +\else\ifnum\ltj@@latex@plv>1000 +%%%% 2021-10-01 PL3 <= LaTeX < 2021-06-01 \DeclareRobustCommand\usekanji[4]{% \kanjiencoding{#1}\edef\k@family{#2}% \set@target@series@kanji{#3}\edef\k@shape{#4}% @@ -971,7 +985,7 @@ \DeclareRobustCommand\useroman[4]{% \romanencoding{#1}\edef\f@family{#2}\edef\f@series{#3}\edef\f@shape{#4}% \selectfont\ignorespaces} -\fi +\fi\fi %%%% LaTeX >= 2020-02-02 END \else %%%% LaTeX 2019-10-01 @@ -1014,6 +1028,7 @@ %%%% LaTeX >= 2020-02-02 \let\prepare@family@series@update@kanji=\prepare@family@series@update \patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{} +\patchcmd\prepare@family@series@update@kanji{\if@forced@series}{\if@forced@series@kanji}{}{} \patchcmd\prepare@family@series@update@kanji{\fontfamily}{\kanjifamily}{}{} \patchcmd\prepare@family@series@update@kanji{\update@series@target@value}{\update@series@target@value@kanji}{}{} \patchcmd\prepare@family@series@update@kanji{\f@family}{\k@family}{}{} @@ -1153,12 +1168,23 @@ \let\reset@font\normalfont \fi\fi } + +\ifnum\ltj@@latex@plv>1499 +\@ltj@hook@dfh{% + \kanjiencoding{\kanjiencodingdefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% + \let\delayed@k@adjustment\empty +} +\else \@ltj@hook@dfh{% \kanjiencoding{\kanjiencodingdefault}% \edef\k@family{\kanjifamilydefault}% \edef\k@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } +\fi \let\@ltj@hook@dfh\@undefined %%%% LaTeX >= 2020-02-02 END \else diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty index d1a21a0e5c0..27680205f64 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty @@ -13,7 +13,7 @@ \RequirePackage{expl3} \ExplSyntaxOn\makeatletter \box_new:N \l__platex_shipout_dummy_box -\if_cs_exist:N \__shipout_execute_main_cont:Nnnn %% 2021-05-01 +\if_cs_exist:N \__shipout_execute_main_cont:Nnnn %% 2021-06-01 \cs_new_eq:NN \__platex_original_shipout_execute_main_cont:Nnnn \__shipout_execute_main_cont:Nnnn \cs_set:Npn \__shipout_execute_main_cont:Nnnn #1#2#3#4 { diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty index 99ed1906318..b838fd92fe2 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-footmisc}[2021-03-17 Patch to footmisc for LuaTeX-ja] +\ProvidesPackage{lltjp-footmisc}[2021-03-25 Patch to footmisc for LuaTeX-ja] \RequirePackage{footmisc} \let \if@tempswa \ifFN@bottom @@ -47,9 +47,7 @@ \setbox\@outputbox \vbox to\@colht{% \@texttop \dimen@\dp\@outputbox \unvbox\@outputbox - \unless\ifnum\ltjgetparameter{direction}=4 - \vbox{\primitive\everypar{}\hskip\z@}% - \fi %%% LuaTeX-ja + \pltx@adjust@wd@outputbox \vskip -\dimen@\@textbottom }% \fi 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 c6bebc36cde..db444aecb78 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 2019-06-06 +% lltjp-siunitx.sty 2021-04-19 % \NeedsTeXFormat{LaTeX2e} @@ -7,6 +7,32 @@ \RequirePackage{siunitx} \makeatletter \ExplSyntaxOn +\cs_if_exist:NTF \siunitx_print_text:n {% siunitx v3.00 +\cs_set_protected:Npn \siunitx_print_text:n #1 + { + \text + { + \ltj@allalchar % <--- LuaTeX-ja + \bool_if:NT \l__siunitx_print_text_family_bool + { + \fontfamily { \familydefault } + \selectfont + } + \bool_if:NT \l__siunitx_print_text_series_bool + { + \fontseries { \seriesdefault } + \selectfont + } + \bool_if:NT \l__siunitx_print_text_shape_bool + { + \fontshape { \shapedefault } + \selectfont + } + \__siunitx_print_text_replace:n {#1} + } + } +}% siunitx v3.00 end +{% siunitx v2.xx \cs_generate_variant:Nn \tl_if_in:NnT { coT } \cs_new:Nn \__ltj_siunix_patch_inner:n { \cs_if_exist:cT { #1_tl } { @@ -91,6 +117,6 @@ } { } } - +} \ExplSyntaxOff \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty index 6ce9528d727..c4cd3ca53e9 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty @@ -1,5 +1,5 @@ % -% lltjp-stfloats.sty 2021-03-17 +% lltjp-stfloats.sty 2021-03-25 % \NeedsTeXFormat{LaTeX2e} @@ -14,9 +14,7 @@ \global\let\org@makecol\ltj@orig@makecol \patchcmd\fn@makecol{\vskip -\dimen@\@textbottom}% - {\unless\ifnum\ltjgetparameter{direction}=4 - \vbox{\primitive\everypar{}\hskip\z@}% - \fi %%% LuaTeX-ja + {\pltx@adjust@wd@outputbox \vskip -\dimen@ \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{} \patchcmd\fn@makecol{\vskip\skip\footins}{\iffnfixbottom\vskip\z@\@plus.0001fil\fi\vskip\skip\footins}{}{} |