diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty | 346 |
1 files changed, 173 insertions, 173 deletions
diff --git a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty index d7543028d16..e7e4a25ff0d 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty @@ -12,7 +12,7 @@ % - If you have any ideas, questions, suggestions or bugs to report, please - % % - feel free to contact me. - % % --------------------------------------------------------------------------- % -% - Copyright 2011-2012 Clemens Niederberger - % +% - Copyright 2011-2013 Clemens Niederberger - % % - - % % - This work may be distributed and/or modified under the - % % - conditions of the LaTeX Project Public License, either version 1.3 - % @@ -64,10 +64,10 @@ % --------------------------------------------------------------------------- % % 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 +\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 @@ -79,9 +79,9 @@ % --------------------------------------------------------------------------- % % define variables: -\prop_new:N \l_ghsystem_h_prop -\prop_new:N \l_ghsystem_euh_prop -\prop_new:N \l_ghsystem_p_prop +\prop_new:N \l__ghsystem_h_prop +\prop_new:N \l__ghsystem_euh_prop +\prop_new:N \l__ghsystem_p_prop \cs_new:Npn \ghsystem_exposure: {} \cs_new:Npn \ghsystem_effect: {} @@ -89,49 +89,49 @@ \cs_new:Npn \ghsystem_substance: {} \cs_new:Npn \ghsystem_text: {} -\bool_new:N \l_ghsystem_fill_in_bool -\bool_new:N \l_ghsystem_show_number_bool -\bool_new:N \l_ghsystem_substance_bool -\bool_new:N \l_ghsystem_organs_bool -\bool_new:N \l_ghsystem_hide_statement_bool -\bool_new:N \l_ghsystem_engine_pdftex_bool -\bool_new:N \l_ghsystem_engine_xetex_bool -\bool_new:N \l_ghsystem_engine_luatex_bool - -\tl_new:N \l_ghsystem_number_space_tl -\tl_new:N \l_ghsystem_celsius_temperature_tl -\tl_new:N \l_ghsystem_fahrenheit_temperature_tl -\tl_new:N \l_ghsystem_kg_mass_tl -\tl_new:N \l_ghsystem_lbs_mass_tl -\tl_new:N \l_ghsystem_dots_tl -\tl_set:Nn \l_ghsystem_dots_tl { \ldots } -\tl_new:N \l_ghsystem_picture_scale_default_tl -\tl_set:Nn \l_ghsystem_picture_scale_default_tl { .05 } -\tl_new:N \l_ghsystem_picture_scale_tl -\tl_set_eq:NN \l_ghsystem_picture_scale_tl \l_ghsystem_picture_scale_default_tl -\tl_new:N \l_ghsystem_picture_includegraphics_tl -\tl_new:N \l_ghsystem_picture_type_tl -\tl_new:N \l_ghsystem_identifier_tl -\tl_new:N \l_ghsystem_table_text_tl -\tl_new:N \l_ghsystem_table_next_page_tl -\tl_new:N \l_ghsystem_table_head_rule_tl -\tl_set:Nn \l_ghsystem_table_head_rule_tl { \hline } -\tl_new:N \l_ghsystem_table_top_head_rule_tl -\tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \hline } -\tl_new:N \l_ghsystem_table_foot_rule_tl -\tl_set:Nn \l_ghsystem_table_foot_rule_tl { \hline } -\tl_new:N \l_ghsystem_table_last_foot_rule_tl -\tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \hline } -\tl_new:N \l_ghsystem_table_caption_tl -\tl_new:N \l_ghsystem_table_caption_short_tl -\tl_new:N \l_ghsystem_table_label_tl -\tl_set:Nn \l_ghsystem_table_label_tl { tab : ghs-hp-statements } - -\dim_new:N \l_ghsystem_table_line_sep_dim -\dim_set:Nn \l_ghsystem_table_line_sep_dim { 3pt } - -\fp_new:N \l_ghsystem_picture_scale_fp -\fp_set:Nn \l_ghsystem_picture_scale_fp { \l_ghsystem_picture_scale_tl } +\bool_new:N \l__ghsystem_fill_in_bool +\bool_new:N \l__ghsystem_show_number_bool +\bool_new:N \l__ghsystem_substance_bool +\bool_new:N \l__ghsystem_organs_bool +\bool_new:N \l__ghsystem_hide_statement_bool +\bool_new:N \l__ghsystem_engine_pdftex_bool +\bool_new:N \l__ghsystem_engine_xetex_bool +\bool_new:N \l__ghsystem_engine_luatex_bool + +\tl_new:N \l__ghsystem_number_space_tl +\tl_new:N \l__ghsystem_celsius_temperature_tl +\tl_new:N \l__ghsystem_fahrenheit_temperature_tl +\tl_new:N \l__ghsystem_kg_mass_tl +\tl_new:N \l__ghsystem_lbs_mass_tl +\tl_new:N \l__ghsystem_dots_tl +\tl_set:Nn \l__ghsystem_dots_tl { \ldots } +\tl_new:N \l__ghsystem_picture_scale_default_tl +\tl_set:Nn \l__ghsystem_picture_scale_default_tl { .05 } +\tl_new:N \l__ghsystem_picture_scale_tl +\tl_set_eq:NN \l__ghsystem_picture_scale_tl \l__ghsystem_picture_scale_default_tl +\tl_new:N \l__ghsystem_picture_includegraphics_tl +\tl_new:N \l__ghsystem_picture_type_tl +\tl_new:N \l__ghsystem_identifier_tl +\tl_new:N \l__ghsystem_table_text_tl +\tl_new:N \l__ghsystem_table_next_page_tl +\tl_new:N \l__ghsystem_table_head_rule_tl +\tl_set:Nn \l__ghsystem_table_head_rule_tl { \hline } +\tl_new:N \l__ghsystem_table_top_head_rule_tl +\tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \hline } +\tl_new:N \l__ghsystem_table_foot_rule_tl +\tl_set:Nn \l__ghsystem_table_foot_rule_tl { \hline } +\tl_new:N \l__ghsystem_table_last_foot_rule_tl +\tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \hline } +\tl_new:N \l__ghsystem_table_caption_tl +\tl_new:N \l__ghsystem_table_caption_short_tl +\tl_new:N \l__ghsystem_table_label_tl +\tl_set:Nn \l__ghsystem_table_label_tl { tab : ghs-hp-statements } + +\dim_new:N \l__ghsystem_table_line_sep_dim +\dim_set:Nn \l__ghsystem_table_line_sep_dim { 3pt } + +\fp_new:N \l__ghsystem_picture_scale_fp +\fp_set:Nn \l__ghsystem_picture_scale_fp { \l__ghsystem_picture_scale_tl } \DeclareSIUnit { \GHSfahrenheit } { \SIUnitSymbolDegree F } \DeclareSIUnit { \GHScelsius } { \SIUnitSymbolDegree C } @@ -139,21 +139,21 @@ \DeclareSIUnit { \GHSpounds } { lbs } % language settings -\bool_new:N \l_ghsystem_language_file_loaded_bool -\bool_new:N \l_ghsystem_language_directory_bool +\bool_new:N \l__ghsystem_language_file_loaded_bool +\bool_new:N \l__ghsystem_language_directory_bool \file_if_exist:nTF { language / ghsystem_english_def } - { \bool_set_true:N \l_ghsystem_language_directory_bool } - { \bool_set_false:N \l_ghsystem_language_directory_bool } + { \bool_set_true:N \l__ghsystem_language_directory_bool } + { \bool_set_false:N \l__ghsystem_language_directory_bool } -\bool_if:NTF \l_ghsystem_language_directory_bool +\bool_if:NTF \l__ghsystem_language_directory_bool { - \prop_map_inline:Nn \l_chemmacros_language_prop + \prop_map_inline:Nn \l__chemmacros_language_prop { \bool_if:cT { l_chemmacros_#1_bool } { \file_if_exist:nTF { language / ghsystem_#2.def } { - \bool_set_true:N \l_ghsystem_language_file_loaded_bool + \bool_set_true:N \l__ghsystem_language_file_loaded_bool \input { language / ghsystem_#2.def } \ExplSyntaxOn } { \input { language / ghsystem_english.def } \ExplSyntaxOn } @@ -161,13 +161,13 @@ } } { - \prop_map_inline:Nn \l_chemmacros_language_prop + \prop_map_inline:Nn \l__chemmacros_language_prop { \bool_if:cT { l_chemmacros_#1_bool } { \file_if_exist:nTF { ghsystem_#2.def } { - \bool_set_true:N \l_ghsystem_language_file_loaded_bool + \bool_set_true:N \l__ghsystem_language_file_loaded_bool \input { ghsystem_#2.def } \ExplSyntaxOn } { \input { ghsystem_english.def } \ExplSyntaxOn } @@ -175,9 +175,9 @@ } } -\bool_if:NF \l_ghsystem_language_file_loaded_bool +\bool_if:NF \l__ghsystem_language_file_loaded_bool { - \bool_if:NTF \l_ghsystem_language_directory_bool + \bool_if:NTF \l__ghsystem_language_directory_bool { \input { language / ghsystem_english.def } \ExplSyntaxOn } { \input { ghsystem_english.def } \ExplSyntaxOn } } @@ -194,104 +194,104 @@ { % general options: language .code:n = - \bool_set_true:c { l_ghsystem_#1_bool } - \bool_if:NTF \l_ghsystem_language_directory_bool + \bool_set_true:c { l__ghsystem_#1_bool } + \bool_if:NTF \l__ghsystem_language_directory_bool { \input { language / ghsystem_#1.def } \ExplSyntaxOn } { \input { ghsystem_#1.def } \ExplSyntaxOn } , % \ghs options: hide .bool_set:N = - \l_ghsystem_hide_statement_bool , + \l__ghsystem_hide_statement_bool , hide .default:n = true , - fill-in .bool_set:N = \l_ghsystem_fill_in_bool , + fill-in .bool_set:N = \l__ghsystem_fill_in_bool , fill-in .default:n = true , exposure .code:n = \cs_set:Npn \ghsystem_exposure: { ~ #1 } , effect .code:n = \cs_set:Npn \ghsystem_effect: { ~ #1 } , organs .code:n = - \bool_set_true:N \l_ghsystem_organs_bool + \bool_set_true:N \l__ghsystem_organs_bool \cs_set:Npn \ghsystem_organs: { ~ #1 } , substance .code:n = - \bool_set_true:N \l_ghsystem_substance_bool + \bool_set_true:N \l__ghsystem_substance_bool \cs_set:Npn \ghsystem_substance: { ~ #1 } , text .code:n = \cs_set:Npn \ghsystem_text: { ~ #1 } , space .tl_set:N = - \l_ghsystem_number_space_tl , + \l__ghsystem_number_space_tl , C-temperature .tl_set:N = - \l_ghsystem_celsius_temperature_tl , + \l__ghsystem_celsius_temperature_tl , F-temperature .tl_set:N = - \l_ghsystem_fahrenheit_temperature_tl , - kg-mass .tl_set:N = \l_ghsystem_kg_mass_tl , - lbs-mass .tl_set:N = \l_ghsystem_lbs_mass_tl , - dots .tl_set:N = \l_ghsystem_dots_tl , + \l__ghsystem_fahrenheit_temperature_tl , + kg-mass .tl_set:N = \l__ghsystem_kg_mass_tl , + lbs-mass .tl_set:N = \l__ghsystem_lbs_mass_tl , + dots .tl_set:N = \l__ghsystem_dots_tl , % \ghspic options: scale .code:n = - \fp_mul:Nn \l_ghsystem_picture_scale_fp { #1 } , + \fp_mul:Nn \l__ghsystem_picture_scale_fp { #1 } , includegraphics .code:n = - \tl_set:Nn \l_ghsystem_picture_includegraphics_tl { , #1 } , + \tl_set:Nn \l__ghsystem_picture_includegraphics_tl { , #1 } , pic-type .choices:nn = { eps , jpg , png , pdf } - { \tl_set_eq:NN \l_ghsystem_picture_type_tl \l_keys_choice_tl } , + { \tl_set_eq:NN \l__ghsystem_picture_type_tl \l_keys_choice_tl } , % \ghslistall options: - table-head-number .tl_set:N = \l_ghsystem_identifier_tl , - table-head-text .tl_set:N = \l_ghsystem_table_text_tl , + table-head-number .tl_set:N = \l__ghsystem_identifier_tl , + table-head-text .tl_set:N = \l__ghsystem_table_text_tl , table-next-page .tl_set:N = - \l_ghsystem_table_next_page_tl , + \l__ghsystem_table_next_page_tl , table-row-sep .dim_set:N = - \l_ghsystem_table_line_sep_dim , + \l__ghsystem_table_line_sep_dim , table-head-rule .choice: , table-head-rule / default .code:n = - \tl_set:Nn \l_ghsystem_table_head_rule_tl { \hline } , + \tl_set:Nn \l__ghsystem_table_head_rule_tl { \hline } , table-head-rule / booktabs .code:n = \ghsystem_booktabs:n { table-head-rule } - \tl_set:Nn \l_ghsystem_table_head_rule_tl { \midrule } , + \tl_set:Nn \l__ghsystem_table_head_rule_tl { \midrule } , table-head-rule / none .code:n = - \tl_clear:N \l_ghsystem_table_head_rule_tl , + \tl_clear:N \l__ghsystem_table_head_rule_tl , table-top-head-rule .choice: , table-top-head-rule / default .code:n = - \tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \hline } , + \tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \hline } , table-top-head-rule / booktabs .code:n = \ghsystem_booktabs:n { table-top-head-rule } - \tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \toprule } , + \tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \toprule } , table-top-head-rule / none .code:n = - \tl_clear:N \l_ghsystem_table_top_head_rule_tl , + \tl_clear:N \l__ghsystem_table_top_head_rule_tl , table-foot-rule .choice: , table-foot-rule / default .code:n = - \tl_set:Nn \l_ghsystem_table_foot_rule_tl { \hline } , + \tl_set:Nn \l__ghsystem_table_foot_rule_tl { \hline } , table-foot-rule / booktabs .code:n = \ghsystem_booktabs:n { table-foot-rule } - \tl_set:Nn \l_ghsystem_table_foot_rule_tl { \midrule } , + \tl_set:Nn \l__ghsystem_table_foot_rule_tl { \midrule } , table-foot-rule / none .code:n = - \tl_clear:N \l_ghsystem_table_foot_rule_tl , + \tl_clear:N \l__ghsystem_table_foot_rule_tl , table-last-foot-rule .choice: , table-last-foot-rule / default .code:n = - \tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \hline } , + \tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \hline } , table-last-foot-rule / booktabs .code:n = \ghsystem_booktabs:n { table-last-foot-rule } - \tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \bottomrule } , + \tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \bottomrule } , table-last-foot-rule / none .code:n = - \tl_clear:N \l_ghsystem_table_last_foot_rule_tl , + \tl_clear:N \l__ghsystem_table_last_foot_rule_tl , table-rules .choice: , table-rules / default .code:n = - \tl_set:Nn \l_ghsystem_table_head_rule_tl { \hline } - \tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \hline } - \tl_set:Nn \l_ghsystem_table_foot_rule_tl { \hline } - \tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \hline } , + \tl_set:Nn \l__ghsystem_table_head_rule_tl { \hline } + \tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \hline } + \tl_set:Nn \l__ghsystem_table_foot_rule_tl { \hline } + \tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \hline } , table-rules / booktabs .code:n = \ghsystem_booktabs:n { table-rules } - \tl_set:Nn \l_ghsystem_table_head_rule_tl { \midrule } - \tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \toprule } - \tl_set:Nn \l_ghsystem_table_foot_rule_tl { \midrule } - \tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \bottomrule } , + \tl_set:Nn \l__ghsystem_table_head_rule_tl { \midrule } + \tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \toprule } + \tl_set:Nn \l__ghsystem_table_foot_rule_tl { \midrule } + \tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \bottomrule } , table-rules / none .code:n = - \tl_clear:N \l_ghsystem_table_head_rule_tl - \tl_clear:N \l_ghsystem_table_top_head_rule_tl - \tl_clear:N \l_ghsystem_table_foot_rule_tl - \tl_clear:N \l_ghsystem_table_last_foot_rule_tl , - table-caption .tl_set:N = \l_ghsystem_table_caption_tl , + \tl_clear:N \l__ghsystem_table_head_rule_tl + \tl_clear:N \l__ghsystem_table_top_head_rule_tl + \tl_clear:N \l__ghsystem_table_foot_rule_tl + \tl_clear:N \l__ghsystem_table_last_foot_rule_tl , + table-caption .tl_set:N = \l__ghsystem_table_caption_tl , table-caption-short .tl_set:N = - \l_ghsystem_table_caption_short_tl , - table-label .tl_set:N = \l_ghsystem_table_label_tl + \l__ghsystem_table_caption_short_tl , + table-label .tl_set:N = \l__ghsystem_table_label_tl } % --------------------------------------------------------------------------- % @@ -302,7 +302,7 @@ \NewDocumentCommand \ghs { somm } { \group_begin: - \IfBooleanF { #1 } { \bool_set_true:N \l_ghsystem_show_number_bool } + \IfBooleanF { #1 } { \bool_set_true:N \l__ghsystem_show_number_bool } \IfNoValueF { #2 } { \keys_set:nn { chemmacros / ghsystem } { #2 } } \ghsystem_read_args:nn { #3 } { #4 } \group_end: @@ -310,12 +310,12 @@ \cs_new:Nn \ghsystem_read_args:nn { - \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_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_ghsystem_tmpb_tl } + \bool_if:NF \l__ghsystem_hide_statement_bool + { \tl_use:N \l__ghsystem_tmpb_tl } } { \chemmacros_msg:nnxx { ghsystem } { statements } { #1 } { #2 } } } @@ -345,41 +345,41 @@ \cs_new:Npn \ghsystem_is_combination_aux_i:w #1,#2+#3 \q_stop { - \bool_if:NT \l_ghsystem_show_number_bool + \bool_if:NT \l__ghsystem_show_number_bool { \tl_to_uppercase:n { #1 } - \tl_use:N \l_ghsystem_number_space_tl + \tl_use:N \l__ghsystem_number_space_tl #2 ~ + ~ \tl_if_in:nnTF { #3 } { + } { \ghsystem_is_combination_aux_iii:w #1,#3 \q_stop } { \tl_to_uppercase:n { #1 } - \tl_use:N \l_ghsystem_number_space_tl - #3 \bool_if:NF \l_ghsystem_hide_statement_bool { : ~ } + \tl_use:N \l__ghsystem_number_space_tl + #3 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ } } } } \cs_new:Npn \ghsystem_is_combination_aux_ii:w #1,#2 \q_stop { - \bool_if:NT \l_ghsystem_show_number_bool + \bool_if:NT \l__ghsystem_show_number_bool { \tl_to_uppercase:n { #1 } - \tl_use:N \l_ghsystem_number_space_tl - #2 \bool_if:NF \l_ghsystem_hide_statement_bool { : ~ } + \tl_use:N \l__ghsystem_number_space_tl + #2 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ } } } \cs_new:Npn \ghsystem_is_combination_aux_iii:w #1,#2+#3 \q_stop { - \bool_if:NT \l_ghsystem_show_number_bool + \bool_if:NT \l__ghsystem_show_number_bool { \tl_to_uppercase:n { #1 } - \tl_use:N \l_ghsystem_number_space_tl + \tl_use:N \l__ghsystem_number_space_tl #2 ~ + ~ \tl_to_uppercase:n { #1 } - \tl_use:N \l_ghsystem_number_space_tl - #3 \bool_if:NF \l_ghsystem_hide_statement_bool { : ~ } + \tl_use:N \l__ghsystem_number_space_tl + #3 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ } } } @@ -390,43 +390,43 @@ { \group_begin: \IfNoValueF { #1 } { \keys_set:nn { chemmacros / ghsystem } { #1 } } - \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 + \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 ] + \caption [ \l__ghsystem_table_caption_short_tl ] { - \l_ghsystem_table_caption_tl - \exp_args:No \label { \l_ghsystem_table_label_tl } + \l__ghsystem_table_caption_tl + \exp_args:No \label { \l__ghsystem_table_label_tl } } \\ - \l_ghsystem_table_top_head_rule_tl - \textbf { \l_ghsystem_identifier_tl } & - \textbf { \l_ghsystem_table_text_tl } \\ - \l_ghsystem_table_head_rule_tl + \l__ghsystem_table_top_head_rule_tl + \textbf { \l__ghsystem_identifier_tl } & + \textbf { \l__ghsystem_table_text_tl } \\ + \l__ghsystem_table_head_rule_tl \endfirsthead - \l_ghsystem_table_top_head_rule_tl - \textbf { \l_ghsystem_identifier_tl } & - \textbf { \l_ghsystem_table_text_tl } \\ - \l_ghsystem_table_head_rule_tl + \l__ghsystem_table_top_head_rule_tl + \textbf { \l__ghsystem_identifier_tl } & + \textbf { \l__ghsystem_table_text_tl } \\ + \l__ghsystem_table_head_rule_tl \endhead - \l_ghsystem_table_last_foot_rule_tl - \multicolumn{2}{r} { \textit { \l_ghsystem_table_next_page_tl } } + \l__ghsystem_table_last_foot_rule_tl + \multicolumn{2}{r} { \textit { \l__ghsystem_table_next_page_tl } } \endfoot - \l_ghsystem_table_foot_rule_tl \multicolumn{2}{r} { } + \l__ghsystem_table_foot_rule_tl \multicolumn{2}{r} { } \endlastfoot - \prop_map_inline:Nn \l_ghsystem_h_prop + \prop_map_inline:Nn \l__ghsystem_h_prop { \ghsystem_read_number:nn { H } { ##1 } & ##2 \\ } - \prop_map_inline:Nn \l_ghsystem_euh_prop + \prop_map_inline:Nn \l__ghsystem_euh_prop { \ghsystem_read_number:nn { EUH } { ##1 } & ##2 \\ } - \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_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_ghsystem_tmpb_int + \int_gincr:N \l__ghsystem_tmpb_int \ghsystem_read_number:nn { P } { ##1 } & ##2 - \int_compare:nNnT { \l_ghsystem_tmpb_int } < { \l_ghsystem_tmpa_int } { \\ } + \int_compare:nNnT { \l__ghsystem_tmpb_int } < { \l__ghsystem_tmpa_int } { \\ } } \end { longtabu } \group_end: @@ -436,12 +436,12 @@ { \tl_if_in:nnTF { #2 } { + } { \ghsystem_read_number_aux_i:w #1 , #2 \q_stop } - { #1 \tl_use:N \l_ghsystem_number_space_tl #2 } + { #1 \tl_use:N \l__ghsystem_number_space_tl #2 } } \cs_new:Npn \ghsystem_read_number_aux_i:w #1,#2+#3\q_stop { - #1 \tl_use:N \l_ghsystem_number_space_tl #2 ~+~ + #1 \tl_use:N \l__ghsystem_number_space_tl #2 ~+~ \tl_if_in:nnTF { #3 } { + } { \ghsystem_read_number_aux_ii:w #1,#3 \q_stop } { #1#3 } @@ -454,49 +454,49 @@ % \ghspic[<options>]{<name>} % % test for compilation engine/mode: -\pdftex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_pdftex_bool } -\xetex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_xetex_bool } -\luatex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_luatex_bool } +\pdftex_if_engine:T { \bool_set_true:N \l__ghsystem_engine_pdftex_bool } +\xetex_if_engine:T { \bool_set_true:N \l__ghsystem_engine_xetex_bool } +\luatex_if_engine:T { \bool_set_true:N \l__ghsystem_engine_luatex_bool } -\bool_new:N \l_ghsystem_picture_directory_bool +\bool_new:N \l__ghsystem_picture_directory_bool -\bool_if:NT \l_ghsystem_engine_pdftex_bool +\bool_if:NT \l__ghsystem_engine_pdftex_bool { \ifpdf - \tl_set:Nn \l_ghsystem_picture_type_tl { pdf } + \tl_set:Nn \l__ghsystem_picture_type_tl { pdf } \else - \tl_set:Nn \l_ghsystem_picture_type_tl { eps } + \tl_set:Nn \l__ghsystem_picture_type_tl { eps } \fi } -\bool_if:NT \l_ghsystem_engine_xetex_bool - { \tl_set:Nn \l_ghsystem_picture_type_tl { pdf } } -\bool_if:NT \l_ghsystem_engine_luatex_bool - { \tl_set:Nn \l_ghsystem_picture_type_tl { pdf } } +\bool_if:NT \l__ghsystem_engine_xetex_bool + { \tl_set:Nn \l__ghsystem_picture_type_tl { pdf } } +\bool_if:NT \l__ghsystem_engine_luatex_bool + { \tl_set:Nn \l__ghsystem_picture_type_tl { pdf } } % the command: \NewDocumentCommand \ghspic { om } { - \file_if_exist:nTF { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl } - { \bool_set_true:N \l_ghsystem_picture_directory_bool } - { \bool_set_false:N \l_ghsystem_picture_directory_bool } + \file_if_exist:nTF { pictures / ghsystem_ #2 . \l__ghsystem_picture_type_tl } + { \bool_set_true:N \l__ghsystem_picture_directory_bool } + { \bool_set_false:N \l__ghsystem_picture_directory_bool } \group_begin: \IfNoValueF { #1 } { \keys_set:nn { chemmacros / ghsystem } { #1 } } - \bool_if:NTF \l_ghsystem_picture_directory_bool + \bool_if:NTF \l__ghsystem_picture_directory_bool { \ghsystem_includegraphics:xn { - scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp - \l_ghsystem_picture_includegraphics_tl + scale = \fp_to_tl:N \l__ghsystem_picture_scale_fp + \l__ghsystem_picture_includegraphics_tl } - { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl } + { pictures / ghsystem_ #2 . \l__ghsystem_picture_type_tl } } { \ghsystem_includegraphics:xn { - scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp - \l_ghsystem_picture_includegraphics_tl + scale = \fp_to_tl:N \l__ghsystem_picture_scale_fp + \l__ghsystem_picture_includegraphics_tl } - { ghsystem_ #2 . \l_ghsystem_picture_type_tl } + { ghsystem_ #2 . \l__ghsystem_picture_type_tl } } \group_end: } |