4 files changed, 12 insertions, 136 deletions
diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README
index 7483ec9d3f4..6153319d531 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.9 2019/11/17
+the CHEMMACROS package v5.10 2020/02/03
 
   comprehensive support for typesetting chemistry documents
 
@@ -28,8 +28,9 @@ The chemmacros package consists of the following files
     chemmacros4.sty
     chemmacros5.sty,
  == DOCUMENTATION FILES ==
-    chemmacros_en.tex
-    chemmacros_en.pdf,
+    chemmacros-manual.tex
+    chemmacros-manual.pdf
+    chemmacros-manual.cls
     README
     chemmacros.history
  == MODULE CODE FILES ==
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros-manual.pdf
index 56198337573..02badca2566 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros-manual.pdf
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros-manual.tex
index 9bf20e87898..991742a7105 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros-manual.tex
@@ -30,133 +30,8 @@
 %
 % The Current Maintainer of this work is Clemens Niederberger.
 % --------------------------------------------------------------------------
-\documentclass[load-preamble+]{cnltx-doc}
-\usepackage[utf8]{inputenc}
-\usepackage[compatibility=newest]{chemmacros}
-\setcnltx{
-  package  = {chemmacros},
-  info     = {comprehensive support for typesetting chemistry documents},
-  url      = https://github.com/cgnieder/chemmacros ,
-  authors  = Clemens Niederberger ,
-  email    = contact@mychemistry.eu ,
-  abstract = {%
-    \centering
-    \includegraphics{chemmacros-logo.pdf}
-    \par
-  } ,
-  quote-format = \small\biolinumLF ,
-  add-cmds = {
-     abinitio, activatechemgreekmapping, AddRxnDesc, anti, aq, aqi,
-     ba, bond, bridge,
-    cd, ch, changechemgreeksymbol, charrow, chcpd, chemabove, chemalpha,
-      chembeta, ChemCleverefSupport, chemdelta, chemDelta,
-      ChemFancyrefSupport, chemformula@bondlength, chemgamma, ChemModule,
-      chemomega, chemphi, chemPhi, chemsetup, chlewis, chname , cip, cis, ch,
-      CNMR,
-    data, DeclareChemArrow, DeclareChemBond, DeclareChemBondAlias,
-      DeclareChemCharge, DeclareChemEqConstant, declarechemgreekmapping,
-      DeclareChemIUPAC, DeclareChemIUPACShorthand, DeclareChemLatin,
-      DeclareChemNMR, DeclareChemNucleophile, DeclareChemPartialCharge,
-      DeclareChemParticle, DeclareChemPhase, DeclareChemReaction,
-      DeclareChemState,
-      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,
-    hapto, HNMR, Helmholtz, hydrogen,
-    IfChemCompatibilityF, IfChemCompatibilityT, IfChemCompatibilityTF, insitu,
-      invacuo, isotope, iupac,
-    Ka, Kb, Kw,
-    laevus, Lfi, listofreactions, lqd,
-    makepolymerdelims, mch, mega, meta, mhName,
-    NewChemArrow, NewChemBond, NewChemBondAlias,
-      NewChemCharge, NewChemEqConstant, newchemgreekmapping, NewChemIUPAC,
-      NewChemIUPACShorthand, NewChemLatin, NewChemMacroset, NewChemNMR,
-      NewChemNucleophile, NewChemPartialCharge, NewChemParticle, NewChemPhase,
-      NewChemReaction, NewChemState,
-      newman, nitrogen, NMR, Nu, Nuc,
-    orbital, ortho, ox, OX, oxygen,
-    para, pch, per, pH, phase, phosphorus, photon, pKa, pKb, pOH, pos,
-      positron, Pot, ProvideChemArrow, ProvideChemBond, ProvideChemCharge,
-      ProvideChemEqConstant, ProvideChemIUPAC, ProvideChemIUPACShorthand,
-      ProvideChemLatin, ProvideChemNMR, ProvideChemNucleophile,
-      ProvideChemPartialCharge, ProvideChemParticle, ProvideChemPhase,
-      ProvideChemReaction,
-      ProvideChemState, prt,
-    Rad, redox, RemoveChemIUPACShorthand, RenewChemArrow, RenewChemBond,
-      RenewChemCharge, RenewChemEqConstant, renewchemgreekmapping,
-      RenewChemIUPAC, RenewChemIUPACShorthand, RenewChemLatin, RenewChemNMR,
-      RenewChemNucleophile, RenewChemPartialCharge, RenewChemParticle,
-      RenewChemPhase, RenewChemState,
-    Sf, scrm, scrp, second, selectchemgreekmapping, setchemformula,
-      ShowChemArrow, ShowChemBond, sld, Sod, state, sulfur,
-    trans,
-    usechemmodule,
-    val,
-    zusammen
-  } ,
-  add-silent-cmds = {
-    addplot,
-    bottomrule,
-    cancel, cdot, ce, cee, celsius, centering, chemfig, chemname, clap,
-      cnsetup, code, color, cstack, cstsetup,
-    DeclareInstance, DeclareSIUnit, definecolor, draw,
-    electronvolt, endtikzpicture,
-    footnotesize,
-    glqq, grqq,
-    hertz, hspace,
-    includegraphics, intertext, IUPAC,
-    joule,
-    kelvin, kilo,
-    latin, lc, lewis, Lewis, liquid, ltn,
-    metre, midrule, milli, mmHg, mole,
-    nano, nicefrac, num, numrange,
-    ominus, oplus,
-    percent, pgfarrowsdeclarealias, pgfarrowsrenewalias,
-    renewtagform, rightarrow,
-    sample, scriptscriptstyle, setchemfig, sfrac, shade,
-      shadedraw, shorthandoff, si, SI, sisetup, square, subsection,
-    textcolor, textendash, textsuperscript, tikz, tikzpicture, tiny, toprule,
-    upbeta, upeta, upgamma, usetikzlibrary,
-    volt, vphantom, vspave,
-    xspace,
-    z@, z@skip
-  } ,
-  index-setup = { othercode = \footnotesize , level = \section } ,
-  makeindex-setup = { columns = 2 , columnsep = 1em }
-}
-
-\usepackage{booktabs,array,longtable}
-
-\usepackage{chemfig,cancel,varioref,csquotes}
-
-\usepackage[
-  a4paper,
-  top    = .1\paperheight,
-  bottom = .1\paperheight,
-  left   = .2\paperwidth,
-  right  = .1\paperwidth
-]{geometry}
+\documentclass{chemmacros-manual}
 
