Do not separate the shortcut from the label string

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

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 9a078a0c9b10436fd00030a28c7553e1a906ad32..fd8c9c9d30c0454c6d5a480316bc7f360e869357 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -1,5 +1,6 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aastex]{article (AASTeX)}
+#  \DeclareLaTeXClass[aastex,amssymb.sty,latexsym.sty,natbib.sty,verbatim.sty]{American Astronomical Society (AASTeX)}
+#  \DeclareCategory{Articles}
 #
 # Author: Mike Ressler <mike.ressler@alum.mit.edu>
 # Author: Uwe Stöhr <uwestoehr@web.de>
@@ -33,7 +34,7 @@
 #                        - new environments for \altaffiltext and \tablenotetext
 
 
-Format 26
+Format 41
 Columns                 1
 Sides                   1
 #SecNumDepth            3
@@ -165,8 +166,11 @@ Input stdfloats.inc
 Input stdcounters.inc
 
 NoStyle Part
+NoCounter part
 NoStyle Chapter
+NoCounter chapter
 NoStyle Subparagraph
+NoCounter subparagraph
 NoStyle List
 NoStyle Bibliography
 
@@ -299,7 +303,7 @@ Style Altaffilation
 End
 
 
-InsetLayout altaffilmark
+InsetLayout "Flex:altaffilmark"
        LyxType                 custom
        LatexType               command
        LatexName               altaffilmark
@@ -582,7 +586,7 @@ Style "Table note"
 End
 
 
-InsetLayout tablenotemark
+InsetLayout "Flex:tablenotemark"
        LyxType                 custom
        LatexType               command
        LatexName               tablenotemark
@@ -615,7 +619,10 @@ Style FigCaption
        AlignPossible         Block, Left
        LabelType             Static
        LabelString           "Fig. ---"
-       OptionalArgs          1
+       Argument 1
+               LabelString   "Short Title|S"
+               Tooltip       "The caption as it appears in the list of figures"
+       EndArgument
 End
 
 # Facility style definition
@@ -658,7 +665,10 @@ Style Objectname
        LabelType             Static
        LabelSep              M
        LabelString           "Obj:"
-       OptionalArgs          1
+       Argument 1
+               LabelString   "Recognized Name"
+               Tooltip       "Separate the recognized name of an object from text"
+       EndArgument
        Font
          Family              Roman
          Shape               Up
@@ -685,7 +695,10 @@ Style Dataset
        LabelType             Static
        LabelSep              M
        LabelString           "Dataset:"
-       OptionalArgs          1
+       Argument 1
+               LabelString   "Recognized Name"
+               Tooltip       "Separate the dataset ID from text"
+       EndArgument
        Font
          Family              Roman
          Shape               Up