diff options
Diffstat (limited to 'Master')
29 files changed, 252 insertions, 113 deletions
diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README index 6780d16b274..520b25dbabc 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.2 2015/10/14 +the CHEMMACROS package v5.3 2016/01/13 comprehensive support for typesetting chemistry documents @@ -9,7 +9,7 @@ Web: https://github.com/cgnieder/chemmacros/ http://www.mychemistry.eu/forums/forum/2430/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2011-2015 Clemens Niederberger +Copyright 2011-2016 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf Binary files differindex 083395dcf6e..b284fcf361c 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex index f900d35b4d5..532decad6d7 100644 --- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex +++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex @@ -1,5 +1,5 @@ % arara: pdflatex -% !arara: biber +% arara: biber % arara: pdflatex % arara: pdflatex % -------------------------------------------------------------------------- @@ -17,7 +17,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -59,7 +59,7 @@ DeclareChemIUPACShorthand, DeclareChemLatin, DeclareChemNMR, DeclareChemNucleophile, DeclareChemPartialCharge, DeclareChemParticle, DeclareChemPhase, DeclareChemReaction, DeclareChemState, - delm, delp, Delta, descter, Dfi, + delm, delp, Delta, dexter, Dfi, el, ElPot, endo, entgegen, Enthalpy, enthalpy, entropy, fdelm, fdelp, fmch, fminus, fpch, fplus, fscrm, fscrp, gas, ghs, ghslistall, ghspic, gibbs, gram, @@ -325,6 +325,7 @@ % \undef\module % \undef\moduleidx \newidxcmd\chemmodule{\code{#1}}[ (module)] +\newidxcmd\tikzdecoration{\code{#1}}[ (\TikZ\ decoration)] \AtEndPreamble{% \pdfstringdefDisableCommands{% \def\chemmodule*#1{\textquotedblleft#1\textquotedblright}% @@ -408,7 +409,7 @@ } \ExplSyntaxOff -\AtBeginDocument{\renewcommand*\reftextfaraway[1]{from page~\pageref{#1}}} +\AtBeginDocument{\renewcommand*\reftextfaraway[1]{starting on page~\pageref{#1}}} \begin{document} @@ -973,11 +974,17 @@ and \cs*{textsuperscript} instead of \sym{\textasciicircum} without inserts a small space. The amount of inserted space can be customized. \item The characters \sym{(} and \sym{)} allow the word to be hyphenated and don't prevent further hyphenation, likewise \sym{[} and \sym{]}. + \item \sinceversion{5.3}The character \sym{'} is printed as \cs{chemprime}. \end{itemize} \begin{example}[side-by-side] \huge\iupac{2,4-Di|chlor|pentan} \par 2,4-Dichlorpentan \end{example} +\begin{commands} + \command{chemprime} + Prints\sinceversion{5.3} a prime character in superscript position. It is + defined as \verbcode+\ensuremath{{}^{\prime}}+. +\end{commands} The spaces inserted by \sym{-} and \sym{\textbar} can be customized. @@ -1210,8 +1217,6 @@ Two options allow customization: Append a hyphen to \cs{hapto}, \cs{dent} and \cs{bridge} or don't. \end{options} -\pagebreak - \paragraph{Examples} \begin{example} \iupac{\dexter-Wein|s\"aure} = @@ -1341,12 +1346,16 @@ All of these macros are defined using \pkg{chemformula}'s \cs{chcpd}. The details are explained in section~\vref{sec:defin-own-part}. The macros \cs{Nuc} and \cs{ba} are special: they have an optional argument -for the following option: +for the following options: \begin{options} \keychoice{elpair}{dots,dash,false}\Module{particles}\Default{false} Determine how the electron pair of the nucleophiles is displayed. The electron pair is drawn using \chemformula's \cs{chlewis} macro. + \keyval{space}{dim}\Module{particles}\Default{.1em} + Sets\sinceversion{5.3} the space that is inserted between the electron + pair and the negative charge sign. \end{options} +Both options can of course also be set with \cs{chemsetup}. \begin{example}[side-by-side] \ba[elpair=dots] \Nuc[elpair=dash] @@ -2700,6 +2709,9 @@ number of options. For historical reasons they all belong to the module \keyval{atom-number-cs}{cs}\Module{spectroscopy}\Default{\cs*{@firstofone}} Set the macro that prints the number set with the \cs{\#} macro. This needs to be a command with one mandatory argument. + \keyval{atom-number-space}{dim}\Module{spectroscopy}\Default{.16667em} + Horizontal\sinceversion{5.3} space inserted between number and atom + (printed by \cs{\#}). \keybool{parse}\Module{spectroscopy}\Default{true} Treat the solvent as \chemformula\ formula or not. \keyval{delta}{tokens}\Module{spectroscopy}\Default @@ -3109,7 +3121,7 @@ So -- for following thermodynamic conventions -- one could define a molar and an absolute variable: \begin{example} \RenewChemState\enthalpy{symbol=h,superscript=,unit=\kilo\joule\per\mole}% molar - \RenewChemState\Enthalpy{symbol=H,superscript=,unit=\kilo\joule}% absolute + \NewChemState\Enthalpy{symbol=H,superscript=,unit=\kilo\joule}% absolute \enthalpy{-12.3} \Enthalpy{-12.3} \end{example} @@ -3168,6 +3180,15 @@ The \chemmodule{tikz} module defines a few arrow tips: \tikz\draw[-right el](0,0)--(1,0); \end{tikzcode} +The\sinceversion{5.3} \chemmodule{tikz} module also loads the libraries +\code{calc} and \code{decorations.pathmorphing}. It uses those libraries for +defining a new decoration \tikzdecoration{wave}. +\begin{example}[side-by-side] + \begin{tikzpicture} + \draw[decorate,decoration=wave] (0,0) -- (2,0) ; + \end{tikzpicture} +\end{example} + \subsubsection{For Module Writers} The \chemmodule{tikz} module provides some macros for common \TikZ\ functions. This allows to use expl3's powerful function variants for diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.acid-base.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.acid-base.code.tex index 2d0346d5b79..e50bd859d98 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.acid-base.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.acid-base.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.all.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.all.code.tex index d9b655351ee..b90b5ee39ae 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.all.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.all.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 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 3bb594156c2..d62b2b5aa7e 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 @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -259,11 +259,11 @@ % -------------------------------------------------------------------------- % a setup command: -\NewDocumentCommand \chemsetup { o m } +\NewDocumentCommand \chemsetup {om} { \IfNoValueTF {#1} - { \keys_set:nn {chemmacros} {#2} } - { \keys_set:nn { chemmacros / #1 } {#2} } + { \keys_set:nn {chemmacros} {#2} } + { \keys_set:nn {chemmacros/#1} {#2} } } \keys_define:nn {chemmacros} diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.charges.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.charges.code.tex index e852764feed..1697b7e4a72 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.charges.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.charges.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex index 7ab4116182b..20e8be12ba9 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.chemformula.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.errorcheck.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.errorcheck.code.tex index 70879c15e24..500efe139b9 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.errorcheck.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.errorcheck.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -77,33 +77,33 @@ \chemmacros_command_requires_module:Nn \orbital {orbital} % reactions module -\chemmacros_environment_requires_module:nn {reaction} {reactions} -\chemmacros_environment_requires_module:nn {reaction*} {reactions} -\chemmacros_environment_requires_module:nn {reactions} {reactions} -\chemmacros_environment_requires_module:nn {reactions*} {reactions} -\chemmacros_command_requires_module:Nn \listofreactions {reactions} -\chemmacros_command_requires_module:Nn \AddRxnDesc {reactions} +\chemmacros_environment_requires_module:nn {reaction} {reactions} +\chemmacros_environment_requires_module:nn {reaction*} {reactions} +\chemmacros_environment_requires_module:nn {reactions} {reactions} +\chemmacros_environment_requires_module:nn {reactions*} {reactions} +\chemmacros_command_requires_module:Nn \listofreactions {reactions} +\chemmacros_command_requires_module:Nn \AddRxnDesc {reactions} % redox module -\chemmacros_command_requires_module:Nn \ox {redox} -\chemmacros_command_requires_module:Nn \OX {redox} +\chemmacros_command_requires_module:Nn \ox {redox} +\chemmacros_command_requires_module:Nn \OX {redox} \chemmacros_command_requires_module:Nn \redox {redox} % scheme module -\chemmacros_environment_requires_module:nn {scheme} {scheme} -\chemmacros_command_requires_module:Nn \listschemename {scheme} -\chemmacros_command_requires_module:Nn \schemename {scheme} -\chemmacros_command_requires_module:Nn \listofschemes {scheme} +\chemmacros_environment_requires_module:nn {scheme} {scheme} +\chemmacros_command_requires_module:Nn \listschemename {scheme} +\chemmacros_command_requires_module:Nn \schemename {scheme} +\chemmacros_command_requires_module:Nn \listofschemes {scheme} % spectroscopy module -\chemmacros_command_requires_module:Nn \NMR {spectroscopy} +\chemmacros_command_requires_module:Nn \NMR {spectroscopy} \chemmacros_environment_requires_module:nn {experimental} {spectroscopy} % thermodynamics module -\chemmacros_command_requires_module:Nn \state {thermodynamics} +\chemmacros_command_requires_module:Nn \state {thermodynamics} \chemmacros_command_requires_module:Nn \enthalpy {thermodynamics} -\chemmacros_command_requires_module:Nn \entropy {thermodynamics} -\chemmacros_command_requires_module:Nn \gibbs {thermodynamics} +\chemmacros_command_requires_module:Nn \entropy {thermodynamics} +\chemmacros_command_requires_module:Nn \gibbs {thermodynamics} % xfrac module \chemmacros_command_requires_module:Nn \chemfrac {xfrac} @@ -113,3 +113,4 @@ \tex_endinput:D 2015/10/14 - first version + diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.greek.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.greek.code.tex index 72180d595af..6111cd0119e 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.greek.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.greek.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.isotopes.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.isotopes.code.tex index 6a788d8373c..4799dfe0c8f 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.isotopes.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.isotopes.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.lang.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.lang.code.tex index 45d7d267abc..abcea92f071 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.lang.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.lang.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{lang}{2015/07/21 language settings for chemmacros} +\ChemModule{lang}{2015/11/17 language settings for chemmacros} \RequirePackage{translations} @@ -44,20 +44,41 @@ % language is either chosen automatically or by option it is only available at % begin document \tl_new:N \l_chemmacros_language_tl -\tl_set:Nn \l_chemmacros_language_tl { english } +\tl_set:Nn \l_chemmacros_language_tl {english} \tl_new:N \l__chemmacros_current_language_tl % translate the key #1 \cs_new:Npn \chemmacros_translate:n #1 { \bool_if:NTF \l__chemmacros_language_auto_bool - { \GetTranslation{#1} } - { \GetTranslationFor{\l_chemmacros_language_tl}{#1} } + { \GetTranslation {#1} } + { \GetTranslationFor {\l_chemmacros_language_tl} {#1} } } \DeclareExpandableDocumentCommand \ChemTranslate {m} { \chemmacros_translate:n {#1} } +\keys_define:nn {chemmacros} + { + language .value_required:n = true , + language .code:n = + \tl_if_eq:nnTF {#1} {auto} + { \bool_set_true:N \l__chemmacros_language_auto_bool } + { + \bool_set_false:N \l__chemmacros_language_auto_bool + \tl_set:Nn \l__chemmacros_current_language_tl {#1} + } , + language .initial:n = auto + } + +\ChemCompatibilityTo{5.2} +\keys_define:nn {chemmacros} + { + german .meta:n = { language = german } , + ngerman .meta:n = { language = ngerman } + } +\EndChemCompatibility + \AtBeginDocument{ \bool_if:NTF \l__chemmacros_language_auto_bool { @@ -68,58 +89,60 @@ \tl_set_eq:NN \l_chemmacros_language_tl \l__chemmacros_current_language_tl - } + } } -\keys_define:nn {chemmacros} - { - language .value_required:n = true , - language .code:n = - \tl_if_eq:nnTF { #1 } { auto } - { \bool_set_true:N \l__chemmacros_language_auto_bool } - { - \bool_set_false:N \l__chemmacros_language_auto_bool - \tl_set:Nn \l__chemmacros_current_language_tl { #1 } - } , - % do we still need these? - german .meta:n = { language = german } , - german .meta:n = { language = ngerman } , - language .initial:n = auto - } - % -------------------------------------------------------------------------- -\DeclareTranslationFallback {scheme-name} {Scheme} -\DeclareTranslation {German} {scheme-name} {Schema} +\DeclareTranslationFallback {scheme-name} {Scheme} +\DeclareTranslation {English} {scheme-name} {Scheme} +\DeclareTranslation {German} {scheme-name} {Schema} -\DeclareTranslationFallback {scheme-list} {List~ of~ Schemes} -\DeclareTranslation {German} {scheme-list} {Verzeichnis~ der~ Schemata} +\DeclareTranslationFallback {scheme-list} {List~ of~ Schemes} +\DeclareTranslation {English} {scheme-list} {List~ of~ Schemes} +\DeclareTranslation {German} {scheme-list} {Verzeichnis~ der~ Schemata} % -------------------------------------------------------------------------- -\DeclareTranslationFallback {K-acid} {\mathrm{a}} -\DeclareTranslation{German} {K-acid} {\mathrm{s}} -\DeclareTranslation{Dutch} {K-acid} {\mathrm{z}} +\DeclareTranslationFallback {K-acid} {\mathrm{a}} +\DeclareTranslation {English} {K-acid} {\mathrm{a}} +\DeclareTranslation {German} {K-acid} {\mathrm{s}} +\DeclareTranslation {Dutch} {K-acid} {\mathrm{z}} -\DeclareTranslationFallback {K-base} {\mathrm{b}} +\DeclareTranslationFallback {K-base} {\mathrm{b}} +\DeclareTranslation {English} {K-base} {\mathrm{b}} -\DeclareTranslationFallback {K-water} {\mathrm{w}} +\DeclareTranslationFallback {K-water} {\mathrm{w}} +\DeclareTranslation {English} {K-water} {\mathrm{w}} % -------------------------------------------------------------------------- -\DeclareTranslation{German}{phase-sld}{ f } -\DeclareTranslation{German}{phase-lqd}{ f\/l } +\DeclareTranslation {English} {phase-sld} {s} +\DeclareTranslation {German} {phase-sld} {f} + +\DeclareTranslation {English} {phase-lqd} {l} +\DeclareTranslation {German} {phase-lqd} {f\/l} + +\DeclareTranslation {English} {phase-gas} {g} +\DeclareTranslation {German} {phase-gas} {g} + +\DeclareTranslation {English} {phase-aq} {aq} +\DeclareTranslation {German} {phase-aq} {aq} % -------------------------------------------------------------------------- -\DeclareTranslationFallback {list-of-reactions} { List~ of~ Reactions } -\DeclareTranslation{English} {list-of-reactions} { List~ of~ Reactions } -\DeclareTranslation{German} {list-of-reactions} { Reaktionsverzeichnis } -\DeclareTranslation{Italian} {list-of-reactions} { Elenco~ delle~ reazioni } -\DeclareTranslation{French} {list-of-reactions} { Table~ des~ r\'eactions } -\DeclareTranslation{Dutch} {list-of-reactions} { Lijst~ van~ reacties } -% -\DeclareTranslationFallback {reaction} { Reaction } -\DeclareTranslation{English} {reaction} { Reaction } -\DeclareTranslation{German} {reaction} { Reaktion } -\DeclareTranslation{Italian} {reaction} { Reazione } -\DeclareTranslation{French} {reaction} { R\'eaction } -\DeclareTranslation{Dutch} {reaction} { Reactie } +\DeclareTranslationFallback {list-of-reactions} {List~ of~ Reactions} +\DeclareTranslation {English} {list-of-reactions} {List~ of~ Reactions} +\DeclareTranslation {German} {list-of-reactions} {Reaktionsverzeichnis} +\DeclareTranslation {Italian} {list-of-reactions} {Elenco~ delle~ reazioni} +\DeclareTranslation {French} {list-of-reactions} {Table~ des~ r\'eactions} +\DeclareTranslation {Dutch} {list-of-reactions} {Lijst~ van~ reacties} + +\DeclareTranslationFallback {reaction} {Reaction} +\DeclareTranslation {English} {reaction} {Reaction} +\DeclareTranslation {German} {reaction} {Reaktion} +\DeclareTranslation {Italian} {reaction} {Reazione} +\DeclareTranslation {French} {reaction} {R\'eaction} +\DeclareTranslation {Dutch} {reaction} {Reactie} + % -------------------------------------------------------------------------- +\tex_endinput:D + +2015/11/17 - remove options `german' and `ngerman', starting with v5.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.mechanisms.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.mechanisms.code.tex index a2b3d205069..db28e0cf05e 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.mechanisms.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.mechanisms.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.newman.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.newman.code.tex index 8d1df135388..3821f966192 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.newman.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.newman.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex index ec941e31bd2..59cb743ad2b 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.nomenclature.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -521,6 +521,7 @@ \NewDocumentCommand \RemoveChemIUPACShorthand {m} { \chemmacros_remove_shorthand:N #1 } +\NewChemIUPACShorthand ^ \chemmacros_superscript:n \NewChemIUPACShorthand | \chemmacros_break_point: \NewChemIUPACShorthand - \chemmacros_break_point_hyphen: \ChemCompatibilityFrom{5.1} @@ -529,7 +530,10 @@ \NewChemIUPACShorthand [ \chemmacros_break_point_opening_bracket: \NewChemIUPACShorthand ] \chemmacros_break_point_closing_bracket: \EndChemCompatibility -\NewChemIUPACShorthand ^ \chemmacros_superscript:n +\ChemCompatibilityFrom{5.3} +\NewChemIUPAC \chemprime { \ensuremath {{}^{\prime}} } +\NewChemIUPACShorthand ' \chemprime +\EndChemCompatibility \group_begin: \chemmacros_activate_all_iupac_shorthands: @@ -725,3 +729,4 @@ \chemmacros_make_iupac: - \cip only italicizes elements of csv list - fix bug in \RemoveChemIUPACShorthand +2016/01/02 - \chemprime diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.orbital.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.orbital.code.tex index e7f0eac2f56..29aa6242541 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.orbital.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.orbital.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.particles.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.particles.code.tex index ccc506e8c23..373634815c1 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.particles.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.particles.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{particles}{2015/07/15 particles} +\ChemModule{particles}{2016/01/13 particles} \chemmacros_load_modules:n {charges,chemformula} @@ -49,6 +49,16 @@ \bool_new:N \l__chemmacros_nucleophile_elpair_bool \bool_new:N \l__chemmacros_elpair_dots_bool +\ChemCompatibilityFrom{5.3} +\dim_new:N \l__chemmacros_nucleophile_dim +\dim_set:Nn \l__chemmacros_nucleophile_dim { .1em } + +\keys_define:nn {chemmacros/particles} + { + space .dim_set:N = \l__chemmacros_nucleophile_dim + } +\EndChemCompatibility + \keys_define:nn {chemmacros/particles} { elpair .choice: , @@ -72,7 +82,12 @@ \cs_set_protected:cpn {__chemmacros_ \chemmacros_remove_backslash:N #1:} { \bool_if:NTF \l__chemmacros_nucleophile_elpair_bool - { \chemmacros_elpair:n { #2 } \chemmacros_chemformula:n { {}^{-} } } + { + \chemmacros_elpair:n { #2 } + \chemmacros_if_compatiblity:nnT {>=} {5.3} + { \skip_horizontal:N \l__chemmacros_nucleophile_dim } + \chemmacros_chemformula:n { {}^{-} } + } { \chemmacros_chemformula:n { #2- } } } \DeclareDocumentCommand #1 {o} @@ -98,9 +113,9 @@ % ions, molecules % proton, hydroxide, hydronium/oxonium, water: -\NewChemParticle \Hpl { H+ } -\NewChemParticle \Hyd { OH- } -\NewChemParticle \Oxo { H3O+ } +\NewChemParticle \Hpl { H+ } +\NewChemParticle \Hyd { OH- } +\NewChemParticle \Oxo { H3O+ } \NewChemParticle \water { H2O } % electrophile: @@ -116,3 +131,5 @@ \EndChemCompatibility % -------------------------------------------------------------------------- +\tex_endinput:D +2016/01/13 - new option particles/space diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.phases.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.phases.code.tex index cbc6fe23039..5f913d3f0cd 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.phases.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.phases.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex index 8138ca6e7dc..bc58cd45ab2 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.reactions.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.redox.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.redox.code.tex index 11980accdcb..0da0a2e61e6 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.redox.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.redox.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.scheme.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.scheme.code.tex index d4dd3ae7691..30fb015dc64 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.scheme.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.scheme.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\ChemModule{scheme}{2015/09/19 a scheme floating environment} +\ChemModule{scheme}{2015/10/23 a scheme floating environment} \RequirePackage {chemnum} @@ -35,6 +35,9 @@ \prop_new:N \l__chemmacros_float_methods_prop \prop_new:N \l__chemmacros_float_definitions_prop +\msg_new:nnn {chemmacros} {float-method} + { Detected~ float~ defining~ method~ `#1'. } + % -------------------------------------------------------------------------- % #1: name % #2: check @@ -138,6 +141,7 @@ { \bool_set_true:N \l__chemmacros_float_def_bool \tl_set:Nn \l__chemmacros_float_method_tl {#1} + \msg_info:nnn {chemmacros} {float-method} {#1} } } @@ -227,4 +231,4 @@ \tex_endinput:D % -------------------------------------------------------------------------- 2015/09/19 - make the module compatible with floatrow - +2015/10/23 - add info message to float method detection diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex index e5bcb407e10..4991ad2722f 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.spectroscopy.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -82,6 +82,9 @@ \bool_new:N \l__chemmacros_nmr_custom_command_active_bool \bool_new:N \l__chemmacros_nmr_custom_command_used_bool +\skip_new:N \l__chemmacros_nmr_space_skip +\skip_set:Nn \l__chemmacros_nmr_space_skip { .16667em } + \cs_new_protected:Npn \__chemmacros_nmr_nucleus:nn #1#2 { \tl_gset:Nn \g__chemmacros_nmr_isotope_tl {#1} @@ -188,6 +191,8 @@ \l__chemmacros_nmr_coupling_symbol_tl , atom-number-cs .code:n = \cs_set_eq:NN \__chemmacros_nmr_number:n #1 , + \chemmacros_if_compatiblity:nnT {>=} {5.3} + { atom-number-space .skip_set:N = \l__chemmacros_nmr_space_skip , } coupling-pos-cs .code:n = \cs_set_eq:NN \__chemmacros_nmr_position:n #1 , parse .bool_set:N = \l__chemmacros_nmr_parse_bool , @@ -366,7 +371,8 @@ \cs_new_protected:Npn \chemmacros_nmr_number:n #1 { - \__chemmacros_nmr_number:n {#1} \, + \__chemmacros_nmr_number:n {#1} + \skip_horizontal:N \l__chemmacros_nmr_space_skip \chemmacros_chemformula:V \g__chemmacros_nmr_element_tl } @@ -467,3 +473,5 @@ } % -------------------------------------------------------------------------- +\tex_endinput:D +2015/12/31 - new option `atom-number-space' diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.symbols.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.symbols.code.tex index 6482a78229c..73ec35e1dfc 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.symbols.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.symbols.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.thermodynamics.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.thermodynamics.code.tex index edde631c1ca..f4915b0ec5f 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.thermodynamics.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.thermodynamics.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.tikz.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.tikz.code.tex index 9524d14d734..8d70a4ac0ba 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.tikz.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.tikz.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -28,7 +28,7 @@ \ChemModule*{tikz}{2015/07/24 upright greek symbols} \RequirePackage{tikz} -\usetikzlibrary{calc}%,arrows} +\usetikzlibrary{calc,decorations.pathmorphing} \ExplSyntaxOn @@ -141,3 +141,47 @@ \pgfusepathqfillstroke } % -------------------------------------------------------------------------- +% http://tex.stackexchange.com/a/25689/ +\ChemCompatibilityFrom{5.3} +\pgfdeclaredecoration{wave}{initial}{ + \state{initial}[ + width = +0pt , + next~ state = sine, + persistent~ precomputation = { + \pgfmathsetmacro\matchinglength{ + \pgfdecoratedinputsegmentlength / + int(\pgfdecoratedinputsegmentlength/\pgfdecorationsegmentlength) + } + \setlength{\pgfdecorationsegmentlength}{\matchinglength pt} + } + ]{} + \state{sine}[width=\pgfdecorationsegmentlength]{ + \pgfpathsine{ + \pgfpoint + {0.25\pgfdecorationsegmentlength} + {0.5\pgfdecorationsegmentamplitude} + } + \pgfpathcosine{ + \pgfpoint + {0.25\pgfdecorationsegmentlength} + {-0.5\pgfdecorationsegmentamplitude} + } + \pgfpathsine{ + \pgfpoint + {0.25\pgfdecorationsegmentlength} + {-0.5\pgfdecorationsegmentamplitude} + } + \pgfpathcosine{ + \pgfpoint + {0.25\pgfdecorationsegmentlength} + {0.5\pgfdecorationsegmentamplitude} + } + } + \state{final}{} +} +\EndChemCompatibility + +% -------------------------------------------------------------------------- +\tex_endinput:D + +2015/10/26 - add decoration `wave' (complete sines) diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex index 0ecf2b7407f..d91de5754b8 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.xfrac.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.xfrac.code.tex index 3308b4c5d37..d577e0e9761 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.xfrac.code.tex +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.xfrac.code.tex @@ -11,7 +11,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty index 2843bf1e83a..ca2552059ec 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty @@ -12,7 +12,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -% Copyright 2011-2015 Clemens Niederberger +% Copyright 2011-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -31,9 +31,9 @@ % -------------------------------------------------------------------------- % package information: -\tl_const:Nn \c_chemmacros_date_tl {2015/10/14} +\tl_const:Nn \c_chemmacros_date_tl {2016/01/13} \tl_const:Nn \c_chemmacros_version_major_number_tl {5} -\tl_const:Nn \c_chemmacros_version_minor_number_tl {2} +\tl_const:Nn \c_chemmacros_version_minor_number_tl {3} \tl_const:Nn \c_chemmacros_version_subrelease_tl {} \tl_const:Nx \c_chemmacros_version_number_tl {\c_chemmacros_version_major_number_tl.\c_chemmacros_version_minor_number_tl} @@ -490,3 +490,9 @@ Version history - fixes in the module hook mechanism - fix in \chemmacros_if_module_loaded:n - new internal module `errorcheck' +2016/01/13 - version 5.3 - removed options `german' and `ngerman' (lang) + - remove deprecated pre-v5 macros (several modules) + - new option `atom-number-space' (spectroscopy) + - add \chemprime and ' shorthand (nomenclature) + - new option `space' (particles) + - TikZ decoration `wave' (tikz) diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty index c4757bd6e43..683c1344fdb 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty @@ -265,8 +265,18 @@ % load default modules: \chemmacros_load_modules:n { - base, errorcheck, lang, greek, chemformula, % <= those need to be present for all modules - acid-base, symbols, charges, particles, phases , nomenclature + % required modules: + base, + errorcheck, + lang, greek, + chemformula, + % preloaded modules: + acid-base, + symbols, + charges, + particles, + phases , + nomenclature } % -------------------------------------------------------------------------- |