From 01156f021cb6a2f7163babffef5a297ede4574e7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 29 Aug 2017 21:04:16 +0000 Subject: chemmacros (29aug17) git-svn-id: svn://tug.org/texlive/trunk@45164 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/chemmacros/README | 2 +- .../doc/latex/chemmacros/chemmacros.history | 8 +++-- .../doc/latex/chemmacros/chemmacros_en.pdf | Bin 1008012 -> 1042240 bytes .../doc/latex/chemmacros/chemmacros_en.tex | 36 ++++++++++++--------- .../chemmacros/chemmacros.module.base.code.tex | 11 ++++++- .../texmf-dist/tex/latex/chemmacros/chemmacros.sty | 4 +-- 6 files changed, 38 insertions(+), 23 deletions(-) diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README index 05e46321e79..d6b3a3a4cc2 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/README +++ b/Master/texmf-dist/doc/latex/chemmacros/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the CHEMMACROS package v5.8a 2017/06/13 +the CHEMMACROS package v5.8b 2017/08/28 comprehensive support for typesetting chemistry documents diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history b/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history index 314dbafafca..505e43a72f2 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history @@ -296,8 +296,8 @@ Version history user with \usechemmodule - various changes, see http://www.mychemistry.eu/2015/06/chemmacros-development/ - and the manual section 3.4. Upgrading from version < 5.0 - for details + and the manual section 3.4. Upgrading from version + < 5.0 for details 2015/09/23 - version 5.1 - add option `method' to `chemformula' module - make module `scheme' compatible with `floatrow' - add module hooks `before' and `after' @@ -320,7 +320,8 @@ Version history - new option `space' (particles) - TikZ decoration `wave' (tikz) 2016/01/23 - version 5.3a - compatibility with chemscheme package (scheme) - - IUPAC shorthands only defined within \iupac (nomenclature) + - IUPAC shorthands only defined within \iupac + (nomenclature) 2016/02/10 - version 5.4 - \NewChemEqConstant and family, new option `eq-constant' (acid-base) - added \ignorespacesafterend to environments @@ -373,3 +374,4 @@ Version history - change behaviour of \__chemmacros_break_point_insert:nnn so it does nothing as last token in \iupac (nomenclature) +2017/08/28 - version 5.8b - fix missing hyperref check diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf index 54b518ba25d..0f621ee5612 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/doc/latex/chemmacros/chemmacros_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex index d6fc4f13bec..d4928256f32 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex @@ -1,7 +1,7 @@ % !arara: pdflatex % !arara: biber -% arara: pdflatex -% arara: pdflatex +% arara: pdflatex: { action: nonstopmode } +% arara: pdflatex: { action: nonstopmode } % -------------------------------------------------------------------------- % the CHEMMACROS package % @@ -389,9 +389,13 @@ {}% failure \newsourcecodeenv[ code-only, - sourcecode-options={style=bash}, - pre-code=\def\prompt{\textasciitilde\space\$\space} -]{bash} + sourcecode-options = { + style = bash , + deleteindex = [5][keyword5] , + deleteindex = [6][keyword6] + }, + pre-code = \def\prompt{\textasciitilde\space\$\space} +]{lbash} \makeatother \renewcommand*\dictumauthorformat[1]{#1} @@ -836,24 +840,24 @@ this you have two possibilities: The\sinceversion{5.4} constants \Ka, \Kb, and \Kw\ were defined using the following commands: \begin{commands} - \command{NewChemEqConstant}\marg{cs}\marg{name}\marg{subscript} + \command{NewChemEqConstant}[\marg{cs}\marg{name}\marg{subscript}] Define the constant \meta{cs} with the name \meta{name} and the subscript \meta{subscript}. This also defines the default translation with the key \meta{name} using \meta{subscript} as fallback translation (see section~\vref{sec:lang-module} for details). It also defines the option \meta{name} for setting the subscript. - \command{RenewChemEqConstant}\marg{cs}\marg{name}\marg{default appearance} + \command{RenewChemEqConstant}[\marg{cs}\marg{name}\marg{default appearance}] The same as \cs{NewChemEqConstant} but renews an existing command. - \command{DeclareChemEqConstant}\marg{cs}\marg{name}\marg{default appearance} + \command{DeclareChemEqConstant}[\marg{cs}\marg{name}\marg{default appearance}] The same as \cs{NewChemEqConstant} but overwrites existing commands. - \command{ProvideChemEqConstant}\marg{cs}\marg{name}\marg{default appearance} + \command{ProvideChemEqConstant}[\marg{cs}\marg{name}\marg{default appearance}] The same as \cs{NewChemEqConstant} but doesn't throw an error if \meta{cs} already exists. \end{commands} This is how \cs{Ka} is defined: \begin{sourcecode} - \NewChemEqConstant \Ka {K-acid} { \mathrm{a} } + \NewChemEqConstant\Ka{K-acid}{\mathrm{a}} \end{sourcecode} \subsection{The \chemmodule*{charges} Module}\label{sec:charges-module} @@ -881,10 +885,10 @@ The \chemmodule{charges} module loads the module \chemmodule{chemformula}. \subsubsection{Ion Charges}\label{sec:ion-charges} Simple displaying of (real) charges. It is worth noting that these commands really are relicts from a time when \chemmacros\ tried hard to be compliant -with \pkg{mhchem} and \chemformula\ didn't exist, yet. They are still -provided for backwards compatibility but \emph{my recommendation is to use} -\cs{ch} (see the documentation of the \chemformula\ -package~\cite{pkg:chemformula}) \emph{and forget about these commands:} +with \pkg{mhchem} and \chemformula\ didn't exist, yet. \textbf{They are still + provided for backwards compatibility but \emph{my recommendation is to use} + \cs{ch} (see the documentation of the \chemformula\ + package~\cite{pkg:chemformula}) \emph{and forget about these commands:}} \begin{commands} \command{pch}[\oarg{number}] positive charge @@ -3656,9 +3660,9 @@ module name: \end{sourcecode} You will find more details on the naming conventions in \code{interface3.pdf} which most likely is available on your system: -\begin{bash} +\begin{lbash} texdoc interface3 -\end{bash} +\end{lbash} If you haven't read section~\vref{sec:base-module} about the \chemmodule{base} module, yet, please have a look. There some macros for module writers are described. Also other modules define macros for module writers which may be diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex index 1401c075785..6e6b98094ad 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.base.code.tex @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{base}{2016/05/04 basic chemmacros module} +\ChemModule{base}{2017/08/28 basic chemmacros module} % for the document hooks \ChemCompatibilityFrom{5.1} @@ -463,6 +463,14 @@ % -------------------------------------------------------------------------- +\bool_new:N \l__chemmacros_hyperref_bool + +\AtEndPreamble + { + \chemmacros_if_package_loaded:nT {hyperref} + { \bool_set_true:N \l__chemmacros_hyperref_bool } + } + \tex_endinput:D 2015/09/23 - new conditionals \chemmacros_if_preamble:TF and @@ -473,3 +481,4 @@ 2016/04/25 - macros for cleveref and fancyref support, \ChemCleverefSupport \ChemFancyrefSupport 2016/05/04 - fix \ChemCleverefSupport +2017/08/28 - add missing hyperref check diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index 03d7b33bd91..fb25545aad6 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 {2017/06/13} +\tl_const:Nn \c_chemmacros_date_tl {2017/08/28} \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 {a} +\tl_const:Nn \c_chemmacros_version_subrelease_tl {b} \tl_const:Nx \c_chemmacros_version_number_tl { \c_chemmacros_version_major_number_tl . -- cgit v1.2.3