diff options
author | Karl Berry <karl@freefriends.org> | 2021-05-31 20:22:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-05-31 20:22:08 +0000 |
commit | d7b4bf25c731eaaa8cf7fa74ba1d452e67af0862 (patch) | |
tree | 9de3b8cab8bc8e8155e3953c58fcd4d5d88dd8c9 /Master/texmf-dist/tex/platex/base/platexrelease.sty | |
parent | 1efb89eab8e678c8f4aee660aad3d8008f3feec0 (diff) |
platex (31may21)
git-svn-id: svn://tug.org/texlive/trunk@59404 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex/base/platexrelease.sty')
-rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 134 |
1 files changed, 111 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 5c4d898c4f0..363f98c29d5 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -20,7 +20,7 @@ \edef\p@known@latexreleaseversion {2020-10-01} \edef\platexreleaseversion - {2020-10-01} + {2021-06-01} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -146,7 +146,8 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% - % * <2020-10-01>+2 (prepare for LaTeX2e <2021-05-01>) + % * <2021-06-01> + % * <2020-10-01>+2 % * <2020-10-01>+1 % * <2020-10-01> % * <2020-04-12> @@ -770,10 +771,10 @@ of this package available from CTAN} \fi \size@update} %% -\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN %% \DeclareRobustCommand\selectfont{% - % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN + % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o BEGIN \ifx\delayed@k@adjustment\@empty \else \let\k@shape@saved\k@shape @@ -811,7 +812,8 @@ of this package available from CTAN} \fi \let\delayed@f@adjustment\@empty \fi - % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END + \@forced@seriesfalse + % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o END \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \edef\tmp@item{{\k@encoding}}% @@ -861,14 +863,14 @@ of this package available from CTAN} \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \pickup@font \font@name - \UseHook{selectfont}% since LaTeX2e 2021-05-01 + \UseHook{selectfont}% since LaTeX2e 2021-06-01 \enc@update \ifx\f@linespread\baselinestretch \else \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} %% -\fi % --- for >= 2021-05-01 END +\fi % --- for >= 2021-06-01 END \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\selectfont} {ASCII Corporation original}% @@ -1077,7 +1079,7 @@ of this package available from CTAN} \fi \ifx\delayed@f@adjustment\@undefined % old \let\delayed@k@adjustment\@undefined -\else % 2021-05-01 +\else % 2021-06-01 \let\delayed@k@adjustment\@empty \fi \ifx\fontseriesforce\@undefined % old @@ -1089,7 +1091,7 @@ of this package available from CTAN} \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}} -\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\delayed@merge@font@series{#1}}} @@ -1097,7 +1099,7 @@ of this package available from CTAN} \expandafter\def\expandafter\delayed@k@adjustment\expandafter {\delayed@k@adjustment\delayed@merge@kanji@series{#1}}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} -\fi % --- for >= 2021-05-01 END +\fi % --- for >= 2021-06-01 END \fi \ifx\fontseriesforce\@undefined % old \let\romanseriesforce\@undefined @@ -1107,7 +1109,7 @@ of this package available from CTAN} \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}} -\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\edef\f@series{#1}}} @@ -1115,7 +1117,7 @@ of this package available from CTAN} \expandafter\def\expandafter\delayed@k@adjustment\expandafter {\delayed@k@adjustment\edef\k@series{#1}}} \DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} -\fi % --- for >= 2021-05-01 END +\fi % --- for >= 2021-06-01 END \fi \ifx\fontseriesforce\@undefined % old \let\merge@kanji@series\@undefined @@ -1159,7 +1161,7 @@ of this package available from CTAN} \let\merge@kanji@series@without@substitution\@undefined \let\merge@kanji@series@without@substitution@\@undefined \let\delayed@merge@kanji@series\@undefined -\else % 2021-05-01 +\else % 2021-06-01 \def\merge@kanji@series@without@substitution#1{% \expandafter\expandafter\expandafter \merge@kanji@series@without@substitution@ @@ -1195,7 +1197,7 @@ of this package available from CTAN} \@shape@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@roman@kanjifalse} -\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN \DeclareRobustCommand\romanshape[1]{% \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\delayed@merge@font@shape{#1}}} @@ -1206,7 +1208,7 @@ of this package available from CTAN} \@shape@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@roman@kanjifalse} -\fi % --- for >= 2021-05-01 END +\fi % --- for >= 2021-06-01 END \fi \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\fontshape} @@ -1234,7 +1236,7 @@ of this package available from CTAN} \set@safe@kanji@shape{#1}{}% \edef\f@shape{#1}% } -\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN \DeclareRobustCommand\romanshapeforce[1]{% \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\edef\f@shape{#1}}} @@ -1247,7 +1249,7 @@ of this package available from CTAN} \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\edef\f@shape{#1}}% } -\fi % --- for >= 2021-05-01 END +\fi % --- for >= 2021-06-01 END \fi \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\fontshapeforce} @@ -1346,7 +1348,7 @@ of this package available from CTAN} \let\merge@kanji@shape@without@substitution\@undefined \let\merge@kanji@shape@without@substitution@\@undefined \let\delayed@merge@kanji@shape\@undefined -\else % 2021-05-01 +\else % 2021-06-01 \def\merge@kanji@shape@without@substitution#1{% \expandafter\expandafter\expandafter \merge@kanji@shape@without@substitution@ @@ -1387,7 +1389,7 @@ of this package available from CTAN} \plEndIncludeInRelease \plIncludeInRelease{2020/02/02}{\usefont} {Don't call \fontseries or \fontshape}% -\ifx\set@target@series\@undefined +\ifx\set@target@series\@undefined % old \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \edef\k@series{#3}% @@ -1398,7 +1400,8 @@ of this package available from CTAN} \edef\f@series{#3}% \edef\f@shape{#4}\selectfont \ignorespaces} -\else +\else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \set@target@series@kanji{#3}% @@ -1409,7 +1412,23 @@ of this package available from CTAN} \set@target@series{#3}% \edef\f@shape{#4}\selectfont \ignorespaces} -\fi +\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \set@target@series@kanji{#3}% + \edef\k@shape{#4}% + \let\delayed@k@adjustment\@empty + \selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \set@target@series{#3}% + \edef\f@shape{#4}% + \let\delayed@f@adjustment\@empty + \selectfont + \ignorespaces} +\fi % --- for >= 2021-06-01 END +\fi % done \DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter @@ -1483,6 +1502,7 @@ of this package available from CTAN} } \fi % done \else % --- for <= 2020-02-02 END & for >= 2020-10-01 BEGIN +\ifx\delayed@f@adjustment\@undefined % --- for == 2020-10-01 BEGIN \DeclareRobustCommand\normalfont{% \fontencoding\encodingdefault \edef\f@family{\familydefault}% @@ -1497,6 +1517,24 @@ of this package available from CTAN} \edef\k@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } +\else % --- for == 2020-10-01 END & for >= 2021-06-01 BEGIN +\DeclareRobustCommand\normalfont{% + \fontencoding\encodingdefault + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% + \let\delayed@f@adjustment\@empty + \UseHook{normalfont}% + \@defaultfamilyhook % hookname from 2020/02 will vanish + \selectfont} +\AddToHook{normalfont}{% + \kanjiencoding{\kanjiencodingdefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% + \let\delayed@k@adjustment\@empty +} +\fi % --- for >= 2021-06-01 END \fi % --- for >= 2020-10-01 END \adjustbaseline \let\reset@font\normalfont @@ -2376,6 +2414,10 @@ of this package available from CTAN} \fi \fi} \plEndIncludeInRelease +\def\pltx@adjust@wd@outputbox{% + \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi} +\def\pltx@adjust@wd@outputbox@vtryfc{% + \ifydir\else\pdfprimitive\everypar{}\hskip\z@\fi} \plIncludeInRelease{2017/04/08}{\@makecol} {Take into account depth of footnote}% \gdef\@makecol{% @@ -2407,7 +2449,7 @@ of this package available from CTAN} \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox - \iftdir\vbox{\hskip\z@}\fi + \pltx@adjust@wd@outputbox \vskip -\dimen@ \@textbottom }% @@ -2512,7 +2554,7 @@ of this package available from CTAN} \plIncludeInRelease{2020/10/01}{\@vtryfc} {Empty float}% \def\@vtryfc #1{% - \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}% + \global\setbox\@outputbox\vbox{\pltx@adjust@wd@outputbox@vtryfc}% \let\@elt\@wtryfc \@flsucceed \global\setbox\@outputbox \vbox to\@colht{% @@ -3011,6 +3053,29 @@ of this package available from CTAN} } } \fi: +\if_cs_exist:N \__shipout_execute_nohooks_cont: +\cs_new_eq:NN \__platex_original_shipout_execute_nohooks_cont: + \__shipout_execute_nohooks_cont: +\cs_set:Npn \__shipout_execute_nohooks_cont: + { + \platex_if_box_yoko:NF \l__shipout_raw_box { + \vbox_set:Nn \l__shipout_raw_box + { + \platex_direction_yoko: + \box_use:N \l__shipout_raw_box + } + } + \platex_if_direction_yoko:TF { + \__platex_original_shipout_execute_nohooks_cont: + }{ + \vbox_set:Nn \l__platex_shipout_dummy_box + { + \platex_direction_yoko: + \__platex_original_shipout_execute_nohooks_cont: + } + } + } +\fi: \ExplSyntaxOff \fi %--- expl3 available END \plEndIncludeInRelease @@ -3077,6 +3142,29 @@ of this package available from CTAN} {\protected@xdef\@thefnmark{\thempfn}% \@footnotetext}} \plEndIncludeInRelease +\plIncludeInRelease{2021/06/01}{\@footnotetext} + {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}% +\long\def\@footnotetext#1{% + \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi + \insert\footins{\@tempa% + \reset@font\footnotesize + \interlinepenalty\interfootnotelinepenalty + \splittopskip\footnotesep + \splitmaxdepth \dp\strutbox \floatingpenalty \@MM + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \par + \color@endgroup}\ifhmode\null\fi + \ifnum\pltx@foot@penalty=\z@\else + \penalty\pltx@foot@penalty + \pltx@foot@penalty\z@ + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2016/09/08}{\@footnotetext} {Allow break after \footnote (more fix)}% \long\def\@footnotetext#1{% |