Update layouts with separators to format 50

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index b02f1625046307c784805aad57461f9332786be7..14b0499731aae50fc6a886f91aea043239dc2036 100644 (file)
--- 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 6eaa9fa5f06276561bcff4457e6a005e7f593c0a..69a9f4d44fc970cac0edab175da1d7286bf9d89b 100644 (file)
--- 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 1d204e89ab884430e295c6fcf76bdf82a39efbfd..b806e0808abf31b28938b8a0aaf3d2095833779b 100644 (file)
--- 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 6c86edc2a457a4d7f230bc2aef6e8f7c7b18257b..982512dabfb43f851f8f417fea9d31def72e32c5 100644 (file)
--- 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 73d928d8b397a441ca2c6502158de17d34ae67e8..490ad874ebd6d74a669ecbd7244d7beb55ac5bee 100644 (file)
--- 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