Skip to content

Commit

Permalink
plext.dtx: Remove extra \xkanjiskip, fix for \p@array (texjporg#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aminophen
aminophen committed Aug 20, 2016
1 parent 3b54052 commit 715330f
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 19 deletions.
30 changes: 20 additions & 10 deletions plext.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%
% \fi
%
% \CheckSum{1845}
% \CheckSum{1848}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
Expand Down Expand Up @@ -47,6 +47,11 @@
% \changes{v1.1i}{2001/05/10}{$B=DAH$G(Bz$B$r;XDj$9$k$H%(%i!<$K$J$k$N$r=$@5!#(B
% $B$"$j$,$H$&!"Bg@P$5$s(B}
% \changes{v1.2}{2001/09/26}{$B%?%0L>$r(Bplcore$B$+$i(Bpackage$B$KJQ99$7$?(B}
% \changes{v1.2a}{2016/08/20}{tabular$B4D6-A0$NM>J,$J(B\cs{xkanjiskip}$B$r:o=|(B}
% \changes{v1.2a}{2016/08/20}{tabular$B4D6-8e$NM>J,$J(B\cs{xkanjiskip}$B$r:o=|(B}
% \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}
% \fi
%
% \iffalse
Expand All @@ -55,7 +60,7 @@
\ProvidesFile{plext.dtx}
%</driver>
%<package>\ProvidesPackage{plext}
[2001/09/26 v1.2 pLaTeX package file]
[2016/08/20 v1.2a pLaTeX package file (community edition)]
%<*driver>
\documentclass{jltxdoc}
\usepackage{plext}
Expand Down Expand Up @@ -164,8 +169,8 @@
% tabular$B4D6-$K$O%"%9%?%j%9%/7A<0$,$"$j$^$9!#(B
% \begin{macrocode}
\def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz
\let\@classiv\@arrayclassiv
\let\\\@arraycr\let\@halignto\@empty\X@tabarray}
\let\@classiv\@arrayclassiv
\let\\\@arraycr\let\@halignto\@empty\X@tabarray}
%
\def\tabular{\let\@halignto\@empty\X@tabular}
\@namedef{tabular*}{\@ifnextchar<%>
Expand Down Expand Up @@ -194,9 +199,10 @@
% \begin{macro}{\p@tabular}
% $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}
% \begin{macrocode}
\def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>}
\def\p@tabular<#1>{\leavevmode \hbox \bgroup $\let\@acol\@tabacol
\def\p@tabular<#1>{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\p@tabarray<#1>}
% \end{macrocode}
Expand All @@ -215,6 +221,8 @@
% \begin{macro}{\p@array}
% tabular$B4D6-$H(Barray$B4D6-$NFbIt7A<0$G$9!#(B
% \changes{v1.1d}{1995/11/10}{\cs{@array} to \cs{p@array}}
% \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}
% \begin{macrocode}
\def\p@array<#1>[#2]#3{\setbox\@arstrutbox\hbox{%
\iftdir
Expand All @@ -229,9 +237,9 @@
\@depth\arraystretch\dp\tstrutbox \@width\z@
\fi\fi
\else
\if #1t\relax\hbox{\tate
\if #1t\relax\tate
\vrule\@height\arraystretch\ht\tstrutbox
\@depth\arraystretch\dp\tstrutbox \@width\z@}%
\@depth\arraystretch\dp\tstrutbox \@width\z@
\else
\vrule\@height\arraystretch\ht\strutbox
\@depth\arraystretch\dp\strutbox \@width\z@
Expand All @@ -257,9 +265,10 @@
% array$B4D6-$H(Btabular$B4D6-$N=*N;%3%^%s%I$G$9!#(B
% |\@end@alignbox|$B$O(B|\p@array|$B$+$i8F$S=P$5$l$k(B|\fork@array@option|$B$K$h$C$F(B
% $B@_Dj$5$l$^$9!#(B
% \changes{v1.2a}{2016/08/20}{tabular$B4D6-8e$NM>J,$J(B\cs{xkanjiskip}$B$r:o=|(B}
% \begin{macrocode}
\def\endarray{\crcr\egroup\egroup\@end@alignbox}
\def\endtabular{\crcr\egroup\egroup\@end@alignbox $\egroup}
\def\endtabular{\crcr\egroup\egroup\@end@alignbox $\egroup\null}
\expandafter \let \csname endtabular*\endcsname = \endtabular
% \end{macrocode}
% \end{macro}
Expand Down Expand Up @@ -778,9 +787,10 @@
% \changes{v1.1g}{1996/01/12}{\break Grouping \cs{@iiiparbox}}
% 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}
% \begin{macrocode}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
\leavevmode\bgroup
\leavevmode\null\bgroup
\setlength\@tempdima{#5}%
\fork@parbox@option<#1>[#2]%
\if@rotsw
Expand All @@ -797,7 +807,7 @@
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
\csname bm@#4\endcsname}\@end@parbox
\@end@tempboxa\egroup}
\@end@tempboxa\egroup\null}
% \end{macrocode}
% \end{macro}
%
Expand Down
18 changes: 9 additions & 9 deletions plext.sty
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{plext}
[2001/09/26 v1.2 pLaTeX package file]
[2016/08/20 v1.2a pLaTeX package file (community edition)]
\newif\if@rotsw
\def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz
\let\@classiv\@arrayclassiv
\let\\\@arraycr\let\@halignto\@empty\X@tabarray}
\let\@classiv\@arrayclassiv
\let\\\@arraycr\let\@halignto\@empty\X@tabarray}
\def\tabular{\let\@halignto\@empty\X@tabular}
\@namedef{tabular*}{\@ifnextchar<%>
{\@stabular}{\@stabular<Z>}}
Expand All @@ -44,7 +44,7 @@
\def\X@tabular{\@ifnextchar<%>
{\p@tabular}{\p@tabular<Z>}}
\def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>}
\def\p@tabular<#1>{\leavevmode \hbox \bgroup $\let\@acol\@tabacol
\def\p@tabular<#1>{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\p@tabarray<#1>}
\def\p@tabarray<#1>{\m@th\@ifnextchar[%]
Expand All @@ -62,9 +62,9 @@
\@depth\arraystretch\dp\tstrutbox \@width\z@
\fi\fi
\else
\if #1t\relax\hbox{\tate
\if #1t\relax\tate
\vrule\@height\arraystretch\ht\tstrutbox
\@depth\arraystretch\dp\tstrutbox \@width\z@}%
\@depth\arraystretch\dp\tstrutbox \@width\z@
\else
\vrule\@height\arraystretch\ht\strutbox
\@depth\arraystretch\dp\strutbox \@width\z@
Expand All @@ -80,7 +80,7 @@
\let\@sharp##\let\protect\relax
\lineskip\z@skip\baselineskip\z@skip\@preamble}
\def\endarray{\crcr\egroup\egroup\@end@alignbox}
\def\endtabular{\crcr\egroup\egroup\@end@alignbox $\egroup}
\def\endtabular{\crcr\egroup\egroup\@end@alignbox $\egroup\null}
\expandafter \let \csname endtabular*\endcsname = \endtabular
\def\fork@array@option<#1>[#2]{%
\@rotswfalse
Expand Down Expand Up @@ -325,7 +325,7 @@
\def\@iiparbox<#1>#2[#3]{\@ifnextchar[%]%
{\@iiiparbox<#1>{#2}{#3}}{\@iiiparbox<#1>{#2}{#3}[#2]}}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
\leavevmode\bgroup
\leavevmode\null\bgroup
\setlength\@tempdima{#5}%
\fork@parbox@option<#1>[#2]%
\if@rotsw
Expand All @@ -342,7 +342,7 @@
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
\csname bm@#4\endcsname}\@end@parbox
\@end@tempboxa\egroup}
\@end@tempboxa\egroup\null}
\def\fork@parbox@option<#1>[#2]{%
\@rotswfalse
\iftdir
Expand Down

0 comments on commit 715330f

Please sign in to comment.