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 f72ded3281859bfc6ca83f30d5a7876dbdc43f35..74d2ab6adea3a599edca1f98dcb5e04c55d17c17 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -36,13 +36,14 @@
 #                        - new environments for \altaffiltext and \tablenotetext
 # Version 1.5   26/11/12 - added mandatory argument for \altaffiltext
 # Version 1.6   23/01/15 - fix for the optional argument of \figcaption
+# Version 1.7   05/04/19 - Normalize layout name of \thebibliography
 
 # Note: aastex.cls was replaced by aastex6.cls (v.1 2016/02/16)
 #      in the CTAN and TeXLive "aastex" package in march 2016.
 #      The new "aastex6.layout" depends on aastex6.cls but inputs this
 #       file for the definitions (cf. LyX ticket #10027)
 
-Format 60
+Format 82
 Columns                        1
 Sides                  1
 #SecNumDepth           3
@@ -59,7 +60,7 @@ End
 
 
 Style Standard
-       Category        MainText
+       Category        MainText
        Margin          Static
        LatexType       Paragraph
        LatexName       dummy
@@ -68,6 +69,7 @@ Style Standard
        Align           Block
        AlignPossible   Block, Left, Right, Center
        LabelType       No_Label
+       DocBookTag      para
 End
 
 
@@ -153,6 +155,9 @@ Style Author
          Series        Medium
          Shape         SmallCaps
        EndFont
+       DocBookTag            personname
+       DocBookWrapperTag     author
+       DocBookInInfo         always
 End
 
 
@@ -170,6 +175,11 @@ Style Affiliation
          Family        Roman
          Size          Normal
        EndFont
+       DocBookTag                        affiliation
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookItemTag                    orgname
+       DocBookInInfo                     always
 End
 
 
@@ -184,6 +194,7 @@ Style Altaffilation
          Mandatory     1
          LabelString   "Number"
          Tooltip       "Consecutive number for the alternative affiliations"
+         PassThru      1
        EndArgument
        LabelSep        xx
        LabelType       Static
@@ -191,6 +202,12 @@ Style Altaffilation
        LabelFont
          Color         green
        EndFont
+       DocBookTag                        affiliation
+       DocBookAttr                       role="alternate"
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookItemTag                    orgname
+       DocBookInInfo                     always
 End
 
 
@@ -210,6 +227,10 @@ Style Email
          Size          Normal
          Shape         Italic
        EndFont
+       DocBookTag                        email
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookInInfo                     always
 End
 
 
@@ -310,6 +331,9 @@ Style Keywords
          Shape         Italic
          Size          Normal
        EndFont
+       DocBookTag          keyword
+       DocBookWrapperTag   keywordset
+       DocBookInInfo       always
 End
 
 
@@ -331,6 +355,8 @@ Style Acknowledgements
          Size          Normal
          Shape         Italic
        EndFont
+       DocBookTag            para
+       DocBookWrapperTag     acknowledgement
 End
 
 
@@ -406,7 +432,7 @@ Style MathLetters
 End
 
 
-Style References
+Style Bibliography
        Margin          First_Dynamic
        LatexType       Bib_Environment
        LatexName       thebibliography
@@ -429,6 +455,20 @@ Style References
          Size          Normal
          Series        Bold
        EndFont
+       Argument listpreamble:1
+         LabelString    "Bib preamble"
+         MenuString     "Bibliography Preamble"
+         Tooltip        "LaTeX code to be inserted before the first bibliography item"
+         PassThru       1
+         Font
+           Family typewriter
+           Color latex
+         EndFont
+       EndArgument
+End
+
+Style References
+       Obsoletedby     Bibliography
 End