diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index 6210a200dd..162e5a7315 100644 --- a/lib/layouts/aa.layout +++ b/lib/layouts/aa.layout @@ -2,6 +2,7 @@ # \DeclareLaTeXClass[aa]{article (A&A)} # # Author: Peter Sütterlin +# Author: Jürgen Spitzmüller # # 2001-05-17 take out include of stdlayouts; merge aapaper.inc # remove LaTeX style, rename to aa @@ -9,6 +10,8 @@ # take out thesaurus, email -> mail # change layout of title # abstract is command +# 2008-06-09 Implement \inst and \email as char styles, +# implement paragraph style keywords Format 4 @@ -311,6 +314,36 @@ Style Abstract End +Style Keywords + Margin First_Dynamic + LatexType Command + LatexName keywords + InTitle 1 + NextNoIndent 1 + LeftMargin MMM + RightMargin MMM + ParIndent "" + ItemSep 0 + TopSep 1.2 + BottomSep 0.7 + ParSep 0 + Align Block + AlignPossible Block + LabelType static + LabelString "Key words." + LabelSep M + LabelBottomSep 0 + Font + Size Small + EndFont + LabelFont + Family Sans + Series Bold + Size Small + EndFont +End + + Style Bibliography Align Left AlignPossible Left @@ -318,3 +351,22 @@ Style Bibliography Series Bold EndFont End + + +CharStyle Institute + LatexType command + LatexName inst + Font + Color blue + EndFont +End + + +CharStyle E-Mail + LatexType command + LatexName email + Font + Family Typewriter + Color blue + EndFont +End diff --git a/lib/templates/aa.lyx b/lib/templates/aa.lyx index d6abeb6b0f..ecf9fd1f89 100644 --- a/lib/templates/aa.lyx +++ b/lib/templates/aa.lyx @@ -1,4 +1,4 @@ -#LyX 1.5.0svn created this file. For more info see http://www.lyx.org/ +#LyX 1.5.6svn created this file. For more info see http://www.lyx.org/ \lyxformat 276 \begin_document \begin_header @@ -33,40 +33,39 @@ \paperpagestyle default \tracking_changes false \output_changes false +\author "" +\author "" \end_header \begin_body \begin_layout Title - This is your Title \end_layout \begin_layout Subtitle - your subtitle \end_layout \begin_layout Author - Me -\begin_inset ERT -status collapsed +\begin_inset CharStyle Institute +show_label false +status inlined \begin_layout Standard - -\backslash -inst{ +1 \end_layout \end_inset -1 + \begin_inset ERT status collapsed \begin_layout Standard -} + + \backslash and \end_layout @@ -74,23 +73,12 @@ and \end_inset You -\begin_inset ERT -status collapsed +\begin_inset CharStyle Institute +show_label false +status inlined \begin_layout Standard - -\backslash -inst{ -\end_layout - -\end_inset - 2 -\begin_inset ERT -status collapsed - -\begin_layout Standard -} \end_layout \end_inset @@ -99,30 +87,25 @@ status collapsed \end_layout \begin_layout Address - Here \newline -\begin_inset ERT -status collapsed +\begin_inset CharStyle E-Mail +show_label false +status inlined \begin_layout Standard - -\backslash -email{ +myaddress \end_layout \end_inset -myaddress + \begin_inset ERT status collapsed \begin_layout Standard -} -\end_layout -\begin_layout Standard \backslash and @@ -133,23 +116,12 @@ and There \newline -\begin_inset ERT -status collapsed +\begin_inset CharStyle E-Mail +show_label false +status inlined \begin_layout Standard - -\backslash -email{ -\end_layout - -\end_inset - youraddress -\begin_inset ERT -status collapsed - -\begin_layout Standard -} \end_layout \end_inset @@ -158,48 +130,115 @@ status collapsed \end_layout \begin_layout Offprint - Me \end_layout \begin_layout Date +Received ...; Accepted... +\end_layout + +\begin_layout Date +\begin_inset Note Note +status open + +\begin_layout Standard +This template uses the new +\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 +\begin_inset Quotes eld +\end_inset + +traditabstract +\begin_inset Quotes erd +\end_inset + + document option into +\family sans +Document\SpecialChar \menuseparator +Settings\SpecialChar \menuseparator +Document Class\SpecialChar \menuseparator + Options +\family default + and remove the red braces ( +\begin_inset ERT +status collapsed + +\begin_layout Standard + +}{ +\end_layout + +\end_inset + +). +\end_layout + +\end_inset + -Received ; Accepted \end_layout \begin_layout Abstract - -Short abstract +context (optional: leave void) \begin_inset ERT status collapsed \begin_layout Standard -\end_layout - -\begin_layout Standard - -\backslash -keywords{ +} { \end_layout \end_inset +aims +\begin_inset ERT +status collapsed + +\begin_layout Standard + +} { +\end_layout + +\end_inset + +methods +\begin_inset ERT +status collapsed + +\begin_layout Standard + +} { +\end_layout + +\end_inset + +results +\begin_inset ERT +status collapsed + +\begin_layout Standard + +} { +\end_layout + +\end_inset + +conclusions (optional: leave void) +\end_layout + +\begin_layout Keywords keywords -\begin_inset ERT -status collapsed - -\begin_layout Standard -} -\end_layout - -\end_inset - - \end_layout \begin_layout Section - Introduction \end_layout diff --git a/status.15x b/status.15x index e9ff00c417..6d1a80b17d 100644 --- a/status.15x +++ b/status.15x @@ -53,6 +53,9 @@ What's new - Add support for Graphviz Dot files (bug 4882). +- The A&A document class and template has been updated to conform to + version 6.0 of the A&A specification (bug 4928). + * WINDOWS INSTALLER @@ -71,7 +74,6 @@ What's new - * USER INTERFACE - Fix crash related to the outline pane with some documents (bug 4857).