From 9e8a295d38a2315ed078122e51b2009c05632212 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 10 Sep 2015 20:57:29 +0000 Subject: chemformula (9sep15) git-svn-id: svn://tug.org/texlive/trunk@38341 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/chemformula/chemformula.sty | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/chemformula/chemformula.sty b/Master/texmf-dist/tex/latex/chemformula/chemformula.sty index fcd07845edb..c5e7a7a88be 100644 --- a/Master/texmf-dist/tex/latex/chemformula/chemformula.sty +++ b/Master/texmf-dist/tex/latex/chemformula/chemformula.sty @@ -26,16 +26,23 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\RequirePackage{ expl3 , xparse , l3keys2e , tikz , amstext , xfrac , nicefrac, scrlfile } +\RequirePackage{expl3,xparse,l3keys2e,tikz,amstext,xfrac,nicefrac,scrlfile} \usetikzlibrary{arrows.meta} -\def\chemformula@version{4.12a} -\def\chemformula@date{2015/08/19} + +\ExplSyntaxOn +\tl_const:Nn \c_chemformula_date_tl {2015/09/08} +\tl_const:Nn \c_chemformula_version_number_tl {4.12} +\tl_const:Nn \c_chemformula_version_suffix_tl {b} +\tl_const:Nx \c_chemformula_version_tl + { \c_chemformula_version_number_tl \c_chemformula_version_suffix_tl } +\tl_const:Nn \c_chemformula_info_tl + {typeset chemical compounds and reactions} \ProvidesExplPackage {chemformula} - {\chemformula@date} - {\chemformula@version} - {typeset chemical compounds and reactions} + {\c_chemformula_date_tl} + {\c_chemformula_version_tl} + {\c_chemformula_info_tl \c_space_tl (CN)} % -------------------------------------------------------------------------- % warning and error messages: @@ -1046,7 +1053,9 @@ \cs_new_protected:Npn \__chemformula_ch_main:n #1 { \group_begin: - \seq_set_split:Nnn \l__chemformula_input_seq { ~ } {#1} + \tl_set:Nn \l__chemmacros_tmpa_tl {#1} + \tl_trim_spaces:N \l__chemmacros_tmpa_tl + \seq_set_split:NnV \l__chemformula_input_seq { ~ } \l__chemmacros_tmpa_tl \cs_set_eq:NN \xspace \scan_stop: % the next two aren't necessary any more but shouldn't do harm, too: \cs_set_nopar:Npn \[ { [ } @@ -3274,6 +3283,8 @@ VERSION HISTORY \chemformula_formal_minus: \ProvideChem... equivalents to all \NewChem... macros +2015/09/08 - version 4.12b - trim spaces of \ch input -- due to a change in + l3kernel % -------------------------------------------------------------------------- % TODO -- cgit v1.2.3