platex (4feb20)

git-svn-id: svn://tug.org/texlive/trunk@53668 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 31 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index fead9278ea1..b91a130c2b8 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -127,13 +127,14 @@
 % \changes{v1.6v}{2020/02/01}{$BDj5A$r(Bpldefs$B$+$i(Bplcore$B$X0\F0(B}
 % \changes{v1.6v}{2020/02/01}{Set \cs{kanjishapedefault} explicitly to ``n''
 %    (sync with fontdef.dtx 2019/12/17 v3.0e)}
+% \changes{v1.6w}{2020/02/03}{$B4,$-La$7$N%P%0=$@5(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plfonts.dtx}[2020/02/01 v1.6v pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2020/02/03 v1.6w pLaTeX New Font Selection Scheme]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plfonts.dtx}
@@ -1915,7 +1916,10 @@
 % \begin{macro}{\fontseries}
 % $B=qBN$N%7%j!<%:$r;XDj$9$k%3%^%s%I$G$9!#(B
 % |\fontseries|$B%3%^%s%I$OOB2$J8$NN>J}$K1F6A$7$^$9!#(B
-% \LaTeXe~2020-02-02$B$G$O(B|\merge@font@series|$B$r;H$$$^$9!#(B
+%
+% 2019$BG/$^$G$OL5>r7o$K;XDj$5$l$?$H$*$j$N%7%j!<%:$rA*Br$7$F$$$^$7$?$,!"(B
+% \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontSeriesChangeRule|$B$K$h$C$F(B
+% $B@k8@$5$l$?!V%7%j!<%:99?75,B'!W$K4p$E$-%7%j!<%:$rA*Br$7$^$9!#(B
 %    \begin{macrocode}
 %<*plcore|platexrelease>
 \ifx\fontseriesforce\@undefined  % old
@@ -2006,7 +2010,10 @@
 % \begin{macro}{\fontshape}
 % $B=qBN$N%7%'%$%W$r;XDj$9$k%3%^%s%I$G$9!#(B
 % |\fontshape|$B%3%^%s%I$OOB2$J8$NN>J}$K1F6A$7$^$9!#(B
-% \LaTeXe~2020-02-02$B$G$O(B|\merge@font@shape|$B$r;H$$$^$9!#(B
+%
+% 2019$BG/$^$G$OL5>r7o$K;XDj$5$l$?$H$*$j$N%7%'%$%W$rA*Br$7$F$$$^$7$?$,!"(B
+% \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontShapeChangeRule|$B$K$h$C$F(B
+% $B@k8@$5$l$?!V%7%'%$%W99?75,B'!W$K4p$E$-%7%'%$%W$rA*Br$7$^$9!#(B
 %    \begin{macrocode}
 \ifx\fontshapeforce\@undefined   % old
 \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}}
@@ -2062,7 +2069,8 @@
   \ifx\@reserveda\@empty
     \edef\k@shape{#2}%
   \else
-    \maybe@load@fontshape
+    \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
+      \maybe@load@fontshape\endgroup
     \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}%
      \ifcsname \@reserveda\endcsname
        \edef\k@shape{#1}%
@@ -2206,9 +2214,15 @@
 % \begin{macro}{\bfseries@gt}
 % \begin{macro}{\mdseries@mc}
 % \begin{macro}{\mdseries@gt}
-% \LaTeXe~2020-02-02$B$G$O(Bmweights$B%Q%C%1!<%8$r4p$K$7$?(B
-% $B2$J8%U%)%s%H$N%7%j!<%:$N%+%9%?%`@_Dj$,F3F~$5$l$F$$$^$9$N$G!"(B
-% p\LaTeXe{}$B$NOBJ8%U%)%s%H$G$b$3$l$r%5%]!<%H$7$^$9!#(B
+% \LaTeXe~2020-02-02$B$G$O!"2$J8%U%)%s%H$K$D$$$F(B
+% $B!V%U%!%_%j$4$H$N<B:]$N%7%j!<%:CM$r@_Dj$G$-$k!W(B
+% $B$H$$$&5!G=$,F3F~$5$l$^$7$?!J85$O(Bmweights$B%Q%C%1!<%8$N5!G=!K!#(B
+% $B$^$?!"F1;~$K(B
+% $B!V(BComputer Modern$B$H(BLatin Modern$B$N>l9g$O8_49@-$N$?$aB@;z$r(Bbx$B$K!"(B
+% $B$=$l0J30$N2$J8%U%!%_%j$N>l9g$OB@;z$r(Bb$B$K$9$k!W(B
+% $B$H$$$&;EMMJQ99$bF~$j$^$7$?!#(B
+% $B$3$l$K9g$o$;$F!"(Bp\LaTeXe{}$B$NOBJ8%U%)%s%H$K$bF1Ey$N5!G=$rDI2C$7!"(B
+% $BOBJ8%U%!%_%j$NB@;z$b(Bbx$B$G$O$J$/(Bb$B$KJQ99$7$^$7$?!#(B
 % \changes{v1.6v}{2020/02/01}{\LaTeX{}$B$,(Bmweights$B%Q%C%1!<%8$r4p$K$7$?(B
 %    $B%7%j!<%:$N%+%9%?%`@_Dj$rF3F~$7$?$N$G!"$3$l$r%5%]!<%H(B
 %    (sync with ltfssini.dtx 2019/12/17 v3.1e)}
@@ -2259,7 +2273,7 @@
 %
 % \begin{macro}{\bfseries}
 % \begin{macro}{\mdseries}
-% $B%+%9%?%`@_Dj$r%A%'%C%/$7$^$9!#(B
+% $B%U%!%_%j$4$H$N@_DjCM$r;2>H$7$^$9!#(B
 %    \begin{macrocode}
 \ifx\bfseries@rm\@undefined\else  % 2020-02-02
 \DeclareRobustCommand\bfseries{%
@@ -2402,8 +2416,15 @@
 %}%
 %    \end{macrocode}
 % $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B
+% \begin{itemize}
+%   \item \LaTeXe~2019-10-01$B0JA0!'L$Dj5A(B
+%   \item \LaTeXe~2020-02-02$B0J9_!'>e$N$H$*$j$NDj5A(B
+%   \item $B$?$@$7!"(Blatexrelease$B$G4,$-La$7!'(B|\relax|$B$HF15A(B
+% \end{itemize}
+% $B$K$J$k$3$H$KCm0U$7$^$9!#(B
+% \changes{v1.6w}{2020/02/03}{$B4,$-La$7$N%P%0=$@5(B}
 %    \begin{macrocode}
-\ifx\init@series@setup\@undefined\else  % 2020-02-02
+\expandafter\ifx\csname init@series@setup\endcsname\relax\else  % 2020-02-02
 \g@addto@macro\init@series@setup{%
   \ifx\kanjidef@ult\mcdef@ult      \mcfamily
   \else\ifx\kanjidef@ult\gtdef@ult \gtfamily
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 7be5ca9cc09..b354d4f4a62 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -195,7 +195,7 @@
    {2020-02-02}
 %</plcore|platexrelease>
 %<*plcore>
-\def\ppatch@level{0}
+\def\ppatch@level{1}
 %</plcore>
 %    \end{macrocode}
 % \end{macro}