texlive[42709] Master/texmf-dist/tex/generic/tex4ht:

[commits+karl at tug.org]

Revision: 42709
          http://tug.org/svn/texlive?view=revision&revision=42709
Author:   karl
Date:     2016-12-15 01:55:17 +0100 (Thu, 15 Dec 2016)
Log Message:
-----------
xcolor/colortbl.4ht fixes, tex4ht r223, http://puszcza.gnu.org.ua/bugs/?346

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=223

Modified Paths:
--------------
    trunk/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht	2016-12-14 23:00:32 UTC (rev 42708)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht	2016-12-15 00:55:17 UTC (rev 42709)
@@ -1,4 +1,4 @@
-% colortbl.4ht (2016-12-13-14:52), generated from tex4ht-4ht.tex
+% colortbl.4ht (2016-12-14-16:54), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
 % Copyright 2009-2016 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2016-12-13-14:52}
+\immediate\write-1{version 2016-12-14-16:54}
 
 
    \RequirePackage{xcolor}
@@ -85,10 +85,34 @@
   \gdef\CT at row@color{\CT at color{#1}}%
   \CT at rowc}
 \NewConfigure{rowcolor}{1}
+\def\convert:colorspec#1 #2 #3 #4{%
+  \edef\current:color{%
+    \ifx\relax#1\relax\else%
+    #1\ifx\relax#2\relax\else%
+    , #2\ifx\relax#3\relax\else%
+      , #3\ifx\relax#4\relax\else%
+        , #4%
+        \fi%
+      \fi%
+    \fi%
+  \fi%
+  }%
+}
+
+\def\save:color#1 #2//{%
+  \convert:colorspec#2 {} {} {} {}
+  \convertcolorspec{#1}{\current:color}{HTML}\tmp:col
+  \def\current at color{#2}
+  \Configure{HColor}{\current at color}{\tmp:col}
+}
+
 \def\begin:current at color{\let\sv:curcolor\current at color}
 \def\end:current at color{%
    \ifx \current at color\sv:curcolor
-   \else \csname a:text-colortbl\endcsname \fi
+   \else%
+   \expandafter\save:color\current at color//%
+   \csname a:text-colortbl\endcsname
+   \fi
 }
 \NewConfigure{text-colortbl}{1}
 \def\GET at column@color{}

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht	2016-12-14 23:00:32 UTC (rev 42708)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht	2016-12-15 00:55:17 UTC (rev 42709)
@@ -1,30 +1,23 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% xcolor.4ht                            2009-05-21-09:32 %
-% Copyright (C) 2007--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 at cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+% colortbl.4ht (2016-12-14-16:54), generated from tex4ht-4ht.tex
+% Copyright 2007-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-14-16:54}
 
 \input color.4ht
 \def\rowc at l@rs[#1]#2#3#4%
@@ -70,11 +63,17 @@
    \fi
    \XC:definec at lor[#1]{#2}[#3]{#4}{#5}%
 }
+\def\strip:fin:excl#1!{#1}
 \expandafter\def\csname get!HColor\endcsname#1!#2//{%
+  \def\current:color:name{#1\if!#2!\else!\strip:fin:excl#2\fi}%
   \expandafter\ifx \csname HColor!#1\endcsname\relax
      \let\HColor=\relax
      \expandafter\ifx \csname\string\color @#1\endcsname \relax\else
    \expandafter\ifx \csname colortyp:\endcsname\relax \else
+   \extractcolorspec{#1\if!#2!\else!\strip:fin:excl#2\fi}\tmp:color%
+   \expandafter\convertcolorspec\tmp:color{HTML}\tmp:color%
+   \def\HColor{\#\tmp:color}%
+   \Configure{HColor}{\current:color:name}{\HColor}%
       \csname colortyp:\expandafter\expandafter\expandafter\endcsname
          \csname\string\color @#1\expandafter\endcsname
          \space .!//%