Juergen Spitzmueller wrote:
> commit 20bcaec061193a3984d42040ee65d2723872ecf4
> Author: Juergen Spitzmueller <sp...@lyx.org>
> Date: Thu May 29 14:10:32 2014 +0200
>
> Add layout tag that determines if/when a paragraph can be indented.
>
> Fixes: #7327, #7458, #8670
Nice work!
It looks like the layout file format number update is missing. If I update
the number in layout2layout.py and TextClass.cpp, and then run
development/tools/updatelayouts.sh, I get more changes than expected: See
attachment, where I stripped all changes which consisted only of the updated
file format number.
Enrico, could you please have a look the separator changes and adapt those
files? Afterwards, we could then cleanly do the 50->51 update.
Georg
diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index b02f162..0e5c3ca 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -6,7 +6,7 @@
# Richard Heck <rgh...@lyx.org>, Martin Vermeer <martin.verm...@hut.fi> and probably others.
-Format 49
+Format 51
#
# GLOBAL SETTINGS
@@ -1243,28 +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
diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout
index 6eaa9fa..3f3869d 100644
--- a/lib/layouts/g-brief2.layout
+++ b/lib/layouts/g-brief2.layout
@@ -6,7 +6,7 @@
# Thomas Hartkens <tho...@hartkens.de>
# Input general definitions
-Format 49
+Format 51
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..4f613e1 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -6,7 +6,7 @@
# General textclass parameters
-Format 49
+Format 51
Columns 1
Sides 1
SecNumDepth -1
@@ -484,23 +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
diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout
index 6c86edc..7d16411 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 51
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..38cb32e 100644
--- a/lib/layouts/stdlayouts.inc
+++ b/lib/layouts/stdlayouts.inc
@@ -7,7 +7,7 @@
# quotations and such.
-Format 49
+Format 51
Style Quotation
Category MainText
@@ -96,21 +96,3 @@ Style Verbatim
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
diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index 62d5d6d..199a318 100644
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -178,7 +178,7 @@ import os, re, string, sys
# development/tools/updatelayouts.sh script to update all
# layout files to the new format.
-currentFormat = 50
+currentFormat = 51
def usage(prog_name):
diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 7941243..bd819ab 100644
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -61,7 +61,7 @@ namespace lyx {
// development/tools/updatelayouts.sh script, to update the format of
// all of our layout files.
//
-int const LAYOUT_FORMAT = 50; //ef: removal of separator layout
+int const LAYOUT_FORMAT = 51; //spitz: add ToggleIndent tag
namespace {
