xcolor-solarized (6aug16)

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

5 files changed, 98 insertions, 79 deletions

diff --git a/Master/texmf-dist/doc/latex/xcolor-solarized/README b/Master/texmf-dist/doc/latex/xcolor-solarized/README
new file mode 100644
index 00000000000..9b85da7c207
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xcolor-solarized/README
@@ -0,0 +1,10 @@
+xcolor-solarized package
+
+Copyright 2014-2016 Julien Cretel
+
+Released under the LaTeX Project Public License 1.3 or later
+
+Built on the `xcolor` package, the `xcolor-solarized' package defines the
+sixteen colors of Ethan Schoonover's popular Solarized color palette
+(http://ethanschoonover.com/solarized) for use in documents typeset with
+LaTeX & friends.
diff --git a/Master/texmf-dist/doc/latex/xcolor-solarized/xcolor-solarized.pdf b/Master/texmf-dist/doc/latex/xcolor-solarized/xcolor-solarized.pdf
index 0bed20f9740..40c6b5182c1 100644
--- a/Master/texmf-dist/doc/latex/xcolor-solarized/xcolor-solarized.pdf
+++ b/Master/texmf-dist/doc/latex/xcolor-solarized/xcolor-solarized.pdf
diff --git a/Master/texmf-dist/source/latex/xcolor-solarized/xcolor-solarized.dtx b/Master/texmf-dist/source/latex/xcolor-solarized/xcolor-solarized.dtx
index e38c9ee61c5..bf5c7abda77 100644
--- a/Master/texmf-dist/source/latex/xcolor-solarized/xcolor-solarized.dtx
+++ b/Master/texmf-dist/source/latex/xcolor-solarized/xcolor-solarized.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 
 %
-% Copyright (C) 2015 by Julien Cretel
+% Copyright (C) 2016 by Julien Cretel
 %                       <jubobs.tex at gmail.com>
 %
 % This work may be distributed and/or modified under the
@@ -19,7 +19,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[2011/06/27]
 %<package>\ProvidesPackage{xcolor-solarized}
-%<package>  [2015/02/17 v0.3 xcolor definitions for Ethan Schoonover's
+%<package>  [2016/08/05 v0.4 xcolor definitions for Ethan Schoonover's
 %<package>   Solarized theme]
 %
 %<*driver>
@@ -48,7 +48,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{92}
+% \CheckSum{66}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -69,6 +69,7 @@
 % \changes{v0.1}{2014/04/24}{Initial release on GitHub}
 % \changes{v0.2}{2015/02/14}{Major refactoring of the code}
 % \changes{v0.3}{2015/02/17}{Submission to CTAN}
+% \changes{v0.4}{2016/08/05}{Bugfix: remove hardcoding of default prefix}
 %
 % \GetFileInfo{xcolor-solarized.sty}
 %
@@ -269,27 +270,28 @@
 %   Here is a convenient internal macro for defining colors with a custom
 %   prefix.
 %    \begin{macrocode}
-\newcommand\solarized@definecolor{\expandafter\definecolor\expandafter}
+\newcommand\solarized@definecolor[2]
+  {\expandafter\definecolor\expandafter{\solarized@prefix #1}{RGB}{#2}}
 %    \end{macrocode}
 % \end{macro}
 % We now define the sixteen \solarized{} colors.
 %    \begin{macrocode}
-\solarized@definecolor{\solarized@prefix base03} {RGB}{000, 043, 054}
-\solarized@definecolor{\solarized@prefix base02} {RGB}{007, 054, 066}
-\solarized@definecolor{\solarized@prefix base01} {RGB}{088, 110, 117}
-\solarized@definecolor{\solarized@prefix base00} {RGB}{101, 123, 131}
-\solarized@definecolor{\solarized@prefix base0}  {RGB}{131, 148, 150}
-\solarized@definecolor{\solarized@prefix base1}  {RGB}{147, 161, 161}
-\solarized@definecolor{\solarized@prefix base2}  {RGB}{238, 232, 213}
-\solarized@definecolor{\solarized@prefix base3}  {RGB}{253, 246, 227}
-\solarized@definecolor{\solarized@prefix yellow} {RGB}{181, 137, 000}
-\solarized@definecolor{\solarized@prefix orange} {RGB}{203, 075, 022}
-\solarized@definecolor{\solarized@prefix red}    {RGB}{220, 050, 047}
-\solarized@definecolor{\solarized@prefix magenta}{RGB}{211, 054, 130}
-\solarized@definecolor{\solarized@prefix violet} {RGB}{108, 113, 196}
-\solarized@definecolor{\solarized@prefix blue}   {RGB}{038, 139, 210}
-\solarized@definecolor{\solarized@prefix cyan}   {RGB}{042, 161, 152}
-\solarized@definecolor{\solarized@prefix green}  {RGB}{133, 153, 000}
+\solarized@definecolor{base03} {000, 043, 054}
+\solarized@definecolor{base02} {007, 054, 066}
+\solarized@definecolor{base01} {088, 110, 117}
+\solarized@definecolor{base00} {101, 123, 131}
+\solarized@definecolor{base0}  {131, 148, 150}
+\solarized@definecolor{base1}  {147, 161, 161}
+\solarized@definecolor{base2}  {238, 232, 213}
+\solarized@definecolor{base3}  {253, 246, 227}
+\solarized@definecolor{yellow} {181, 137, 000}
+\solarized@definecolor{orange} {203, 075, 022}
+\solarized@definecolor{red}    {220, 050, 047}
+\solarized@definecolor{magenta}{211, 054, 130}
+\solarized@definecolor{violet} {108, 113, 196}
+\solarized@definecolor{blue}   {038, 139, 210}
+\solarized@definecolor{cyan}   {042, 161, 152}
+\solarized@definecolor{green}  {133, 153, 000}
 %    \end{macrocode}
 %
 % \subsection{User-level macro}
@@ -302,28 +304,31 @@
 %    \begin{macrocode}
 \newcommand\solarizedPalette[1][3em]{%
   \newcommand\solarized@square{\rule{#1}{#1}}
+  \newcommand\solarized@showcolor[1]{%
+    \textcolor{\solarized@prefix ##1}{\solarized@square}%
+  }
   \noindent
   \begin{tabular}{cccc cccc}
-    \textcolor{solarized-base03} \solarized@square &
-    \textcolor{solarized-base02} \solarized@square &
-    \textcolor{solarized-base01} \solarized@square &
-    \textcolor{solarized-base00} \solarized@square &
-    \textcolor{solarized-base0}  \solarized@square &
-    \textcolor{solarized-base1}  \solarized@square &
-    \textcolor{solarized-base2}  \solarized@square &
-    \textcolor{solarized-base3}  \solarized@square \\
+    \solarized@showcolor{base03} &
+    \solarized@showcolor{base02} &
+    \solarized@showcolor{base01} &
+    \solarized@showcolor{base00} &
+    \solarized@showcolor{base0}  &
+    \solarized@showcolor{base1}  &
+    \solarized@showcolor{base2}  &
+    \solarized@showcolor{base3}  \\
     base03 & base02 & base01 & base00 &
-    base0  & base1  & base2  & base3               \\[#1]
-    \textcolor{solarized-yellow} \solarized@square &
-    \textcolor{solarized-orange} \solarized@square &
-    \textcolor{solarized-red}    \solarized@square &
-    \textcolor{solarized-magenta}\solarized@square &
-    \textcolor{solarized-violet} \solarized@square &
-    \textcolor{solarized-blue}   \solarized@square &
-    \textcolor{solarized-cyan}   \solarized@square &
-    \textcolor{solarized-green}  \solarized@square \\
-    yellow & orange & red    & magenta &
-    violet & blue   & cyan   & green
+    base0  & base1  & base2  & base3  \\[#1]
+    \solarized@showcolor{yellow} &
+    \solarized@showcolor{orange} &
+    \solarized@showcolor{red}    &
+    \solarized@showcolor{magenta}&
+    \solarized@showcolor{violet} &
+    \solarized@showcolor{blue}   &
+    \solarized@showcolor{cyan}   &
+    \solarized@showcolor{green}  \\
+    yellow & orange & red  & magenta &
+    violet & blue   & cyan & green
   \end{tabular}
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/xcolor-solarized/xcolor-solarized.ins b/Master/texmf-dist/source/latex/xcolor-solarized/xcolor-solarized.ins
index 41d14347610..fe0270810fe 100644
--- a/Master/texmf-dist/source/latex/xcolor-solarized/xcolor-solarized.ins
+++ b/Master/texmf-dist/source/latex/xcolor-solarized/xcolor-solarized.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2014 by Julien Cretel <jubobs.tex at gmail.com>
+%% Copyright (C) 2015 by Julien Cretel <jubobs.tex at gmail.com>
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,7 +19,7 @@
 
 This is a generated file.
 
-Copyright (C) 2014 by Julien Cretel <jubobs.tex at gmail.com>
+Copyright (C) 2015 by Julien Cretel <jubobs.tex at gmail.com>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/xcolor-solarized/xcolor-solarized.sty b/Master/texmf-dist/tex/latex/xcolor-solarized/xcolor-solarized.sty
index b0163d666ad..b07bfcad06c 100644
--- a/Master/texmf-dist/tex/latex/xcolor-solarized/xcolor-solarized.sty
+++ b/Master/texmf-dist/tex/latex/xcolor-solarized/xcolor-solarized.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2014 by Julien Cretel <jubobs.tex at gmail.com>
+%% Copyright (C) 2015 by Julien Cretel <jubobs.tex at gmail.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -30,7 +30,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \ProvidesPackage{xcolor-solarized}
-  [2015/02/17 v0.3 xcolor definitions for Ethan Schoonover's
+  [2016/08/05 v0.4 xcolor definitions for Ethan Schoonover's
    Solarized theme]
 \RequirePackage{xcolor}[2007/01/21]
 \RequirePackage{kvoptions}[2011/06/30]
@@ -44,47 +44,51 @@
   \PackageError{xcolor-solarized}{Unknown `\CurrentOption' option}
 }
 \ProcessKeyvalOptions*
