diff options
author | Norbert Preining <preining@logic.at> | 2006-11-03 06:16:00 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2006-11-03 06:16:00 +0000 |
commit | a6d4e22f961008636a3bfc36f89570e6fa0c85f6 (patch) | |
tree | 9d13f81b2a37ab6bdf3336066017d4cb5e701011 /Master/texmf-dist/tex/generic/pgf/frontendlayer | |
parent | e9b9a3f32d1a5b371fa2256f098ee4b158f6df1d (diff) |
several updates (sorry Karl, it was a long train ride):
updates of packages: screenplay, bussproofs computational-complexity
dvdcoll gnuplottex mathmode movie15 pgf pstricks-add pst-labo
trfsigns (dvi->pdf move, COPYING file to doc) toptesi tocvsec2 thumb
textfit (doc move)
added to tpm-ctan-check: typogrid trsym trfsigns tracking toptesi toolbox
todo tocvsec2 tocloft tocbibind titling titlefoot thumb textopo textfit
teubner tensor
git-svn-id: svn://tug.org/texlive/trunk@2382 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/frontendlayer')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex | 610 |
1 files changed, 307 insertions, 303 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex index ceeaaacb863..740dacf6794 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/frontendlayer/tikz.code.tex,v 1.65 2006/10/11 15:22:25 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/frontendlayer/tikz.code.tex,v 1.68 2006/10/17 08:16:28 tantau Exp $ % Always-present libraries: @@ -38,7 +38,7 @@ \newif\iftikz@node@is@a@label \newif\iftikz@snaked -\let\tikz@options=\pgf@empty +\let\tikz@options=\pgfutil@empty \def\tikz@addoption#1{\expandafter\def\expandafter\tikz@options\expandafter{\tikz@options#1}} \def\tikz@addmode#1{\expandafter\def\expandafter\tikz@mode\expandafter{\tikz@mode#1}} \def\tikz@addtransform#1{% @@ -58,7 +58,7 @@ % Baseline options -\tikzoption{baseline}[0pt]{\pgf@ifnextchar({\tikz@baseline@coordinate}{\tikz@baseline@simple}#1\@nil}%) +\tikzoption{baseline}[0pt]{\pgfutil@ifnextchar({\tikz@baseline@coordinate}{\tikz@baseline@simple}#1\@nil}%) \def\tikz@baseline@simple#1\@nil{\pgfsetbaseline{#1}} \def\tikz@baseline@coordinate#1\@nil{\pgfsetbaselinepointlater{\tikz@scan@one@point\@firstofone#1}} @@ -73,12 +73,12 @@ \tikzoption{dash pattern}{% syntax: on 2pt off 3pt on 4pt ... \def\tikz@temp{#1}% - \ifx\tikz@temp\pgf@empty% + \ifx\tikz@temp\pgfutil@empty% \def\tikz@dashpattern{}% \tikz@addoption{\pgfsetdash{}{0pt}}% \else% \def\tikz@dashpattern{}% - \expandafter\tikz@scandashon\pgf@gobble#1o\@nil% + \expandafter\tikz@scandashon\pgfutil@gobble#1o\@nil% \edef\tikz@temp{{\tikz@dashpattern}{\noexpand\tikz@dashphase}}% \expandafter\tikz@addoption\expandafter{\expandafter\pgfsetdash\tikz@temp}% \fi} @@ -91,10 +91,10 @@ \def\tikz@scandashon n#1o{% \expandafter\def\expandafter\tikz@dashpattern\expandafter{\tikz@dashpattern{#1}}% - \pgf@ifnextchar\@nil{\pgf@gobble}{\tikz@scandashoff}} + \pgfutil@ifnextchar\@nil{\pgfutil@gobble}{\tikz@scandashoff}} \def\tikz@scandashoff ff#1o{% \expandafter\def\expandafter\tikz@dashpattern\expandafter{\tikz@dashpattern{#1}}% - \pgf@ifnextchar\@nil{\pgf@gobble}{\tikz@scandashon}} + \pgfutil@ifnextchar\@nil{\pgfutil@gobble}{\tikz@scandashon}} \tikzoption{draw opacity}{\tikz@addoption{\pgfsetstrokeopacity{#1}}} @@ -104,7 +104,7 @@ \ifx\tikz@temp\tikz@nonetext% \tikz@addmode{\tikz@mode@doublefalse}% \else% - \ifx\tikz@temp\pgf@empty% + \ifx\tikz@temp\pgfutil@empty% \else% \def\tikz@double@color{#1}% \fi% @@ -134,20 +134,20 @@ % Main color options \tikzoption{color}{% \tikz@addoption{% - \ifx\tikz@fillcolor\pgf@empty% - \ifx\tikz@strokecolor\pgf@empty% + \ifx\tikz@fillcolor\pgfutil@empty% + \ifx\tikz@strokecolor\pgfutil@empty% \else% \pgfsys@color@reset@inorderfalse% - \let\tikz@strokecolor\pgf@empty% - \let\tikz@fillcolor\pgf@empty% + \let\tikz@strokecolor\pgfutil@empty% + \let\tikz@fillcolor\pgfutil@empty% \fi% \else% \pgfsys@color@reset@inorderfalse% - \let\tikz@strokecolor\pgf@empty% - \let\tikz@fillcolor\pgf@empty% + \let\tikz@strokecolor\pgfutil@empty% + \let\tikz@fillcolor\pgfutil@empty% \fi% - \colorlet{tikz@color}{#1}% - \colorlet{.}{tikz@color}% + \pgfutil@colorlet{tikz@color}{#1}% + \pgfutil@colorlet{.}{tikz@color}% \pgfsetcolor{.}% \pgfsys@color@reset@inordertrue% }% @@ -166,7 +166,7 @@ \tikzoption{y}{\tikz@handle@vec{\pgfsetyvec}{\tikz@handle@y}#1\relax} \tikzoption{z}{\tikz@handle@vec{\pgfsetzvec}{\tikz@handle@z}#1\relax} -\def\tikz@handle@vec#1#2{\pgf@ifnextchar({\tikz@handle@coordinate#1}{\tikz@handle@single#2}} +\def\tikz@handle@vec#1#2{\pgfutil@ifnextchar({\tikz@handle@coordinate#1}{\tikz@handle@single#2}} \def\tikz@handle@coordinate#1{\tikz@scan@one@point#1} \def\tikz@handle@single#1#2\relax{#1{#2}} \def\tikz@handle@x#1{\pgfsetxvec{\pgfpoint{#1}{0pt}}} @@ -232,18 +232,18 @@ \newif\iftikz@mode@clip \newif\iftikz@mode@boundary \newif\iftikz@mode@shade -\let\tikz@mode=\pgf@empty +\let\tikz@mode=\pgfutil@empty \def\tikz@nonetext{none} -\tikzoption{path only}[]{\let\tikz@mode=\pgf@empty} +\tikzoption{path only}[]{\let\tikz@mode=\pgfutil@empty} \tikzoption{shade}[]{\tikz@addmode{\tikz@mode@shadetrue}} \tikzoption{fill}[]{% \def\tikz@temp{#1}% \ifx\tikz@temp\tikz@nonetext% \tikz@addmode{\tikz@mode@fillfalse}% \else% - \ifx\tikz@temp\pgf@empty% + \ifx\tikz@temp\pgfutil@empty% \else% \tikz@addoption{\pgfsetfillcolor{#1}}% \def\tikz@fillcolor{#1}% @@ -256,7 +256,7 @@ \ifx\tikz@temp\tikz@nonetext% \tikz@addmode{\tikz@mode@drawfalse}% \else% - \ifx\tikz@temp\pgf@empty% + \ifx\tikz@temp\pgfutil@empty% \else% \tikz@addoption{\pgfsetstrokecolor{#1}}% \def\tikz@strokecolor{#1}% @@ -269,8 +269,8 @@ \tikzoption{save path}{\tikz@addmode{\pgfsyssoftpath@getcurrentpath#1\global\let#1=#1}} -\let\tikz@fillcolor=\pgf@empty -\let\tikz@strokecolor=\pgf@empty +\let\tikz@fillcolor=\pgfutil@empty +\let\tikz@strokecolor=\pgfutil@empty % Pattern options @@ -280,7 +280,7 @@ \ifx\tikz@temp\tikz@nonetext% \tikz@addmode{\tikz@mode@fillfalse}% \else% - \ifx\tikz@temp\pgf@empty% + \ifx\tikz@temp\pgfutil@empty% \else% \tikz@addoption{\pgfsetfillpattern{#1}{\tikz@pattern@color}}% \def\tikz@pattern{#1}% @@ -296,27 +296,27 @@ \tikzoption{shading}{\def\tikz@shading{#1}\tikz@addmode{\tikz@mode@shadetrue}} \tikzoption{shading angle}{\def\tikz@shade@angle{#1}\tikz@addmode{\tikz@mode@shadetrue}} \tikzoption{top color}{% - \colorlet{tikz@axis@top}{#1}% - \colorlet{tikz@axis@middle}{tikz@axis@top!50!tikz@axis@bottom}% + \pgfutil@colorlet{tikz@axis@top}{#1}% + \pgfutil@colorlet{tikz@axis@middle}{tikz@axis@top!50!tikz@axis@bottom}% \def\tikz@shading{axis}\def\tikz@shade@angle{0}\tikz@addmode{\tikz@mode@shadetrue}} \tikzoption{bottom color}{% - \colorlet{tikz@axis@bottom}{#1}% - \colorlet{tikz@axis@middle}{tikz@axis@top!50!tikz@axis@bottom}% + \pgfutil@colorlet{tikz@axis@bottom}{#1}% + \pgfutil@colorlet{tikz@axis@middle}{tikz@axis@top!50!tikz@axis@bottom}% \def\tikz@shading{axis}\def\tikz@shade@angle{0}\tikz@addmode{\tikz@mode@shadetrue}} \tikzoption{middle color}{% - \colorlet{tikz@axis@middle}{#1}% + \pgfutil@colorlet{tikz@axis@middle}{#1}% \def\tikz@shading{axis}\tikz@addmode{\tikz@mode@shadetrue}} \tikzoption{left color}{% - \colorlet{tikz@axis@top}{#1}% - \colorlet{tikz@axis@middle}{tikz@axis@top!50!tikz@axis@bottom}% + \pgfutil@colorlet{tikz@axis@top}{#1}% + \pgfutil@colorlet{tikz@axis@middle}{tikz@axis@top!50!tikz@axis@bottom}% \def\tikz@shading{axis}\def\tikz@shade@angle{90}\tikz@addmode{\tikz@mode@shadetrue}} \tikzoption{right color}{% - \colorlet{tikz@axis@bottom}{#1}% - \colorlet{tikz@axis@middle}{tikz@axis@top!50!tikz@axis@bottom}% + \pgfutil@colorlet{tikz@axis@bottom}{#1}% + \pgfutil@colorlet{tikz@axis@middle}{tikz@axis@top!50!tikz@axis@bottom}% \def\tikz@shading{axis}\def\tikz@shade@angle{90}\tikz@addmode{\tikz@mode@shadetrue}} -\tikzoption{ball color}{\colorlet{tikz@ball}{#1}\def\tikz@shading{ball}\tikz@addmode{\tikz@mode@shadetrue}} -\tikzoption{inner color}{\colorlet{tikz@radial@inner}{#1}\def\tikz@shading{radial}\tikz@addmode{\tikz@mode@shadetrue}} -\tikzoption{outer color}{\colorlet{tikz@radial@outer}{#1}\def\tikz@shading{radial}\tikz@addmode{\tikz@mode@shadetrue}} +\tikzoption{ball color}{\pgfutil@colorlet{tikz@ball}{#1}\def\tikz@shading{ball}\tikz@addmode{\tikz@mode@shadetrue}} +\tikzoption{inner color}{\pgfutil@colorlet{tikz@radial@inner}{#1}\def\tikz@shading{radial}\tikz@addmode{\tikz@mode@shadetrue}} +\tikzoption{outer color}{\pgfutil@colorlet{tikz@radial@outer}{#1}\def\tikz@shading{radial}\tikz@addmode{\tikz@mode@shadetrue}} \def\tikz@shading{axis} \def\tikz@shade@angle{0} @@ -328,9 +328,9 @@ color(75bp)=(tikz@axis@top); color(100bp)=(tikz@axis@top)} -\colorlet{tikz@axis@top}{gray} -\colorlet{tikz@axis@middle}{gray!50!white} -\colorlet{tikz@axis@bottom}{white} +\pgfutil@colorlet{tikz@axis@top}{gray} +\pgfutil@colorlet{tikz@axis@middle}{gray!50!white} +\pgfutil@colorlet{tikz@axis@bottom}{white} \pgfdeclareradialshading[tikz@ball]{ball}{\pgfqpoint{-10bp}{10bp}}{% color(0bp)=(tikz@ball!15!white); @@ -339,19 +339,19 @@ color(25bp)=(tikz@ball!50!black); color(50bp)=(black)} -\colorlet{tikz@ball}{blue} +\pgfutil@colorlet{tikz@ball}{blue} \pgfdeclareradialshading[tikz@radial@inner,tikz@radial@outer]{radial}{\pgfpointorigin}{% color(0bp)=(tikz@radial@inner); color(25bp)=(tikz@radial@outer); color(50bp)=(tikz@radial@outer)} -\colorlet{tikz@radial@inner}{gray} -\colorlet{tikz@radial@outer}{white} +\pgfutil@colorlet{tikz@radial@inner}{gray} +\pgfutil@colorlet{tikz@radial@outer}{white} % Pin options -\tikzoption{pin}{\pgf@ifnextchar[{\tikz@parse@pin}{\tikz@parse@pin[]}#1\pgf@nil} +\tikzoption{pin}{\pgfutil@ifnextchar[{\tikz@parse@pin}{\tikz@parse@pin[]}#1\pgf@nil} \tikzoption{pin distance}{\def\tikz@pin@distance{#1}} \tikzoption{pin edge}{\def\tikz@pin@edge@style{#1}} @@ -379,7 +379,7 @@ % Label and pin options -\tikzoption{label}{\pgf@ifnextchar[{\tikz@parse@label}{\tikz@parse@label[]}#1\pgf@nil} +\tikzoption{label}{\pgfutil@ifnextchar[{\tikz@parse@label}{\tikz@parse@label[]}#1\pgf@nil} \tikzoption{label distance}{\def\tikz@label@distance{#1}} \tikzoption{tikz@label@angle}{\def\tikz@label@angle{#1}\csname tikz@label@angle@is@#1\endcsname} @@ -474,7 +474,7 @@ #1% \expandafter\def\expandafter\tikz@afternodepathoptions\expandafter{\tikz@afternodepathoptions#1}} -\let\tikz@afternodepathoptions=\pgf@empty +\let\tikz@afternodepathoptions=\pgfutil@empty \tikzoption{anchor}{\def\tikz@anchor{#1}\let\tikz@do@auto@anchor=\relax} @@ -531,7 +531,7 @@ \def\tikz@possibly@transform#1#2#3{% \let\tikz@do@auto@anchor=\relax% \def\tikz@test{#3}% - \ifx\tikz@test\pgf@empty% + \ifx\tikz@test\pgfutil@empty% \else% \setlength{\pgf@x}{#3}% \pgf@x=#2\pgf@x\relax% @@ -608,12 +608,12 @@ \rightskip\@flushglue% \leftskip\@flushglue\relax}} -\let\tikz@text@width=\pgf@empty -\let\tikz@text@height=\pgf@empty -\let\tikz@text@depth=\pgf@empty -\let\tikz@textcolor=\pgf@empty -\let\tikz@textfont=\pgf@empty -\let\tikz@textopacity=\pgf@empty +\let\tikz@text@width=\pgfutil@empty +\let\tikz@text@height=\pgfutil@empty +\let\tikz@text@depth=\pgfutil@empty +\let\tikz@textcolor=\pgfutil@empty +\let\tikz@textfont=\pgfutil@empty +\let\tikz@textopacity=\pgfutil@empty \def\tikz@text@action{\raggedright\rightskip\z@ plus2em \spaceskip.3333em \xspaceskip.5em\relax} @@ -633,7 +633,7 @@ \tikzoption{shorten >}{\pgfsetshortenend{#1}} \def\tikz@set@pointed#1#2{% - \pgf@ifundefined{pgf@arrow@code@tikze@>@#2} + \pgfutil@ifundefined{pgf@arrow@code@tikze@>@#2} {% \pgfarrowsdeclarealias{tikzs@<@#2}{tikze@>@#2}{#1}{#2}% \pgfarrowsdeclarereversed{tikzs@>@#2}{tikze@<@#2}{#1}{#2}% @@ -641,22 +641,22 @@ \pgfarrowsdeclaredouble[\pgflinewidth]{tikzs@<<@#2}{tikze@>>@#2}{#1}{#2}% \pgfarrowsdeclarereversed{tikzs@>>@#2}{tikze@<<@#2}{tikzs@<<@#2}{tikze@>>@#2}% }{}% - \pgf@namedef{tikz@special@arrow@start<}{tikzs@<@#2}% - \pgf@namedef{tikz@special@arrow@end>}{tikze@>@#2}% - \pgf@namedef{tikz@special@arrow@start>}{tikzs@>@#2}% - \pgf@namedef{tikz@special@arrow@end<}{tikze@<@#2}% - \pgf@namedef{tikz@special@arrow@start|<}{tikz@|<@#2}% - \pgf@namedef{tikz@special@arrow@end>|}{tikz@>|@#2}% - \pgf@namedef{tikz@special@arrow@start<<}{tikzs@<<@#2}% - \pgf@namedef{tikz@special@arrow@end>>}{tikze@>>@#2}% - \pgf@namedef{tikz@special@arrow@start>>}{tikzs@<<@#2}% - \pgf@namedef{tikz@special@arrow@end<<}{tikze@>>@#2}% + \pgfutil@namedef{tikz@special@arrow@start<}{tikzs@<@#2}% + \pgfutil@namedef{tikz@special@arrow@end>}{tikze@>@#2}% + \pgfutil@namedef{tikz@special@arrow@start>}{tikzs@>@#2}% + \pgfutil@namedef{tikz@special@arrow@end<}{tikze@<@#2}% + \pgfutil@namedef{tikz@special@arrow@start|<}{tikz@|<@#2}% + \pgfutil@namedef{tikz@special@arrow@end>|}{tikz@>|@#2}% + \pgfutil@namedef{tikz@special@arrow@start<<}{tikzs@<<@#2}% + \pgfutil@namedef{tikz@special@arrow@end>>}{tikze@>>@#2}% + \pgfutil@namedef{tikz@special@arrow@start>>}{tikzs@<<@#2}% + \pgfutil@namedef{tikz@special@arrow@end<<}{tikze@>>@#2}% } \def\tikz@processarrows#1{% \def\tikz@current@arrows{#1}% \def\tikz@temp{#1}% - \ifx\tikz@temp\pgf@empty% + \ifx\tikz@temp\pgfutil@empty% \else% \tikz@@processarrows#1\@nil \fi% @@ -721,12 +721,12 @@ \tikzoption{mark phase}{\pgfsetplotmarkphase{#1}} \tikzoption{mark repeat}{\pgfsetplotmarkrepeat{#1}} -\let\tikz@mark@list=\pgf@empty +\let\tikz@mark@list=\pgfutil@empty -\let\tikz@plot@mark@options=\pgf@empty +\let\tikz@plot@mark@options=\pgfutil@empty \let\tikz@plot@handler=\pgfplothandlerlineto -\let\tikz@plot@mark=\pgf@empty +\let\tikz@plot@mark=\pgfutil@empty \def\tikz@plot@sampels{25} \def\tikz@plot@domain{-5:5} @@ -748,8 +748,8 @@ % Tree options \tikzoption{edge from parent path}{\def\tikz@edge@to@parent@path{#1}} -\tikzoption{parent anchor}{\def\tikzparentanchor{.#1}\ifx\tikzparentanchor\tikz@border@text\let\tikzparentanchor\pgf@empty\fi} -\tikzoption{child anchor}{\def\tikzchildanchor{.#1}\ifx\tikzchildanchor\tikz@border@text\let\tikzchildanchor\pgf@empty\fi} +\tikzoption{parent anchor}{\def\tikzparentanchor{.#1}\ifx\tikzparentanchor\tikz@border@text\let\tikzparentanchor\pgfutil@empty\fi} +\tikzoption{child anchor}{\def\tikzchildanchor{.#1}\ifx\tikzchildanchor\tikz@border@text\let\tikzchildanchor\pgfutil@empty\fi} \tikzoption{level distance}{\setlength\tikzleveldistance{#1}} \tikzoption{sibling distance}{\setlength\tikzsiblingdistance{#1}} @@ -783,8 +783,8 @@ } \def\tikz@border@text{.border} -\let\tikzparentanchor=\pgf@empty -\let\tikzchildanchor=\pgf@empty +\let\tikzparentanchor=\pgfutil@empty +\let\tikzchildanchor=\pgfutil@empty \def\tikz@edge@to@parent@path{(\tikzparentnode\tikzparentanchor) -- (\tikzchildnode\tikzchildanchor)} \tikzleveldistance=15mm @@ -826,7 +826,7 @@ % Snake options \tikzoption{snake}[]{% \def\tikz@@snake{#1}% - \ifx\tikz@@snake\pgf@empty% + \ifx\tikz@@snake\pgfutil@empty% \tikz@snakedtrue% \else% \ifx\tikz@@snake\tikz@nonetext% @@ -849,35 +849,35 @@ \csname if#1\endcsname \def\pgf@snake@mirror{\pgftransformyscale{-1}}% \else% - \let\pgf@snake@mirror=\pgf@empty% + \let\pgf@snake@mirror=\pgfutil@empty% \fi } \tikzoption{gap before snake}{\def\tikz@presnake{{moveto}{#1}}} \tikzoption{line before snake}{\def\tikz@presnake{{lineto}{#1}}} -\tikzoption{gap after snake}{\def\tikz@postsnake{{moveto}{#1}}\def\tikz@mainsnakelength{\pgfsnakeremainingdistance-#1}} -\tikzoption{line after snake}{\def\tikz@postsnake{{lineto}{#1}}\def\tikz@mainsnakelength{\pgfsnakeremainingdistance-#1}} +\tikzoption{gap after snake}{\def\tikz@postsnake{{moveto}{#1}}\def\tikz@mainsnakelength{\pgfsnakeremainingdistance+-#1}} +\tikzoption{line after snake}{\def\tikz@postsnake{{lineto}{#1}}\def\tikz@mainsnakelength{\pgfsnakeremainingdistance+-#1}} \tikzoption{gap around snake}{% \def\tikz@presnake{{moveto}{#1}}% \def\tikz@postsnake{{moveto}{#1}}% - \def\tikz@mainsnakelength{\pgfsnakeremainingdistance-#1}% + \def\tikz@mainsnakelength{\pgfsnakeremainingdistance+-#1}% } \tikzoption{line around snake}{% \def\tikz@presnake{{lineto}{#1}}% \def\tikz@postsnake{{lineto}{#1}}% - \def\tikz@mainsnakelength{\pgfsnakeremainingdistance-#1}% + \def\tikz@mainsnakelength{\pgfsnakeremainingdistance+-#1}% } -\let\pgf@snake@mirror=\pgf@empty -\let\pgf@snake@raise=\pgf@empty +\let\pgf@snake@mirror=\pgfutil@empty +\let\pgf@snake@raise=\pgfutil@empty \pgfsetsnakesegmenttransformation{\pgf@snake@mirror\pgf@snake@raise} \def\tikz@snake{zigzag} -\let\tikz@presnake=\pgf@empty -\let\tikz@postsnake=\pgf@empty +\let\tikz@presnake=\pgfutil@empty +\let\tikz@postsnake=\pgfutil@empty \def\tikz@mainsnakelength{\pgfsnakeremainingdistance} @@ -893,14 +893,14 @@ \tikzoption{execute at begin node}{\expandafter\def\expandafter\tikz@atbegin@node\expandafter{\tikz@atbegin@node#1}} \tikzoption{execute at end node}{\expandafter\def\expandafter\tikz@atend@node\expandafter{\tikz@atend@node#1}} -\let\tikz@atbegin@picture=\pgf@empty -\let\tikz@atend@picture=\pgf@empty -\let\tikz@atbegin@scope=\pgf@empty -\let\tikz@atend@scope=\pgf@empty -\let\tikz@atbegin@to=\pgf@empty -\let\tikz@atend@to=\pgf@empty -\let\tikz@atbegin@node=\pgf@empty -\let\tikz@atend@node=\pgf@empty +\let\tikz@atbegin@picture=\pgfutil@empty +\let\tikz@atend@picture=\pgfutil@empty +\let\tikz@atbegin@scope=\pgfutil@empty +\let\tikz@atend@scope=\pgfutil@empty +\let\tikz@atbegin@to=\pgfutil@empty +\let\tikz@atend@to=\pgfutil@empty +\let\tikz@atbegin@node=\pgfutil@empty +\let\tikz@atend@node=\pgfutil@empty @@ -909,9 +909,11 @@ \tikzoption{set style}{\tikzstyle#1} % Handled in a special way. -\def\tikzstyle#1#2=#3[#4]{% #2 and #3 are dummy - \in@+{#2}% - \ifin@% +\def\tikzstyle{\pgfutil@ifnextchar\bgroup\tikz@style@parseA\tikz@style@parseB} +\def\tikz@style@parseB#1={\tikz@style@parseA{#1}=} +\def\tikz@style@parseA#1#2=#3[#4]{% #2 and #3 are dummy + \pgfutil@in@+{#2}% + \ifpgfutil@in@% \tikz@style{#1}{#4}% \else% \expandafter\def\csname tikz@st@#1\endcsname{#4}% @@ -927,13 +929,13 @@ } \def\iftikzstyleempty#1#2#3{% - \expandafter\ifx\csname tikz@st@#1\endcsname\pgf@empty% - \let\pgf@next=\@firstoftwo% + \expandafter\ifx\csname tikz@st@#1\endcsname\pgfutil@empty% + \let\pgf@next=\pgfutil@firstoftwo% \else% \expandafter\ifx\csname tikz@st@#1\endcsname\relax% - \let\pgf@next=\@firstoftwo% + \let\pgf@next=\pgfutil@firstoftwo% \else - \let\pgf@next=\@secondoftwo% + \let\pgf@next=\pgfutil@secondoftwo% \fi% \fi% \pgf@next{#2}{#3}} @@ -1008,23 +1010,28 @@ % Setting keys % -\let\tikz@late@keys=\pgf@empty% +\let\tikz@late@keys=\pgfutil@empty% \def\tikz@set@one@key#1{% \tikz@orig@setkeys*{tikz}{#1}% - \ifx\XKV@rm\pgf@empty% + \ifx\XKV@rm\pgfutil@empty% % fine \else% - \expandafter\in@\expandafter!\expandafter{\XKV@rm}% - \ifin@% + \expandafter\pgfutil@in@\expandafter!\expandafter{\XKV@rm}% + \ifpgfutil@in@% % this is a color! - \expandafter\tikz@addoption\expandafter{\expandafter\color\expandafter{\XKV@rm}}% + \expandafter\tikz@addoption\expandafter{\expandafter\pgfutil@color\expandafter{\XKV@rm}}% \edef\tikz@textcolor{\XKV@rm}% \else% - \expandafter\ifx\csname\string\color@\XKV@rm\endcsname\relax% + \pgfutil@doifcolorelse{\XKV@rm} + { % + \expandafter\tikz@addoption\expandafter{\expandafter\pgfutil@color\expandafter{\XKV@rm}}% + \edef\tikz@textcolor{\XKV@rm}% + }% + {% % Ok, second chance: This might be an arrow specification: - \expandafter\in@\expandafter-\expandafter{\XKV@rm} - \ifin@% + \expandafter\pgfutil@in@\expandafter-\expandafter{\XKV@rm} + \ifpgfutil@in@% % Ah, an arrow spec! \expandafter\tikz@processarrows\expandafter{\XKV@rm}% \else% @@ -1035,10 +1042,7 @@ \edef\tikz@shape{\XKV@rm}% \fi% \fi% - \else% - \expandafter\tikz@addoption\expandafter{\expandafter\color\expandafter{\XKV@rm}}% - \edef\tikz@textcolor{\XKV@rm}% - \fi% + }% \fi% \fi% } @@ -1048,11 +1052,11 @@ \def\tikz@@setkeys#1,#2\pgf@stop{% \def\tikz@key@test{#1}% \def\tikz@key@rest{#2}% - \ifx\tikz@key@test\pgf@empty% + \ifx\tikz@key@test\pgfutil@empty% \else% - \pgf@ifnextchar s{\tikz@parse@key}{\tikz@parse@key}#1==\pgf@stop% + \pgfutil@ifnextchar s{\tikz@parse@key}{\tikz@parse@key}#1==\pgf@stop% \fi% - \ifx\tikz@key@rest\pgf@empty% + \ifx\tikz@key@rest\pgfutil@empty% \else% \expandafter\expandafter\expandafter\tikz@@setkeys\expandafter\tikz@key@rest\expandafter\pgf@stop% \fi% @@ -1064,7 +1068,7 @@ \def\tikz@key@test{#1}% \ifx\tikz@key@test\tikz@style@text% % Ok, style! - \pgf@ifundefined{tikz@st@#2}% + \pgfutil@ifundefined{tikz@st@#2}% {\PackageError{tikz}{Unknown style ``#2}''{}} {% \expandafter\let\expandafter\tikz@temp\expandafter=\csname tikz@st@#2\endcsname% @@ -1076,7 +1080,7 @@ \expandafter\ifx\csname tikz@st@#1\endcsname\relax% % Ok, normal! \def\tikz@test{#3}% - \ifx\tikz@test\pgf@empty% + \ifx\tikz@test\pgfutil@empty% \tikz@set@one@key{#1}% \else% \tikz@set@one@key{#1={#2}}% @@ -1107,11 +1111,11 @@ % Main TikZ Environment % -\def\tikzpicture{\pgf@ifnextchar[\tikz@picture{\tikz@picture[]}}%} +\def\tikzpicture{\pgfutil@ifnextchar[\tikz@picture{\tikz@picture[]}}%} \def\tikz@picture[#1]{% \pgfpicture% - \let\tikz@atbegin@picture=\pgf@empty% - \let\tikz@atend@picture=\pgf@empty% + \let\tikz@atbegin@picture=\pgfutil@empty% + \let\tikz@atend@picture=\pgfutil@empty% \let\tikz@transform=\relax% \tikz@installcommands\scope[style=every picture,#1]% \tikz@atbegin@picture% @@ -1139,8 +1143,8 @@ % The rectangle \tikz{\draw (0,0) rectangle (1em,1ex)} has width 1em and % height 1ex. -\def\tikz{\pgf@ifnextchar[{\tikz@opt}{\tikz@opt[]}} -\def\tikz@opt[#1]{\pgf@ifnextchar\bgroup{\tikz@[#1]}{\tikz@@[#1]}} +\def\tikz{\pgfutil@ifnextchar[{\tikz@opt}{\tikz@opt[]}} +\def\tikz@opt[#1]{\pgfutil@ifnextchar\bgroup{\tikz@[#1]}{\tikz@@[#1]}} \def\tikz@[#1]#2{\tikzpicture[#1]#2\endtikzpicture} \def\tikz@@{% \let\tikz@next=\tikz@collectnormalsemicolon% @@ -1159,14 +1163,14 @@ % % Environment for scoping graphic state settings % -\def\tikz@scope@env{\pgf@ifnextchar[\tikz@@scope@env{\tikz@@scope@env[]}} +\def\tikz@scope@env{\pgfutil@ifnextchar[\tikz@@scope@env{\tikz@@scope@env[]}} \def\tikz@@scope@env[#1]{% \pgfscope% \begingroup% - \let\tikz@atbegin@scope=\pgf@empty% - \let\tikz@atend@scope=\pgf@empty% - \let\tikz@options=\pgf@empty% - \let\tikz@mode=\pgf@empty% + \let\tikz@atbegin@scope=\pgfutil@empty% + \let\tikz@atend@scope=\pgfutil@empty% + \let\tikz@options=\pgfutil@empty% + \let\tikz@mode=\pgfutil@empty% \tikz@every@style{every scope}% \tikz@setkeys{#1}% \tikz@options% @@ -1277,10 +1281,10 @@ % settings. \def\tikz@command@path{% - \pgf@ifnextchar[{\tikz@check@earg}%] - {\pgf@ifnextchar<{\tikz@doopt}{\tikz@@command@path}}} + \pgfutil@ifnextchar[{\tikz@check@earg}%] + {\pgfutil@ifnextchar<{\tikz@doopt}{\tikz@@command@path}}} \def\tikz@check@earg[#1]{% - \pgf@ifnextchar<{\tikz@swap@args[#1]}{\tikz@@command@path[#1]}} + \pgfutil@ifnextchar<{\tikz@swap@args[#1]}{\tikz@@command@path[#1]}} \def\tikz@swap@args[#1]<#2>{\tikz@command@path<#2>[#1]} \def\tikz@doopt{% @@ -1298,11 +1302,11 @@ \def\tikz@@command@path{% \edef\tikzscope@linewidth{\the\pgflinewidth}% \begingroup% - \let\tikz@options=\pgf@empty% - \let\tikz@mode=\pgf@empty% + \let\tikz@options=\pgfutil@empty% + \let\tikz@mode=\pgfutil@empty% \let\tikz@moveto@waiting=\relax% \let\tikz@timer=\relax% - \let\tikz@collected@onpath=\pgf@empty% + \let\tikz@collected@onpath=\pgfutil@empty% \tikz@snakedfalse% \tikz@node@is@a@labelfalse% \tikz@expandcount=1000\relax% @@ -1314,7 +1318,7 @@ \tikz@scan@next@command% } \def\tikz@scan@next@command{% - \ifx\tikz@collected@onpath\pgf@empty% + \ifx\tikz@collected@onpath\pgfutil@empty% \else% \tikz@invoke@collected@onpath% \fi% @@ -1416,16 +1420,16 @@ \@next% } -\def\tikz@pchar{\pgf@ifnextchar l{\tikz@plot}{\tikz@parabola}} +\def\tikz@pchar{\pgfutil@ifnextchar l{\tikz@plot}{\tikz@parabola}} \def\tikz@cchar{% - \pgf@ifnextchar i{\tikz@circle}% - {\pgf@ifnextchar h{\tikz@children}{\tikz@cochar}}}% + \pgfutil@ifnextchar i{\tikz@circle}% + {\pgfutil@ifnextchar h{\tikz@children}{\tikz@cochar}}}% \def\tikz@cochar o{% - \pgf@ifnextchar o{\tikz@coordinate}{\tikz@cosine}} + \pgfutil@ifnextchar o{\tikz@coordinate}{\tikz@cosine}} \def\tikz@e@char{% - \pgf@ifnextchar l{\tikz@ellipse}{\tikz@@e@char}}% + \pgfutil@ifnextchar l{\tikz@ellipse}{\tikz@@e@char}}% \def\tikz@@e@char dge{% - \pgf@ifnextchar f{\tikz@edgetoparent}{\tikz@edge@plain}}% + \pgfutil@ifnextchar f{\tikz@edgetoparent}{\tikz@edge@plain}}% \def\tikz@finish{% @@ -1443,7 +1447,7 @@ % % Step 1: Setup options % - \ifx\tikz@options\pgf@empty% + \ifx\tikz@options\pgfutil@empty% \else% \pgfsys@beginscope% \begingroup% @@ -1517,7 +1521,7 @@ % % Step 8: Close option brace % - \ifx\tikz@options\pgf@empty% + \ifx\tikz@options\pgfutil@empty% \else% \endgroup% \pgfsys@endscope% @@ -1569,7 +1573,7 @@ % \pgfextra {normal tex text} % \pgfextra normal tex text \endpgfextra -\def\tikz@extra{\pgf@ifnextchar\bgroup\tikz@@extra\relax} +\def\tikz@extra{\pgfutil@ifnextchar\bgroup\tikz@@extra\relax} \long\def\tikz@@extra#1{#1\tikz@scan@next@command} \let\endpgfextra=\tikz@scan@next@command @@ -1585,7 +1589,7 @@ \def\tikz@foreach{% \def\pgffor@beginhook{\setbox\tikz@figbox=\box\tikz@tempbox\expandafter\tikz@scan@next@command\@firstofone}% - \def\pgffor@endhook{\pgfextra{\global\setbox\tikz@tempbox=\copy\tikz@figbox\pgf@gobble}}% + \def\pgffor@endhook{\pgfextra{\global\setbox\tikz@tempbox=\copy\tikz@figbox\pgfutil@gobble}}% \def\pgffor@afterhook{\setbox\tikz@figbox=\box\tikz@tempbox\tikz@scan@next@command}% \global\setbox\tikz@tempbox=\copy\tikz@figbox% \foreach} @@ -1596,7 +1600,7 @@ \def\tikz@command@againpath#1{% \pgfextra{% \pgfsyssoftpath@getcurrentpath\tikz@temp% - \expandafter\pgf@g@addto@macro\expandafter\tikz@temp\expandafter{#1}% + \expandafter\pgfutil@g@addto@macro\expandafter\tikz@temp\expandafter{#1}% \pgfsyssoftpath@setcurrentpath\tikz@temp% } } @@ -1665,9 +1669,9 @@ % \def\tikz@collect@coordinate@onpath#1coordinate{% - \pgf@ifnextchar[{\tikz@@collect@coordinate@opt#1}{\tikz@@collect@coordinate@opt#1[]}}%} + \pgfutil@ifnextchar[{\tikz@@collect@coordinate@opt#1}{\tikz@@collect@coordinate@opt#1[]}}%} \def\tikz@@collect@coordinate@opt#1[#2]{% - \pgf@ifnextchar({\tikz@@collect@coordinate#1[#2]}{% + \pgfutil@ifnextchar({\tikz@@collect@coordinate#1[#2]}{% \tikz@collect@label@onpath#1node[shape=coordinate,#2]{}}}%} \def\tikz@@collect@coordinate#1[#2](#3){% \tikz@collect@label@onpath#1node[shape=coordinate,#2](#3){}} @@ -1677,9 +1681,9 @@ \tikz@collect@label@scan#1} \def\tikz@collect@label@scan#1{% - \pgf@ifnextchar({\tikz@collect@paran#1}% - {\pgf@ifnextchar[{\tikz@collect@options#1}% - {\pgf@ifnextchar\bgroup{\tikz@collect@arg#1}% + \pgfutil@ifnextchar({\tikz@collect@paran#1}% + {\pgfutil@ifnextchar[{\tikz@collect@options#1}% + {\pgfutil@ifnextchar\bgroup{\tikz@collect@arg#1}% {#1}}}% }%}} @@ -1700,7 +1704,7 @@ \def\tikz@invoke@collected@onpath{% \tikz@node@is@a@labeltrue% \let\tikz@temp=\tikz@collected@onpath% - \let\tikz@collected@onpath=\pgf@empty% + \let\tikz@collected@onpath=\pgfutil@empty% \expandafter\tikz@scan@next@command\tikz@temp\pgf@stop% \tikz@node@is@a@labelfalse% } @@ -1712,15 +1716,15 @@ % -- <point> \def\tikz@lineto{% - \pgf@ifnextchar |% - {\expandafter\tikz@hv@lineto\pgf@gobble}% - {\expandafter\pgf@ifnextchar\tikz@activebar{\expandafter\tikz@hv@lineto\pgf@gobble}% - {\expandafter\tikz@lineto@mid\pgf@gobble}}} + \pgfutil@ifnextchar |% + {\expandafter\tikz@hv@lineto\pgfutil@gobble}% + {\expandafter\pgfutil@ifnextchar\tikz@activebar{\expandafter\tikz@hv@lineto\pgfutil@gobble}% + {\expandafter\tikz@lineto@mid\pgfutil@gobble}}} \def\tikz@lineto@mid{% - \pgf@ifnextchar n{\tikz@collect@label@onpath\tikz@lineto@mid}% + \pgfutil@ifnextchar n{\tikz@collect@label@onpath\tikz@lineto@mid}% {% - \pgf@ifnextchar c{\tikz@close}{% - \pgf@ifnextchar p{\pgfsetlinetofirstplotpoint\expandafter\tikz@plot\pgf@gobble}% + \pgfutil@ifnextchar c{\tikz@close}{% + \pgfutil@ifnextchar p{\pgfsetlinetofirstplotpoint\expandafter\tikz@plot\pgfutil@gobble}% {\tikz@scan@one@point{\tikz@@lineto}}}}} \def\tikz@@lineto#1{% % Record the starting point for later labels on the path: @@ -1773,9 +1777,9 @@ % -| <point> \def\tikz@hv@lineto{% - \pgf@ifnextchar n + \pgfutil@ifnextchar n {\tikz@collect@label@onpath\tikz@hv@lineto} - {\pgf@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@hv@lineto}% + {\pgfutil@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@hv@lineto}% {\tikz@scan@one@point{\tikz@@hv@lineto}}}} \def\tikz@@hv@lineto#1{% \edef\tikz@timer@start{\noexpand\pgfqpoint{\the\tikz@lastx}{\the\tikz@lasty}}% @@ -1807,9 +1811,9 @@ \def\tikz@vh@lineto-{\tikz@vh@lineto@next} \def\tikz@vh@lineto@next{% - \pgf@ifnextchar n + \pgfutil@ifnextchar n {\tikz@collect@label@onpath\tikz@vh@lineto@next} - {\pgf@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@vh@lineto@next}% + {\pgfutil@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@vh@lineto@next}% {\tikz@scan@one@point\tikz@@vh@lineto}}} \def\tikz@@vh@lineto#1{% \edef\tikz@timer@start{\noexpand\pgfqpoint{\the\tikz@lastx}{\the\tikz@lasty}}% @@ -1839,7 +1843,7 @@ % Syntax for cycle: % -- cycle \def\tikz@close c{% - \pgf@ifnextchar o{\tikz@collect@coordinate@onpath\tikz@lineto@mid c}% oops, a coordinate + \pgfutil@ifnextchar o{\tikz@collect@coordinate@onpath\tikz@lineto@mid c}% oops, a coordinate {\tikz@@close c}}% \def\tikz@@close cycle{% \tikz@flush@moveto% @@ -1874,16 +1878,16 @@ \let\tikz@to@or@edge@function=\tikz@do@to% \tikz@to@or@edge} -\def\tikz@to@or@edge{\pgf@ifnextchar[\tikz@@to@or@edge{\tikz@@to@or@edge[]}}%} +\def\tikz@to@or@edge{\pgfutil@ifnextchar[\tikz@@to@or@edge{\tikz@@to@or@edge[]}}%} \def\tikz@@to@or@edge[#1]{% \def\tikz@@to@local@options{[#1]}% - \let\tikz@collected@onpath=\pgf@empty% + \let\tikz@collected@onpath=\pgfutil@empty% \tikz@@to@collect% } \def\tikz@@to@collect{% - \pgf@ifnextchar(\tikz@@to@or@edge@coordinate - {\pgf@ifnextchar n{\tikz@collect@label@onpath\tikz@@to@collect}% - {\pgf@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@@to@collect} + \pgfutil@ifnextchar(\tikz@@to@or@edge@coordinate + {\pgfutil@ifnextchar n{\tikz@collect@label@onpath\tikz@@to@collect}% + {\pgfutil@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@@to@collect} {\PackageError{tikz}{( expected}{}%} \tikz@@to@or@edge@coordinate()}}}% } @@ -1900,11 +1904,11 @@ \bgroup% \pgfinterruptpath% \pgfscope% - \let\tikz@transform=\pgf@empty% - \let\tikz@options=\pgf@empty% + \let\tikz@transform=\pgfutil@empty% + \let\tikz@options=\pgfutil@empty% \let\tikz@tonodes=\tikz@collected@onpath% \def\tikztonodes{{\pgfextra{\tikz@node@is@a@labeltrue}\tikz@tonodes}}% - \let\tikz@collected@onpath=\pgf@empty% + \let\tikz@collected@onpath=\pgfutil@empty% \tikz@options% \tikz@transform% % Typeset node: @@ -1925,7 +1929,7 @@ \def\tikz@do@to{% \let\tikz@tonodes=\tikz@collected@onpath% \def\tikztonodes{{\pgfextra{\tikz@node@is@a@labeltrue}\tikz@tonodes}}% - \let\tikz@collected@onpath=\pgf@empty% + \let\tikz@collected@onpath=\pgfutil@empty% \tikz@scan@next@command% \pgfextra{\tikz@atbegin@to}% [style=every to]\tikz@@to@local@options\tikz@to@path% @@ -1948,9 +1952,9 @@ % Syntax for edge from parent: % edge from parent [options] -\def\tikz@edgetoparent from parent{\pgf@ifnextchar[\tikz@@edgetoparent{\tikz@@edgetoparent[]}}%} +\def\tikz@edgetoparent from parent{\pgfutil@ifnextchar[\tikz@@edgetoparent{\tikz@@edgetoparent[]}}%} \def\tikz@@edgetoparent[#1]{% - \let\tikz@edge@to@parent@needed=\pgf@empty% + \let\tikz@edge@to@parent@needed=\pgfutil@empty% \tikz@node@is@a@labeltrue% \tikz@scan@next@command [style=edge from parent,#1] \tikz@edge@to@parent@path% } @@ -1963,12 +1967,12 @@ \def\tikz@dot.{\tikz@@dot}% \def\tikz@@dot{% - \pgf@ifnextchar n% + \pgfutil@ifnextchar n% {\tikz@collect@label@onpath\tikz@@dot}% - {\pgf@ifnextchar c{\tikz@curveto@double}{\tikz@curveto@auto}}} + {\pgfutil@ifnextchar c{\tikz@curveto@double}{\tikz@curveto@auto}}} \def\tikz@curveto@double co{% - \pgf@ifnextchar o{\tikz@collect@coordinate@onpath\tikz@@dot co} + \pgfutil@ifnextchar o{\tikz@collect@coordinate@onpath\tikz@@dot co} {\tikz@cureveto@@double}} \def\tikz@cureveto@@double ntrols#1{% \tikz@scan@one@point\tikz@curveA#1% @@ -1979,7 +1983,7 @@ \tikz@make@last@position{#1}% \xdef\tikz@curve@first{\noexpand\pgfqpoint{\the\tikz@lastx}{\the\tikz@lasty}}% }% - \pgf@ifnextchar a + \pgfutil@ifnextchar a {\tikz@curveBand}% {\let\tikz@curve@second\tikz@curve@first\tikz@curveCdots}% } @@ -2000,9 +2004,9 @@ \tikz@curveCcheck% } \def\tikz@curveCcheck{% - \pgf@ifnextchar n% + \pgfutil@ifnextchar n% {\tikz@collect@label@onpath\tikz@curveCcheck} - {\pgf@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@curveCcheck} + {\pgfutil@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@curveCcheck} {\tikz@scan@one@point\tikz@curveC}}% } \def\tikz@curveC#1{% @@ -2055,9 +2059,9 @@ \edef\tikz@timer@start{\noexpand\pgfqpoint{\the\tikz@lastx}{\the\tikz@lasty}}% \tikz@@rect}% \def\tikz@@rect{% - \pgf@ifnextchar n + \pgfutil@ifnextchar n {\tikz@collect@label@onpath\tikz@@rect} - {\pgf@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@@rect}% + {\pgfutil@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@@rect}% { \pgf@xa=\tikz@lastx\relax% \pgf@ya=\tikz@lasty\relax% @@ -2084,7 +2088,7 @@ \tikz@flush@moveto% \pgf@xa=\tikz@lastx\relax% \pgf@ya=\tikz@lasty\relax% - \pgf@ifnextchar[{\tikz@gridA}{\tikz@gridA[]}}%} + \pgfutil@ifnextchar[{\tikz@gridA}{\tikz@gridA[]}}%} \def\tikz@gridA[#1]{% \def\tikz@grid@options{#1}% \tikz@scan@one@point\tikz@gridB}% @@ -2121,29 +2125,29 @@ % -- plot [local options] ... % starts with a lineto \def\tikz@plot lot{% \tikz@flush@moveto% - \pgf@ifnextchar[{\tikz@@plot}{\tikz@@plot[]}}%} + \pgfutil@ifnextchar[{\tikz@@plot}{\tikz@@plot[]}}%} \def\tikz@@plot[#1]{% \begingroup% - \let\tikz@options=\pgf@empty% + \let\tikz@options=\pgfutil@empty% \tikz@every@style{every plot}% \tikz@setkeys{#1}% - \pgf@ifnextchar f{\tikz@plot@f}% - {\pgf@ifnextchar c{\tikz@plot@scan@points}% + \pgfutil@ifnextchar f{\tikz@plot@f}% + {\pgfutil@ifnextchar c{\tikz@plot@scan@points}% {\PackageError{tikz}{Cannot parse this plotting data}{}% \endgroup}}} -\def\tikz@plot@f f{\pgf@ifnextchar i{\tikz@plot@file}{\tikz@plot@function}} +\def\tikz@plot@f f{\pgfutil@ifnextchar i{\tikz@plot@file}{\tikz@plot@function}} \def\tikz@plot@file ile#1{\def\tikz@plot@data{\pgfplotxyfile{#1}}\tikz@@@plot}% \def\tikz@plot@scan@points coordinates#1{% \pgfplothandlerrecord\tikz@plot@data% \pgfplotstreamstart% - \pgf@ifnextchar\pgf@stop{\pgfplotstreamend\expandafter\tikz@@@plot\pgf@gobble} + \pgfutil@ifnextchar\pgf@stop{\pgfplotstreamend\expandafter\tikz@@@plot\pgfutil@gobble} {\tikz@scan@one@point\tikz@plot@next@point}% #1\pgf@stop% } \def\tikz@plot@next@point#1{% \pgfplotstreampoint{#1}% - \pgf@ifnextchar\pgf@stop{\pgfplotstreamend\expandafter\tikz@@@plot\pgf@gobble}% + \pgfutil@ifnextchar\pgf@stop{\pgfplotstreamend\expandafter\tikz@@@plot\pgfutil@gobble}% {\tikz@scan@one@point\tikz@plot@next@point}% } \def\tikz@plot@function unction#1{% @@ -2166,7 +2170,7 @@ } \def\tikz@plot@no@resample{% - \IfFileExists{\tikz@plot@filename.table}% + \pgfutil@IfFileExists{\tikz@plot@filename.table}% {\def\tikz@plot@data{\pgfplotxyfile{\tikz@plot@filename.table}}}% {}% } @@ -2177,7 +2181,7 @@ \tikz@plot@handler% \tikz@plot@data% \global\let\tikz@@@temp=\pgfplotlastpoint% - \ifx\tikz@plot@mark\pgf@empty% + \ifx\tikz@plot@mark\pgfutil@empty% \else% % Marks are drawn after the path. \setbox\tikz@figbox=\hbox{% @@ -2185,11 +2189,11 @@ \hbox{{% \pgfinterruptpath% \pgfscope% - \let\tikz@options=\pgf@empty% - \let\tikz@transform=\pgf@empty% + \let\tikz@options=\pgfutil@empty% + \let\tikz@transform=\pgfutil@empty% \expandafter\tikz@setkeys\expandafter{\tikz@plot@mark@options}% \tikz@options% - \ifx\tikz@mark@list\pgf@empty% + \ifx\tikz@mark@list\pgfutil@empty% \pgfplothandlermark{\tikz@transform\pgfuseplotmark{\tikz@plot@mark}}% \else \pgfplothandlermarklisted{\tikz@transform\pgfuseplotmark{\tikz@plot@mark}}{\tikz@mark@list}% @@ -2258,11 +2262,11 @@ % Syntax for parabolas: % parabola[options] bend <coordinate> <coordinate> \def\tikz@parabola arabola{% - \pgf@ifnextchar[{\tikz@parabola@options}{\tikz@parabola@options[]}}%} + \pgfutil@ifnextchar[{\tikz@parabola@options}{\tikz@parabola@options[]}}%} \def\tikz@parabola@options[#1]{% \def\tikz@parabola@option{#1}% - \pgf@ifnextchar b{\tikz@parabola@scan@bend}{\tikz@scan@one@point\tikz@parabola@semifinal}} + \pgfutil@ifnextchar b{\tikz@parabola@scan@bend}{\tikz@scan@one@point\tikz@parabola@semifinal}} \def\tikz@parabola@scan@bend bend{\tikz@scan@one@point\tikz@parabola@scan@bendB} \def\tikz@parabola@scan@bendB#1{% \def\tikz@parabola@bend{#1}% @@ -2308,7 +2312,7 @@ \def\tikz@circle ircle{\tikz@flush@moveto\tikz@@circle} \def\tikz@ellipse llipse{\tikz@flush@moveto\tikz@@circle} \def\tikz@@circle{% - \pgf@ifnextchar(\tikz@@@circle{%) + \pgfutil@ifnextchar(\tikz@@@circle{%) \advance\tikz@expandcount by -1% \ifnum\tikz@expandcount<0\relax% \let\@next=\tikz@@circle@scangiveup% @@ -2321,8 +2325,8 @@ \def\tikz@@circle@scanexpand{\expandafter\tikz@@circle} \def\tikz@@circle@scangiveup#1{\PackageError{tikz}{Cannot parse this radius}{}#1{\tikz@scan@next@command}} \def\tikz@@@circle(#1){% - \in@{ and }{#1}% - \ifin@% + \pgfutil@in@{ and }{#1}% + \ifpgfutil@in@% \tikz@@ellipseB(#1)% \else% \tikz@@ellipseB(#1 and #1)% @@ -2347,7 +2351,7 @@ % radius can be dimensionless, then the arc is in the xy-coordinate system \def\tikz@arcA rc{% \tikz@flush@moveto% - \pgf@ifnextchar({\tikz@@arcto}{\expandafter\tikz@arcA\expandafter r\expandafter c}} + \pgfutil@ifnextchar({\tikz@@arcto}{\expandafter\tikz@arcA\expandafter r\expandafter c}} \def\tikz@@arcto(#1){% \edef\tikz@temp{(#1)}% @@ -2355,12 +2359,12 @@ } \def\tikz@@@arcto@check@slashand(#1:#2:#3){% - \in@{/}{#3}% - \ifin@% + \pgfutil@in@{/}{#3}% + \ifpgfutil@in@% \tikz@parse@arc@replace@slash@and(#1:#2:#3)% \else% - \in@{ and }{#3}% - \ifin@% + \pgfutil@in@{ and }{#3}% + \ifpgfutil@in@% \tikz@parse@arc@and(#1:#2:#3)% \else% \tikz@parse@arc@and(#1:#2:#3 and #3)% @@ -2400,12 +2404,12 @@ % coordinate[options] (coordinate name) at (point) % where ``at (point)'' is optional \def\tikz@coordinate ordinate{% - \pgf@ifnextchar[{\tikz@@coordinate@opt}{\tikz@@coordinate@opt[]}} + \pgfutil@ifnextchar[{\tikz@@coordinate@opt}{\tikz@@coordinate@opt[]}} \def\tikz@@coordinate@opt[#1]{% - \pgf@ifnextchar({\tikz@@coordinate[#1]} + \pgfutil@ifnextchar({\tikz@@coordinate[#1]} {\tikz@fig ode[shape=coordinate,#1]{}}}%} \def\tikz@@coordinate[#1](#2){% - \pgf@ifnextchar a{\tikz@@coordinate@at[#1](#2)} + \pgfutil@ifnextchar a{\tikz@@coordinate@at[#1](#2)} {\tikz@fig ode[shape=coordinate,#1](#2){}}} \def\tikz@@coordinate@at[#1](#2)at#3(#4){% \tikz@fig ode[shape=coordinate,#1](#2)at(#4){}} @@ -2423,26 +2427,26 @@ \def\tikz@fig ode{% \edef\tikz@save@line@width{\the\pgflinewidth}% \begingroup% - \let\tikz@fig@name=\pgf@empty% + \let\tikz@fig@name=\pgfutil@empty% \begingroup% \let\nodepart=\tikz@nodepart% - \let\tikz@options=\pgf@empty% - \let\tikz@after@node=\pgf@empty% - \let\tikz@afternodepathoptions=\pgf@empty% - \let\tikz@transform=\pgf@empty% - \let\tikz@mode=\pgf@empty% + \let\tikz@options=\pgfutil@empty% + \let\tikz@after@node=\pgfutil@empty% + \let\tikz@afternodepathoptions=\pgfutil@empty% + \let\tikz@transform=\pgfutil@empty% + \let\tikz@mode=\pgfutil@empty% \def\tikz@node@at{\pgfqpoint{\the\tikz@lastx}{\the\tikz@lasty}}% \iftikz@node@is@a@label% \else% - \let\tikz@time=\pgf@empty% + \let\tikz@time=\pgfutil@empty% \fi% \tikz@every@style{every node}% \tikz@@scan@fig}% \def\tikz@@scan@fig{% - \pgf@ifnextchar a{\tikz@fig@scan@at} - {\pgf@ifnextchar({\tikz@fig@scan@name} - {\pgf@ifnextchar[{\tikz@fig@scan@options}% - {\pgf@ifnextchar\bgroup{\tikz@fig@main}% + \pgfutil@ifnextchar a{\tikz@fig@scan@at} + {\pgfutil@ifnextchar({\tikz@fig@scan@name} + {\pgfutil@ifnextchar[{\tikz@fig@scan@options}% + {\pgfutil@ifnextchar\bgroup{\tikz@fig@main}% {\PackageError{tikz}{A node must have a (possibly empty) label text}{}% \tikz@fig@main{}}}}}}%}} \def\tikz@fig@scan@at at{% @@ -2453,7 +2457,7 @@ \def\tikz@fig@scan@options[#1]{\tikz@setkeys{#1}\def\test{#1}\tikz@@scan@fig}% \def\tikz@fig@main{\afterassignment\tikz@@fig@main\let\next=} \def\tikz@@fig@main{% - \pgf@ifundefined{pgf@sh@s@\tikz@shape}% + \pgfutil@ifundefined{pgf@sh@s@\tikz@shape}% {\PackageError{tikz}% {Unknown shape ``\tikz@shape.'' Using ``rectangle'' instead}{}% \def\tikz@shape{rectangle}}% @@ -2462,25 +2466,25 @@ \setbox\pgfnodeparttextbox=\hbox% \bgroup% \tikz@every@style{every text node part}% - \ifx\tikz@textopacity\pgf@empty% + \ifx\tikz@textopacity\pgfutil@empty% \else% \pgfsetfillopacity{\tikz@textopacity}% \pgfsetstrokeopacity{\tikz@textopacity}% \fi% \pgfinterruptpicture% \tikz@textfont% - \ifx\tikz@text@width\pgf@empty% + \ifx\tikz@text@width\pgfutil@empty% \else% \begingroup% - \minipage[t]{\tikz@text@width}% + \pgfutil@minipage[t]{\tikz@text@width}% \tikz@text@action% \fi% \tikz@atbegin@node% \bgroup% \aftergroup\unskip% - \ifx\tikz@textcolor\pgf@empty% + \ifx\tikz@textcolor\pgfutil@empty% \else% - \colorlet{.}{\tikz@textcolor}% + \pgfutil@colorlet{.}{\tikz@textcolor}% \fi% \pgfsetcolor{.}% \setbox\tikz@figbox=\box\voidb@x% @@ -2489,26 +2493,26 @@ \ignorespaces% } \def\tikz@fig@collectresetcolor{% - \pgf@ifnextchar\reset@color% + \pgfutil@ifnextchar\reset@color% {\reset@color\afterassignment\tikz@fig@collectresetcolor\let\tikz@temp=}% {\tikz@fig@boxdone}% } \def\tikz@fig@boxdone{% \tikz@atend@node% - \ifx\tikz@text@width\pgf@empty% + \ifx\tikz@text@width\pgfutil@empty% \else% - \endminipage% + \pgfutil@endminipage% \endgroup% \fi% \endpgfinterruptpicture% \egroup% - \pgf@ifnextchar c{\tikz@fig@mustbenamed}% - {\pgf@ifnextchar[{\tikz@fig@mustbenamed}% - {\pgf@ifnextchar t{\tikz@fig@mustbenamed} - {\pgf@ifnextchar e{\tikz@fig@mustbenamed} - {\ifx\tikz@after@node\pgf@empty\expandafter\tikz@fig@continue\else\expandafter\tikz@fig@mustbenamed\fi}}}}}%} + \pgfutil@ifnextchar c{\tikz@fig@mustbenamed}% + {\pgfutil@ifnextchar[{\tikz@fig@mustbenamed}% + {\pgfutil@ifnextchar t{\tikz@fig@mustbenamed} + {\pgfutil@ifnextchar e{\tikz@fig@mustbenamed} + {\ifx\tikz@after@node\pgfutil@empty\expandafter\tikz@fig@continue\else\expandafter\tikz@fig@mustbenamed\fi}}}}}%} \def\tikz@fig@mustbenamed{% - \ifx\tikz@fig@name\pgf@empty% + \ifx\tikz@fig@name\pgfutil@empty% % Assign a dummy name \global\advance\tikz@fig@count by1\relax \edef\tikz@fig@name{tikz@f@\the\tikz@fig@count}% @@ -2516,23 +2520,23 @@ \tikz@fig@continue% } \def\tikz@fig@continue{% - \ifx\tikz@text@width\pgf@empty% + \ifx\tikz@text@width\pgfutil@empty% \else% \setlength{\pgf@x}{\tikz@text@width}% \wd\pgfnodeparttextbox=\pgf@x% \fi% - \ifx\tikz@text@height\pgf@empty% + \ifx\tikz@text@height\pgfutil@empty% \else% \setlength{\pgf@x}{\tikz@text@height}% \ht\pgfnodeparttextbox=\pgf@x% \fi% - \ifx\tikz@text@depth\pgf@empty% + \ifx\tikz@text@depth\pgfutil@empty% \else% \setlength{\pgf@x}{\tikz@text@depth}% \dp\pgfnodeparttextbox=\pgf@x% \fi% % Possibly, we are ``online'' - \ifx\tikz@time\pgf@empty% + \ifx\tikz@time\pgfutil@empty% \pgftransformshift{\tikz@node@at}% \iftikz@fullytransformed% \else% @@ -2573,7 +2577,7 @@ \let\tikz@to@last@fig@name=\tikz@last@fig@name% \let\tikz@to@use@whom=\tikz@to@use@last@fig@name% \let\tikzlastnode=\tikz@last@fig@name% - \ifx\tikz@after@node@smuggle\pgf@empty% + \ifx\tikz@after@node@smuggle\pgfutil@empty% \else% \tikz@scan@next@command{\pgfextra{\tikz@afternodepathoptions@smuggle}\tikz@after@node@smuggle}\pgf@stop% \fi% @@ -2589,7 +2593,7 @@ \unskip% \gdef\tikz@nodepart@name{#1}% \global\let\tikz@fig@continue=\tikz@nodepart@continue% - \pgf@ifnextchar x{\egroup\relax}{\egroup\relax}% gobble spaces + \pgfutil@ifnextchar x{\egroup\relax}{\egroup\relax}% gobble spaces } \def\tikz@nodepart@continue{% \global\let\tikz@fig@continue=\tikz@fig@continue@orig% @@ -2599,17 +2603,17 @@ \tikz@every@style{every \tikz@nodepart@name\space node part}% \pgfinterruptpicture% \tikz@textfont% - \ifx\tikz@text@width\pgf@empty% + \ifx\tikz@text@width\pgfutil@empty% \else% \begingroup% - \minipage[t]{\tikz@text@width}% + \pgfutil@minipage[t]{\tikz@text@width}% \tikz@text@action% \fi% \bgroup% \aftergroup\unskip% - \ifx\tikz@textcolor\pgf@empty% + \ifx\tikz@textcolor\pgfutil@empty% \else% - \colorlet{.}{\tikz@textcolor}% + \pgfutil@colorlet{.}{\tikz@textcolor}% \fi% \pgfsetcolor{.}% \setbox\tikz@figbox=\box\voidb@x% @@ -2700,24 +2704,24 @@ \def\tikz@children{% % Start collecting the children: - \let\tikz@children@list=\pgf@empty% + \let\tikz@children@list=\pgfutil@empty% \tikznumberofchildren=0\relax% \tikz@collect@children c} -\def\tikz@collect@children{\pgf@ifnextchar c{\tikz@collect@children@cchar}{\tikz@children@collected}} -\def\tikz@collect@children@cchar c{\pgf@ifnextchar h{\tikz@collect@child}{\tikz@children@collected c}} -\def\tikz@collect@child hild{\pgf@ifnextchar[{\tikz@collect@childA}{\tikz@collect@childA[]}}%} -\def\tikz@collect@childA[#1]{\pgf@ifnextchar f{\tikz@collect@children@foreach[#1]}{\tikz@collect@childB[#1]}} +\def\tikz@collect@children{\pgfutil@ifnextchar c{\tikz@collect@children@cchar}{\tikz@children@collected}} +\def\tikz@collect@children@cchar c{\pgfutil@ifnextchar h{\tikz@collect@child}{\tikz@children@collected c}} +\def\tikz@collect@child hild{\pgfutil@ifnextchar[{\tikz@collect@childA}{\tikz@collect@childA[]}}%} +\def\tikz@collect@childA[#1]{\pgfutil@ifnextchar f{\tikz@collect@children@foreach[#1]}{\tikz@collect@childB[#1]}} \def\tikz@collect@childB[#1]{% \advance\tikznumberofchildren by1\relax \expandafter\def\expandafter\tikz@children@list\expandafter{\tikz@children@list \tikz@childnode[#1]}% - \pgf@ifnextchar\bgroup{\tikz@collect@child@code}{\tikz@collect@child@code{}}} + \pgfutil@ifnextchar\bgroup{\tikz@collect@child@code}{\tikz@collect@child@code{}}} \def\tikz@collect@child@code#1{% \expandafter\def\expandafter\tikz@children@list\expandafter{\tikz@children@list{#1}}% \tikz@collect@children% } \def\tikz@collect@children@foreach[#1]foreach#2in#3{% - \pgf@ifnextchar\bgroup{\tikz@collect@children@foreachA{#1}{#2}{#3}}{\tikz@collect@children@foreachA{#1}{#2}{#3}{}}} + \pgfutil@ifnextchar\bgroup{\tikz@collect@children@foreachA{#1}{#2}{#3}}{\tikz@collect@children@foreachA{#1}{#2}{#3}{}}} \def\tikz@collect@children@foreachA#1#2#3#4{% \expandafter\def\expandafter\tikz@children@list\expandafter {\tikz@children@list\tikz@childrennodes[#1]{#2}{#3}{#4}}% @@ -2732,8 +2736,8 @@ \long\def\tikz@children@collected{% \begingroup% \advance\tikztreelevel by 1\relax% - \let\tikz@options=\pgf@empty% - \let\tikz@transform=\pgf@empty% + \let\tikz@options=\pgfutil@empty% + \let\tikz@transform=\pgfutil@empty% \tikz@every@style{level \the\tikztreelevel}% \tikz@transform% \let\tikzparentnode=\tikz@last@fig@name% @@ -2784,7 +2788,7 @@ \hbox\bgroup\bgroup% \pgfinterruptpath% \pgfscope% - \let\tikz@transform=\pgf@empty% + \let\tikz@transform=\pgfutil@empty% \tikz@every@style{every child}% \tikz@setkeys{#1}% \tikz@options% @@ -2801,7 +2805,7 @@ \let\tikzchildnode=\tikz@childnode@name% {% \def\tikz@edge@to@parent@needed{edge from parent} - \ifx\tikz@child@node@rest\pgf@empty% + \ifx\tikz@child@node@rest\pgfutil@empty% \path edge from parent;% \else% \path (0,0) \tikz@child@node@rest \tikz@edge@to@parent@needed;% @@ -2814,31 +2818,31 @@ } \def\tikz@parse@child@node{% - \pgf@ifnextchar n{\tikz@parse@child@node@n}% - {\pgf@ifnextchar c{\tikz@parse@child@node@c}% + \pgfutil@ifnextchar n{\tikz@parse@child@node@n}% + {\pgfutil@ifnextchar c{\tikz@parse@child@node@c}% {\tikz@parse@child@node@rest}}} \def\tikz@parse@child@node@rest#1\pgf@stop{\def\tikz@child@node@rest{#1}} -\def\tikz@parse@child@node@c c{\pgf@ifnextchar o{\tikz@parse@child@node@co}{\tikz@parse@child@node@rest c}} -\def\tikz@parse@child@node@co o{\pgf@ifnextchar o{\tikz@parse@child@node@coordinate}{\tikz@parse@child@node@rest co}} +\def\tikz@parse@child@node@c c{\pgfutil@ifnextchar o{\tikz@parse@child@node@co}{\tikz@parse@child@node@rest c}} +\def\tikz@parse@child@node@co o{\pgfutil@ifnextchar o{\tikz@parse@child@node@coordinate}{\tikz@parse@child@node@rest co}} \def\tikz@parse@child@node@coordinate ordinate{% - \pgf@ifnextchar ({\tikz@@parse@child@node@coordinate}{% + \pgfutil@ifnextchar ({\tikz@@parse@child@node@coordinate}{% \def\tikz@child@node@text{[shape=coordinate]{}}% \tikz@parse@child@node@rest}}%} \def\tikz@@parse@child@node@coordinate(#1){% - \pgf@ifnextchar a{\tikz@p@c@n@c@at(#1)}{% + \pgfutil@ifnextchar a{\tikz@p@c@n@c@at(#1)}{% \def\tikz@child@node@text{[shape=coordinate,name=#1]{}}% \tikz@parse@child@node@rest}} \def\tikz@p@c@n@c@at(#1)at#2(#3){% \def\tikz@child@node@text{[shape=coordinate,name=#1]at(#3){}}% \tikz@parse@child@node@rest}% \def\tikz@parse@child@node@n node{% - \let\tikz@child@node@text=\pgf@empty% + \let\tikz@child@node@text=\pgfutil@empty% \tikz@p@c@s}% \def\tikz@p@c@s{% - \pgf@ifnextchar a{\tikz@p@c@s@at} - {\pgf@ifnextchar ({\tikz@p@c@s@paran} - {\pgf@ifnextchar [{\tikz@p@c@s@bra} - {\pgf@ifnextchar \bgroup{\tikz@p@c@s@group} + \pgfutil@ifnextchar a{\tikz@p@c@s@at} + {\pgfutil@ifnextchar ({\tikz@p@c@s@paran} + {\pgfutil@ifnextchar [{\tikz@p@c@s@bra} + {\pgfutil@ifnextchar \bgroup{\tikz@p@c@s@group} {\PackageError{tikz}{Cannot parse this node}{}}}}}}%}} \def\tikz@p@c@s@at at#1(#2){% \expandafter\def\expandafter\tikz@child@node@text\expandafter{\tikz@child@node@text at(#2)} @@ -3074,9 +3078,9 @@ \def\tikz@scan@one@point#1{% \let\tikz@to@use@whom=\tikz@to@use@last@coordinate% \tikz@shapeborderfalse% - \pgf@ifnextchar+{\tikz@scan@relative#1}{\tikz@scan@absolute#1}} + \pgfutil@ifnextchar+{\tikz@scan@relative#1}{\tikz@scan@absolute#1}} \def\tikz@scan@absolute#1{% - \pgf@ifnextchar({\tikz@scan@@absolute#1}%) + \pgfutil@ifnextchar({\tikz@scan@@absolute#1}%) {% \advance\tikz@expandcount by -1% \ifnum\tikz@expandcount<0\relax% @@ -3094,7 +3098,7 @@ \expandafter\tikz@@scan@@absolute\expandafter#1\tikz@temp% } \def\tikz@@scan@@absolute#1({% - \pgf@ifnextchar[% uhoh... options! + \pgfutil@ifnextchar[% uhoh... options! {\def\tikz@scan@point@recall{#1}\tikz@scan@options}% {\tikz@@@scan@@absolute#1(}% } @@ -3109,7 +3113,7 @@ % Ok, compute point with options set and zero transformation % matrix: \pgftransformreset% - \let\tikz@transform=\pgf@empty% + \let\tikz@transform=\pgfutil@empty% \expandafter\tikz@setkeys\expandafter{\tikz@scan@point@options}% \tikz@transform% \pgf@process{\pgfpointtransformed{#1}}% @@ -3119,29 +3123,29 @@ } \def\tikz@@@scan@@absolute#1(#2){% - \in@{intersection of}{#2}% - \ifin@% + \pgfutil@in@{intersection of}{#2}% + \ifpgfutil@in@% \let\@next\tikz@parse@intersection% \else% - \in@|{#2}% - \ifin@ - \in@{-|}{#2}% - \ifin@ + \pgfutil@in@|{#2}% + \ifpgfutil@in@ + \pgfutil@in@{-|}{#2}% + \ifpgfutil@in@ \let\@next\tikz@parse@hv% \else% \let\@next\tikz@parse@vh% \fi% \else% - \in@{cs:}{#2}% - \ifin@% + \pgfutil@in@{cs:}{#2}% + \ifpgfutil@in@% \let\@next\tikz@parse@coordinatesystem% \else% - \in@:{#2}% - \ifin@ + \pgfutil@in@:{#2}% + \ifpgfutil@in@ \let\@next\tikz@parse@polar% \else% - \in@,{#2}% - \ifin@% + \pgfutil@in@,{#2}% + \ifpgfutil@in@% \let\@next\tikz@parse@regular% \else% \let\@next\tikz@parse@node% @@ -3155,7 +3159,7 @@ \def\tikz@parse@coordinatesystem#1(#2 cs:#3){% \let\tikz@return@coordinate=\pgfpointorigin% - \pgf@ifundefined{tikz@parse@cs@#2} + \pgfutil@ifundefined{tikz@parse@cs@#2} {\PackageError{tikz}{Unknown coordinate system '#2'}{}} {\csname tikz@parse@cs@#2\endcsname(#3)}% \expandafter#1\expandafter{\tikz@return@coordinate}% @@ -3168,18 +3172,18 @@ \afterassignment\tikz@@checkunit% \@tempdima#1\@tempdima\tikz@unique% } -\def\tikz@@checkunit{\pgf@ifnextchar\tikz@unique{\tikz@checkunit@number}{\tikz@checkunit@dimension}} +\def\tikz@@checkunit{\pgfutil@ifnextchar\tikz@unique{\tikz@checkunit@number}{\tikz@checkunit@dimension}} \def\tikz@checkunit@number\tikz@unique{\tikz@isdimensionfalse} \def\tikz@checkunit@dimension#1\tikz@unique{\tikz@isdimensiontrue} \def\tikz@parse@polar#1(#2:#3){% - \pgf@ifundefined{tikz@polar@dir@#2} + \pgfutil@ifundefined{tikz@polar@dir@#2} {\tikz@@parse@polar#1(#2:#3)} {\tikz@@parse@polar#1(\csname tikz@polar@dir@#2\endcsname:#3)}% } \def\tikz@@parse@polar#1(#2:#3){% - \in@{ and }{#3}% - \ifin@% + \pgfutil@in@{ and }{#3}% + \ifpgfutil@in@% \edef\tikz@args{(#2:#3)}% \else% \edef\tikz@args{(#2:#3 and #3)}% @@ -3209,8 +3213,8 @@ \expandafter\def\csname tikz@polar@dir@south west\endcsname{-135} \def\tikz@parse@regular#1(#2,#3){% - \in@,{#3}% - \ifin@% + \pgfutil@in@,{#3}% + \ifpgfutil@in@% \tikz@parse@splitxyz{#1}{#2}#3,% \else% \tikz@checkunit{#2}% @@ -3230,8 +3234,8 @@ \def\tikz@coordinate@text{coordinate} \def\tikz@parse@node#1(#2){% - \in@.{#2}% Ok, flag this - \ifin@ + \pgfutil@in@.{#2}% Ok, flag this + \ifpgfutil@in@ \tikz@calc@anchor#2\tikz@stop% \else% \tikz@calc@anchor#2.center\tikz@stop% to be on the save side, in @@ -3252,16 +3256,16 @@ \def\tikz@parse@hv#1(#2){% - \in@{ -| }{#2}% - \ifin@% + \pgfutil@in@{ -| }{#2}% + \ifpgfutil@in@% \let\tikz@next=\tikz@parse@hvboth% \else% - \in@{ -|}{#2}% - \ifin@% + \pgfutil@in@{ -|}{#2}% + \ifpgfutil@in@% \let\tikz@next=\tikz@parse@hvleft% \else% - \in@{-| }{#2}% - \ifin@% + \pgfutil@in@{-| }{#2}% + \ifpgfutil@in@% \let\tikz@next=\tikz@parse@hvright% \else% \let\tikz@next=\tikz@parse@hvdone% @@ -3275,16 +3279,16 @@ \def\tikz@parse@hvdone#1(#2-|#3){\tikz@parse@vhdone#1(#3|-#2)} \def\tikz@parse@vh#1(#2){% - \in@{ |- }{#2}% - \ifin@% + \pgfutil@in@{ |- }{#2}% + \ifpgfutil@in@% \let\tikz@next=\tikz@parse@vhboth% \else% - \in@{ |-}{#2}% - \ifin@% + \pgfutil@in@{ |-}{#2}% + \ifpgfutil@in@% \let\tikz@next=\tikz@parse@vhleft% \else% - \in@{|- }{#2}% - \ifin@% + \pgfutil@in@{|- }{#2}% + \ifpgfutil@in@% \let\tikz@next=\tikz@parse@vhright% \else% \let\tikz@next=\tikz@parse@vhdone% @@ -3329,7 +3333,7 @@ \def\tikz@parse@intersection@d#1{\pgf@process{#1}} \def\tikz@scan@relative#1+{% - \pgf@ifnextchar+{\tikz@scan@plusplus#1}{\tikz@scan@oneplus#1}} + \pgfutil@ifnextchar+{\tikz@scan@plusplus#1}{\tikz@scan@oneplus#1}} \def\tikz@scan@plusplus#1+{% \def\tikz@doafter{#1}% @@ -3366,13 +3370,13 @@ % \usetikzlibrary{arrows} % \usetikzlibrary[patterns,topaths] -\def\usetikzlibrary{\pgf@ifnextchar[{\use@tikzlibrary}{\use@@tikzlibrary}}%} +\def\usetikzlibrary{\pgfutil@ifnextchar[{\use@tikzlibrary}{\use@@tikzlibrary}}%} \def\use@tikzlibrary[#1]{\use@@tikzlibrary{#1}} \def\use@@tikzlibrary#1{% \edef\pgf@list{#1}% - \@for\pgf@temp:=\pgf@list\do{% + \pgfutil@for\pgf@temp:=\pgf@list\do{% \expandafter\ifx\csname tikz@library@\pgf@temp @loaded\endcsname\relax% - \expandafter\global\expandafter\let\csname tikz@library@\pgf@temp @loaded\endcsname=\pgf@empty% + \expandafter\global\expandafter\let\csname tikz@library@\pgf@temp @loaded\endcsname=\pgfutil@empty% \expandafter\edef\csname tikz@library@#1@atcode\endcsname{\the\catcode`\@} \expandafter\edef\csname tikz@library@#1@barcode\endcsname{\the\catcode`\|} \catcode`\@=11 |