platex (11dec21)

git-svn-id: svn://tug.org/texlive/trunk@61273 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 96 insertions, 27 deletions

diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md
index 910b447fd89..63fed01732d 100644
--- a/Master/texmf-dist/doc/platex/base/README.md
+++ b/Master/texmf-dist/doc/platex/base/README.md
@@ -1,27 +1,34 @@
 # platex
 
-The bundle provides pLaTeX2e format and miscellaneous macros
-for pTeX and e-pTeX.
-This is a community edition maintained by
+pLaTeX is a Japanese version of LaTeX, which runs on pTeX
+(a TeX engine with extensions for Japanese typesetting).
+This bundle provides the macros and settings needed to generate
+the pLaTeX format (named "pLaTeX2e") and some classes.
+
+Note: This is a community edition maintained by
 [Japanese TeX Development Community](http://texjp.org),
-which forked from the original ASCII edition (ptex-texmf-2.5).
+which forked from the original ASCII edition; see below.
 
 ## Repository
 
-The bundle is maintained on GitHub:
+This bundle is maintained on GitHub:
 https://github.com/texjporg/platex
 
-If you have issues, please let us know from the above page.
+If you have issues, please let us know from the page above.
 
-The original ASCII edition can be obtained from:
+## Changes from the original ASCII edition
 
-- https://asciidwango.github.io/ptex/base/sources.html#platex
+The macros were originally developed by ASCII Corporation
+(a publishing company in Japan).
+We, Japanese TeX Development Community, have created a fork
+to work with the latest version of TeX Live.
 
-## Changes from the original ASCII edition
+The original ASCII edition, pLaTeX2e 2006/11/10,
+was based on pTeX-3.1.10 and LaTeX2e 2005/12/01.
+It can be obtained from the link below:
+- https://asciidwango.github.io/ptex/base/sources.html#platex
 
-The original ASCII edition (pLaTeX2e 2006/11/10) was based on
-pTeX-3.1.10 and LaTeX2e 2005/12/01.
-The community edition (this package) has the following advantages:
+The community edition (this bundle) has the following advantages:
 
 - Fix several bugs in pLaTeX2e format and packages.
 - Fix macros which are inconsistent with the latest pTeX
@@ -64,6 +71,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2021-06-27
+2021-12-11
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/platex/base/platexrelease.pdf b/Master/texmf-dist/doc/platex/base/platexrelease.pdf
index bac4a2ede2d..dde573c150a 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
index a5d49237bb0..7d43f333699 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 78bda1bf649..41452e036b5 100644
--- a/Master/texmf-dist/source/platex/base/platexrelease.dtx
+++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx
@@ -351,6 +351,9 @@ 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}%
+  % * <2021-11-15>
+  % * <2021-06-01>+2
+  % * <2021-06-01>+1
   % * <2021-06-01>
   % * <2020-10-01>+2
   % * <2020-10-01>+1
diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx
index 118a6ad96f3..01f331cef51 100644
--- a/Master/texmf-dist/source/platex/base/plcore.dtx
+++ b/Master/texmf-dist/source/platex/base/plcore.dtx
@@ -135,13 +135,15 @@
 % \changes{v1.3i}{2021/03/25}{\cs{@outputpage}, \cs{@vtryfc}$B$G$N!"Hs2#AH;~$K$*$1$k(B
 %    \cs{@outputbox}$B$N@#K!Jd@5$N%3!<%I$rJLL?Na$H$7$F@Z$j=P$7$?(B}
 % \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}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plcore.dtx}[2021/06/03 v1.3j pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2021/12/08 v1.3l pLaTeX core file]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plcore.dtx}
