X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Frevtex4.layout;h=cc4429c4b0c9cb1a5f9f66632b97d1e11dfdf4d2;hb=b4dcad83b2f6e3fce28b4e04cc1abc8d654f9bfe;hp=1478fa0c8c9ba1fc0898f12e478cdd2bc4728b70;hpb=ead5df1a204d1351a86523562039ac0ef3b60294;p=lyx.git

diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout
index 1478fa0c8c..cc4429c4b0 100644
--- a/lib/layouts/revtex4.layout
+++ b/lib/layouts/revtex4.layout
@@ -1,5 +1,6 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[revtex4,natbib.sty,revsymb.sty]{article (REVTeX 4)}
+#  \DeclareLaTeXClass[revtex4,natbib.sty,revsymb.sty]{REVTeX (V. 4)}
+#  \DeclareCategory{Articles}
 # RevTeX 4 textclass definition file. Based on:
 # AMS-Article textclass definition file. Taken from initial LyX source code
 # and from the Article textclass definition file, following the AMS sample
@@ -10,7 +11,7 @@
 #          Amir Karger (RevTeX 4 beta) 9/1999, 7/2000
 # Heavily modifed and enhanced by serveral developers.
 
-Format 35
+Format 60
 
 Columns                   1
 Sides                     1
@@ -18,6 +19,9 @@ PageStyle                 Headers
 Provides natbib-internal  1
 Provides url              1
 
+SecNumDepth               4
+TocDepth                  3
+
 # Default textclass options. The user may need to modify this.
 ClassOptions
 	Other                 "aps,manuscript"
@@ -39,6 +43,7 @@ EndPreamble
 
 
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -61,40 +66,24 @@ Style Section
 	Align                 Center
 	AlignPossible         Block, Center, Left
 	Font
-	  Series              Medium
 	  Shape               Smallcaps
-	  Size                Large
-	EndFont
-	TocLevel              1
-End
-
-
-Style Subsection
-	Font
-	  Series              Bold
-	  Size                Normal
 	EndFont
-	TocLevel              2
 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.
@@ -112,6 +101,7 @@ Input stdstruct.inc
 
 
 Style Preprint
+	Category              FrontMatter
 	Margin                Right_Address_Box
 	LatexType             Command
 	InTitle               1
@@ -131,25 +121,17 @@ Style Title
 End
 
 
-Style Author
-	Font
-	  Size                Large
-	  Shape               Smallcaps
-	EndFont
-End
-
-
 Style Date
 	LabelType             Static
 	LabelString           "Date:"
 	LabelFont
 	  Shape               Italic
-	  Size                Large
 	EndFont
 End
 
 
 Style Affiliation
+	Category              FrontMatter
 	Margin                Dynamic
 	LatexType             Command
 	InTitle               1
@@ -167,13 +149,29 @@ Style Affiliation
 End
 
 
-Style AltAffiliation
+Style Affiliation_(alternate)
 	CopyStyle             Affiliation
 	PassThru              1
 	ParbreakIsNewline     1
 	LatexName             altaffiliation
-	OptionalArgs          1
-	LabelString           "AltAffiliation"
+	Argument 1
+		LabelString   "Alternate Affiliation Option"
+		Tooltip       "Optional argument to the altaffiliation command"
+	EndArgument
+	LabelString           "Affiliation (alternate):"
+End
+
+
+Style Affiliation_(none)
+	CopyStyle             Affiliation
+	KeepEmpty             1
+	LabelString           "No affiliation"
+	LatexName             noaffiliation%
+End
+
+
+Style AltAffiliation
+	ObsoletedBy           Affiliation_(alternate)
 End
 
 
@@ -186,6 +184,13 @@ Style Address
 End
 
 
+Style Collaboration
+	CopyStyle             Affiliation
+	LatexName             collaboration
+	LabelString           "Collaboration:"
+End
+
+
 Style Thanks
 	CopyStyle             Affiliation
 	LatexName             thanks
@@ -198,7 +203,10 @@ Style Author_Email
 	PassThru              1
 	ParbreakIsNewline     1
 	LatexName             email
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Electronic Address Option|s"
+		Tooltip       "Optional argument to the email command"
+	EndArgument
 	LabelString           "Electronic Address:"
 	TextFont
 	  Family              Typewriter
@@ -214,7 +222,10 @@ Style Author_URL
 	PassThru              1
 	ParbreakIsNewline     1
 	LatexName             homepage
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Author URL Option"
+		Tooltip       "Optional argument to the homepage command"
+	EndArgument
 	LabelString           "URL:"
 End
 
@@ -223,31 +234,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"
+	LabelType             Centered
+	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