summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/systemlayer
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-06-17 23:22:38 +0000
committerKarl Berry <karl@freefriends.org>2007-06-17 23:22:38 +0000
commit5c5c7843fbd37c6960799b6e1a32d5948966316c (patch)
treeea73f6b5ba799656992ebe2f34beccd2555f1342 /Master/texmf-dist/tex/generic/pgf/systemlayer
parentf0c1f4cdb9fad83f293fd91d194538425f9f7633 (diff)
pgf 1.18 (15jun07)
git-svn-id: svn://tug.org/texlive/trunk@4459 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/systemlayer')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg11
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def6
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def13
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def106
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def25
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def8
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def18
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def4
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex33
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex9
10 files changed, 134 insertions, 99 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg
index 0bed39c0541..b89169e5a1e 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg
@@ -7,11 +7,20 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgf.cfg,v 1.2 2006/10/11 15:22:26 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgf.cfg,v 1.4 2007/03/20 09:34:00 tantau Exp $
% Default driver:
\ifx\pgfsysdriver\@undefined
\def\pgfsysdriver{pgfsys-\Gin@driver}
+
+ % Test for XeTeX and use dvipdfm in this case:
+ \ifx\XeTeXversion\@undefined
+ \else
+ \ifx\XeTeXversion\relax
+ \else
+ \def\pgfsysdriver{pgfsys-dvipdfm.def}
+ \fi
+ \fi
\fi
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 0247df3d9ea..bb9dde9ea85 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.15 2006/10/16 22:32:59 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-postscript.def,v 1.16 2007/06/07 07:41:11 tantau Exp $
% Driver commands for postscript
@@ -181,7 +181,7 @@
\def\pgfsys@horishading#1#2#3{%
{%
\pgf@parsefunc{#3}%
- \setlength\pgf@x{#2}%
+ \pgfmathsetlength\pgf@x{#2}%
\pgf@xa=\pgf@x%
\pgf@sys@bp@correct{\pgf@x}%
\pgf@y=\pgf@max%
@@ -200,7 +200,7 @@
\def\pgfsys@vertshading#1#2#3{%
{%
\pgf@parsefunc{#3}%
- \setlength\pgf@x{#2}%
+ \pgfmathsetlength\pgf@x{#2}%
\pgf@xa=\pgf@x%
\pgf@sys@bp@correct{\pgf@x}%
\pgf@y=\pgf@max%
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 5dffff8b17c..f1446ce894b 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,7 +7,7 @@
%
% 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.18 2006/10/16 22:32:59 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-svg.def,v 1.19 2007/06/12 21:23:32 tantau Exp $
% Driver commands for svg
@@ -30,6 +30,9 @@
}
\newcount\pgf@sys@svg@objectcount
\let\Hnewline=\pgfutil@empty
+\catcode`\%=12
+\def\pgf@sys@svg@percentchar{%}
+\catcode`\%=14
% Path construction:
\def\pgfsys@lineto#1#2{\pgf@sys@addtosvgpath{L }\pgf@sys@svgnum{#1}\pgf@sys@svgnum{#2}}
@@ -145,7 +148,7 @@
\pgf@xb=100\pgf@xb%
\pgf@xc=#3pt%
\pgf@xc=100\pgf@xc%
- \xdef\pgf@sys@svg@prepared{rgb(\pgf@sys@tonumber\pgf@xa\%,\pgf@sys@tonumber\pgf@xb\%,\pgf@sys@tonumber\pgf@xc\%)}%
+ \xdef\pgf@sys@svg@prepared{rgb(\pgf@sys@tonumber\pgf@xa\pgf@sys@svg@percentchar,\pgf@sys@tonumber\pgf@xb\pgf@sys@svg@percentchar,\pgf@sys@tonumber\pgf@xc\pgf@sys@svg@percentchar)}%
}%
}
\def\pgf@sys@svg@color@cmy#1,#2,#3\relax{%
@@ -159,7 +162,7 @@
\pgf@xc=1pt%
\advance\pgf@xc by-#3pt%
\pgf@xc=100\pgf@xc%
- \xdef\pgf@sys@svg@prepared{rgb(\pgf@sys@tonumber\pgf@xa\%,\pgf@sys@tonumber\pgf@xb\%,\pgf@sys@tonumber\pgf@xc\%)}%
+ \xdef\pgf@sys@svg@prepared{rgb(\pgf@sys@tonumber\pgf@xa\pgf@sys@svg@percentchar,\pgf@sys@tonumber\pgf@xb\pgf@sys@svg@percentchar,\pgf@sys@tonumber\pgf@xc\pgf@sys@svg@percentchar)}%
}%
}
\def\pgf@sys@svg@color@cmyk#1,#2,#3,#4\relax{%
@@ -182,14 +185,14 @@
\advance\pgf@xc by#4pt%
\advance\pgf@xc by-1pt%
\pgf@xc=-100\pgf@xc%
- \xdef\pgf@sys@svg@prepared{rgb(\pgf@sys@tonumber\pgf@xa\%,\pgf@sys@tonumber\pgf@xb\%,\pgf@sys@tonumber\pgf@xc\%)}%
+ \xdef\pgf@sys@svg@prepared{rgb(\pgf@sys@tonumber\pgf@xa\pgf@sys@svg@percentchar,\pgf@sys@tonumber\pgf@xb\pgf@sys@svg@percentchar,\pgf@sys@tonumber\pgf@xc\pgf@sys@svg@percentchar)}%
}%
}
\def\pgf@sys@svg@color@gray#1\relax{%
{%
\pgf@xa=#1pt%
\pgf@xa=100\pgf@xa%
- \xdef\pgf@sys@svg@prepared{rgb(\pgf@sys@tonumber\pgf@xa\%,\pgf@sys@tonumber\pgf@xa\%,\pgf@sys@tonumber\pgf@xa\%)}%
+ \xdef\pgf@sys@svg@prepared{rgb(\pgf@sys@tonumber\pgf@xa\pgf@sys@svg@percentchar,\pgf@sys@tonumber\pgf@xa\pgf@sys@svg@percentchar,\pgf@sys@tonumber\pgf@xa\pgf@sys@svg@percentchar)}%
}%
}
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def
index 164efe6a01e..05f647fc796 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.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-dvi.def,v 1.3 2006/10/11 15:22:26 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvi.def,v 1.5 2007/06/07 07:41:11 tantau Exp $
% Driver commands for pure, ultra-portable dvi, in the tradition of
% old-style LaTeX pictures.
@@ -82,80 +82,80 @@
\pgf@xc=#7%
\pgf@yc=#8%
% Compute number of steps:
- \@tempdima=\pgf@x%
- \advance\@tempdima by-\pgf@xa%
- \ifdim\@tempdima<0pt%
- \@tempdimb=-\@tempdima%
+ \pgfutil@tempdima=\pgf@x%
+ \advance\pgfutil@tempdima by-\pgf@xa%
+ \ifdim\pgfutil@tempdima<0pt%
+ \pgfutil@tempdimb=-\pgfutil@tempdima%
\else%
- \@tempdimb=\@tempdima%
+ \pgfutil@tempdimb=\pgfutil@tempdima%
\fi%
- \@tempdima=\pgf@y%
- \advance\@tempdima by-\pgf@ya%
- \ifdim\@tempdima<0pt%
- \@tempdima=-\@tempdima%
+ \pgfutil@tempdima=\pgf@y%
+ \advance\pgfutil@tempdima by-\pgf@ya%
+ \ifdim\pgfutil@tempdima<0pt%
+ \pgfutil@tempdima=-\pgfutil@tempdima%
\fi%
- \ifdim\@tempdima>\@tempdimb%
- \@tempdimb=\@tempdima%
+ \ifdim\pgfutil@tempdima>\pgfutil@tempdimb%
+ \pgfutil@tempdimb=\pgfutil@tempdima%
\fi%
- \@tempdima=\pgf@xb%
- \advance\@tempdima by-\pgf@xc%
- \ifdim\@tempdima<0pt%
- \@tempdima=-\@tempdima%
+ \pgfutil@tempdima=\pgf@xb%
+ \advance\pgfutil@tempdima by-\pgf@xc%
+ \ifdim\pgfutil@tempdima<0pt%
+ \pgfutil@tempdima=-\pgfutil@tempdima%
\fi%
- \ifdim\@tempdima>\@tempdimb%
- \@tempdimb=\@tempdima%
+ \ifdim\pgfutil@tempdima>\pgfutil@tempdimb%
+ \pgfutil@tempdimb=\pgfutil@tempdima%
\fi%
- \@tempdima=\pgf@yb%
- \advance\@tempdima by-\pgf@yc%
- \ifdim\@tempdima<0pt%
- \@tempdima=-\@tempdima%
+ \pgfutil@tempdima=\pgf@yb%
+ \advance\pgfutil@tempdima by-\pgf@yc%
+ \ifdim\pgfutil@tempdima<0pt%
+ \pgfutil@tempdima=-\pgfutil@tempdima%
\fi%
- \ifdim\@tempdima>\@tempdimb%
- \@tempdimb=\@tempdima%
+ \ifdim\pgfutil@tempdima>\pgfutil@tempdimb%
+ \pgfutil@tempdimb=\pgfutil@tempdima%
\fi%
- \@tempdima=\pgf@x%
- \advance\@tempdima by-\pgf@xc%
- \ifdim\@tempdima<0pt%
- \@tempdima=-\@tempdima%
+ \pgfutil@tempdima=\pgf@x%
+ \advance\pgfutil@tempdima by-\pgf@xc%
+ \ifdim\pgfutil@tempdima<0pt%
+ \pgfutil@tempdima=-\pgfutil@tempdima%
\fi%
- \ifdim\@tempdima>\@tempdimb%
- \@tempdimb=\@tempdima%
+ \ifdim\pgfutil@tempdima>\pgfutil@tempdimb%
+ \pgfutil@tempdimb=\pgfutil@tempdima%
\fi%
- \@tempdima=\pgf@y%
- \advance\@tempdima by-\pgf@yc%
- \ifdim\@tempdima<0pt%
- \@tempdima=-\@tempdima%
+ \pgfutil@tempdima=\pgf@y%
+ \advance\pgfutil@tempdima by-\pgf@yc%
+ \ifdim\pgfutil@tempdima<0pt%
+ \pgfutil@tempdima=-\pgfutil@tempdima%
\fi%
- \ifdim\@tempdima>\@tempdimb%
- \@tempdimb=\@tempdima%
+ \ifdim\pgfutil@tempdima>\pgfutil@tempdimb%
+ \pgfutil@tempdimb=\pgfutil@tempdima%
\fi%
- \@tempcnta=\@tempdimb%
+ \pgfutil@tempcnta=\pgfutil@tempdimb%
\ifdim\pgf@sys@dvi@linewidth>0.3pt%
- \@tempdimb=0.15pt%
+ \pgfutil@tempdimb=0.15pt%
\else%
\ifdim\pgf@sys@dvi@linewidth<0.05pt%
- \@tempdimb=.025pt%
+ \pgfutil@tempdimb=.025pt%
\else%
- \@tempdimb=.5\pgf@sys@dvi@linewidth%
+ \pgfutil@tempdimb=.5\pgf@sys@dvi@linewidth%
\fi%
\fi%
- \@tempcntb=\@tempdimb%
- \divide\@tempcnta by\@tempcntb\relax%
- \ifnum\@tempcnta>0\relax%
- \@tempcntb=0\relax%
+ \pgfutil@tempcntb=\pgfutil@tempdimb%
+ \divide\pgfutil@tempcnta by\pgfutil@tempcntb\relax%
+ \ifnum\pgfutil@tempcnta>0\relax%
+ \pgfutil@tempcntb=0\relax%
\loop%
{%
- \@tempdima=\the\@tempcntb pt%
- \@tempdimb=\the\@tempcnta pt%
- \advance\@tempdimb by-\@tempdima\relax%
- \divide\@tempdima by\@tempcnta\relax%
- \divide\@tempdimb by\@tempcnta\relax%
- \edef\pgf@time@t{\pgf@sys@tonumber{\@tempdima}}%
- \edef\pgf@time@s{\pgf@sys@tonumber{\@tempdimb}}%
+ \pgfutil@tempdima=\the\pgfutil@tempcntb pt%
+ \pgfutil@tempdimb=\the\pgfutil@tempcnta pt%
+ \advance\pgfutil@tempdimb by-\pgfutil@tempdima\relax%
+ \divide\pgfutil@tempdima by\pgfutil@tempcnta\relax%
+ \divide\pgfutil@tempdimb by\pgfutil@tempcnta\relax%
+ \edef\pgf@time@t{\pgf@sys@tonumber{\pgfutil@tempdima}}%
+ \edef\pgf@time@s{\pgf@sys@tonumber{\pgfutil@tempdimb}}%
\pgf@sys@dvi@bezier%
}%
- \advance\@tempcntb by1\relax
- \ifnum\@tempcntb<\@tempcnta%
+ \advance\pgfutil@tempcntb by1\relax
+ \ifnum\pgfutil@tempcntb<\pgfutil@tempcnta%
{\def\pgf@time@t{1}\def\pgf@time@s{0}\pgf@sys@dvi@bezier}%
\repeat%
\fi%
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 4627ba048ce..b97cdc08515 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.11 2006/10/26 17:19:42 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvipdfm.def,v 1.14 2007/06/07 07:41:11 tantau Exp $
% Driver commands for dvipdfm
@@ -23,10 +23,11 @@
\def\pgfsys@hbox#1{%
\special{pdf: content Q q -1 0 0 -1 0 0 cm q}%
- \special{pdf: content -1 0 0 -1 0 0 cm q}% translate to original coordinate system
- \special{pdf: content 0 0 m W n q}% clip next stuff
- {\hbox to 0pt{\pgf@selectfontorig.\hss}}% enforce font change
- \special{pdf: content Q}% end of font change enforcement.
+ \special{pdf: content -1 0 0 -1 0 0 cm 3 Tr q}% translate to
+ % original coordinate system and do
+ % not show anything
+ {\hbox to 0pt{\pgfutil@font@normalfont\pgfutil@selectfont.\hss}}% enforce font change
+ \special{pdf: content Q 0 Tr q}% end of font change enforcement.
\wd#1=0pt%
\ht#1=0pt%
\dp#1=0pt%
@@ -34,9 +35,9 @@
\special{pdf: content Q n Q}%
}
\def\pgfsys@beginpicture{%
- \pgfsys@invoke{1 0 0 1 2000 2000 cm}%
- \hbox to 0pt{\selectfont.\hss}%
- \pgfsys@invoke{1 0 0 1 -2000 -2000 cm}%
+ \special{pdf: content Q 3 Tr q}% do not show anything
+ \hbox to 0pt{\pgfutil@font@normalfont\pgfutil@selectfont.\hss}% enforce font change
+ \special{pdf: content Q 0 Tr q}% end of font change enforcement.
\special{pdf: content q}}
\def\pgfsys@endpicture{%
\special{pdf: content n Q}%
@@ -106,8 +107,8 @@
\pgf@sys@bp@correct{\pgf@y}%
\pgf@sys@bp@correct{\pgf@xa}%
\pgf@sys@bp@correct{\pgf@ya}%
- \@tempdima=2\pgf@max\relax%
- \edef\@temp{\noexpand\pgf@sys@atbeginpage{\special{pdf: beginxobj @pgfshade#1 width \the\@tempdima\space height \the\@tempdima}}}\@temp%
+ \pgfutil@tempdima=2\pgf@max\relax%
+ \edef\@temp{\noexpand\pgf@sys@atbeginpage{\special{pdf: beginxobj @pgfshade#1 width \the\pgfutil@tempdima\space height \the\pgfutil@tempdima}}}\@temp%
\edef\@temp{\noexpand\pgf@sys@atbeginpage{\special{pdf: put @resources <<
/Shading << /Sh << /ShadingType 3
/ColorSpace /DeviceRGB
@@ -118,14 +119,14 @@
\pgf@sys@atbeginpage{\special{pdf: content /Sh sh}%
\special{pdf: endxobj}}%
\expandafter\xdef\csname @pgfshading#1!\endcsname{%
- \hbox to\the\@tempdima{\vbox to\the\@tempdima{\vfil\special{pdf: usexobj @pgfshade#1}}\hfil}}%
+ \hbox to\the\pgfutil@tempdima{\vbox to\the\pgfutil@tempdima{\vfil\special{pdf: usexobj @pgfshade#1}}\hfil}}%
}%
}%
\def\pgf@sys@atbeginpage#1{\AtBeginDvi{#1}}
\AtBeginDocument{% hyperref hack
- \providecommand\HyPL@EveryPage{}
+ \ifx\HyPL@EveryPage\@undefined\def\HyPL@EveryPage{}\fi
\def\@begindvi{\unvbox\@begindvibox\HyPL@EveryPage}
}
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 c66aca7b4d8..ba01eda368f 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.15 2006/10/26 17:19:43 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvips.def,v 1.17 2007/05/28 18:39:57 tantau Exp $
% Driver commands for dvips
@@ -75,7 +75,7 @@
/.setopacityalpha where {pop} {/.setopacityalpha{pop}def} ifelse % install .setopacityalpha
/.pgfsetfillopacityalpha{/pgffoa exch def
/pgffill{gsave pgffoa .setopacityalpha fill 1 .setopacityalpha newpath fill grestore}B
- /pgfeofill{gsave pgffoa .setopacityalpha eofill1 .setopacityalpha newpath eofill grestore}B}B
+ /pgfeofill{gsave pgffoa .setopacityalpha eofill 1 .setopacityalpha newpath eofill grestore}B}B
/.pgfsetstrokeopacityalpha{/pgfsoa exch def
/pgfstr{gsave pgfsoa .setopacityalpha stroke grestore}B}B
/pgffoa 1 def
@@ -86,13 +86,13 @@
\AtBeginDocument{ % needed for plain TeX
\pgfsys@atbegindocument
- \let\pgfsys@atbegindocument=\relax
+ \let\pgfsys@atbegindocument=\pgfutil@empty
}
%
-% Position tracking (needs pdftex >= 1.40.0-alpha-20051205 in dvi mode)
+% Position tracking (needs pdftex >= 1.40 in dvi mode)
%
\ifx\pdftexversion\@undefined
\else
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 be4d4d2fd3b..1f14326ad1f 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.14 2006/10/23 08:38:18 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-pdftex.def,v 1.15 2007/06/07 07:41:11 tantau Exp $
% Driver commands for pdf
@@ -85,9 +85,9 @@
\PackageWarning{pgf}{Page selection not supported. Ignoring
page selection}%
\fi%
- \setbox\@tempboxa=\hbox{%
+ \setbox\pgfutil@tempboxa=\hbox{%
\pdfimage \pgf@imageheight \pgf@imagewidth {\pgf@filename}}%
- \pdfform\@tempboxa%
+ \pdfform\pgfutil@tempboxa%
\edef\pgf@image{\noexpand\pdfrefform\the\pdflastform}%
\else% new version
{\pdfximage \pgf@imageheight \pgf@imagewidth attr
@@ -108,7 +108,7 @@
\def\pgfsys@horishading#1#2#3{%
{%
\pgf@parsefunc{#3}%
- \setbox\@tempboxa=\hbox to\pgf@max{\vbox to#2{\vfil\pdfliteral{/Sh sh}}\hfil}%
+ \setbox\pgfutil@tempboxa=\hbox to\pgf@max{\vbox to#2{\vfil\pdfliteral{/Sh sh}}\hfil}%
\pgf@process{\pgfpoint{\pgf@max}{#2}}%
\pdfxform resources {%
/Shading << /Sh << /ShadingType 2
@@ -116,14 +116,14 @@
/Domain [\pgf@pdfparseddomain]
/Coords [\pgf@doma\space0 \pgf@domb\space0]
/Function \pgf@pdfparsedfunction
- /Extend [false false] >> >>}\@tempboxa%
+ /Extend [false false] >> >>}\pgfutil@tempboxa%
\expandafter\xdef\csname @pgfshading#1!\endcsname{\leavevmode\noexpand\pdfrefxform\the\pdflastxform}%
}%
}
\def\pgfsys@vertshading#1#2#3{%
{%
\pgf@parsefunc{#3}%
- \setbox\@tempboxa=\hbox to#2{\vbox to\pgf@max{\vfil\pdfliteral{/Sh sh}}\hfil}%
+ \setbox\pgfutil@tempboxa=\hbox to#2{\vbox to\pgf@max{\vfil\pdfliteral{/Sh sh}}\hfil}%
\pgf@process{\pgfpoint{#2}{\pgf@max}}%
\pdfxform resources {%
/Shading << /Sh << /ShadingType 2
@@ -131,14 +131,14 @@
/Domain [\pgf@pdfparseddomain]
/Coords [0 \pgf@doma\space0 \pgf@domb]
/Function \pgf@pdfparsedfunction
- /Extend [false false] >> >>}\@tempboxa%
+ /Extend [false false] >> >>}\pgfutil@tempboxa%
\expandafter\xdef\csname @pgfshading#1!\endcsname{\leavevmode\noexpand\pdfrefxform\the\pdflastxform}%
}%
}
\def\pgfsys@radialshading#1#2#3{%
{%
\pgf@parsefunc{#3}%
- \setbox\@tempboxa=\hbox to2\pgf@max{\vbox to2\pgf@max{\vfil\pdfliteral{/Sh sh}}\hfil}%
+ \setbox\pgfutil@tempboxa=\hbox to2\pgf@max{\vbox to2\pgf@max{\vfil\pdfliteral{/Sh sh}}\hfil}%
\pgf@process{#2}%
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
@@ -155,7 +155,7 @@
/Domain [\pgf@pdfparseddomain]
/Coords [\pgf@sys@tonumber{\pgf@xa} \pgf@sys@tonumber{\pgf@ya} \pgf@doma\space \pgf@sys@tonumber{\pgf@x} \pgf@sys@tonumber{\pgf@y} \pgf@domb]
/Function \pgf@pdfparsedfunction
- /Extend [true false] >> >>}\@tempboxa%
+ /Extend [true false] >> >>}\pgfutil@tempboxa%
\expandafter\xdef\csname @pgfshading#1!\endcsname{\leavevmode\noexpand\pdfrefxform\the\pdflastxform}%
}%
}%
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 c2be445e31f..f332a046031 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.14 2006/10/16 22:32:59 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-tex4ht.def,v 1.15 2007/06/07 07:41:11 tantau Exp $
\RequirePackage{xcolor}
@@ -91,7 +91,7 @@
\pgfsys@invoke{) scale(1,-1) translate(0,}%
\pgf@sys@pt\pgf@ya\pgfsysprotocol@flushcurrentprotocol%
\pgfsys@invoke{)">\Hnewline }%
- \setlength\pgf@x{\pgf@shift@baseline}%
+ \pgfmathsetlength\pgf@x{\pgf@shift@baseline}%
\advance\pgf@x by-\pgf@picminy\relax%
\advance\pgf@picmaxy by-\pgf@picminy\relax% maxy is now the height
\advance\pgf@picmaxx by-\pgf@picminx\relax% maxx is now the width
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 b3cfbd76b75..37d370990ba 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.19 2006/10/16 22:32:59 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys.code.tex,v 1.24 2007/06/07 07:41:11 tantau Exp $
%
@@ -49,6 +49,12 @@
\newdimen\pgf@xc
\newdimen\pgf@yc
+% internal counters that are alwyas present when pgfsys is loaded
+\newcount\c@pgf@counta
+\newcount\c@pgf@countb
+\newcount\c@pgf@countc
+\newcount\c@pgf@countd
+
% The following \if decides, whether even-odd filling and clipping is
% to be used or normal the non-zero winding number rule. See the
@@ -668,6 +674,7 @@
\def\pgfsys@hbox#1{%
\pgfsys@beginscope%
+ \setbox#1=\hbox{\box#1}%
\wd#1=0pt%
\ht#1=0pt%
\dp#1=0pt%
@@ -696,7 +703,7 @@
% Called at the end of a pgfpicture.
\def\pgfsys@typesetpicturebox#1{%
- \setlength\pgf@x{\pgf@shift@baseline}%
+ \pgfmathsetlength\pgf@x{\pgf@shift@baseline}%
\advance\pgf@x by-\pgf@picminy\relax%
\advance\pgf@picmaxy by-\pgf@picminy\relax% maxy is now the height
\advance\pgf@picmaxx by-\pgf@picminx\relax% maxx is now the width
@@ -831,12 +838,6 @@
-\AtBeginDocument{
- \pgfsys@atbegindocument
- \let\pgfsys@atbegindocument=\relax
-}
-
-
% Discern the driver:
@@ -846,4 +847,20 @@
\pgfutil@InputIfFileExists{\pgfsysdriver}{}{%
\PackageError{pgfsys}{Driver file ``\pgfsysdriver'' not found.}{}}
+
+
+% This will insert always-present-specials at the beginning of the
+% code.
+\AtBeginDocument{
+ \pgfsys@atbegindocument
+ \let\pgfsys@atbegindocument=\pgfutil@empty
+}
+
+
+
+% Read aux file in plain and context mode:
+
+\pgfutil@aux@read@hook
+
+
\endinput
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 2a5226b3668..943da39770c 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.4 2006/10/16 22:32:59 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsyssoftpath.code.tex,v 1.5 2007/02/19 13:18:57 tantau Exp $
% This package provides the pgf system path abstraction layer. This
@@ -42,13 +42,18 @@
\def\pgfsyssoftpath@lastmoveto{{0pt}{0pt}}
+\newif\ifpgfsyssoftpathmovetorelevant
+\pgfsyssoftpathmovetorelevanttrue
+
% Add a moveto element to the current path
\def\pgfsyssoftpath@moveto#1#2{%
\edef\pgfsyssoftpath@temp{{%
\noexpand\pgfsyssoftpath@movetotoken{#1}{#2}%
}}%
\expandafter\pgfutil@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
- \xdef\pgfsyssoftpath@lastmoveto{{#1}{#2}}%
+ \ifpgfsyssoftpathmovetorelevant%
+ \xdef\pgfsyssoftpath@lastmoveto{{#1}{#2}}%
+ \fi%
}
% Add a lineto element to the current path