chemmacros (20nov13)

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

7 files changed, 45 insertions, 37 deletions

diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README
index 02e95dbc1d9..10888343fe7 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/README
+++ b/Master/texmf-dist/doc/latex/chemmacros/README
@@ -1,12 +1,11 @@
 --------------------------------------------------------------------------
-the CHEMMACROS bundle
--> chemmacros package v4.2b  -> macros and commands for chemists
--> chemformula package v4.2a -> typeset chemical compounds and reactions
--> ghsystem package v4.0     -> typeset H & P statements and pictograms
+the CHEMMACROS bundle 2013/11/20
+ - chemmacros package v4.2c  -> macros and commands for chemists
+ - chemformula package v4.2a -> typeset chemical compounds and reactions
+ - ghsystem package v4.0     -> typeset H & P statements and pictograms
                                 from the globally harmonised system (GHS)
--> chemgreek package v0.2    -> handle mapping of upright greek letters to
+ - chemgreek package v0.2a   -> handle mapping of upright greek letters to
                                 the \chemalpha ... commands
-2013/11/04
 --------------------------------------------------------------------------
 This bundle succeeds the chemmacros package which is now part of the
 bundle
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf
index 1aff4138e8f..f747027f451 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf
index e18727edff3..a3e19f1abe2 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
index 3a355ba5db4..ff0a00ba78e 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/ghsystem_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf
index 8054cd8eab3..36799e44576 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemgreek.sty b/Master/texmf-dist/tex/latex/chemmacros/chemgreek.sty
index 9bb67b76e9f..fda3886a67f 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemgreek.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemgreek.sty
@@ -26,8 +26,8 @@
 % - The Current Maintainer of this work is Clemens Niederberger.
 % ----------------------------------------------------------------------------
 \RequirePackage{expl3,xparse}
-\def\chemgreek@version{0.2}
-\def\chemgreek@date{2013/08/24}
+\def\chemgreek@version{0.2a}
+\def\chemgreek@date{2013/11/20}
 
 \ProvidesExplPackage{chemgreek}{\chemgreek@date}{\chemgreek@version}
   {interface for upright greek letters for use in chemistry (CN)}
@@ -131,7 +131,7 @@
 \cs_new_protected:Npn \chemgreek_new_mapping:nn #1#2
   {
     \chemgreek_if_mapping_exists:nTF { #1 }
-      { \msg_error:nn { chemgreek } { mapping-defined } }
+      { \msg_error:nnn { chemgreek } { mapping-defined } { #1 } }
       {
         \prop_new:c { l__chemgreek_uppercase_mapping_#1_prop }
         \prop_new:c { l__chemgreek_lowercase_mapping_#1_prop }
@@ -143,7 +143,7 @@
   {
     \chemgreek_if_mapping_exists:nTF { #1 }
       { \__chemgreek_set_mapping:nn { #1 } { #2 } }
-      { \msg_error:nn { chemgreek } { mapping-not-defined } }
+      { \msg_error:nnn { chemgreek } { mapping-not-defined } { #1 } }
   }
 
 \cs_new_protected:Npn \chemgreek_declare_mapping:nn #1#2
@@ -158,6 +158,8 @@
 
 \cs_new_protected:Npn \__chemgreek_set_mapping:nn #1#2
   {
+    \prop_clear:c { l__chemgreek_lowercase_mapping_#1_prop }
+    \prop_clear:c { l__chemgreek_uppercase_mapping_#1_prop }
     \int_zero:N \l__chemgreek_tmpa_int
     \clist_map_inline:nn { #2 }
       {
@@ -196,7 +198,7 @@
           { #3 }
           { #4 }
       }
-      { \msg_error:nn { chemgreek } { mapping-not-defined } }
+      { \msg_error:nnn { chemgreek } { mapping-not-defined } { #1 } }
   }
 
 % the user command:
@@ -218,7 +220,7 @@
               { \prop_get:cn { l__chemgreek_lowercase_mapping_#1_prop } { ##1 } }
           }
       }
-      { \msg_error:nn { chemgreek } { mapping-not-defined } }
+      { \msg_error:nnn { chemgreek } { mapping-not-defined } { #1 } }
   }
 
 % user command that also loads the needed package:
@@ -549,29 +551,29 @@
 
 \chemgreek_new_mapping:nn { fourier }
   {
-    \__chemgreek_lfourier:n {alpha}   / \ensuremath{\mathrm{A}} , %  1
-    \__chemgreek_lfourier:n {beta}    / \ensuremath{\mathrm{B}} , %  2
-    \__chemgreek_lfourier:n {gamma}   / \__chemgreek_upper_fourier:n {Gamma} ,   %  3
-    \__chemgreek_lfourier:n {delta}   / \__chemgreek_upper_fourier:n {Delta} ,   %  4
-    \__chemgreek_lfourier:n {epsilon} / \ensuremath{\mathrm{E}} , %  5
-    \__chemgreek_lfourier:n {zeta}    / \ensuremath{\mathrm{Z}} , %  6
-    \__chemgreek_lfourier:n {eta}     / \ensuremath{\mathrm{H}} , %  7
-    \__chemgreek_lfourier:n {theta}   / \__chemgreek_upper_fourier:n {Theta} ,   %  8
-    \__chemgreek_lfourier:n {iota}    / \ensuremath{\mathrm{I}} , %  9
-    \__chemgreek_lfourier:n {kappa}   / \ensuremath{\mathrm{K}} , % 10
-    \__chemgreek_lfourier:n {lambda}  / \__chemgreek_upper_fourier:n {Lambda} ,  % 11
-    \__chemgreek_lfourier:n {mu}      / \ensuremath{\mathrm{M}} , % 12
-    \__chemgreek_lfourier:n {nu}      / \ensuremath{\mathrm{N}} , % 13
-    \__chemgreek_lfourier:n {xi}      / \__chemgreek_upper_fourier:n {Xi} ,      % 14
-    \ensuremath {\mathrm{o}}          / \ensuremath{\mathrm{O}} , % 15
-    \__chemgreek_lfourier:n {pi}      / \__chemgreek_upper_fourier:n {Pi} ,      % 16
-    \__chemgreek_lfourier:n {rho}     / \ensuremath{\mathrm{R}} , % 17
-    \__chemgreek_lfourier:n {sigma}   / \__chemgreek_upper_fourier:n {Sigma} ,   % 18
-    \__chemgreek_lfourier:n {tau}     / \ensuremath{\mathrm{T}} , % 19
-    \__chemgreek_lfourier:n {upsilon} / \__chemgreek_upper_fourier:n {Upsilon} , % 20
-    \__chemgreek_lfourier:n {phi}     / \__chemgreek_upper_fourier:n {Phi} ,     % 21
-    \__chemgreek_lfourier:n {psi}     / \__chemgreek_upper_fourier:n {Psi} ,     % 22
-    \__chemgreek_lfourier:n {chi}     / \ensuremath{\mathrm{X}} , % 23
+    \__chemgreek_lfourier:n {alpha}   / \ensuremath{\mathrm{A}} ,           %  1
+    \__chemgreek_lfourier:n {beta}    / \ensuremath{\mathrm{B}} ,           %  2
+    \__chemgreek_lfourier:n {gamma}   / \__chemgreek_ufourier:n {Gamma} ,   %  3
+    \__chemgreek_lfourier:n {delta}   / \__chemgreek_ufourier:n {Delta} ,   %  4
+    \__chemgreek_lfourier:n {epsilon} / \ensuremath{\mathrm{E}} ,           %  5
+    \__chemgreek_lfourier:n {zeta}    / \ensuremath{\mathrm{Z}} ,           %  6
+    \__chemgreek_lfourier:n {eta}     / \ensuremath{\mathrm{H}} ,           %  7
+    \__chemgreek_lfourier:n {theta}   / \__chemgreek_ufourier:n {Theta} ,   %  8
+    \__chemgreek_lfourier:n {iota}    / \ensuremath{\mathrm{I}} ,           %  9
+    \__chemgreek_lfourier:n {kappa}   / \ensuremath{\mathrm{K}} ,           % 10
+    \__chemgreek_lfourier:n {lambda}  / \__chemgreek_ufourier:n {Lambda} ,  % 11
+    \__chemgreek_lfourier:n {mu}      / \ensuremath{\mathrm{M}} ,           % 12
+    \__chemgreek_lfourier:n {nu}      / \ensuremath{\mathrm{N}} ,           % 13
+    \__chemgreek_lfourier:n {xi}      / \__chemgreek_ufourier:n {Xi} ,      % 14
+    \ensuremath {\mathrm{o}}          / \ensuremath{\mathrm{O}} ,           % 15
+    \__chemgreek_lfourier:n {pi}      / \__chemgreek_ufourier:n {Pi} ,      % 16
+    \__chemgreek_lfourier:n {rho}     / \ensuremath{\mathrm{R}} ,           % 17
+    \__chemgreek_lfourier:n {sigma}   / \__chemgreek_ufourier:n {Sigma} ,   % 18
+    \__chemgreek_lfourier:n {tau}     / \ensuremath{\mathrm{T}} ,           % 19
+    \__chemgreek_lfourier:n {upsilon} / \__chemgreek_ufourier:n {Upsilon} , % 20
+    \__chemgreek_lfourier:n {phi}     / \__chemgreek_ufourier:n {Phi} ,     % 21
+    \__chemgreek_lfourier:n {psi}     / \__chemgreek_ufourier:n {Psi} ,     % 22
+    \__chemgreek_lfourier:n {chi}     / \ensuremath{\mathrm{X}} ,           % 23
     \__chemgreek_lfourier:n {omega}   / \__chemgreek_ufourier:n {Omega}     % 24
   }
 
@@ -588,3 +590,9 @@ HISTORY:
 2013/08/24 - v0.2  - new mappings `mathdesign', `fourier'
                    - new functions: \chemgreek_int_to_greek:n and
                      \chemgreek_int_to_Greek:n
+2013/11/20 - v0.2a - fixed typos in `fourier' mapping
+                   - added missing \prop_clear: to \__chemgreek_set_mapping:nn
+                   - added missing argument to message calls
+
+TODO:
+
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
index a392fbe6d81..1a218208277 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
@@ -26,8 +26,8 @@
 % - The Current Maintainer of this work is Clemens Niederberger.
 % --------------------------------------------------------------------------
 \RequirePackage{ expl3 , xparse , l3keys2e }
-\def\chemmacros@version{4.2b}
-\def\chemmacros@date{2013/11/04}
+\def\chemmacros@version{4.2c}
+\def\chemmacros@date{2013/11/20}
 
 \ProvidesExplPackage
   {chemmacros}
@@ -4055,6 +4055,7 @@ Version history
                             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'
 
 % --------------------------------------------------------------------------- %
 % TODO: