From 97030c9424cbeda231cd2b45fa08639d6a033c8b Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Tue, 2 Aug 2011 19:27:52 +0000 Subject: xtab v2.3f (2011/07/31) git-svn-id: svn://tug.org/texlive/trunk@23347 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/xtab/xtab.sty | 40 ++++--------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) (limited to 'Master/texmf-dist/tex/latex/xtab') diff --git a/Master/texmf-dist/tex/latex/xtab/xtab.sty b/Master/texmf-dist/tex/latex/xtab/xtab.sty index 0bd745d276f..650bb470039 100644 --- a/Master/texmf-dist/tex/latex/xtab/xtab.sty +++ b/Master/texmf-dist/tex/latex/xtab/xtab.sty @@ -24,18 +24,16 @@ %% ----------------------------------------------------------------- %% \ProvidesPackage{xtab} - [2010/02/06 v2.3e Extended supertabular package] + [2011/07/31 v2.3f Extended supertabular package] \newcount\c@tracingst \DeclareOption{errorshow}{\c@tracingst\z@} %%%%\DeclareOption{pageshow}{\c@tracingst\tw@} \DeclareOption{pageshow}{\c@tracingst\thr@@} \DeclareOption{debugshow}{\c@tracingst5\relax} \ProcessOptions - \newif\if@topcaption \@topcaptiontrue \def\topcaption{\@topcaptiontrue\tablecaption} \def\bottomcaption{\@topcaptionfalse\tablecaption} - \gdef\PWST@thecaption{} \newdimen\PWSTcapht \long\def\tablecaption{% @@ -44,18 +42,15 @@ \long\gdef\PWST@thecaption{#2}% \long\gdef\@process@tablecaption{\ST@caption{table}[#1]{#2}}} \global\let\@process@tablecaption\relax - \newif\ifST@star \newif\ifST@mp \newdimen\ST@wd \newskip\ST@rightskip \newskip\ST@leftskip \newskip\ST@parfillskip - \@ifundefined{@initisotab}{% \newcommand{\@initisotab}{}% \newif\ifinfloat}{\typeout{xtab using iso captions}} - \long\def\ST@caption#1[#2]#3{\par% \@initisotab \addcontentsline{\csname ext@#1\endcsname}{#1}% @@ -70,17 +65,15 @@ \endgroup \global\advance\ST@pageleft -\PWSTcapht \ST@trace\tw@{Added caption. Space left for xtabular: \the\ST@pageleft}} - \newcommand\tablehead[1]{% \gdef\@tablehead{% \noalign{% - \global\let\@savcr=\\ + \global\let\@savcr=\\% \global\let\\=\org@tabularcr}% #1% \noalign{\global\let\\=\@savcr}}} \tablehead{} \newcommand\tablefirsthead[1]{\gdef\@table@first@head{#1}} - \newcounter{PWSTtable} \newcount\PWSTlastpage \newcount\PWSTpenultimate @@ -93,7 +86,6 @@ \newdimen\PWST@lastht \newdimen\PWST@generalht \newdimen\PWST@ht - \newcommand{\tablelasthead}[1]{\gdef\@table@last@head{#1}} \newcommand{\notablelasthead}{\let\@table@last@head\relax} \tablelasthead{} @@ -101,21 +93,19 @@ \newcommand\tabletail[1]{% \gdef\@tabletail{% \noalign{% - \global\let\@savcr=\\ + \global\let\@savcr=\\% \global\let\\=\org@tabularcr}% #1% \noalign{\global\let\\=\@savcr}}} \tabletail{} \newcommand\tablelasttail[1]{\gdef\@table@last@tail{#1}} \tablelasttail{} - \newcommand\sttraceon{\c@tracingst5\relax} \newcommand\sttraceoff{\c@tracingst\z@} \newcommand\ST@trace[2]{% \ifnum\c@tracingst>#1\relax \GenericWarning{(xtab)\@spaces\@spaces}{Package xtab: #2}% \fi} - \newdimen\ST@pageleft \newcommand*\shrinkheight[1]{% \noalign{\global\advance\ST@pageleft-#1\relax}} @@ -123,7 +113,6 @@ \noalign{\global\ST@pageleft=#1\relax}} \newcommand{\xentrystretch}[1]{\def\PWST@xentrystretch{#1}} \xentrystretch{0.1} - \newdimen\ST@headht \newdimen\ST@tailht \newdimen\ST@pagesofar @@ -187,7 +176,6 @@ \fi \ST@dimen=\z@ \unvbox\ST@pbox\egroup\hfil} - \def\estimate@lineht{% \ST@lineht=\arraystretch \baselineskip \global\advance\ST@lineht by 1\p@ @@ -197,7 +185,6 @@ Arrayed line height: \the\ST@stretchht}% \global\advance\ST@lineht \PWST@xentrystretch\ST@lineht \ST@trace\tw@{Stretched line height: \the\ST@lineht}} - \def\@calfirstpageht{% \ST@trace\tw@{Calculating height of xtabular on first page}% \global\ST@pagesofar\pagetotal @@ -291,7 +278,6 @@ \global\ST@pageleft\@colroom \global\ST@pagesofar=\z@ \ST@trace\tw@{Maximum space for xtabular: \the\ST@pageleft}} - \newcommand{\PWSTcalchtlines}{% \setbox\@tempboxa=\vbox{\@arrayparboxrestore \ST@restore @@ -318,7 +304,6 @@ \@tablehead\endtabular}% \PWST@ht = \ht\@tempboxa\advance\PWST@ht\dp\@tempboxa \global\advance\PWST@generalht by \PWST@ht} - \newcommand{\PWSTcalnextpageht}{% \ifnum\PWSTcurpage = \PWSTpenultimate \ST@trace\tw@{Calculating height of xtabular on last page}% @@ -331,7 +316,6 @@ \global\advance\ST@pageleft -\PWST@ht \global\ST@pagesofar=\z@ \ST@trace\tw@{Available space for xtabular: \the\ST@pageleft}} - \def\x@supertabular{% \let\org@tabular\tabular \let\tabular\inner@tabular @@ -341,7 +325,7 @@ \expandafter\let\csname tabular*\expandafter\endcsname \csname inner@tabular*\endcsname %%%% \if@topcaption \@process@tablecaption \fi - \global\let\@oldcr=\\ + \global\let\@oldcr=\\% \def\baslineskp{\baselineskip}% \ifx\undefined\@classix \let\org@tabularcr\@tabularcr @@ -373,7 +357,6 @@ \ST@trace\tw@{Available space after accounting for header: \the\ST@pageleft}% \global\advance\ST@pageleft -\ST@tailht% \ST@trace\tw@{Available space after accounting for tail: \the\ST@pageleft}} - \newcommand{\PWSTinit}{% \global\advance\c@PWSTtable\@ne \global\expandafter\let\expandafter\PWSTtempc @@ -390,7 +373,6 @@ \global\PWSTlines=\z@ \global\firstcalltrue \infloattrue} - \def\xtabular{% \@ifnextchar[{\@supertabular}%] {\@supertabular[]}} @@ -402,7 +384,6 @@ \x@supertabular \expandafter\org@tabular\expandafter{\ST@tableformat}% \@@tablehead} - \@namedef{xtabular*}#1{% \@ifnextchar[{\@nameuse{@supertabular*}{#1}}% {\@nameuse{@supertabular*}{#1}[]}%] @@ -418,7 +399,6 @@ \expandafter{\expandafter\ST@wd\expandafter}% \expandafter{\ST@tableformat}% \@@tablehead} - \def\mpxtabular{% \@ifnextchar[{\@mpsupertabular}%] {\@mpsupertabular[]}} @@ -459,8 +439,7 @@ \noindent\expandafter\csname org@tabular*\expandafter\endcsname \expandafter{\expandafter\ST@wd\expandafter}% \expandafter{\ST@tableformat}% - \@@tablehead}% - + \@@tablehead} \def\endxtabular{% \ifx\@table@last@tail\undefined \@tabletail @@ -484,7 +463,6 @@ \global\let\@process@tablecaption\relax \PWSToplastpagenum \infloatfalse} - \newcommand{\PWSToplastpagenum}{% \ifnum\PWSTcurpage=\PWSTlastpage \iffirstcall % on last, no overflow @@ -521,7 +499,6 @@ \x@endsupertabular \ST@trace\tw@{Ended an mpxtabular\ifST@star*\fi}} \expandafter\let\csname endmpxtabular*\endcsname\endmpxtabular - \def\ST@restore{% \ifx\undefined\@classix \let\@tabularcr\org@tabularcr @@ -530,7 +507,6 @@ \fi \let\@startpbox\org@startpbox \let\@endpbox\org@endpbox} - \def\inner@tabular{% \ST@restore \let\\=\@oldcr @@ -541,7 +517,6 @@ \let\\=\@oldcr \noindent \csname org@tabular*\endcsname} - \def\ST@cr{% \noalign{% \ST@trace\thr@@{Parbox height: \the\ST@pboxht\MessageBreak @@ -604,14 +579,12 @@ \fi \global\let\ST@next\@empty }} - \newcommand{\PWST@setfirstcall}{% \iffirstcall \global\firstcallfalse \global\PWSTlines=\z@ \ST@trace\thr@@{Overflow on last page. Line counter set to \the\PWSTlines}% \fi} - \def\ST@skipfirstpart{% \noalign{% \ST@trace\tw@{Tabular too high, moving to next page}% @@ -620,7 +593,6 @@ \newpage \global\let\ST@skippage\ST@newpage }} - \def\ST@newpage{% \noalign{\ST@trace\tw@{Starting new page, writing tail}}% \@tabletail @@ -650,7 +622,6 @@ \else \expandafter\org@tabular\expandafter{\ST@tableformat}% \fi} - \newcommand{\PWSTsethead}{% \global\PWSTlines=\z@ \ST@trace\thr@@{Newpage, line counter set to: \the\PWSTlines}% @@ -674,7 +645,6 @@ \ST@trace\tw@{Set heading to tablehead}% \fi} - \endinput %% %% End of file `xtab.sty'. -- cgit v1.2.3