Merge branch 'staging' into unstable

gadmm · Feb 11, 2018 · c7e6fc4 · c7e6fc4
2 parents 2dc0be9 + 979ca30
commit c7e6fc4
Show file tree

Hide file tree

Showing 3 changed files with 175 additions and 0 deletions.
diff --git a/lib/layouts/article-beamer-flex.layout b/lib/layouts/article-beamer-flex.layout
@@ -0,0 +1,34 @@
+#% Do not delete the line below; configure depends on this
+#  \DeclareLaTeXClass[article,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer-flex Article (Standard Class)}
+#  \DeclareCategory{Articles}
+# Author: Jürgen Spitzmüller <[email protected]>
+# Adapted to beamer-flex by [email protected]
+
+Format 66
+
+# Includes
+Input article.layout
+Input beamer-flex.layout
+
+# override settings inherited from beamer.layout (Paul Rubin <[email protected]>)
+Provides geometry 0
+Provides hyperref 0
+
+DefaultFont
+	Family                Roman
+	Series                Medium
+	Shape                 Up
+	Size                  Normal
+	Color                 None
+EndFont
+
+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
diff --git a/lib/layouts/beamerposter-flex.layout b/lib/layouts/beamerposter-flex.layout
@@ -0,0 +1,107 @@
+#% Do not delete the line below; configure depends on this
+#  \DeclareLaTeXClass[beamer,beamerposter.sty]{Beamerposter (flex insets)}
+#  \DeclareCategory{Posters}
+# Wrapper layout for the beamer class with beamerposter style
+#
+# Authors: Jürgen Spitzmüller ([email protected])
+# Adapted to beamer-flex by [email protected]
+#
+# Input general definitions
+
+Format 66
+
+Input beamer-flex.layout
+
+Preamble
+	\usepackage{etoolbox}
+	\AtEndPreamble{%
+	   \usepackage{beamerposter}
+	}
+EndPreamble
+
+Style Title
+	InPreamble 1
+	InTitle    0
+End
+
+Style Subtitle
+	InPreamble 1
+	InTitle    0
+End
+
+Style Author
+	InPreamble 1
+	InTitle    0
+End
+
+Style Institute
+	InPreamble 1
+	InTitle    0
+End
+
+Style Date
+	InPreamble 1
+	InTitle    0
+End
+
+Style TitleGraphic
+	InPreamble 1
+	InTitle    0
+End
+
+NoStyle Title_(Plain_Frame)
+
+InsetLayout "Flex:Giant"
+	LyXType               custom
+	Decoration            classic
+	LabelString           Giant
+	LatexType             None
+	LeftDelim             {\veryHuge{}
+	RightDelim            \par}
+	Font
+	  Size                giant
+	EndFont
+	LabelFont
+	  Size                normal
+	EndFont
+	ResetsFont            true
+End
+
+InsetLayout "Flex:More_Giant"
+	CopyStyle             Flex:Giant
+	LeftDelim             {\VeryHuge{}
+	LabelString           "More Giant"
+End
+
+InsetLayout "Flex:Most_Giant"
+	CopyStyle             Flex:Giant
+	LeftDelim             {\VERYHuge{}
+	LabelString           "Most Giant"
+End
+
+InsetLayout Flex:Giant_Snippet
+	LyXType               charstyle
+	LabelString           Giant
+	LatexType             None
+	LeftDelim             {\veryHuge{}
+	RightDelim            }
+	Font
+	  Size                giant
+	EndFont
+	LabelFont
+	  Size                normal
+	EndFont
+	ResetsFont            true
+End
+
+InsetLayout Flex:More_Giant_Snippet
+	CopyStyle             Flex:Giant_Snippet
+	LabelString           "More Giant"
+	LeftDelim             {\VeryHuge{}
+End
+
+InsetLayout Flex:Most_Giant_Snippet
+	CopyStyle             Flex:Giant_Snippet
+	LabelString           "Most Giant"
+	LeftDelim             {\VERYHuge{}
+End
diff --git a/lib/layouts/scrarticle-beamer-flex.layout b/lib/layouts/scrarticle-beamer-flex.layout
@@ -0,0 +1,34 @@
+#% Do not delete the line below; configure depends on this
+#  \DeclareLaTeXClass[scrartcl,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer-flex Article (KOMA-Script)}
+#  \DeclareCategory{Articles}
+# Author: Jürgen Spitzmüller <[email protected]>
+# Adapted to beamer-flex by [email protected]
+
+Format 66
+
+# Includes
+Input scrartcl.layout
+Input beamer-flex.layout
+
+# override settings inherited from beamer.layout
+Provides geometry 0
+Provides hyperref 0
+
+DefaultFont
+	Family                Roman
+	Series                Medium
+	Shape                 Up
+	Size                  Normal
+	Color                 None
+EndFont
+
+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