X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fachemso.layout;h=9f23ee9c829baacc544d518bafb22b89c3a04bb0;hb=c8c1c15631712d458e98b612ba8c049a7ae4d260;hp=6dcb56e3c3c9256ce0bf8684f6f0d4ba68571991;hpb=bbf287a3c603b40e41007be54872e939b996319d;p=lyx.git

diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout
index 6dcb56e3c3..9f23ee9c82 100644
--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@@ -4,7 +4,7 @@
 # textclass definition file for achemso 3.8 and 3.9
 # Author: Uwe Stöhr (uwestoehr@web.de)
 
-Format 68
+Format 98
 
 Columns				1
 Sides				1
@@ -38,6 +38,7 @@ Style Standard
 	Align			Block
 	AlignPossible	Block, Left, Right, Center
 	LabelType		No_Label
+	DocBookTag      para
 End
 
 Input stdcounters.inc
@@ -75,6 +76,9 @@ Style Title
 	  Tooltip		"Short title which will appear in the running header"
 	  InsertCotext	1
 	EndArgument
+	DocBookTag            title
+	DocBookTagType        paragraph
+	DocBookInInfo         maybe
 End
 
 Style Author
@@ -88,6 +92,12 @@ Style Author
 	  Family		Sans
 	  Size			Large
 	EndFont
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType block
+	# Don't merge with the previous, as the author name indicates a new author.
+	DocBookInInfo         always
 End
 
 Style Email
@@ -110,18 +120,38 @@ Style Affiliation
 	  Tooltip		"Short name which appears in the footer of the title page"
 	  InsertCotext	1
 	EndArgument
+	DocBookTag                        affiliation
+	DocBookWrapperTag                 author
+	DocBookWrapperMergeWithPrevious   true
+	DocBookItemTag                    orgname
+	DocBookItemTagType                paragraph
+	DocBookInInfo                     always
 End
 
 Style Alt_Affiliation
 	CopyStyle		Affiliation
 	LatexName		altaffiliation
 	TopSep			0.7
+	DocBookTag                        affiliation
+	DocBookAttr                       role='alternate'
+	DocBookWrapperTag                 author
+	DocBookWrapperMergeWithPrevious   true
+	DocBookItemTag                    orgname
+	DocBookItemTagType                paragraph
+	DocBookInInfo                     always
 End
 
 Style Also_Affiliation
 	CopyStyle		Affiliation
 	LatexName		alsoaffiliation
 	TopSep			0.5
+	DocBookTag                        affiliation
+	DocBookAttr                       role='also'
+	DocBookWrapperTag                 author
+	DocBookWrapperMergeWithPrevious   true
+	DocBookItemTag                    orgname
+	DocBookItemTagType                paragraph
+	DocBookInInfo                     always
 End
 
 Style Fax
@@ -131,6 +161,13 @@ Style Fax
 	LabelSep		xx
 	LabelType		Static
 	LabelString		"Fax:"
+	DocBookTag                        address
+	DocBookTagType                    paragraph
+	DocBookWrapperTag                 author
+	DocBookWrapperMergeWithPrevious   true
+	DocBookItemTag                    phone
+	DocBookItemTagType                paragraph
+	DocBookInInfo                     always
 End
 
 Style Phone
@@ -138,6 +175,13 @@ Style Phone
 	LatexName		phone
 	LabelString		"Phone:"
 	TopSep			0.5
+	DocBookTag                        address
+	DocBookTagType                    paragraph
+	DocBookWrapperTag                 author
+	DocBookWrapperMergeWithPrevious   true
+	DocBookItemTag                    fax
+	DocBookItemTagType                paragraph
+	DocBookInInfo                     always
 End
 
 Style Abbreviations
@@ -148,7 +192,7 @@ Style Abbreviations
 	Align			Left
 	LabelString		"Abbreviations:"
 	LabelFont
-	  Color			Blue
+	  Color			textlabel1
 	EndFont
 End
 
@@ -251,12 +295,17 @@ Style Acknowledgement
 	  Series		Bold
 	  Size			Large
 	EndFont
+	DocBookTag            para
+	DocBookWrapperTag     acknowledgements
 End
 
 Style SupplementalInfo
 	CopyStyle		Acknowledgement
 	LatexName		suppinfo
 	LabelString		"Supporting Information Available"
+	DocBookTag            para
+	DocBookWrapperTag     sidebar
+	DocBookWrapperMergeWithPrevious true
 End
 
 Style TOC_entry
@@ -264,6 +313,9 @@ Style TOC_entry
 	LatexName		tocentry
 	ParSep			0.3
 	LabelString		"Graphical TOC Entry"
+	DocBookTag            para
+	DocBookWrapperTag     sidebar
+	DocBookWrapperMergeWithPrevious true
 End
 
 InsetLayout Flex:Bibnote
@@ -297,9 +349,11 @@ InsetLayout Flex:Chemistry
 	  \usepackage[version=3]{mhchem}
 	EndPreamble
 	LabelFont
-	  Color			blue
+	  Color			textlabel1
 	EndFont
 	MultiPar		false
+	DocBookTag      phrase
+	DocBookAttr     role='chemistry'
 End
 
 InsetLayout Flex:Latin