chemmacros update

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

8 files changed, 106 insertions, 32 deletions

diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README
index dc42bc516b5..2616a1258bd 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/README
+++ b/Master/texmf-dist/doc/latex/chemmacros/README
@@ -1,10 +1,10 @@
 --------------------------------------------------------------------------
-the CHEMMACROS bundle v3.4
+the CHEMMACROS bundle v3.4a
 -> chemmacros package  -> macros and commands for chemists
 -> chemformula package -> typeset chemical compounds and reactions
 -> ghsystem package    -> typeset H & P statements and pictograms
                           from the globally harmonised system (GHS)
-2012/09/11
+2012/10/03
 --------------------------------------------------------------------------
 This bundle succeeds the chemmacros package which is now part of the
 bundle
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
index 6b7d3d4a8a1..6839cc88641 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
index fa192a48e7c..1ed6dbe6355 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
@@ -52,8 +52,7 @@
   modules  = true,
   code-box = {skipabove=1ex,skipbelow=1ex}
 }
-\usepackage{polyglossia}
-  \setmainlanguage{german}
+
 \usepackage[varioref=false]{chemstyle}
 \usepackage{chemfig,upgreek,textgreek,booktabs,cancel}
 \usepackage[version=3]{mhchem}
@@ -151,7 +150,7 @@
 
 \renewcommand*\AmS{\hologo{AmS}}
 \newcommand*\pdfTeX{\hologo{pdfTeX}}
-\newcommand*\LuaTeX{\hologo{LuaTeX}}
+\renewcommand*\LuaTeX{\hologo{LuaTeX}}
 
 \TitlePicture{%
  \ch[font-spec={[Color=chemformula]Augie}]{ 2 "\OX{o1,\ox{0,Na}}" + "\OX{r1,\ox{0,Cl}}" {}2 -> 2 "\OX{o2,\ox{+1,Na}}" {}+ + 2 "\OX{r2,\ox{-1,Cl}}" {}- }
@@ -183,7 +182,10 @@
 \makeindex[columns=3,intoc,options={-sl \jobname.ist}]
 
 \begin{document}
-\chemsetup[chemformula]{font-spec={[Color=chemformula]Latin Modern Sans}}
+\chemsetup[chemformula]{
+  font-spec =
+    {[Color=chemformula,Numbers={Proportional,Lining}]Latin Modern Sans}
+}
 \renewcommand*\glqq{„}
 \renewcommand*\grqq{“}
 
@@ -1523,7 +1525,13 @@ werden.
 Ausgabe für \lstinline+<optionen>: delta=(ppm),pos-number=sub,use-equal+:
 \bigskip
 
-\begin{experimental}[delta=(ppm),pos-number=sub,use-equal]\sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}\chemsetup[chemformula]{format=}
+\begin{experimental}[delta=(ppm),pos-number=sub,use-equal]
+ \sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}
+ \chemsetup[chemformula]{
+   font-spec =
+     {[Numbers={Proportional,Lining}]Linux Libertine O}
+ }
+ %
  \data*{Ausbeute} \SI{17}{\milli\gram} gelbe Nadeln (\SI{0.04}{\milli\mole},
  \SI{13}{\percent}).
  %
@@ -1565,7 +1573,13 @@ Ausgabe für \lstinline+<optionen>: delta=(ppm),pos-number=sub,use-equal+:
 Ausgabe für \lstinline+<optionen>: format=\bfseries,delta=(ppm),list=true,use-equal+:
 \bigskip
 
-\begin{experimental}[format=\bfseries,delta=(ppm),list=true,use-equal]\sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}\chemsetup[chemformula]{format=}
+\begin{experimental}[format=\bfseries,delta=(ppm),list=true,use-equal]
+ \sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}
+ \chemsetup[chemformula]{
+   font-spec =
+     {[Numbers={Proportional,Lining}]Linux Libertine O}
+ }
+ %
  \data*{Ausbeute} \SI{17}{\milli\gram} gelbe Nadeln (\SI{0.04}{\milli\mole},
  \SI{13}{\percent}).
  %
@@ -1621,7 +1635,13 @@ Ausgabe für \code{<optionen>}:
   delta=\textcolor{green}{\ch{M+ + H2O}},
   pos-number=side,
   coupling-unit=\mega\gram\per\square\second,
-  list-setup=,use-equal]\sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}\chemsetup[chemformula]{format=}
+  list-setup=,use-equal]
+ \sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}
+ \chemsetup[chemformula]{
+   font-spec =
+     {[Numbers={Proportional,Lining}]Linux Libertine O}
+ }
+ %
  \data*{Ausbeute} \SI{17}{\milli\gram} gelbe Nadeln (\SI{0.04}{\milli\mole},
  \SI{13}{\percent}).
  %
