aastex: fix optional argument of a command

- aastex.layout: fix name and hint of \figcaption
- aastex.lyx: improved template file

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index b0f66b3a44fd4d1b6f680ee6c690d9d60146dc87..293dcdb033ba97fe723764f7bff75dd5e8176785 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -33,6 +33,7 @@
 # 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
 
 
 Format 54
@@ -526,13 +527,12 @@ End
 
 
 InsetLayout Caption:FigCaption
-       LabelString          fig.
-       LaTeXType            command
-       LatexName            figcaption
-       # FIXME: it seems that the optional argument is actually a file name
+       LabelString     fig.
+       LaTeXType       command
+       LatexName       figcaption
        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 {

diff --git a/lib/templates/aastex.lyx b/lib/templates/aastex.lyx
index e83eb12bb9503432b1f00bdfb4d9549911c48715..b233ac150f3acf297a1b253dbbada18b1ee55d93 100644 (file)
--- a/lib/templates/aastex.lyx
+++ b/lib/templates/aastex.lyx
@@ -1,5 +1,5 @@
-#LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 474
+#LyX 2.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 481
 \begin_document
 \begin_header
 \textclass aastex
@@ -212,7 +212,7 @@ Results
 <results text; refer to Figure 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "fig1"
+reference "fig:fig1"
 
 \end_inset
 
@@ -296,12 +296,12 @@ sideways false
 status open
 
 \begin_layout Plain Layout
-\begin_inset Caption FigCaption
+\begin_inset Caption Standard
 
 \begin_layout Plain Layout
 \begin_inset CommandInset label
 LatexCommand label
-name "fig1"
+name "fig:fig1"
 
 \end_inset
 
@@ -317,6 +317,39 @@ This is the first figure.
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\begin_inset Float figure
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\begin_inset Caption FigCaption
+
+\begin_layout Plain Layout
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+filename
+\end_layout
+
+\end_inset
+
+This is the second figure where the image filename is referenced via a FigCaptio
+n.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \end_body