From 0219cfa14982e7730370ef8e18c58c3b07722a10 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 15 Dec 2016 00:55:17 +0000 Subject: xcolor/colortbl.4ht fixes, tex4ht r223, http://puszcza.gnu.org.ua/bugs/?346 git-svn-id: svn://tug.org/texlive/trunk@42709 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht | 30 ++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht') diff --git a/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht b/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht index 659fbf2db35..2054fd6ba23 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht @@ -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@row@color{\CT@color{#1}}% \CT@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@color{#2} + \Configure{HColor}{\current@color}{\tmp:col} +} + \def\begin:current@color{\let\sv:curcolor\current@color} \def\end:current@color{% \ifx \current@color\sv:curcolor - \else \csname a:text-colortbl\endcsname \fi + \else% + \expandafter\save:color\current@color//% + \csname a:text-colortbl\endcsname + \fi } \NewConfigure{text-colortbl}{1} \def\GET@column@color{} -- cgit v1.2.3