colortbl 1.0a (14feb12)

git-svn-id: svn://tug.org/texlive/trunk@25394 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 55 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf
new file mode 100755
index 00000000000..6c6b376143f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf
diff --git a/Master/texmf-dist/doc/latex/colortbl/colortbl-de.tex b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.tex
index 99fe294248e..99fe294248e 100644
--- a/Master/texmf-dist/doc/latex/colortbl/colortbl-de.tex
+++ b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.tex
diff --git a/Master/texmf-dist/doc/latex/colortbl/colortbl-de.pdf b/Master/texmf-dist/doc/latex/colortbl/colortbl-de.pdf
deleted file mode 100644
index 23eabd02a4a..00000000000
--- a/Master/texmf-dist/doc/latex/colortbl/colortbl-de.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf b/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
index 17f79c63076..1ba12db2345 100644
--- a/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
+++ b/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
diff --git a/Master/texmf-dist/source/latex/colortbl/colortbl.dtx b/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
index b5a5a225917..30328484101 100644
--- a/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
+++ b/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
@@ -1,10 +1,10 @@
 % \iffalse
 %%
 %% Source File: `colortbl.dtx'.
-%% Copyright 1996 1998 1999 David Carlisle
+%% Copyright 1996 1998 1999 2012 David Carlisle
 %%
 %% This file may be distributed under the terms of the LPPL.
-%% See 00readme.txt for details.
+%% See readme for details.
 %%
 %
 %<*dtx>
@@ -15,7 +15,7 @@
 %<driver>\ProvidesFile{colortbl.drv}
 % \fi
 %         \ProvidesFile{colortbl.dtx}
-          [2001/02/13 v0.1j Color table columns (DPC)]
+          [2012/02/13 v1.0a Color table columns (DPC)]
 %
 % \iffalse
 %<*driver>
@@ -42,7 +42,7 @@
 %
 %  \maketitle
 % 
-% \CheckSum{941}
+% \CheckSum{966}
 %
 %
 % \begin{abstract}
@@ -646,6 +646,10 @@
 %    \begin{macrocode}
    \@addtopreamble{%
     \setbox\z@\hbox\bgroup\bgroup
+%    \end{macrocode}
+% \changes{v1.0a}{2012/02/13}{reset everycr for nested uses (see test ct2)}
+%    \begin{macrocode}
+      \CT@everycr{}%
       \ifcase \@chnum
 %    \end{macrocode}
 % "c" code: This used to use twice as much glue as "l" and "r" (1fil
@@ -901,8 +905,9 @@
 %
 % \begin{macro}{\multicolumn}
 % "\multicolumn"
+% \changes{v1.0a}{2012/02/13}{make multicolumn long (see test ct1)}
 %    \begin{macrocode}
-\def\multicolumn#1#2#3{%
+\long\def\multicolumn#1#2#3{%
    \multispan{#1}\begingroup
    \def\@addamp{\if@firstamp \@firstampfalse \else
                 \@preamerr 5\fi}%
@@ -910,7 +915,10 @@
    \endgroup
    \def\@sharp{#3}%
    \let\CT@cell@color\relax
-   \let\CT@row@color\relax
+%    \end{macrocode}
+% \changes{v1.0a}{2012/02/13}{don't reset CT@row@color (see test ct3)}
+%   \let\CT@row@color\relax
+%    \begin{macrocode}
    \let\CT@column@color\relax
    \let\CT@do@color\relax
    \@arstrut \@preamble
@@ -1178,14 +1186,18 @@
 % \end{macro}
 %
 % hhline support (almost the whole package, repeated, sigh).
+% \changes{v1.0a}{2012/02/13}{Several improvements (see test ct4)}
 %    \begin{macrocode}
 \AtBeginDocument{%
   \ifx\hhline\@undefined\else
 \def\HH@box#1#2{\vbox{{%
-  {\CT@drsc@\dimen@\tw@\arrayrulewidth
-   \advance\dimen@\doublerulesep
-   \hrule \@height\dimen@
-   \vskip-\dimen@}%
+  \ifx\CT@drsc@\relax\else
+    \global\dimen\thr@@\tw@\arrayrulewidth
+    \global\advance\dimen\thr@@\doublerulesep
+    {\CT@drsc@
+     \hrule \@height\dimen\thr@@
+     \vskip-\dimen\thr@@}%
+  \fi
   \CT@arc@
   \hrule \@height \arrayrulewidth \@width #1
   \vskip\doublerulesep
@@ -1218,15 +1230,17 @@
               \ifx\CT@drsc@\relax
                 \HH@add{\hfil}\else
                  \HH@add{{%
-\CT@drsc@\leaders\hrule\@height\doublerulesep\hfil}}%
+                   \CT@drsc@\leaders\hrule\@height\HH@height\hfil}}%
                \fi
                  \else
   \ifx\@tempb-\@tempswafalse
+           \gdef\HH@height{\arrayrulewidth}%
            \if@firstamp\@firstampfalse\else\HH@add{&\omit}\fi
               \HH@add{{%
                 \CT@arc@\leaders\hrule\@height\arrayrulewidth\hfil}}%
                            \else
   \ifx\@tempb=\@tempswafalse
+       \gdef\HH@height{\dimen\thr@@}%
        \if@firstamp\@firstampfalse\else\HH@add{&\omit}\fi
        \HH@add
           {\rlap{\copy\@ne}\leaders\copy\@ne\hfil\llap{\copy\@ne}}\else
@@ -1236,8 +1250,12 @@
 % Stop the backspacing for "t" and "b", it messes up the underlying
 % colour.
 %    \begin{macrocode}
-  \ifx\@tempb t\HH@add{\HH@box\doublerulesep\z@}\@tempswafalse\else
-  \ifx\@tempb b\HH@add{\HH@box\z@\doublerulesep}\@tempswafalse\else
+  \ifx\@tempb t\HH@add{%
+    \def\HH@height{\dimen\thr@@}%
+    \HH@box\doublerulesep\z@}\@tempswafalse\else
+  \ifx\@tempb b\HH@add{%
+    \def\HH@height{\dimen\thr@@}%
+    \HH@box\z@\doublerulesep}\@tempswafalse\else
   \ifx\@tempb>\def\next##1##2{%
      \HH@add{%
       {\baselineskip\p@\relax
diff --git a/Master/texmf-dist/tex/latex/colortbl/colortbl.sty b/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
index ef4fe215e45..8e642542380 100644
--- a/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
+++ b/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
@@ -8,14 +8,14 @@
 %% 
 %%
 %% Source File: `colortbl.dtx'.
