X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fapax.inc;h=4309d69db8cc7fb32439dd64eb577dbc43831d9d;hb=8d0d3ea0905172b4a1fba7fbfadba83ff61671c6;hp=e63a518eb974de42c5f1d0e688add02407ec1bd9;hpb=b9c1fe1bacf09c1b511c7a8e4bbbefe325f048a7;p=lyx.git

diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc
index e63a518eb9..4309d69db8 100644
--- a/lib/layouts/apax.inc
+++ b/lib/layouts/apax.inc
@@ -2,7 +2,7 @@
 # Author: Jacob Bishop <bishop.jacob@gmail.com> based on the apa 
 # layout written by Randy Gobbel.
 
-Format 82
+Format 89
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -31,6 +31,7 @@ Style Standard
 	Align                 Block
 	AlignPossible         Block, Left, Right, Center
 	LabelType             No_Label
+	DocBookTag            para
 End
 
 
@@ -44,6 +45,9 @@ Style Title
 	EndFont
 	Align                 Center
 	HTMLTitle             true
+	DocBookTag            title
+	DocBookTagType        paragraph
+	DocBookInInfo         maybe
 End
 
 
@@ -67,6 +71,9 @@ Style ShortTitle
 	  Size                Small
 	  Shape               Up
 	EndFont
+	DocBookTag            titleabbrev
+	DocBookTagType        paragraph
+	DocBookInInfo         maybe
 End
 
 
@@ -83,6 +90,11 @@ Style Author
 	  Shape               Italic
 	  Size                Small
 	EndFont
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType inline
+	DocBookInInfo         always
 End
 
 
@@ -142,6 +154,10 @@ Style LeftHeader
 	  Series              Bold
 	  Size                Small
 	EndFont
+	DocBookTag            authorinitials
+	DocBookAttr           role='left-header'
+	DocBookTagType        paragraph
+	DocBookInInfo         maybe
 End
 
 
@@ -164,6 +180,12 @@ Style Affiliation
 	  Series              Bold
 	  Size                Small
 	EndFont
+	DocBookTag                        affiliation
+	DocBookWrapperTag                 author
+	DocBookWrapperMergeWithPrevious   true
+	DocBookItemTag                    orgname
+	DocBookItemTagType                paragraph
+	DocBookInInfo                     always
 End
 
 Style TwoAffiliations
@@ -244,6 +266,11 @@ Style Abstract
 	  Series              Bold
 	  Size                Small
 	EndFont
+	DocBookAbstract       true
+	DocBookInInfo         always
+	DocBookWrapperTag     abstract
+	DocBookWrapperMergeWithPrevious    true
+	DocBookTag            para
 End
 
 Style Keywords
@@ -268,6 +295,10 @@ Style Keywords
 	  Size                Small
 	  Shape               Italic
 	EndFont
+	DocBookTag          keyword
+	DocBookTagType      paragraph
+	DocBookWrapperTag   keywordset
+	DocBookInInfo       always
 End
 
 Style AuthorNote
@@ -295,6 +326,9 @@ Style AuthorNote
 	  Series              Bold
 	  Size                Small
 	EndFont
+	DocBookTag            para
+	DocBookWrapperTag     acknowledgements
+	DocBookSection        true
 End
 
 
@@ -522,6 +556,9 @@ Style Enumerate
 			Color latex
 		EndFont
 	EndArgument
+	DocBookTag            orderedlist
+	DocBookItemTag        listitem
+	DocBookItemInnerTag   para
 End
 
 
@@ -579,6 +616,9 @@ Style Course
 	  Size                Small
 	  Shape               Italic
 	EndFont
+	DocBookTag            releaseinfo
+	DocBookAttr           role='course'
+	DocBookInInfo         always
 End
 
 
@@ -599,7 +639,14 @@ Style addORCIDlink
 	  LabelString         "Author-name"
 	  Tooltip             ORCID
 	  Mandatory           1
+	  DocBookTag          phrase
+	  DocBookAttr         role='author-name'
 	EndArgument
+	# TODO: for DocBook, this won't work outside the preamble.
+	DocBookTag            personblurb
+	DocBookAttr           role='orcid'
+	DocBookTagType        paragraph
+	DocBookInInfo         maybe
 End