diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/xtab/xtab.sty | 94 |
1 files changed, 37 insertions, 57 deletions
diff --git a/Master/texmf-dist/tex/latex/xtab/xtab.sty b/Master/texmf-dist/tex/latex/xtab/xtab.sty index 3deb5a7e425..09b882d7b25 100644 --- a/Master/texmf-dist/tex/latex/xtab/xtab.sty +++ b/Master/texmf-dist/tex/latex/xtab/xtab.sty @@ -7,9 +7,8 @@ %% xtab.dtx (with options: `xtab') %% %% ----------------------------------------------------------------- -%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004 -%% (or at: pandgwilson at earthlink dot net) -%% Copyright 1998 -- 2004 Peter R. Wilson +%% Author: Peter Wilson (herries dot press (at) earthlink dot net) +%% Copyright 1998 -- 2008 Peter R. Wilson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -25,9 +24,8 @@ %% This work consists of the files listed in the README file. %% ----------------------------------------------------------------- %% - \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xtab}[2000/04/09 v2.3 Extended supertabular package] +\ProvidesPackage{xtab}[2008/07/26 v2.3c Extended supertabular package] \newcount\c@tracingst \DeclareOption{errorshow}{\c@tracingst\z@} @@ -57,14 +55,14 @@ \newskip\ST@parfillskip \@ifundefined{@initisotab}{% - \newcommand{\@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}% {\protect\numberline{% - \csname the#1\endcsname}{\ignorespaces #2}} + \csname the#1\endcsname}{\ignorespaces #2}}% \begingroup \@parboxrestore \normalsize @@ -73,8 +71,7 @@ %% \if@topcaption \vskip 10\p@ \fi \endgroup \global\advance\ST@pageleft -\PWSTcapht - \ST@trace\tw@{Added caption. Space left for xtabular: \the\ST@pageleft} -} + \ST@trace\tw@{Added caption. Space left for xtabular: \the\ST@pageleft}} \newcommand\tablehead[1]{% \gdef\@tablehead{% @@ -118,11 +115,8 @@ \newcommand\sttraceoff{\c@tracingst\z@} \newcommand\ST@trace[2]{% \ifnum\c@tracingst>#1\relax - \GenericWarning - {(xtab)\@spaces\@spaces} - {Package xtab: #2}% - \fi -} + \GenericWarning{(xtab)\@spaces\@spaces}{Package xtab: #2}% + \fi} \newdimen\ST@pageleft \newcommand*\shrinkheight[1]{% @@ -153,7 +147,7 @@ \def\ST@argtabularcr[#1]{% \ifnum0=`{\fi}% \ifdim #1>\z@ - \unskip\ST@xargarraycr{#1} + \unskip\ST@xargarraycr{#1}% \else \ST@yargarraycr{#1}% \fi} @@ -165,10 +159,12 @@ \cr\noalign{\vskip #1\global\ST@toadd=#1}\ST@cr} \def\ST@startpbox#1{% - \setbox\ST@pbox\vtop\bgroup\hsize#1\@arrayparboxrestore} +%%%% \setbox\ST@pbox\vtop\bgroup\hsize#1\@arrayparboxrestore} + \setbox\ST@pbox\vtop\bgroup\setlength\hsize{#1}\@arrayparboxrestore} \def\ST@astartpbox#1{% \bgroup\hsize#1% - \setbox\ST@pbox\vtop\bgroup\hsize#1\@arrayparboxrestore} +%%%% \setbox\ST@pbox\vtop\bgroup\hsize#1\@arrayparboxrestore} + \setbox\ST@pbox\vtop\bgroup\setlength\hsize{#1}\@arrayparboxrestore} \def\ST@endpbox{% \@finalstrut\@arstrutbox\par\egroup \ST@dimen=\ht\ST@pbox @@ -196,8 +192,7 @@ \ST@trace\tw@{Basic line height: \the\ST@lineht\MessageBreak% Arrayed line height: \the\ST@stretchht}% \global\advance\ST@lineht \PWST@xentrystretch\ST@lineht - \ST@trace\tw@{Stretched line height: \the\ST@lineht}% -} + \ST@trace\tw@{Stretched line height: \the\ST@lineht}} \def\@calfirstpageht{% \ST@trace\tw@{Calculating height of xtabular on first page}% @@ -259,8 +254,8 @@ \else \setbox\@tempboxa=\vbox{\@arrayparboxrestore \ST@restore - \expandafter\tabular\expandafter{\ST@tableformat} - \@tabletail\endtabular} + \expandafter\tabular\expandafter{\ST@tableformat}% + \@tabletail\endtabular}% \ST@tailht=\ht\@tempboxa\advance\ST@tailht\dp\@tempboxa \fi \advance\ST@tailht by \ST@lineht @@ -270,7 +265,7 @@ \advance\@tempdima\ST@lineht \advance\@tempdima\ST@tailht \if@topcaption - \setbox\@tempboxa=\vbox{\PWST@thecaption} + \setbox\@tempboxa=\vbox{\PWST@thecaption}% \PWSTcapht=\ht\@tempboxa\advance\PWSTcapht\dp\@tempboxa \advance\PWSTcapht by 20\p@ \else @@ -285,15 +280,13 @@ \global\ST@pageleft\@colroom \global\advance\ST@pageleft by -\PWSTcapht \global\ST@pagesofar=\z@ - \fi -} % end \@calfirstpageheight + \fi} % end \@calfirstpageheight \def\@calnextpageht{% \ST@trace\tw@{Calculating height of xtabular on next page}% \global\ST@pageleft\@colroom \global\ST@pagesofar=\z@ - \ST@trace\tw@{Maximum space for xtabular: \the\ST@pageleft}% - } + \ST@trace\tw@{Maximum space for xtabular: \the\ST@pageleft}} \newcommand{\PWSTcalchtlines}{% \setbox\@tempboxa=\vbox{\@arrayparboxrestore @@ -320,8 +313,7 @@ \expandafter\tabular\expandafter{\ST@tableformat}% \@tablehead\endtabular}% \PWST@ht = \ht\@tempboxa\advance\PWST@ht\dp\@tempboxa - \global\advance\PWST@generalht by \PWST@ht -} % end \PWSTcalchtlines + \global\advance\PWST@generalht by \PWST@ht} \newcommand{\PWSTcalnextpageht}{% \ifnum\PWSTcurpage = \PWSTpenultimate @@ -334,8 +326,7 @@ \global\ST@pageleft\@colroom \global\advance\ST@pageleft -\PWST@ht \global\ST@pagesofar=\z@ - \ST@trace\tw@{Available space for xtabular: \the\ST@pageleft}% -} + \ST@trace\tw@{Available space for xtabular: \the\ST@pageleft}} \def\x@supertabular{% \let\org@tabular\tabular @@ -377,8 +368,7 @@ \global\advance\ST@pageleft -\ST@headht% \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}% -} + \ST@trace\tw@{Available space after accounting for tail: \the\ST@pageleft}} \newcommand{\PWSTinit}{% \global\advance\c@PWSTtable\@ne @@ -386,7 +376,7 @@ \csname PWST@\romannumeral\c@PWSTtable\endcsname \ifx\PWSTtempc\relax \ST@trace\tw@{Table \the\c@PWSTtable: Processing for the first time}% - \PWSTlastpage=\@m % = 1000 + \PWSTlastpage=\@m% = 1000 \else \PWSTlastpage=\PWSTtempc \fi @@ -395,14 +385,13 @@ \PWSTcalchtlines \global\PWSTlines=\z@ \global\firstcalltrue - \infloattrue -} + \infloattrue} \def\xtabular{% \@ifnextchar[{\@supertabular}%] {\@supertabular[]}} \def\@supertabular[#1]#2{% - \def\ST@tableformat{#2} + \def\ST@tableformat{#2}% \ST@trace\tw@{Starting a new xtabular}% \global\ST@starfalse \global\ST@mpfalse @@ -476,8 +465,7 @@ \fi \csname endtabular\ifST@star*\fi\endcsname \x@endsupertabular - \ST@trace\tw@{Ended a xtabular\ifST@star*\fi}% - } + \ST@trace\tw@{Ended a xtabular\ifST@star*\fi}} \expandafter\let\csname endxtabular*\endcsname\endxtabular \newcommand{\x@endsupertabular}{% \ST@restore @@ -491,8 +479,7 @@ %%% \global\let\@table@last@tail\undefined \global\let\@process@tablecaption\relax \PWSToplastpagenum - \infloatfalse -} + \infloatfalse} \newcommand{\PWSToplastpagenum}{% \ifnum\PWSTcurpage=\PWSTlastpage @@ -514,11 +501,10 @@ \fi \fi \if@filesw\immediate\write\@auxout% - {\gdef\string\PWST@\romannumeral\c@PWSTtable{\the\PWSTcurpage}} + {\gdef\string\PWST@\romannumeral\c@PWSTtable{\the\PWSTcurpage}}% \ST@trace\tw@{Table \the\c@PWSTtable:\MessageBreak wrote \the\PWSTcurpage\space as the last page}% - \fi -} + \fi} \def\endmpxtabular{% \ifx\@table@last@tail\undefined @@ -529,8 +515,7 @@ \csname endtabular\ifST@star*\fi\endcsname \endminipage \x@endsupertabular - \ST@trace\tw@{Ended an mpxtabular\ifST@star*\fi}% - } + \ST@trace\tw@{Ended an mpxtabular\ifST@star*\fi}} \expandafter\let\csname endmpxtabular*\endcsname\endmpxtabular \def\ST@restore{% @@ -540,8 +525,7 @@ \let\@arraycr\org@tabularcr \fi \let\@startpbox\org@startpbox - \let\@endpbox\org@endpbox -} + \let\@endpbox\org@endpbox} \def\inner@tabular{% \ST@restore @@ -574,7 +558,7 @@ \ST@trace\thr@@{Space left for xtabular: \the\ST@pageleft}% \global\advance\PWSTlines \@ne \ST@trace\thr@@{Line counter incremented by one to: \the\PWSTlines}% - } % end of noalign + }% end of noalign \ifnum\PWSTcurpage=\PWSTlastpage \PWST@lastpagecr \else @@ -588,7 +572,7 @@ \global\advance\@tempdima\ht\@mpfootins \global\advance\@tempdima 3pt \fi - \fi} % end noalign + \fi}% end noalign \ifnum\ST@pageleft<\@tempdima \ST@newpage \else @@ -615,16 +599,14 @@ \PWST@setfirstcall \fi \global\let\ST@next\@empty - } % end noalign -} + }} \newcommand{\PWST@setfirstcall}{% \iffirstcall \global\firstcallfalse \global\PWSTlines=\z@ \ST@trace\thr@@{Overflow on last page. Line counter set to \the\PWSTlines}% - \fi -} + \fi} \def\ST@skipfirstpart{% \noalign{% @@ -633,8 +615,7 @@ \global\ST@pagesofar\z@ \newpage \global\let\ST@skippage\ST@newpage - } -} + }} \def\ST@newpage{% \noalign{\ST@trace\tw@{Starting new page, writing tail}}% @@ -687,8 +668,7 @@ \else \let\ST@next\@tablehead \ST@trace\tw@{Set heading to tablehead}% - \fi -} + \fi} \endinput |