[tex4ht-commits] [SCM] tex4ht updated: r550 - trunk/lit

[michal_h21 at gnu.org.ua]

Author: michal_h21
Date: 2019-04-09 16:36:30 +0300 (Tue, 09 Apr 2019)
New Revision: 550

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-4ht.tex
Log:
fixed issues with colors

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2019-04-05 22:58:02 UTC (rev 549)
+++ trunk/lit/ChangeLog	2019-04-09 13:36:30 UTC (rev 550)
@@ -1,3 +1,9 @@
+2019-04-09  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (color.4ht, xcolor.4ht): fixed issues with color names
+	equal to color schemes.
+	https://tug.org/pipermail/tex4ht/2019q2/002242.html
+
 2019-04-05  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht),

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2019-04-05 22:58:02 UTC (rev 549)
+++ trunk/lit/tex4ht-4ht.tex	2019-04-09 13:36:30 UTC (rev 550)
@@ -25397,7 +25397,8 @@
 
 \<fix color\><<<
 \def\get:HColor#1 #2//{%
-  \expandafter\ifx \csname HColor:#1\endcsname\relax
+  \if\relax#2\relax
+  % \expandafter\ifx \csname HColor:#1\endcsname\relax
      \let\HColor=\relax
      |<color from def|>%
   \else
@@ -25510,17 +25511,18 @@
 \HLet\boxframe\:temp
 >>>
 
-\<config xcolor\><<<
-\let\XC:definec at lor\XC at definec@lor
-\def\XC at definec@lor[#1]#2[#3]#4#5{%
-   \expandafter\ifx\csname HColor!#2\endcsname\relax\else
-        \csname HColor!#4\endcsname #3!//%
-        \edef\:temp{{HColor}{#1}{\HColor}}%
-        \expandafter\Configure\:temp
-   \fi
-   \XC:definec at lor[#1]{#2}[#3]{#4}{#5}%
-}
->>>
+% This isn't necessary anymore, it even could cause compilation errors
+% \<config xcolor\><<<
+% \let\XC:definec at lor\XC at definec@lor
+% \def\XC at definec@lor[#1]#2[#3]#4#5{%
+%    \expandafter\ifx\csname HColor!#2\endcsname\relax\else
+%         \csname HColor!#4\endcsname #3!//%
+%         \edef\:temp{{HColor}{#1}{\HColor}}%
+%         \expandafter\Configure\:temp
+%    \fi
+%    \XC:definec at lor[#1]{#2}[#3]{#4}{#5}%
+% }
+% >>>
 
 \<xcolor SetHColor\><<<
 \expandafter\ifx \csname get!HColor\endcsname\relax \else
@@ -25532,7 +25534,8 @@
 \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
+  \if\relax#2\relax
+  %\expandafter\ifx \csname HColor!#1\endcsname\relax
      \let\HColor=\relax
      |<xcolor from def|>%
   \else