From 745a8740b6e66be4383f1bc6a0326110abdf6a3b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Sep 2019 21:49:40 +0000 Subject: chemmacros (30sep19) git-svn-id: svn://tug.org/texlive/trunk@52224 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/chemmacros/README | 2 +- .../doc/latex/chemmacros/chemmacros_en.pdf | Bin 1037667 -> 973195 bytes .../chemmacros/chemmacros.module.base.code.tex | 4 ++-- .../chemmacros.module.reactions.code.tex | 3 ++- .../chemmacros.module.spectroscopy.code.tex | 1 + .../texmf-dist/tex/latex/chemmacros/chemmacros.sty | 4 ++-- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README index 22ff8e700c0..2661b9f4271 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/README +++ b/Master/texmf-dist/doc/latex/chemmacros/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the CHEMMACROS package v5.8d 2019/09/23 +the CHEMMACROS package v5.8e 2019/09/27 comprehensive support for typesetting chemistry documents diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf index e3e43444c64..b62e8b0501f 100644 Binary files a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf and b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf differ diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex index 5d2e66611d3..1ea731b25c2 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex @@ -179,8 +179,8 @@ \cs_new_eq:NN \chemmacros_ignore_spaces: \tex_ignorespaces:D \cs_new_protected:Npn \chemmacros_leave_vmode: { \hbox_unpack:N \c_empty_box } -\cs_new_protected:Npn \chemmacros_nobreak: { \tex_penalty:D \c_ten_thousand } -\cs_new_protected:Npn \chemmacros_allow_break: { \tex_penalty:D \c_zero } +\cs_new_protected:Npn \chemmacros_nobreak: { \tex_penalty:D 10000 \scan_stop: } +\cs_new_protected:Npn \chemmacros_allow_break: { \tex_penalty:D \c_zero_int } \cs_new_protected:Npn \chemmacros_skip_nobreak:N #1 { \chemmacros_nobreak: diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex index 629d3f89ca2..f261611bfb0 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex @@ -278,7 +278,8 @@ % #4: argument list ({#2}{#3}...) \cs_new_protected:Npn \chemmacros_declare_reaction_env:nnnn #1#2#3#4 { - \exp_args:Nnx \DeclareDocumentEnvironment {#1} { !O{} \prg_replicate:nn {#3+0} {m} } + \exp_args:Nnx \DeclareDocumentEnvironment {#1} + { \int_compare:nT { #3+0 = 0 } {!} O{} \prg_replicate:nn {#3+0} {m} } { \chemmacros_add_reaction_description:n {##1} \__chemmacros_begin_reaction: 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 87d53dd3ce7..748a4cb19e3 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 @@ -41,6 +41,7 @@ \tl_set:Nn \l__chemmacros_nmr_coupling_nuclei_post_tl { ) } \tl_new:N \l__chemmacros_nmr_coupling_bonds_tl \tl_new:N \l__chemmacros_nmr_coupling_bonds_pre_tl +\tl_new:N \l__chemmacros_nmr_coupling_bonds_post_tl \tl_set:Nn \l__chemmacros_nmr_coupling_bonds_pre_tl { } \tl_set:Nn \l__chemmacros_nmr_coupling_bonds_post_tl { \! } \tl_new:N \l__chemmacros_nmr_coupling_symbol_tl diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index 84915c9f558..bb1e94bd3f9 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty @@ -31,10 +31,10 @@ % -------------------------------------------------------------------------- % package information: -\tl_const:Nn \c_chemmacros_date_tl {2019/09/27} +\tl_const:Nn \c_chemmacros_date_tl {2019/09/30} \tl_const:Nn \c_chemmacros_version_major_number_tl {5} \tl_const:Nn \c_chemmacros_version_minor_number_tl {8} -\tl_const:Nn \c_chemmacros_version_subrelease_tl {e} +\tl_const:Nn \c_chemmacros_version_subrelease_tl {f} \tl_const:Nx \c_chemmacros_version_number_tl { \c_chemmacros_version_major_number_tl . -- cgit v1.2.3