X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Faastex.layout;h=c851727ee79433e8c91174deeae0ad60d415ac6a;hb=d0af587ab4b93533955f40bf2ac099e71d60b4f4;hp=01f443b82ed987d987ad45578cf17d3e9d0eab93;hpb=41014dec49cd889cb6daa498311ca302b0036e8e;p=lyx.git

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 01f443b82e..c851727ee7 100644
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -35,7 +35,7 @@
 # Version 1.5   26/11/12 - added mandatory argument for \altaffiltext
 
 
-Format 41
+Format 48
 Columns			1
 Sides			1
 #SecNumDepth		3
@@ -52,6 +52,7 @@ End
 
 
 Style Standard
+	Category        MainText
 	Margin		Static
 	LatexType	Paragraph
 	LatexName	dummy
@@ -63,98 +64,6 @@ Style Standard
 End
 
 
-# I want to keep the entries in a logical order.
-# Therefore I'll define the entries first, then fill them in
-
-Style Section
-	TocLevel	1
-End
-
-Style Subsection
-	TocLevel	2
-End
-
-Style Subsubsection
-	TocLevel	3
-End
-
-Style Paragraph
-	TocLevel	4
-End
-
-Style Itemize
-End
-
-Style Enumerate
-End
-
-Style Description
-End
-
-Style List
-End
-
-Style Title
-End
-
-Style Author
-End
-
-Style Affiliation
-End
-
-Style Email
-End
-
-Style And
-End
-
-Style Date
-End
-
-Style Abstract
-End
-
-Style Keywords
-End
-
-Style Acknowledgements
-End
-
-Style Appendix
-End
-
-Style References
-End
-
-Style PlaceFigure
-End
-
-Style PlaceTable
-End
-
-Style TableComments
-End
-
-Style TableRefs
-End
-
-
-Style MathLetters
-End
-
-Style NoteToEditor
-End
-
-Style Facility
-End
-
-Style Objectname
-End
-
-Style Dataset
-End
-
 # OK, now we have a more or less consistent Ordering. Now fill the
 # definitions. First, the standard includes
 
@@ -240,37 +149,6 @@ Style Author
 End
 
 
-Style Date
-	InTitle		0
-	LabelSep	""
-	TopSep		1.2
-	Align		Center
-	Font
-	  Size		Small
-	EndFont
-End
-
-
-Style Abstract
-	LeftMargin	"MMM"
-	RightMargin	"MMM"
-	ParIndent	"MM"
-	InTitle		0
-	TopSep		1.4
-	BottomSep	0.7
-	LabelType	Centered_Top_Environment
-	Align		Block
-	AlignPossible	Block, Left, Right, Center
-	Font
-	  Size		Normal
-	EndFont
-	LabelFont
-	  Series	Bold
-	  Size		Normal
-	EndFont
-End
-
-
 Style Affiliation
 	Margin		Static
 	LatexType	Command
@@ -309,6 +187,76 @@ Style Altaffilation
 End
 
 
+Style Email
+	Margin		Static
+	LatexType	Command
+	InTitle		0
+	LatexName	email
+	Category	FrontMatter
+	ParSkip		0.4
+	BottomSep	0.4
+	Align		Center
+	AlignPossible	Block, Left, Right, Center
+	LabelType	No_Label
+	Font
+	  Family	Roman
+	  Size		Normal
+	  Shape		Italic
+	EndFont
+End
+
+
+Style And
+	Margin		Dynamic
+	LatexType	Command
+	InTitle		0
+	LatexName	and
+	Category	FrontMatter
+	TopSep		1.2
+	ParSkip		0.4
+	BottomSep	1.2
+	Align		Center
+	LabelType	Static
+	LabelString	"and"
+	KeepEmpty	1
+	Font
+	  Family	Roman
+	  Size		Normal
+	EndFont
+End
+
+
+Style Date
+	InTitle		0
+	LabelSep	""
+	TopSep		1.2
+	Align		Center
+	Font
+	  Size		Small
+	EndFont
+End
+
+
+Style Abstract
+	LeftMargin	"MMM"
+	RightMargin	"MMM"
+	ParIndent	"MM"
+	InTitle		0
+	TopSep		1.4
+	BottomSep	0.7
+	LabelType	Centered
+	Align		Block
+	AlignPossible	Block, Left, Right, Center
+	Font
+	  Size		Normal
+	EndFont
+	LabelFont
+	  Series	Bold
+	  Size		Normal
+	EndFont
+End
+
+
 InsetLayout "Flex:altaffilmark"
 	LyxType		custom
 	LatexType	command
@@ -358,26 +306,8 @@ Style Keywords
 End
 
 
-Style Email
-	Margin		Static
-	LatexType	Command
-	InTitle		0
-	LatexName	email
-	Category	FrontMatter
-	ParSkip		0.4
-	BottomSep	0.4
-	Align		Center
-	AlignPossible	Block, Left, Right, Center
-	LabelType	No_Label
-	Font
-	  Family	Roman
-	  Size		Normal
-	  Shape		Italic
-	EndFont
-End
-
-
 Style Acknowledgements
+	Category        BackMatter
 	Margin		Dynamic
 	LatexType	Command
 	InTitle		0
@@ -397,26 +327,6 @@ Style Acknowledgements
 End
 
 
-Style And
-	Margin		Dynamic
-	LatexType	Command
-	InTitle		0
-	LatexName	and
-	Category	FrontMatter
-	TopSep		1.2
-	ParSkip		0.4
-	BottomSep	1.2
-	Align		Center
-	LabelType	Static
-	LabelString	"and"
-	KeepEmpty	1
-	Font
-	  Family	Roman
-	  Size		Normal
-	EndFont
-End
-
-
 Style PlaceFigure
 	Margin		Dynamic
 	LatexType	Command
@@ -614,23 +524,26 @@ InsetLayout "Flex:tablenotemark"
 End
 
 
-Style FigCaption
-	Margin		First_Dynamic
-	LatexType	Command
-	LatexName	figcaption
-	LabelSep	xx
-	ParSkip		0.4
-	TopSep		0.5
-	Align		Block
-	AlignPossible	Block, Left
-	LabelType	Static
-	LabelString	"Fig. ---"
+InsetLayout Caption:FigCaption
+	LabelString          fig.
+	LaTeXType            command
+	LatexName            figcaption
 	Argument 1
-	  LabelString	"Short Title|S"
-	  Tooltip	"The caption as it appears in the list of figures"
+	    LabelString   "Short Title|S"
+	    Tooltip       "The caption as it appears in the list of figures"
 	EndArgument
+	HTMLStyle
+		div.float-caption {
+			text-align: center;
+			border: 2px solid black;
+			padding: 1ex;
+			margin: 1ex;
+		}
+	EndHTMLStyle
+	HTMLAttr "class='float-caption float-caption-figcaption'"
 End
 
+
 # Facility style definition
 Style Facility
 	LeftMargin	MMM