summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/basiclayer
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2006-11-03 06:16:00 +0000
committerNorbert Preining <preining@logic.at>2006-11-03 06:16:00 +0000
commita6d4e22f961008636a3bfc36f89570e6fa0c85f6 (patch)
tree9d13f81b2a37ab6bdf3336066017d4cb5e701011 /Master/texmf-dist/tex/generic/pgf/basiclayer
parente9b9a3f32d1a5b371fa2256f098ee4b158f6df1d (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/basiclayer')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseimage.code.tex38
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex8
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasepatterns.code.tex16
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseplot.code.tex14
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseshapes.code.tex42
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex16
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex28
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex18
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoremath.code.tex15
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex22
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex94
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathusage.code.tex54
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepoints.code.tex14
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex22
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreshade.code.tex84
15 files changed, 245 insertions, 240 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseimage.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseimage.code.tex
index ec8d93af683..11d0ec2cda1 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseimage.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseimage.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/basiclayer/pgfbaseimage.code.tex,v 1.4 2006/10/11 15:22:25 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbaseimage.code.tex,v 1.5 2006/10/16 22:32:58 tantau Exp $
% Declare an image
@@ -27,23 +27,23 @@
%
% \pgfdeclareimage[width=2cm,page=2]{myimage}{imagefilename}
-\def\pgfdeclareimage{\pgf@ifnextchar[{\pgf@declareimage}{\pgf@declareimage[]}}
+\def\pgfdeclareimage{\pgfutil@ifnextchar[{\pgf@declareimage}{\pgf@declareimage[]}}
\def\pgf@declareimage[#1]#2#3{%
\setkeys{pgfimage}{height=,width=,page=,interpolate=false,mask=}% defaults
\setkeys{pgfimage}{#1}%
% Try to find the file
\gdef\pgf@filename{}%
% If page= parameter is not empty, try that file first:
- \ifx\pgf@imagepage\pgf@empty%
+ \ifx\pgf@imagepage\pgfutil@empty%
\else%
\expandafter\pgf@findfile\pgfsys@imagesuffixlist:+{#3.page\pgf@imagepage}%
\fi%
- \ifx\pgf@filename\pgf@empty%
+ \ifx\pgf@filename\pgfutil@empty%
\expandafter\pgf@findfile\pgfsys@imagesuffixlist:+{#3}%
\else%
\setkeys{pgfimage}{page=}% make page empty
\fi%
- \ifx\pgf@filename\pgf@empty%
+ \ifx\pgf@filename\pgfutil@empty%
\PackageWarning{pgf}%
{File "#3" not found when defining image "#2".\MessageBreak
Tried all extensions in "\pgfsys@imagesuffixlist"}%
@@ -64,36 +64,36 @@
\define@key{pgfimage}{interpolate}[true]{\edef\pgf@imageinterpolate{/Interpolate #1}}
\define@key{pgfimage}{mask}{%
\edef\pgf@imagemask{#1}%
- \ifx\pgf@imagemask\pgf@empty%
+ \ifx\pgf@imagemask\pgfutil@empty%
\else%
- \pgf@ifundefined{pgf@mask@#1}%
+ \pgfutil@ifundefined{pgf@mask@#1}%
{\PackageError{pgf}{Undefined mask "#1".}{}%
\edef\pgf@imagemask{}}%
{\edef\pgf@imagemask{\csname pgf@mask@#1\endcsname}%
- \ifx\pgf@imagemask\pgf@empty%
+ \ifx\pgf@imagemask\pgfutil@empty%
\else
\edef\pgf@imagemask{/SMask \pgf@imagemask\space 0 R}%
\fi}%
\fi}
\def\pgf@findfile#1:#2+#3{%
- \IfFileExists{#3.#1}%
+ \pgfutil@IfFileExists{#3.#1}%
{\xdef\pgf@filename{#3.#1}}%
{\def\pgf@mightbeempty{#2}%
- \ifx\pgf@mightbeempty\pgf@empty\else%
+ \ifx\pgf@mightbeempty\pgfutil@empty\else%
\pgf@findfile#2+{#3}%
\fi}}
\def\pgf@declaredraftimage#1{%
- \ifx\pgf@imagewidth\pgf@empty%
+ \ifx\pgf@imagewidth\pgfutil@empty%
\PackageWarning{pgf}{Missing width for image "#1" in draft mode.\MessageBreak Using 1cm instead}%
\edef\pgf@imagewidth{1cm}%
\fi%
- \ifx\pgf@imageheight\pgf@empty%
+ \ifx\pgf@imageheight\pgfutil@empty%
\PackageWarning{pgf}{Missing height for image "#1" in draft mode.\MessageBreak Using 1cm instead}%
\edef\pgf@imageheight{1cm}%
\fi%
- \ifx\pgf@imagepage\pgf@empty\else\edef\pgf@imagepagetext{ page \pgf@imagepage}\fi%
+ \ifx\pgf@imagepage\pgfutil@empty\else\edef\pgf@imagepagetext{ page \pgf@imagepage}\fi%
\edef\pgf@image{%
\hbox to \pgf@imagewidth{%
\vrule\kern-0.4pt%
@@ -127,7 +127,7 @@
% \pgfdeclaremask[matte=white]{maskname}{maskfilename}
% \pgfdeclareimage[mask=maskname]{image}{imagefilename}
-\def\pgfdeclaremask{\pgf@ifnextchar[\pgf@declaremask{\pgf@declaremask[]}}
+\def\pgfdeclaremask{\pgfutil@ifnextchar[\pgf@declaremask{\pgf@declaremask[]}}
\def\pgf@declaremask[#1]#2#3{%
\setkeys{pgfmask}{matte={1 1 1}}% defaults
\setkeys{pgfmask}{#1}%
@@ -135,7 +135,7 @@
% Try to find the file
\gdef\pgf@filename{}%
\expandafter\pgf@findfile\pgfsys@imagesuffixlist:+{#3}%
- \ifx\pgf@filename\pgf@empty%
+ \ifx\pgf@filename\pgfutil@empty%
\PackageWarning{pgf}%
{File "#3" not found when defining mask "#2".\MessageBreak
Tried all extensions in "\pgfsys@imagesuffixlist"}%
@@ -178,16 +178,16 @@
\def\pgfuseimage#1{%
\def\pgf@imagename{pgf@image@#1}%
\pgf@tryextensions{\pgf@imagename}{\pgfalternateextension}%
- \expandafter\pgf@ifundefined\expandafter{\pgf@imagename}%
+ \expandafter\pgfutil@ifundefined\expandafter{\pgf@imagename}%
{\PackageError{pgf}{Undefined image "#1"}{}}%
{{\leavevmode\csname\pgf@imagename\endcsname}}}
\def\pgf@tryextensions#1#2{%
\edef\pgf@args{[#2!]}\expandafter\pgf@@tryextensions\pgf@args{#1}}
\def\pgf@@tryextensions[#1!#2]#3{%
- \expandafter\pgf@ifundefined\expandafter{#3.#1!#2}%
+ \expandafter\pgfutil@ifundefined\expandafter{#3.#1!#2}%
{\def\pgf@temp{#2}%
- \ifx\pgf@temp\pgf@empty%
+ \ifx\pgf@temp\pgfutil@empty%
\edef#3{#3!}%
\else%
\pgf@@tryextensions[#2]{#3}%
@@ -228,7 +228,7 @@
%
% \pgfimage[height=2cm]{filename}
-\def\pgfimage{\pgf@ifnextchar[\pgf@imagecom{\pgf@imagecom[]}}
+\def\pgfimage{\pgfutil@ifnextchar[\pgf@imagecom{\pgf@imagecom[]}}
\def\pgf@imagecom[#1]#2{%
\pgfdeclareimage[#1]{pgflastimage}{#2}%
\pgfuseimage{pgflastimage}}
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex
index 7603b016a67..d05672009e6 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.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/basiclayer/pgfbaselayers.code.tex,v 1.4 2006/10/11 15:22:25 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbaselayers.code.tex,v 1.5 2006/10/16 22:32:58 tantau Exp $
% Creates a new pgf layer
@@ -90,7 +90,7 @@
\pgfsys@endscope%
\fi%
\def\pgf@test{#2}%
- \ifx\pgf@test\pgf@empty%
+ \ifx\pgf@test\pgfutil@empty%
\else%
\pgf@dolayer#2,\relax%
\fi%
@@ -106,7 +106,7 @@
\setbox\csname pgf@layerboxsaved@#1\endcsname=\box\csname pgf@layerbox@#1\endcsname%
\fi%
\def\pgf@test{#2}%
- \ifx\pgf@test\pgf@empty%
+ \ifx\pgf@test\pgfutil@empty%
\else%
\pgf@dosavelayer#2,\relax%
\fi%
@@ -122,7 +122,7 @@
\global\setbox\csname pgf@layerbox@#1\endcsname=\box\csname pgf@layerboxsaved@#1\endcsname%
\fi%
\def\pgf@test{#2}%
- \ifx\pgf@test\pgf@empty%
+ \ifx\pgf@test\pgfutil@empty%
\else%
\pgf@dorestorelayer#2,\relax%
\fi%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasepatterns.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasepatterns.code.tex
index 2d6116f3ac2..816f50c0d19 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasepatterns.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasepatterns.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/basiclayer/pgfbasepatterns.code.tex,v 1.8 2006/10/11 15:22:25 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbasepatterns.code.tex,v 1.9 2006/10/16 22:32:58 tantau Exp $
% Creates a new uncolored pattern
@@ -87,14 +87,14 @@
\def\pgfdeclarepatterninherentlycolored#1#2#3#4#5{\pgf@declarepattern{#1}{#2}{#3}{#4}{#5}{1}}
\def\pgf@declarepattern#1#2#3#4#5#6{%
- \pgf@ifundefined{pgf@pattern@name@#1}{%
+ \pgfutil@ifundefined{pgf@pattern@name@#1}{%
\pgfsysprotocol@getcurrentprotocol\pgf@pattern@temp%
{%
\pgfinterruptpath%
\pgfpicturetrue%
\pgf@relevantforpicturesizefalse%
\pgftransformreset%
- \pgfsysprotocol@setcurrentprotocol\pgf@empty%
+ \pgfsysprotocol@setcurrentprotocol\pgfutil@empty%
\pgfsysprotocol@bufferedtrue%
\pgfsys@beginscope%
#5%
@@ -152,7 +152,7 @@
% \pgfsetfillpattern{stars}{red}
\def\pgfsetfillpattern#1#2{%
- \pgf@ifundefined{pgf@pattern@name@#1}{%
+ \pgfutil@ifundefined{pgf@pattern@name@#1}{%
\PackageError{pgfbasepatterns}{Undefined pattern `#1'}{}}
{%
\csname pgf@pattern@instantiate@#1\endcsname%
@@ -160,10 +160,10 @@
\pgf@ifpatternisinherentlycolored{#1}{%
\pgfsys@setpatterncolored{\csname pgf@pattern@name@#1\endcsname}%
}{%
- \colorlet{pgf@tempcolor}{#2}%
- \pgf@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
- \extractcolorspec{pgf@tempcolor}{\pgf@tempcolor}%
- \expandafter\convertcolorspec\pgf@tempcolor{rgb}{\pgf@rgbcolor}%
+ \pgfutil@colorlet{pgf@tempcolor}{#2}%
+ \pgfutil@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
+ \pgfutil@extractcolorspec{pgf@tempcolor}{\pgf@tempcolor}%
+ \expandafter\pgfutil@convertcolorspec\pgf@tempcolor{rgb}{\pgf@rgbcolor}%
\expandafter\pgf@set@fill@patternuncolored\pgf@rgbcolor\relax{#1}%
}%
}%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseplot.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseplot.code.tex
index ffebbfacc0f..9ca915d5981 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseplot.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseplot.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/basiclayer/pgfbaseplot.code.tex,v 1.4 2006/10/11 15:22:25 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbaseplot.code.tex,v 1.5 2006/10/16 22:32:58 tantau Exp $
% PGF's plotting interface works as follows:
@@ -106,7 +106,7 @@
\def\pgfplothandlerlineto{%
\def\pgf@plotstreamstart{%
\global\let\pgf@plotstreampoint=\pgf@plot@line@handler%
- \global\let\pgf@plotstreamspecial=\pgf@gobble%
+ \global\let\pgf@plotstreamspecial=\pgfutil@gobble%
\global\let\pgf@plotstreamend=\relax%
}%
}
@@ -133,8 +133,8 @@
\def\pgfplothandlerdiscard{%
\def\pgf@plotstreamstart{%
- \global\let\pgf@plotstreampoint=\pgf@gobble%
- \global\let\pgf@plotstreamspecial=\pgf@gobble%
+ \global\let\pgf@plotstreampoint=\pgfutil@gobble%
+ \global\let\pgf@plotstreamspecial=\pgfutil@gobble%
\global\let\pgf@plotstreamend=\relax%
}%
}
@@ -203,7 +203,7 @@
\read1 to \pgf@temp%
\let\par=\@@par%
\edef\pgf@temp{\pgf@temp}%
- \ifx\pgf@temp\pgf@empty%
+ \ifx\pgf@temp\pgfutil@empty%
\else\ifx\pgf@temp\pgf@partext%
\else%
\expandafter\pgf@parsexyline\pgf@temp\pgf@stop%
@@ -248,7 +248,7 @@
\def\pgf@readxyzfile{%
\read1 to \pgf@temp%
- \ifx\pgf@temp\pgf@empty%
+ \ifx\pgf@temp\pgfutil@empty%
\else\ifx\pgf@temp\pgf@partext%
\else%
\expandafter\pgf@parsexyzline\pgf@temp\pgf@stop%
@@ -290,7 +290,7 @@
\newwrite\pgf@plotwrite
\newif\ifpgf@resample@plot
-\def\pgfplotgnuplot{\pgf@ifnextchar[{\pgf@plotgnuplot}{\pgf@plotgnuplot[\jobname]}}%}
+\def\pgfplotgnuplot{\pgfutil@ifnextchar[{\pgf@plotgnuplot}{\pgf@plotgnuplot[\jobname]}}%}
\def\pgf@plotgnuplot[#1]#2{%
\pgf@resample@plottrue%
% Check, whether it is up-to-date
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseshapes.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseshapes.code.tex
index b6e8140abe3..5535010cbbb 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseshapes.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaseshapes.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/basiclayer/pgfbaseshapes.code.tex,v 1.14 2006/10/11 15:22:25 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbaseshapes.code.tex,v 1.16 2006/10/16 22:32:58 tantau Exp $
\newbox\pgfnodeparttextbox
@@ -36,11 +36,11 @@
% \pgfmultipartnode{rectangle}{center}{Hello}{hellonode}{\pgfusepath{stroke}}
\def\pgfmultipartnode#1#2#3#4{%
- \pgf@ifundefined{pgf@sh@s@#1}%
+ \pgfutil@ifundefined{pgf@sh@s@#1}%
{\PackageError{pgf}{Unknown shape ``#1''}{}}%
{%
{%
- \let\pgf@sh@savedpoints=\pgf@empty%
+ \let\pgf@sh@savedpoints=\pgfutil@empty%
\csname pgf@sh@s@#1\endcsname%
\pgf@sh@savedpoints%
\pgftransformshift{%
@@ -50,7 +50,7 @@
}%
% Save the saved points and the transformation matrix
\edef\pgf@test{#3}%
- \ifx\pgf@test\pgf@empty%
+ \ifx\pgf@test\pgfutil@empty%
\else%
\expandafter\xdef\csname pgf@sh@ns@#3\endcsname{#1}%
\edef\pgf@sh@@temp{\noexpand\gdef\expandafter\noexpand\csname pgf@sh@np@#3\endcsname}%
@@ -59,25 +59,25 @@
\expandafter\xdef\csname pgf@sh@nt@#3\endcsname{\pgf@temp}%
\expandafter\xdef\csname pgf@sh@pi@#3\endcsname{\pgfpictureid}%
\fi%
- \pgf@ifundefined{pgf@sh@bbg@#1}{}
+ \pgfutil@ifundefined{pgf@sh@bbg@#1}{}
{{\pgfscope\csname pgf@sh@bbg@#1\endcsname\endpgfscope}}%
- \pgf@ifundefined{pgf@sh@bg@#1}{}%
+ \pgfutil@ifundefined{pgf@sh@bg@#1}{}%
{\csname pgf@sh@bg@#1\endcsname#4}%
- \pgf@ifundefined{pgf@sh@fbg@#1}{}
+ \pgfutil@ifundefined{pgf@sh@fbg@#1}{}
{{\pgfscope\csname pgf@sh@fbg@#1\endcsname\endpgfscope}}%
{%
- \expandafter\@for\expandafter\pgf@shape@com\expandafter:\expandafter=\csname pgf@sh@boxes@#1\endcsname\do{%
+ \expandafter\pgfutil@for\expandafter\pgf@shape@com\expandafter:\expandafter=\csname pgf@sh@boxes@#1\endcsname\do{%
{%
\pgftransformshift{\pgf@sh@reanchor{#1}{\pgf@shape@com}}%
\expandafter\pgfqboxsynced\expandafter{\csname pgfnodepart\pgf@shape@com box\endcsname}%
}%
}%
}%
- \pgf@ifundefined{pgf@sh@bfg@#1}{}%
+ \pgfutil@ifundefined{pgf@sh@bfg@#1}{}%
{{\pgfscope\csname pgf@sh@bfg@#1\endcsname\endpgfscope}}%
- \pgf@ifundefined{pgf@sh@fg@#1}{}%
+ \pgfutil@ifundefined{pgf@sh@fg@#1}{}%
{\csname pgf@sh@fg@#1\endcsname#4}%
- \pgf@ifundefined{pgf@sh@ffg@#1}{}%
+ \pgfutil@ifundefined{pgf@sh@ffg@#1}{}%
{{\pgfscope\csname pgf@sh@ffg@#1\endcsname\endpgfscope}}%
}%
}%
@@ -119,7 +119,7 @@
\def\pgf@sh@resavedanchor#1#2{%
\pgf@process{#2}%
\edef\pgf@sh@marshal{%
- \noexpand\pgf@g@addto@macro\noexpand\pgf@sh@savedpoints{%
+ \noexpand\pgfutil@g@addto@macro\noexpand\pgf@sh@savedpoints{%
\noexpand\def\noexpand#1{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}%
}}%
\pgf@sh@marshal%
@@ -129,7 +129,7 @@
\def\pgf@sh@resaveddimen#1#2{%
{#2\global\pgf@x=\pgf@x}%
\edef\pgf@sh@marshal{%
- \noexpand\pgf@g@addto@macro\noexpand\pgf@sh@savedpoints{%
+ \noexpand\pgfutil@g@addto@macro\noexpand\pgf@sh@savedpoints{%
\noexpand\def\noexpand#1{\the\pgf@x}%
}}%
\pgf@sh@marshal%
@@ -137,9 +137,9 @@
% Invoke an anchor
\def\pgf@sh@reanchor#1#2{%
- \pgf@ifundefined{pgf@anchor@#1@#2}%
+ \pgfutil@ifundefined{pgf@anchor@#1@#2}%
{%
- \setcounter{pgf@counta}{#2}%
+ \pgflatex@setcounter{pgf@counta}{#2}%
\csname pgf@anchor@#1@border\endcsname{\pgfpointpolar{\c@pgf@counta}{1pt}}%
}%
{\csname pgf@anchor@#1@#2\endcsname}%
@@ -163,7 +163,7 @@
\def\pgfpointanchor#1#2{%
% Ok, check whether #1 is known!
- \pgf@ifundefined{pgf@sh@ns@#1}
+ \pgfutil@ifundefined{pgf@sh@ns@#1}
{\PackageError{pgf}{No shape named #1 is known}{}%
\pgfpointorigin}%
{%
@@ -225,7 +225,7 @@
\def\pgfpointshapeborder#1#2{%
% Ok, check whether #1 is known!
- \pgf@ifundefined{pgf@sh@ns@#1}
+ \pgfutil@ifundefined{pgf@sh@ns@#1}
{\PackageError{pgf}{No shape named #1 is known}{}%
\pgfpointorigin}%
{%
@@ -353,15 +353,15 @@
\anchorborder{\csname pgf@anchor@#1@center\endcsname}%
\anchor{text}{\pgfpointorigin}%
\nodeparts{text}%
- \expandafter\global\expandafter\let\csname pgf@sh@s@\shape@name\endcsname=\pgf@empty%
+ \expandafter\global\expandafter\let\csname pgf@sh@s@\shape@name\endcsname=\pgfutil@empty%
#2
}
}
\def\pgf@sh@savedanchor#1#2{%
- \expandafter\pgf@g@addto@macro\csname pgf@sh@s@\shape@name\endcsname{\pgf@sh@resavedanchor{#1}{#2}}}
+ \expandafter\pgfutil@g@addto@macro\csname pgf@sh@s@\shape@name\endcsname{\pgf@sh@resavedanchor{#1}{#2}}}
\def\pgf@sh@saveddimen#1#2{%
- \expandafter\pgf@g@addto@macro\csname pgf@sh@s@\shape@name\endcsname{\pgf@sh@resaveddimen{#1}{#2}}}
+ \expandafter\pgfutil@g@addto@macro\csname pgf@sh@s@\shape@name\endcsname{\pgf@sh@resaveddimen{#1}{#2}}}
\def\pgf@sh@anchor#1#2{\expandafter\gdef\csname pgf@anchor@\shape@name @#1\endcsname{#2}}
\def\pgf@sh@anchorborder#1{\expandafter\gdef\csname pgf@anchor@\shape@name @border\endcsname##1{\pgf@process{##1}#1}}
\long\def\pgf@sh@behindbgpath#1{\expandafter\gdef\csname pgf@sh@bbg@\shape@name\endcsname{#1}}
@@ -373,7 +373,7 @@
\def\pgf@sh@boxes#1{\expandafter\gdef\csname pgf@sh@boxes@\shape@name\endcsname{#1}}
\def\pgf@sh@inheritsavedanchors[from=#1]{%
- \expandafter\pgf@g@addto@macro\csname pgf@sh@s@\shape@name\endcsname{\csname pgf@sh@s@#1\endcsname}}
+ \expandafter\pgfutil@g@addto@macro\csname pgf@sh@s@\shape@name\endcsname{\csname pgf@sh@s@#1\endcsname}}
\def\pgf@sh@inheritanchor[from=#1]#2{%
\edef\pgf@marshal{\global\let\expandafter\noexpand\csname
pgf@anchor@\shape@name @#2\endcsname=\expandafter\noexpand\csname
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex
index b4842e3dc29..e20b2ca3c9e 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.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/basiclayer/pgfbasesnakes.code.tex,v 1.9 2006/10/11 15:22:25 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbasesnakes.code.tex,v 1.10 2006/10/16 22:32:58 tantau Exp $
\newdimen\pgfsnakeremainingdistance
\newdimen\pgfsnakecompleteddistance
@@ -45,7 +45,7 @@
\long\def\pgfdeclaresnake#1#2#3{%
\def\pgf@snake@name{#1}%
- \pgf@namedef{pgf@snake@@#1@initial}{#2}%
+ \pgfutil@namedef{pgf@snake@@#1@initial}{#2}%
\let\pgf@orig@state=\state%
\let\state=\pgf@snake@state
#3
@@ -88,10 +88,10 @@
% \pgfpathlineto{\pgfpoint{10pt}{0pt}}
% }
-\def\pgf@snake@state#1{\pgf@ifnextchar[{\pgf@@snake@start#1}{\pgf@@snake@start#1[]}}%}
+\def\pgf@snake@state#1{\pgfutil@ifnextchar[{\pgf@@snake@start#1}{\pgf@@snake@start#1[]}}%}
\def\pgf@@snake@start#1[#2]#3{%
- \pgf@namedef{pgf@snake@@\pgf@snake@name @#1@options}{#2}%
- \pgf@namedef{pgf@snake@@\pgf@snake@name @#1@code}{#3}%
+ \pgfutil@namedef{pgf@snake@@\pgf@snake@name @#1@options}{#2}%
+ \pgfutil@namedef{pgf@snake@@\pgf@snake@name @#1@code}{#3}%
}
@@ -164,8 +164,8 @@
\pgfsnakecompleteddistance=0pt%
\pgf@xb=\pgf@x%
\pgf@yb=\pgf@y%
- \@for\pgf@temp:=\pgf@list\do{%
- \ifx\pgf@temp\pgf@empty%
+ \pgfutil@for\pgf@temp:=\pgf@list\do{%
+ \ifx\pgf@temp\pgfutil@empty%
\else%
\expandafter\pgf@snake@invoke\pgf@temp%
\fi%
@@ -227,7 +227,7 @@
% \pgfpathsnakealongvector{zig zag}{100pt}{\pgfpolar{30}{1pt}}
\def\pgfpathsnakealongvector#1#2#3{%
- \pgf@ifundefined{pgf@snake@@#1@initial}{\PackageError{pgf}{Undefined snake ``#1''}{}}
+ \pgfutil@ifundefined{pgf@snake@@#1@initial}{\PackageError{pgf}{Undefined snake ``#1''}{}}
{
\begingroup% keep things local
\pgftransformreset%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex
index d813fe20973..bbbe9580b26 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorearrows.code.tex,v 1.5 2006/10/11 15:22:25 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorearrows.code.tex,v 1.6 2006/10/16 22:32:58 tantau Exp $
% Sets the end arrow
@@ -20,13 +20,13 @@
\def\pgfsetarrowsend#1{\pgf@arrowset{end}{#1}}
\def\pgf@arrowset#1#2{%
- \pgf@ifundefined{pgf@arrow@code@#2}
+ \pgfutil@ifundefined{pgf@arrow@code@#2}
{\PackageError{pgf}{Arrow #1 type ``#2'' unknown}{}}
{%
\edef\pgf@arrow@temp{#2}%
- \ifx\pgf@arrow@temp\pgf@empty% ah. clear!
- \expandafter\let\csname pgf@#1arrow\endcsname=\pgf@empty%
- \expandafter\let\csname pgf@shorten@#1\endcsname=\pgf@empty%
+ \ifx\pgf@arrow@temp\pgfutil@empty% ah. clear!
+ \expandafter\let\csname pgf@#1arrow\endcsname=\pgfutil@empty%
+ \expandafter\let\csname pgf@shorten@#1\endcsname=\pgfutil@empty%
\else%
%\pgf@arrow@prepare{#2}%
\expandafter\def\csname pgf@#1arrow\endcsname{\pgf@arrow@call{#2}}%
@@ -69,18 +69,18 @@
}
\def\pgf@arrows@checked#1#2#3{%
- \pgf@ifundefined{pgf@arrow@code@#2}%
+ \pgfutil@ifundefined{pgf@arrow@code@#2}%
{%
\PackageError{pgf}{Arrow end type ``#2'' unknown}{}}%
{%
- \pgf@ifundefined{pgf@arrow@code@\csname pgf@arrows@invert#1\endcsname}
+ \pgfutil@ifundefined{pgf@arrow@code@\csname pgf@arrows@invert#1\endcsname}
{\PackageError{pgf}{Arrow start type ``#1'' unknown}{}}%
{#3}%
}%
}
\def\pgf@arrows@check@already#1#2#3{%
- \pgf@ifundefined{pgf@arrow@code@#2}
+ \pgfutil@ifundefined{pgf@arrow@code@#2}
{#3}%
{\PackageError{pgf}{Arrow end type ``#2'' already defined}{}}%
}
@@ -96,7 +96,7 @@
\let\pgfusepath=\pgf@nousepath@here%
\pgf@relevantforpicturesizefalse%
\pgftransformreset%
- \pgfsysprotocol@setcurrentprotocol\pgf@empty%
+ \pgfsysprotocol@setcurrentprotocol\pgfutil@empty%
\pgfsysprotocol@bufferedtrue%
\pgfsys@beginscope%
\csname pgf@arrow@code@#1\endcsname%
@@ -268,9 +268,9 @@
% \pgfarrowsdeclarecombine*{|<}{>|}{|}{|}{<}{>}
% \pgfarrowsdeclarecombine{<<}{>>}{<}{>}{<}{>}
-\def\pgfarrowsdeclarecombine{\pgf@ifnextchar*{\pgfarrowsdeclarecombine@star}{\pgf@@arrowsdeclarecombine}}
+\def\pgfarrowsdeclarecombine{\pgfutil@ifnextchar*{\pgfarrowsdeclarecombine@star}{\pgf@@arrowsdeclarecombine}}
-\def\pgf@@arrowsdeclarecombine{\pgf@ifnextchar[{\pgf@arrowsdeclarecombine}{\pgf@arrowsdeclarecombine[0pt]}}
+\def\pgf@@arrowsdeclarecombine{\pgfutil@ifnextchar[{\pgf@arrowsdeclarecombine}{\pgf@arrowsdeclarecombine[0pt]}}
\def\pgf@arrowsdeclarecombine[#1]#2#3#4#5#6#7{%
\pgf@arrows@check@already{#2}{#3}%
{%
@@ -306,7 +306,7 @@
}%
}
-\def\pgfarrowsdeclarecombine@star*{\pgf@ifnextchar[{\pgf@arrowsdeclarecombine@star}{\pgf@arrowsdeclarecombine@star[0pt]}}
+\def\pgfarrowsdeclarecombine@star*{\pgfutil@ifnextchar[{\pgf@arrowsdeclarecombine@star}{\pgf@arrowsdeclarecombine@star[0pt]}}
\def\pgf@arrowsdeclarecombine@star[#1]#2#3#4#5#6#7{%
\pgf@arrows@check@already{#2}{#3}%
{%
@@ -356,9 +356,9 @@
%
% \pgfarrowsdeclaredouble{<<}{>>}{<}{>}
-\def\pgfarrowsdeclaredouble{\pgf@ifnextchar[{\pgf@arrowsdeclaredouble}{\pgf@arrowsdeclaredouble[0pt]}}
+\def\pgfarrowsdeclaredouble{\pgfutil@ifnextchar[{\pgf@arrowsdeclaredouble}{\pgf@arrowsdeclaredouble[0pt]}}
\def\pgf@arrowsdeclaredouble[#1]#2#3#4#5{\pgfarrowsdeclarecombine[#1]{#2}{#3}{#4}{#5}{#4}{#5}}
-\def\pgfarrowsdeclaretriple{\pgf@ifnextchar[{\pgf@arrowsdeclaretriple}{\pgf@arrowsdeclaretriple[0pt]}}
+\def\pgfarrowsdeclaretriple{\pgfutil@ifnextchar[{\pgf@arrowsdeclaretriple}{\pgf@arrowsdeclaretriple[0pt]}}
\def\pgf@arrowsdeclaretriple[#1]#2#3#4#5{%
\pgfarrowsdeclarecombine[#1]{pgf@trip@#2}{pgf@trip@#3}{#4}{#5}{#4}{#5}%
\pgfarrowsdeclarecombine[#1]{#2}{#3}{pgf@trip@#2}{pgf@trip@#3}{#4}{#5}%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex
index 3eb07f2897a..236dc6a80cb 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex,v 1.5 2006/10/11 15:22:25 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex,v 1.6 2006/10/16 22:32:58 tantau Exp $
% Globals
@@ -67,7 +67,7 @@
\let\pgf@next=\relax%
\else%
\setlength\pgf@x{#1}%
- \ifx\pgf@temp\pgf@empty%
+ \ifx\pgf@temp\pgfutil@empty%
\edef\pgf@temp{\the\pgf@x}%
\else%
\edef\pgf@temp{\pgf@temp,\the\pgf@x}%
@@ -84,8 +84,8 @@
% \pgfsetstrokecolor{red}
\def\pgfsetstrokecolor#1{%
- \colorlet{pgf@tempcolor}{#1}%
- \pgf@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
+ \pgfutil@colorlet{pgf@tempcolor}{#1}%
+ \pgfutil@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
\expandafter\expandafter\expandafter\pgf@setstrokecolor\csname\string\color@pgf@tempcolor\endcsname%
}
\def\pgf@setstrokecolor#1#2#3#4#5{%
@@ -99,7 +99,7 @@
\def\pgf@uncomma#1,{%
\def\pgf@coltest{#1}%
- \ifx\pgf@coltest\pgf@empty%
+ \ifx\pgf@coltest\pgfutil@empty%
\let\pgf@colnext=\relax%
\else%
\expandafter\def\expandafter\pgf@colmarshal\expandafter{\pgf@colmarshal{#1}}%
@@ -116,8 +116,8 @@
% \pgfsetfillcolor{gray}
\def\pgfsetfillcolor#1{%
- \colorlet{pgf@tempcolor}{#1}%
- \pgf@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
+ \pgfutil@colorlet{pgf@tempcolor}{#1}%
+ \pgfutil@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
\expandafter\expandafter\expandafter\pgf@setfillcolor\csname\string\color@pgf@tempcolor\endcsname%
}
\def\pgf@setfillcolor#1#2#3#4#5{%
@@ -138,8 +138,8 @@
% \pgfsetcolor{blue}
\def\pgfsetcolor#1{%
- \colorlet{pgf@tempcolor}{#1}%
- \pgf@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
+ \pgfutil@colorlet{pgf@tempcolor}{#1}%
+ \pgfutil@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
\expandafter\expandafter\expandafter\pgf@setcolor\csname\string\color@pgf@tempcolor\endcsname%
}
\def\pgf@setcolor#1#2#3#4#5{%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoremath.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoremath.code.tex
index 44c4e208d5c..2a0187b13a8 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoremath.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoremath.code.tex
@@ -7,17 +7,22 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoremath.code.tex,v 1.2 2006/10/11 15:22:25 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoremath.code.tex,v 1.3 2006/10/15 15:54:25 tantau Exp $
% Mathematical stuff
% Internal registers
-\newcounter{pgf@counta}
-\newcounter{pgf@countb}
-\newcounter{pgf@countc}
-\newcounter{pgf@countd}
+\ifx\pgflatex@setcounter\@undefined
+ \def\pgflatex@setcounter{\setcounter}
+\fi
+
+\newcount\c@pgf@counta
+\newcount\c@pgf@countb
+\newcount\c@pgf@countc
+\newcount\c@pgf@countd
+
% Internal setting function
\def\pgf@setmath#1#2{\edef\pgf@temp{#2pt}\csname pgf@#1\endcsname=\pgf@temp}
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
index f6c61229ff1..ad0a8fff031 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex,v 1.5 2006/10/11 15:22:25 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex,v 1.6 2006/10/16 22:32:58 tantau Exp $
\newdimen\pgf@path@lastx
@@ -256,8 +256,8 @@
}
\def\pgf@arc#1#2#3{%
- \in@/{#3}%
- \ifin@%
+ \pgfutil@in@/{#3}%
+ \ifpgfutil@in@%
\pgf@@arc{#1}{#2}#3\@@%
\else
\pgf@@arc{#1}{#2}#3/#3\@@%
@@ -605,7 +605,7 @@
\define@key{pgfbase}{stepy}{\setlength{\pgf@y}{#1}\relax}
\define@key{pgfbase}{step}{\pgf@process{#1}}
-\def\pgfpathgrid{\pgf@ifnextchar[{\pgf@pathgrid}{\pgf@pathgrid[]}}
+\def\pgfpathgrid{\pgfutil@ifnextchar[{\pgf@pathgrid}{\pgf@pathgrid[]}}
\def\pgf@pathgrid[#1]#2#3{%
\setkeys{pgfbase}{stepx=1cm,stepy=1cm}%
\setkeys{pgfbase}{#1}%
@@ -752,24 +752,24 @@
\pgf@process{#1}% untransformed
\pgf@xc=\pgf@x%
\pgf@yc=\pgf@y%
- \@tempswatrue%
+ \pgfutil@tempswatrue%
\ifdim\pgf@xb=0pt\relax%
\ifdim\pgf@yb=0pt\relax%
- \@tempswafalse%
+ \pgfutil@tempswafalse%
\fi%
\fi%
{%
- \if@tempswa%
+ \ifpgfutil@tempswa%
\pgf@arccornersfalse
\else%
\fi%
- \@tempswatrue%
+ \pgfutil@tempswatrue%
\ifdim\pgf@xc=0pt\relax%
\ifdim\pgf@yc=0pt\relax%
- \@tempswafalse%
+ \pgfutil@tempswafalse%
\fi%
\fi%
- \if@tempswa
+ \ifpgfutil@tempswa
{%
\pgf@pt@x=\pgf@path@lastx%
\pgf@pt@y=\pgf@path@lasty%
@@ -780,7 +780,7 @@
}%
\fi%
}%
- \if@tempswa%
+ \ifpgfutil@tempswa%
\pgf@xc=\pgf@xb%
\pgf@yc=\pgf@yb%
{%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex
index 4fbed5e37ea..a913b30d52a 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex,v 1.4 2006/10/11 15:22:25 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex,v 1.5 2006/10/16 22:32:58 tantau Exp $
@@ -30,7 +30,7 @@
\def\pgfprocesspathcleanup#1{%
{%
- \let\pgf@newpath=\pgf@empty%
+ \let\pgf@newpath=\pgfutil@empty%
\expandafter\pgf@cleanupprocessor#1\pgf@stop%
}%
\let#1=\pgf@newpath%
@@ -38,7 +38,7 @@
\def\pgf@cleanupprocessor#1{%
\ifx#1\pgf@stop%
- \let\next=\pgf@gobble% ok, done
+ \let\next=\pgfutil@gobble% ok, done
\else%
\ifx#1\pgfsyssoftpath@movetotoken%
\let\next=\pgf@cleanupmoveto%
@@ -50,7 +50,7 @@
}
\def\pgf@cleanupredo#1#2#3{%
- \pgf@g@addto@macro\pgf@newpath{#1{#2}{#3}}%
+ \pgfutil@g@addto@macro\pgf@newpath{#1{#2}{#3}}%
\pgf@cleanupprocessor%
}
@@ -58,7 +58,7 @@
\ifx#4\pgfsyssoftpath@movetotoken%
% Ok, skip
\else%
- \pgf@g@addto@macro\pgf@newpath{#1{#2}{#3}}%
+ \pgfutil@g@addto@macro\pgf@newpath{#1{#2}{#3}}%
\fi%
\pgf@cleanupprocessor#4%
}
@@ -92,7 +92,7 @@
% % \pgfpointlastonpath is now \pgfpoint{40bp}{40bp}
\def\pgfprocesspathextractpoints#1{%
- \ifx#1\pgf@empty%
+ \ifx#1\pgfutil@empty%
\let\pgfpointfirstonpath=\pgfpointorigin%
\let\pgfpointsecondonpath=\pgfpointorigin%
\let\pgfpointsecondlastonpath=\pgfpointorigin%
@@ -109,7 +109,7 @@
\let\pgfpointsecondonpath=\pgfpointfirstonpath%
\let\pgfpointsecondlastonpath=\pgfpointfirstonpath%
\let\pgfpointlastonpath=\pgfpointfirstonpath%
- \let\next=\pgf@gobble%
+ \let\next=\pgfutil@gobble%
\else
\let\next=\pgf@extractprocessorsecond%
\fi%
@@ -131,7 +131,7 @@
\let\pgfpointlastonpath=\pgfpointsecondonpath%
\ifx#4\pgf@stop%
% short path...
- \let\next=\pgf@gobble%
+ \let\next=\pgfutil@gobble%
\else
\let\next=\pgf@extractprocessorother%
\fi%
@@ -152,7 +152,7 @@
\def\pgfpointlastonpath{\pgfpoint{#2}{#3}}%
\ifx#4\pgf@stop%
% end!
- \let\next=\pgf@gobble%
+ \let\next=\pgfutil@gobble%
\fi%
\next#4%
}
@@ -175,14 +175,14 @@
\def\pgfprocesscheckclosed#1#2{%
{%
\global\let\pgf@proc@todo=\relax%
- \let\pgfsyssoftpath@movetotoken=\pgf@gobbletwo%
- \let\pgfsyssoftpath@linetotoken=\pgf@gobbletwo%
- \let\pgfsyssoftpath@curvetosupportatoken=\pgf@gobbletwo%
- \let\pgfsyssoftpath@curvetosupportbtoken=\pgf@gobbletwo%
- \let\pgfsyssoftpath@curvetotoken=\pgf@gobbletwo%
- \def\pgfsyssoftpath@rectcornertoken{\gdef\pgf@proc@todo{#2}\pgf@gobbletwo}%
- \def\pgfsyssoftpath@rectsizetoken{\gdef\pgf@proc@todo{#2}\pgf@gobbletwo}%
- \def\pgfsyssoftpath@closepathtoken{\gdef\pgf@proc@todo{#2}\pgf@gobbletwo}%
+ \let\pgfsyssoftpath@movetotoken=\pgfutil@gobbletwo%
+ \let\pgfsyssoftpath@linetotoken=\pgfutil@gobbletwo%
+ \let\pgfsyssoftpath@curvetosupportatoken=\pgfutil@gobbletwo%
+ \let\pgfsyssoftpath@curvetosupportbtoken=\pgfutil@gobbletwo%
+ \let\pgfsyssoftpath@curvetotoken=\pgfutil@gobbletwo%
+ \def\pgfsyssoftpath@rectcornertoken{\gdef\pgf@proc@todo{#2}\pgfutil@gobbletwo}%
+ \def\pgfsyssoftpath@rectsizetoken{\gdef\pgf@proc@todo{#2}\pgfutil@gobbletwo}%
+ \def\pgfsyssoftpath@closepathtoken{\gdef\pgf@proc@todo{#2}\pgfutil@gobbletwo}%
#1%
}%
\pgf@proc@todo%
@@ -208,7 +208,7 @@
\def\pgf@processroundcheck#1#2#3\pgfsyssoftpath@specialroundtoken#4\pgf@stop{%
\def\pgf@test{#4}%
- \ifx\pgf@test\pgf@empty%
+ \ifx\pgf@test\pgfutil@empty%
% ok, nothing to be done!
\let#2=#1%
\else%
@@ -219,15 +219,15 @@
\def\pgf@@processround#1#2{%
- \let\pgfprocess@newpath\pgf@empty%
- \let\pgfprocess@moveto\pgf@empty%
- \let\pgfprocess@firstto\pgf@empty%
- \let\pgfprocess@segment\pgf@empty%
+ \let\pgfprocess@newpath\pgfutil@empty%
+ \let\pgfprocess@moveto\pgfutil@empty%
+ \let\pgfprocess@firstto\pgfutil@empty%
+ \let\pgfprocess@segment\pgfutil@empty%
\pgf@xa=0pt%
\pgf@ya=0pt%
\expandafter\pgfprocess@round#1\pgf@stop{0pt}{0pt}%
- \expandafter\pgf@g@addto@macro\expandafter\pgfprocess@newpath\expandafter{\pgfprocess@moveto}%
- \expandafter\pgf@g@addto@macro\expandafter\pgfprocess@newpath\expandafter{\pgfprocess@segment}%
+ \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@newpath\expandafter{\pgfprocess@moveto}%
+ \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@newpath\expandafter{\pgfprocess@segment}%
\let#2=\pgfprocess@newpath%
}
@@ -245,20 +245,20 @@
\fi%
\fi%
\else%
- \ifx\pgfprocess@firstto\pgf@empty%
+ \ifx\pgfprocess@firstto\pgfutil@empty%
\def\pgfprocess@firstto{{#2}{#3}}%
\fi%
\pgf@xa=#2%
\pgf@ya=#3%
\ifx#1\pgfsyssoftpath@movetotoken%
% ok, move old segment to newpath
- \expandafter\pgf@g@addto@macro\expandafter\pgfprocess@newpath\expandafter{\pgfprocess@moveto}%
- \expandafter\pgf@g@addto@macro\expandafter\pgfprocess@newpath\expandafter{\pgfprocess@segment}%
+ \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@newpath\expandafter{\pgfprocess@moveto}%
+ \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@newpath\expandafter{\pgfprocess@segment}%
\def\pgfprocess@moveto{#1{#2}{#3}}%
- \let\pgfprocess@firstto=\pgf@empty%
- \let\pgfprocess@segment=\pgf@empty%
+ \let\pgfprocess@firstto=\pgfutil@empty%
+ \let\pgfprocess@segment=\pgfutil@empty%
\else%
- \pgf@g@addto@macro\pgfprocess@segment{#1{#2}{#3}}%
+ \pgfutil@g@addto@macro\pgfprocess@segment{#1{#2}{#3}}%
\fi%
\let\next=\pgfprocess@round%
\fi%
@@ -267,7 +267,7 @@
}
\def\pgfprocess@specialround#1#2#3{%
- \ifx\pgfprocess@firstto\pgf@empty%
+ \ifx\pgfprocess@firstto\pgfutil@empty%
\def\pgfprocess@firstto{{#2}{#3}}%
\fi%
\let\next=\pgfprocess@round% default: do nothing
@@ -323,7 +323,7 @@
}
\def\pgfprocess@@specialround#1#2#3{%
- \pgf@g@addto@macro\pgfprocess@segment{#1}%
+ \pgfutil@g@addto@macro\pgfprocess@segment{#1}%
% calculate start coordinate of the curve
\pgf@xb=#2%
\pgf@yb=#3%
@@ -336,7 +336,7 @@
\pgf@xa=\pgf@x% save start point of added curve
\pgf@ya=\pgf@y%
\edef\pgfprocess@addition{{\the\pgf@x}{\the\pgf@y}}%
- \expandafter\pgf@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}%
+ \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}%
%
% now add curve
%
@@ -356,7 +356,7 @@
\advance\pgf@xa by 0.555\pgf@x%
\advance\pgf@ya by 0.555\pgf@y%
\edef\pgfprocess@addition{\noexpand\pgfsyssoftpath@curvetosupportatoken{\the\pgf@xa}{\the\pgf@ya}}%
- \expandafter\pgf@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}%
+ \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}%
}%
% calculate second support:
{%
@@ -367,11 +367,11 @@
\advance\pgf@xc by 0.555\pgf@x%
\advance\pgf@yc by 0.555\pgf@y%
\edef\pgfprocess@addition{\noexpand\pgfsyssoftpath@curvetosupportbtoken{\the\pgf@xc}{\the\pgf@yc}}%
- \expandafter\pgf@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}%
+ \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}%
}%
% add end:
\edef\pgfprocess@addition{\noexpand\pgfsyssoftpath@curvetotoken{\the\pgf@xc}{\the\pgf@yc}}%
- \expandafter\pgf@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}%
+ \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}%
%
% continue!
%
@@ -381,16 +381,16 @@
}
\def\pgfprocess@specialroundcurveto#1#2#3#4#5#6{%
- \pgf@g@addto@macro\pgfprocess@segment{#1{#2}{#3}#4{#5}{#6}}% supports
+ \pgfutil@g@addto@macro\pgfprocess@segment{#1{#2}{#3}#4{#5}{#6}}% supports
\pgf@xa=#5%
\pgf@ya=#6%
\pgfprocess@specialroundcope}
\def\pgfprocess@specialroundclose{%
\let\next=\pgfprocess@round%
- \ifx\pgfprocess@moveto\pgf@empty%
+ \ifx\pgfprocess@moveto\pgfutil@empty%
\else%
- \ifx\pgfprocess@firstto\pgf@empty%
+ \ifx\pgfprocess@firstto\pgfutil@empty%
\else%
\expandafter\pgfprocess@@specialclosetarget\pgfprocess@firstto%
\let\pgfprocess@continueafterrounding=\pgfprocess@cleanupafterclose%
@@ -449,9 +449,9 @@
\def\pgfprocesspathreplacestartandend#1#2#3{%
{%
- \let\pgf@newpath=\pgf@empty%
- \let\pgf@prepath=\pgf@empty%
- \ifx#1\pgf@empty%
+ \let\pgf@newpath=\pgfutil@empty%
+ \let\pgf@prepath=\pgfutil@empty%
+ \ifx#1\pgfutil@empty%
\else%
\pgf@process{#3}%
\pgf@xa=\pgf@x%
@@ -470,7 +470,7 @@
\def\pgf@temppath{#1{#2}{#3}}%
\edef\pgf@newpath{\noexpand#1{\the\pgf@x}{\the\pgf@y}}%
\ifx#4\pgf@stop%
- \let\next=\pgf@gobble%
+ \let\next=\pgfutil@gobble%
\else%
\let\next=\pgf@replaceprocessother%
\fi%
@@ -493,11 +493,11 @@
\def\pgf@@replaceprocessother#1#2#3#4{%
\ifx#4\pgf@stop%
\edef\pgf@newpathaddition{{\noexpand#1{\the\pgf@xa}{\the\pgf@ya}}}%
- \expandafter\pgf@g@addto@macro\expandafter\pgf@newpath\pgf@newpathaddition%
- \let\next=\pgf@gobble%
+ \expandafter\pgfutil@g@addto@macro\expandafter\pgf@newpath\pgf@newpathaddition%
+ \let\next=\pgfutil@gobble%
\else%
- \pgf@g@addto@macro\pgf@temppath{#1{#2}{#3}}%
- \pgf@g@addto@macro\pgf@newpath{#1{#2}{#3}}%
+ \pgfutil@g@addto@macro\pgf@temppath{#1{#2}{#3}}%
+ \pgfutil@g@addto@macro\pgf@newpath{#1{#2}{#3}}%
\let\next=\pgf@replaceprocessother%
\fi%
\next#4%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathusage.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathusage.code.tex
index 0d5b5482a57..c7d20093db9 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathusage.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathusage.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathusage.code.tex,v 1.6 2006/10/11 15:22:25 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathusage.code.tex,v 1.7 2006/10/16 22:32:58 tantau Exp $
% Stroke/fill/clip/etc. the current path. Depending on the options,
@@ -40,18 +40,18 @@
\define@key{pgfup}{use as bounding box}[]{\def\pgf@up@bb{\pgf@relevantforpicturesizefalse}}
\def\pgfusepath#1{%
- \let\pgf@up@stroke\pgf@empty%
- \let\pgf@up@fill\pgf@empty%
- \let\pgf@up@clip\pgf@empty%
- \let\pgf@up@discard\pgf@empty%
- \let\pgf@up@bb\pgf@empty%
+ \let\pgf@up@stroke\pgfutil@empty%
+ \let\pgf@up@fill\pgfutil@empty%
+ \let\pgf@up@clip\pgfutil@empty%
+ \let\pgf@up@discard\pgfutil@empty%
+ \let\pgf@up@bb\pgfutil@empty%
\setkeys{pgfup}{#1}%
\expandafter\def\expandafter\pgf@up@action\expandafter{\csname pgfsys@\pgf@up@fill\pgf@up@stroke\endcsname}%
- \ifx\pgf@up@stroke\pgf@empty%
- \ifx\pgf@up@fill\pgf@empty%
- \ifx\pgf@up@clip\pgf@empty%
- \let\pgf@up@action=\pgf@empty%
- \pgfsyssoftpath@setcurrentpath\pgf@empty%
+ \ifx\pgf@up@stroke\pgfutil@empty%
+ \ifx\pgf@up@fill\pgfutil@empty%
+ \ifx\pgf@up@clip\pgfutil@empty%
+ \let\pgf@up@action=\pgfutil@empty%
+ \pgfsyssoftpath@setcurrentpath\pgfutil@empty%
\else%
% only clipping
\let\pgf@up@action=\pgfsys@discardpath%
@@ -64,7 +64,7 @@
% to the bounding box.
%
\ifpgf@relevantforpicturesize%
- \ifx\pgf@up@stroke\pgf@empty%
+ \ifx\pgf@up@stroke\pgfutil@empty%
\else%
\ifdim\pgf@picmaxx=-16000pt\relax%
\else%
@@ -80,8 +80,8 @@
\fi%
\fi%
%
- \ifx\pgf@up@clip\pgf@empty%
- \ifx\pgf@up@stroke\pgf@empty%
+ \ifx\pgf@up@clip\pgfutil@empty%
+ \ifx\pgf@up@stroke\pgfutil@empty%
\pgfsyssoftpath@invokecurrentpath%
\pgfsyssoftpath@getcurrentpath\pgf@last@used@path%
\pgf@up@action%
@@ -92,7 +92,7 @@
\pgfsyssoftpath@invokecurrentpath%
\pgfsyssoftpath@getcurrentpath\pgf@last@used@path%
\pgf@up@action%
- \pgfsyssoftpath@setcurrentpath\pgf@empty%
+ \pgfsyssoftpath@setcurrentpath\pgfutil@empty%
\pgf@add@arrows@as@needed%
\else%
\pgfsyssoftpath@invokecurrentpath%
@@ -108,7 +108,7 @@
\pgf@relevantforpicturesizefalse%
\fi%
\pgf@up@bb%
- \pgfsyssoftpath@setcurrentpath\pgf@empty%
+ \pgfsyssoftpath@setcurrentpath\pgfutil@empty%
\pgf@resetpathsizes%
\ignorespaces%
}
@@ -135,13 +135,13 @@
\def\pgf@check@for@arrows{%
\pgf@drawarrowsfalse%
- \ifx\pgf@startarrow\pgf@empty\else\pgf@drawarrowstrue\fi%
- \ifx\pgf@endarrow\pgf@empty\else\pgf@drawarrowstrue\fi%
+ \ifx\pgf@startarrow\pgfutil@empty\else\pgf@drawarrowstrue\fi%
+ \ifx\pgf@endarrow\pgfutil@empty\else\pgf@drawarrowstrue\fi%
\ifdim\pgf@shorten@end@additional=0pt\relax\else\pgf@drawarrowstrue\fi%
\ifdim\pgf@shorten@start@additional=0pt\relax\else\pgf@drawarrowstrue\fi%
\ifpgf@drawarrows%
\pgfsyssoftpath@getcurrentpath\pgf@arrowpath%
- \ifx\pgf@arrowpath\pgf@empty%
+ \ifx\pgf@arrowpath\pgfutil@empty%
\pgf@drawarrowsfalse%
\else%
\pgfprocesscheckclosed{\pgf@arrowpath}{\pgf@drawarrowsfalse}%
@@ -152,14 +152,14 @@
\newdimen\pgf@shorten@end@additional
\newdimen\pgf@shorten@start@additional
-\let\pgf@shorten@end=\pgf@empty
-\let\pgf@shorten@start=\pgf@empty
+\let\pgf@shorten@end=\pgfutil@empty
+\let\pgf@shorten@start=\pgfutil@empty
\def\pgf@shorten@path@as@needed{%
\pgfprocesspathextractpoints{\pgf@arrowpath}%
\let\pgf@arrow@next=\pgf@shorten@now%
- \ifx\pgf@shorten@start\pgf@empty%
- \ifx\pgf@shorten@end\pgf@empty%
+ \ifx\pgf@shorten@start\pgfutil@empty%
+ \ifx\pgf@shorten@end\pgfutil@empty%
\ifdim\pgf@shorten@end@additional=0pt\relax%
\ifdim\pgf@shorten@start@additional=0pt\relax%
\let\pgf@arrow@next=\relax%
@@ -204,13 +204,13 @@
}
\def\pgf@add@arrows@as@needed{%
- \ifx\pgf@startarrow\pgf@empty%
+ \ifx\pgf@startarrow\pgfutil@empty%
\else%
\pgflowlevelobj%
{\pgftransformarrow{\pgfpointsecondonpath}{\pgfpointfirstonpath}}
{\pgf@startarrow}%
\fi%
- \ifx\pgf@endarrow\pgf@empty%
+ \ifx\pgf@endarrow\pgfutil@empty%
\else%
\pgflowlevelobj%
{\pgftransformarrow{\pgfpointsecondlastonpath}{\pgfpointlastonpath}}
@@ -218,7 +218,7 @@
\fi%
}
-\let\pgf@startarrow=\pgf@empty
-\let\pgf@endarrow=\pgf@empty
+\let\pgf@startarrow=\pgfutil@empty
+\let\pgf@endarrow=\pgfutil@empty
\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepoints.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepoints.code.tex
index e4cde74a4f8..3f2a26be578 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepoints.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepoints.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepoints.code.tex,v 1.5 2006/10/11 15:22:25 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepoints.code.tex,v 1.7 2006/10/16 22:32:58 tantau Exp $
\newdimen\pgf@picminx
\newdimen\pgf@picmaxx
@@ -39,9 +39,9 @@
\global\pgf@tempdim\pgf@tempdim% make dimension global
\endgroup%
#1=\pgf@tempdim\relax}
-\newcounter{pgf@tempcount}
+\newcount\c@pgf@tempcount
\def\pgf@setcounter#1#2{%
- \setcounter{pgf@tempcount}{#2}% makes change global!
+ \pgflatex@setcounter{pgf@tempcount}{#2}% makes change global!
\csname c@#1\endcsname=\c@pgf@tempcount\relax}
\def\pgf@selectfont{\pgf@selectfontorig\nullfont}
@@ -419,8 +419,8 @@
\def\pgfpointpolar#1#2{%
\pgfsincos{#1}%
- \in@/{#2}%
- \ifin@%
+ \pgfutil@in@/{#2}%
+ \ifpgfutil@in@%
\pgf@polar@#2\@@%
\else%
\pgf@polar@#2/#2\@@%
@@ -450,8 +450,8 @@
\def\pgfpointpolarxy#1#2{%
\pgfsincos{#1}%
- \in@/{#2}%
- \ifin@%
+ \pgfutil@in@/{#2}%
+ \ifpgfutil@in@%
\pgf@polarxy@#2\@@%
\else%
\pgf@polarxy@#2/#2\@@%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex
index bad6e237ecb..a3bb4b05cef 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorescopes.code.tex,v 1.18 2006/10/11 15:22:25 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorescopes.code.tex,v 1.20 2006/10/23 08:38:17 tantau Exp $
% Globals
@@ -52,13 +52,13 @@
% \usepgflibrary{arrows}
% \usepgflibrary[patterns,snakes]
-\def\usepgflibrary{\pgf@ifnextchar[{\use@pgflibrary}{\use@@pgflibrary}}%}
+\def\usepgflibrary{\pgfutil@ifnextchar[{\use@pgflibrary}{\use@@pgflibrary}}%}
\def\use@pgflibrary[#1]{\use@@pgflibrary{#1}}
\def\use@@pgflibrary#1{%
\edef\pgf@list{#1}%
- \@for\pgf@temp:=\pgf@list\do{%
+ \pgfutil@for\pgf@temp:=\pgf@list\do{%
\expandafter\ifx\csname pgf@library@\pgf@temp @loaded\endcsname\relax%
- \expandafter\let\csname pgf@library@\pgf@temp @loaded\endcsname=\pgf@empty%
+ \expandafter\let\csname pgf@library@\pgf@temp @loaded\endcsname=\pgfutil@empty%
\expandafter\edef\csname pgf@library@#1@atcode\endcsname{\the\catcode`\@}
\expandafter\edef\csname pgf@library@#1@barcode\endcsname{\the\catcode`\|}
\catcode`\@=11
@@ -86,7 +86,7 @@
% \end{pgfscope}
\def\pgfscope{%
- \pgfsyssoftpath@setcurrentpath\pgf@empty%
+ \pgfsyssoftpath@setcurrentpath\pgfutil@empty%
\pgfsys@beginscope%
\pgf@resetpathsizes%
\edef\pgfscope@linewidth{\the\pgflinewidth}%
@@ -145,7 +145,7 @@
% \pgftransformshift{\pgfpoint{1cm}{0cm}}
% \pgftext{Hello World!}
-\def\pgftext{\pgf@ifnextchar[\pgf@text{\pgf@text[]}}%
+\def\pgftext{\pgfutil@ifnextchar[\pgf@text{\pgf@text[]}}%
\def\pgf@text[#1]{%
\def\pgf@text@options{#1}%
\pgf@maketext\pgf@after@text}
@@ -200,7 +200,7 @@
\let\next=%
}
\def\pgf@collectresetcolor{%
- \pgf@ifnextchar\reset@color%
+ \pgfutil@ifnextchar\reset@color%
{\reset@color\afterassignment\pgf@collectresetcolor\let\pgf@temp=}%
{\pgf@textdone}%
}
@@ -236,14 +236,14 @@
\begingroup%
\pgfpicturetrue%
\global\advance\pgf@picture@serial@count by1\relax%
- \edef\pgfpictureid{pgfid@\the\pgf@picture@serial@count}%
+ \edef\pgfpictureid{pgfid\the\pgf@picture@serial@count}%
\pgf@picmaxx=-16000pt\relax%
\pgf@picminx=16000pt\relax%
\pgf@picmaxy=-16000pt\relax%
\pgf@picminy=16000pt\relax%
\pgf@relevantforpicturesizetrue%
\pgf@resetpathsizes%
- \pgf@ifnextchar\bgroup\pgf@oldpicture\pgf@picture}
+ \pgfutil@ifnextchar\bgroup\pgf@oldpicture\pgf@picture}
\def\pgf@oldpicture#1#2#3#4{%
\setlength\pgf@picminx{#1}%
\setlength\pgf@picminy{#2}%
@@ -261,7 +261,7 @@
\pgfsetcolor{.}%
\pgfsetlinewidth{0.4pt}%
\pgftransformreset%
- \pgfsyssoftpath@setcurrentpath\pgf@empty%
+ \pgfsyssoftpath@setcurrentpath\pgfutil@empty%
\begingroup%
\let\pgf@setlengthorig=\setlength%
\let\pgf@addtolengthorig=\addtolength%
@@ -390,7 +390,7 @@
\edef\pgf@interrupt@savey{\the\pgf@path@lasty}%
\pgf@getpathsizes\pgf@interrupt@pathsizes%
\pgfsyssoftpath@getcurrentpath\pgf@interrupt@path%
- \pgfsyssoftpath@setcurrentpath\pgf@empty%
+ \pgfsyssoftpath@setcurrentpath\pgfutil@empty%
\edef\pgfscope@linewidth{\the\pgflinewidth}%
\let\pgf@interrupt@lastmoveto=\pgfsyssoftpath@lastmoveto%
\begingroup%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreshade.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreshade.code.tex
index 2eebc7d6035..e7d4c0a8081 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreshade.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreshade.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoreshade.code.tex,v 1.6 2006/10/11 15:22:25 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoreshade.code.tex,v 1.7 2006/10/16 22:32:58 tantau Exp $
%
% Parsing functions
@@ -20,16 +20,16 @@
\edef\temp{{\pgf@rgbconv}}%
\expandafter\pgf@@parsefunc\temp}
\def\pgf@@parsefunc#1{%
- \let\pgf@bounds=\pgf@empty%
- \let\pgf@funcs=\pgf@empty%
- \let\pgf@psfuncs=\pgf@empty%
- \let\pgf@encode=\pgf@empty%
- \let\pgf@sys@shading@ranges=\pgf@empty%
+ \let\pgf@bounds=\pgfutil@empty%
+ \let\pgf@funcs=\pgfutil@empty%
+ \let\pgf@psfuncs=\pgfutil@empty%
+ \let\pgf@encode=\pgfutil@empty%
+ \let\pgf@sys@shading@ranges=\pgfutil@empty%
\pgf@sys@shading@range@num=0\relax%
\pgf@parsefirst[#1; ]%
\pgf@parselastdom[#1; ]%
\pgf@parsemid[#1; ]%
- \ifx\pgf@bounds\pgf@empty%
+ \ifx\pgf@bounds\pgfutil@empty%
\edef\pgf@pdfparseddomain{0 1}%
\edef\pgf@pdfparsedfunction{\pgf@singlefunc\space}%
\else%
@@ -54,7 +54,7 @@
\edef\pgf@prevcolor{\pgf@rgb}%
\edef\pgf@firstcolor{\pgf@rgb}}
\def\pgf@parselastdom[rgb(#1)=(#2,#3,#4); {%
- \pgf@ifnextchar]{%
+ \pgfutil@ifnextchar]{%
\setlength\pgf@x{#1}%
\edef\pgf@sys@shading@end@pos{\the\pgf@x}%
\pgf@max=\pgf@x\relax%
@@ -62,11 +62,11 @@
\edef\pgf@domb{\pgf@sys@tonumber{\pgf@x}}%
\pgf@getrgbtuplewithmixin{#2}{#3}{#4}%
\edef\pgf@sys@shading@end@rgb{\pgf@sys@rgb}%
- \pgf@gobble}{\pgf@parselastdom[}}
+ \pgfutil@gobble}{\pgf@parselastdom[}}
\def\pgf@parsemid[rgb(#1)=(#2,#3,#4); {\pgf@parserest[}
\def\pgf@parserest[rgb(#1)=(#2,#3,#4); {%
\advance\pgf@sys@shading@range@num by1\relax%
- \pgf@ifnextchar]{%
+ \pgfutil@ifnextchar]{%
\pgf@getrgbtuplewithmixin{#2}{#3}{#4}%
\edef\pgf@singlefunc{\space%
<< /FunctionType 2 /Domain [0 1] /C0
@@ -79,7 +79,7 @@
\edef\pgf@sys@shading@ranges{\pgf@sys@shading@ranges{{\pgf@sys@prevpos}{\the\pgf@x}{\pgf@sys@prevcolor}{\pgf@sys@rgb}}}%
\edef\pgf@sys@prevpos{\the\pgf@x}%
\let\pgf@sys@prevcolor=\pgf@sys@rgb%
- \pgf@gobble}{%
+ \pgfutil@gobble}{%
\setlength\pgf@x{#1}%
\pgf@getrgbtuplewithmixin{#2}{#3}{#4}%
\edef\pgf@sys@shading@ranges{\pgf@sys@shading@ranges{{\pgf@sys@prevpos}{\the\pgf@x}{\pgf@sys@prevcolor}{\pgf@sys@rgb}}}%
@@ -100,10 +100,10 @@
\pgf@parserest[}}
\def\pgf@getrgbtuplewithmixin#1#2#3{%
- \definecolor{pgfshadetemp}{rgb}{#1,#2,#3}%
- \pgf@ifundefined{applycolormixins}{}{\applycolormixins{pgfshadetemp}}%
- \extractcolorspec{pgfshadetemp}{\pgf@tempcolor}%
- \expandafter\convertcolorspec\pgf@tempcolor{rgb}{\pgf@rgbcolor}%
+ \pgfutil@definecolor{pgfshadetemp}{rgb}{#1,#2,#3}%
+ \pgfutil@ifundefined{applycolormixins}{}{\applycolormixins{pgfshadetemp}}%
+ \pgfutil@extractcolorspec{pgfshadetemp}{\pgf@tempcolor}%
+ \expandafter\pgfutil@convertcolorspec\pgf@tempcolor{rgb}{\pgf@rgbcolor}%
\expandafter\pgf@getrgb@@\pgf@rgbcolor!}
\def\pgf@getrgb@@#1,#2,#3!{%
\def\pgf@rgb{#1 #2 #3}%
@@ -116,15 +116,15 @@
\pgf@converttorgb#1]%
}
\def\pgf@converttorgb{%
- \pgf@ifnextchar]{\pgf@gobble}%done!
+ \pgfutil@ifnextchar]{\pgfutil@gobble}%done!
{%
- \pgf@ifnextchar;{\pgf@grabsemicolor}%
+ \pgfutil@ifnextchar;{\pgf@grabsemicolor}%
{%
- \pgf@ifnextchar r{\pgf@grabrgb}%
+ \pgfutil@ifnextchar r{\pgf@grabrgb}%
{%
- \pgf@ifnextchar g{\pgf@grabgray}%
+ \pgfutil@ifnextchar g{\pgf@grabgray}%
{%
- \pgf@ifnextchar c{\pgf@grabcolor}%
+ \pgfutil@ifnextchar c{\pgf@grabcolor}%
{\PackageError{pgfshade}{Illformed shading
specification}{}\pgf@converttorgb}%
}%
@@ -139,9 +139,9 @@
\def\pgf@grabgray gray(#1)=(#2){%
\edef\pgf@rgbconv{\pgf@rgbconv rgb(#1)=(#2,#2,#2)}\pgf@converttorgb}
\def\pgf@grabcolor color(#1)=(#2){%
- \colorlet{pgf@tempcol}{#2}%
- \extractcolorspec{pgf@tempcol}{\pgf@tempcolor}%
- \expandafter\convertcolorspec\pgf@tempcolor{rgb}{\pgf@rgbcolor}%
+ \pgfutil@colorlet{pgf@tempcol}{#2}%
+ \pgfutil@extractcolorspec{pgf@tempcol}{\pgf@tempcolor}%
+ \expandafter\pgfutil@convertcolorspec\pgf@tempcolor{rgb}{\pgf@rgbcolor}%
\expandafter\pgf@convgetrgb@\expandafter{\pgf@rgbcolor}{#1}%
}
\def\pgf@convgetrgb@#1#2{%
@@ -174,15 +174,15 @@
% The following bar is 2cm long: \pgfuseshading{redtogreentoblue}.
% \end{document}
-\def\pgfdeclarehorizontalshading{\pgf@ifnextchar[\pgf@declarehorizontalshading{\pgf@declarehorizontalshading[]}}%
+\def\pgfdeclarehorizontalshading{\pgfutil@ifnextchar[\pgf@declarehorizontalshading{\pgf@declarehorizontalshading[]}}%
\def\pgf@declarehorizontalshading[#1]#2#3#4{%
\expandafter\def\csname pgf@deps@pgfshading#2!\endcsname{#1}%
- \expandafter\ifx\csname pgf@deps@pgfshading#2!\endcsname\pgf@empty%
+ \expandafter\ifx\csname pgf@deps@pgfshading#2!\endcsname\pgfutil@empty%
\pgfsys@horishading{#2}{#3}{#4}%
\else%
\expandafter\def\csname pgf@func@pgfshading#2!\endcsname{\pgfsys@horishading}%
\expandafter\def\csname pgf@args@pgfshading#2!\endcsname{{#3}{#4}}%
- \expandafter\let\csname @pgfshading#2!\endcsname=\pgf@empty%
+ \expandafter\let\csname @pgfshading#2!\endcsname=\pgfutil@empty%
\fi}
@@ -203,15 +203,15 @@
% The following bar is 2cm high: \pgfuseshading{redtogreentoblue}.
% \end{document}
-\def\pgfdeclareverticalshading{\pgf@ifnextchar[\pgf@declareverticalshading{\pgf@declareverticalshading[]}}%
+\def\pgfdeclareverticalshading{\pgfutil@ifnextchar[\pgf@declareverticalshading{\pgf@declareverticalshading[]}}%
\def\pgf@declareverticalshading[#1]#2#3#4{%
\expandafter\def\csname pgf@deps@pgfshading#2!\endcsname{#1}%
- \expandafter\ifx\csname pgf@deps@pgfshading#2!\endcsname\pgf@empty%
+ \expandafter\ifx\csname pgf@deps@pgfshading#2!\endcsname\pgfutil@empty%
\pgfsys@vertshading{#2}{#3}{#4}%
\else%
\expandafter\def\csname pgf@func@pgfshading#2!\endcsname{\pgfsys@vertshading}%
\expandafter\def\csname pgf@args@pgfshading#2!\endcsname{{#3}{#4}}%
- \expandafter\let\csname @pgfshading#2!\endcsname=\pgf@empty%
+ \expandafter\let\csname @pgfshading#2!\endcsname=\pgfutil@empty%
\fi}
@@ -245,15 +245,15 @@
% The following ball has diameter 3cm: \pgfuseshading{redtogreentoblue}.
% \end{document}
-\def\pgfdeclareradialshading{\pgf@ifnextchar[\pgf@declareradialshading{\pgf@declareradialshading[]}}%
+\def\pgfdeclareradialshading{\pgfutil@ifnextchar[\pgf@declareradialshading{\pgf@declareradialshading[]}}%
\def\pgf@declareradialshading[#1]#2#3#4{%
\expandafter\def\csname pgf@deps@pgfshading#2!\endcsname{#1}%
- \expandafter\ifx\csname pgf@deps@pgfshading#2!\endcsname\pgf@empty%
+ \expandafter\ifx\csname pgf@deps@pgfshading#2!\endcsname\pgfutil@empty%
\pgfsys@radialshading{#2}{#3}{#4}%
\else%
\expandafter\def\csname pgf@func@pgfshading#2!\endcsname{\pgfsys@radialshading}%
\expandafter\def\csname pgf@args@pgfshading#2!\endcsname{{#3}{#4}}%
- \expandafter\let\csname @pgfshading#2!\endcsname=\pgf@empty%
+ \expandafter\let\csname @pgfshading#2!\endcsname=\pgfutil@empty%
\fi}
@@ -269,27 +269,27 @@
\def\pgfuseshading#1{%
\edef\pgf@shadingname{@pgfshading#1}%
\pgf@tryextensions{\pgf@shadingname}{\pgfalternateextension}%
- \expandafter\pgf@ifundefined\expandafter{\pgf@shadingname}%
+ \expandafter\pgfutil@ifundefined\expandafter{\pgf@shadingname}%
{\PackageError{pgfshade}{Undefined shading "#1"}{}}%
{%
{%
- \globalcolorsfalse%
+ \pgfutil@globalcolorsfalse%
\def\pgf@shade@adds{}%
- \pgf@ifundefined{pgf@deps\pgf@shadingname}%
+ \pgfutil@ifundefined{pgf@deps\pgf@shadingname}%
{}%
{%
\edef\@list{\csname pgf@deps\pgf@shadingname\endcsname}%
- \@for\@temp:=\@list\do{%
+ \pgfutil@for\@temp:=\@list\do{%
{%
- \pgf@ifundefined{applycolormixins}{}{\applycolormixins{\@temp}}%
- \extractcolorspec{\@temp}{\pgf@tempcolor}%
- \expandafter\convertcolorspec\pgf@tempcolor{rgb}{\pgf@rgbcolor}%
+ \pgfutil@ifundefined{applycolormixins}{}{\applycolormixins{\@temp}}%
+ \pgfutil@extractcolorspec{\@temp}{\pgf@tempcolor}%
+ \expandafter\pgfutil@convertcolorspec\pgf@tempcolor{rgb}{\pgf@rgbcolor}%
\xdef\pgf@shade@adds{\pgf@shade@adds,\pgf@rgbcolor}%
}%
}%
}%
\expandafter\pgf@strip@shadename\pgf@shadingname!!%
- \pgf@ifundefined{@pgfshading\pgf@basename\pgf@shade@adds!}%
+ \pgfutil@ifundefined{@pgfshading\pgf@basename\pgf@shade@adds!}%
{%
{%
\expandafter\def\expandafter\@temp\expandafter{\csname pgf@func\pgf@shadingname\endcsname}%
@@ -406,7 +406,7 @@
\pgfsys@transformcm%
{\pgf@sys@tonumber{\pgf@y}}{\pgf@sys@tonumber{\pgf@x}}%
{\pgf@sys@tonumber{\pgf@xa}}{\pgf@sys@tonumber{\pgf@y}}{0pt}{0pt}%
- \ifx\pgf@shade@extra@transform\pgf@empty%
+ \ifx\pgf@shade@extra@transform\pgfutil@empty%
\else%
\pgflowlevel{\pgf@shade@extra@transform}%
\fi%
@@ -427,7 +427,7 @@
% \pgfsetadditionalshadetransform{\pgftransformrotate{30}}
\def\pgfsetadditionalshadetransform#1{\def\pgf@shade@extra@transform{#1}}
-\let\pgf@shade@extra@transform=\pgf@empty
+\let\pgf@shade@extra@transform=\pgfutil@empty