]> git.lyx.org Git - features.git/commitdiff
aa.layout: updated for A&A 8.2
authorUwe Stöhr <uwestoehr@lyx.org>
Sun, 26 May 2013 03:29:24 +0000 (05:29 +0200)
committerUwe Stöhr <uwestoehr@lyx.org>
Sun, 26 May 2013 03:29:24 +0000 (05:29 +0200)
development/FORMAT
lib/layouts/aa.layout
lib/lyx2lyx/lyx_2_1.py
lib/templates/aa.lyx
src/version.h

index 58f90167d4f87b3b34a87214d9ef2bddd59dc45b..fedfd4303b6b41d399aa2d362391989aa176e6e6 100644 (file)
@@ -11,6 +11,10 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.
 
 -----------------------
 
+2013-05-26 Uwe Stöhr <uwestoehr@web.de>
+       * Format incremented to 472: added 2 new abstract styles to the
+         aa.layout file
+
 2013-05-16 Julien Rioux <jrioux@lyx.org>
        * Format incremented to 471
          New \cite_engine_type default. The default citation
index 57f6c80387e36267327f939eb9f44eb4bef6b19b..9d117627ea6d409d738a03ab3e1c01f87f471b91 100644 (file)
 # 2008-06-09  Implement \inst and \email as char styles,
 #             implement paragraph style keywords
 # 2008-10-26  Updated for aa.cls version 6.1
+# 2013-05-26  Updated for aa.cls version 8.2
 
 
 Format 45
-Columns                 2
-Sides                   2
-SecNumDepth             3
-TocDepth                0
-PageStyle               Plain
+Columns                2
+Sides          2
+SecNumDepth    3
+TocDepth       0
+PageStyle      Plain
 
 # Pre-loaded packages
 Provides inputenc      1
 
 Style Standard
-       Category              MainText
-       Margin                Static
-       LatexType             Paragraph
-       LatexName             dummy
-       ParIndent             MM
-       ParSkip               0.4
-       Align                 Block
-       AlignPossible         Block, Left, Right, Center
-       LabelType             No_Label
+       Category        MainText
+       Margin          Static
+       LatexType       Paragraph
+       LatexName       dummy
+       ParIndent       MM
+       ParSkip         0.4
+       Align           Block
+       AlignPossible   Block, Left, Right, Center
+       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 Section
-       TocLevel 1
-End
-
-Style Subsection
-       TocLevel 2
-End
-
-Style Subsubsection
-       TocLevel 3
-End
-
-Style Itemize
-End
-
-Style Enumerate
-End
-
-Style Description
-End
-
-Style List
-End
-
-
-Style Title
-End
-
-Style Subtitle
-End
-
-Style Author
-End
-
-Style Address
-End
-
-Style Offprint
-End
-
-Style Mail
-End
-
-Style Date
-End
-
-Style Abstract
-End
-
-Style Acknowledgement
-End
-
-Style Bibliography
-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 stdsections.inc
@@ -118,318 +56,340 @@ NoStyle Subparagraph
 NoCounter subparagraph
 NoStyle Part
 NoCounter part
+NoStyle Abstract
 
 
 Style Subtitle
-       Margin                  Static
-       LatexType               Command
-       InTitle                 1
-       LatexName               subtitle
-       Category                FrontMatter
-       NextNoIndent            1
-       ParSkip                 0.4
-       ItemSep                 0
-       TopSep                  1.3
-       BottomSep               1.3
-       ParSep                  1
-       Align                   Center
-       LabelType               No_Label
+       Margin          Static
+       LatexType       Command
+       InTitle         1
+       LatexName       subtitle
+       Category        FrontMatter
+       NextNoIndent    1
+       ParSkip         0.4
+       ItemSep         0
+       TopSep          1.3
+       BottomSep       1.3
+       ParSep          1
+       Align           Center
+       LabelType       No_Label
        Font
-         Family                Sans
-         Size                  Larger
-         Series                Bold
+         Family        Sans
+         Size          Larger
+         Series        Bold
        EndFont
 End
 
 
 Style Address
-       LeftMargin              MMM
-       Margin                  Static
-       LatexType               Command
-       InTitle                 1
-       LatexName               institute
-       Category                FrontMatter
-       ParSkip                 0.4
-       #BottomSep              0.4
-       Align                   Left
-       LabelType               No_Label
+       LeftMargin      MMM
+       Margin          Static
+       LatexType       Command
+       InTitle         1
+       LatexName       institute
+       Category        FrontMatter
+       ParSkip         0.4
+       #BottomSep      0.4
+       Align           Left
+       LabelType       No_Label
        Font
-         Family                Roman
-         Size                  Small
+         Family        Roman
+         Size          Small
        EndFont
 End
 
 
 Style Offprint
