diff options
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/LICENSE | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/README.md | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/platexrelease.pdf | bin | 109693 -> 111387 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/pldoc.pdf | bin | 1367858 -> 1376083 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/platexrelease.dtx | 19 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plcore.dtx | 101 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plvers.dtx | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 73 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 30 |
9 files changed, 215 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/platex/base/LICENSE b/Master/texmf-dist/doc/platex/base/LICENSE index 592f89f5eeb..ab54973a8ce 100644 --- a/Master/texmf-dist/doc/platex/base/LICENSE +++ b/Master/texmf-dist/doc/platex/base/LICENSE @@ -1,5 +1,5 @@ Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016-2022 Japanese TeX Development Community +Copyright (c) 2016-2023 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 80a1542d3ed..aa4ab92e7b2 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -71,6 +71,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2022-12-15 +2023-02-19 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/platexrelease.pdf b/Master/texmf-dist/doc/platex/base/platexrelease.pdf Binary files differindex 00987e078ac..f9223b6dec1 100644 --- a/Master/texmf-dist/doc/platex/base/platexrelease.pdf +++ b/Master/texmf-dist/doc/platex/base/platexrelease.pdf diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf Binary files differindex 078d1737173..69d3856cd07 100644 --- a/Master/texmf-dist/doc/platex/base/pldoc.pdf +++ b/Master/texmf-dist/doc/platex/base/pldoc.pdf diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index a866eb0874e..84a73c9b729 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment %% File: platexrelease.dtx % -% Copyright (c) 2016-2022 Japanese TeX Development Community +% Copyright (c) 2016-2023 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -34,6 +34,7 @@ % \changes{v1.0n}{2020/03/28}{$B@h$K(Blatexrelease$B$,FI$_9~$^$l$F$$$?$i7Y9p(B} % \changes{v1.0o}{2021/02/13}{\cs{sourcepLaTeXdate} added % (sync with latexrelease.dtx 2021/01/23 v1.0l)} +% \changes{v1.0p}{2023/01/08}{latexrelease$B$,?7$7$$>l9g$O>o$K>e=q$-(B} % \fi % % \iffalse @@ -43,7 +44,7 @@ \ProvidesFile{platexrelease.dtx} %</driver> %<platexrelease>\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)] %<*driver> \RequirePackage{plautopatch} @@ -226,13 +227,19 @@ % % $BFI$_9~$s$@(B\Lpack{latexrelease}$B%Q%C%1!<%8$N%P!<%8%g%s$r3NG'$7!"(B % \Lpack{platexrelease}$B$,L$BP1~$N?7$7$$$b$N$G$"$C$?>l9g$K7Y9p$7$^$9!#(B +% $B$3$N>l9g$O!"(B\Lpack{latexrelease}$B$K$h$C$F(Bp\LaTeX{}$B$,>e=q$-$5$l$F(B +% $B2u$l$k$N$rKI$0$?$a!"LdEzL5MQ$G(Bp\LaTeX{}$B$G:FEY>e=q$-$7$^$9!#(B % \changes{v1.0b}{2016/02/16}{latexrelease$B$N%P!<%8%g%s3NG'$rF3F~(B} +% \changes{v1.0p}{2023/01/08}{latexrelease$B$,?7$7$$>l9g$O>o$K>e=q$-(B} % \begin{macrocode} \ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil >\expandafter\@parse@version\p@known@latexreleaseversion//00\@nil \PackageWarningNoLine{platexrelease}{% Version of `latexrelease' is newer than\MessageBreak what `platexrelease' knows} + \let\pltx@maybe@gobble\@gobble +\else + \let\pltx@maybe@gobble\@firstofone \fi % \end{macrocode} % @@ -293,7 +300,7 @@ \ifnum\requestedpLaTeXdate=\currentpLaTeXdate \PackageWarningNoLine{platexrelease}{% Current format date selected, no patches applied} -\expandafter\endinput +\pltx@maybe@gobble{\expandafter\endinput} \fi % \end{macrocode} % @@ -308,7 +315,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 % \end{macrocode} % @@ -322,7 +329,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 % \end{macrocode} % @@ -352,6 +359,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 diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 073138eebe3..afb26bcc5bc 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -3,7 +3,7 @@ % % Copyright 1994-2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2022 Japanese TeX Development Community +% Copyright (c) 2016-2023 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -137,13 +137,14 @@ % \changes{v1.3j}{2021/06/03}{$B4,La$7%3!<%I$N%(%i!<=$@5(B} % \changes{v1.3k}{2021/06/28}{$BFbIt(BUnicode$B$N;~$N$_$r8!=P(B} % \changes{v1.3l}{2021/12/08}{\LaTeXe~2021-11-15$B$KH<$&=$@5(B} +% \changes{v1.3m}{2023/02/14}{$B%U%m!<%H4D6-Fb$G$NAHJ}8~JQ99$r(Bplext$B$KM6F3(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2021/12/08 v1.3l pLaTeX core file] +\ProvidesFile{plcore.dtx}[2023/02/14 v1.3m pLaTeX core file] % \iffalse \RequirePackage{plautopatch} \documentclass[dvipdfmx,a4paper]{jltxdoc} @@ -485,6 +486,7 @@ % $B6XB'J8;z$X$NBP:v$rF~$l$F$$$^$9$,!"(Bplain \TeX{}$B8_49$N%7%s%W%k$J(B % $BL?Na$G$"$k(B|\break|$B$d(B|\nobreak|$B$K$O!"BP:v$r9T$$$^$;$s!#(B % +% % \subsection{$B%*%V%8%'%/%H$N=PNO=g=x(B} % $B%*%j%8%J%k$N(B\LaTeX{}$B$O!"%H%C%W%U%m!<%H!"K\J8!"5SCm!"%\%H%`%U%m!<%H(B % $B$N=gHV$G=PNO$7$^$9$1$l$I$b!"F|K\8lAHHG$G$O!"%H%C%W%U%m!<%H!"K\J8!"(B @@ -1738,9 +1740,102 @@ %<platexrelease> {LaTeX2e original}% %<platexrelease>% do nothing %<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% +% \subsection{$B%U%m!<%H4D6-(B} +% $B?^(B(figure)$B$dI=(B(table)$B$H$$$C$?%U%m!<%H4D6-Fb$G$O(B +% $BAHJ}8~JQ99$r(B|\tate|$B$d(B|\yoko|$B$K$h$C$FD>@\JQ99$7$J$$$G$/$@$5$$!#(B +% $BBe$o$j$K(B\file{plext}$B%Q%C%1!<%8$,Ds6!$9$k(B +% |\layoutcaption| / |\layoutfloat| / |\pcaption|$B$H$$$C$?L?Na$r(B +% $B;H$&$H!"Nc$($P!V=D=q$-Cf$K2#=q$-$G?^I=%-%c%W%7%g%s$rA^F~!W$N$h$&$J(B +% $B<+M3$J;XDj$,$G$-$k$h$&$K$J$j$^$9!#(B(Issue \#95) +% \begin{macro}{\@floatboxreset} +% $B85$O(Bltfloat.dtx$B$GDj5A$5$l$F$$$^$9!#(B +% \changes{v1.3m}{2023/02/14}{$B%U%m!<%H4D6-Fb$G$NAHJ}8~JQ99$r(Bplext$B$KM6F3(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2023/02/14}{\@floatboxreset} +%<*plcore|platexrelease> +\def\@floatboxreset{% + \pltx@save@float@dir % pLaTeX + \reset@font + \normalsize + \@setminipage +} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@floatboxreset} +%<platexrelease> {Mention \layoutcaption}% +%<platexrelease>\def\@floatboxreset{% +%<platexrelease> \reset@font +%<platexrelease> \normalsize +%<platexrelease> \@setminipage +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@endfloatbox} +% $B85$O(Bltfloat.dtx$B$GDj5A$5$l$F$$$^$9!#(B +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2023/02/14}{\@endfloatbox} +%<platexrelease> {Mention \layoutcaption}% +%<*plcore|platexrelease> +\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 +} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@endfloatbox} +%<platexrelease> {Mention \layoutcaption}% +%<platexrelease>\def\@endfloatbox{% +%<platexrelease> \par\vskip\z@skip %% \par\vskip\z@ added 15 Dec 87 +%<platexrelease> \@minipagefalse +%<platexrelease> \outer@nobreak +%<platexrelease> \egroup %% end of vbox +%<platexrelease> \color@endbox +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@save@float@dir} +% \begin{macro}{\pltx@check@float@dir} +% \pLaTeX{}$B$K$h$kDI2CL?Na$G$9!#(B +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2023/02/14}{\pltx@check@float@dir} +%<platexrelease> {Mention \layoutcaption}% +%<*plcore|platexrelease> +\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 +} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@check@float@dir} +%<platexrelease> {Mention \layoutcaption}% +%<platexrelease>\let\pltx@save@float@dir\@undefined +%<platexrelease>\let\pltx@check@float@dir\@undefined +%<platexrelease>\let\pltx@err@float@dir\@undefined +%<platexrelease>\plEndIncludeInRelease %<*plcore> % \end{macrocode} % \end{macro} +% \end{macro} % % % \subsection{$B5SCm%^%/%m(B} @@ -2277,6 +2372,7 @@ % \end{macrocode} % \end{macro} % +% % \subsection{$BMQ8l=8$N=PNO(B} % \LaTeX{}$B$K$O!"$J$<$+MQ8l=8$r=PNO$9$k$?$a$N%3%^%s%I$,$"$j$^$;$s$N$G!"(B % $BDI2C$r$7$^$9!#(B @@ -2310,6 +2406,7 @@ % \end{macro} % \end{macro} % +% % \subsection{tabular$B4D6-(B} % \LaTeX{}$B%+!<%M%k(B(lttab.dtx)$B$NL?Na72$r=$@5$7$^$9!#(B % diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 577d32b2be0..79c7fc1db4a 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -3,7 +3,7 @@ % % Copyright 1995-2006 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2022 Japanese TeX Development Community +% Copyright (c) 2016-2023 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -201,10 +201,10 @@ %</plcore> %<platexrelease>\edef\platexreleaseversion %<*plcore|platexrelease> - {2021-11-15} + {2023-02-14} %</plcore|platexrelease> %<*plcore> -\def\ppatch@level{1} +\def\ppatch@level{0} %</plcore> % \end{macrocode} % \end{macro} @@ -306,7 +306,7 @@ % \end{macrocode} % % \pLaTeXe{}$B$N%P!<%8%g%sI=<($r:n$j$^$9!#(B -% \changes{v1.2a}{2022-12-05}{|\space|$B$r$3$NCJ3,$GF~$l$k$N$O;_$a$?!#(B} +% \changes{v1.2a}{2022-12-05}{\cs{space}$B$r$3$NCJ3,$GF~$l$k$N$O;_$a$?(B} % \begin{macrocode} \ifnum\ppatch@level=0 \toks2={\pfmtname\space<\pfmtversion>}% 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} |