pstricks (27jul15)

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

1 files changed, 8 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 14c94b22dee..d34dd775288 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -56,9 +56,9 @@
 %
 \DeclareOption*{\OptionNotUsed}
 %
-%\ProcessOptions\relax
+\ProcessOptions\relax
 %
-\RequirePackage{ifpdf,xkeyval,ifplatform}
+\RequirePackage{ifpdf}
 %
 \ifpst@loadPDF
   \ifnum\pdfshellescape=\@ne\else
@@ -69,28 +69,22 @@
     (if you are using MikTeX)                        \MessageBreak  
 ************************************}
   \fi
+  \def\app@pdfcrop@opts{--hres}%%%                hv 20130405
   \@ifclassloaded{beamer}{%
      \ifpdf    \else\setbeamertemplate{navigation symbols}{}   \fi
-     \AtEndOfPackage{\input{pstricks.app}}%
-     \typeout{>>> Loading auto-pst-pdf at end of pstricks.sty }}%
-    {\let\pst@document\document
-     \def\document{%
+     \AtEndOfPackage{\RequirePackage{auto-pst-pdf}}}
+    {\AtBeginDocument{%
         {\@ifundefined{shorthandoff}           % we have no babel until now
-          { \typeout{>>> noshorthand}\input{pstricks.app}}
+          { \typeout{noshorthand}\usepackage{auto-pst-pdf}}
           { \@ifundefined{bbl@active@"}{}{\shorthandoff{"}}
-            \input{pstricks.app}%
-            \typeout{>>> Loading auto-pst-pdf at begin of document }%
-            \@ifundefined{bbl@active@"}{}{\shorthandon{"}}}}
-         \pst@document}%
-        }
-  \def\app@pdfcrop@opts{--hres}%%%                hv 20130405
+            \usepackage{auto-pst-pdf}
+            \@ifundefined{bbl@active@"}{}{\shorthandon{"}}}}}}
 \fi
 %
 \ifpst@ovl \RequirePackage{pst-ovl}\fi
 %
 \@ifundefined{PSTricksLoaded}
 {%
-  \ProcessOptions\relax
   \let\saved@scalebox\scalebox
   \ifpst@OldVersion
     \def\psDEBUG[#1]#2{}