The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit c5dccc859aefe84f5bb227337000188631feedb1
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Mon Nov 26 05:54:45 2012 +0100
JASATeX: update layout and template
- fix problem with natbib
- add a missing short title that was also already in the template
(patch for branch follows)
diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout
index 3d8db6c..745e34e 100644
--- a/lib/layouts/jasatex.layout
+++ b/lib/layouts/jasatex.layout
@@ -6,14 +6,15 @@
Format 41
-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
@@ -68,6 +69,10 @@ Style Title
ParSep 1
Align Center
AlignPossible Left, Right
+ Argument 1
+ LabelString "Short Title|S"
+ Tooltip "Short title that will appear in header line"
+ EndArgument
LabelType No_Label
Font
Size Largest
@@ -117,8 +122,8 @@ Style "Alternative Affiliation"
LatexType Command
LatexName altaffiliation
Argument 1
- LabelString "Alternative Affiliation Option"
- Tooltip "Option to the alternative affiliation command"
+ LabelString "Affiliation Prefix"
+ Tooltip "A prefix like 'Also at '"
EndArgument
End
diff --git a/lib/templates/JASA.lyx b/lib/templates/JASA.lyx
index aa04278..7dd4e65 100644
--- a/lib/templates/JASA.lyx
+++ b/lib/templates/JASA.lyx
@@ -1,4 +1,4 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
\lyxformat 413
\begin_document
\begin_header
@@ -19,7 +19,6 @@
\font_osf false
\font_sf_scale 100
\font_tt_scale 100
-
\graphics default
\default_output_format default
\output_sync 0
@@ -32,8 +31,8 @@
\use_geometry false
\use_amsmath 1
\use_esint 1
-\use_mhchem 1
\use_mathdots 1
+\use_mhchem 1
\cite_engine basic
\use_bibtopic false
\use_indices false
@@ -78,28 +77,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
@@ -159,11 +136,11 @@ Also at
\begin_inset Note Note
-status collapsed
+status open
\begin_layout Plain Layout
This affiliation appears as footnote.
- The short title should be
+ The prefix should be
\begin_inset Quotes eld
\end_inset
@@ -362,7 +339,7 @@ Bla, bla
placement h
wide false
sideways false
-status collapsed
+status open
\begin_layout Plain Layout
\begin_inset Caption
-----------------------------------------------------------------------
Summary of changes:
lib/layouts/jasatex.layout | 21 +++++++++++++--------
lib/templates/JASA.lyx | 33 +++++----------------------------
2 files changed, 18 insertions(+), 36 deletions(-)
hooks/post-receive
--
The LyX Source Repository
