X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Frsphrase.module;h=4dddb0b5a7176b3af7117a9ff5bbc5ecbc09f7e0;hb=a830e51c8ae7d3ab0da4694a7c1d3499db66878f;hp=0704e434ee59047422ee2789164297ee73745665;hpb=182d13ee6aa68c306aa3b2788f6d9ed6c1741f51;p=lyx.git

diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module
index 0704e434ee..4dddb0b5a7 100644
--- a/lib/layouts/rsphrase.module
+++ b/lib/layouts/rsphrase.module
@@ -6,62 +6,60 @@
 #DescriptionEnd
 #Author: Uwe Stöhr <uwestoehr@web.de>
 
-Format 41
-
-AddToPreamble
-	\usepackage{rsphrase}	% load chemical risk and safety statements
-EndPreamble
+Format 54
 
 InsetLayout "Flex:R-S number"
-	LyxType			custom
-	LatexType		command
-	LatexName		rsnumber
-	LabelString		"R-S number"
+	LyxType		custom
+	LatexType	command
+	LatexName	rsnumber
+	Requires	rsphrase
+	LabelString	"R-S number"
 	Font
-	  Color			foreground
-	  Size			Small
-	  Family		Roman
-	  Shape			Up
-	  Series		Medium
-	  Misc			No_Emph
-	  Misc			No_Noun
-	  Misc			No_Bar
+	  Color		foreground
+	  Size		Small
+	  Family	Roman
+	  Shape		Up
+	  Series	Medium
+	  Misc		No_Emph
+	  Misc		No_Noun
+	  Misc		No_Bar
 	EndFont
 	LabelFont
-	  Color			green
-	  Size			Small
+	  Color		green
+	  Size		Small
 	EndFont
 End
 
 InsetLayout "Flex:R-S phrase"
-	CopyStyle 		"Flex:R-S number"
-	LatexName		rsphrase
-	LabelString		"R-S phrase"
+	CopyStyle 	"Flex:R-S number"
+	LatexName	rsphrase
+	LabelString	"R-S phrase"
 End
 
 Style "Safety phrase"
-	LatexType		command
-	LatexName		rsphrase
-	Category		MainText
-	NextNoIndent		1
+	LatexType	command
+	LatexName	rsphrase
+	Requires	rsphrase
+	Category	MainText
+	NextNoIndent	1
 	Argument 1
-		LabelString   "Safety Phrase Option|S"
-		Tooltip       "Optional argument to the rsphrase command"
+	  LabelString	"Phrase Text"
+	  Tooltip	"Argument for statements that requires to specify additional information"
 	EndArgument
-	KeepEmpty		1
-	Margin			Dynamic
-	LabelSep		xx
-	ParSkip			0.0
-	ItemSep			0.2
-	TopSep			0.7
-	BottomSep		0.7
-	ParSep			0.3
-	Align			Block
-	AlignPossible		Block
-	LabelType		Static
-	LabelString		"S phrase:"
+	KeepEmpty	1
+	Margin		Dynamic
+	LabelSep	xx
+	ParSkip		0.0
+	ItemSep		0.2
+	TopSep		0.7
+	BottomSep	0.7
+	ParSep		0.3
+	Align		Block
+	AlignPossible	Block
+	LabelType	Static
+	LabelString	"S phrase:"
 	LabelFont
-		Color		Green
+	  Color		Green
 	EndFont
 End