pst-pdf update (2008/09/10)

git-svn-id: svn://tug.org/texlive/trunk@10547 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 53 insertions, 66 deletions

diff --git a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
index 1aef15fa32d..e379e06a650 100644
--- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
+++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2004 by Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%% Copyright (C) 2004-2008 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%%                            and Hubert Gaesslein
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.2 of this license
@@ -22,7 +23,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{pst-pdf}
-    [2008/05/02 v1.1r PS graphics for pdfLaTeX (RN,HjG)]
+    [2008/09/09 v1.1t PS graphics for pdfLaTeX (RN,HjG)]
 \newcommand*\ppf@TeX@mode{-1}
 \newcommand*\ppf@draft{false}
 \newif\if@ppf@PST@used\@ppf@PST@usedtrue
@@ -67,13 +68,12 @@
 \newcommand*\ppf@other@extensions[1]{}
 \newcommand*\usepicture[2][]{}
 \newcommand*\savepicture[1]{}
-  \newenvironment*{pst-pdf-defs}%
-  {%
-    \endgroup
-  }{%
-    \begingroup
-    \def\@currenvir{pst-pdf-defs}%
-  }
+\newenvironment*{pst-pdf-defs}{%
+  \endgroup
+}{%
+  \begingroup
+  \def\@currenvir{pst-pdf-defs}%
+}
 \RequirePackage{graphicx}%
 \let\ppf@Ginclude@graphics\Ginclude@graphics
 \let\ppf@Gin@extensions\Gin@extensions
@@ -129,6 +129,7 @@
   \define@key{Gin}{ignore}[true]{}%
   \define@key{Gin}{showname}[true]{}%
   \define@key{Gin}{namefont}{}%
+  \@ifundefined{GPT@page}{\define@key{Gin}{page}{}}{}
   \if@ppf@tightpage\else
     \def\PreviewBbAdjust{%
       -600pt -600pt 600pt 600pt}%
@@ -208,45 +209,44 @@
   \let\pdfliteral\@gobble%
 \or
   \PackageInfo{pst-pdf}{MODE: \ppf@TeX@mode\space (pdfTeX mode)}%
