chemmacros (21apr13)

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

10 files changed, 237 insertions, 100 deletions

diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README
index 8342f05b70d..8cf1cfdf0af 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.6
+the CHEMMACROS bundle v3.6b
 -> 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)
-2013/02/26
+2013/03/19
 --------------------------------------------------------------------------
 This bundle succeeds the chemmacros package which is now part of the
 bundle
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemformula_test_sub_and_superscripts.tex b/Master/texmf-dist/doc/latex/chemmacros/chemformula_test_sub_and_superscripts.tex
index d7119b1e199..f08d1764bc0 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemformula_test_sub_and_superscripts.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemformula_test_sub_and_superscripts.tex
@@ -138,5 +138,54 @@ $ A^{\ch{SO4^2-}}$
 \ch{!( $2n-1$ )( H2O )} \quad
 \ch{!( H2O )( H2O )} \quad
 \ch{!(oxonium)( H3O+ )}
- 
+
+\ch{O2^{.-}}
+
+\ch[radical-vshift=.4ex]{O2^{.-}}
+
+\ch{.5 H2O}
+
+\ch{,5 H2O}
+
+\ch{1.5 H2O}
+
+\ch{1,5 H2O ->[a][ b2+ ] ?? <=>> CH2+CH2 == SO4^2- + Ca^2+}
+
+\ch{1/2 H2O}
+
+\ch{(1.5) H2O} \ch{( H2O )} \ch{!( bla )( H2O )}
+
+\ch{(1/5) H2O}
+
+\chemsetup[chemformula]{stoich-paren-parse = true}
+\ch{(1/5) H2O}
+
+\ch{3_1/2 H2O}
+
+\Hpl
+
+\ghspic{skull}
+
+\Sconf
+
+\p{H}
+
+\pH{} \pOH
+
+\pKa{} \pKb
+
+\newman{1,2,3}
+
+\orbital{s} \orbital{p} \orbital{sp} \orbital{sp2} \orbital{sp3}
+
+\bigskip
+
+\OX{a,Na} $\rightarrow$ \OX{b,Na}\pch
+\redox(a,b)[->,red]{ox}
+\redox(a,b)[<-,blue][-1]{red}
+
+\bigskip
+
+\ch{"->"}
+
 \end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
index f5b8f369199..d1f6d89a1db 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 0fd1dcf1fab..d9363e0dadb 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
@@ -50,10 +50,10 @@
   language = de,
   subtitle = {Pakete \Chemmacros, \Chemformula\ und \Ghsystem},
   modules  = true,
-  code-box = {skipabove=1ex,skipbelow=1ex}
+  code-box = {skipabove=1ex,skipbelow=1ex},
+  label    = {},
 }
 
-% \usepackage[varioref=false]{chemstyle}
 \usepackage{chemfig,upgreek,textgreek,booktabs,cancel}
 \usepackage[version=3]{mhchem}
 \usepackage{hologo}
@@ -102,6 +102,12 @@
 \chemsetup[option]{synchronize,language=german}
 \colorlet{chemformula}{darkgray}
 
+\sisetup{
+  detect-mode=false,
+  mode=text,
+  text-rm=\addfontfeatures{Numbers={Proportional,Lining}}
+}
+
 \usepackage{filecontents}
 
 \begin{filecontents*}{\jobname.ist}
@@ -112,10 +118,11 @@
  heading_prefix "{\\bfseries "
  heading_suffix "\\hfil}\\nopagebreak\n"
  headings_flag  1
- delim_0 "\\ \\dotfill\\ "
- delim_1 "\\ \\dotfill\\ "
- delim_2 "\\ \\dotfill\\ "
- delim_r "\\textendash"
+ delim_0 "\\dotfill\\hyperpage{"
+ delim_1 "\\dotfill\\hyperpage{"
+ delim_2 "\\dotfill\\hyperpage{"
+ delim_r "}\\textendash\\hyperpage{"
+ delim_t "}"
  suffix_2p "\\nohyperpage{\\,f.}"
  suffix_3p "\\nohyperpage{\\,ff.}"
 \end{filecontents*}
@@ -167,7 +174,9 @@
     denominator-bot-sep = -.2ex ,
     denominator-format  = \scriptsize #1 ,
     numerator-top-sep   = -.2ex ,
-    numerator-format    = \scriptsize #1
+    numerator-format    = \scriptsize #1 ,
+    slash-right-kern    = .05em ,
+    slash-left-kern     = .05em
   }
 
 \newcommand*\chemformula{{\scshape\textcolor{cnpkgblue}{chemformula}}\xspace}
@@ -217,6 +226,7 @@
   w,xspace,Z}
 
 \usepackage{imakeidx}
+\indexsetup{othercode=\footnotesize}
 \makeindex[columns=3,intoc,options={-sl \jobname.ist}]
 
 \begin{document}
@@ -564,6 +574,7 @@ Bei der Sprachwahl \code{italian} werden zusätzliche IUPAC-Befehle definiert:
    sie fehlt.
  \item Neue Option: \key{stoich-paren-parse}.
  \item Zahlreiche interne Änderungen am Code.
+ \item Neue Option: \key{arrow-min-length}.
 \end{itemize}
 \secidx*{Neues}\secidx*{BEVOR ES LOS GEHT}
 
@@ -766,7 +777,6 @@ Tabelle~\ref{tab:iupac_modes} demonstriert die verschiedenen Modi.
  \caption{Demonstration der verschiedenen \protect\key{iupac}-Modi.}\label{tab:iupac_modes}
 \end{table}
 
-% TODO : Text umbrechen
 \subsubsection{Vordefinierte Befehle}\secidx[vordefiniert]{IUPAC-Namen}\secidx{Stereodeskriptoren und Nomenklatur}
 \paragraph{Griechische Buchstaben}\label{par:greek_letters}\secidx[griechische Buchstaben]{IUPAC-Namen}
 Griechische Buchstaben in Verbindungsnamen werden aufrecht geschrieben. Dafür gibt
@@ -1018,7 +1028,11 @@ Ladungssymbolen, siehe auch Abschnitt \ref{sec:optionen}. Alle Befehle, die
 formale Ladungen ausgeben, starten mit einem \code{f}.
 
 \subsection{Ionenladungen}\label{ssec:ionen}\secidx{Ionenladungen}
-Einfache Verwendung von (realen) Ladungen:
+Einfache Verwendung von (realen) Ladungen. Man sollte anmerken, dass diese
+Befehle aus der Zeit stammen, als \chemmacros sich stark bemühte, mit
+\paket{mhchem} kompatibel zu sein, und es \Chemformula noch nicht gab. Sie
+werden weiterhin zur Verfügung gestellt, aber meine Empfehlung wäre, \cmd{ch}
+(siehe~\ref{part:chemformula}) zu verwenden und diese Befehle zu vergessen:
 \begin{beschreibung}
  \befehl{pch}[<number>] positive Ladung (\textbf{p}lus + \textbf{ch}arge)
  \befehl{mch}[<number>] negative Ladung (\textbf{m}inus + \textbf{ch}arge)
@@ -1255,7 +1269,6 @@ den Abstand zwischen Atom und Anfang der Linie zu verändern.
  \OX{a,Na} $\rightarrow$ \OX{b,Na}\pch\redox(a,b)[->,red]{ox}
 \end{beispiel}
 
-\newpage
 Beispiele:% TODO: watch pagebreaks!
 \begin{beispiel}[dist]
  \ch{ 2 "\OX{o1,Na}" + "\OX{r1,Cl}" {}2 -> 2 "\OX{o2,Na}" \pch{} + 2
@@ -2285,7 +2298,7 @@ eigenen Bedarf umdefiniert werden kann. Default ist folgendes:
     slash-right-kern = -.15em
   }
 \end{beispiel}
-Dieses Dokument verwendet den Font \textsc{Linux Libertine O} und folgende Definition:
+Dieses Dokument verwendet den Font Linux Libertine~O und folgende Definition:
 \begin{beispiel}[code only]
  \DeclareInstance{xfrac}{chemformula-text-frac}{text}
   {
@@ -2293,7 +2306,9 @@ Dieses Dokument verwendet den Font \textsc{Linux Libertine O} und folgende Defin
     denominator-bot-sep = -.2ex ,
     denominator-format  = \scriptsize #1 ,
     numerator-top-sep   = -.2ex ,
-    numerator-format    = \scriptsize #1
+    numerator-format    = \scriptsize #1 ,
+    slash-right-kern    = .05em ,
+    slash-left-kern     = .05em
   }
 \end{beispiel}
 
@@ -2799,7 +2814,10 @@ Mit folgenden Optionen können Sie das Erscheinungsbild der Pfeile anpassen:
 \begin{beschreibung}
  \option{arrow-offset}{<dim>} Die Länge, die ein Pfeil links und rechts über die
    Beschriftung hinausragt. Die Länge eines leeren Pfeils beträgt zwei mal
- \code{arrow-offset}. Eine \TeX-Länge. Default = \code{.75em}
+   \code{arrow-offset}. Eine \TeX-Länge. Default = \code{.75em}
+ \option{arrow-min-length}{<dim>} Die minimale Länge, die ein Pfeil hat, wenn
+   zwei mal \key{arrow-offset} plus die Breite der Beschriftung nicht größer ist.
+   Default = \code{0pt}
  \option{arrow-yshift}{<dim>} Verschiebt einen Pfeil nach oben (positiver Wert)
    oder nach unten (negativer Wert). Eine \TeX-Länge. Default = \code{0pt}
  \option{arrow-ratio}{<factor>} Das Verhältnis der Pfeillängen der ver unbalancierten
@@ -3294,7 +3312,7 @@ Sie können die Sprache auch explizit wählen.
 Ich werde in irgendwann in der Zukunft weitere Sprachen implementieren. Das kann
 aber eine Weile dauern. Wenn Sie gerne zu \ghsystem beisteuern möchten und die
 Sätze in einer anderen Sprache tippen wollen, kontaktieren Sie mich\footnote{%
-\href{mailto:contac@mychemistry.eu}{contact@mychemistry.eu}} gerne. Ich stelle
+\href{mailto:contact@mychemistry.eu}{contact@mychemistry.eu}} gerne. Ich stelle
 Ihnen dann eine Template-Datei, ein \acs{pdf} mit den offiziellen Übersetzungen
 sowie jede weitere Hilfe, die sie benötigen.
 
