diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/systemlayer')
11 files changed, 125 insertions, 110 deletions
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 |