diff options
author | Karl Berry <karl@freefriends.org> | 2006-06-30 13:18:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2006-06-30 13:18:19 +0000 |
commit | 587e2649317c29ebe59d9ab905a972faa3452e6c (patch) | |
tree | dce6f5589c163639ad18825725f42f56ead58edc /Master/texmf-dist/tex/latex/mhchem/rsphrase.sty | |
parent | 2848e8054ecf9fb4840f537847372fbf6654e383 (diff) |
mhchem update
git-svn-id: svn://tug.org/texlive/trunk@1731 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/mhchem/rsphrase.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/mhchem/rsphrase.sty | 99 |
1 files changed, 76 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty b/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty index b180595571f..60b67112090 100644 --- a/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty +++ b/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty @@ -1,5 +1,5 @@ %% rsphrase.sty -%% Copyright 2004-2005 M.a-r.t-i.n H.e-n.s-e.l +%% Copyright 2004-2006 M.a-r.t-i.n H.e-n.s-e.l % % The original phrases are taken from % http://europa.eu.int/comm/environment/dansub/pdfs/annex3_en.pdf and @@ -48,7 +48,7 @@ % mhchem.pdf, legal.txt and whatsnew.txt. % % -\ProvidesPackage{rsphrase}[2005/07/15 v3.00 Risk and Safety Phrases (mhchem bundle)] +\ProvidesPackage{rsphrase}[2006/06/23 v3.03 Risk and Safety Phrases (mhchem bundle)] \RequirePackage{ifthen} \RequirePackage{textcomp} @@ -107,10 +107,29 @@ \def\mhchem@rs@empty{} \def\mhchem@rs@warning@german{\PackageWarning{rsphrase}{% - Your use the language setting german. rsphrase% - \MessageBreak only knows the current German spelling (ngerman)% - \MessageBreak which therefore is used for all "german"% - \MessageBreak phrases in this document}} + You use the language setting german (or austrian or% + \MessageBreak germanb). rsphrase only knows the current German + \MessageBreak spelling (ngerman or naustrian) which will be + \MessageBreak used for all "german" phrases in this document% + \MessageBreak }} + +\newcommand*{\mhchem@iflanguagename}[1]{%- from Heiko Oberdiek and Markus Kohm in de.comp.text.tex + \begingroup + \edef\x{#1}% + \ifnum\language=0 + \def\y{english}% + \else + \edef\y{\languagename}% + \fi + \@onelevel@sanitize\x + \@onelevel@sanitize\y + \expandafter\endgroup + \ifx\x\y + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi +} \newcommand{\rsnumber}[2]% []% @@ -119,23 +138,40 @@ {% \gdef\mhchem@rs@phrase{\mhchem@rs@empty}% % - \iflanguage{danish}{\mhchem@rs@data@danish[#1]{#2}}{% + \mhchem@iflanguagename{danish}{\mhchem@rs@data@danish[#1]{#2}}{% % - \iflanguage{english}{\mhchem@rs@data@english[#1]{#2}}{% = USenglish, american - \iflanguage{UKenglish}{\mhchem@rs@data@english[#1]{#2}}{% = british + \mhchem@iflanguagename{english}{\mhchem@rs@data@english[#1]{#2}}{% = USenglish, american + \mhchem@iflanguagename{USenglish}{\mhchem@rs@data@english[#1]{#2}}{% + \mhchem@iflanguagename{american}{\mhchem@rs@data@english[#1]{#2}}{% + \mhchem@iflanguagename{UKenglish}{\mhchem@rs@data@english[#1]{#2}}{% = british + \mhchem@iflanguagename{british}{\mhchem@rs@data@english[#1]{#2}}{% % - \iflanguage{french}{\mhchem@rs@data@french[#1]{#2}}{% = francais, canadien, acadian + \mhchem@iflanguagename{french}{\mhchem@rs@data@french[#1]{#2}}{% = francais, canadien, acadian + \mhchem@iflanguagename{francais}{\mhchem@rs@data@french[#1]{#2}}{% + \mhchem@iflanguagename{canadien}{\mhchem@rs@data@french[#1]{#2}}{% + \mhchem@iflanguagename{acadian}{\mhchem@rs@data@french[#1]{#2}}{% % - \iflanguage{ngerman}{\mhchem@rs@data@ngerman[#1]{#2}}{% = naustrian - \iflanguage{german}{% = austrian, germanb, + \mhchem@iflanguagename{ngerman}{\mhchem@rs@data@ngerman[#1]{#2}}{% = naustrian + \mhchem@iflanguagename{naustrian}{\mhchem@rs@data@ngerman[#1]{#2}}{% + \mhchem@iflanguagename{german}{% = austrian, germanb, + \mhchem@rs@warning@german% + \gdef\mhchem@rs@warning@german{}% + \mhchem@rs@data@ngerman[#1]{#2}% + }{% + \mhchem@iflanguagename{austrian}{% \mhchem@rs@warning@german% \gdef\mhchem@rs@warning@german{}% \mhchem@rs@data@ngerman[#1]{#2}% }{% + \mhchem@iflanguagename{germanb}{% + \mhchem@rs@warning@german% + \gdef\mhchem@rs@warning@german{}% + \mhchem@rs@data@ngerman[#1]{#2}% + }{% % - \iflanguage{spanish}{\mhchem@rs@data@spanish[#1]{#2}}{% + \mhchem@iflanguagename{spanish}{\mhchem@rs@data@spanish[#1]{#2}}{% % - }}}}}}}% + }}}}}}}}}}}}}}}}% \ifthenelse{\equal{\mhchem@rs@phrase}{\mhchem@rs@empty}}% {\gdef\mhchem@rs@phrase{}% \PackageError{rsphrase}{R or S Phrase "#2" is unknown for your% @@ -153,23 +189,40 @@ {% \gdef\mhchem@rs@phrase{\mhchem@rs@empty}% % - \iflanguage{danish}{\mhchem@rs@data@danish[#1]{#2}}{% + \mhchem@iflanguagename{danish}{\mhchem@rs@data@danish[#1]{#2}}{% % - \iflanguage{english}{\mhchem@rs@data@english[#1]{#2}}{% = USenglish, american - \iflanguage{UKenglish}{\mhchem@rs@data@english[#1]{#2}}{% = british + \mhchem@iflanguagename{english}{\mhchem@rs@data@english[#1]{#2}}{% = USenglish, american + \mhchem@iflanguagename{USenglish}{\mhchem@rs@data@english[#1]{#2}}{% + \mhchem@iflanguagename{american}{\mhchem@rs@data@english[#1]{#2}}{% + \mhchem@iflanguagename{UKenglish}{\mhchem@rs@data@english[#1]{#2}}{% = british + \mhchem@iflanguagename{british}{\mhchem@rs@data@english[#1]{#2}}{% % - \iflanguage{french}{\mhchem@rs@data@french[#1]{#2}}{% = francais, canadien, acadian + \mhchem@iflanguagename{french}{\mhchem@rs@data@french[#1]{#2}}{% = francais, canadien, acadian + \mhchem@iflanguagename{francais}{\mhchem@rs@data@french[#1]{#2}}{% + \mhchem@iflanguagename{canadien}{\mhchem@rs@data@french[#1]{#2}}{% + \mhchem@iflanguagename{acadian}{\mhchem@rs@data@french[#1]{#2}}{% % - \iflanguage{ngerman}{\mhchem@rs@data@ngerman[#1]{#2}}{% = naustrian - \iflanguage{german}{% = austrian, germanb, + \mhchem@iflanguagename{ngerman}{\mhchem@rs@data@ngerman[#1]{#2}}{% = naustrian + \mhchem@iflanguagename{naustrian}{\mhchem@rs@data@ngerman[#1]{#2}}{% + \mhchem@iflanguagename{german}{% = austrian, germanb, + \mhchem@rs@warning@german% + \gdef\mhchem@rs@warning@german{}% + \mhchem@rs@data@ngerman[#1]{#2}% + }{% + \mhchem@iflanguagename{austrian}{% \mhchem@rs@warning@german% \gdef\mhchem@rs@warning@german{}% \mhchem@rs@data@ngerman[#1]{#2}% }{% + \mhchem@iflanguagename{germanb}{% + \mhchem@rs@warning@german% + \gdef\mhchem@rs@warning@german{}% + \mhchem@rs@data@ngerman[#1]{#2}% + }{% % - \iflanguage{spanish}{\mhchem@rs@data@spanish[#1]{#2}}{% + \mhchem@iflanguagename{spanish}{\mhchem@rs@data@spanish[#1]{#2}}{% % - }}}}}}}% + }}}}}}}}}}}}}}}}% \ifthenelse{\equal{\mhchem@rs@phrase}{\mhchem@rs@empty}}% {\gdef\mhchem@rs@phrase{}% \PackageError{rsphrase}{R or S phrase "#2" is unknown for your% @@ -803,7 +856,7 @@ \mhchem@rs@ii[S23]{#2}{S23.1}{Do not breathe gas}{}% \mhchem@rs@ii[S23]{#2}{S23.2}{Do not breathe fumes}{}% \mhchem@rs@ii[S23]{#2}{S23.3}{Do not breathe vapour}{}% - \mhchem@rs@ii[S23]{#2}{S23.4}{Do not breathe spay}{}% + \mhchem@rs@ii[S23]{#2}{S23.4}{Do not breathe spray}{}% \mhchem@rs@ii{#2}{S24}{Avoid contact with skin}{}% \mhchem@rs@ii{#2}{S25}{Avoid contact with eyes}{}% \mhchem@rs@ii{#2}{S26}{In case of contact with eyes, rinse immediately with |