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 | |
| 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')
66 files changed, 2038 insertions, 1270 deletions
diff --git a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbim.tex b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbim.tex index 093f1d92c9a..3545a72dcd6 100644 --- a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbim.tex +++ b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbim.tex @@ -12,12 +12,15 @@ \edef\pgfbaseimageatcode{\the\catcode`\@} \edef\pgfbaseimagebarcode{\the\catcode`\|} +\edef\pgfbaseimageexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 \input pgfbaseimage.code.tex \catcode`\@=\pgfbaseimageatcode \catcode`\|=\pgfbaseimagebarcode +\catcode`\!=\pgfbaseimageexclaimcode \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbla.tex b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbla.tex index efc458bf6c3..26e7ac48348 100644 --- a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbla.tex +++ b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbla.tex @@ -12,13 +12,16 @@ \edef\pgfbaselayersatcode{\the\catcode`\@} \edef\pgfbaselayersbarcode{\the\catcode`\|} +\edef\pgfbaselayersexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 \input pgfbaselayers.code.tex \catcode`\@=\pgfbaselayersatcode \catcode`\|=\pgfbaselayersbarcode +\catcode`\!=\pgfbaselayersexclaimcode \let\startpgfonlayer=\pgfonlayer \let\stoppgfonlayer=\endpgfonlayer diff --git a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbpl.tex b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbpl.tex index 8dde1e1721c..f2884d85be4 100644 --- a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbpl.tex +++ b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbpl.tex @@ -12,12 +12,15 @@ \edef\pgfbaseplotatcode{\the\catcode`\@} \edef\pgfbaseplotbarcode{\the\catcode`\|} +\edef\pgfbaseplotexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 \input pgfbaseplot.code.tex \catcode`\@=\pgfbaseplotatcode \catcode`\|=\pgfbaseplotbarcode +\catcode`\|=\pgfbaseplotexclaimcode \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbpt.tex b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbpt.tex index a6fa8f1bc9c..20ac6d984b9 100644 --- a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbpt.tex +++ b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbpt.tex @@ -12,12 +12,15 @@ \edef\pgfbasepatternsatcode{\the\catcode`\@} \edef\pgfbasepatternsbarcode{\the\catcode`\|} +\edef\pgfbasepatternsexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 \input pgfbasepatterns.code.tex \catcode`\@=\pgfbasepatternsatcode \catcode`\|=\pgfbasepatternsbarcode +\catcode`\!=\pgfbasepatternsexclaimcode \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbsh.tex b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbsh.tex index 45b3af25e99..02dfd4c0ae9 100644 --- a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbsh.tex +++ b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbsh.tex @@ -12,12 +12,15 @@ \edef\pgfbaseshapesatcode{\the\catcode`\@} \edef\pgfbaseshapesbarcode{\the\catcode`\|} +\edef\pgfbaseshapesexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 \input pgfbaseshapes.code.tex \catcode`\@=\pgfbaseshapesatcode \catcode`\|=\pgfbaseshapesbarcode +\catcode`\!=\pgfbaseshapesexclaimcode \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbsn.tex b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbsn.tex index 85ec116206a..1c50fb16ec0 100644 --- a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbsn.tex +++ b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfbsn.tex @@ -12,12 +12,15 @@ \edef\pgfbasesnakesatcode{\the\catcode`\@} \edef\pgfbasesnakesbarcode{\the\catcode`\|} +\edef\pgfbasesnakesexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 \input pgfbasesnakes.code.tex \catcode`\@=\pgfbasesnakesatcode \catcode`\|=\pgfbasesnakesbarcode +\catcode`\!=\pgfbasesnakesexclaimcode \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfcor.tex b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfcor.tex index afaefba3644..be03adc2afd 100644 --- a/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfcor.tex +++ b/Master/texmf-dist/tex/context/pgf/basiclayer/t-pgfcor.tex @@ -18,13 +18,16 @@ \edef\pgfcoreatcode{\the\catcode`\@} \edef\pgfcorebarcode{\the\catcode`\|} +\edef\pgfcoreexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 \input pgfcore.code.tex \catcode`\@=\pgfcoreatcode \catcode`\|=\pgfcorebarcode +\catcode`\!=\pgfcoreexclaimcode \let\startpgfpicture=\pgfpicture \let\stoppgfpicture=\endpgfpicture diff --git a/Master/texmf-dist/tex/context/pgf/frontendlayer/t-tikz.tex b/Master/texmf-dist/tex/context/pgf/frontendlayer/t-tikz.tex index aa9abe49ffc..7a7f3a4f87c 100644 --- a/Master/texmf-dist/tex/context/pgf/frontendlayer/t-tikz.tex +++ b/Master/texmf-dist/tex/context/pgf/frontendlayer/t-tikz.tex @@ -14,17 +14,19 @@ \input t-pgf.tex \input t-pgffor.tex -\input t-pgflph.tex \edef\tikzatcode{\the\catcode`\@} \edef\tikzbarcode{\the\catcode`\|} +\edef\tikzexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 \input tikz.code.tex \catcode`\@=\tikzatcode \catcode`\|=\tikzbarcode +\catcode`\!=\tikzexclaimcode \let\starttikzpicture=\tikzpicture \let\stoptikzpicture=\endtikzpicture diff --git a/Master/texmf-dist/tex/context/pgf/systemlayer/t-pgfsys.tex b/Master/texmf-dist/tex/context/pgf/systemlayer/t-pgfsys.tex index 606062a56be..8b2453b094f 100644 --- a/Master/texmf-dist/tex/context/pgf/systemlayer/t-pgfsys.tex +++ b/Master/texmf-dist/tex/context/pgf/systemlayer/t-pgfsys.tex @@ -17,8 +17,10 @@ \edef\pgfsysatcode{\the\catcode`\@} \edef\pgfsysbarcode{\the\catcode`\|} +\edef\pgfsysexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 \input pgfsys.code.tex \input pgfsyssoftpath.code.tex @@ -26,6 +28,7 @@ \catcode`\@=\pgfsysatcode \catcode`\|=\pgfsysbarcode +\catcode`\!=\pgfsysexclaimcode \fi diff --git a/Master/texmf-dist/tex/context/pgf/utilities/t-pgfrcs.tex b/Master/texmf-dist/tex/context/pgf/utilities/t-pgfrcs.tex index ad48baf1d2c..a0a12dd47be 100644 --- a/Master/texmf-dist/tex/context/pgf/utilities/t-pgfrcs.tex +++ b/Master/texmf-dist/tex/context/pgf/utilities/t-pgfrcs.tex @@ -16,14 +16,19 @@ \edef\pgfrcsatcode{\the\catcode`\@} \edef\pgfrcsbarcode{\the\catcode`\|} +\edef\pgfrcsexclaimcode{\the\catcode`\!} \catcode`\@=11 \catcode`\|=12 +\catcode`\!=12 + +\input pgfutil-common.tex +\input pgfutil-context.def \input pgfrcs.code.tex -\input pgf-latex-emulation.tex \catcode`\@=\pgfrcsatcode \catcode`\|=\pgfrcsbarcode +\catcode`\!=\pgfrcsexclaimcode \fi 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 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 diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex index afd5f3509b4..0a1572cd894 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryplothandlers.code.tex,v 1.7 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryplothandlers.code.tex,v 1.8 2006/10/16 22:32:59 tantau Exp $ \newif\ifpgf@plot@started @@ -26,7 +26,7 @@ \def\pgfplothandlercurveto{% \def\pgf@plotstreamstart{% \global\let\pgf@plotstreampoint=\pgf@plot@curveto@handler@initial% - \global\let\pgf@plotstreamspecial=\pgf@gobble% + \global\let\pgf@plotstreamspecial=\pgfutil@gobble% \global\let\pgf@plotstreamend=\pgf@plot@curveto@handler@finish% \global\pgf@plot@startedfalse% }% @@ -116,7 +116,7 @@ \def\pgfplothandlerclosedcurve{% \def\pgf@plotstreamstart{% \global\let\pgf@plotstreampoint=\pgf@plot@closedcurve@handler@initial% - \global\let\pgf@plotstreamspecial=\pgf@gobble% + \global\let\pgf@plotstreamspecial=\pgfutil@gobble% \global\let\pgf@plotstreamend=\pgf@plot@closedcurve@handler@finish% }% } @@ -279,7 +279,7 @@ \def\pgfplothandlerxcomb{% \def\pgf@plotstreamstart{% \global\let\pgf@plotstreampoint=\pgf@plot@xcomb@handler% - \global\let\pgf@plotstreamspecial=\pgf@gobble% + \global\let\pgf@plotstreamspecial=\pgfutil@gobble% \global\let\pgf@plotstreamend=\relax% }% } @@ -305,7 +305,7 @@ \def\pgfplothandlerycomb{% \def\pgf@plotstreamstart{% \global\let\pgf@plotstreampoint=\pgf@plot@ycomb@handler% - \global\let\pgf@plotstreamspecial=\pgf@gobble% + \global\let\pgf@plotstreamspecial=\pgfutil@gobble% \global\let\pgf@plotstreamend=\relax% }% } @@ -334,7 +334,7 @@ \def\pgfplothandlerpolarcomb{% \def\pgf@plotstreamstart{% \global\let\pgf@plotstreampoint=\pgf@plot@polarcomb@handler% - \global\let\pgf@plotstreamspecial=\pgf@gobble% + \global\let\pgf@plotstreamspecial=\pgfutil@gobble% \global\let\pgf@plotstreamend=\relax% }% } @@ -380,7 +380,7 @@ \global\pgf@plot@mark@count=\pgf@plot@mark@repeat\relax% \global\advance\pgf@plot@mark@count by-\pgf@plot@mark@phase\relax% \global\let\pgf@plotstreampoint=\pgf@plot@mark@handler% - \global\let\pgf@plotstreamspecial=\pgf@gobble% + \global\let\pgf@plotstreamspecial=\pgfutil@gobble% \global\let\pgf@plotstreamend=\relax% }% } @@ -432,13 +432,13 @@ % \pgfplotxyfile{mytable} \def\pgfplothandlermarklisted#1#2{% - \let\pgf@plot@mark@list=\pgf@empty% + \let\pgf@plot@mark@list=\pgfutil@empty% \edef\pgf@marshal{\noexpand\foreach\noexpand\pgf@temp in{#2}} \pgf@marshal{\xdef\pgf@plot@mark@list{\pgf@plot@mark@list(\pgf@temp)}}% \pgf@plothandlermark{% - \edef\pgf@marshal{\noexpand\in@{(\the\pgf@plot@mark@count)}{\pgf@plot@mark@list}}% + \edef\pgf@marshal{\noexpand\pgfutil@in@{(\the\pgf@plot@mark@count)}{\pgf@plot@mark@list}}% \pgf@marshal% - \ifin@#1\fi}% + \ifpgfutil@in@#1\fi}% } diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex index 80a2ca35f55..b7ec179de63 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex,v 1.14 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex,v 1.17 2006/10/17 18:57:25 tantau Exp $ @@ -53,7 +53,7 @@ \setlength\pgf@xc{\pgfsnakesegmentamplitude}% \pgfpathrectangle {\pgfpoint{.5\@tempdima}{-.5\pgf@xc}} - {\pgfpoint{\pgfsnakeremainingdistance-.5\@tempdimb-.5\@tempdima}{\pgf@xc}} + {\pgfpoint{\pgfsnakeremainingdistance+-.5\@tempdimb+-.5\@tempdima}{\pgf@xc}} } \state{end}[width=0pt,next state=final] { @@ -137,8 +137,8 @@ \def\tikz@parse@switch from (#1) to (#2)\pgf@unique{% \def\tikz@to@path{% \pgfextra{% - \colorlet{tikz@switch@from}{#1}% - \colorlet{tikz@switch@to}{#2}% + \pgfutil@colorlet{tikz@switch@from}{#1}% + \pgfutil@colorlet{tikz@switch@to}{#2}% \tikz@compute@circle@radii\tikz@compute@segmentamplitude% \tikz@compute@rotation% } @@ -216,31 +216,31 @@ \tikzstyle{every mindmap}=[] -\tikzstyle{root concept}= [minimum size=4cm,text width=3.5cm,font=\large] +\tikzstyle{root concept}= [minimum size=4cm,text width=3.5cm,font=\pgfutil@font@large] \tikzstyle{level 1 concept}=[minimum size=2.25cm, level distance=5cm, text width=2cm, sibling angle=60, - font=\small] + font=\pgfutil@font@small] \tikzstyle{level 2 concept}=[minimum size=1.75cm,% level distance=2.9cm,% text width=1.5cm,% sibling angle=60,% - font=\footnotesize] + font=\pgfutil@font@footnotesize] \tikzstyle{level 3 concept}=[minimum size=1.15cm,% text width=1cm,% level distance=2.4cm,% sibling angle=30,% - font=\tiny] + font=\pgfutil@font@tiny] \tikzstyle{level 4 concept}=[minimum size=0.9cm,% text width=0.7cm, level distance=1.85cm,% sibling angle=30,% - font=\tiny] + font=\pgfutil@font@tiny] \tikzstyle{large mindmap}= [% - set style={{root concept}=[minimum size=5.6cm,text width=4.5cm,font=\Large]}, + set style={{root concept}=[minimum size=5.6cm,text width=4.5cm,font=\pgfutil@font@Large]}, set style={{level 1 concept}=[% minimum size=3.2cm, level distance=7cm, @@ -252,33 +252,33 @@ level distance=4cm,% text width=2.2cm,% sibling angle=60,% - font=\small% + font=\pgfutil@font@small% ]},% set style={{level 3 concept}=[% minimum size=1.63cm,% text width=1.4cm,% level distance=3.38cm,% sibling angle=30,% - font=\scriptsize]},% + font=\pgfutil@font@scriptsize]},% set style={{level 4 concept}=[% minimum size=1.27cm,% text width=1cm, level distance=2.60cm,% sibling angle=30,% - font=\tiny]},% + font=\pgfutil@font@tiny]},% mindmap,% line width=2pt ] \tikzstyle{huge mindmap}= [% - set style={{root concept}=[minimum size=8cm,text width=7cm,font=\huge]}, + set style={{root concept}=[minimum size=8cm,text width=7cm,font=\pgfutil@font@huge]}, set style={{level 1 concept}+=[% minimum size=4.5cm, level distance=10cm, text width=4cm, sibling angle=60, - font=\large]},% + font=\pgfutil@font@large]},% set style={{level 2 concept}+=[% minimum size=3.5cm,% level distance=5.8cm,% @@ -291,13 +291,13 @@ text width=2cm,% level distance=4.8cm,% sibling angle=30,% - font=\footnotesize]},% + font=\pgfutil@font@footnotesize]},% set style={{level 4 concept}+=[% minimum size=1.7cm,% text width=1.4cm, level distance=3.7cm,% sibling angle=30,% - font=\scriptsize]},% + font=\pgfutil@font@scriptsize]},% mindmap,% line width=3pt ] @@ -312,7 +312,7 @@ inner sep=1mm, text badly ragged, rounded corners, - font=\tiny, + font=\pgfutil@font@tiny, every annotation] \tikzstyle{every annotation}=[] diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzpetri.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzpetri.code.tex index ebb43bca13f..375713fa933 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzpetri.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzpetri.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzpetri.code.tex,v 1.3 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzpetri.code.tex,v 1.4 2006/10/17 08:16:28 tantau Exp $ % Styles for places: @@ -39,7 +39,7 @@ \tikzstyle{every token}= [] \tikzstyle{token}= [fill=black,draw=none,circle, inner sep=0.5pt,minimum size=1ex, - text=white,font=\tiny,every token] + text=white,font=\pgfutil@font@tiny,every token] \tikzoption{token distance}{\def\tikz@token@distance{#1}} \def\tikz@token@distance{1.5ex} diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztopaths.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztopaths.code.tex index c26ce1c018f..6e8cf9e0690 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztopaths.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztopaths.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikztopaths.code.tex,v 1.4 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikztopaths.code.tex,v 1.5 2006/10/16 22:32:59 tantau Exp $ % Straight to @@ -24,7 +24,7 @@ \tikzoption{bend left}[]{% \def\pgf@temp{#1}% - \ifx\pgf@temp\pgf@empty% + \ifx\pgf@temp\pgfutil@empty% \else% \def\tikz@to@bend{#1}% \fi% @@ -38,7 +38,7 @@ \tikzoption{bend right}[]{% \def\pgf@temp{#1}% - \ifx\pgf@temp\pgf@empty% + \ifx\pgf@temp\pgfutil@empty% \else% \def\tikz@to@bend{#1}% \fi% @@ -88,7 +88,7 @@ \def\tikz@to@setifnotempy#1#2#3{% \def\pgf@temp{#1}% - \ifx\pgf@temp\pgf@empty\else\def#2{#1}#3\fi% + \ifx\pgf@temp\pgfutil@empty\else\def#2{#1}#3\fi% } @@ -140,7 +140,7 @@ } \def\tikz@to@modify#1#2{% - \pgf@ifundefined{pgf@sh@ns@#1} + \pgfutil@ifundefined{pgf@sh@ns@#1} {}% {\edef#1{#1.#2}} }% @@ -254,10 +254,10 @@ % Adjust start and target so that they lie on the border in the % rotated coordinate system. % - \pgf@ifundefined{pgf@sh@ns@\tikztostart} + \pgfutil@ifundefined{pgf@sh@ns@\tikztostart} {% \let\tikz@first@point=\tikz@tofrom% - \let\tikz@tostart@tikz=\pgf@empty + \let\tikz@tostart@tikz=\pgfutil@empty }% {% % Start computation of new start. @@ -281,7 +281,7 @@ \tikz@first@point% \edef\tikz@tostart@tikz{(\the\pgf@x,\the\pgf@y)}% }% - \pgf@ifundefined{pgf@sh@ns@\tikztotarget} + \pgfutil@ifundefined{pgf@sh@ns@\tikztotarget} {% \let\tikz@second@point=\tikz@toto% }% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def index bdc3c16b905..1393e4522f7 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-pdf.def,v 1.6 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-pdf.def,v 1.7 2006/10/16 22:32:59 tantau Exp $ % Driver commands for pdf @@ -39,7 +39,7 @@ % Graphics state \def\pgfsys@setdash#1#2{% \pgfsysprotocol@literalbuffered{[}% - \@for\pgf@sys@temp:={#1}\do{\pgf@sys@bp{\pgf@sys@temp}}% + \pgfutil@for\pgf@sys@temp:={#1}\do{\pgf@sys@bp{\pgf@sys@temp}}% \pgfsysprotocol@literalbuffered{]}% \pgf@sys@bp{#2}\pgfsysprotocol@literal{d}} \def\pgfsys@setlinewidth#1{\pgf@sys@bp{#1}\pgfsysprotocol@literal{w}} diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def index 89d1d34f958..0247df3d9ea 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-postscript.def,v 1.14 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-postscript.def,v 1.15 2006/10/16 22:32:59 tantau Exp $ % Driver commands for postscript @@ -103,7 +103,7 @@ % Graphics state \def\pgfsys@setdash#1#2{% \pgfsysprotocol@literalbuffered{[}% - \@for\pgf@sys@temp:={#1}\do{\pgf@sys@bp{\pgf@sys@temp}}% + \pgfutil@for\pgf@sys@temp:={#1}\do{\pgf@sys@bp{\pgf@sys@temp}}% \pgfsysprotocol@literalbuffered{]}% \pgf@sys@bp{#2}\pgfsysprotocol@literal{setdash}} \def\pgfsys@setlinewidth#1{\pgf@sys@bp{#1}\pgfsysprotocol@literal{pgfw}} @@ -157,7 +157,7 @@ \expandafter\xdef\csname#1\endcsname{\the\pgf@objectcount}% \pgfsysprotocol@getcurrentprotocol\pgfsys@temp% {% - \pgfsysprotocol@setcurrentprotocol\pgf@empty% + \pgfsysprotocol@setcurrentprotocol\pgfutil@empty% \pgfsysprotocol@bufferedtrue% #4% \pgfsysprotocol@getcurrentprotocol\pgfsys@@temp% @@ -168,7 +168,7 @@ \def\pgfsys@useobject#1#2{% \pgfsysprotocol@getcurrentprotocol\pgfsys@temp% {% - \pgfsysprotocol@setcurrentprotocol\pgf@empty% + \pgfsysprotocol@setcurrentprotocol\pgfutil@empty% \pgfsysprotocol@bufferedfalse% #2% \pgfsysprotocol@invokecurrentprotocol% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def index 03a422f95e1..5dffff8b17c 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def @@ -7,14 +7,14 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-svg.def,v 1.17 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-svg.def,v 1.18 2006/10/16 22:32:59 tantau Exp $ % Driver commands for svg % Helping functions: -\let\pgf@sys@svgpath=\pgf@empty +\let\pgf@sys@svgpath=\pgfutil@empty \def\pgf@sys@svgnum#1{% {% \pgf@x=#1\relax% @@ -23,13 +23,13 @@ \xdef\pgf@sys@svgpath{\the\toks@}% }% } -\def\pgf@sys@addtosvgpath#1{\g@addto@macro\pgf@sys@svgpath{#1\space}} -\def\pgf@sys@flushsvgpath{\pgfsysprotocol@literal{\pgf@sys@svgpath}\global\let\pgf@sys@svgpath=\pgf@empty} +\def\pgf@sys@addtosvgpath#1{\pgfutil@g@addto@macro\pgf@sys@svgpath{#1\space}} +\def\pgf@sys@flushsvgpath{\pgfsysprotocol@literal{\pgf@sys@svgpath}\global\let\pgf@sys@svgpath=\pgfutil@empty} \def\pgf@sys@svg@gs#1{% {\pgfsysprotocol@literal{<g #1>\Hnewline }}\global\advance\pgf@sys@svg@scopecount by1\relax% } \newcount\pgf@sys@svg@objectcount -\let\Hnewline=\pgf@empty +\let\Hnewline=\pgfutil@empty % Path construction: \def\pgfsys@lineto#1#2{\pgf@sys@addtosvgpath{L }\pgf@sys@svgnum{#1}\pgf@sys@svgnum{#2}} @@ -79,7 +79,7 @@ \pgf@sys@svg@gs{clip-path="url(\#pgfcp\the\pgf@sys@svg@objectcount)"} \pgf@sys@svg@clipnextfalse% \else% - \global\let\pgf@sys@svgpath=\pgf@empty + \global\let\pgf@sys@svgpath=\pgfutil@empty \fi} % Fill rules: @@ -116,7 +116,7 @@ % Graphics state \def\pgfsys@setdash#1#2{% \edef\pgf@test@dashpattern{#1}% - \ifx\pgf@test@dashpattern\pgf@empty% + \ifx\pgf@test@dashpattern\pgfutil@empty% \pgf@sys@svg@gs{stroke-dasharray="none" stroke-dashoffset="#2"}% \else% \pgf@sys@svg@gs{stroke-dasharray="#1" stroke-dashoffset="#2"}% @@ -237,7 +237,7 @@ } \def\pgf@sys@svg@shading@dostops#1{% \edef\pgf@test{#1}% - \ifx\pgf@test\pgf@empty% + \ifx\pgf@test\pgfutil@empty% \else% \expandafter\pgf@sys@svg@shading@dostop\pgf@test% \expandafter\pgf@sys@svg@shading@dostops% @@ -261,7 +261,7 @@ \pgf@sys@svg@addtostops{\pgf@sys@svg@prepared}% } -\let\pgf@sys@svg@thestops=\pgf@empty +\let\pgf@sys@svg@thestops=\pgfutil@empty \def\pgf@sys@svg@addtostops#1{% \edef\pgf@temp{#1}% \expandafter\expandafter\expandafter\def diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def index 88cd20046e0..4627ba048ce 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvipdfm.def,v 1.10 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvipdfm.def,v 1.11 2006/10/26 17:19:42 tantau Exp $ % Driver commands for dvipdfm @@ -129,6 +129,35 @@ \def\@begindvi{\unvbox\@begindvibox\HyPL@EveryPage} } + +% +% Position tracking (needs pdftex >= 1.40.0-alpha-20051205 in dvi mode) +% +\ifx\pdftexversion\@undefined +\else + \ifnum\pdftexversion>139 + +\def\pgfsys@markposition#1{% + \pdfsavepos% + \edef\pgf@temp{#1}% + \expandafter\write\expandafter\pgfutil@auxout\expandafter{% + \expandafter\noexpand\expandafter\pgfsyspdfmark\expandafter{\pgf@temp}{\the\pdflastxpos}{\the\pdflastypos}}% +} + +\def\pgfsyspdfmark#1#2#3{% + \expandafter\gdef\csname pgf@sys@pdf@mark@pos@#1\endcsname{\pgfqpoint{#2sp}{#3sp}}% +} + +\def\pgfsys@getposition#1#2{% + \edef\pgf@marshal{\let\noexpand#2=\expandafter\noexpand\csname pgf@sys@pdf@mark@pos@#1\endcsname}% + \pgf@marshal% +} + +\def\pgf@sys@pdf@mark@pos@pgfpageorigin{\pgfpointorigin} + + \fi +\fi + \endinput %%% Local Variables: diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def index a633f7cc4e9..c66aca7b4d8 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvips.def,v 1.14 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvips.def,v 1.15 2006/10/26 17:19:43 tantau Exp $ % Driver commands for dvips @@ -89,6 +89,36 @@ \let\pgfsys@atbegindocument=\relax } + + +% +% Position tracking (needs pdftex >= 1.40.0-alpha-20051205 in dvi mode) +% +\ifx\pdftexversion\@undefined +\else + \ifnum\pdftexversion>139 + +\def\pgfsys@markposition#1{% + \pdfsavepos% + \edef\pgf@temp{#1}% + \expandafter\write\expandafter\pgfutil@auxout\expandafter{% + \expandafter\noexpand\expandafter\pgfsyspdfmark\expandafter{\pgf@temp}{\the\pdflastxpos}{\the\pdflastypos}}% +} + +\def\pgfsyspdfmark#1#2#3{% + \expandafter\gdef\csname pgf@sys@pdf@mark@pos@#1\endcsname{\pgfqpoint{#2sp}{#3sp}}% +} + +\def\pgfsys@getposition#1#2{% + \edef\pgf@marshal{\let\noexpand#2=\expandafter\noexpand\csname pgf@sys@pdf@mark@pos@#1\endcsname}% + \pgf@marshal% +} + +\def\pgf@sys@pdf@mark@pos@pgfpageorigin{\pgfpointorigin} + + \fi +\fi + \endinput %%% Local Variables: diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def index ce86689204c..be4d4d2fd3b 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-pdftex.def,v 1.12 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-pdftex.def,v 1.14 2006/10/23 08:38:18 tantau Exp $ % Driver commands for pdf @@ -42,8 +42,8 @@ }% } -\let\pgf@sys@pgf@resource@list@extgs=\pgf@empty% -\let\pgf@sys@pgf@resource@list@patterns=\pgf@empty% +\let\pgf@sys@pgf@resource@list@extgs=\pgfutil@empty% +\let\pgf@sys@pgf@resource@list@patterns=\pgfutil@empty% \def\pgf@sys@pdf@addtopageresources@extgs#1{% \xdef\pgf@sys@pgf@resource@list@extgs{\pgf@sys@pgf@resource@list@extgs\space#1}% @@ -56,13 +56,13 @@ } \def\pgf@sys@pdf@updateresources{% - \let\pgf@temp=\pgf@empty% - \ifx\pgf@sys@pgf@resource@list@extgs\pgf@empty% + \let\pgf@temp=\pgfutil@empty% + \ifx\pgf@sys@pgf@resource@list@extgs\pgfutil@empty% \else% \immediate\pdfobj{<<\pgf@sys@pgf@resource@list@extgs>>}% \edef\pgf@temp{/ExtGState \the\pdflastobj\space 0 R\space}% \fi% - \ifx\pgf@sys@pgf@resource@list@patterns=\pgf@empty% + \ifx\pgf@sys@pgf@resource@list@patterns=\pgfutil@empty% \else% \immediate\pdfobj{<<\pgf@sys@pgf@resource@list@patterns>>}% \edef\pgf@temp{% @@ -77,11 +77,11 @@ \def\pgfsys@imagesuffixlist{pdf:jpg:jpeg:png} \def\pgfsys@defineimage{% width, height, page number - \ifx\pgf@imagewidth\pgf@empty\else\edef\pgf@imagewidth{ width \pgf@imagewidth }\fi% - \ifx\pgf@imageheight\pgf@empty\else\edef\pgf@imageheight{ height \pgf@imageheight }\fi% - \ifx\pgf@imagepage\pgf@empty\else\edef\pgf@imagepage{ page \pgf@imagepage }\fi% + \ifx\pgf@imagewidth\pgfutil@empty\else\edef\pgf@imagewidth{ width \pgf@imagewidth }\fi% + \ifx\pgf@imageheight\pgfutil@empty\else\edef\pgf@imageheight{ height \pgf@imageheight }\fi% + \ifx\pgf@imagepage\pgfutil@empty\else\edef\pgf@imagepage{ page \pgf@imagepage }\fi% \ifx\pdfximage\@undefined% old version of pdflatex - \ifx\pgf@imagepage\pgf@empty\else% + \ifx\pgf@imagepage\pgfutil@empty\else% \PackageWarning{pgf}{Page selection not supported. Ignoring page selection}% \fi% @@ -97,7 +97,7 @@ \fi }% \def\pgfsys@definemask{% - \ifx\pgf@maskmatte\pgf@empty% + \ifx\pgf@maskmatte\pgfutil@empty% \else% \edef\pgf@maskmatte{/Matte [\pgf@maskmatte]}% \fi% @@ -247,11 +247,11 @@ \def\pgfsys@markposition#1{% \pdfsavepos% \edef\pgf@temp{#1}% - \expandafter\write\expandafter\@auxout\expandafter{% - \expandafter\noexpand\expandafter\pgf@sys@pdf@mark\expandafter{\pgf@temp}{\the\pdflastxpos}{\the\pdflastypos}}% + \expandafter\write\expandafter\pgfutil@auxout\expandafter{% + \expandafter\noexpand\expandafter\pgfsyspdfmark\expandafter{\pgf@temp}{\the\pdflastxpos}{\the\pdflastypos}}% } -\def\pgf@sys@pdf@mark#1#2#3{% +\def\pgfsyspdfmark#1#2#3{% \expandafter\gdef\csname pgf@sys@pdf@mark@pos@#1\endcsname{\pgfqpoint{#2sp}{#3sp}}% } diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def index 5bab839a2db..c2be445e31f 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-tex4ht.def,v 1.13 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-tex4ht.def,v 1.14 2006/10/16 22:32:59 tantau Exp $ \RequirePackage{xcolor} @@ -108,7 +108,7 @@ \pgf@x=.5\wd#1% \ifx\tikz@textcolor\relax% \else% - \ifx\tikz@textcolor\pgf@empty% + \ifx\tikz@textcolor\pgfutil@empty% \pgfsetfillcolor{.}% \else% \pgfsetfillcolor{\tikz@textcolor}% @@ -119,7 +119,7 @@ transform="scale(1,-1) translate(\pgf@sys@tonumber{\pgf@x},0)" text-anchor="middle" }% - \ifx\f@size\pgf@empty% + \ifx\f@size\pgfutil@empty% \else% \HCode{ font-size="\f@size"}% \fi% @@ -131,7 +131,7 @@ \HCode{</text>\Hnewline }% } -\def\pgfsys@outerinvoke{\ifpgfpicture\expandafter\pgfsys@invoke\else\expandafter\pgf@gobble\fi} +\def\pgfsys@outerinvoke{\ifpgfpicture\expandafter\pgfsys@invoke\else\expandafter\pgfutil@gobble\fi} \def\pgfsys@shadingoutsidepgfpicture#1{% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def index cac83871b86..06fdc4fe187 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-vtex.def,v 1.6 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-vtex.def,v 1.7 2006/10/16 22:32:59 tantau Exp $ % Driver commands for vtex @@ -40,8 +40,8 @@ \let\reset@color=\pgf@sys@vtex@reset@color% } \def\pgf@sys@vtex@setcolor#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@sys@vtex@@setcolor\csname\string\color@pgf@tempcolor\endcsname% } \def\pgf@sys@vtex@@setcolor#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex index 6057cbec149..b3cfbd76b75 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.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/systemlayer/pgfsys.code.tex,v 1.18 2006/10/11 15:22:26 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys.code.tex,v 1.19 2006/10/16 22:32:59 tantau Exp $ % @@ -39,50 +39,6 @@ } -% -% Useful commands that are used throughout pgf. The corresponding -% latex commands are not used because a) latex might not be in use and -% b) the latex commands are redefined by some *very vile and evil* -% packages. -% -\long\def\pgf@ifundefined#1{% - \expandafter\ifx\csname#1\endcsname\relax - \expandafter\pgf@firstoftwo - \else - \expandafter\pgf@secondoftwo - \fi} -\def\pgf@firstoftwo#1#2{#1} -\def\pgf@secondoftwo#1#2{#2} -\def\pgf@empty{} -\def\pgf@gobble#1{} -\def\pgf@gobbletwo#1#2{} -\long\def\pgf@ifnextchar#1#2#3{% - \let\reserved@d=#1% - \def\reserved@a{#2}% - \def\reserved@b{#3}% - \futurelet\pgf@let@token\pgf@ifnch} -\def\pgf@ifnch{% - \ifx\pgf@let@token\pgf@sptoken - \let\reserved@c\pgf@xifnch - \else - \ifx\pgf@let@token\reserved@d - \let\reserved@c\reserved@a - \else - \let\reserved@c\reserved@b - \fi - \fi - \reserved@c} -\def\:{\global\let\pgf@sptoken= } \: -\def\:{\pgf@xifnch} \expandafter\def\: {\futurelet\pgf@let@token\pgf@ifnch} -\def\pgf@namedef#1{\expandafter\def\csname #1\endcsname} -\long\def\pgf@g@addto@macro#1#2{% - \begingroup - \toks@\expandafter{#1#2}% - \xdef#1{\the\toks@}% - \endgroup} - - - % internal dimensions that are always present when pgsys is loaded. \newdimen\pgf@x \newdimen\pgf@y @@ -120,9 +76,9 @@ % given at the end. \def\pgf@sys@fail#1{% - \expandafter\ifx\csname pgf@sys@fail@#1\endcsname\pgf@empty% + \expandafter\ifx\csname pgf@sys@fail@#1\endcsname\pgfutil@empty% \else% - \expandafter\global\expandafter\let\csname pgf@sys@fail@#1\endcsname=\pgf@empty% + \expandafter\global\expandafter\let\csname pgf@sys@fail@#1\endcsname=\pgfutil@empty% \PackageWarning{pgf}{% Your graphic driver \pgfsysdriver\space does not supported #1. This warning is given only once}% \fi% @@ -408,7 +364,7 @@ % Example: Make stroked text dark red: \pgfsys@color@rgb@stroke{0.5}{0}{0} % % The special stroking color is only used if the stroking color has -% been set since the last \color command. Thus, each \color command +% been set since the last \pgfutil@color command. Thus, each \pgfutil@color command % should reset both the stroking and filling colors. \def\pgfsys@color@rgb@fill#1#2#3{\pgf@sys@fail{color}} @@ -418,7 +374,7 @@ \def\pgfsys@color@rgb#1#2#3{\pgfsys@color@rgb@stroke{#1}{#2}{#3}\pgfsys@color@rgb@fill{#1}{#2}{#3}} % Sets the color used for filling and stroking operations. This is a -% ``low-level'' version of the \color command. It is currently only +% ``low-level'' version of the \pgfutil@color command. It is currently only % used by the plain tex version to support colors. \def\pgfsys@color@cmyk@stroke#1#2#3#4{\pgf@sys@fail{color}} @@ -466,10 +422,10 @@ \def\pgfsys@color@reset{} -% This command will be called when the \color command is used. It +% This command will be called when the \pgfutil@color command is used. It % should purge any internal settings of stroking and filling % color. After this call, till the next use of a command like -% \pgfsys@color@rgb@fill, the current color installed by the \color +% \pgfsys@color@rgb@fill, the current color installed by the \pgfutil@color % command should be used. \def\pgfsys@color@unstacked#1{} @@ -767,9 +723,9 @@ % Called at the end of a ``pure'' pgfpicture. \def\pgfsys@defineimage{% - \ifx\pgf@imagewidth\pgf@empty\else\edef\pgf@imagewidth{width=\pgf@imagewidth,}\fi% - \ifx\pgf@imageheight\pgf@empty\else\edef\pgf@imageheight{height=\pgf@imageheight,}\fi% - \ifx\pgf@imagepage\pgf@empty\else\edef\pgf@imagepage{page=\pgf@imagepage,}\fi% + \ifx\pgf@imagewidth\pgfutil@empty\else\edef\pgf@imagewidth{width=\pgf@imagewidth,}\fi% + \ifx\pgf@imageheight\pgfutil@empty\else\edef\pgf@imageheight{height=\pgf@imageheight,}\fi% + \ifx\pgf@imagepage\pgfutil@empty\else\edef\pgf@imagepage{page=\pgf@imagepage,}\fi% \edef\pgf@image{\noexpand\includegraphics[\pgf@imageheight\pgf@imagewidth]{\pgf@filename}}% } % Called, when an image should be defined. @@ -822,7 +778,7 @@ \def\pgfsys@defobject#1#2#3#4{% \pgfsysprotocol@getcurrentprotocol\pgfsys@temp% {% - \pgfsysprotocol@setcurrentprotocol\pgf@empty% + \pgfsysprotocol@setcurrentprotocol\pgfutil@empty% \pgfsysprotocol@bufferedtrue% #4% \pgfsysprotocol@getcurrentprotocol\pgfsys@@temp% @@ -843,7 +799,7 @@ \def\pgfsys@useobject#1#2{% \pgfsysprotocol@getcurrentprotocol\pgfsys@temp% {% - \pgfsysprotocol@setcurrentprotocol\pgf@empty% + \pgfsysprotocol@setcurrentprotocol\pgfutil@empty% \pgfsysprotocol@bufferedfalse% #2% \expandafter\pgfsysprotocol@setcurrentprotocol\csname #1\endcsname% @@ -887,7 +843,7 @@ \input pgf.cfg \PackageInfo{pgfsys}{Driver file for pgf: \pgfsysdriver} -\InputIfFileExists{\pgfsysdriver}{}{% +\pgfutil@InputIfFileExists{\pgfsysdriver}{}{% \PackageError{pgfsys}{Driver file ``\pgfsysdriver'' not found.}{}} \endinput diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex index a241c6fbf75..b34ae3bcdc7 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsysprotocol.code.tex,v 1.3 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsysprotocol.code.tex,v 1.4 2006/10/16 22:32:59 tantau Exp $ @@ -24,14 +24,14 @@ -\let\pgfsysprotocol@currentprotocol=\pgf@empty +\let\pgfsysprotocol@currentprotocol=\pgfutil@empty \newif\ifpgfsysprotocol@buffered % Add to the protocol buffered \def\pgfsysprotocol@literalbuffered#1{% \edef\pgfsysprotocol@temp{{#1\space}}% - \expandafter\pgf@g@addto@macro\expandafter\pgfsysprotocol@currentprotocol\pgfsysprotocol@temp% + \expandafter\pgfutil@g@addto@macro\expandafter\pgfsysprotocol@currentprotocol\pgfsysprotocol@temp% } % Add to the protocol @@ -55,7 +55,7 @@ % Invoking the current protocol \def\pgfsysprotocol@invokecurrentprotocol{% - \ifx\pgfsysprotocol@currentprotocol\pgf@empty% + \ifx\pgfsysprotocol@currentprotocol\pgfutil@empty% \else% \expandafter\pgfsys@invoke\expandafter{\pgfsysprotocol@currentprotocol}% \fi% @@ -63,7 +63,7 @@ \def\pgfsysprotocol@flushcurrentprotocol{% \pgfsysprotocol@invokecurrentprotocol% - \pgfsysprotocol@setcurrentprotocol\pgf@empty% + \pgfsysprotocol@setcurrentprotocol\pgfutil@empty% } diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex index d92f0402782..2a5226b3668 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsyssoftpath.code.tex,v 1.3 2006/10/11 15:22:26 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsyssoftpath.code.tex,v 1.4 2006/10/16 22:32:59 tantau Exp $ % This package provides the pgf system path abstraction layer. This @@ -37,7 +37,7 @@ -\let\pgfsyssoftpath@currentpath=\pgf@empty +\let\pgfsyssoftpath@currentpath=\pgfutil@empty % The current path \def\pgfsyssoftpath@lastmoveto{{0pt}{0pt}} @@ -47,7 +47,7 @@ \edef\pgfsyssoftpath@temp{{% \noexpand\pgfsyssoftpath@movetotoken{#1}{#2}% }}% - \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% + \expandafter\pgfutil@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% \xdef\pgfsyssoftpath@lastmoveto{{#1}{#2}}% } @@ -56,7 +56,7 @@ \edef\pgfsyssoftpath@temp{{% \noexpand\pgfsyssoftpath@linetotoken{#1}{#2}% }}% - \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% + \expandafter\pgfutil@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% } % Add curveto elements to the current path @@ -66,7 +66,7 @@ \noexpand\pgfsyssoftpath@curvetosupportbtoken{#3}{#4}% \noexpand\pgfsyssoftpath@curvetotoken{#5}{#6}% }}% - \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% + \expandafter\pgfutil@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% } % Add rectanlge elements to the current path @@ -75,7 +75,7 @@ \noexpand\pgfsyssoftpath@rectcornertoken{#1}{#2}% \noexpand\pgfsyssoftpath@rectsizetoken{#3}{#4}% }}% - \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% + \expandafter\pgfutil@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% } % Add closepath element to the current path @@ -83,7 +83,7 @@ \edef\pgfsyssoftpath@temp{{% \noexpand\pgfsyssoftpath@closepathtoken\pgfsyssoftpath@lastmoveto% }}% - \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% + \expandafter\pgfutil@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% } % Add special element to the current path @@ -91,7 +91,7 @@ \edef\pgfsyssoftpath@temp{{% \noexpand\pgfsyssoftpath@specialroundtoken{#1}{#2}% }}% - \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% + \expandafter\pgfutil@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp% } @@ -112,7 +112,7 @@ \def\pgfsyssoftpath@flushcurrentpath{% \pgfsyssoftpath@invokecurrentpath% - \pgfsyssoftpath@setcurrentpath\pgf@empty% + \pgfsyssoftpath@setcurrentpath\pgfutil@empty% } % Marshallers @@ -121,7 +121,7 @@ \def\pgfsyssoftpath@rectcornertoken#1#2#3#4#5{\pgfsys@rect{#1}{#2}{#4}{#5}} % #3 = \pgfsyssoftpath@rectsizetoken \def\pgfsyssoftpath@curvetosupportatoken#1#2#3#4#5#6#7#8{\pgfsys@curveto{#1}{#2}{#4}{#5}{#7}{#8}} \def\pgfsyssoftpath@closepathtoken#1#2{\pgfsys@closepath} -\let\pgfsyssoftpath@specialroundtoken=\pgf@gobbletwo +\let\pgfsyssoftpath@specialroundtoken=\pgfutil@gobbletwo \endinput diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex deleted file mode 100644 index 257741a3c9a..00000000000 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex +++ /dev/null @@ -1,297 +0,0 @@ -% Copyright 2006 by Till Tantau -% -% This file may be distributed and/or modified -% -% 1. under the LaTeX Project Public License and/or -% 2. under the GNU Public License. -% -% See the file doc/generic/pgf/licenses/LICENSE for more details. - - -\catcode`\@=11\relax - -\def\pgf@test@fmtname{LaTeX2e} -\expandafter\ifx\csname fmtname\endcsname\pgf@test@fmtname% - \PackageError{pgf}{This file should not be loaded with \LaTeX.}{} -\else% - -% Direct copy from latex.ltx: -\def\typeout#1{\immediate\write\@unused{#1}} -\alloc@7\write\chardef\sixt@@n\@unused -\let\@@par=\par -\def\@empty{} -\def\@gobble #1{} -\def\@gobbletwo #1#2{} -\long\def\@ifnextchar#1#2#3{% - \let\reserved@d=#1% - \def\reserved@a{#2}% - \def\reserved@b{#3}% - \futurelet\@let@token\@ifnch} -\def\@ifnch{% - \ifx\@let@token\@sptoken - \let\reserved@c\@xifnch - \else - \ifx\@let@token\reserved@d - \let\reserved@c\reserved@a - \else - \let\reserved@c\reserved@b - \fi - \fi - \reserved@c} -\def\in@#1#2{% - \def\in@@##1#1##2##3\in@@{% - \ifx\in@##2\in@false\else\in@true\fi}% - \in@@#2#1\in@\in@@} -\newif\ifin@ -\newdimen\@tempdima -\newdimen\@tempdimb -\newcount\@tempcnta -\newcount\@tempcntb -\def\@namedef#1{\expandafter\def\csname #1\endcsname} -\long\def\g@addto@macro#1#2{% - \begingroup - \toks@\expandafter{#1#2}% - \xdef#1{\the\toks@}% - \endgroup} -\long\def\mbox#1{\leavevmode\hbox{#1}} -\def\:{\global\let\@sptoken= } \: -\def\:{\@xifnch} \expandafter\def\: {\futurelet\@let@token\@ifnch} -\def\@nnil{\@nil} -\def\@fornoop#1\@@#2#3{} -\long\def\@for#1:=#2\do#3{% - \expandafter\def\expandafter\@fortmp\expandafter{#2}% - \ifx\@fortmp\@empty \else - \expandafter\@forloop#2,\@nil,\@nil\@@#1{#3}\fi} -\long\def\@forloop#1,#2,#3\@@#4#5{\def#4{#1}\ifx #4\@nnil \else - #5\def#4{#2}\ifx #4\@nnil \else#5\@iforloop #3\@@#4{#5}\fi\fi} -\long\def\@iforloop#1,#2\@@#3#4{\def#3{#1}\ifx #3\@nnil - \expandafter\@fornoop \else - #4\relax\expandafter\@iforloop\fi#2\@@#3{#4}} -\def\@tfor#1:={\@tf@r#1 } -\long\def\@tf@r#1#2\do#3{\def\@fortmp{#2}\ifx\@fortmp\space\else - \@tforloop#2\@nil\@nil\@@#1{#3}\fi} -\long\def\@tforloop#1#2\@@#3#4{\def#3{#1}\ifx #3\@nnil - \expandafter\@fornoop \else - #4\relax\expandafter\@tforloop\fi#2\@@#3{#4}} -\chardef\@inputcheck0 -\def\IfFileExists#1#2#3{% - \openin\@inputcheck#1 % - \ifeof\@inputcheck - #3\relax - \else - #2\relax - \fi - \closein\@inputcheck} -\newbox\@tempboxa -\newif\if@tempswa -\long\def\@firstoftwo#1#2{#1} -\long\def\@secondoftwo#1#2{#2} - -% Simplified version of latex.ltx: -\def\PackageInfo#1#2{}%\typeout{Package #1: Info: #2.}}% -\def\PackageWarning#1#2{\typeout{Package #1: Warning! #2.}}% -\def\PackageError#1#2#3{\typeout{Package #1: Error! #2.}}% -\long\def\AtBeginDocument#1{#1}% -\long\def\AtBeginDvi#1{#1}% -\def\InputIfFileExists#1#2#3{\input #1\relax#2}% -\def\minipage[#1]#2{% - \hbox to#2\bgroup% - \hsize=#2\relax% - \vbox\bgroup\leavevmode% -} -\def\endminipage{\egroup\egroup} -\def\providecommand#1#2{\def#1{#2}} - -\def\newcounter#1{\expandafter\alloc@\expandafter0\expandafter\count\expandafter\countdef\expandafter\insc@unt\csname c@#1\endcsname}% -\def\setcounter#1#2{\global\csname c@#1\endcsname#2\relax}% -\def\addtocounter#1#2{\global\advance\csname c@#1\endcsname #2\relax} -\newskip\pgf@length@skip -\def\setlength#1#2{\pgf@length@skip#2\relax#1\pgf@length@skip} -\def\addtolength#1#2{\advance#1 #2\relax} - - -% Driver detector (not so good): -\ifx\pdfoutput\@undefined\alloc@0\count\countdef\insc@unt\pdfoutput\fi -\ifx\pdfoutput\relax\alloc@0\count\countdef\insc@unt\pdfoutput\fi -\ifcase\pdfoutput% - \gdef\Gin@driver{dvips.def}% -\else% - \gdef\Gin@driver{pdftex.def}% -\fi% - -% aux files -\newwrite\@auxout -\IfFileExists{\jobname.aux}{\input \jobname.aux\relax}{} -\openout\@auxout - -% Things that are not too clever, yet: -\def\selectfont{\rm} -\def\applycolormixins#1{} - - -% My ultra-quick xcolor.sty emulation... -\newif\ifglobalcolors -\def\definecolor#1#2#3{\csname pgf@emu@#2\endcsname{#1}#3\@nil} -\def\pgf@emu@rgb#1#2,#3,#4\@nil{\expandafter\def\csname\string\color@#1\endcsname{\xcolor@{}{}{rgb}{#2,#3,#4}}} -\def\pgf@emu@gray#1#2\@nil{\expandafter\def\csname\string\color@#1\endcsname{\xcolor@{}{}{rgb}{#2,#2,#2}}} - -\definecolor{white}{gray}{1} -\definecolor{black}{gray}{0} -\definecolor{gray}{gray}{0.5} -\definecolor{red}{rgb}{1,0,0} -\definecolor{green}{rgb}{0,1,0} -\definecolor{blue}{rgb}{0,0,1} -\definecolor{cyan}{rgb}{0,1,1} -\definecolor{magenta}{rgb}{1,0,1} -\definecolor{yellow}{rgb}{1,1,0} -\definecolor{orange}{rgb}{1,0.5,0} -\definecolor{violet}{rgb}{0.5,0,0.5} -\definecolor{purple}{rgb}{0.75,0,0.25} -\definecolor{brown}{rgb}{0.75,0.5,0.25} - -\ifx\color\@undefined -\def\color#1{% - \colorlet{.}{#1}% - \pgfsysprotocol@getcurrentprotocol\pgf@emu@temp% - {% - \pgfsysprotocol@setcurrentprotocol\@empty% - \pgfsysprotocol@bufferedtrue% - \pgfsetcolor{.}% - \expandafter\pgfsys@outerinvoke\expandafter{\pgfsysprotocol@currentprotocol}% - }% - \pgfsysprotocol@setcurrentprotocol\pgf@emu@temp% - \aftergroup\reset@color% -} -\fi - -\def\reset@color{% - \pgfsysprotocol@getcurrentprotocol\pgf@emu@temp% - {% - \pgfsysprotocol@setcurrentprotocol\@empty% - \pgfsysprotocol@bufferedtrue% - \pgfsetcolor{.}% - \expandafter\pgfsys@outerinvoke\expandafter{\pgfsysprotocol@currentprotocol}% - }% - \pgfsysprotocol@setcurrentprotocol\pgf@emu@temp% -} -\expandafter\def\csname\string\color@.\endcsname{\xcolor@{}{}{rgb}{0,0,0}} - - -\def\colorlet#1#2{% - \edef\pgf@marshal{#2}% - \expandafter\in@\expandafter!\expandafter{\pgf@marshal}% - \ifin@% - % compute mixture - {% - \expandafter\pgf@emu@mix\pgf@marshal!white!\@nil% - \xdef\pgf@marshal{\noexpand\def\expandafter\noexpand\csname\string\color@#1\endcsname{% - \noexpand\xcolor@{}{}{rgb}{\pgf@sys@tonumber\pgf@xa,\pgf@sys@tonumber\pgf@xb,\pgf@sys@tonumber\pgf@xc}}}% - }% - \pgf@marshal% - \else% - \edef\pgf@marshal{\noexpand\let\expandafter\noexpand\csname\string\color@#1\endcsname=% - \expandafter\noexpand\csname\string\color@#2\endcsname}% - \pgf@marshal% - \fi% -} -\def\pgf@emu@mix#1!#2!#3!#4\@nil{% - \expandafter\expandafter\expandafter\pgf@emu@unpack\csname\string\color@#1\endcsname% - \pgf@ya=\pgf@xa% - \pgf@yb=\pgf@xb% - \pgf@yc=\pgf@xc% - \expandafter\expandafter\expandafter\pgf@emu@unpack\csname\string\color@#3\endcsname% - \c@pgf@counta=#2\relax% - \c@pgf@countb=100\relax% - \advance\c@pgf@countb by-\c@pgf@counta\relax% - \pgf@xa=\c@pgf@countb\pgf@xa% - \advance\pgf@xa by\c@pgf@counta\pgf@ya% - \divide\pgf@xa by 100\relax% - \pgf@xb=\c@pgf@countb\pgf@xb% - \advance\pgf@xb by\c@pgf@counta\pgf@yb% - \divide\pgf@xb by 100\relax% - \pgf@xc=\c@pgf@countb\pgf@xc% - \advance\pgf@xc by\c@pgf@counta\pgf@yc% - \divide\pgf@xc by 100\relax% -} -\def\pgf@emu@unpack#1#2#3#4#5{% - \pgf@emu@@unpack#5\@nil% -} -\def\pgf@emu@@unpack#1,#2,#3\@nil{% - \pgf@xa=#1pt% - \pgf@xb=#2pt% - \pgf@xc=#3pt% -} - -\def\extractcolorspec#1#2{% - \def#2{{#1}}% -} - -\def\convertcolorspec#1#2#3{% - \edef#3{\expandafter\expandafter\expandafter\pgf@emu@select\csname\string\color@#1\endcsname}% -} -\def\pgf@emu@select#1#2#3#4#5{#5} - - - - -% Adapted from keyval.sty: -\newtoks\KV@toks@ - -\ifx\setkeys\@undefined -\def\setkeys#1#2{% - \def\KV@prefix{KV@#1@}% - \let\@tempc\relax - \KV@do#2,\relax,} -\def\KV@do#1,{% - \ifx\relax#1\empty\else - \KV@split#1==\relax - \expandafter\KV@do\fi} -\def\KV@split#1=#2=#3\relax{% - \KV@@sp@def\@tempa{#1}% - \ifx\@tempa\@empty\else - \expandafter\let\expandafter\@tempc - \csname\KV@prefix\@tempa\endcsname - \ifx\@tempc\relax - \KV@errx - {\@tempa\space undefined}% - \else - \ifx\@empty#3\@empty - \KV@default - \else - \KV@@sp@def\@tempb{#2}% - \expandafter\@tempc\expandafter{\@tempb}\relax - \fi - \fi - \fi} -\def\KV@default{% - \expandafter\let\expandafter\@tempb - \csname\KV@prefix\@tempa @default\endcsname - \ifx\@tempb\relax - \KV@errx{No value specified for \@tempa}% - \else - \@tempb\relax - \fi} -\def\KV@errx#1{\PackageError{keyval}{#1}{}} -\def\@tempa#1{% -\def\KV@@sp@def##1##2{% - \futurelet\KV@tempa\KV@@sp@d##2\@nil\@nil#1\@nil\relax##1}% -\def\KV@@sp@d{% - \ifx\KV@tempa\@sptoken - \expandafter\KV@@sp@b - \else - \expandafter\KV@@sp@b\expandafter#1% - \fi}% -\def\KV@@sp@b#1##1 \@nil{\KV@@sp@c##1}% - } -\@tempa{ } -\def\KV@@sp@c#1\@nil#2\relax#3{\KV@toks@{#1}\edef#3{\the\KV@toks@}} -\def\define@key#1#2{% - \@ifnextchar[{\KV@def{#1}{#2}}{\@namedef{KV@#1@#2}####1}} -\def\KV@def#1#2[#3]{% - \@namedef{KV@#1@#2@default\expandafter}\expandafter - {\csname KV@#1@#2\endcsname{#3}}% - \@namedef{KV@#1@#2}##1} -\fi% -\fi% - -\endinput diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex index 86b4106af18..6f2cc5f1996 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex @@ -7,15 +7,15 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/utilities/pgffor.code.tex,v 1.4 2006/10/11 15:22:26 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/utilities/pgffor.code.tex,v 1.5 2006/10/16 22:32:59 tantau Exp $ \newdimen\pgffor@iter \newdimen\pgffor@skip \newif\ifpgffor@continue -\let\pgffor@beginhook=\@empty -\let\pgffor@endhook=\@empty -\let\pgffor@afterhook=\@empty +\let\pgffor@beginhook=\pgfutil@empty +\let\pgffor@endhook=\pgfutil@empty +\let\pgffor@afterhook=\pgfutil@empty \def\pgffor@emptyvalues{, \pgffor@stop,}% @@ -25,13 +25,13 @@ \ifx\pgffor@values\pgffor@emptyvalues \def\pgffor@values{\pgffor@stop,}% \fi% - \let\pgffor@body\@empty% + \let\pgffor@body\pgfutil@empty% \global\pgffor@continuetrue% \pgffor@collectbody} \def\pgffor@collectbody{% - \@ifnextchar\foreach{\pgffor@collectforeach}{% - \@ifnextchar\bgroup{\pgffor@collectargument}{\pgffor@collectsemicolon}}% + \pgfutil@ifnextchar\foreach{\pgffor@collectforeach}{% + \pgfutil@ifnextchar\bgroup{\pgffor@collectargument}{\pgffor@collectsemicolon}}% } \def\pgffor@collectforeach\foreach#1in#2{% @@ -68,14 +68,14 @@ } \def\pgffor@iterate{% - \let\pgffor@last\@empty% - \let\pgffor@prevlast\@empty% + \let\pgffor@last\pgfutil@empty% + \let\pgffor@prevlast\pgfutil@empty% \expandafter\pgffor@scan\pgffor@values} \def\pgffor@stop{\pgffor@stop}% \def\pgffor@dots{...}% -\def\pgffor@scan{\@ifnextchar({\pgffor@scanround}{\pgffor@scanone}} +\def\pgffor@scan{\pgfutil@ifnextchar({\pgffor@scanround}{\pgffor@scanone}} \def\pgffor@scanround(#1)#2,{\def\pgffor@value{(#1)}\pgffor@scanned} \def\pgffor@scanone#1,{\def\pgffor@value{#1}\pgffor@scanned} @@ -134,7 +134,7 @@ \def\pgffor@multiassignrest{\expandafter\pgffor@multiassignfinal\pgffor@valuerest} \def\pgffor@multiassignfinal#1/#2/\relax{% \def\pgffor@test{#2}% - \ifx\pgffor@test\@empty% + \ifx\pgffor@test\pgfutil@empty% \def\pgffor@valuerest{#1//\relax}% repeat \else% \def\pgffor@valuerest{#2/\relax}% @@ -147,7 +147,7 @@ \def\pgffor@handledots{% - \ifx\pgffor@last\@empty% + \ifx\pgffor@last\pgfutil@empty% \PackageError{pgffor}{``...'' not allowed without prior value}{}% \fi% \pgffor@dotsscanend% @@ -155,7 +155,7 @@ \def\pgffor@dotsscanend#1,{% \def\pgffor@dotsend{#1}% % calculate skip% - \ifx\pgffor@prevlast\@empty% + \ifx\pgffor@prevlast\pgfutil@empty% \ifdim\pgffor@dotsend pt>\pgffor@last pt% \pgffor@skip=1pt% \else% diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex index 68c5150641a..d3a6b4d6077 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex @@ -15,7 +15,7 @@ % prints out a message to the log. -\def\pgfversion{1.09} +\def\pgfversion{1.10} \ifx\pgfrcsloaded\undefined @@ -24,8 +24,6 @@ \edef\pgfrcsatcode{\the\catcode`\@} \catcode`\@=11 -\def\@empty{} - % Get date and version from RCS Ids \def\pgf@parseid $#1: #2.#3,v #4 #5/#6/#7 #8${% \pgf@parsercsfile$#2/$ @@ -35,7 +33,7 @@ } \def\pgf@parsercsfile$#1/#2${ \def\pgf@temp{#2} - \ifx\pgf@temp\@empty + \ifx\pgf@temp\pgfutil@empty \def\pgf@rcsfile{#1} \else \pgf@parsercsfile$#2$ @@ -88,7 +86,7 @@ \def\ProvidesFile#1[#2]{\wlog{Loading file #1 version #2.}} \fi -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/utilities/pgfrcs.code.tex,v 1.12 2006/10/11 15:22:26 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/utilities/pgfrcs.code.tex,v 1.14 2006/10/26 16:07:01 tantau Exp $ \catcode`\@=\pgfrcsatcode diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex new file mode 100644 index 00000000000..e134db7a099 --- /dev/null +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex @@ -0,0 +1,119 @@ +% Copyright 2006 by Till Tantau +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. +% +% See the file doc/generic/pgf/licenses/LICENSE for more details. + + +% +% This file provides utitiliy commands that are used throughout pgf. +% +% For most commands, the definition of these commands is just given +% below. We cannot use the LaTeX definition of these commands since +% LaTeX may not be the current format and since LaTeX packages tend to +% redefine these commands. +% +% For some commands the actual definition of the format (like latex or +% context) is to be preferred over the generic definition below. In +% this case, the definition of the format is installed when the file +% pgfutil-XXXX.tex is read, where XXXX is the format name (latex, +% plain, or context). + + + +\catcode`\@=11\relax + + +% Simple stuff + +\long\def\pgfutil@ifundefined#1{% + \expandafter\ifx\csname#1\endcsname\relax + \expandafter\pgfutil@firstoftwo + \else + \expandafter\pgfutil@secondoftwo + \fi} +\def\pgfutil@firstoftwo#1#2{#1} +\def\pgfutil@secondoftwo#1#2{#2} +\def\pgfutil@empty{} +\def\pgfutil@gobble#1{} +\def\pgfutil@gobbletwo#1#2{} +\def\pgfutil@namedef#1{\expandafter\def\csname #1\endcsname} +\long\def\pgfutil@g@addto@macro#1#2{% + \begingroup + \toks@\expandafter{#1#2}% + \xdef#1{\the\toks@}% + \endgroup} +\newif\ifpgfutil@tempswa + +% pgfutil@ifnextchar + +\long\def\pgfutil@ifnextchar#1#2#3{% + \let\pgfutil@reserved@d=#1% + \def\pgfutil@reserved@a{#2}% + \def\pgfutil@reserved@b{#3}% + \futurelet\pgfutil@let@token\pgfutil@ifnch} +\def\pgfutil@ifnch{% + \ifx\pgfutil@let@token\pgfutil@sptoken + \let\pgfutil@reserved@c\pgfutil@xifnch + \else + \ifx\pgfutil@let@token\pgfutil@reserved@d + \let\pgfutil@reserved@c\pgfutil@reserved@a + \else + \let\pgfutil@reserved@c\pgfutil@reserved@b + \fi + \fi + \pgfutil@reserved@c} +\def\:{\global\let\pgfutil@sptoken= } \: +\def\:{\pgfutil@xifnch} \expandafter\def\: {\futurelet\pgfutil@let@token\pgfutil@ifnch} + + +% pgfutil@in@ + +\newif\ifpgfutil@in@ +\def\pgfutil@in@#1#2{% + \def\pgfutil@in@@##1#1##2##3\pgfutil@in@@{% + \ifx\pgfutil@in@##2\pgfutil@in@false\else\pgfutil@in@true\fi}% + \pgfutil@in@@#2#1\pgfutil@in@\pgfutil@in@@} + + +% pgfutil@for + +\def\pgfutil@nnil{\pgfutil@nil} +\def\pgfutil@fornoop#1\@@#2#3{} +\long\def\pgfutil@for#1:=#2\do#3{% + \expandafter\def\expandafter\pgfutil@fortmp\expandafter{#2}% + \ifx\pgfutil@fortmp\pgfutil@empty \else + \expandafter\pgfutil@forloop#2,\pgfutil@nil,\pgfutil@nil\@@#1{#3}\fi} +\long\def\pgfutil@forloop#1,#2,#3\@@#4#5{\def#4{#1}\ifx #4\pgfutil@nnil \else + #5\def#4{#2}\ifx #4\pgfutil@nnil \else#5\pgfutil@iforloop #3\@@#4{#5}\fi\fi} +\long\def\pgfutil@iforloop#1,#2\@@#3#4{\def#3{#1}\ifx #3\pgfutil@nnil + \expandafter\pgfutil@fornoop \else + #4\relax\expandafter\pgfutil@iforloop\fi#2\@@#3{#4}} +\def\pgfutil@tfor#1:={\pgfutil@tf@r#1 } +\long\def\pgfutil@tf@r#1#2\do#3{\def\pgfutil@fortmp{#2}\ifx\pgfutil@fortmp\space\else + \pgfutil@tforloop#2\pgfutil@nil\pgfutil@nil\@@#1{#3}\fi} +\long\def\pgfutil@tforloop#1#2\@@#3#4{\def#3{#1}\ifx #3\pgfutil@nnil + \expandafter\pgfutil@fornoop \else + #4\relax\expandafter\pgfutil@tforloop\fi#2\@@#3{#4}} + + +% pgfutil@IfFileExists + +\chardef\pgfutil@inputcheck0 +\def\pgfutil@IfFileExists#1#2#3{% + \openin\pgfutil@inputcheck#1 % + \ifeof\pgfutil@inputcheck + #3\relax + \else + #2\relax + \fi + \closein\pgfutil@inputcheck} + +\def\pgfutil@InputIfFileExists#1#2#3{\pgfutil@IfFileExists{#1}{\input #1\relax#2}{#3}}% + + + +\endinput diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def new file mode 100644 index 00000000000..ebd9780372c --- /dev/null +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def @@ -0,0 +1,307 @@ +% Copyright 2006 by Till Tantau +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. +% +% See the file doc/generic/pgf/licenses/LICENSE for more details. + + + + +% The aux files, needed for reading back coordinates + +\newwrite\pgfutil@auxout +\pgfutil@IfFileExists{\jobname.aux}{\input \jobname.aux\relax}{} +\openout\pgfutil@auxout +% Hmm, is there a better file for use with ConTeXt? + + + + +% XColor-like support for ConTeXt + +\def\pgfutil@definecolor#1#2#3{\csname pgfutil@emu@#2\endcsname{#1}#3\@nil} + +\def\pgfutil@emu@rgb#1#2,#3,#4\@nil{\expandafter\def\csname\string\color@#1\endcsname{\xcolor@{}{}{rgb}{#2,#3,#4}}} +\def\pgfutil@emu@gray#1#2\@nil{\expandafter\def\csname\string\color@#1\endcsname{\xcolor@{}{}{rgb}{#2,#2,#2}}} + +\pgfutil@definecolor{white}{gray}{1} +\pgfutil@definecolor{black}{gray}{0} +\pgfutil@definecolor{gray}{gray}{0.5} +\pgfutil@definecolor{red}{rgb}{1,0,0} +\pgfutil@definecolor{green}{rgb}{0,1,0} +\pgfutil@definecolor{blue}{rgb}{0,0,1} +\pgfutil@definecolor{cyan}{rgb}{0,1,1} +\pgfutil@definecolor{magenta}{rgb}{1,0,1} +\pgfutil@definecolor{yellow}{rgb}{1,1,0} +\pgfutil@definecolor{orange}{rgb}{1,0.5,0} +\pgfutil@definecolor{violet}{rgb}{0.5,0,0.5} +\pgfutil@definecolor{purple}{rgb}{0.75,0,0.25} +\pgfutil@definecolor{brown}{rgb}{0.75,0.5,0.25} + +\def\pgfutil@color#1{% + \pgfutil@colorlet{.}{#1}% + \pgfsysprotocol@getcurrentprotocol\pgfutil@emu@temp% + {% + \pgfsysprotocol@setcurrentprotocol\pgfutil@empty% + \pgfsysprotocol@bufferedtrue% + \pgfsetcolor{.}% + \expandafter\pgfsys@outerinvoke\expandafter{\pgfsysprotocol@currentprotocol}% + }% + \pgfsysprotocol@setcurrentprotocol\pgfutil@emu@temp% + \aftergroup\pgfutil@reset@color% +} + +\def\pgfutil@extractcolorspec#1#2{% + \def#2{{#1}}% +} + +\def\pgfutil@convertcolorspec#1#2#3{% + \edef#3{\expandafter\expandafter\expandafter\pgfutil@emu@select\csname\string\color@#1\endcsname}% +} + +\let\pgfutil@doifcolorelse=\doifcolorelse + + +\def\pgfutil@reset@color{% + \pgfsysprotocol@getcurrentprotocol\pgfutil@emu@temp% + {% + \pgfsysprotocol@setcurrentprotocol\pgfutil@empty% + \pgfsysprotocol@bufferedtrue% + \pgfsetcolor{.}% + \expandafter\pgfsys@outerinvoke\expandafter{\pgfsysprotocol@currentprotocol}% + }% + \pgfsysprotocol@setcurrentprotocol\pgfutil@emu@temp% +} +\expandafter\def\csname\string\color@.\endcsname{\xcolor@{}{}{rgb}{0,0,0}} + +\def\pgfutil@colorlet#1#2{% + \edef\pgf@marshal{#2}% + \expandafter\pgfutil@in@\expandafter!\expandafter{\pgf@marshal}% + \ifpgfutil@in@% + % compute mixture + {% + \expandafter\pgfutil@emu@mix\pgf@marshal!white!\@nil% + \xdef\pgf@marshal{\noexpand\def\expandafter\noexpand\csname\string\color@#1\endcsname{% + \noexpand\xcolor@{}{}{rgb}{\pgf@sys@tonumber\pgf@xa,\pgf@sys@tonumber\pgf@xb,\pgf@sys@tonumber\pgf@xc}}}% + }% + \pgf@marshal% + \else% + \expandafter\ifx\csname\string\color@#2\endcsname\relax% + \pgfutil@registercolor{#2}% + \fi% + \edef\pgf@marshal{\noexpand\let\expandafter\noexpand\csname\string\color@#1\endcsname=% + \expandafter\noexpand\csname\string\color@#2\endcsname}% + \pgf@marshal% + \fi% +} +\def\pgfutil@emu@mix#1!#2!#3!#4\@nil{% + \expandafter\ifx\csname\string\color@#1\endcsname\relax% + \pgfutil@registercolor{#1}% + \fi% + \expandafter\ifx\csname\string\color@#3\endcsname\relax% + \pgfutil@registercolor{#3}% + \fi% + \expandafter\expandafter\expandafter\pgfutil@emu@unpack\csname\string\color@#1\endcsname% + \pgf@ya=\pgf@xa% + \pgf@yb=\pgf@xb% + \pgf@yc=\pgf@xc% + \expandafter\expandafter\expandafter\pgfutil@emu@unpack\csname\string\color@#3\endcsname% + \c@pgf@counta=#2\relax% + \c@pgf@countb=100\relax% + \advance\c@pgf@countb by-\c@pgf@counta\relax% + \pgf@xa=\c@pgf@countb\pgf@xa% + \advance\pgf@xa by\c@pgf@counta\pgf@ya% + \divide\pgf@xa by 100\relax% + \pgf@xb=\c@pgf@countb\pgf@xb% + \advance\pgf@xb by\c@pgf@counta\pgf@yb% + \divide\pgf@xb by 100\relax% + \pgf@xc=\c@pgf@countb\pgf@xc% + \advance\pgf@xc by\c@pgf@counta\pgf@yc% + \divide\pgf@xc by 100\relax% +} +\def\pgfutil@emu@unpack#1#2#3#4#5{% + \pgfutil@emu@@unpack#5\@nil% +} +\def\pgfutil@emu@@unpack#1,#2,#3\@nil{% + \pgf@xa=#1pt% + \pgf@xb=#2pt% + \pgf@xc=#3pt% +} + +\def\pgfutil@emu@select#1#2#3#4#5{#5} + + +\def\pgfutil@registercolor#1{% + \edef\pgf@temp{\PDFcolor{#1}}% + \edef\pgf@marshal{\noexpand\pgfutil@in@{ g}{\pgf@temp}}% + \pgf@marshal% + \ifpgfutil@in@% + \expandafter\pgfutil@context@parse@gray\pgf@temp{#1}% + \else% + \edef\pgf@marshal{\noexpand\pgfutil@in@{ rg}{\pgf@temp}}% + \pgf@marshal% + \ifpgfutil@in@% + \expandafter\pgfutil@context@parse@rgb\pgf@temp{#1}% + \else% + \PackageError{pgf}{Color #1 has an unsupported color model.}{}% + \pgfutil@definecolor{#1}{gray}{0} + \fi% + \fi% +} + +\def\pgfutil@context@parse@gray#1 g#2{% + \pgfutil@definecolor{#2}{gray}{#1} +} + +\def\pgfutil@context@parse@rgb#1 #2 #3 rg#4{% + \pgfutil@definecolor{#4}{rgb}{#1,#2,#3} +} + + + +% pgfutil@minipage + +\def\pgfutil@minipage[#1]#2{% + \hbox to#2\bgroup% + \hsize=#2\relax% + \vbox\bgroup\leavevmode% +} +\def\pgfutil@endminipage{\egroup\egroup} + + + +% Driver detector (how should we do this in ConTeXt?) : + +\ifx\pdfoutput\@undefined\newcount\pdfoutput\fi +\ifx\pdfoutput\relax\newcount\pdfoutput\fi +\ifcase\pdfoutput% + \gdef\Gin@driver{dvips.def}% +\else% + \gdef\Gin@driver{pdftex.def}% +\fi% + + + +% Global colors + +\let\pgfutil@globalcolorsfalse=\relax +\let\pgfutil@globalcolorstrue=\relax + + + +% Font stuff + +\def\pgfutil@font@tiny{\tfxx} % How to do this correctly? +\def\pgfutil@font@scriptsize{\tfxx} +\def\pgfutil@font@footnotesize{\tfx} +\def\pgfutil@font@small{\tfx} +\def\pgfutil@font@normalsize{\tf} +\def\pgfutil@font@large{\tfa} +\def\pgfutil@font@Large{\tfb} +\def\pgfutil@font@huge{\tfc} +\def\pgfutil@font@Huge{\tfc} + +\def\pgfutil@font@itshape{\it} +\def\pgfutil@font@bfseries{\bf} + + +% The following is still messy and needs to be cleanup up (everything +% prefixed by pgfutil@): + +\def\PackageInfo#1#2{} +\def\PackageWarning#1#2{\immediate\write-1{Package #1: Warning! #2.}}% +\def\PackageError#1#2#3{\immediate\write-1{Package #1: Error! #2.}}% +\long\def\AtBeginDocument#1{#1}% +\long\def\AtBeginDvi#1{#1}% +\def\providecommand#1#2{\ifx#1\@undefined\def#1{#2}\fi} + +\def\pgflatex@setcounter#1#2{\global\csname c@#1\endcsname#2\relax}% + +\def\setlength#1#2{% + \pgf@length@skip=0pt% + \edef\pgf@temp{#2}% + \expandafter\pgfutil@parse@setlength\pgf@temp+\pgf@stop% + #1=\pgf@length@skip% +} +\def\pgfutil@parse@setlength#1+#2\pgf@stop{% + \advance\pgf@length@skip by#1\relax% + \def\pgf@test{#2}% + \ifx\pgf@test\pgfutil@empty% + \else% + \pgfutil@parse@setlength#2\pgf@stop% + \fi% +} +\def\addtolength#1#2{\setlength{\pgf@length@skip}{#2}\advance#1 \pgf@length@skip\relax} +\def\selectfont{\rm} +\def\applycolormixins#1{} + +\ifx\setkeys\@undefined +\def\setkeys#1#2{% + \def\KV@prefix{KV@#1@}% + \let\@tempc\relax + \KV@do#2,\relax,} +\def\KV@do#1,{% + \ifx\relax#1\pgfutil@empty\else + \KV@split#1==\relax + \expandafter\KV@do\fi} +\def\KV@split#1=#2=#3\relax{% + \KV@@sp@def\@tempa{#1}% + \ifx\@tempa\pgfutil@empty\else + \expandafter\let\expandafter\@tempc + \csname\KV@prefix\@tempa\endcsname + \ifx\@tempc\relax + \KV@errx + {\@tempa\space undefined}% + \else + \ifx\pgfutil@empty#3\pgfutil@empty + \KV@default + \else + \KV@@sp@def\@tempb{#2}% + \expandafter\@tempc\expandafter{\@tempb}\relax + \fi + \fi + \fi} +\def\KV@default{% + \expandafter\let\expandafter\@tempb + \csname\KV@prefix\@tempa @default\endcsname + \ifx\@tempb\relax + \KV@errx{No value specified for \@tempa}% + \else + \@tempb\relax + \fi} +\def\KV@errx#1{\PackageError{keyval}{#1}{}} +\def\@tempa#1{% +\def\KV@@sp@def##1##2{% + \futurelet\KV@tempa\KV@@sp@d##2\@nil\@nil#1\@nil\relax##1}% +\def\KV@@sp@d{% + \ifx\KV@tempa\@sptoken + \expandafter\KV@@sp@b + \else + \expandafter\KV@@sp@b\expandafter#1% + \fi}% +\def\KV@@sp@b#1##1 \@nil{\KV@@sp@c##1}% + } +\@tempa{ } +\def\KV@@sp@c#1\@nil#2\relax#3{\KV@toks@{#1}\edef#3{\the\KV@toks@}} +\def\define@key#1#2{% + \pgfutil@ifnextchar[{\KV@def{#1}{#2}}{\pgfutil@namedef{KV@#1@#2}####1}} +\def\KV@def#1#2[#3]{% + \pgfutil@namedef{KV@#1@#2@default\expandafter}\expandafter + {\csname KV@#1@#2\endcsname{#3}}% + \pgfutil@namedef{KV@#1@#2}##1} +\fi% + + +\newtoks\KV@toks@ +\newdimen\@tempdima +\newdimen\@tempdimb +\newcount\@tempcnta +\newcount\@tempcntb +\newbox\@tempboxa +\newskip\pgf@length@skip + + +\endinput diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def new file mode 100644 index 00000000000..8d75746a663 --- /dev/null +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def @@ -0,0 +1,51 @@ +% Copyright 2006 by Till Tantau +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. +% +% See the file doc/generic/pgf/licenses/LICENSE for more details. + + +\catcode`\@=11\relax + +\let\pgfutil@auxout=\@auxout + +\def\pgfutil@definecolor{\definecolor} +\def\pgfutil@color{\color} +\def\pgfutil@colorlet{\colorlet} +\def\pgfutil@extractcolorspec{\extractcolorspec} +\def\pgfutil@convertcolorspec{\convertcolorspec} + +\def\pgfutil@globalcolorsfalse{\let\ifglobalcolors\iffalse} +\def\pgfutil@globalcolorstrue{\let\ifglobalcolors\iftrue} + +\def\pgfutil@minipage{\minipage} +\def\pgfutil@endminipage{\endminipage} + +\def\pgfutil@doifcolorelse#1#2#3{% + \expandafter\ifx\csname\string\color@#1\endcsname\relax% + \let\pgf@next=\pgfutil@secondoftwo% + \else + \let\pgf@next=\pgfutil@firstoftwo% + \fi% + \pgf@next{#2}{#3}% +} + + +\def\pgfutil@font@tiny{\tiny} +\def\pgfutil@font@scriptsize{\scriptsize} +\def\pgfutil@font@footnotesize{\footnotesize} +\def\pgfutil@font@small{\small} +\def\pgfutil@font@normalsize{\normalsize} +\def\pgfutil@font@large{\large} +\def\pgfutil@font@Large{\Large} +\def\pgfutil@font@huge{\huge} +\def\pgfutil@font@Huge{\Huge} + +\def\pgfutil@font@itshape{\itshape} +\def\pgfutil@font@bfseries{\bfseries} + + +\endinput diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def new file mode 100644 index 00000000000..474cdea9f1a --- /dev/null +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def @@ -0,0 +1,287 @@ +% Copyright 2006 by Till Tantau +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. +% +% See the file doc/generic/pgf/licenses/LICENSE for more details. + + + + + +% The aux files, needed for reading back coordinates + +\newwrite\pgfutil@auxout +\pgfutil@IfFileExists{\jobname.aux}{\input \jobname.aux\relax}{} +\openout\pgfutil@auxout + + + +% XColor-like support for plain TeX + +\def\pgfutil@definecolor#1#2#3{\csname pgfutil@emu@#2\endcsname{#1}#3\@nil} + +\def\pgfutil@emu@rgb#1#2,#3,#4\@nil{\expandafter\def\csname\string\color@#1\endcsname{\xcolor@{}{}{rgb}{#2,#3,#4}}} +\def\pgfutil@emu@gray#1#2\@nil{\expandafter\def\csname\string\color@#1\endcsname{\xcolor@{}{}{rgb}{#2,#2,#2}}} + +\pgfutil@definecolor{white}{gray}{1} +\pgfutil@definecolor{black}{gray}{0} +\pgfutil@definecolor{gray}{gray}{0.5} +\pgfutil@definecolor{red}{rgb}{1,0,0} +\pgfutil@definecolor{green}{rgb}{0,1,0} +\pgfutil@definecolor{blue}{rgb}{0,0,1} +\pgfutil@definecolor{cyan}{rgb}{0,1,1} +\pgfutil@definecolor{magenta}{rgb}{1,0,1} +\pgfutil@definecolor{yellow}{rgb}{1,1,0} +\pgfutil@definecolor{orange}{rgb}{1,0.5,0} +\pgfutil@definecolor{violet}{rgb}{0.5,0,0.5} +\pgfutil@definecolor{purple}{rgb}{0.75,0,0.25} +\pgfutil@definecolor{brown}{rgb}{0.75,0.5,0.25} + +\def\pgfutil@color#1{% + \pgfutil@colorlet{.}{#1}% + \pgfsysprotocol@getcurrentprotocol\pgfutil@emu@temp% + {% + \pgfsysprotocol@setcurrentprotocol\pgfutil@empty% + \pgfsysprotocol@bufferedtrue% + \pgfsetcolor{.}% + \expandafter\pgfsys@outerinvoke\expandafter{\pgfsysprotocol@currentprotocol}% + }% + \pgfsysprotocol@setcurrentprotocol\pgfutil@emu@temp% + \aftergroup\pgfutil@reset@color% +} + +\def\pgfutil@extractcolorspec#1#2{% + \def#2{{#1}}% +} + +\def\pgfutil@convertcolorspec#1#2#3{% + \edef#3{\expandafter\expandafter\expandafter\pgfutil@emu@select\csname\string\color@#1\endcsname}% +} + + +\def\pgfutil@doifcolorelse#1#2#3{% + \expandafter\ifx\csname\string\color@#1\endcsname\relax% + \let\pgf@next=\pgfutil@secondoftwo% + \else + \let\pgf@next=\pgfutil@firstoftwo% + \fi% + \pgf@next{#2}{#3}% +} + + +\def\pgfutil@reset@color{% + \pgfsysprotocol@getcurrentprotocol\pgfutil@emu@temp% + {% + \pgfsysprotocol@setcurrentprotocol\pgfutil@empty% + \pgfsysprotocol@bufferedtrue% + \pgfsetcolor{.}% + \expandafter\pgfsys@outerinvoke\expandafter{\pgfsysprotocol@currentprotocol}% + }% + \pgfsysprotocol@setcurrentprotocol\pgfutil@emu@temp% +} +\expandafter\def\csname\string\color@.\endcsname{\xcolor@{}{}{rgb}{0,0,0}} + +\def\pgfutil@colorlet#1#2{% + \edef\pgf@marshal{#2}% + \expandafter\pgfutil@in@\expandafter!\expandafter{\pgf@marshal}% + \ifpgfutil@in@% + % compute mixture + {% + \expandafter\pgfutil@emu@mix\pgf@marshal!white!\@nil% + \xdef\pgf@marshal{\noexpand\def\expandafter\noexpand\csname\string\color@#1\endcsname{% + \noexpand\xcolor@{}{}{rgb}{\pgf@sys@tonumber\pgf@xa,\pgf@sys@tonumber\pgf@xb,\pgf@sys@tonumber\pgf@xc}}}% + }% + \pgf@marshal% + \else% + \edef\pgf@marshal{\noexpand\let\expandafter\noexpand\csname\string\color@#1\endcsname=% + \expandafter\noexpand\csname\string\color@#2\endcsname}% + \pgf@marshal% + \fi% +} +\def\pgfutil@emu@mix#1!#2!#3!#4\@nil{% + \expandafter\expandafter\expandafter\pgfutil@emu@unpack\csname\string\color@#1\endcsname% + \pgf@ya=\pgf@xa% + \pgf@yb=\pgf@xb% + \pgf@yc=\pgf@xc% + \expandafter\expandafter\expandafter\pgfutil@emu@unpack\csname\string\color@#3\endcsname% + \c@pgf@counta=#2\relax% + \c@pgf@countb=100\relax% + \advance\c@pgf@countb by-\c@pgf@counta\relax% + \pgf@xa=\c@pgf@countb\pgf@xa% + \advance\pgf@xa by\c@pgf@counta\pgf@ya% + \divide\pgf@xa by 100\relax% + \pgf@xb=\c@pgf@countb\pgf@xb% + \advance\pgf@xb by\c@pgf@counta\pgf@yb% + \divide\pgf@xb by 100\relax% + \pgf@xc=\c@pgf@countb\pgf@xc% + \advance\pgf@xc by\c@pgf@counta\pgf@yc% + \divide\pgf@xc by 100\relax% +} +\def\pgfutil@emu@unpack#1#2#3#4#5{% + \pgfutil@emu@@unpack#5\@nil% +} +\def\pgfutil@emu@@unpack#1,#2,#3\@nil{% + \pgf@xa=#1pt% + \pgf@xb=#2pt% + \pgf@xc=#3pt% +} + +\def\pgfutil@emu@select#1#2#3#4#5{#5} + + + +\let\definecolor=\pgfutil@definecolor +\let\color=\pgfutil@color +\let\colorlet=\pgfutil@colorlet +\let\extractcolorspec=\pgfutil@extractcolorspec +\let\convertcolorspec=\pgfutil@convertcolorspec + + + + +% pgfutil@minipage + +\def\pgfutil@minipage[#1]#2{% + \hbox to#2\bgroup% + \hsize=#2\relax% + \vbox\bgroup\leavevmode% +} +\def\pgfutil@endminipage{\egroup\egroup} + + + +% Driver detector (not so good): + +\ifx\pdfoutput\@undefined\alloc@0\count\countdef\insc@unt\pdfoutput\fi +\ifx\pdfoutput\relax\alloc@0\count\countdef\insc@unt\pdfoutput\fi +\ifcase\pdfoutput% + \gdef\Gin@driver{dvips.def}% +\else% + \gdef\Gin@driver{pdftex.def}% +\fi% + + +% Global colors + +\let\pgfutil@globalcolorsfalse=\relax +\let\pgfutil@globalcolorstrue=\relax + + + +% Font stuff + +\def\pgfutil@font@tiny{\fam\z@\fiverm} % How to do this correctly? +\def\pgfutil@font@scriptsize{\fam\z@\sevenrm} +\def\pgfutil@font@footnotesize{\rm} +\def\pgfutil@font@small{\fam\z@\ninerm} +\def\pgfutil@font@normalsize{\rm} +\def\pgfutil@font@large{\rm} +\def\pgfutil@font@Large{\rm} +\def\pgfutil@font@huge{\rm} +\def\pgfutil@font@Huge{\rm} + +\def\pgfutil@font@itshape{\it} +\def\pgfutil@font@bfseries{\bf} + + + + +% The following is still messy and needs to be cleanup up (everything +% prefixed by pgfutil@): + +\def\PackageInfo#1#2{} +\def\PackageWarning#1#2{\immediate\write-1{Package #1: Warning! #2.}}% +\def\PackageError#1#2#3{\immediate\write-1{Package #1: Error! #2.}}% +\long\def\AtBeginDocument#1{#1}% +\long\def\AtBeginDvi#1{#1}% +\def\providecommand#1#2{\ifx#1\@undefined\def#1{#2}\fi} +\def\pgflatex@setcounter#1#2{\global\csname c@#1\endcsname#2\relax}% +\def\setlength#1#2{% + \pgf@length@skip=0pt% + \edef\pgf@temp{#2}% + \expandafter\pgfutil@parse@setlength\pgf@temp+\pgf@stop% + #1=\pgf@length@skip% +} +\def\pgfutil@parse@setlength#1+#2\pgf@stop{% + \advance\pgf@length@skip by#1\relax% + \def\pgf@test{#2}% + \ifx\pgf@test\pgfutil@empty% + \else% + \pgfutil@parse@setlength#2\pgf@stop% + \fi% +} +\def\addtolength#1#2{\setlength{\pgf@length@skip}{#2}\advance#1 \pgf@length@skip\relax} +\def\selectfont{\rm} +\def\applycolormixins#1{} +\ifx\setkeys\@undefined +\def\setkeys#1#2{% + \def\KV@prefix{KV@#1@}% + \let\@tempc\relax + \KV@do#2,\relax,} +\def\KV@do#1,{% + \ifx\relax#1\pgfutil@empty\else + \KV@split#1==\relax + \expandafter\KV@do\fi} +\def\KV@split#1=#2=#3\relax{% + \KV@@sp@def\@tempa{#1}% + \ifx\@tempa\pgfutil@empty\else + \expandafter\let\expandafter\@tempc + \csname\KV@prefix\@tempa\endcsname + \ifx\@tempc\relax + \KV@errx + {\@tempa\space undefined}% + \else + \ifx\pgfutil@empty#3\pgfutil@empty + \KV@default + \else + \KV@@sp@def\@tempb{#2}% + \expandafter\@tempc\expandafter{\@tempb}\relax + \fi + \fi + \fi} +\def\KV@default{% + \expandafter\let\expandafter\@tempb + \csname\KV@prefix\@tempa @default\endcsname + \ifx\@tempb\relax + \KV@errx{No value specified for \@tempa}% + \else + \@tempb\relax + \fi} +\def\KV@errx#1{\PackageError{keyval}{#1}{}} +\def\@tempa#1{% +\def\KV@@sp@def##1##2{% + \futurelet\KV@tempa\KV@@sp@d##2\@nil\@nil#1\@nil\relax##1}% +\def\KV@@sp@d{% + \ifx\KV@tempa\@sptoken + \expandafter\KV@@sp@b + \else + \expandafter\KV@@sp@b\expandafter#1% + \fi}% +\def\KV@@sp@b#1##1 \@nil{\KV@@sp@c##1}% + } +\@tempa{ } +\def\KV@@sp@c#1\@nil#2\relax#3{\KV@toks@{#1}\edef#3{\the\KV@toks@}} +\def\define@key#1#2{% + \pgfutil@ifnextchar[{\KV@def{#1}{#2}}{\pgfutil@namedef{KV@#1@#2}####1}} +\def\KV@def#1#2[#3]{% + \pgfutil@namedef{KV@#1@#2@default\expandafter}\expandafter + {\csname KV@#1@#2\endcsname{#3}}% + \pgfutil@namedef{KV@#1@#2}##1} +\fi% + + +\newtoks\KV@toks@ +\newdimen\@tempdima +\newdimen\@tempdimb +\newcount\@tempcnta +\newcount\@tempcntb +\newbox\@tempboxa +\newskip\pgf@length@skip + + + + +\endinput diff --git a/Master/texmf-dist/tex/latex/bussproofs/bussproofs.sty b/Master/texmf-dist/tex/latex/bussproofs/bussproofs.sty index b5d7cc83bd5..8d2d4481a10 100644 --- a/Master/texmf-dist/tex/latex/bussproofs/bussproofs.sty +++ b/Master/texmf-dist/tex/latex/bussproofs/bussproofs.sty @@ -2,10 +2,31 @@ \def\BPmessage{Proof Tree (bussproofs) style macros. Version 1.0.} % bussproofs.sty. Version 1.0 % (c) 1994,1995,1996,2004,2005,2006. Copyright retained by Samuel R. Buss. +% +% ==== Legal statement: ==== +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt. +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/1 or later. +% +% This work has the LPPL maintenance status 'maintained'. +% +% The Current Maintainer of the work is Sam Buss. +% +% This work consists of bussproofs.sty. +% ===== +% Informal summary of legal situation: % This software may be used and distributed freely, except that % if you make changes, you must change the file name to be different % than bussproofs.sty to avoid compatibility problems. +% The terms of the LaTeX Public License are the legally controlling terms +% and override any contradictory terms of the "informal situation". +% % Please report comments and bugs to sbuss@ucsd.edu. +% % Thanks to Felix Joachimski for making changes to let these macros % work in plain TeX in addition to LaTeX. Nothing has been done % to see if they work in AMSTeX. The comments below mostly @@ -261,7 +282,7 @@ % Parameters which control the style of the proof trees. % The user may wish to override these parameters locally or globally. -% BUT DONT CHANGE THE PARAMETERS BY CHANGING THIS FILE (to avoid +% BUT DON'T CHANGE THE PARAMETERS BY CHANGING THIS FILE (to avoid % future incompatibilities). Instead, you should change them in your % TeX document right after including this style file in the % header material of your LaTeX document. @@ -284,7 +305,7 @@ \def\proofSkipAmount{\vskip.8ex plus.8ex minus.4ex} % Space above and below a prooftree display. -\def\defaultRootPosition{\buildRootBottom} +\def\defaultRootPosition{\buildRootBottom} % Default: Proofs root at bottom %\def\defaultRootPosition{\buildRootTop} % Makes all proofs upside down \ifx\fCenter\undefined diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls index 9bb0e2a613c..3e7439e4b41 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls @@ -268,7 +268,7 @@ {-2.9ex\@plus-.5ex\@minus-.2ex}% {1.5ex\@plus.5ex\@minus.2ex}% {\normalfont\large\bfseries\centering}} -\def\opt@fullstop#1{#1{\tracingall\has@fullstop#1.\@@@ +\def\opt@fullstop#1{#1{\has@fullstop#1.\@@@ \if@tempswa\else \has@exlamationmark#1!\@@@ \if@tempswa\else diff --git a/Master/texmf-dist/tex/latex/dvdcoll/dvdcoll.cls b/Master/texmf-dist/tex/latex/dvdcoll/dvdcoll.cls index 507ea447d5c..81e46fcb1e7 100644 --- a/Master/texmf-dist/tex/latex/dvdcoll/dvdcoll.cls +++ b/Master/texmf-dist/tex/latex/dvdcoll/dvdcoll.cls @@ -22,7 +22,7 @@ % \NeedsTeXFormat{LaTeX2e}% % -\ProvidesClass{dvdcoll}[2006/10/06 dvdcoll.cls v0.6 - Josef Kleber (C) 2006]% +\ProvidesClass{dvdcoll}[2006/10/06 dvdcoll.cls v0.6a - Josef Kleber (C) 2006]% % \RequirePackage{xkeyval}% \RequirePackage{ifthen}% @@ -334,6 +334,7 @@ \renewcommand*\dc@option@titlenumbering{normal}% % \setkeys{DvdSeries}{#1}% + \SetSeason{1}% \chapter{#2}% \def\dc@series{#2}% \setcounter{season}{-1}% @@ -504,6 +505,7 @@ \newenvironment{Dvd}[2]% {% % + \endlinechar=-1% %Hack von Markus Kohm zur Behebung des \bottomrule-Problems bei \endtabularx in Environments (-> Google-Groups) \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname% \expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{% @@ -518,7 +520,7 @@ \phantomsection% korrigiert fehlerhafte (falsch positionierte) Links auf dvd-Tabellen \noindent% % verhindert overfull \hbox Errors wegen \tabularx{\linewidth}... - \tabularx{\linewidth}{>{\dc@size@table@cells\hfill}r>{\dc@size@table@cells}X>{\dc@size@table@cells}r}% + \tabularx{\linewidth}{>{\dc@size@table@cells}l>{\dc@size@table@cells}X>{\dc@size@table@cells}r}% \multicolumn{3}{l}{\dc@size@table@title\dc@title\dc@option@dvdlabel\dc@print@dvdlabel{#2}}\\% \midrule% }% diff --git a/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty b/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty index e4427eee8dc..4fe162fc373 100644 --- a/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty +++ b/Master/texmf-dist/tex/latex/gnuplottex/gnuplottex.sty @@ -41,16 +41,14 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{gnuplottex} - [2006/04/02 v0.1 gnuplot graphs in LaTeX] -\RequirePackage{graphicx,moreverb,keyval} + [2006/10/28 v0.2 gnuplot graphs in LaTeX] +\RequirePackage{latexsym,graphicx,moreverb,keyval} \newif\ifShellEscape \newif\ifmiktex \miktexfalse -\newif\ifpdf \pdffalse \DeclareOption{shell}{\ShellEscapetrue} \DeclareOption{noshell}{\ShellEscapefalse} \DeclareOption{miktex}{\global\miktextrue} -\DeclareOption{pdf}{\pdftrue} \ExecuteOptions{shell} \ProcessOptions\relax @@ -82,9 +80,9 @@ \def\gnuplotverbatimwrite#1{% \def\BeforeStream - {\message{Opening gnuplot stream=\figname.gnuplot}% - \immediate\write\verbatim@out{\string set terminal postscript eps enhanced} -\immediate\write\verbatim@out{\string set output '\figname.eps'} + {\message{Opening gnuplot stream #1}% + \immediate\write\verbatim@out{\string set terminal latex} +\immediate\write\verbatim@out{\string set output '\figname.tex'} } \@bsphack \immediate\openout \verbatim@out #1 @@ -97,74 +95,41 @@ \verbatim@start} \def\endgnuplotverbatimwrite{% \immediate\closeout\verbatim@out - \@esphack} -\define@key{pic}{width}{\def\gnuplotwidth{#1}} -\define@key{pic}{height}{\def\gnuplotheight{#1}} + \@esphack +\catcode`\\0 +\catcode`\{1 +\catcode`\}2 +\catcode`\$3 +\catcode`\&4 +\catcode`\^^M5 +\catcode`\#6 +\catcode`\^7 +\catcode`\_8 +\catcode`\ 10 +\catcode`\%14} +\define@key{pic}{scale}{\def\gnuplotscale{#1}} \newenvironment{gnuplot}[1][]{\stepcounter{fignum}% -\let\gnuplotwidth\undefined -\let\gnuplotheight\undefined +\def\gnuplotscale{1} \setkeys{pic}{#1} \xdef\gnuplotCutFile{\figname.gnuplot} \gnuplotverbatimwrite{\gnuplotCutFile}} {\endgnuplotverbatimwrite% \gnuplotgraphicsinclude} \long\gdef\gnuplotgraphicsprocess{% - \ifShellEscape +\ifShellEscape \IfFileExists{\figname.gnuplot}{% \immediate\write18{gnuplot \figname.gnuplot} -\IfFileExists{\figname.eps}{% -\ifpdf -\immediate\write18{epstopdf \figname.eps} -\IfFileExists{\figname.pdf}{% +\IfFileExists{\figname.tex}{% \PackageInfo{gnuplottex} {\figname.gnuplot converted}} {\PackageWarningNoLine{gnuplottex} -{Conversion of \figname.gnuplot failed.}} -\else -\PackageInfo{gnuplottex} -{\figname.gnuplot converted} -\fi} -{\PackageWarningNoLine{gnuplottex} {Conversion of \figname.gnuplot failed.}}}{} \fi} \long\gdef\gnuplotgraphicsinclude{\gnuplotgraphicsprocess% -\ifpdf -\IfFileExists{\figname.pdf}{% -\ifx\gnuplotwidth\undefined -\ifx\gnuplotheight\undefined -\includegraphics{\figname} -\else -\includegraphics[height=\gnuplotheight]{\figname} -\fi -\else -\ifx\gnuplotheight\undefined -\includegraphics[width=\gnuplotwidth]{\figname} -\else -\includegraphics[width=\gnuplotwidth,height=\gnuplotheight]{\figname} -\fi -\fi -} +\IfFileExists{\figname.tex}{% +\scalebox{\gnuplotscale}{\input{\figname}}} {\PackageWarningNoLine{gnuplottex} {Please convert \figname.gnuplot manually}} -\else -\IfFileExists{\figname.eps}{% -\ifx\gnuplotwidth\undefined -\ifx\gnuplotheight\undefined -\includegraphics{\figname} -\else -\includegraphics[height=\gnuplotheight]{\figname} -\fi -\else -\ifx\gnuplotheight\undefined -\includegraphics[width=\gnuplotwidth]{\figname} -\else -\includegraphics[width=\gnuplotwidth,height=\gnuplotheight]{\figname} -\fi -\fi -} -{\PackageWarningNoLine{gnuplottex} -{Please convert \figname.gnuplot manually}} -\fi } \endinput %% diff --git a/Master/texmf-dist/tex/latex/movie15/movie15.sty b/Master/texmf-dist/tex/latex/movie15/movie15.sty index 44702431632..e71a6b6414f 100644 --- a/Master/texmf-dist/tex/latex/movie15/movie15.sty +++ b/Master/texmf-dist/tex/latex/movie15/movie15.sty @@ -1,4 +1,4 @@ -% Copyright 2004 Alexander Grahn +% Copyright 2004--2006 Alexander Grahn % % This material is subject to the LaTeX Project Public License. See % http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html @@ -9,21 +9,40 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{movie15}[2006/08/15] +\ProvidesPackage{movie15}[2006/10/12] \RequirePackage{keyval} \RequirePackage{ifthen} \RequirePackage{ifpdf} +\RequirePackage{ifdraft} -\newboolean{@MXV@iiiDfeat}% enable 3D features from PDF-1.6 spec? +\newboolean{@MXV@iiiDfeat} % enable 3D features from PDF-1.6 spec? \setboolean{@MXV@iiiDfeat}{false}% -\newboolean{@MXV@iiid}%set to true if a 3D file is being embedded +\newboolean{@MXV@iiid} %set to true if a 3D file is being embedded +\newboolean{@MXV@draft} %according to global setting +\newboolean{@MXV@@draft} %per inclusion setting + +\ifdraft{%globally set by document class + \setboolean{@MXV@draft}{true}% +}{% + \setboolean{@MXV@draft}{false}% +}% + +%override global setting +\DeclareOption{draft}{% + \setboolean{@MXV@draft}{true}% +} +\DeclareOption{final}{% + \setboolean{@MXV@draft}{false}% +} \DeclareOption{3D}{% \setboolean{@MXV@iiiDfeat}{true}% } -\DeclareOption*{\PackageWarning{movie15}{Unknown Option \CurrentOption}} -\ProcessOptions\relax +\DeclareOption*{% + \PackageWarning{movie15}{Unknown Option \CurrentOption} +} +\ProcessOptions*\relax %correct pdfTeX version? \ifpdf% @@ -175,6 +194,12 @@ \setboolean{@MXV@linkstop}{false}% \setboolean{@MXV@linkclose}{false}% \setboolean{@MXV@linkreset}{false}% + \ifthenelse{\boolean{@MXV@draft}}{% + \setboolean{@MXV@@draft}{true}% + }{% + \setboolean{@MXV@@draft}{false}% + }% + % \gdef\@MXV@label{}% for movieref \gdef\@MXV@@label{}% for movieref \gdef\@MXV@mime{@MXV@auto}% @@ -318,6 +343,18 @@ }}}}}}}}}}}}}}}}% } +%draft box +\def\@MXV@draftbox#1#2#3#4{%width height depth filename + \edef\@MXV@oldfboxsep{\the\fboxsep}% + \setlength{\fboxsep}{-\fboxrule}% + \framebox[#1][l]{% + \vrule width 0pt height #2 depth #3% + \edef\@tempa{#4}% + \raisebox{\depth}[0pt][0pt]{ \ttfamily\expandafter\strip@prefix\meaning\@tempa}% + }% + \setlength{\fboxsep}{\@MXV@oldfboxsep}% +} + \ifthenelse{\boolean{@MXV@iiiDfeat}}{% 3D related definitions and macros \RequirePackage{fp}% needed for fixed point calculus \newcount\@MXV@viewscount%counter for number of 3D views per inclusion @@ -1660,7 +1697,9 @@ }{}% }{}% \@MXV@labeltoaux{@MXV@\@MXV@@label.annotid}{\the\@MXV@includes}% - \@MXV@newlabel{@MXV@\@MXV@@label.annotid}{\the\@MXV@includes}% + \if@MXV@presentation\else% + \@MXV@newlabel{@MXV@\@MXV@@label.annotid}{\the\@MXV@includes}% + \fi% \fi% % \ifthenelse{\boolean{@MXV@externalviewer}}{% @@ -1979,22 +2018,26 @@ }% }{}% % - %insert textbox, obscured by poster - \ifthenelse{\boolean{@MXV@boxopt}\AND\NOT\boolean{@MXV@textoverposter}}{% - \makebox[0pt][l]{\usebox{\@MXV@textbox}}% - }{}% - % - %insert annotation - \ifthenelse{\boolean{@MXV@iiid}}{% - \@MXV@includeiiid{\@MXV@width}{\@MXV@height}{\@MXV@depth}{#4}% + \ifthenelse{\boolean{@MXV@@draft}}{% + \@MXV@draftbox{\@MXV@width}{\@MXV@height}{\@MXV@depth}{#4}% }{% - \@MXV@includemovie{\@MXV@width}{\@MXV@height}{\@MXV@depth}{#4}% + %insert textbox, obscured by poster + \ifthenelse{\boolean{@MXV@boxopt}\AND\NOT\boolean{@MXV@textoverposter}}{% + \makebox[0pt][l]{\usebox{\@MXV@textbox}}% + }{}% + % + %insert annotation + \ifthenelse{\boolean{@MXV@iiid}}{% + \@MXV@includeiiid{\@MXV@width}{\@MXV@height}{\@MXV@depth}{#4}% + }{% + \@MXV@includemovie{\@MXV@width}{\@MXV@height}{\@MXV@depth}{#4}% + }% + % + %insert textbox, overprinting the poster + \ifthenelse{\boolean{@MXV@boxopt}\AND\boolean{@MXV@textoverposter}}{% + \makebox[0pt][r]{\usebox{\@MXV@textbox}}% + }{}% }% - % - %insert textbox, overprinting the poster - \ifthenelse{\boolean{@MXV@boxopt}\AND\boolean{@MXV@textoverposter}}{% - \makebox[0pt][r]{\usebox{\@MXV@textbox}}% - }{}% }% } @@ -2166,12 +2209,195 @@ /Next <<% /S/JavaScript% /JS (try{% + %constructor for doubly linked list + function List() { + this.first_node = null; + this.last_node = new Node(undefined); + } + List.prototype.push_back = function (x) { + var new_node = new Node(x); + if (this.first_node == null) { + this.first_node = new_node; + new_node.prev = null; + } else { + new_node.prev = this.last_node.prev; + new_node.prev.next = new_node; + } + new_node.next = this.last_node; + this.last_node.prev = new_node; + }; + List.prototype.move_to_front = function (it) { + var node = it.get(); + if (node.next != null && node.prev != null) { + node.next.prev = node.prev; + node.prev.next = node.next; + node.prev = null; + node.next = this.first_node; + this.first_node.prev = node; + this.first_node = node; + } + }; + List.prototype.begin = function () { + var i = new Iterator(); + i.target = this.first_node; + return i; + }; + List.prototype.end = function () { + var i = new Iterator(); + i.target = this.last_node; + return i; + }; + function Iterator (it) { + if ( it != undefined ) { + this.target = it.target; + } else { + this.target = null; + } + } + Iterator.prototype.set = function (it) {this.target = it.target;}; + Iterator.prototype.get = function () {return this.target;}; + Iterator.prototype.deref = function () {return this.target.data;}; + Iterator.prototype.incr = function () { + if (this.target.next != null) {this.target = this.target.next;} + }; + %constructor for node objects that populate the linked list + function Node (x) { + this.prev=null; + this.next=null; + this.data=x; + } + function sqr (r) {return r*r;} %helper function + %The following code borrows heavily from Bernd Gaertners `Miniball' software, + %originally written in C++, for computing the smallest enclosing ball of a + %set of points; see: http://www.inf.ethz.ch/personal/gaertner/miniball.html + function Basis () { + this.m=0; + this.q0 = new Array(3); + this.z = new Array(4); + this.f = new Array(4); + this.v = new Array(new Array(3), new Array(3), new Array(3), new Array(3)); + this.a = new Array(new Array(3), new Array(3), new Array(3), new Array(3)); + this.c = new Array(new Array(3), new Array(3), new Array(3), new Array(3)); + this.sqr_r = new Array(4); + this.current_c = this.c[0]; + this.current_sqr_r=0; + this.reset(); + } + Basis.prototype.center = function () {return this.current_c;}; + Basis.prototype.size = function () {return this.m;}; + Basis.prototype.pop = function () {--this.m;}; + Basis.prototype.excess = function (p) { + var e = -this.current_sqr_r; + for (var k=0; k<3; ++k) { + e += sqr(p[k]-this.current_c[k]); + } + return e; + }; + Basis.prototype.reset = function () { + this.m = 0; + for (var j=0; j<3; ++j) { + this.c[0][j]=0; + } + this.current_c = this.c[0]; + this.current_sqr_r = -1; + }; + Basis.prototype.push = function (p) { + var i, j; + var eps=1e-32; + if (this.m==0) { + for (i=0; i<3; ++i) { + this.q0[i]=p[i]; + } + for (i=0; i<3; ++i) { + this.c[0][i]=this.q0[i]; + } + this.sqr_r[0]=0; + } else { + for (i=0; i<3; ++i) { + this.v[this.m][i] = p[i]-this.q0[i]; + } + for (i=1; i<this.m; ++i) { + this.a[this.m][i] = 0; + for (j=0; j<3; ++j) { + this.a[this.m][i] += this.v[i][j]*this.v[this.m][j]; + } + this.a[this.m][i]*=(2/this.z[i]); + } + for (i=1; i<this.m; ++i) { + for (j=0; j<3; ++j) { + this.v[this.m][j] -= this.a[this.m][i]*this.v[i][j]; + } + } + this.z[this.m]=0; + for (j=0; j<3; ++j) { + this.z[this.m] += sqr(this.v[this.m][j]); + } + this.z[this.m]*=2; + if (this.z[this.m]<eps*this.current_sqr_r) { + return false; + } + var e = -this.sqr_r[this.m-1]; + for (i=0; i<3; ++i) { + e += sqr(p[i]-this.c[this.m-1][i]); + } + this.f[this.m]=e/this.z[this.m]; + for (i=0; i<3; ++i) { + this.c[this.m][i] = this.c[this.m-1][i]+this.f[this.m]*this.v[this.m][i]; + } + this.sqr_r[this.m] = this.sqr_r[this.m-1]+e*this.f[this.m]/2; + } + this.current_c = this.c[this.m]; + this.current_sqr_r = this.sqr_r[this.m]; + ++this.m; + return true; + }; + function Miniball () { + this.L = new List(); + this.B = new Basis(); + this.support_end=new Iterator(); + } + Miniball.prototype.mtf_mb = function (it) { + var i = new Iterator(it); + this.support_end.set(this.L.begin()); + if ((this.B.size())==4) {return;} + for (var k = new Iterator(this.L.begin()); k.get()!=i.get();) { + var j=new Iterator(k); + k.incr(); + if (this.B.excess(j.deref()) > 0) { + if (this.B.push(j.deref())) { + this.mtf_mb(j); + this.B.pop(); + if (this.support_end.get() == j.get()) { + this.support_end.incr(); + } + this.L.move_to_front(j); + } + } + } + }; + Miniball.prototype.check_in = function (b) { + this.L.push_back(b); + }; + Miniball.prototype.build = function () { + this.B.reset(); + this.support_end.set(this.L.begin()); + this.mtf_mb(this.L.end()); + }; + Miniball.prototype.center = function () { + return this.B.center(); + }; + Miniball.prototype.radius = function () { + return Math.sqrt(this.B.current_sqr_r); + }; + % + %create Miniball object + var mb = new Miniball(); + % %aperture angle of the virtual camera var aac = \@MXV@calc; % - %list of nodes - var nodes = annot3D["\@MXV@label"].context3D.scene.nodes; - var cnt = nodes.count; + %list of mesh nodes + var meshes = annot3D["\@MXV@label"].context3D.scene.meshes; % %auxiliary vectors var dir = new annot3D["\@MXV@label"].context3D.Vector3(); @@ -2181,110 +2407,96 @@ %auxiliary 4x4 matrix var bbox4x4 = new annot3D["\@MXV@label"].context3D.Matrix4x4(); % - %centre of global bounding box --> centre of orbit - var coo = % - annot3D["\@MXV@label"].context3D.scene.computeBoundingBox().center; - % - %radius of bounding sphere - var rBSphere = 0; - % - %iterate over all nodes in the scene - for(i=0; i<cnt; i++){% - var node = nodes.getByIndex(i); + %iterate over all mesh nodes in the scene + for(i=0; i<meshes.count; i++){% + var mesh = meshes.getByIndex(i); + % + %get the bbox of the mesh (local coordinates) + var bbox = mesh.computeBoundingBox(); + % + %local to parent transformation matrix + var trans = mesh.transform.transpose; % - %but inspect mesh nodes only - if(node.constructor.name == 'Mesh'){% - %get the bbox of the node (local coordinates) - var bbox = node.computeBoundingBox(); - % - %local to parent transformation matrix - var trans = node.transform.transpose; - % - %build local to world transformation matrix by recursively - %multiplying the parent's transf. matrix on the left - var parent = node.parent; - while(parent.constructor.name != 'Scene'){% - trans = parent.transform.transpose.multiply(trans); - parent = parent.parent; - }% - % - %transform the local bounding box corner coordinates to - %world coordinates for bounding sphere radius - %determination; - %Matrix4x4 method transformDirection(<Vector3>) seems - %to be bugged, therefore we must resort to the - %multiply(<Matrix4x4>) method using an auxiliary matrix - %which contains the local bounding box corner coordinates - % - %auxiliary matrix from bbox.min coordinates - bbox4x4.setView(bbox.min, dir, up); - % - %transform to world coordinates - bbox4x4 = trans.multiply(bbox4x4.transpose); - % - %extract the transformed coordinates - corner.set(bbox4x4.transpose.translation); - % - %vector from centre of orbit to bbox corner position - corner.subtractInPlace(coo); - % - %update bounding sphere radius - rBSphere = Math.max(rBSphere, corner.length); - % - %the same procedure with bbox.max - bbox4x4.setView(bbox.max, dir, up); - bbox4x4 = trans.multiply(bbox4x4.transpose); - corner.set(bbox4x4.transpose.translation); - corner.subtractInPlace(coo); - rBSphere = Math.max(rBSphere, corner.length); - % - %and with all remaining 6 bbox corners - corner.set(bbox.min.x, bbox.max.y, bbox.max.z); - bbox4x4.setView(corner, dir, up); - bbox4x4 = trans.multiply(bbox4x4.transpose); - corner.set(bbox4x4.transpose.translation); - corner.subtractInPlace(coo); - rBSphere = Math.max(rBSphere, corner.length); - % - corner.set(bbox.min.x, bbox.min.y, bbox.max.z); - bbox4x4.setView(corner, dir, up); - bbox4x4 = trans.multiply(bbox4x4.transpose); - corner.set(bbox4x4.transpose.translation); - corner.subtractInPlace(coo); - rBSphere = Math.max(rBSphere, corner.length); - % - corner.set(bbox.min.x, bbox.max.y, bbox.min.z); - bbox4x4.setView(corner, dir, up); - bbox4x4 = trans.multiply(bbox4x4.transpose); - corner.set(bbox4x4.transpose.translation); - corner.subtractInPlace(coo); - rBSphere = Math.max(rBSphere, corner.length); - % - corner.set(bbox.max.x, bbox.min.y, bbox.min.z); - bbox4x4.setView(corner, dir, up); - bbox4x4 = trans.multiply(bbox4x4.transpose); - corner.set(bbox4x4.transpose.translation); - corner.subtractInPlace(coo); - rBSphere = Math.max(rBSphere, corner.length); - % - corner.set(bbox.max.x, bbox.min.y, bbox.max.z); - bbox4x4.setView(corner, dir, up); - bbox4x4 = trans.multiply(bbox4x4.transpose); - corner.set(bbox4x4.transpose.translation); - corner.subtractInPlace(coo); - rBSphere = Math.max(rBSphere, corner.length); - % - corner.set(bbox.max.x, bbox.max.y, bbox.min.z); - bbox4x4.setView(corner, dir, up); - bbox4x4 = trans.multiply(bbox4x4.transpose); - corner.set(bbox4x4.transpose.translation); - corner.subtractInPlace(coo); - rBSphere = Math.max(rBSphere, corner.length); + %build local to world transformation matrix by recursively + %multiplying the parent's transf. matrix on the left + var parent = mesh.parent; + while(parent.constructor.name != 'Scene'){% + trans = parent.transform.transpose.multiply(trans); + parent = parent.parent; }% + % + %transform the local bounding box corner coordinates to + %world coordinates for bounding sphere determination; + %Matrix4x4 method transformDirection(<Vector3>) seems + %to be bugged, therefore we must resort to the + %multiply(<Matrix4x4>) method using an auxiliary matrix + %which contains the local bounding box corner coordinates + % + %auxiliary matrix from bbox.min coordinates + bbox4x4.setView(bbox.min, dir, up); + % + %transform to world coordinates + bbox4x4 = trans.multiply(bbox4x4.transpose); + % + %extract the transformed coordinates + corner.set(bbox4x4.transpose.translation); + % + %check-in corner position into Miniball + mb.check_in(new Array(corner.x, corner.y, corner.z)); + % + %the same procedure with bbox.max + bbox4x4.setView(bbox.max, dir, up); + bbox4x4 = trans.multiply(bbox4x4.transpose); + corner.set(bbox4x4.transpose.translation); + mb.check_in(new Array(corner.x, corner.y, corner.z)); + % + %and with all remaining 6 bbox corners + corner.set(bbox.min.x, bbox.max.y, bbox.max.z); + bbox4x4.setView(corner, dir, up); + bbox4x4 = trans.multiply(bbox4x4.transpose); + corner.set(bbox4x4.transpose.translation); + mb.check_in(new Array(corner.x, corner.y, corner.z)); + % + corner.set(bbox.min.x, bbox.min.y, bbox.max.z); + bbox4x4.setView(corner, dir, up); + bbox4x4 = trans.multiply(bbox4x4.transpose); + corner.set(bbox4x4.transpose.translation); + mb.check_in(new Array(corner.x, corner.y, corner.z)); + % + corner.set(bbox.min.x, bbox.max.y, bbox.min.z); + bbox4x4.setView(corner, dir, up); + bbox4x4 = trans.multiply(bbox4x4.transpose); + corner.set(bbox4x4.transpose.translation); + mb.check_in(new Array(corner.x, corner.y, corner.z)); + % + corner.set(bbox.max.x, bbox.min.y, bbox.min.z); + bbox4x4.setView(corner, dir, up); + bbox4x4 = trans.multiply(bbox4x4.transpose); + corner.set(bbox4x4.transpose.translation); + mb.check_in(new Array(corner.x, corner.y, corner.z)); + % + corner.set(bbox.max.x, bbox.min.y, bbox.max.z); + bbox4x4.setView(corner, dir, up); + bbox4x4 = trans.multiply(bbox4x4.transpose); + corner.set(bbox4x4.transpose.translation); + mb.check_in(new Array(corner.x, corner.y, corner.z)); + % + corner.set(bbox.max.x, bbox.max.y, bbox.min.z); + bbox4x4.setView(corner, dir, up); + bbox4x4 = trans.multiply(bbox4x4.transpose); + corner.set(bbox4x4.transpose.translation); + mb.check_in(new Array(corner.x, corner.y, corner.z)); }% % + %compute the smallest enclosing bounding sphere + mb.build(); + % + %bounding sphere centre + var coo = new annot3D["\@MXV@label"].context3D.Vector3(); + coo.set((mb.center())[0], (mb.center())[1], (mb.center())[2]); + % %radius of orbit - var roo = rBSphere / Math.sin(aac * Math.PI / 360.); + var roo = mb.radius()/ Math.sin(aac * Math.PI / 360.); % %assemble result string var res = ''; @@ -2661,6 +2873,16 @@ } %key definitions for options to \includemovie +\define@key{movie15}{draft}[true]{% + \setboolean{@MXV@@draft}{#1}% +} +\define@key{movie15}{final}[true]{% + \ifthenelse{\equal{#1}{true}}{% + \setboolean{@MXV@@draft}{false}% + }{% + \setboolean{@MXV@@draft}{true}% + }% +} \define@key{movie15}{label}{%for use with movieref \gdef\@MXV@label{#1}% } diff --git a/Master/texmf-dist/tex/latex/pgf/frontendlayer/pgfpict2e.sty b/Master/texmf-dist/tex/latex/pgf/frontendlayer/pgfpict2e.sty index 04a298eac4e..830fa0c6428 100644 --- a/Master/texmf-dist/tex/latex/pgf/frontendlayer/pgfpict2e.sty +++ b/Master/texmf-dist/tex/latex/pgf/frontendlayer/pgfpict2e.sty @@ -50,8 +50,8 @@ \pgfsys@endpurepicture}} -\def\oval{\pgf@ifnextchar[{\pgfpictIIe@oval}{\pgfpictIIe@oval[20pt]}} -\def\pgfpictIIe@oval[#1](#2,#3){\pgf@ifnextchar[{\pgfpictIIe@@oval[#1](#2,#3)}{\pgfpictIIe@@oval[#1](#2,#3)[]}} +\def\oval{\pgfutil@ifnextchar[{\pgfpictIIe@oval}{\pgfpictIIe@oval[20pt]}} +\def\pgfpictIIe@oval[#1](#2,#3){\pgfutil@ifnextchar[{\pgfpictIIe@@oval[#1](#2,#3)}{\pgfpictIIe@@oval[#1](#2,#3)[]}} \def\pgfpictIIe@@oval[#1](#2,#3)[#4]{{% \pgfsys@beginpurepicture% \@tfor\reserved@a:=#4\do{\csname pgfpictIIe@clip\reserved@a\endcsname}% diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty index ed5356f2bbb..639fb071a3f 100644 --- a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty +++ b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty @@ -62,11 +62,11 @@ % % \pgfpagesuselayout{resize to}[a4paper] -\def\pgfpagesuselayout#1{\pgf@ifnextchar[{\pgf@pagelayout{#1}}{\pgf@pagelayout{#1}[]}} +\def\pgfpagesuselayout#1{\pgfutil@ifnextchar[{\pgf@pagelayout{#1}}{\pgf@pagelayout{#1}[]}} \def\pgf@pagelayout#1[#2]{ \csname pgfpages@layoutbefore@#1\endcsname \setkeys{pgfpagesuselayoutoption}{#2} - \pgf@ifundefined{pgfpages@layout@#1}{ + \pgfutil@ifundefined{pgfpages@layout@#1}{ \PackageError{pgfpages}{Page layout `#1' undefined.}{} } { @@ -1006,7 +1006,7 @@ \newcommand\pgfsetupphysicalpagesizes{% % The following code was send to me by Rolf Niepraschk - \ifx\Gin@driver\pgf@empty\else% + \ifx\Gin@driver\pgfutil@empty\else% \filename@parse{\Gin@driver}\@tempswafalse% \def\reserved@a{dvips}% \ifx\filename@base\reserved@a\@tempswatrue\fi% diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/pgfrcs.sty b/Master/texmf-dist/tex/latex/pgf/utilities/pgfrcs.sty index 7c0004d3333..05db9decaea 100644 --- a/Master/texmf-dist/tex/latex/pgf/utilities/pgfrcs.sty +++ b/Master/texmf-dist/tex/latex/pgf/utilities/pgfrcs.sty @@ -7,6 +7,9 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. +\input pgfutil-common.tex +\input pgfutil-latex.def + \input{pgfrcs.code.tex} \endinput diff --git a/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty b/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty index 8c7e84769d5..7264746835a 100644 --- a/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty +++ b/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty @@ -32,14 +32,14 @@ %% http://dvc.org.uk/gplv2.txt %% %% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+= -\ProvidesPackage{hardmarg}[2006/10/08 v1.504 +\ProvidesPackage{hardmarg}[2006/10/25 v1.516 For use with class screenplay (C)2006 John Pate released under the GNU General Public License] \setlength{\textwidth}{6.0in} -\renewcommand*{\widthfudge}{0in} -\renewcommand*{\dialwidth}{3.0in} -\renewcommand*{\parenwidth}{1.5in} +\setlength{\widthgutter}{0in} +\setlength{\dialwidth}{3.0in} +\setlength{\parenwidth}{1.5in} %% %% Hail Eris! All Hail Discordia! %% diff --git a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls index 89cd0267c00..ccce7fb2449 100644 --- a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls +++ b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls @@ -33,13 +33,13 @@ %% %% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+= \NeedsTeXFormat{LaTeX2e}[2003/12/01] -\ProvidesClass{screenplay}[2006/10/08 v1.504 +\ProvidesClass{screenplay}[2006/10/25 v1.516 LaTeX2e Draft Screenplay document class (C)2006 John Pate released under the GNU General Public License] \DeclareOption*{% \PackageError{screenplay}{Unwanted option '\CurrentOption'}% - {There are no options available for class screenplay v1.504}} + {There are no options available for class screenplay v1.516}} \ProcessOptions\relax \RequirePackage{ifthen}[2001/05/26] \LoadClass[12pt,letterpaper,onecolumn,oneside]{article}[2004/02/16] @@ -53,7 +53,7 @@ released under the GNU General Public License] \pagestyle{myheadings} \setlength{\baselineskip}{12pt plus 0pt minus 0pt} \renewcommand*{\baselinestretch}{0.8} -\newcommand*{\dialfix}{\vspace{3pt}} +\newcommand*{\dialfix}{\vspace{2pt}} \setlength{\parskip}{\baselineskip} \setlength{\parindent}{0in} \newcommand*{\slugspace}{\hspace{2.0em plus 0em minus 0em}} @@ -63,14 +63,21 @@ released under the GNU General Public License] \setlength{\headsep}{0.4in} \setlength{\topskip}{0in} \setlength{\textheight}{9.5in} -\setlength{\textwidth}{6.1in} -\newcommand*{\widthfudge}{0.1in} -\newcommand*{\dialwidth}{3.2in} +\setlength{\textwidth}{6.0in} +\newlength{\widthgutter} +\setlength{\widthgutter}{0.1in} +\addtolength{\textwidth}{\widthgutter} +\newlength{\dialwidth} +\setlength{\dialwidth}{3.0in} +\newlength{\dialgutter} +\setlength{\dialgutter}{0.2in} +\addtolength{\dialwidth}{\dialgutter} \newcommand*{\dialtab}{\hspace*{1.5in}} \newcommand*{\dialnametab}{\hspace*{1.2in}} -\newcommand*{\parenwidth}{1.7in} +\newlength{\parenwidth} +\setlength{\parenwidth}{1.5in} +\addtolength{\parenwidth}{\dialgutter} \newcommand*{\parentab}{\hspace{0.7in}} -\newcommand*{\parenkludge}{\dialfix} \renewcommand*{\textfraction}{1} \renewcommand*{\topfraction}{0} \renewcommand*{\bottomfraction}{0} @@ -118,12 +125,14 @@ by\\ \parbox[t]{2.0in}{\raggedright#4} \newpage\setcounter{page}{1} }%titleextra +\newcommand*{\more}{(MORE)} +\newcommand*{\contd}{(CONT'D)} \newcommand{\paren}[2][\\]{% -#1\parentab\parbox[t]{\parenwidth}{\raggedright(#2)\parenkludge}\\ +#1\parentab\parbox[t]{\parenwidth}{\raggedright(#2)\dialfix}\\ }%paren \newenvironment{dialogue}[2][]{ -\dialtab\dialnametab\hbox{\MakeUppercase{#2}}\nopagebreak\\ +\dialtab\dialnametab\hbox{\MakeUppercase{#2}}\\* \dialtab\begin{minipage}[b]{\dialwidth} \dialfix \raggedright @@ -136,14 +145,14 @@ by\\ }%dialogue \newcommand{\dialbreak}[2][]{ -\\\dialnametab\hbox{(MORE)}% +\\\dialnametab\hbox{\more}% \end{dialogue} \pagebreak \ifthenelse{\not\equal{#1}{}} { -\begin{dialogue}[#1]{\MakeUppercase{#2} (CONT'D)} +\begin{dialogue}[#1]{\MakeUppercase{#2} \contd} }{ -\begin{dialogue}{\MakeUppercase{#2} (CONT'D)} +\begin{dialogue}{\MakeUppercase{#2} \contd} } }%dialbreak \newcommand{\intslug}[2][]{ @@ -190,12 +199,11 @@ by\\ \ifthenelse{\not\equal{#1}{}} { -TITLE OVER (#1):\\ +TITLE OVER #1: }{ -TITLE OVER:\\ -} -\vspace{\baselineskip} -\nopagebreak +TITLE OVER: +}% +\\*[\baselineskip] \dialtab\begin{minipage}[b]{\dialwidth} \raggedright }{ @@ -203,17 +211,15 @@ TITLE OVER:\\ }%titleover \newcommand{\titbreak}{ -\\\dialnametab\hbox{(MORE)}% +\\\dialnametab\hbox{\more}% \end{titleover} \pagebreak -\begin{titleover}[CONT'D] +\begin{titleover}[\contd] }%titbreak \newcommand{\centretitle}[1]{ -TITLE OVER: -\nopagebreak - -\hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthfudge} +TITLE OVER:\\*[\baselineskip] +\hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthgutter} }%centretitle \newcommand{\fadein}{ @@ -223,20 +229,19 @@ FADE IN: }%fadein \newcommand{\fadeout}{ -\hspace*{\fill}FADE OUT:\hspace{\widthfudge} +\hspace*{\fill}FADE OUT:\hspace{\widthgutter} }%fadeout \newcommand{\intercut}{ -\hspace*{\fill}INTERCUT WITH:\hspace{\widthfudge} +\hspace*{\fill}INTERCUT WITH:\hspace{\widthgutter} }%intercut -\newcommand*{\pov}{P.O.V. } -\newcommand*{\revert}{REVERSE \pov } -\newcommand*{\nb}{NOTE: } +\newcommand*{\pov}{P.O.V.} +\newcommand*{\revert}{REVERSE \pov} \newcommand{\theend}{ -\hspace*{\fill}THE END\hspace{\fill}\hspace{\widthfudge} +\hspace*{\fill}THE END\hspace{\fill}\hspace{\widthgutter} }%THE END %% diff --git a/Master/texmf-dist/tex/latex/textfit/textfit.sty b/Master/texmf-dist/tex/latex/textfit/textfit.sty index 762e39dceb9..35262bd816c 100644 --- a/Master/texmf-dist/tex/latex/textfit/textfit.sty +++ b/Master/texmf-dist/tex/latex/textfit/textfit.sty @@ -1,15 +1,15 @@ -%% +%% %% This is file `textfit.sty', %% generated with the docstrip utility. -%% +%% %% The original source files were: -%% +%% %% textfit.dtx (with options: `package') -%% Copyright (C) 1993,94 Sebastian Rahtz and Phil Taylor. -%% All rights reserved. Permission is granted to to -%% customize the declarations in this file to serve the needs of your -%% installation. However, no permission is granted to distribute a -%% modified version of this file under its original name. +%% Copyright (C) 1993,94 Sebastian Rahtz and Phil Taylor. +%% All rights reserved. Permission is granted to to +%% customize the declarations in this file to serve the needs of your +%% installation. However, no permission is granted to distribute a +%% modified version of this file under its original name. %% \def\fileversion{5} \def\filedate{1994/04/15} @@ -141,5 +141,5 @@ \def\scaletowidth{\@scaletofit[h]} \def\scaletoheight{\@scaletofit[v]} \endinput -%% +%% %% End of file `textfit.sty'. diff --git a/Master/texmf-dist/tex/latex/thumb/thumb.sty b/Master/texmf-dist/tex/latex/thumb/thumb.sty index 022b8cb3f3b..78cb656ba56 100644 --- a/Master/texmf-dist/tex/latex/thumb/thumb.sty +++ b/Master/texmf-dist/tex/latex/thumb/thumb.sty @@ -148,7 +148,7 @@ \ifhave@minitoc \def\thumbmini{} \else - \PackageWarning{thumb}{style `minitoc^^b4 not avaliable \return + \PackageWarning{thumb}{style `minitoc´ not avaliable \return option `minitoc' will not be used} \fi } @@ -553,7 +553,7 @@ \immediate\write\thumbovr{\ovrout} } \else - \PackageWarning{thumb}{style `fancyhdr^^b4 not avaliable \return + \PackageWarning{thumb}{style `fancyhdr´ not avaliable \return style `thumb' will not be used} \fi \endinput diff --git a/Master/texmf-dist/tex/latex/tocvsec2/tocvsec2.sty b/Master/texmf-dist/tex/latex/tocvsec2/tocvsec2.sty index 884a15514a3..6ea2c35498a 100644 --- a/Master/texmf-dist/tex/latex/tocvsec2/tocvsec2.sty +++ b/Master/texmf-dist/tex/latex/tocvsec2/tocvsec2.sty @@ -6,35 +6,41 @@ %% %% tocvsec2.dtx (with options: `usc') %% -%% Copyright 1998 Peter R. Wilson +%% ----------------------------------------------------------------- +%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004 +%% (or at: pandgwilson at earthlink dot net) +%% Copyright 1998 -- 2004 Peter R. Wilson %% -%% This program is provided under the terms of the -%% LaTeX Project Public License distributed from CTAN -%% archives in directory macros/latex/base/lppl.txt. +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any +%% later version. +%% The latest version of the license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2003/06/01 or later. %% -%% Author: Peter Wilson (CUA and NIST) -%% now at: peter.r.wilson@boeing.com +%% This work has the LPPL maintenance status "author-maintained". %% +%% This work consists of the files listed in the README file. +%% ----------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tocvsec2}[1999/01/24 v1.1 variable ToC section entries] -\RequirePackage{stdclsdv} +\ProvidesPackage{tocvsec2}[2004/05/24 v1.2 variable ToC section entries] \RequirePackage{ifthen} -\ifSCDknownclass - \ifSCDnodivs - \PackageWarning{tocvsec2}{There are no sectional divisions in this class} - \renewcommand{\SCDquit}{\endinput} - \fi -\else - \PackageWarning{tocvsec2}% - {I don't recognize the class but I'll do my best} -\fi -\SCDquit +\newif\ift@cchapter + \t@cchapterfalse +\@ifundefined{chapter}{% + \@ifundefined{section}{% + \PackageWarning{tocvsec2}{% + I don't recognize any divisions but I'll do my best}}{}}% + {\t@cchaptertrue} + \newif\if@knownsect@c \newcommand{\@setseccntt@c}[2]{ \@knownsect@cfalse \ifthenelse{\equal{#1}{none}}{\setcounter{#2}{-10} \@knownsect@ctrue}{} - \ifthenelse{\equal{#1}{part}}{\ifSCDchapter + \ifthenelse{\equal{#1}{part}}{\ift@cchapter \setcounter{#2}{-1} \else \setcounter{#2}{0} @@ -68,7 +74,7 @@ \addtocontents{toc}{\protect\setcounter{tocdepth}{-10}} \@knownsect@ctrue}{} \ifthenelse{\equal{#1}{part}}{% - \ifSCDchapter + \ift@cchapter \addtocontents{toc}{\protect\setcounter{tocdepth}{-1}} \else \addtocontents{toc}{\protect\setcounter{tocdepth}{0}} diff --git a/Master/texmf-dist/tex/plain/pgf/basiclayer/pgf.tex b/Master/texmf-dist/tex/plain/pgf/basiclayer/pgf.tex index 038eb090031..f04628f835c 100644 --- a/Master/texmf-dist/tex/plain/pgf/basiclayer/pgf.tex +++ b/Master/texmf-dist/tex/plain/pgf/basiclayer/pgf.tex @@ -12,8 +12,8 @@ \catcode`\@=11 -\input pgfrcs.code.tex -\ProvidesPackageRCS $Header: /cvsroot/pgf/pgf/plain/pgf/basiclayer/pgf.tex,v 1.5 2006/10/11 15:22:28 tantau Exp $ +\input pgfrcs.tex +\ProvidesPackageRCS $Header: /cvsroot/pgf/pgf/plain/pgf/basiclayer/pgf.tex,v 1.6 2006/10/16 22:33:01 tantau Exp $ \input pgfcore.tex \input pgfbaseshapes.tex diff --git a/Master/texmf-dist/tex/plain/pgf/frontendlayer/tikz.tex b/Master/texmf-dist/tex/plain/pgf/frontendlayer/tikz.tex index 3b83649a10a..28754b8a41d 100644 --- a/Master/texmf-dist/tex/plain/pgf/frontendlayer/tikz.tex +++ b/Master/texmf-dist/tex/plain/pgf/frontendlayer/tikz.tex @@ -15,7 +15,6 @@ \input xkeyval.tex \input pgf.tex \input pgffor.tex -\input pgflibraryplothandlers.tex \input tikz.code.tex \catcode`\@=\tikzatcode diff --git a/Master/texmf-dist/tex/plain/pgf/systemlayer/pgfsys.tex b/Master/texmf-dist/tex/plain/pgf/systemlayer/pgfsys.tex index 58d6a27f801..1ca8bba3581 100644 --- a/Master/texmf-dist/tex/plain/pgf/systemlayer/pgfsys.tex +++ b/Master/texmf-dist/tex/plain/pgf/systemlayer/pgfsys.tex @@ -15,8 +15,7 @@ \edef\pgfsysatcode{\the\catcode`\@} \catcode`\@=11 -\input pgfrcs.code.tex -\input pgf-latex-emulation.tex +\input pgfrcs.tex \input pgfsys.code.tex \input pgfsyssoftpath.code.tex diff --git a/Master/texmf-dist/tex/plain/pgf/utilities/pgffor.tex b/Master/texmf-dist/tex/plain/pgf/utilities/pgffor.tex index 6888de3bcc1..4b5e8177135 100644 --- a/Master/texmf-dist/tex/plain/pgf/utilities/pgffor.tex +++ b/Master/texmf-dist/tex/plain/pgf/utilities/pgffor.tex @@ -10,7 +10,7 @@ \edef\pgfforatcode{\the\catcode`\@} \catcode`\@=11 -\input pgfrcs.code.tex +\input pgfrcs.tex \input pgffor.code.tex \catcode`\@=\pgfforatcode diff --git a/Master/texmf-dist/tex/plain/pgf/utilities/pgfrcs.tex b/Master/texmf-dist/tex/plain/pgf/utilities/pgfrcs.tex new file mode 100644 index 00000000000..6d8928dc078 --- /dev/null +++ b/Master/texmf-dist/tex/plain/pgf/utilities/pgfrcs.tex @@ -0,0 +1,26 @@ +% Copyright 2006 by Till Tantau +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. +% +% See the file doc/generic/pgf/licenses/LICENSE for more details. + + +\ifx\pgfrcsincluded\undefined +\def\pgfrcsincluded{} + +\edef\pgfrcsatcode{\the\catcode`\@} +\catcode`\@=11 + +\input pgfutil-common.tex +\input pgfutil-plain.def + +\input pgfrcs.code.tex + +\catcode`\@=\pgfrcsatcode + +\fi + +\endinput |