- elsarticle.lyx: forgot that elsarticle has a frontmatter environment and a \journal command

- ACM-sigplan.lyx: small cleanup
- elsarticle.layout, iopart.layout, sigplanconf.layout: categorize

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

lib/layouts/elsarticle.layout

@@ -51,9 +51,10 @@ NoStyle Chapter*
 Style Title
 	Margin			Static
 	LatexType		Command
+	LatexName		title
+	Category		FrontMatter
 	InTitle			1
 	OptionalArgs		0
-	LatexName		title
 	ParSkip			0.4
 	ItemSep			0
 	TopSep			0
@@ -72,6 +73,7 @@ Style "Title footnote"
 	Margin			Dynamic
 	LatexType		Command
 	LatexName		tnotetext
+	Category		FrontMatter
 	InTitle			1
 	OptionalArgs		1
 	ParSkip			0.4
@@ -90,6 +92,7 @@ End
 Style Author
 	Margin			Static
 	LatexType		Command
+	Category		FrontMatter
 	InTitle			1
 	OptionalArgs		1
 	LatexName		author
@@ -123,6 +126,7 @@ End
 Style Address
 	Margin			Static
 	LatexType		Command
+	Category		FrontMatter
 	LatexName		address
 	InTitle			1
 	OptionalArgs		1
@@ -150,6 +154,7 @@ Style Abstract
 	Margin			Static
 	LatexType		Environment
 	LatexName		abstract
+	Category		FrontMatter
 	InTitle			1
 	NextNoIndent		1
 	LeftMargin		MMM
@@ -178,6 +183,7 @@ Style Keywords
 	Margin			Dynamic
 	LatexType		Environment
 	LatexName		keyword
+	Category		FrontMatter
 	InTitle			1
 	Align			Left
 	NextNoIndent		1
@@ -198,6 +204,7 @@ Style Bibliography
 	Margin			First_Dynamic
 	LatexType		Bib_Environment
 	LatexName		thebibliography
+	Category		BackMatter
 	NextNoIndent		1
 	LeftMargin		MM
 	ParSkip			0.4

lib/layouts/iopart.layout

@@ -55,9 +55,10 @@ NoStyle Chapter*
 Style Title
 	Margin			Static
 	LatexType		Command
+	LatexName		title
+	Category		FrontMatter
 	InTitle			1
 	OptionalArgs		1
-	LatexName		title
 	ParSkip			0.4
 	ItemSep			0
 	TopSep			0
@@ -123,9 +124,10 @@ End
 Style Author
 	Margin			Static
 	LatexType		Command
-	InTitle			1
 	LatexName		author
-	LabelSep		 xxx
+	Category		FrontMatter
+	InTitle			1
+	LabelSep		xxx
 	ParSkip			0.4
 	TopSep			1.3
 	BottomSep		0.7
@@ -142,22 +144,24 @@ Style Address
 	Margin			Static
 	LatexType		Command
 	LatexName		address
+	Category		FrontMatter
 	InTitle			1
 	ParSkip			0.4
 	Align			Center
 	LabelType		No_Label
+	Font
+	  Shape			Italic
+	EndFont
 End
 
 
 Style Email
-	Margin			Static
+	CopyStyle		Address
-	LatexType		Command
 	LatexName		ead
-	InTitle			1
-	ParSkip			0.4
 	BottomSep		0.5
-	Align			Center
+	Font
-	LabelType		No_Label
+	  Shape			Up
+	EndFont
 End
 
 
@@ -165,6 +169,7 @@ Style Abstract
 	Margin			Static
 	LatexType		Environment
 	LatexName		abstract
+	Category		FrontMatter
 	InTitle			1
 	NextNoIndent		1
 	LeftMargin		MMM
@@ -193,6 +198,7 @@ Style Keywords
 	Margin			Dynamic
 	LatexType		Command
 	LatexName		"noindent{\it Keywords\/}: "
+	Category		FrontMatter
 	InTitle			1
 	ParSkip			0.4
 	BottomSep		0.5
@@ -232,6 +238,7 @@ Style Acknowledgments
 	Margin			Dynamic
 	LatexType		Command
 	LatexName		ack{}
+	Category		BackMatter
 	NeedProtect		1
 	NextNoIndent		1
 	KeepEmpty		1
@@ -253,6 +260,7 @@ Style "Bibliography (plain)"
 	Margin			First_Dynamic
 	LatexType		Bib_Environment
 	LatexName		thebibliography
