- aastex.lyx: use insets of actual layout

- ACM-sigplan.lyx: remove unnecessary ERT
- apa.lyx, latex8.lyx: typographic fixes

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

lib/templates/ACM-sigplan.lyx

@@ -1,9 +1,10 @@
 #LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 341
+\lyxformat 344
 \begin_document
 \begin_header
 \textclass sigplanconf
 \options natbib
+\use_default_options false
 \language english
 \inputencoding default
 \font_roman default
@@ -90,25 +91,11 @@ The Conference expects 2 infos that are separated by
 
 \begin_layout Title
 Example ACM Paper
-\begin_inset ERT
+\begin_inset Foot
-status collapsed
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-thanks{
-\end_layout
-
-\end_inset
-
 This work was supported by ...
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset

lib/templates/aastex.lyx

@@ -1,5 +1,5 @@
 #LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 341
+\lyxformat 344
 \begin_document
 \begin_header
 \textclass aastex
@@ -8,6 +8,7 @@
 \shorttitle{}
 \shortauthors{}
 \end_preamble
+\use_default_options false
 \language english
 \inputencoding default
 \font_roman default
@@ -41,6 +42,7 @@
 \tracking_changes false
 \output_changes false
 \author "" 
+\author "" 
 \end_header
 
 \begin_body
@@ -51,14 +53,11 @@
 
 \begin_layout Author
 <Author 1>
-\begin_inset ERT
+\begin_inset Flex altaffilmark
-status collapsed
+status open
 
 \begin_layout Plain Layout
-
+1
-
-\backslash
-altaffilmark{1}
 \end_layout
 
 \end_inset
@@ -76,14 +75,13 @@ altaffilmark{1}
 
 \begin_layout Author
 <Author 2>
-\begin_inset ERT
+
+\begin_inset Flex altaffilmark
 status collapsed
 
 \begin_layout Plain Layout
 
-
+2,3
-\backslash
-altaffilmark{2,3}
 \end_layout
 
 \end_inset
@@ -101,14 +99,11 @@ altaffilmark{2,3}
 
 \begin_layout Author
 <Author 3>
-\begin_inset ERT
+\begin_inset Flex altaffilmark
 status collapsed
 
 \begin_layout Plain Layout
-
+3
-
-\backslash
-altaffilmark{3}
 \end_layout
 
 \end_inset
@@ -120,41 +115,46 @@ altaffilmark{3}
 <Institution and Address>
 \end_layout
 
-\begin_layout Standard
+\begin_layout Altaffilation
+1
 \begin_inset ERT
 status collapsed
 
 \begin_layout Plain Layout
-
+}{
-
-\backslash
-altaffiltext{1}{Visiting Astronomer, etc.}
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-
-\backslash
-altaffiltext{2}{Current Address, etc.}
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-
-\backslash
-altaffiltext{3}{Visiting Astronomer, etc.}
 \end_layout
 
 \end_inset
 
+Visiting Astronomer, etc.
+\end_layout
+
+\begin_layout Altaffilation
+2
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+}{
+\end_layout
+
+\end_inset
+
+Current Address, etc.
+\end_layout
+
+\begin_layout Altaffilation
+3
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+}{
+\end_layout
+
+\end_inset
+
+Visiting Astronomer, etc.
  
 \end_layout
 
@@ -261,16 +261,7 @@ apj
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Newpage clearpage
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-clearpage
-\end_layout
-
 \end_inset
 
 

lib/templates/apa.lyx

@@ -1,5 +1,5 @@
 #LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 341
+\lyxformat 344
 \begin_document
 \begin_header
 \textclass apa
@@ -24,6 +24,7 @@
 \acknowledgements{Author notes, acknowledgements, contact information go here \ldots}
 \end_preamble
 \options jou
+\use_default_options false
 \language english
 \inputencoding auto
 \font_roman default
@@ -204,12 +205,11 @@ status collapsed
 
 \end_inset
 
- in TeX mode, e.
+ in TeX mode, e.g.
-\begin_inset space \thinspace{}
+\begin_inset space \space{}
 \end_inset
 
-g.
+
- 
 \begin_inset Quotes eld
 \end_inset
 
@@ -229,12 +229,11 @@ My colleague's name
 \end_inset
 
 .
- Note further that you must use the corresponding Affiliation style, i.
+ Note further that you must use the corresponding Affiliation style, i.e.
-\begin_inset space \thinspace{}
+\begin_inset space \space{}
 \end_inset
 
-e.
+
- 
 \emph on
 TwoAffiliations
 \emph default

lib/templates/latex8.lyx

@@ -1,8 +1,9 @@
 #LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 341
+\lyxformat 344
 \begin_document
 \begin_header
 \textclass latex8
+\use_default_options false
 \language english
 \inputencoding default
 \font_roman default
@@ -36,6 +37,7 @@
 \tracking_changes false
 \output_changes false
 \author "" 
+\author "" 
 \end_header
 
 \begin_body
@@ -66,11 +68,7 @@ status collapsed
 
 
 \backslash
-and
+and 
-\end_layout
-
-\begin_layout Plain Layout
-
 \end_layout
 
 \end_inset
@@ -89,7 +87,7 @@ Another Institution
 
 \begin_layout Standard
 \begin_inset ERT
-status collapsed
+status open
 
 \begin_layout Plain Layout