-
-\makeatletter
-\def\libertine@figurestyle{LF}
-\usepackage{amsmath}
-\undef\lvert \undef\lVert
-\undef\rvert \undef\rVert
-\usepackage[libertine]{newtxmath}
-\def\libertine@figurestyle{OsF}
-\makeatother
-
-\usepackage[biblatex]{embrac}
-\ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
-\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
-
-\usepackage[accsupp]{acro}
-\acsetup{
-  long-format  = \scshape ,
-  short-format = \scshape
-}
 \DeclareAcronym{ghs}{
   short     = ghs ,
   long      = Globally Harmonized System of Classification and Labelling of
@@ -208,19 +83,17 @@
   chemformula/format = \libertineLF
 }
 
-\usepackage{siunitx}
-
 \sisetup{
   detect-mode=false,
   mode=text,
   text-rm=\libertineLF
 }
 
-\usepackage{filecontents}
-
 \defbibheading{bibliography}{\section{References}}
 \addbibresource{\jobname.bib}
-\begin{filecontents*}{\jobname.bib}
+\addbibresource{cnltx.bib}
+
+\begin{filecontents*}[overwrite]{\jobname.bib}
 @book{iupac:greenbook,
   author    = {E. Richard Cohan and Tomislav Cvita\v{s} and Jeremy G. Frey and
     Bertil Holmstr\"om and Kozo Kuchitsu and Roberto Marquardt and Ian Mills and
@@ -1647,8 +1520,6 @@ modules. In the macro descriptions below \TF\ denotes that a \code{T}, an
   \marg{true} \marg{false}]
     Checks if class \meta{name} has been loaded. Also works after begin
     document.
-  \explcommand{chemmacros_leave_vmode:}
-    Equivalent of \cs*{leavevmode}.
   \explcommand{chemmacros_nobreak:}
     Inserts a penalty of \num{10000}.
   \explcommand{chemmacros_allow_break:}
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history b/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history
index fc78d0e1202..694c1039cee 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros.history
@@ -386,3 +386,7 @@ Version history
                           - define latin phrases on the go instead of at begin
                             document
 2020/01/16 - version 5.9a - adapt to renaming of string case changing functions
+2020/02/03 - version 5.10 - define \torr as well as \Torr (units)
+                          - prefer lazy boolean evaluation
+                          - prefer the kernel commands to
+                            \chemmacros_leave_vmode: and \chemmacros_tex_if: