diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 73 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 30 |
2 files changed, 96 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index bff7469dd3e..5fb54b5c8e1 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 {2021-11-15} \edef\platexreleaseversion - {2021-11-15} + {2023-02-14} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -71,7 +71,7 @@ %% File: platexrelease.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{platexrelease} - [2021/02/13 v1.0o latexrelease support for pLaTeX Kernel + [2023/01/08 v1.0p latexrelease support for pLaTeX Kernel (including releases up to \platexreleaseversion)] \ifx\p@warn@latexrelease\@undefined\else \let\p@warn@latexrelease\relax @@ -87,6 +87,9 @@ \PackageWarningNoLine{platexrelease}{% Version of `latexrelease' is newer than\MessageBreak what `platexrelease' knows} + \let\pltx@maybe@gobble\@gobble +\else + \let\pltx@maybe@gobble\@firstofone \fi \edef\sourcepLaTeXdate{% \expandafter\@parse@version\pfmtversion//00\@nil} @@ -119,7 +122,7 @@ \ifnum\requestedpLaTeXdate=\currentpLaTeXdate \PackageWarningNoLine{platexrelease}{% Current format date selected, no patches applied} -\expandafter\endinput +\pltx@maybe@gobble{\expandafter\endinput} \fi \ifnum\currentpLaTeXdate >\expandafter\@parse@version\platexreleaseversion//00\@nil @@ -127,7 +130,7 @@ The current package is for an older pLaTeX format:\MessageBreak pLaTeX \platexreleaseversion\space\MessageBreak Obtain a newer version of this package!} -\expandafter\endinput +\pltx@maybe@gobble{\expandafter\endinput} \fi \ifnum\requestedpLaTeXdate >\expandafter\@parse@version\platexreleaseversion//00\@nil @@ -136,7 +139,7 @@ The current package is for pLaTeX \platexreleaseversion:\MessageBreak It has no patches beyond that date\MessageBreak There may be an updated version\MessageBreak of this package available from CTAN} -\expandafter\endinput +\pltx@maybe@gobble{\expandafter\endinput} \fi \let\pfmtversion\requestedplpatchdate \let\currentpLaTeXdate\requestedpLaTeXdate @@ -146,6 +149,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}% + % * <2023-02-14> + % * <2021-11-15>+1 % * <2021-11-15> % * <2021-06-01>+2 % * <2021-06-01>+1 @@ -3105,6 +3110,64 @@ of this package available from CTAN} {LaTeX2e original}% % do nothing \plEndIncludeInRelease +\plIncludeInRelease{2023/02/14}{\@floatboxreset} +\def\@floatboxreset{% + \pltx@save@float@dir % pLaTeX + \reset@font + \normalsize + \@setminipage +} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@floatboxreset} + {Mention \layoutcaption}% +\def\@floatboxreset{% + \reset@font + \normalsize + \@setminipage +} +\plEndIncludeInRelease +\plIncludeInRelease{2023/02/14}{\@endfloatbox} + {Mention \layoutcaption}% +\def\@endfloatbox{% + \par\vskip\z@skip %% \par\vskip\z@ added 15 Dec 87 + \@minipagefalse + \outer@nobreak + \pltx@check@float@dir % pLaTeX + \egroup %% end of vbox + \color@endbox +} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@endfloatbox} + {Mention \layoutcaption}% +\def\@endfloatbox{% + \par\vskip\z@skip %% \par\vskip\z@ added 15 Dec 87 + \@minipagefalse + \outer@nobreak + \egroup %% end of vbox + \color@endbox +} +\plEndIncludeInRelease +\plIncludeInRelease{2023/02/14}{\pltx@check@float@dir} + {Mention \layoutcaption}% +\def\pltx@save@float@dir{% + \edef\pltx@float@dir@first{\iftdir\tate\else\yoko\fi}} +\def\pltx@check@float@dir{% + \edef\pltx@float@dir@last{\iftdir\tate\else\yoko\fi}% + \ifx\pltx@float@dir@last\pltx@float@dir@first\else + \pltx@err@float@dir + \fi} +\def\pltx@err@float@dir{% + \@latex@error{Direction change inside float!?\MessageBreak + Use \noexpand\layoutcaption provided in + \string\usepackage{plext}}\@ehc +} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\pltx@check@float@dir} + {Mention \layoutcaption}% +\let\pltx@save@float@dir\@undefined +\let\pltx@check@float@dir\@undefined +\let\pltx@err@float@dir\@undefined +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@makefnmark} {Remove extra \xkanjiskip}% \renewcommand\@makefnmark{% diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 7279ad72670..0b3d432b9da 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -34,8 +34,8 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2021-11-15} -\def\ppatch@level{1} + {2023-02-14} +\def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -2167,6 +2167,32 @@ } %--- IF LEVEL 1 END \ExplSyntaxOff \fi %--- expl3 available END +\def\@floatboxreset{% + \pltx@save@float@dir % pLaTeX + \reset@font + \normalsize + \@setminipage +} +\def\@endfloatbox{% + \par\vskip\z@skip %% \par\vskip\z@ added 15 Dec 87 + \@minipagefalse + \outer@nobreak + \pltx@check@float@dir % pLaTeX + \egroup %% end of vbox + \color@endbox +} +\def\pltx@save@float@dir{% + \edef\pltx@float@dir@first{\iftdir\tate\else\yoko\fi}} +\def\pltx@check@float@dir{% + \edef\pltx@float@dir@last{\iftdir\tate\else\yoko\fi}% + \ifx\pltx@float@dir@last\pltx@float@dir@first\else + \pltx@err@float@dir + \fi} +\def\pltx@err@float@dir{% + \@latex@error{Direction change inside float!?\MessageBreak + Use \noexpand\layoutcaption provided in + \string\usepackage{plext}}\@ehc +} \renewcommand\@makefnmark{% \ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}% \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi} |