diff options
| author | Karl Berry <karl@freefriends.org> | 2014-10-07 20:31:27 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2014-10-07 20:31:27 +0000 |
| commit | 34cc3394c6121534aebd71c0abe20a302f132cd6 (patch) | |
| tree | 0bd066b4e9f7eb3cea61dd2c989a8b80aa5dce26 /Master/texmf-dist/tex/latex/chemformula | |
| parent | 4ba0f6031b9eba7505c1ebb8996946fb1b53dd93 (diff) | |
chemformula (7oct14)
git-svn-id: svn://tug.org/texlive/trunk@35325 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/chemformula')
| -rw-r--r-- | Master/texmf-dist/tex/latex/chemformula/chemformula.sty | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/chemformula/chemformula.sty b/Master/texmf-dist/tex/latex/chemformula/chemformula.sty index d01d1e79121..4bf964e34b0 100644 --- a/Master/texmf-dist/tex/latex/chemformula/chemformula.sty +++ b/Master/texmf-dist/tex/latex/chemformula/chemformula.sty @@ -28,8 +28,8 @@ % -------------------------------------------------------------------------- \RequirePackage{ expl3 , xparse , l3keys2e , tikz , amsmath , xfrac , nicefrac , scrlfile } \usetikzlibrary{arrows.meta} -\def\chemformula@version{4.7} -\def\chemformula@date{2014/08/08} +\def\chemformula@version{4.9} +\def\chemformula@date{2014/10/07} \ProvidesExplPackage {chemformula} @@ -278,6 +278,8 @@ \skip_set:Nn \l__chemformula_math_space_skip { .1667em plus .0333em minus .0117em } \skip_new:N \l__chemformula_plus_space_skip \skip_set:Nn \l__chemformula_plus_space_skip { .3em plus .1em minus .1em } +\skip_new:N \l__chemformula_minus_space_skip +\skip_set:Nn \l__chemformula_minus_space_skip { .3em plus .1em minus .1em } % integers: @@ -305,6 +307,12 @@ \tl_set:Nn \l__chemformula_arrow_offset_tl { .75em } \tl_new:N \l__chemformula_plus_penalty_tl \tl_set:Nn \l__chemformula_plus_penalty_tl { 700 } +\tl_new:N \l__chemformula_plus_output_tl +\tl_set:Nn \l__chemformula_plus_output_tl { + } +\tl_new:N \l__chemformula_minus_penalty_tl +\tl_set:Nn \l__chemformula_minus_penalty_tl { 700 } +\tl_new:N \l__chemformula_minus_output_tl +\tl_set:Nn \l__chemformula_minus_output_tl { $-$ } \tl_new:N \l__chemformula_bond_penalty_tl \tl_set:Nn \l__chemformula_bond_penalty_tl { 10000 } \tl_new:N \l__chemformula_name_tmp_tl @@ -2349,7 +2357,7 @@ \tl_put_right:Nn \l__chemformula_input_tl { \chemformula_skip_nobreak:N \l__chemformula_plus_space_skip - + + \tl_use:N \l__chemformula_plus_output_tl \chemformula_skip_nobreak_penalty:Nn \l__chemformula_plus_space_skip { \l__chemformula_plus_penalty_tl } @@ -2359,11 +2367,11 @@ { \tl_put_right:Nn \l__chemformula_input_tl { - \chemformula_skip_nobreak:N \l__chemformula_plus_space_skip - \c_math_toggle_token - \c_math_toggle_token + \chemformula_skip_nobreak:N \l__chemformula_minus_space_skip + \tl_use:N \l__chemformula_minus_output_tl \chemformula_skip_nobreak_penalty:Nn - \l__chemformula_plus_space_skip - { \l__chemformula_plus_penalty_tl } + \l__chemformula_minus_space_skip + { \l__chemformula_minus_penalty_tl } } } \bool_set_false:N \l__chemformula_is_plus_bool @@ -2651,6 +2659,10 @@ adduct-space .dim_set:N = \l__chemformula_adduct_space_dim , plus-space .skip_set:N = \l__chemformula_plus_space_skip , plus-penalty .tl_set:N = \l__chemformula_plus_penalty_tl , + plus-output-symbol .tl_set:N = \l__chemformula_plus_output_tl , + minus-space .skip_set:N = \l__chemformula_minus_space_skip , + minus-penalty .tl_set:N = \l__chemformula_minus_penalty_tl , + minus-output-symbol .tl_set:N = \l__chemformula_minus_output_tl , math-space .skip_set:N = \l__chemformula_math_space_skip , name-format .tl_set:N = \l__chemformula_name_format_tl , name-width .code:n = @@ -3103,11 +3115,13 @@ VERSION HISTORY instead of `arrows' - new arrow tip definition allows redeclaration to other existing tips by \pgfkeys{cf/.tip=<tip>} -2014/08/07 - version 4.8 - fix bug introduced in last update: `butt cap' now +2014/08/08 - version 4.8 - fix bug introduced in last update: `butt cap' now needs to be `Butt Cap' with the new `arrows.meta' library - split from `chemmacros' bundle as independent package +2014/10/07 - version 4.9 - new options: `minus-space', `minus-penalty', + `plus-output-symbol' and `minus-output-symbol' % -------------------------------------------------------------------------- % TODO |