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

diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout
index 951177aa6b..9e4f48166e 100644
--- a/lib/layouts/aapaper.layout
+++ b/lib/layouts/aapaper.layout
@@ -1,19 +1,21 @@
 #% 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).
 
 
+Format 45
 Columns                 2
 Sides                   2
 SecNumDepth             3
@@ -31,6 +33,7 @@ EndFont
 
 
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -56,19 +59,20 @@ End
 Style List
 End
 
-Style Caption
-End
 
 Style LaTeX
 End
 
 Style Section
+	TocLevel 1
 End
 
 Style Subsection
+	TocLevel 2
 End
 
 Style Subsubsection
+	TocLevel 3
 End
 
 Style Title
@@ -95,7 +99,7 @@ End
 Style Date
 End
 
-Style Abstract 
+Style Abstract
 End
 
 Style Acknowledgement
@@ -107,12 +111,12 @@ End
 # OK, now we have a more or less consistent Ordering. Now fill the
 # definitions.  First, the standard includes
 
+Input stdinsets.inc
 Input stdlists.inc
 Input stdlayouts.inc
 Input stdsections.inc
 Input stdtitle.inc
 Input stdstruct.inc
-Input numarticle.inc
 Input stdfloats.inc
 Input stdcounters.inc
 
@@ -120,9 +124,13 @@ NoStyle Quotation
 NoStyle Quote
 NoStyle Verse
 NoStyle Chapter
+NoCounter chapter
 NoStyle Paragraph
+NoCounter paragraph
 NoStyle Subparagraph
+NoCounter subparagraph
 NoStyle Part
+NoCounter part
 
 
 Input aapaper.inc
@@ -131,30 +139,33 @@ Input aapaper.inc
 Style Section
 	TopSep                2.0
 	BottomSep             1.3
-	Font 
+	Font
 	  Size                Normal
 	EndFont
+	TocLevel 1
 End
 
 
 Style Subsection
 	TopSep                1.7
 	BottomSep             1.1
-	Font 
+	Font
 	  Series              Medium
 	  Size                Normal
 	  Shape               Italic
 	EndFont
+	TocLevel 2
 End
 
 
 Style Subsubsection
 	TopSep                1.7
 	BottomSep             1.1
-	Font 
+	Font
 	  Series              Medium
 	  Size                Normal
 	EndFont
+	TocLevel 3
 End
 
 
@@ -163,7 +174,7 @@ Style Title
 	BottomSep             1.3
 	Align                 Left
 	AlignPossible         Left
-	Font 
+	Font
 	  Series              Bold
 	EndFont
 End
@@ -173,7 +184,7 @@ Style Author
 	Align                 Left
 	AlignPossible         Left
 	LabelType             No_Label
-	Font 
+	Font
 	  Size                Normal
 	  Series              Bold
 	EndFont
@@ -185,33 +196,33 @@ Style Date
 	TopSep                1.2
 	Align                 Left
 	AlignPossible         Left
-	Font 
+	Font
 	  Size                Small
 	EndFont
 End
 
 
-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
 
 
 Style Bibliography
 	Align                 Left
 	AlignPossible         Left
-	LabelFont 
+	LabelFont
 	  Series              Bold
 	EndFont
 End