chemnum (13may15)

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

4 files changed, 27 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/chemnum/README b/Master/texmf-dist/doc/latex/chemnum/README
index 8842efff412..7b014bce08c 100644
--- a/Master/texmf-dist/doc/latex/chemnum/README
+++ b/Master/texmf-dist/doc/latex/chemnum/README
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------
-chemnum v1.0b 2014/06/02
+chemnum v1.1a 2014/05/13
 
   a comprehensive approach for the numbering of chemical compounds
 
@@ -10,7 +10,7 @@ Web:
   v1.* https://github.com/cgnieder/chemnum
 E-Mail: contact@mychemistry.eu
 --------------------------------------------------------------------------
-Copyright 2011-2014 Clemens Niederberger
+Copyright 2011-2015 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/doc/latex/chemnum/chemnum_en.pdf b/Master/texmf-dist/doc/latex/chemnum/chemnum_en.pdf
index b4708c4d74f..daa4771fcf5 100644
--- a/Master/texmf-dist/doc/latex/chemnum/chemnum_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemnum/chemnum_en.pdf
diff --git a/Master/texmf-dist/doc/latex/chemnum/chemnum_en.tex b/Master/texmf-dist/doc/latex/chemnum/chemnum_en.tex
index e696933cd2b..f1d1db2d074 100644
--- a/Master/texmf-dist/doc/latex/chemnum/chemnum_en.tex
+++ b/Master/texmf-dist/doc/latex/chemnum/chemnum_en.tex
@@ -194,6 +194,9 @@ Most of the commands will be explained in a later section in more detail.
     \ac{pdf} strings (\cf\ \cs*{texorpdfstring}\marg{\TeX}\marg{\ac{pdf}
       string}). This command is described in
     section~\ref{sec:deta-comp-labels}.
+  \command{replacecmpd}[\code{+}\oarg{options}\marg{\ac{id}}]
+    A command for replacing tags in \ac{eps} files, see
+    section~\ref{sec:replacing-tags-aceps} for details.
   \command{initcmpd}[\oarg{options}\marg{list of \acp{id}}]
     Initiate compound labels.  This command can only be used in the preamble.
     It is desribed in section~\ref{sec:deta-comp-labels}.
@@ -846,7 +849,7 @@ explicitly will overwrite the language sensitivity.  If you only want to adapt
 the separators to your language have a look at
 section~\ref{sec:lang-depend-sett}.
 
-\section{Replacing Tags in \ac{eps} or \ac{ps} Files}
+\section{Replacing Tags in \ac{eps} or \ac{ps} Files}\label{sec:replacing-tags-aceps}
 
 Although it is quite possible to create rection schemes within \LaTeX\
 directly -- for example with the \pkg{chemfig} package~\cite{pkg:chemfig} --
@@ -862,6 +865,12 @@ method is usually used:
     use \cs{replacecmpd} once for every temporary tag.
 \end{itemize}
 
+\begin{commands}
+  \command{replacecmpd}[\code{+}\oarg{options}\marg{\ac{id}}]
+    Replaces a tag in the following \ac{eps} file.  This command doesn't have
+    an optional star otherwise the syntax is the same as with \cs{cmpd}.
+\end{commands}
+
 Figure~\ref{fig:scheme-tmp-tags} shows a scheme with temporary tags.  It is
 produced with the following code where the class \cls{standalone} has been
 used to get the figure only:
@@ -893,6 +902,12 @@ The replacement is done with the help of the \pkg{psfrag}
 package~\cite{pkg:psfrag} and its \cs{psfrag} command.  For details on this
 package and its command I refer to its documentation.
 
+Although the examples don't do it the usage of \cs{replacecmpd} and the
+corresponding graphic file should be placed inside a group (probably a
+\env*{figure} or a \env*{scheme} environment) in order to keep the stepping of
+the tag number local: this allows to use the same tags \code{TMP1},
+\code{TMP2}, \ldots, in the next figure again.
+
 As you can see the labels are printed sans serif.  This setting can of course
 be changed.  The complete list of options is this:
 \begin{options}
diff --git a/Master/texmf-dist/tex/latex/chemnum/chemnum.sty b/Master/texmf-dist/tex/latex/chemnum/chemnum.sty
index a6cb73cb3f7..4e8beed3d3e 100644
--- a/Master/texmf-dist/tex/latex/chemnum/chemnum.sty
+++ b/Master/texmf-dist/tex/latex/chemnum/chemnum.sty
@@ -12,7 +12,7 @@
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-% Copyright 2011-2014 Clemens Niederberger
+% Copyright 2011-2015 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -26,8 +26,8 @@
 %
 % The Current Maintainer of this work is Clemens Niederberger.
 % --------------------------------------------------------------------------
-\def\chemnumdate{2014/08/08}
-\def\chemnumversion{1.1}
+\def\chemnumdate{2015/05/13}
+\def\chemnumversion{1.1a}
 \def\chemnuminfo{a comprehensive approach for the numbering of chemical compounds}
 
 \RequirePackage{expl3}[2013/07/14]
@@ -1742,7 +1742,9 @@
   {
     % place the label
     % just in case it hasn't been declared:
-    \labelcmpd[{#2}]{#3}
+    \bool_if:nF {#1} {
+      \chemnum_cmpd:nnnn { \c_true_bool } { \c_false_bool } {#2} {#3}
+    }
     % set specific replacement options
     \keys_set_groups:nnn {chemnum} {replace} { replace=false, #2 }
     \bool_if:nTF
@@ -1775,7 +1777,7 @@
             \group_begin:
               \exp_not:V \l__chemnum_compound_replace_local_format_tl
               \exp_not:n
-                { \chemnum_cmpd:nnnn { \c_false_bool } { #1 } { #2 } { #3 } }
+                { \chemnum_cmpd:nnnn { \c_false_bool } {#1} {#2} {#3} }
             \group_end:
           }
       }
@@ -1788,7 +1790,7 @@
             \group_begin:
               \exp_not:V \l__chemnum_compound_replace_format_tl
               \exp_not:n
-                { \chemnum_cmpd:nnnn { \c_false_bool } { #1 } { #2 } { #3 } }
+                { \chemnum_cmpd:nnnn { \c_false_bool } {#1} {#2} {#3} }
             \group_end:
           }
       }
@@ -1939,4 +1941,5 @@ HISTORY:
 2014/06/02 v1.0b - bug fix: list of sublabels can now correctly be sorted and
                    compressed if referenced before they're defined
 2014/08/08 v1.1  - new option `replace-tag-nr'
+2015/05/13 v1.1a - fix bug in \replacecmpd