xcolor 2.10 update

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

3 files changed, 49 insertions, 53 deletions

diff --git a/Master/texmf-dist/tex/latex/xcolor/svgnam.def b/Master/texmf-dist/tex/latex/xcolor/svgnam.def
index 0d748d91124..c84ecf30d6d 100644
--- a/Master/texmf-dist/tex/latex/xcolor/svgnam.def
+++ b/Master/texmf-dist/tex/latex/xcolor/svgnam.def
@@ -22,10 +22,10 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{svgnam.def}
- [2005/12/21 v2.09 Predefined colors according to SVG 1.1 (UK)]
+ [2006/11/28 v2.10 Predefined colors according to SVG 1.1 (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2005 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
 \def\colornameprefix{XC@}
diff --git a/Master/texmf-dist/tex/latex/xcolor/x11nam.def b/Master/texmf-dist/tex/latex/xcolor/x11nam.def
index ff738862c86..020eaff857a 100644
--- a/Master/texmf-dist/tex/latex/xcolor/x11nam.def
+++ b/Master/texmf-dist/tex/latex/xcolor/x11nam.def
@@ -22,10 +22,10 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{x11nam.def}
- [2005/12/21 v2.09 Predefined colors according to Unix/X11 (UK)]
+ [2006/11/28 v2.10 Predefined colors according to Unix/X11 (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2005 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
 \def\colornameprefix{XC@}
diff --git a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
index 23d6d617cac..66e9428a416 100644
--- a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
+++ b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
@@ -22,10 +22,10 @@
 %% in the same archive or directory.)
 %%
 \ProvidesPackage{xcolor}
- [2005/12/21 v2.09 LaTeX color extensions (UK)]
+ [2006/11/28 v2.10 LaTeX color extensions (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2005 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
 %% Please send error reports and suggestions for
@@ -40,26 +40,30 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \expandafter\edef\csname XC@catcodes\endcsname
- {\catcode`\noexpand\@\the\catcode`\@\relax
-  \catcode`\noexpand\!\the\catcode`\!\relax
-  \catcode`\noexpand\:\the\catcode`\:\relax
-  \catcode`\noexpand\-\the\catcode`\-\relax
-  \catcode`\noexpand\+\the\catcode`\+\relax
-  \catcode`\noexpand\;\the\catcode`\;\relax
-  \catcode`\noexpand\/\the\catcode`\/\relax
-  \catcode`\noexpand\"\the\catcode`\"\relax
-  \catcode`\noexpand\>\the\catcode`\>\relax
+ {\catcode33 \the\catcode33 % !
+  \catcode34 \the\catcode34 % "
+  \catcode39 \the\catcode39 % '
+  \catcode42 \the\catcode42 % *
+  \catcode44 \the\catcode44 % ,
+  \catcode45 \the\catcode45 % -
+  \catcode46 \the\catcode46 % .
+  \catcode47 \the\catcode47 % /
+  \catcode58 \the\catcode58 % :
+  \catcode59 \the\catcode59 % ;
+  \catcode60 \the\catcode60 % <
+  \catcode61 \the\catcode61 % =
+  \catcode62 \the\catcode62 % >
+  \catcode63 \the\catcode63 % ?
+  \catcode64 \the\catcode64 % @
+  \catcode94 \the\catcode94 % ^
+  \catcode96 \the\catcode96 % `
   \catcode`\noexpand\^^A\the\catcode`\^^A\relax}
-\catcode`\@=11
-\catcode`\!=12
-\catcode`\:=12
-\catcode`\-=12
-\catcode`\+=12
-\catcode`\;=12
-\catcode`\/=12
-\catcode`\"=12
-\catcode`\>=12
-\catcode`\^^A=\catcode`\%
+\catcode64 11 %
+\@makeother\! \@makeother\" \@makeother\' \@makeother\* \@makeother\,
+\@makeother\- \@makeother\. \@makeother\/ \@makeother\: \@makeother\;
+\@makeother\< \@makeother\= \@makeother\> \@makeother\? \@makeother\`
+\catcode94 7 %
+\catcode`\^^A=14 %
 \edef\XC@@{\expandafter\noexpand\csname\string\XC@@\endcsname}
 \newif\ifcolors@ \colors@true
 \newif\ifcolorerrors@
@@ -172,7 +176,6 @@
 \XC@declarenames{ralnames}{ralnam}{}
 \DeclareOption{table}{\XC@append\XC@@pkg{\RequirePackage{colortbl}}}
 \DeclareOption{fixpdftex}{\XC@append\XC@@pkg{\RequirePackage{pdfcolmk}}}
-\DeclareOption{pst}{\def\XC@pst{\RequirePackage{pstcol}}}
 \DeclareOption{hyperref}
  {\@tfor\@@tmp:={cite}{file}{link}{menu}{page}{run}{url}\do
    {\expandafter\edef\csname KV@Hyp@x\@@tmp bordercolor\endcsname #1%
@@ -196,6 +199,7 @@
 \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}}
 \DeclareOption{xcdraw}{\def\XC@@xcd@{1}}
 \DeclareOption{noxcdraw}{\def\XC@@xcd@{-1}}
+\DeclareOption{fixinclude}{\def\XC@@xcf@{1}}
 \DeclareOption{prologue}{\def\XC@@xcp@{1}}
 \DeclareOption{kernelfbox}{\XC@@fboxfalse}
 \DeclareOption{showerrors}{\colorerrors@true}
@@ -204,6 +208,7 @@
 \DeclareOption*%
  {\PackageInfo{xcolor}{Package option `\CurrentOption' ignored}}
 \def\XC@@xcd@{-1}
+\def\XC@@xcf@{-1}
 \def\XC@@xcp@{-1}
 \ExecuteOptions{natural,showerrors}
 \InputIfFileExists{color.cfg}{}{}
@@ -222,8 +227,8 @@
   \def\@@tmp#1.def{\def\XC@@drv{#1}}
   \expandafter\@@tmp\Gin@driver
 \fi
-\count@\XC@@xcd@ \advance\count@\XC@@xcp@\relax
-\ifnum\count@>-2
+\count@\XC@@xcd@ \advance\count@\XC@@xcf@ \advance\count@\XC@@xcp@\relax
+\ifnum\count@>-3
   \XC@ifcase\XC@@drv
    {{dvips,pctex32}%
     {\def\@tempa{0}
@@ -236,8 +241,12 @@
      \def\XC@special#1{\special{pdf: content #1}}}%
    }{\def\@tempa{-1}}
   \ifnum\XC@@xcd@>\m@ne\let\XC@@xcd@\@tempa\fi
+  \ifnum\XC@@xcf@>\m@ne\let\XC@@xcf@\@tempa\fi
   \ifnum\XC@@xcp@>\m@ne\let\XC@@xcp@\@tempa\fi
   \ifnum\@tempa=0 \AtBeginDvi{\special{header=xcolor.pro}}\fi
+  \ifcase\XC@@xcf@
+    \AtBeginDvi{\special{! XCfixnormalscale}}
+  \fi
   \ifcase\XC@@xcp@
     \AtBeginDvi{\special{header=\jobname.xcp}}
     \newwrite\XC@@xcp\immediate\openout\XC@@xcp=\jobname.xcp
@@ -247,7 +256,6 @@
      {\immediate\write\XC@@xcp{end}\immediate\closeout\XC@@xcp}
   \fi
 \fi
-\@nameuse{XC@pst}
 \@namedef{ver@color.sty}{1999/02/16}
 \XC@@pkg
 \long\def\@secondoffive#1#2#3#4#5{#2}
@@ -289,10 +297,12 @@
    \expandafter\XC@repl@ce\expandafter\@empty #1\@empty#2Q{#3}}
 }
 \def\XC@clean#1%
- {\edef#1{ #1 }\edef#1{\expandafter\XC@strip@comma#1,,\@nnil}%
-  \edef#1{\expandafter\XC@cle@n#1\@empty}%
+ {\edef#1{ #1 }%
+  \XC@cle@n#1,{ }\XC@cle@n#1{. }{ }\XC@cle@n#1{ },%
   \edef#1{\expandafter\@gobbletwo#1}}
-\def\XC@cle@n#1 #2{,#1\ifx#2\@empty\else\expandafter\XC@cle@n\fi#2}
+\def\XC@cle@n#1#2#3%
+ {\def\XC@cl@@n##1#2##2{#3##1\ifx##2\@empty\else\expandafter\XC@cl@@n\fi##2}%
+  \edef#1{\expandafter\XC@cl@@n#1#2\@empty}}%
 \def\rdivide#1#2%
  {\begingroup\toks@{#1}\edef\@@tmp{\noexpand\@tempdima\the#1}%
   \@defaultunits\@tempdimb=#2pt\relax\@nnil \@@tmp\relax
@@ -742,10 +752,10 @@
  {\begingroup
   \let\ignorespaces\endgroup \let\set@color\set@page@color
   \color}
-\def\colorbox#1#{\color@box{#1}}
+\def\colorbox#1#{\protect\color@box{#1}}
 \def\color@box#1#2{\color@b@x\relax{\color#1{#2}}}
 \def\fcolorbox#1#{\color@fbox{#1}}
-\def\color@fbox#1#2#3#{\color@fb@x{#1}{#2}{#3}}
+\def\color@fbox#1#2#3#{\protect\color@fb@x{#1}{#2}{#3}}
 \def\color@fb@x#1#2#3#4%
  {\color@b@x{\fboxsep\z@\color#1{#2}\XC@fbox}%
    {\@ifxempty{#3}{\color#1}{\color#3}{#4}}}
@@ -763,10 +773,9 @@
      {\lower\@tempdima\hbox
        {\vbox
          {\kern\fboxrule
-          \hbox
-           {\kern\fboxrule#1%
-            \vbox{\kern\fboxsep\box\@tempboxa\kern\fboxsep}%
-            #1\kern\fboxrule}%
+          \hbox{\kern\fboxrule#1%
+                \vbox{\kern\fboxsep\box\@tempboxa\kern\fboxsep}%
+                #1\kern\fboxrule}%
           \kern\fboxrule}}}%
     \@tempdima\wd\@tempboxa
     \edef\@tempa{{\the\@tempdima}{\the\ht\@tempboxa}{\the\dp\@tempboxa}}%
@@ -827,7 +836,7 @@
       \kern-0.5\fboxrule
       \hrule\@height\fboxrule}}}
 \def\@xcolor@#1#2#3#4%
- {\edef\@@mod{#3}\edef\@@clr{#4}%
+ {\XC@sdef\@@mod{#3}\edef\@@clr{#4}%
   \ifx\@@mix\@empty\else\expandafter\@xcolor@@\@@mix!!!!\@nil\fi
   \if@tempswa
     \XC@let@Nc\@@tmp{XC@cnv@\@@mod @compl}%
@@ -1349,7 +1358,6 @@
 \@ifundefinedmodel{HSB}{\substitutecolormodel{HSB}{hsb}}{}
 \@ifundefinedmodel{Gray}{\substitutecolormodel{Gray}{gray}}{}
 \@ifundefinedmodel{wave}{\substitutecolormodel{wave}{hsb}}{}
-\@ifundefined{XC@pst}{%
 \def\XC@getcolor#1#2%
  {\begingroup\toks@{#1}\XC@getc@lor#1\XC@@\aftergroupdef#2{\@@tmp}}
 \def\XC@getc@lor#1#2\XC@@
@@ -1368,16 +1376,6 @@
     \expandafter\@declaredcolor\expandafter{\the\toks@}%
     \let\@@tmp\XC@current@color
   \fi}
-}{% compatibility code begin
-\def\XC@getcolor#1#2%
- {\@ifundefinedcolor{#1}%
-   {\begingroup\color{#1}%
-    \edef\@@tmp
-     {\edef\noexpand#2{\noexpand\expandafter\noexpand\c@lor@to@ps
-      \current@color\noexpand\@@}}%
-    \expandafter\endgroup\@@tmp}%
-   {\edef#2{\XC@usecolor{#1}}}}
-}% compatibility code end
 \def\XC@usecolor#1{\expandafter\XC@usec@lor#1\XC@@}
 \def\XC@usec@lor#1#2\XC@@
  {\ifx#1\xcolor@
@@ -1389,9 +1387,7 @@
   \space}
 \let\XC@c@lor@to@ps\XC@usecolor
 \let\pst@getcolor\XC@getcolor
-\@ifundefined{XC@pst}{%
-  \let\pst@usecolor\XC@usecolor
-}{}
+\let\pst@usecolor\XC@usecolor
 \def\c@lor@special#1#2{\edef\@tempa{\write#1{#2}}\@tempa}
 \def\normalcolor{\let\current@color\default@color\set@color}
 \AtBeginDocument{\let\default@color\current@color}