From 1528453c520d52522feb93806d5afe1a7da34db8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Jul 2013 23:30:13 +0000 Subject: polytable (18jul13) git-svn-id: svn://tug.org/texlive/trunk@31235 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/polytable/polytable.pdf | Bin 288192 -> 288334 bytes .../source/latex/polytable/polytable.dtx | 28 +++++++++++++-------- .../texmf-dist/tex/latex/polytable/polytable.sty | 18 +++++++------ 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/Master/texmf-dist/doc/latex/polytable/polytable.pdf b/Master/texmf-dist/doc/latex/polytable/polytable.pdf index ea38f58a232..2f267be0e52 100644 Binary files a/Master/texmf-dist/doc/latex/polytable/polytable.pdf and b/Master/texmf-dist/doc/latex/polytable/polytable.pdf differ diff --git a/Master/texmf-dist/source/latex/polytable/polytable.dtx b/Master/texmf-dist/source/latex/polytable/polytable.dtx index 6f8601b7e09..fb9219492bf 100644 --- a/Master/texmf-dist/source/latex/polytable/polytable.dtx +++ b/Master/texmf-dist/source/latex/polytable/polytable.dtx @@ -8,12 +8,12 @@ \end{document} % % -% Copyright (C) 2003--2005 by Andres Loeh +% Copyright (C) 2003--2013 by Andres Loeh % % \fi % % \ProvidesFile{polytable.dtx} -% [2005/04/26 v0.8.2 `polytable' package (Andres Loeh)] +% [2013/07/08 v0.8.5 `polytable' package (Andres Loeh)] % \GetFileInfo{polytable.dtx} % % \title{The \textsf{polytable} package} @@ -49,6 +49,10 @@ % interface, added the external (disk) queue.} % \changes{v0.8.2}{2005/04/26}{New interface command. % Minor beautifications.} +% \changes{v0.8.3}{2009/04/28}{Make sorting algorithm stable.} +% \changes{v0.8.4}{2009/11/01}{Make ptb output more stable.} +% \changes{v0.8.5}{2013/07/18}{Work around lazylist name clash +% with unicode-math.} % % \section{Introduction} % @@ -570,7 +574,7 @@ % \subsection{A warning} % % The contents of the table are processed multiple times because -% the widths of the entries are measured. Global assigments that +% the widths of the entries are measured. Global assignments that % modify registers and similar things can thus result in unexpected % behaviour. % New in v0.7: \LaTeX\ counters (i.e., counters defined by @@ -745,7 +749,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{polytable}% - [2005/04/26 v0.8.2 `polytable' package (Andres Loeh)] + [2013/07/18 v0.8.5 `polytable' package (Andres Loeh)] % \end{macrocode} % New in v0.7.2: % The \textsf{amsmath} package clashes with \textsf{lazylist}: @@ -756,12 +760,16 @@ % our problem \dots % \begin{macrocode} \let\PT@original@And\And +\let\PT@original@Not\Not \RequirePackage{lazylist} \let\PT@And\And +\let\PT@Not\Not \def\PT@prelazylist - {\let\And\PT@And} + {\let\And\PT@And + \let\Not\PT@Not} \def\PT@postlazylist - {\let\And\PT@original@And} + {\let\And\PT@original@And + \let\Not\PT@original@Not} \PT@postlazylist \RequirePackage{array} % \end{macrocode} @@ -1821,7 +1829,7 @@ % the order on their (untrusted) widths. % \begin{macrocode} \def\PT@ltmax #1#2% - {\PT@TeXif{\ifdim\csname #1.max\endcsname<\csname #2.max\endcsname}} + {\Not{\PT@TeXif{\ifdim\csname #1.max\endcsname>\csname #2.max\endcsname}}} % \end{macrocode} % \end{macro} % @@ -2135,10 +2143,10 @@ \PT@expanded{\def\PT@temp}% {\csname PT@restore@\romannumeral\PT@temp\endcsname}% \expandafter\gdef\PT@temp{}% start empty - % this is: \PT@Execute{\Map{\PT@savecolumn{\PT@temp}}\PT@sortedlist} + % this is: \PT@Execute{\Map{\PT@savecolumn{\PT@temp}}{\Reverse\PT@allcols}} \expandafter\PT@Execute\expandafter{\expandafter \Map\expandafter{\expandafter\PT@savecolumn - \expandafter{\PT@temp}}\PT@sortedlist}} + \expandafter{\PT@temp}}{\Reverse\PT@allcols}}} % \end{macrocode} % \end{macro} % @@ -2296,7 +2304,7 @@ {\immediate\write\@auxout{% \gdef\expandafter\noexpand \csname PT@restore@\romannumeral\PT@table\endcsname - {\PT@Execute{\Map{\PT@write@column{#1}}\PT@allcols}}}}% + {\PT@Execute{\Map{\PT@write@column{#1}}{\Reverse\PT@allcols}}}}}% \PT@postlazylist \fi} % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/polytable/polytable.sty b/Master/texmf-dist/tex/latex/polytable/polytable.sty index d5b0685cedd..f31d3d3a497 100644 --- a/Master/texmf-dist/tex/latex/polytable/polytable.sty +++ b/Master/texmf-dist/tex/latex/polytable/polytable.sty @@ -9,14 +9,18 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{polytable}% - [2005/04/26 v0.8.2 `polytable' package (Andres Loeh)] + [2013/07/18 v0.8.5 `polytable' package (Andres Loeh)] \let\PT@original@And\And +\let\PT@original@Not\Not \RequirePackage{lazylist} \let\PT@And\And +\let\PT@Not\Not \def\PT@prelazylist - {\let\And\PT@And} + {\let\And\PT@And + \let\Not\PT@Not} \def\PT@postlazylist - {\let\And\PT@original@And} + {\let\And\PT@original@And + \let\Not\PT@original@Not} \PT@postlazylist \RequirePackage{array} \DeclareOption{debug} {\AtEndOfPackage\PT@debug} @@ -507,7 +511,7 @@ \def\PT@gobblefalse\else\relax\gobbletrue\fi #1#2% {\fi #1} \def\PT@ltmax #1#2% - {\PT@TeXif{\ifdim\csname #1.max\endcsname<\csname #2.max\endcsname}} + {\Not{\PT@TeXif{\ifdim\csname #1.max\endcsname>\csname #2.max\endcsname}}} \def\PT@numbercol #1% {%\PT@typeout@{numbering #1 as \the\PT@cols}% \PT@enamedef{#1.num}{\the\PT@cols}% @@ -639,10 +643,10 @@ \PT@expanded{\def\PT@temp}% {\csname PT@restore@\romannumeral\PT@temp\endcsname}% \expandafter\gdef\PT@temp{}% start empty - % this is: \PT@Execute{\Map{\PT@savecolumn{\PT@temp}}\PT@sortedlist} + % this is: \PT@Execute{\Map{\PT@savecolumn{\PT@temp}}{\Reverse\PT@allcols}} \expandafter\PT@Execute\expandafter{\expandafter \Map\expandafter{\expandafter\PT@savecolumn - \expandafter{\PT@temp}}\PT@sortedlist}} + \expandafter{\PT@temp}}{\Reverse\PT@allcols}}} \def\PT@savecolumn#1#2% #1 macro name, #2 column name {\PT@typeout@{saving column #2 in \string #1 ...}% \def\PT@temp{#2}% @@ -739,7 +743,7 @@ {\immediate\write\@auxout{% \gdef\expandafter\noexpand \csname PT@restore@\romannumeral\PT@table\endcsname - {\PT@Execute{\Map{\PT@write@column{#1}}\PT@allcols}}}}% + {\PT@Execute{\Map{\PT@write@column{#1}}{\Reverse\PT@allcols}}}}}% \PT@postlazylist \fi} \def\PT@write@column #1#2% -- cgit v1.2.3