diff options
author | Norbert Preining <norbert@preining.info> | 2020-10-01 03:04:13 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-10-01 03:04:13 +0000 |
commit | d2a6bb90e56a2836bb59477b8f27248aab9149f5 (patch) | |
tree | 5d6be29a531495452688a3c8456355fa58d485f2 /language/japanese/platex/plcore.dtx | |
parent | 36f406d8d1fc994af516d837e6a87c68839cdb2d (diff) |
CTAN sync 202010010304
Diffstat (limited to 'language/japanese/platex/plcore.dtx')
-rw-r--r-- | language/japanese/platex/plcore.dtx | 206 |
1 files changed, 192 insertions, 14 deletions
diff --git a/language/japanese/platex/plcore.dtx b/language/japanese/platex/plcore.dtx index 25f31fbe2c..a56b737c05 100644 --- a/language/japanese/platex/plcore.dtx +++ b/language/japanese/platex/plcore.dtx @@ -124,13 +124,20 @@ % FAM256$B3HD%$"$j$N>l9g$K8B$j%l%8%9%??t$,(B65536$B8D$N$?$a!#(B} % \changes{v1.3d}{2019/10/19}{$B%3%T!<K:$l(B} % \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 +% (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)} +% \changes{v1.3g}{2020/09/28}{\file{plexpl3}$B$GDj5A$7$?L?Na$r;HMQ(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2020/03/05 v1.3e pLaTeX core file] +\ProvidesFile{plcore.dtx}[2020/09/28 v1.3g pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -156,6 +163,7 @@ % \item $B2~9T(B % \item $B%*%V%8%'%/%H$N=PNO=g=x(B % \item $B%H%s%\(B +% \item $B=PNO%k!<%A%s(B % \item $B5SCm%^%/%m(B % \item $BAj8_;2>H(B % \item $B5?;w%?%$%WF~NO(B @@ -786,6 +794,70 @@ \unvbox\footins}\fi \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi } +%</plcore> +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\@vtryfc} +% \LaTeXe\ 2017/01/01$B0J9_$G$O!"Nc$($P(B +%\begin{verbatim} +% \documentclass{tarticle} +% \begin{document} +% \begin{figure} +% \end{figure} +% \clearpage +% a +% \end{document} +%\end{verbatim} +% $B$N$h$&$K$9$k$H!V6u$N%U%m!<%H!W$@$1$N6uGr%Z!<%8$,H/@8$7$^$9!#(B +% $B$3$N$H$-!"=DAH%/%i%9$G$O%U%C%?$,;}$A>e$,$C$F$7$^$&$N$G!"(B +% $BBP:v$7$^$9!#(B(Issue \#78) +% +% $B$J$*!"(B\LaTeXe\ 2015/01/01--2016/03/31 patch level 3$B$G$O(B +%\begin{verbatim} +% ! Output loop---100 consecutive dead cycles. +%\end{verbatim} +% $B$N%(%i!<$,=P$F$$$^$7$?!#(B +% $B$=$l$h$j@N$NHG$G$O6uGr%Z!<%8$OH/@8$7$^$;$s!#(B +% +% $BBP:vJ}K!$O!"(B\file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k(B|\@vtryfc|$B$K(B +% |\ifydir\else\hskip\z@\fi|$B$NDI2C$G$9!J(B|\@makecol|$B$HF1MM!K!#(B +% \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)} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2020/10/01}{\@vtryfc} +%<platexrelease> {Empty float}% +%<*plcore|platexrelease> +\def\@vtryfc #1{% + \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}% + \let\@elt\@wtryfc + \@flsucceed + \global\setbox\@outputbox \vbox to\@colht{% + \vskip \@fptop + \vskip -\@fpsep + \unvbox \@outputbox + \vskip \@fpbot}% + \let\@elt\relax + \xdef #1{\@failedlist\@flfail}% + \xdef\@freelist{\@freelist\@flsucceed}} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@vtryfc} +%<platexrelease> {LaTeX2e original}% +%<platexrelease>\def\@vtryfc #1{% +%<platexrelease> \global\setbox\@outputbox\vbox{}% +%<platexrelease> \let\@elt\@wtryfc +%<platexrelease> \@flsucceed +%<platexrelease> \global\setbox\@outputbox \vbox to\@colht{% +%<platexrelease> \vskip \@fptop +%<platexrelease> \vskip -\@fpsep +%<platexrelease> \unvbox \@outputbox +%<platexrelease> \vskip \@fpbot}% +%<platexrelease> \let\@elt\relax +%<platexrelease> \xdef #1{\@failedlist\@flfail}% +%<platexrelease> \xdef\@freelist{\@freelist\@flsucceed}} +%<platexrelease>\plEndIncludeInRelease % \end{macrocode} % \end{macro} % @@ -798,6 +870,7 @@ % |\iftombow|$B$O%H%s%\$r=PNO$9$k$+$I$&$+!"(B|\iftombowdate|$B$O(BDVI$B$r:n@.$7$?(B % $BF|IU$r%H%s%\$NOF$K=PNO$9$k$+$I$&$+$r<($9$?$a$KMQ$$$^$9!#(B % \begin{macrocode} +%<*plcore> \newif\iftombow \tombowfalse \newif\iftombowdate \tombowdatetrue % \end{macrocode} @@ -1139,7 +1212,7 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\@tombowreset@@paper} +% \begin{macro}{\@tombowreset@@paper} % $B%H%s%\=PNO%*%W%7%g%s$,;XDj$5$l$F$$$k>l9g$K(B % $BMQ;f%5%$%:$r:F@_Dj$9$kL?Na$G$9!#(B % |\@outputpage|$B$X2C$($kJQ99$r4J7i$K$9$k$?$a!"J,N%$7$?>e$G(B @@ -1169,17 +1242,21 @@ %<platexrelease>\plEndIncludeInRelease %<*plcore> % \end{macrocode} -% \end{macro} +% \end{macro} % -% \begin{macro}{\@shipoutsetup} +% +% \subsection{$B=PNO%k!<%A%s(B} +% $B$3$3$G<B:]$K%H%s%\$r=PNO$7$^$9!#(B +% +% \begin{macro}{\@shipoutsetup} % \changes{v1.1i}{1998/02/03}{Command removed} % |\@outputpage|$BFb$KA^F~$7$?$N$G:o=|$7$^$7$?!#(B -% \end{macro} +% \end{macro} % % \begin{macro}{\@outputpage} % |\textwidth|$B$H(B|\textheight|$B$N8r49$O!"(B|\@shipoutsetup|$BFb$G$O9T$J$$$^$;$s!#(B % $B$J$<$J$i!"(B|\@shipoutsetup|$B%^%/%m$,<B9T$5$l$k$H$-$O!"(B -% |\shipout|$B$5$l$k(Bvbox$B$NCf$G$"$j!"$3$N$H$-$O2#AH%b!<%I$G$9$N$G!"(B +% |\shipout|$B$5$l$k(B|\vbox|$B$NCf$G$"$j!"$3$N$H$-$O2#AH%b!<%I$G$9$N$G!"(B % $B$D$M$K(B|\iftdir|$B$O56$HH=CG$5$l!"=D$H2#$N%5%$%:$r8r49$G$-$J$$$+$i$G$9!#(B % % $B$J$*!"$3$NJQ99$r%m!<%+%k$J$b$N$K$9$k$?$a$K!"(B @@ -1434,6 +1511,10 @@ % \end{macro} % % \begin{macro}{\AtBeginDvi} +% \LaTeXe{}$B$N%P!<%8%g%s$,(B2020-02-02$B$^$G$N>l9g!'(B +% |\AtBeginDvi|$B$,!V(B|\unvbox|$B$7$F$+$i:F$S(B|\vbox|$B$9$k!W$H$$$&F0:n$N$?$a!"(B +% $B:FDj5A$,I,MW$G$9!#(B +% \begin{quote} % p\LaTeX{}$B$N=PNO%k!<%A%s$N(B|\@outputpage|$B$G$O!"(B|\shipout|$B$9$k(Bvbox$B$NCf?H$K(B % |\yoko|$B$r;XDj$7$F$$$^$9!#$3$N$?$a!"(B|\AtBeginDocument{\AtBeginDvi{}}|$B$H$$$&(B % $B%3!<%I$r=q$/$H(B\texttt{Incompatible direction list can't be unboxed.}$B$H$$$&(B @@ -1445,40 +1526,137 @@ % |\@begindvibox|$B$O!J6u$G$J$$8B$j!K>o$K2#AH$G$J$1$l$P$J$i$J$$(B % \end{center} % $B$H2>Dj$7$^$9!#$3$N2>Dj$K=>$$!"(B|\AtBeginDvi|$B$r:FDj5A$7$^$9!#(B +% \end{quote} % \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}$B$r>o$K2#AH$K(B} % \changes{v1.3c}{2019/09/16}{Make \cs{AtBeginDvi} robust % (sync with ltoutput.dtx 2019/08/27 v1.4e)} +% +% \LaTeXe~2020-10-01$B0J9_!'(B|\AtBeginDvi|$B$O%U%C%/$K$I$s$I$s%3!<%I$rDI2C$7$F(B +% $B$$$/$@$1$G$9$N$G!":FDj5A$OITMW$G$9!#0lJ}!"Be$o$j$K(B +% |\__shipout_execute_cont:|$B$r:FDj5A$9$kI,MW$,$"$j$^$9!#(B +% \changes{v1.3f}{2020/09/26}{\cs{AtBeginDvi}$B$r:FDj5A$7$J$$(B +% (checked ltshipout.dtx 2020/09/21 v1.0c)} % \begin{macrocode} %</plcore> -%<platexrelease>\plIncludeInRelease{2019/10/01}{\AtBeginDvi} -%<platexrelease> {Make robust}% +%<platexrelease>\plIncludeInRelease{2020/10/01}{\AtBeginDvi} +%<platexrelease> {Adapt to new shipout code}% %<*plcore|platexrelease> +\chardef\pltx@AtBeginDvi@untouched\z@ +% for LaTeX2e 2020-10-01 or later +\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +\ExplSyntaxOn +\if_cs_exist:N \__shipout_add_firstpage_material:Nn + \chardef\pltx@AtBeginDvi@untouched\@ne +%<platexrelease>\DeclareRobustCommand \AtBeginDvi +%<platexrelease> {\__shipout_add_firstpage_material:Nn \AtBeginDvi} +\fi: +\ExplSyntaxOff +\fi %--- expl3 available END +% for LaTeX2e 2020-02-02 PL5 or older +\ifnum\pltx@AtBeginDvi@untouched>\z@\else \DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox - \vbox{\yoko \unvbox \@begindvibox #1}% -} + \vbox{\yoko \unvbox \@begindvibox #1}}% +\fi +% done +\let\pltx@AtBeginDvi@untouched\@undefined %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2019/10/01}{\AtBeginDvi} +%<platexrelease> {Make robust}% +%<platexrelease>\DeclareRobustCommand \AtBeginDvi [1]{% +%<platexrelease> \global \setbox \@begindvibox +%<platexrelease> \vbox{\yoko \unvbox \@begindvibox #1}} +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{2016/07/01}{\AtBeginDvi} %<platexrelease> {Fix for incompatible direction}% %<platexrelease>\def \AtBeginDvi #1{% %<platexrelease> \global \setbox \@begindvibox -%<platexrelease> \vbox{\yoko \unvbox \@begindvibox #1}% -%<platexrelease>} +%<platexrelease> \vbox{\yoko \unvbox \@begindvibox #1}} %<platexrelease>\expandafter \let \csname AtBeginDvi \endcsname \@undefined %<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\AtBeginDvi} %<platexrelease> {LaTeX2e original}% %<platexrelease>\def \AtBeginDvi #1{% %<platexrelease> \global \setbox \@begindvibox -%<platexrelease> \vbox{\unvbox \@begindvibox #1}% -%<platexrelease>} +%<platexrelease> \vbox{\unvbox \@begindvibox #1}} %<platexrelease>\expandafter \let \csname AtBeginDvi \endcsname \@undefined %<platexrelease>\plEndIncludeInRelease %<*plcore> % \end{macrocode} % \end{macro} % +% \begin{macro}{shipout-execute-cont} +% \LaTeXe~2020-10-01$B0J9_!'(B\file{ltshipout.dtx}$B$,%Y!<%9$G$9!#(B +% $B$?$@$7!"=DAH%/%i%9$G$bDL$k$h$&$K$9$k$?$a!"0J2<$NJ}K!$r:N$j$^$9!#(B +% \begin{itemize} +% \item |\shipout|$B<B9T;~$NAHJ}8~$,2#AH$J$i!"(B|\yoko|$B$r<B9T$;$:$=$N$^$^!#(B +% \item $B2#AH$G$J$$>l9g$O(B|\__shipout_execute_cont:|$B$r2#AH%\%C%/%9(B\\ +% |\l__platex_shipout_dummy_box|$B$G3g$C$F<B9T$9$k!J"(!K!#(B +% \item |\l_shipout_box|$B$,2#AH$G$J$$>l9g$O;vA0$K2#AH2=$9$k!#(B +% \end{itemize} +% $BCm0U!'>e5-"($N<BAu$K$h$j!"=DAH%/%i%9$G$O(B +% $B!V(B|\AtBeginShipout|$B$NCf?H$,30It?bD>%b!<%I$G<B9T$5$l$k$3$H!W$r(B +% $BA[Dj$7$?;HMQ!JNc!'(Bplatex-tools issue \#15$B!K$O%5%]!<%H$5$l$^$;$s!#(B +% ^^A $B=>Mh$N(B\file{pxatbegshi}$B%Q%C%1!<%8$K$bF1MM$N@)Ls$,$"$j$^$7$?!#(B +% ^^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 +% (checked ltshipout.dtx 2020/09/21 v1.0c)} +% \changes{v1.3g}{2020/09/28}{\file{plexpl3}$B$GDj5A$7$?L?Na$r;HMQ(B} +% \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2020/10/01}{\__shipout_execute_cont:} +%<platexrelease> {Adapt to new shipout code}% +%<*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_set:Npn \__shipout_execute_cont: + { + % if \l_shipout_box is not a \yoko-box (= horizontal writing), + % then make it a \yoko-box behorehand. + \platex_if_box_yoko:NF \l_shipout_box { + \vbox_set:Nn \l_shipout_box + { + \platex_direction_yoko: + \box_use:N \l_shipout_box + } + } + % if the current direction is not \yoko, + % then enclose \__shipout_execute_cont: with + % a dummy \yoko-box named \l__platex_shipout_dummy_box. + \platex_if_direction_yoko:TF { + \__platex_original_shipout_execute_cont: + }{ + \vbox_set:Nn \l__platex_shipout_dummy_box + { + \platex_direction_yoko: + \__platex_original_shipout_execute_cont: + } + % [Limitation] the code above may discard some contents, + % so we'd like to put it back by \box\l__platex_shipout_dummy_box. + % however, an infinite loop occurs if we uncomment the line below + % so we can't. + %\box_use:N \l__platex_shipout_dummy_box + } + } +\fi: +\ExplSyntaxOff +\fi %--- expl3 available END +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\__shipout_execute_cont:} +%<platexrelease> {LaTeX2e original}% +%<platexrelease>% do nothing +%<platexrelease>\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} +% \end{macro} +% % % \subsection{$B5SCm%^%/%m(B} % $B5SCm$rAH$_N)$F$kItJ,$N%^%/%m$r:FDj5A$7$^$9!#(B |