X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2FRJournal.layout;h=43c02b411ba36ebde584abee9350811dd7666a1b;hb=1a89f89337413adb6188e6265c6e1c49e0969f65;hp=e7a2df40b487e00997580cd36f270be1154e79c0;hpb=9d7d7c38163091d99a72ed661e3ee00e82614dd5;p=lyx.git

diff --git a/lib/layouts/RJournal.layout b/lib/layouts/RJournal.layout
index e7a2df40b4..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}
@@ -64,21 +60,26 @@ Style Abstract
 	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