- aa.layout: updatesd for aa.cls version 6.1

- aa.lyx, aa_sample.lyx: updates and fix the documentclass option

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27181 a592a061-630c-0410-9148-cb99ea01b6c8

lib/examples/aa_sample.lyx

@@ -1,4 +1,4 @@
-#LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.0rc5 created this file. For more info see http://www.lyx.org/
 \lyxformat 344
 \begin_document
 \begin_header
@@ -7,6 +7,7 @@
 \usepackage{graphicx}
 %
 \end_preamble
+\options traditabstract
 \use_default_options false
 \language english
 \inputencoding auto
@@ -46,6 +47,24 @@
 
 \begin_body
 
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Depending on the submission state and the abstract layout, you need to use
+ different document class options that are listed in the aa manual 
+\family sans
+aadoc.pdf
+\family default
+.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Title
 Hydrodynamics of giant planet formation
 \end_layout
@@ -62,27 +81,16 @@ I.
 \begin_layout Author
 G.
  Wuchterl
-\begin_inset ERT
+\begin_inset Flex institutemark
-status collapsed
+status open
 
 \begin_layout Plain Layout
-
+1
-
-\backslash
-inst{1} 
-\backslash
-and
-\end_layout
-
-\begin_layout Plain Layout
-
-          
 \end_layout
 
 \end_inset
 
-C.
+
- Ptolemy
 \begin_inset ERT
 status collapsed
 
@@ -90,7 +98,29 @@ status collapsed
 
 
 \backslash
-inst{2}
+and 
+\end_layout
+
+\end_inset
+
+ C.
+ Ptolemy
+\begin_inset Flex institutemark
+status collapsed
+
+\begin_layout Plain Layout
+2
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
 \backslash
 fnmsep 
 \end_layout
@@ -108,6 +138,18 @@ Just to show the usage of the elements in the author field
 \end_inset
 
  
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+fnmsep is only needed for more than one consecutive notes/marks
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Offprint
@@ -122,22 +164,26 @@ Institute for Astronomy (IfA), University of Vienna, Türkenschanzstrasse
 \end_inset
 
 
+\begin_inset Flex Email
+status open
+
+\begin_layout Plain Layout
+wuchterl@amok.ast.univie.ac.at
+\end_layout
+
+\end_inset
+
+
 \begin_inset ERT
 status collapsed
 
 \begin_layout Plain Layout
 
 
-\backslash
-email{wuchterl@amok.ast.univie.ac.at} 
 \backslash
 and 
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 University of Alexandria, Department of Geography, ...
@@ -145,14 +191,11 @@ University of Alexandria, Department of Geography, ...
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Flex Email
 status collapsed
 
 \begin_layout Plain Layout
-
+c.ptolemy@hipparch.uheaven.space
-
-\backslash
-email{c.ptolemy@hipparch.uheaven.space}
 \end_layout
 
 \end_inset
@@ -177,22 +220,8 @@ Received September 15, 1996; accepted March 16, 1997
 \begin_layout Abstract
 To investigate the physical nature of the `nuc\SpecialChar \-
 leated instability' of proto
- giant planets (Mizuno 
+ giant planets, the stability of layers in static, radiative gas spheres
-\begin_inset CommandInset citation
+ is analysed on the basis of Baker's standard one-zone model.
-LatexCommand cite
-key "mizuno"
-
-\end_inset
-
-), the stability of layers in static, radiative gas spheres is analysed
- on the basis of Baker's 
-\begin_inset CommandInset citation
-LatexCommand cite
-key "baker"
-
-\end_inset
-
- standard one-zone model.
  It is shown that stability depends only upon the equations of state, the
  opacities and the local thermodynamic state in the layer.
  Stability and instability can therefore be expressed in the form of stability
@@ -235,25 +264,39 @@ key "baker"
 \end_inset
 
 -mechanism is widespread under `cool' conditions.
-\begin_inset ERT
+\begin_inset Note Note
 status open
 
 \begin_layout Plain Layout
-
+Citations are not allowed in A&A abstracts.
-
-\backslash
-keywords{giant planet formation -- 
-\backslash
-(
-\backslash
-kappa
-\backslash
-)-mechanism -- stability of gas spheres }
 \end_layout
 
 \end_inset
 
 
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+This is the unstructured abstract type, an example for the structured abstract
+ is in the 
+\family sans
+aa.lyx
+\family default
+ template file that comes with LyX.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Keywords
+giant planet formation -- 
+\begin_inset Formula $\kappa$
+\end_inset
+
+-mechanism -- stability of gas spheres
 \end_layout
 
 \begin_layout Section
@@ -1074,6 +1117,23 @@ schaft, DFG
 \end_inset
 
 17/2--1.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+You can alternatively use BibTeX.
+ You must then use the BibTeX style 
+\family sans
+aa.bst
+\family default
+ that is part of the A&A LaTeX-package.
+\end_layout
+
+\end_inset
+
 
 \end_layout
 

lib/layouts/aa.layout

@@ -3,6 +3,7 @@
 #
 # Author: Peter Sütterlin <pit@uni-sw.gwdg.de>
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
+# Author: Uwe Stöhr <uwestoehr@web.de>
 #
 # 2001-05-17  take out include of stdlayouts; merge aapaper.inc
 #             remove LaTeX style, rename to aa
@@ -12,6 +13,7 @@
 #             abstract is command
 # 2008-06-09  Implement \inst and \email as char styles,
 #             implement paragraph style keywords
+# 2008-10-26  Updated for aa.cls version 6.1
 
 
 Format 11
@@ -112,6 +114,7 @@ Style Subtitle
 	LatexType		Command
 	InTitle			1
 	LatexName		subtitle
