]> git.lyx.org Git - lyx.git/commitdiff
- aastex.layout: introduce new environments and insets to get rid of unnecessary ERT
authorUwe Stöhr <uwestoehr@web.de>
Sun, 26 Oct 2008 00:50:15 +0000 (00:50 +0000)
committerUwe Stöhr <uwestoehr@web.de>
Sun, 26 Oct 2008 00:50:15 +0000 (00:50 +0000)
- aas_sample.lyx: update file and remove unneeded ERT

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27124 a592a061-630c-0410-9148-cb99ea01b6c8

lib/examples/aas_sample.lyx
lib/layouts/aastex.layout

index b1787b0c2b61d7fe0b6d549ade62cb007d361e71..dbd2bfc12f3ec71d5231b14168168e31e6d9948f 100644 (file)
@@ -57,28 +57,22 @@ Collapsed Cores in Globular Clusters,  Gauge-Boson Couplings, and AASTeX
 \begin_layout Author
 S.
  Djorgovski
-\begin_inset ERT
-status collapsed
+\begin_inset Flex altaffilmark
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-altaffilmark{1,2,3}
+1,2,3
 \end_layout
 
 \end_inset
 
  and Ivan R.
  King
-\begin_inset ERT
+\begin_inset Flex altaffilmark
 status collapsed
 
 \begin_layout Plain Layout
-
-
-\backslash
-altaffilmark{1}
+1
 \end_layout
 
 \end_inset
@@ -94,14 +88,11 @@ Astronomy Department, University of California, Berkeley, CA 94720
 C.
  D.
  Biemesderfer
-\begin_inset ERT
+\begin_inset Flex altaffilmark
 status collapsed
 
 \begin_layout Plain Layout
-
-
-\backslash
-altaffilmark{4,5}
+4,5
 \end_layout
 
 \end_inset
@@ -125,14 +116,11 @@ aastex-help@aas.org
 R.
  J.
  Hanisch
-\begin_inset ERT
+\begin_inset Flex altaffilmark
 status collapsed
 
 \begin_layout Plain Layout
-
-
-\backslash
-altaffilmark{5}
+5
 \end_layout
 
 \end_inset
@@ -144,69 +132,85 @@ altaffilmark{5}
 Space Telescope Science Institute, Baltimore, MD 21218
 \end_layout
 
