standalone (10apr12)

git-svn-id: svn://tug.org/texlive/trunk@25908 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 28 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/latex/standalone/standalone.pdf b/Master/texmf-dist/doc/latex/standalone/standalone.pdf
index 44ed836fb84..82c6a27c932 100644
--- a/Master/texmf-dist/doc/latex/standalone/standalone.pdf
+++ b/Master/texmf-dist/doc/latex/standalone/standalone.pdf
diff --git a/Master/texmf-dist/source/latex/standalone/standalone.dtx b/Master/texmf-dist/source/latex/standalone/standalone.dtx
index d5e2a859ca6..512188ed8da 100644
--- a/Master/texmf-dist/source/latex/standalone/standalone.dtx
+++ b/Master/texmf-dist/source/latex/standalone/standalone.dtx
@@ -25,10 +25,10 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{standalone.dtx}[%
 %<=*DATE>
-    2011/12/21
+    2012/04/10
 %<=/DATE>
 %<=*VERSION>
-    v1.0
+    v1.0a
 %<=/VERSION>
     DTX file of the standalone bundle]
 \documentclass[a4paper,11pt]{ydoc}
@@ -43,7 +43,7 @@
 \RecordChanges
 \colorlet{keydesc}{opt}
 \OnlyDescription
-\lstset{numbers=none}
+\lstset{numbers=none,columns=fullflexible}
 \begin{document}
   \DocInput{\jobname.dtx}
   \PrintChanges
@@ -52,7 +52,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{3359}
+% \CheckSum{3368}
 %
 % \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
@@ -220,7 +220,7 @@
 % Also the |\begin{document}| and |\end{document}| should each stand on a source line of their own.
 %
 % \par\noindent
-% \begin{minipage}{\textwidth}\small
+% \begin{minipage}{\textwidth}
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,caption={Basic use of the \cls{standalone} class.},numbers=none]
 %   \documentclass{standalone}
 %   \usepackage{somepackage}
@@ -239,7 +239,7 @@
 % For PSTricks pictures an corresponding \opt{pstricks} option is provided.
 %
 % \par\noindent
-% \begin{minipage}{\textwidth}\small
+% \begin{minipage}{\textwidth}
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,caption={Basic use of the \cls{standalone} class.},numbers=none]
 %   \documentclass[tikz]{standalone}
 %   %\usetikzlibrary{calc}
@@ -440,7 +440,7 @@
 % The listings~\ref{lst:beamer}--\ref{lst:beamerrepl} shows a beamer standalone example and its effective code in standalone and main document mode.
 %
 % \par\bigskip\noindent
-% \begin{minipage}{\textwidth}\noindent\small
+% \begin{minipage}{\textwidth}\noindent
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,numbers=none,caption={Use of \texttt{standalone} class with \texttt{beamer} option.},label=lst:beamer]
 %   % Use of 'standalone' class with a beamer overlay:
 %   \documentclass[beamer]{standalone}
@@ -458,7 +458,7 @@
 % \end{minipage}
 %
 % \par\bigskip\noindent
-% \begin{minipage}{\textwidth}\noindent\small
+% \begin{minipage}{\textwidth}\noindent
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,numbers=none,caption={Effective beamer code if compiled standalone.}]
 %   \documentclass{beamer}
 %   <beamer code from standalone.cfg file>
@@ -473,7 +473,7 @@
 % \end{minipage}
 %
 % \par\bigskip\noindent
-% \begin{minipage}{\textwidth}\noindent\small
+% \begin{minipage}{\textwidth}\noindent
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,numbers=none,caption={Effective code if included in a beamer presentation.},label=lst:beamerrepl]
 %   \begingroup
 %     \only<1>{ One }%
@@ -508,7 +508,7 @@
 % By default conversion is disabled (\Key{convert}'=false'). If enabled without providing own settings (\Key{convert}, \Key{convert}'=true')
 % the following default settings are used: PNG format, a density of 300dpi, no explicit size and the output file name is given by \Macro\jobname, i.e.\ the name of the \LaTeX\ document.
 % Using the \opt{convert} option with any value other than |false| will enabled it.
-% All normal conversation settings are listed in \autoref{tab:convopt}, while \autoref{tab:advconvopt} lists the more advanced options which e.g.\ can be used to modify the conversation command directly.
+% All normal conversion settings are listed in \autoref{tab:convopt}, while \autoref{tab:advconvopt} lists the more advanced options which e.g.\ can be used to modify the conversion command directly.
 %
 % \begin{table}
 % \vspace*{-10ex}%
@@ -591,7 +591,7 @@
 %
 % \subsubsection{Conversion process}
 % The conversion process is currently implemented in the following way to allow the normal compilation and subsequent conversion using only one (manual) compiler run.
