diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty | 58 |
1 files changed, 19 insertions, 39 deletions
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 @@ -63,6 +63,13 @@ } % --------------------------------------------------------------------------- % +% 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* { } \ProcessOptions \scan_stop: @@ -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: |