@@ -3509,7 +3527,7 @@ auf \url{https://bitbucket.org/cgnieder/chemmacros/} melden.
 Vielen Dank an alle, die mir schon Feedback zukommen ließen, vor allem (in
 alphabetischer Reihenfolge):
 \begin{itemize}
- \item \href{http://www.mathannotated.com/}{Peter Cao}
+ \item Peter Cao
  \item Christina Lüdigk
  \item Dr.\ Paul King
  \item Jonas Rivetti (Besonderen Dank für seine Übersetzung der H- und P-Sätze
@@ -3518,7 +3536,7 @@ alphabetischer Reihenfolge):
  \item Timo Stein
 \end{itemize}
 
-{\EmbracOff\printbibliography[title=Quellen]}
+\printbibliography[title=Quellen]
 
 {\catcode`\^=11 \catcode`\#=11 \catcode`\|=11
 \printindex}
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
index f93f05024fe..9bef3059b5e 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 b1743cf1432..77c85e11dca 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
@@ -1,7 +1,7 @@
 % arara: xelatex
 % arara: biber
 % arara: xelatex
-% !arara: xelatex
+% arara: xelatex
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % ----------------------------------------------------------------------------- 
 % - the CHEMMACROS bundle
@@ -49,11 +49,10 @@
   title    = the \Chemmacros\ bundle,
   subtitle = {packages \Chemmacros, \Chemformula\ and \Ghsystem},
   modules  = true,
-  code-box = {skipabove=1ex,skipbelow=1ex}
+  code-box = {skipabove=1ex,skipbelow=1ex},
+  label    = {},
 }
 
-% \usepackage{scrhack}
-% \usepackage[varioref=false,floats=float]{chemstyle}
 \usepackage{chemfig,upgreek,textgreek,booktabs,cancel}
 \usepackage[version=3]{mhchem}
 \usepackage{hologo}
@@ -102,6 +101,12 @@
 \chemsetup[option]{synchronize}
 \colorlet{chemformula}{darkgray}
 
+\sisetup{
+  detect-mode=false,
+  mode=text,
+  text-rm=\addfontfeatures{Numbers={Proportional,Lining}}
+}
+
 \usepackage{filecontents}
 
 \begin{filecontents*}{\jobname.ist}
@@ -112,10 +117,11 @@
  heading_prefix "{\\bfseries "
  heading_suffix "\\hfil}\\nopagebreak\n"
  headings_flag  1
- delim_0 "\\ \\dotfill\\ "
- delim_1 "\\ \\dotfill\\ "
- delim_2 "\\ \\dotfill\\ "
- delim_r "\\textendash"
+ delim_0 "\\dotfill\\hyperpage{"
+ delim_1 "\\dotfill\\hyperpage{"
+ delim_2 "\\dotfill\\hyperpage{"
+ delim_r "}\\textendash\\hyperpage{"
+ delim_t "}"
  suffix_2p "\\nohyperpage{\\,f.}"
  suffix_3p "\\nohyperpage{\\,ff.}"
 \end{filecontents*}
@@ -166,7 +172,9 @@
     denominator-bot-sep = -.2ex ,
     denominator-format  = \scriptsize #1 ,
     numerator-top-sep   = -.2ex ,
-    numerator-format    = \scriptsize #1
+    numerator-format    = \scriptsize #1 ,
+    slash-right-kern    = .05em ,
+    slash-left-kern     = .05em
   }
 
 \newcommand*\chemformula{{\scshape\textcolor{cnpkgblue}{chemformula}}\xspace}
@@ -218,6 +226,7 @@
   w,xspace,Z}
 
 \usepackage{imakeidx}
+\indexsetup{othercode=\footnotesize}
 \makeindex[columns=3,intoc,options={-sl \jobname.ist}]
 
 \begin{document}
@@ -230,9 +239,10 @@
 
 \part{Preliminaries}\secidx{PRELIMINARIES}
 \section{Licence, Requirements and README}
-The \chemmacros bundle underlies the \LaTeX\ project public license (lppl)
-version 1.3 or later (\url{http://www.latex-project.org/lppl.txt}) and has the
-status ``maintained.''
+Permission is granted to copy, distribute and/or modify this software under the
+terms of the \LaTeX\ project public license (lppl) version 1.3 or later
+(\url{http://www.latex-project.org/lppl.txt}). The package has the status
+``maintained.''
 
 The \chemmacros bundle needs the bundles \paket{l3kernel} and \paket{l3packages}.
 It also needs the packages \paket{siunitx}, \paket{mathtools}, \paket{bm},
@@ -384,14 +394,14 @@ be set using the setup command.
    \emph{This option can only be chosen in the preamble}.
  % ghsystem
  \option[option]{ghsystem}{\default{true}|false} Disable the use of the \ghsystem
-   package. Setting \key{ghs}{false} will prevent \chemmacros from loading \ghsystem.
-   (default = \code{true})
+   package. Setting \key{ghsystem}{false} will prevent \chemmacros from loading
+   \ghsystem. (default = \code{true})
  % greek
  \option[option]{greek}{\default{auto}|math|textgreek|upgreek} This Option determines
    how the letters \cmd{Chemalpha} and friends are typeset. See page~\pageref{desc:upgreek}
    for more information. \emph{This option can only be chosen in the preamble}.
    Please note that this options \emph{does not load either \paket{upgreek} nor
-   \paket{textgreek}}! It only determines which one to choose if available. The
+   \paket{textgreek}!} It only determines which one to choose if available. The
    option will detect if either \paket{upgreek} or \paket{textgreek} have been
    loaded and use them if available. If you explicitly choose \code{upgreek} or
    \code{textgreek} you also have to load the corresponding package.
@@ -420,8 +430,9 @@ be set using the setup command.
  % synchronize
  \option[option]{synchronize}{\default{true}|false} The setting \code{true} will
    tell \chemmacros the adapt the font settings of \chemformula if that method has
-   been chosen (default = \code{false}). In order to demonstrate this feature this
-   document is set with \key{synchronize}{true} and the \chemformula setting
+   been chosen (default = \code{false}). In order to demonstrate this feature the
+   first part of this document is set with \key{synchronize}{true} and the
+   \chemformula setting
    \lstinline+\chemsetup[chemformula]{font-spec={[Color=darkgray]Latin Modern Sans}}+.
  % xspace
  \option[option]{xspace}{\default{true}|false} With this option most commands are
@@ -456,7 +467,7 @@ The package options can also be seen as keys belonging to the module
 Keys \emph{not} belonging to a module \emph{cannot} be used with \cmd{chemsetup}!
 
 All options of \chemformula belong to the module \textcolor{module}{\code{chemformula}}
-and all of \ghsystem's options belong to the module \textcolor{module}{\code{ghs}}.
+and all of \ghsystem's options belong to the module \textcolor{module}{\code{ghsystem}}.
 \secidx*{Setup}
 
 \section{Language Settings}\label{sec:languages}\secidx{Language Settings}
@@ -547,6 +558,7 @@ Choosing the language \code{italian} defines two additional \ac{iupac} commands:
  \item In stoichiometric factors a leading 0 is added if missing.
  \item New option: \key{stoich-paren-parse}.
  \item Various internal changes to the code.
+ \item New option: \key{arrow-min-length}.
 \end{itemize}
 \secidx*{News}\secidx*{PRELIMINARIES}
 
@@ -556,7 +568,9 @@ Choosing the language \code{italian} defines two additional \ac{iupac} commands:
 \chemmacros defines some simple macros for displaying often needed particles and
 symbols. Please note, that they're displayed differently depending on the package
 options used, see section~\ref{sec:optionen}. These commands can be used in text
-as well as in math mode.
+as well as in math mode. Note that they are not meant to be used in \Chemformula's
+\cmd{ch}.
+
 \begin{beschreibung}
  \befehl{Hpl} \Hpl (proton)
  \befehl{Hyd} \Hyd (hydroxide)
@@ -641,7 +655,8 @@ compliance. \ac{iupac} recommends to use upright greek letters in nomenclature.
  symbols for physical quantities.
 \end{zitat}
 
-\chemmacros uses these commands now to defined nomenclature commands, see page~\pageref{par:greek_letters}.
+\chemmacros uses these commands now to define nomenclature commands, see
+page~\pageref{par:greek_letters}.
 
 \subsection{Own Particles}\secidx[own]{Particles, Ions and Symbols}
 Surely sometimes it can be handy to have other particle macros defined such as
@@ -695,7 +710,7 @@ The \cmd{iupac} command is more of a semantic command. Most times you can achiev
 (nearly) the same thing by using \cmd{-} instead of \cmd{|}, \code{-} instead of
 \cmd{-} and \lstinline=\textsuperscript= instead of {\catcode`\^=11\relax\cmd{^}}.
 
-There are some subtleties: \cmd{-} inserts a small space before the hyphen a
+There are some subtleties: \cmd{-} inserts a small space before the hyphen and
 removes a small space after it. The command \cmd{|} not only prevents ligatures
 but also inserts a small space.
 \begin{beispiel}
@@ -874,8 +889,8 @@ Two options allow customization:
 \subsubsection{Own Naming Commands}\secidx[own]{IUPAC Names}
 If you find any commands missing you can define them using
 \begin{beschreibung}
- \befehl{DeclareChemIUPAC}{<cmd>}\ma{<declaration>}
- \befehl{RenewChemIUPAC}{<cmd>}\ma{<declaration>}
+ \Befehl{DeclareChemIUPAC}{<cmd>}\ma{<declaration>}
+ \Befehl{RenewChemIUPAC}{<cmd>}\ma{<declaration>}
 \end{beschreibung}
 A command defined in this way will obey the setting of the option \key[option]{iupac}.
 This means any existing command is only overwritten with \key{iupac}{strict}. However,
@@ -994,8 +1009,13 @@ There is one option which changes the style the \p{} is typeset:
 \chemmacros distinguishes between real ($+$/$-$) and formal (\fplus/\fminus)
 charge symbols, also see section~\ref{sec:optionen}. All commands using formal
 charge symbols start with a \code{f}.
+
 \subsection{Ion Charges}\label{ssec:ionen}\secidx{Ion Charges}
-Simple displaying of (real) charges:
+Simple displaying of (real) charges. It is worth noting that these commands
+really are relicts from a time when \chemmacros tried hard to be compliant
+with \paket{mhchem} and \Chemformula didn't exist, yet. They are still provided
+for backwards compatibility but my recommendation is to use \cmd{ch}
+(see~\ref{part:chemformula}) and forget about these commands:
 \begin{beschreibung}
  \befehl{pch}[<number>] positive charge (\textbf{p}lus + \textbf{ch}arge)
  \befehl{mch}[<number>] negative charge (\textbf{m}inus + \textbf{ch}arge)
@@ -1242,7 +1262,6 @@ Examples:% TODO: watch pagebreaks!
  \vspace{7mm}
 \end{beispiel}
 
-\newpage
 \bspmidlength{dist}{15mm}
 \begin{beispiel}[dist]
  \ch{ 2 "\OX{o1,\ox{0,Na}}" + "\OX{r1,\ox{0,Cl}}" {}2 -> 2 "\OX{o2,\ox{+1,Na}}"
@@ -1261,6 +1280,7 @@ Examples:% TODO: watch pagebreaks!
 \end{beispiel}
 \secidx*{Redox Reactions}
 
+\newpage
 \section{(Standard) State, Thermodynamics}\label{sec:standardstate}\secidx{Thermodynamics}
 \subsection{Thermodynamic Variables}\label{ssec:siunitx}
 The following commands use \paket{siunitx}:
@@ -2055,7 +2075,6 @@ Additionally there are two options, with which the \TikZ behaviour can be change
  \vspace{7mm}
 \end{beispiel}
 
-\newpage
 \bspmidlength{dist}{10mm}
 \begin{beispiel}[dist]
  \hspace{2cm}
@@ -2112,7 +2131,7 @@ The usage will seem very familiar to you if you're familiar with \paket{mhchem}:
 \end{beispiel}
 
 However, there are differences. The most notable one: \chemformula distinguishes
-between different types of input. These different parts \emph{have} to be seperated
+between different types of input. These different parts \emph{have} to be separated
 with blanks:
 \begin{beschreibung}
  \Befehl{ch}{part1 part2 part3 part4}
@@ -2216,7 +2235,7 @@ The default definition is this:
     slash-right-kern = -.15em
   }
 \end{beispiel}
-This document uses the font Linux Libertine and the following definition:
+This document uses the font Linux Libertine~O and the following definition:
 \begin{beispiel}[code only]
  \DeclareInstance{xfrac}{chemformula-text-frac}{text}
   {
@@ -2224,7 +2243,9 @@ This document uses the font Linux Libertine and the following definition:
     denominator-bot-sep = -.2ex ,
     denominator-format  = \scriptsize #1 ,
     numerator-top-sep   = -.2ex ,
-    numerator-format    = \scriptsize #1
+    numerator-format    = \scriptsize #1 ,
+    slash-right-kern    = .05em ,
+    slash-left-kern     = .05em
   }
 \end{beispiel}
 
@@ -2719,6 +2740,9 @@ These are the options which enable you to customize the arrows:
  \option{arrow-offset}{<dim>} This is the length that an arrow protrudes a label
    on both sides. This means an empty arrow's length is two times \code{arrow-offset}.
    Default = \code{.75em}
+ \option{arrow-min-length}{<dim>} The minimal length an error must have unless
+   two times \key{arrow-offset} plus the width of the label is larger.
+   Default = \code{0pt}
  \option{arrow-yshift}{<dim>} Shifts an arrow up (positive value) or down (negative
    value). Default = \code{0pt}
  \option{arrow-ratio}{<factor>} The ratio of the arrow lengths of the unbalanced
@@ -3191,7 +3215,7 @@ You can also choose the language explicitly.
 
 I will add other languages some time in future. This may take a while, though.
 If you would be willing to contribute and write the statements of another language
-please feel free to contact me\footnote{\href{mailto:contac@mychemistry.eu}{contact@mychemistry.eu}}.
+please feel free to contact me\footnote{\href{mailto:contact@mychemistry.eu}{contact@mychemistry.eu}}.
 I would provide you with a template file, a \acs{pdf} containing the official
 translations, and help to all your questions.
 
@@ -3389,7 +3413,7 @@ Quite a number of commands has been presented with which the possibilities of
 \end{beschreibung}
 \secidx*{Option Overview (chemmacros)}
 
-\addsec{Suggestions and Bug Reports}\addcontentsline{toc}{section}{Suggestions and Bug Reports}
+\addsec{Suggestions and Bug Reports}
 Feedback on \chemmacros, \chemformula and \ghsystem is highly appreciated and
 welcome! Especially \chemformula and \ghsystem are still in beta testing phase
 so even if I repeat myself: feedback is highly welcome.
@@ -3406,7 +3430,7 @@ which I can reproduce the bug. You can also submit an issue on
 Many thanks to all the people who already provided me with feedback, especially
 (in alphabetical order):
 \begin{itemize}
- \item \href{http://www.mathannotated.com/}{Peter Cao}
+ \item Peter Cao
  \item Christina Lüdigk
  \item Dr.\ Paul King
  \item Jonas Rivetti (Special thanks for his translation of the hazard and
@@ -3415,7 +3439,7 @@ Many thanks to all the people who already provided me with feedback, especially
  \item Timo Stein
 \end{itemize}
 
-{\EmbracOff\printbibliography}
+\printbibliography
 
 {\catcode`\^=11 \catcode`\#=11
 \printindex}
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf
index 4e3e48c6081..58bb3daf1c9 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 39b8ded627e..5b88b4c684d 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex
@@ -49,10 +49,10 @@
   language = it,
   subtitle = {I pacchetti \Chemmacros, \Chemformula\ e \Ghsystem},
   modules  = true,
-  code-box = {skipabove=1ex,skipbelow=1ex}
+  code-box = {skipabove=1ex,skipbelow=1ex},
+  label    = {},
 }
 
-% \usepackage[varioref=false]{chemstyle}
 \usepackage{chemfig,upgreek,textgreek,booktabs,cancel}
 \usepackage[version=3]{mhchem}
 \usepackage{hologo}
@@ -101,6 +101,12 @@
 \chemsetup[option]{synchronize,language=italian}
 \colorlet{chemformula}{darkgray}
 
+\sisetup{
+  detect-mode=false,
+  mode=text,
+  text-rm=\addfontfeatures{Numbers={Proportional,Lining}}
+}
+
 \usepackage{filecontents}
 
 \begin{filecontents*}{\jobname.ist}
@@ -112,10 +118,11 @@
  heading_prefix "{\\bfseries "
  heading_suffix "\\hfil}\\nopagebreak\n"
  headings_flag  1
- delim_0 "\\dotfill "
- delim_1 "\\dotfill "
- delim_2 "\\dotfill "
- delim_r "\\textendash"
+ delim_0 "\\dotfill\\hyperpage{"
+ delim_1 "\\dotfill\\hyperpage{"
+ delim_2 "\\dotfill\\hyperpage{"
+ delim_r "}\\textendash\\hyperpage{"
+ delim_t "}"
  suffix_2p "\\nohyperpage{\\,f.}"
  suffix_3p "\\nohyperpage{\\,ff.}"
 \end{filecontents*}
@@ -166,7 +173,9 @@
     denominator-bot-sep = -.2ex ,
     denominator-format  = \scriptsize #1 ,
     numerator-top-sep   = -.2ex ,
-    numerator-format    = \scriptsize #1
+    numerator-format    = \scriptsize #1 ,
+    slash-right-kern    = .05em ,
+    slash-left-kern     = .05em
   }
 
 \newcommand*\chemformula{{\scshape\textcolor{cnpkgblue}{chemformula}}\xspace}
@@ -220,7 +229,9 @@
 \newcommand*\pes{\mbox{p.\,es.}\xspace}
 
 \usepackage{imakeidx}
+\indexsetup{othercode=\footnotesize}
 \makeindex[columns=3,intoc,options={-sl \jobname.ist}]
+
 \begin{document}
 \chemsetup[chemformula]{
   font-spec =
@@ -571,6 +582,7 @@ Selezionando come lingua \code{italian} vengono definiti ulteriori comandi \ac{i
  \item Nei fattori stechiometrici viene inserito uno zero iniziale quando mancante.
  \item Nuova opzione \key{stoich-paren-parse}.
  \item Numerose variazioni interne del codice.
+ \item Nuova opzione \key{arrow-min-length}.
 \end{itemize}
 \secidx*{Novità}\secidx*{PRIMA DI COMINCIARE}
 
@@ -1020,7 +1032,11 @@ Esiste un'opzione che varia lo stile di rappresentazione di \p{}:
 cariche formali iniziano con la lettera \code{f}.
 
 \subsection{Cariche ioniche}\label{ssec:ionen}\secidx{Cariche ioniche}
-Le cariche (reali) sono di facile impiego:
+Le cariche (reali) sono di facile impiego. Si noti che i comandi sono stati
+introdotti quando \chemmacros aveva ancora come obbiettivo l'alta compatibilità
+con \paket{mhchem}, e \Chemformula non esisteva ancora. Sono ancora disponibili,
+anche se personalmente consiglio di usare \cmd{ch} (vedi~ref{part:chemformula})
+e di dimenticare questi comandi.
 \begin{beschreibung}
  \befehl{pch}[<number>] carica positiva (\textbf{p}lus + \textbf{ch}arge)
  \befehl{mch}[<number>] carica negativa (\textbf{m}inus + \textbf{ch}arge)
@@ -1202,6 +1218,7 @@ assumere uno dei valori seguenti:
 \end{beschreibung}
 \secidx*{Meccanismi di reazione}
 
+% TODO: watch pagebreaks!
 \section{Reazioni redox}\label{sec:redoxreaktionen}\secidx{Reazioni redox}
 \chemmacros mette a disposizione due comandi con cui mostrare il trasferimento
 di elettroni nelle reazioni redox\footnote{Ringrazio~\href{http://www.mathannotated.com/}{Peter Cao},
@@ -1257,7 +1274,6 @@ permette di variare la distanza tra atomo e inizio della linea.
 \end{beispiel}
 
 % TODO: watch pagebreaks!
-\newpage
 Esempi:
 \begin{beispiel}[dist]
  \ch{ 2 "\OX{o1,Na}" + "\OX{r1,Cl}" {}2 -> 2 "\OX{o2,Na}" \pch{} + 2
@@ -2215,7 +2231,7 @@ adattata alle proprie necessità. Le impostazioni di default sono elencate di se
     slash-right-kern = -.15em
   }
 \end{beispiel}
-Questo documento impiega il Font \textsc{Linux Libertine O} e la definizione seguente:
+Questo documento impiega il Font Linux Libertine~O e la definizione seguente:
 \begin{beispiel}[code only]
  \DeclareInstance{xfrac}{chemformula-text-frac}{text}
   {
@@ -2223,7 +2239,9 @@ Questo documento impiega il Font \textsc{Linux Libertine O} e la definizione seg
     denominator-bot-sep = -.2ex ,
     denominator-format  = \scriptsize #1 ,
     numerator-top-sep   = -.2ex ,
-    numerator-format    = \scriptsize #1
+    numerator-format    = \scriptsize #1 ,
+    slash-right-kern    = .05em ,
+    slash-left-kern     = .05em
   }
 \end{beispiel}
 
@@ -2723,6 +2741,9 @@ Con le opzioni seguenti è possibile adattare la resa grafica delle frecce:
  \option{arrow-offset}{<dim>} La lunghezza della freccia eccedente l'etichetta (a
    sinistra e destra). La lunghezza di una freccia vuota è il doppio di \code{arrow-offset}.
    Una lunghezza di \TeX. Default = \code{.75em}
+\option{arrow-min-length}{<dim>} La lunghezza minima che deve avere un errore,
+  se tale lunghezza è inferiore al doppio di \key{arrow-offset} più la larghezza
+  dell'etichetta. Default = \code{0pt}
  \option{arrow-yshift}{<dim>} Sposta una freccia verso l'alto (valore positivo) o
    verso il basso (valore negativo); una dimensione di \TeX. Default = \code{0pt}
  \option{arrow-ratio}{<factor>} Il rapporto tra le lunghezze delle frecce di equilibrio
@@ -3211,7 +3232,7 @@ ma non riconosce (ancora) la lingua impostata con \paket{babel} o \paket{polyglo
 È mia intenzione implementare ulteriori lingue in futuro; tuttavia potrebbe volerci
 ancora del tempo. Chi volesse partecipare a \ghsystem e trascrivere le frasi in
 un'altra lingua, è invitato a contattarmi%
-\footnote{\href{mailto:contac@mychemistry.eu}{contact@mychemistry.eu}};
+\footnote{\href{mailto:contact@mychemistry.eu}{contact@mychemistry.eu}};
 gli metterò a disposizione un file template, un \acs{pdf} contenenti le traduzioni
 officiali ed ogni ulteriore aiuto necessario.
 
@@ -3427,7 +3448,7 @@ riprodurre il bug. È anche possibile segnalaro come \enquote{Issue} su
 Ringrazio tanto anche tutti coloro da cui ho già avuto segnalazioni, in particolare
 (in ordine alfabetico):
 \begin{itemize}
- \item \href{http://www.mathannotated.com/}{Peter Cao}
+ \item Peter Cao
  \item Christina Lüdigk
  \item Dr.\ Paul King
  \item Jonas Rivetti (traduzione delle frasi H e P in italiano; molte grazie anche
@@ -3436,7 +3457,7 @@ Ringrazio tanto anche tutti coloro da cui ho già avuto segnalazioni, in partico
  \item Timo Stein
 \end{itemize}
 
-{\EmbracOff\printbibliography[title=Bibliografia]}
+\printbibliography
 
 {\catcode`\^=11 \catcode`\#=11 \catcode`\|=11
 \printindex}
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
index 715ff06b1ad..12344325e7d 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
@@ -302,6 +302,7 @@
 \dim_new:N  \l__chemformula_arrow_length_dim
 \dim_new:N  \l__chemformula_arrow_label_offset_dim
 \dim_set:Nn \l__chemformula_arrow_label_offset_dim { 2pt }
+\dim_new:N  \l__chemformula_arrow_minimum_length_dim
 \dim_new:N  \l__chemformula_arrow_shortage_dim
 \dim_new:N  \l__chemformula_arrow_offset_dim
 \dim_set:Nn \l__chemformula_arrow_offset_dim { .75em }
@@ -328,6 +329,13 @@
       { \l__chemformula_arrow_offset_dim }
     \dim_add:Nn \l__chemformula_arrow_length_dim
       { \l__chemformula_arrow_offset_dim }
+    \dim_compare:nF
+      { \l__chemformula_arrow_length_dim > \l__chemformula_arrow_minimum_length_dim }
+      {
+        \dim_set_eq:NN
+          \l__chemformula_arrow_length_dim
+          \l__chemformula_arrow_minimum_length_dim
+      }
     \dim_set:Nn \l__chemformula_arrow_shortage_dim
       {
         \l__chemformula_arrow_length_dim *
@@ -351,6 +359,7 @@
 \tl_new:N  \l__chemformula_arrow_style_tl
 \tl_new:N  \l__chemformula_arrow_label_style_tl
 \tl_set:Nn \l__chemformula_arrow_label_style_tl { \footnotesize }
+\tl_new:N  \l__chemformula_arrow_tmp_tl
 
 \prop_new:N \l__chemformula_arrows_code_prop
 \seq_new:N  \l__chemformula_arrows_type_seq
@@ -535,14 +544,15 @@
 % arrow customization
 \keys_define:nn { chemmacros / chemformula }
   {
-    arrow-offset .dim_set:N = \l__chemformula_arrow_offset_dim ,
-    arrow-yshift .dim_set:N = \l__chemformula_arrow_yshift_dim ,
-    arrow-ratio  .tl_set:N  = \l__chemformula_arrow_ratio_tl ,
-    label-offset .dim_set:N = \l__chemformula_arrow_label_offset_dim ,
-    compound-sep .dim_set:N = \l__chemformula_compound_sep_dim ,
-%     arrow-tips   .tl_set:N  = \l__chemformula_arrow_head_tl ,
-    arrow-style  .tl_set:N  = \l__chemformula_arrow_style_tl ,
-    label-style  .tl_set:N  = \l__chemformula_arrow_label_style_tl
+    arrow-offset     .dim_set:N = \l__chemformula_arrow_offset_dim ,
+    arrow-min-length .dim_set:N = \l__chemformula_arrow_minimum_length_dim ,
+    arrow-yshift     .dim_set:N = \l__chemformula_arrow_yshift_dim ,
+    arrow-ratio      .tl_set:N  = \l__chemformula_arrow_ratio_tl ,
+    label-offset     .dim_set:N = \l__chemformula_arrow_label_offset_dim ,
+    compound-sep     .dim_set:N = \l__chemformula_compound_sep_dim ,
+%     arrow-tips       .tl_set:N  = \l__chemformula_arrow_head_tl ,
+    arrow-style      .tl_set:N  = \l__chemformula_arrow_style_tl ,
+    label-style      .tl_set:N  = \l__chemformula_arrow_label_style_tl
   }
 
 %-----------------------------------------------------------------------------%
@@ -564,12 +574,13 @@
       \seq_map_function:NN
         \l__chemformula_input_seq
         \chemformula_input:n
-      \__chemformula_generate_arrows:V \l__chemformula_input_tl
-      \__chemformula_generate_name:V \l__chemformula_output_tl
-      \tl_set_rescan:Nno \l__chemformula_output_tl
+%       \tl_set_eq:NN
+%         \l__chemformula_output_tl
+%         \l__chemformula_input_tl
+      \tl_set_rescan:Nno \l__chemformula_input_tl
         { \ExplSyntaxOn \makeatletter }
-        { \l__chemformula_output_tl }
-      \chemformula_write:V \l__chemformula_output_tl
+        { \l__chemformula_input_tl }
+      \chemformula_write:V \l__chemformula_input_tl
     \group_end:
   }
 
@@ -664,17 +675,17 @@
 
 %-----------------------------------------------------------------------------%
 % arrow generation & detection
-\cs_new:Npn \__chemformula_generate_arrows:n #1
+\cs_new:Npn \__chemformula_generate_arrows:Nn #1#2
   {
-    \tl_set:Nn \l__chemformula_tmpa_tl { #1 }
+    \tl_set:Nn \l__chemformula_tmpa_tl { #2 }
     \seq_map_inline:Nn \l__chemformula_arrows_type_seq
       {
         \tl_replace_all:Nnn \l__chemformula_tmpa_tl
           { ##1 } { \__chemformula_arrows_get:n { ##1 } }
       }
-    \tl_set_eq:NN \l__chemformula_output_tl \l__chemformula_tmpa_tl
+    \tl_set_eq:NN #1 \l__chemformula_tmpa_tl
   }
-\cs_generate_variant:Nn \__chemformula_generate_arrows:n { V }
+\cs_generate_variant:Nn \__chemformula_generate_arrows:Nn { NV }
 
 \cs_new_protected:Npn \__chemformula_detect_arrows:n #1
   {
@@ -690,6 +701,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % compound names
 \dim_new:N \l__chemformula_name_dim
+\tl_new:N  \l__chemformula_name_tmp_tl
 
 \cs_new:Npn \__chemformula_name_cmpd:w
   { \peek_meaning:NTF ( { \__chemformula_name_cmpd_aux:w } { ! } }
@@ -714,14 +726,18 @@
     \)
   }
 
-\cs_new_protected:Npn \__chemformula_generate_name:n #1
+\cs_new_protected:Npn \__chemformula_generate_name:Nn #1#2
   {
-    \tl_set:Nn \l__chemformula_tmpa_tl { #1 }
+    \tl_set:Nn \l__chemformula_tmpa_tl { #2 }
     \tl_if_in:VnT \l__chemformula_tmpa_tl { ! }
-      { \tl_replace_all:Nnn \l__chemformula_tmpa_tl { ! } { \__chemformula_name_cmpd:w } }
-    \tl_set_eq:NN \l__chemformula_output_tl \l__chemformula_tmpa_tl
+      {
+        \tl_replace_all:Nnn \l__chemformula_tmpa_tl
+          { ! }
+          { \__chemformula_name_cmpd:w }
+      }
+    \tl_set_eq:NN #1 \l__chemformula_tmpa_tl
   }
-\cs_generate_variant:Nn \__chemformula_generate_name:n { V }
+\cs_generate_variant:Nn \__chemformula_generate_name:Nn { NV }
 
 \cs_new_protected:Npn \__chemformula_detect_name:n #1
   {
@@ -773,7 +789,7 @@
 \tl_new:N  \l__chemformula_chemformula_tmpa_tl
 \tl_new:N  \g__chemformula_options_tl
 \tl_new:N  \g__chemformula_output_tl
-\tl_new:N  \l__chemformula_output_tl
+% \tl_new:N  \l__chemformula_output_tl
 \tl_new:N  \l__chemformula_input_tl
 \tl_new:N  \l__chemformula_stoich_tl
 \tl_new:N  \l__chemformula_decimal_output_tl
@@ -1514,8 +1530,9 @@
       { \sfrac[chemformula-text-frac]{#1}{#2} }
     \bool_if:NT \l__chemformula_nicefrac_bool
       { \nicefrac{#1}{#2} }
+    % FIXME: why doesn't this work without \textstyle?
     \bool_if:NT \l__chemformula_mathfrac_bool
-      { $ \frac{ \text { #1 } } { \text { #2 } } $ }
+      { $ \textstyle \frac{ \text { #1 } } { \text { #2 } } $ }
   }
 
 \cs_new:Npn \__chemformula_misc_frac:nnn #1#2#3
@@ -1773,7 +1790,10 @@
         !\l__chemformula_first_last_text_bool &&
         !\l__chemformula_first_last_math_bool
       }
-      { \tl_put_right:Nn \l__chemformula_input_tl { #1 } }
+      {
+        \__chemformula_generate_arrows:Nn \l__chemformula_arrow_tmp_tl { #1 }
+        \tl_put_right:NV \l__chemformula_input_tl \l__chemformula_arrow_tmp_tl
+      }
     \bool_set_false:N \l__chemformula_is_arrow_bool
   }
 \cs_generate_variant:Nn \chemformula_input_arrow:n { o }
@@ -1788,7 +1808,10 @@
         !\l__chemformula_first_last_text_bool &&
         !\l__chemformula_first_last_math_bool
       }
-      { \tl_put_right:Nn \l__chemformula_input_tl { #1 } }
+      {
+        \__chemformula_generate_name:Nn \l__chemformula_name_tmp_tl { #1 }
+        \tl_put_right:NV \l__chemformula_input_tl \l__chemformula_name_tmp_tl
+      }
     \bool_set_false:N \l__chemformula_is_name_bool
   }
 
@@ -2035,6 +2058,7 @@ see the chemmacros.sty file
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % TODO
+- Bug: math- und text-escaping schützt nicht vor arrow-Umwandlung: \ch{"->"}
 - Addukte: Zahlen nach * und . automatisch erkennen?
 - allow fractions in subscripts: _{$\frac{1}{2}$} ?
 - optionale Argumente von \\ nach außen weiterreichen?
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
index 38b5e573c43..efa0b0d2138 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.6}
-\def\chemmacros@date{2013/02/26}
+\def\chemmacros@version{3.6b}
+\def\chemmacros@date{2013/04/19}
 
 \ProvidesExplPackage
   {chemmacros}
@@ -583,6 +583,7 @@
   { \mathpalette \__chemmacros_fplus_aux: \bigcirc }
 
 % TODO: can I rewrite this in a more "expl3-way"?
+% and what about a ``text'' version?
 \cs_new:Npn \__chemmacros_fplus_aux: #1#2
   {
     \ooalign
@@ -1076,12 +1077,7 @@
   { \chemmacros_cip:n { #1 } }
 
 \cs_new:Npn \chemmacros_cip:n #1
-  {
-    \cs_if_exist:NTF \EmbracOff
-      { \textit* { (#1) } }
-      { \textit  { (#1) } }
-    \tex_kern:D \l__chemmacros_cip_kern_dim
-  }
+  { (\textit{#1}\tex_kern:D \l__chemmacros_cip_kern_dim) }
 
 \DeclareChemDeprecated \Rcip \R { \cip { R } }
 \DeclareChemDeprecated \Scip \S { \cip { S } }
@@ -4004,6 +4000,11 @@ Version history
                             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
 
 % --------------------------------------------------------------------------- %
 % TODO: