From e651b058802905949b57e67c813f83a01d29eb34 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 6 Jul 2009 00:13:51 +0000 Subject: -mpstool 1.2b (4jul09) git-svn-id: svn://tug.org/texlive/trunk@14130 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pstool/pstool.sty | 31 ++++++++++++++++----------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/latex/pstool') diff --git a/Master/texmf-dist/tex/latex/pstool/pstool.sty b/Master/texmf-dist/tex/latex/pstool/pstool.sty index dfb1d7d0e5d..f4124251176 100644 --- a/Master/texmf-dist/tex/latex/pstool/pstool.sty +++ b/Master/texmf-dist/tex/latex/pstool/pstool.sty @@ -1,8 +1,8 @@ %% LaTeX2e file `pstool.sty' %% generated by the `filecontents' environment -%% from source `pstool' on 2009/05/25. +%% from source `pstool' on 2009/07/03. %% -\ProvidesPackage{pstool}[2009/05/25 v1.2a +\ProvidesPackage{pstool}[2009/07/03 v1.2b Wrapper for processing PostScript/psfrag figures] % External packages @@ -201,8 +201,8 @@ } \def\pstool@stripEPS#1.eps#2\@nil{#1} -% |test.eps\@nil|->|test|\\ -% |test.eps.eps\@nil|->|test| +% |test.eps\@nil| $\to$ |test| (|#2| $\to$ \)\\ +% |test.eps.eps\@nil| $\to$ |test| (|#2| $\to$ |.eps|) % \section{Command parsing} % User input is \cmd\pstool\ (with optional |*| or |!| suffix) which turns into one of the following three macros depending on the mode. @@ -213,7 +213,7 @@ \ifpdf \newcommand\pstool@neverprocess[3][]{% - \pstool@includegraphics[#1]{#2}} + \pstool@includegraphics{#2}} \else \newcommand\pstool@neverprocess[3][]{% \begingroup @@ -230,7 +230,7 @@ \pstool@IfnewerEPS{% needs info from |\pstool@getpaths| \pstool@process{#1}{#3}% }{% - \pstool@includegraphics[#1]{#2}% + \pstool@includegraphics{#2}% }% }{% \pstool@process{#1}{#3}% @@ -277,7 +277,7 @@ -interaction=\pstool@mode\space \pstool@latex@opts\space "\pstool@jobname.tex"}% -% Execute dvips in quiet mode if latex is not run in (non/error)stop mode: +% Execute |dvips| in quiet mode if |latex| is not run in (non/error)stop mode: \pstool@exe{dvips}{\ip@directpath}{% dvips \if@pstool@verbose@\else -q \fi -Ppdf \pstool@dvips@opts\space "\pstool@jobname.dvi"}% @@ -295,7 +295,7 @@ \fi \pstool@endprocess{% \pstool@cleanup - \pstool@includegraphics[#1]{% + \pstool@includegraphics{% \ip@directpath\ip@lastelement}% }% \pstool@echo@verbose{^^J=== pstool: end processing ===^^J}% @@ -351,8 +351,12 @@ % for EPS figures with psfrag: \newcommand\psfragfig[2][]{\pstool@psfragfig{#1}{#2}{}} -\WithSuffix\newcommand\psfragfig*[2][]{\pstool@psfragfig{#1}{#2}{*}} -\WithSuffix\newcommand\psfragfig![2][]{\pstool@psfragfig{#1}{#2}{!}} +\WithSuffix\newcommand\psfragfig*[2][]{% + \pstool@psfragfig{#1}{#2}{*}% +} +\WithSuffix\newcommand\psfragfig![2][]{% + \pstool@psfragfig{#1}{#2}{!}% +} % Parse optional \ \newcommand\pstool@psfragfig[3]{% @@ -367,10 +371,10 @@ % % |#1|: possible graphicx options\\ % |#2|: graphic name (possibly with path)\\ -% |#3|: |\pstool| suffix (i.e., |!| or |*| or empty\\ -% |#4|: possible \pkg{psfrag} macros +% |#3|: |\pstool| suffix (i.e., |!| or |*| or \)\\ +% |#4|: possible \pkg{psfrag} (or other) macros \newcommand\pstool@@psfragfig[4]{% - % Find the.eps file to use. + % Find the .eps file to use. \IfFileExists{#2-psfrag.eps}{% \edef\pstool@eps{#2-psfrag}% \OnlyIfFileExists{#2.eps}{% @@ -424,3 +428,4 @@ }% } +% That's it. -- cgit v1.2.3