diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemformula/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemformula/chemformula_en.pdf | bin | 943391 -> 944504 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chemformula/chemformula_en.tex | 28 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chemformula/chemformula.sty | 30 |
4 files changed, 46 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/chemformula/README b/Master/texmf-dist/doc/latex/chemformula/README index c849b1328ae..fd809c17048 100644 --- a/Master/texmf-dist/doc/latex/chemformula/README +++ b/Master/texmf-dist/doc/latex/chemformula/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the CHEMFORMULE package v4.7 2014/08/08 +the CHEMFORMULA package v4.9 2014/10/07 typeset chemical compounds and reactions diff --git a/Master/texmf-dist/doc/latex/chemformula/chemformula_en.pdf b/Master/texmf-dist/doc/latex/chemformula/chemformula_en.pdf Binary files differindex f4f5cd2fa14..2b644863b57 100644 --- a/Master/texmf-dist/doc/latex/chemformula/chemformula_en.pdf +++ b/Master/texmf-dist/doc/latex/chemformula/chemformula_en.pdf diff --git a/Master/texmf-dist/doc/latex/chemformula/chemformula_en.tex b/Master/texmf-dist/doc/latex/chemformula/chemformula_en.tex index 42aa31c189b..e3ac37f0d05 100644 --- a/Master/texmf-dist/doc/latex/chemformula/chemformula_en.tex +++ b/Master/texmf-dist/doc/latex/chemformula/chemformula_en.tex @@ -266,6 +266,15 @@ then \chemmacros\ will not be loaded. The \chemmacros\ package, however, bundle but is dirtributed as a package of it's own. \end{itemize} +\subsection{Version 4.9} +\begin{itemize} + \item New options \option{minus-space} and \option{minus-penalty} equivalent + to the existing \option{plus-space} and \option{plus-penalty} + \item New options \option{plus-output-symbol} and + \option{minus-output-symbol} for customizing the plus and minus signs in + the output. +\end{itemize} + \section{Licence and Requirements} \license @@ -895,14 +904,23 @@ following ones: \end{commands} \footnotetext{Is this the correct English term? Please correct me if it isn't.} -The space left and right of the plus and the minus sign can be set with this -option: +The space left and right of the plus and the minus sign and the signs +themselves can be set with the following options: \begin{options} \keyval{plus-space}{skip}\Default{.3em plus .1em minus .1em} A rubber length. + \keyval{minus-space}{skip}\Default{.3em plus .1em minus .1em} + \sinceversion{4.9}A rubber length. \keyval{plus-penalty}{num}\Default{700} - \sinceversion{4.0a}The penalty that is inserted after the plus and the - minus sign for (dis-)allowing line breaks. + \sinceversion{4.0a}The penalty that is inserted after the plus sign for + (dis-)allowing line breaks. + \keyval{minus-penalty}{num}\Default{700} + \sinceversion{4.9}The penalty that is inserted after the minus sign for + (dis-)allowing line breaks. + \keyval{plus-output-symbol}{code}\Default{+} + \sinceversion{4.9}The \meta{code} that is used for the plus sign. + \keyval{minus-output-symbol}{code}\Default{\$-\$} + \sinceversion{4.9}The \meta{code} that is used for the minus sign. \end{options} \begin{example}[side-by-side] \ch{A + B}\par @@ -943,7 +961,7 @@ be input with \verbcode+~+. \begin{commands} \command{ch}[\Marg{ "\meta{escaped text}" }] One of two possibilities to \emph{escape} \chemformula's parsing. - \command{ch}[\Marg{ '\meta{escaped text}' }] + \command{ch}[\Marg{ \textquotesingle\meta{escaped text}\textquotesingle{} }] The second of two possibilities to \emph{escape} \chemformula's parsing. \end{commands} \begin{example} 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 |