DocBook: implement APA.

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index f8885100db4bb2de4b82c82031084df0b66e4404..ad794e5c59a508f73c019f2484b312c28f670b79 100644 (file)
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -3,7 +3,7 @@
 #  \DeclareCategory{Articles}
 # Author: Randy Gobbel <gobbel@andrew.cmu.edu>
 
-Format 84
+Format 85
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -35,6 +35,7 @@ Style Standard
        Align                 Block
        AlignPossible         Block, Left, Right, Center
        LabelType             No_Label
+       DocBookTag            para
 End
 
 
@@ -48,6 +49,9 @@ Style Title
        EndFont
        Align                 Center
        HTMLTitle             true
+       DocBookTag            title
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
 End
 
 
@@ -90,6 +94,11 @@ Style Abstract
          Series              Bold
          Size                Small
        EndFont
+       DocBookAbstract       true
+       DocBookInInfo         always
+       DocBookWrapperTag     abstract
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 End
 
 
@@ -113,6 +122,9 @@ Style ShortTitle
          Size                Small
          Shape               Up
        EndFont
+       DocBookTag            titleabbrev
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
 End
 
 
@@ -129,6 +141,11 @@ Style Author
          Shape               Italic
          Size                Small
        EndFont
+       DocBookTag            personname
+       DocBookTagType        paragraph
+       DocBookWrapperTag     author
+       DocBookWrapperTagType inline
+       DocBookInInfo         always
 End
 
 
@@ -175,6 +192,12 @@ Style Affiliation
          Series              Bold
          Size                Small
        EndFont
+       DocBookTag                        affiliation
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookItemTag                    orgname
+       DocBookItemTagType                paragraph
+       DocBookInInfo                     always
 End
 
 
@@ -228,6 +251,8 @@ Style Acknowledgements
          Series              Bold
          Size                Small
        EndFont
+       DocBookTag            para
+       DocBookWrapperTag     acknowledgements
 End
 
 

diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc
index dc005b4b7487ff3bc973513d313c0647656f9f69..d37cd2bff9240d3f4b56834f1662ffd103f25355 100644 (file)
--- 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 84
+Format 85
 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
 
 
@@ -164,6 +176,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 +262,11 @@ Style Abstract
          Series              Bold
          Size                Small
        EndFont
+       DocBookAbstract       true
+       DocBookInInfo         always
+       DocBookWrapperTag     abstract
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 End
 
 Style Keywords
@@ -268,6 +291,10 @@ Style Keywords
          Size                Small
          Shape               Italic
        EndFont
+       DocBookTag          keyword
+       DocBookTagType      paragraph
+       DocBookWrapperTag   keywordset
+       DocBookInInfo       always
 End
 
 Style AuthorNote
@@ -295,6 +322,8 @@ Style AuthorNote
          Series              Bold
          Size                Small
        EndFont
+       DocBookTag            para
+       DocBookWrapperTag     acknowledgements
 End
 
 

diff --git a/lib/layouts/stdtitle.inc b/lib/layouts/stdtitle.inc
index 44b1b8e067b5b5bae6ee2e931e977ce66fce5796..9fbc3b77eddafbc00375a9925eee26ed84ea6189 100644 (file)
--- a/lib/layouts/stdtitle.inc
+++ b/lib/layouts/stdtitle.inc
@@ -8,7 +8,7 @@
 # a document, like title, author and such.
 
 
-Format 84
+Format 85
 
 Style Title
        Margin                Static