From d2ba1341cc119a1545f538c73e366b4f25282fda Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 29 Apr 2009 00:44:56 +0000 Subject: auto-pst-pdf 0.6 (26apr09) git-svn-id: svn://tug.org/texlive/trunk@12848 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/auto-pst-pdf/auto-pst-pdf.sty | 28 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex/auto-pst-pdf/auto-pst-pdf.sty') diff --git a/Master/texmf-dist/tex/latex/auto-pst-pdf/auto-pst-pdf.sty b/Master/texmf-dist/tex/latex/auto-pst-pdf/auto-pst-pdf.sty index e44046fec02..8ff331eb208 100644 --- a/Master/texmf-dist/tex/latex/auto-pst-pdf/auto-pst-pdf.sty +++ b/Master/texmf-dist/tex/latex/auto-pst-pdf/auto-pst-pdf.sty @@ -8,10 +8,11 @@ %% __________________________________ %% Copyright (C) 2007 Will Robertson %% License information appended. -\ProvidesPackage{auto-pst-pdf}[2008/03/14 v0.5 Wrapper for pst-pdf] +\ProvidesPackage{auto-pst-pdf}[2009/04/26 v0.6 Wrapper for pst-pdf] \RequirePackage{ifpdf,xkeyval,ifplatform} \newif\if@app@off@ \newif\if@app@crop@ +\newcounter{app@runs} \def\app@suffix{autopp} \edef\app@jobname{\jobname-\app@suffix} \edef\app@pics{\jobname-pics.pdf} @@ -37,18 +38,31 @@ \DeclareOptionX{dvips}{\def\app@dvips@opts{#1}} \DeclareOptionX{pspdf}{\def\app@pspdf@opts{#1}} \DeclareOptionX{pdfcrop}{\def\app@pdfcrop@opts{#1}} + \DeclareOptionX{cleanup}{% \let\app@rm@files\@empty \@for\@ii:=#1\do{% \edef\app@rm@files{\app@rm@files,\app@jobname.\@ii}}} + +\DeclareOptionX{runs}{% + \setcounter{app@runs}{#1}% support calc + \ifnum\c@app@runs > \z@ + \else + \app@PackageWarning{The number of runs must be at least one.}% + \c@app@runs\@ne + \fi} + +\DeclareOptionX*{\PassOptionsToPackage{\CurrentOption}{pst-pdf}} + \ExecuteOptionsX{% ext=tex, crop=on, latex={}, dvips={-Ppdf}, - pspdf={}, pdfcrop={}, - cleanup={log,aux,dvi,ps,pdf}} + cleanup={log,aux,dvi,ps,pdf}, + runs=1 +} \ifwindows \ExecuteOptionsX{pspdf={}} \else @@ -71,6 +85,10 @@ \def\app@compile{% \app@cleanup \app@remove@container + \loop\ifnum\c@app@runs > \@ne + \app@convert{extralatex}{\jobname.\app@ext}{\app@jobname.dvi}% + \advance\c@app@runs\m@ne + \repeat \app@convert{latex}{\jobname.\app@ext}{\app@jobname.dvi}% \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}% \if@app@crop@ @@ -90,7 +108,9 @@ \def\app@remove@container{\app@try@rm{\app@pics}} \def\app@cleanup{\app@try@rm{\app@rm@files}} \def\app@cmd@latex#1#2{latex \app@latex@opts\space - "\let\noexpand\APPmakepictures\noexpand\empty\noexpand\input #1"} + "\unexpanded{\let\APPmakepictures\empty\input} #1"} +\def\app@cmd@extralatex#1#2{latex \app@latex@opts\space + "\unexpanded{\let\APPmakepictures\undefined\input} #1"} \def\app@cmd@dvips#1#2{dvips \app@dvips@opts\space -o "#2" "#1"} \def\app@cmd@pstopdf#1#2{ps2pdf \app@pspdf@opts\space "#1" "#2"} \def\app@cmd@pdfcrop#1#2{pdfcrop \app@pdfcrop@opts\space "#1" "#2"} -- cgit v1.2.3