X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Felsarticle.layout;h=943962cd6938a0e9ba9e1adf00952cad8a55819f;hb=f8f9eec358c5dcd45665defed13d51c0b304fb8e;hp=f7102ada3b6fe08d1fb4ff48d64ef9e0a956051f;hpb=e4018a327e04804ec06f86f8aa27e78a1c62a8af;p=lyx.git

diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout
index f7102ada3b..943962cd69 100644
--- a/lib/layouts/elsarticle.layout
+++ b/lib/layouts/elsarticle.layout
@@ -1,14 +1,15 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[elsarticle,natbib.sty,pifont.sty]{article (Elsevier)}
+#  \DeclareLaTeXClass[elsarticle,natbib.sty,pifont.sty]{Elsevier}
+#  \DeclareCategory{Articles}
 # elsarticle textclass definition file.
 # Author: Uwe Stöhr (uwestoehr@web.de)
 
-Format 36
+Format 68
 
-Columns			1
-Sides			1
-SecNumDepth		3
-TocDepth		3
+Columns				1
+Sides				1
+SecNumDepth			3
+TocDepth			3
 DefaultStyle		Standard
 Provides natbib		1
 Provides refstyle	1
@@ -17,6 +18,8 @@ ClassOptions
 	FontSize		10|11|12
 end
 
+TitleLatexType Environment
+TitleLatexName frontmatter
 
 # This is just to show how to declare the default font.
 # The defaults are exactly those shown here.
@@ -30,13 +33,14 @@ EndFont
 
 
 Style Standard
+	Category		MainText
 	Margin			Static
 	LatexType		Paragraph
 	LatexName		dummy
 	ParIndent		MM
 	ParSkip			0.4
 	Align			Block
-	AlignPossible		Block, Left, Right, Center
+	AlignPossible	Block, Left, Right, Center
 	LabelType		No_Label
 End
 
@@ -47,43 +51,17 @@ Input stdsections.inc
 Input stdstarsections.inc
 Input stdlayouts.inc
 
-NoStyle Chapter
-NoCounter chapter
-NoStyle Chapter*
-
-
-Style BeginFrontmatter
-  Margin	Dynamic
-  LatexType	Command
-  LatexName	begin{frontmatter}
-  Category	FrontMatter
-  KeepEmpty	1
-  ParSkip	0.4
-  Align		Block
-  LabelSep	xx
-  LabelType	Static
-  LabelString	"Begin frontmatter"
-  LabelFont
-    Series	Bold
-    Color	Green
-  EndFont
-End
-
-
-Style EndFrontmatter
-  CopyStyle	BeginFrontmatter
-  LatexName	end{frontmatter}
-  LabelString	"End frontmatter"
-End
-
+NoStyle				Chapter
+NoCounter			chapter
+NoStyle				Chapter*
 
 Style Title
 	Margin			Static
 	LatexType		Command
 	LatexName		title
 	Category		FrontMatter
-	InTitle			0
-	OptionalArgs		0
+	InTitle			1
+	ResetArgs		1
 	ParSkip			0.4
 	ItemSep			0
 	TopSep			0
@@ -94,13 +72,13 @@ Style Title
 	Font
 	  Size			Largest
 	EndFont
-	HTMLTitle             true
+	HTMLTitle		true
 End
 
-
 InsetLayout "Flex:Titlenotemark"
 	LyxType			custom
 	LatexType		command
+	ForcePlain		1
 	LatexName		tnoteref
 	LabelString		"Titlenote mark"
 	Font
@@ -125,8 +103,11 @@ Style "Title footnote"
 	LatexType		Command
 	LatexName		tnotetext
 	Category		FrontMatter
-	InTitle			0
-	OptionalArgs		1
+	InTitle			1
+	Argument 1
+	  LabelString		"Footnote Label"
+	  Tooltip		"Label you refer to in the title"
+	EndArgument
 	ParSkip			0.4
 	BottomSep		0.5
 	Align			Left
@@ -144,8 +125,11 @@ Style Author
 	Margin			Static
 	LatexType		Command
 	Category		FrontMatter
-	InTitle			0
-	OptionalArgs		1
+	InTitle			1
+	Argument 1
+	  LabelString	"Author Label"
+	  Tooltip		"Label you will reference in the address"
+	EndArgument
 	LatexName		author
 	LabelSep		xxx
 	ParSkip			0.4
