More tweaks, and some fixes for missing files in the makefiles, while we're at it.

[lyx.git] / lib / layouts / aastex.layout

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index e0374e2566a8f8ff92fea6eeb56825e5007a2d53..5a579414a074502694aef7956de01905c985750d 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -27,16 +27,18 @@
 #                         example files are available.
 # Version 1.1   7/25/99 - Changed \url to take advantage of new layout option.
 # Version 1.2   4/18/02 - Updated for natbib in 1.2.0
+# Version 1.3   5/7/04  - Updated for AASTeX 5.2
 
 
+Format 6
 Columns                 1
 Sides                   1
 #SecNumDepth            3
 TocDepth                0
 PageStyle               Plain
-ProvidesAmsmath         1
-ProvidesNatbib          1
-ProvidesUrl             1
+Provides amsmath         1
+Provides natbib          1
+Provides url             1
 
 
 ClassOptions
@@ -128,8 +130,6 @@ End
 Style TableRefs
 End
 
-Style Caption
-End
 
 Style MathLetters
 End
@@ -137,12 +137,20 @@ End
 Style NoteToEditor
 End
 
+Style Facility
+End
+
+Style Objectname
+End
+
+Style Dataset
+End
 
 # OK, now we have a more or less consistent Ordering. Now fill the
 # definitions. First, the standard includes
 
+Input stdinsets.inc
 Input stdsections.inc
-Input numarticle.inc
 Input stdtitle.inc
 Input stdstruct.inc
 Input stdlists.inc
@@ -158,7 +166,6 @@ NoStyle Bibliography
 
 Style Section
        Align                 Center
-       AlignPossible         Center
        NextNoIndent          0
        TopSep                2.0
        BottomSep             1.3
@@ -171,7 +178,6 @@ End
 
 Style Subsection
        Align                 Center
-       AlignPossible         Center
        NextNoIndent          0
        TopSep                1.7
        BottomSep             1.1
@@ -184,7 +190,6 @@ End
 
 Style Subsubsection
        Align                 Center
-       AlignPossible         Center
        NextNoIndent          0
        TopSep                1.7
        BottomSep             1.1
@@ -200,7 +205,6 @@ Style Title
        TopSep                2
        BottomSep             1.3
        Align                 Center
-       AlignPossible         Center
        InTitle               0
        Font
          Series              Bold
@@ -211,7 +215,6 @@ End
 
 Style Author
        Align                 Center
-       AlignPossible         Center
        LabelType             No_Label
        InTitle               0
        Font
@@ -226,7 +229,6 @@ Style Date
        LabelSep              ""
        TopSep                1.2
        Align                 Center
-       AlignPossible         Center
        InTitle               0
        Font
          Size                Small
@@ -324,9 +326,8 @@ Style Acknowledgements
        ParSkip               0.4
        BottomSep             0.8
        Align                 Left
-       AlignPossible         Left
        LabelType             Static
-       LabelString           [Acknowledgements]
+       LabelString           "[Acknowledgements]"
        KeepEmpty             1
        Font
          Family              Roman
@@ -345,9 +346,8 @@ Style And
        ParSkip               0.4
        BottomSep             1.2
        Align                 Center
-       AlignPossible         Center
        LabelType             Static
-       LabelString           and
+       LabelString           "and"
        KeepEmpty             1
        Font
          Family              Roman
@@ -365,9 +365,9 @@ Style PlaceFigure
        ParSkip               0.4
        BottomSep             0.8
        Align                 Left
-       AlignPossible         Left
        LabelType             Static
-       LabelString           "Place Figure here: "
+       LabelSep              M
+       LabelString           "Place Figure here:"
        Font
          Family              Roman
          Size                Normal
@@ -385,9 +385,9 @@ Style PlaceTable
        ParSkip               0.4
        BottomSep             0.8
        Align                 Left
-       AlignPossible         Left
        LabelType             Static
-       LabelString           "Place Table here: "
+       LabelSep              M
+       LabelString           "Place Table here:"
        Font
          Family              Roman
          Size                Normal
@@ -405,9 +405,8 @@ Style Appendix
        ParSkip               0.4
        BottomSep             0.8
        Align                 Left
-       AlignPossible         Left
        LabelType             Static
-       LabelString           [Appendix]
+       LabelString           "[Appendix]"
        KeepEmpty             1
        Font
          Family              Roman
@@ -431,7 +430,7 @@ End
 
 Style References
        Margin                First_Dynamic
-       LatexType             Item_Environment
+       LatexType             Bib_Environment
        LatexName             thebibliography
        NextNoIndent          1
        LeftMargin            MM
@@ -441,7 +440,7 @@ Style References
        BottomSep             0.7
        ParSep                0.5
        LabelType             Bibliography
-       LabelString           References
+       LabelString           "References"
        LabelBottomSep        0.7
        Align                 Block
        AlignPossible         Block, Left, Right, Center
@@ -466,7 +465,8 @@ Style NoteToEditor
        Align                 Left
        AlignPossible         Block, Left, Right, Center
        LabelType             Static
-       LabelString           "Note to Editor: "
+       LabelSep              M
+       LabelString           "Note to Editor:"
        Font
          Family              Roman
          Size                Normal
@@ -486,7 +486,8 @@ Style TableRefs
        Align                 Block
        AlignPossible         Block, Left, Right, Center
        LabelType             Static
-       LabelString           "References. --- "
+        LabelSep              M
+       LabelString           "References. ---"
        Font
          Family              Roman
          Size                Normal
@@ -505,7 +506,8 @@ Style TableComments
        Align                 Block
        AlignPossible         Block, Left, Right, Center
        LabelType             Static
-       LabelString           "Note. --- "
+        LabelSep              M
+       LabelString           "Note. ---"
        Font
          Family              Roman
          Size                Normal
@@ -513,34 +515,99 @@ Style TableComments
 End
 
 
-Style Caption
+
+
+Style FigCaption
        Margin                First_Dynamic
        LatexType             Command
-       LatexName             caption
-       NeedProtect           1
+       LatexName             figcaption
        LabelSep              xx
        ParSkip               0.4
        TopSep                0.5
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Sensitive
-       LabelString           Caption
+       LabelType             Static
+       LabelString           "Fig. ---"
+       OptionalArgs          1
+End
+
+# Facility style definition
+Style Facility
+       LeftMargin            MMM
+       Margin                Dynamic
+       LatexType             Command
+       InTitle               0
+       LatexName             facility
+       ParSkip               0.4
+       BottomSep             0.4
+       Align                 Block
+       AlignPossible         Block, Left, Right, Center
+       LabelType             Static
+       LabelSep              M
+       LabelString           "Facility:"
+       Font
+         Family              Roman
+         Shape               Up
+         Size                Normal
+       EndFont
        LabelFont
-         Series              Bold
+         Family              Roman
+         Shape               Italic
+         Size                Normal
        EndFont
 End
 
+# Objectname style definition
+Style Objectname
+       LeftMargin            MMM
+       Margin                Dynamic
+       LatexType             Command
+       InTitle               0
+       LatexName             objectname
+       ParSkip               0.4
+       BottomSep             0.4
+       Align                 Block
+       AlignPossible         Block, Left, Right, Center
+       LabelType             Static
+       LabelSep              M
+       LabelString           "Obj:"
+       OptionalArgs          1
+       Font
+         Family              Roman
+         Shape               Up
+         Size                Normal
+       EndFont
+       LabelFont
+         Family              Roman
+         Shape               Italic
+         Size                Normal
+       EndFont
+End
 
-Style FigCaption
-       Margin                First_Dynamic
+# Dataset style definition
+Style Dataset
+       LeftMargin            MMM
+       Margin                Dynamic
        LatexType             Command
-       LatexName             figcaption
-       LatexParam            [FileName]
-       LabelSep              xx
+       InTitle               0
+       LatexName             dataset
        ParSkip               0.4
-       TopSep                0.5
+       BottomSep             0.4
        Align                 Block
-       AlignPossible         Block, Left
+       AlignPossible         Block, Left, Right, Center
        LabelType             Static
-       LabelString           "Fig. --- "
+       LabelSep              M
+       LabelString           "Dataset:"
+       OptionalArgs          1
+       Font
+         Family              Roman
+         Shape               Up
+         Size                Normal
+       EndFont
+       LabelFont
+         Family              Roman
+         Shape               Italic
+         Size                Normal
+       EndFont
 End
+