jasatex.layout: add missing short title

-also resolve a potential package clash with natbib

diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout
index cd9fe4e2104862a76745adb54d8b769d62bc490f..9b5d07fe51781fc632cd1d770a42295826b82132 100644 (file)
--- a/lib/layouts/jasatex.layout
+++ b/lib/layouts/jasatex.layout
@@ -5,14 +5,15 @@
 
 Format 35
 
-Columns                 1
-Sides                   1
-SecNumDepth             3
-TocDepth                3
-DefaultStyle            Standard
+Columns                        1
+Sides                  1
+SecNumDepth            3
+TocDepth               3
+DefaultStyle           Standard
+Provides natbib                1
 
 ClassOptions
-       FontSize                10|11|12
+       FontSize        10|11|12
 end
 
 Preamble
@@ -60,6 +61,7 @@ Style Title
        LatexName               title
        Category                FrontMatter
        InTitle                 1
+       OptionalArgs            1
        ParSkip                 0.4
        ItemSep                 0
        TopSep                  0

diff --git a/lib/templates/JASA.lyx b/lib/templates/JASA.lyx
index aa04278645cbd714f2759175d6fea905b9e177ce..e230a498b6bbe1cfc193b113e7b516038e7c2285 100644 (file)
--- a/lib/templates/JASA.lyx
+++ b/lib/templates/JASA.lyx
@@ -76,28 +76,6 @@ nopreprint
 \end_inset
 
 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-
-\series bold
-Note
-\series default
-: Using the citation style 
-\family sans
-Natbib
-\family default
- in the document settings would lead to LaTeX errors, because JasaTeX uses
- its own natbib mechanism.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Preprint number

diff --git a/status.20x b/status.20x
index e7bced2da13c31caadce81c2a9db2e8c9cbd76ea..8d3600f542be63c165691dc91a9f9f8206f20c65 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -68,6 +68,9 @@ What's new
 
 - Correct output of text in changed font size and with decorations (bug 8424).
 
+- Layout file for JASATeX: solved problems with natbib and added missing
+  short title for the document title
+
 
 * USER INTERFACE