@@ -163,6 +147,7 @@ End
 InsetLayout "Flex:Authormark"
 	LyxType			custom
 	LatexType		command
+	ForcePlain		1
 	LatexName		fnref
 	LabelString		"Author mark"
 	Font
@@ -185,35 +170,29 @@ End
 Style "Author footnote"
 	CopyStyle		"Title footnote"
 	LatexName		fntext
+	InTitle			1
 	LabelString		"Author footnote:"
+	Argument 1
+	  LabelString	"Author Footnote Label"
+	  Tooltip		"Label you refer to for an author"
+	EndArgument
 End
 
 
 InsetLayout "Flex:CorAuthormark"
-	LyxType			custom
-	LatexType		command
+	CopyStyle		"Flex:Authormark"
 	LatexName		corref
 	LabelString		"CorAuthor mark"
-	Font
-	  Color			foreground
-	  Size			Small
-	  Family		Roman
-	  Shape			Up
-	  Series		Medium
-	  Misc			No_Emph
-	  Misc			No_Noun
-	  Misc			No_Bar
-	EndFont
 	LabelFont
 	  Color			blue
-	  Size			Small
 	EndFont
 End
 
 
 Style "Corresponding author"
-	CopyStyle		"Title footnote"
+	CopyStyle		"Author footnote"
 	LatexName		cortext
+	InTitle			1
 	LabelString		"Corresponding author text:"
 End
 
@@ -223,11 +202,14 @@ Style Address
 	LatexType		Command
 	Category		FrontMatter
 	LatexName		address
-	InTitle			0
-	OptionalArgs		1
+	InTitle			1
+	Argument 1
+	  LabelString	"Address Label"
+	  Tooltip		"Label of the author you refer to"
+	EndArgument
 	ParSkip			0.4
 	Align			Center
-	AlignPossible		Left, Right
+	AlignPossible	Left, Right
 	LabelType		No_Label
 	Font
 	  Shape			Italic
@@ -238,7 +220,12 @@ End
 Style Email
 	CopyStyle		Address
 	LatexName		ead
-	AlignPossible		Block
+	InTitle			1
+	AlignPossible	Block
+	Argument 1
+	  LabelString	"Internet"
+	  Tooltip		"If content is 'url', email becomes an Internet address"
+	EndArgument
 	Font
 	  Shape			Up
 	EndFont
@@ -250,8 +237,8 @@ Style Abstract
 	LatexType		Environment
 	LatexName		abstract
 	Category		FrontMatter
-	InTitle			0
-	NextNoIndent		1
+	InTitle			1
+	NextNoIndent	1
 	LeftMargin		MMM
 	RightMargin		MMM
 	ParIndent		MM
@@ -260,10 +247,10 @@ Style Abstract
 	BottomSep		0.7
 	ParSep			0
 	Align			Block
-	AlignPossible		Block
-	LabelType		Centered_Top_Environment
+	AlignPossible	Block
+	LabelType		Centered
 	LabelString		"Abstract"
-	LabelBottomSep		0.5
+	LabelBottomSep	0.5
 	Font
 	  Size			Small
 	EndFont
@@ -279,9 +266,8 @@ Style Keywords
 	LatexType		Environment
 	LatexName		keyword
 	Category		FrontMatter
-	InTitle			0
-	Align			Left
-	NextNoIndent		1
+	InTitle			1
+	NextNoIndent	1
 	BottomSep		0.5
 	ParSkip			0.4
 	Align			Block
@@ -300,7 +286,8 @@ Style Bibliography
 	LatexType		Bib_Environment
 	LatexName		thebibliography
 	Category		BackMatter
-	NextNoIndent		1
+	NextNoIndent	        1
+	ToggleIndent            Never
 	LeftMargin		MM
 	ParSkip			0.4
 	ItemSep			0
@@ -308,13 +295,15 @@ Style Bibliography
 	BottomSep		0.7
 	ParSep			0.5
 	Align			Block
-	AlignPossible		Block, Left
+	AlignPossible           Block, Left
 	LabelType		Bibliography
 	LabelString		"References"
-	LabelBottomSep		1.2
+	LabelBottomSep          1.2
 	LabelFont
 	  Series		Bold
 	  Size			Larger
 	EndFont
+	TocLevel                1
+	IsTocCaption            0
 End