chemmacros (29jan14)

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

8 files changed, 70 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README
index 2987f1262a7..48b53adb453 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/README
+++ b/Master/texmf-dist/doc/latex/chemmacros/README
@@ -1,10 +1,10 @@
 --------------------------------------------------------------------------
-the CHEMMACROS bundle 2014/01/09
- - chemmacros package v4.3  -> macros and commands for chemists
- - chemformula package v4.3 -> typeset chemical compounds and reactions
+the CHEMMACROS bundle 2014/01/29
+ - chemmacros package v4.4   -> macros and commands for chemists
+ - chemformula package v4.4  -> typeset chemical compounds and reactions
  - ghsystem package v4.2e    -> typeset H & P statements and pictograms
                                 from the globally harmonised system (GHS)
- - chemgreek package v0.3   -> handle mapping of upright greek letters to
+ - chemgreek package v0.4    -> handle mapping of upright greek letters to
                                 the \chemalpha ... commands
 --------------------------------------------------------------------------
 This bundle succeeds the chemmacros package which is now part of the
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.pdf
index dd6454d7889..6ac302eab5b 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/chemformula_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex
index 1266b358f6c..36ff900a1fa 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemformula_en.tex
@@ -311,6 +311,12 @@ then \chemmacros\ will not be loaded.  The \chemmacros\ package, however,
     the new command is already defined.
 \end{itemize}
 
+\subsection{Version 4.4}
+\begin{itemize}
+  \item A single dash \code{-} in \cs{ch} is now treated as a minus sign.
+  This is consistent with the behaviour of a \code{+}.
+\end{itemize}
+
 \section{Licence and Requirements}
 \license
 
@@ -882,9 +888,13 @@ There are some \enquote{special type} input groups.
 The first kind are groups which consist of only one token, namely of the
 following ones:
 \begin{commands}
-  \command{ch}[\marg{ + } \ch{ + }]
+  \command{ch}[\Marg{ + } \ch{ + }]
     Creates the plus sign between compounds with space around it:\\
     \cs{ch}\Marg{2 Na + Cl2} \ch{2 Na + Cl2}
+  \command{ch}[\Marg{ - } \ch{ - }]
+    \sinceversion{4.3a}Creates the minus sign between compounds with space
+    around it:\\
+    \cs{ch}\Marg{M - H} \ch{M - H}
   \command{ch}[\Marg{ v } \ch{ v }]
     Sign for precipitate: \cs{ch}\Marg{BaSO4 v} \ch{BaSO4 v}
   \command{ch}[\Marg{ \textasciicircum\ } \ch{ ^ }]
