Skip to content

Commit

Permalink
exppl2e.sty: Inhibit JFM glue at the beginning of tabbing (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
aminophen committed Aug 26, 2017
1 parent a648471 commit 7887b23
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 4 deletions.
42 changes: 41 additions & 1 deletion exppl2e.sty
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
% case 1: This file must be a normal package
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{exppl2e}
[2017/08/25 v1.0o Experimental pLaTeX2e features]
[2017/08/26 v1.0p Experimental pLaTeX2e features]
\PackageWarningNoLine{exppl2e}{%
This is the unstable, experimental part of pLaTeX2e.\MessageBreak
This package may contain:\MessageBreak
Expand Down Expand Up @@ -498,6 +498,46 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% \section{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=(B}
%
% \begin{macro}{\@startline}
% tabbing$B4D6-$N9T$G!"Cf?H$,;O$a3g8LN`$J$I$G;O$^$k>l9g!"(B
% $B:G=i$N9`L\$@$1(BJFM$B%0%k!<$,>C$($J$$8=>]$KBP=h$7$^$9!#(B
% \changes{v????}{????/??/??}{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=$r:o=|(B}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{????/??/??}{\@startline}
%<platexrelease> {Inhibit JFM glue at the beginning}%
%<*plcore|platexrelease>
\gdef\@startline{%
\ifnum \@nxttabmar >\@hightab
\@badtab
\global\@nxttabmar \@hightab
\fi
\global\@curtabmar \@nxttabmar
\global\@curtab \@curtabmar
\global\setbox\@curline \hbox {}%
\@startfield
\strut\inhibitglue}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\@startline}
%<platexrelease> {Inhibit JFM glue at the beginning}%
%<platexrelease>\gdef\@startline{%
%<platexrelease> \ifnum \@nxttabmar >\@hightab
%<platexrelease> \@badtab
%<platexrelease> \global\@nxttabmar \@hightab
%<platexrelease> \fi
%<platexrelease> \global\@curtabmar \@nxttabmar
%<platexrelease> \global\@curtab \@curtabmar
%<platexrelease> \global\setbox\@curline \hbox {}%
%<platexrelease> \@startfield
%<platexrelease> \strut}
%<platexrelease>\plEndIncludeInRelease
% \end{macrocode}
% \end{macro}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% \section{\cs{inhibitglue}$B$N4JN,7A(B}
%
% \begin{macro}{\<}
Expand Down
7 changes: 4 additions & 3 deletions plnewsc07.tex
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,15 @@ \section{$B3+H/HG$N%F%9%H$N$*4j$$(B}
\begin{verbatim}
\RequirePackage{exppl2e}
\end{verbatim}
$B$H=q$/$3$H$G!"8=:_$N3+H/HG$r%F%9%H$9$k$3$H$,$G$-$^$9!#(B
$B8=:_$O0J2<$N=$@5$rDs6!$7$F$$$^$9!#(B
$B:G8e$N(B3$B$D$O2$J8$N(B\LaTeX{}$B$H$NAHHG7k2L$N8_49@-8~>e$rL\;X$7$F$$$^$9!#(B
$B$H=q$/$3$H$G!"3+H/HG$r%F%9%H$9$k$3$H$,$G$-$^$9!#(B
$B8=:_$O0J2<$N=$@5$,4^$^$l!"FC$K:G8e$N(B3$B$D$O2$J8$N(B\LaTeX{}$B$H$N(B
$BAHHG7k2L$N8_49@-8~>e$rL\;X$7$F$$$^$9!#(B
\begin{itemize}
\item $B%"%/%;%s%[email protected];z$NA08e$K(B|\xkanjiskip|$B$,F~$i$J$$LdBj$N=$@5(B
\item |\<|$B$H$$$&L?Na$rCJMnF,$G$b8z$/$h$&$K$9$k=$@5(B
\footnote{2010$BG/$N(B\pTeX{}$B$N=$@5$K$h$j(B\cs{inhibitglue}$B$,?bD>%b!<%I(B
$B$G8z$+$J$/$J$C$?$3$H$X$NBP1~!#(B}
\item tabbing$B4D6-$N9T$N:G=i$N9`L\$@$13g8LN`$N(BJFM$B%0%k!<$,F~$k8=>]$X$NBP=h(B
\item |\verb|$B$NCf?H$,H>3Q6uGr$G;O$^$k>l9g$K$=$l$,>CLG$9$kLdBj$N=$@5(B
\item |\ref|$B$N7k2L$,(B``A''$B$N$h$&$J1QBgJ8;z$N>l9g$N%9%Z!<%9%U%!%/%?!<(B
\footnote{$BJ8Kv6uGr$+C18l4V6uGr$+$r7h$a$k0x;R!#(B}$B$NJd@5(B
Expand Down
58 changes: 58 additions & 0 deletions tests/tabbing.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
\documentclass{article}
\begin{document}

\begin{tabbing}
あああああ\=あああああああ\=あああああ\kill
(ほげ) \> (ほげ) \> (ほげ) \\
(ほげ)\>(ほげ)\>(ほげ)\\
ほげほげ \> ほげ \> ほげほげ \\
ほげほげ\>ほげ\>ほげほげ
\end{tabbing}

\begin{tabbing}
ほげほげほげ \= ほげほげほげほげ \= ほげほげ \= ほげほげほげほげほげ \\
(一) \> (二) \> (三) \> (四) \+\+\\
(三) \> (四) \\
\< (二) \> (三) \> (四) \\
(三) \> (四) \-\\
(二) \> (三) \> (四) \-\\
(一) \> (二) \> (三) \> (四) \+\+\\
(三) \> (四) \\
(二右) \' (三) \> (四) \-\-\\
(一) \> (二) \> (三) \> (四) \\
\` (四右余白)\\ % ここから下は比較用
\` 四右余白 \+\+\\
三番 \> 四番 \\
二番右 \' 三番 \> 四番
\end{tabbing}

\begin{tabbing}
ほげほげほげ \= ほげほげほげほげ \= ほげほげ \= ほげほげほげほげほげ \\
(一)\>(二)\>(三)\>(四)\+\+\\
(三)\>(四)\\
\<(二)\>(三)\>(四)\\
(三)\>(四)\-\\
(二)\>(三)\>(四)\-\\
(一)\>(二)\>(三)\>(四)\+\+\\
(三)\>(四)\\
(二右)\'(三)\>(四)\-\-\\
(一)\>(二)\>(三)\>(四)\\
\`(四右余白)\\ % ここから下は比較用
\`四右余白\+\+\\
三番\>四番\\
二番右\'三番\>四番
\end{tabbing}

\begin{tabbing}
最初のタブ位置\= 二番目のタブ位置\= 三番目のタブ位置\= 四番目のタブ位置\kill
(一)\> (二) \> (三) \> (四) \+\\
(二) \> (三) \> (四) \\
\pushtabs
別の位置A\= 別の位置B \= 別の位置C\= 別の位置D\kill
(壱)\> (弐) \> (参) \> (肆) \+\+\\
(参) \> (肆) \-\-\\
\poptabs
(二) \> (三) \> (四)
\end{tabbing}

\end{document}

0 comments on commit 7887b23

Please sign in to comment.