summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-04 22:14:53 +0000
committerKarl Berry <karl@freefriends.org>2020-02-04 22:14:53 +0000
commitd70ad5795d2f31a375d4496f8d2c65389a741ae1 (patch)
tree9d7d725e21b20b634f165a18d93dacd8675c110f /Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex
parent54c32ad3fede7208dd034d5278347a380315612c (diff)
chemmacros (4feb20)
git-svn-id: svn://tug.org/texlive/trunk@53665 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex')
-rw-r--r--Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex18
1 files changed, 7 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex
index 292b90747a2..7bc4be0b0ac 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex
@@ -25,7 +25,7 @@
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
-\ChemModule{chemformula}{2016/05/03 integration of chemical formulas}
+\ChemModule{chemformula}{2020/02/02 integration of chemical formulas}
\RequirePackage{amstext}
\chemmacros_load_module:n {charges}
@@ -209,17 +209,12 @@
\AtEndPreamble
{
- \bool_if:nTF
- {
- !\l__chemmacros_formula_method_set_bool
- &&
- \chemmacros_if_compatibility_p:nn {>=} {5.2}
- &&
- \chemmacros_if_compatibility_p:nn {<} {5.6}
- }
- { \chemmacros_check_formula_method: }
+ \bool_if:NF \l__chemmacros_formula_method_set_bool
{
- \bool_if:NF \l__chemmacros_formula_method_set_bool
+ \bool_lazy_and:nnTF
+ { \chemmacros_if_compatibility_p:nn {>=} {5.2} }
+ { \chemmacros_if_compatibility_p:nn {<} {5.6} }
+ { \chemmacros_check_formula_method: }
{
\chemmacros_if_compatibility:nnTF {>=} {5.6}
{ \msg_info:nn {chemmacros} {default-formula-method} }
@@ -242,3 +237,4 @@
- don't automatically load an available method: load `chemformula'
if the users haven't decided for themselves and issue a warning
2016/05/03 - correct wrong method check
+2020/02/02 - lazy boolean evaluation