chemschemex (4Apr)

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

1 files changed, 26 insertions, 25 deletions

diff --git a/Master/texmf-dist/source/latex/chemschemex/chemschemex.dtx b/Master/texmf-dist/source/latex/chemschemex/chemschemex.dtx
index d51561cfdd7..fa5fda7a42a 100644
--- a/Master/texmf-dist/source/latex/chemschemex/chemschemex.dtx
+++ b/Master/texmf-dist/source/latex/chemschemex/chemschemex.dtx
@@ -18,7 +18,7 @@
 %
 % <package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 % <package>\ProvidesPackage{chemschemex}
-% <package>[2014/07/15 v1.0]
+% <package>[2017/04/03 v1.1.1]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -41,7 +41,7 @@
 \newstruct[{R=H},{R=Me},{R=Ph}]{maleimid}{maleimid}{Maleimid}{}
 \newstruct{cp}{cyclopentadiene}{Cyclopentadiene}{cp}
 \newstruct[{R=H},{R=Me},{R=Ph}]{product}{}{}{}
-\date{2014/07/15}
+\date{2017/04/03}
 \begin{document}
     \DocInput{chemschemex.dtx}
 \end{document}
@@ -67,6 +67,8 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \changes{v1.0}{2014/07/15}{Initial version}
+% \changes{v1.1}{2017/04/02}{Bug within the \textbackslash Struct command fixed}
+% \changes{v1.1.1}{2017/04/03}{No code changes, documentation attached}
 %
 % \GetFileInfo{chemschemex.sty}
 %
@@ -941,7 +943,11 @@
 % }
 % \end{Verbatim}
 %
-%
+% \section{Change history}
+% 	\begin{itemize}
+%		\item[2014/07/15] Initial version
+%		\item[2017/04/03] Bug within the \textbackslash Struct command fixed
+%	\end{itemize}
 %
 % \StopEventually{}
 %
@@ -949,7 +955,7 @@
 % \subsection{Identification}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{chemschemex}[2014/07/15 v1.0 Typeset chemical schemes]
+\ProvidesPackage{chemschemex}[2017/04/03 v1.1.1 Typeset chemical schemes]
 %    \end{macrocode}
 %
 % \subsection{Loading packages and define counter formats}
@@ -1859,31 +1865,26 @@
               {\fancyref@sort@list}%
    \edef\CSX@sorted@list{\fancyref@sort@list}%
    % Generate the caption
-   \def\@Struct@family{#1}%
-   \def\@Struct@filename{#3}%
+   \edef\@@Struct##1##2{%
+      % ##1=
+      % ##2=sublabel
+      \noexpand\@ifundefined{CSX@newstruct@#3@subcaption@##2}{%
+         \noexpand\PackageError{chemschemex}{Substructure '##2' not defined as %
+                                    substructure of '#3'. %
+                                    For the definition of substructures %
+                                    use the command \string\newstruct.}{}%
+       }{%
+         \noexpand\fancyref@addtolist{%
+            {{\noexpand\def\noexpand\fancylabelShowLabelEvent{\noexpand\CSXlabelsep}%
+              \noexpand\fancysublabel[#1]{#3}{##2}},%
+             {\noexpand\@nameuse{CSX@newstruct@#3@subcaption@##2}}}}%
+            {\noexpand\@@struct}%
+       }%
+   }%
    \expandnext{\fancyref@foreach{\@@Struct}{}}{\CSX@sorted@list}%
 }
 %    \end{macrocode}
 % \end{macro}
-% \begin{macro}{\@@Struct}
-%    \begin{macrocode}
-\newcommand{\@@Struct}[2]{%
-   % #1=
-   % #2=sublabel
-   \@ifundefined{CSX@newstruct@\@Struct@filename @subcaption@#2}{%
-      \PackageError{chemschemex}{Substructure '#2' not defined as %
-                                 substructure of '\@Struct@filename '. %
-                                 Use the \noexpand\newstruct  command for %
-                                 the definition of substructures.}{}%
-    }{%
-      \fancyref@addtolist{%
-         {{\def\fancylabelShowLabelEvent{\CSXlabelsep}\fancysublabel[\@Struct@family]{\@Struct@filename}{#2}},%
-          {\@nameuse{CSX@newstruct@\@Struct@filename @subcaption@#2}}}}%
-         {\@@struct}%
-    }%
-}
-%    \end{macrocode}
-% \end{macro}
 % \begin{macro}{\@Struct*}
 %    \begin{macrocode}
 \WithSuffix\newcommand\@Struct*[3]{%