diff options
author | Karl Berry <karl@freefriends.org> | 2014-07-06 23:17:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-07-06 23:17:09 +0000 |
commit | 6538616b6c48d003babe30809efa10c70a6ead51 (patch) | |
tree | 4ab04416a03a782fc1ce769d195815bb856c960b /Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty | |
parent | 64a70a9ff352252833b48b2ee6e8b5261730ddc8 (diff) |
chemmacros (6jul14)
git-svn-id: svn://tug.org/texlive/trunk@34532 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index 846a9d86fcd..3075128b12a 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty @@ -26,8 +26,8 @@ % - The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \RequirePackage{ expl3 , xparse , l3keys2e } -\def\chemmacros@version{4.5} -\def\chemmacros@date{2014/04/08} +\def\chemmacros@version{4.5a} +\def\chemmacros@date{2014/06/30} \ProvidesExplPackage {chemmacros} @@ -37,7 +37,7 @@ % -------------------------------------------------------------------------- % check expl3 version: -\@ifpackagelater { expl3 } { 2012/11/21 } +\@ifpackagelater { expl3 } { 2013/12/14 } { } { \PackageError { chemmacros } { Support~package~expl3~too~old } @@ -433,6 +433,7 @@ { \bool_set_false:N \l__chemmacros_circled_chem_bool } , circletype / chem .code:n = { \bool_set_true:N \l__chemmacros_circled_chem_bool } , + circletype .default:n = chem , circled .choice: , circled / none .code:n = { @@ -1783,11 +1784,8 @@ \cs_new_protected:Npn \__chemmacros_ox_is_integer:n #1 { - \fp_set:Nn \l__chemmacros_tmpa_tl { #1 } - \fp_add:Nn \l__chemmacros_tmpa_tl { 1 } - \fp_round_places:Nn \l__chemmacros_tmpa_tl { 0 } - \fp_sub:Nn \l__chemmacros_tmpa_tl { 1 } - \fp_compare:nNnTF { \l__chemmacros_tmpa_tl } = { #1 } + \fp_set:Nn \l__chemmacros_tmpa_fp { round(#1 + 1 , 0 ) - 1 } + \fp_compare:nNnTF { \l__chemmacros_tmpa_fp } = { #1 } { \bool_set_true:N \l__chemmacros_ox_integer_bool } { \bool_set_false:N \l__chemmacros_ox_integer_bool @@ -1799,10 +1797,9 @@ \cs_new_protected:Npn \__chemmacros_fp_to_Roman:n #1 { \group_begin: - \fp_set:Nn \l__chemmacros_tmpa_tl { #1 } - \fp_round_places:Nn \l__chemmacros_tmpa_tl { 0 } + \fp_set:Nn \l__chemmacros_tmpa_fp { round(#1 , 0 ) } \int_set:Nn \l__chemmacros_tmpa_int - { \fp_to_tl:N \l__chemmacros_tmpa_tl } + { \fp_to_tl:N \l__chemmacros_tmpa_fp } \int_compare:nTF { \l__chemmacros_tmpa_int = 0 } { 0 } { \int_to_Roman:n { \l__chemmacros_tmpa_int } } @@ -4329,6 +4326,7 @@ Version history - new option `nmr/coupling-pos-cs' 2014/04/08 - version 4.5 - new option `acid-base/subscript' - added Dutch translations +2014/06/30 - version 4.5a - adapt to deprecated expl3 functions % --------------------------------------------------------------------------- % % TODO: |