X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2FRJournal.layout;h=43c02b411ba36ebde584abee9350811dd7666a1b;hb=b4dcad83b2f6e3fce28b4e04cc1abc8d654f9bfe;hp=e00d0e4381f77b305f9a52ba6ab49e6e4cc5e102;hpb=4beba4e8f87ca218473448caf10563b99faf7b21;p=lyx.git

diff --git a/lib/layouts/RJournal.layout b/lib/layouts/RJournal.layout
index e00d0e4381..43c02b411b 100644
--- a/lib/layouts/RJournal.layout
+++ b/lib/layouts/RJournal.layout
@@ -1,10 +1,15 @@
-#  \DeclareLaTeXClass[report,RJournal.sty,booktabs.sty,natbib.sty]{report (R Journal)}
+#% Do not delete the line below; configure depends on this
+#  \DeclareLaTeXClass[report,RJournal.sty,booktabs.sty,natbib.sty]{R Journal}
+#  \DeclareCategory{Reports}
+# Author: Yihui Xie
+# Modified by: Scott Kostyshak
 
-Format 35
+Format 60
 
 Input stdclass.inc
 
 Provides natbib-internal 1
+Provides url             1
 
 ClassOptions
 	Other		  a4paper
@@ -14,17 +19,8 @@ DefaultModule   knitr
 
 AddToPreamble
 	\usepackage{RJournal}
-	\usepackage[round]{natbib}
-	\bibliographystyle{abbrvnat}
 	\usepackage{booktabs}
 
-	% use Schunk, Sinput and Soutput environments defined by RJournal
-	<<include=FALSE>>=
-	render_sweave()
-	set_header(highlight = '')
-	knit_hooks$set(document = hook_rjournal)
-	@
-
 	\fancyhf{}
 	\fancyhead[LO,RE]{\textsc{Contributed Article}}
 	\fancyhead[RO,LE]{\thepage}
@@ -40,31 +36,50 @@ AddToPreamble
 	}
 EndPreamble
 
-InsetLayout "Flex:Abstract"
-	LabelString           "Abstract"
+Style Abstract
+	Margin                First_Dynamic
 	LatexType             Command
-	LaTexName             abstract
-	LyXType               Custom
+	InTitle               0
+	LatexName             abstract
+	LeftMargin            MMM
+	LabelIndent           MMM
+	RightMargin           MMM
+	ParIndent             MM
+	TopSep                0.7
+	BottomSep             0.7
+	Align                 Block
+	LabelType             Static
+	LabelString           "Abstract."
+	LabelSep              M
+	Font
+	  Size                Small
+	EndFont
 	LabelFont
+	  Shape               Smallcaps
 	  Color               latex
 	EndFont
 End
 
-InsetLayout "Flex:Address"
-	LabelString           "Address"
+Style Address
+	Category	      FrontMatter
+	Margin                Static
 	LatexType             Command
-	LaTexName             address
-	LyXType               Custom
-	LabelFont
-	  Color               latex
-	EndFont
+	LatexName             address
+	ParSkip               0.4
+	BottomSep             1.5
+	ParSep                1.5
+	Align                 Left
+	AlignPossible         Block, Left, Right, Center
+	LabelType             No_Label
 End
 
 InsetLayout "Flex:Email"
 	LabelString           "Email"
 	LatexType             Command
+	Decoration            Classic
 	LaTexName             email
 	LyXType               Custom
+	ForcePlain            1
 	LabelFont
 	  Color               latex
 	EndFont