layout files: backport Julien's fixes (that don't change strings) to branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39167 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout
index 0a796fadefb126f078f75b2bcedcade3d5027571..27f24281196599dda442ff95c7a92fe2d2efacfc 100644 (file)
--- a/lib/layouts/revtex4.layout
+++ b/lib/layouts/revtex4.layout
@@ -8,14 +8,18 @@
 #          Marc Mengel (RevTeX)
 #          Amir Karger (LyX v11.34 style modifications)
 #          Amir Karger (RevTeX 4 beta) 9/1999, 7/2000
-
+# Heavily modifed and enhanced by serveral developers.
 
 Format 35
-Columns                 1
-Sides                   1
-PageStyle               Headers
-Provides natbib-internal       1
-Provides url           1
+
+Columns                   1
+Sides                     1
+PageStyle                 Headers
+Provides natbib-internal  1
+Provides url              1
+
+SecNumDepth               4
+TocDepth                  3
 
 # Default textclass options. The user may need to modify this.
 ClassOptions
@@ -33,11 +37,12 @@ Preamble
         \definecolor{CYAN}{cmyk}{1,0,0,0}
         \definecolor{MAGENTA}{cmyk}{0,1,0,0}
         \definecolor{YELLOW}{cmyk}{0,0,1,0}
-        }
+       }
 EndPreamble
 
 
 Style Standard
+       Category              MainText
        Margin                Static
        LatexType             Paragraph
        LatexName             dummy
@@ -60,11 +65,8 @@ Style Section
        Align                 Center
        AlignPossible         Block, Center, Left
        Font
-         Series              Medium
          Shape               Smallcaps
-         Size                Large
        EndFont
-       TocLevel 1
 End
 
 
@@ -79,21 +81,17 @@ End
 
 Style Subsubsection
        Font
+         Series              Medium
          Shape               Italic
-         Size                Normal
        EndFont
-       TocLevel 3
 End
 
 
 Style Paragraph
-       TopSep                0.7
-       ParSep                0.4
        Font
+         Series              Medium
          Shape               Italic
-         Size                Normal
        EndFont
-       TocLevel 4
 End
 
 # then define the unumbered sections, based on the numbered ones.
@@ -111,6 +109,7 @@ Input stdstruct.inc
 
 
 Style Preprint
+       Category              FrontMatter
        Margin                Right_Address_Box
        LatexType             Command
        InTitle               1
@@ -143,19 +142,17 @@ Style Date
        LabelString           "Date:"
        LabelFont
          Shape               Italic
-         Size                Large
        EndFont
 End
 
 
 Style Affiliation
+       Category              FrontMatter
        Margin                Dynamic
        LatexType             Command
        InTitle               1
        LatexName             affiliation
        ParSkip               0.4
-#  BottomSep            1.5
-#  ParSep               1.5
        Align                 Center
        AlignPossible         Block, Left, Right, Center
        LabelType             Static
@@ -224,31 +221,30 @@ Style Abstract
        InTitle               1
        ItemSep               0.2
        ParSep                0.3
-       LabelFont
-         Size                Large
-       EndFont
 End
 
 
 Style Acknowledgments
+       Category              BackMatter
        LatexType             Environment
        LatexName             acknowledgments
        ParIndent             MM
        ParSkip               0.4
+       TopSep                0.7
        Align                 Block
        AlignPossible         Block, Left, Right, Center
        LabelType             Centered_Top_Environment
        LabelString           "acknowledgments"
        LabelBottomSep        0.5
        LabelFont
-         Series              Medium
-         Shape               Smallcaps
+         Series              Bold
          Size                Large
        EndFont
 End
 
 
 Style PACS
+       Category              FrontMatter
        Margin                Dynamic
        LatexType             Command
        InTitle               1

diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc
index 87f322593e84e906ce9e36531f3b2cf83766d8fd..6cbc3fa5e8787e797a3547893d1132ee5a6afbfb 100644 (file)
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -27,6 +27,7 @@ Style Part
        ParSep                0.8
        Align                 Center
        Alignpossible         Center
+       OptionalArgs          1
        Font
          Series              Bold
          Size                Huge

diff --git a/lib/layouts/stdstarsections.inc b/lib/layouts/stdstarsections.inc
index 875e2a5146738aa4b1dc82670bfd0c30f0bbd987..f984206b067b748366427e80fb7eb93083af6b51 100644 (file)
--- a/lib/layouts/stdstarsections.inc
+++ b/lib/layouts/stdstarsections.inc
@@ -11,76 +11,77 @@
 
 Format 35
 Style Part*
-       CopyStyle             Part
-       Category              Unnumbered
-       Margin                Static
-       LatexName             part*
-       LabelType             No_Label
-       LabelCounter          ""
+       CopyStyle       Part
+       Category        Unnumbered
+       Margin          Static
+       LatexName       part*
+       LabelType       No_Label
+       LabelCounter    ""
+       OptionalArgs    0
 End
 
 
 Style Chapter*
-       CopyStyle             Chapter
-       Category              Unnumbered
-       Margin                Static
-       LatexName             chapter*
-       LabelType             No_Label
-       LabelCounter          ""
-       OptionalArgs          0
+       CopyStyle       Chapter
+       Category        Unnumbered
+       Margin          Static
+       LatexName       chapter*
+       LabelType       No_Label
+       LabelCounter    ""
+       OptionalArgs    0
 End
 
 
 Style Section*
-       CopyStyle             Section
-       Category              Unnumbered
-       Margin                Static
-       LatexName             section*
-       LabelType             No_Label
-       LabelCounter          ""
-       OptionalArgs          0
+       CopyStyle       Section
+       Category        Unnumbered
+       Margin          Static
+       LatexName       section*
+       LabelType       No_Label
+       LabelCounter    ""
+       OptionalArgs    0
 End
 
 
 Style Subsection*
-       CopyStyle             Subsection
-       Category              Unnumbered
-       Margin                Static
-       LatexName             subsection*
-       LabelType             No_Label
-       LabelCounter          ""
-       OptionalArgs          0
+       CopyStyle       Subsection
+       Category        Unnumbered
+       Margin  Static
+       LatexName       subsection*
+       LabelType       No_Label
+       LabelCounter    ""
+       OptionalArgs    0
 End
 
 
 Style Subsubsection*
-       CopyStyle             Subsubsection
-       Category              Unnumbered
-       Margin                Static
-       LatexName             subsubsection*
-       LabelType             No_Label
-       LabelCounter          ""
-       OptionalArgs          0
+       CopyStyle       Subsubsection
+       Category        Unnumbered
+       Margin          Static
+       LatexName       subsubsection*
+       LabelType       No_Label
+       LabelCounter    ""
+       OptionalArgs    0
 End
 
 
 Style Paragraph*
-       CopyStyle             Paragraph
-       Category              Unnumbered
-       Margin                Static
-       LatexName             paragraph*
-       LabelType             No_Label
-       LabelCounter          ""
-       OptionalArgs          0
+       CopyStyle       Paragraph
+       Category        Unnumbered
+       Margin          Static
+       LatexName       paragraph*
+       LabelType       No_Label
+       LabelCounter    ""
+       OptionalArgs    0
 End
 
 
 Style Subparagraph*
-       CopyStyle             Subparagraph
-       Category              Unnumbered
-       Margin                Static
-       LatexName             subparagraph*
-       LabelType             No_Label
-       LabelCounter          ""
-       OptionalArgs          0
+       CopyStyle       Subparagraph
+       Category        Unnumbered
+       Margin          Static
+       LatexName       subparagraph*
+       LabelType       No_Label
+       LabelCounter    ""
+       OptionalArgs    0
 End

diff --git a/lib/layouts/tufte-handout.layout b/lib/layouts/tufte-handout.layout
index 35bcd00ffb1771652e47971082fcfdd09cec2348..8378e29812798e4bc837be820ed92c4a44bd0363 100644 (file)
--- a/lib/layouts/tufte-handout.layout
+++ b/lib/layouts/tufte-handout.layout
@@ -24,7 +24,6 @@ Style Part
        Margin          Dynamic
        LabelType       No_Label
        TocLevel        0
-       LabelCounter    part
        LatexType       Command
        LatexName       part
        NeedProtect     1
@@ -36,6 +35,7 @@ Style Part
        ParSep          0.8
        Align           Center
        Alignpossible   Center
+       OptionalArgs    1
        Font
          Series        Bold
          Size          Huge