-%% Copyright 1996 1998 1999 David Carlisle
+%% Copyright 1996 1998 1999 2012 David Carlisle
 %%
 %% This file may be distributed under the terms of the LPPL.
-%% See 00readme.txt for details.
+%% See readme for details.
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{colortbl}
-          [2001/02/13 v0.1j Color table columns (DPC)]
+          [2012/02/13 v1.0a Color table columns (DPC)]
 \edef\@tempa{%
   \noexpand\AtEndOfPackage{%
     \catcode`\noexpand\^^A\the\catcode`\^^A\relax}}
@@ -31,6 +31,7 @@
 \expandafter\CT@extract\the\toks\@tempcnta\columncolor!\@nil
    \@addtopreamble{%
     \setbox\z@\hbox\bgroup\bgroup
+      \CT@everycr{}%
       \ifcase \@chnum
       \hskip\stretch{.5}\kern\z@
       \d@llarbegin
@@ -118,7 +119,7 @@
   \expandafter\def\expandafter\@tabarray\expandafter{%
     \expandafter\CT@start\@tabarray}}
 \def\endarray{\crcr \egroup \egroup \gdef\@preamble{}\CT@end}
-\def\multicolumn#1#2#3{%
+\long\def\multicolumn#1#2#3{%
    \multispan{#1}\begingroup
    \def\@addamp{\if@firstamp \@firstampfalse \else
                 \@preamerr 5\fi}%
@@ -126,7 +127,6 @@
    \endgroup
    \def\@sharp{#3}%
    \let\CT@cell@color\relax
-   \let\CT@row@color\relax
    \let\CT@column@color\relax
    \let\CT@do@color\relax
    \@arstrut \@preamble
@@ -248,10 +248,13 @@
 \AtBeginDocument{%
   \ifx\hhline\@undefined\else
 \def\HH@box#1#2{\vbox{{%
-  {\CT@drsc@\dimen@\tw@\arrayrulewidth
-   \advance\dimen@\doublerulesep
-   \hrule \@height\dimen@
-   \vskip-\dimen@}%
+  \ifx\CT@drsc@\relax\else
+    \global\dimen\thr@@\tw@\arrayrulewidth
+    \global\advance\dimen\thr@@\doublerulesep
+    {\CT@drsc@
+     \hrule \@height\dimen\thr@@
+     \vskip-\dimen\thr@@}%
+  \fi
   \CT@arc@
   \hrule \@height \arrayrulewidth \@width #1
   \vskip\doublerulesep
@@ -281,20 +284,26 @@
               \ifx\CT@drsc@\relax
                 \HH@add{\hfil}\else
                  \HH@add{{%
-\CT@drsc@\leaders\hrule\@height\doublerulesep\hfil}}%
+                   \CT@drsc@\leaders\hrule\@height\HH@height\hfil}}%
                \fi
                  \else
   \ifx\@tempb-\@tempswafalse
+           \gdef\HH@height{\arrayrulewidth}%
            \if@firstamp\@firstampfalse\else\HH@add{&\omit}\fi
               \HH@add{{%
                 \CT@arc@\leaders\hrule\@height\arrayrulewidth\hfil}}%
                            \else
   \ifx\@tempb=\@tempswafalse
+       \gdef\HH@height{\dimen\thr@@}%
        \if@firstamp\@firstampfalse\else\HH@add{&\omit}\fi
        \HH@add
           {\rlap{\copy\@ne}\leaders\copy\@ne\hfil\llap{\copy\@ne}}\else
-  \ifx\@tempb t\HH@add{\HH@box\doublerulesep\z@}\@tempswafalse\else
-  \ifx\@tempb b\HH@add{\HH@box\z@\doublerulesep}\@tempswafalse\else
+  \ifx\@tempb t\HH@add{%
+    \def\HH@height{\dimen\thr@@}%
+    \HH@box\doublerulesep\z@}\@tempswafalse\else
+  \ifx\@tempb b\HH@add{%
+    \def\HH@height{\dimen\thr@@}%
+    \HH@box\z@\doublerulesep}\@tempswafalse\else
   \ifx\@tempb>\def\next##1##2{%
      \HH@add{%
       {\baselineskip\p@\relax
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 083fd3b4d6a..69e01dd2d7c 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -307,6 +307,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'elhyphen',	"die 'skipping, incorporated in hyph-utf8'",
  'elsarticle',	"&MAKEflatten",
  'em',		"die 'skipping, european modern fonts too old, not packaged'",
+ 'emerald',	"die 'skipping, nonfree fonts'",
  'enctex',	"die 'skipping, engine requiring compilation'",
  'encxvlna',    "&MAKEcopy",
  'enpassant',	"die 'skipping, license unknown'",
@@ -446,6 +447,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'lamstex',	"die 'skipping, old'",
  'lamstex-index', 	"die 'skipping, old'",
  'labtable',		"die 'skipping, nonfree w32 application'",
+ 'latex_maker',		"die 'skipping, ruby'",
  'latex-help-texinfo',	"die 'skipping, use latex2e-help-texinfo'",
  'latex-make',		"die 'skipping, subprograms seem problematic'",
  'latex-pro-pragmatiky',"die 'skipping, no source'",
@@ -826,6 +828,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'texdraw',	"&MAKEtexdraw",
  'texlipse',	"die 'skipping, plugin for Eclipse'",
  'texlog-extract',	"die 'skipping, Ruby, not self-locating'",
+ 'texlog_extract',	"die 'skipping, Ruby, not self-locating'",
  'texmacs',		"die 'skipping, binary'",
  'texpower',	"&MAKEnosymlinks",
  'texsis',	"&MAKEtexsis",