[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-cvs
Subject:    [LyX/master] Update layouts with separators to format 50
From:       Georg Baum <baum () lyx ! org>
Date:       2014-05-29 19:23:06
Message-ID: 20140529192306.918462802CE () lyx ! lyx ! org
[Download RAW message or body]

commit 4e078230a0335f196caf40943ef1c03da13b0680
Author: Georg Baum <baum@lyx.org>
Date:   Thu May 29 21:22:15 2014 +0200

    Update layouts with separators to format 50

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index b02f162..14b0499 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -6,7 +6,7 @@
 #   Richard Heck <rgheck@lyx.org>, Martin Vermeer <martin.vermeer@hut.fi> and probably others.
 
 
-Format 49
+Format 50
 
 #
 # GLOBAL SETTINGS
@@ -1243,29 +1243,6 @@ End
 # MISC.
 #
 
-Style Separator
-  Category         MainText
-  LatexType        Paragraph
-  LatexName        dummy
-  ParIndent        MM
-  ParSkip          0.4
-  Align            Left
-  AlignPossible    Block, Left, Right, Center
-  Margin           First_Dynamic
-  TopSep           0
-  BottomSep        0
-  ParSep           0
-  LabelType        Static
-  LabelBottomSep   0
-  LabelString      "___"
-  KeepEmpty        1
-  LabelFont 
-    Series         Medium
-    Size           Normal
-    Color          latex
-  EndFont
-End
- 
 Style LyX-Code
   Category         MainText
   Margin           Static
diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout
index 6eaa9fa..69a9f4d 100644
--- a/lib/layouts/g-brief2.layout
+++ b/lib/layouts/g-brief2.layout
@@ -6,7 +6,7 @@
 #          Thomas Hartkens <thomas@hartkens.de>
 
 # Input general definitions
-Format 49
+Format 50
 Input stdfloats.inc
 Input stdcounters.inc
 Input stdinsets.inc
@@ -1018,7 +1018,6 @@ End
 Input stdlists.inc
 Input stdlayouts.inc
 NoStyle			Verse
-NoStyle			--Separator--
 
 # Input lyxmacros.inc
 
diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 1d204e8..b806e08 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -6,7 +6,7 @@
 
 
 # General textclass parameters
-Format 49
+Format 50
 	Columns		1
 	Sides		1
 	SecNumDepth	-1
@@ -484,24 +484,6 @@ Style Bibliography
 	EndFont
 End
 
-Style --Separator--
-	KeepEmpty	1
-	Margin		Dynamic
-	LatexType	Paragraph
-	LatexName	dummy
-	ParIndent	MM
-	Align		Block
-	LabelType	Static
-	LabelString	"--- Separate Environment ---"
-	LabelFont
-	  Family	Roman
-	  Series	Medium
-	  Size		Normal
-	  Color		Blue
-	EndFont
-	HTMLLabel	NONE
-End
-
 Style Recipient
 	Margin		Dynamic
 	LatexType	Command
diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout
index 6c86edc..982512d 100644
--- a/lib/layouts/seminar.layout
+++ b/lib/layouts/seminar.layout
@@ -11,7 +11,7 @@
 #   1.4 2008-10-08 Günter Milde (use --Separator-- "look")
 #   1.5 2011-06-09 Günter Milde (Use Flex insets)
 
-Format 49
+Format 50
 Sides	1
 Columns	1
 
@@ -84,7 +84,22 @@ End
 # It is recommended to use the custom insets instead of paragraph styles.
 
 Style LandscapeSlide
-	CopyStyle		--Separator-- 
+	Category              MainText
+	KeepEmpty             1
+	Margin                Dynamic
+	LatexType             Paragraph
+	LatexName             dummy
+	ParIndent             MM
+	Align                 Block
+	LabelType             Static
+	LabelString           "--- Separate Environment ---"
+	LabelFont
+	  Family              Roman
+	  Series              Medium
+	  Size                Normal
+	  Color               Blue
+	EndFont
+	HTMLLabel             NONE
 	LatexType		Environment
 	LatexName		slide
 	NextNoIndent		1
@@ -111,12 +126,24 @@ End
 # EndOfSlide was a dummy style whose main purpose is to separate subsequent
 # Slide environments. Nowadays lyx has the special --Separator-- style as
 # workaround:
-Style EndOfSlide
-	ObsoletedBy		--Separator--
-End
 
 Style ListOfSlides
-	CopyStyle		--Separator--
+	Category              MainText
+	KeepEmpty             1
+	Margin                Dynamic
+	LatexType             Paragraph
+	LatexName             dummy
+	ParIndent             MM
+	Align                 Block
+	LabelType             Static
+	LabelString           "--- Separate Environment ---"
+	LabelFont
+	  Family              Roman
+	  Series              Medium
+	  Size                Normal
+	  Color               Blue
+	EndFont
+	HTMLLabel             NONE
 	LatexType		Command
 	LatexName		listofslides
 	TopSep			0.5
diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc
index 73d928d..490ad87 100644
--- a/lib/layouts/stdlayouts.inc
+++ b/lib/layouts/stdlayouts.inc
@@ -7,7 +7,7 @@
 # quotations and such.
 
 
-Format 49
+Format 50
 
 Style Quotation
 	Category              MainText
@@ -95,22 +95,3 @@ Style Verbatim
 	HTMLItem		p
 End
 
-
-Style --Separator--
-	Category              MainText
-	KeepEmpty             1
-	Margin                Dynamic
-	LatexType             Paragraph
-	LatexName             dummy
-	ParIndent             MM
-	Align                 Block
-	LabelType             Static
-	LabelString           "--- Separate Environment ---"
-	LabelFont
-	  Family              Roman
-	  Series              Medium
-	  Size                Normal
-	  Color               Blue
-	EndFont
-	HTMLLabel             NONE
-End

[prev in list] [next in list] [prev in thread] [next in thread]