platex (4jun21)

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

4 files changed, 130 insertions, 17 deletions

diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx
index 6e61ab38c94..118a6ad96f3 100644
--- a/Master/texmf-dist/source/platex/base/plcore.dtx
+++ b/Master/texmf-dist/source/platex/base/plcore.dtx
@@ -126,7 +126,7 @@
 % \changes{v1.3e}{2020/03/05}{$B9g;z=hM}$rM^;_$7$D$D(B\cs{xkanjiskip}$B$OA^F~(B}
 % \changes{v1.3f}{2020/09/26}{\cs{AtBeginDvi}$B$r:FDj5A$7$J$$(B
 %    (checked ltshipout.dtx 2020/09/21 v1.0c)}
-% \changes{v1.3f}{2020/09/26}{\cs{\_\_shipout_execute_cont:}$B$r:FDj5A(B
+% \changes{v1.3f}{2020/09/26}{\cs{\_\_shipout\_execute\_cont:}$B$r:FDj5A(B
 %    (checked ltshipout.dtx 2020/09/21 v1.0c)}
 % \changes{v1.3g}{2020/09/28}{$B=DAH$G6u$N%U%m!<%H$@$1$N%Z!<%8$N(B
 %    $B%U%C%?(B(Issue 78)}
@@ -134,13 +134,14 @@
 % \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01$B$KH<$&=$@5(B}
 % \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}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plcore.dtx}[2021/03/25 v1.3i pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2021/06/03 v1.3j pLaTeX core file]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plcore.dtx}
@@ -1641,9 +1642,10 @@
 % ^^A $BK\Ev$O!"=hM}=*N;;~$K(B|\box\l__platex_shipout_dummy_box|$B$7$F(B
 % ^^A $B%a%$%s?bD>%j%9%H$KCf?H$rLa$7$?$$$N$G$9$,!"(B
 % ^^A $B$J$<$+L58B%k!<%W$,5/$-$k$?$a<B9T$7$F$$$^$;$s!#(B
-% \changes{v1.3f}{2020/09/26}{\cs{shipout-execute-cont}$B$r:FDj5A(B
+% \changes{v1.3f}{2020/09/26}{\cs{\_\_shipout\_execute\_cont:}$B$r:FDj5A(B
 %    (checked ltshipout.dtx 2020/09/21 v1.0c)}
 % \changes{v1.3g}{2020/09/28}{\file{plexpl3}$B$GDj5A$7$?L?Na$r;HMQ(B}
+% \changes{v1.3j}{2021/06/03}{$B4,La$7%3!<%I$N%(%i!<=$@5(B}
 %    \begin{macrocode}
 %</plcore>
 %<platexrelease>\plIncludeInRelease{2020/10/01}{\__shipout_execute_cont:}
@@ -1651,9 +1653,14 @@
 %<*plcore|platexrelease>
 \ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
 \ExplSyntaxOn
-\if_cs_exist:N \__shipout_execute_cont:
-\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont:
-\box_new:N \l__platex_shipout_dummy_box
+\cs_if_exist:NT \__shipout_execute_cont: { %--- IF LEVEL 1 BEGIN
+\cs_if_exist:NF \__platex_original_shipout_execute_cont: {
+  \cs_new_eq:NN \__platex_original_shipout_execute_cont:
+                \__shipout_execute_cont:
+  }
+\cs_if_exist:NF \l__platex_shipout_dummy_box {
+    \box_new:N \l__platex_shipout_dummy_box
+  }
 \cs_set:Npn \__shipout_execute_cont:
   {
     % if \l_shipout_box is not a \yoko-box (= horizontal writing),
@@ -1683,7 +1690,7 @@
       %\box_use:N \l__platex_shipout_dummy_box
     }
   }
-\fi:
+}                                          %--- IF LEVEL 1 END
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1692,10 +1699,13 @@
 % $BI,MW$J$N$G!"$=$l$r9T$$$^$9!#(B
 % \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01$B$G$O(B
 %                 \cs{\_\_shipout\_execute\_nohooks\_cont:}$B$,DI2C$5$l$?(B}
+% \changes{v1.3j}{2021/06/03}{$B4,La$7%3!<%I$N%(%i!<=$@5(B}
 %    \begin{macrocode}
-\if_cs_exist:N \__shipout_execute_nohooks_cont:
-\cs_new_eq:NN \__platex_original_shipout_execute_nohooks_cont:
-              \__shipout_execute_nohooks_cont:
+\cs_if_exist:NT \__shipout_execute_nohooks_cont: { %--- IF LEVEL 1 BEGIN
+\cs_if_exist:NF \__platex_original_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 {
@@ -1715,7 +1725,7 @@
         }
     }
   }
-\fi:
+}                                                  %--- IF LEVEL 1 END
 \ExplSyntaxOff
 \fi                     %--- expl3 available END
 %</plcore|platexrelease>
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index 4474d8a36e5..a46eb001015 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -184,13 +184,15 @@
 % \changes{v1.7l}{2021/05/23}{Unset the forced series boolean when reaching
 %    \cs{selectfont} (latex2e/444)
 %    (sync with ltfsstrc.dtx 2021/04/26 v3.0o)}
+% \changes{v1.7m}{2021/06/04}{latex2e/444$BBP1~!'(B\cs{@shape@roman@kanji}$B%U%i%0(B
+%    $B$r(B\cs{delayed@k@adjustment}$B$NCf$GJQ99(B/$BI|5"$9$k(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plfonts.dtx}[2021/05/23 v1.7l pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2021/06/04 v1.7m pLaTeX New Font Selection Scheme]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plfonts.dtx}
@@ -323,7 +325,7 @@
 %<*trace>
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{ptrace}
-     [2021/01/10 v1.7k Standard pLaTeX package (font tracing)]
+     [2021/06/04 v1.7m Standard pLaTeX package (font tracing)]
 \RequirePackageWithOptions{tracefnt}
 %</trace>
 %    \end{macrocode}
@@ -2878,6 +2880,8 @@
 % \LaTeXe~2021-06-01$B0J9_$G$O!"%7%'%$%W$N99?7$r(B|\selectfont|$B$^$GCY$i$;$^$9!#(B
 % \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444)
 %    (sync with ltfssaxes.dtx 2020/12/22 v1.0h)}
+% \changes{v1.7m}{2021/06/04}{latex2e/444$BBP1~!'(B\cs{@shape@roman@kanji}$B%U%i%0(B
+%    $B$r(B\cs{delayed@k@adjustment}$B$NCf$GJQ99(B/$BI|5"$9$k(B}
 %    \begin{macrocode}
 %<platexrelease>\plIncludeInRelease{2020/04/12}{\fontshape}
 %<platexrelease>                   {No \k@shape update if unavailable}%
@@ -2905,9 +2909,10 @@
     \expandafter\def\expandafter\delayed@k@adjustment\expandafter
         {\delayed@k@adjustment\delayed@merge@kanji@shape{#1}}}
 \DeclareRobustCommand\fontshape[1]{%
-  \@shape@roman@kanjitrue
-  \kanjishape{#1}\romanshape{#1}%
-  \@shape@roman@kanjifalse}
+    \romanshape{#1}%
+    \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+        {\delayed@k@adjustment\@shape@roman@kanjitrue
+         \delayed@merge@kanji@shape{#1}\@shape@roman@kanjifalse}}
 \fi          % --- for >= 2021-06-01 END
 \fi
 %</plcore|platexrelease>
diff --git a/Master/texmf-dist/source/platex/base/plnewsc16.tex b/Master/texmf-dist/source/platex/base/plnewsc16.tex
new file mode 100644
index 00000000000..c0811bd01fc
--- /dev/null
+++ b/Master/texmf-dist/source/platex/base/plnewsc16.tex
@@ -0,0 +1,94 @@
+%% <2021-06-01>
+\documentclass{plnews}
+\usepackage{minijs}
+
+\publicationyear{2021}% $BH/9TG/(B
+\publicationmonth{06}% $BH/9T7n(B
+\publicationissue{c16}% $BHV9f(B
+\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B}
+
+\def\cs#1{\texttt{\char92\nobreak #1}}
+\def\pTeX{p\kern-.15em\TeX}
+\def\eTeX{$\varepsilon$-\TeX}
+\def\epTeX{$\varepsilon$-\pTeX}
+\def\pLaTeX{p\kern-.05em\LaTeX}
+\def\pLaTeXe{p\kern-.05em\LaTeXe}
+\xspcode`\\=1
+
+\begin{document}
+
+\maketitle
+
+$B%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2021-06-01>}$B$K$D$$$F!"(B
+\pLaTeXe\ \texttt{<2020-10-01>}$B$+$i$N99?72U=j$r(B
+$B$^$H$a$^$7$?!#(Bu\pLaTeXe{}$B$bF1;~$K99?7$7$F$/$@$5$$!#(B
+
+
+\section{\LaTeXe\ \texttt{<2021-06-01>}$BBP1~(B}
+$B"*;29M!'(B|texjporg/platex#96|
+
+$B?7$7$$(B\LaTeXe\ \texttt{<2021-06-01>}$B$G=$@5!&DI2C$5$l$?(B
+$B5!G=!J(B\file{ltnews33}, \file{ltpara-doc}$B$b;2>H!K$N$&$A!"(B
+\pLaTeXe{}$B$NF|K\8l3HD%ItJ,$K1F6A$9$k$b$N$KBP1~$r;\$7$^$7$?!#(B
+$B6qBNE*$K$O!"0J2<$,3:Ev$7$^$9!#(B
+\begin{itemize}
+\item $BCJMn$X$N%U%C%/5!G=(B
+  (Extending the hook concept to paragraphs)
+\item $B=qBNA*BrL?Na(B |\selectfont| $B$X$N%U%C%/5!G=(B
+  (A new hook in |\selectfont|)
+  $B!J$3$l$O=>Mh$N(B |everysel| $B%Q%C%1!<%8$KAjEv!K(B
+\item $B?7(BNFSS$B$X$NDI2C=$@5!'%7%j!<%:!&%7%'%$%W$NJQ99$r(B
+  |\selectfont| $B$^$GCY$i$;$k(B
+  (Change of font series/shape delayed until |\selectfont|)
+\end{itemize}
+
+
+\section{$B3+H/HG$N%F%9%H$N$*4j$$(B}
+$BFC$K(B2020$BG/0J9_!"%*%j%8%J%k$N(B\LaTeX{}$B$,3hH/$K3+H/$5$l$F$*$j!"(B
+$B$=$NJQ99E@$,(B\pLaTeX{}$B$KGH5Z$9$k%1!<%9$,A}$($F$-$^$7$?!#(B
+$B$=$N$h$&$J%1!<%9$N8+Mn$H$7$rHr$1!"$+$D!":#8e(B\pLaTeX{}$B$K(B
+$BF3F~$9$k$+$b$7$l$J$$=$@5$d;EMMJQ99$r;vA0$K%F%9%H$7$F$$$?$@$/(B
+$B$3$H$O!"M=4|$7$J$$%P%0$NKI;_$K$D$J$,$j$^$9!#(B
+$B$<$R3+H/HG$N%F%9%H$K$46(NO$/$@$5$$!#$$$/$D$+$NJ}K!$,$"$j$^$9!#(B
+
+$B:G$b4JC1$JJ}K!$O!VDL>o$N%3%^%s%IL>(B |platex| $B$NBe$o$j$K(B
+|platex-dev| $B$H$$$&%3%^%s%I$r5/F0$9$k!W$H$$$&$b$N$G$9!#(B
+$BDL>o$N%3%^%s%I$O(B
+$B!V(B\LaTeXe{}$B$N(B\emph{$B0BDjHG(B}$B$K(B\pLaTeXe{}$B$r:\$;$?$b$N!W(B
+$B$G$9$,!"(B|-dev| $BIU$-%3%^%s%I$O(B
+$B!V(B\LaTeXe{}$B$N(B\emph{$B3+H/HG(B}$B$K(B\pLaTeXe{}$B$r:\$;$?$b$N!W(B
+$B$K$J$j$^$9!#(B
+$B%3%^%s%I%i%$%s$GD>@\<B9T$9$k$[$+!"0J2<$NJ}K!$G$bMxMQ2DG=$G$9!#(B
+\begin{itemize}
+ \item $B%m!<%+%k%$%s%9%H!<%kITMW$G!"$9$0$K(BWeb$B>e$G(B\pLaTeX{}$B$r(B
+  $B<B9T$G$-$k%5!<%S%9(B
+  Cloud LaTeX (https://cloudlatex.io/ja)
+  $B$K$O!"(B2021/05/09$B0J9_!"(B
+  $B%W%m%8%'%/%H@_Dj$K!V3+H/HG$r;n$9!W$H$$$&5!G=$,MQ0U$5$l$F$$$^$9!#(B
+  $B$3$l$O(B |platex| $B$NBe$o$j$K(B |platex-dev| $B$r5/F0$9$k$b$N$G$9!#(B
+  $B$3$l$G!"0lHL$N%f!<%6$NJ}!9$K$b3+H/HG$N%F%9%H$K;22C$7$F$$$?$@$-(B
+  $B$d$9$/$J$j$^$7$?!#(B
+ \item \TeX Shop$B$d(B\TeX works$B$J$I$N;Y1g4D6-$r;HMQ$9$k>l9g!"(B
+  $B5/F0%3%^%s%IL>$K(B |ptex2pdf -l ...| $B$H$"$k2U=j$r(B
+  |ptex2pdf -ld ...| $B$KJQ99$9$l$P!"3+H/HG$,5/F0$7$^$9!#(B
+\end{itemize}
+$B$3$NJ}K!$K$h$C$F!"(B\pLaTeXe{}$B$,3+H/HG(B\LaTeXe{}$B$KHsBP1~$N2U=j$r(B
+$B$"$V$j=P$9$3$H$,$G$-$^$9!#(B
+
+$B$5$i$K!"(B\pLaTeXe{}$BFCM-$N;n83E*%3!<%I$rG[I[$9$k>l9g$b$"$j$^$9!#(B
+\TeX{}$B%U%!%$%k$NKAF,!J(B|\documentclass|$B$h$jA0!K$G(B
+\begin{verbatim}
+  \RequirePackage{exppl2e}
+\end{verbatim}
+$B$H=q$/$3$H$G!"(B\pLaTeXe{}$B$N3+H/HG%3!<%I$b>e>h$;$G$-$^$9!#(B
+$B>\:Y$O(B\file{exppl2e.pdf}$B$r;2>H$7$F$/$@$5$$!#$3$3$K$O!"(B
+$B$=$NB>$N(B\pLaTeXe{}$B$N4{CN$N@)Ls;v9`$b5-:\$7$F$$$^$9!#(B
+
+$B3+H/HG$r$*;n$7$$$?$@$-!"(B\TeX\ Forum$B$d(BGitHub$B$N(BIssue$B$G$N(B
+$B%P%0Js9p$d$40U8+$r4?7^$7$^$9!#(B
+\begin{itemize}
+\item \texttt{https://github.com/texjporg/platex}
+\item \texttt{https://github.com/texjporg/uplatex}
+\end{itemize}
+
+\end{document}
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 2bacd245538..8b509580f87 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -197,7 +197,7 @@
    {2021-06-01}
 %</plcore|platexrelease>
 %<*plcore>
-\def\ppatch@level{0}
+\def\ppatch@level{1}
 %</plcore>
 %    \end{macrocode}
 % \end{macro}
@@ -496,6 +496,10 @@
 \else
 % for LaTeX2e 2020-10-01 or later
 \AddToHook{begindocument/before}{\p@warn@latexrelease}
+%%% temporary workaround: see latex3/latex2e#577
+\AddToHook{package/before/latexrelease}{\let\saved@pathstack\@kernel@currpathstack}
+\AddToHook{package/after/latexrelease}{\let\@kernel@currpathstack\saved@pathstack}
+%%% [TODO] remove the above when fixed!
 \fi
 %
 \def\p@warn@latexrelease{%