xcolor 2.11 update from CTAN

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

15 files changed, 90 insertions, 55 deletions

diff --git a/Master/texmf-dist/doc/latex/xcolor/ChangeLog b/Master/texmf-dist/doc/latex/xcolor/ChangeLog
index 2ecdabe2156..fa98bcbea50 100644
--- a/Master/texmf-dist/doc/latex/xcolor/ChangeLog
+++ b/Master/texmf-dist/doc/latex/xcolor/ChangeLog
@@ -4,6 +4,13 @@ Package `xcolor' by Dr. Uwe Kern
 History
 =======
 
+2007/01/21 v2.11
+* New features:
+    - color names `lime' and `teal' added to the set of predefined
+      colors.
+* Bugfix:
+    - incorrect \XC@strip@comma call within `hyperref'-related options.
+
 2006/11/28 v2.10
 * New features:
     - `fixinclude' option prevents dvips from explicitly resetting
diff --git a/Master/texmf-dist/doc/latex/xcolor/README b/Master/texmf-dist/doc/latex/xcolor/README
index 287bf661342..12d30a04ce1 100644
--- a/Master/texmf-dist/doc/latex/xcolor/README
+++ b/Master/texmf-dist/doc/latex/xcolor/README
@@ -1,7 +1,7 @@
 Package `xcolor' by Dr. Uwe Kern
 (xcolor at ukern dot de)
 
-v2.10 (2006/11/28)
+v2.11 (2007/01/21)
 
 `xcolor' provides easy driver-independent access to several kinds of
 colors, tints, shades, tones, and mixes of arbitrary colors by means of
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
index 5cdb60ca392..4ca5c000c98 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
@@ -22,11 +22,11 @@
 %% in the same archive or directory.)
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v2.10}%
-\def\XCfiledate{2006/11/28}%
+\def\XCfileversion{v2.11}%
+\def\XCfiledate{2007/01/21}%
 \def\ukfile#1#2#3#4%
  {\def\ukhead
    {\ifnum#1>2 \perCent!^^J\fi
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf b/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
index 7b2cef9410f..ccd9a19b571 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
index c44f5ad1b33..d9758ba6a8d 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
@@ -22,14 +22,14 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{xcolor1}
- [2006/11/28 v2.10 Color conversion test (UK)]
+ [2007/01/21 v2.11 Color conversion test (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v2.10}%
-\def\XCfiledate{2006/11/28}%
+\def\XCfileversion{v2.11}%
+\def\XCfiledate{2007/01/21}%
 \documentclass[a4paper]{article}
 
 \usepackage{array,multicol,multido,textcomp}
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf b/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
index 2fb5ea75820..f0cb6672215 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
index 3c668a878dd..7d42358337c 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
@@ -22,14 +22,14 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{xcolor2}
- [2006/11/28 v2.10 Pstricks color test (UK)]
+ [2007/01/21 v2.11 Pstricks color test (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v2.10}%
-\def\XCfiledate{2006/11/28}%
+\def\XCfileversion{v2.11}%
+\def\XCfiledate{2007/01/21}%
 \listfiles
 \documentclass{article}
 
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
index 4f4d05ca701..7b1c8cddf11 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
@@ -22,14 +22,14 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{xcolor3}
- [2006/11/28 v2.10 Color logging test (UK)]
+ [2007/01/21 v2.11 Color logging test (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v2.10}%
-\def\XCfiledate{2006/11/28}%
+\def\XCfileversion{v2.11}%
+\def\XCfiledate{2007/01/21}%
 \listfiles
 \documentclass[a4paper]{article}
 \usepackage[showerrors,table,dvipsnames*,hyperref]{xcolor}[2005/12/21]
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
index eb5ddc0f889..27c034a188c 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
@@ -22,14 +22,14 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{xcolor4}
- [2006/11/28 v2.10 Color driver test (UK)]
+ [2007/01/21 v2.11 Color driver test (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v2.10}%
-\def\XCfiledate{2006/11/28}%
+\def\XCfileversion{v2.11}%
+\def\XCfiledate{2007/01/21}%
 \listfiles
 \documentclass[a4paper]{article}
 %%\PassOptionsToPackage{dvipdf}{xcolor}
diff --git a/Master/texmf-dist/dvips/xcolor/xcolor.pro b/Master/texmf-dist/dvips/xcolor/xcolor.pro
index b3d530a3669..fcda805da5b 100644
--- a/Master/texmf-dist/dvips/xcolor/xcolor.pro
+++ b/Master/texmf-dist/dvips/xcolor/xcolor.pro
@@ -23,10 +23,10 @@
 %% in the same archive or directory.)
 %%
 %% xcolor.pro (PostScript/dvips header file)
-%%  [2006/11/28 v2.10 LaTeX color extensions (UK)]
+%%  [2007/01/21 v2.11 LaTeX color extensions (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
 userdict begin
diff --git a/Master/texmf-dist/source/latex/xcolor/xcolor.dtx b/Master/texmf-dist/source/latex/xcolor/xcolor.dtx
index 4bb61e9b428..8e51c6e85f8 100644
--- a/Master/texmf-dist/source/latex/xcolor/xcolor.dtx
+++ b/Master/texmf-dist/source/latex/xcolor/xcolor.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
 %<*package>
@@ -17,8 +17,8 @@
 %%
 %</package>
 %<*extract|driver|test1|test2|test3|test4>
-\def\XCfileversion{v2.10}%
-\def\XCfiledate{2006/11/28}%
+\def\XCfileversion{v2.11}%
+\def\XCfiledate{2007/01/21}%
 %</extract|driver|test1|test2|test3|test4>
 %
 % This file may be distributed and/or modified under the
@@ -880,7 +880,7 @@
 %
 % \def\test#1{\testclr{#1}~\Color{#1}}
 % Within \File{xcolor.sty}, the following color names are defined:
-% \test{red}, \test{green}, \test{blue}, \test{cyan}, \test{magenta}, \test{yellow}, \test{black}, \test{darkgray}, \test{gray}, \test{lightgray}, \test{white}, \test{brown}, \test{olive}, \test{orange}, \test{pink}, \test{purple}, \test{violet}.
+% \test{red}, \test{green}, \test{blue}, \test{cyan}, \test{magenta}, \test{yellow}, \test{black}, \test{gray}, \test{white}, \test{darkgray}, \test{lightgray}, \test{brown}, \test{lime}, \test{olive}, \test{orange}, \test{pink}, \test{purple}, \test{teal}, \test{violet}.
 %
 % This base set of colors can be used without restrictions in all kinds of color expressions, as explained in section \vref{sec.term}.
 %
@@ -893,7 +893,7 @@
 % In the latter case, individual color names have to be activated by |\definecolors| or |\providecolors| commands, as described in section \vref{sec.deferred}, before they can be applied in a document.
 % \begin{itemize}
 % \item \Option{dvipsnames}/\Option{dvipsnames*} loads a set of 68 \Model{cmyk} colors as defined in the |dvips| driver. However, these colors may be used in all supported drivers.
-% \item \Option{svgnames}/\Option{svgnames*} loads a set of 151 \Model{rgb} color names\footnote{In fact, these names represent 141 different colors.} according to the \Index{SVG}~1.1 specification \cite{svg}\footnote{Actually, the cited specification lists only lowercase names, and the original definitions are given in \Model{RGB} parameters, converted to \Model{rgb} by the author.}, enhanced by~4 names taken from the file \File{rgb.txt} which is part of \Index{Unix}/\Index{X11} distributions.
+% \item \Option{svgnames}/\Option{svgnames*} loads a set of 151 \Model{rgb} color names\footnote{In fact, these names represent 141 different colors.} according to the \Index{SVG}~1.1 specification \cite{svg}\footnote{Actually, the cited specification lists only lowercase names, and the original definitions are given in \Model{RGB} parameters, converted to \Model{rgb} by the author.}, enhanced by~4 names taken from the file \File{rgb.txt} which is part of \Index{Unix}/\Index{X11} distributions. Note that \Index{HTML4} accepts a subset of 16~color keywords (using identical specifications), see \cite{HTML4} and section \vref{sec.names}.
 % \item \Option{x11names}/\Option{x11names*} loads a set of 317 \Model{rgb} color names\footnote{These names represent 315 different colors.} that are basically variations of a subset of the \Index{SVG} set mentioned before, according to the file \File{rgb.txt} which is part of \Index{Unix}/\Index{X11} distributions\footnote{Again, the original definitions are given in \Model{RGB} parameters, converted to \Model{rgb} by the author.}.
 % We describe now how to access all 752 color names of \File{rgb.txt} without much effort:
 % \begin{itemize}
@@ -1624,7 +1624,7 @@
 % \makeatletter
 % \def\X#1%
 %  {\def\tmp{{#1}}\dots\Meaning{tmp}&
-%   \selectcolormodel{#1}\testclr{red} \testclr{green} \testclr{blue} \testclr{cyan} \testclr{magenta} \testclr{yellow} \testclr{orange} \testclr{violet} \testclr{purple} \testclr{brown} \testclr{pink} \testclr{olive} \testclr{black} \testclr{darkgray} \testclr{gray} \testclr{lightgray} \testclr{white}\\}
+%   \selectcolormodel{#1}\testclr{red} \testclr{green} \testclr{blue} \testclr{cyan} \testclr{magenta} \testclr{yellow} \testclr{brown} \testclr{lime} \testclr{olive} \testclr{orange} \testclr{pink} \testclr{purple} \testclr{teal} \testclr{violet} \testclr{black} \testclr{darkgray} \testclr{gray} \testclr{lightgray} \testclr{white}\\}
 % \makeatother
 % \begin{tabular}{@{}>{\ttfamily}l@{ }l@{}}
 % \string\selectcolormodel&\\
@@ -1762,9 +1762,7 @@
 % \extrarowheight2pt
 % \makeatletter
 % \def\X#1#2{\edef\tmp{\@ifxempty{#1}{}{[#1]}{#2}}\dots\Meaning{tmp}&
-%   \maskcolors[#1]{#2}\testclr{red} \testclr{green} \testclr{blue} \testclr{cyan} \testclr{magenta}
-%   \testclr{yellow} \testclr{orange} \testclr{violet} \testclr{purple} \testclr{brown} \testclr{pink}
-%   \testclr{olive} \testclr{black} \testclr{darkgray} \testclr{gray} \testclr{lightgray} \testclr{white}\\}\relax
+%   \maskcolors[#1]{#2}\testclr{red} \testclr{green} \testclr{blue} \testclr{cyan} \testclr{magenta} \testclr{yellow} \testclr{brown} \testclr{lime} \testclr{olive} \testclr{orange} \testclr{pink} \testclr{purple} \testclr{teal} \testclr{violet} \testclr{black} \testclr{darkgray} \testclr{gray} \testclr{lightgray} \testclr{white}\\}\relax
 % \makeatother
 % \begin{tabular}{@{}>{\ttfamily}l@{ }l@{}}
 % \string\maskcolors&\\
@@ -1999,12 +1997,14 @@
 % \0{gray}
 % \0{green}
 % \0{lightgray}
+% \0{lime}
 % \0{magenta}
 % \0{olive}
 % \0{orange}
 % \0{pink}
 % \0{purple}
 % \0{red}
+% \0{teal}
 % \0{violet}
 % \0{white}
 % \0{yellow}
@@ -2108,7 +2108,13 @@
 % \Color[-]{DarkSlateGray} = \Color[-]{DarkSlateGrey},
 % \Color[-]{LightSlateGray} = \Color[-]{LightSlateGrey},
 % \Color[-]{DimGray} = \Color[-]{DimGrey}.
-% \par
+% \par\smallskip
+% \Index{HTML4} color keyword subset:
+% \Color[-]{Aqua}, \Color[-]{Black}, \Color[-]{Blue}, \Color[-]{Fuchsia},
+% \Color[-]{Gray}, \Color[-]{Green}, \Color[-]{Lime}, \Color[-]{Maroon},
+% \Color[-]{Navy}, \Color[-]{Olive}, \Color[-]{Purple}, \Color[-]{Red},
+% \Color[-]{Silver}, \Color[-]{Teal}, \Color[-]{White}, \Color[-]{Yellow}.
+% \par\smallskip
 % Colors taken from \Index{Unix}/\Index{X11}:
 % \Color[-]{LightGoldenrod},
 % \Color[-]{LightSlateBlue},
@@ -3095,6 +3101,10 @@
 %  {\People{Alvy Ray}{Smith}: ``Color Gamut Transform Pairs''. \emph{Computer Graphics} (ACM SIGGRAPH), Volume 12, Number 3, August 1978.
 %   \URL{http://alvyray.com/Papers/PapersCG.htm}}
 %
+% \bibitem{HTML4}%
+%  {World Wide Web Consortium: ``HTML4 color keywords''.
+%   \URL{http://www.w3.org/TR/css3-color/\#html4}}
+%
 % \bibitem{svg}%
 %  {World Wide Web Consortium: ``Scalable Vector Graphics (\Index{SVG}) 1.1 Specification --- Basic Data Types and Interfaces''.
 %   \URL{http://www.w3.org/TR/SVG11/types.html\#ColorKeywords}}
@@ -3132,6 +3142,18 @@
 % \subsection*{History}
 % \addcontentsline{toc}{subsection}{History}
 %
+% \subsubsection*{2007/01/21 v2.11}
+% \begin{itemize}
+% \item New features:
+%   \begin{itemize}
+%   \item color names \Color{lime} and \Color{teal} added to the set of predefined colors.
+%   \end{itemize}
+% \item Bugfix:
+%   \begin{itemize}
+%   \item incorrect |\XC@strip@comma| call within \Package{hyperref}-related options.
+%   \end{itemize}
+% \end{itemize}
+%
 % \subsubsection*{2006/11/28 v2.10}
 % \begin{itemize}
 % \item New features:
@@ -5836,7 +5858,7 @@
  {\extractcolorspec{#2}\XC@@tmp
   \expandafter\convertcolorspec\XC@@tmp\XC@mod@rgb\XC@@tmp
   \expandafter\edef\csname @#1bordercolor\endcsname
-   {\expandafter\XC@strip@comma\XC@@tmp,\@nnil}}
+   {\expandafter\XC@strip@comma\XC@@tmp,,\@nnil}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -5846,7 +5868,7 @@
 %    \begin{macrocode}
 \def\XC@pdfborder#1 #2 #3\relax
  {\def\@@scl{80}\XC@calc@#1,#2,#3,,:S%
-  \edef\@pdfborder{\expandafter\XC@strip@comma\@@tmp,\@nnil}}
+  \edef\@pdfborder{\expandafter\XC@strip@comma\@@tmp,,\@nnil}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6968,21 +6990,25 @@
 % \subsubsection{Basic color definitions}
 %
 % \Model{rgb}-minded colors.\footnote{Generic definitions:
+% \Color{brown} = \Color{violet}|!|50|!|\Color{yellow},
+% \Color{lime} = \Color{green}|!|25|!|\Color{yellow},
 % \Color{orange} = \Color{red}|!|50|!|\Color{yellow},
-% \Color{violet} = \Color{blue}|!|50|!|\Color{red},
+% \Color{pink} = \Color{red}|!|25,
 % \Color{purple} = \Color{violet}|!|50|!|\Color{red},
-% \Color{brown} = \Color{violet}|!|50|!|\Color{yellow},
-% \Color{pink} = \Color{red}|!|25.}
+% \Color{teal} = \Color{green}|!|50|!|\Color{blue},
+% \Color{violet} = \Color{blue}|!|50|!|\Color{red}.}
 %    \begin{macrocode}
 \definecolorset{rgb/hsb/cmyk/gray}{}{}%
  {red,1,0,0/0,1,1/0,1,1,0/.3;%
   green,0,1,0/.33333,1,1/1,0,1,0/.59;%
   blue,0,0,1/.66667,1,1/1,1,0,0/.11;%
+  brown,.75,.5,.25/.083333,.66667,.75/0,.25,.5,.25/.5475;%
+  lime,.75,1,0/.20833,1,1/.25,0,1,0/.815;%
   orange,1,.5,0/.083333,1,1/0,.5,1,0/.595;%
-  violet,.5,0,.5/.83333,1,.5/0,.5,0,.5/.205;%
+  pink,1,.75,.75/0,.25,1/0,.25,.25,0/.825;%
   purple,.75,0,.25/.94444,1,.75/0,.75,.5,.25/.2525;%
-  brown,.75,.5,.25/.083333,.66667,.75/0,.25,.5,.25/.5475;%
-  pink,1,.75,.75/0,.25,1/0,.25,.25,0/.825}%
+  teal,0,.5,.5/.5,1,.5/.5,0,0,.5/.35;%
+  violet,.5,0,.5/.83333,1,.5/0,.5,0,.5/.205}%
 %    \end{macrocode}
 %
 % \Model{cmyk}-minded colors.\footnote{Generic definitions:
diff --git a/Master/texmf-dist/tex/latex/xcolor/svgnam.def b/Master/texmf-dist/tex/latex/xcolor/svgnam.def
index c84ecf30d6d..adb84576223 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}
- [2006/11/28 v2.10 Predefined colors according to SVG 1.1 (UK)]
+ [2007/01/21 v2.11 Predefined colors according to SVG 1.1 (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 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 020eaff857a..2a92a29f985 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}
- [2006/11/28 v2.10 Predefined colors according to Unix/X11 (UK)]
+ [2007/01/21 v2.11 Predefined colors according to Unix/X11 (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 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 66e9428a416..96e87614d53 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}
- [2006/11/28 v2.10 LaTeX color extensions (UK)]
+ [2007/01/21 v2.11 LaTeX color extensions (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2006 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
 %% Please send error reports and suggestions for
@@ -959,10 +959,10 @@
  {\extractcolorspec{#2}\XC@@tmp
   \expandafter\convertcolorspec\XC@@tmp\XC@mod@rgb\XC@@tmp
   \expandafter\edef\csname @#1bordercolor\endcsname
-   {\expandafter\XC@strip@comma\XC@@tmp,\@nnil}}
+   {\expandafter\XC@strip@comma\XC@@tmp,,\@nnil}}
 \def\XC@pdfborder#1 #2 #3\relax
  {\def\@@scl{80}\XC@calc@#1,#2,#3,,:S%
-  \edef\@pdfborder{\expandafter\XC@strip@comma\@@tmp,\@nnil}}
+  \edef\@pdfborder{\expandafter\XC@strip@comma\@@tmp,,\@nnil}}
 \@ifXCopt{table}{%
  \def\rowcolors
   {\@ifstar{\@rowcmdfalse\rowc@lors}{\@rowcmdtrue\rowc@lors}}
@@ -1420,11 +1420,13 @@
  {red,1,0,0/0,1,1/0,1,1,0/.3;%
   green,0,1,0/.33333,1,1/1,0,1,0/.59;%
   blue,0,0,1/.66667,1,1/1,1,0,0/.11;%
+  brown,.75,.5,.25/.083333,.66667,.75/0,.25,.5,.25/.5475;%
+  lime,.75,1,0/.20833,1,1/.25,0,1,0/.815;%
   orange,1,.5,0/.083333,1,1/0,.5,1,0/.595;%
-  violet,.5,0,.5/.83333,1,.5/0,.5,0,.5/.205;%
+  pink,1,.75,.75/0,.25,1/0,.25,.25,0/.825;%
   purple,.75,0,.25/.94444,1,.75/0,.75,.5,.25/.2525;%
-  brown,.75,.5,.25/.083333,.66667,.75/0,.25,.5,.25/.5475;%
-  pink,1,.75,.75/0,.25,1/0,.25,.25,0/.825}%
+  teal,0,.5,.5/.5,1,.5/.5,0,0,.5/.35;%
+  violet,.5,0,.5/.83333,1,.5/0,.5,0,.5/.205}%
 \definecolorset{cmyk/rgb/hsb/gray}{}{}%
  {cyan,1,0,0,0/0,1,1/.5,1,1/.7;%
   magenta,0,1,0,0/1,0,1/.83333,1,1/.41;%
diff --git a/Master/texmf-dist/tpm/xcolor.tpm b/Master/texmf-dist/tpm/xcolor.tpm
index d7b8759cef2..73ec6e04941 100644
--- a/Master/texmf-dist/tpm/xcolor.tpm
+++ b/Master/texmf-dist/tpm/xcolor.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/xcolor.zip">
     <TPM:Name>xcolor</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/12/22 23:24:38</TPM:Date>
+    <TPM:Date>2007/01/22 16:04:52</TPM:Date>
     <TPM:Version>2.03</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>
@@ -23,14 +23,14 @@ Colors can be mixed like \color{red!30!green!40!blue}.
     <TPM:Size>1256327</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="72861">
+    <TPM:RunFiles size="72945">
 texmf-dist/dvips/xcolor/xcolor.pro
 texmf-dist/tex/latex/xcolor/svgnam.def
 texmf-dist/tex/latex/xcolor/x11nam.def
 texmf-dist/tex/latex/xcolor/xcolor.sty
 texmf-dist/tpm/xcolor.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="843020">
+    <TPM:DocFiles size="847106">
 texmf-dist/doc/latex/xcolor/ChangeLog
 texmf-dist/doc/latex/xcolor/README
 texmf-dist/doc/latex/xcolor/xcolor.lox
@@ -41,7 +41,7 @@ texmf-dist/doc/latex/xcolor/xcolor2.tex
 texmf-dist/doc/latex/xcolor/xcolor3.tex
 texmf-dist/doc/latex/xcolor/xcolor4.tex
     </TPM:DocFiles>
-    <TPM:SourceFiles size="340446">
+    <TPM:SourceFiles size="341730">
 texmf-dist/source/latex/xcolor/xcolor.dtx
 texmf-dist/source/latex/xcolor/xcolor.ins
     </TPM:SourceFiles>