diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex index 30223fc583f..87d53dd3ce7 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2017 Clemens Niederberger +% Copyright 2011-2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -131,8 +131,8 @@ \tl_put_left:Nn \g__chemmacros_nmr_element_coupled_tl {#2} \chemmacros_chemformula:n { ^{#1} } \bool_if:NTF \l__chemmacros_nmr_parse_bool - { \chemformula_ch:nV {} \g__chemmacros_nmr_element_coupled_tl } { \chemmacros_chemformula:V \g__chemmacros_nmr_element_coupled_tl } + { \g__chemmacros_nmr_element_coupled_tl } \tl_use:N \l__chemmacros_nmr_element_method_connector_tl \tl_use:N \l__chemmacros_nmr_method_tl } @@ -157,8 +157,8 @@ \tl_if_blank:VF \g__chemmacros_nmr_element_coupled_tl { \bool_if:NTF \l__chemmacros_nmr_parse_bool - { \chemformula_ch:nV {} \g__chemmacros_nmr_element_coupled_tl } { \chemmacros_chemformula:V \g__chemmacros_nmr_element_coupled_tl } + { \g__chemmacros_nmr_element_coupled_tl } } \tl_use:N \l__chemmacros_nmr_element_method_connector_tl \tl_use:N \l__chemmacros_nmr_method_tl @@ -339,7 +339,7 @@ \bool_if:NT \l__chemmacros_nmr_solvent_bool { \bool_if:NTF \l__chemmacros_nmr_parse_bool - { \chemformula_ch:nn { } {#4} } + { \chemmacros_chemformula:n {#4} } {#4} } \bool_if:NT \l__chemmacros_nmr_delimiters_bool @@ -404,7 +404,10 @@ \cs_new_protected:Npn \chemmacros_nmr_number:n #1 { \__chemmacros_nmr_number:n {#1} - \skip_horizontal:N \l__chemmacros_nmr_space_skip + \chemmacros_if_compatibility:nnTF {>=} {5.8c} + { \chemmacros_skip_nobreak:N } + { \skip_horizontal:N } + \l__chemmacros_nmr_space_skip \chemmacros_chemformula:V \g__chemmacros_nmr_element_tl } @@ -509,6 +512,6 @@ } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2015/12/31 - new option `atom-number-space' 2017/01/27 - new option `nmr-base-format' |