summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-01-22 16:05:54 +0000
committerNorbert Preining <preining@logic.at>2007-01-22 16:05:54 +0000
commita826077ed27606ca04db24c420e703f6171f2e97 (patch)
tree80a29d92dba4d602d2a5032bebdba69188f36490 /Master/texmf-dist/tex
parent880c4b95105840051f57f2dbc03be12c328615f1 (diff)
xcolor 2.11 update from CTAN
git-svn-id: svn://tug.org/texlive/trunk@3687 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/xcolor/svgnam.def4
-rw-r--r--Master/texmf-dist/tex/latex/xcolor/x11nam.def4
-rw-r--r--Master/texmf-dist/tex/latex/xcolor/xcolor.sty16
3 files changed, 13 insertions, 11 deletions
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;%