From 6211d77fbc4c51c1d69410ad59c40741b9400e44 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 4 Apr 2017 04:56:25 +0000 Subject: chemschemex (4Apr) git-svn-id: svn://tug.org/texlive/trunk@43685 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/chemschemex/chemschemex.sty | 35 +++++++++++----------- 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/chemschemex') 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 -- cgit v1.2.3