- 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

diff --git a/lib/templates/ACM-sigplan.lyx b/lib/templates/ACM-sigplan.lyx
index 35600ef893d31c6fdad6c38e526dfa64f8325a8d..27edb577508b07094c416baad3e0a1e2f7ae9d61 100644 (file)
--- a/lib/templates/ACM-sigplan.lyx
+++ b/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
-status collapsed
+\begin_inset Foot
+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

diff --git a/lib/templates/aastex.lyx b/lib/templates/aastex.lyx
index 27307851f6121d39c70b86ca8bbb5321d00b2f03..92e2c74ae6695fedcdc0cfc00617399412780f72 100644 (file)
--- a/lib/templates/aastex.lyx
+++ b/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
-status collapsed
+\begin_inset Flex altaffilmark
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-altaffilmark{1}
+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
 
-
-\backslash
-altaffilmark{2,3}
+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
-
-
-\backslash
-altaffilmark{3}
+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_inset
 
+Visiting Astronomer, etc.
 \end_layout
 
-\begin_layout Plain Layout
-
+\begin_layout Altaffilation
+2
+\begin_inset ERT
+status collapsed
 
-\backslash
-altaffiltext{2}{Current Address, etc.}
+\begin_layout Plain Layout
+}{
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
 
+Current Address, etc.
 \end_layout
 
-\begin_layout Plain Layout
-
+\begin_layout Altaffilation
+3
+\begin_inset ERT
+status collapsed
 
-\backslash
-altaffiltext{3}{Visiting Astronomer, etc.}
+\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
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-clearpage
-\end_layout
-
+\begin_inset Newpage clearpage
 \end_inset
 
 

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

diff --git a/lib/templates/latex8.lyx b/lib/templates/latex8.lyx
index 3fb666b9bce5ce677b9353a7a25be885f1757a92..70a3a05b4dd466bfa2511cc1a4fa241d18d2b0b0 100644 (file)
--- a/lib/templates/latex8.lyx
+++ b/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
-\end_layout
-
-\begin_layout Plain Layout
-
+and 
 \end_layout
 
 \end_inset
@@ -89,7 +87,7 @@ Another Institution
 
 \begin_layout Standard
 \begin_inset ERT
-status collapsed
+status open
 
 \begin_layout Plain Layout