Merge branch 'master' into features/latexargs

[lyx.git] / lib / layouts / stdsections.inc

diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc
index f04b2b6527ab59197d7f88b2a250ebb4d706734a..3c7167d7eec23f1bfe489bdfbd8978a7aa483493 100644 (file)
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -3,18 +3,19 @@
 # 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 6
+Format 40
+
 Style Part
        Category              Section
        Margin                Dynamic
-       LabelString               "Part \thepart"
-       LabelType                   Counter
+       LabelString           "Part \thepart"
+       LabelType             Counter
        TocLevel              0
-       LabelCounter            part
+       LabelCounter          part
        LatexType             Command
        LatexName             part
        NeedProtect           1
@@ -26,20 +27,26 @@ Style Part
        ParSep                0.8
        Align                 Center
        Alignpossible         Center
+       Argument 1
+               LabelString   "Short Title"
+               Shortcut      S
+               Tooltip       "The Part as it appears in the TOC"
+       EndArgument
        Font
          Series              Bold
          Size                Huge
        EndFont
+       HTMLTag               h1
 End
 
 
 Style Chapter
        Margin                Static
        Category              Section
-       LabelString               "Chapter \thechapter"
+       LabelString           "Chapter \thechapter"
        LabelStringAppendix   "Appendix \thechapter"
-       LabelType                   Counter
-       LabelCounter            chapter
+       LabelType             Counter
+       LabelCounter          chapter
        TocLevel              0
        LatexType             Command
        LatexName             chapter
@@ -50,19 +57,24 @@ Style Chapter
        BottomSep             0.8
        ParSep                0.8
        Align                 Block
-       OptionalArgs          1
+       Argument 1
+               LabelString   "Short Title"
+               Shortcut      S
+               Tooltip       "The Chapter as it appears in the TOC"
+       EndArgument
        Font
          Series              Bold
          Size                Huge
        EndFont
+       HTMLTag               h1
 End
 
 
 Style Section
        Category              Section
        Margin                Dynamic
-       LabelType                   Counter
-       LabelCounter            section
+       LabelType             Counter
+       LabelCounter          section
        TocLevel              1
        LatexType             Command
        LatexName             section
@@ -74,17 +86,22 @@ Style Section
        BottomSep             0.7
        ParSep                0.7
        Align                 Block
-       OptionalArgs          1
+       Argument 1
+               LabelString   "Short Title"
+               Shortcut      S
+               Tooltip       "The Section as it appears in the TOC"
+       EndArgument
        Font
          Series              Bold
          Size                Larger
        EndFont
+       HTMLTag               h2
 End
 
 
 Style Subsection
        CopyStyle             Section
-       LabelCounter            subsection
+       LabelCounter          subsection
        TocLevel              2
        LatexName             subsection
        TopSep                0.9
@@ -94,12 +111,13 @@ Style Subsection
          Series              Bold
          Size                Large
        EndFont
+       HTMLTag               h3
 End
 
 
 Style Subsubsection
        CopyStyle             Subsection
-       LabelCounter            subsubsection
+       LabelCounter          subsubsection
        TocLevel              3
        LatexName             subsubsection
        TopSep                0.7
@@ -108,12 +126,13 @@ Style Subsubsection
          Series              Bold
          Size                Normal
        EndFont
+       HTMLTag               h4
 End
 
 
 Style Paragraph
        CopyStyle             Subsubsection
-       LabelCounter            paragraph
+       LabelCounter          paragraph
        TocLevel              4
        LatexName             paragraph
        TopSep                0.4
@@ -123,11 +142,12 @@ End
 
 Style Subparagraph
        CopyStyle             Paragraph
-       LabelCounter            subparagraph
+       LabelCounter          subparagraph
        TocLevel              5
        LatexName             subparagraph
        NextNoIndent          0
        LeftMargin            MM
 End
 
+Input stdrefprefix.inc
 Input numarticle.inc