Update branch inset inversion explanation

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

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index c851727ee79433e8c91174deeae0ad60d415ac6a..b1b334b898b83e6627fb3efd7c14ed77ffa45442 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -1,7 +1,9 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aastex,amssymb.sty,latexsym.sty,natbib.sty,verbatim.sty]{American Astronomical Society (AASTeX)}
+#  \DeclareLaTeXClass[aastex,amssymb.sty,latexsym.sty,natbib.sty,verbatim.sty]{American Astronomical Society (AASTeX v. 5)}
 #  \DeclareCategory{Articles}
 #
+# LyX support for the AAS TeX package http://www.ctan.org/pkg/aastex
+#
 # Author: Mike Ressler <mike.ressler@alum.mit.edu>
 # Author: Uwe Stöhr <uwestoehr@web.de>
 #
@@ -33,9 +35,15 @@
 # Version 1.4   26/10/08 - new custom insets for \altaffilmark, \tablenotemark
 #                        - 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 48
+Format 95
 Columns                        1
 Sides                  1
 #SecNumDepth           3
@@ -52,7 +60,7 @@ End
 
 
 Style Standard
-       Category        MainText
+       Category        MainText
        Margin          Static
        LatexType       Paragraph
        LatexName       dummy
@@ -61,6 +69,7 @@ Style Standard
        Align           Block
        AlignPossible   Block, Left, Right, Center
        LabelType       No_Label
+       DocBookTag      para
 End
 
 
@@ -134,6 +143,9 @@ Style Title
          Series        Bold
          Size          Large
        EndFont
+       DocBookTag      title
+       DocBookTagType  paragraph
+       DocBookInInfo   maybe
 End
 
 
@@ -146,6 +158,11 @@ Style Author
          Series        Medium
          Shape         SmallCaps
        EndFont
+       DocBookTag            personname
+       DocBookTagType        paragraph
+       DocBookWrapperTag     author
+       DocBookWrapperTagType inline
+       DocBookInInfo         always
 End
 
 
@@ -163,6 +180,12 @@ Style Affiliation
          Family        Roman
          Size          Normal
        EndFont
+       DocBookTag                        affiliation
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookItemTag                    orgname
+       DocBookItemTagType                paragraph
+       DocBookInInfo                     always
 End
 
 
@@ -177,13 +200,21 @@ Style Altaffilation
          Mandatory     1
          LabelString   "Number"
          Tooltip       "Consecutive number for the alternative affiliations"
+         PassThru      1
        EndArgument
        LabelSep        xx
        LabelType       Static
        LabelString     "Alternative affiliation:"
        LabelFont
-         Color         green
-       EndFont
+         Color         textlabel2
+       EndFont
+       DocBookTag                        affiliation
+       DocBookAttr                       role='alternate'
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookItemTag                    orgname
+       DocBookItemTagType                paragraph
+       DocBookInInfo                     always
 End
 
 
@@ -203,6 +234,11 @@ Style Email
          Size          Normal
          Shape         Italic
        EndFont
+       DocBookTag                        email
+       DocBookTagType                    paragraph
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookInInfo                     always
 End
 
 
@@ -254,6 +290,11 @@ Style Abstract
          Series        Bold
          Size          Normal
        EndFont
+       DocBookAbstract       true
+       DocBookInInfo         always
+       DocBookWrapperTag     abstract
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 End
 
 
@@ -273,7 +314,7 @@ InsetLayout "Flex:altaffilmark"
          Misc          No_Bar
        EndFont
        LabelFont
-         Color         green
+         Color         textlabel2
          Size          Small
        EndFont
 End
@@ -303,6 +344,10 @@ Style Keywords
          Shape         Italic
          Size          Normal
        EndFont
+       DocBookTag          keyword
+       DocBookTagType      paragraph
+       DocBookWrapperTag   keywordset
+       DocBookInInfo       always
 End
 
 
@@ -324,6 +369,8 @@ Style Acknowledgements
          Size          Normal
          Shape         Italic
        EndFont
+       DocBookTag            para
+       DocBookWrapperTag     acknowledgements
 End
 
 
@@ -396,15 +443,17 @@ Style MathLetters
        Font
          Size          Normal
        EndFont
+       DocBookTag  NONE
 End
 
 
-Style References
+Style Bibliography
        Margin          First_Dynamic
        LatexType       Bib_Environment
        LatexName       thebibliography
        Category        BackMatter
        NextNoIndent    1
+       ToggleIndent    Never
        LeftMargin      MM
        ParSkip         0.4
        ItemSep         0
@@ -421,6 +470,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
 
 
@@ -444,6 +507,9 @@ Style NoteToEditor
          Size          Normal
          Shape         Italic
        EndFont
+       DocBookTag      remark
+       DocBookTagType  paragraph
+       DocBookAttr     role='to-editor'
 End
 
 
@@ -464,6 +530,9 @@ Style TableRefs
          Family        Roman
          Size          Normal
        EndFont
+       DocBookTag      remark
+       DocBookTagType  paragraph
+       DocBookAttr     role='tablerefs'
 End
 
 
@@ -484,6 +553,9 @@ Style TableComments
          Family        Roman
          Size          Normal
        EndFont
+       DocBookTag      remark
+       DocBookTagType  paragraph
+       DocBookAttr     role='tablecomments'
 End
 
 
@@ -497,8 +569,11 @@ Style "Table note"
        LabelType       Static
        LabelString     "Table note:"
        LabelFont
-         Color         magenta
+         Color         textlabel3
        EndFont
+       DocBookTag      remark
+       DocBookTagType  paragraph
+       DocBookAttr     role='tablenote'
 End
 
 
@@ -518,19 +593,23 @@ InsetLayout "Flex:tablenotemark"
          Misc          No_Bar
        EndFont
        LabelFont
-         Color         magenta
+         Color         textlabel3
          Size          Small
        EndFont
+       DocBookTag      remark
+       DocBookTagType  paragraph
+       DocBookAttr     role='tablenotemark'
 End
 
 
 InsetLayout Caption:FigCaption
-       LabelString          fig.
-       LaTeXType            command
-       LatexName            figcaption
+       LabelString     fig.
+       LaTeXType       command
+       LatexName       figcaption
+       MultiPar        false
        Argument 1
-           LabelString   "Short Title|S"
-           Tooltip       "The caption as it appears in the list of figures"
+         LabelString   "Filename"
+         Tooltip       "Filename to identify the corresponding figure file"
        EndArgument
        HTMLStyle
                div.float-caption {