standalone update (22mar10)

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

4 files changed, 26 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/standalone/standalone.cfg b/Master/texmf-dist/tex/latex/standalone/standalone.cfg
index e2fcf8f8ac9..9718bbff17d 100644
--- a/Master/texmf-dist/tex/latex/standalone/standalone.cfg
+++ b/Master/texmf-dist/tex/latex/standalone/standalone.cfg
@@ -1,4 +1,8 @@
-% $Id: standalone.dtx 1704 2010-03-21 19:25:13Z martin $
-\ProvidesFile{standalone.cfg}[2010/03/21 v0.1 Default configuration file for 'standalone' class and package]%
+% $Id: standalone.dtx 1714 2010-03-22 14:44:37Z martin $
+\ProvidesFile{standalone.cfg}[2010/03/22 v0.2 Default configuration file for 'standalone' class and package]%
 \PassOptionsToPackage{active,tightpage}{preview}%
+
+\ifstandalonebeamer
+  \setbeamertemplate{navigation symbols}{}
+\fi
 % vim: ft=tex
diff --git a/Master/texmf-dist/tex/latex/standalone/standalone.cls b/Master/texmf-dist/tex/latex/standalone/standalone.cls
index 46cc44389d2..99682b22ff8 100644
--- a/Master/texmf-dist/tex/latex/standalone/standalone.cls
+++ b/Master/texmf-dist/tex/latex/standalone/standalone.cls
@@ -25,9 +25,9 @@
 %% This work consists of the files standalone.dtx, standalone.ins
 %% and the derived file standalone.sty.
 %% 
-% $Id: standalone.dtx 1704 2010-03-21 19:25:13Z martin $
+% $Id: standalone.dtx 1714 2010-03-22 14:44:37Z martin $
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{standalone}   [2010/03/21 v0.1 Class to compile TeX sub-files standalone]
+\ProvidesClass{standalone}   [2010/03/22 v0.2 Class to compile TeX sub-files standalone]
 \def\sa@classoptionslist{}
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{prefix=sa@}
@@ -36,9 +36,11 @@
 \let\endstandalone\relax
 \def\sa@cls@document{\standalone}
 \def\sa@cls@enddocument{\endstandalone}
+\newif\ifstandalonebeamer
 \DeclareVoidOption{beamer}{%
   \def\sa@class{beamer}%
   \sa@previewfalse
+  \standalonebeamertrue
   \newenvironment{standaloneframe}{%
     \@ifnextchar<%
       {\@standaloneframe}%
@@ -70,16 +72,14 @@
   }%
 }
 \DeclareStringOption[article]{class}
-\DeclareStringOption[]{frameoptions}
 \DeclareDefaultOption{%
   \xdef\sa@classoptionslist{\sa@classoptionslist,\CurrentOption}%
 }
-\input{standalone.cfg}
 \ProcessKeyvalOptions*\relax
 \let\@classoptionslist\sa@classoptionslist
 \xdef\@tempa{[\sa@classoptionslist]{\sa@class}}
 \expandafter\LoadClass\@tempa
-\@nameuse{sa@afterclassloaded}
+\input{standalone.cfg}
 \ifsa@preview
   \@ifundefined{endstandalone}{%
     \renewenvironment{standalone}
diff --git a/Master/texmf-dist/tex/latex/standalone/standalone.sty b/Master/texmf-dist/tex/latex/standalone/standalone.sty
index db5544a0fdf..e6ad6db56ed 100644
--- a/Master/texmf-dist/tex/latex/standalone/standalone.sty
+++ b/Master/texmf-dist/tex/latex/standalone/standalone.sty
@@ -25,11 +25,15 @@
 %% This work consists of the files standalone.dtx, standalone.ins
 %% and the derived file standalone.sty.
 %% 
-% $Id: standalone.dtx 1704 2010-03-21 19:25:13Z martin $
+% $Id: standalone.dtx 1714 2010-03-22 14:44:37Z martin $
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{standalone} [2010/03/21 v0.1 Package to include TeX sub-files which use the 'standalone' class]
+\ProvidesPackage{standalone} [2010/03/22 v0.2 Package to include TeX sub-files which use the 'standalone' class]
 \expandafter\newif\csname ifstandalone\endcsname
 \standalonefalse
+\@ifundefined{ifstandalonebeamer}{%
+\expandafter\newif\csname ifstandalonebeamer\endcsname
+\standalonebeamerfalse
+}{}%
 \newcommand{\sa@documentclass}[2][]{%
   \let\document\sa@document
   \expandafter\sa@@documentclass
diff --git a/Master/texmf-dist/tex/latex/standalone/standalone.tex b/Master/texmf-dist/tex/latex/standalone/standalone.tex
new file mode 100644
index 00000000000..ebc55aa0853
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/standalone/standalone.tex
@@ -0,0 +1,9 @@
+% $Id: standalone.dtx 1714 2010-03-22 14:44:37Z martin $
+\ProvidesFile{standalone.tex}[2010/03/22 v0.2 Provides if-switch to show if file is compiled standalone]%
+\expandafter\ifx\csname ifstandalone\endcsname\relax
+\expandafter\newif\csname ifstandalone\endcsname
+\expandafter\ifx\csname @twoclasseserror\endcsname\documentclass
+\else
+  \standalonetrue
+\fi
+\fi