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.dtx121
1 files changed, 106 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx
index 80a83b1a587..d4cae9c7cf3 100644
--- a/Master/texmf-dist/source/platex/base/plext.dtx
+++ b/Master/texmf-dist/source/platex/base/plext.dtx
@@ -3,7 +3,7 @@
%
% Copyright 2001 ASCII Corporation.
% Copyright (c) 2010 ASCII MEDIA WORKS
-% Copyright (c) 2016 Japanese TeX Development Community
+% Copyright (c) 2016-2017 Japanese TeX Development Community
%
% This file is part of the pLaTeX2e system (community edition).
% -------------------------------------------------------------
@@ -50,6 +50,12 @@
% \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)}
+% \changes{v1.2d}{2017/02/04}{\cs{Kanji}$B$N0z?t$@$1$G$J$/8e$KO"B3$9$k(B
+% $B?t;z$b4A?t;z$K$J$C$F$7$^$&%P%0$r=$@5(B}
+% \changes{v1.2e}{2017/03/02}{Make \cs{parbox} Robust
+% (sync with ltboxes 2015/01/08 v1.1h)}
+% \changes{v1.2f}{2017/03/28}{$BI=$H<~0O$H$NB7$(0LCV$r=$@5(B}
+% \changes{v1.2f}{2017/03/28}{$BCJMn$NH"$H<~0O$H$NB7$(0LCV$r=$@5(B}
% \fi
%
% \iffalse
@@ -58,7 +64,7 @@
\ProvidesFile{plext.dtx}
%</driver>
%<package>\ProvidesPackage{plext}
- [2016/11/19 v1.2c pLaTeX package file (community edition)]
+ [2017/03/28 v1.2f pLaTeX package file (community edition)]
%<*driver>
\documentclass{jltxdoc}
\usepackage{plext}
@@ -280,6 +286,43 @@
% \begin{macro}{\fork@array@option}
% array$B4D6-$H(Btabular$B4D6-$GM?$($i$l$?(B
% $BBh0l0z?t$HBhFs0z?t$NAH9g$;$NJ,4t$r9T$J$$$^$9!#(B
+%
+% $B%3%_%e%K%F%#HG$G$O!"%"%9%-!<HG$GIT<+A3$@$C$?I=AH!J(Barray$B4D6-$*$h$S(Btabular$B4D6-!K$H(B
+% $B<~0O$NK\J8$H$NB7$(0LCV$r=$@5$7!"0J2<$N$h$&$K@_7W$7$^$7$?!#(B
+% \begin{itemize}
+% \item $B<~0O$NAHJ}8~$,2#AH$+$DAHJ}8~$,(B|<y>|, |<z>|$B;XDj$N>l9g(B
+% \begin{itemize}
+% \item |[t]|$B;XDj$N$H$-(B\\$B0l9TL\$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW!J7S@~$N>l9g$OOBJ8%Y!<%9%i%$%s$N0LCV!K(B
+% \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+% \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW!J7S@~$N>l9g$OOBJ8%Y!<%9%i%$%s$N0LCV!K(B
+% \end{itemize}
+% \item $B<~0O$NAHJ}8~$,2#AH$+$DAHJ}8~$,(B|<t>|$B;XDj$N>l9g(B
+% \begin{itemize}
+% \item |[t]|$B;XDj$N$H$-(B\\$BI=AH$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
+% \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+% \item |[b]|$B;XDj$N$H$-(B\\$BI=AH$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
+% \end{itemize}
+% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<y>|$B;XDj$N>l9g(B
+% \begin{itemize}
+% \item |[t]|$B;XDj$N$H$-(B\\$BI=AH$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
+% \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+% \item |[b]|$B;XDj$N$H$-(B\\$BI=AH$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
+% \end{itemize}
+% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<t>|$B;XDj$N>l9g(B
+% \begin{itemize}
+% \item |[t]|$B;XDj$N$H$-(B\\$B0l9TL\$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW!J7S@~$N>l9g$OOBJ8%Y!<%9%i%$%s$N0LCV!K(B
+% \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+% \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW!J7S@~$N>l9g$OOBJ8%Y!<%9%i%$%s$N0LCV!K(B
+% \end{itemize}
+% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<z>|$B;XDj$N>l9g(B
+% [TODO] $BL$Dj!*(B
+%^^A \begin{itemize}
+%^^A \item |[t]|$B;XDj$N$H$-(B\\$BI=AH$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
+%^^A \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+%^^A \item |[b]|$B;XDj$N$H$-(B\\$BI=AH$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
+%^^A \end{itemize}
+% \end{itemize}
+% \changes{v1.2f}{2017/03/28}{$BI=$H<~0O$H$NB7$(0LCV$r=$@5(B}
% \begin{macrocode}
\def\fork@array@option<#1>[#2]{%
\@rotswfalse
@@ -289,10 +332,16 @@
\iftdir
\if #1y\relax\let\box@dir\yoko
\if #2t\relax
- \def\@begin@alignbox{\raise\cdp\vtop\bgroup\kern\z@\vbox}%
+ \def\@begin@alignbox{%
+ \@tempdima=\tbaselineshift
+ \advance\@tempdima-\ybaselineshift
+ \raise\@tempdima\vtop\bgroup\kern\z@\vtop}%
\let\@end@alignbox\egroup
\else\if #2b\relax
- \def\@begin@alignbox{\lower\cdp\vbox\bgroup\vbox}%
+ \def\@begin@alignbox{%
+ \@tempdima=\tbaselineshift
+ \advance\@tempdima-\ybaselineshift
+ \raise\@tempdima\vbox\bgroup\vbox}%
\def\@end@alignbox{\kern\z@\egroup}%
\else
\let\@begin@alignbox\vcenter
@@ -311,7 +360,7 @@
\fi\fi
\else\let\box@dir\tate
\if #2t\relax
- \def\@begin@alignbox{\raise\cdp\vtop}%
+ \let\@begin@alignbox\vtop
\let\@end@alignbox\relax
\else\if #2b\relax
\let\@begin@alignbox\vbox
@@ -338,7 +387,7 @@
\fi\fi
\else\let\box@dir\yoko
\if #2t\relax
- \def\@begin@alignbox{\raise\cdp\vtop}%
+ \let\@begin@alignbox\vtop
\let\@end@alignbox\relax
\else\if #2b\relax
\let\@begin@alignbox\vbox
@@ -759,8 +808,10 @@
%
% \begin{macro}{\parbox}
% $BAHJ}8~%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2e}{2017/03/02}{Make \cs{parbox} Robust
+% (sync with ltboxes 2015/01/08 v1.1h)}
% \begin{macrocode}
-\def\parbox{\@ifnextchar<%>
+\DeclareRobustCommand\parbox{\@ifnextchar<%>
{\X@parbox}{\X@parbox<Z>}}
% \end{macrocode}
% \end{macro}
@@ -833,6 +884,43 @@
%
% \begin{macro}{\fork@parbox@option}
% |\parbox|$B$GM?$($i$l$?Bh0l0z?t$HBhFs0z?t$NAH9g$;$NJ,4t$r9T$J$$$^$9!#(B
+%
+% $B%3%_%e%K%F%#HG$G$O!"%"%9%-!<HG$GIT<+A3$@$C$?(B|\parbox|$B$NH"$H(B
+% $B<~0O$NK\J8$H$NB7$(0LCV$r=$@5$7!"0J2<$N$h$&$K@_7W$7$^$7$?!#(B
+% \begin{itemize}
+% \item $B<~0O$NAHJ}8~$,2#AH$+$DAHJ}8~$,(B|<y>|, |<z>|$B;XDj$N>l9g(B
+% \begin{itemize}
+% \item |[t]|$B;XDj$N$H$-(B\\$B0l9TL\$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B
+% \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+% \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B
+% \end{itemize}
+% \item $B<~0O$NAHJ}8~$,2#AH$+$DAHJ}8~$,(B|<t>|$B;XDj$N>l9g(B
+% \begin{itemize}
+% \item |[t]|$B;XDj$N$H$-(B\\$BH"$N>eC<$,<~0O$NOBJ8J8;z$N9b$5$H0lCW(B
+% \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+% \item |[b]|$B;XDj$N$H$-(B\\$BH"$N2<C<$,<~0O$NOBJ8J8;z$N?<$5$H0lCW(B
+% \end{itemize}
+% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<y>|$B;XDj$N>l9g(B
+% \begin{itemize}
+% \item |[t]|$B;XDj$N$H$-(B\\$BH"$N>eC<$,<~0O$NOBJ8J8;z$N9b$5$H0lCW(B
+% \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+% \item |[b]|$B;XDj$N$H$-(B\\$BH"$N2<C<$,<~0O$NOBJ8J8;z$N?<$5$H0lCW(B
+% \end{itemize}
+% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<t>|$B;XDj$N>l9g(B
+% \begin{itemize}
+% \item |[t]|$B;XDj$N$H$-(B\\$B0l9TL\$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B
+% \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+% \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B
+% \end{itemize}
+% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<z>|$B;XDj$N>l9g(B
+% [TODO] $BL$Dj!*(B
+%^^A \begin{itemize}
+%^^A \item |[t]|$B;XDj$N$H$-(B\\$BH"$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
+%^^A \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+%^^A \item |[b]|$B;XDj$N$H$-(B\\$BH"$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
+%^^A \end{itemize}
+% \end{itemize}
+% \changes{v1.2f}{2017/03/28}{$BCJMn$NH"$H<~0O$H$NB7$(0LCV$r=$@5(B}
% \begin{macrocode}
\def\fork@parbox@option<#1>[#2]{%
\@rotswfalse
@@ -842,7 +930,7 @@
\iftdir
\if #1y\relax\let\box@dir\yoko
\if #2t\relax
- \def\@begin@parbox{\raise\cdp\vtop\bgroup\kern\z@\vtop}%
+ \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}%
\let\@end@parbox\egroup
\else\if #2b\relax
\def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}%
@@ -851,7 +939,7 @@
\let\@begin@parbox\vcenter
\let\@end@parbox\relax
\else
- \def\@begin@parbox{\hskip\tbaselineshift$\vcenter}%
+ \def\@begin@parbox{$\vcenter}%
\def\@end@parbox{\m@th$}%
\fi\fi\fi
\else\if #1z\relax\@rotswtrue \let\box@dir\relax
@@ -865,7 +953,7 @@
\let\@begin@parbox\vcenter
\let\@end@parbox\relax
\else
- \def\@begin@parbox{\hskip\tbaselineshift$\vcenter}%
+ \def\@begin@parbox{$\vcenter}%
\def\@end@parbox{\m@th$}%
\fi\fi\fi
\else\let\box@dir\tate
@@ -873,7 +961,7 @@
\let\@begin@parbox\vtop
\let\@end@parbox\relax
\else\if #2b\relax
- \def\@begin@parbox{\lower\cdp\vbox}%
+ \let\@begin@parbox\vbox
\let\@end@parbox\relax
\else\ifmmode
\let\@begin@parbox\vcenter
@@ -889,10 +977,10 @@
\else
\if #1t\relax\let\box@dir\tate
\if #2t\relax
- \def\@begin@parbox{\vtop\bgroup\kern\z@\vbox}%
+ \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}%
\let\@end@parbox\egroup
\else\if #2b\relax
- \def\@begin@parbox{\vbox\bgroup\vbox}%
+ \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}%
\def\@end@parbox{\kern\z@\egroup}%
\else\ifmmode
\let\@begin@parbox\vcenter
@@ -1167,7 +1255,7 @@
% \begin{macro}{\Kanji}
% \begin{macro}{\@Kanji}
% \begin{macro}{\kanji}
-% |\Kanji|$B%3%^%s%I$rDj5A$7$^$9!#(B|\Kanji|$B%3%^%s%I$O(B|\Alpha|$B$HF1$8$h$&$K!"(B
+% |\Kanji|$B%3%^%s%I$rDj5A$7$^$9!#(B|\Kanji|$B%3%^%s%I$O(B|\Alph|$B$HF1$8$h$&$K!"(B
% $B%+%&%s%?$KBP$7$F$N$_;HMQ$9$k$3$H$,$G$-$^$9!#(B
%
% |\kanji|$B%3%^%s%I$O!"8eB3$NH>3Q?t;z$r4A?t;z$K$7$^$9!#(B
@@ -1175,10 +1263,13 @@
% $B$?$@$7!"2#AH%b!<%I$N$H$-$K$O!"2?$b$7$^$;$s!#(B
% $B$D$M$K4A?t;z$K$7$?$$>l9g$O!"(B|\kansuji|$B%W%j%_%F%#%V$r;H$C$F$/$@$5$$!#(B
%
+% $B8eB3$N?t;z$^$G4A?t;z$K$J$C$F$7$^$&%P%0$r=$@5$7$^$7$?(B(Issue~\#33)$B!#(B
% \changes{v1.0h}{1996/03/13}{\cs{@Kanji}$B$rDI2C!#1Q8lHG$HF1MM$K$7$?!#(B}
+% \changes{v1.2d}{2017/02/04}{\cs{Kanji}$B$N0z?t$@$1$G$J$/8e$KO"B3$9$k(B
+% $B?t;z$b4A?t;z$K$J$C$F$7$^$&%P%0$r=$@5(B}
% \begin{macrocode}
\def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname}
-\def\@Kanji#1{\expandafter\kansuji\number #1}
+\def\@Kanji#1{\kansuji #1}
\def\kanji{\iftdir\expandafter\kansuji\fi}
% \end{macrocode}
% \end{macro}