tex4ht-1.0.2008_05_07_2048

git-svn-id: svn://tug.org/texlive/trunk@8000 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 40 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/dvips.4ht b/Master/texmf-dist/tex/generic/tex4ht/dvips.4ht
index 58bf03219a5..b5f1c794381 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/dvips.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/dvips.4ht
@@ -1,15 +1,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% dvips.4ht                             2007-01-03-21:02 %
-% Copyright (C) 2003--2007       Eitan M. Gurari         %
+% dvips.4ht                             2008-02-28-20:51 %
+% Copyright (C) 2003--2008       Eitan M. Gurari         %
 %                                                        %
 % This work may be distributed and/or modified under the %
 % conditions of the LaTeX Project Public License, either %
-% version 1.3 of this license or (at your option) any    %
+% 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.3 or later is part of all distributions  %
-% of LaTeX version 2003/12/01 or later.                  %
+% 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".%
 %                                                        %
@@ -24,11 +24,42 @@
 %                             gurari@cse.ohio-state.edu  %
 %                 http://www.cse.ohio-state.edu/~gurari  %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2007-01-03-21:02}
+\immediate\write-1{version 2008-02-28-20:51}
+
+\def\colortyp:gray:#1 #2//{%
+   \if :#1:%
+      \colortyp:gray:#2 //%
+   \else
+      \HColor:gray #1 //%
+   \fi
+}
+
+\def\colortyp:cmyk:#1 #2 #3 #4 #5//{%
+   \if :#1:%
+      \colortyp:cmyk:#2 #3 #4 #5//%
+   \else\if :#2:%
+      \colortyp:cmyk:#1 #3 #4 #5//%
+   \else\if :#3:%
+      \colortyp:cmyk:#1 #2 #4 #5//%
+   \else\if :#4:%
+      \colortyp:cmyk:#1 #2 #3 #5//%
+   \else
+      \HColor:cmyk #1,#2,#3,#4 //%
+   \fi\fi\fi\fi
+}
+
+\def\colortyp:rgb:#1 #2 #3 #4//{%
+   \if :#1:%
+      \colortyp:rgb:#2 #3 #4 //%
+   \else\if :#2:%
+      \colortyp:rgb:#1 #3 #4 //%
+   \else\if :#3:%
+      \colortyp:rgb:#1 #2 #4 //%
+   \else
+      \HColor:rgb #1,#2,#3 //%
+   \fi\fi\fi
+}
 
-\def\colortyp:gray:#1 #2//{\HColor:gray #1 //}
-\def\colortyp:cmyk:#1 #2 #3 #4 #5//{\HColor:cmyk #1,#2,#3,#4 //}
-\def\colortyp:rgb:#1 #2 #3 #4//{\HColor:rgb #1,#2,#3 //}
 \def\colortyp:#1 #2//{%
    \expandafter\ifx \csname colortyp:#1:\endcsname\relax \else
      \csname colortyp:#1:\endcsname #2 //\fi}