X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fiucr.layout;h=ca9cf7207b1e89a5a18984f2ee2a5b22a45e7e8b;hb=2841a1c06315edb7dd3a264746c093ee4c1a7c9f;hp=e62a71e6110e992414e002a67e37f05178d9c9c6;hpb=1ed5aa3a3e4d51a21bdd558958846e669a21ccf9;p=lyx.git

diff --git a/lib/layouts/iucr.layout b/lib/layouts/iucr.layout
index e62a71e611..ca9cf7207b 100644
--- a/lib/layouts/iucr.layout
+++ b/lib/layouts/iucr.layout
@@ -5,7 +5,7 @@
 # Author: Uwe Stöhr (uwestoehr@web.de)
 # IUCr LaTeX files can be downloaded from ftp://ftp.iucr.org/templates/latex/
 
-Format 80
+Format 100
 
 Columns				1
 Sides				1
@@ -27,6 +27,7 @@ Style Standard
 	Align			Block
 	AlignPossible		Block, Left, Right, Center
 	LabelType		No_Label
+	DocBookTag      para
 End
 
 Input stdtitle.inc
@@ -47,6 +48,7 @@ Style Section
 	LabelString		\thesection.
 	LabelStringAppendix	\thesection
 	Align			Center
+	TocLevel 1
 End
 
 Style Subsection
@@ -55,6 +57,7 @@ Style Subsection
 	  Shape			Italic
 	  Size			Normal
 	EndFont
+	TocLevel 2
 End
 
 Style Subsubsection
@@ -62,6 +65,7 @@ Style Subsubsection
 	Font
 	  Shape			Italic
 	EndFont
+	TocLevel 3
 End
 
 Style "Short Title"
@@ -70,6 +74,7 @@ Style "Short Title"
 	Font
 	  Size			Small
 	EndFont
+	DocBookTag      titleabbrev
 End
 
 InsetLayout "Flex:City"
@@ -89,7 +94,7 @@ InsetLayout "Flex:City"
 	  Misc			No_Bar
 	EndFont
 	LabelFont
-	  Color			green
+	  Color			textlabel2
 	  Size			Small
 	EndFont
 End
@@ -116,16 +121,19 @@ Style "Main Author"
 	Argument 1
 	  LabelString		"Affiliation Key"
 	  Tooltip		"Affiliation key of the author"
+	  # DocBookTag    othername
 	EndArgument
 	Argument 2
 	  Mandatory		1
 	  LabelString		"Forename"
 	  Tooltip		"Forename"
+	  # DocBookTag    firstname
 	EndArgument
 	Argument 3
 	  Mandatory		1
 	  LabelString		"Surname"
 	  Tooltip		"Surname"
+	  # DocBookTag    surname
 	EndArgument
 	Argument 4
 	  Mandatory		1
@@ -134,11 +142,18 @@ Style "Main Author"
 	  Font
 	    Shape		Italic
 	  EndFont
+	  # DocBookTag    email
 	EndArgument
 	BottomSep		0.5
 	ParSkip			0.4
 	Align			Center
 	LabelType		No_Label
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType inline
+	DocBookInInfo         always
+	# TODO: a lot of information is available, but the email would be output in the <personname> tag, and that does not make sense. The two first arguments should be grouped in <personname>, the rest must live outside <personname>.
 End
 
 Style "Co Author"
@@ -168,8 +183,11 @@ Style "Short Author"
 	LabelSep		xx
 	LabelFont
 	  Series		Bold
-	  Color			Green
+	  Color			textlabel2
 	EndFont
+	DocBookInInfo   always
+	DocBookTag      authorinitials
+	DocBookWrapperTag     NONE
 End
 
 Style Affiliation
@@ -186,7 +204,7 @@ Style Affiliation
 	EndFont
 	LabelFont
 	  Series		Bold
-	  Color			Green
+	  Color			textlabel2
 	  Shape			Up
 	EndFont
 End
@@ -195,6 +213,10 @@ Style Keyword
 	CopyStyle		"Short Author"
 	LatexName		keyword
 	LabelString		"Keyword:"
+	DocBookTag         keyword
+	DocBookTagType     paragraph
+	DocBookWrapperTag  keywordset
+	DocBookInInfo      always
 End
 
 Style Vita
@@ -225,15 +247,18 @@ Style Synopsis
   LabelString			"Synopsis"
   Align				Left
   AlignPossible			Left
+  DocBookAttr       role='synopsis'
 End
 
-Style Acknowledgements
+Style Acknowledgments
   CopyStyle			"Short Author"
   LatexName			ack
   InTitle			0
-  LabelString			"Acknowledgements:"
+  LabelString			"Acknowledgments:"
   Category			BackMatter
   TopSep			0.7
+  DocBookTag            	para
+  DocBookWrapperTag     	acknowledgements
 End
 
 Style References
@@ -266,6 +291,8 @@ Style References
     LabelString			"Reference"
     Mandatory			1
     AutoInsert			1
+	DocBookTag          bibliomixed
   EndArgument
   Align				Left
+  DocBookTag        bibliography
 End