From: Richard Heck <rgheck@comcast.net>
Date: Tue, 8 Feb 2011 23:02:13 +0000 (+0000)
Subject: Fix bug #7289. Confusingly, svjour.inc declares "NoStyle Chapter", and then
X-Git-Tag: 2.0.0~822
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6b35c79b40a47909e3dd9cc6a096729b0e2fa0e5;p=features.git

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 2c6c7a9eaa..595b0416fa 100644
--- 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 ef24580f7b..ac374c3d33 100644
--- 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 332293a6fa..6d04c864c2 100644
--- 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 19262847fa..c3c37364ea 100644
--- 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 7ec67dffd0..4806f14b2d 100644
--- 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 5cb42dc600..4e6472fe6f 100644
--- 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 b343cbbbbd..90a422a9f6 100644
--- 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