From 7f54d85b7dd2e8db1e8cca36c48e2f82eaa81034 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 May 2012 23:36:21 +0000 Subject: standalone 1.1a (20may12) git-svn-id: svn://tug.org/texlive/trunk@26511 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/standalone/standalone.cfg | 4 ++-- .../texmf-dist/tex/latex/standalone/standalone.cls | 25 +++++++++++++++++++--- .../texmf-dist/tex/latex/standalone/standalone.sty | 4 ++-- 3 files changed, 26 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/standalone') diff --git a/Master/texmf-dist/tex/latex/standalone/standalone.cfg b/Master/texmf-dist/tex/latex/standalone/standalone.cfg index 31967ccd210..b2d5fe0a5d5 100644 --- a/Master/texmf-dist/tex/latex/standalone/standalone.cfg +++ b/Master/texmf-dist/tex/latex/standalone/standalone.cfg @@ -1,7 +1,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{standalone.cfg}[% - 2012/05/05 - v1.1 + 2012/05/20 + v1.1a Default configuration file for 'standalone' class]% %% Enabled the "varwidth" option if the "varwidth" package is available: %%\IfFileExists{varwidth.sty}{% diff --git a/Master/texmf-dist/tex/latex/standalone/standalone.cls b/Master/texmf-dist/tex/latex/standalone/standalone.cls index a5d9474da06..34eeb872bda 100644 --- a/Master/texmf-dist/tex/latex/standalone/standalone.cls +++ b/Master/texmf-dist/tex/latex/standalone/standalone.cls @@ -18,8 +18,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{standalone}[% - 2012/05/05 - v1.1 + 2012/05/20 + v1.1a Class to compile TeX sub-files standalone] \newif\ifstandalone \standalonetrue @@ -776,6 +776,7 @@ \sa@convertfalse \fi \ifsa@convert +\let\sa@convert@stop\stop \begingroup \let\on@line\@gobble \def\sa@convert#1{% @@ -793,10 +794,27 @@ }{% \def\filemodbefore{}% }}}}% + \edef\@tempa{\jobname} + \edef\@tempb{\sa@convert@subjobname} + \@onelevel@sanitize\@tempa + \@onelevel@sanitize\@tempb + \@tempswafalse + \ifx\@tempa\@tempb + \@tempswatrue + \edef\infile@filemodbefore{\csname pdffilemoddate\endcsname{\infile}}% + \else + \global\let\sa@convert@stop\relax + \fi \immediate\write18{\sa@convert@latex\space\sa@convert@latexoptions\space -jobname \sa@convert@quote\sa@convert@subjobname\sa@convert@quote\space \sa@convert@quote\string\expandafter\string\def\string\csname\space sa@internal@run\string\endcsname{1}\string\input{\sa@convert@mainfile}\sa@convert@quote}% + \if@tempswa + \edef\infile@filemodafter{\csname pdffilemoddate\endcsname{\infile}}% + \ifx\infile@filemodbefore\infile@filemodafter + \global\let\sa@convert@stop\relax + \fi + \fi \edef\sa@convert@precommand{\sa@convert@precommand}% \ifx\sa@convert@precommand\@empty\else \immediate\write18{\sa@convert@precommand}% @@ -854,6 +872,7 @@ \relax% 0 \sa@convert@failuremsg {standalone}{Shell escape disabled! Cannot convert file '\infile'.}{}% + \global\let\sa@convert@stop\relax \or% 1 \sa@convert{Conversion unsuccessful!\MessageBreak There might be something wrong with your\MessageBreak @@ -862,7 +881,7 @@ \sa@convert{Conversion failed! Please ensure that shell escape\MessageBreak is enabled (e.g. use '-shell-escape').}% \fi \endgroup -\expandafter\stop +\expandafter\sa@convert@stop \fi \begingroup \toks@\expandafter{% diff --git a/Master/texmf-dist/tex/latex/standalone/standalone.sty b/Master/texmf-dist/tex/latex/standalone/standalone.sty index 51b32d2b2e9..372d8790d7f 100644 --- a/Master/texmf-dist/tex/latex/standalone/standalone.sty +++ b/Master/texmf-dist/tex/latex/standalone/standalone.sty @@ -19,8 +19,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{standalone}[% - 2012/05/05 - v1.1 + 2012/05/20 + v1.1a Package to include TeX sub-files with preambles] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \@ifundefined{ifstandalone}{% -- cgit v1.2.3