rsphrase.module: update to layout argument machinery

- also some whitespace fixes
- R-S-statements.lyx: update fileformat and fox some typos

diff --git a/lib/examples/R-S-statements.lyx b/lib/examples/R-S-statements.lyx
index 3c00a3accdc68f628812f7727ff9a72cdc3dfb15..a64df191537f1a4b17b1b26e7c66e9fbfc65e563 100644 (file)
--- a/lib/examples/R-S-statements.lyx
+++ b/lib/examples/R-S-statements.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 459
 \begin_document
 \begin_header
 \textclass scrartcl
@@ -21,18 +21,18 @@ rsphrase
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding utf8
+\inputencoding auto
 \fontencoding global
 \font_roman default
 \font_sans default
 \font_typewriter default
+\font_math auto
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
-
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -55,15 +55,23 @@ rsphrase
 \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
 \papersize default
 \use_geometry false
-\use_amsmath 1
-\use_esint 1
-\use_mhchem 1
-\use_mathdots 1
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
 \cite_engine basic
+\cite_engine_type numerical
+\biblio_style plain
 \use_bibtopic false
 \use_indices false
 \paperorientation portrait
 \suppress_date true
+\justification true
 \use_refstyle 1
 \notefontcolor #0000ff
 \index Index
@@ -73,7 +81,7 @@ rsphrase
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation skip
-\defskip smallskip
+\defskip medskip
 \quotes_language english
 \papercolumns 1
 \papersides 1
@@ -292,17 +300,11 @@ status open
 Some safety statements require some text.
  For these statements, you need to use the phrase environments from LyX's
  environment selection box instead of the inset.
- The required text is specified as optional argument (inserted via the menu
- 
+ The required text is specified as optional argument (inserted via the 
 \family sans
-Insert\SpecialChar \menuseparator
-Short
-\begin_inset space ~
-\end_inset
-
-Title
+Insert
 \family default
-):
+ menu):
 \end_layout
 
 \begin_layout Standard
@@ -332,7 +334,7 @@ S47
 \end_layout
 
 \begin_layout Safety phrase
-\begin_inset Argument
+\begin_inset Argument 1
 status open
 
 \begin_layout Plain Layout
@@ -384,7 +386,7 @@ S43
 \end_layout
 
 \begin_layout Safety phrase
-\begin_inset Argument
+\begin_inset Argument 1
 status open
 
 \begin_layout Plain Layout
@@ -411,7 +413,7 @@ S43
 \end_layout
 
 \begin_layout Safety phrase
-\begin_inset Argument
+\begin_inset Argument 1
 status open
 
 \begin_layout Plain Layout
@@ -466,7 +468,7 @@ Mixing languages is possible without problems:
 \begin_layout Standard
 
 \lang ngerman
-Dies Sicherheitssatz 
+Dies ist Sicherheitssatz 
 \begin_inset Flex R-S number
 status collapsed
 

diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module
index 39107e4820df983abb4925aa1c18bf0f04ca6db9..c39f650184fcab151bf562a280314d804caaa040 100644 (file)
--- a/lib/layouts/rsphrase.module
+++ b/lib/layouts/rsphrase.module
@@ -9,59 +9,59 @@
 Format 43
 
 AddToPreamble
-       \usepackage{rsphrase}   % load chemical risk and safety statements
+       \usepackage{rsphrase}
 EndPreamble
 
 InsetLayout "Flex:R-S number"
-       LyxType                 custom
-       LatexType               command
-       LatexName               rsnumber
-       LabelString             "R-S number"
+       LyxType         custom
+       LatexType       command
+       LatexName       rsnumber
+       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
+       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