-\begin_layout Standard
+\begin_layout Altaffilation
+1
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
-
-\backslash
-altaffiltext{1}{Visiting Astronomer, Cerro Tololo Inter-American Observatory.
- CTIO is operated by AURA, Inc.
-\backslash
- under contract to the National Science Foundation.} 
+}{
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
+
+Visiting Astronomer, Cerro Tololo Inter-American Observatory.
+ CTIO is operated by AURA, Inc.
+\begin_inset space \space{}
+\end_inset
 
+under contract to the National Science Foundation.
 \end_layout
 
-\begin_layout Plain Layout
+\begin_layout Altaffilation
+2
+\begin_inset ERT
+status collapsed
 
+\begin_layout Plain Layout
 
-\backslash
-altaffiltext{2}{Society of Fellows, Harvard University.} 
+}{
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
 
+Society of Fellows, Harvard University.
 \end_layout
 
-\begin_layout Plain Layout
+\begin_layout Altaffilation
+3
+\begin_inset ERT
+status collapsed
 
+\begin_layout Plain Layout
 
-\backslash
-altaffiltext{3}{present address: Center for Astrophysics, 60 Garden Street,
- Cambridge, MA 02138} 
+}{
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
 
+present address: Center for Astrophysics, 60 Garden Street, Cambridge, MA
+ 02138
 \end_layout
 
-\begin_layout Plain Layout
+\begin_layout Altaffilation
+4
+\begin_inset ERT
+status collapsed
 
+\begin_layout Plain Layout
 
-\backslash
-altaffiltext{4}{Visiting Programmer, Space Telescope Science Institute}
+}{
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
 
+Visiting Programmer, Space Telescope Science Institute
 \end_layout
 
-\begin_layout Plain Layout
+\begin_layout Altaffilation
+5
+\begin_inset ERT
+status collapsed
 
+\begin_layout Plain Layout
 
-\backslash
-altaffiltext{5}{Patron, Alonso's Bar and Grill}
+}{
 \end_layout
 
 \end_inset
 
-
+Patron, Alonso's Bar and Grill
 \end_layout
 
 \begin_layout Abstract
@@ -645,22 +649,8 @@ reference "tbl-2"
 \begin_inset Formula $M_{\sun}$
 \end_inset
 
-, but the assumption is that the alternate results should be less than 90
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-degr
-\backslash
-\end_layout
-
-\end_inset
-
-out of phase with previous values.
+, but the assumption is that the alternate results should be less than 90°
+ out of phase with previous values.
  We have no observations of 
 \begin_inset ERT
 status collapsed
@@ -1140,16 +1130,7 @@ Spitzer, L.
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-clearpage
-\end_layout
-
+\begin_inset Newpage clearpage
 \end_inset
 
 
@@ -1190,16 +1171,7 @@ This figure has no associated EPS file, so the optional parameter is omitted.
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-clearpage
-\end_layout
-
+\begin_inset Newpage clearpage
 \end_inset
 
 
@@ -1238,6 +1210,7 @@ name "tbl-2"
 \end_layout
 
 \begin_layout Plain Layout
+\align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="7" columns="13">
 <features>
@@ -1359,14 +1332,11 @@ Star
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Flex tablenotemark
 status collapsed
 
 \begin_layout Plain Layout
-
-
-\backslash
-tablenotemark{a}
+a
 \end_layout
 
 \end_inset
@@ -1410,14 +1380,11 @@ tablenotemark{a}
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Flex tablenotemark
 status collapsed
 
 \begin_layout Plain Layout
-
-
-\backslash
-tablenotemark{b}
+b
 \end_layout
 
 \end_inset
@@ -1832,14 +1799,11 @@ tableline
 
 \begin_layout Plain Layout
 -1.2
-\begin_inset ERT
-status collapsed
+\begin_inset Flex tablenotemark
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-tablenotemark{c}
+c
 \end_layout
 
 \end_inset
@@ -2000,14 +1964,11 @@ tablenotemark{c}
 
 \begin_layout Plain Layout
 1.669
-\begin_inset ERT
+\begin_inset Flex tablenotemark
 status collapsed
 
 \begin_layout Plain Layout
-
-
-\backslash
-tablenotemark{c}
+c
 \end_layout
 
 \end_inset
@@ -2198,48 +2159,78 @@ tablenotemark{c}
 
 \end_layout
 
-\begin_layout Plain Layout
+\begin_layout Table note
+a
 \begin_inset ERT
 status collapsed
 
 \begin_layout Plain Layout
 
+}{
+\end_layout
 
-\backslash
-tablenotetext{a}{Sample footnote for table~
-\backslash
-ref{tbl-2} that was generated with the 
-\backslash
-LaTeX
-\backslash
- table environment} 
+\end_inset
+
+Sample footnote for table
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "tbl-2"
+
+\end_inset
+
+ that was generated with the LaTeX table environment
 \end_layout
 
+\begin_layout Table note
+b
+\begin_inset ERT
+status collapsed
+
 \begin_layout Plain Layout
 
+}{
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
+
+Yet another sample footnote for table
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "tbl-2"
+
+\end_inset
 
 
-\backslash
-tablenotetext{b}{Yet another sample footnote for table~
-\backslash
-ref{tbl-2}} 
 \end_layout
 
+\begin_layout Table note
+c
+\begin_inset ERT
+status collapsed
+
 \begin_layout Plain Layout
 
+}{
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
 
+Another sample footnote for table
+\begin_inset space ~
+\end_inset
 
-\backslash
-tablenotetext{c}{Another sample footnote for table~
-\backslash
-ref{tbl-2}}
-\end_layout
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "tbl-2"
 
 \end_inset
 
index 81232751794124fe2467f72ecde28b70202bc7fb..efe77057ac2d0a6dfe67bd9a10fcc59161e667cc 100644 (file)
@@ -1,7 +1,9 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass[aastex]{article (AASTeX)}
 #
-# Author: Mike Ressler <mike.ressler@alum.mit.edu>
+# Authors:
+#  Mike Ressler <mike.ressler@alum.mit.edu>
+#  Uwe Stöhr <uwestoehr@web.de>
 #
 # Disclaimer: Though I am an astronomer at the Jet Propulsion Laboratory, this
 # package was prepared on my own time on my own machine. Neither the United
@@ -28,6 +30,8 @@
 # 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
+# Version 1.4   26-10-2008  - new custom insets for \altaffilmark, \tablenotemark
+#                           - new environments for \altaffiltext and \tablenotetext
 
 
 Format 11
@@ -202,156 +206,198 @@ End
 
 
 Style Title
-       TopSep                2
-       BottomSep             1.3
-       Align                 Center
-       InTitle               0
+       TopSep                  2
+       BottomSep               1.3
+       Align                   Center
+       InTitle                 0
        Font
-         Series              Bold
-         Size                Large
+         Series                Bold
+         Size                  Large
        EndFont
 End
 
 
 Style Author
-       Align                 Center
-       LabelType             No_Label
-       InTitle               0
+       Align                   Center
+       LabelType               No_Label
+       InTitle                 0
        Font
-         Size                Normal
-         Series              Medium
-         Shape               SmallCaps
+         Size                  Normal
+         Series                Medium
+         Shape                 SmallCaps
        EndFont
 End
 
 
 Style Date
-       LabelSep              ""
-       TopSep                1.2
-       Align                 Center
-       InTitle               0
+       InTitle                 0
+       LabelSep                ""
+       TopSep                  1.2
+       Align                   Center
        Font
-         Size                Small
+         Size                  Small
        EndFont
 End
 
 
 Style Abstract
-       LeftMargin            "MMM"
-       RightMargin           "MMM"
-       ParIndent             "MM"
-       TopSep                1.4
-       BottomSep             0.7
-       LabelType             Centered_Top_Environment
-       Align                 Block
-       AlignPossible         Block, Left, Right, Center
+       LeftMargin              "MMM"
+       RightMargin             "MMM"
+       ParIndent               "MM"
+       InTitle                 0
+       TopSep                  1.4
+       BottomSep               0.7
+       LabelType               Centered_Top_Environment
+       Align                   Block
+       AlignPossible           Block, Left, Right, Center
        Font
-         Size                Normal
+         Size                  Normal
        EndFont
        LabelFont
-         Series              Bold
-         Size                Normal
+         Series                Bold
+         Size                  Normal
        EndFont
 End
 
 
 Style Affiliation
-       Margin                Static
-       LatexType             Command
-       InTitle               0
-       LatexName             affil
-       ParSkip               0.4
-       BottomSep             0.4
-       Align                 Center
-       AlignPossible         Block, Left, Right, Center
-       LabelType             No_Label
+       Margin                  Static
+       LatexType               Command
+       LatexName               affil
+       Category                FrontMatter
+       ParSkip                 0.4
+       BottomSep               0.4
+       Align                   Center
+       AlignPossible           Block, Left, Right, Center
+       LabelType               No_Label
+       Font
+         Family                Roman
+         Size                  Normal
+       EndFont
+End
 
+
+Style Altaffilation
+       Margin                  Dynamic
+       LatexType               Command
+       LatexName               altaffiltext
+       Category                FrontMatter
+       ParSkip                 0.4
+       Align                   Block
+       LabelSep                xx
+       LabelType               Static
+       LabelString             "Alternative affiliation:"
+       LabelFont
+         Color                 green
+       EndFont
+End
+
+
+InsetLayout altaffilmark
+       LyxType                 custom
+       LatexType               command
+       LatexName               altaffilmark
+       LabelString             "altaffiliation mark"
        Font
-         Family              Roman
-         Size                Normal
+         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
+       EndFont
+       MultiPar                true
 End
 
 
 Style Keywords
-       LeftMargin            MMM
-       Margin                Dynamic
-       LatexType             Command
-       InTitle               0
-       LatexName             keywords
-       ParSkip               0.4
-       BottomSep             0.4
-       Align                 Block
-       AlignPossible         Block, Left, Right, Center
-       LabelType             Static
-       LabelSep              M
-       LabelString           "Subject headings:"
+       LeftMargin              MMM
+       Margin                  Dynamic
+       LatexType               Command
+       InTitle                 0
+       LatexName               keywords
+       Category                FrontMatter
+       ParSkip                 0.4
+       BottomSep               0.4
+       Align                   Block
+       AlignPossible           Block, Left, Right, Center
+       LabelType               Static
+       LabelSep                M
+       LabelString             "Subject headings:"
        Font
-         Family              Roman
-         Shape               Up
-         Size                Normal
+         Family                Roman
+         Shape                 Up
+         Size                  Normal
        EndFont
        LabelFont
-         Family              Roman
-         Shape               Italic
-         Size                Normal
+         Family                Roman
+         Shape                 Italic
+         Size                  Normal
        EndFont
 End
 
 
 Style Email
-       Margin                Static
-       LatexType             Command
-       InTitle               0
-       LatexName             email
-       ParSkip               0.4
-       BottomSep             0.4
-       Align                 Center
-       AlignPossible         Block, Left, Right, Center
-       LabelType             No_Label
+       Margin                  Static
+       LatexType               Command
+       InTitle                 0
+       LatexName               email
+       Category                FrontMatter
+       ParSkip                 0.4
+       BottomSep               0.4
+       Align                   Center
+       AlignPossible           Block, Left, Right, Center
+       LabelType               No_Label
        Font
-         Family              Roman
-         Size                Normal
-         Shape               Italic
+         Family                Roman
+         Size                  Normal
+         Shape                 Italic
        EndFont
 End
 
 
 Style Acknowledgements
-       Margin                Dynamic
-       LatexType             Command
-       InTitle               0
-       LatexName             acknowledgements
-       TopSep                1.2
-       ParSkip               0.4
-       BottomSep             0.8
-       Align                 Left
-       LabelType             Static
-       LabelString           "[Acknowledgements]"
-       KeepEmpty             1
+       Margin                  Dynamic
+       LatexType               Command
+       InTitle                 0
+       LatexName               acknowledgements
+       TopSep                  1.2
+       ParSkip                 0.4
+       BottomSep               0.8
+       Align                   Left
+       LabelType               Static
+       LabelString             "[Acknowledgements]"
+       KeepEmpty               1
        Font
-         Family              Roman
-         Size                Normal
-         Shape               Italic
+         Family                Roman
+         Size                  Normal
+         Shape                 Italic
        EndFont
 End
 
 
 Style And
-       Margin                Dynamic
-       LatexType             Command
-       InTitle               0
-       LatexName             and
-       TopSep                1.2
-       ParSkip               0.4
-       BottomSep             1.2
-       Align                 Center
-       LabelType             Static
-       LabelString           "and"
-       KeepEmpty             1
+       Margin                  Dynamic
+       LatexType               Command
+       InTitle                 0
+       LatexName               and
+       Category                FrontMatter
+       TopSep                  1.2
+       ParSkip                 0.4
+       BottomSep               1.2
+       Align                   Center
+       LabelType               Static
+       LabelString             "and"
+       KeepEmpty               1
        Font
-         Family              Roman
-         Size                Normal
+         Family                Roman
+         Size                  Normal
        EndFont
 End
 
@@ -399,8 +445,8 @@ End
 Style Appendix
        Margin                Dynamic
        LatexType             Command
-       InTitle               0
        LatexName             appendix
+       Category                BackMatter
        TopSep                1.2
        ParSkip               0.4
        BottomSep             0.8
@@ -432,6 +478,7 @@ Style References
        Margin                First_Dynamic
        LatexType             Bib_Environment
        LatexName             thebibliography
+       Category                BackMatter
        NextNoIndent          1
        LeftMargin            MM
        ParSkip               0.4
@@ -515,6 +562,42 @@ Style TableComments
 End
 
 
+Style "Table note"
+       Margin                  Dynamic
+       LatexType               Command
+       LatexName               tablenotetext
+       ParSkip                 0.4
+       Align                   Block
+       LabelSep                xx
+       LabelType               Static
+       LabelString             "Table note:"
+       LabelFont
+         Color                 magenta
+       EndFont
+End
+
+
+InsetLayout tablenotemark
+       LyxType                 custom
+       LatexType               command
+       LatexName               tablenotemark
+       LabelString             "tablenote mark"
+       Font
+         Color                 foreground
+         Size                  Small
+         Family                Roman
+         Shape                 Up
+         Series                Medium
+         Misc                  No_Emph
+         Misc                  No_Noun
+         Misc                  No_Bar
+       EndFont
+       LabelFont
+         Color                 magenta
+         Size                  Small
+       EndFont
+       MultiPar                true
+End
 
 
 Style FigCaption