summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-08-31 21:18:04 +0000
committerKarl Berry <karl@freefriends.org>2019-08-31 21:18:04 +0000
commit4071c391a929d5e37fc50476a19c15f32eaaeb93 (patch)
tree7a6f078e9e9a7d954868b6e524968e656f0a4a34
parent367696eaddff42b6596bf1efb19374b376fffbbb (diff)
fix for colors defined with spaces, tex4ht r596
git-svn-id: svn://tug.org/texlive/trunk@52001 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/color.4ht4
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht16
2 files changed, 16 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/color.4ht b/Master/texmf-dist/tex/generic/tex4ht/color.4ht
index 92565593b4c..216519e08b4 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/color.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/color.4ht
@@ -1,4 +1,4 @@
-% color.4ht (2019-04-09-10:06), generated from tex4ht-4ht.tex
+% color.4ht (2019-08-31-14:16), generated from tex4ht-4ht.tex
% Copyright 1997-2009 Eitan M. Gurari
% Copyright 2009-2019 TeX Users Group
%
@@ -89,7 +89,7 @@
\fi \fi
%
\else
- \csname HColor:#1\endcsname #2//%
+ \csname HColor:#1\endcsname #2 //%
\fi
}
\def\c:HColor:gray:{\def\HColor:gray##1 ##2//}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index ce7bb7a30e4..38be4b45142 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,4 +1,4 @@
-% html4.4ht (2019-08-30-14:03), generated from tex4ht-html4.tex
+% html4.4ht (2019-08-31-14:16), generated from tex4ht-html4.tex
% Copyright 2009-2019 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2019-08-30-14:03}
+\immediate\write-1{version 2019-08-31-14:16}
\exit:ifnot{8859-6,%
CJK,%
@@ -28681,20 +28681,32 @@ Y{0178}\i{00EF}%
\else \HCode{</span>}\fi \egroup}
\Configure{HColor:gray}{%
+ \if :#1:%
+ \int:of\:tempa{255}{#2}%
+ \else%
\int:of\:tempa{255}{#1}%
+ \fi%
\Configure{HColor}{}{rgb(\:tempa,\:tempa,\:tempa)}%
}
\Configure{HColor:rgb}{%
\int:of\:tempa{255}{#1}%
\int:of\:tempb{255}{#2}%
+ \if :#3:
+ \int:of\:tempc{255}{#4}%
+ \else%
\int:of\:tempc{255}{#3}%
+ \fi%
\Configure{HColor}{}{rgb(\:tempa,\:tempb,\:tempc)}%
}
\Configure{HColor:cmyk}{%
\int:of\:Cyan{255}{#1}%
\int:of\:Magenta{255}{#2}%
\int:of\:Yellow{255}{#3}%
+ \if :#4:%
+ \int:of\:Black{255}{#5}%
+ \else%
\int:of\:Black{255}{#4}%
+ \fi%
\:cmyk\:tempa\:Cyan
\:cmyk\:tempb\:Magenta
\:cmyk\:tempc\:Yellow