xcolor (11may16)

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

3 files changed, 27 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/latex/xcolor/svgnam.def b/Master/texmf-dist/tex/latex/xcolor/svgnam.def
index adb84576223..a947636ab3f 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}
- [2007/01/21 v2.11 Predefined colors according to SVG 1.1 (UK)]
+ [2016/05/11 v2.12 Predefined colors according to SVG 1.1 (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2016 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 2a92a29f985..61bcdecb88d 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}
- [2007/01/21 v2.11 Predefined colors according to Unix/X11 (UK)]
+ [2016/05/11 v2.12 Predefined colors according to Unix/X11 (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2016 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 96e87614d53..7bcf5cc20c2 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}
- [2007/01/21 v2.11 LaTeX color extensions (UK)]
+ [2016/05/11 v2.12 LaTeX color extensions (UK)]
 %%
 %% ----------------------------------------------------------------
-%% Copyright (C) 2003-2007 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de>
 %% ----------------------------------------------------------------
 %%
 %% Please send error reports and suggestions for
@@ -115,15 +115,15 @@
  {\ifx#1\@@ifxempty
   \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
 \long\def\XC@ifxcase#1#2#3%
- {\long\def\@@tmp##1##2%
+ {\long\def\XC@if@##1##2%
    {\ifx#1##1%
-      \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\@@tmp\fi}%
-  \@@tmp#2#1{#3}\@nnil\the\toks@}
+      \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\XC@if@\fi}%
+  \XC@if@#2#1{#3}\@nnil\the\toks@}
 \long\def\XC@ifcase#1#2#3%
- {\long\def\@@tmp##1##2%
+ {\long\def\XC@if@##1##2%
    {\@expandtwoargs\in@{,#1,}{,##1,}\ifin@
-      \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\@@tmp\fi}%
-  \@@tmp#2{#1}{#3}\@nnil\the\toks@}
+      \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\XC@if@\fi}%
+  \XC@if@#2{#1}{#3}\@nnil\the\toks@}
 \def\XC@@opt{,}
 \def\@ifXCopt#1%
  {\@expandtwoargs\in@{,#1,}{\XC@@opt}%
@@ -189,7 +189,7 @@
       \@break@tfor\fi}}}
 \providecommand*\Gin@driver{}
 \@tfor\@@tmp:={dvipdf}{dvipdfm}{dvipdfmx}{dvips}{dvipsone}{dviwin}%
-              {emtex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}%
+              {emtex}{luatex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}%
               {tcidvi}{textures}{truetex}{vtex}{xetex}\do
  {\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}%
     {\def\noexpand\Gin@driver{\@@tmp.def}}}%
@@ -236,6 +236,13 @@
     {pdftex}%
     {\def\@tempa{1}
      \def\XC@special#1{\pdfliteral{ q #1 Q }}}%
+    {luatex}%
+    {\def\@tempa{1}
+     \ifnum\luatexversion<87%
+       \def\XC@special#1{\pdfliteral{ q #1 Q }}%
+     \else%
+       \def\XC@special#1{\pdfextension literal{ q #1 Q }}%
+     \fi}%
     {dvipdfm}%
     {\def\@tempa{1}
      \def\XC@special#1{\special{pdf: content #1}}}%
@@ -276,13 +283,13 @@
 \def\xglobalize@#1{\ifx\xglobal@\global\global\let#1#1\fi}
 \def\GetGinDriver
  {\@tempswafalse
-  \@tfor\@@tmp:={dvips}{pdftex}{dvipdf}{dvipdfm}{dvipsone}{vtex}{textures}%
+  \@tfor\@@tmp:={dvips}{luatex}{pdftex}{dvipdf}{dvipdfm}{dvipsone}{vtex}{textures}%
   \do{\ifx\XC@@drv\@@tmp\@tempswatrue\@break@tfor\fi}%
   \edef\GinDriver{\if@tempswa\XC@@drv\else hypertex\fi}}
 \def\@hex@Hex#1{\ifx#1\relax\else\expandafter\@hex@@Hex\expandafter#1\fi}
 \def\@hex@@Hex#1%
  {\if a#1A\else \if b#1B\else \if c#1C\else \if d#1D\else
-  \if e#1E\else \if f#1f\else #1\fi\fi\fi\fi\fi\fi \@hex@Hex}
+  \if e#1E\else \if f#1F\else #1\fi\fi\fi\fi\fi\fi \@hex@Hex}
 \def\XC@strip@comma#1,#2%
  {\ifx,#2%
     #1\expandafter\remove@to@nnil\else#1 \expandafter\XC@strip@comma\fi
@@ -752,6 +759,10 @@
  {\begingroup
   \let\ignorespaces\endgroup \let\set@color\set@page@color
   \color}
+\def\nopagecolor
+ {\@ifundefined{no@page@color}%
+   {\PackageInfo{xcolor}{\string\nopagecolor\space is not supported}}%
+   {\no@page@color}}
 \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}}
@@ -1398,7 +1409,7 @@
              \csname\string\color@#1\endcsname}}
    \def\define@color@named#1#2%
     {\@namedef{\string\color@#1}{{}{}{ \colornameprefix#1}{}{}}}}%
-  {dvipsone,pctexps,pdftex,tcidvi,truetex,vtex,xetex}%
+  {dvipsone,luatex,pctexps,pdftex,tcidvi,truetex,vtex,xetex}%
   {\def\c@lor@@named#1,#2,#3\@@#4%
     {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive
              \csname\string\color@#1\endcsname}}