summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/pstool/pstool.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/pstool/pstool.tex')
-rw-r--r--Master/texmf-dist/source/latex/pstool/pstool.tex23
1 files changed, 15 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/latex/pstool/pstool.tex b/Master/texmf-dist/source/latex/pstool/pstool.tex
index bdc840c6676..5941caf3a6e 100644
--- a/Master/texmf-dist/source/latex/pstool/pstool.tex
+++ b/Master/texmf-dist/source/latex/pstool/pstool.tex
@@ -2,7 +2,6 @@
\begin{filecontents*}{README.txt}
__________________
The pstool package
-v1.5a
A package like "pst-pdf" for processing PostScript graphics
with psfrag labels within pdfLaTeX documents. The difference
@@ -21,10 +20,14 @@ Please see the PDF documentation for further information.
Will Robertson & Zebb Prime
Copyright 2008-2013
+Distributed under the LaTeX Project Public License, "maintained" by Will Robertson.
____________________
Brief change history
+v1.5b
+ - Fix conflict with beamer, which resets the catcode of @ with \begin{document}
+
v1.5a, March 2013:
- Fix bug introduced in last version in which plain LaTeX compilation
(producing DVI) produced erroneous output above each figure.
@@ -55,7 +58,7 @@ v1.3, July 2009:
\begin{filecontents*}{pstool.sty}
% TODO: convert this package into expl3 syntax (will save many lines of code).
-\ProvidesPackage{pstool}[2013/03/11 v1.5a
+\ProvidesPackage{pstool}[2013/03/11 v1.5b
Wrapper for processing PostScript/psfrag figures]
% External packages:
@@ -445,10 +448,10 @@ v1.3, July 2009:
\fi
% Finish up: (implies success!)
\pstool@endprocess{%
- \pstool@cleanup
\pstool@includegraphics{\pstool@path\pstool@filestub}%
% Emulate \cs{include} (sort of) and have the main document load the auxiliary aux file, in a manner of speaking:
\pstool@write@aux
+ \pstool@cleanup
}%
\pstool@echo@verbose{^^J=== pstool: end processing ===^^J}%
\endgroup
@@ -498,9 +501,11 @@ v1.3, July 2009:
% We need to cache the aux file, so here goes.
% This is because the aux file is cleared for writing after \cs{begin{document}}.
-\IfFileExists{\jobname.oldaux}{\immediate\write18{\pstool@rm@cmd \jobname.oldaux}}{}
-\immediate\write18{\pstool@cp@cmd \jobname.aux \jobname.oldaux}
-\AtEndDocument{\immediate\write18{\pstool@rm@cmd \jobname.oldaux}}
+\ifpdf
+ \IfFileExists{\jobname.oldaux}{\immediate\write18{\pstool@rm@cmd \jobname.oldaux}}{}
+ \immediate\write18{\pstool@cp@cmd \jobname.aux \jobname.oldaux}
+ \AtEndDocument{\immediate\write18{\pstool@rm@cmd \jobname.oldaux}}
+\fi
\edef\pstool@auxmarker#1{\string\@percentchar\space <#1PSTOOLLABELS>}
\edef\pstool@auxmarker@text#1{\@percentchar <#1PSTOOLLABELS>}
@@ -562,10 +567,12 @@ v1.3, July 2009:
}^^J%
\fi
% And the document body to place the graphic on a page of its own:
- \noexpand\@input{\jobname.oldaux}^^J^^J%
+ \noexpand\@input{\jobname.oldaux}^^J%
+ \noexpand\makeatother^^J^^J%
\noexpand\begin{document}^^J%
+ \noexpand\makeatletter^^J%
\unexpanded{\immediate\write\@mainaux}{\pstool@auxmarker*}^^J%
- \noexpand\makeatother^^J%
+ \noexpand\makeatother^^J^^J%
\unexpanded{%
\centering\null\vfill^^J%
}%