diff options
author | Karl Berry <karl@freefriends.org> | 2011-12-30 22:58:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-12-30 22:58:39 +0000 |
commit | 44ccd75065152cd73c512645bc4dc6d258fe62cb (patch) | |
tree | 39e9b861199f3172d9cff378a68f2c773248db87 /Master/texmf-dist/tex/generic/pgfplots/libs | |
parent | b3370daebbffee05312803e74c40f6d0abbf08c4 (diff) |
pgfplots 1.5.1 (29dec11)
git-svn-id: svn://tug.org/texlive/trunk@24977 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgfplots/libs')
3 files changed, 74 insertions, 4 deletions
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 32b0e5f32ee..dd7a735e252 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 @@ -110,6 +110,22 @@ }, /pgfplots/group/group name/.store in=\pgfplots@group@name, /pgfplots/group/empty plot/.style={/pgfplots/hide axis=true}, + /pgfplots/trim axis group left/.code={% + \pgfutil@ifundefined{pgfsettrimleft}{% + \pgfplots@error{Sorry, the 'trim axis group left' requires a more recent PGF version.}% + }{% + \pgfkeysalso{/tikz/trim left={(group c1r1.south west)}}% + }% + },% + /tikz/trim axis group left/.style={/pgfplots/trim axis group left}, + /pgfplots/trim axis group right/.code={% + \pgfutil@ifundefined{pgfsettrimleft}{% + \pgfplots@error{Sorry, the 'trim axis group right' requires a more recent PGF version.}% + }{% + \pgfkeysalso{/pgfplots/trim axis right}% + }% + },% + /tikz/trim axis group right/.style={/pgfplots/trim axis group right}, } \def\nextgroupplot{% diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.patchplots.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.patchplots.code.tex index 4076e37281c..f3e4674f9e6 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.patchplots.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.patchplots.code.tex @@ -1035,6 +1035,58 @@ \let\pgfplotspatchclass@rect@D@=\pgfplotspatchclass@rect@D% }% + +% An arbitrary poligy specified in the sequence +% D <-- C +% | ^ +% v | +% A --> B +% +\pgfkeyssetvalue{/pgfplots/vertex count}{0}% +\pgfplotsdeclarepatchclass{polygon}{% + new=\def\pgfplotspatchclass@poly@no{0}, + set next vertex={% + \pgfplotspatchclass@poly@checkcount + \expandafter\edef\csname pgfplotspatchclass@poly@\pgfplotspatchclass@poly@no\endcsname{#1}% + \pgfplotsutil@advancestringcounter\pgfplotspatchclass@poly@no + \ifnum\pgfplotspatchclass@poly@no=\pgfkeysvalueof{/pgfplots/vertex count} % + \def\pgfplotspatchclass@poly@no{0}% + \pgfplotspatchready% + \fi + }, + first vertex=\expandafter\expandafter\expandafter\pgfplotspatchvertex\csname pgfplotspatchclass@poly@0\endcsname\endvertex, + foreach vertex={% + \pgfplotspatchclass@poly@foreach@loop{0}{#1}% + }, + init pdf shading={% + \pgfplots@error{Sorry, patch type=polygon does not support shadings}% + }, + serialize except vertices=\let\pgfplotsretval\pgfutil@empty,% + deserialize except vertices=, + get pdf shading type=4, + get num vertices=\pgfkeysvalueof{/pgfplots/vertex count}, +}% +\def\pgfplotspatchclass@poly@checkcount{% + \ifnum\pgfkeysvalueof{/pgfplots/vertex count}>0 + \else + \pgfplots@error{Sorry, 'patch type=polygon' *requires* that 'vertex count=<num>' is set (note: it is allowed if multiple vertices have the same coordinates).}% + \fi +}% +\long\def\pgfplotspatchclass@poly@foreach@loop#1#2{% + \ifnum#1<\pgfkeysvalueof{/pgfplots/vertex count} % + \expandafter\expandafter\expandafter\pgfplotspatchvertex\csname pgfplotspatchclass@poly@#1\endcsname\endvertex #2% + \begingroup + \c@pgf@counta=#1 % + \advance\c@pgf@counta by1 % + \t@pgfplots@toka={#2}% + \xdef\pgfplots@glob@TMPc{\noexpand\pgfplotspatchclass@poly@foreach@loop{\the\c@pgf@counta}{\the\t@pgfplots@toka}}% + \endgroup + \else + \gdef\pgfplots@glob@TMPc{}% + \fi + \pgfplots@glob@TMPc +}% + \def\pgfplots@biquad@next@A{E} \def\pgfplots@biquad@next@B{F} \def\pgfplots@biquad@next@C{G} diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.polar.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.polar.code.tex index 7502dac1c36..24292d1354c 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.polar.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.polar.code.tex @@ -146,6 +146,7 @@ %\tracingmacros=0\tracingcommands=0 }% \def\pgfplotsaxisifcontainspoint@polar#1#2{% + \begingroup \pgfmath@basic@mod@{\pgfplots@current@point@x}{360}% \pgf@xa=\pgfmathresult pt % % @@ -154,6 +155,7 @@ % absolute value: \pgf@ya=-\pgf@ya \fi +%\message{ifcontainspoint(\the\pgf@xa,\pgfplots@current@point@y) limits = [\pgfplots@xmin@mod:\pgfplots@xmax@mod] x [\the\pgfplots@ymin@reg,\the\pgfplots@ymax@reg]^^J}% % % I assume that \pgfplots@[xyz]min@reg and min@reg are registers % containing the limits. @@ -188,7 +190,7 @@ \else \def\pgfplots@loc@TMPa{#2}% \fi - \pgfplots@loc@TMPa% + \expandafter\endgroup\pgfplots@loc@TMPa% } \def\pgfplots@check@invalid@range@polar{% @@ -485,10 +487,10 @@ \let\pgfplots@xmin@mod=\pgfmathresult \pgfmath@basic@mod@{\pgfplots@xmax}{360}% \let\pgfplots@xmax@mod=\pgfmathresult - \ifdim\pgfplots@xmax@mod pt<\pgfplots@xmin@mod pt - \def\b@pgfplots@polar@limit@around@zero{1}% - \else + \ifdim\pgfplots@xmax@mod pt>\pgfplots@xmin@mod pt \def\b@pgfplots@polar@limit@around@zero{0}% + \else + \def\b@pgfplots@polar@limit@around@zero{1}% \fi % \pgfplots@xmin@reg=\pgfplots@xmin pt % |