diff options
author | Norbert Preining <preining@logic.at> | 2008-01-08 14:57:44 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2008-01-08 14:57:44 +0000 |
commit | f060c38fbeae55d94e6fb69f0532011a93d6a65a (patch) | |
tree | 1d49921bff0220e0d6075da6775a5da2a88ad482 /Master/texmf-dist/source/latex/makecell | |
parent | ef9f02e1332e604eb441b2a8ff6bca6a8f3c55a1 (diff) |
makecell update CTAN 08-01-08
git-svn-id: svn://tug.org/texlive/trunk@6146 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/makecell')
-rw-r--r-- | Master/texmf-dist/source/latex/makecell/makecell.dtx | 20 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/makecell/tablists.dtx | 324 |
2 files changed, 228 insertions, 116 deletions
diff --git a/Master/texmf-dist/source/latex/makecell/makecell.dtx b/Master/texmf-dist/source/latex/makecell/makecell.dtx index 6e1b30b6ba1..75b094c8198 100644 --- a/Master/texmf-dist/source/latex/makecell/makecell.dtx +++ b/Master/texmf-dist/source/latex/makecell/makecell.dtx @@ -16,7 +16,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{makecell} %<*package> - [2007/05/24 V0.1d Managing of Tab Column Heads and Cells] + [2008/01/12 V0.1e Managing of Tab Column Heads and Cells] %</package> % %<*batchfile> @@ -34,6 +34,14 @@ % %<*driver> \documentclass{ltxdoc} + +\usepackage{ifpdf} +\ifpdf + \usepackage{mathptmx,courier} + \usepackage[scaled=0.90]{helvet} + \addtolength\marginparwidth{15pt} +\fi + \usepackage{makecell} \IfFileExists{rotating.sty}{\usepackage{rotating}}{} \IfFileExists{footmisc.sty}{\usepackage[perpage,bottom]{footmisc}}{} @@ -41,7 +49,7 @@ \IfFileExists{hyperref.sty}{\usepackage{hyperref}}{} \IfFileExists{hypcap.sty}{\usepackage{hypcap}}{} \IfFileExists{caption.sty} - {\usepackage[font=small,labelfont=bf,labelsep=period]{caption}[2004/11/28] + {\usepackage[font=small,labelfont=bf,labelsep=period]{caption} \IfFileExists{floatrow.sty} {\usepackage[font=small,style=plaintop,captionskip=5pt]{floatrow}} {}}{} @@ -62,7 +70,7 @@ \providecommand*{\cls}[1]{\textsf{#1}} \providecommand*{\env}[1]{\texttt{#1}} -%\OnlyDescription +\OnlyDescription \begin{document} \DocInput{makecell.dtx} \PrintChanges @@ -70,7 +78,7 @@ %</driver> % \fi % -% \CheckSum{1238} +% \CheckSum{1245} % % \GetFileInfo{makecell.dtx} % @@ -1090,6 +1098,8 @@ % set |c|-argument as vertical or horizontal centering alignment if necessary. % For \texttt{l} and \texttt{r} alignments also redefined alignment % settings for |\makecell| (|\thead|) blocks. +% \changes{V0.1d}{2007/05/24}{The \cmd{\empty} command changed to \cmd{\relax} +% for usage inside \cmd{\@classz}} % \begin{macrocode} \newcommand\mcell@l{\def\mcell@ii{l}\let\mcell@c\mcell@ic \global\let\mcell@left\relax} @@ -1683,8 +1693,10 @@ % % \begin{macro}{\Xhline} % The commands for |\hline| and |\cline| with necessary thickness. +% \changes{0.0e}{2008/01/12}{The \cmd{\Xhline} adds support for long tables.} % \begin{macrocode} \newcommand\Xhline[1]{\noalign{\ifnum0=`}\fi\arrayrulewidth#1% + \ifx\hline\LT@hline\let\@xhline\LT@@hline\fi \hrule\@height\arrayrulewidth\futurelet\reserved@a\@xhline} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/makecell/tablists.dtx b/Master/texmf-dist/source/latex/makecell/tablists.dtx index 0390c886b40..2179d285b83 100644 --- a/Master/texmf-dist/source/latex/makecell/tablists.dtx +++ b/Master/texmf-dist/source/latex/makecell/tablists.dtx @@ -16,7 +16,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{tablists} %<*package> - [2007/05/24 v0.0a (beta) Tabulated list of short items] + [2008/01/12 v0.0ñ (beta) Tabulated list of short items] %</package> % %<*batchfile> @@ -34,10 +34,22 @@ % %<*driver> \documentclass{ltxdoc} + +\usepackage{ifpdf} +\ifpdf + \usepackage{mathptmx,courier} + \usepackage[scaled=0.90]{helvet} + \addtolength\marginparwidth{15pt} +\fi + \usepackage{paralist} \usepackage{makecell} +\usepackage{amsthm} +\newtheorem{theorem}{Theorem} \usepackage{tablists} \IfFileExists{hyperref.sty}{\usepackage{hyperref}}{} +\IfFileExists{listpen.sty}{\usepackage{listpen}}{} +\providecommand\RestoreSpaces{\bigskip} \EnableCrossrefs \CodelineIndex \RecordChanges @@ -51,7 +63,7 @@ \providecommand*{\cls}[1]{\textsf{#1}} \providecommand*{\env}[1]{\texttt{#1}} -%\OnlyDescription +\OnlyDescription \begin{document} \DocInput{tablists.dtx} \PrintChanges @@ -59,7 +71,7 @@ %</driver> % \fi % -% \CheckSum{447} +% \CheckSum{493} % % \GetFileInfo{tablists.dtx} % @@ -91,8 +103,7 @@ % \DescribeMacro{\item} % The \env{tabenum} environment prints short items aligned in columns. % -% Each item starts with |\tabenumitem| command; you may use the |\item| -% macro instead of |\tabenumitem| in this environment. +% Each item starts with |\tabenumitem| command. % First example of \env{tabenum} list---please note that you may set optional % argument in the same way as in modified environments from \pkg{enumerate} % or \pkg{paralist} packages: @@ -108,27 +119,27 @@ %$3^{2x+3}=16 $; %\tabenumitem %$z=2x^2+4y^2$;\par -%\item +%\tabenumitem %$u=\sqrt{x^2+y^2+z^2}$; -%\item +%\tabenumitem %$v=gt+\displaystyle\frac{g}{4}t$;\\[1ex] -%\item +%\tabenumitem %$u=2^{5x-3y+z}$; -%\item +%\tabenumitem %$w=(v+7)^2+(u-3)^2$; % % -%\item +%\tabenumitem %$5^x=\displaystyle\frac{4}{3} ;$ -%\item +%\tabenumitem %$z=(x+1)^2+y^2$;\\* -%\item +%\tabenumitem %$2+5+8+ \ldots +(3n+2)=155$, $n\in \mathrm{N};$ -%\item +%\tabenumitem %$t=5u^2+8v^2$; %\end{tabenum} %\end{verbatim} -%\end{small}% +%\end{small} % \begin{tabenum}[\bfseries1)]% % \tabenumitem % $z=\displaystyle\frac xy$; @@ -139,23 +150,23 @@ % $3^{2x+3}=4 $; % \tabenumitem % $z=2x^2+4y^2$;\par -% \item +% \tabenumitem % $u=\sqrt{x^2+y^2+z^2}$; -% \item +% \tabenumitem % $v=gt+\displaystyle\frac{g}{4}t$;\\[1ex] -% \item +% \tabenumitem % $u=2^{5x-3y+z}$; -% \item +% \tabenumitem % $w=(v+7)^2+(u-3)^2$; % % -% \item +% \tabenumitem % $5^x=\displaystyle\frac{4}{3} ;$ -% \item +% \tabenumitem % $z=(x+1)^2+y^2$;\\* -% \item +% \tabenumitem % $2+5+8+ \ldots +(3n+2)=155$, $n\in \mathrm{N};$ -% \item +% \tabenumitem % $t=5u^2+8v^2$; % \end{tabenum} % @@ -168,6 +179,8 @@ % |\cr|'s or |\\|'s (and also any combination of these three commands) % create additional empty lines. % +% You may use the |\item| +% macro instead of |\tabenumitem| in this \env{tabenum} environments (see next examples). % % \DescribeMacro{\notabenumitem} % \DescribeMacro{\noitem} @@ -187,13 +200,13 @@ %\par\begin{small}% %\begin{verbatim} %\begin{tabenum}[\bfseries1)]% -%\tabenumitem +%\item %$z=\displaystyle\frac xy$; -%\notabenumitem +%\noitem %$2^x=9;$ -%\tabenumitem +%\item %$3^{2x+3}=4 $. -%\tabenumitem +%\item %$z=2x^2+4y^2$;\nopagebreak % %\item @@ -217,13 +230,13 @@ %\end{verbatim} %\end{small}% % \begin{tabenum}[\bfseries1)]% -% \tabenumitem +% \item\label{tabenum:I:1} % $z=\displaystyle\frac xy$; -% \notabenumitem +% \noitem\label{tabenum:I:2} % $2^x=9;$ -% \tabenumitem +% \item % $3^{2x+3}=4 $. -% \tabenumitem +% \item % $z=2x^2+4y^2$;\nopagebreak % % \item @@ -238,11 +251,14 @@ % $5^x=\displaystyle\frac{4}{3} ;$ % \item % $z=(x+1)^2+y^2$;\\* -% \item +% \item\label{tabenum:I:11} % $2+5+8+ \ldots +(3n+2)=155$, $n\in \mathrm{N};$\hidewidth\skipitem % \item % $t=5u^2+8v^2$; % \end{tabenum} +% The items \ref{tabenum:I:1} and \ref{tabenum:I:2} were joined in one column: the item \ref{tabenum:I:2} +% used |\noitem| (|\notabenumitem|) command. The item \ref{tabenum:I:11} occupies two columns, +% so it uses the |\hidewidth| (hides item width) and |\skipitem| (skips column of next item) commands. % % % \subsection{Spacing} @@ -287,7 +303,7 @@ %\begin{verbatim} %\begin{enumerate}[\bfseries1)]% %\item\renewcommand\tabenumindent{1)\hskip\labelsep}% -% \liststrut[\displaystyle\frac xy] +% \liststrut[\displaystyle\frac /y] %\begin{tabenum}[a)]% %... %\end{verbatim}% @@ -296,13 +312,13 @@ % \item\renewcommand\tabenumindent{1)\hskip\labelsep}% % \liststrut[\displaystyle\frac /y] % \begin{tabenum}[a)]% -% \tabenumitem +% \item % {$z=\displaystyle\frac xy$}; -% \notabenumitem +% \noitem % {$2^x=9;$} -% \tabenumitem +% \item % {$3^{2x+3}=4 $}. -% \tabenumitem +% \item % {$z=2x^2+4y^2$};\nopagebreak % % \item @@ -323,6 +339,7 @@ % $t=5u^2+8v^2$; % \end{tabenum} % \end{enumerate}% +% \emph{Note}: The |\liststrut| not always works correctly.\RestoreSpaces % % \subsection{The \env{subtabenum} environment: second level, variant I} % @@ -335,13 +352,13 @@ %\begin{tabenum}[\bfseries 1)]% %\item %\begin{subtabenum}[a)]% -%\tabenumitem +%\item %$z=\displaystyle\frac xy$; -%\notabenumitem +%\noitem %$2^x=9;$ -%\tabenumitem +%\item %$3^{2x+3}=4 $. -%\tabenumitem +%\item %$z=2x^2+4y^2$; %\end{subtabenum} % @@ -350,37 +367,25 @@ %\item %$u=\sqrt{x^2+y^2+z^2}$; %\item -%$v=gt+\displaystyle\frac{g}{4}t$, -%\item -%$u=2^{5x-3y+z}$.\\ -%\item -%$w=(v+7)^2+(u-3)^2$; -%\item -%$5^x=\displaystyle\frac{4}{3} ;$ -%\item -%$z=(x+1)^2+y^2$;\\ -%\item -%$2+5+8+ \ldots +(3n+2)=155$, $n\in \mathrm{N};$\hidewidth\strut\skipitem -%\item -%$t=5u^2+8v^2$; +%... %\end{subtabenum} %\end{tabenum} %\end{verbatim}% %\end{small}% % \begin{tabenum}[\bfseries 1)]% -% \tabenumitem +% \item % \begin{subtabenum}[a)]% -% \tabenumitem +% \item % $z=\displaystyle\frac xy$; -% \notabenumitem +% \noitem % $2^x=9;$ -% \tabenumitem +% \item % $3^{2x+3}=4 $. -% \tabenumitem +% \item % $z=2x^2+4y^2$; -% \end{subtabenum} +% \end{subtabenum}\nopagebreak % -% \tabenumitem +% \item % \begin{subtabenum}[a)] % \item % $u=\sqrt{x^2+y^2+z^2}$; @@ -402,94 +407,155 @@ % \end{tabenum} % Please note that |\hidewidth| skip is followed by the |\strut| command inside % \env{subtabenum} environment: -% the skips at the ``edges'' of \env{tabular} columns doesn't work. +% the skips at the ``edges'' of \env{tabular} columns or before |\\| command doesn't work. % % \subsection{The \cs{subtabenumitem}/\cs{subitem} macros: second level, variant II} % % The previous example shows that columns were destroyed from one -% \env{subtabenum} environment to another. +% \env{subtabenum} environment to another. Also the rows of sublist cannot break between pages. % +% \DescribeMacro{\subtabenumitem} +% \DescribeMacro{\subitem} % There is another variant for two-level tabulated list. If you use second option % in \env{tabenum} environment, you may use |\subtabenumitem|/|\subitem| commands -% for the second level. +% for the second level\footnote{If there are not second optional argument, these commands +% work like \cs{tabenumitem}/\cs{item}.}. % -% \DescribeMacro{\subtabenumitem} -% \DescribeMacro{\subitem} -% If you put |\subitem| after |\item|, you get extra space between +% If you put |\subtabenumitem| (|\subitem|) after |\tabenumitem| (|\item|), you get extra space between % two numbers, created by |\tabenumsep| skip. The |\negtabenumsep| command -% cancels this skip. +% cancels this skip: the version 0.1c included this command inside the |\tabenumitem| definition. %\par\begin{small}\openup-.75pt %\begin{verbatim} %\def\tabenumsep{\qquad} %\begin{tabenum}[\bfseries 1)][a)]% -%\tabenumitem\negtabenumsep -%\subtabenumitem +%\item +%\subitem %$z=\displaystyle\frac xy$; -%\nosubtabenumitem +%\nosubitem %$2^x=9;$ -%\subtabenumitem +%\subitem %$3^{2x+3}=4 $. -%\subtabenumitem +%\subitem %$z=2x^2+4y^2$;\\ -%\startnumber{4}\startsubnumber{1} -%\item\negtabenumsep +%\startnumber{4} +%\item %\subitem %$u=\sqrt{x^2+y^2+z^2}$; %\subitem %$v=gt+\displaystyle\frac{g}{4}t$, %\subitem -%$u=2^{5x-3y+z}$.\\\skipitem\negtabenumsep +%$u=2^{5x-3y+z}$.\\\startsubnumber{7}\subtabrow %\subitem %$w=(v+7)^2+(u-3)^2$; %\subitem %$5^x=\displaystyle\frac{4}{3} ;$ %\subitem -%$z=(x+1)^2+y^2$;\\\skipitem\negtabenumsep +%$z=(x+1)^2+y^2$;\\\subtabrow %\subitem %$2+5+8+ \ldots +(3n+2)=155$, $n\in \mathrm{N};$\hidewidth\skipitem %\subitem %$t=5u^2+8v^2$; %\end{tabenum} %\end{verbatim}% -%\end{small}% +%\end{small} % \begin{tabenum}[\bfseries 1)][a)]% -% \tabenumitem\negtabenumsep -% \subtabenumitem +% \item +% \subitem % $z=\displaystyle\frac xy$; -% \nosubtabenumitem +% \nosubitem % $2^x=9;$ -% \subtabenumitem +% \subitem % $3^{2x+3}=4 $. -% \subtabenumitem +% \subitem % $z=2x^2+4y^2$;\\ -%\startnumber{4}\startsubnumber{1} -% \item\negtabenumsep +% \startnumber{4}\relax +% \item % \subitem % $u=\sqrt{x^2+y^2+z^2}$; % \subitem % $v=gt+\displaystyle\frac{g}{4}t$, % \subitem -% $u=2^{5x-3y+z}$.\\\skipitem\negtabenumsep +% $u=2^{5x-3y+z}$.\\\startsubnumber{7}\subtabrow % \subitem % $w=(v+7)^2+(u-3)^2$; % \subitem % $5^x=\displaystyle\frac{4}{3} ;$ % \subitem -% $z=(x+1)^2+y^2$;\\\skipitem\negtabenumsep +% $z=(x+1)^2+y^2$;\\\subtabrow % \subitem % $2+5+8+ \ldots +(3n+2)=155$, $n\in \mathrm{N};$\hidewidth\skipitem % \subitem % $t=5u^2+8v^2$; % \end{tabenum} % There were used two commands |\startnumber| and |\startsubnumber| which set -% next start numbers for items of each of two levels. There is not restarting commands -% for numeration of second level inside environment, -% so, in this case, we need set new start of sublevel by hand. The -% |\startnumber|\footnote{The \cs{startnumber} command can be used inside any list -% environment.} +% next start numbers for items of each of two levels\footnote{The \cs{startnumber} +% command can be used inside any list +% environment.}. The |\startnumber| % allows you to divide \env{tabenum} environment and restart with necessary counter. % You may still use the traditional |\setcounter{enum..}{..}| combination, -% if you know the level of your list and \env{tabenum}/\allowbreak\env{subtabenum} % environments. +% if you know the level of your list and \env{tabenum}/\allowbreak\env{subtabenum} environments. +% For start of the new row from subitem, you need to use~\nobreak\quad1)\nobreak\enskip +% the |\skipitem| command to skip +% column, occupied by the ``parent'' label (|\tabenumitem|) and~\nobreak\quad2)\nobreak\enskip +% the |\negtabenumsep| command to undo column separation. +% These two commands abbreviated by |\subtabrow| command. +% +% \subsection{Placing the QED sign at the end of \env{tabenum} environment} +% +% When the \env{tabenum} environment is used inside \env{proof} environment (the +% \texttt{amsthm} package), +% the better way is to put QED at the end of last \env{tabenum} line. You may use +% the |\tabqedhere| command: +% +% \begin{theorem}% +% You may put the QED sign inside the \env{tabenum} environment. +% \end{theorem}% +% \begin{proof}% +% Let's put our favorite \env{tabenum} environment inside the \env{proof} one, +% and at the end of it write the |\tabqedhere| (or |\qedhere|) command: +%\begin{verbatim} +%\begin{theorem} +% You may put the QED sign inside the \env{tabenum} environment. +%\end{theorem} +%\begin{proof} +% Let's put... +%\begin{tabenum}[\bfseries 1)][a)]% +%... +%\subitem +%$t=5u^2+8v^2$;\qedhere +%\end{tabenum} +%\end{proof} +%\end{verbatim}% +% \begin{tabenum}[\bfseries 1)][a)]% +% \item +% \subitem +% $z=\displaystyle\frac xy$; +% \nosubitem +% $2^x=9;$ +% \subitem +% $3^{2x+3}=4 $. +% \subitem +% $z=2x^2+4y^2$;\\ +% \startnumber{4}\relax +% \item +% \subitem +% $u=\sqrt{x^2+y^2+z^2}$; +% \subitem +% $v=gt+\displaystyle\frac{g}{4}t$, +% \subitem +% $u=2^{5x-3y+z}$.\\\startsubnumber{7}\subtabrow +% \subitem +% $w=(v+7)^2+(u-3)^2$; +% \subitem +% $5^x=\displaystyle\frac{4}{3} ;$ +% \subitem +% $z=(x+1)^2+y^2$;\\\subtabrow +% \subitem +% $2+5+8+ \ldots +(3n+2)=155$, $n\in \mathrm{N};$\hidewidth\skipitem +% \subitem +% $t=5u^2+8v^2$;\qedhere +% \end{tabenum} +% \end{proof}% % % \subsection{Restoring of \cs{item} as command from list environments} % @@ -509,7 +575,8 @@ % The horizontal separation space between items/columns. % \begin{macrocode} \newcommand\tabenumsep{\hskip1em} -\newcommand\negtabenumsep{\settowidth\@tempdima{\tabenumsep}\hspace*{-\@tempdima}} +\newcommand\negtabenumsep{% + \settowidth\@tempdima{\tabenumsep}\hspace*{-\@tempdima}} % \end{macrocode} % % \begin{macro}{\tabenumitem} @@ -518,18 +585,27 @@ % \begin{macrocode} \newcommand\tabenumitem{&\@ifnextchar[%] {\TeXr@@tabenumitem{&}}% - {\TeXr@tabenumitem{&}{\@enumctr}}} + {\TeXr@tabenumitem{&}{\@enumctr}}\setcounter{\@subenumctr}\z@} % \end{macrocode} % The macro for second level of tabulated items. % \begin{macrocode} -\newcommand\subtabenumitem{&\@ifnextchar[%] - {\TeXr@@tabenumitem{&}}% - {\TeXr@tabenumitem{&}{\@subenumctr}}} +\newcommand\subtabenumitem{\ifnum\value{\@subenumctr}=\z@\negtabenumsep + \let\negtabenumsep\relax\fi& + \@ifnextchar[%] + {\TeXr@@tabenumitem{&}}% + {\TeXr@tabenumitem{&}{\@subenumctr}}} % \end{macrocode} -% The macros for list and optional numeration. +% The macros for list and optional numeration. For a successful usage of |\label|--|\ref| mechanism +% the |\refstepcounter| contains were divided in two parts: the |\stepcounter| command was plased in the +% first column, before printing of label, on the second column was placed mechanism of creation +% labels. +% \changes{0.0b}{2007/09/07}{The \cmd{\refstepcounter} command divided into two parts to allow +% labels for tabular items.} % \begin{macrocode} \newcommand\TeXr@tabenumitem[2]{% - \refstepcounter{#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{} \def\TeXr@@tabenumitem#1[#2]{{#2}#1} % \end{macrocode} @@ -566,6 +642,14 @@ % \end{macrocode} % \end{macro}% % +% \begin{macro}{\subtabrow} +% Command allows to skip column of items in tabulated list. +% One item column occupies two tabular ones and needs |&&| for skipping +% \begin{macrocode} +\newcommand\subtabrow{\skipitem\negtabenumsep} +% \end{macrocode} +% \end{macro}% +% % \begin{macro}{\tabenumindent} % If this command empty there is no any indentation. To set necessary indentation % you may define this command as any text or horizontal skip. @@ -585,7 +669,7 @@ % |\Asbuk|/|\asbuk| numeration. % \begin{macrocode} \newenvironment{rtabenum}{\let\Alph\Asbuk\let\alph\asbuk - \begin{tabenum}}{\end{tabenum}} + \tabenum}{\endtabenum} % \end{macrocode} % % These environments use mechanism of optional argument from |\@enumlabel@| @@ -593,7 +677,8 @@ % \begin{macrocode} \newcommand\tabenum{\@ifnextchar[{\TeXr@tabenum@}{\TeXr@tabenum@[]}} \@ifdefinable\TeXr@tabenum@{} -\def\TeXr@tabenum@[#1]{\@ifnextchar[{\TeXr@tabenum@@[#1]}{\TeXr@tabenum@@[#1][]}} +\def\TeXr@tabenum@[#1]{\@ifnextchar[%] + {\TeXr@tabenum@@[#1]}{\TeXr@tabenum@@[#1][]}} % \end{macrocode} % % These environments allow two options for item numeration and subitem numeration. @@ -613,7 +698,7 @@ % Interline spacing enlarged by |\jot| as in \pkg{amsmath}'s environments like % \env{align} etc. % \begin{macrocode} - \openup\jot + \openup\jot% % \end{macrocode} % Check for list depth and settings for first level. % If it exceeded, the error message pops out. @@ -631,7 +716,7 @@ % \begin{macrocode} \ifnum\@enumdepth>\thr@@ \PackageWarning{tablists}{tablist has one level}{}% - \let\subitem\tabenumitem\let\nosubitem\notabenumitem% + \let\subitem\tabenumitem\let\nosubitem\notabenumitem \else \let\subitem\subtabenumitem\let\nosubitem\nosubtabenumitem \advance\@enumdepth\@ne @@ -674,9 +759,10 @@ \let\\\TeXr@arraycr\TeXr@tlist@arrayjot\let\par=\cr \settowidth\@tempdima{\tabenumindent}% \settowidth\@tempdimb{\tabenumsep}% + \let\qedhere\tabqedhere \halign\bgroup \strut##\hskip\@tempdima - \hskip-\@tempdimb&&\tabenumsep\hfil##\hskip\labelsep&##\hfil\cr} + \hskip-\@tempdimb&&\tabenumsep\hfil##\hskip\labelsep&##\hfil\cr} % \end{macrocode} % % Finish of \env{tabenum} environment. @@ -705,9 +791,10 @@ \let\subitem\subtabenumitem\let\nosubitem\nosubtabenumitem \@TeXr@subtabenum } -\newcommand{\@TeXr@subtabenum}{% +\newcommand{\@TeXr@subtabenum}{\let\negtabenumsep\relax \hbox{\ifnum0=`}\fi - \begin{tabular}[t]{@{\tabenumindent}l@{}*{12}{r@{\hskip\labelsep}l@{\tabenumsep}}@{}}% + \begin{tabular}[t]{@{\tabenumindent}l@{} + *{12}{r@{\hskip\labelsep}l@{\tabenumsep}}@{}}% } \def\endsubtabenum{\end{tabular}% \ifnum0=`{\fi}\gdef\tabenumindent{}} @@ -716,8 +803,8 @@ % Russified environment with |\Asbuk|/|\asbuk| counters instead of % |\Alph|/|\alph|. % \begin{macrocode} -\newenvironment{rsubtabenum}{\let\Alph\Asbuk\let\alph\asbuk - \begin{subtabenum}}{\end{subtabenum}} +\newenvironment{rsubtabenum}{\let\Alph\Asbuk\let\alph\asbuk% + \subtabenum}{\endsubtabenum} % \end{macrocode} % \end{environment}% % \end{environment}% @@ -728,17 +815,20 @@ % \begin{macrocode} \@ifdefinable\TeXr@rixarraycr{} \let\TeXr@rixarraycr\TeXr@xarraycr -\newcommand\TeXr@Xarraycr{\@ifnextchar [ \TeXr@Xargarraycr {\@argarraycr[\jot]}} +\newcommand\TeXr@Xarraycr{\@ifnextchar[%] + \TeXr@Xargarraycr {\@argarraycr[\jot]}} \@ifdefinable\TeXr@Xargarraycr{} \def\TeXr@Xargarraycr[#1]{\@tempdima\jot\advance\@tempdima#1% \@argarraycr[\@tempdima]} \@ifdefinable\TeXr@arrayjot{} \def\TeXr@arrayjot [#1]{\let\@xarraycr\TeXr@Xarraycr\jot#1} \def\noarrayjot{\let\@xarraycr\TeXr@rixarraycr} -\newcommand\TeXr@tlist@arrayjot {\@ifnextchar[\TeXr@arrayjot{\TeXr@arrayjot[\jot]}} +\newcommand\TeXr@tlist@arrayjot {\@ifnextchar[%] + \TeXr@arrayjot{\TeXr@arrayjot[\jot]}} \AtBeginDocument{\let\arrayjot\TeXr@tlist@arrayjot} \def\TeXr@arraycr{% - \relax\iffalse{\fi\ifnum 0=`}\fi\@ifstar{\vadjust{\penalty\@M}\@xarraycr}\@xarraycr} + \relax\iffalse{\fi\ifnum 0=`}\fi + \@ifstar{\vadjust{\penalty\@M}\@xarraycr}\@xarraycr} % \end{macrocode} % \end{macro} % @@ -779,6 +869,16 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\tabqedhere} +% Places the QED sign at the end of \env{tabenum} line inside the \env{proof} environment. +% \begin{macrocode} +\newcommand\tabqedhere{\cr + \noalign{\@par\@tempdima\prevdepth + \kern-\@tempdima\kern-\baselineskip\kern\lineskip + {\strut\popQED}\@par\kern\@tempdima}} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\restorelistitem} % For the cases when standard lists appear inside \env{tablist}. % \begin{macrocode} @@ -790,4 +890,4 @@ % \Finale \endinput %% -%% End of file tablists.dtx
\ No newline at end of file +%% End of file tablists.dtx
\ No newline at end of file |