Skip to content

Commit

Permalink
plcore.dtx: Move patches for tabular internals to kernel (#43)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aminophen
aminophen committed Jul 21, 2017
1 parent 0be063b commit 592e705
Show file tree
Hide file tree
Showing 4 changed files with 196 additions and 12 deletions.
64 changes: 63 additions & 1 deletion platexrelease.sty
View file
Expand Up @@ -18,7 +18,7 @@
\edef\p@known@latexreleaseversion
{2017/04/15}
\edef\platexreleaseversion
{2017/05/05}
{2017/07/29}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
Expand Down Expand Up @@ -914,6 +914,68 @@ of this package available from CTAN}
\@ifstar\@sverb\@verb}
\fi
\plEndIncludeInRelease
\plIncludeInRelease{2017/07/29}{\@tabclassz}
{Inhibit JFM glue in tabular cells}%
\def\@tabclassz{%
\ifcase\@lastchclass
\@acolampacol
\or
\@ampacol
\or
\or
\or
\@addamp
\or
\@acolampacol
\or
\@firstampfalse\@acol
\fi
\edef\@preamble{%
\@preamble{%
\ifcase\@chnum
\hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c
\or
\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l
\or
\hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% r
\fi}}}
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\@tabclassz}
{Inhibit JFM glue in tabular cells}%
\def\@tabclassz{%
\ifcase\@lastchclass
\@acolampacol
\or
\@ampacol
\or
\or
\or
\@addamp
\or
\@acolampacol
\or
\@firstampfalse\@acol
\fi
\edef\@preamble{%
\@preamble{%
\ifcase\@chnum
\hfil\ignorespaces\@sharp\unskip\hfil
\or
\hskip1sp\ignorespaces\@sharp\unskip\hfil
\or
\hfil\hskip1sp\ignorespaces\@sharp\unskip
\fi}}}
\plEndIncludeInRelease
\plIncludeInRelease{2017/07/29}{\@tabclassz}
{Inhibit JFM glue in tabular cells}%
\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
\@sharp\unskip\@endpbox}}
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\@tabclassz}
{Inhibit JFM glue in tabular cells}%
\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces
\@sharp\@endpbox}}
\plEndIncludeInRelease
\plIncludeInRelease{2016/04/17}{\@tabular}
{Remove extra \xkanjiskip}%
\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
Expand Down
115 changes: 106 additions & 9 deletions plcore.dtx
View file
Expand Up @@ -37,8 +37,9 @@
% $B$H$N4V$K(Bxkanjiskip$B$,F~$C$F$7$^$&LdBj$KBP1~!#(B
% \cs{@outputbox}$B$N?<$5$,B>$N$b$N$N0LCV$K1F6A$rM?$($J$$(B
% $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.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B
% tabular$B4D6-!"(B\cs{parbox}$BL?Na!"(B\cs{underline}$BL?Na$K$b9T$C$?(B}
% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(Btabular$B4D6-$K$b9T$C$?(B}
% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{parbox}$BL?Na$K$b9T$C$?(B}
% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{underline}$BL?Na$K$b9T$C$?(B}
% \changes{v1.2d}{2016/04/01}{multicol$B%Q%C%1!<%8$r;H$&$H%H%s%\$N2<C<$,=L$`LdBj$r=$@5(B}
% \changes{v1.2e}{2016/05/20}{\file{fltrace}$B%Q%C%1!<%8$N(Bp\LaTeX{}$BHG(B
% $B$H$7$F(B\file{pfltrace}$B%Q%C%1!<%8$r?7@_(B}
Expand Down Expand Up @@ -66,13 +67,14 @@
% $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)}
% \changes{v1.2n}{2017/04/23}{$B%I%-%e%a%s%H$NDI2C(B}
% \changes{v1.2o}{2017/05/03}{$B9TF,6XB'J8;z$ND>A0$G$b2~9T$9$k$h$&$K$7$?(B}
% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
\ProvidesFile{plcore.dtx}[2017/05/03 v1.2o pLaTeX core file]
\ProvidesFile{plcore.dtx}[2017/07/21 v1.2p pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
Expand Down Expand Up @@ -1474,15 +1476,108 @@
% \end{macro}
% \end{macro}
%
% \subsection{tabular$B4D6-$J$I(B}
% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B
% tabular$B4D6-!"(B\cs{parbox}$BL?Na!"(B\cs{underline}$BL?Na$K$b9T$C$?(B}
% \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(Bp\TeX{}$B$N(B|\xkanjiskip|$BM3Mh$N(B
% $B%"%-$,A08e$KF~$C$F$7$^$&$3$H$,$"$j$^$7$?!#$=$&$7$?L?Na$K%Q%C%A$r$"$F$^$9!#(B
% \subsection{tabular$B4D6-(B}
% \LaTeX{}$B%+!<%M%k(B(lttab.dtx)$B$NL?Na72$r=$@5$7$^$9!#(B
%
% \begin{macro}{\@tabclassz}
% \LaTeX{}$B%+!<%M%k$O!"%"%i%$%s%a%s%HJ8;z(B|&|$B$N<~0O$KH>3Q6uGr$r=q$$$?$+$I$&$+$K(B
% $B$+$+$o$i$:M>J,$J%9%Z!<%9$r=PNO$7$J$$$h$&$K!"(B|\ignorespaces|$B$H(B|\unskip|$B$r(B
% $BH/9T$7$F$$$^$9(B(lttab.dtx)$B!#$7$+$7!"$3$l$@$1$G$O(BJFM$B%0%k!<$,>C$($:$K;D$C$F(B
% $B$7$^$&$N$G!"(Bp\LaTeX{}$B$G$ODI2C$NBP=h$rF~$l$^$9!#(B
%
% $B$^$:!"(B|l|, |c|, |r|$B$N>l9g$G$9!#(B
% $B%;%k$NCf?H$r(B|\mbox|$B$KF~$l!"$5$i$K:G=i$K(B|\inhibitglue|$B$rH/9T$9$k(B
% $B$3$H$G!"%;%kMWAG$N<~0O$N(BJFM$B%0%k!=$r>C$7$^$9!#(B
% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
% \begin{macrocode}
%</plcore>
%<platexrelease>\plIncludeInRelease{2017/07/29}{\@tabclassz}
%<platexrelease> {Inhibit JFM glue in tabular cells}%
%<*plcore|platexrelease>
\def\@tabclassz{%
\ifcase\@lastchclass
\@acolampacol
\or
\@ampacol
\or
\or
\or
\@addamp
\or
\@acolampacol
\or
\@firstampfalse\@acol
\fi
\edef\@preamble{%
\@preamble{%
\ifcase\@chnum
\hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c
\or
\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l
\or
\hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% r
\fi}}}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\@tabclassz}
%<platexrelease> {Inhibit JFM glue in tabular cells}%
%<platexrelease>\def\@tabclassz{%
%<platexrelease> \ifcase\@lastchclass
%<platexrelease> \@acolampacol
%<platexrelease> \or
%<platexrelease> \@ampacol
%<platexrelease> \or
%<platexrelease> \or
%<platexrelease> \or
%<platexrelease> \@addamp
%<platexrelease> \or
%<platexrelease> \@acolampacol
%<platexrelease> \or
%<platexrelease> \@firstampfalse\@acol
%<platexrelease> \fi
%<platexrelease> \edef\@preamble{%
%<platexrelease> \@preamble{%
%<platexrelease> \ifcase\@chnum
%<platexrelease> \hfil\ignorespaces\@sharp\unskip\hfil
%<platexrelease> \or
%<platexrelease> \hskip1sp\ignorespaces\@sharp\unskip\hfil
%<platexrelease> \or
%<platexrelease> \hfil\hskip1sp\ignorespaces\@sharp\unskip
%<platexrelease> \fi}}}
%<platexrelease>\plEndIncludeInRelease
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@classv}
% $B<!$K!"(B|p|$B$N>l9g$G$9!#(B|\mbox{}\inhibitglue|$B$H(B|\unskip|$B$rDI2C$7$F$$$^$9!#(B
% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2017/07/29}{\@tabclassz}
%<platexrelease> {Inhibit JFM glue in tabular cells}%
%<*plcore|platexrelease>
\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
\@sharp\unskip\@endpbox}}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\@tabclassz}
%<platexrelease> {Inhibit JFM glue in tabular cells}%
%<platexrelease>\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces
%<platexrelease>\@sharp\@endpbox}}
%<platexrelease>\plEndIncludeInRelease
% \end{macrocode}
% \end{macro}
%
%
% \section{2013$BG/0J9_$N?7$7$$(Bp\TeX{}$BBP1~(B}
% \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(B2013$BG/0J9_$N(Bp\TeX{}$B$G$O(B
% |\xkanjiskip|$BM3Mh$N%"%-$,A08e$KF~$C$F$7$^$&$3$H$,$"$j$^$7$?!#(B
% $B$=$&$7$?L?Na$K%Q%C%A$r$"$F$^$9!#$J$*!"4{$K=P$F$-$?(B|\footnote|$B$NFbItL?Na(B
% $B!J(B|\@makefnmark|$B!K$K$OF1MM$N%Q%C%A$,$b$&$"$F$F$"$j$^$9!#(B
%
% \begin{macro}{\@tabular}
% tabular$B4D6-$NFbItL?Na$G$9!#$b$H$O(B\file{lttab.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(Btabular$B4D6-$K$b9T$C$?(B}
% \begin{macrocode}
%</plcore>
%<platexrelease>\plIncludeInRelease{2016/04/17}{\@tabular}
%<platexrelease> {Remove extra \xkanjiskip}%
%<*plcore|platexrelease>
Expand Down Expand Up @@ -1521,6 +1616,7 @@
%
% \begin{macro}{\@iiiparbox}
% |\parbox|$B$NFbItL?Na$G$9!#$b$H$O(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{parbox}$BL?Na$K$b9T$C$?(B}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2016/04/17}{\@iiiparbox}
%<platexrelease> {Remove extra \xkanjiskip}%
Expand Down Expand Up @@ -1573,6 +1669,7 @@
%
% \begin{macro}{\underline}
% $B2<@~$r0z$/L?Na$G$9!#$b$H$O(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{underline}$BL?Na$K$b9T$C$?(B}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2016/04/17}{\underline}
%<platexrelease> {Remove extra \xkanjiskip}%
Expand Down
27 changes: 26 additions & 1 deletion plcore.ltx
View file
Expand Up @@ -18,7 +18,7 @@
%% File: plvers.dtx
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
{2017/05/05}
{2017/07/29}
\def\ppatch@level{0}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
Expand Down Expand Up @@ -1006,6 +1006,31 @@
\newcommand\printglossary{\@input@{\jobname.gls}}
\newcount\hour
\newcount\minute
\def\@tabclassz{%
\ifcase\@lastchclass
\@acolampacol
\or
\@ampacol
\or
\or
\or
\@addamp
\or
\@acolampacol
\or
\@firstampfalse\@acol
\fi
\edef\@preamble{%
\@preamble{%
\ifcase\@chnum
\hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c
\or
\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l
\or
\hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% r
\fi}}}
\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
\@sharp\unskip\@endpbox}}
\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
Expand Down
2 changes: 1 addition & 1 deletion plvers.dtx
View file
Expand Up @@ -127,7 +127,7 @@
%</plcore>
%<platexrelease>\edef\platexreleaseversion
%<*plcore|platexrelease>
{2017/05/05}
{2017/07/29}
%</plcore|platexrelease>
%<*plcore>
\def\ppatch@level{0}
Expand Down

0 comments on commit 592e705

Please sign in to comment.