X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Frevtex4-x.inc;h=5ef0e9d78a89c18765be5fdef14b636d138f06ee;hb=051c5f27284f00c20e95c5732bcfb04632c7cb18;hp=c818eafdbcd7d88ade4a4226f0b86f91a00c0f08;hpb=1e2885fe81a71f1b6d983d0517a1d77de5943803;p=lyx.git

diff --git a/lib/layouts/revtex4-x.inc b/lib/layouts/revtex4-x.inc
index c818eafdbc..5ef0e9d78a 100644
--- a/lib/layouts/revtex4-x.inc
+++ b/lib/layouts/revtex4-x.inc
@@ -13,7 +13,7 @@
 #     - add support for \onlinecite{}
 
 
-Format 82
+Format 99
 
 Input stdclass.inc
 Input numrevtex.inc
@@ -32,6 +32,7 @@ Style Section
 	Font
 	  Shape			Smallcaps
 	EndFont
+	TocLevel 1
 End
 
 
@@ -39,6 +40,7 @@ Style Subsubsection
 	Font
 	  Shape			Italic
 	EndFont
+	TocLevel 3
 End
 
 
@@ -46,6 +48,7 @@ Style Paragraph
 	Font
 	  Shape			Italic
 	EndFont
+	TocLevel 4
 End
 
 
@@ -76,9 +79,14 @@ Style Affiliation
 	EndFont
 	LabelString		"Affiliation:"
 	LabelFont
-	  Color			Green
+	  Color			textlabel2
 	  Series		Bold	
 	EndFont
+	DocBookTag                        address
+	DocBookTagType                    paragraph
+	DocBookWrapperTag                 author
+	DocBookWrapperMergeWithPrevious   true
+	DocBookInInfo                     always
 End
 
 
@@ -91,6 +99,12 @@ Style Affiliation_(alternate)
 	  Tooltip		"Optional argument to the altaffiliation command"
 	EndArgument
 	PassThru		1
+	DocBookTag                        address
+	DocBookAttr                       role='alternate'
+	DocBookTagType                    paragraph
+	DocBookWrapperTag                 author
+	DocBookWrapperMergeWithPrevious   true
+	DocBookInInfo                     always
 End
 
 
@@ -123,6 +137,12 @@ Style Author_Email
 	TextFont
 	  Family		Roman
 	EndFont
+	DocBookTag            email
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious  true
+	DocBookInInfo         always
 End
 
 
@@ -135,6 +155,12 @@ Style Author_URL
 	  Tooltip		"Optional argument to the homepage command"
 	EndArgument
 	PassThru		1
+	DocBookTag            uri
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious  true
+	DocBookInInfo         always
 End
 
 
@@ -161,9 +187,13 @@ Style Keywords
 	LabelSep		M
 	LabelString		"Keywords:"
 	LabelFont
-	  Color			Green
+	  Color			textlabel2
 	  Series		Bold
 	EndFont
+	DocBookTag          keyword
+	DocBookTagType      paragraph
+	DocBookWrapperTag   keywordset
+	DocBookInInfo       always
 End
 
 
@@ -171,6 +201,16 @@ Style PACS
 	CopyStyle		Keywords
 	LatexName		pacs
 	LabelString		"PACS numbers:"
+	DocBookTag            subjectset
+	DocBookAttr           role='pacs'
+	DocBookTagType        block
+	DocBookItemWrapperTag      subject
+	DocBookItemWrapperTagType  paragraph
+	DocBookItemTag        subjectterm
+	DocBookItemTagType    inline
+	DocBookWrapperTag     NONE
+	DocBookWrapperAttr    ""
+	DocBookInInfo         always
 End
 
 
@@ -184,13 +224,22 @@ Style Preprint
 	BottomSep		1.5
 	ParSep			1.5
 	Align			Left
+	DocBookWrapperTag   cover
+	DocBookWrapperAttr  role='preprint'
+	DocBookTag          para
+	DocBookInInfo       always
 End
 
 
 Style Thanks
+	# TODO: This style has a misleading name, innit?
 	CopyStyle		Affiliation
 	LatexName		thanks
 	LabelString		"Title footnote:"
+	DocBookTag            subtitle
+	DocBookAttr           role='footnote'
+	DocBookWrapperTag     NONE
+	DocBookInInfo         maybe
 End
 
 
@@ -223,6 +272,9 @@ Style Acknowledgments
 	  Size			Larger
 	EndFont
 	TopSep			0.7
+	DocBookTag            para
+	DocBookWrapperTag     acknowledgements
+	DocBookSection        true
 End
 
 
@@ -345,7 +397,7 @@ InsetLayout Flex:Surname
 	  # from the surrounding environment
 	EndFont
 	LabelFont
-	  Color			green
+	  Color			textlabel2
 	  Size			Small
 	EndFont
 	ResetsFont true