From 244839b0edef369eaae2ca5624a8deac38db65d1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Mar 2012 23:25:20 +0000 Subject: chemmacros (14mar12) git-svn-id: svn://tug.org/texlive/trunk@25645 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/chemmacros/chemmacros.sty | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty') diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index c12b04033ca..77dab7f9d0c 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty @@ -5,7 +5,7 @@ % - macros and commands for chemists - % % --------------------------------------------------------------------------- % % - Clemens Niederberger - % -% - 2012/03/03 - % +% - 2012/03/14 - % % --------------------------------------------------------------------------- % % - https://bitbucket.org/cgnieder/chemmacros/ - % % - contact@mychemistry.eu - % @@ -33,8 +33,8 @@ \ProvidesExplPackage {chemmacros} - {2012/03/03} - {3.1b} + {2012/03/14} + {3.1c} {macros and commands for chemists} \@ifpackageloaded { chemformula } {} { \RequirePackage { chemformula } } @@ -181,12 +181,16 @@ \bool_set_false:N \l_chemmacros_use_upgreek_bool \bool_set_false:N \l_chemmacros_use_textgreek_bool , upgreek .default:n = upgreek , - version .choice: , - version / 1 .code:n = + % dummy version for compatibility with KOMA's global option and backwards + % compatibility of chemmacros + version .code:n = , + % TODO: neuen Namen finden! + cmversion .choice: , + cmversion / 1 .code:n = { \bool_set_true:N \l_chemmacros_version_one_bool } , - version / 2 .code:n = + cmversion / 2 .code:n = { \bool_set_false:N \l_chemmacros_version_one_bool } , - version / bundle .code:n = + cmversion / bundle .code:n = { \bool_set_false:N \l_chemmacros_version_one_bool } , xspace .bool_set:N = \l_chemmacros_xspace_bool , xspace .default:n = true @@ -1833,7 +1837,7 @@ { \addcontentsline { lor } { reaction } { - \l_chemmacros_reaction_lorname_tl #3 ##1 #4 + \l_chemmacros_reaction_lorname_tl #3 #2 ##1 #4 \tl_use:c { l_chemmacros_reaction_ \thereaction _tl } } } @@ -1881,6 +1885,7 @@ \bool_if:NTF \l_chemmacros_version_one_bool { \usetagform { CMreaction } } { \usetagform { reaction } } + % => this is problematic because it disallows resetting the counter: \tl_new:c { l_chemmacros_reaction_ \thereaction _tl } } @@ -3257,6 +3262,9 @@ Version history - deprecated option: "option/detect-bold" 2012/03/03 - version 3.1b - changes in the chemformula package - IUPAC compliance for \Delta and \ox +2012/03/14 - version 3.1c - compatibility with KOMA's global option + "version = " + - bugfix in the list of reactions % --------------------------------------------------------------------------- % % TODO: -- cgit v1.2.3