summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-04-04 04:56:25 +0000
committerNorbert Preining <preining@logic.at>2017-04-04 04:56:25 +0000
commit6211d77fbc4c51c1d69410ad59c40741b9400e44 (patch)
tree0a9c42ad2ef48faa72dd64280c040715fc8da1a3 /Master
parentf04e93dee693425394125c4484ebb289861a2d43 (diff)
chemschemex (4Apr)
git-svn-id: svn://tug.org/texlive/trunk@43685 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/chemschemex/CH2=CH-R2.pdf (renamed from Master/texmf-dist/doc/latex/chemschemex/CH2CH-R2.pdf)bin3624 -> 3624 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemschemex/R1-CH=CH2.pdf (renamed from Master/texmf-dist/doc/latex/chemschemex/R1-CHCH2.pdf)bin3557 -> 3557 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemschemex/R2-CH=CH-R1.pdf (renamed from Master/texmf-dist/doc/latex/chemschemex/R2-CHCH-R1.pdf)bin3815 -> 3815 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemschemex/README2
-rw-r--r--Master/texmf-dist/doc/latex/chemschemex/Ru=CH-R1.pdf (renamed from Master/texmf-dist/doc/latex/chemschemex/RuCH-R1.pdf)bin3829 -> 3829 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemschemex/Ru=CH2.pdf (renamed from Master/texmf-dist/doc/latex/chemschemex/RuCH2.pdf)0
-rw-r--r--Master/texmf-dist/doc/latex/chemschemex/chemschemex.pdfbin290841 -> 292157 bytes
-rw-r--r--Master/texmf-dist/source/latex/chemschemex/chemschemex.dtx51
-rw-r--r--Master/texmf-dist/tex/latex/chemschemex/chemschemex.sty35
9 files changed, 44 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/latex/chemschemex/CH2CH-R2.pdf b/Master/texmf-dist/doc/latex/chemschemex/CH2=CH-R2.pdf
index da9b4965f7c..da9b4965f7c 100644
--- a/Master/texmf-dist/doc/latex/chemschemex/CH2CH-R2.pdf
+++ b/Master/texmf-dist/doc/latex/chemschemex/CH2=CH-R2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemschemex/R1-CHCH2.pdf b/Master/texmf-dist/doc/latex/chemschemex/R1-CH=CH2.pdf
index fc51e162beb..fc51e162beb 100644
--- a/Master/texmf-dist/doc/latex/chemschemex/R1-CHCH2.pdf
+++ b/Master/texmf-dist/doc/latex/chemschemex/R1-CH=CH2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemschemex/R2-CHCH-R1.pdf b/Master/texmf-dist/doc/latex/chemschemex/R2-CH=CH-R1.pdf
index 75856cb747e..75856cb747e 100644
--- a/Master/texmf-dist/doc/latex/chemschemex/R2-CHCH-R1.pdf
+++ b/Master/texmf-dist/doc/latex/chemschemex/R2-CH=CH-R1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemschemex/README b/Master/texmf-dist/doc/latex/chemschemex/README
index 304f4746ff5..7ff9496f992 100644
--- a/Master/texmf-dist/doc/latex/chemschemex/README
+++ b/Master/texmf-dist/doc/latex/chemschemex/README
@@ -1,5 +1,5 @@
---------------------------------------------------------
-chemschemex v1.0 2014/07/15
+chemschemex v1.1 2017/04/02
Chemical schemes including complex labeling and
referencing
diff --git a/Master/texmf-dist/doc/latex/chemschemex/RuCH-R1.pdf b/Master/texmf-dist/doc/latex/chemschemex/Ru=CH-R1.pdf
index 7de0d1a7513..7de0d1a7513 100644
--- a/Master/texmf-dist/doc/latex/chemschemex/RuCH-R1.pdf
+++ b/Master/texmf-dist/doc/latex/chemschemex/Ru=CH-R1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemschemex/RuCH2.pdf b/Master/texmf-dist/doc/latex/chemschemex/Ru=CH2.pdf
index ccdbc1fcb8c..ccdbc1fcb8c 100644
--- a/Master/texmf-dist/doc/latex/chemschemex/RuCH2.pdf
+++ b/Master/texmf-dist/doc/latex/chemschemex/Ru=CH2.pdf
diff --git a/Master/texmf-dist/doc/latex/chemschemex/chemschemex.pdf b/Master/texmf-dist/doc/latex/chemschemex/chemschemex.pdf
index ec0013a4ac6..b227a74298e 100644
--- a/Master/texmf-dist/doc/latex/chemschemex/chemschemex.pdf
+++ b/Master/texmf-dist/doc/latex/chemschemex/chemschemex.pdf
Binary files differ
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]{%
diff --git a/Master/texmf-dist/tex/latex/chemschemex/chemschemex.sty b/Master/texmf-dist/tex/latex/chemschemex/chemschemex.sty
index a4f80eb66ed..f39a9143436 100644
--- a/Master/texmf-dist/tex/latex/chemschemex/chemschemex.sty
+++ b/Master/texmf-dist/tex/latex/chemschemex/chemschemex.sty
@@ -25,7 +25,7 @@
%%
%% latex chemschemex.dtx
\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]
\RequirePackage{xkeyval}
\RequirePackage{etextools}
\RequirePackage{xargs}
@@ -753,25 +753,24 @@
{\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}%
}
-\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}%
- }%
-}
\WithSuffix\newcommand\@Struct*[3]{%
% #1=family
% #2=list of sublabels previously defined with \newstruct