remove spaces from label strings, part 2

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

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index e0374e2566a8f8ff92fea6eeb56825e5007a2d53..e8b20591dc23617fca564907c566b026f27e27a8 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -27,6 +27,7 @@
 #                         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
 
 
 Columns                 1
@@ -137,6 +138,14 @@ 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
@@ -326,7 +335,7 @@ Style Acknowledgements
        Align                 Left
        AlignPossible         Left
        LabelType             Static
-       LabelString           [Acknowledgements]
+       LabelString           "[Acknowledgements]"
        KeepEmpty             1
        Font
          Family              Roman
@@ -347,7 +356,7 @@ Style And
        Align                 Center
        AlignPossible         Center
        LabelType             Static
-       LabelString           and
+       LabelString           "and"
        KeepEmpty             1
        Font
          Family              Roman
@@ -367,7 +376,8 @@ Style PlaceFigure
        Align                 Left
        AlignPossible         Left
        LabelType             Static
-       LabelString           "Place Figure here: "
+       LabelSep              M
+       LabelString           "Place Figure here:"
        Font
          Family              Roman
          Size                Normal
@@ -387,7 +397,8 @@ Style PlaceTable
        Align                 Left
        AlignPossible         Left
        LabelType             Static
-       LabelString           "Place Table here: "
+       LabelSep              M
+       LabelString           "Place Table here:"
        Font
          Family              Roman
          Size                Normal
@@ -407,7 +418,7 @@ Style Appendix
        Align                 Left
        AlignPossible         Left
        LabelType             Static
-       LabelString           [Appendix]
+       LabelString           "[Appendix]"
        KeepEmpty             1
        Font
          Family              Roman
@@ -441,7 +452,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 +477,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 +498,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 +518,8 @@ Style TableComments
        Align                 Block
        AlignPossible         Block, Left, Right, Center
        LabelType             Static
-       LabelString           "Note. --- "
+        LabelSep              M
+       LabelString           "Note. ---"
        Font
          Family              Roman
          Size                Normal
@@ -524,7 +538,7 @@ Style Caption
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Sensitive
-       LabelString           Caption
+       LabelString           "Caption"
        LabelFont
          Series              Bold
        EndFont
@@ -535,12 +549,93 @@ Style FigCaption
        Margin                First_Dynamic
        LatexType             Command
        LatexName             figcaption
-       LatexParam            [FileName]
        LabelSep              xx
        ParSkip               0.4
        TopSep                0.5
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Static
-       LabelString           "Fig. --- "
+       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
+         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
+
+# Dataset style definition
+Style Dataset
+       LeftMargin            MMM
+       Margin                Dynamic
+       LatexType             Command
+       InTitle               0
+       LatexName             dataset
+       ParSkip               0.4
+       BottomSep             0.4
+       Align                 Block
+       AlignPossible         Block, Left, Right, Center
+       LabelType             Static
+       LabelSep              M
+       LabelString           "Dataset:"
+       OptionalArgs          1
+       Font
+         Family              Roman
+         Shape               Up
+         Size                Normal
+       EndFont
+       LabelFont
+         Family              Roman
+         Shape               Italic
+         Size                Normal
+       EndFont
+End
+