@@ -2058,7 +2078,11 @@ kann:
 \bspmidlength{dist}{7mm}
 \secidx*{Orbitale}\secidx*{CHEMMACROS}
 
-\part{\texorpdfstring{\Chemformula}{chemformula}}\label{part:chemformula}\chemsetup[chemformula]{format=}\secidx{CHEMFORMULA}
+\part{\texorpdfstring{\Chemformula}{chemformula}}\label{part:chemformula}\secidx{CHEMFORMULA}
+\chemsetup[chemformula]{
+  font-spec =
+    {[Numbers={Proportional,Lining}]Linux Libertine O}
+}
 \section{Setup}
 Alle Optionen von \chemformula gehören dem Modul \textcolor{module}{\code{chemformula}}
 an. Das bedeutet, sie können via
@@ -3411,7 +3435,7 @@ alphabetischer Reihenfolge):
 \begin{itemize}
  \item \href{http://www.mathannotated.com/}{Peter Cao}
  \item Christina Lüdigk
- \item Dr.\@ Paul King
+ \item Dr.\ Paul King
  \item Jonas Rivetti (Besonderen Dank für seine Übersetzung der H- und P-Sätze
    ins Italienische!)
  \item Christoph Schäfer
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
index 2f84a2a8403..8d3b397db1a 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 ece445209b7..fd3bbee867d 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
@@ -45,13 +45,13 @@
 \documentclass[DIV11,toc=index,toc=bib]{cnpkgdoc}
 \docsetup{
   pkg      = chemmacros,
+  language = en,
   title    = the \Chemmacros\ bundle,
   subtitle = {packages \Chemmacros, \Chemformula\ and \Ghsystem},
   modules  = true,
   code-box = {skipabove=1ex,skipbelow=1ex}
 }
-\usepackage{polyglossia}
-  \setmainlanguage{english}
+
 \usepackage[varioref=false]{chemstyle}
 \usepackage{chemfig,upgreek,textgreek,booktabs,cancel}
 \usepackage[version=3]{mhchem}
@@ -148,7 +148,7 @@
 
 \renewcommand*\AmS{\hologo{AmS}}
 \newcommand*\pdfTeX{\hologo{pdfTeX}}
-\newcommand*\LuaTeX{\hologo{LuaTeX}}
+\renewcommand*\LuaTeX{\hologo{LuaTeX}}
 
 \TitlePicture{%
  \ch[font-spec={[Color=chemformula]Augie}]{ 2 "\OX{o1,\ox{0,Na}}" + "\OX{r1,\ox{0,Cl}}" {}2 -> 2 "\OX{o2,\ox{+1,Na}}" {}+ + 2 "\OX{r2,\ox{-1,Cl}}" {}- }
@@ -180,7 +180,10 @@
 \makeindex[columns=3,intoc,options={-sl \jobname.ist}]
 
 \begin{document}
-\chemsetup[chemformula]{font-spec={[Color=chemformula]Latin Modern Sans}}
+\chemsetup[chemformula]{
+  font-spec =
+    {[Color=chemformula,Numbers={Proportional,Lining}]Latin Modern Sans}
+}
 \renewcommand*\glqq{„}
 \renewcommand*\grqq{“}
 
@@ -1479,7 +1482,13 @@ course options can also be chosen with \cmd{chemsetup}.
 Output with these options: \lstinline+<optionen>: delta=(ppm),pos-number=sub,use-equal+
 \bigskip
 
-\begin{experimental}[delta=(ppm),pos-number=sub,use-equal]\sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}\chemsetup[chemformula]{format=}
+\begin{experimental}[delta=(ppm),pos-number=sub,use-equal]
+ \sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}
+ \chemsetup[chemformula]{
+   font-spec =
+     {[Numbers={Proportional,Lining}]Linux Libertine O}
+ }
+ %
  \data*{yield} \SI{17}{\milli\gram} yellow needles (\SI{0.04}{\milli\mole},
  \SI{13}{\percent}).
  %
@@ -1521,7 +1530,13 @@ Output with these options: \lstinline+<optionen>: delta=(ppm),pos-number=sub,use
 Output with these options: \lstinline+<optionen>: format=\bfseries,delta=(ppm),list=true,use-equal+
 \bigskip
 
