From 4ccf8917dd7207bd3f86aae8bc3531661080bc23 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 11 Sep 2012 23:05:31 +0000 Subject: chemmacros (11sep12) git-svn-id: svn://tug.org/texlive/trunk@27649 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/chemmacros/chemformula.sty | 594 ++++++++++++--------- .../texmf-dist/tex/latex/chemmacros/chemmacros.sty | 116 ++-- .../texmf-dist/tex/latex/chemmacros/ghsystem.sty | 58 +- .../latex/chemmacros/language/ghsystem_italian.def | 98 ++-- 4 files changed, 478 insertions(+), 388 deletions(-) (limited to 'Master/texmf-dist/tex/latex/chemmacros') diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty index c42a9feca39..c58a8f6fde9 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty @@ -72,6 +72,34 @@ exist. } +\msg_set:nnnn { chemformula } { declare-bond } + { + The~bond~type~ \tl_to_str:n { #1 } \c_space_tl is~already~defined. + } + { + You've~tried~to~define~the~bond~type~\tl_to_str:n { #1 } \c_space_tl with + ~\token_to_str:N \DeclareChemBond \c_space_tl but~it~already~exists. + ~Choose~another~name. + } + +\msg_set:nnnn { chemformula } { renew-bond } + { The~bond~type~ \tl_to_str:n { #1 } \c_space_tl is~not~defined. } + { + You've~tried~to~renew~the~bond~type~\tl_to_str:n { #1 } ~but~it~doesn't~ + exist. + } + +% --------------------------------------------------------------------------- % +% scratch variables +\tl_new:N \l_chemformula_tmpa_tl +\tl_new:N \l_chemformula_tmpb_tl +\tl_new:N \l_chemformula_tmpc_tl +\dim_new:N \l_chemformula_tmpa_dim +\dim_new:N \l_chemformula_tmpb_dim +\int_new:N \l_chemformula_tmpa_int +\int_new:N \l_chemformula_tmpb_int +\box_new:N \l_chemformula_tmpa_box + %-----------------------------------------------------------------------------% % gobble options \DeclareOption* { } @@ -91,7 +119,7 @@ %-----------------------------------------------------------------------------% % Some basic internal commands: -\cs_new:Nn \chemformula_plus: +\cs_new:Npn \chemformula_plus: { \bool_if:nTF { \l_chemmacros_circled_bool && !\l_chemmacros_circled_formal_bool } @@ -107,7 +135,7 @@ } } -\cs_new:Nn \chemformula_minus: +\cs_new:Npn \chemformula_minus: { \bool_if:nTF { \l_chemmacros_circled_bool && !\l_chemmacros_circled_formal_bool } @@ -123,8 +151,30 @@ } } -\cs_new:Nn \chemformula_radical: { \textperiodcentered } -\cs_new:Nn \chemformula_adduct: +\tl_new:N \l_chemformula_radical_style_tl +\dim_new:N \l_chemformula_radical_radius_dim +\dim_set:Nn \l_chemformula_radical_radius_dim { .2ex } + +\cs_new:Npn \chemformula_radical: + { + \chemformula_tikz:xn + { + \l_chemformula_radical_style_tl , + baseline, + minimum~height=0pt, + inner~sep=0pt, + outer~sep=0pt + } + { \fill (0,0)++(.3ex,.7ex) circle (\l_chemformula_radical_radius_dim) ; } + } + +\keys_define:nn { chemformula } + { + radical-style .tl_set:N = \l_chemformula_radical_style_tl , + radical-radius .dim_set:N = \l_chemformula_radical_radius_dim + } + +\cs_new:Npn \chemformula_adduct: { \skip_horizontal:N \l_chemformula_cdot_space_dim \textperiodcentered @@ -252,14 +302,14 @@ % determine length in dependency of labels \cs_new:Npn \chemformula_determine_arrow_length:nn #1#2 { - \box_set_eq:NN \l_tmpa_box #1 - \dim_set:Nn \l_tmpa_dim { \box_wd:N \l_tmpa_box } - \box_set_eq:NN \l_tmpa_box #2 - \dim_set:Nn \l_tmpb_dim { \box_wd:N \l_tmpa_box } - \box_clear:N \l_tmpa_box - \dim_compare:nTF { \l_tmpa_dim >= \l_tmpb_dim } - { \dim_set_eq:NN \l_chemformula_arrow_length_dim \l_tmpa_dim } - { \dim_set_eq:NN \l_chemformula_arrow_length_dim \l_tmpb_dim } + \box_set_eq:NN \l_chemformula_tmpa_box #1 + \dim_set:Nn \l_chemformula_tmpa_dim { \box_wd:N \l_chemformula_tmpa_box } + \box_set_eq:NN \l_chemformula_tmpa_box #2 + \dim_set:Nn \l_chemformula_tmpb_dim { \box_wd:N \l_chemformula_tmpa_box } + \box_clear:N \l_chemformula_tmpa_box + \dim_compare:nTF { \l_chemformula_tmpa_dim >= \l_chemformula_tmpb_dim } + { \dim_set_eq:NN \l_chemformula_arrow_length_dim \l_chemformula_tmpa_dim } + { \dim_set_eq:NN \l_chemformula_arrow_length_dim \l_chemformula_tmpb_dim } \dim_add:Nn \l_chemformula_arrow_length_dim { \l_chemformula_arrow_offset_dim } \dim_add:Nn \l_chemformula_arrow_length_dim @@ -323,8 +373,8 @@ % now we have both arguments do the actual drawing: \prop_get:NVN \l_chemformula_arrows_code_prop \l_chemformula_arrow_type_tl - \l_tmpb_tl - \chemformula_arrow_draw:V \l_tmpb_tl + \l_chemformula_tmpb_tl + \chemformula_arrow_draw:V \l_chemformula_tmpb_tl } % get arrows (for the use in \ch to replace the symbol) @@ -344,7 +394,7 @@ { % prepare arrow code for drawing: % TODO: flexible Pfeilspitzen, TikZ-Keys ermöglichen - \tl_set_rescan:Nnn \l_tmpc_tl { \char_set_catcode_letter:N \_ } { #1 } + \tl_set_rescan:Nnn \l_chemformula_tmpc_tl { \char_set_catcode_letter:N \_ } { #1 } % determine length of the arrow \chemformula_determine_arrow_length:NN \l_chemformula_arrow_arg_i_box @@ -379,7 +429,7 @@ [ below=\l_chemformula_arrow_label_offset_dim ] at (cf_arrow_mid) { \box_use:N \l_chemformula_arrow_arg_ii_box } ; - \tl_use:N \l_tmpc_tl + \tl_use:N \l_chemformula_tmpc_tl } } \cs_generate_variant:Nn \chemformula_arrow_draw:n { V } @@ -407,8 +457,8 @@ \NewDocumentCommand \ShowChemArrow { m } { - \prop_get:NnN \l_chemformula_arrows_code_prop { #1 } \l_tmpa_tl - \tl_to_str:N \l_tmpa_tl + \prop_get:NnN \l_chemformula_arrows_code_prop { #1 } \l_chemformula_tmpa_tl + \tl_to_str:N \l_chemformula_tmpa_tl } % declare arrows in the right order @@ -504,7 +554,7 @@ \group_end: } -\cs_new:Nn \chemformula_ch:nn +\cs_new:Npn \chemformula_ch:nn #1#2 { \group_align_safe_begin: \chemmacros_leave_vmode: @@ -578,7 +628,7 @@ \NewDocumentCommand \ch { om } { \chemformula_ch:nn { #1 } { #2 } } -\cs_new:Nn \chemformula_write:V +\cs_new:Npn \chemformula_write:n #1 { \mode_if_math:TF { @@ -590,18 +640,19 @@ } { #1 } } +\cs_generate_variant:Nn \chemformula_write:n { V } %-----------------------------------------------------------------------------% % arrow generation & detection \cs_set:Nn \chemformula_generate_arrows:V { - \tl_set:No \l_tmpa_tl { #1 } + \tl_set:No \l_chemformula_tmpa_tl { #1 } \seq_map_inline:Nn \l_chemformula_arrows_type_seq { - \tl_replace_all:Nnn \l_tmpa_tl + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { ##1 } { \chemformula_arrows_get:n { ##1 } } } - \tl_set_eq:NN \l_chemformula_output_tl \l_tmpa_tl + \tl_set_eq:NN \l_chemformula_output_tl \l_chemformula_tmpa_tl } \cs_new:Npn \chemformula_detect_arrows:n #1 @@ -609,8 +660,8 @@ \bool_set_false:N \l_chemformula_is_arrow_bool \prop_map_inline:Nn \l_chemformula_arrows_code_prop { - \tl_set_rescan:Nnn \l_tmpa_tl {} { ##1 } - \tl_if_in:noT { #1 } { \l_tmpa_tl } + \tl_set_rescan:Nnn \l_chemformula_tmpa_tl {} { ##1 } + \tl_if_in:noT { #1 } { \l_chemformula_tmpa_tl } { \bool_set_true:N \l_chemformula_is_arrow_bool } } } @@ -641,27 +692,27 @@ \) } -\cs_new:Npn \width_to_dim:nn #1#2 +\cs_new:Npn \width_to_dim:Nn #1#2 { - \hbox_set:Nn \l_tmpa_box { #2 } - \dim_set:Nn #1 { \box_wd:N \l_tmpa_box } - \box_clear:N \l_tmpa_box + \hbox_set:Nn \l_chemformula_tmpa_box { #2 } + \dim_set:Nn #1 { \box_wd:N \l_chemformula_tmpa_box } + \box_clear:N \l_chemformula_tmpa_box } -\cs_generate_variant:Nn \width_to_dim:nn { Nn } -\cs_new:Nn \chemformula_generate_name:V +\cs_new:Npn \chemformula_generate_name:n #1 { - \tl_set:No \l_tmpa_tl { #1 } - \tl_if_in:onT { \l_tmpa_tl } { ! } - { \tl_replace_all:Nnn \l_tmpa_tl { ! } { \chemformula_name_cmpd:w } } - \tl_set_eq:NN \l_chemformula_output_tl \l_tmpa_tl + \tl_set:Nn \l_chemformula_tmpa_tl { #1 } + \tl_if_in:VnT \l_chemformula_tmpa_tl { ! } + { \tl_replace_all:Nnn \l_chemformula_tmpa_tl { ! } { \chemformula_name_cmpd:w } } + \tl_set_eq:NN \l_chemformula_output_tl \l_chemformula_tmpa_tl } +\cs_generate_variant:Nn \chemformula_generate_name:n { V } \cs_new:Npn \chemformula_detect_name:n #1 { \bool_set_false:N \l_chemformula_is_name_bool - \tl_set:No \l_tmpa_tl { #1 } - \tl_if_in:onT { \l_tmpa_tl } { ! } + \tl_set:Nn \l_chemformula_tmpa_tl { #1 } + \tl_if_in:VnT \l_chemformula_tmpa_tl { ! } { \bool_set_true:N \l_chemformula_is_name_bool } } @@ -699,7 +750,7 @@ \bool_new:N \l_chemformula_charge_full_shift_bool % token lists: -\tl_new:N \l_chemformula_tmpa_tl +\tl_new:N \l_chemformula_chemformula_tmpa_tl \tl_new:N \g_chemformula_options_tl \tl_new:N \g_chemformula_output_tl \tl_new:N \l_chemformula_output_tl @@ -838,34 +889,26 @@ %-----------------------------------------------------------------------------% % bonds: -\dim_new:N \l_chemformula_bond_space_dim +\dim_new:N \l_chemformula_bond_space_dim \dim_set:Nn \l_chemformula_bond_space_dim { .07em } +\prop_new:N \l_chemformula_bonds_prop + +\cs_new:Npn \chemformula@bondlength { \l_chemformula_bond_dim } \cs_new:Npn \chemformula_single_bond: { \bool_if:NTF \l_chemformula_sup_bool { \chemformula_minus: } - { - \skip_horizontal:N \l_chemformula_bond_space_dim - \chemformula_tikz:nn - { - inner~sep = 0 , - outer~sep = 0 , - text~height = 1em , - baseline = (chemformula-single-bond.base) - } - { - \draw node[draw=none,minimum~height=1em,minimum~width=0] - (chemformula-single-bond) at (0,0) {} ; - \draw[butt~cap-butt~cap,\l_chemformula_bond_style_tl] - (chemformula-single-bond) ++ (0,-.1716em) - -- ++( \l_chemformula_bond_dim ,0); - } - \skip_horizontal:N \l_chemformula_bond_space_dim - } + { \chemformula_bond:n { single } } } \cs_new:Npn \chemformula_double_bond: + { \chemformula_bond:n { double } } + +\cs_new:Npn \chemformula_triple_bond: + { \chemformula_bond:n { triple } } + +\cs_new:Npn \chemformula_bond:n #1 { \skip_horizontal:N \l_chemformula_bond_space_dim \chemformula_tikz:nn @@ -873,69 +916,160 @@ inner~sep = 0 , outer~sep = 0 , text~height = 1em , - baseline = (chemformula-double-bond.base) + baseline = (chemformula-bond-ground.base) } { - \draw node[draw=none,minimum~height=1em,minimum~width=0] - (chemformula-double-bond) at (0,0) {} ; - \draw[butt~cap-butt~cap] - (chemformula-double-bond) ++ (0,-.0858em) -- ++ - (\l_chemformula_bond_dim ,0) ; - \draw[butt~cap-butt~cap] - (chemformula-double-bond) ++ (0,-.2574em) -- ++ - (\l_chemformula_bond_dim ,0) ; + \draw node[draw=none,minimum~height=1em,minimum~width=0] + (chemformula-bond-ground) at (0,0) {}; + \draw (chemformula-bond-ground) ++ (0,-.1716em) + coordinate (chemformula-bond-start) ; + \draw (chemformula-bond-start) ++(\l_chemformula_bond_dim ,0) + coordinate (chemformula-bond-end) ; + \tl_if_blank:nTF { #1 } + { \chemformula_bond_draw:n { single } } + { \chemformula_bond_draw:n { #1 } } } \skip_horizontal:N \l_chemformula_bond_space_dim } -\cs_new:Npn \chemformula_triple_bond: +\cs_new:Npn \chemformula_bond_draw:n #1 { - \skip_horizontal:N \l_chemformula_bond_space_dim - \chemformula_tikz:nn + \tl_set_rescan:Nnn \l_chemformula_tmpa_tl {} { #1 } + \exp_args:NNo \prop_get:Nn \l_chemformula_bonds_prop + { \l_chemformula_tmpa_tl } + } + +\tikzset { chembond/.style={butt~cap-butt~cap,\l_chemformula_bond_style_tl} } + +\NewDocumentCommand \DeclareChemBond { mm } + { + \cs_if_exist:cTF { chemformula_bond_type_#1 } + { \chemmacros_msg:nnxx { chemformula } { declare-bond } { #1 } {} } { - inner~sep = 0 , - outer~sep = 0 , - text~height = 1em , - baseline = (chemformula-triple-bond.base) + \cs_new:cpn { chemformula_bond_type_#1 } {} + \prop_put:Nnn \l_chemformula_bonds_prop { #1 } { #2 } } + } + +\NewDocumentCommand \DeclareChemBondAlias { mm } + { + \cs_if_exist:cTF { chemformula_bond_type_#1 } + { \chemmacros_msg:nnxx { chemformula } { declare-bond } { #1 } {} } { - \draw node[draw=none,minimum~height=1em,minimum~width=0] - (chemformula-triple-bond) at (0,0) {} ; - \draw[butt~cap-butt~cap] - (chemformula-triple-bond) ++ (0,-.0429em) -- ++ - (\l_chemformula_bond_dim ,0) ; - \draw[butt~cap-butt~cap] - (chemformula-triple-bond) ++ (0,-.1716em) -- ++ - (\l_chemformula_bond_dim ,0) ; - \draw[butt~cap-butt~cap] - (chemformula-triple-bond) ++ (0,-.3003em) -- ++ - (\l_chemformula_bond_dim ,0) ; + \cs_new:cpn { chemformula_bond_type_#1 } {} + \prop_get:NnN \l_chemformula_bonds_prop { #2 } \l_chemformula_tmpa_tl + \prop_put:Nno \l_chemformula_bonds_prop { #1 } { \l_chemformula_tmpa_tl } } - \skip_horizontal:N \l_chemformula_bond_space_dim } +\NewDocumentCommand \RenewChemBond { mm } + { + \cs_if_exist:cTF { chemformula_bond_type_#1 } + { \prop_put:Nnn \l_chemformula_bonds_prop { #1 } { #2 } } + { \chemmacros_msg:nnxx { chemformula } { renew-bond } { #1 } {} } + } + +\NewDocumentCommand \ShowChemBond { m } + { + \prop_get:NnN \l_chemformula_bonds_prop { #1 } \l_chemformula_tmpa_tl + \tl_to_str:N \l_chemformula_tmpa_tl + } + +\NewDocumentCommand \bond { m } + { \chemformula_bond:n { #1 } } + +% now let's declare some default bonds: +\DeclareChemBond{single} + { \draw[chembond] (chemformula-bond-start) -- (chemformula-bond-end) ; } +\DeclareChemBondAlias{normal}{single} +\DeclareChemBondAlias{sb}{single} + +\DeclareChemBond{semisingle} + { \draw[chembond,densely~dotted] (chemformula-bond-start) -- (chemformula-bond-end) ; } +\DeclareChemBondAlias{dotted}{semisingle} + +\DeclareChemBond{double} + { + \draw (chemformula-bond-start) ++ (0,.0858em) coordinate (double-start-up) ; + \draw (chemformula-bond-end) ++ (0,.0858em) coordinate (double-end-up) ; + \draw (chemformula-bond-start) ++ (0,-.0858em) coordinate (double-start-down) ; + \draw (chemformula-bond-end) ++ (0,-.0858em) coordinate (double-end-down) ; + \draw[chembond] + (double-start-down) -- (double-end-down) + (double-start-up) -- (double-end-up) ; + } +\DeclareChemBondAlias{db}{double} + +\DeclareChemBond{semidouble} + { + \draw (chemformula-bond-start) ++ (0,.0858em) coordinate (double-start-up) ; + \draw (chemformula-bond-end) ++ (0,.0858em) coordinate (double-end-up) ; + \draw (chemformula-bond-start) ++ (0,-.0858em) coordinate (double-start-down) ; + \draw (chemformula-bond-end) ++ (0,-.0858em) coordinate (double-end-down) ; + \draw[chembond] (double-start-down) -- (double-end-down) ; + \draw[chembond,densely~dotted] (double-start-up) -- (double-end-up) ; + } + +\DeclareChemBondAlias{deloc}{semidouble} +% \DeclareChemBondAlias{deloc2}{semidouble} + +\DeclareChemBond{triple} + { + \draw (chemformula-bond-start) ++ (0,.1287em) coordinate (triple-start-up) ; + \draw (chemformula-bond-end) ++ (0,.1287em) coordinate (triple-end-up) ; + \draw (chemformula-bond-start) ++ (0,-.1287em) coordinate (triple-start-down) ; + \draw (chemformula-bond-end) ++ (0,-.1287em) coordinate (triple-end-down) ; + \draw[chembond] + (triple-start-down) -- (triple-end-down) + (chemformula-bond-start) -- (chemformula-bond-end) + (triple-start-up) -- (triple-end-up) ; + } +\DeclareChemBondAlias{tp}{triple} + +\DeclareChemBond{semitriple} + { + \draw (chemformula-bond-start) ++ (0,.1287em) coordinate (triple-start-up) ; + \draw (chemformula-bond-end) ++ (0,.1287em) coordinate (triple-end-up) ; + \draw (chemformula-bond-start) ++ (0,-.1287em) coordinate (triple-start-down) ; + \draw (chemformula-bond-end) ++ (0,-.1287em) coordinate (triple-end-down) ; + \draw[chembond] + (triple-start-down) -- (triple-end-down) + (chemformula-bond-start) -- (chemformula-bond-end) ; + \draw[chembond,densely~dotted] (triple-start-up) -- (triple-end-up) ; + } +\DeclareChemBondAlias{tdeloc}{semitriple} + +\DeclareChemBond{coordright} + { \draw[chembond,butt~cap->] (chemformula-bond-start) -- (chemformula-bond-end) ; } +\DeclareChemBondAlias{co>}{coordright} + +\DeclareChemBond{coordleft} + { \draw[chembond,<-butt~cap] (chemformula-bond-start) -- (chemformula-bond-end) ; } +\DeclareChemBondAlias{ 0pt } - { \skip_horizontal:N \l_tmpa_dim } + \dim_compare:nT { \l_chemformula_tmpa_dim > 0pt } + { \skip_horizontal:N \l_chemformula_tmpa_dim } } \group_end: % clean up @@ -1182,7 +1318,7 @@ % read the input \cs_new:Npn \chemformula_input:n #1 { - \tl_set_rescan:Nnn \l_chemformula_tmpa_tl + \tl_set_rescan:Nnn \l_chemformula_chemformula_tmpa_tl { \char_set_catcode_letter:N \{ \char_set_catcode_letter:N \} @@ -1190,12 +1326,12 @@ \char_set_catcode_other:N \" } { #1 } - \chemformula_input_escape_text:o { \l_chemformula_tmpa_tl } + \chemformula_input_escape_text:o { \l_chemformula_chemformula_tmpa_tl } \chemformula_input_escape_math:n { #1 } \chemformula_input_stoich:n { #1 } - \chemformula_clean_chem_macros:o { \l_chemformula_tmpa_tl } + \chemformula_clean_chem_macros:o { \l_chemformula_chemformula_tmpa_tl } \chemformula_input_cmpd:VN - \l_chemformula_tmpa_tl \l_chemformula_input_tl + \l_chemformula_chemformula_tmpa_tl \l_chemformula_input_tl \chemformula_input_arrow:n { #1 } \chemformula_input_name:n { #1 } \chemformula_input_plus:n { #1 } @@ -1208,14 +1344,14 @@ \cs_new:Npn \chemformula_input_options:n #1 { \makeatother - \tl_set_rescan:Nnn \l_tmpa_tl { \makeatletter } { #1 } - \tl_if_in:VnTF \l_tmpa_tl { @ } + \tl_set_rescan:Nnn \l_chemformula_tmpa_tl { \makeatletter } { #1 } + \tl_if_in:VnTF \l_chemformula_tmpa_tl { @ } { \bool_set_true:N \l_chemformula_options_bool \bool_set_true:N \l_chemformula_is_option_bool - \tl_remove_all:Nn \l_tmpa_tl { @ } + \tl_remove_all:Nn \l_chemformula_tmpa_tl { @ } \exp_last_unbraced:Nno \tl_set:Nn \l_chemformula_internal_options_tl - { \l_tmpa_tl } + { \l_chemformula_tmpa_tl } } { \bool_set_false:N \l_chemformula_is_option_bool } } @@ -1228,10 +1364,10 @@ \tl_put_right:Nn \l_chemformula_stoich_tl { \chemformula_font_inner: } \tl_map_inline:nn { #1 } { - \prop_get:NnNTF \l_chemformula_stoich_prop { ##1 } \l_tmpa_tl + \prop_get:NnNTF \l_chemformula_stoich_prop { ##1 } \l_chemformula_tmpa_tl { \bool_if:NT \l_chemformula_stoich_bool - { \tl_put_right:Nx \l_chemformula_stoich_tl { \l_tmpa_tl } } + { \tl_put_right:Nx \l_chemformula_stoich_tl { \l_chemformula_tmpa_tl } } } { \bool_set_false:N \l_chemformula_stoich_bool } } @@ -1249,7 +1385,7 @@ { \tl_clear:N \l_chemformula_stoich_tl } } -\cs_new:Nn \chemformula_bm:n { #1 } +\cs_new:Npn \chemformula_bm:n #1 { #1 } \cs_new:Npn \chemformula_parse_stoich:n #1 { @@ -1307,7 +1443,7 @@ %-----------------------------------------------------------------------------% % input compounds -\cs_new:Nn \chemformula_input_cmpd:nN +\cs_new:Npn \chemformula_input_cmpd:nN #1#2 { \tl_if_blank:VTF \l_chemformula_stoich_tl { @@ -1363,7 +1499,7 @@ } \cs_generate_variant:Nn \chemformula_input_cmpd:nN { VN } -\cs_new:Nn \chemformula_font_inner: +\cs_new:Npn \chemformula_font_inner: { \bool_if:NT \l_chemformula_fss_bool { @@ -1383,8 +1519,8 @@ { \cs_set:Nn \chemformula_bm:n { ##1 } } } -\cs_new:Nn \chemformula_font: {} -\cs_new:Nn \chemformula_fontspec:n +\cs_new:Npn \chemformula_font: {} +\cs_new:Npn \chemformula_fontspec:n #1 { \tl_if_in:nnTF { #1 } { [ } { \chemformula_fontspec_aux:w #1 \q_stop } @@ -1394,9 +1530,9 @@ \cs_new:Npn \chemformula_fontspec_aux:w [#1]#2 \q_stop { \newfontfamily \chemformula_font: [ #1 ] { #2 } } -\cs_new:Nn \chemformula_handle_sub_and_superscripts:nN +\cs_new:Npn \chemformula_handle_sub_and_superscripts:nN #1#2 { - \tl_set_rescan:Nnn \l_tmpa_tl + \tl_set_rescan:Nnn \l_chemformula_tmpa_tl { \char_set_catcode_letter:N \_ \char_set_catcode_letter:N \{ @@ -1406,29 +1542,29 @@ } { #1 } % let's see if the compound starts with a sub- or superscript: - \exp_args:Nx \tl_if_in:nnT { \tl_head:V \l_tmpa_tl } { ^ } + \exp_args:Nx \tl_if_in:nnT { \tl_head:V \l_chemformula_tmpa_tl } { ^ } { \bool_set_true:N \l_chemformula_is_isotope_bool } - \exp_args:Nx \tl_if_in:nnT { \tl_head:V \l_tmpa_tl } { _ } + \exp_args:Nx \tl_if_in:nnT { \tl_head:V \l_chemformula_tmpa_tl } { _ } { \bool_set_true:N \l_chemformula_is_isotope_bool } \exp_args:NNx \prop_if_in:NnT \l_chemformula_numbers_prop - { \tl_head:V \l_tmpa_tl } + { \tl_head:V \l_chemformula_tmpa_tl } { \bool_set_true:N \l_chemformula_is_isotope_bool } - \tl_if_in:VnT \l_tmpa_tl { ^ } + \tl_if_in:VnT \l_chemformula_tmpa_tl { ^ } { - \tl_replace_all:Nnn \l_tmpa_tl { ^ } + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { ^ } { \chemformula_superscript:n } } - \tl_if_in:VnT \l_tmpa_tl { _ } + \tl_if_in:VnT \l_chemformula_tmpa_tl { _ } { - \tl_replace_all:Nnn \l_tmpa_tl { _ } + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { _ } { \chemformula_subscript:n } } \int_zero:N \l_chemformula_count_tokens_int - \tl_map_inline:Nn \l_tmpa_tl + \tl_map_inline:Nn \l_chemformula_tmpa_tl { \int_incr:N \l_chemformula_count_tokens_int \int_compare:nTF - { \l_chemformula_count_tokens_int = \tl_length:N \l_tmpa_tl } + { \l_chemformula_count_tokens_int = \tl_length:N \l_chemformula_tmpa_tl } { \tl_if_eq:nnTF { ##1 } { + } { @@ -1442,15 +1578,15 @@ { \chemformula_superscript:n { \chemformula_minus: } } } { - \prop_get:NnNTF \l_chemformula_cmpd_prop { ##1 } \l_tmpb_tl - { \tl_put_right:No #2 { \l_tmpb_tl } } + \prop_get:NnNTF \l_chemformula_cmpd_prop { ##1 } \l_chemformula_tmpb_tl + { \tl_put_right:No #2 { \l_chemformula_tmpb_tl } } { \tl_put_right:Nn #2 { ##1 } } } } } { - \prop_get:NnNTF \l_chemformula_cmpd_prop { ##1 } \l_tmpb_tl - { \tl_put_right:No #2 { \l_tmpb_tl } } + \prop_get:NnNTF \l_chemformula_cmpd_prop { ##1 } \l_chemformula_tmpb_tl + { \tl_put_right:No #2 { \l_chemformula_tmpb_tl } } { \tl_put_right:Nn #2 { ##1 } } } } @@ -1458,7 +1594,7 @@ %-----------------------------------------------------------------------------% % clean up chemmacros commands: -\cs_new:Nn \chemformula_clean_chem_macros:n +\cs_new:Npn \chemformula_clean_chem_macros:n #1 { \cs_set:Nn \chemmacros_text:n { @@ -1472,7 +1608,7 @@ %-----------------------------------------------------------------------------% % input "and" sign -\cs_new:Nn \chemformula_input_plus:n +\cs_new:Npn \chemformula_input_plus:n #1 { \tl_if_eq:nnT { #1 } { + } { @@ -1488,7 +1624,7 @@ %-----------------------------------------------------------------------------% % input escaping gas -\cs_new:Nn \chemformula_input_up:n +\cs_new:Npn \chemformula_input_up:n #1 { \tl_if_eq:nnT { #1 } { ^ } { \tl_put_right:Nn \l_chemformula_input_tl { $\uparrow$ } } @@ -1497,7 +1633,7 @@ %-----------------------------------------------------------------------------% % input precipitate -\cs_new:Nn \chemformula_input_down:n +\cs_new:Npn \chemformula_input_down:n #1 { \tl_if_eq:nnT { #1 } { v } { \tl_put_right:Nn \l_chemformula_input_tl { $\downarrow$ } } @@ -1506,7 +1642,7 @@ %-----------------------------------------------------------------------------% % input arrow -\cs_new:Nn \chemformula_input_arrow:n +\cs_new:Npn \chemformula_input_arrow:n #1 { \bool_if:nT { @@ -1521,7 +1657,7 @@ %-----------------------------------------------------------------------------% % input compound name -\cs_new:Nn \chemformula_input_name:n +\cs_new:Npn \chemformula_input_name:n #1 { \bool_if:nT { @@ -1535,7 +1671,7 @@ %-----------------------------------------------------------------------------% % input escaped text -\cs_new:Nn \chemformula_input_escape_text:n +\cs_new:Npn \chemformula_input_escape_text:n #1 { \chemformula_first_last_text:n { #1 } \bool_if:NT \l_chemformula_first_last_double_bool @@ -1553,45 +1689,45 @@ \cs_new:Npn \chemformula_read_escape_double:w "#1" \q_nil { - \tl_set_rescan:Nnn \l_tmpa_tl + \tl_set_rescan:Nnn \l_chemformula_tmpa_tl { \ExplSyntaxNamesOn \char_set_catcode_other:N \: } { { #1 } } - \tl_replace_all:Nnn \l_tmpa_tl { \_ } { chemformulaplaceholder } - \tl_replace_all:Nnn \l_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token - \tl_replace_all:Nnn \l_tmpa_tl { chemformulaplaceholder } { \_ } - \tl_set_rescan:Nno \l_tmpa_tl { \ExplSyntaxOff } { \l_tmpa_tl } - \tl_put_right:NV \l_chemformula_input_tl \l_tmpa_tl + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { \_ } { chemformulaplaceholder } + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { chemformulaplaceholder } { \_ } + \tl_set_rescan:Nno \l_chemformula_tmpa_tl { \ExplSyntaxOff } { \l_chemformula_tmpa_tl } + \tl_put_right:NV \l_chemformula_input_tl \l_chemformula_tmpa_tl } \cs_new:Npn \chemformula_read_escape_single:w '#1' \q_nil { - \tl_set_rescan:Nnn \l_tmpa_tl + \tl_set_rescan:Nnn \l_chemformula_tmpa_tl { \ExplSyntaxNamesOn \char_set_catcode_other:N \: } { { #1 } } - \tl_replace_all:Nnn \l_tmpa_tl { \_ } { chemformulaplaceholder } - \tl_replace_all:Nnn \l_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token - \tl_replace_all:Nnn \l_tmpa_tl { chemformulaplaceholder } { \_ } - \tl_set_rescan:Nno \l_tmpa_tl { \ExplSyntaxOff } { \l_tmpa_tl } - \tl_put_right:NV \l_chemformula_input_tl \l_tmpa_tl + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { \_ } { chemformulaplaceholder } + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token? + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { chemformulaplaceholder } { \_ } + \tl_set_rescan:Nno \l_chemformula_tmpa_tl { \ExplSyntaxOff } { \l_chemformula_tmpa_tl } + \tl_put_right:NV \l_chemformula_input_tl \l_chemformula_tmpa_tl } -\cs_new:Nn \chemformula_first_last_text:n +\cs_new:Npn \chemformula_first_last_text:n #1 { \bool_set_false:N \l_chemformula_first_last_double_bool \bool_set_false:N \l_chemformula_first_last_single_bool \bool_set_false:N \l_chemformula_first_last_text_bool - \int_zero:N \l_tmpa_int - \int_zero:N \l_tmpb_int - \tl_map_inline:nn { #1 } { \int_incr:N \l_tmpa_int } + \int_zero:N \l_chemformula_tmpa_int + \int_zero:N \l_chemformula_tmpb_int + \tl_map_inline:nn { #1 } { \int_incr:N \l_chemformula_tmpa_int } \tl_map_inline:nn { #1 } { - \int_incr:N \l_tmpb_int - \int_compare:nT { \l_tmpb_int = 1 } + \int_incr:N \l_chemformula_tmpb_int + \int_compare:nT { \l_chemformula_tmpb_int = 1 } { \tl_if_eq:nnT { ##1 } { " } { \bool_set_true:N \l_chemformula_first_last_double_bool } } - \int_compare:nT { \l_tmpb_int = \l_tmpa_int } + \int_compare:nT { \l_chemformula_tmpb_int = \l_chemformula_tmpa_int } { \tl_if_eq:nnF { ##1 } { " } { \bool_set_false:N \l_chemformula_first_last_double_bool } @@ -1599,16 +1735,16 @@ } \bool_if:NF \l_chemformula_first_last_double_bool { - \int_zero:N \l_tmpb_int + \int_zero:N \l_chemformula_tmpb_int \tl_map_inline:nn { #1 } { - \int_incr:N \l_tmpb_int - \int_compare:nT { \l_tmpb_int = 1 } + \int_incr:N \l_chemformula_tmpb_int + \int_compare:nT { \l_chemformula_tmpb_int = 1 } { \tl_if_eq:nnT { ##1 } { ' } { \bool_set_true:N \l_chemformula_first_last_single_bool } } - \int_compare:nT { \l_tmpb_int = \l_tmpa_int } + \int_compare:nT { \l_chemformula_tmpb_int = \l_chemformula_tmpa_int } { \tl_if_eq:nnF { ##1 } { ' } { \bool_set_false:N \l_chemformula_first_last_single_bool } @@ -1619,7 +1755,7 @@ %-----------------------------------------------------------------------------% % input escaped math -\cs_new:Nn \chemformula_input_escape_math:n +\cs_new:Npn \chemformula_input_escape_math:n #1 { \chemformula_first_last_math:n { #1 } \bool_if:NT \l_chemformula_first_last_math_bool @@ -1628,36 +1764,36 @@ \cs_new:Npn \chemformula_read_escape_math:w $#1$ \q_nil { - \tl_set_rescan:Nnn \l_tmpa_tl + \tl_set_rescan:Nnn \l_chemformula_tmpa_tl { \ExplSyntaxNamesOn \char_set_catcode_letter:N \{ \char_set_catcode_letter:N \} } { \mbox { \( #1 \) } } - \tl_replace_all:Nnn \l_tmpa_tl { \_ } { chemformulaplaceholder } - \tl_replace_all:Nnn \l_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token - \tl_replace_all:Nnn \l_tmpa_tl { chemformulaplaceholder } { \_ } - \tl_set_rescan:Nno \l_tmpa_tl { \ExplSyntaxOff } { \l_tmpa_tl } - \tl_put_right:NV \l_chemformula_input_tl \l_tmpa_tl + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { \_ } { chemformulaplaceholder } + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token + \tl_replace_all:Nnn \l_chemformula_tmpa_tl { chemformulaplaceholder } { \_ } + \tl_set_rescan:Nno \l_chemformula_tmpa_tl { \ExplSyntaxOff } { \l_chemformula_tmpa_tl } + \tl_put_right:NV \l_chemformula_input_tl \l_chemformula_tmpa_tl \tl_put_right:Nn \l_chemformula_input_tl { \skip_horizontal:N \l_chemformula_math_space_dim } } -\cs_new:Nn \chemformula_first_last_math:n +\cs_new:Npn \chemformula_first_last_math:n #1 { \bool_set_false:N \l_chemformula_first_last_math_bool - \int_zero:N \l_tmpa_int - \int_zero:N \l_tmpb_int - \tl_map_inline:nn { #1 } { \int_incr:N \l_tmpa_int } + \int_zero:N \l_chemformula_tmpa_int + \int_zero:N \l_chemformula_tmpb_int + \tl_map_inline:nn { #1 } { \int_incr:N \l_chemformula_tmpa_int } \tl_map_inline:nn { #1 } { - \int_incr:N \l_tmpb_int - \int_compare:nT { \l_tmpb_int = 1 } + \int_incr:N \l_chemformula_tmpb_int + \int_compare:nT { \l_chemformula_tmpb_int = 1 } { \tl_if_eq:nnT { ##1 } { $ } { \bool_set_true:N \l_chemformula_first_last_math_bool } } - \int_compare:nT { \l_tmpb_int = \l_tmpa_int } + \int_compare:nT { \l_chemformula_tmpb_int = \l_chemformula_tmpa_int } { \tl_if_eq:nnF { ##1 } { $ } { \bool_set_false:N \l_chemformula_first_last_math_bool } @@ -1770,60 +1906,10 @@ \tex_endinput:D %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% VERSION HISTORY -2012/01/28 - version 3.0 - first published to CTAN with the chemmacros bundle -2012/01/30 - version 3.0a - bugfix: subscripts in escaped inputs failed, - renamed formula => chemformula -2012/02/02 - version 3.0b - updated documentation -2012/02/05 - version 3.0c - renamed pictogram files -2012/02/10 - version 3.0d - \xspace disabled inside \ch{} - - bugfix: \ch{_{123}^{23}U} now compiles (\leavevmode - added) - - bugfix: right shift for the super- und subscripts - - bugfix: escaped text recognizes space by ~ again - - * in superscript now gives excited state - - new arrow type <> -2012/02/19 - version 3.1 - new functions in the chemmacros package - - new arrow types -/>, - - new commands \DeclareChemArrow, \RenewChemArrow and - \ShowChemArrow -2012/02/26 - version 3.1a - changes in the chemmacros package -2012/03/03 - version 3.1b - arrow types are stored in a sequence to automate the - search and replace in the right order - - new arrow type == - - IUPAC compliance for stoichiometric factors - - new handling of super- and subscripts to correct - various flaws: clear distinction between isotope and - formula - - new option charge-vshift -2012/03/14 - version 3.1c - a few changes in chemmacros.sty - - improved arrow labels -2012/03/20 - version 3.2 - new: option input via @{} - - a few changes in chemmacros.sty -2012/05/07 - version 3.3 - \ch now bypasses \ref{}, \label{}, and \intertext{} - - new features in chemmacros.sty -2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements - - fix of unexpected behaviour in the compound naming - mechanism -2012/05/18 - version 3.3b - compatibility with MiKTeX -2012/05/18 - version 3.3c - fix in the `ghsystem/language' option -2012/07/24 - version 3.3d - additional picture file type `pdf' - - default bond length set to 1.1667ex - - bug fix in the bonds - - added kerning to cip commands, new option - `iupac/cip-kern' - - bug fix: messages needed to be defined before the - options -2012/08/08 - version 3.3e - new option ox/align=center|right +see the chemmacros.sty file %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % TODO -- Option, die den Punkt . in \ch zum Radikal-Punkt macht, evtl \chemformula_radical: - an chemfigs \lewis anpassen -- Bindungen nach einem Mechanismus ähnlich der Pfeile konstruieren - => Möglichkeit, eigene Bindungen hinzuzufügen, Bindungen leichter um weitere - Typen erweitern - => Problem: bislang nur ein Token pro Bindung möglich - => Makro \bond{}? - Addukte: Zahlen nach * und . automatisch erkennen? - allow fractions in subscripts: _{$\frac{1}{2}$} ? - optionale Argumente von \\ nach außen weiterreichen? diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index d1cbaf00c3a..3baaced86cc 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty @@ -29,8 +29,8 @@ \RequirePackage{ expl3 , xparse , l3keys2e , xfrac , siunitx } \RequirePackage{ tikz , mathtools , environ , scrlfile , etoolbox , bm } \usetikzlibrary{calc,arrows} -\def\chemmacros@version{3.3e} -\def\chemmacros@date{2012/08/21} +\def\chemmacros@version{3.4} +\def\chemmacros@date{2012/09/11} \ProvidesExplPackage {chemmacros} @@ -263,6 +263,12 @@ \token_to_str:N \DeclareChemState \c_space_tl to~create~it. } +% --------------------------------------------------------------------------- % +% scratch variables +\tl_new:N \l_chemmacros_tmpa_tl +\tl_new:N \l_chemmacros_tmpb_tl +\int_new:N \l_chemmacros_tmpa_int + % --------------------------------------------------------------------------- % % package options % bpchem => use \IUPAC inside for \NMR command @@ -293,7 +299,7 @@ \tl_new:N \l_chemmacros_current_language_tl \tl_set:Nn \l_chemmacros_current_language_tl { english } -\cs_new:Nn \chemmacros_inner_font: {} +\cs_new:Npn \chemmacros_inner_font: {} \keys_define:nn { chemmacros / option } { @@ -673,13 +679,13 @@ } \cs_generate_variant:Nn \chemmacros_atom:n { o,f,x,V } -\cs_new:Nn \chemmacros_text:n +\cs_new:Npn \chemmacros_text:n #1 { \mode_if_math:TF { \text { #1 } } { #1 } } % add a possibility to let chemformula use the chemformula % with method=chemformula, too \tl_new:N \l_chemmacros_chemformula_tl -\cs_new:Nn \chemmacros_chemformula:n +\cs_new:Npn \chemmacros_chemformula:n #1 { \bool_if:NTF \l_chemmacros_use_mhchem_bool { \ce { #1 } } @@ -753,10 +759,10 @@ { \group_begin: \chemformula_input:n { #2 } - \tl_set_rescan:Nno \l_tmpa_tl + \tl_set_rescan:Nno \l_chemmacros_tmpa_tl { \ExplSyntaxOn } { \l_chemformula_input_tl } - \chemformula_write:V \l_tmpa_tl + \chemformula_write:V \l_chemmacros_tmpa_tl \group_end: \chemmacros_xspace: } @@ -975,20 +981,20 @@ \NewDocumentCommand \DeclareChemIUPAC { mm } { - \tl_set_rescan:Nnn \l_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 } - \tl_set:Nf \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } - \prop_if_in:NoTF \l_chemmacros_iupac_prop { \l_tmpa_tl } + \tl_set_rescan:Nnn \l_chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 } + \tl_set:Nf \l_chemmacros_tmpa_tl { \tl_tail:V \l_chemmacros_tmpa_tl } + \prop_if_in:NoTF \l_chemmacros_iupac_prop { \l_chemmacros_tmpa_tl } { \chemmacros_msg:nnxx { chemmacros } { declare-iupac } { #1 } { } } - { \prop_put:Non \l_chemmacros_iupac_prop { \l_tmpa_tl } { #2 } } + { \prop_put:Non \l_chemmacros_iupac_prop { \l_chemmacros_tmpa_tl } { #2 } } \chemmacros_make_iupac: } \NewDocumentCommand \RenewChemIUPAC { mm } { - \tl_set_rescan:Nnn \l_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 } - \tl_set:Nf \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } - \prop_if_in:NoTF \l_chemmacros_iupac_prop { \l_tmpa_tl } - { \prop_put:Non \l_chemmacros_iupac_prop { \l_tmpa_tl } { #2 } } + \tl_set_rescan:Nnn \l_chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 } + \tl_set:Nf \l_chemmacros_tmpa_tl { \tl_tail:V \l_chemmacros_tmpa_tl } + \prop_if_in:NoTF \l_chemmacros_iupac_prop { \l_chemmacros_tmpa_tl } + { \prop_put:Non \l_chemmacros_iupac_prop { \l_chemmacros_tmpa_tl } { #2 } } { \chemmacros_msg:nnxx { chemmacros } { renew-iupac } { #1 } { } } \chemmacros_make_iupac: } @@ -1567,11 +1573,11 @@ \cs_new_nopar:Npn \chemmacros_ox_is_integer:n #1 { - \fp_set:Nn \l_tmpa_tl { #1 } - \fp_add:Nn \l_tmpa_tl { 1 } - \fp_round_places:Nn \l_tmpa_tl { 0 } - \fp_sub:Nn \l_tmpa_tl { 1 } - \fp_compare:nNnTF { \l_tmpa_tl } = { #1 } + \fp_set:Nn \l_chemmacros_tmpa_tl { #1 } + \fp_add:Nn \l_chemmacros_tmpa_tl { 1 } + \fp_round_places:Nn \l_chemmacros_tmpa_tl { 0 } + \fp_sub:Nn \l_chemmacros_tmpa_tl { 1 } + \fp_compare:nNnTF { \l_chemmacros_tmpa_tl } = { #1 } { \bool_set_true:N \l_chemmacros_ox_integer_bool } { \bool_set_false:N \l_chemmacros_ox_integer_bool @@ -1583,12 +1589,12 @@ \cs_new_nopar:Npn \chemmacros_fp_to_Roman:n #1 { \group_begin: - \fp_set:Nn \l_tmpa_tl { #1 } - \fp_round_places:Nn \l_tmpa_tl { 0 } - \int_set:Nn \l_tmpa_int { \fp_to_tl:N \l_tmpa_tl } - \int_compare:nTF { \l_tmpa_int = 0 } + \fp_set:Nn \l_chemmacros_tmpa_tl { #1 } + \fp_round_places:Nn \l_chemmacros_tmpa_tl { 0 } + \int_set:Nn \l_chemmacros_tmpa_int { \fp_to_tl:N \l_chemmacros_tmpa_tl } + \int_compare:nTF { \l_chemmacros_tmpa_int = 0 } { 0 } - { \int_to_Roman:n { \int_use:N \l_tmpa_int } } + { \int_to_Roman:n { \int_use:N \l_chemmacros_tmpa_int } } \group_end: } \cs_generate_variant:Nn \chemmacros_fp_to_Roman:n { N } @@ -1596,8 +1602,8 @@ \cs_new_nopar:Npn \chemmacros_fp_to_arabic:n #1 { \group_begin: - \fp_set:Nn \l_tmpa_tl { #1 } - \fp_to_tl:N \l_tmpa_tl + \fp_set:Nn \l_chemmacros_tmpa_tl { #1 } + \fp_to_tl:N \l_chemmacros_tmpa_tl \group_end: } \cs_generate_variant:Nn \chemmacros_fp_to_arabic:n { N } @@ -1605,14 +1611,14 @@ \cs_new_nopar:Npn \chemmacros_fp_show:n #1 { \group_begin: - \fp_set:Nn \l_tmpa_tl { #1 } + \fp_set:Nn \l_chemmacros_tmpa_tl { #1 } \bool_if:NTF \l_chemmacros_ox_decimal_marker_comma_bool { - \tl_set:Nx \l_tmpb_tl { \fp_to_tl:N \l_tmpa_tl } - \tl_replace_once:Nnn \l_tmpb_tl { . } { {,} } - \tl_use:N \l_tmpb_tl + \tl_set:Nx \l_chemmacros_tmpb_tl { \fp_to_tl:N \l_chemmacros_tmpa_tl } + \tl_replace_once:Nnn \l_chemmacros_tmpb_tl { . } { {,} } + \tl_use:N \l_chemmacros_tmpb_tl } - { \fp_to_tl:N \l_tmpa_tl } + { \fp_to_tl:N \l_chemmacros_tmpa_tl } \group_end: } \cs_generate_variant:Nn \chemmacros_fp_show:n { N } @@ -2296,28 +2302,28 @@ \NewDocumentCommand \DeclareChemPhase { mom } { - \tl_set_rescan:Nnn \l_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 } - \tl_set:Nf \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } + \tl_set_rescan:Nnn \l_chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 } + \tl_set:Nf \l_chemmacros_tmpa_tl { \tl_tail:V \l_chemmacros_tmpa_tl } \cs_if_free:NTF #1 { \cs_new_nopar:Npn #1 {} } { \chemmacros_msg:nnxx { chemmacros } { declare-phase } { #1 } {} } \IfNoValueTF { #2 } - { \prop_put:Non \l_chemmacros_phases_german_prop { \l_tmpa_tl } { #3 } } - { \prop_put:Non \l_chemmacros_phases_german_prop { \l_tmpa_tl } { #2 } } - \prop_put:Non \l_chemmacros_phases_prop { \l_tmpa_tl } { #3 } + { \prop_put:Non \l_chemmacros_phases_german_prop { \l_chemmacros_tmpa_tl } { #3 } } + { \prop_put:Non \l_chemmacros_phases_german_prop { \l_chemmacros_tmpa_tl } { #2 } } + \prop_put:Non \l_chemmacros_phases_prop { \l_chemmacros_tmpa_tl } { #3 } \chemmacros_make_phases: } \NewDocumentCommand \RenewChemPhase { mom } { - \tl_set_rescan:Nnn \l_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 } - \tl_set:Nf \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } + \tl_set_rescan:Nnn \l_chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 } + \tl_set:Nf \l_chemmacros_tmpa_tl { \tl_tail:V \l_chemmacros_tmpa_tl } \cs_if_free:NT #1 { \chemmacros_msg:nnxx { chemmacros } { renew-phase } { #1 } {} } \IfNoValueTF { #2 } - { \prop_put:Non \l_chemmacros_phases_german_prop { \l_tmpa_tl } { #3 } } - { \prop_put:Non \l_chemmacros_phases_german_prop { \l_tmpa_tl } { #2 } } - \prop_put:Non \l_chemmacros_phases_prop { \l_tmpa_tl } { #3 } + { \prop_put:Non \l_chemmacros_phases_german_prop { \l_chemmacros_tmpa_tl } { #3 } } + { \prop_put:Non \l_chemmacros_phases_german_prop { \l_chemmacros_tmpa_tl } { #2 } } + \prop_put:Non \l_chemmacros_phases_prop { \l_chemmacros_tmpa_tl } { #3 } \chemmacros_make_phases: } @@ -3813,6 +3819,7 @@ Version history \phase - changed default behaviour of phases - removed optional argument from \sld and \lqd + - new arrow type <> 2012/02/19 - version 3.1 - new commands \DeclareChemIUPAC and \RenewChemIUPAC - new option "option/iupac" - deprecated option: "option/EZ" @@ -3824,17 +3831,27 @@ Version history \Scip => \S \Dfi => \D \Lfi => \L - - new arrow types in the chemformula package + - new arrow types -/>, + - new commands \DeclareChemArrow, \RenewChemArrow and + \ShowChemArrow 2012/02/26 - version 3.1a - "operator" p rewritten to follow IUPAC recommendations - new option "acid-base/p-style" - deprecated option: "option/detect-bold" -2012/03/03 - version 3.1b - changes in the chemformula package +2012/03/03 - version 3.1b - arrow types are stored in a sequence to automate the + search and replace in the right order + - new arrow type == + - IUPAC compliance for stoichiometric factors + - new handling of super- and subscripts to correct + various flaws: clear distinction between isotope and + formula + - new option charge-vshift - IUPAC compliance for \Delta and \ox 2012/03/14 - version 3.1c - compatibility with KOMA's global option "version = " - bugfix in the list of reactions -2012/03/20 - version 3.2 - new feature in chemformula + - improved arrow labels +2012/03/20 - version 3.2 - new: option input via @{} - improved list of reactions: resetting the "reaction" counter now doesn't cause errors any more - \AddRxnDesc added which allows to add descriptions @@ -3843,7 +3860,7 @@ Version history formatting for the for displaying of measurement results - more greek letters for the \iupac command - - new features in chemformula.sty + - \ch now bypasses \ref{}, \label{}, and \intertext{} - small adjustments of the iupac commands \| and \- - bug fix: option `upgreek' is now working and was renamed to `greek' @@ -3861,6 +3878,13 @@ Version history options 2012/08/21 - version 3.3e - new option ox/align=center|right - a new option to \NMR and to \J +2012/09/11 - version 3.4 - cleaned a little, minor bug fixes + - switched to internal scratch variables + - new command \bond, more bond types + - new commands \DeclareChemBond, \DeclareChemBondAlias, + \RenewChemBond and \ShowChemBond + - radical point thicker, new options `radical-style' + and `radical-radius' % --------------------------------------------------------------------------- % % TODO: diff --git a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty index 75587497e36..d7543028d16 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty @@ -62,6 +62,13 @@ sure~to~load~it~in~your~preamble. } +% --------------------------------------------------------------------------- % +% scratch variables +\tl_new:N \l_ghsystem_tmpa_tl +\tl_new:N \l_ghsystem_tmpb_tl +\int_new:N \l_ghsystem_tmpa_int +\int_new:N \l_ghsystem_tmpb_int + % --------------------------------------------------------------------------- % % gobble options \DeclareOption* { } @@ -303,12 +310,12 @@ \cs_new:Nn \ghsystem_read_args:nn { - \ghsystem_get_type:nN { #1 } \l_tmpa_tl - \prop_get:cnNTF { l_ghsystem_ \l_tmpa_tl _prop } { #2 } \l_tmpb_tl + \ghsystem_get_type:nN { #1 } \l_ghsystem_tmpa_tl + \prop_get:cnNTF { l_ghsystem_ \l_ghsystem_tmpa_tl _prop } { #2 } \l_ghsystem_tmpb_tl { \ghsystem_is_combination:nn { #1 } { #2 } \bool_if:NF \l_ghsystem_hide_statement_bool - { \tl_use:N \l_tmpb_tl } + { \tl_use:N \l_ghsystem_tmpb_tl } } { \chemmacros_msg:nnxx { ghsystem } { statements } { #1 } { #2 } } } @@ -383,9 +390,9 @@ { \group_begin: \IfNoValueF { #1 } { \keys_set:nn { chemmacros / ghsystem } { #1 } } - \int_zero:N \l_tmpa_int - \int_zero:N \l_tmpb_int - \prop_map_inline:Nn \l_ghsystem_p_prop { \int_incr:N \l_tmpa_int } + \int_zero:N \l_ghsystem_tmpa_int + \int_zero:N \l_ghsystem_tmpb_int + \prop_map_inline:Nn \l_ghsystem_p_prop { \int_incr:N \l_ghsystem_tmpa_int } \dim_set_eq:NN \tabulinesep \l_ghsystem_table_line_sep_dim \begin { longtabu } { X[3]X[7,L] } \caption [ \l_ghsystem_table_caption_short_tl ] @@ -412,14 +419,14 @@ { \ghsystem_read_number:nn { H } { ##1 } & ##2 \\ } \prop_map_inline:Nn \l_ghsystem_euh_prop { \ghsystem_read_number:nn { EUH } { ##1 } & ##2 \\ } - \int_zero:N \l_tmpa_int - \prop_map_inline:Nn \l_ghsystem_p_prop { \int_gincr:N \l_tmpa_int } - \int_zero:N \l_tmpb_int + \int_zero:N \l_ghsystem_tmpa_int + \prop_map_inline:Nn \l_ghsystem_p_prop { \int_gincr:N \l_ghsystem_tmpa_int } + \int_zero:N \l_ghsystem_tmpb_int \prop_map_inline:Nn \l_ghsystem_p_prop { - \int_gincr:N \l_tmpb_int + \int_gincr:N \l_ghsystem_tmpb_int \ghsystem_read_number:nn { P } { ##1 } & ##2 - \int_compare:nNnT { \l_tmpb_int } < { \l_tmpa_int } { \\ } + \int_compare:nNnT { \l_ghsystem_tmpb_int } < { \l_ghsystem_tmpa_int } { \\ } } \end { longtabu } \group_end: @@ -501,34 +508,7 @@ \tex_endinput:D %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% VERSION HISTORY -2012/01/28 - version 3.0 - first published to CTAN with the chemmacros bundle -2012/01/30 - version 3.0a - bugfix in chemormula.sty, renamed ghs => ghsystem -2012/02/03 - version 3.0b - updated documentation -2012/02/05 - version 3.0c - renamed pictogram files -2012/02/10 - version 3.0d - several bugfixes in chemformula, some new commands - and options in chemmacros -2012/02/19 - version 3.1 - new functions in the chemmacros package - - new arrow types and functions in the chemformula - package -2012/02/26 - version 3.1a - changes in the chemmacros package -2012/03/03 - version 3.1b - changes in packages chemformula and chemmacros -2012/03/14 - version 3.1c - changes in packages chemformula and chemmacros -2012/03/20 - version 3.2 - changes in packages chemformula and chemmacros -2012/05/07 - version 3.3 - changes in packages chemformula and chemmacros - - support for chemmacros' new language settings -2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements - - removed erroneous empty line at the end of the table - created by \ghslistall -2012/05/18 - version 3.3b - compatibility with MiKTeX -2012/05/18 - version 3.3c - fix in the `ghsystem/language' option -2012/07/24 - version 3.3d - additional picture file type `pdf' - - default bond length set to 1.1667ex - - bug fix in the bonds - - added kerning to cip commands, new option - `iupac/cip-kern' - - bug fix: messages needed to be defined before the - options -2012/08/08 - version 3.3e - new option ox/align=center|right +see the chemmacros.sty file %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % TODO: diff --git a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_italian.def b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_italian.def index eab682caf6a..dde47101ca2 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_italian.def +++ b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_italian.def @@ -5,7 +5,7 @@ % - macros and commands for chemists - % % --------------------------------------------------------------------------- % % - Clemens Niederberger - % -% - 2012/05/13 - % +% - 2012/09/11 - % % --------------------------------------------------------------------------- % % - http://www.mychemistry.eu/ - % % - contact@mychemistry.eu - % @@ -38,8 +38,8 @@ % table head and foot: \tl_set:Nn \l_ghsystem_identifier_tl { Numero } \tl_set:Nn \l_ghsystem_table_text_tl { Frase } -\tl_set:Nn \l_ghsystem_table_next_page_tl { con\-ti\-nua~sul\-la~pros\-si\-ma~pa\-gi\-na } -\tl_set:Nn \l_ghsystem_table_caption_tl { Tut\-te~le~fra\-si~H,~EUH~e~P. } +\tl_set:Nn \l_ghsystem_table_next_page_tl { Con\-ti\-nua~nel\-la~pros\-si\-ma~pa\-gi\-na } +\tl_set:Nn \l_ghsystem_table_caption_tl { Elen\-co~di~tut\-te~le~fra\-si~H,~EUH~e~P. } % fill-in functions: % . @@ -148,17 +148,17 @@ \prop_put:Nnn \l_ghsystem_h_prop { 334 } { Pu\`o~pro\-vo\-ca\-re~sin\-to\-mi~al\-ler\-gi\-ci~o~a\-sma\-ti\-ci~o~dif\-fi\-col\-t\`a~re\-spi\-ra\-to\-rie~se~i\-na\-la\-to. } \prop_put:Nnn \l_ghsystem_h_prop { 335 } { Pu\`o~ir\-ri\-ta\-re~le~vie~re\-spi\-ra\-to\-rie. } \prop_put:Nnn \l_ghsystem_h_prop { 336 } { Pu\`o~pro\-vo\-ca\-re~son\-no\-len\-za~o~ver\-ti\-gi\-ni. } -\prop_put:Nnn \l_ghsystem_h_prop { 340 } { Pu\`o~pro\-vo\-ca\-re~al\-te\-ra\-zio\-ni~ge\-ne\-ti\-che~\ghsystem_exposure: } -\prop_put:Nnn \l_ghsystem_h_prop { 341 } { So\-spet\-ta\-to~di~pro\-vo\-ca\-re~al\-te\-ra\-zio\-ni~ge\-ne\-ti\-che~\ghsystem_exposure: } -\prop_put:Nnn \l_ghsystem_h_prop { 350 } { Pu\`o~pro\-vo\-ca\-re~il~can\-cro~\ghsystem_exposure: } -\prop_put:Nnn \l_ghsystem_h_prop { 351 } { So\-spet\-ta\-to~di~pro\-vo\-ca\-re~il~can\-cro~\ghsystem_exposure: } -\prop_put:Nnn \l_ghsystem_h_prop { 360 } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a~o~al~fe\-to~\ghsystem_effect: ~ \ghsystem_exposure: } -\prop_put:Nnn \l_ghsystem_h_prop { 361 } { So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a~o~al~fe\-to~\ghsystem_effect:~\ghsystem_exposure: } +\prop_put:Nnn \l_ghsystem_h_prop { 340 } { Pu\`o~pro\-vo\-ca\-re~al\-te\-ra\-zio\-ni~ge\-ne\-ti\-che \ghsystem_exposure: .} %%% Punkt dazu +\prop_put:Nnn \l_ghsystem_h_prop { 341 } { So\-spet\-ta\-to~di~pro\-vo\-ca\-re~al\-te\-ra\-zio\-ni~ge\-ne\-ti\-che \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu +\prop_put:Nnn \l_ghsystem_h_prop { 350 } { Pu\`o~pro\-vo\-ca\-re~il~can\-cro \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu +\prop_put:Nnn \l_ghsystem_h_prop { 351 } { So\-spet\-ta\-to~di~pro\-vo\-ca\-re~il~can\-cro \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu +\prop_put:Nnn \l_ghsystem_h_prop { 360 } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a~o~al~fe\-to \ghsystem_effect: \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu +\prop_put:Nnn \l_ghsystem_h_prop { 361 } { So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a~o~al~fe\-to \ghsystem_effect: \ghsystem_exposure: .}%%% spaces gerichtet, Punkt dazu \prop_put:Nnn \l_ghsystem_h_prop { 362 } { Pu\`o~es\-se\-re~no\-ci\-vo~per~i~lat\-tan\-ti~al\-lat\-ta\-ti~al~se\-no. } -\prop_put:Nnn \l_ghsystem_h_prop { 370 } { Pro\-vo\-ca~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs: . \ghsystem_exposure: } -\prop_put:Nnn \l_ghsystem_h_prop { 371 } { Pu\`o~pro\-vo\-ca\-re~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs: . \ghsystem_exposure: } -\prop_put:Nnn \l_ghsystem_h_prop { 372 } { Pro\-vo\-ca~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:\ in~ca\-so~di~e\-spo\-si\-zio\-ne~pro\-lun\-ga\-ta~o~ri\-pe\-tu\-ta.~\ghsystem_exposure: } -\prop_put:Nnn \l_ghsystem_h_prop { 373 } { Pu\`o~pro\-vo\-ca\-re~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:\ in~ca\-so~di~e\-spo\-si\-zio\-ne~pro\-lun\-ga\-ta~o~ri\-pe\-tu\-ta. \ghsystem_exposure: } +\prop_put:Nnn \l_ghsystem_h_prop { 370 } { Pro\-vo\-ca~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs: \ghsystem_exposure: .} %%% Punkt dazu +\prop_put:Nnn \l_ghsystem_h_prop { 371 } { Pu\`o~pro\-vo\-ca\-re~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs: \ghsystem_exposure: .} %%% Punkt dazu +\prop_put:Nnn \l_ghsystem_h_prop { 372 } { Pro\-vo\-ca~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:\ in~ca\-so~di~e\-spo\-si\-zio\-ne~pro\-lun\-ga\-ta~o~ri\-pe\-tu\-ta \ghsystem_exposure: .} +\prop_put:Nnn \l_ghsystem_h_prop { 373 } { Pu\`o~pro\-vo\-ca\-re~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:\ in~ca\-so~di~e\-spo\-si\-zio\-ne~pro\-lun\-ga\-ta~o~ri\-pe\-tu\-ta \ghsystem_exposure: .} % 1.3 Pericoli per l'ambiente \prop_put:Nnn \l_ghsystem_h_prop { 400 } { Mol\-to~tos\-si\-co~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci. } @@ -172,7 +172,7 @@ \prop_put:Nnn \l_ghsystem_euh_prop { 001 } { E\-splo\-si\-vo~al\-lo~sta\-to~sec\-co. } \prop_put:Nnn \l_ghsystem_euh_prop { 006 } { E\-splo\-si\-vo~a~con\-tat\-to~o~sen\-za~con\-tat\-to~con~l'a\-ria. } \prop_put:Nnn \l_ghsystem_euh_prop { 014 } { Re\-a\-gi\-sce~vio\-len\-te\-men\-te~con~l'ac\-qua. } -\prop_put:Nnn \l_ghsystem_euh_prop { 018 } { Du\-ran\-te~l'u\-so~pu\`o~for\-mar\-si~u\-na~mi\-sce\-la~va\-po\-re-a\-ria~e\-splo\-si\-va/in\-fiam\-ma\-bi\-le. } +\prop_put:Nnn \l_ghsystem_euh_prop { 018 } { Du\-ran\-te~l'u\-so~pu\`o~for\-mar\-si~u\-na~mi\-sce\-la~va\-po\-re-a\-ria~e\-splo\-si\-va\slash in\-fiam\-ma\-bi\-le. } \prop_put:Nnn \l_ghsystem_euh_prop { 019 } { Pu\`o~for\-ma\-re~per\-ossidi~e\-splo\-si\-vi. } \prop_put:Nnn \l_ghsystem_euh_prop { 044 } { Ri\-schio~di~e\-splo\-sio\-ne~per~ri\-scal\-da\-men\-to~in~am\-bien\-te~con\-fi\-na\-to. } @@ -196,7 +196,7 @@ \prop_put:Nnn \l_ghsystem_euh_prop { 205 } { Con\-tie\-ne~com\-po\-nen\-ti~epossi\-di\-ci.~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. } \prop_put:Nnn \l_ghsystem_euh_prop { 206 } { At\-ten\-zio\-ne!~Non~u\-ti\-liz\-za\-re~in~com\-bi\-na\-zio\-ne~con~al\-tri~pro\-dot\-ti.~Pos\-so\-no~li\-be\-rar\-si~gas~pe\-ri\-co\-lo\-si~(cloro). } \prop_put:Nnn \l_ghsystem_euh_prop { 207 } { At\-ten\-zio\-ne!~Con\-tie\-ne~cadmio.~Du\-ran\-te~l'u\-so~si~svi\-lup\-pa\-no~fu\-mi~pe\-ri\-co\-lo\-si.~Leg\-ge\-re~le~in\-for\-ma\-zio\-ni~for\-ni\-te~dal~fab\-bri\-can\-te.~Ri\-spet\-ta\-re~le~di\-spo\-si\-zio\-ni~di~si\-cu\-rez\-za. } -\prop_put:Nnn \l_ghsystem_euh_prop { 208 } { Con\-tie\-ne~\ghsystem_substance: .~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne al\-ler\-gi\-ca. } +\prop_put:Nnn \l_ghsystem_euh_prop { 208 } { Con\-tie\-ne \ghsystem_substance: .~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. } \prop_put:Nnn \l_ghsystem_euh_prop { 209 } { Pu\`o~di\-ven\-ta\-re~fa\-cil\-men\-te~in\-fiam\-ma\-bi\-le~du\-ran\-te~l'u\-so. } \prop_put:Nnn \l_ghsystem_euh_prop { 209A } { Pu\`o~di\-ven\-ta\-re~in\-fiam\-ma\-bi\-le~du\-ran\-te~l'u\-so. } \prop_put:Nnn \l_ghsystem_euh_prop { 210 } { Sche\-da~da\-ti~di~si\-cu\-rez\-za~di\-spo\-ni\-bi\-le~su~ri\-chie\-sta. } @@ -212,9 +212,9 @@ % 3.2 Consigli di prudenza - Prevenzione \prop_put:Nnn \l_ghsystem_p_prop { 201 } { Pro\-cu\-rar\-si~i\-stru\-zio\-ni~spe\-ci\-fi\-che~pri\-ma~del\-l'u\-so. } \prop_put:Nnn \l_ghsystem_p_prop { 202 } { Non~ma\-ni\-po\-la\-re~pri\-ma~di~a\-ve\-re~let\-to~e~com\-pre\-so~tut\-te~le~av\-ver\-ten\-ze. } -\prop_put:Nnn \l_ghsystem_p_prop { 210 } { Te\-ne\-re~lon\-ta\-no~da~fon\-ti~di~ca\-lo\-re/scin\-til\-le/fiam\-me~li\-be\-re/su\-per\-fi\-ci~ri\-scal\-da\-te.~ \textemdash ~Non~fu\-ma\-re. } +\prop_put:Nnn \l_ghsystem_p_prop { 210 } { Te\-ne\-re~lon\-ta\-no~da~fon\-ti~di~ca\-lo\-re\slash scin\-til\-le\slash fiam\-me~li\-be\-re\slash su\-per\-fi\-ci~ri\-scal\-da\-te.~ \textemdash ~Non~fu\-ma\-re. } \prop_put:Nnn \l_ghsystem_p_prop { 211 } { Non~va\-po\-riz\-za\-re~su~u\-na~fiam\-ma~li\-be\-ra~o~al\-tra~fon\-te~di~ac\-cen\-sio\-ne. } -\prop_put:Nnn \l_ghsystem_p_prop { 220 } { Te\-ne\-re/con\-ser\-va\-re~lon\-ta\-no~da~in\-du\-men\-ti/\l_ghsystem_dots_tl /ma\-te\-ria\-li~com\-bu\-sti\-bi\-li. } +\prop_put:Nnn \l_ghsystem_p_prop { 220 } { Te\-ne\-re\slash con\-ser\-va\-re~lon\-ta\-no~da~in\-du\-men\-ti\slash \l_ghsystem_dots_tl \slash ma\-te\-ria\-li~com\-bu\-sti\-bi\-li. } \prop_put:Nnn \l_ghsystem_p_prop { 221 } { Pren\-de\-re~o\-gni~pre\-cau\-zio\-ne~per~e\-vi\-ta\-re~di~mi\-sce\-la\-re~con~so\-stan\-ze~com\-bu\-sti\-bi\-li~\l_ghsystem_dots_tl . } \prop_put:Nnn \l_ghsystem_p_prop { 222 } { Evi\-ta\-re~il~con\-tat\-to~con~l'a\-ria. } \prop_put:Nnn \l_ghsystem_p_prop { 223 } { Evi\-ta\-re~qual\-si\-a\-si~con\-tat\-to~con~l'ac\-qua:~pe\-ri\-co\-lo~di~re\-a\-zio\-ne~vio\-len\-ta~e~di~in\-fiam\-ma\-zio\-ne~spon\-ta\-nea. } @@ -224,25 +224,25 @@ \prop_put:Nnn \l_ghsystem_p_prop { 233 } { Te\-ne\-re~il~re\-ci\-pien\-te~ben~chiu\-so. } \prop_put:Nnn \l_ghsystem_p_prop { 234 } { Con\-ser\-va\-re~sol\-tan\-to~nel~con\-te\-ni\-to\-re~o\-ri\-gi\-na\-le. } \prop_put:Nnn \l_ghsystem_p_prop { 235 } { Con\-ser\-va\-re~in~luo\-go~fre\-sco. } -\prop_put:Nnn \l_ghsystem_p_prop { 240 } { Met\-te\-re~a~ter\-ra/mas\-sa~il~con\-te\-ni\-to\-re~e~il~di\-spo\-si\-ti\-vo~ri\-ce\-ven\-te. } -\prop_put:Nnn \l_ghsystem_p_prop { 241 } { U\-ti\-liz\-za\-re~im\-pian\-ti~e\-let\-tri\-ci/di~ven\-ti\-la\-zio\-ne/d'il\-lu\-mi\-na\-zio\-ne/\l_ghsystem_dots_tl /a~pro\-va~di~e\-splo\-sio\-ne. } +\prop_put:Nnn \l_ghsystem_p_prop { 240 } { Met\-te\-re~a~ter\-ra\slash mas\-sa~il~con\-te\-ni\-to\-re~e~il~di\-spo\-si\-ti\-vo~ri\-ce\-ven\-te. } +\prop_put:Nnn \l_ghsystem_p_prop { 241 } { U\-ti\-liz\-za\-re~im\-pian\-ti~e\-let\-tri\-ci\slash di~ven\-ti\-la\-zio\-ne\slash d'il\-lu\-mi\-na\-zio\-ne\slash \l_ghsystem_dots_tl \slash a~pro\-va~di~e\-splo\-sio\-ne. } \prop_put:Nnn \l_ghsystem_p_prop { 242 } { U\-ti\-liz\-za\-re~so\-lo~u\-ten\-si\-li~an\-ti\-scin\-til\-la\-men\-to. } \prop_put:Nnn \l_ghsystem_p_prop { 243 } { Pren\-de\-re~pre\-cau\-zio\-ni~con\-tro~le~sca\-ri\-che~e\-let\-tro\-sta\-ti\-che. } \prop_put:Nnn \l_ghsystem_p_prop { 244 } { Man\-te\-ne\-re~le~val\-vo\-le~di~ri\-du\-zio\-ne~li\-be\-re~da~gras\-so~e~o\-lio. } -\prop_put:Nnn \l_ghsystem_p_prop { 250 } { E\-vi\-ta\-re~le~a\-bra\-sio\-ni/gli~ur\-ti/\l_ghsystem_dots_tl /gli~at\-tri\-ti. } +\prop_put:Nnn \l_ghsystem_p_prop { 250 } { E\-vi\-ta\-re~le~a\-bra\-sio\-ni\slash gli~ur\-ti\slash \l_ghsystem_dots_tl \slash gli~at\-tri\-ti. } \prop_put:Nnn \l_ghsystem_p_prop { 251 } { Re\-ci\-pien\-te~sot\-to~pres\-sio\-ne:~non~per\-fo\-ra\-re~n\'e~bru\-cia\-re,~nep\-pu\-re~do\-po~l'uso. } -\prop_put:Nnn \l_ghsystem_p_prop { 260 } { Non~re\-spi\-ra\-re~la~pol\-ve\-re/i~fu\-mi/i~gas/la~neb\-bia/i~va\-po\-ri/gli~aero\-sol. } -\prop_put:Nnn \l_ghsystem_p_prop { 261 } { E\-vi\-ta\-re~di~re\-spi\-ra\-re~la~pol\-ve\-re/i~fu\-mi/i~gas/la~neb\-bia/i~va\-po\-ri/gli~aero\-sol. } +\prop_put:Nnn \l_ghsystem_p_prop { 260 } { Non~re\-spi\-ra\-re~la~pol\-ve\-re\slash i~fu\-mi\slash i~gas\slash la~neb\-bia\slash i~va\-po\-ri\slash gli~aero\-sol. } +\prop_put:Nnn \l_ghsystem_p_prop { 261 } { E\-vi\-ta\-re~di~re\-spi\-ra\-re~la~pol\-ve\-re\slash i~fu\-mi\slash i~gas\slash la~neb\-bia\slash i~va\-po\-ri\slash gli~aero\-sol. } \prop_put:Nnn \l_ghsystem_p_prop { 262 } { E\-vi\-ta\-re~il~con\-tat\-to~con~gli~oc\-chi,~la~pel\-le~o~gli~in\-du\-men\-ti. } -\prop_put:Nnn \l_ghsystem_p_prop { 263 } { E\-vi\-ta\-re~il~con\-tat\-to~du\-ran\-te~la~gra\-vi\-dan\-za/l'al\-lat\-ta\-men\-to. } +\prop_put:Nnn \l_ghsystem_p_prop { 263 } { E\-vi\-ta\-re~il~con\-tat\-to~du\-ran\-te~la~gra\-vi\-dan\-za\slash l'al\-lat\-ta\-men\-to. } \prop_put:Nnn \l_ghsystem_p_prop { 264 } { La\-va\-re~ac\-cu\-ra\-ta\-men\-te~\l_ghsystem_dots_tl\ do\-po~l'u\-so. } \prop_put:Nnn \l_ghsystem_p_prop { 270 } { Non~man\-gia\-re,~n\'e~be\-re,~n\'e~fu\-ma\-re~du\-ran\-te~l'u\-so. } \prop_put:Nnn \l_ghsystem_p_prop { 271 } { U\-ti\-liz\-za\-re~sol\-tan\-to~al\-l'a\-per\-to~o~in~luo\-go~ben~ven\-ti\-la\-to. } \prop_put:Nnn \l_ghsystem_p_prop { 272 } { Gli~in\-du\-men\-ti~da~la\-vo\-ro~con\-ta\-mi\-na\-ti~non~de\-vo\-no~es\-se\-re~por\-ta\-ti~fuo\-ri~dal~luo\-go~di~la\-vo\-ro. } \prop_put:Nnn \l_ghsystem_p_prop { 273 } { Non~di\-sper\-de\-re~nel\-l'am\-bien\-te. } -\prop_put:Nnn \l_ghsystem_p_prop { 280 } { In\-dos\-sa\-re~guan\-ti/in\-du\-men\-ti~pro\-tet\-ti\-vi/Pro\-teg\-ge\-re~gli~oc\-chi/il~vi\-so. } +\prop_put:Nnn \l_ghsystem_p_prop { 280 } { In\-dos\-sa\-re~guan\-ti\slash in\-du\-men\-ti~pro\-tet\-ti\-vi\slash Pro\-teg\-ge\-re~gli~oc\-chi\slash il~vi\-so. } \prop_put:Nnn \l_ghsystem_p_prop { 281 } { U\-ti\-liz\-za\-re~il~di\-spo\-si\-ti\-vo~di~pro\-te\-zio\-ne~in\-di\-vi\-dua\-le~ri\-chie\-sto. } -\prop_put:Nnn \l_ghsystem_p_prop { 282 } { U\-ti\-liz\-za\-re~guan\-ti~ter\-mi\-ci/scher\-mo~fac\-cia\-le/Pro\-teg\-ge\-re~gli~oc\-chi. } +\prop_put:Nnn \l_ghsystem_p_prop { 282 } { U\-ti\-liz\-za\-re~guan\-ti~ter\-mi\-ci\slash scher\-mo~fac\-cia\-le\slash Pro\-teg\-ge\-re~gli~oc\-chi. } \prop_put:Nnn \l_ghsystem_p_prop { 283 } { In\-dos\-sa\-re~in\-du\-men\-ti~com\-ple\-ta\-men\-te~i\-gni\-fu\-ghi~o~in~tes\-su\-ti~ri\-tar\-dan\-ti~di~fiam\-ma. } \prop_put:Nnn \l_ghsystem_p_prop { 284 } { U\-ti\-liz\-za\-re~un~ap\-pa\-rec\-chio~re\-spi\-ra\-to\-rio. } \prop_put:Nnn \l_ghsystem_p_prop { 285 } { In~ca\-so~di~ven\-ti\-la\-zio\-ne~in\-suf\-fi\-cien\-te~u\-ti\-liz\-za\-re~un~ap\-pa\-rec\-chio~re\-spi\-ra\-to\-rio. } @@ -250,15 +250,15 @@ \prop_put:Nnn \l_ghsystem_p_prop { 235 + 410 } { Te\-ne\-re~in~luo\-go~fre\-sco.~Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri. } % 3.3 Consigli di prudenza - Reazione -\prop_put:Nnn \l_ghsystem_p_prop { 301 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 302 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 303 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE~(o~con~i~ca\-pel\-li) :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 304 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 305 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~OC\-CHI :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 306 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~IN\-DU\-MEN\-TI :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 307 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 308 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~pos\-si\-bi\-le~e\-spo\-si\-zio\-ne :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 309 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~ma\-les\-se\-re :~\ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 301 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 302 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 303 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE~(o~con~i~ca\-pel\-li): \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 304 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 305 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~OC\-CHI: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 306 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~IN\-DU\-MEN\-TI: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 307 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 308 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~pos\-si\-bi\-le~e\-spo\-si\-zio\-ne: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 309 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~ma\-les\-se\-re: \ghsystem_text: } \prop_put:Nnn \l_ghsystem_p_prop { 310 } { Con\-tat\-ta\-re~im\-me\-dia\-ta\-men\-te~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. } \prop_put:Nnn \l_ghsystem_p_prop { 311 } { Con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. } \prop_put:Nnn \l_ghsystem_p_prop { 312 } { In~ca\-so~di~ma\-les\-se\-re,~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. } @@ -270,32 +270,32 @@ \prop_put:Nnn \l_ghsystem_p_prop { 322 } { Mi\-su\-re~spe\-ci\-fi\-che~(ve\-de\-re~\l_ghsystem_dots_tl\ su~que\-sta~e\-ti\-chet\-ta). } \prop_put:Nnn \l_ghsystem_p_prop { 330 } { Sciac\-qua\-re~la~boc\-ca. } \prop_put:Nnn \l_ghsystem_p_prop { 331 } { NON~pro\-vo\-ca\-re~il~vo\-mi\-to. } -\prop_put:Nnn \l_ghsystem_p_prop { 332 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~del\-la~pel\-le :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 333 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~o~e\-ru\-zio\-ne~del\-la~pel\-le :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 334 } { Im\-mer\-ge\-re~in~ac\-qua~fred\-da/av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. } +\prop_put:Nnn \l_ghsystem_p_prop { 332 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~del\-la~pel\-le: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 333 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~o~e\-ru\-zio\-ne~del\-la~pel\-le: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 334 } { Im\-mer\-ge\-re~in~ac\-qua~fred\-da\slash av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. } \prop_put:Nnn \l_ghsystem_p_prop { 335 } { Ri\-muo\-ve\-re~le~par\-ti\-cel\-le~de\-po\-si\-ta\-te~sul\-la~pel\-le. } \prop_put:Nnn \l_ghsystem_p_prop { 336 } { Sge\-la\-re~le~par\-ti~con\-ge\-la\-te~u\-san\-do~ac\-qua~tie\-pi\-da.~Non~sfre\-ga\-re~la~par\-te~in\-te\-res\-sa\-ta. } -\prop_put:Nnn \l_ghsystem_p_prop { 337 } { Se~l'ir\-ri\-ta\-zio\-ne~de\-gli~oc\-chi~per\-si\-ste :~\ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 337 } { Se~l'ir\-ri\-ta\-zio\-ne~de\-gli~oc\-chi~per\-si\-ste: \ghsystem_text: } \prop_put:Nnn \l_ghsystem_p_prop { 338 } { To\-glie\-re~le~e\-ven\-tua\-li~len\-ti~a~con\-tat\-to~se~\`e~a\-ge\-vo\-le~farlo.~Con\-ti\-nua\-re~a~sciac\-qua\-re. } \prop_put:Nnn \l_ghsystem_p_prop { 340 } { Tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. } \prop_put:Nnn \l_ghsystem_p_prop { 341 } { Se~la~re\-spi\-ra\-zio\-ne~\`e~dif\-fi\-ci\-le,~tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. } -\prop_put:Nnn \l_ghsystem_p_prop { 342 } { In~ca\-so~di~sin\-to\-mi~re\-spi\-ra\-to\-ri :~\ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 342 } { In~ca\-so~di~sin\-to\-mi~re\-spi\-ra\-to\-ri: \ghsystem_text: } \prop_put:Nnn \l_ghsystem_p_prop { 350 } { La\-va\-re~de\-li\-ca\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. } \prop_put:Nnn \l_ghsystem_p_prop { 351 } { Sciac\-qua\-re~ac\-cu\-ra\-ta\-men\-te~per~pa\-rec\-chi~mi\-nu\-ti. } \prop_put:Nnn \l_ghsystem_p_prop { 352 } { La\-va\-re~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. } -\prop_put:Nnn \l_ghsystem_p_prop { 353 } { Sciac\-qua\-re~la~pel\-le/fa\-re~u\-na~doc\-cia. } +\prop_put:Nnn \l_ghsystem_p_prop { 353 } { Sciac\-qua\-re~la~pel\-le\slash fa\-re~u\-na~doc\-cia. } \prop_put:Nnn \l_ghsystem_p_prop { 360 } { Sciac\-qua\-re~im\-me\-dia\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~e~la~pel\-le~pri\-ma~di~to\-glier\-si~gli~in\-du\-men\-ti. } \prop_put:Nnn \l_ghsystem_p_prop { 361 } { To\-glier\-si~di~dos\-so~im\-me\-dia\-ta\-men\-te~tut\-ti~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti. } \prop_put:Nnn \l_ghsystem_p_prop { 362 } { To\-glier\-si~di~dos\-so~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~e~la\-var\-li~pri\-ma~di~in\-dos\-sar\-li~nuo\-va\-men\-te. } \prop_put:Nnn \l_ghsystem_p_prop { 363 } { La\-va\-re~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~pri\-ma~di~in\-dos\-sar\-li~nuo\-va\-men\-te. } -\prop_put:Nnn \l_ghsystem_p_prop { 370 } { In~ca\-so~di~in\-cen\-dio :~\ghsystem_text: } -\prop_put:Nnn \l_ghsystem_p_prop { 371 } { In~ca\-so~di~in\-cen\-dio~gra\-ve~e~di~quan\-ti\-t\`a~ri\-le\-van\-ti :~\ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 370 } { In~ca\-so~di~in\-cen\-dio: \ghsystem_text: } +\prop_put:Nnn \l_ghsystem_p_prop { 371 } { In~ca\-so~di~in\-cen\-dio~gra\-ve~e~di~quan\-ti\-t\`a~ri\-le\-van\-ti: \ghsystem_text: } \prop_put:Nnn \l_ghsystem_p_prop { 372 } { Ri\-schio~di~e\-splo\-sio\-ne~in~ca\-so~di~in\-cen\-dio. } \prop_put:Nnn \l_ghsystem_p_prop { 373 } { NON~u\-ti\-liz\-za\-re~mez\-zi~e\-stin\-guen\-ti~se~l'in\-cen\-dio~rag\-giun\-ge~ma\-te\-ria\-li~e\-splo\-si\-vi. } \prop_put:Nnn \l_ghsystem_p_prop { 374 } { U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~con~le~pre\-cau\-zio\-ni~a\-bi\-tu\-a\-li~a~di\-stan\-za~ra\-gio\-ne\-vo\-le. } \prop_put:Nnn \l_ghsystem_p_prop { 375 } { Ri\-schio~di~e\-splo\-sio\-ne.~U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~a~gran\-de~di\-stan\-za. } \prop_put:Nnn \l_ghsystem_p_prop { 376 } { Bloc\-ca\-re~la~per\-di\-ta~se~non~c'\`e~pe\-ri\-co\-lo. } -\prop_put:Nnn \l_ghsystem_p_prop { 377 } { In~ca\-so~d'in\-cen\-dio~do\-vu\-to~a~per\-di\-ta~di~gas~\ghsystem_text: , ~non~e\-stin\-gue\-re~a~me\-no~che~non~sia~pos\-si\-bi\-le~bloc\-ca\-re~la~per\-di\-ta~sen\-za~pe\-ri\-co\-lo. } +\prop_put:Nnn \l_ghsystem_p_prop { 377 } { In~ca\-so~d'in\-cen\-dio~do\-vu\-to~a~per\-di\-ta~di~gas \ghsystem_text: , ~non~e\-stin\-gue\-re~a~me\-no~che~non~sia~pos\-si\-bi\-le~bloc\-ca\-re~la~per\-di\-ta~sen\-za~pe\-ri\-co\-lo. } \prop_put:Nnn \l_ghsystem_p_prop { 378 } { E\-stin\-gue\-re~con~\l_ghsystem_dots_tl . } \prop_put:Nnn \l_ghsystem_p_prop { 380 } { E\-va\-cua\-re~la~zo\-na. } \prop_put:Nnn \l_ghsystem_p_prop { 381 } { E\-li\-mi\-na\-re~o\-gni~fon\-te~di~ac\-cen\-sio\-ne~se~non~c'\`e~pe\-ri\-co\-lo. } @@ -304,10 +304,10 @@ \prop_put:Nnn \l_ghsystem_p_prop { 301 + 310 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE:~con\-tat\-ta\-re~im\-me\-dia\-ta\-men\-te~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. } \prop_put:Nnn \l_ghsystem_p_prop { 301 + 312 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE~ac\-com\-pa\-gna\-ta~da~ma\-les\-se\-re:~con\-tat\-ta\-re~un~CEN\-TRO AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. } \prop_put:Nnn \l_ghsystem_p_prop { 301 + 330 + 331 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE:~sciac\-qua\-re~la~boc\-ca.~NON~pro\-vo\-ca\-re~il~vo\-mi\-to. } -\prop_put:Nnn \l_ghsystem_p_prop { 302 + 334 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~im\-mer\-ge\-re~in~ac\-qua~fred\-da/av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. } +\prop_put:Nnn \l_ghsystem_p_prop { 302 + 334 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~im\-mer\-ge\-re~in~ac\-qua~fred\-da\slash av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. } \prop_put:Nnn \l_ghsystem_p_prop { 302 + 350 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~la\-va\-re~de\-li\-ca\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. } \prop_put:Nnn \l_ghsystem_p_prop { 302 + 352 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~la\-va\-re~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. } -\prop_put:Nnn \l_ghsystem_p_prop { 303 + 361 + 353 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE~(o~con~i~ca\-pel\-li):~to\-glier\-si~di~dos\-so~im\-me\-dia\-ta\-men\-te~tut\-ti~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti.~Sciac\-qua\-re~la~pel\-le/fa\-re~u\-na~doc\-cia. } +\prop_put:Nnn \l_ghsystem_p_prop { 303 + 361 + 353 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE~(o~con~i~ca\-pel\-li):~to\-glier\-si~di~dos\-so~im\-me\-dia\-ta\-men\-te~tut\-ti~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti.~Sciac\-qua\-re~la~pel\-le\slash fa\-re~u\-na~doc\-cia. } \prop_put:Nnn \l_ghsystem_p_prop { 304 + 340 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE:~tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. } \prop_put:Nnn \l_ghsystem_p_prop { 304 + 341 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE:~se~la~re\-spi\-ra\-zio\-ne~\`e~dif\-fi\-ci\-le,~tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. } \prop_put:Nnn \l_ghsystem_p_prop { 305 + 351 + 338 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~OCCHI:~sciac\-qua\-re~ac\-cu\-ra\-ta\-men\-te~per~pa\-rec\-chi~mi\-nu\-ti.~To\-glie\-re~le~e\-ven\-tua\-li~len\-ti~a~con\-tat\-to~se~\`e~a\-ge\-vo\-le~farlo.~Con\-ti\-nua\-re~a~sciac\-qua\-re. } @@ -317,7 +317,7 @@ \prop_put:Nnn \l_ghsystem_p_prop { 309 + 311 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~ma\-les\-se\-re,~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. } \prop_put:Nnn \l_ghsystem_p_prop { 332 + 313 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~del\-la~pel\-le:~con\-sul\-ta\-re~un~me\-di\-co. } \prop_put:Nnn \l_ghsystem_p_prop { 333 + 313 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~o~e\-ru\-zio\-ne~del\-la~pel\-le:~con\-sul\-ta\-re~un~me\-di\-co. } -\prop_put:Nnn \l_ghsystem_p_prop { 335 + 334 } { Ri\-muo\-ve\-re~le~par\-ti\-cel\-le~de\-po\-si\-ta\-te~sul\-la~pel\-le.~Im\-mer\-ge\-re~in~ac\-qua~fred\-da/av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. } +\prop_put:Nnn \l_ghsystem_p_prop { 335 + 334 } { Ri\-muo\-ve\-re~le~par\-ti\-cel\-le~de\-po\-si\-ta\-te~sul\-la~pel\-le.~Im\-mer\-ge\-re~in~ac\-qua~fred\-da\slash av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. } \prop_put:Nnn \l_ghsystem_p_prop { 337 + 313 } { Se~l'ir\-ri\-ta\-zio\-ne~de\-gli~oc\-chi~per\-si\-ste,~con\-sul\-ta\-re~un~me\-di\-co. } \prop_put:Nnn \l_ghsystem_p_prop { 342 + 311 } { In~ca\-so~di~sin\-to\-mi~re\-spi\-ra\-to\-ri:~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. } \prop_put:Nnn \l_ghsystem_p_prop { 370 + 376 } { In~ca\-so~di~in\-cen\-dio:~bloc\-ca\-re~la~per\-di\-ta~se~non~c'\`e~pe\-ri\-co\-lo. } @@ -332,8 +332,8 @@ \prop_put:Nnn \l_ghsystem_p_prop { 403 } { Con\-ser\-va\-re~in~luo\-go~ben~ven\-ti\-la\-to. } \prop_put:Nnn \l_ghsystem_p_prop { 404 } { Con\-ser\-va\-re~in~un~re\-ci\-pien\-te~chiu\-so. } \prop_put:Nnn \l_ghsystem_p_prop { 405 } { Con\-ser\-va\-re~sot\-to~chia\-ve. } -\prop_put:Nnn \l_ghsystem_p_prop { 406 } { Con\-ser\-va\-re~in~re\-ci\-pien\-te~re\-si\-sten\-te~al\-la~cor\-ro\-sio\-ne/ \l_ghsystem_dots_tl\ prov\-vi\-sto~di~ri\-ve\-sti\-men\-to~in\-ter\-no~re\-si\-sten\-te. } -\prop_put:Nnn \l_ghsystem_p_prop { 407 } { Man\-te\-ne\-re~u\-no~spa\-zio~li\-be\-ro~tra~gli~scaf\-fa\-li/i~pal\-let. } +\prop_put:Nnn \l_ghsystem_p_prop { 406 } { Con\-ser\-va\-re~in~re\-ci\-pien\-te~re\-si\-sten\-te~al\-la~cor\-ro\-sio\-ne\slash \l_ghsystem_dots_tl\ prov\-vi\-sto~di~ri\-ve\-sti\-men\-to~in\-ter\-no~re\-si\-sten\-te. } +\prop_put:Nnn \l_ghsystem_p_prop { 407 } { Man\-te\-ne\-re~u\-no~spa\-zio~li\-be\-ro~tra~gli~scaf\-fa\-li\slash i~pal\-let. } \prop_put:Nnn \l_ghsystem_p_prop { 410 } { Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri. } \prop_put:Nnn \l_ghsystem_p_prop { 411 } { Con\-ser\-va\-re~a~tem\-pe\-ra\-tu\-re~non~su\-pe\-rio\-ri~a~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl }{ \GHScelsius } . } \prop_put:Nnn \l_ghsystem_p_prop { 412 } { Non~e\-spor\-re~a~tem\-pe\-ra\-tu\-re~su\-pe\-rio\-ri~a~ \SI { 50 } { \GHScelsius } . } @@ -348,7 +348,7 @@ \prop_put:Nnn \l_ghsystem_p_prop { 411 + 235 } { Con\-ser\-va\-re~in~luo\-go~fre\-sco~a~tem\-pe\-ra\-tu\-re~non~su\-pe\-rio\-ri~a~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl } { \GHScelsius } . } % 3.5 Consigli di prudenza - Smaltimento -\prop_put:Nnn \l_ghsystem_p_prop { 501 } { Smal\-ti\-re~il~pro\-dot\-to/re\-ci\-pien\-te~in~\l_ghsystem_dots_tl . } +\prop_put:Nnn \l_ghsystem_p_prop { 501 } { Smal\-ti\-re~il~pro\-dot\-to\slash re\-ci\-pien\-te~in~\l_ghsystem_dots_tl . } % 4 Codici descrittivi di pericolo (Allegato 6, da pagina 4) \prop_put:Nnn \l_ghsystem_h_prop { 350i } { Pu\`o~cau\-sa\-re~il~can\-cro~se~i\-na\-la\-to. } -- cgit v1.2.3