summaryrefslogtreecommitdiff
path: root/language/japanese/platex/plfonts.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-28 03:01:01 +0000
committerNorbert Preining <norbert@preining.info>2021-06-28 03:01:01 +0000
commit36c481b02c4fdfaf33325b9f18834c2357b8eec5 (patch)
tree5414e5c86007a3beb77beb54d2b8ca765927d0de /language/japanese/platex/plfonts.dtx
parenta090105758cdab68b58246a8aea7cb79dc168501 (diff)
CTAN sync 202106280301
Diffstat (limited to 'language/japanese/platex/plfonts.dtx')
-rw-r--r--language/japanese/platex/plfonts.dtx107
1 files changed, 72 insertions, 35 deletions
diff --git a/language/japanese/platex/plfonts.dtx b/language/japanese/platex/plfonts.dtx
index a46eb00101..8dd162c91b 100644
--- a/language/japanese/platex/plfonts.dtx
+++ b/language/japanese/platex/plfonts.dtx
@@ -186,13 +186,16 @@
% (sync with ltfsstrc.dtx 2021/04/26 v3.0o)}
% \changes{v1.7m}{2021/06/04}{latex2e/444$BBP1~!'(B\cs{@shape@roman@kanji}$B%U%i%0(B
% $B$r(B\cs{delayed@k@adjustment}$B$NCf$GJQ99(B/$BI|5"$9$k(B}
+% \changes{v1.7n}{2021/06/27}{$B=>B02$J8$N%7%j!<%:$H%7%'!<%W99?7$r(B
+% $BH?1G$9$k$h$&$K=$@5(B}
+% \changes{v1.7n}{2021/06/27}{$BOB2$J8$N(Bforced@series$B%U%i%0$rJ,N%(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2021/06/04 v1.7m pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2021/06/27 v1.7n pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -325,7 +328,7 @@
%<*trace>
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{ptrace}
- [2021/06/04 v1.7m Standard pLaTeX package (font tracing)]
+ [2021/06/27 v1.7n Standard pLaTeX package (font tracing)]
\RequirePackageWithOptions{tracefnt}
%</trace>
% \end{macrocode}
@@ -1878,12 +1881,16 @@
%%
\DeclareRobustCommand\selectfont{%
% \end{macrocode}
-% $B:G=i$K!"CY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$NCM99?7$r9T$$$^$9!#(B
+% $B:G=i$KOBJ8$N=hM}$r40N;$5$;$F$+$i!"2$J8!J=>B02$J8$+$b$7$l$^$;$s!K$N(B
+% $B=hM}$KF~$kI,MW$,$"$j$^$9!#$=$l$>$l$G!VCY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$N(B
+% $BCM99?7"*%U%)%s%H$N@Z$jBX$(!W$r9T$$$^$9!#(B
% \changes{v1.7k}{2021/01/10}{Execute delayed series and shape updates (latex2e/444)
% (sync with ltfsstrc.dtx 2020/12/22 v3.0n)}
% \changes{v1.7l}{2021/05/23}{Unset the forced series boolean when reaching
% \cs{selectfont} (latex2e/444)
% (sync with ltfsstrc.dtx 2021/04/26 v3.0o)}
+%
+% $BOBJ8!'CY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$NCM99?7!#(B
% \begin{macrocode}
% !! sync with ltfsstrc.dtx 2021/04/26 v3.0o BEGIN
\ifx\delayed@k@adjustment\@empty
@@ -1905,28 +1912,10 @@
\fi
\let\delayed@k@adjustment\@empty
\fi
- \ifx\delayed@f@adjustment\@empty
- \else
- \let\f@shape@saved\f@shape
- \let\f@series@saved\f@series
- \delayed@f@adjustment
- \maybe@load@fontshape
- \ifcsname \f@encoding/\f@family/\f@series/\f@shape \endcsname
- \else
- \let\f@shape\f@shape@saved
- \let\f@series\f@series@saved
- \let\delayed@merge@font@shape\merge@font@shape
- \let\delayed@merge@font@series\merge@font@series
- \delayed@f@adjustment
- \let\delayed@merge@font@shape\merge@font@shape@without@substitution
- \let\delayed@merge@font@series\merge@font@series@without@substitution
- \fi
- \let\delayed@f@adjustment\@empty
- \fi
- \@forced@seriesfalse
+ \@forced@series@kanjifalse
% !! sync with ltfsstrc.dtx 2021/04/26 v3.0o END
% \end{macrocode}
-% p\LaTeXe{}$B$N(B|\selectfont|$B%3%^%s%I$O!"$^$:!"OBJ8%U%)%s%H$r@Z$jBX$($^$9!#(B
+% $BOBJ8!'%U%)%s%H$N@Z$jBX$(!#(B
% \begin{macrocode}
\let\tmp@error@fontshape\error@fontshape
\let\error@fontshape\error@kfontshape
@@ -1962,10 +1951,17 @@
\kenc@update
\let\error@fontshape\tmp@error@fontshape
% \end{macrocode}
-% $B<!$K!"(B|\if@knjcmd|$B$,??$N>l9g!"(B
-% $B2$J8=qBN$r8=:_$NOBJ8=qBN$K4XO"IU$1$5$l$?%U%)%s%H$KJQ$($^$9!#(B
-% $B$3$N%U%i%0$O(B|\userelfont|$B%3%^%s%I$K$h$C$F(B\emph{$B??(B}$B$H$J$j$^$9!#(B
-% $B$3$N%U%i%0$O$3$3$G:F$S!"(B\emph{$B56(B}$B$K@_Dj$5$l$^$9!#(B
+% $B0J>e$G!"OBJ8$N=hM}$,40N;!#(B
+%
+% $B=>B02$J8$r;H$&!J(B|\if@knjcmd|$B$,??$N!K>l9g$O!"OBJ8=qBN$,3NDj$7$?(B
+% $B$3$NCJ3,$G!V4XO"IU$1$5$l$?2$J8=qBN!W$KCM$r99?7$7$^$9!#(B
+% |\rel@../../../..| $B$G(B |\romanseries| $B$H(B |\romanshape| $B$,<B9T(B
+% $B$5$l$k!J$9$J$o$A(B |\delayed@f@adjustment| $B$KDI2C$,F~$k!K$3$H$K(B
+% $BCm0U$7$F$/$@$5$$!#(B
+% $B$J$*!"(B|\if@knjcmd|$B%U%i%0$O(B|\userelfont|$B%3%^%s%I$K$h$C$F(B
+% \emph{$B??(B}$B$H$J$j!"0J2<$G:F$S(B\emph{$B56(B}$B$K%j%;%C%H$5$l$^$9!#(B
+% \changes{v1.7n}{2021/06/27}{$B=>B02$J8$N%7%j!<%:$H%7%'!<%W99?7$r(B
+% $BH?1G$9$k$h$&$K=$@5(B}
% \begin{macrocode}
\if@knjcmd \@knjcmdfalse
\expandafter\ifx
@@ -1980,7 +1976,31 @@
\fi
\fi
% \end{macrocode}
-% $B$=$7$F!"2$J8%U%)%s%H$r@Z$jBX$($^$9!#(B
+% $B2$J8!'CY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$NCM99?7!#(B
+% \begin{macrocode}
+ % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o BEGIN
+ \ifx\delayed@f@adjustment\@empty
+ \else
+ \let\f@shape@saved\f@shape
+ \let\f@series@saved\f@series
+ \delayed@f@adjustment
+ \maybe@load@fontshape
+ \ifcsname \f@encoding/\f@family/\f@series/\f@shape \endcsname
+ \else
+ \let\f@shape\f@shape@saved
+ \let\f@series\f@series@saved
+ \let\delayed@merge@font@shape\merge@font@shape
+ \let\delayed@merge@font@series\merge@font@series
+ \delayed@f@adjustment
+ \let\delayed@merge@font@shape\merge@font@shape@without@substitution
+ \let\delayed@merge@font@series\merge@font@series@without@substitution
+ \fi
+ \let\delayed@f@adjustment\@empty
+ \fi
+ \@forced@seriesfalse
+ % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o END
+% \end{macrocode}
+% $B2$J8!'%U%)%s%H$N@Z$jBX$(!#(B
% \begin{macrocode}
\let\font\afont
\xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
@@ -2656,6 +2676,21 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\if@forced@series@kanji}
+% \LaTeXe~2020-02-02 PL3$B$GDI2C$5$l$?(B|\if@forced@series|$B%U%i%0$NOBJ8HG$G$9!#(B
+% \changes{v1.7n}{2021/06/27}{$BOB2$J8$N(Bforced@series$B%U%i%0$rJ,N%(B}
+% \begin{macrocode}
+%<*plcore|platexrelease>
+\ifx\@forced@seriestrue\@undefined % old
+ \let\@forced@series@kanjifalse\@undefined
+ \let\@forced@series@kanjitrue\@undefined
+\else % 2020-02-02 PL3 or later
+ \expandafter\newif\csname if@forced@series@kanji\endcsname
+\fi
+%</plcore|platexrelease>
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\romanseries}
% \begin{macro}{\kanjiseries}
% \begin{macro}{\fontseries}
@@ -2678,13 +2713,13 @@
\else % 2020-02-02
\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
\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\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\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\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
@@ -2710,13 +2745,13 @@
\else % 2020-02-02
\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
\DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
-\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\edef\k@series{#1}}
+\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@series@kanjitrue\edef\k@series{#1}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\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}}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
@@ -2862,7 +2897,9 @@
% $BOBJ8%7%'%$%WL$Dj5A$N>l9g$O(B\cs{k@shape}$B$r99?7$7$J$$$h$&$KJQ99(B}
% \begin{macrocode}
%<*plcore|platexrelease>
-\newif\if@shape@roman@kanji
+\ifx\@shape@roman@kanjitrue\@undefined % just in case
+ \expandafter\newif\csname if@shape@roman@kanji\endcsname
+\fi
%</plcore|platexrelease>
% \end{macrocode}
% \end{macro}
@@ -3676,7 +3713,7 @@
~\fi
}
\def\prepare@family@series@update@kanji#1#2{%
-~\if@forced@series
+~\if@forced@series@kanji
%<+debug> \series@change@debug{No series preparation (forced \k@series)\on@line}%
~ \kanjifamily#2%
~\else
@@ -3980,7 +4017,7 @@
~\fi
}
\def\prepare@family@series@update@kanji#1#2{%
-~\if@forced@series
+~\if@forced@series@kanji
%<+debug> \series@change@debug{No series preparation (forced \k@series)\on@line}%
~ \kanjifamily#2%
~\else