+	Category		BackMatter
 	NextNoIndent		1
 	LeftMargin		MM
 	ParSkip			0.4
@@ -275,6 +283,7 @@ End
 Style "Bibliography heading"
 	CopyStyle		Section
 	LatexName		section*{References}
+	Category		BackMatter
 	KeepEmpty		1
 	LabelType		Static
 	LabelString		"References"

lib/layouts/sigplanconf.layout

@@ -65,6 +65,7 @@ Style Conference
 	Margin			Dynamic
 	LatexType		Command
 	LatexName		conferenceinfo
+	Category		FrontMatter
 	InTitle			1
 	ParSkip			0.4
 	BottomSep		0.5
@@ -107,27 +108,28 @@ Style Subtitle
 	CopyStyle		Title
 	LatexName		subtitle
 	Font
-	  Size                Larger
+	  Size			Larger
 	EndFont
 End
 
 
 # overwrite the Author definition from stdtitle.inc
 Style Author
-	Margin                Static
+	Margin			Static
-	LatexType             Command
+	LatexType		Command
-	InTitle               1
+	LatexName		authorinfo
-	LatexName             authorinfo
+	Category		FrontMatter
-	LabelSep              xxx
+	InTitle			1
-	ParSkip               0.4
+	LabelSep		xxx
-	TopSep                1.3
+	ParSkip			0.4
-	BottomSep             0.7
+	TopSep			1.3
-	ParSep                0.7
+	BottomSep		0.7
-	Align                 Center
+	ParSep			0.7
-	AlignPossible         None
+	Align			Center
-	LabelType             No_Label
+	AlignPossible		None
+	LabelType		No_Label
 	Font
-	  Size                Large
+	  Size			Large
 	EndFont
 End
 
@@ -150,6 +152,7 @@ Style Abstract
 	Margin			Static
 	LatexType		Environment
 	LatexName		abstract
+	Category		FrontMatter
 	NextNoIndent		1
 	LeftMargin		MMM
 	RightMargin		MMM
@@ -176,6 +179,7 @@ End
 Style Acknowledgments
 	CopyStyle		Abstract
 	LatexName		acks
+	Category		BackMatter
 	InTitle			0
 	LabelBottomsep		0
 	LabelType		Top_Environment

lib/templates/ACM-sigplan.lyx

@@ -72,7 +72,7 @@ The Conference expects 2 infos that are separated by
 \begin_inset Quotes erd
 \end_inset
 
- in TeX-code as in this example.
+ in TeX code.
 \end_layout
 
 \end_inset
@@ -167,10 +167,7 @@ status open
 
 \begin_layout Plain Layout
 At least one autor is required.
-\end_layout
+ The Author field expects 3 infos that are separated by 
-
-\begin_layout Plain Layout
-The Author field expects 3 infos that are separated by 
 \begin_inset Quotes eld
 \end_inset
 
@@ -182,7 +179,7 @@ The Author field expects 3 infos that are separated by
 \begin_inset Quotes erd
 \end_inset
 
- in TeX-code as in these examples.
+ in TeX code.
 \end_layout
 
 \end_inset

lib/templates/elsarticle.lyx

@@ -4,17 +4,8 @@
 \begin_header
 \textclass elsarticle
 \begin_preamble
-% options for the bibliography, see the elsarticle documentation for further
+% specify here the journal
-% information!
+\journal{Example: Nuclear Physics B}
-%\biboptions{longnamesfirst,angle,semicolon}
-
-% sort and compress citations
-% the heading "Reference" is inserted by natbib
-%\usepackage[numbers, sort&compress]{natbib}
-
-% define \newblock to get natbib work with ioparticle
-% (normally only needed for the "thebibliography" environment)
-%\def\newblock{\hskip .11em plus .33em minus .07em}
 \end_preamble
 \language english
 \inputencoding auto
@@ -59,8 +50,9 @@
 status open
 
 \begin_layout Plain Layout
-For the right document class options to get the page format for your journal,
+The Journal is specified in the document preamble! For the right document
- have a look at the elsarticle documentation: 
+ class options to get the page format for your journal, have a look at the
+ elsarticle documentation: 
 \begin_inset Flex URL
 status collapsed
 
@@ -77,6 +69,32 @@ http://www.ctan.org/get/macros/latex/contrib/elsarticle/elsdoc.pdf
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+begin{frontmatter}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+starts the front matter
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Title
@@ -676,6 +694,32 @@ MSC
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+end{frontmatter}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+ends the front matter
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section