emergency update again: r53974 fails 'fmtutil-sys --byfmt (u)platex-dev'

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

1 files changed, 19 insertions, 3 deletions

diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index 78ab72ff991..7163f9a5644 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -1941,13 +1941,22 @@
 %<*plcore|platexrelease>
 \ifx\fontseriesforce\@undefined      % old
 \else                                % 2020-02-02
-  \ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+  \ifx\@forced@seriestrue\@undefined % patch level 0, 1, 2
     \@latex@error
       {Please update LaTeX2e!^^J\space\space
-       At least LaTeX2e 2020-02-02 patch level 5 is required}
-      {LaTeX2e 2020-02-02 patch level 2 and 4 has a bug.}
+       At least LaTeX2e 2020-02-02 patch level 3 is required}
+      {LaTeX2e 2020-02-02 patch level 2 has a bug.}
 %<plcore>    \@@end
   \fi
+  % actually we'd like to check the below too,
+  % but commented out for TL19 frozen since
+  % platex-dev format generation fails
+  %\ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+  %  \@latex@error
+  %    {Please update LaTeX2e!^^J\space\space
+  %     At least LaTeX2e 2020-02-02 patch level 5 is required}
+  %    {LaTeX2e 2020-02-02 patch level 2 and 4 has a bug.}
+  %\fi
 \fi
 %</plcore|platexrelease>
 %    \end{macrocode}
@@ -2040,11 +2049,18 @@
     \fi
   \fi
 }
+\ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+\def\set@target@series@kanji#1{%
+    \edef\k@series{#1}%
+    \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}%
+}
+\else                                   % patch level 5
 \def\set@target@series@kanji#1{%
     \edef\k@series{#1}%
     \expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series
 }
 \fi
+\fi
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}