From b0c3dce84fe940b3429e9163862b1e9151f51dba Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Fri, 18 May 2012 21:29:21 +0200
Subject: [PATCH] =?utf8?q?seminar.layout:=20new=20version=20from=20G=C3=BC?=
 =?utf8?q?nter=20Milde=20(bug=20#7624)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/layouts/seminar.layout | 84 +++++++++++++++++++++++++++++---------
 status.20x                 |  4 +-
 2 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout
index 840d0b8f40..c48938b05a 100644
--- a/lib/layouts/seminar.layout
+++ b/lib/layouts/seminar.layout
@@ -6,8 +6,9 @@
 #   1.1 08-04-2002 Günter Milde <milde users.sf.net>
 #   1.2 11-12-2002 Günter Milde (copying some stuff from L. G. Bjønnes
 #                                version in LyX 1.3)
-#   1.3 2007-09-18 GM (adapted to LyX 1.5)
-#   1.4 2008-10-08 GM (use --Separator-- "look")
+#   1.3 2007-09-18 Günter Milde (adapted to LyX 1.5)
+#   1.4 2008-10-08 Günter Milde (use --Separator-- "look")
+#   1.5 2011-06-09 Günter Milde (Use Flex insets)
 
 Format 35
 Sides	1
@@ -15,12 +16,71 @@ Columns	1
 
 ClassOptions
 	FontSize	8|9|10|11|12|14|17
-	Other	slidesec
+	Other		"slidesec,semrot,portrait"
 End
 
 # Input general definitions: (seminar is based on the article class)
 Input article.layout
 
+InsetLayout Flex:LandscapeSlide
+	LabelString	"Landscape Slide"
+	LatexType	Environment
+	LatexName	slide
+	LyXType		custom
+	Decoration	classic
+	MultiPar	true
+	KeepEmpty		true
+	LabelFont
+		Size	Small
+	EndFont
+End
+
+InsetLayout Flex:PortraitSlide
+	CopyStyle	Flex:LandscapeSlide
+	LabelString	"Portrait Slide"
+	LatexName	slide*
+End
+
+# Note: \slideheading is only defined when the option slidesec is present
+Style SlideHeading
+	CopyStyle		Section*
+	LatexName		slideheading
+	Align			Center
+End
+
+# Note: \slidesubheading is only defined when the option slidesec is present
+Style SlideSubHeading
+	CopyStyle		Subsection*
+	LatexName		slidesubheading
+	Align			Center
+End
+
+InsetLayout Flex:ListOfSlides
+	CopyStyle		Flex:LandscapeSlide
+	LabelString		"List of Slides"
+	LatexType		Command
+	LatexName		listofslides
+	BgColor			listingsbg
+	Spellcheck		0
+End
+
+InsetLayout Flex:SlideContents
+	CopyStyle		Flex:ListOfSlides
+	LabelString		"Slide Contents"
+	LatexName		slidecontents
+End
+
+InsetLayout Flex:ProgressContents
+	CopyStyle		Flex:ListOfSlides
+	LabelString		"Progress Contents"
+	LatexName		Slidecontents
+End
+
+# Compatibility definitions for old documents
+# -------------------------------------------
+#
+# It is recommended to use the custom insets instead of paragraph styles.
+
 Style LandscapeSlide
 	CopyStyle		--Separator-- 
 	LatexType		Environment
@@ -43,7 +103,7 @@ Style PortraitSlide
 	LabelString		"Portrait Slide:"
 End
 Style Slide*
-	Obsoletedby		PortraitSlide
+	ObsoletedBy		PortraitSlide
 End
 
 # EndOfSlide was a dummy style whose main purpose is to separate subsequent
@@ -53,20 +113,6 @@ Style EndOfSlide
 	ObsoletedBy		--Separator--
 End
 
-# Note: \slideheading is only defined when the option slidesec is present
-Style SlideHeading
-	CopyStyle		Section*
-	LatexName		slideheading
-	Align			Center
-End
-
-# Note: \slidesubheading is only defined when the option slidesec is present
-Style SlideSubHeading
-	CopyStyle		Subsection*
-	LatexName		slidesubheading
-	Align			Center
-End
-
 Style ListOfSlides
 	CopyStyle		--Separator--
 	LatexType		Command
@@ -77,7 +123,6 @@ Style ListOfSlides
 #	BottomSep		0
 	LabelString		"[List Of Slides]"
 End
-
 Style SlideContents
 	CopyStyle		ListOfSlides
 	LatexName		slidecontents
@@ -89,4 +134,3 @@ Style ProgressContents
 	LatexName		Slidecontents
 	LabelString		"[Progress Contents]"
 End
-
diff --git a/status.20x b/status.20x
index 579c63dd6f..30a58532ad 100644
--- a/status.20x
+++ b/status.20x
@@ -68,6 +68,8 @@ What's new
 
 - Recognize geany, leafpad and mousepad as viewers (bug #8021).
 
+- Improved version of the layout file for Seminar slide documents (bug 7624).
+
 
 * DOCUMENTATION AND LOCALIZATION
 
@@ -82,7 +84,7 @@ What's new
   - New section how to color every second table row.
   - New section how rotate table cells by a custom angle.
 
-- Cleaned up the customization manual a bit.
+- Cleaned up the Customization manual a bit.
 
 
 * BUILD/INSTALLATION
-- 
2.39.5