-\newcommand\solarized@definecolor{\expandafter\definecolor\expandafter}
-\solarized@definecolor{\solarized@prefix base03} {RGB}{000, 043, 054}
-\solarized@definecolor{\solarized@prefix base02} {RGB}{007, 054, 066}
-\solarized@definecolor{\solarized@prefix base01} {RGB}{088, 110, 117}
-\solarized@definecolor{\solarized@prefix base00} {RGB}{101, 123, 131}
-\solarized@definecolor{\solarized@prefix base0}  {RGB}{131, 148, 150}
-\solarized@definecolor{\solarized@prefix base1}  {RGB}{147, 161, 161}
-\solarized@definecolor{\solarized@prefix base2}  {RGB}{238, 232, 213}
-\solarized@definecolor{\solarized@prefix base3}  {RGB}{253, 246, 227}
-\solarized@definecolor{\solarized@prefix yellow} {RGB}{181, 137, 000}
-\solarized@definecolor{\solarized@prefix orange} {RGB}{203, 075, 022}
-\solarized@definecolor{\solarized@prefix red}    {RGB}{220, 050, 047}
-\solarized@definecolor{\solarized@prefix magenta}{RGB}{211, 054, 130}
-\solarized@definecolor{\solarized@prefix violet} {RGB}{108, 113, 196}
-\solarized@definecolor{\solarized@prefix blue}   {RGB}{038, 139, 210}
-\solarized@definecolor{\solarized@prefix cyan}   {RGB}{042, 161, 152}
-\solarized@definecolor{\solarized@prefix green}  {RGB}{133, 153, 000}
+\newcommand\solarized@definecolor[2]
+  {\expandafter\definecolor\expandafter{\solarized@prefix #1}{RGB}{#2}}
+\solarized@definecolor{base03} {000, 043, 054}
+\solarized@definecolor{base02} {007, 054, 066}
+\solarized@definecolor{base01} {088, 110, 117}
+\solarized@definecolor{base00} {101, 123, 131}
+\solarized@definecolor{base0}  {131, 148, 150}
+\solarized@definecolor{base1}  {147, 161, 161}
+\solarized@definecolor{base2}  {238, 232, 213}
+\solarized@definecolor{base3}  {253, 246, 227}
+\solarized@definecolor{yellow} {181, 137, 000}
+\solarized@definecolor{orange} {203, 075, 022}
+\solarized@definecolor{red}    {220, 050, 047}
+\solarized@definecolor{magenta}{211, 054, 130}
+\solarized@definecolor{violet} {108, 113, 196}
+\solarized@definecolor{blue}   {038, 139, 210}
+\solarized@definecolor{cyan}   {042, 161, 152}
+\solarized@definecolor{green}  {133, 153, 000}
 \newcommand\solarizedPalette[1][3em]{%
   \newcommand\solarized@square{\rule{#1}{#1}}
+  \newcommand\solarized@showcolor[1]{%
+    \textcolor{\solarized@prefix ##1}{\solarized@square}%
+  }
   \noindent
   \begin{tabular}{cccc cccc}
-    \textcolor{solarized-base03} \solarized@square &
-    \textcolor{solarized-base02} \solarized@square &
-    \textcolor{solarized-base01} \solarized@square &
-    \textcolor{solarized-base00} \solarized@square &
-    \textcolor{solarized-base0}  \solarized@square &
-    \textcolor{solarized-base1}  \solarized@square &
-    \textcolor{solarized-base2}  \solarized@square &
-    \textcolor{solarized-base3}  \solarized@square \\
+    \solarized@showcolor{base03} &
+    \solarized@showcolor{base02} &
+    \solarized@showcolor{base01} &
+    \solarized@showcolor{base00} &
+    \solarized@showcolor{base0}  &
+    \solarized@showcolor{base1}  &
+    \solarized@showcolor{base2}  &
+    \solarized@showcolor{base3}  \\
     base03 & base02 & base01 & base00 &
-    base0  & base1  & base2  & base3               \\[#1]
-    \textcolor{solarized-yellow} \solarized@square &
-    \textcolor{solarized-orange} \solarized@square &
-    \textcolor{solarized-red}    \solarized@square &
-    \textcolor{solarized-magenta}\solarized@square &
-    \textcolor{solarized-violet} \solarized@square &
-    \textcolor{solarized-blue}   \solarized@square &
-    \textcolor{solarized-cyan}   \solarized@square &
-    \textcolor{solarized-green}  \solarized@square \\
-    yellow & orange & red    & magenta &
-    violet & blue   & cyan   & green
+    base0  & base1  & base2  & base3  \\[#1]
+    \solarized@showcolor{yellow} &
+    \solarized@showcolor{orange} &
+    \solarized@showcolor{red}    &
+    \solarized@showcolor{magenta}&
+    \solarized@showcolor{violet} &
+    \solarized@showcolor{blue}   &
+    \solarized@showcolor{cyan}   &
+    \solarized@showcolor{green}  \\
+    yellow & orange & red  & magenta &
+    violet & blue   & cyan & green
   \end{tabular}
 }
 \endinput