diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex | 66 |
1 files changed, 64 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex b/Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex index 92cb99709c5..38f1445195c 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex @@ -2844,6 +2844,7 @@ \let\pgfplots@current@point@y=\pgfutil@empty \let\pgfplots@current@point@z=\pgfutil@empty \let\pgfplots@current@point@meta=\pgfutil@empty + \let\pgfplots@current@point@coordinatestyle=\pgfutil@empty \let\pgfplots@current@point@error@x@plus=\pgfutil@empty \let\pgfplots@current@point@error@x@minus=\pgfutil@empty \let\pgfplots@current@point@error@y@plus=\pgfutil@empty @@ -3286,6 +3287,10 @@ \E\pgfplots@errorbars@survey@point \fi % + \if1\b@has@pgfplots@colordinate@style + \E\pgfplots@get@matching@coordinate@styles@surveyphase + \fi + % \ifpgfplots@collect@firstplot@astick \ifnum\pgfplots@numplots=0 \E\ifx\E\pgfplots@firstplot@coords@x\E\pgfutil@empty @@ -3818,6 +3823,11 @@ \fi \fi % + \if1\b@has@pgfplots@colordinate@style + \pgfplots@LUA@survey@log@deactivation{coordinate style currently unsupported}% + \pgfplots@LUA@backend@supportedfalse + \fi + % \ifpgfplots@LUA@backend@supported \edef\pgfplots@LUA@backend@plotnum{\pgfutil@directlua{tex.sprint(\pgfplotsHASH pgfplots.gca.plothandlers)}}% \begingroup @@ -4179,7 +4189,12 @@ \let\protect=\pgfplots@oldprotect \t@pgfplots@toka=\expandafter{\pgfplotsaxisserializedatapoint@val}% \t@pgfplots@tokb=\expandafter{\pgfplotsretval}% - \edef\pgfplotsretval{{\the\t@pgfplots@tokb;\the\t@pgfplots@toka}}% + \if1\b@has@pgfplots@colordinate@style + \t@pgfplots@tokc\expandafter{\expandafter{\pgfplots@current@point@coordinatestyle}}% + \else + \t@pgfplots@tokc={}% + \fi + \edef\pgfplotsretval{{\the\t@pgfplots@tokb;\the\t@pgfplots@tokc\the\t@pgfplots@toka}}% }% \def\pgfplotsaxisserializedatapoint{% @@ -4200,7 +4215,15 @@ % parts which can be read with % \pgfplotsaxisdeserializedatapointfrom@private) \def\pgfplotsaxisdeserializedatapointfrom#1{% - \expandafter\pgfplotsaxisdeserializedatapointfrom@#1\pgfplots@EOI + \if1\b@has@pgfplots@colordinate@style + \expandafter\pgfplotsaxisdeserializedatapointfrom@@#1\pgfplots@EOI + \else + \expandafter\pgfplotsaxisdeserializedatapointfrom@#1\pgfplots@EOI + \fi +}% +\def\pgfplotsaxisdeserializedatapointfrom@@#1;#2#3\pgfplots@EOI{% + \pgfplotsaxisdeserializedatapointfrom@{#1};{#3}\pgfplots@EOI + \def\pgfplots@current@point@coordinatestyle{#2}% }% \def\pgfplotsaxisdeserializedatapointfrom@#1;#2\pgfplots@EOI{% \def\pgfplotsaxisdeserializedatapointfrom@private@lastvalue{#1}% @@ -9719,3 +9742,42 @@ \pgfplots@shellescape{sh #1.sh > #1.out} \fi% } + +% Defines \pgfplots@current@point@coordinatestyle to be the list of options resulting from the evaluation of all matching 'coordinate style' expressions. +\def\pgfplots@get@matching@coordinate@styles@surveyphase{% + \let\pgfplots@current@point@coordinatestyle=\pgfutil@empty + % ##1: operation mode + % ##2: key + % ##3: value + \def\pgfplots@coordinate@style@process##1##2##3{% + \if E##1% Ah : an expression. + \pgfmathifexpression{##2}{% + \expandafter\def\expandafter\pgfplots@current@point@coordinatestyle\expandafter{\pgfplots@current@point@coordinatestyle,% + ##3% + }% + }{}% + \else + \if V##1% Ah : an .from + \edef\pgfplots@loc@TMPc{##2}% + \t@pgfplots@toka=\expandafter{\pgfplots@current@point@coordinatestyle}% + \t@pgfplots@tokb=\expandafter{\pgfplots@loc@TMPc}% + \edef\pgfplots@current@point@coordinatestyle{% + \the\t@pgfplots@toka,% + \the\t@pgfplots@tokb + }% + \else + \pgfplots@get@matching@coordinate@styles@surveyphase@err{##1}% + \fi + \fi + }% + \pgfplotsapplistXlet\pgfplots@loc@TMPb=\pgfplots@coordinate@style@list + \expandafter\pgfplotsutilforeachcommasep\pgfplots@loc@TMPb\as\pgfplots@loc@TMPa{% + \ifx\pgfplots@loc@TMPa\pgfutil@empty + \else + \expandafter\pgfplots@coordinate@style@process\pgfplots@loc@TMPa + \fi + }% +}% +\def\pgfplots@get@matching@coordinate@styles@surveyphase@err#1#2#3{% + \pgfplots@error{Encountered unexpected internal value of 'coordinate style: #1}% +} |