@@ -268,6 +270,7 @@
 % $B$,F@$i$l$^$9!J:G=i$N(B\verb+\removejfmglue+$B$O7k2LE*$K2?$b$7$F$$$^$;$s!K!#(B
 % \changes{v1.2x}{2018/03/01}{JFM$B%0%k!<%N!<%I$r:o=|$9$k%^%/%mDI2C(B}
 % \changes{v1.3}{2018/09/02}{\cs{removejfmglue}$B$N5sF0$rL@J82=(B}
+% \changes{v1.3k}{2021/06/28}{$BFbIt(BUnicode$B$N;~$N$_$r8!=P(B}
 %    \begin{macrocode}
 %<platexrelease>\plIncludeInRelease{2018/03/09}%
 %<platexrelease>                   {\removejfmglue}{Macro added}%
@@ -278,7 +281,7 @@
   \let\removejfmglue\@undefined
 \else
   \setbox0\hbox{%
-    \ifdefined\ucs %% upTeX check
+    \ifnum\jis"2121="3000 %% upTeX check
       \jfont\tenmin=upjisr-h at 9.62216pt
     \else
       \jfont\tenmin=min10
@@ -1894,9 +1897,11 @@
 % \changes{v1.0a}{1995/04/07}{$BAHJ}8~$NH=Dj$r%\%C%/%9$N30$G$9$k$h$&$K$7$?(B}
 % \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01$B$G$O(B\cs{par}$B$,F~$k(B
 %    (sync with ltfloat.dtx 2021/02/10 v1.2e)}
+% \changes{v1.3l}{2021/12/08}{\LaTeXe~2021-11-15$B$G$O(B\cs{@currentcounter}$B$r(B
+%    $BL@<(E*$K@_Dj$9$k(B(sync with ltfloat.dtx 2021/10/14 v1.2g)}
 %    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2021/06/01}{\@footnotetext}
-%<platexrelease>                   {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}%
+%<platexrelease>\plIncludeInRelease{2021/11/15}{\@footnotetext}
+%<platexrelease>                   {Adapt to ltfloat.dtx (2021-10-14 v1.2g)}%
 %<*plcore|platexrelease>
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -1908,6 +1913,7 @@
     \splittopskip\footnotesep
     \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
     \hsize\columnwidth \@parboxrestore
+    \def\@currentcounter{footnote}%
     \protected@edef\@currentlabel{%
        \csname p@footnote\endcsname\@thefnmark
     }%
@@ -1937,6 +1943,29 @@
 %    \begin{macrocode}
 %</plcore|platexrelease>
 %<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2021/06/01}{\@footnotetext}
+%<platexrelease>                   {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}%
+%<platexrelease>\long\def\@footnotetext#1{%
+%<platexrelease>  \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
+%<platexrelease>  \insert\footins{\@tempa%
+%<platexrelease>    \reset@font\footnotesize
+%<platexrelease>    \interlinepenalty\interfootnotelinepenalty
+%<platexrelease>    \splittopskip\footnotesep
+%<platexrelease>    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+%<platexrelease>    \hsize\columnwidth \@parboxrestore
+%<platexrelease>    \protected@edef\@currentlabel{%
+%<platexrelease>       \csname p@footnote\endcsname\@thefnmark
+%<platexrelease>    }%
+%<platexrelease>    \color@begingroup
+%<platexrelease>      \@makefntext{%
+%<platexrelease>        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%<platexrelease>    \par
+%<platexrelease>    \color@endgroup}\ifhmode\null\fi
+%<platexrelease>    \ifnum\pltx@foot@penalty=\z@\else
+%<platexrelease>      \penalty\pltx@foot@penalty
+%<platexrelease>      \pltx@foot@penalty\z@
+%<platexrelease>    \fi}
+%<platexrelease>\plEndIncludeInRelease
 %<platexrelease>\plIncludeInRelease{2016/09/08}{\@footnotetext}
 %<platexrelease>                   {Allow break after \footnote (more fix)}%
 %<platexrelease>\long\def\@footnotetext#1{%
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 6442add1a2c..8bbd0f6bb2a 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -100,12 +100,13 @@
 % \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}$BHGBP1~3NG'(B}
 % \changes{v1.1x}{2020/10/07}{$B%U%C%/%7%9%F%`$,MxMQ2DG=$+$I$&$+H=Dj(B}
 % \changes{v1.1y}{2021/06/27}{\LaTeX\ \texttt{!<2021-06-01!>}$BHG$[$\BP1~(B}
+% \changes{v1.1z}{2021/12/08}{\LaTeX\ \texttt{!<2021-11-15!>}$BHG$[$\BP1~(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 % \fi
-\ProvidesFile{plvers.dtx}[2021/06/27 v1.1y pLaTeX Kernel (Version Info)]
+\ProvidesFile{plvers.dtx}[2021/12/08 v1.1z pLaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plvers.dtx}
@@ -147,6 +148,7 @@
 % \changes{v1.1s}{2020/03/14}{\LaTeX\ \texttt{!<2020-02-02!> PL5}$BHGBP1~3NG'(B}
 % \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}$BHGBP1~3NG'(B}
 % \changes{v1.1y}{2021/06/27}{\LaTeX\ \texttt{!<2021-06-01!>}$BHG$[$\BP1~(B}
+% \changes{v1.1z}{2021/12/08}{\LaTeX\ \texttt{!<2021-11-15!>}$BHG$[$\BP1~(B}
 %    \begin{macrocode}
 %<*2ekernel>
 %\def\fmtname{LaTeX2e}
@@ -155,7 +157,7 @@
 %<latexrelease>\edef\latexreleaseversion
 %<platexrelease>\edef\p@known@latexreleaseversion
 %<*2ekernel|latexrelease|platexrelease>
-   {2021-06-01}
+   {2021-11-15}
 %</2ekernel|latexrelease|platexrelease>
 %    \end{macrocode}
 %
@@ -196,10 +198,10 @@
 %</plcore>
 %<platexrelease>\edef\platexreleaseversion
 %<*plcore|platexrelease>
-   {2021-06-01}
+   {2021-11-15}
 %</plcore|platexrelease>
 %<*plcore>
-\def\ppatch@level{2}
+\def\ppatch@level{0}
 %</plcore>
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 5c18d5eaf4f..bff7469dd3e 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -18,9 +18,9 @@
 %% 
 %% File: plvers.dtx
 \edef\p@known@latexreleaseversion
-   {2021-06-01}
+   {2021-11-15}
 \edef\platexreleaseversion
-   {2021-06-01}
+   {2021-11-15}
 \newif\if@plincludeinrelease
 \@plincludeinreleasefalse
 \def\plIncludeInRelease#1{%
@@ -146,6 +146,9 @@ 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}%
+  % * <2021-11-15>
+  % * <2021-06-01>+2
+  % * <2021-06-01>+1
   % * <2021-06-01>
   % * <2020-10-01>+2
   % * <2020-10-01>+1
@@ -2342,7 +2345,7 @@ of this package available from CTAN}
   \let\removejfmglue\@undefined
 \else
   \setbox0\hbox{%
-    \ifdefined\ucs %% upTeX check
+    \ifnum\jis"2121="3000 %% upTeX check
       \jfont\tenmin=upjisr-h at 9.62216pt
     \else
       \jfont\tenmin=min10
@@ -3161,6 +3164,30 @@ of this package available from CTAN}
        {\protected@xdef\@thefnmark{\thempfn}%
     \@footnotetext}}
 \plEndIncludeInRelease
+\plIncludeInRelease{2021/11/15}{\@footnotetext}
+                   {Adapt to ltfloat.dtx (2021-10-14 v1.2g)}%
+\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
+    \def\@currentcounter{footnote}%
+    \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{2021/06/01}{\@footnotetext}
                    {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}%
 \long\def\@footnotetext#1{%
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 66dca03b294..321eb942db4 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-06-01}
-\def\ppatch@level{2}
+   {2021-11-15}
+\def\ppatch@level{0}
 \edef\platexBANNER{\noexpand\platexNILa
                    \the\everyjob % LaTeX banner and delayed codes
                    \noexpand\platexNILb}
@@ -1784,7 +1784,7 @@
   \let\removejfmglue\@undefined
 \else
   \setbox0\hbox{%
-    \ifdefined\ucs %% upTeX check
+    \ifnum\jis"2121="3000 %% upTeX check
       \jfont\tenmin=upjisr-h at 9.62216pt
     \else
       \jfont\tenmin=min10
@@ -2187,6 +2187,7 @@
     \splittopskip\footnotesep
     \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
     \hsize\columnwidth \@parboxrestore
+    \def\@currentcounter{footnote}%
     \protected@edef\@currentlabel{%
        \csname p@footnote\endcsname\@thefnmark
     }%