+	Category		FrontMatter
 	NextNoIndent		1
 	ParSkip			0.4
 	ItemSep			0
@@ -134,8 +137,9 @@ Style Address
 	LatexType		Command
 	InTitle			1
 	LatexName		institute
+	Category		FrontMatter
 	ParSkip			0.4
-#  BottomSep            0.4
+	#BottomSep		0.4
 	Align			Left
 	LabelType		No_Label
 	Font
@@ -148,6 +152,7 @@ End
 Style Offprint
 	Margin			Static
 	LatexType		Command
+	Category		FrontMatter
 	InTitle			1
 	LatexName		offprints
 	Align			Left
@@ -171,6 +176,7 @@ Style Mail
 	Margin			Static
 	LatexType		Command
 	InTitle			1
+	Category		FrontMatter
 	LatexName		mail
 	Align			Left
 	LeftMargin		"Correspondence to:M"
@@ -193,6 +199,7 @@ Style Acknowledgement
 	Margin			First_Dynamic
 	LatexType		Environment
 	LatexName		acknowledgements
+	Category		BackMatter
 	NextNoIndent		0
 	ItemSep			0
 	TopSep			1.2
@@ -212,8 +219,6 @@ Style Acknowledgement
 End
 
 
-
-
 Style Section
 	TopSep			2.0
 	BottomSep		1.3
@@ -270,6 +275,7 @@ End
 
 
 Style Date
+	InTitle			1
 	LeftMargin		MMM
 	LabelSep		""
 	TopSep			1.2
@@ -280,10 +286,34 @@ Style Date
 End
 
 
+InsetLayout institutemark
+	LyxType			custom
+	LatexType		command
+	LatexName		inst
+	LabelString		"institute mark"
+	Font
+	  Color			foreground
+	  Size			Small
+	  Family		Roman
+	  Shape			Up
+	  Series		Medium
+	  Misc			No_Emph
+	  Misc			No_Noun
+	  Misc			No_Bar
+	EndFont
+	LabelFont
+	  Color			green
+	  Size			Small
+	EndFont
+	MultiPar		true
+End
+
+
 Style Abstract
 	Margin			First_Dynamic
 	LatexType		Command
 	LatexName		abstract
+	Category		FrontMatter
 	InTitle			1
 	NextNoIndent		1
 	LeftMargin		MMM
@@ -365,3 +395,27 @@ InsetLayout CharStyle:E-Mail
     Color			blue
   EndFont
 End
+
+
+InsetLayout Email
+	LyxType			custom
+	LatexType		command
+	LatexName		email
+	LabelString		"email"
+	Font
+	  Color			foreground
+	  Size			Small
+	  Family		Roman
+	  Shape			Up
+	  Series		Medium
+	  Misc			No_Emph
+	  Misc			No_Noun
+	  Misc			No_Bar
+	EndFont
+	LabelFont
+	  Color			urllabel
+	  Size			Small
+	EndFont
+	MultiPar		true
+End
+

lib/templates/aa.lyx

@@ -1,8 +1,10 @@
-#LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.0rc5 created this file. For more info see http://www.lyx.org/
-\lyxformat 341
+\lyxformat 344
 \begin_document
 \begin_header
 \textclass aa
+\options structabstract
+\use_default_options false
 \language english
 \inputencoding auto
 \font_roman times
@@ -50,9 +52,9 @@ your subtitle
 \end_layout
 
 \begin_layout Author
-Me
+first author
-\begin_inset Flex CharStyle:Institute
+\begin_inset Flex institutemark
-status collapsed
+status open
 
 \begin_layout Plain Layout
 1
@@ -73,8 +75,8 @@ and
 
 \end_inset
 
-You
+second author
-\begin_inset Flex CharStyle:Institute
+\begin_inset Flex institutemark
 status collapsed
 
 \begin_layout Plain Layout
@@ -87,16 +89,16 @@ status collapsed
 \end_layout
 
 \begin_layout Address
-Here 
+Address of first author 
 \begin_inset Newline newline
 \end_inset
 
 
-\begin_inset Flex CharStyle:E-Mail
+\begin_inset Flex Email
-status collapsed
+status open
 
 \begin_layout Plain Layout
-myaddress
+email of first author
 \end_layout
 
 \end_inset
@@ -114,16 +116,16 @@ and
 
 \end_inset
 
- There
+Address of second author
 \begin_inset Newline newline
 \end_inset
 
 
-\begin_inset Flex CharStyle:E-Mail
+\begin_inset Flex Email
 status collapsed
 
 \begin_layout Plain Layout
-youraddress
+email of second author
 \end_layout
 
 \end_inset
@@ -144,17 +146,9 @@ Received ...; Accepted...
 status open
 
 \begin_layout Plain Layout
-This template uses the new 
+This template uses the structured abstract style.
-\begin_inset Quotes eld
-\end_inset
-
-Structured Abstract
-\begin_inset Quotes erd
-\end_inset
-
- approach that is implemented and recommended as of A&A version 6.0.
  If you want to use the traditional, unstructured abstract, you have to
- insert the 
+ add 
 \begin_inset Quotes eld
 \end_inset
 
@@ -162,12 +156,12 @@ traditabstract
 \begin_inset Quotes erd
 \end_inset
 
- document option into 
+ to the document options in 
 \family sans
 Document\SpecialChar \menuseparator
 Settings\SpecialChar \menuseparator
 Document Class\SpecialChar \menuseparator
- Options
+Options
 \family default
  and remove the red braces (
 \begin_inset ERT
@@ -181,6 +175,11 @@ status collapsed
 \end_inset
 
 ).
+ See the 
+\family sans
+aa_sample.lyx
+\family default
+ example file that comes with LyX.
 \end_layout
 
 \end_inset