From 2e5d8b0237884321ed5c11a8c100ecdd711cf1b1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Nov 2013 23:42:23 +0000 Subject: chemmacros git-svn-id: svn://tug.org/texlive/trunk@32049 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/chemmacros/README | 4 ++-- .../doc/latex/chemmacros/chemmacros_en.pdf | Bin 890090 -> 890101 bytes .../texmf-dist/tex/latex/chemmacros/chemmacros.sty | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README index b7634e6ea91..545b2eff066 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/README +++ b/Master/texmf-dist/doc/latex/chemmacros/README @@ -1,12 +1,12 @@ -------------------------------------------------------------------------- the CHEMMACROS bundle --> chemmacros package v4.2 -> macros and commands for chemists +-> chemmacros package v4.2a -> macros and commands for chemists -> chemformula package v4.2 -> typeset chemical compounds and reactions -> ghsystem package v4.0 -> typeset H & P statements and pictograms from the globally harmonised system (GHS) -> chemgreek package v0.2 -> handle mapping of upright greek letters to the \chemalpha ... commands -2013/10/28 +2013/10/31 -------------------------------------------------------------------------- This bundle succeeds the chemmacros package which is now part of the bundle diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf index f21d010f854..42e857e56cc 100644 Binary files a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf and b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf differ diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index 3b99d33eb9b..2c0e7272907 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.2} -\def\chemmacros@date{2013/10/28} +\def\chemmacros@version{4.2a} +\def\chemmacros@date{2013/10/31} \ProvidesExplPackage {chemmacros} @@ -1125,7 +1125,11 @@ } \cs_new_protected:Npn \chemformula_hapto:n #1 - { \Chemeta \chemformula_superscript:n { #1 } \chemmacros_break_point_hyphen: } + { + \Chemeta \chemformula_superscript:n { #1 } + \bool_if:NT \l__chemmacros_coord_use_hyphen_bool + { \chemmacros_break_point_hyphen: } + } \cs_new_protected:Npn \chemformula_bridge:n #1 { @@ -1136,7 +1140,8 @@ { \chemformula_superscript:n { #1 } } { \chemformula_subscript:n { #1 } } } - \chemmacros_break_point_hyphen: + \bool_if:NT \l__chemmacros_coord_use_hyphen_bool + { \chemmacros_break_point_hyphen: } } \DeclareChemIUPAC \hapto { \chemformula_hapto:n } @@ -4042,6 +4047,7 @@ Version history - change in the syntax of \DeclareChemState and \RenewChemState and improved both internal definition and user interface +2013/10/31 - version 4.2a - bug bix in \hapto and \bridge % --------------------------------------------------------------------------- % % TODO: -- cgit v1.2.3