chemmacros (24apr17)

git-svn-id: svn://tug.org/texlive/trunk@44023 c570f23f-e606-0410-a88d-b1316a301751

28 files changed, 200 insertions, 429 deletions

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 61a4a3fb93d..4ba72d344ae 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -66,7 +66,7 @@
     \tl_set:cn
       {l__chemmacros_#2_tl}
       { \chemmacros_translate:n {#2} }
-    \chemmacros_if_compatiblity:nnTF {>} {5.6}
+    \chemmacros_if_compatibility:nnTF {>} {5.6}
       { \chemmacros_declare_translation:nnn {#2} {fallback} {#3} }
       { \DeclareTranslationFallback {#2} {#3} }
     \cs_set_protected:Npn #1
@@ -90,7 +90,7 @@
 \NewChemEqConstant \Kb {K-base}  { \mathrm{b} }
 \NewChemEqConstant \Kw {K-water} { \mathrm{w} }
 
-\chemmacros_if_compatiblity:nnT {>=} {5.4}
+\chemmacros_if_compatibility:nnT {>=} {5.4}
   {
     \chemmacros_define_keys:nn {acid-base}
       { eq-constant .tl_set:N = \l__chemmacros_equilibrium_constant_tl }
@@ -152,8 +152,8 @@
 \ChemCompatibilityFrom{5.6}
 \chemmacros_declare_translations:nn {K-acid}
   {
-    German   = \mathrm {s} ,
-    Dutch    = \mathrm {z}
+    German = \mathrm {s} ,
+    Dutch  = \mathrm {z}
   }
 \EndChemCompatibility
 % --------------------------------------------------------------------------
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 89bec822113..599b6598194 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 a1406a3b5cf..1401c075785 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -360,7 +360,7 @@
 \bool_new:N \l__chemmacros_in_document_bool
 \bool_new:N \l__chemmacros_chemstyle_bool
 
-\chemmacros_if_compatiblity:nnTF {>=} {5.2}
+\chemmacros_if_compatibility:nnTF {>=} {5.2}
   { \AfterEndPreamble }
   { \AtBeginDocument }
   { \bool_set_true:N \l__chemmacros_in_document_bool }
@@ -458,7 +458,7 @@
 
 % --------------------------------------------------------------------------
 
-\chemmacros_if_compatiblity:nnT {>=} {5.2}
+\chemmacros_if_compatibility:nnT {>=} {5.2}
   { \chemmacros_load_module:n {errorcheck} }
 
 % --------------------------------------------------------------------------
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 48bbf1d3a91..3429727aa23 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 21133f4caa2..a1d3ac24048 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -213,15 +213,15 @@
       {
         !\l__chemmacros_formula_method_set_bool
         &&
-        \chemmacros_if_compatiblity_p:nn {>=} {5.2}
+        \chemmacros_if_compatibility_p:nn {>=} {5.2}
         &&
-        \chemmacros_if_compatiblity_p:nn {<} {5.6}
+        \chemmacros_if_compatibility_p:nn {<} {5.6}
       }
       { \chemmacros_check_formula_method: }
       {
         \bool_if:NF \l__chemmacros_formula_method_set_bool
           {
-            \chemmacros_if_compatiblity:nnTF {>=} {5.6}
+            \chemmacros_if_compatibility:nnTF {>=} {5.6}
               { \msg_info:nn {chemmacros} {default-formula-method} }
               { \msg_warning:nn {chemmacros} {default-formula-method} }
             \chemmacros_set_formula_method:n {chemformula}
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 3322c739339..d7c70b5e9c8 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -25,44 +25,42 @@
 %
 % The Current Maintainer of this work is Clemens Niederberger.
 % --------------------------------------------------------------------------
-\ChemModule{errorcheck}{2016/05/31 error checking for unloaded modules}[5.2]
+\ChemModule{errorcheck}{2016/10/05 error checking for unloaded modules}[5.2]
 
 \RequirePackage{scrlfile}
 
 \msg_new:nnn {chemmacros} {undefined}
-  { The~ #1~ `#2'~ is~ undefined.~ You~ need~ to~ load~ the~ `#3'~ module. }
+  {
+    The~ #1~ `#2'~ is~ undefined.~ You~ need~ to~ load~ the~
+    `#3'~ module.
+  }
 
 \cs_generate_variant:Nn \msg_error:nnnnn {nnnx}
 
-\cs_new_protected:Npn \chemmacros_command_requires_module:Nn #1#2
+\cs_new_protected:Npn \chemmacros_requires_module:nNn #1#2#3
   {
-    \chemmacros_if_module_loaded:nF {#2}
+    \chemmacros_if_module_loaded:nF {#3}
       {
-        \cs_set:Npn #1
+        \cs_if_free:NT #2
           {
-            \msg_error:nnnxn {chemmacros} {undefined}
-              {command}
-              { \token_to_str:N #1 }
-              {#2}
+            \cs_set:Npn #2
+              {
+                \msg_error:nnnxn {chemmacros} {undefined}
+                  {#1}
+                  {\token_to_str:N #2}
+                  {#3}
+              }
+            \chemmacros_before_module:nn {#3} { \cs_undefine:N #2 }
           }
       }
-    \chemmacros_before_module:nn {#2} { \cs_undefine:N #1 }
   }
+\cs_generate_variant:Nn \chemmacros_requires_module:nNn {nc}
+
+\cs_new_protected:Npn \chemmacros_command_requires_module:Nn #1#2
+  { \chemmacros_requires_module:nNn {command} #1 {#2} }
 
 \cs_new_protected:Npn \chemmacros_environment_requires_module:nn #1#2
-  {
-    \chemmacros_if_module_loaded:nF {#2}
-      {
-        \cs_set:cpn {#1}
-          {
-            \msg_error:nnnnn {chemmacros} {undefined}
-              {environment}
-              {#1}
-              {#2}
-          }
-      }
-    \chemmacros_before_module:nn {#2} { \cs_undefine:c {#1} }
-  }
+  { \chemmacros_requires_module:ncn {environment} {#1} {#2} }
 
 % --------------------------------------------------------------------------
 % add checking for the most common user commands and environments:
@@ -129,3 +127,4 @@
 2015/10/14 - first version
 2016/03/08 - add `polymers' module
 2016/05/31 - enable `chemscheme' to be loaded after chemmacros
+2016/10/06 - check if commands exist before defining them to raise errors
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 44143552ef9..a9f96d7485a 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 fdb8a62b5ee..0931c1579f4 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 b6eb32d2383..a087398981e 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -48,7 +48,7 @@
 \tl_new:N  \l__chemmacros_current_language_tl
 
 \tl_const:Nx \c__chemmacros_keyword_prefix_tl
-  { \chemmacros_if_compatiblity:nnT {>} {5.6} {chem-keyword-} }
+  { \chemmacros_if_compatibility:nnT {>} {5.6} {chem-keyword-} }
 
 \prop_new:N \g_chemmacros_translations_prop
 
@@ -121,10 +121,9 @@
 % #3: translation
 \cs_new_protected:Npn \chemmacros_declare_translation:nnn #1#2#3
   {
-    % TODO: this should be \declaretranslation
-    \@trnslt@declare@translation
-      { \c__chemmacros_keyword_prefix_tl #1 }
+    \declaretranslation
       {#2}
+      { \c__chemmacros_keyword_prefix_tl #1 }
       {#3}
     \prop_gput:Nnn \g_chemmacros_translations_prop {#1(#2)} {#3}
   }
@@ -149,14 +148,14 @@
 
 \cs_new:Npn \__chemmacros_parse_translate_list_entry:nnn #1#2#3 {}
 
-\cs_new_protected:Npn \__chemacros_parse_translate_list_entry:www #1(#2)\q_mark#3\q_stop
+\cs_new_protected:Npn \__chemmacros_parse_translate_list_entry:www #1(#2)\q_mark#3\q_stop
   { \__chemmacros_parse_translate_list_entry:nnn {#1} {#2} {#3} }
 
 \cs_new_protected:Npn \chemmacros_for_all_translations_do:n #1
   {
     \cs_set:Npn \__chemmacros_parse_translate_list_entry:nnn ##1##2##3 {#1}
     \prop_map_inline:Nn \g_chemmacros_translations_prop
-      { \__chemacros_parse_translate_list_entry:www ##1 \q_mark ##2 \q_stop }
+      { \__chemmacros_parse_translate_list_entry:www ##1 \q_mark ##2 \q_stop }
   }
 
 \ChemCompatibilityFrom{5.7}
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 83460feb761..662d93fbb3a 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 53828dcf71a..79d5c16ff13 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 5c409af08ca..037f863190b 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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{nomenclature}{2016/06/07 chemical names}
+\ChemModule{nomenclature}{2017/07/10 chemical names}
 
 \RequirePackage{scrlfile}
 
@@ -250,7 +250,7 @@
   { \chemmacros_cip:n {#1} }
 \EndChemCompatibility
 
-\ChemCompatibilityFrom{5.2}
+\ChemCompatibilityBetween{5.2}{5.7}
 \cs_new_protected:Npn \chemmacros_cip:n #1
   {
     \int_zero:N \l__chemmacros_tmpa_int
@@ -270,6 +270,54 @@
 \DeclareChemIUPAC \cip { \chemmacros_cip:n }
 \EndChemCompatibility
 
+\ChemCompatibilityFrom{5.8}
+\tl_new:N \l__chemmacros_cip_inner_tl
+\tl_new:N \l__chemmacros_cip_outer_tl
+\tl_new:N \l__chemmacros_cip_number_tl
+
+\chemmacros_define_keys:nn {nomenclature}
+  {
+    cip-inner-format  .tl_set:N  = \l__chemmacros_cip_inner_tl ,
+    cip-inner-format  .initial:n = \itshape ,
+    cip-outer-format  .tl_set:N  = \l__chemmacros_cip_outer_tl ,
+    cip-outer-format  .initial:n = \upshape ,
+    cip-number-format .tl_set:N  = \l__chemmacros_cip_number_tl ,
+    cip-number-format .initial:n = \itshape
+  }
+  
+\cs_new_protected:Npn \__chemmacros_cip:n #1
+  {
+    \tl_set:Nn \l__chemmacros_tmpa_tl {#1}
+    \int_step_inline:nnnn {0} {1} {9}
+      {
+        \tl_replace_all:Nnn \l__chemmacros_tmpa_tl
+          {##1}
+          { { \l__chemmacros_cip_number_tl ##1} }
+      }
+    { \l__chemmacros_cip_inner_tl \l__chemmacros_tmpa_tl }
+  }
+
+\cs_new_protected:Npn \chemmacros_cip:n #1
+  {
+    \int_zero:N \l__chemmacros_tmpa_int
+    \group_begin:
+      \l__chemmacros_cip_outer_tl (
+      \clist_map_inline:nn
+        {#1}
+        {
+          \int_incr:N \l__chemmacros_tmpa_int
+          \__chemmacros_cip:n {##1}
+          \int_compare:nT
+            { \l__chemmacros_tmpa_int < \clist_count:n {#1} }
+            { , }
+        }
+      )
+    \group_end:
+    \tex_kern:D \l__chemmacros_cip_kern_dim
+  }
+\DeclareChemIUPAC \cip { \chemmacros_cip:n }
+\EndChemCompatibility
+
 % remember: TikZ needs : to be other
 \cs_new_protected:Npn \chemmacros_sconf:n #1
   {
@@ -337,7 +385,11 @@
   {
     \chemmacros_coordination_symbol:nnnn
       { \l__chemmacros_coord_use_hyphen_bool }
-      { \c_false_bool }
+      {
+        \chemmacros_if_compatibility:nnTF {>} {5.7}
+          { \c_true_bool }
+          { \c_false_bool }
+      }
       { \chemeta }
       {#1}
   }
@@ -346,7 +398,11 @@
   {
     \chemmacros_coordination_symbol:nnnn
       { \l__chemmacros_coord_use_hyphen_bool }
-      { \c_false_bool }
+      {
+        \chemmacros_if_compatibility:nnTF {>} {5.7}
+          { \c_true_bool }
+          { \c_false_bool }
+      }
       { \chemkappa }
       {#1}
   }
@@ -370,7 +426,9 @@
 \cs_new_protected:Npn \chemmacros_allow_hyphens:
   {
     \chemmacros_nobreak:
-    \skip_horizontal:N \c_zero_dim
+    \chemmacros_if_compatibility:nnTF {<=} {5.7}
+      { \skip_horizontal:N \c_zero_dim }
+      { \skip_horizontal:N \c_zero_skip }
   }
 
 % #1: pre break
@@ -486,7 +544,7 @@
 \prop_new:N \l__chemmacros_iupac_shorthands_prop
 
 % #1: token
-% #2: arg spec
+% #2: definition
 \cs_new_protected:Npn \chemmacros_define_iupac_shorthand:NN #1#2
   {
     \seq_if_in:NnF \l__chemmacros_iupac_shorthands_seq {#1}
@@ -584,7 +642,7 @@
       \chemmacros_make_shorthands:
       % what's this vvv in here for?
       \chemmacros_ignore_spaces:
-      \chemmacros_if_compatiblity:nnT {<=} {5.2}
+      \chemmacros_if_compatibility:nnT {<=} {5.2}
         { \chemmacros_define_deprecated:NN \- - }
       \tl_set_rescan:Nnn \l__chemmacros_tmpa_tl
         { \chemmacros_activate_all_iupac_shorthands: }
@@ -825,3 +883,6 @@
              argument for setting options
 2016/06/07 - rename functions which erroneously were assigned to the
              `chemformula' module
+2017/04/17 - fix erroneous definition of \chemmacros_allow_hyphens:
+           - new options `cip-inner-format', `cip-outer-format' and
+             `cip-number-format'
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 2a3c751e426..d3f3a5a16f2 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 fc07911ccc7..82473a53325 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -91,7 +91,7 @@
         \bool_if:NTF \l__chemmacros_nucleophile_elpair_bool
           {
             \chemmacros_elpair:n { #2 }
-            \chemmacros_if_compatiblity:nnT {>=} {5.3}
+            \chemmacros_if_compatibility:nnT {>=} {5.3}
               { \skip_horizontal:N \l__chemmacros_nucleophile_dim }
             \chemmacros_chemformula:n { {}^{-} }
           }
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 2ab75a98e14..2a5069f5bbb 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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.polymers.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.polymers.code.tex
index 6b03453ff25..8c93ff002cc 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.polymers.code.tex
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.polymers.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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 b325a046787..7dde472d7a6 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -117,7 +117,7 @@
 
 \cs_if_exist:NTF \chapter
   {
-    \chemmacros_if_compatiblity:nnTF {>=} {5.2}
+    \chemmacros_if_compatibility:nnTF {>=} {5.2}
       {
         \chemmacros_set_keys:nn {reactions}
           { list-heading-cmd = \chapter* {#1} }
@@ -125,7 +125,7 @@
       { \cs_set_protected:Npn \__chemmacros_reaction_heading:n { \chapter* } }
   }
   {
-    \chemmacros_if_compatiblity:nnTF {>=} {5.2}
+    \chemmacros_if_compatibility:nnTF {>=} {5.2}
       {
         \chemmacros_set_keys:nn {reactions}
           { list-heading-cmd = \section* {#1} }
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 2efabd57922..8d9918e498a 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 c0700c7091c..8a3ed06c620 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -80,7 +80,7 @@
         \counterwithin {#1} {chapter}
         \setcounter {#1} {0}
       }
-    \chemmacros_tex_if:nT {artopt}
+    \chemmacros_tex_if:nnT {artopt} {}
       { \counterwithout {#1} {chapter} }
   }
 
@@ -217,7 +217,7 @@
               {
                 \cs_new_protected:cpn {listof#1s}
                   {
-                    \chemmacros_tex_if:nTF {@twocolumn}
+                    \chemmacros_tex_if:nnTF {@twocolumn} {}
                       { \@restonecoltrue\onecolumn }
                       { \@restonecolfalse }
                     \exp_args:NNx \chapter* {\exp_not:c {list#1name}}
@@ -225,7 +225,7 @@
                       { \MakeUppercase \use:c {list#1name} }
                       { \MakeUppercase \use:c {list#1name} }
                     \@starttoc {#2}
-                    \chemmacros_tex_if:nT {@restonecol}
+                    \chemmacros_tex_if:nnT {@restonecol} {}
                       { \twocolumn }
                   }
               }
@@ -307,3 +307,4 @@
 2015/10/23 - add info message to float method detection
 2016/01/23 - make the module compatible with chemscheme
 2016/04/25 - cleveref and fancyref support
+2016/12/28 - bug fix: typo in \chemmacros_tex_if:nnTF usage
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 2c543a8e494..8ba4c066cc6 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -120,6 +120,7 @@
     \tl_set:Nn \l__chemmacros_nmr_element_default_tl {#2}
   }
 
+\ChemCompatibilityTo{5.7}
 \cs_new_protected:Npn \__chemmacros_nmr_base:nn #1#2
   {
     \tl_if_blank:VF \g__chemmacros_nmr_element_coupled_tl
@@ -135,6 +136,36 @@
     \tl_use:N \l__chemmacros_nmr_element_method_connector_tl
     \tl_use:N \l__chemmacros_nmr_method_tl
   }
+\EndChemCompatibility
+\ChemCompatibilityFrom{5.8}
+\tl_new:N \l__chemmacros_nmr_base_format_tl
+
+\chemmacros_define_keys:nn {spectroscopy}
+  { nmr-base-format .tl_set:N = \l__chemmacros_nmr_base_format_tl }
+
+\cs_new_protected:Npn \__chemmacros_nmr_base:nn #1#2
+  {
+    \group_begin:
+      \tl_use:N \l__chemmacros_nmr_base_format_tl
+      \tl_if_blank:VF \g__chemmacros_nmr_element_coupled_tl
+        {
+          \tl_put_left:Nn \g__chemmacros_nmr_element_coupled_tl { \{ }
+          \tl_put_right:Nn \g__chemmacros_nmr_element_coupled_tl { \} }
+        }
+      \tl_put_left:Nn \g__chemmacros_nmr_element_coupled_tl {#2}
+      \chemmacros_chemformula:n { ^{#1} }
+      \tl_if_blank:VF \g__chemmacros_nmr_element_coupled_tl
+        {
+          \bool_if:NTF \l__chemmacros_nmr_parse_bool
+            { \chemformula_ch:nV {} \g__chemmacros_nmr_element_coupled_tl }
+            { \chemmacros_chemformula:V \g__chemmacros_nmr_element_coupled_tl }
+        }
+      \tl_use:N \l__chemmacros_nmr_element_method_connector_tl
+      \tl_use:N \l__chemmacros_nmr_method_tl
+    \group_end:
+  }
+\EndChemCompatibility
+
 \cs_generate_variant:Nn \__chemmacros_nmr_base:nn { VV }
 
 \cs_new_protected:Npn \__chemmacros_nmr_frequency:n #1
@@ -191,7 +222,7 @@
       \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}
+    \chemmacros_if_compatibility: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 ,
@@ -209,11 +240,11 @@
   {
     \cs_if_exist:NTF #1
       {
-        \RenewDocumentCommand #1 { s }
+        \RenewDocumentCommand #1 {s}
           { \IfBooleanTF {##1} { \NMR*{#2} } { \NMR{#2} } }
       }
       {
-        \NewDocumentCommand #1 { s }
+        \NewDocumentCommand #1 {s}
           { \IfBooleanTF {##1} { \NMR*{#2} } { \NMR{#2} } }
       }
   }
@@ -476,3 +507,4 @@
 % --------------------------------------------------------------------------
 \tex_endinput:D
 2015/12/31 - new option `atom-number-space'
+2017/01/27 - new option `nmr-base-format'
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 73ec35e1dfc..dfbc812d6ff 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 0838397b169..3d97ecbb6cb 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 934c069d9f3..2e8dfd243cd 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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.units.code.tex b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.module.units.code.tex
index d91de5754b8..ce7142e3dd4 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 d577e0e9761..6ad2fd7771a 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-2016 Clemens Niederberger
+% Copyright 2011-2017 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 4e85031c2c2..a2a94addd3e 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-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -31,14 +31,20 @@
 
 % --------------------------------------------------------------------------
 % package information:
-\tl_const:Nn \c_chemmacros_date_tl {2016/06/08}
+\tl_const:Nn \c_chemmacros_date_tl {2017/04/24}
 \tl_const:Nn \c_chemmacros_version_major_number_tl {5}
-\tl_const:Nn \c_chemmacros_version_minor_number_tl {7}
-\tl_const:Nn \c_chemmacros_version_subrelease_tl   {a}
+\tl_const:Nn \c_chemmacros_version_minor_number_tl {8}
+\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}
+  {
+    \c_chemmacros_version_major_number_tl .
+    \c_chemmacros_version_minor_number_tl
+  }
 \tl_const:Nx \c_chemmacros_version_tl
-  { \c_chemmacros_version_number_tl \c_chemmacros_version_subrelease_tl }
+  {
+    \c_chemmacros_version_number_tl
+    \c_chemmacros_version_subrelease_tl
+  }
 \tl_const:Nn \c_chemmacros_info_tl
   {comprehensive~ support~ for~ typesetting~ chemistry~ documents}
 
@@ -111,7 +117,7 @@
 % #2: number
 % #3: true
 % #4: false
-\prg_new_conditional:Npnn \chemmacros_if_compatiblity:nn #1#2 {p,T,F,TF}
+\prg_new_conditional:Npnn \chemmacros_if_compatibility:nn #1#2 {p,T,F,TF}
   {
     \chemmacros_if_version:nnnTF
       { \fp_to_decimal:N \l__chemmacros_compatibility_version_fp }
@@ -120,35 +126,35 @@
       { \prg_return_true: }
       { \prg_return_false: }
   }
-\cs_generate_variant:Nn \chemmacros_if_compatiblity:nnT {nV}
+\cs_generate_variant:Nn \chemmacros_if_compatibility:nnT {nV}
 
 % user checks:
 \NewDocumentCommand \IfChemCompatibilityTF {mm+m+m}
-  { \chemmacros_if_compatiblity:nnTF {#1} {#2} {#3} {#4} }
+  { \chemmacros_if_compatibility:nnTF {#1} {#2} {#3} {#4} }
 
 \NewDocumentCommand \IfChemCompatibilityT {mm+m}
-  { \chemmacros_if_compatiblity:nnT {#1} {#2} {#3} }
+  { \chemmacros_if_compatibility:nnT {#1} {#2} {#3} }
 
 \NewDocumentCommand \IfChemCompatibilityF {mm+m}
-  { \chemmacros_if_compatiblity:nnF {#1} {#2} {#3} }
+  { \chemmacros_if_compatibility:nnF {#1} {#2} {#3} }
 
 % --------------------------------------------------------------------------
 % compatibility coding:
 \cs_new_protected:Npn \ChemCompatibility #1#2 \EndChemCompatibility
-  { \chemmacros_if_compatiblity:nnT {=} {#1} {#2} }
+  { \chemmacros_if_compatibility:nnT {=} {#1} {#2} }
   
 \cs_new_protected:Npn \ChemCompatibilityFrom #1#2 \EndChemCompatibility
-  { \chemmacros_if_compatiblity:nnT {>=} {#1} {#2} }
+  { \chemmacros_if_compatibility:nnT {>=} {#1} {#2} }
 
 \cs_new_protected:Npn \ChemCompatibilityTo #1#2 \EndChemCompatibility
-  { \chemmacros_if_compatiblity:nnT {<=} {#1} {#2} }
+  { \chemmacros_if_compatibility:nnT {<=} {#1} {#2} }
 
 \cs_new_protected:Npn \ChemCompatibilityBetween #1#2#3 \EndChemCompatibility
   {
     \bool_if:nT
       {
-        \chemmacros_if_compatiblity_p:nn {>=} {#1} &&
-        \chemmacros_if_compatiblity_p:nn {<=} {#2}
+        \chemmacros_if_compatibility_p:nn {>=} {#1} &&
+        \chemmacros_if_compatibility_p:nn {<=} {#2}
       }
       {#3}
   }
@@ -177,7 +183,7 @@
 
 % --------------------------------------------------------------------------
 % let's see that the max number is the newest (=current) version
-\chemmacros_if_compatiblity:nnT {>} { \c_chemmacros_version_number_tl }
+\chemmacros_if_compatibility:nnT {>} { \c_chemmacros_version_number_tl }
   {
     \fp_set:Nn \l__chemmacros_compatibility_version_fp
       { \c_chemmacros_version_number_tl }
@@ -185,351 +191,24 @@
 
 % --------------------------------------------------------------------------
 % compatibility too low:
-\chemmacros_if_compatiblity:nnT {<} {4.7}
+\chemmacros_if_compatibility:nnT {<} {4.7}
   {
     \msg_warning:nnx {chemmacros} {too-low-compatibility}
       { \fp_to_tl:N \l__chemmacros_compatibility_version_fp }
   }
 
 % not the newest version:
-\chemmacros_if_compatiblity:nnT {<} { \c_chemmacros_version_number_tl }
+\chemmacros_if_compatibility:nnT {<} { \c_chemmacros_version_number_tl }
   {
     \msg_warning:nnx {chemmacros} {low-compatibility}
       { \fp_to_tl:N \l__chemmacros_compatibility_version_fp }
   }
   
 % --------------------------------------------------------------------------
-\chemmacros_if_compatiblity:nnTF {<} {5.0}
+\chemmacros_if_compatibility:nnTF {<} {5.0}
   { \RequirePackage{chemmacros4} }
   { \RequirePackage{chemmacros5} }
 
 % --------------------------------------------------------------------------
 \tex_endinput:D
 
-% --------------------------------------------------------------------------
-Version history
-2011/05/15 - version 1.0  - CTAN release
-2011/06/22 - version 1.1  - "LaTeXified" whole package for safer usage
-                          - less user work required (like loading package
-                            after another)
-                          - more particle macros
-                          - latin phrases
-                          - extra units
-                          - acid/base commands
-                          - \mech
-                          - \NMR
-                          - \mhName, \setmhName, \newreaction, phases
-                          - \renewstate, \setstatesubscript
-                          - improved orbitals
-                          - simpler package options, option german, bpchem
-                          - bug fixes
-2011/10/28 - version 2.0  - rewritten in expl3
-                          - customization via \chemsetup
-                          - new commands \p, \fplus, \fminus, \fpch, \fmch,
-                            \fscrp, \fsrcm, \fdelp, \fdelm, \orbital, \chemsetup
-                          - various commands have a new syntax
-                          - removed: \setmhName, \setredoxdist,
-                            \setstatesubscript, \porb, \phorb, \pxorb, \pyorb,
-                            \pzorb, \setorbheight, \solid, \liquid
-                          - reaction environments work with hyperref and
-                            varioref
-2011/11/03 - version 2.0a - minor bug fixes
-                          - new feature for \Nu
-                          - new command \ba
-2012/01/28 - version 3.0  - bundled with packages `formula' and `ghs'
-                          - new commands \Ka, \Kb, \Kw
-                          - commands can detect if font series is bold
-                          - new package option "detect-bold"
-                          - new package option "method" => choose between
-                            `mhchem' and `formula' for internal uses.
-                          - new package option "ghs" => load `ghs' or don't
-                          - new package option "synchronize"
-                          - new package option "strict"
-                          - new command \iupac
-                          - new command \listofreactions, reaction environments
-                            with optional argument
-                          - \cis, \trans, \tert without \xspace
-2012/01/30 - version 3.0a - bugfix in formula.sty
-                          - renamed formula => chemformula
-                            and ghs => ghsystem to make the names unique
-                            (following a request by Karl Berry for TeXlive)
-2012/02/03 - version 3.0b - new command \DeclareChemParticle, updated
-                            documentation
-2012/02/05 - version 3.0c - renamed pictogram files (following a request by
-                            Karl Berry for TeXlive)
-                          - new package option "Nu"
-2012/02/10 - version 3.0d - several bugfixes in chemformula
-                          - bugfixes with \DeclareChemParticle
-                          - new command \RenewChemParticle
-                          - new option phases / pos
-                          - new commands \DeclareChemPhase, \RenewChemPhase,
-                            \phase
-                          - changed default behaviour of phases
-                          - removed optional argument from \sld and \lqd
-                          - new arrow type <>
-2012/02/19 - version 3.1  - new commands \DeclareChemIUPAC and \RenewChemIUPAC
-                          - new option "option/iupac"
-                          - deprecated option: "option/EZ"
-                          - deprecated commands:
-                            \newreaction => \DeclareChemReaction
-                            \setnewstate => \DeclareChemState
-                            \renewstate  => \RenewChemState
-                            \Rcip        => \R
-                            \Scip        => \S
-                            \Dfi         => \D
-                            \Lfi         => \L
-                          - new arrow types -/>, </- and <o>
-                          - new commands \DeclareChemArrow, \RenewChemArrow and
-                            \ShowChemArrow
-2012/02/26 - version 3.1a - "operator" p rewritten to follow IUPAC
-                            recommendations
-                          - new option "acid-base/p-style"
-                          - deprecated option: "option/detect-bold"
-2012/03/03 - version 3.1b - arrow types are stored in a sequence to automate the
-                            search and replace in the right order 
-                          - new arrow type ==                                   
-                          - IUPAC compliance for stoichiometric factors
-                          - new handling of super- and subscripts to correct
-                            various flaws: clear distinction between isotope and
-                            formula
-                          - new option charge-vshift
-                          - IUPAC compliance for \Delta and \ox
-2012/03/14 - version 3.1c - compatibility with KOMA's global option
-                            "version = <value>"
-                          - bugfix in the list of reactions
-                          - improved arrow labels
-2012/03/20 - version 3.2  - new: option input via @{<options>}
-                          - improved list of reactions: resetting the "reaction"
-                            counter now doesn't cause errors any more
-                          - \AddRxnDesc added which allows to add descriptions
-                            to each reaction in the "reactions" environment
-2012/05/07 - version 3.3  - new environment `experimental' that allows some
-                            formatting for the for displaying of measurement
-                            results
-                          - more greek letters for the \iupac command
-                          - \ch now bypasses \ref{}, \label{}, and \intertext{}
-                          - small adjustments of the iupac commands \| and \-
-                          - bug fix: option `upgreek' is now working and was
-                            renamed to `greek'
-                          - proper language support
-2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements
-                          - \hapto and \bridge
-2012/05/18 - version 3.3b - compatibility with MiKTeX
-2012/05/18 - version 3.3c - fix in the `ghsystem/language' option
-2012/07/24 - version 3.3d - additional picture file type `pdf'
-                          - default bond length set to 1.1667ex
-                          - bug fix in the bonds
-                          - added kerning to cip commands, new option
-                            `iupac/cip-kern'
-                          - bug fix: messages needed to be defined before the
-                            options
-2012/08/21 - version 3.3e - new option ox/align=center|right
-                          - a new option to \NMR and to \J
-2012/09/11 - version 3.4  - cleaned a little, minor bug fixes
-                          - switched to internal scratch variables
-                          - new command \bond, more bond types
-                          - new commands \DeclareChemBond, \DeclareChemBondAlias,
-                            \RenewChemBond and \ShowChemBond
-                          - radical point thicker, new options `radical-style'
-                            and `radical-radius'
-2012/10/03 - version 3.4a - bug fix in coupling constant \J
-2013/01/04 - version 3.4b - bug fix in the sub- and superscript handling
-2013/01/28 - version 3.5  - disallow breaks at bonds
-                          - allow breaks after arrows
-                          - made some spaces in chemformulas stretch- and
-                            shrinkable
-                          - various internal code improvements
-                          - changed defaults for horizontal spaces that have in
-                            set in ex into corresponding values in em.
-                          - improvements to the placement of sub- and superscripts
-2013/02/19 - version 3.5a - bug fix: `ghsystem' recognizes language again
-2013/02/26 - version 3.6  - support for use with the `breqn' package
-                          - chemformula: math escaping also via \(\)
-                          - chemformula internal: clearer escaping macros
-                          - new options: `radical-vshift', `radical-hshift'
-                            and `radical-space'
-                          - bug fix: `radical-...' options are now correctly set
-                          - stoichiometric factors: add leading 0 if missing
-                          - new option: `stoich-paren-parse'
-                          - internal changes: be way more rigid about protected
-                            and expandable macros
-                          - internal changes: clearer distinction between
-                            private macros and accessable module macros
-                          - internal changes: clearer distinction between
-                            document commands and module level commands
-                          - chemformula's !()() syntax now also works with babel's
-                            French
-2013/02/27 - version 3.6a - bug fix: escaped text and math stays escaped, i.e.
-                            also arrow code like `<=>'
-2013/04/19 - version 3.6b - chemformula: new key `arrow-min-length'
-                          - bug fix: stoichiometric fractions correctly displayed
-                          - changed appearance of \cip to use upright parentheses
-2013/07/06 - version 4.0  - `chemformula' doesn't automatically load
-                            `chemmacros' any more but can be used stand-alone
-                          - option `bpchem' has been dropped
-                          - improved detection of bold font series
-                          - changed wrongly used \mbox in definition of \Ka,
-                            \Kb and \Kw into \ensuremath
-                          - adapt \mch and \pch to match `chemformula's
-                            charges
-                          - dropped option `method=mhchem'
-                          - support for `kpfonts' and `newtxmath' upright
-                            greek letters added, greek alphabet complete both
-                            for uppercase and lowercase; this is handled by
-                            the new package in the family: `chemgreek'
-                          - \OX and \redox now work in `amsmath's environment
-                            by ignoring the measuring phase
-                          - language management with the help of the
-                            `translations' package =>
-                            recognize document language automatically and use
-                            it if it a) is known to `chemmacros' and b) has
-                            not been overwritten by the `language' option;
-                            this also made minor changes to `ghsystem'
-                            necessary; additionally this lead to changes in
-                            the way phases are defined
-                          - status of \Dfi and \Lfi changed from `deprecated'
-                            to `dropped'
-                          - new option `charges/partial-format'
-                          - fixed wrongly written contents to the lor when
-                            used together with `hyperref'
-                          - new option `reaction/list-heading'
-                          - option `charges/append' deprecated
-2013/08/07 - version 4.0a - extra pair of braces in definition of
-                            \standardstate
-                          - added missing \exp_not:n to the definitions of
-                            \chemmacros_declare_phase:Nn and kin
-2013/08/24 - version 4.1  - changed `0' values in TikZ coordinates into `0pt'
-                            see http://tex.stackexchange.com/q/128792/5049 and
-                            http://tex.stackexchange.com/q/118467/5049 for
-                            reference
-2013/10/28 - version 4.2  - changed particles with electron pairs to use
-                            \chlewis
-                          - changed \Delta in thermodynamic state variables
-                            into \ChemDelta for IUPAC compliance and defined
-                            it as an operator
-                          - 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
-2013/11/04 - version 4.2b - new IUPAC commands: \fac/\mer
-2013/11/20 - version 4.2c - step bundle version due to changes in `chemgreek'
-2013/12/15 - version 4.2d - small changes to the translating mechansim which
-                            now seems to be more logical: `language=auto'
-                            detects the current `babel' language and
-                            `language=<lang>' overwrites to the chosen
-                            language
-                          - new options `acid-base/K-acid', `acid-base/K-base'
-                            and `acid-base/K-water'
-                          - adapt \ox to updates in `l3fp'
-2014/01/09 - version 4.2e - step bundle version due to changes in `ghsystem'
-2014/01/24 - version 4.3  - \NewChemIUPAC, \LetChemIUPAC
-                          - \NewChemParticle
-                          - \NewChemNMR
-                          - \NewChemPhase
-                          - \NewChemReaction, \RenewChemReaction
-                          - \NewChemState
-                          - added macro names with more meaningfule names to
-                            each of the one-letter name commands
-                          - changed behaviour of \DeclareChem to match
-                            \DeclareRobustCommand, i.e., no check if command
-                            is defined; added a \NewChem variant to each that
-                            /does/ check; use \NewChem instead of \DeclareChem
-                            for definitions
-                          - new iupac command \dento
-                          - new option choice `nmr/pos=super'
-                          - bug fix in appearance of coupling nuclei
-                          - new possibilities for formatting the output of the
-                            NMR coupling constants output with \J:
-                            `coupling-pos=side/sub', `coupling-nuclei-pre',
-                            coupling-nuclei-post', `coupling-bonds-pre',
-                            coupling-bonds-post', `coupling-symbol'
-                          - internal changes to the greek letter mapping
-                            selection mechanism
-                          - deprecate package option `strict'
-                          - deprecate package option `cmversion': also all
-                            backwards compatibility for version 1 has been
-                            dropped
-                          - drop command \mhName
-2014/01/29 - version 4.4  - bug fix in the display of the coupling constant
-                          - bug fix in phase definitions (need to adapt to
-                            changes in `translations'
-                          - new option `nmr/atom-number-cs'
-                          - 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
-2014/08/08 - version 4.6  - from bundle to packages: packages `chemformula',
-                            `ghsystem' and `chemgreek' no longer belong to the
-                            bundle but now are packages of their own.
-2015/02/08 - version 4.7  - fix \iupac so active letters like | still work
-                            inside other macros (\section, ...)
-                          - Change the default subscripts of the equilibrium
-                            constants to match the usage in the IUPAC Green
-                            Book
-                          - allow \NewChemPhase and friends after \begin{document}
-                          - new optional argument to phase commands
-                          - new options `nmr/method' and `nmr/connector'
-2015/09/11 - version 5.0  - the former chemmacros.sty is now chemmacros4.sty
-                            and can be loaded through the `compatibility'
-                            option
-                          - chemmacros is now organized in separate modules
-                            which either are preloaded or can be loaded by the
-                            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
-2015/09/23 - version 5.1  - add option `method' to `chemformula' module
-                          - make module `scheme' compatible with `floatrow'
-                          - add module hooks `before' and `after'
-2015/10/14 - version 5.2  - warn if compatibility version requested is higher
-                            than the current version number
-                          - enable to specify a minimal compatibility version
-                            for a module
-                          - add info message to `all' module
-                          - add values `newest' and `latest' to the
-                            compatibility option
-                          - check for mhchem and chemformula and choose the
-                            formula method accordingly
-                          - 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)
-2016/01/23 - version 5.3a - compatibility with chemscheme package (scheme)
-                          - 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
-                            (reactions)
-                          - fixed erroneous definition of \NewChemMacroset
-                            (base)
-                          - new option `explicit-zero-sign' (redox)
-2016/03/08 - version 5.5  - new module `polymers'
-2016/05/02 - version 5.6  - generalization of the formula method concept, new
-                            methods `chemist' and `chemfig' (chemformula)
-                          - use `tocbasic' for the list of reactions if
-                            available (reactions)
-                          - fix reaction environments to obey \thereaction
-                            (reactions)
-                          - add cleveref and fancyref support (reactions)
-                          - add cleveref and fancyref support (scheme)
-                          - \DeclareChemTranslation and
-                            \DeclareChemTranslations 
-                          - moved translations from lang module to the
-                            corresponding modules they belong to
-2016/05/04 - version 5.6a - fix small but annoying bugs (base and chemformula)
-2016/06/07 - version 5.7  - \iupac gets an optional argument for setting
-                            options (nomenclature)
-                          - \latin always defined by chemmacros (nomenclature)
-                          - fix conflict with `achemso' (nomenclature)
-                          - allow `chemscheme'/`chemstyle' to be loaded after
-                            chemmacros (errorcheck)
-                          - translation keys get internal prefix (translations)
-2016/06/08 - version 5.7a - rename functions which erroneously were assigned
-                            to the `chemformula' module
-                          - correct wrong dates in module files
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros4.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros4.sty
index d1316031749..c47106a14b9 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros4.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros4.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-2017 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/chemmacros5.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty
index 683c1344fdb..6c267fe42c1 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros5.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-2017 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -228,7 +228,7 @@
 % --------------------------------------------------------------------------
 \cs_new_protected:Npn \__chemmacros_module:nnnn #1#2#3#4
   {
-    \chemmacros_if_compatiblity:nnF {>=} {#4}
+    \chemmacros_if_compatibility:nnF {>=} {#4}
       {
         \msg_warning:nnnn {chemmacros} {module-not-available} {#2} {#4}
         \tex_endinput:D