diff options
author | Karl Berry <karl@freefriends.org> | 2008-05-10 00:31:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-05-10 00:31:48 +0000 |
commit | 3affd633834494c279f96078e95831935ea51ca7 (patch) | |
tree | d18cbef6ade390df34099bff78c593f00e9d7971 /Master/texmf-dist/tex/generic/tex4ht/color.4ht | |
parent | 78d169458ffb8d121d56a1345471b5dbe3f17a2a (diff) |
tex4ht-1.0.2008_05_07_2048
git-svn-id: svn://tug.org/texlive/trunk@8000 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/tex4ht/color.4ht')
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/color.4ht | 60 |
1 files changed, 39 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/color.4ht b/Master/texmf-dist/tex/generic/tex4ht/color.4ht index 5d1c979d6f5..67687067724 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/color.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/color.4ht @@ -1,15 +1,15 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% color.4ht 2007-01-03-21:02 % -% Copyright (C) 1997--2007 Eitan M. Gurari % +% color.4ht 2008-02-28-20:51 % +% Copyright (C) 1997--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,9 +24,11 @@ % 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} +\expandafter\ifx \csname color:def\endcsname\relax + \let\color:def\def +\else \expandafter\endinput\fi \let\:temp\begingroup \HLet\color@setgroup\:temp \def\HColor{\:warning{\string\Hcode{...}{...} is deprecated; Use @@ -34,12 +36,21 @@ \NewConfigure{HColor}[2]{\if !#1!\if!#2!\let\HColor\relax \else \edef\HColor{#2}\fi \else \expandafter\edef\csname CLR:#1\endcsname{#2}\fi} -\pend:defIII\definecolor{% - \expandafter\ifx\csname HColor:##2\endcsname\relax\else - \csname HColor:##2\endcsname ##3 //% - \edef\:temp{{HColor}{##1}{\HColor}}% - \expandafter\Configure\:temp - \fi} +\def\:temp#1#2#3{% + \@ifundefined{color@#2}% + {\c@lor@error{model `#2'}}% + {\@ifundefined{\string\color @#1}{}% + {\PackageInfo{color}{Redefining color #1}}% + \csname color@#2\expandafter\endcsname + \csname\string\color @#1\endcsname{#3}}} +\ifx \definecolor\:temp + \pend:defIII\definecolor{% + \expandafter\ifx\csname HColor:##2\endcsname\relax\else + \csname HColor:##2\endcsname ##3 //% + \edef\:temp{{HColor}{##1}{\HColor}}% + \expandafter\Configure\:temp + \fi} +\fi \NewConfigure{color}{1} \def\:tempc#1#2#3{\protect\leavevmode{\protect\a:textcolor @@ -61,20 +72,21 @@ \pend:defI\@declaredcolor{\a:color{##1}} \NewConfigure{SetHColor}[2]{{% \expandafter\let\expandafter\:temp \csname CLR:#2\endcsname - \ifx \:temp\relax \edef\:temp{#2 //}\expandafter\get:colortyp\:temp + \ifx \:temp\relax + \edef\:temp{#2 //}\expandafter\get:HColor\:temp + \ifx \HColor\relax + \expandafter\ifx \csname get!HColor\endcsname\relax \else + \edef\:temp{#2!//}\expandafter\csname get!HColor\expandafter\endcsname\:temp +\fi +% + \fi \else \let\HColor=\:temp \fi \ifx \HColor\relax \:warning{missing \string\Configure{HColor}{#2}{...} (in LaTeX: \csname\string\color @#2\endcsname)}% \expandafter\global\expandafter\let\csname CLR:#2\endcsname\empty \else #1\fi }} -\def\c:HColor:gray:{\def\HColor:gray##1 ##2//} -\Configure{HColor:gray}{\Configure{HColor}{}{}} -\def\c:HColor:rgb:{\def\HColor:rgb##1,##2,##3 ##4//} -\Configure{HColor:rgb}{\Configure{HColor}{}{}} -\def\c:HColor:cmyk:{\def\HColor:cmyk##1,##2,##3,##4 ##5//} -\Configure{HColor:cmyk}{\Configure{HColor}{}{}} -\def\get:colortyp#1 #2//{% +\def\get:HColor#1 #2//{% \expandafter\ifx \csname HColor:#1\endcsname\relax \let\HColor=\relax \expandafter\ifx \csname\string\color @#1\endcsname \relax\else @@ -88,6 +100,12 @@ \csname HColor:#1\endcsname #2//% \fi } +\def\c:HColor:gray:{\def\HColor:gray##1 ##2//} +\Configure{HColor:gray}{\Configure{HColor}{}{}} +\def\c:HColor:rgb:{\def\HColor:rgb##1,##2,##3 ##4//} +\Configure{HColor:rgb}{\Configure{HColor}{}{}} +\def\c:HColor:cmyk:{\def\HColor:cmyk##1,##2,##3,##4 ##5//} +\Configure{HColor:cmyk}{\Configure{HColor}{}{}} \long\def\:temp#1#2#3{% \ifcolors@ |