From 2245beb21ba2d7c9658279dcbcdba4494bfaef18 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 22 Oct 2013 23:54:17 +0000 Subject: pstricks git-svn-id: svn://tug.org/texlive/trunk@31964 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 37 +++++++++++------------ 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/latex/pstricks') diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index aabf143beb2..ca6c42fec94 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty @@ -15,7 +15,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pstricks}[2013/10/20 v0.58 LaTeX wrapper for `PSTricks' (RN,HV)] +\ProvidesPackage{pstricks}[2013/10/21 v0.59 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -34,10 +34,12 @@ % \newif\ifpst@OldVersion\pst@OldVersionfalse \DeclareOption{97}{\pst@OldVersiontrue} -\newif\ifpst@ovl\pst@ovlfalse +% +\newif\ifpst@ovl \pst@ovlfalse \DeclareOption{overlays}{\global\pst@ovltrue} -\newif\ifpst@PDF\pst@PDFfalse -\DeclareOption{pdf}{\global\pst@PDFtrue} +% +\newif\ifpst@loadPDF \pst@loadPDFfalse +\DeclareOption{pdf}{\global\pst@loadPDFtrue} %------------------------------------ PLAIN -------------------------------- \DeclareOption{plain}{% \ifpst@OldVersion @@ -50,19 +52,14 @@ \ProvidesFile{\pst@tempa}[\filedate\space v\fileversion\space `PSTricks' (tvz)]% \endinput } - +% \DeclareOption*{\OptionNotUsed} - +% \ProcessOptions\relax - -\ifpst@PDF - \@ifclassloaded{beamer}% - {\typeout{>>> Loading package auto-pst-pdf for beamer <<<}% - \AtEndOfPackage{\RequirePackage{auto-pst-pdf}} - \ifpdf\else\setbeamertemplate{navigation symbols}{}\fi}% - {\typeout{>>> Loading package auto-pst-pdf <<<}% - \AtBeginDocument{\usepackage{auto-pst-pdf}}}% - \def\app@pdfcrop@opts{--hres}%%% hv 20130405 +% +\RequirePackage{ifpdf} +% +\ifpst@loadPDF \ifnum\pdfshellescape=\@ne\else \PackageWarningNoLine{pstricks}{% ************************************ \MessageBreak @@ -71,12 +68,14 @@ (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{\usepackage{auto-pst-pdf}}} \fi % -\ifpst@ovl - \typeout{>>> Loading package pst-ovl <<<}% - \RequirePackage{pst-ovl} -\fi +\ifpst@ovl \RequirePackage{pst-ovl}\fi % \@ifundefined{PSTricksLoaded} {% -- cgit v1.2.3