colortbl fix, tex4ht r219, https://puszcza.gnu.org.ua/bugs/?346

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

1 files changed, 26 insertions, 61 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht b/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht
index 1010e82cc07..659fbf2db35 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht
@@ -1,38 +1,35 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% colortbl.4ht                          2009-05-21-09:32 %
-% Copyright (C) 1997--2009       Eitan M. Gurari         %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any   %
-% later version. The latest version of this license is   %
-% in                                                     %
-%   http://www.latex-project.org/lppl.txt                %
-% and version 1.3c or later is part of all distributions %
-% of LaTeX version 2005/12/01 or later.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+% colortbl.4ht (2016-12-13-14:52), generated from tex4ht-4ht.tex
+% Copyright 1997-2009 Eitan M. Gurari
+% Copyright 2009-2016 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2016-12-13-14:52}
 
 
-   \CT@everycr{\o:noalign:{\global\let\CT@row@color\relax}\the\everycr}
+   \RequirePackage{xcolor}
+\CT@everycr{\o:noalign:{\global\let\CT@row@color\relax}\the\everycr}
 \def\columncolor#1{{\def\current@color{#1}%
                     \csname a:cell-colortbl\endcsname}}
 \Odef\columncolor[#1]#2{{\if :#1:\def\current@color{#2}%
                          \else
-                            \Configure{tblcol:#1}{#2}%
+                           \gHAdvance\tblcol:N by 1
+                           \convertcolorspec{#1}{#2}{HTML}\tmp:tblcolor
+                           \Configure{HColor}{tblcol-\tblcol:N}{\#\tmp:tblcolor}%
+                           \def\current@color{tblcol-\tblcol:N}%
                          \fi
                     \csname a:cell-colortbl\endcsname}%
    \futurelet\:temp\left:colcol}
@@ -47,38 +44,6 @@
 }
 \def\right::colcol[#1]{}
 \HAssign\tblcol:N = 0
-\NewConfigure{tblcol:gray}[1]{%
-   \gHAdvance\tblcol:N by 1
-   \def\:temp##1 ##2//{%
-       \int:of\:tempa{255}{##1}%
-       \Configure{HColor}{tblcol-\tblcol:N}{rgb(\:tempa,\:tempa,\:tempa)}%
-   }\:temp #1 //%
-   \def\current@color{tblcol-\tblcol:N}%
-}
-\NewConfigure{tblcol:rgb}[1]{%
-   \gHAdvance\tblcol:N by 1
-   \def\:temp##1 ##2 ##3 ##4//{%
-       \int:of\:tempa{255}{##1}%
-       \int:of\:tempb{255}{##2}%
-       \int:of\:tempc{255}{##3}%
-       \Configure{HColor}{tblcol-\tblcol:N}{rgb(\:tempa,\:tempb,\:tempc)}%
-   }\:temp #1 //%
-   \def\current@color{tblcol-\tblcol:N}%
-}
-\NewConfigure{tblcol:cmyk}[1]{%
-   \gHAdvance\tblcol:N by 1
-   \def\:temp##1 ##2 ##3 ##4 ##5//{%
-      \int:of\:Cyan{255}{##1}%
-      \int:of\:Magenta{255}{##2}%
-      \int:of\:Yellow{255}{##3}%
-      \int:of\:Black{255}{##4}%
-      \:cmyk\:tempa\:Cyan
-      \:cmyk\:tempb\:Magenta
-      \:cmyk\:tempc\:Yellow
-       \Configure{HColor}{tblcol-\tblcol:N}{rgb(\:tempa,\:tempb,\:tempc)}%
-   }\:temp #1 //%
-   \def\current@color{tblcol-\tblcol:N}%
-}
 \NewConfigure{@classz}{4}
 \pend:def\@classz{\pic:gobble\a:@classz}
 \append:def\@classz{\pic:gobble\b:@classz}