summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-26 22:50:40 +0000
committerKarl Berry <karl@freefriends.org>2015-07-26 22:50:40 +0000
commit7a88911ffe2801abc78f25c81f6b3cf2bc0c4b82 (patch)
tree0ced28a9465f3a0244595c7f82eaca1c4d198197 /Master/texmf-dist/tex/latex/pstricks/pstricks.sty
parent92fc98cab37ec4df1477c3c9a32d724d4ed049d5 (diff)
pstricks (26jul15)
git-svn-id: svn://tug.org/texlive/trunk@37963 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pstricks/pstricks.sty')
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty22
1 files changed, 14 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index d34dd775288..14c94b22dee 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}
+\RequirePackage{ifpdf,xkeyval,ifplatform}
%
\ifpst@loadPDF
\ifnum\pdfshellescape=\@ne\else
@@ -69,22 +69,28 @@
(if you are using MikTeX) \MessageBreak
************************************}
\fi
- \def\app@pdfcrop@opts{--hres}%%% hv 20130405
\@ifclassloaded{beamer}{%
\ifpdf \else\setbeamertemplate{navigation symbols}{} \fi
- \AtEndOfPackage{\RequirePackage{auto-pst-pdf}}}
- {\AtBeginDocument{%
+ \AtEndOfPackage{\input{pstricks.app}}%
+ \typeout{>>> Loading auto-pst-pdf at end of pstricks.sty }}%
+ {\let\pst@document\document
+ \def\document{%
{\@ifundefined{shorthandoff} % we have no babel until now
- { \typeout{noshorthand}\usepackage{auto-pst-pdf}}
+ { \typeout{>>> noshorthand}\input{pstricks.app}}
{ \@ifundefined{bbl@active@"}{}{\shorthandoff{"}}
- \usepackage{auto-pst-pdf}
- \@ifundefined{bbl@active@"}{}{\shorthandon{"}}}}}}
+ \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
\fi
%
\ifpst@ovl \RequirePackage{pst-ovl}\fi
%
\@ifundefined{PSTricksLoaded}
{%
+ \ProcessOptions\relax
\let\saved@scalebox\scalebox
\ifpst@OldVersion
\def\psDEBUG[#1]#2{}