summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex/base/plfonts.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-07 20:52:53 +0000
committerKarl Berry <karl@freefriends.org>2020-10-07 20:52:53 +0000
commitd9b1ec3c205a61c913ac359ae066e75b37329f48 (patch)
tree70de3ef023d9b5a573b1cb788468710577f0a4f6 /Master/texmf-dist/source/platex/base/plfonts.dtx
parent1f1d5f72b672dfac7da6d3b26c1b84945a81eb50 (diff)
platex (6oct20)
git-svn-id: svn://tug.org/texlive/trunk@56582 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/platex/base/plfonts.dtx')
-rw-r--r--Master/texmf-dist/source/platex/base/plfonts.dtx51
1 files changed, 28 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index e68de15a597..2ccf9c3790b 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -166,13 +166,14 @@
% (sync with ltfssini.dtx 2020/04/13 v3.1n)}
% \changes{v1.7h}{2020/09/28}{New hook management interface
% (sync with ltfssini.dtx 2020/08/21 v3.2b)}
+% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2020/09/28 v1.7h pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2020/10/07 v1.7i pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -2976,11 +2977,12 @@
% \LaTeXe~2020-10-01$B$G$O(B|\AddToHook|$B$,;H$($^$9!#(B
% \changes{v1.7h}{2020/09/28}{New hook management interface
% (sync with ltfssini.dtx 2020/08/21 v3.2b)}
+% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2020/04/12}{\normalfont}
%<platexrelease> {Use \@defaultfamilyhook}%
%<*plcore|platexrelease>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN
+\ifnum\pltx@newhook@avail=\z@ % --- for <= 2020-02-02 BEGIN
\ifx\@defaultfamilyhook\@undefined % old
\DeclareRobustCommand\normalfont{%
\kanjiencoding{\kanjiencodingdefault}%
@@ -3007,14 +3009,14 @@
\edef\k@shape{\kanjishapedefault}%
}
\fi % done
-\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
+\else % --- for <= 2020-02-02 END & for >= 2020-10-01 BEGIN
%<platexrelease>\DeclareRobustCommand\normalfont{%
%<platexrelease> \fontencoding\encodingdefault
%<platexrelease> \edef\f@family{\familydefault}%
%<platexrelease> \edef\f@series{\seriesdefault}%
%<platexrelease> \edef\f@shape{\shapedefault}%
%<platexrelease> \UseHook{normalfont}%
-%<platexrelease> \@defaultfamilyhook % hookname from 2020/02 will vanish
+%<platexrelease> \@defaultfamilyhook % hookname from 2020/02 will vanish
%<platexrelease> \selectfont}
\AddToHook{normalfont}{%
\kanjiencoding{\kanjiencodingdefault}%
@@ -3022,7 +3024,7 @@
\edef\k@series{\kanjiseriesdefault}%
\edef\k@shape{\kanjishapedefault}%
}
-\fi % --- for 2020-10-01 END
+\fi % --- for >= 2020-10-01 END
\adjustbaseline
\let\reset@font\normalfont
%</plcore|platexrelease>
@@ -3124,22 +3126,23 @@
% ^^A $B$=$l$K4p$E$$$F(B |\seriesdefault| $B$r@_Dj$9$k!#(B
% \changes{v1.7h}{2020/09/28}{New hook management interface
% (sync with ltfssini.dtx 2020/08/21 v3.2b)}
+% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B}
% \begin{macrocode}
-\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN
\g@addto@macro\expand@font@defaults{%
\edef\mcdef@ult{\mcdefault}%
\edef\gtdef@ult{\gtdefault}%
\edef\kanjidef@ult{\kanjifamilydefault}%
}
-\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN
\AddToHook{expand@font@defaults}{%
\edef\mcdef@ult{\mcdefault}%
\edef\gtdef@ult{\gtdefault}%
%\edef\kanjidef@ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n
}
-\fi % --- for 2020-10-01 END
-\fi %</2020-02-02|2020-10-01>
+\fi % --- for >= 2020-10-01 END
+\fi %</2020-02-02|2020-10-01|.>
% \end{macrocode}
% \end{macro}
%
@@ -3201,8 +3204,8 @@
% and \cs{mddefault}, use \cs{@setYYseriesdefaultshook}
% (sync with ltfssini.dtx 2020/03/19 v3.1k and 2020/04/06 v3.1m)}
% \begin{macrocode}
-\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN
\DeclareRobustCommand\bfseries{%
\not@math@alphabet\bfseries\mathbf
\expand@font@defaults
@@ -3251,8 +3254,9 @@
% $B<!$K(B\LaTeXe~2020-10-01$B%Y!<%9!#(B|\AddToHook|$B$G==J,$G$9!#(B
% \changes{v1.7h}{2020/09/28}{New hook management interface
% (sync with ltfssini.dtx 2020/08/21 v3.2b)}
+% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B}
% \begin{macrocode}
-\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN
\AddToHook{bfseries/defaults}{%
\let\bfseries@mc\bfdef@ult
\let\bfseries@gt\bfdef@ult
@@ -3275,8 +3279,8 @@
\else \kanjiseries\mddefault
\fi\fi
}
-\fi % --- for 2020-10-01 END
-\fi %</2020-02-02|2020-10-01>
+\fi % --- for >= 2020-10-01 END
+\fi %</2020-02-02|2020-10-01|.>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3441,16 +3445,17 @@
% \changes{v1.6w}{2020/02/03}{$B4,$-La$7$N%P%0=$@5(B}
% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes
% (sync with ltfssini.dtx 2020/04/13 v3.1n)}
+% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B}
% \begin{macrocode}
\expandafter\ifx\csname init@series@setup\endcsname\relax
-\else %<*2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\else %<*2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN
\g@addto@macro\init@series@setup{%
\ifx\kanjidef@ult\mcdef@ult \mcfamily
\else\ifx\kanjidef@ult\gtdef@ult \gtfamily
\fi\fi
}%
-\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN
\g@addto@macro\init@series@setup{%
% !! sync with 2020/04/13 v3.1n BEGIN
\ifx\kanjiseriesdefault\kanjiseriesdefault@kernel
@@ -3459,8 +3464,8 @@
\fi
% !! sync with 2020/04/13 v3.1n END
}%
-\fi % --- for 2020-10-01 END
-\fi %</2020-02-02|2020-10-01>
+\fi % --- for >= 2020-10-01 END
+\fi %</2020-02-02|2020-10-01|.>
% \end{macrocode}
% \end{macro}
%
@@ -3473,14 +3478,14 @@
% $BJQ99$5$l$?$+$I$&$+8!CN$G$-$k$h$&$K$J$j$^$9!#(B
% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes
% (sync with ltfssini.dtx 2020/04/13 v3.1n)}
+% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B}
% \begin{macrocode}
-\ifx\AddToHook\@undefined
-\else % --- for LaTeX2e 2020-10-01 or later BEGIN
+\ifnum\pltx@newhook@avail>\z@ % --- for >= 2020-10-01 BEGIN
\def\code@after@pldefs{%
\expandafter\def\expandafter\kanjiseriesdefault
\expandafter{\kanjiseriesdefault\@empty}
\let\kanjiseriesdefault@kernel\kanjiseriesdefault}
-\fi % --- for LaTeX2e 2020-10-01 or later END
+\fi % --- for >= 2020-10-01 END
% \end{macrocode}
% \end{macro}
% \end{macro}