summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-09 21:38:51 +0000
committerKarl Berry <karl@freefriends.org>2024-05-09 21:38:51 +0000
commitd4b60eb41fa6198bb7ee6e0e2a9a9f54afbf9704 (patch)
treea5f450ca9903e2201245aa4b461356d137d844c1
parentfe6cfb68f83442d7286c95854171e71439f3b316 (diff)
more colors, tex4ht r1516
git-svn-id: svn://tug.org/texlive/trunk@71221 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex5
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex6
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht8
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht9
5 files changed, 21 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 146207b308c..d5ac53c7ee7 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,9 @@
+2024-05-09 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (xcolor.4ht),
+ * tex4ht-html4.tex (html4.4ht): added support for more colors.
+ https://tex.stackexchange.com/q/716339/2891
+
2024-05-07 Linas Stonys <lstonys@vtex.lt>
* tex4ht-4ht.tex (latex.4ht, amsmath.4ht): fixed restoring of \begin
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index aa73c275dff..8d96fba96d9 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1515 2024-05-07 15:21:27Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1516 2024-05-09 13:28:51Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2024 TeX Users Group
@@ -28716,6 +28716,9 @@ fragments.
\else%
\ifcsname HColor!#1\endcsname%
\csname HColor!#1\endcsname #2//%
+ \else
+ \get:xcolorcss{#1!#2}{\HColor}%
+ \Configure{HColor}{\current:color:name}{\HColor}%
\fi%
\fi
}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index 4fe364db384..4c591c9b373 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1511 2024-04-24 12:46:19Z michal_h21 $
+% $Id: tex4ht-html4.tex 1516 2024-05-09 13:28:51Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -16313,9 +16313,7 @@ Blue = 1-minimum(1,Yellow *(1-Black)+Black)
\<configure html4 xcolor\><<<
\Configure{HColor!gray}{%
- \XC@c@lcD\rangeGray{}{#1}\@@tmp
- \int:of\:tempa{255}{\@@tmp}%
- \Configure{HColor}{}{rgb(\:tempa,\:tempa,\:tempa)}%
+ \get:xcolorcss{gray!#1}{\HColor}
}
>>>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 0ac29a156d3..0fd74759c13 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 (2024-04-24-13:39), generated from tex4ht-html4.tex
+% html4.4ht (2024-05-09-14:07), generated from tex4ht-html4.tex
% Copyright 2009-2024 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 2024-04-24-13:39}
+\immediate\write-1{version 2024-05-09-14:07}
\exit:ifnot{8859-6,%
CJK,%
@@ -28974,9 +28974,7 @@ Y{0178}\i{00EF}%
\fi
}}
\Configure{HColor!gray}{%
- \XC@c@lcD\rangeGray{}{#1}\@@tmp
- \int:of\:tempa{255}{\@@tmp}%
- \Configure{HColor}{}{rgb(\:tempa,\:tempa,\:tempa)}%
+ \get:xcolorcss{gray!#1}{\HColor}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht b/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht
index 51afa62e1bb..1fd25406e1c 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht
@@ -1,6 +1,6 @@
-% xcolor.4ht (2023-12-03-13:24), generated from tex4ht-4ht.tex
+% xcolor.4ht (2024-05-09-14:07), generated from tex4ht-4ht.tex
% Copyright 2007-2009 Eitan M. Gurari
-% Copyright 2009-2023 TeX Users Group
+% Copyright 2009-2024 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2023-12-03-13:24}
+\immediate\write-1{version 2024-05-09-14:07}
\input color.4ht
\def\rowc@l@rs[#1]#2#3#4%
@@ -74,6 +74,9 @@
\else%
\ifcsname HColor!#1\endcsname%
\csname HColor!#1\endcsname #2//%
+ \else
+ \get:xcolorcss{#1!#2}{\HColor}%
+ \Configure{HColor}{\current:color:name}{\HColor}%
\fi%
\fi
}