X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdsections.inc;h=e752ee197a02bb7f259ad5b4f0704ce7af6aa05c;hb=f8f9eec358c5dcd45665defed13d51c0b304fb8e;hp=f3cbc605f134ad2fea0eb87c33bad025b8bb7eb5;hpb=062db8b67960a544687179188a861ad8de5defa3;p=lyx.git

diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc
index f3cbc605f1..e752ee197a 100644
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -3,22 +3,24 @@
 # Transposed by Pascal André <andre@via.ecp.fr>
 # Heavily modifed and enhanced by several developers.
 
-# This include files contains all numbered sectionning-related
+# This include file contains all numbered sectionning-related
 # commands that are useful for article-like document classes, but not
 # for letters.
 
-Format 11
+Format 68
+
 Style Part
-	Category              Section
+	Category              Sectioning
 	Margin                Dynamic
-	LabelString	          "Part \thepart"
-	LabelType	            Counter
-	TocLevel              0
-	LabelCounter	        part
+	LabelString           "Part \thepart"
+	LabelType             Static
+	TocLevel              -1
+	LabelCounter          part
 	LatexType             Command
 	LatexName             part
 	NeedProtect           1
 	NextNoIndent          1
+	ToggleIndent          Never
 	Labelsep              xxx
 	ParSkip               0.4
 	TopSep                4
@@ -26,74 +28,86 @@ Style Part
 	ParSep                0.8
 	Align                 Center
 	Alignpossible         Center
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The part as it appears in the table of contents/running headers"
+		InsertCotext  1
+		IsTocCaption  1
+	EndArgument
 	Font
 	  Series              Bold
 	  Size                Huge
 	EndFont
 	HTMLTag               h1
-	HTMLAttr              class='part'
 End
 
 
 Style Chapter
 	Margin                Static
-	Category              Section
-	LabelString	          "Chapter \thechapter"
+	Category              Sectioning
+	LabelString           "Chapter \thechapter"
 	LabelStringAppendix   "Appendix \thechapter"
-	LabelType	            Counter
-	LabelCounter	        chapter
+	LabelType             Above
+	LabelCounter          chapter
 	TocLevel              0
 	LatexType             Command
 	LatexName             chapter
 	NeedProtect           1
 	NextNoIndent          1
+	ToggleIndent          Never
 	ParSkip               0.4
-	TopSep                4
+	TopSep                2
 	BottomSep             0.8
 	ParSep                0.8
 	Align                 Block
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The chapter as it appears in the table of contents/running headers"
+		InsertCotext  1
+		IsTocCaption  1
+	EndArgument
 	Font
 	  Series              Bold
 	  Size                Huge
 	EndFont
 	HTMLTag               h1
-	HTMLAttr              class='chapter'
 End
 
 
 Style Section
-	Category              Section
+	Category              Sectioning
 	Margin                Dynamic
-	LabelType	            Counter
-	LabelCounter	        section
+	LabelType             Static
+	LabelCounter          section
 	TocLevel              1
 	LatexType             Command
 	LatexName             section
 	NeedProtect           1
 	NextNoIndent          1
+	ToggleIndent          Never
 	LabelSep              xxx
 	ParSkip               0.4
 	TopSep                1.3
 	BottomSep             0.7
 	ParSep                0.7
 	Align                 Block
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The section as it appears in the table of contents/running headers"
+		InsertCotext  1
+		IsTocCaption  1
+	EndArgument
 	Font
 	  Series              Bold
 	  Size                Larger
 	EndFont
 	HTMLTag               h2
-	HTMLAttr              class='section'
-	HTMLStyle
-		h2.section { font-family: sans-serif; }
-	EndHTMLStyle
 End
 
 
 Style Subsection
 	CopyStyle             Section
-	LabelCounter	        subsection
+	LabelCounter          subsection
 	TocLevel              2
 	LatexName             subsection
 	TopSep                0.9
@@ -104,13 +118,12 @@ Style Subsection
 	  Size                Large
 	EndFont
 	HTMLTag               h3
-	HTMLAttr              class='subsection'
 End
 
 
 Style Subsubsection
 	CopyStyle             Subsection
-	LabelCounter	        subsubsection
+	LabelCounter          subsubsection
 	TocLevel              3
 	LatexName             subsubsection
 	TopSep                0.7
@@ -120,31 +133,29 @@ Style Subsubsection
 	  Size                Normal
 	EndFont
 	HTMLTag               h4
-	HTMLAttr              class='subsubsection'
 End
 
 
 Style Paragraph
 	CopyStyle             Subsubsection
-	LabelCounter	        paragraph
+	LabelCounter          paragraph
 	TocLevel              4
 	LatexName             paragraph
 	TopSep                0.4
 	BottomSep             0
-	HTMLTag               span
-	HTMLAttr              class='paragraph'
+	HTMLTag               h5
 End
 
 
 Style Subparagraph
 	CopyStyle             Paragraph
-	LabelCounter	        subparagraph
+	LabelCounter          subparagraph
 	TocLevel              5
 	LatexName             subparagraph
 	NextNoIndent          0
 	LeftMargin            MM
-	HTMLTag               span
-	HTMLAttr              class='subparagraph'
+	HTMLTag               h6
 End
 
+Input stdrefprefix.inc
 Input numarticle.inc