DocBook: new logic to handle the new lines, only used in output_docbook for now.

[lyx.git] / lib / layouts / aastex.layout

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 5db7deea0101909f2044ab09d586e968365dc487..74d2ab6adea3a599edca1f98dcb5e04c55d17c17 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -175,10 +175,11 @@ Style Affiliation
          Family        Roman
          Size          Normal
        EndFont
-       DocBookTag            affiliation
-       DocBookWrapperTag     author
-       DocBookItemTag        orgname
-       DocBookInInfo         always
+       DocBookTag                        affiliation
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookItemTag                    orgname
+       DocBookInInfo                     always
 End
 
 
@@ -201,11 +202,12 @@ Style Altaffilation
        LabelFont
          Color         green
        EndFont
-       DocBookTag            affiliation
-       DocBookAttr           role="alternate"
-       DocBookItemTag        orgname
-       DocBookWrapperTag     author
-       DocBookInInfo         always
+       DocBookTag                        affiliation
+       DocBookAttr                       role="alternate"
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookItemTag                    orgname
+       DocBookInInfo                     always
 End
 
 
@@ -225,9 +227,10 @@ Style Email
          Size          Normal
          Shape         Italic
        EndFont
-       DocBookTag            email
-       DocBookWrapperTag     author
-       DocBookInInfo         always
+       DocBookTag                        email
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookInInfo                     always
 End
 
 
@@ -328,6 +331,9 @@ Style Keywords
          Shape         Italic
          Size          Normal
        EndFont
+       DocBookTag          keyword
+       DocBookWrapperTag   keywordset
+       DocBookInInfo       always
 End