From 4d5ea40067f8dca80c5bc08220a04cb67fc9beb6 Mon Sep 17 00:00:00 2001 From: "Dr. Clea F. Rees" Date: Fri, 7 Aug 2009 00:50:27 +0000 Subject: tablists new version git-svn-id: svn://tug.org/texlive/trunk@14566 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tablists/tablists.sty | 38 ++++++++++++----------- 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tablists/tablists.sty') diff --git a/Master/texmf-dist/tex/latex/tablists/tablists.sty b/Master/texmf-dist/tex/latex/tablists/tablists.sty index b7c26d026ea..986c9376907 100644 --- a/Master/texmf-dist/tex/latex/tablists/tablists.sty +++ b/Master/texmf-dist/tex/latex/tablists/tablists.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{tablists} - [2008/01/14 v0.0d (beta) Tabulated list of short items] + [2009/08/04 v0.0e (beta) Tabulated list of short items] \RequirePackage{makecell} \@ifpackagelater{makecell}{2007/05/24 V0.1d}{}{\PackageError {tablists}{For a successful cooperation we need at least\MessageBreak @@ -33,16 +33,17 @@ \newcommand\tabenumsep{\hskip1em} \newcommand\negtabenumsep{% \settowidth\@tempdima{\tabenumsep}\hspace*{-\@tempdima}} -\newcommand\tabenumitem{&\@ifnextchar[%] +\newcommand\tabenumitem{\ifvoid\@labels\else\llap{\box\@labels\hspace{-\@totalleftmargin}}\fi + &\@ifnextchar[% {\TeXr@@tabenumitem{&}}% - {\TeXr@tabenumitem{&}{\@enumctr}}\setcounter{\@subenumctr}\z@} + {\TeXr@tabenumitem{&}{\@enumctr}\setcounter{\@subenumctr}\z@}} \newcommand\subtabenumitem{\ifnum\value{\@subenumctr}=\z@\negtabenumsep \let\negtabenumsep\relax\fi& \@ifnextchar[%] {\TeXr@@tabenumitem{&}}% {\TeXr@tabenumitem{&}{\@subenumctr}}} \newcommand\TeXr@tabenumitem[2]{% - \stepcounter{#2}\@nameuse{label#2}#1 + \stepcounter{#2}{\@nameuse{label#2}}#1 \protected@edef \@currentlabel{\csname p@#2\endcsname\csname the#2\endcsname}} \@ifdefinable\TeXr@@tabenumitem{} @@ -72,8 +73,8 @@ \@topsepadd\topsep\advance\@topsepadd\partopsep \advance\@topsepadd-\jot \ifdim\@topsepadd<\z@\@topsepadd=\z@\fi - \if@nobreak\else\addvspace\@topsepadd\fi - \openup\jot% + \if@nobreak\vspace{-\jot}\else\addvspace\@topsepadd\fi + \openup\jot \ifnum\@enumdepth>\thr@@ \@toodeep \else @@ -110,13 +111,15 @@ } \newcommand{\@TeXr@tabenum}{\begingroup \let\\\TeXr@arraycr\TeXr@tlist@arrayjot\let\par=\cr - \settowidth\@tempdima{\tabenumindent}% + \settowidth\@tempdima{\tabenumindent}\gdef\tabenumindent{}% \settowidth\@tempdimb{\tabenumsep}% + \ifnum\@listdepth>\z@\advance\@tempdima\@totalleftmargin\fi \let\qedhere\tabqedhere \halign\bgroup \strut##\hskip\@tempdima - \hskip-\@tempdimb&&\tabenumsep\hfil##\hskip\labelsep&##\hfil\cr} -\def\endtabenum{\crcr\egroup\endgroup\gdef\tabenumindent{}\par + \hskip-\@tempdimb&&\hskip\@tempdimb\hfil##\hskip\labelsep + &##\hfil\cr} +\def\endtabenum{\crcr\egroup\endgroup\par \addpenalty\@endparpenalty \advance\@topsepadd\jot \addvspace\@topsepadd} @@ -159,16 +162,15 @@ \newcommand\startsubnumber[1]{\count@#1\advance\count@-1% \global\expandafter\csname c@\@subenumctr\endcsname\count@} \newcommand\liststrut[1][]{\def\tempa{#1}\ifx\tempa\empty - \strut - \@tempdima-1.3\baselineskip - \vspace*{\@tempdima}\par% - \else\settoheight\@tempdima{{$#1$}}\strut - \advance\@tempdima\lineskip - \noindent\vrule\@height\@tempdima\@width\z@\@depth\z@ - \strut\advance\@tempdima.3\baselineskip - \vspace*{-\@tempdima}\par% + \strut\@tempskipa\z@ + \else\settoheight\@tempdima{{$#1$}}\vrule height\@tempdima depth\dp\strutbox width\z@ + \advance\@tempdima-\ht\strutbox + \ifdim\@tempdima>\lineskip\advance\@tempdima\lineskip\fi + \@tempskipa\@tempdima \fi - \@nobreaktrue} + \advance\@tempskipa\baselineskip + \par\nobreak\vskip-\parskip + \nobreak\kern-\@tempskipa\@nobreaktrue} \newcommand\tabqedhere{\cr \noalign{\@par\@tempdima\prevdepth \kern-\@tempdima\kern-\baselineskip\kern\lineskip -- cgit v1.2.3