-% Because the document must be fully compiled before the conversation can occur the \cls{standalone} executes the same \LaTeX\ compiler (e.g.\ texttt{pdflatex}) again as
+% Because the document must be fully compiled before the conversion can occur the \cls{standalone} executes the same \LaTeX\ compiler (e.g.\ texttt{pdflatex}) again as
 % a sub-process which compiles the current document fully. This is done when the \cls{standalone} class is loaded, so that the main compiler instance is still at \Macro\documentclass
 % and has not yet itself opened the output file for writing. After the document got compiled using the sub-process the external conversion tool will be executed.
 % If required intermediate conversions like \texttt{dvips} are also executed beforehand.
@@ -627,7 +627,7 @@
 % It must be used if this switch is required before the |\documentclass| of a standalone file.
 %
 % \noindent
-% \begin{minipage}{\textwidth}\noindent\small
+% \begin{minipage}{\textwidth}\noindent
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,numbers=none,caption={Usage of 'standalone.tex'.}]
 %   \input{standalone} % use before any '\documentclass'
 %   \ifstandalone
@@ -926,7 +926,7 @@
 % \setcounter{lstlisting}{0}
 %
 % \par\noindent
-% \begin{minipage}{\textwidth}\small
+% \begin{minipage}{\textwidth}
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,caption={Use of \emph{standalone} package.}]
 %   % Main file
 %   % Real document class:
@@ -952,7 +952,7 @@
 % \end{minipage}
 %
 % \par\noindent
-% \begin{minipage}{\textwidth}\small
+% \begin{minipage}{\textwidth}
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,caption={Use of \emph{standalone} class.}]
 %   % A sub-file (e.g. picture) using the 'standalone' class:
 %   % Use 'standalone' as document class:
@@ -972,7 +972,7 @@
 % \end{minipage}
 %
 % \par\noindent
-% \begin{minipage}{\textwidth}\small
+% \begin{minipage}{\textwidth}
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,caption={Effective code if compiled standalone.}]
 %   \documentclass{article}
 %
@@ -995,7 +995,7 @@
 % \end{minipage}
 %
 % \par\noindent
-% \begin{minipage}{\textwidth}\small
+% \begin{minipage}{\textwidth}
 % \begin{lstlisting}[language={[latex]tex},gobble=4,frame=lines,caption={Effective code if included in a main document.}]
 %   \begingroup
 %   \begin{tikzpicture}
@@ -1437,8 +1437,8 @@
 %
 % \begin{key}{standalone.cls}{convert}
 %    \begin{macrocode}
-\sa@clsoption{convert}[true]{%
-    \setkeys{standalone.cls/convert}{#1}%
+\sa@clsoption{convert}[]{%
+    \setkeys{standalone.cls/convert}{true,#1}%
 }
 %    \end{macrocode}
 % \end{key}
@@ -2257,7 +2257,7 @@
                 \sa@convert@failuremsg{standalone}{#1}{}%
             \fi
         \else
-            \ClassInfo{standalone}{Conversion successfull.}%
+            \ClassInfo{standalone}{Conversion successful.}%
         \fi
     \else
         \sa@convert@failuremsg{standalone}{#1}{}%
diff --git a/Master/texmf-dist/tex/latex/standalone/standalone.cfg b/Master/texmf-dist/tex/latex/standalone/standalone.cfg
index b3a92272e58..bd047b7e624 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}[%
-    2011/12/21
-    v1.0
+    2012/04/10
+    v1.0a
     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 0fd148c0079..d418be0450a 100644
--- a/Master/texmf-dist/tex/latex/standalone/standalone.cls
+++ b/Master/texmf-dist/tex/latex/standalone/standalone.cls
@@ -17,8 +17,8 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{standalone}[%
-    2011/12/21
-    v1.0
+    2012/04/10
+    v1.0a
     Class to compile TeX sub-files standalone]
 \newif\ifstandalone
 \standalonetrue
@@ -241,8 +241,8 @@
 \def\sa@endnofloat{%
     \endtrivlist
 }
-\sa@clsoption{convert}[true]{%
-    \setkeys{standalone.cls/convert}{#1}%
+\sa@clsoption{convert}[]{%
+    \setkeys{standalone.cls/convert}{true,#1}%
 }
 \sa@clsoption{disable@convert}[]{%
     \typeout{Disable conversion}
@@ -720,7 +720,7 @@
                 \sa@convert@failuremsg{standalone}{#1}{}%
             \fi
         \else
-            \ClassInfo{standalone}{Conversion successfull.}%
+            \ClassInfo{standalone}{Conversion successful.}%
         \fi
     \else
         \sa@convert@failuremsg{standalone}{#1}{}%
diff --git a/Master/texmf-dist/tex/latex/standalone/standalone.sty b/Master/texmf-dist/tex/latex/standalone/standalone.sty
index fbc050b6861..01d7a1046e2 100644
--- a/Master/texmf-dist/tex/latex/standalone/standalone.sty
+++ b/Master/texmf-dist/tex/latex/standalone/standalone.sty
@@ -18,8 +18,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{standalone}[%
-    2011/12/21
-    v1.0
+    2012/04/10
+    v1.0a
     Package to include TeX sub-files with preambles]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \@ifundefined{ifstandalone}{%