-\begin{experimental}[format=\bfseries,delta=(ppm),list=true,use-equal]\sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}\chemsetup[chemformula]{format=}
+\begin{experimental}[format=\bfseries,delta=(ppm),list=true,use-equal]
+ \sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}
+ \chemsetup[chemformula]{
+   font-spec =
+     {[Numbers={Proportional,Lining}]Linux Libertine O}
+ }
+ %
  \data*{yield} \SI{17}{\milli\gram} yellow needles (\SI{0.04}{\milli\mole},
  \SI{13}{\percent}).
  %
@@ -1577,7 +1592,13 @@ Output for these options: \code{<optionen>}:
   delta=\textcolor{green}{\ch{M+ + H2O}},
   pos-number=side,
   coupling-unit=\mega\gram\per\square\second,
-  list-setup=,use-equal]\sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}\chemsetup[chemformula]{format=}
+  list-setup=,use-equal]
+ \sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}
+ \chemsetup[chemformula]{
+   font-spec =
+     {[Numbers={Proportional,Lining}]Linux Libertine O}
+ }
+ %
  \data*{yield} \SI{17}{\milli\gram} yellow needles (\SI{0.04}{\milli\mole},
  \SI{13}{\percent}).
  %
@@ -1999,7 +2020,11 @@ Additionally there are two options, with which the \TikZ behaviour can be change
 \bspmidlength{dist}{7mm}
 \secidx*{Orbitals}\secidx*{CHEMMACROS}
 
-\part{\texorpdfstring{\Chemformula}{chemformula}}\chemsetup[chemformula]{format=}\secidx{CHEMFORMULA}\label{part:chemformula}
+\part{\texorpdfstring{\Chemformula}{chemformula}}\secidx{CHEMFORMULA}\label{part:chemformula}
+\chemsetup[chemformula]{
+  font-spec =
+    {[Numbers={Proportional,Lining}]Linux Libertine O}
+}
 \section{Setup}
 All of \chemformula's options belong to the module \textcolor{module}{\code{chemformula}}.
 This means they can be setup with
@@ -3309,7 +3334,7 @@ Many thanks to all the people who already provided me with feedback, especially
 \begin{itemize}
  \item \href{http://www.mathannotated.com/}{Peter Cao}
  \item Christina Lüdigk
- \item Dr.\@ Paul King
+ \item Dr.\ Paul King
  \item Jonas Rivetti (Special thanks for his translation of the hazard and
    precautionary statements into Italian!)
  \item Christoph Schäfer
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf
index 33919a3b538..5958c8b7f55 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex
index 22fde5723bb..fd263bad69a 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex
@@ -51,8 +51,7 @@
   modules  = true,
   code-box = {skipabove=1ex,skipbelow=1ex}
 }
-\usepackage{polyglossia}
-  \setmainlanguage{italian}
+
 \usepackage[varioref=false]{chemstyle}
 \usepackage{chemfig,upgreek,textgreek,booktabs,cancel}
 \usepackage[version=3]{mhchem}
@@ -150,7 +149,7 @@
 
 \renewcommand*\AmS{\hologo{AmS}}
 \newcommand*\pdfTeX{\hologo{pdfTeX}}
-\newcommand*\LuaTeX{\hologo{LuaTeX}}
+\renewcommand*\LuaTeX{\hologo{LuaTeX}}
 
 \TitlePicture{%
  \ch[font-spec={[Color=chemformula]Augie}]{ 2 "\OX{o1,\ox{0,Na}}" + "\OX{r1,\ox{0,Cl}}" {}2 -> 2 "\OX{o2,\ox{+1,Na}}" {}+ + 2 "\OX{r2,\ox{-1,Cl}}" {}- }
@@ -183,7 +182,10 @@
 \usepackage{imakeidx}
 \makeindex[columns=3,intoc,options={-sl \jobname.ist}]
 \begin{document}
-\chemsetup[chemformula]{font-spec={[Color=chemformula]Latin Modern Sans}}
+\chemsetup[chemformula]{
+  font-spec =
+    {[Color=chemformula,Numbers={Proportional,Lining}]Latin Modern Sans}
+}
 \renewcommand*\glqq{„}
 \renewcommand*\grqq{“}
 
@@ -1516,7 +1518,13 @@ con \cmd{chemsetup}.
 Output per \lstinline+<opzioni>: delta=(ppm),pos-number=sub,use-equal+:
 \bigskip
 
-\begin{experimental}[delta=(ppm),pos-number=sub,use-equal]\sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}\chemsetup[chemformula]{format=}
+\begin{experimental}[delta=(ppm),pos-number=sub,use-equal]
+ \sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}
+ \chemsetup[chemformula]{
+   font-spec =
+     {[Numbers={Proportional,Lining}]Linux Libertine O}
+ }
+ %
  \data*{Resa} \SI{17}{\milli\gram} aghi gialli (\SI{0.04}{\milli\mole}, \SI{13}{\percent}).
  %
  \data{P.f.} \SI{277}{\celsius} (DSC).