-       Margin                  Static
-       LatexType               Command
-       Category                FrontMatter
-       InTitle                 1
-       LatexName               offprints
-       Align                   Left
-       LeftMargin              "Offprint Requests to:M"
-       LabelType               Static
-       LabelString             "Offprint Requests to:"
-       LabelSep                M
+       Margin          Static
+       LatexType       Command
+       Category        FrontMatter
+       InTitle         1
+       LatexName       offprints
+       Align           Left
+       LeftMargin      "Offprint Requests to:M"
+       LabelType       Static
+       LabelString     "Offprint Requests to:"
+       LabelSep        M
        Font
-         Family                Roman
-         Size                  Small
+         Family        Roman
+         Size          Small
        EndFont
        LabelFont
-         Family                Roman
-         Size                  Small
-         Shape                 Slanted
+         Family        Roman
+         Size          Small
+         Shape         Slanted
        EndFont
 End
 
 
 Style Mail
-       Margin                  Static
-       LatexType               Command
-       InTitle                 1
-       Category                FrontMatter
-       LatexName               mail
-       Align                   Left
-       LeftMargin              "Correspondence to:M"
-       LabelType               Static
-       LabelString             "Correspondence to:"
-       LabelSep                M
+       Margin          Static
+       LatexType       Command
+       InTitle         1
+       Category        FrontMatter
+       LatexName       mail
+       Align           Left
+       LeftMargin      "Correspondence to:M"
+       LabelType       Static
+       LabelString     "Correspondence to:"
+       LabelSep        M
        Font
-         Family                Roman
-         Size                  Small
+         Family        Roman
+         Size          Small
        EndFont
        LabelFont
-         Family                Roman
-         Size                  Small
-         Shape                 Slanted
+         Family        Roman
+         Size          Small
+         Shape         Slanted
        EndFont
 End
 
 
 Style Acknowledgement
-       Margin                  First_Dynamic
-       LatexType               Environment
-       LatexName               acknowledgements
-       Category                BackMatter
-       NextNoIndent            0
-       ItemSep                 0
-       TopSep                  1.2
-       BottomSep               0
-       ParSep                  0
-       Align                   Block
-       LabelType               Static
-       LabelString             "Acknowledgements."
-       LabelSep                M
+       Margin          First_Dynamic
+       LatexType       Environment
+       LatexName       acknowledgements
+       Category        BackMatter
+       NextNoIndent    0
+       ItemSep         0
+       TopSep          1.2
+       BottomSep       0
+       ParSep          0
+       Align           Block
+       LabelType       Static
+       LabelString     "Acknowledgements."
+       LabelSep        M
        Font
-         Size                  Small
+         Size          Small
        EndFont
        LabelFont
-         Size                  Small
-         Shape                 Italic
+         Size          Small
+         Shape         Italic
        EndFont
 End
 
 
 Style Section
-       TopSep                  2.0
-       BottomSep               1.3
        Font
-         Family                Sans
-         Size                  Large
+         Family        Sans
+         Size          Large
        EndFont
-       TocLevel 1
 End
 
 
 Style Subsection
-       TopSep                  1.7
-       BottomSep               1.1
        Font
-         Family                Sans
-         Series                Medium
-         Size                  Large
-         Shape                 Slanted
+         Family        Sans
+         Series        Medium
+         Size          Normal
+         Shape         Slanted
        EndFont
-       TocLevel 2
 End
 
 
 Style Subsubsection
-       TopSep                  1.7
-       BottomSep               1.1
        Font
-         Series                Medium
-         Size                  Normal
+         Series        Medium
+         Size          Normal
        EndFont
-       TocLevel 3
 End
 
 
 Style Title
-       TopSep                  2
-       BottomSep               1.3
-       Align                   Center
-       AlignPossible           Left
+       TopSep          2
+       BottomSep       1.3
+       Align           Center
+       AlignPossible   Left
        Font
-         Family                Sans
-         Series                Bold
+         Family        Sans
+         Series        Bold
        EndFont
 End
 
 
 Style Author
-       Align                   Center
-       LabelType               No_Label
-       BottomSep               1.5
+       Align           Center
+       LabelType       No_Label
+       BottomSep       1.5
        Font
-         Size                  Large
-         Series                Medium
+         Size          Large
+         Series        Medium
        EndFont
 End
 
 
 Style Date
-       InTitle                 1
-       LeftMargin              MMM
-       LabelSep                ""
-       TopSep                  1.2
-       Align                   Left
+       InTitle         1
+       LeftMargin      MMM
+       LabelSep        ""
+       TopSep          1.2
+       Align           Left
        Font
-         Size                  Small
+         Size          Small
        EndFont
 End
 
 
 InsetLayout "Flex:institutemark"
-       LyxType                 custom
-       LatexType               command
-       LatexName               inst
-       LabelString             "Institute Mark"
+       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
+         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
+         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
-       RightMargin             MMM
-       ParIndent               ""
-       ItemSep                 0
-       TopSep                  1.2
-       BottomSep               0.7
-       ParSep                  0
-       Align                   Block
-       LabelType               static
-       LabelString             "Abstract"
-       LabelSep                M
-       LabelBottomSep          0
+       MultiPar        true
+End
+
+
+Style Abstract_(unstructured)
+       LatexType       Command
+       LatexName       abstract
+       Category        FrontMatter
+       InTitle         1
+       NextNoIndent    1
+       Margin          Static
+       LeftMargin      MMM
+       RightMargin     MMM
+       ParIndent       ""
+       ItemSep         0
+       TopSep          1.2
+       BottomSep       0.7
+       ParSep          0
+       Align           Left
+       LabelType       Centered
+       LabelString     "ABSTRACT"
+       LabelBottomSep  0.7
        Font
-         Size                  Small
+         Size          Small
        EndFont
        LabelFont
-         Family                Sans
-         Series                Bold
-         Size                  Small
+         Family        Sans
+         Series        Bold
+         Size          Small
        EndFont
 End
 
 
+Style Abstract
+       ObsoletedBy     Abstract_(unstructured)
+End
+
+
+Style Abstract_(structured)
+       CopyStyle       Abstract_(unstructured)
+       Argument 1
+         Mandatory     1
+         LabelString   "Context"
+         Tooltip       "Context of your work (optional, can be left empty)"
+       EndArgument
+       Argument 2
+         Mandatory     1
+         LabelString   "Aims"
+         Tooltip       "Aims of your work"
+       EndArgument
+       Argument 3
+         Mandatory     1
+         LabelString   "Methods"
+         Tooltip       "Methods used in your work"
+       EndArgument
+       Argument 4
+         Mandatory     1
+         LabelString   "Results"
+         Tooltip       "Results of your work"
+       EndArgument
+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
-       LabelType               static
-       LabelString             "Key Words."
-       LabelSep                M
-       LabelBottomSep          0
+       Margin          First_Dynamic
+       LatexType       Command
+       LatexName       keywords
+       Category        FrontMatter
+       InTitle         1
+       NextNoIndent    1
+       LeftMargin      MMM
+       RightMargin     MMM
+       ParIndent       ""
+       ItemSep         0
+       TopSep          1.2
+       BottomSep       0.7
+       ParSep          0
+       Align           Block
+       LabelType       static
+       LabelString     "Key words."
+       LabelSep        M
+       LabelBottomSep  0
        Font
-         Size                  Small
+         Size          Small
        EndFont
        LabelFont
-         Family                Sans
-         Series                Bold
-         Size                  Small
+         Family        Sans
+         Series        Bold
+         Size          Small
        EndFont
 End
 
 
 Style Bibliography
-       Align                   Left
+       Align           Left
        LabelFont
-         Series                Bold
+         Series        Bold
        EndFont
 End
 
 
 InsetLayout Flex:Institute
-  LyXType                      charstyle
-  LatexType                    command
-  LatexName                    inst
-  Font
-    Color                      blue
-  EndFont
+       LyXType         charstyle
+       LatexType       command
+       LatexName       inst
+       Font
+         Color         blue
+       EndFont
 End
 
 
 InsetLayout Flex:E-Mail
-  LyXType                      charstyle
-  LatexType                    command
-  LatexName                    email
-  Font
-    Family                     Typewriter
-    Color                      blue
-  EndFont
+       LyXType         charstyle
+       LatexType       command
+       LatexName       email
+       Font
+         Family        Typewriter
+         Color         blue
+       EndFont
 End
 
 
 InsetLayout "Flex:Email"
-       LyxType                 custom
-       LatexType               command
-       LatexName               email
-       LabelString             "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
+         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
+         Color         urllabel
+         Size          Small
        EndFont
-       MultiPar                true
+       MultiPar        true
 End
 
index 362da372e3a11485dba4983c90de2e21e0b2217b..f97e6be58c41208289287dd30029259cc02d3bb6 100644 (file)
@@ -4152,6 +4152,34 @@ def revert_forced_local_layout(document):
                 document.header[k+1 : k+1] = lines
 
 
+def revert_aa1(document):
+  " Reverts InsetArguments of aa to TeX-code "
+  if document.textclass == "aa":
+    i = 0
+    while True:
+      if i != -1:
+        i = find_token(document.body, "\\begin_layout Abstract (structured)", i)
+      if i != -1:
+        revert_Argument_to_TeX_brace(document, i, 0, 1, 4, False, False)
+        i = i + 1
+      if i == -1:
+        return
+
+
+def revert_aa2(document):
+  " Reverts InsetArguments of aa to TeX-code "
+  if document.textclass == "aa":
+    i = 0
+    while True:
+      if i != -1:
+        i = find_token(document.body, "\\begin_layout Abstract (structured)", i)
+      if i != -1:
+        document.body[i] = "\\begin_layout Abstract"
+        i = i + 1
+      if i == -1:
+        return
+
+
 ##
 # Conversion hub
 #
@@ -4216,9 +4244,11 @@ convert = [
            [469, []],
            [470, []],
            [471, [convert_cite_engine_type_default]],
+           [472, []]
           ]
 
 revert =  [
+           [471, [revert_aa1,revert_aa2]],
            [470, [revert_cite_engine_type_default]],
            [469, [revert_forced_local_layout]],
            [468, [revert_starred_caption]],
index 09d03fb4f9be8ee16c87e8c33264b37d73abce22..fe55543037deb3df238d92a71c9b2ad82f7f21b0 100644 (file)
@@ -1,9 +1,8 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 471
 \begin_document
 \begin_header
 \textclass aa
-\options structabstract
 \use_default_options false
 \maintain_unincluded_children false
 \language english
 \font_roman default
 \font_sans default
 \font_typewriter default
+\font_math auto
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
-
 \graphics default
 \default_output_format default
 \output_sync 0
 \use_hyperref false
 \papersize default
 \use_geometry false
-\use_amsmath 0
-\use_esint 0
-\use_mhchem 1
-\use_mathdots 1
+\use_package amsmath 0
+\use_package amssymb 0
+\use_package cancel 0
+\use_package esint 0
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
 \cite_engine basic
+\cite_engine_type default
+\biblio_style plain
 \use_bibtopic false
 \use_indices false
 \paperorientation portrait
 \suppress_date false
+\justification false
 \use_refstyle 0
 \index Index
 \shortcut idx
@@ -66,6 +74,9 @@
 status open
 
 \begin_layout Plain Layout
+
+\series medium
+\size normal
 This is a template LyX file for articles to be submitted to the Journal
  of Astronomy & Astrophysicssing (A&A).
  How to install the A&A LaTeX class to your LaTeX system is explained in
@@ -186,41 +197,13 @@ Me
 Received ...; Accepted...
 \end_layout
 
-\begin_layout Date
+\begin_layout Abstract (structured)
 \begin_inset Note Note
 status open
 
 \begin_layout Plain Layout
 This template uses the structured abstract style.
- If you want to use the traditional, unstructured abstract, you have to
- add 
-\begin_inset Quotes eld
-\end_inset
-
-traditabstract
-\begin_inset Quotes erd
-\end_inset
-
- to the document options in 
-\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 Plain Layout
-
-}{
-\end_layout
-
-\end_inset
-
-).
- See the 
+ You can alternatively use the unstructured abstract as used in the 
 \family sans
 aa_sample.lyx
 \family default
@@ -230,49 +213,41 @@ aa_sample.lyx
 \end_inset
 
 
-\end_layout
-
-\begin_layout Abstract
-context (optional: leave void)
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-} {
+context (optional: leave void)
 \end_layout
 
 \end_inset
 
-aims
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 2
+status open
 
-} {
+\begin_layout Plain Layout
+aims
 \end_layout
 
 \end_inset
 
-methods
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 3
+status open
 
-} {
+\begin_layout Plain Layout
+methods
 \end_layout
 
 \end_inset
 
-results
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 4
+status open
 
-} {
+\begin_layout Plain Layout
+results
 \end_layout
 
 \end_inset
@@ -288,5 +263,29 @@ keywords
 Introduction
 \end_layout
 
+\begin_layout Standard
+bla bla
+\end_layout
+
+\begin_layout Subsection
+a subsection
+\end_layout
+
+\begin_layout Standard
+bla
+\end_layout
+
+\begin_layout Subsubsection
+a subsubsection
+\end_layout
+
+\begin_layout Standard
+bla
+\end_layout
+
+\begin_layout Acknowledgement
+Part of this work was supported by
+\end_layout
+
 \end_body
 \end_document
index 34eea53f0bd98af2270b28f3c9a9d05acac29c80..ea4b18422a3c4339a9b58ada616da68473b1391e 100644 (file)
@@ -30,8 +30,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 471 // jrioux: new \cite_engine_type default
-#define LYX_FORMAT_TEX2LYX 471 // jrioux: new \cite_engine_type default
+#define LYX_FORMAT_LYX 472 // uwestoehr: updated layout for A&A class
+#define LYX_FORMAT_TEX2LYX 472
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER