X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Faastex.layout;h=654d5920fe231e80a3328687e226a2a9990fd754;hb=517cd50e051d3debce752f565d6ba1880fd6184d;hp=35deaa88495bd9cf0e1114509f7b21bc6c8a068f;hpb=43c0149796662da5f8622deeb99e52f6d6607b7f;p=lyx.git

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 35deaa8849..654d5920fe 100644
--- 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,14 @@
 # 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
 
+# 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 53
+Format 63
 Columns			1
 Sides			1
 #SecNumDepth		3
@@ -177,6 +184,7 @@ Style Altaffilation
 	  Mandatory	1
 	  LabelString	"Number"
 	  Tooltip	"Consecutive number for the alternative affiliations"
+	  PassThru	1
 	EndArgument
 	LabelSep	xx
 	LabelType	Static
@@ -526,12 +534,13 @@ 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 {