X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdsections.inc;h=eddf34786df53510c127c17e2784ddf94d8a39f1;hb=ed5794d68bbfca0dd81b62887f76003405c5fb23;hp=a1ead7213721a530fb0a591faf1efab891595a6a;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc
index a1ead72137..eddf34786d 100644
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -1,180 +1,133 @@
 # Standard textclass definition file. Taken from initial LyX source code
 # Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
-# Transposed by Pascal André <andre@via.ecp.fr>
+# Transposed by Pascal André <andre@via.ecp.fr>
 # Heavily modifed and enhanced by several developers.
 
 # This include files contains all numbered sectionning-related
 # commands that are useful for article-like document classes, but not
 # for letters.
 
-# Part style definition
+Format 8
 Style Part
-  Margin		Dynamic
-  LatexType		Command
-  LatexName		part
-  NeedProtect		1
-  NextNoIndent          1
-  Labelsep		xxx
-  ParSkip               0.4
-  TopSep                4
-  BottomSep             4
-  ParSep                0.8
-  Align			Center         
-  Alignpossible         Center
-  LabelType             Static
-  LabelString		"Part #"
-
-  # standard font definition
-  Font 
-    Series              Bold
-    Size                Huge
-  EndFont
-
+	Category              Section
+	Margin                Dynamic
+	LabelString	          "Part \thepart"
+	LabelType	            Counter
+	TocLevel              0
+	LabelCounter	        part
+	LatexType             Command
+	LatexName             part
+	NeedProtect           1
+	NextNoIndent          1
+	Labelsep              xxx
+	ParSkip               0.4
+	TopSep                4
+	BottomSep             4
+	ParSep                0.8
+	Align                 Center
+	Alignpossible         Center
+	Font
+	  Series              Bold
+	  Size                Huge
+	EndFont
 End
-  
-
-# Chapter style definition
-Style Chapter
-  Margin                Static
-  LatexType             Command
-  LatexName             chapter
-  NeedProtect		1
-  NextNoIndent          1
-  ParSkip               0.4
-  TopSep                4
-  BottomSep             0.8
-  ParSep                0.8
-  Align                 Block
-  AlignPossible         Block, Left
-  LabelType             Counter_Chapter
-  LabelString		"Chapter "
-  LabelStringAppendix   "Appendix "
 
-  # standard font definition
-  Font 
-    Series              Bold
-    Size                Huge
-  EndFont
 
+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                 Block
+	OptionalArgs          1
+	Font
+	  Series              Bold
+	  Size                Huge
+	EndFont
 End
 
-# Section style definition
-Style Section
-  Margin		Dynamic
-  LatexType		Command
-  LatexName		section
-  NeedProtect		1
-  NextNoIndent		1
-  LabelSep		xxx
-  ParSkip		0.4
-  TopSep		1.3
-  BottomSep		0.7
-  ParSep		0.7
-  Align			Block
-  AlignPossible		Block, Left
-  LabelType		Counter_Section
-
-  # standard font definition
-  Font 
-    Series 		Bold
-    Size		Larger
-  EndFont
 
+Style Section
+	Category              Section
+	Margin                Dynamic
+	LabelType	            Counter
+	LabelCounter	        section
+	TocLevel              1
+	LatexType             Command
+	LatexName             section
+	NeedProtect           1
+	NextNoIndent          1
+	LabelSep              xxx
+	ParSkip               0.4
+	TopSep                1.3
+	BottomSep             0.7
+	ParSep                0.7
+	Align                 Block
+	OptionalArgs          1
+	Font
+	  Series              Bold
+	  Size                Larger
+	EndFont
 End
 
-# Subsection style definition
-Style Subsection
-  Margin		Dynamic
-  LatexType		Command
-  LatexName		subsection
-  NeedProtect		1
-  NextNoIndent		1
-  LabelSep		xxx
-  ParSkip		0.4
-  TopSep		0.9
-  BottomSep		0.5
-  ParSep		0.5
-  Align			Block
-  AlignPossible		Block, Left
-  LabelType		Counter_Subsection
-
-  # standard font definition
-  Font 
-    Series 		Bold
-    Size		Large
-  EndFont
 
+Style Subsection
+	CopyStyle             Section
+	LabelCounter	        subsection
+	TocLevel              2
+	LatexName             subsection
+	TopSep                0.9
+	BottomSep             0.5
+	ParSep                0.5
+	Font
+	  Series              Bold
+	  Size                Large
+	EndFont
 End
 
-# Subsubsection style definition
-Style Subsubsection
-  Margin		Dynamic
-  LatexType		Command
-  LatexName		subsubsection
-  NeedProtect		1
-  NextNoIndent		1
-  LabelSep		xxx
-  ParSkip		0.4
-  TopSep		0.7
-  BottomSep		0.4
-  ParSep		0.4
-  Align			Block
-  AlignPossible		Block, Left
-  LabelType		Counter_SubSubSection
-
-  # standard font definition
-  Font 
-    Series 		Bold
-    Size		Normal
-  EndFont
 
+Style Subsubsection
+	CopyStyle             Subsection
+	LabelCounter	        subsubsection
+	TocLevel              3
+	LatexName             subsubsection
+	TopSep                0.7
+	BottomSep             0.4
+	Font
+	  Series              Bold
+	  Size                Normal
+	EndFont
 End
 
-# Paragraph style definition
-Style Paragraph
-  Margin		Dynamic
-  LatexType		Command
-  LatexName		paragraph
-  NeedProtect		1
-  NextNoIndent		1
-  LabelSep		xxx
-  ParSkip		0.4
-  TopSep		0.4
-  BottomSep		0
-  ParSep		0.4
-  Align			Block
-  AlignPossible		Block, Left
-  LabelType		Counter_Paragraph
-
-  # standard font definition
-  Font 
-    Series 		Bold
-    Size		Normal
-  EndFont
 
+Style Paragraph
+	CopyStyle             Subsubsection
+	LabelCounter	        paragraph
+	TocLevel              4
+	LatexName             paragraph
+	TopSep                0.4
+	BottomSep             0
 End
 
-# Subparagraph style definition
-Style Subparagraph
-  Margin		Dynamic
-  LatexType		Command
-  LatexName		subparagraph
-  NeedProtect		1
-  NextNoIndent		0
-  LeftMargin		MM
-  LabelSep		xxx
-  ParSkip		0.4
-  TopSep		0.4
-  BottomSep		0
-  ParSep		0.4
-  Align			Block
-  AlignPossible		Block, Left
-  LabelType		Counter_SubParagraph
-
-  # standard font definition
-  Font 
-    Series 		Bold
-    Size		Normal
-  EndFont
 
+Style Subparagraph
+	CopyStyle             Paragraph
+	LabelCounter	        subparagraph
+	TocLevel              5
+	LatexName             subparagraph
+	NextNoIndent          0
+	LeftMargin            MM
 End
+
+Input numarticle.inc