@@ -1540,7 +1548,13 @@ Output per \lstinline+<opzioni>: delta=(ppm),pos-number=sub,use-equal+:
 Output per le seguenti \lstinline+<opzioni>: format=\bfseries,delta=(ppm),list=true,use-equal+:
 \bigskip
 
-\begin{experimental}[format=\bfseries,delta=(ppm),list=true,use-equal]\sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}\chemsetup[chemformula]{format=}
+\begin{experimental}[format=\bfseries,delta=(ppm),list=true,use-equal]
+ \sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}
+ \chemsetup[chemformula]{
+   font-spec =
+     {[Numbers={Proportional,Lining}]Linux Libertine O}
+ }
+ %
  \data*{Resa} \SI{17}{\milli\gram} aghi gialli (\SI{0.04}{\milli\mole}, \SI{13}{\percent}).
  %
  \data{P.f.} \SI{277}{\celsius} (DSC).
@@ -1578,7 +1592,13 @@ Output per \code{<opzioni>}:
   delta=\textcolor{green}{\ch{M+ + H2O}},
   pos-number=side,
   coupling-unit=\mega\gram\per\square\second,
-  list-setup=,use-equal]\sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}\chemsetup[chemformula]{format=}
+  list-setup=,use-equal]
+ \sisetup{separate-uncertainty,per-mode=symbol,detect-all,range-phrase=--}
+ \chemsetup[chemformula]{
+   font-spec =
+     {[Numbers={Proportional,Lining}]Linux Libertine O}
+ }
+ %
  \data*{Resa} \SI{17}{\milli\gram} aghi gialli (\SI{0.04}{\milli\mole}, \SI{13}{\percent}).
  %
  \data{P.f.} \SI{277}{\celsius} (DSC).
@@ -1989,7 +2009,11 @@ di \TikZ:
 \bspmidlength{dist}{7mm}
 \secidx*{Orbitali}\secidx*{CHEMMACROS}
 
-\part{\texorpdfstring{\Chemformula}{chemformula}}\label{part:chemformula}\chemsetup[chemformula]{format=}\secidx{CHEMFORMULA}
+\part{\texorpdfstring{\Chemformula}{chemformula}}\label{part:chemformula}\secidx{CHEMFORMULA}
+\chemsetup[chemformula]{
+  font-spec =
+    {[Numbers={Proportional,Lining}]Linux Libertine O}
+}
 \section{Impostazioni}
 Tutte le opzioni di \chemformula appartengono al modulo \textcolor{module}{\code{chemformula}}. Quindi possono essere impostate attraverso
 \begin{beispiel}[code only]
@@ -3321,7 +3345,7 @@ Ringrazio tanto anche tutti coloro da cui ho già avuto segnalazioni, in partico
 \begin{itemize}
  \item \href{http://www.mathannotated.com/}{Peter Cao}
  \item Christina Lüdigk
- \item Dr.\@ Paul King
+ \item Dr.\ Paul King
  \item Jonas Rivetti (traduzione delle frasi H e P in italiano; molte grazie anche
    per la traduzione del manuale!)
  \item Christoph Schäfer
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
index 3baaced86cc..3c4c74bc299 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
@@ -29,8 +29,8 @@
 \RequirePackage{ expl3 , xparse , l3keys2e , xfrac , siunitx }
 \RequirePackage{ tikz , mathtools , environ , scrlfile , etoolbox , bm }
 \usetikzlibrary{calc,arrows}
-\def\chemmacros@version{3.4}
-\def\chemmacros@date{2012/09/11}
+\def\chemmacros@version{3.4a}
+\def\chemmacros@date{2012/10/03}
 
 \ProvidesExplPackage
   {chemmacros}
@@ -2170,7 +2170,7 @@
     \tl_clear:N \l_chemmacros_nmr_coupling_bonds_tl
     \peek_meaning:NTF (
       { \chemmacros_nmr_coupling_auxi:w }
-      { \chemmacros_nmr_coupling_auxi:w }
+      { \chemmacros_nmr_coupling_auxii:w }
   }
 
 \cs_new:Npn \chemmacros_nmr_coupling_auxi:w (#1;#2)
@@ -3885,6 +3885,7 @@ Version history
                             \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
 
 % --------------------------------------------------------------------------- %
 % TODO: