include intl/libintl.h that is relative to $TOP_SRCDIR/src

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

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 9345e5950596aa6aaf18372722f0e8a84fdb4a63..8af79373ac48d895f86c65612a6518c373df8c00 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -30,14 +30,15 @@
 # Version 1.3   5/7/04  - Updated for AASTeX 5.2
 
 
+Format 5
 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
@@ -129,8 +130,6 @@ End
 Style TableRefs
 End
 
-Style Caption
-End
 
 Style MathLetters
 End
@@ -150,8 +149,8 @@ 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
@@ -167,7 +166,6 @@ NoStyle Bibliography
 
 Style Section
        Align                 Center
-       AlignPossible         Center
        NextNoIndent          0
        TopSep                2.0
        BottomSep             1.3
@@ -180,7 +178,6 @@ End
 
 Style Subsection
        Align                 Center
-       AlignPossible         Center
        NextNoIndent          0
        TopSep                1.7
        BottomSep             1.1
@@ -193,7 +190,6 @@ End
 
 Style Subsubsection
        Align                 Center
-       AlignPossible         Center
        NextNoIndent          0
        TopSep                1.7
        BottomSep             1.1
@@ -209,7 +205,6 @@ Style Title
        TopSep                2
        BottomSep             1.3
        Align                 Center
-       AlignPossible         Center
        InTitle               0
        Font
          Series              Bold
@@ -220,7 +215,6 @@ End
 
 Style Author
        Align                 Center
-       AlignPossible         Center
        LabelType             No_Label
        InTitle               0
        Font
@@ -235,7 +229,6 @@ Style Date
        LabelSep              ""
        TopSep                1.2
        Align                 Center
-       AlignPossible         Center
        InTitle               0
        Font
          Size                Small
@@ -333,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
@@ -354,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
@@ -374,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
@@ -394,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
@@ -414,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
@@ -440,7 +430,7 @@ End
 
 Style References
        Margin                First_Dynamic
-       LatexType             Item_Environment
+       LatexType             Bib_Environment
        LatexName             thebibliography
        NextNoIndent          1
        LeftMargin            MM
@@ -450,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
@@ -475,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
@@ -495,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
@@ -514,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
@@ -522,22 +515,6 @@ Style TableComments
 End
 
 
-Style Caption
-       Margin                First_Dynamic
-       LatexType             Command
-       LatexName             caption
-       NeedProtect           1
-       LabelSep              xx
-       ParSkip               0.4
-       TopSep                0.5
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Sensitive
-       LabelString           Caption
-       LabelFont
-         Series              Bold
-       EndFont
-End
 
 
 Style FigCaption
@@ -550,7 +527,7 @@ Style FigCaption
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Static
-       LabelString           "Fig. --- "
+       LabelString           "Fig. ---"
        OptionalArgs          1
 End