* lib/layouts/article-beamer.layout:

* lib/layouts/scrarticle-beamer.layout:
* lib/Makefile.am:
* development/scons/scons_manifest.py:
	- new layouts that support beamerarticle.cls

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24289 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index dc7a675791bd48b2294d70ee4ee9b12bd012c629..ce898a0bac0ed1d33e664677dfa0008de65fdd7d 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -2517,6 +2517,7 @@ lib_layouts_files = Split('''
     arab-article.layout
     armenian-article.layout
     article.layout
+    article-beamer.layout
     beamer.layout
     book.layout
     broadway.layout
@@ -2573,6 +2574,7 @@ lib_layouts_files = Split('''
     revtex.layout
     revtex4.layout
     scrartcl.layout
+    scrarticle-beamer.layout
     scrbook.layout
     scrlettr.layout
     scrlttr2.layout

diff --git a/lib/Makefile.am b/lib/Makefile.am
index cb5ad6ddbedef9a23643aa50c00851aa8bc55641..27bb701ca81eb437a9269e19292a9107a4dddb5e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -949,6 +949,7 @@ dist_layouts_DATA =\
        layouts/arab-article.layout \
        layouts/armenian-article.layout \
        layouts/article.layout \
+       layouts/article-beamer.layout \
        layouts/beamer.layout \
        layouts/book.layout \
        layouts/braille.module \
@@ -1027,6 +1028,7 @@ dist_layouts_DATA =\
        layouts/revtex.layout \
        layouts/revtex4.layout \
        layouts/scrartcl.layout \
+       layouts/scrarticle-beamer.layout \
        layouts/scrbook.layout \
        layouts/scrclass.inc \
        layouts/scrlettr.layout \

diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout
new file mode 100644 (file)
index 0000000..fd9e5d4
--- /dev/null
+++ b/lib/layouts/article-beamer.layout
@@ -0,0 +1,35 @@
+#% Do not delete the line below; configure depends on this
+#  \DeclareLaTeXClass[article]{article (beamer)}
+# Author: Jürgen Spitzmüller <j.spitzmueller@gmx.de>
+
+Format 7
+
+# Includes
+Input beamer.layout
+
+Preamble
+       \usepackage{beamerarticle,pgf}
+       % this default might be overridden by plain title style
+       \newcommand\makebeamertitle{\frame{\maketitle}}%
+       \AtBeginDocument{
+               \let\origtableofcontents=\tableofcontents
+               \def\tableofcontents{\@ifnextchar[{\origtableofcontents}{\gobbletableofcontents}}
+               \def\gobbletableofcontents#1{\origtableofcontents}
+       }
+EndPreamble
+
+# Frame control definition
+Style BeginFrame
+# This redefinition is needed to make beamerarticle work
+  Preamble
+    \makeatletter
+    \long\def\lyxframe#1{\@lyxframe#1\@lyxframestop}%
+    \def\@lyxframe{\@ifnextchar<{\@@lyxframe}{\@@lyxframe<*>}}%
+    \def\@@lyxframe<#1>{\@ifnextchar[{\@@@lyxframe<#1>}{\@@@lyxframe<#1>[]}}
+    \def\@@@lyxframe<#1>[{\@ifnextchar<{\@@@@@lyxframe<#1>[}{\@@@@lyxframe<#1>[<*>][}}
+    \def\@@@@@lyxframe<#1>[#2]{\@ifnextchar[{\@@@@lyxframe<#1>[#2]}{\@@@@lyxframe<#1>[#2][]}}
+    \long\def\@@@@lyxframe<#1>[#2][#3]#4\@lyxframestop#5\lyxframeend{%
+      \frame<#1>[#3]{\frametitle{#4}#5}}
+    \makeatother
+  EndPreamble
+End

diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout
new file mode 100644 (file)
index 0000000..7d945ac
--- /dev/null
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -0,0 +1,35 @@
+#% Do not delete the line below; configure depends on this
+#  \DeclareLaTeXClass[scrartcl]{article (koma + beamer)}
+# Author : Jürgen Spitzmüller <j.spitzmueller@gmx.de>
+
+Format 7
+
+# Includes
+Input beamer.layout
+
+Preamble
+       \usepackage{beamerarticle,pgf}
+       % this default might be overridden by plain title style
+       \newcommand\makebeamertitle{\frame{\maketitle}}%
+       \AtBeginDocument{
+               \let\origtableofcontents=\tableofcontents
+               \def\tableofcontents{\@ifnextchar[{\origtableofcontents}{\gobbletableofcontents}}
+               \def\gobbletableofcontents#1{\origtableofcontents}
+       }
+EndPreamble
+
+# Frame control definition
+Style BeginFrame
+# This redefinition is needed to make beamerarticle work
+  Preamble
+    \makeatletter
+    \long\def\lyxframe#1{\@lyxframe#1\@lyxframestop}%
+    \def\@lyxframe{\@ifnextchar<{\@@lyxframe}{\@@lyxframe<*>}}%
+    \def\@@lyxframe<#1>{\@ifnextchar[{\@@@lyxframe<#1>}{\@@@lyxframe<#1>[]}}
+    \def\@@@lyxframe<#1>[{\@ifnextchar<{\@@@@@lyxframe<#1>[}{\@@@@lyxframe<#1>[<*>][}}
+    \def\@@@@@lyxframe<#1>[#2]{\@ifnextchar[{\@@@@lyxframe<#1>[#2]}{\@@@@lyxframe<#1>[#2][]}}
+    \long\def\@@@@lyxframe<#1>[#2][#3]#4\@lyxframestop#5\lyxframeend{%
+      \frame<#1>[#3]{\frametitle{#4}#5}}
+    \makeatother
+  EndPreamble
+End