diff options
author | Norbert Preining <norbert@preining.info> | 2021-06-01 03:00:58 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-06-01 03:00:58 +0000 |
commit | 0f69e2fd4a9928663f0cc64b8cac1f0d8baee9d6 (patch) | |
tree | c9ab8a25ba9f5a5dcfb4bef6a51aa35fe07834cb /language/japanese/platex/plcore.dtx | |
parent | 098258765e1921f3e57f38e424272587103189dd (diff) |
CTAN sync 202106010300
Diffstat (limited to 'language/japanese/platex/plcore.dtx')
-rw-r--r-- | language/japanese/platex/plcore.dtx | 138 |
1 files changed, 117 insertions, 21 deletions
diff --git a/language/japanese/platex/plcore.dtx b/language/japanese/platex/plcore.dtx index a56b737c05..6e61ab38c9 100644 --- a/language/japanese/platex/plcore.dtx +++ b/language/japanese/platex/plcore.dtx @@ -3,7 +3,7 @@ % % Copyright 1994-2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2020 Japanese TeX Development Community +% Copyright (c) 2016-2021 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -113,9 +113,9 @@ % \changes{v1.3}{2018/09/02}{\file{platexrelease}$B%P%0=$@5(B} % \changes{v1.3a}{2018/10/31}{\LaTeXe{}$B$H(Bp\LaTeXe{}$B$N99?7%?%$%_%s%0$:$lBP:v$r(B % \file{plvers.dtx} (plfinal) $B$+$i(B\file{plcore.dtx}$B$X0\F0!"(Blatexrelease$BBP:v(B -% (sync with ltfinal 2018/08/24 v2.1f)} +% (sync with ltfinal.dtx 2018/08/24 v2.1f)} % \changes{v1.3b}{2019/02/08}{$BCf1{B7$($N%;%k$G$N(B\cs{unskip}$BBP:v(B -% (sync with lttab 2018/12/30 v1.1p)} +% (sync with lttab.dtx 2018/12/30 v1.1p)} % \changes{v1.3c}{2019/09/16}{Make \cs{AtBeginDvi} robust % (sync with ltoutput.dtx 2019/08/27 v1.4e)} % \changes{v1.3c}{2019/09/16}{Make \cs{underline} robust @@ -126,18 +126,21 @@ % \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)} % \changes{v1.3g}{2020/09/28}{\file{plexpl3}$B$GDj5A$7$?L?Na$r;HMQ(B} +% \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} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2020/09/28 v1.3g pLaTeX core file] +\ProvidesFile{plcore.dtx}[2021/03/25 v1.3i pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -501,6 +504,40 @@ %</fltrace> % \end{macrocode} % +% \begin{macro}{\pltx@adjust@wd@outputbox} +% |\@outputpage|$BFb$G<B9T$5$l$F$$$?(B +% \begin{quote} +% $B=DAH$N:]$K(B|\@outputbox|$B$NFbMF$,6u$N%\%C%/%9$@$1$N>l9g$K!"(B|\wd\@outputbox|$B$,(B +% 0pt$B$K$J$C$F$7$^$$!"7k2L$H$7$F%U%C%?$N0LCV$,$/$k$C$F$7$^$C$F$$$?!#(B +% 0$B$N(B|\hskip|$B$rH/@8$5$;$k$H(B|\wd\@outputbox|$B$NCM$,4|BT$7$?$b$N$H$J$k$N$G!"(B +% $B=DAH$N>l9g$O$=$NJ}K!$GBP=h$9$k!#(B +% +% $B$?$@$7!"(B0$B$N(B|\hskip|$B$rH/@8$5$;$k$H$-!"?eJ?%b!<%I$KF~$C$F$7$^$&$H!"$?$H$($P(B +% longtable$B%Q%C%1!<%8$r;HMQ$7$FI=AHESCf$G2~%Z!<%8$9$k$H$-$K(B|\par -> {\vskip}|$B$N(B +% $BL58B%k!<%W$,5/$-$F$7$^$$$^$9!#$=$3$G!"(B|\vbox|$B$NCf$GH/@8$5$;$^$9!#(B +% \end{quote} +% $B$H$$$&=hM}$r<h$j=P$7$?$b$N$G$9!#(B +% +% \LaTeXe~2021-06-01$B$G$OCJMn3+;O;~$N(B``para/*''$B%U%C%/$,<BAu$5$l$^$9$,!"(B +% $B$=$l$r0l;~E*$KL58z2=$9$k$?$a$K!V%W%j%_%F%#%V$H$7$F$N!W(B|\everypar|$B$r(B +% |\pdfprimitive\everypar|$B$H$7$F8F$S=P$7$F$$$^$9!#(B +% \begin{macrocode} +%<*plcore|platexrelease> +\def\pltx@adjust@wd@outputbox{% + \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@adjust@wd@outputbox@vtryfc} +% |\pltx@adjust@wd@outputbox|$B$HF1MM$N=hM}$G$9$,!"(B|\@vtryfc|$B$G$O(B +% |\vbox|$B$N0LCV$,0[$J$j$^$9!#(B +% \begin{macrocode} +\def\pltx@adjust@wd@outputbox@vtryfc{% + \ifydir\else\pdfprimitive\everypar{}\hskip\z@\fi} +%</plcore|platexrelease> +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\@makecol} % $B$3$N%^%/%m$,AH$_N)$F$kItJ,$NCf?4$H$J$j$^$9!#(B % \file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B @@ -551,14 +588,11 @@ \dimen@ \dp\@outputbox \unvbox \@outputbox % \end{macrocode} -% $B=DAH$N:]$K(B|\@outputbox|$B$NFbMF$,6u$N%\%C%/%9$@$1$N>l9g$K!"(B|\wd\@outputbox|$B$,(B -% 0pt$B$K$J$C$F$7$^$$!"7k2L$H$7$F%U%C%?$N0LCV$,$/$k$C$F$7$^$C$F$$$?!#(B -% 0$B$N(B|\hskip|$B$rH/@8$5$;$k$H(B|\wd\@outputbox|$B$NCM$,4|BT$7$?$b$N$H$J$k$N$G!"(B -% $B=DAH$N>l9g$O$=$NJ}K!$GBP=h$9$k!#(B -% -% $B$?$@$7!"(B0$B$N(B|\hskip|$B$rH/@8$5$;$k$H$-!"?eJ?%b!<%I$KF~$C$F$7$^$&$H!"$?$H$($P(B -% longtable$B%Q%C%1!<%8$r;HMQ$7$FI=AHESCf$G2~%Z!<%8$9$k$H$-$K(B|\par -> {\vskip}|$B$N(B -% $BL58B%k!<%W$,5/$-$F$7$^$$$^$9!#$=$3$G!"(B|\vbox|$B$NCf$GH/@8$5$;$^$9!#(B +% $B<!$N9T$O0JA0$O(B +%\begin{verbatim} +%\iftdir\vbox{\hskip\z@}\fi +%\end{verbatim} +% $B$G$7$?$,!"(B|\pltx@adjust@wd@outputbox|$B$H$7$F@Z$j=P$7$^$7$?!#(B % \changes{v1.1j}{2001/05/10}{\cs{@makecol}$B$GAH$_N)$F$i$l$k(B % \cs{@outputbox}$B$NBg$-$5$,!"=DAH$GCf?H$,6u$N%\%C%/%9$@$1$N>l9g$bE,@5$K$J$k(B % $B$h$&$K=$@5(B} @@ -566,8 +600,10 @@ % $B$h$&$K$9$k(B\texttt{\cs{vskip}~-\cs{dimen@}}$B$,=DAH%b!<%I$G$OL58z$K$J$C$F$$$?$N$G=$@5(B} % \changes{v1.2h}{2016/09/01}{$B=DAH$G(Blongtable$B%Q%C%1!<%8$r;H$C$FI=AH$NESCf$G2~%Z!<%8(B % $B$9$k$H$-L58B%k!<%W$,5/$3$kLdBj$KBP=h(B(Issue 21)} +% \changes{v1.3i}{2021/03/25}{$BHs2#AH;~$K$*$1$k(B +% \cs{@outputbox}$B$N@#K!Jd@5$N%3!<%I$r(B\cs{pltx@adjust@wd@outputbox}$B$H$7$F@Z$j=P$7$?(B} % \begin{macrocode} - \iftdir\vbox{\hskip\z@}\fi + \pltx@adjust@wd@outputbox \vskip -\dimen@ \@textbottom }% @@ -822,15 +858,18 @@ % $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 +% |\ifydir\else\hskip\z@\fi|$B$NDI2C$G$9!J(B|\@makecol|$B$HF1MM!K$,!"(B +% $BJLL?Na(B|\pltx@adjust@wd@outputbox@vtryfc|$B$H$7$F@Z$j=P$7$^$7$?!#(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)} +% \changes{v1.3i}{2021/03/25}{$BHs2#AH;~$K$*$1$k(B +% \cs{@outputbox}$B$N@#K!Jd@5$N%3!<%I$r(B\cs{pltx@adjust@wd@outputbox@vtryfc}$B$H$7$F@Z$j=P$7$?(B} % \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}% + \global\setbox\@outputbox\vbox{\pltx@adjust@wd@outputbox@vtryfc}% \let\@elt\@wtryfc \@flsucceed \global\setbox\@outputbox \vbox to\@colht{% @@ -1586,7 +1625,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{shipout-execute-cont} +% \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} @@ -1645,6 +1684,38 @@ } } \fi: +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\__shipout_execute_nohooks_cont:} +% \LaTeXe~2021-06-01$B$G$O!"F1MM$N=hM}$,(B|\__shipout_execute_nohooks_cont:|$B$K$b(B +% $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} +% \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_set:Npn \__shipout_execute_nohooks_cont: + { + \platex_if_box_yoko:NF \l__shipout_raw_box { + \vbox_set:Nn \l__shipout_raw_box + { + \platex_direction_yoko: + \box_use:N \l__shipout_raw_box + } + } + \platex_if_direction_yoko:TF { + \__platex_original_shipout_execute_nohooks_cont: + }{ + \vbox_set:Nn \l__platex_shipout_dummy_box + { + \platex_direction_yoko: + \__platex_original_shipout_execute_nohooks_cont: + } + } + } +\fi: \ExplSyntaxOff \fi %--- expl3 available END %</plcore|platexrelease> @@ -1811,9 +1882,11 @@ % $B;H$($k$h$&$K:FDj5A$5$l$^$9!#(B % % \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)} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{2016/09/08}{\@footnotetext} -%<platexrelease> {Allow break after \footnote (more fix)}% +%<platexrelease>\plIncludeInRelease{2021/06/01}{\@footnotetext} +%<platexrelease> {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}% %<*plcore|platexrelease> % \end{macrocode} % \begin{macrocode} @@ -1831,6 +1904,7 @@ \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \par % \end{macrocode} % % p\TeX{}$B$G$O(B|\insert|$B$ND>8e$KOBJ8J8;z$,Mh$?>l9g!"$=$3$G$N2~9T$O5v$5$l$J$$(B @@ -1853,6 +1927,28 @@ % \begin{macrocode} %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/09/08}{\@footnotetext} +%<platexrelease> {Allow break after \footnote (more fix)}% +%<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> \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/03}{\@footnotetext} %<platexrelease> {Allow break after \footnote}% %<platexrelease>\long\def\@footnotetext#1{% @@ -2194,7 +2290,7 @@ % $B$J$C$F$$$?%P%0$r=$@5(B} % \changes{v1.2x}{2018/03/01}{\cs{removejfmglue}$B$,$"$l$PMxMQ$9$k$h$&$K$7$?(B} % \changes{v1.3b}{2019/02/08}{$BCf1{B7$($N%;%k$G$N(B\cs{unskip}$BBP:v(B -% (sync with lttab 2018/12/30 v1.1p)} +% (sync with lttab.dtx 2018/12/30 v1.1p)} % ^^A $B$J$<$+(B v1.3b $B$NJQ99$OK\2H(B latexrelease $B$K4^$^$l$J$$$N$G$=$l$K9g$o$;$?(B % \begin{macrocode} %</plcore> @@ -2698,7 +2794,7 @@ % \section{\LaTeXe{}$B$H(Bp\LaTeXe{}$B$N99?7%?%$%_%s%0$:$lBP:v(B} % \changes{v1.3a}{2018/10/31}{\LaTeXe{}$B$H(Bp\LaTeXe{}$B$N99?7%?%$%_%s%0$:$lBP:v$r(B % \file{plvers.dtx} (plfinal) $B$+$i(B\file{plcore.dtx}$B$X0\F0!"(Blatexrelease$BBP:v(B -% (sync with ltfinal 2018/08/24 v2.1f)} +% (sync with ltfinal.dtx 2018/08/24 v2.1f)} % % \begin{macro}{\l@nohyphenation} % $BDL>o$O(BBabel$B$N%O%$%U%M!<%7%g%sDj5A$K$h$jDs6!$5$l$k%Q%i%a!<%?$G$9!#(B |