The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit 025943868a2888b5d268c2ee0a42c89525a13111
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Mon Nov 26 06:14:04 2012 +0100
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 cd9fe4e..9b5d07f 100644
--- 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 aa04278..e230a49 100644
--- a/lib/templates/JASA.lyx
+++ b/lib/templates/JASA.lyx
@@ -78,28 +78,6 @@ nopreprint
\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
AIP/123-QED
\begin_inset Note Note
diff --git a/status.20x b/status.20x
index e7bced2..8d3600f 100644
--- 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
-----------------------------------------------------------------------
Summary of changes:
lib/layouts/jasatex.layout | 14 ++++++++------
lib/templates/JASA.lyx | 22 ----------------------
status.20x | 3 +++
3 files changed, 11 insertions(+), 28 deletions(-)
hooks/post-receive
--
The LyX Source Repository
