diff options
Diffstat (limited to 'Master/texmf-dist/tex/platex')
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 22 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 22 |
2 files changed, 38 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index fd368a6c291..8710e500eb0 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -489,12 +489,21 @@ of this package available from CTAN} \plEndIncludeInRelease \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.} \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 \ifx\fontseriesforce\@undefined % old \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} @@ -546,11 +555,18 @@ of this package available from CTAN} \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 \ifx\fontshapeforce\@undefined % old \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 3c7172412f0..13dc9165aa4 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -678,13 +678,22 @@ \fi\fi} \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.} \@@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 \ifx\fontseriesforce\@undefined % old \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} @@ -736,11 +745,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 \ifx\fontshapeforce\@undefined % old \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} |