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

diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout
index b585f06d25..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
@@ -148,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
 
 
@@ -167,6 +184,13 @@ Style Address
 End
 
 
+Style Collaboration
+	CopyStyle             Affiliation
+	LatexName             collaboration
+	LabelString           "Collaboration:"
+End
+
+
 Style Thanks
 	CopyStyle             Affiliation
 	LatexName             thanks
@@ -179,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
@@ -195,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
 
@@ -216,7 +246,7 @@ Style Acknowledgments
 	TopSep                0.7
 	Align                 Block
 	AlignPossible         Block, Left, Right, Center
-	LabelType             Centered_Top_Environment
+	LabelType             Centered
 	LabelString           "Acknowledgments"
 	LabelBottomSep        0.5
 	LabelFont