From f40322081bde2e33cf36f4d37787f76a84b2c51e Mon Sep 17 00:00:00 2001
From: Scott Kostyshak <skostysh@lyx.org>
Date: Tue, 7 May 2013 20:48:28 -0400
Subject: [PATCH] RJournal: change 'Address' Flex inset into a Style

This looks better and gives natural separation between multiple
authors.
---
 lib/layouts/RJournal.layout | 17 ++++++++++-------
 lib/templates/RJournal.lyx  | 22 ++--------------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/lib/layouts/RJournal.layout b/lib/layouts/RJournal.layout
index e7a2df40b4..57a5cb3def 100644
--- a/lib/layouts/RJournal.layout
+++ b/lib/layouts/RJournal.layout
@@ -64,14 +64,17 @@ 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"
diff --git a/lib/templates/RJournal.lyx b/lib/templates/RJournal.lyx
index c46d174b02..b1522ede52 100644
--- a/lib/templates/RJournal.lyx
+++ b/lib/templates/RJournal.lyx
@@ -293,11 +293,7 @@ bibfiles "biblio"
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset Flex Address
-status collapsed
-
-\begin_layout Plain Layout
+\begin_layout Address
 Author A
 \begin_inset Newline newline
 \end_inset
@@ -313,11 +309,6 @@ arg   "newline-insert newline"
 \end_inset
 
 address here
-\end_layout
-
-\end_inset
-
-
 \begin_inset Newline newline
 \end_inset
 
@@ -334,17 +325,8 @@ author.a@email
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset Flex Address
-status collapsed
-
-\begin_layout Plain Layout
+\begin_layout Address
 Author B
-\end_layout
-
-\end_inset
-
-
 \begin_inset Newline newline
 \end_inset