X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Faa.layout;h=710d2b6d8a841eaa0440199953825b3d7d35eaff;hb=bbbd1820957f8a3584765eecc8533da6853a979f;hp=9d117627ea6d409d738a03ab3e1c01f87f471b91;hpb=e28625160a5078ffb37fc27ad3906edf5a73a31f;p=lyx.git

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 9d117627ea..710d2b6d8a 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -18,7 +18,7 @@
 # 2013-05-26  Updated for aa.cls version 8.2
 
 
-Format 45
+Format 104
 Columns		2
 Sides		2
 SecNumDepth	3
@@ -27,6 +27,11 @@ PageStyle	Plain
 
 # Pre-loaded packages
 Provides inputenc	1
+Provides natbib		1
+
+ClassOptions
+	Other		utf8
+End
 
 Style Standard
 	Category	MainText
@@ -38,6 +43,7 @@ Style Standard
 	Align		Block
 	AlignPossible	Block, Left, Right, Center
 	LabelType	No_Label
+	DocBookTag  para
 End
 
 Input stdinsets.inc
@@ -57,6 +63,7 @@ NoCounter subparagraph
 NoStyle Part
 NoCounter part
 NoStyle Abstract
+NoStyle Bibliography
 
 
 Style Subtitle
@@ -78,6 +85,8 @@ Style Subtitle
 	  Size		Larger
 	  Series	Bold
 	EndFont
+	DocBookTag            subtitle
+	DocBookInInfo         maybe
 End
 
 
@@ -96,6 +105,8 @@ Style Address
 	  Family	Roman
 	  Size		Small
 	EndFont
+	DocBookTag      address
+	DocBookInInfo   always
 End
 
 
@@ -119,6 +130,12 @@ Style Offprint
 	  Size		Small
 	  Shape		Slanted
 	EndFont
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperAttr    role='offprint'
+	DocBookWrapperTagType inline
+	DocBookInInfo         always
 End
 
 
@@ -142,10 +159,14 @@ Style Mail
 	  Size		Small
 	  Shape		Slanted
 	EndFont
+	DocBookTag      author
+	DocBookAttr     role='mail'
+	DocBookTagType  paragraph
+	DocBookInInfo   always
 End
 
 
-Style Acknowledgement
+Style Acknowledgments
 	Margin		First_Dynamic
 	LatexType	Environment
 	LatexName	acknowledgements
@@ -157,7 +178,7 @@ Style Acknowledgement
 	ParSep		0
 	Align		Block
 	LabelType	Static
-	LabelString	"Acknowledgements."
+	LabelString	"Acknowledgments."
 	LabelSep	M
 	Font
 	  Size		Small
@@ -166,6 +187,9 @@ Style Acknowledgement
 	  Size		Small
 	  Shape		Italic
 	EndFont
+	DocBookTag            para
+	DocBookWrapperTag     acknowledgements
+	DocBookSection        true
 End
 
 
@@ -174,6 +198,7 @@ Style Section
 	  Family	Sans
 	  Size		Large
 	EndFont
+	TocLevel 1
 End
 
 
@@ -184,6 +209,7 @@ Style Subsection
 	  Size		Normal
 	  Shape		Slanted
 	EndFont
+	TocLevel 2
 End
 
 
@@ -192,6 +218,7 @@ Style Subsubsection
 	  Series	Medium
 	  Size		Normal
 	EndFont
+	TocLevel 3
 End
 
 
@@ -204,6 +231,9 @@ Style Title
 	  Family	Sans
 	  Series	Bold
 	EndFont
+	DocBookTag      title
+	DocBookTagType  paragraph
+	DocBookInInfo   maybe
 End
 
 
@@ -215,6 +245,11 @@ Style Author
 	  Size		Large
 	  Series	Medium
 	EndFont
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType inline
+	DocBookInInfo         always
 End
 
 
@@ -227,6 +262,10 @@ Style Date
 	Font
 	  Size		Small
 	EndFont
+	DocBookTag      date
+	DocBookTagType  paragraph
+	DocBookInInfo   always
+    DocBookNoFontInside true
 End
 
 
@@ -246,10 +285,13 @@ InsetLayout "Flex:institutemark"
 	  Misc		No_Bar
 	EndFont
 	LabelFont
-	  Color		green
+	  Color		textlabel2
 	  Size		Small
 	EndFont
 	MultiPar	true
+	AllowedInLayouts
+	    Author
+	EndAllowedInLayouts
 End
 
 
@@ -279,6 +321,11 @@ Style Abstract_(unstructured)
 	  Series	Bold
 	  Size		Small
 	EndFont
+	DocBookTag         para
+	DocBookWrapperTag  abstract
+	DocBookWrapperAttr role='unstructured'
+	DocBookWrapperMergeWithPrevious  true
+	DocBookInInfo     always
 End
 
 
@@ -309,6 +356,11 @@ Style Abstract_(structured)
 	  LabelString	"Results"
 	  Tooltip	"Results of your work"
 	EndArgument
+	DocBookTag         para
+	DocBookWrapperTag  abstract
+	DocBookWrapperAttr role='structured'
+	DocBookWrapperMergeWithPrevious  true
+	DocBookInInfo      always
 End
 
 
@@ -339,14 +391,10 @@ Style Keywords
 	  Series	Bold
 	  Size		Small
 	EndFont
-End
-
-
-Style Bibliography
-	Align		Left
-	LabelFont
-	  Series	Bold
-	EndFont
+	DocBookTag         keyword
+	DocBookTagType     paragraph
+	DocBookWrapperTag  keywordset
+	DocBookInInfo      always
 End
 
 
@@ -355,8 +403,12 @@ InsetLayout Flex:Institute
 	LatexType	command
 	LatexName	inst
 	Font
-	  Color		blue
+	  Color		textlabel1
 	EndFont
+	ResetsFont      true
+	AllowedInLayouts
+	    Author
+	EndAllowedInLayouts
 End
 
 
@@ -366,8 +418,12 @@ InsetLayout Flex:E-Mail
 	LatexName	email
 	Font
 	  Family	Typewriter
-	  Color		blue
+	  Color		textlabel1
 	EndFont
+	ResetsFont      true
+	AllowedInLayouts
+	    Address
+	EndAllowedInLayouts
 End
 
 
@@ -391,5 +447,8 @@ InsetLayout "Flex:Email"
 	  Size		Small
 	EndFont
 	MultiPar	true
+	AllowedInLayouts
+	    Address
+	EndAllowedInLayouts
 End