X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fjss.layout;h=5dafd831ff7a9ccdc288b010666aead1661dfde4;hb=4fa5cbddcef5d4090d29850da38e6dc20d961b7c;hp=476b3ad04733d479d9b690dfe14c8bc27e8cf8eb;hpb=e6c225d582baedfe664200a6da8b8f3bb548ac31;p=lyx.git

diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout
index 476b3ad047..5dafd831ff 100644
--- a/lib/layouts/jss.layout
+++ b/lib/layouts/jss.layout
@@ -8,7 +8,7 @@
 # License: GNU GPL version 2 or later
 # JSS LaTeX files can be downloaded from http://www.jstatsoft.org/downloads/JSSstyle.zip
 
-Format 49
+Format 59
 
 # Read the definitions from article.layout
 Input article.layout
@@ -20,6 +20,23 @@ AddToPreamble
     %\usepackage{Sweave}
 EndPreamble
 
+NoStyle "Right Address"
+
+Style Section
+	LabelString			\thesection.
+End
+
+Style Subsection
+	LabelString			\thesubsection.
+End
+
+Style Subsubsection
+	LabelType			No_Label
+	Font
+	  Shape				Italic
+	EndFont
+End
+
 Style Title
 	InPreamble			1
 	Font
@@ -27,20 +44,10 @@ Style Title
 	EndFont
 End
 
-Style "Plain Title"
-	CopyStyle			Title
-	LatexName			Plaintitle
-End
-
 Style Author
 	InPreamble			1
 End
 
-Style "Plain Author"
-	CopyStyle			Author
-	LatexName			Plainauthor
-End
-
 Style Abstract
 	Category			FrontMatter
 	LatexName			Abstract
@@ -48,7 +55,8 @@ Style Abstract
 	InTitle				1
 	InPreamble			1
 	Margin				Dynamic
-	LeftMargin			MMNMM
+	LeftMargin			M
+	NextNoIndent		1
 	ParSkip				0.4
 	BottomSep			1.5
 	TopSep				1.5
@@ -58,7 +66,6 @@ Style Abstract
 	AlignPossible		Block, Left, Right, Center
 	Labeltype			Centered
 	LabelString			"Abstract"
-	Labelsep			M
 	LabelFont
 	  Series			Bold
 	EndFont
@@ -67,7 +74,7 @@ End
 Style Address
 	CopyStyle			Abstract
 	LatexName			Address
-	Labeltype			Above
+	LabelType			Above
 	LabelString			"Affiliation:"
 	Margin				Static
 	LeftMargin			M
@@ -78,22 +85,22 @@ Style Address
 End
 
 Style Keywords
-	CopyStyle			Abstract	
-	LatexName			Keywords
-	Font
-	  Size				Small
-	EndFont
 	Margin				Dynamic
-	LeftMargin			MMN
-	RightMargin			MMN
-	Align				Block
+	LatexType			Command
+	LatexName			Keywords
+	Category			FrontMatter
+	InTitle				1
+	InPreamble			1
 	NextNoIndent		1
 	BottomSep			0.5
 	ParSkip				0.4
-	Labeltype			Static
+	Align				Block
+	LabelSep			xx
+	LabelType			Static
 	LabelString			"Keywords:"
 	LabelFont
-	  Shape				Italic
+	  Color				Green
+	  Series			Bold
 	EndFont
 End
 
@@ -103,13 +110,25 @@ Style "Plain Keywords"
 	LabelString			"Plain Keywords:"
 End
 
+Style "Plain Title"
+	CopyStyle			Keywords
+	LatexName			Plaintitle
+	LabelString			"Plain Title:"
+End
+
 Style "Short Title"
 	CopyStyle			Keywords
 	LatexName			Shorttitle
 	LabelString			"Short Title:"
 End
 
-InsetLayout "Flex:pkg"
+Style "Plain Author"
+	CopyStyle			Keywords
+	LatexName			Plainauthor
+	LabelString			"Plain Author:"
+End
+
+InsetLayout "Flex:Pkg"
 	LyxType				custom
 	LabelString			pkg
 	LatexType			command
@@ -129,14 +148,13 @@ InsetLayout "Flex:pkg"
 	  Color				latex
 	  Size				Small
 	EndFont
-	InToc				true
 	HTMLTag				pkg
 	ResetsFont			true
 	spellcheck			false
 End
 
-InsetLayout "Flex:proglang"
-	CopyStyle			"Flex:pkg"
+InsetLayout "Flex:Proglang"
+	CopyStyle			"Flex:Pkg"
 	LabelString			proglang
 	LatexName			proglang
 	Font
@@ -150,8 +168,9 @@ InsetLayout "Flex:proglang"
 	HTMLTag				proglang
 End
 
-InsetLayout "Flex:code"
-	CopyStyle			"Flex:proglang"
+InsetLayout "Flex:Code"
+	CopyStyle			"Flex:Proglang"
+	Spellcheck			0
 	LabelString			code
 	LatexName			code
 	HTMLTag				code
@@ -164,22 +183,42 @@ InsetLayout "Flex:E-mail"
 	HTMLTag				email
 End
 
-Style "Code Chunk"
-	Category			MainText
+InsetLayout "Flex:Code Chunk"
+	CopyStyle			"Flex:Pkg"
 	LatexType			Environment
 	LatexName			CodeChunk
+	Decoration			Classic
+	Spellcheck			0
+	ParbreakIsNewline	1
+	FreeSpacing			1
+	PassThru			1
+	KeepEmpty			1
+	LabelString			"Code Chunk"
+	Font
+	  Family			Typewriter
+	EndFont
+	LabelFont
+	  Color				Green
+	EndFont
+End
+
+Style "Code"
+	LatexName			Code
+	LabelString			"Code"
+	LatexType			Environment
+	LatexName			Code
+	Spellcheck			0
 	NextNoIndent		1
 	ParbreakIsNewline	1
 	FreeSpacing			1
 	PassThru			1
 	KeepEmpty			1
 	NewLine				0
-	TopSep				0.7
-	BottomSep			0.7
+	TopSep				0
+	BottomSep			0
 	Align				Block
 	AlignPossible		Block
 	Labeltype			Above
-	LabelString			"Code Chunk"
 	Font
 	  Family			Typewriter
 	EndFont
@@ -191,22 +230,14 @@ Style "Code Chunk"
 	HTMLItem			p
 End
 
-Style "Standard Code"
-	CopyStyle			"Code Chunk"
-	LatexName			Code
-	LabelString			"Code"
-	TopSep				0
-	BottomSep			0
-End
-
 Style "Code Input"
-	CopyStyle			"Standard Code"
+	CopyStyle			"Code"
 	LatexName			CodeInput
 	LabelString			"Code Input"
 End
 
 Style "Code Output"
-	CopyStyle			"Standard Code"
+	CopyStyle			"Code"
 	LatexName			CodeOutput
 	LabelString			"Code Output"
 End