Fix bug #7289. Confusingly, svjour.inc declares "NoStyle Chapter", and then

some of the files that include it redefine chapter by cut-and-paste from
stdsections.inc. Not very clean. So now svnjour.inc doesn't do this, and
the journal files that include it declare "NoStyle Chapter" themselves. This
also allows some simplification of the sv book classes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37565 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/svglobal.layout b/lib/layouts/svglobal.layout
index 2c6c7a9eaae3e9489bbe8245769779d3b84b9ef3..595b0416fae1ebc3bdb1eae61d1958038005beee 100644 (file)
--- a/lib/layouts/svglobal.layout
+++ b/lib/layouts/svglobal.layout
@@ -18,8 +18,11 @@
 # see www.springer.de/author/tex/help-journals.html for class files
 #
 # The standard Springer Journal sections
+
 Format 33
 Input svjour.inc
+NoStyle Chapter
+NoCounter chapter
 
 ClassOptions
   Other                global

diff --git a/lib/layouts/svglobal3.layout b/lib/layouts/svglobal3.layout
index ef24580f7b82f631a9235d63c06bcf519f004cb1..ac374c3d33e5d87b9cea5c78aae6a0b414031e06 100644 (file)
--- a/lib/layouts/svglobal3.layout
+++ b/lib/layouts/svglobal3.layout
@@ -16,6 +16,9 @@
 Format 33
 
 Input svjour.inc
+NoStyle Chapter
+NoCounter chapter
+
 NoStyle Acknowledgement
 NoStyle Headnote
 NoStyle Dedication

diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout
index 332293a6fa2d3d42316e708ef26bf5c561de32a6..6d04c864c20449c5500491866776344bf86a0b2b 100644 (file)
--- a/lib/layouts/svjog.layout
+++ b/lib/layouts/svjog.layout
@@ -24,7 +24,8 @@
 
 Format 33
 Input svjour.inc
-
+NoStyle Chapter
+NoCounter chapter
 
 ClassOptions
        Other         jog

diff --git a/lib/layouts/svjour.inc b/lib/layouts/svjour.inc
index 19262847fa5699c8c91df5518ac9fa39072253b8..c3c37364ea947bb9ae56fdcedff15f7f02e9cea7 100644 (file)
--- a/lib/layouts/svjour.inc
+++ b/lib/layouts/svjour.inc
@@ -48,8 +48,6 @@ Input stdtitle.inc
 NoStyle Part
 NoCounter part
 NoStyle Part*
-NoStyle Chapter
-NoCounter chapter
 NoStyle Chapter*
 NoStyle Subparagraph
 NoCounter subparagraph

diff --git a/lib/layouts/svmono.layout b/lib/layouts/svmono.layout
index 7ec67dffd0b2756c8ca66511f88fcbb6e08419a3..4806f14b2d43e5015303a3374e34f46370c76715 100644 (file)
--- a/lib/layouts/svmono.layout
+++ b/lib/layouts/svmono.layout
@@ -99,37 +99,11 @@ Style Part*
 End
 
 Style Chapter
-       Margin          Static
-       Category        Section
-       LabelString     "Chapter \thechapter"
-       LabelStringAppendix     "Appendix \thechapter"
-       LabelType       Counter
-       LabelCounter    chapter
-       TocLevel        0
-       LatexType       Command
-       LatexName       chapter
-       NeedProtect     1
-       NextNoIndent    1
-       ParSkip         0.4
-       TopSep          4
-       BottomSep       0.8
-       ParSep          0.8
        Align           Left
-       OptionalArgs    1
-       Font
-         Series        Bold
-         Size          Huge
-       EndFont
 End
 
 Style Chapter*
-       CopyStyle       Chapter
-       Category        Unnumbered
-       Margin          Static
-       LatexName       chapter*
-       LabelType       No_Label
-       LabelCounter    ""
-       OptionalArgs    0
+  Align   Left
 End
 
 Style Preface

diff --git a/lib/layouts/svmult.layout b/lib/layouts/svmult.layout
index 5cb42dc6004a7651b80c5318bac530f278a53f6b..4e6472fe6f063273c1d196e75e0cffb4e308b106 100644 (file)
--- a/lib/layouts/svmult.layout
+++ b/lib/layouts/svmult.layout
@@ -242,37 +242,13 @@ Style Part*
 End
 
 Style Chapter
-       Margin          Static
        Category        "For editors"
-       LabelString     "Chapter \thechapter"
-       LabelStringAppendix  "Appendix \thechapter"
-       LabelType       Counter
-       LabelCounter    chapter
-       TocLevel        0
-       LatexType       Command
-       LatexName       chapter
-       NeedProtect     1
-       NextNoIndent    1
-       ParSkip         0.4
-       TopSep          4
-       BottomSep       0.8
-       ParSep          0.8
-       Align           Left
-       OptionalArgs    1
-       Font
-         Series        Bold
-         Size          Huge
-       EndFont
+  Align   Left
 End
 
 Style Chapter*
-       CopyStyle       Chapter
        Category        "For editors"
-       Margin          Static
-       LatexName       chapter*
-       LabelType       No_Label
-       LabelCounter    ""
-       OptionalArgs    0
+  Align   Left
 End
 
 InsetLayout Inst

diff --git a/lib/layouts/svprobth.layout b/lib/layouts/svprobth.layout
index b343cbbbbd396db1ee2c93f11c5af557c19b6813..90a422a9f61234d69f5ddc5ca7b851374e43f34b 100644 (file)
--- a/lib/layouts/svprobth.layout
+++ b/lib/layouts/svprobth.layout
@@ -26,6 +26,8 @@
 
 Format 33
 Input svjour.inc
+NoStyle Chapter
+NoCounter chapter
 
 ClassOptions
        Other         probth