X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Faapaper.layout;h=9e4f48166e8da97110dd11024a54207b89558be5;hb=8f9520eda5a0ecf2458341e5d8ea40f5970d54db;hp=ec3dcc485fa18c571c6f852961b76188bb003207;hpb=12d02d04b2b26bdd49ca8dfcc0c53529c8a20f9d;p=lyx.git

diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout
index ec3dcc485f..9e4f48166e 100644
--- a/lib/layouts/aapaper.layout
+++ b/lib/layouts/aapaper.layout
@@ -1,26 +1,28 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aa]{article (A&A V4)}
+#  \DeclareLaTeXClass[aa]{Astronomy & Astrophysics (V. 4, Obsolete)}
+#  \DeclareCategory{Articles}
 #
-# Author: Peter Sütterlin <pit@uni-sw.gwdg.de>
+# Author: Peter Sütterlin <pit@uni-sw.gwdg.de>
 
 # This is for the old Springer layout of A&A (aa.cls version 4.x)
-# If you still have this, please upgrade to version 5 (see Extended.lyx)
+# If you still have this, please upgrade to version 5 (see Additional.lyx)
 #
 # If you want to keep the layout for old papers I'd suggest to rename
 # the old style file to aa-old and change the second line in this file to
-# 
-#  \DeclareLaTeXClass[aa-old]{article (A&A V4)}
+#
+#  \DeclareLaTeXClass[aa-old]{Astronomy & Astrophysics (V. 4, Obsolete)}
 #
 # and reconfigure LyX (after running texhash, of course).
 
-# General textclass parameters
+
+Format 45
 Columns                 2
 Sides                   2
-MaxCounter              Counter_Section
 SecNumDepth             3
 TocDepth                0
 PageStyle               Plain
 
+
 DefaultFont
 	Family                Roman
 	Series                Medium
@@ -29,8 +31,9 @@ DefaultFont
 	Color                 None
 EndFont
 
-# Standard style definition
+
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -41,54 +44,74 @@ Style Standard
 	LabelType             No_Label
 End
 
+
 # I want to keep the entries in a logical order.
 # Therefore I'll define the entries first, then fill them
-
 Style Itemize
-	End
+End
+
 Style Enumerate
-	End
+End
+
 Style Description
-	End
+End
+
 Style List
-	End
-Style Caption
-	End
+End
+
+
 Style LaTeX
-	End
+End
+
 Style Section
-	End
+	TocLevel 1
+End
+
 Style Subsection
-	End
+	TocLevel 2
+End
+
 Style Subsubsection
-	End
+	TocLevel 3
+End
+
 Style Title
-	End
+End
+
 Style Subtitle
-	End
+End
+
 Style Author
-	End
+End
+
 Style Address
-	End
+End
+
 Style Email
-	End
+End
+
 Style Offprint
-	End
+End
+
 Style Thesaurus
-	End
+End
+
 Style Date
-	End
-Style Abstract 
-	End
+End
+
+Style Abstract
+End
+
 Style Acknowledgement
-	End
+End
+
 Style Bibliography
-	End
+End
 
 # OK, now we have a more or less consistent Ordering. Now fill the
-# definitions. 
-# First, the standard includes
+# definitions.  First, the standard includes
 
+Input stdinsets.inc
 Input stdlists.inc
 Input stdlayouts.inc
 Input stdsections.inc
@@ -96,107 +119,110 @@ Input stdtitle.inc
 Input stdstruct.inc
 Input stdfloats.inc
 Input stdcounters.inc
-# Remove unwanted Styles
 
 NoStyle Quotation
 NoStyle Quote
 NoStyle Verse
 NoStyle Chapter
+NoCounter chapter
 NoStyle Paragraph
+NoCounter paragraph
 NoStyle Subparagraph
+NoCounter subparagraph
 NoStyle Part
+NoCounter part
+
 
-# Definitions only valid for A&A style
 Input aapaper.inc
 
-# Redefine some things
 
-# Section style redefinition
 Style Section
 	TopSep                2.0
 	BottomSep             1.3
-	Font 
+	Font
 	  Size                Normal
 	EndFont
+	TocLevel 1
 End
 
-# Subsection style redefinition
+
 Style Subsection
 	TopSep                1.7
 	BottomSep             1.1
-	Font 
+	Font
 	  Series              Medium
 	  Size                Normal
 	  Shape               Italic
 	EndFont
+	TocLevel 2
 End
 
-# Subsubsection style redefinition
+
 Style Subsubsection
 	TopSep                1.7
 	BottomSep             1.1
-	Font 
+	Font
 	  Series              Medium
 	  Size                Normal
 	EndFont
+	TocLevel 3
 End
 
-# Title style redefinition
+
 Style Title
 	TopSep                2
 	BottomSep             1.3
 	Align                 Left
 	AlignPossible         Left
-	Font 
+	Font
 	  Series              Bold
 	EndFont
 End
 
-# Author style redefinition
+
 Style Author
 	Align                 Left
 	AlignPossible         Left
 	LabelType             No_Label
-	Font 
+	Font
 	  Size                Normal
 	  Series              Bold
 	EndFont
 End
 
-# Date style redefinition
+
 Style Date
 	LabelSep              ""
 	TopSep                1.2
 	Align                 Left
 	AlignPossible         Left
-	Font 
+	Font
 	  Size                Small
 	EndFont
 End
 
-# Abstract style redefinition
-Style Abstract 
+
+Style Abstract
 	LeftMargin            ""
 	RightMargin           ""
 	ParIndent             ""
 	TopSep                1.4
 	BottomSep             0.7
-	LabelType             Top_Environment
-	Font 
+	LabelType             Above
+	Font
 	  Size                Normal
 	EndFont
-	LabelFont 
+	LabelFont
 	  Series              Bold
 	  Size                Normal
 	EndFont
-End 
+End
+
 
-# Bibliography style redefinition
 Style Bibliography
 	Align                 Left
 	AlignPossible         Left
-	LabelFont 
+	LabelFont
 	  Series              Bold
 	EndFont
 End
-