summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/standalone/standalone.pdfbin427133 -> 416512 bytes
-rw-r--r--Master/texmf-dist/source/latex/standalone/standalone.dtx50
-rw-r--r--Master/texmf-dist/tex/latex/standalone/standalone.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/standalone/standalone.cls25
-rw-r--r--Master/texmf-dist/tex/latex/standalone/standalone.sty4
5 files changed, 67 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/standalone/standalone.pdf b/Master/texmf-dist/doc/latex/standalone/standalone.pdf
index 96db9fa51f6..a1bd9511adc 100644
--- a/Master/texmf-dist/doc/latex/standalone/standalone.pdf
+++ b/Master/texmf-dist/doc/latex/standalone/standalone.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/standalone/standalone.dtx b/Master/texmf-dist/source/latex/standalone/standalone.dtx
index 2d8143f71df..b7244871c83 100644
--- a/Master/texmf-dist/source/latex/standalone/standalone.dtx
+++ b/Master/texmf-dist/source/latex/standalone/standalone.dtx
@@ -26,10 +26,10 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{standalone.dtx}[%
%<=*DATE>
- 2012/05/05
+ 2012/05/20
%<=/DATE>
%<=*VERSION>
- v1.1
+ v1.1a
%<=/VERSION>
DTX file of the standalone bundle]
\documentclass[a4paper,11pt]{ydoc}
@@ -43,7 +43,7 @@
\CodelineIndex
\RecordChanges
\colorlet{keydesc}{opt}
-%\OnlyDescription
+\OnlyDescription
\lstset{numbers=none,columns=fullflexible}
\begin{document}
\DocInput{\jobname.dtx}
@@ -53,7 +53,7 @@
%</driver>
% \fi
%
-% \CheckSum{3555}
+% \CheckSum{3603}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -77,6 +77,8 @@
% \changes{v0.3a}{2010/03/27}{Fixed bug related to line endings in \texttt{.sta} file. Listed sub-files now have \texttt{.tex} as default extension.}
% \changes{v0.4}{2011/02/28}{Added option 'border' for easy adjustments of the preview border.}
% \changes{v1.1}{2012/05/05}{Fixed conversion issue with MiKTeX.}
+% \changes{v1.1a}{2012/05/20}{Failed conversion now always creates a normal output file. Some requested changes in the
+% manual.}
%
% \GetFileInfo{\jobname.dtx}
%
@@ -266,7 +268,11 @@
% Options might switch other options on or off. For example, mutual exclusive options will disable each other. The order of the option is obeyed
% and later options will prevail over earlier ones.
%
-% Certain class options can also be changed inside the preamble or document body using \Macro\standaloneconfig{<options>}.
+% By default the \opt{crop} option with \opt{border}|=0| is enabled. In versions prior to v1.0 the option \opt{preview} was the default. This chance
+% was deemed required and should not affect most documents. However, in some cases resetting the \opt{preview} option
+% might be required.
+%
+% Certain class options can also be set inside the preamble or document body using \Macro\standaloneconfig{<options>}.
%
% \DescribeKey{class}'='<class name>
% Specifies the underlying class which is loaded by the \cls{standalone} class.
@@ -276,16 +282,20 @@
%
% \DescribeKey{crop}'=true|false'
% If enabled this option crops the content to its natural size plus a specified border. This is done by saving the content in a box register and resizing
-% the page size relative to the box dimensions.
-% This option is mutual exclusive with the similar \opt{preview} option and will therefore disable it.
+% the page size relative to the box dimensions. This option is enabled by default (since v1.0).
+% This option is mutually exclusive with the similar \opt{preview} option and will therefore disable it.
+% If both options are used the last one will be enabled and the other will be disabled.
% Also \Key{float}'=false' will be set by \Key{crop}'=true' in order to avoid issues with floating environments.
%
% \DescribeKey{preview}'=true|false'
% If enabled this option loads the \pkg{preview} package with the \opt{tightpage} option
% and wraps the content into a \env{preview} environment. This crops the content to its natural size plus a specified border.
% Issues with the \pkg{preview} options and TikZ shadings under XeLaTeX have been reported. In this cases the \opt{crop} option should be used instead.
+% Note that this option was enabled by default for versions before v1.0, but since then \opt{crop} is enabled by
+% default.
%
-% This option is mutual exclusive with the similar \opt{crop} option and will therefore disable it.
+% This option is mutually exclusive with the similar \opt{crop} option and will therefore disable it.
+% If both options are used the last one will be enabled and the other will be disabled.
% Also \Key{float}'=false' will be set by \Key{preview}'=true' in order to avoid issues with floating environments.
%
% \DescribeKey{border}'='<length (all sides)>
@@ -295,6 +305,7 @@
% An alternative name of this option is \opt{margin}.
% The border can either be given using a single value for all sides, separately for the horizontal and vertical borders or for all sides separately.
% Multiple values are separated by spaces, which require the whole value to be wrapped in braces.
+% By default a border of |0pt| is set.
%
% This option can be changed during the document using \Macro\standaloneconfig and will affect all following pages.
%
@@ -2368,6 +2379,7 @@
% \end{macrocode}
%
% \begin{macrocode}
+\let\sa@convert@stop\stop
\begingroup
\let\on@line\@gobble
% \end{macrocode}
@@ -2390,10 +2402,29 @@
}{%
\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
+% \end{macrocode}
+% \begin{macrocode}
\edef\sa@convert@precommand{\sa@convert@precommand}%
\ifx\sa@convert@precommand\@empty\else
\immediate\write18{\sa@convert@precommand}%
@@ -2460,6 +2491,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
@@ -2468,9 +2500,9 @@
\sa@convert{Conversion failed! Please ensure that shell escape\MessageBreak is enabled (e.g. use '-shell-escape').}%
\fi
\endgroup
-\expandafter\stop
% \end{macrocode}
% \begin{macrocode}
+\expandafter\sa@convert@stop
\fi
% \end{macrocode}
%
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}{%