From 3affd633834494c279f96078e95831935ea51ca7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 10 May 2008 00:31:48 +0000 Subject: tex4ht-1.0.2008_05_07_2048 git-svn-id: svn://tug.org/texlive/trunk@8000 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/web.4ht | 33 ++++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht/web.4ht') diff --git a/Master/texmf-dist/tex/generic/tex4ht/web.4ht b/Master/texmf-dist/tex/generic/tex4ht/web.4ht index db5d360e7a3..8469bdde0c8 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/web.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/web.4ht @@ -1,15 +1,15 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% web.4ht 2007-01-03-21:02 % -% Copyright (C) 1999--2007 Eitan M. Gurari % +% web.4ht 2008-02-28-20:51 % +% Copyright (C) 1999--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,7 +24,7 @@ % 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} \let\web:startsection=\@startsection \def\@startsection{\def\@seccntformat##1{}\web:startsection} @@ -54,12 +54,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 \Hinput{web} \endinput -- cgit v1.2.3