@@ -893,13 +903,14 @@ following ones:
 \end{commands}
 \footnotetext{Is this the correct English term? Please correct me if it isn't.}
 
-The space left and right of the plus sign can be set with this option:
+The space left and right of the plus and the minus sign can be set with this
+option:
 \begin{options}
   \keyval{plus-space}{skip}\Default{.3em plus .1em minus .1em}
     A rubber length.
   \keyval{plus-penalty}{num}\Default{700}
-    \sinceversion{4.0a}The penalty that is inserted after the plus sign for
-    (dis-)allowing line breaks.
+    \sinceversion{4.0a}The penalty that is inserted after the plus and the
+    minus sign for (dis-)allowing line breaks.
 \end{options}
 \begin{example}[side-by-side]
   \ch{A + B}\par
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.pdf
index 44bbb921461..b25f82c8f41 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/chemgreek_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex
index 6cc4e45adb1..c26422e4167 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemgreek_en.tex
@@ -1,7 +1,7 @@
-% !arara: pdflatex
-% arara: biber
-% !arara: pdflatex
+% arara: pdflatex: { shell: on }
+% !arara: biber
 % arara: pdflatex
+% !arara: pdflatex
 % --------------------------------------------------------------------------
 % the CHEMMACROS bundle
 %   chemgreek_en.tex
@@ -75,7 +75,7 @@
       newman, nitrogen, NMR, Nu, Nuc,
     orbital, ortho, ox, OX, oxygen,
     para, pch, per, pH, phase, phosphorus, photon, pKa, pKb, pOH, pos,
-      positron, Pot, prt,
+      positron, Pot, prt, printchemgreekalphabet ,
     Rad, redox, RenewChemArrow, RenewChemBond, renewchemgreekmapping,
       RenewChemIUPAC, RenewChemLatin, RenewChemNMR, RenewChemParticle,
       RenewChemPhase, RenewChemState,
@@ -103,8 +103,8 @@
     ominus, oplus,
     percent, pgfarrowsdeclarealias, pgfarrowsrenewalias,
     renewtagform, rightarrow,
-    sample, scriptscriptstyle, setatomsep, setbondoffset, sfrac, shorthandoff,
-      si, SI, sisetup, square, subsection,
+    sample, scriptscriptstyle, setatomsep, setbondoffset, setmainfont, sfrac,
+      shorthandoff, si, SI, sisetup, square, subsection,
     textcolor, textendash, textsuperscript, tiny, toprule,
     upbeta, upeta, upgamma, upPhi, upphi, usetikzlibrary,
     volt, vphantom, vspave,
@@ -317,6 +317,14 @@ used by \chemmacros\ and its \acs{iupac} naming commands.
     about \cs*{texorpdfstring}.
 \end{itemize}
 
+\subsection{Version~0.4}
+\begin{itemize}
+  \item The mapping ``fontspec'' has been added.  In order to use it you
+    need the \pkg{fontspec} package~\cite{pkg:fontspec} loaded.  This means it
+    can only be used with \LuaLaTeX\ or \XeLaTeX.
+  \item New command \cs{printchemgreekalphabet}.
+\end{itemize}
+
 \section{Define Mappings}
 \selectchemgreekmapping{default}
 
@@ -392,7 +400,10 @@ available mappings.
 \section{Predefined Mappings and Selection of a Mapping}
 \chemgreek\ predefines some mappings.  Some of the mappings require additional
 packages to be loaded.  The mapping names and the required packages are listed
-in table~\ref{tab:mappings}.
+in table~\ref{tab:mappings}.  Ths mapping \code{fontspec} is a bit different
+here:  if you use this mapping then the fact is used that \pkg{fontspec} also
+defines commands like \cs*{textalpha}.  However, they only work if you also
+use a font that has the Greek glyphs.
 
 \begin{table}
   \centering
@@ -409,6 +420,7 @@ in table~\ref{tab:mappings}.
       mathdesign  & \pkg{mathdesign} \cite{pkg:mathdesign} \\
       fourier     & \pkg{fourier} \cite{pkg:fourier} \\
       textalpha   & \pkg{textalpha} \cite{bnd:greek-fontenc} \\
+      fontspec    & \pkg{fontspec} \cite{pkg:fontspec} \\
     \bottomrule
   \end{tabular}
   \caption{Predefined mappings.}
@@ -437,6 +449,21 @@ A mapping is selected and activated with one of the following commands:
   \chemphi\ and \chemPhi, $\upphi$ and $\upPhi$
 \end{example}
 
+Since the \code{fontspec} mapping is a little bit different than the others
+I'd like to show a little example for it.  The difference is subtle: you need
+to choose a font containing the needed glyphs.
+
+\begin{example}[compile,program=lualatex,runs=1,add-frame=false]
+  \documentclass[margin=3pt]{standalone}
+  \usepackage{fontspec}
+  \setmainfont{Linux Libertine O}% need a font that has the glyphs!
+  \usepackage{chemgreek}
+  \selectchemgreekmapping{fontspec}
+  \begin{document}
+  \printchemgreekalphabet
+  \end{document}
+\end{example}
+
 \section{Changing a Specific Symbol in an Existing Mapping}
 If you should want to change a specific entry of a specific mapping it would
 be rather tedious to redefine the whole mapping.  That is why \chemgreek\
@@ -458,6 +485,7 @@ mapping afterwards:
 \end{example}
 
 \section{Inspecting a Mapping}
+\selectchemgreekmapping{newtx}
 If you want to check if a mapping has been correctly set you can use the
 following commands:
 \begin{commands}
@@ -465,6 +493,9 @@ following commands:
     \sinceversion{0.3}This will typeset a table (using a simple \code{tabular}
     environment) with all~48 characters like the one shown in
     table~\ref{tab:showmapping}.
+  \command{printchemgreekalphabet}
+    \sinceversion{0.4}This will print the twentyfour pairs of lower- and
+    uppercase letters of the currently active mapping: \printchemgreekalphabet.
   \command{showchemgreekmapping}[\marg{mapping}]
     \changedversion{0.3}This command will write information about the
     definition of all 48~macros for a mapping to the log file.
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
index db6381cf1ba..31851b59554 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 33552b27838..517d55d2ea8 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
@@ -419,6 +419,12 @@ With version~4.0 some changes have been made:
   \item The command \cs{mhName} has been dropped.
 \end{itemize}
 
+\subsection{Version 4.4}
+\begin{itemize}
+  \item New \module{nmr} option \option{atom-number-cs}.
+  \item New \module{nmr} option \option{coupling-pos-cs}.
+\end{itemize}
+
 \section{Package Options}\label{sec:options}
 \chemmacros\ has several package options. They all are used as key/value pairs
 like
@@ -1794,6 +1800,12 @@ number of options.  For historical reasons they all belong to the module
     \sinceversion{4.3}Code inserted before the coupling bonds.
   \keyval{coupling-bonds-post}{code}\Module{nmr}\Default{\cs*{!}}
     \sinceversion{4.3}Code inserted after the coupling bonds.
+  \keyval{coupling-pos-cs}{cs}\Module{nmr}\Default{\cs*{@firstofone}}
+    \sinceversion{4.4}Set the macro that prints the number set with the
+    \cs{pos} macro.  This needs to be a command with one mandatory argument.
+  \keyval{atom-number-cs}{cs}\Module{nmr}\Default{\cs*{@firstofone}}
+    \sinceversion{4.4}Set the macro that prints the number set with the
+    \cs{\#} macro.  This needs to be a command with one mandatory argument.
   \keybool{parse}\Module{nmr}\Default{true}
     Treat the solvent as \chemformula\ formula or not.
   \keyval{delta}{tokens}\Module{nmr}\Default
@@ -2282,7 +2294,7 @@ states of aggregation.  You can easily define them.
     See section~\ref{sec:lang-depend} for a way to define language dependent
     settings.
   \command{RenewChemPhase}[\marg{cs}\oarg{german}\marg{english}]
-    Redefine an existing pahse command.  Actually the optional argument is an
+    Redefine an existing phase command.  Actually the optional argument is an
     artefact of an earlier implementation of the command.  It has no effect at
     all.  See section~\ref{sec:lang-depend} for a way to define language
     dependent settings.
diff --git a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf
index c0a3ea31a47..288abb1dacf 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/ghsystem_en.pdf