summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex/base/plext.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/platex/base/plext.dtx')
-rw-r--r--Master/texmf-dist/source/platex/base/plext.dtx72
1 files changed, 56 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx
index 656750435de..80a83b1a587 100644
--- a/Master/texmf-dist/source/platex/base/plext.dtx
+++ b/Master/texmf-dist/source/platex/base/plext.dtx
@@ -35,6 +35,21 @@
% \changes{v1.2a}{2016/08/20}{\cs{parbox}$BA08e$NM>J,$J(B\cs{xkanjiskip}$B$r:o=|(B}
% \changes{v1.2a}{2016/08/20}{$B2#AH$G(B\texttt{<t>}$B$r;XDj$7$?>l9g$K(B
% \cs{@arstrutbox}$B$rM>7W$K(B\cs{hbox}$B$KF~$l$F$$$?$N$r=$@5(B}
+% \changes{v1.2b}{2016/11/07}{$B2#AH$GCJMn$NF,$K(B\cs{rensuji}$B$r;H$($k(B
+% $B$h$&$K(B\cs{leavevmode}$B$rDI2C$7$F=$@5(B}
+% \changes{v1.2c}{2016/11/19}{Use \cs{setlength}, so that
+% calc extensions apply (sync with lttab.dtx v1.1j)}
+% \changes{v1.2c}{2016/11/19}{Use \cs{@setminpage}
+% (sync with ltboxes v1.1a)}
+% \changes{v1.2c}{2016/11/19}{put \cs{global} into definition
+% of \cs{@minipagefalse} (sync with ltboxes v1.0z)}
+% \changes{v1.2c}{2016/11/19}{Changed \cs{endgraf} to
+% \cs{@@par} (sync with ltboxes.dtx v1.0y)}
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
+% \changes{v1.2c}{2016/11/19}{Ensure \cs{@parboxto} holds the value
+% of \cs{@tempdimb} not the register itself (pr/3867)
+% (sync with ltboxes.dtx v1.1g)}
% \fi
%
% \iffalse
@@ -43,7 +58,7 @@
\ProvidesFile{plext.dtx}
%</driver>
%<package>\ProvidesPackage{plext}
- [2016/08/20 v1.2a pLaTeX package file (community edition)]
+ [2016/11/19 v1.2c pLaTeX package file (community edition)]
%<*driver>
\documentclass{jltxdoc}
\usepackage{plext}
@@ -183,8 +198,12 @@
% $B%"%9%?%j%9%/7A<0$N>l9g$O!"AHJ}8~%*%W%7%g%s$N8e$m$KI}$r;XDj$7$^$9!#(B
% \changes{v1.1d}{1995/11/10}{\cs{@tabular} to \cs{p@tabular}}
% \changes{v1.2a}{2016/08/20}{tabular$B4D6-A0$NM>J,$J(B\cs{xkanjiskip}$B$r:o=|(B}
+% \changes{v1.2c}{2016/11/19}{Use \cs{setlength}, so that
+% calc extensions apply (sync with lttab.dtx v1.1j)}
% \begin{macrocode}
-\def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>}
+\def\@stabular<#1>#2{%
+ \setlength\dimen@{#2}%
+ \edef\@halignto{to\the\dimen@}\p@tabular<#1>}
\def\p@tabular<#1>{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\p@tabarray<#1>}
@@ -623,7 +642,7 @@
% \subsection{$BCJMn%\%C%/%94D6-(B}
% minipage$B4D6-$H(B|\parbox|$B%3%^%s%I$b!"(Btabular$B4D6-$HF1$8$h$&$K!"(B
% $BAHJ}8~$r;XDj$9$k%*%W%7%g%s$rDI2C$7$F$"$j$^$9!#(B
-% $B$3$l$i$N%3%^%s%I$O!"(B\file{ltbox.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% $B$3$l$i$N%3%^%s%I$O!"(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
%
% |\parbox|$B%3%^%s%I$OI}$@$1$G$J$/9b$5$b;XDj$G$-$k$h$&$K$J$C$F$$$^$9!#(B
% $B?7$7$$(B|\parbox|$B%3%^%s%I$K$D$$$F$N>\:Y$O!"(B\file{usrguide.tex}$B$r;2>H(B
@@ -641,17 +660,21 @@
%
% \begin{macro}{\X@minipage}
% $B0LCV%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
% \begin{macrocode}
\def\X@minipage<#1>{\@ifnextchar[%]
- {\@iminipage<#1>}{\@iiiminipage<#1>{c}\@empty[s]}}
+ {\@iminipage<#1>}{\@iiiminipage<#1>{c}\relax[s]}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@iminipage}
% $B9b$5%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
% \begin{macrocode}
\def\@iminipage<#1>[#2]{\@ifnextchar[%]
- {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\@empty[s]}}
+ {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\relax[s]}}
% \end{macrocode}
% \end{macro}
%
@@ -690,6 +713,8 @@
\if@rotsw \hsize\@tempdima\hbox\bgroup$\vbox\bgroup\fi
% \end{macrocode}
% \changes{v1.1c}{1995/09/11}{Add \cs{adjustbaseline}.}
+% \changes{v1.2c}{2016/11/19}{Use \cs{@setminpage}
+% (sync with ltboxes v1.1a)}
% \begin{macrocode}
\adjustbaseline
\color@begingroup
@@ -701,13 +726,14 @@
\let\@footnotetext\@mpfootnotetext
\let\@listdepth\@mplistdepth \@mplistdepth\z@
\@minipagerestore
- \global\@minipagetrue %% \global added 24 May 89
- \everypar{\global\@minipagefalse\everypar{}}}
+ \@setminipage}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\endminipage}
% minipage$B4D6-$N=*N;%3%^%s%I$G$9!#(B
+% \changes{v1.2c}{2016/11/19}{put \cs{global} into definition
+% of \cs{@minipagefalse} (sync with ltboxes v1.0z)}
% \begin{macrocode}
\def\endminipage{%
\par
@@ -718,7 +744,7 @@
\footnoterule
\unvbox\@mpfootins
\fi
- \global\@minipagefalse %% added 24 May 89
+ \@minipagefalse %% added 24 May 89
\color@endgroup
\if@rotsw \egroup\m@th$\egroup\fi
% \end{macrocode}
@@ -741,17 +767,21 @@
%
% \begin{macro}{\X@parbox}
% $B0LCV%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
% \begin{macrocode}
\def\X@parbox<#1>{\@ifnextchar[%]
- {\@iparbox<#1>}{\@iiiparbox<#1>{c}\@empty[s]}}
+ {\@iparbox<#1>}{\@iiiparbox<#1>{c}\relax[s]}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@iparbox}
% $B9b$5%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
% \begin{macrocode}
\def\@iparbox<#1>[#2]{\@ifnextchar[%]
- {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\@empty[s]}}
+ {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\relax[s]}}
% \end{macrocode}
% \end{macro}
%
@@ -771,6 +801,13 @@
% minipage$B4D6-$HF1$8$h$&$K%0%k!<%T%s%0$r$7$^$9!#(B
% $B$3$N3g8L$HBP$K$J$k$N$O!"$3$N%^%/%m$N:G8e$N(B\cs{egroup}$B$G$9!#(B
% \changes{v1.2a}{2016/08/20}{\cs{parbox}$BA08e$NM>J,$J(B\cs{xkanjiskip}$B$r:o=|(B}
+% \changes{v1.2c}{2016/11/19}{Changed \cs{endgraf} to
+% \cs{@@par} (sync with ltboxes.dtx v1.0y)}
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
+% \changes{v1.2c}{2016/11/19}{Ensure \cs{@parboxto} holds the value
+% of \cs{@tempdimb} not the register itself (pr/3867)
+% (sync with ltboxes.dtx v1.1g)}
% \begin{macrocode}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
\leavevmode\null\bgroup
@@ -778,14 +815,14 @@
\fork@parbox@option<#1>[#2]%
\if@rotsw
\@begin@tempboxa\vbox{\box@dir\hsize\@tempdima
- \hbox{$\vbox{\@parboxrestore\adjustbaseline#6\endgraf}\m@th$}}%
+ \hbox{$\vbox{\@parboxrestore\adjustbaseline#6\@@par}\m@th$}}%
\else
\@begin@tempboxa\vbox{\box@dir
- \hsize\@tempdima\@parboxrestore\adjustbaseline#6\endgraf}%
+ \hsize\@tempdima\@parboxrestore\adjustbaseline#6\@@par}%
\fi
- \ifx\@empty#3\relax\else
+ \ifx\relax#3\relax\else
\setlength\@tempdimb{#3}%
- \def\@parboxto{to\@tempdimb}%
+ \edef\@parboxto{to\the\@tempdimb}%
\fi
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
@@ -1083,13 +1120,16 @@
% |\rensuji|$B$O!"(B|*|$B7A<0$+$I$&$+$rD4$Y$^$9!#(B
% |\@rensuji|$B$O!"0LCV%*%W%7%g%s$rD4$Y$^$9!#(B
% |\@@rensuji|$B$,(B|\rensuji|$B$NFbIt7A<0$G$9!#(B
+% \changes{v1.2b}{2016/11/07}{$B2#AH$GCJMn$NF,$K(B\cs{rensuji}$B$r;H$($k(B
+% $B$h$&$K(B\cs{leavevmode}$B$rDI2C$7$F=$@5(B}
% \begin{macrocode}
\DeclareRobustCommand\rensuji{%
\@ifstar{\not@advancelinetrue\@rensuji}{\@rensuji}}
\def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}}
-\def\@@rensuji[#1]#2{\ifydir\hbox{#2}\else
- \hskip\rensujiskip
+\def\@@rensuji[#1]#2{%
\ifvmode\leavevmode\fi
+ \ifydir\hbox{#2}\else
+ \hskip\rensujiskip
\ifnot@advanceline\not@advancelinefalse\else
\setbox\z@\hbox{\yoko#2}%
\@tempdima\ht\z@ \advance\@tempdima\dp\z@
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 10:43:44 +0000