From 3a29da9222c9516099c75309557dbb2904b7cb79 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Nov 2019 22:32:31 +0000 Subject: chemmacros (17nov19) git-svn-id: svn://tug.org/texlive/trunk@52839 c570f23f-e606-0410-a88d-b1316a301751 --- .../chemmacros.module.nomenclature.code.tex | 8 ++++++++ .../chemmacros/chemmacros.module.units.code.tex | 21 ++++++++++++--------- .../texmf-dist/tex/latex/chemmacros/chemmacros.sty | 6 +++--- 3 files changed, 23 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/chemmacros') diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex index 596d36f65a1..9cb5969ed29 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex @@ -862,7 +862,9 @@ \chemmacros_latin:n {#2} \group_end: } +\EndChemCompatibility +\ChemCompatibilityBetween{5.7}{5.9} \AtBeginDocument { \AfterPackage* {chemstyle} { \cs_undefine:N \invacuo } @@ -870,7 +872,13 @@ \NewChemLatin \abinitio {ab~initio} \NewChemLatin \invacuo {in~vacuo} } +\EndChemCompatibility +\ChemCompatibilityFrom{5.9} +\cs_undefine:N \invacuo +\NewChemLatin \invacuo {in~vacuo} +\NewChemLatin \abinitio {ab~initio} +\NewChemLatin \insitu {in~situ} \EndChemCompatibility % -------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex index 18bf0e5b9ee..4584c8a631d 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex @@ -25,19 +25,21 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{units}{2015/09/28 chemical units} +\ChemModule{units}{2019/11/07 chemical units} \RequirePackage{siunitx} % -------------------------------------------------------------------------- -\DeclareSIUnit {\atm } {atm} -\DeclareSIUnit {\atmosphere} {atm} -\DeclareSIUnit {\calory } {cal} -\DeclareSIUnit {\cal } {cal} -\DeclareSIUnit {\moLar } {\mole\per\liter} -\DeclareSIUnit {\MolMass } {\gram\per\mole} -\DeclareSIUnit {\normal } {\textsc{n}} -\DeclareSIUnit {\torr } {torr} +\DeclareSIUnit \atm {atm} +\DeclareSIUnit \atmosphere {atm} +\DeclareSIUnit \calory {cal} +\DeclareSIUnit \cal {cal} +\DeclareSIUnit \moLar {\mole\per\liter} +\DeclareSIUnit \MolMass {\gram\per\mole} +\DeclareSIUnit \normal {\textsc{n}} +\chemmacros_if_compatibility:nnTF {<} {5.8g} + { \DeclareSIUnit \torr {torr} } + { \DeclareSIUnit \Torr {Torr} } \AtEndPreamble { @@ -53,4 +55,5 @@ \file_input_stop: 2015/09/28 - change \AtBeginDocument into \AtEndPreamble +2019/11/07 - correction torr -> Torr diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index bb1e94bd3f9..3865e1a8608 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/30} +\tl_const:Nn \c_chemmacros_date_tl {2019/11/17} \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 {f} +\tl_const:Nn \c_chemmacros_version_minor_number_tl {9} +\tl_const:Nn \c_chemmacros_version_subrelease_tl {} \tl_const:Nx \c_chemmacros_version_number_tl { \c_chemmacros_version_major_number_tl . -- cgit v1.2.3