From 5c5c7843fbd37c6960799b6e1a32d5948966316c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Jun 2007 23:22:38 +0000 Subject: pgf 1.18 (15jun07) git-svn-id: svn://tug.org/texlive/trunk@4459 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty | 3 +- .../tex/latex/pgf/basiclayer/pgfbasematrix.sty | 15 +++ Master/texmf-dist/tex/latex/pgf/math/pgfmath.sty | 12 +++ .../tex/latex/pgf/utilities/pgfcalendar.sty | 14 +++ .../tex/latex/pgf/utilities/pgfpages.sty | 58 +++++------ .../tex/latex/pgf/utilities/pgfreadexternal.sty | 33 ------ .../tex/latex/pgf/utilities/pgfwriteexternal.sty | 111 --------------------- 7 files changed, 72 insertions(+), 174 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/pgf/basiclayer/pgfbasematrix.sty create mode 100644 Master/texmf-dist/tex/latex/pgf/math/pgfmath.sty create mode 100644 Master/texmf-dist/tex/latex/pgf/utilities/pgfcalendar.sty delete mode 100644 Master/texmf-dist/tex/latex/pgf/utilities/pgfreadexternal.sty delete mode 100644 Master/texmf-dist/tex/latex/pgf/utilities/pgfwriteexternal.sty (limited to 'Master/texmf-dist/tex/latex/pgf') diff --git a/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty index df45831e884..3eeb1b8f139 100644 --- a/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty +++ b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty @@ -10,7 +10,7 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/basiclayer/pgf.sty,v 1.7 2006/10/11 15:22:27 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/basiclayer/pgf.sty,v 1.8 2007/01/01 13:51:54 tantau Exp $ \def\pgf@draft{} \DeclareOption{draft}{\def\pgf@draft{\pgf@draftmodetrue}} @@ -28,6 +28,7 @@ \RequirePackage{pgfbaselayers} \RequirePackage{pgfbasesnakes} \RequirePackage{pgfbasepatterns} +\RequirePackage{pgfbasematrix} \pgf@obsolete \pgf@draft diff --git a/Master/texmf-dist/tex/latex/pgf/basiclayer/pgfbasematrix.sty b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgfbasematrix.sty new file mode 100644 index 00000000000..4032c6d7c74 --- /dev/null +++ b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgfbasematrix.sty @@ -0,0 +1,15 @@ +% 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. + + +\RequirePackage{pgfcore,pgfbaseshapes} + +\input{pgfbasematrix.code.tex} + +\endinput diff --git a/Master/texmf-dist/tex/latex/pgf/math/pgfmath.sty b/Master/texmf-dist/tex/latex/pgf/math/pgfmath.sty new file mode 100644 index 00000000000..b8092306e25 --- /dev/null +++ b/Master/texmf-dist/tex/latex/pgf/math/pgfmath.sty @@ -0,0 +1,12 @@ +% Copyright 2007 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. + +\input{pgfmath.code.tex} + +\endinput diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/pgfcalendar.sty b/Master/texmf-dist/tex/latex/pgf/utilities/pgfcalendar.sty new file mode 100644 index 00000000000..d694a2d2324 --- /dev/null +++ b/Master/texmf-dist/tex/latex/pgf/utilities/pgfcalendar.sty @@ -0,0 +1,14 @@ +% 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. + +\RequirePackage{pgfrcs} + +\input{pgfcalendar.code.tex} + +\endinput diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty index 639fb071a3f..2d29926b63c 100644 --- a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty +++ b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty @@ -715,26 +715,26 @@ \def\pgf@calculateresizes#1{% \expandafter\ifx\csname pgfpages@p@\the\pgf@cpn @re#1\endcsname\relax% \else% - \expandafter\@tempdima\csname pgfpages@p@\the\pgf@cpn @re#1\endcsname\relax% + \expandafter\pgfutil@tempdima\csname pgfpages@p@\the\pgf@cpn @re#1\endcsname\relax% \expandafter\ifx\csname pgfpages@p@\the\pgf@cpn @border\endcsname\relax% \else% - \expandafter\@tempdimb\csname pgfpages@p@\the\pgf@cpn @border\endcsname\relax% - \advance\@tempdima by-2\@tempdimb\relax% + \expandafter\pgfutil@tempdimb\csname pgfpages@p@\the\pgf@cpn @border\endcsname\relax% + \advance\pgfutil@tempdima by-2\pgfutil@tempdimb\relax% \fi% - \expandafter\@tempdimb\csname pgfpages@p@\the\pgf@cpn @#1\endcsname\relax% - \@tempcnta=\@tempdimb% - \divide\@tempcnta by 65536\relax% - \ifnum\@tempcnta=0\relax% - \@tempcnta=1\relax% + \expandafter\pgfutil@tempdimb\csname pgfpages@p@\the\pgf@cpn @#1\endcsname\relax% + \pgfutil@tempcnta=\pgfutil@tempdimb% + \divide\pgfutil@tempcnta by 65536\relax% + \ifnum\pgfutil@tempcnta=0\relax% + \pgfutil@tempcnta=1\relax% \fi% - \divide\@tempdima by\@tempcnta\relax% + \divide\pgfutil@tempdima by\pgfutil@tempcnta\relax% \expandafter\ifx\csname pgfpages@p@\the\pgf@cpn @scale\endcsname\relax% - \@tempdimb=10000pt% + \pgfutil@tempdimb=10000pt% \else% - \expandafter\@tempdimb\expandafter=\csname pgfpages@p@\the\pgf@cpn @scale\endcsname pt\relax% + \expandafter\pgfutil@tempdimb\expandafter=\csname pgfpages@p@\the\pgf@cpn @scale\endcsname pt\relax% \fi% - \ifdim\@tempdima<\@tempdimb% - \edef\pgf@temp{{scale}{\expandafter\Pgf@geT\the\@tempdima}}% + \ifdim\pgfutil@tempdima<\pgfutil@tempdimb% + \edef\pgf@temp{{scale}{\expandafter\Pgf@geT\the\pgfutil@tempdima}}% \expandafter\pgf@psetcurrent\pgf@temp% \fi% \fi% @@ -795,9 +795,9 @@ \else% \pgflowlevel{\pgftransformrotate{\csname pgfpages@p@\the\pgf@cpn @rotation\endcsname}}% \fi% - \@tempdima=\csname pgfpages@p@\the\pgf@cpn @width\endcsname\relax% - \@tempdimb=\csname pgfpages@p@\the\pgf@cpn @height\endcsname\relax% - \pgflowlevel{\pgftransformshift{\pgfpoint{-.5\@tempdima}{-.5\@tempdimb}}}% + \pgfutil@tempdima=\csname pgfpages@p@\the\pgf@cpn @width\endcsname\relax% + \pgfutil@tempdimb=\csname pgfpages@p@\the\pgf@cpn @height\endcsname\relax% + \pgflowlevel{\pgftransformshift{\pgfpoint{-.5\pgfutil@tempdima}{-.5\pgfutil@tempdimb}}}% \expandafter\ifx\csname pgfpages@p@\the\pgf@cpn @bordercode\endcsname\relax% \else% \pgfpathmoveto{\pgfpointorigin}% @@ -810,21 +810,21 @@ \expandafter\ifx\csname pgfpages@p@\the\pgf@cpn @cornerwidth\endcsname\relax% \else% { - \expandafter\@tempdima\csname pgfpages@p@\the\pgf@cpn @cornerwidth\endcsname\relax% + \expandafter\pgfutil@tempdima\csname pgfpages@p@\the\pgf@cpn @cornerwidth\endcsname\relax% \color{black} - \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\@tempdima}{\@tempdima}}% - \pgfpathrectangle{\pgfpoint{0pt}{\ht0-\@tempdima}}{\pgfpoint{\@tempdima}{\@tempdima}}% - \pgfpathrectangle{\pgfpoint{\wd0-\@tempdima}{0pt}}{\pgfpoint{\@tempdima}{\@tempdima}}% - \pgfpathrectangle{\pgfpoint{\wd0-\@tempdima}{\ht0-\@tempdima}}{\pgfpoint{\@tempdima}{\@tempdima}}% + \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\pgfutil@tempdima}{\pgfutil@tempdima}}% + \pgfpathrectangle{\pgfpoint{0pt}{\ht0-\pgfutil@tempdima}}{\pgfpoint{\pgfutil@tempdima}{\pgfutil@tempdima}}% + \pgfpathrectangle{\pgfpoint{\wd0-\pgfutil@tempdima}{0pt}}{\pgfpoint{\pgfutil@tempdima}{\pgfutil@tempdima}}% + \pgfpathrectangle{\pgfpoint{\wd0-\pgfutil@tempdima}{\ht0-\pgfutil@tempdima}}{\pgfpoint{\pgfutil@tempdima}{\pgfutil@tempdima}}% \pgfusepath{fill}% - \pgfpathmoveto{\pgfpoint{0pt}{\@tempdima}} - \pgfpathcurveto{\pgfpoint{0pt}{0.555\@tempdima}}{\pgfpoint{.555\@tempdima}{0pt}}{\pgfpoint{\@tempdima}{0pt}} - \pgfpathlineto{\pgfpoint{\wd0-\@tempdima}{0pt}} - \pgfpathcurveto{\pgfpoint{\wd0-.555\@tempdima}{0pt}}{\pgfpoint{\wd0}{.555\@tempdima}}{\pgfpoint{\wd0}{\@tempdima}} - \pgfpathlineto{\pgfpoint{\wd0}{\ht0-\@tempdima}} - \pgfpathcurveto{\pgfpoint{\wd0}{\ht0-.555\@tempdima}}{\pgfpoint{\wd0-.555\@tempdima}{\ht0}}{\pgfpoint{\wd0-\@tempdima}{\ht0}} - \pgfpathlineto{\pgfpoint{\@tempdima}{\ht0}} - \pgfpathcurveto{\pgfpoint{.555\@tempdima}{\ht0}}{\pgfpoint{0pt}{\ht0-.555\@tempdima}}{\pgfpoint{0pt}{\ht0-\@tempdima}} + \pgfpathmoveto{\pgfpoint{0pt}{\pgfutil@tempdima}} + \pgfpathcurveto{\pgfpoint{0pt}{0.555\pgfutil@tempdima}}{\pgfpoint{.555\pgfutil@tempdima}{0pt}}{\pgfpoint{\pgfutil@tempdima}{0pt}} + \pgfpathlineto{\pgfpoint{\wd0-\pgfutil@tempdima}{0pt}} + \pgfpathcurveto{\pgfpoint{\wd0-.555\pgfutil@tempdima}{0pt}}{\pgfpoint{\wd0}{.555\pgfutil@tempdima}}{\pgfpoint{\wd0}{\pgfutil@tempdima}} + \pgfpathlineto{\pgfpoint{\wd0}{\ht0-\pgfutil@tempdima}} + \pgfpathcurveto{\pgfpoint{\wd0}{\ht0-.555\pgfutil@tempdima}}{\pgfpoint{\wd0-.555\pgfutil@tempdima}{\ht0}}{\pgfpoint{\wd0-\pgfutil@tempdima}{\ht0}} + \pgfpathlineto{\pgfpoint{\pgfutil@tempdima}{\ht0}} + \pgfpathcurveto{\pgfpoint{.555\pgfutil@tempdima}{\ht0}}{\pgfpoint{0pt}{\ht0-.555\pgfutil@tempdima}}{\pgfpoint{0pt}{\ht0-\pgfutil@tempdima}} \pgfpathclose \pgfusepath{clip} \color{white} diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/pgfreadexternal.sty b/Master/texmf-dist/tex/latex/pgf/utilities/pgfreadexternal.sty deleted file mode 100644 index 4835d0547f2..00000000000 --- a/Master/texmf-dist/tex/latex/pgf/utilities/pgfreadexternal.sty +++ /dev/null @@ -1,33 +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. - -\ProvidesPackage{pgfreadexternal}[2006/03/13 ver 0.01] - -% Environment for reading an external graphic. -% -% #1 = suffix -% -% Example: -% -% \pgfexternalbegin{mygraph} -% \begin{tikzpicture} -% ... -% \end{tikzpicture} -% \pgfextenalend - -\providecommand\pgfexternalbegin{\pgf@externalbegin} -\long\def\pgf@externalbegin#1#2\pgfexternalend{% - \pgfexternalincludecommand{#1}% -} - -\providecommand\pgfexternalincludecommand[1]{\includegraphics{\pgfexternalprefix#1}} -\providecommand\pgfexternalprefix{} - -\endinput - diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/pgfwriteexternal.sty b/Master/texmf-dist/tex/latex/pgf/utilities/pgfwriteexternal.sty deleted file mode 100644 index 5170982fdfa..00000000000 --- a/Master/texmf-dist/tex/latex/pgf/utilities/pgfwriteexternal.sty +++ /dev/null @@ -1,111 +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. - -\ProvidesPackage{pgfwriteexternal}[2006/03/13 ver 0.01] - - -% Modes of operation: -% -% Set \pgfexternalcurrent to empty, relax or undefined and all -% \pgfexternal... are ignored -% -% Set \pgfexternalcurrnet to anything else and all text will be thrown -% away, except the text in the \pgfexternalbegin...\pgfexternalend -% with the right name. - -\AtBeginDocument{ - \ifx\pgfexternalcurrent\relax - \let\pgfexternalcurrent=\@empty - \fi - \ifx\pgfexternalcurrent\@undefined - \let\pgfexternalcurrent=\@empty - \fi - \ifx\pgfexternalcurrent\@empty - \else - \pgf@externalgrabshipout - \fi -} - - -\newwrite\pgfexternal@caller - -% Environment for an external graphic. -% -% #1 = suffix -% -% Example: -% -% \pgfexternalbegin{mygraph} -% \begin{tikzpicture} -% ... -% \end{tikzpicture} -% \pgfextenalend - -\def\pgfexternalbegin#1{% - \IfFileExists{#1.tex}{}{% - \immediate\openout\pgfexternal@caller #1.tex% - \immediate\write\pgfexternal@caller{\noexpand\def\noexpand\pgfexternalcurrent{#1}\noexpand\input \jobname.tex}% - \immediate\closeout\pgfexternal@caller% - }% - \edef\pgf@test{#1}% - \edef\pgfeeext{\pgfexternalcurrent}% - \expandafter\scantokens\expandafter{\expandafter\edef\expandafter\pgfeeext\expandafter{\pgfeeext}}\unskip% - \ifx\pgfeeext\pgf@test% - \global\let\pgfexternalend=\pgf@externalend% - \expandafter\pgf@externalprepareshipout% - \fi% - \ignorespaces% -} - -\let\pgfexternalend=\unskip - - - -\newbox\pgfexternal@ignorebox -\newbox\pgfexternal@box - -\def\pgf@externalgrabshipout{% - \global\let\pgfexternal@originalshipout=\shipout% - \global\def\shipout{\setbox\pgfexternal@ignorebox=} -} - -\def\pgf@externalprepareshipout{% - \setbox\pgfexternal@box=\hbox\bgroup\bgroup% -} - -\def\pgf@externalend{% - \unskip\egroup\egroup% - {% - \parindent0pt% - \leftmargin0pt% - \dimen0\ht\pgfexternal@box% - \advance\dimen0\dp\pgfexternal@box% - \pgfsys@papersize{\the\wd\pgfexternal@box}{\the\dimen0}% - \setbox0=\vbox{% - \kern -1truein% - \hbox{% - \kern -1truein% - \hbox to0pt{\pgfsys@atbegindocument}% - \box\pgfexternal@box% - \kern 1truein}% - \kern1truein}% - \pgfexternal@originalshipout\box0% - }% - \global\let\pgfexternalend=\unskip% -} - -\ifx\pdfoutput\undefined - \newcount\pdfoutput -\fi - - - - -\endinput - -- cgit v1.2.3