diff options
Diffstat (limited to 'macros/luatex/generic/luatexja/src/patches/lltjfont.sty')
-rw-r--r-- | macros/luatex/generic/luatexja/src/patches/lltjfont.sty | 52 |
1 files changed, 39 insertions, 13 deletions
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty index 4932e07480..31f0f645d8 100644 --- a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty +++ b/macros/luatex/generic/luatexja/src/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 |