X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Frsphrase.module;h=ea9df76dea2dd317c87ec64eabbf205a13b5b8f1;hb=a6e20d713816670662e5780004df8e22a7144d1c;hp=f8ebee49535ea3d12753bee9e28ea1deca7ed62f;hpb=b0aa0db10aae4a51d48f060e642f05542e89f370;p=lyx.git

diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module
index f8ebee4953..ea9df76dea 100644
--- a/lib/layouts/rsphrase.module
+++ b/lib/layouts/rsphrase.module
@@ -1,67 +1,66 @@
-#\DeclareLyXModule[rsphrase.sty]{Risk and Safety Statements}
+#\DeclareLyXModule[rsphrase.sty]{Chemistry: Risk and Safety Statements (Obsolete)}
+#\DeclareCategory{Academic Field Specifics}
 #DescriptionBegin
 #Provides two insets and one environment to typeset numbers and phrases of 
-#chemical risk and safety statements. For a description see the file 
-#R-S-statements.lyx in LyX's examples folder.
+#chemical risk and safety statements.
+#Now obsoleted and officially replaced by GHS Hazard-Precautionary statement system in the EU.
 #DescriptionEnd
 #Author: Uwe Stöhr <uwestoehr@web.de>
 
-Format 42
-
-AddToPreamble
-	\usepackage{rsphrase}	% load chemical risk and safety statements
-EndPreamble
+Format 103
 
 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		textlabel2
+	  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		textlabel2
 	EndFont
 End