From e683aafb436fe5079fb4878f058618155dc8939b Mon Sep 17 00:00:00 2001 From: Hironobu Yamashita Date: Sat, 29 Feb 2020 08:57:21 +0000 Subject: emergency update: platex 2020-02-29 containing pLaTeX2e <2020-02-02>+3 Karl -- please refer to mail 'Refrain from major release of LaTeX2e around TL freeze' git-svn-id: svn://tug.org/texlive/trunk@53974 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/platex/base/platexrelease.sty | 100 ++++++++++++-------- Master/texmf-dist/tex/platex/base/plcore.ltx | 103 +++++++++++++-------- 2 files changed, 126 insertions(+), 77 deletions(-) (limited to 'Master/texmf-dist/tex/platex') diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index b0e161cf97a..fd368a6c291 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -487,21 +487,30 @@ of this package available from CTAN} \fi} \expandafter \let \csname adjustbaseline \endcsname \@undefined \plEndIncludeInRelease +\ifx\fontseriesforce\@undefined % old +\else % 2020-02-02 + \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}} \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} \else % 2020-02-02 -\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} -\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} +\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}} +\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} \fi \ifx\fontseriesforce\@undefined % old \let\romanseriesforce\@undefined \let\kanjiseriesforce\@undefined \else % 2020-02-02 -\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}} -\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} +\DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}} +\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\edef\k@series{#1}} \DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} \fi \ifx\fontseriesforce\@undefined % old @@ -539,7 +548,7 @@ of this package available from CTAN} } \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}% + \expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series } \fi \ifx\fontshapeforce\@undefined % old @@ -699,72 +708,87 @@ of this package available from CTAN} \DeclareRobustCommand\bfseries{% \not@math@alphabet\bfseries\mathbf \expand@font@defaults - \romanseries{% changed \fontseries -> \romanseries - \ifx\f@family\rmdef@ult \bfseries@rm - \else\ifx\f@family\sfdef@ult \bfseries@sf - \else\ifx\f@family\ttdef@ult \bfseries@tt - \else \bfdefault + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\bfseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\bfseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\bfseries@tt + \else \romanseries\bfdefault \fi\fi\fi - }% - \kanjiseries{% - \ifx\k@family\mcdef@ult \bfseries@mc - \else\ifx\k@family\gtdef@ult \bfseries@gt - \else \bfdefault + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt + \else \kanjiseries\bfdefault \fi\fi - }% \selectfont } \DeclareRobustCommand\mdseries{% \not@math@alphabet\mdseries\relax \expand@font@defaults - \romanseries{% changed \fontseries -> \romanseries - \ifx\f@family\rmdef@ult \mdseries@rm - \else\ifx\f@family\sfdef@ult \mdseries@sf - \else\ifx\f@family\ttdef@ult \mdseries@tt - \else \mddefault + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\mdseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\mdseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\mdseries@tt + \else \romanseries\mddefault \fi\fi\fi - }% - \kanjiseries{% - \ifx\k@family\mcdef@ult \mdseries@mc - \else\ifx\k@family\gtdef@ult \mdseries@gt - \else \mddefault + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt + \else \kanjiseries\mddefault \fi\fi - }% \selectfont } \fi \ifx\prepare@family@series@update\@undefined % old \let\prepare@family@series@update@kanji\@undefined \let\@meta@family@list@kanji\@undefined +\let\update@series@target@value@kanji\@undefined \else % 2020-02-02 \def\prepare@family@series@update#1#2{% + \if@forced@series + \romanfamily#2% % changed \fontfamily -> \romanfamily + \else \expand@font@defaults \let\target@series@value\@empty \def\target@meta@family@value{#1}% + \expandafter\edef\csname ??def@ult\endcsname{\f@family}% \let\@elt\update@series@target@value \@meta@family@list + \@elt{??}% \let\@elt\relax \romanfamily#2% % changed \fontfamily -> \romanfamily \ifx\target@series@value\@empty \else - \maybe@load@fontshape - \let\f@series\target@series@value + \ifx \f@series\target@series@value + \else + \maybe@load@fontshape + \let\f@series\target@series@value + \fi \fi + \fi } \def\prepare@family@series@update@kanji#1#2{% + \if@forced@series + \kanjifamily#2% + \else \expand@font@defaults \let\target@series@value\@empty \def\target@meta@family@value{#1}% + \expandafter\edef\csname ??def@ult\endcsname{\k@family}% \let\@elt\update@series@target@value@kanji \@meta@family@list@kanji + \@elt{??}% \let\@elt\relax \kanjifamily#2% \ifx\target@series@value\@empty \else - \begingroup\let\f@encoding\k@encoding\let\f@family\k@family - \maybe@load@fontshape\endgroup - \let\k@series\target@series@value + \ifx \k@series\target@series@value + \else + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \let\k@series\target@series@value + \fi \fi + \fi } \def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}} \def\update@series@target@value@kanji#1{% @@ -773,16 +797,16 @@ of this package available from CTAN} \else \expandafter\ifx\csname#1def@ult\endcsname\k@family \let\@elt\@gobble - \expandafter\let\expandafter\@reservedb + \expandafter\let\expandafter\reserved@b \csname mdseries@\target@meta@family@value\endcsname - \expandafter\let\expandafter\@reservedc + \expandafter\let\expandafter\reserved@c \csname bfseries@\target@meta@family@value\endcsname \expandafter\ifx\csname mdseries@#1\endcsname\k@series - \let\target@series@value\@reservedb + \let\target@series@value\reserved@b \else\expandafter\ifx\csname bfseries@#1\endcsname\k@series - \let\target@series@value\@reservedc - \else\ifx\k@series\mddef@ult \let\target@series@value\@reservedb - \else\ifx\k@series\bfdef@ult \let\target@series@value\@reservedc + \let\target@series@value\reserved@c + \else\ifx\k@series\mddef@ult \let\target@series@value\reserved@b + \else\ifx\k@series\bfdef@ult \let\target@series@value\reserved@c \fi\fi\fi\fi \fi \fi diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 222f7c9d2fd..3c7172412f0 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -34,7 +34,7 @@ \def\pfmtname{pLaTeX2e} \def\pfmtversion {2020-02-02} -\def\ppatch@level{2} +\def\ppatch@level{3} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -676,21 +676,31 @@ \if@notkfam\if@notffam \edef\k@family{#1}\edef\f@family{#1}% \fi\fi} +\ifx\fontseriesforce\@undefined % old +\else % 2020-02-02 + \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.} + \@@end + \fi +\fi \ifx\fontseriesforce\@undefined % old \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} \else % 2020-02-02 -\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} -\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} +\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}} +\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} \fi \ifx\fontseriesforce\@undefined % old \let\romanseriesforce\@undefined \let\kanjiseriesforce\@undefined \else % 2020-02-02 -\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}} -\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} +\DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}} +\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\edef\k@series{#1}} \DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} \fi \ifx\fontseriesforce\@undefined % old @@ -728,7 +738,7 @@ } \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}% + \expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series } \fi \ifx\fontshapeforce\@undefined % old @@ -832,72 +842,87 @@ \DeclareRobustCommand\bfseries{% \not@math@alphabet\bfseries\mathbf \expand@font@defaults - \romanseries{% changed \fontseries -> \romanseries - \ifx\f@family\rmdef@ult \bfseries@rm - \else\ifx\f@family\sfdef@ult \bfseries@sf - \else\ifx\f@family\ttdef@ult \bfseries@tt - \else \bfdefault + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\bfseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\bfseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\bfseries@tt + \else \romanseries\bfdefault \fi\fi\fi - }% - \kanjiseries{% - \ifx\k@family\mcdef@ult \bfseries@mc - \else\ifx\k@family\gtdef@ult \bfseries@gt - \else \bfdefault + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt + \else \kanjiseries\bfdefault \fi\fi - }% \selectfont } \DeclareRobustCommand\mdseries{% \not@math@alphabet\mdseries\relax \expand@font@defaults - \romanseries{% changed \fontseries -> \romanseries - \ifx\f@family\rmdef@ult \mdseries@rm - \else\ifx\f@family\sfdef@ult \mdseries@sf - \else\ifx\f@family\ttdef@ult \mdseries@tt - \else \mddefault + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\mdseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\mdseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\mdseries@tt + \else \romanseries\mddefault \fi\fi\fi - }% - \kanjiseries{% - \ifx\k@family\mcdef@ult \mdseries@mc - \else\ifx\k@family\gtdef@ult \mdseries@gt - \else \mddefault + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt + \else \kanjiseries\mddefault \fi\fi - }% \selectfont } \fi \ifx\prepare@family@series@update\@undefined % old \let\prepare@family@series@update@kanji\@undefined \let\@meta@family@list@kanji\@undefined +\let\update@series@target@value@kanji\@undefined \else % 2020-02-02 \def\prepare@family@series@update#1#2{% + \if@forced@series + \romanfamily#2% % changed \fontfamily -> \romanfamily + \else \expand@font@defaults \let\target@series@value\@empty \def\target@meta@family@value{#1}% + \expandafter\edef\csname ??def@ult\endcsname{\f@family}% \let\@elt\update@series@target@value \@meta@family@list + \@elt{??}% \let\@elt\relax \romanfamily#2% % changed \fontfamily -> \romanfamily \ifx\target@series@value\@empty \else - \maybe@load@fontshape - \let\f@series\target@series@value + \ifx \f@series\target@series@value + \else + \maybe@load@fontshape + \let\f@series\target@series@value + \fi \fi + \fi } \def\prepare@family@series@update@kanji#1#2{% + \if@forced@series + \kanjifamily#2% + \else \expand@font@defaults \let\target@series@value\@empty \def\target@meta@family@value{#1}% + \expandafter\edef\csname ??def@ult\endcsname{\k@family}% \let\@elt\update@series@target@value@kanji \@meta@family@list@kanji + \@elt{??}% \let\@elt\relax \kanjifamily#2% \ifx\target@series@value\@empty \else - \begingroup\let\f@encoding\k@encoding\let\f@family\k@family - \maybe@load@fontshape\endgroup - \let\k@series\target@series@value + \ifx \k@series\target@series@value + \else + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \let\k@series\target@series@value + \fi \fi + \fi } \def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}} \def\update@series@target@value@kanji#1{% @@ -906,16 +931,16 @@ \else \expandafter\ifx\csname#1def@ult\endcsname\k@family \let\@elt\@gobble - \expandafter\let\expandafter\@reservedb + \expandafter\let\expandafter\reserved@b \csname mdseries@\target@meta@family@value\endcsname - \expandafter\let\expandafter\@reservedc + \expandafter\let\expandafter\reserved@c \csname bfseries@\target@meta@family@value\endcsname \expandafter\ifx\csname mdseries@#1\endcsname\k@series - \let\target@series@value\@reservedb + \let\target@series@value\reserved@b \else\expandafter\ifx\csname bfseries@#1\endcsname\k@series - \let\target@series@value\@reservedc - \else\ifx\k@series\mddef@ult \let\target@series@value\@reservedb - \else\ifx\k@series\bfdef@ult \let\target@series@value\@reservedc + \let\target@series@value\reserved@c + \else\ifx\k@series\mddef@ult \let\target@series@value\reserved@b + \else\ifx\k@series\bfdef@ult \let\target@series@value\reserved@c \fi\fi\fi\fi \fi \fi -- cgit v1.2.3