pst-pdf update from ctan

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

2 files changed, 28 insertions, 3 deletions

diff --git a/Master/texmf-dist/source/generic/pst-pdf/pst-pdf.dtx b/Master/texmf-dist/source/generic/pst-pdf/pst-pdf.dtx
index b8bd1986086..6b8e3140238 100644
--- a/Master/texmf-dist/source/generic/pst-pdf/pst-pdf.dtx
+++ b/Master/texmf-dist/source/generic/pst-pdf/pst-pdf.dtx
@@ -24,7 +24,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{pst-pdf}
 %<*package>
-    [2006/08/31 v1.1o PS graphics for pdfLaTeX (RN,HjG)]
+    [2007/06/04 v1.1p PS graphics for pdfLaTeX (RN,HjG)]
 %</package>
 %
 %<*driver>
@@ -50,7 +50,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{836}
+% \CheckSum{849}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -816,10 +816,14 @@
 % \fi
 % \changes{v1.1n}{2006/07/14}{\cmd{\nofiles} added (suggestion of Torsten 
 %   Bronger).}
+% \changes{v1.1p}{2007/06/04}{\cmd{\nofiles} makes \cmd{\makeindex} and 
+%   \cmd{\makeglossary} to \cmd{\relax}. \cmd{\@empty} is better 
+%   because of later \cmd{\renewcommand}'s}.
 %    \begin{macrocode}
   \PackageInfo{pst-pdf}{%
     MODE: \ppf@TeX@mode\space (dvi -- extraction mode)}
   \nofiles
+  \let\makeindex\@empty \let\makeglossary\@empty
   \if@ppf@PST@used\RequirePackage{pstricks}\fi
   \RequirePackage[active,dvips,tightpage]{preview}[2005/01/29]%
   \newcommand*\ppf@PreviewBbAdjust{}
@@ -856,6 +860,20 @@
 % \fi
 %    \begin{macrocode}
   \AtBeginDocument{%
+    \@ifpackageloaded{keyval}{%
+      \def\KV@errx#1{\PackageInfo{keyval}{#1}}%
+      }{}%
+    \@ifpackageloaded{xkeyval}{%
+      \def\XKV@err#1{\PackageInfo{xkeyval}{#1}}%
+    }{}%
+%    \end{macrocode}
+% \ifGERMAN
+% In diesem Modus sollten undefinierte keys keinen Fehler bewirken.
+% \fi
+% \ifENGLISH
+% In this mode undefined keys should not be an error.
+% \fi
+%    \begin{macrocode}
     \@for\@tempa:=\ppf@other@extensions\do{%
       \expandafter\let\csname Gin@rule@\@tempa\endcsname\relax}%
     \DeclareGraphicsRule{*}{eps}{*}{}}%
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 a0dc10e074a..254a2f773ca 100644
--- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
+++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{pst-pdf}
-    [2006/08/31 v1.1o PS graphics for pdfLaTeX (RN,HjG)]
+    [2007/06/04 v1.1p PS graphics for pdfLaTeX (RN,HjG)]
 \newcommand*\ppf@TeX@mode{-1}
 \newcommand*\ppf@draft{false}
 \newif\if@ppf@PST@used\@ppf@PST@usedtrue
@@ -101,6 +101,7 @@
   \PackageInfo{pst-pdf}{%
     MODE: \ppf@TeX@mode\space (dvi -- extraction mode)}
   \nofiles
+  \let\makeindex\@empty \let\makeglossary\@empty
   \if@ppf@PST@used\RequirePackage{pstricks}\fi
   \RequirePackage[active,dvips,tightpage]{preview}[2005/01/29]%
   \newcommand*\ppf@PreviewBbAdjust{}
@@ -113,6 +114,12 @@
     }%
   \x
   \AtBeginDocument{%
+    \@ifpackageloaded{keyval}{%
+      \def\KV@errx#1{\PackageInfo{keyval}{#1}}%
+      }{}%
+    \@ifpackageloaded{xkeyval}{%
+      \def\XKV@err#1{\PackageInfo{xkeyval}{#1}}%
+    }{}%
     \@for\@tempa:=\ppf@other@extensions\do{%
       \expandafter\let\csname Gin@rule@\@tempa\endcsname\relax}%
     \DeclareGraphicsRule{*}{eps}{*}{}}%