diff options
author | Karl Berry <karl@freefriends.org> | 2009-02-18 17:29:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-02-18 17:29:19 +0000 |
commit | 580735009eac6952e6ce112bd3c6f00fade80c3f (patch) | |
tree | f30360f712a94d2d7fb524989a55fd6a97ccda9e /Master/texmf-dist/tex/generic/pgfplots/pgfplots.code.tex | |
parent | 55304cf473fbdece6b5392aac6cfb75671e34189 (diff) |
pgfplots update (17feb09)
git-svn-id: svn://tug.org/texlive/trunk@12180 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgfplots/pgfplots.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/pgfplots.code.tex | 103 |
1 files changed, 87 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/pgfplots.code.tex b/Master/texmf-dist/tex/generic/pgfplots/pgfplots.code.tex index 03b56e28bdc..d386b2195a3 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/pgfplots.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/pgfplots.code.tex @@ -56,6 +56,8 @@ \newif\ifpgfplots@warn@for@filter@discards \newif\ifpgfplots@isuniformtick \newif\ifpgfplots@clip@limits +\newif\ifpgfplots@clip +\pgfplots@cliptrue \newif\ifpgfplots@enlargelimits \newif\ifpgfplots@enlargelimits@rel@thresh \newif\ifpgfplots@enlargelimits@auto @@ -908,6 +910,7 @@ /pgfplots/clip limits/.default=true, /pgfplots/clip limits=true, /pgfplots/clip limits/.belongs to family=/pgfplots, + /pgfplots/clip/.is if=pgfplots@clip, /pgfplots/axis equal/.is if=pgfplots@axis@equal, /pgfplots/axis equal/.default=true, /pgfplots/axis equal image/.is if=pgfplots@axis@equal@image, @@ -1672,6 +1675,24 @@ \let\pgfplots@table@curkeyname=\pgfkeyscurrentname \pgfqkeys{/pgfplots}{\pgfplots@table@curkeyname=##1}% }, + /pgfplots/plot graphics/.code={\let\tikz@plot@handler=\pgfplotsplothandlergraphics},% + /pgfplots/plot graphics/src/.initial=, + /pgfplots/plot graphics/includegraphics/.initial=, + /pgfplots/plot graphics/xmin/.initial=, + /pgfplots/plot graphics/xmax/.initial=, + /pgfplots/plot graphics/ymin/.initial=, + /pgfplots/plot graphics/ymax/.initial=, + /pgfplots/plot graphics/zmin/.initial=, + /pgfplots/plot graphics/zmax/.initial=, + /pgfplots/plot graphics/node/.style={ + transform shape, + inner sep=0pt, + outer sep=0pt, + every node/.style={}, + anchor=south west, + at={(0pt,0pt)}, + rectangle + }, /pgfplots/clip marker paths/.is if=pgfplots@clip@marker@paths, /pgfplots/clip marker paths/.default=true, /pgfplots/axis on top/.is if=pgfplots@axis@on@top, @@ -1721,7 +1742,25 @@ /pgfplots/colormap name/.initial=hot, /pgfplots/colormap/.code 2 args={ \pgfplotscreatecolormap{#1}{#2}% - \pgfkeysdef{/pgfplots/colormap name}{#1}% + \pgfkeysalso{/pgfplots/colormap name=#1}% + }, + /pgfplots/colormap/hot/.style={ + colormap name=hot + }, + /pgfplots/colormap/bluered/.style={ + /pgfplots/colormap={bluered}{rgb255(0cm)=(0,0,180); rgb255(1cm)=(0,255,255); rgb255(2cm)=(100,255,0); rgb255(3cm)=(255,255,0); rgb255(4cm)=(255,0,0); rgb255(5cm)=(128,0,0)} + }, + /pgfplots/colormap/cool/.style={ + /pgfplots/colormap={cool}{rgb255(0cm)=(255,255,255); rgb255(1cm)=(0,128,255); rgb255(2cm)=(255,0,255)} + }, + /pgfplots/colormap/greenyellow/.style={ + /pgfplots/colormap={greenyellow}{rgb255(0cm)=(0,128,0); rgb255(1cm)=(255,255,0)} + }, + /pgfplots/colormap/redyellow/.style={ + /pgfplots/colormap={redyellow}{rgb255(0cm)=(255,0,0); rgb255(1cm)=(255,255,0)} + }, + /pgfplots/colormap/blackwhite/.style={ + colormap={blackwhite}{gray(0cm)=(0); gray(1cm)=(1)} }, /pgfplots/scatter/.is choice, /pgfplots/scatter/false/.code={% @@ -1761,9 +1800,9 @@ {\pgfplotspointmetatransformed} {\pgfkeysvalueof{/pgfplots/colormap name}} %\message{Color for current point is RGB '\pgfmathresult' (determined using meta 'phi(\pgfplotspointmeta) = \pgfplotspointmetatransformed')}% - \def\pgfplots@loc@TMPb{\definecolor{mapped color}{rgb}} - \expandafter\pgfplots@loc@TMPb\expandafter{\pgfmathresult} - \scope[#1] + \def\pgfplots@loc@TMPb{\definecolor{mapped color}{rgb}}% + \expandafter\pgfplots@loc@TMPb\expandafter{\pgfmathresult}% + \scope[#1]% }, /pgfplots/scatter/@post marker code/.code={\endscope} }, @@ -1848,6 +1887,26 @@ },% /pgfplots/forget plot/.is if=pgfplots@curplot@isirrelevant, /pgfplots/forget plot/.default=true, + /pgfplots/normalsize/.style={ + /pgfplots/width=240pt, + /pgfplots/height=207pt, + /pgfplots/max space between ticks=35, + }, + /pgfplots/small/.style={ + /pgfplots/width=6.5cm, + /pgfplots/height=, + /pgfplots/max space between ticks=25, + }, + /pgfplots/footnotesize/.style={ + /pgfplots/width=5cm, + /pgfplots/height=, + legend style={font=\footnotesize}, + tick label style={font=\footnotesize}, + label style={font=\small}, + /pgfplots/max space between ticks=15, + every mark/.append style={mark size=8}, + ylabel style={yshift=-0.3cm}, + }, } { @@ -1899,22 +1958,34 @@ % - \pgfplots@plot@samples = value of '/pgfplots/samples', % the values after any backwards compatibility issues will be used. \def\pgfplots@validate@plot@domain@arguments{% + \pgfkeysgetvalue{/pgfplots/samples}\pgfplots@plot@samples + \ifx\pgfplots@plot@samples\pgfutil@empty + \pgfplots@gettikzinternal@keyval{samples}{tikz@plot@samples}{25}% + \pgfkeyslet{/pgfplots/samples}{\tikz@plot@samples}% + \let\pgfplots@plot@samples=\tikz@plot@samples + \def\pgfplots@loc@TMPa{0}% <- whether the tikz backw. compatibility shall resample + \else + \def\pgfplots@loc@TMPa{1}% + \fi \pgfkeysgetvalue{/pgfplots/domain}\pgfplots@plot@domain \pgfkeysgetvalue{/pgfplots/samples at}\pgfplots@plot@samples@at \ifx\pgfplots@plot@domain\pgfutil@empty \ifx\pgfplots@plot@samples@at\pgfutil@empty + \if 1\pgfplots@loc@TMPa + % Resample! See above. + \tikzset{samples=\pgfplots@plot@samples}% + \fi \pgfplots@gettikzinternal@keyval{samples at}{tikz@plot@samplesat}{-5,-4.6,...,5}% \pgfkeyslet{/pgfplots/samples at}{\tikz@plot@samplesat}% \let\pgfplots@plot@samples@at=\tikz@plot@samplesat \else % routines should use \pgfplots@plot@samples@at. \fi - \fi - \pgfkeysgetvalue{/pgfplots/samples}\pgfplots@plot@samples - \ifx\pgfplots@plot@samples\pgfutil@empty - \pgfplots@gettikzinternal@keyval{samples}{tikz@plot@samples}{25}% - \pgfkeyslet{/pgfplots/samples}{\tikz@plot@samples}% - \let\pgfplots@plot@samples=\tikz@plot@samples + \else + % do that such that any active ':' sign will be expanded - for + % french babel support. + \edef\pgfplots@plot@domain{\pgfplots@plot@domain}% + \pgfkeyslet{/pgfplots/domain}\pgfplots@plot@domain \fi }% @@ -3226,7 +3297,7 @@ % The same as \pgfplots@initsizes@getXscale, just for the height. \def\pgfplots@initsizes@getYscale#1\into#2{% \begingroup - \expandafter\pgf@xa\pgfplots@height\relax + \pgf@xa=\pgfplots@height\relax % EXPECTED WIDTH = X = \pgfplots@width % ACTUAL WIDTH = c + x * (xmax-xmin) % where c is a CONSTANT (for the axis labels/tick labels). @@ -4644,7 +4715,9 @@ \fi % CLIPPING: \pgfplots@clippath@prepare - \pgfplots@clippath@install + \ifpgfplots@clip + \pgfplots@clippath@install + \fi } % Defines \pgfplots@clippath@install. @@ -4699,6 +4772,8 @@ \else \pgfplotslistforeach\pgfplots@stored@markerlist\as\pgfplots@loc@TMPa{% \scope% make sure that 'fill opacity' and 'dotted' styles remain local! +%\message{Executing marker stuff: \meaning\pgfplots@loc@TMPa]]]]]}% +%\tracingmacros=2\tracingcommands=2 \pgfplots@loc@TMPa \endscope }% @@ -5919,10 +5994,6 @@ % All plotting commands have been read. % -> apply postponed drawing commands! % -------------------- - - - - \ifpgfplots@draw@at@end% ALWAYS TRUE - this is obsolete \def\pgfplots@nextcommand{% \pgfplots@BEGIN@init@and@draw@axis |