summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pgfplots
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-03 22:23:41 +0000
committerKarl Berry <karl@freefriends.org>2013-10-03 22:23:41 +0000
commit17c26f8a0e90231c7f95311cd8270fcd345002e4 (patch)
treeb0378783b5421fc11bc25ca967c349d4938fd923 /Master/texmf-dist/tex/latex/pgfplots
parent9334469d545fb017cccf5b7f4075005dc17a4949 (diff)
pgfplots (3oct13)
git-svn-id: svn://tug.org/texlive/trunk@31822 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pgfplots')
-rw-r--r--Master/texmf-dist/tex/latex/pgfplots/bugtracker.sty14
-rw-r--r--Master/texmf-dist/tex/latex/pgfplots/pgfplots.sty48
2 files changed, 56 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/pgfplots/bugtracker.sty b/Master/texmf-dist/tex/latex/pgfplots/bugtracker.sty
index 50130daaa8c..e17ba8bd8c3 100644
--- a/Master/texmf-dist/tex/latex/pgfplots/bugtracker.sty
+++ b/Master/texmf-dist/tex/latex/pgfplots/bugtracker.sty
@@ -128,7 +128,10 @@
\long\def\bugtracker@enqueue#1#2{%
\toks0={#2}%
- \edef\bugtracker@entry{{#1}{\bugtracker@status}{\pgfkeysvalueof{/bugtracker/prio}}{\the\toks0}{\the\inputlineno}}%
+ % some of these values are used during the sort procedure; that's
+ % why they are not simply a list of keys. Perhaps they should
+ % still be a list of keys...
+ \edef\bugtracker@entry{{#1}{\bugtracker@status}{\pgfkeysvalueof{/bugtracker/prio}}{\the\toks0}{\the\inputlineno}{\pgfkeysvalueof{/bugtracker/epic}}}%
\expandafter\pgfplotsarraypushbackglobal\expandafter{\bugtracker@entry}\to\bugtrackeritems
\endgroup
\end{#1}%
@@ -138,12 +141,12 @@
\PackageError{bugtracker}{Sorry, bug tracker elements can only be used inside of \string\begin{bugtracker} ... \string\end{bugtracker}. Discarding this element}{}%
}%
-\long\def\bugtracker@unpack#1#2#3#4#5{%
- \bugtrackerset{name={#1},status=#2,prio=#3,source line={#5}}%
+\long\def\bugtracker@unpack#1#2#3#4#5#6{%
+ \bugtrackerset{name={#1},status=#2,prio=#3,source line={#5},epic={#6}}%
\def\bugtracker@content{#4}%
}%
-\long\def\bugtracker@unpack@sorting#1#2#3#4#5{%
+\long\def\bugtracker@unpack@sorting#1#2#3#4#5#6{%
\edef\bugtracker@name {\pgfkeysvalueof{/bugtracker/sort order/#1}}%
\edef\bugtracker@status{\pgfkeysvalueof{/bugtracker/status order/#2}}%
\def\bugtracker@prio{#3}%
@@ -229,6 +232,7 @@
}%
},
prio/.initial=5,
+ epic/.initial=,
source line/.initial=,
status/.is choice,
status/open/.code= {\def\bugtracker@status{open}},
@@ -267,7 +271,7 @@
\protect\bugtrackerset{/bugtracker/typeset name={\pgfkeysvalueof{/bugtracker/name}}}
% \##2
}
- [\bugtracker@status, Priority \pgfkeysvalueof{/bugtracker/prio}]
+ [\bugtracker@status, Priority \pgfkeysvalueof{/bugtracker/prio}, Epic `\pgfkeysvalueof{/bugtracker/epic}']
\vskip4pt
{%
\noindent
diff --git a/Master/texmf-dist/tex/latex/pgfplots/pgfplots.sty b/Master/texmf-dist/tex/latex/pgfplots/pgfplots.sty
index 1f4f8113da6..25ad5cdd15c 100644
--- a/Master/texmf-dist/tex/latex/pgfplots/pgfplots.sty
+++ b/Master/texmf-dist/tex/latex/pgfplots/pgfplots.sty
@@ -7,7 +7,7 @@
%
% It is based on Till Tantau's PGF package.
%
-% Copyright 2007-2011 by Christian Feuersänger.
+% Copyright 2007-2013 by Christian Feuersänger.
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -48,6 +48,52 @@
\def\pgfplots@texdist@protect{\protect}%
\input pgfplots.code.tex
+
+
+% checks for xcolor configuration options and will override
+% mesh/colorspace explicit color output
+% and
+% colormap default colorspace
+% if needed.
+\def\pgfplots@check@global@colorspace@overrides{%
+ % "bOverridesColorspace"
+ \pgfplots@loc@tmpfalse
+ \ifconvertcolorsD
+ \pgfplots@loc@tmptrue
+ \else
+ \ifconvertcolorsU
+ \pgfplots@loc@tmptrue
+ \fi
+ \fi
+ %
+ \ifpgfplots@loc@tmp
+ \let\pgfplots@loc@TMPb=\pgfutil@empty%
+ \ifx\XC@tgt@mod\pgfplots@XC@tgt@mod@rgb \def\pgfplots@loc@TMPb{rgb}\fi
+ \ifx\XC@tgt@mod\pgfplots@XC@tgt@mod@RGB \def\pgfplots@loc@TMPb{rgb}\fi
+ \ifx\XC@tgt@mod\pgfplots@XC@tgt@mod@cmyk\def\pgfplots@loc@TMPb{cmyk}\fi
+ \ifx\XC@tgt@mod\pgfplots@XC@tgt@mod@cmy \def\pgfplots@loc@TMPb{cmyk}\fi
+ \ifx\XC@tgt@mod\pgfplots@XC@tgt@mod@gray \def\pgfplots@loc@TMPb{gray}\fi
+ \ifx\XC@tgt@mod\pgfplots@XC@tgt@mod@Gray \def\pgfplots@loc@TMPb{gray}\fi
+ %
+ \ifx\pgfplots@loc@TMPb\pgfutil@empty
+ \else
+ \edef\pgfplots@loc@TMPa{%
+ mesh/colorspace explicit color output=\pgfplots@loc@TMPb,%
+ colormap default colorspace=\pgfplots@loc@TMPb,%
+ }%
+ \pgfplots@log3{Overriding colorspace to \pgfplots@loc@TMPb\space due to xcolor configuration.}%
+ \expandafter\pgfplotsset\expandafter{\pgfplots@loc@TMPa}%
+ \fi
+ \fi
+}%
+
+\def\pgfplots@XC@tgt@mod@rgb#1{rgb}
+\def\pgfplots@XC@tgt@mod@RGB#1{rgb}
+\def\pgfplots@XC@tgt@mod@cmyk#1{cmyk}
+\def\pgfplots@XC@tgt@mod@cmy#1{cmy}
+\def\pgfplots@XC@tgt@mod@gray#1{gray}
+\def\pgfplots@XC@tgt@mod@Gray#1{gray}
+
\usetikzlibrary{plotmarks}