+  \if@ppf@PST@used
+    \let\ppf@temp\AtBeginDvi\let\AtBeginDvi\@gobble
+    \RequirePackage{pstricks}\let\AtBeginDvi\ppf@temp
+  \fi
   \@temptokena{%
     \let\Gin@PS@file@header\@gobble\let\Gin@PS@literal@header\@gobble
     \let\Gin@PS@raw\@gobble\let\Gin@PS@restored\@gobble
     \@ifundefined{PSTricksLoaded}{}{%
       \PSTricksOff
       \@ifundefined{c@lor@to@ps}{\def\c@lor@to@ps#1 #2\@@{}}{}}}%
-  \if@ppf@PST@used
-    \let\ppf@temp\AtBeginDvi\let\AtBeginDvi\@gobble
-    \RequirePackage{pstricks}\let\AtBeginDvi\ppf@temp
-  \fi
-  \the\@temptokena %%% ????
+  \the\@temptokena
   \expandafter\AtBeginDocument\expandafter
     {\the\@temptokena\@temptokena{}}%
-  \@ifundefined{PSTricksLoaded}{}
-  {%
-    \newtoks\ppf@temptoken
-    \ppf@temptoken\expandafter{\the\output}%
-    \let\output\@gobble
-    \let\ppf@nofiles\nofiles \let\nofiles\relax
+  \@ifundefined{PSTricksLoaded}{}{%
+    \newtoks\ppf@output
+    \ppf@output\expandafter{\the\output}%
+    \let\ppf@nofiles=\nofiles \let\nofiles=\relax
+    \let\ppf@shipout=\shipout
     \RequirePackage[active]{preview}[2005/01/29]%
-    \let\shipout=\pr@shipout \let\nofiles\ppf@nofiles
-    \output\expandafter{\the\ppf@temptoken}%
-    \ppf@temptoken{}%
+    \let\shipout=\ppf@shipout \let\ppf@shipout=\relax
+    \let\nofiles=\ppf@nofiles \let\ppf@nofiles=\relax
+    \output\expandafter{\the\ppf@output} \ppf@output{}%
     \long\def\pr@startbox#1#2{%
-    \ifpr@outer
-      \toks@{#2}%
-      \edef\pr@cleanup{\the\toks@}%
-      \setbox\@tempboxa\vbox\bgroup
-      \everydisplay{}%
-      \pr@outerfalse%
-      \expandafter\@firstofone
-    \else
-      \expandafter\@gobble
-    \fi{#1}}%
+      \ifpr@outer
+        \toks@{#2}%
+        \edef\pr@cleanup{\the\toks@}%
+        \setbox\@tempboxa\vbox\bgroup
+        \everydisplay{}%
+        \pr@outerfalse%
+        \expandafter\@firstofone
+      \else
+        \expandafter\@gobble
+      \fi{#1}}%
     \def\pr@endbox{%
-    \egroup
-    \setbox\@tempboxa\box\voidb@x
-    \ppf@@getpicture
-    \pr@cleanup}%
+      \egroup
+      \setbox\@tempboxa\box\voidb@x
+      \ppf@@getpicture
+      \pr@cleanup}%
     \AtBeginDocument{%
       \@ifundefined{pst@object}{}%
       {%
@@ -372,36 +372,23 @@
     \let\ppf@set@mode=\@empty
   \fi
   }
-  \newenvironment{postscript}[1][]
-  {%
-    \ppf@test@mmode
-    \gdef\ppf@Gin@keys{}%
-    \def\@tempa{postscript}\ifx\@tempa\@currenvir\gdef\ppf@Gin@keys{#1}\fi
-    \expandafter\let\expandafter\pst@object
-      \csname pr@\string\pst@object\endcsname
-    \pr@outerfalse
-    \@makeother\&%
-    \def\Gin@ii[##1]##2{}\setbox\@tempboxa=\vbox\bgroup
-    \ppf@set@mode
-  }%
-  {\ppf@set@mode\egroup\aftergroup\ppf@@getpicture}%
+  \RequirePackage{environ}%
+  \newenvironment{postscript}[1][]{%
+    \def\@tempa{postscript}%
+    \ifx\@tempa\@currenvir
+      \def\ppf@Gin@keys{#1}%
+    \else
+      \def\ppf@Gin@keys{}%
+    \fi
+    \ppf@@getpicture
+    \Collect@Body\@gobble}{}%
   \AtBeginDocument{%
-    \@ifundefined{PSTricksLoaded}{}%
-    {%
-      \iffalse
-        \PreviewEnvironment{pspicture}% Why doesn't it work?
-        \g@addto@macro\pspicture{%
-          %%\pr@outerfalse% necessary, or already there anyway?
-          \@makeother\&% necessary?
-          \def\Gin@ii[#1]#2{}%
-        }%
-        \g@addto@macro\endpspicture{\ppf@@getpicture}%
-      \else
-        \def\pst@@@picture[#1](#2,#3)(#4,#5){\postscript}%
-        \def\endpspicture{\endpostscript\endgroup}%
-      \fi
-      \@ifundefined{psmatrix}{}%
-      {\let\psmatrix=\postscript\let\endpsmatrix=\endpostscript}%
+    \@ifundefined{PSTricksLoaded}{}{%
+      \def\pst@@@picture[#1](#2,#3)(#4,#5){\postscript}%
+      \def\endpspicture{\endpostscript\endgroup}%
+      \@ifundefined{psmatrix}{}{%
+        \let\psmatrix=\postscript
+        \let\endpsmatrix=\endpostscript}%
     }%
     \@ifundefined{pfx@includegraphicx}{}{%
       \let\includegraphics=\pfx@includegraphics