summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgfplots/libs
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-08-11 21:43:18 +0000
committerKarl Berry <karl@freefriends.org>2016-08-11 21:43:18 +0000
commit331998aa63cb82e63c8b2d1e0152a454d7cd027e (patch)
tree24d0935e3537ed8201d0c8ff67d1121804a57848 /Master/texmf-dist/tex/generic/pgfplots/libs
parent08ddf2612db3c8882d81fa31045b11c4daba10b1 (diff)
pgfplots (11aug16)
git-svn-id: svn://tug.org/texlive/trunk@41838 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgfplots/libs')
-rw-r--r--Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarycolorbrewer.code.tex31
-rw-r--r--Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.dateplot.code.tex7
-rw-r--r--Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex19
-rw-r--r--Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.fillbetween.code.tex81
-rw-r--r--Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex32
5 files changed, 111 insertions, 59 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarycolorbrewer.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarycolorbrewer.code.tex
index f5bbcd543e0..b106a506f91 100644
--- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarycolorbrewer.code.tex
+++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarycolorbrewer.code.tex
@@ -349,21 +349,24 @@
\pgfutil@definecolor{PRGn-N}{RGB}{27,120,55}
\pgfutil@definecolor{PRGn-O}{RGB}{0,68,27}
-\pgfutil@definecolor{PuOr-A}{RGB}{127,59,8}
-\pgfutil@definecolor{PuOr-B}{RGB}{179,88,6}
-\pgfutil@definecolor{PuOr-C}{RGB}{230,97,1}
-\pgfutil@definecolor{PuOr-D}{RGB}{224,130,20}
-\pgfutil@definecolor{PuOr-E}{RGB}{241,163,64}
-\pgfutil@definecolor{PuOr-F}{RGB}{253,184,99}
-\pgfutil@definecolor{PuOr-G}{RGB}{254,224,182}
+% These colors are defined in reverse order compared to <http://colorbrewer2.org>.
+% For more details have a look at the comments in
+% <https://sourceforge.net/p/pgfplots/bugs/108/>
+\pgfutil@definecolor{PuOr-A}{RGB}{45,0,75}
+\pgfutil@definecolor{PuOr-B}{RGB}{84,39,136}
+\pgfutil@definecolor{PuOr-C}{RGB}{94,60,153}
+\pgfutil@definecolor{PuOr-D}{RGB}{128,115,172}
+\pgfutil@definecolor{PuOr-E}{RGB}{153,142,195}
+\pgfutil@definecolor{PuOr-F}{RGB}{178,171,210}
+\pgfutil@definecolor{PuOr-G}{RGB}{216,218,235}
\pgfutil@definecolor{PuOr-H}{RGB}{247,247,247}
-\pgfutil@definecolor{PuOr-I}{RGB}{216,218,235}
-\pgfutil@definecolor{PuOr-J}{RGB}{178,171,210}
-\pgfutil@definecolor{PuOr-K}{RGB}{153,142,195}
-\pgfutil@definecolor{PuOr-L}{RGB}{128,115,172}
-\pgfutil@definecolor{PuOr-M}{RGB}{94,60,153}
-\pgfutil@definecolor{PuOr-N}{RGB}{84,39,136}
-\pgfutil@definecolor{PuOr-O}{RGB}{45,0,75}
+\pgfutil@definecolor{PuOr-I}{RGB}{254,224,182}
+\pgfutil@definecolor{PuOr-J}{RGB}{253,184,99}
+\pgfutil@definecolor{PuOr-K}{RGB}{241,163,64}
+\pgfutil@definecolor{PuOr-L}{RGB}{224,130,20}
+\pgfutil@definecolor{PuOr-M}{RGB}{230,97,1}
+\pgfutil@definecolor{PuOr-N}{RGB}{179,88,6}
+\pgfutil@definecolor{PuOr-O}{RGB}{127,59,8}
\pgfutil@definecolor{RdBu-A}{RGB}{103,0,31}
\pgfutil@definecolor{RdBu-B}{RGB}{178,24,43}
diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.dateplot.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.dateplot.code.tex
index a8ed6e9f3da..76fb9fd67a2 100644
--- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.dateplot.code.tex
+++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.dateplot.code.tex
@@ -156,14 +156,15 @@
\endgroup
}%
+\expandafter\def\expandafter\pgfplots@notify@options@are@set\expandafter{\pgfplots@notify@options@are@set
+ \global\let\pgfplots@global@dateplot@defaultshift=\pgfutil@empty
+}
+
\pgfplotsset{
/pgfplots/date ZERO/.code={%
\pgfplots@dateplot@parse@ZEROSHIFT{#1}%
\let\pgfplots@calender@ZEROSHIFT=\pgfmathresult
},
- /pgfplots/execute at begin axis@@/.add={}{%
- \global\let\pgfplots@global@dateplot@defaultshift=\pgfutil@empty
- },
/pgfplots/date coordinates in/.code={%
\pgfkeysdef{/pgfplots/#1 coord trafo}{%
\begingroup
diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex
index 3259029cc67..dabbda099ed 100644
--- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex
+++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex
@@ -109,4 +109,23 @@
\endgroup
\fi
+
+
+\def\tikzexternal@externalizefig@systemcall@call@old#1{%
+ \iftikzexternal@verboseio
+ \immediate\write16{===== 'mode=convert with system call': Invoking '#1' ========}%
+ \fi
+ \immediate\write18{#1}%
+}%
+
+\def\tikzexternal@externalizefig@systemcall@call@new#1{%
+ \iftikzexternal@verboseio
+ \immediate\write16{===== 'mode=convert with system call': Invoking '#1' ========}%
+ \fi
+ \pgfutil@shellescape{#1}%
+}%
+\ifx\tikzexternal@externalizefig@systemcall@call\tikzexternal@externalizefig@systemcall@call@old
+ \let\tikzexternal@externalizefig@systemcall@call=\tikzexternal@externalizefig@systemcall@call@new
+\fi
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.fillbetween.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.fillbetween.code.tex
index 3c3243abab1..fea448143d7 100644
--- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.fillbetween.code.tex
+++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.fillbetween.code.tex
@@ -51,7 +51,7 @@
\usepgfplotslibrary{decorations.softclip}
\pgfkeys{
- /pgfplots/every fill between plot/.style={/pgfplots/area legend,/tikz/fill},
+ /pgfplots/every fill between plot/.style={/pgfplots/area legend,/tikz/fill,/pgfplots/on layer=pre main},
/tikz/soft clip assign/domain/.code args={#1:#2}{%
\pgfplotsifisvisualizationphase{%
\edef\pgfplots@loc@TMPa{%
@@ -71,41 +71,10 @@
},%
%
/pgfplots/execute at begin axis@@/.add={}{%
- \gdef\pgfplotsfillbetween@list@of@layers@with@clippath{}%
\gdef\b@pgfplotsfillbetween@list@has@set@layers{0}%
},
}
-% #1: the value of /tikz/fill between/on layer
-\def\pgfplotsfillbetween@ensure@clipping@on@layer{%
- \ifpgfplots@clip
- \pgfkeysgetvalue{/tikz/fill between/on layer}\pgfplots@loc@TMPa
- \edef\pgfplots@loc@TMPa{\pgfplots@loc@TMPa}%
- %
- % check if 'pre main,' is inside of the already prepared layers:
- \def\pgfplots@loc@TMPb{\expandafter\pgfutil@in@\expandafter{\pgfplots@loc@TMPa,}}%
- \expandafter\pgfplots@loc@TMPb\expandafter{\pgfplotsfillbetween@list@of@layers@with@clippath}%
- %
- \ifpgfutil@in@
- % ah - already prepared. Good, nothing left to do.
- \else
- \pgfplots@log3{fill between: found 'clip=true'. Preparing pgfplotsextra instruction with clip path for layer '\pgfplots@loc@TMPa'...}%
- \xdef\pgfplotsfillbetween@list@of@layers@with@clippath{\pgfplots@loc@TMPa,\pgfplotsfillbetween@list@of@layers@with@clippath}%
- %
- \edef\pgfplots@loc@TMPb{%
- \noexpand\pgfplotsextra{%
- \noexpand\pgfplotsonlayer{\pgfplots@loc@TMPa}%
- \noexpand\pgfplotspathaxisoutline
- \noexpand\pgfusepath{clip}%
- \noexpand\endpgfplotsonlayer
- }%
- }%
- \pgfplots@loc@TMPb
- %
- \fi
- \fi
-}%
-
% The options are from
% \addplot[#1] fill between[#2] #3;
%
@@ -114,6 +83,12 @@
%
\pgfplots@start@plot@with@behavioroptions{/pgfplots/every fill between plot,#1}%
%
+ % '/tikz/fill between/on layer' is not really integrated into the option processing of pgfplots.
+ % improve it here (to some extend):
+ \pgfkeysgetvalue{/pgfplots/on layer}\pgfplots@loc@TMPa
+ \pgfkeyslet{/tikz/fill between/on layer}{\pgfplots@loc@TMPa}%
+ %
+ % FIXME: is this here an accident!?
\pgfkeysvalueof{/pgfplots/execute at end survey}%
\pgfplots@remember@survey@option@list
%
@@ -125,6 +100,41 @@
}{%
% empty - this here is a TikZ instruction, not a "real" \addplot command
}{%
+ \def\b@pgfplots@fillbetween@clip@on@layer{0}%
+ \pgfkeysgetvalue{/tikz/fill between/on layer}\pgfplots@loc@TMPa
+ \edef\pgfplots@fillbetween@layer{\pgfplots@loc@TMPa}%
+ \ifx\pgfplots@fillbetween@layer\pgfutil@empty
+ \else
+ \ifpgfplots@clip
+ \def\b@pgfplots@fillbetween@clip@on@layer{1}%
+ % This here is messy: we have to clip on the other
+ % layer. I gave up to install this clip path once
+ % per axis, that's why I do it for each individual
+ % fillbetween - let us hope this is not too
+ % inefficient.
+ %
+ % I had to give up because the result appears to
+ % require a pattern of sorts
+ % \onlayer{L}
+ % \scope
+ % \clip ... ;
+ % \endonlayer
+ % ...
+ %
+ % \onlayer{L}
+ % \endscope
+ % \endonlayer
+ %
+ % which is forbidden in TeX -- and using
+ % \pgfsys@beginscope resulted in invalid PDF.
+ %
+ \pgfplotsonlayer{\pgfplots@loc@TMPa}%
+ \scope
+ \pgfplotspathaxisoutline
+ \pgfusepath{clip}%
+ \fi
+ \fi
+ %
% the path instruction:
\tikzfillbetween[#2]{%
/pgfplots/.search also=/tikz,%
@@ -132,6 +142,11 @@
/tikz/fill between/every last segment/.append style={/tikz/fill between/path after segment={#3}},%
#1%
}%
+ %
+ \if1\b@pgfplots@fillbetween@clip@on@layer
+ \endscope
+ \endpgfplotsonlayer%
+ \fi
}{%
% post command.
}%
@@ -148,7 +163,6 @@
}%
% SIDE-EFFECT: modifies \b@pgfplotsfillbetween@list@has@set@layers and
-% \pgfplotsfillbetween@list@of@layers@with@clippath
\def\pgfplotslibraryfillbetweenpreparecurrentlayer{%
\pgfkeysgetvalue{/tikz/fill between/on layer}\pgfplots@loc@TMPa
\ifx\pgfplots@loc@TMPa\pgfutil@empty
@@ -158,7 +172,6 @@
\pgfplotssetlateoptions{fill between/@ensure layers}%
\gdef\b@pgfplotsfillbetween@list@has@set@layers{1}%
\fi
- \pgfplotsfillbetween@ensure@clipping@on@layer%
\fi
}
diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex
index 0f42923b753..2c0c06baec4 100644
--- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex
+++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex
@@ -220,13 +220,13 @@
% Determine the labels of both x and y.
%
\def\pgfplots@group@determine@labels{%
- \def\pgfplots@loc@TMPa{all}
- \def\pgfplots@loc@TMPb{lower}
+ \def\pgfplots@loc@TMPa{all}%
+ \def\pgfplots@loc@TMPb{lower}%
\ifx\pgfplots@loc@TMPa\pgfplots@group@xlabels%
% xlabels at=all
% Do nothing as all should have xlabels
\fi
- \gdef\pgfplots@glob@TMPa{}
+ \gdef\pgfplots@glob@TMPa{}%
\ifx\pgfplots@loc@TMPb\pgfplots@group@xlabels%
% xlabels at=lower
\ifnum1<\pgfplots@group@rows\relax
@@ -235,7 +235,11 @@
\ifnum\pgfplots@row=\pgfplots@group@rows\relax%
\else
\expandafter\xdef\expandafter\pgfplots@glob@TMPa\expandafter{%
- \pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={/pgfplots/xlabel={}}}%
+ \pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={%
+ /pgfplots/xlabel={},%
+ \ifpgfplots@units@use/pgfplots/x unit={}\fi
+ }%
+ }%
\fi
}%
}%
@@ -252,7 +256,11 @@
\pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={/pgfplots/xticklabel pos=upper}}%
\else
\expandafter\xdef\expandafter\pgfplots@glob@TMPa\expandafter{%
- \pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={/pgfplots/xlabel={}}}%
+ \pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={%
+ /pgfplots/xlabel={},%
+ \ifpgfplots@units@use/pgfplots/x unit={}\fi%
+ }%
+ }%
\fi
}%
}%
@@ -273,7 +281,11 @@
\foreach \pgfplots@row in {1,...,\pgfplots@group@rows} {%
\foreach \pgfplots@column in {2,...,\pgfplots@group@columns} {%
\expandafter\xdef\expandafter\pgfplots@glob@TMPa\expandafter{%
- \pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={/pgfplots/ylabel={}}}%
+ \pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={%
+ /pgfplots/ylabel={},%
+ \ifpgfplots@units@use/pgfplots/y unit={}\fi%
+ }%
+ }%
}%
}%
\fi%
@@ -289,7 +301,11 @@
\pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={/pgfplots/yticklabel pos=upper}}%
\else
\expandafter\xdef\expandafter\pgfplots@glob@TMPa\expandafter{%
- \pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={/pgfplots/ylabel={}}}%
+ \pgfplots@glob@TMPa,/pgfplots/group/plot c\pgfplots@column r\pgfplots@row/.append style={%
+ /pgfplots/ylabel={},%
+ \ifpgfplots@units@use/pgfplots/y unit={}\fi%
+ }%
+ }%
\fi
}%
}%
@@ -297,7 +313,7 @@
\fi%
\fi
\fi
- \expandafter\pgfkeys\expandafter{\pgfplots@glob@TMPa}
+ \expandafter\pgfkeys\expandafter{\pgfplots@glob@TMPa}%
}
%