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 --- .../texmf-dist/doc/latex/chemschemex/CH2=CH-R2.pdf | Bin 0 -> 3624 bytes .../texmf-dist/doc/latex/chemschemex/CH2CH-R2.pdf | Bin 3624 -> 0 bytes .../texmf-dist/doc/latex/chemschemex/R1-CH=CH2.pdf | Bin 0 -> 3557 bytes .../texmf-dist/doc/latex/chemschemex/R1-CHCH2.pdf | Bin 3557 -> 0 bytes .../doc/latex/chemschemex/R2-CH=CH-R1.pdf | Bin 0 -> 3815 bytes .../doc/latex/chemschemex/R2-CHCH-R1.pdf | Bin 3815 -> 0 bytes Master/texmf-dist/doc/latex/chemschemex/README | 2 +- .../texmf-dist/doc/latex/chemschemex/Ru=CH-R1.pdf | Bin 0 -> 3829 bytes Master/texmf-dist/doc/latex/chemschemex/Ru=CH2.pdf | 119 +++++++++++++++++++++ .../texmf-dist/doc/latex/chemschemex/RuCH-R1.pdf | Bin 3829 -> 0 bytes Master/texmf-dist/doc/latex/chemschemex/RuCH2.pdf | 119 --------------------- .../doc/latex/chemschemex/chemschemex.pdf | Bin 290841 -> 292157 bytes .../source/latex/chemschemex/chemschemex.dtx | 51 ++++----- .../tex/latex/chemschemex/chemschemex.sty | 35 +++--- 14 files changed, 163 insertions(+), 163 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/chemschemex/CH2=CH-R2.pdf delete mode 100644 Master/texmf-dist/doc/latex/chemschemex/CH2CH-R2.pdf create mode 100644 Master/texmf-dist/doc/latex/chemschemex/R1-CH=CH2.pdf delete mode 100644 Master/texmf-dist/doc/latex/chemschemex/R1-CHCH2.pdf create mode 100644 Master/texmf-dist/doc/latex/chemschemex/R2-CH=CH-R1.pdf delete mode 100644 Master/texmf-dist/doc/latex/chemschemex/R2-CHCH-R1.pdf create mode 100644 Master/texmf-dist/doc/latex/chemschemex/Ru=CH-R1.pdf create mode 100644 Master/texmf-dist/doc/latex/chemschemex/Ru=CH2.pdf delete mode 100644 Master/texmf-dist/doc/latex/chemschemex/RuCH-R1.pdf delete mode 100644 Master/texmf-dist/doc/latex/chemschemex/RuCH2.pdf (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/chemschemex/CH2=CH-R2.pdf b/Master/texmf-dist/doc/latex/chemschemex/CH2=CH-R2.pdf new file mode 100644 index 00000000000..da9b4965f7c Binary files /dev/null and b/Master/texmf-dist/doc/latex/chemschemex/CH2=CH-R2.pdf differ diff --git a/Master/texmf-dist/doc/latex/chemschemex/CH2CH-R2.pdf b/Master/texmf-dist/doc/latex/chemschemex/CH2CH-R2.pdf deleted file mode 100644 index da9b4965f7c..00000000000 Binary files a/Master/texmf-dist/doc/latex/chemschemex/CH2CH-R2.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/chemschemex/R1-CH=CH2.pdf b/Master/texmf-dist/doc/latex/chemschemex/R1-CH=CH2.pdf new file mode 100644 index 00000000000..fc51e162beb Binary files /dev/null and b/Master/texmf-dist/doc/latex/chemschemex/R1-CH=CH2.pdf differ diff --git a/Master/texmf-dist/doc/latex/chemschemex/R1-CHCH2.pdf b/Master/texmf-dist/doc/latex/chemschemex/R1-CHCH2.pdf deleted file mode 100644 index fc51e162beb..00000000000 Binary files a/Master/texmf-dist/doc/latex/chemschemex/R1-CHCH2.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/chemschemex/R2-CH=CH-R1.pdf b/Master/texmf-dist/doc/latex/chemschemex/R2-CH=CH-R1.pdf new file mode 100644 index 00000000000..75856cb747e Binary files /dev/null and b/Master/texmf-dist/doc/latex/chemschemex/R2-CH=CH-R1.pdf differ diff --git a/Master/texmf-dist/doc/latex/chemschemex/R2-CHCH-R1.pdf b/Master/texmf-dist/doc/latex/chemschemex/R2-CHCH-R1.pdf deleted file mode 100644 index 75856cb747e..00000000000 Binary files a/Master/texmf-dist/doc/latex/chemschemex/R2-CHCH-R1.pdf and /dev/null 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/Ru=CH-R1.pdf b/Master/texmf-dist/doc/latex/chemschemex/Ru=CH-R1.pdf new file mode 100644 index 00000000000..7de0d1a7513 Binary files /dev/null and b/Master/texmf-dist/doc/latex/chemschemex/Ru=CH-R1.pdf differ diff --git a/Master/texmf-dist/doc/latex/chemschemex/Ru=CH2.pdf b/Master/texmf-dist/doc/latex/chemschemex/Ru=CH2.pdf new file mode 100644 index 00000000000..ccdbc1fcb8c --- /dev/null +++ b/Master/texmf-dist/doc/latex/chemschemex/Ru=CH2.pdf @@ -0,0 +1,119 @@ +%PDF-1.4 +%쏢 +5 0 obj +<> +stream +xM˱0 _qcjt!ʆ +E?1ɀ> +/Contents 5 0 R +>> +endobj +3 0 obj +<< /Type /Pages /Kids [ +4 0 R +] /Count 1 +>> +endobj +1 0 obj +<> +endobj +7 0 obj +<>endobj +10 0 obj +<> +endobj +11 0 obj +<> +endobj +8 0 obj +<> +endobj +9 0 obj +<> +endobj +12 0 obj +<>stream +xU_HSq{o:6I7\edbNRJʦmMi =?")jRҊRP3"K+5$nW##z;|9!4zsf*r1dE60 ? e]e,:l9^ !e PTjAd0ڸ蘘m$&۲"jJjӚ,%5\ZeqzCYW_bԚERhTv"JFrIQ9f4Bwp&>7%VVHp4N6d X G5>|h#xMgc#Mgl^̊々Lș6 UtEtV]5_gWZF=|< C>R%Vcߖa,V-eɀmG=IyI:Ҟ(>e ޗI\bF+)7Φ1 M<$Jh==M6K(;h㭆F_>stream + + + + + +2014-03-19T09:43:32+01:00 +2014-03-19T09:43:32+01:00 +ChemDraw Ultra(tm) 11.0d1 + +Ru=CH2.eps + + + + + +endstream +endobj +2 0 obj +<>endobj +xref +0 14 +0000000000 65535 f +0000000451 00000 n +0000003405 00000 n +0000000392 00000 n +0000000243 00000 n +0000000015 00000 n +0000000224 00000 n +0000000516 00000 n +0000000617 00000 n +0000000920 00000 n +0000000557 00000 n +0000000587 00000 n +0000001187 00000 n +0000001975 00000 n +trailer +<< /Size 14 /Root 1 0 R /Info 2 0 R +/ID [] +>> +startxref +3585 +%%EOF diff --git a/Master/texmf-dist/doc/latex/chemschemex/RuCH-R1.pdf b/Master/texmf-dist/doc/latex/chemschemex/RuCH-R1.pdf deleted file mode 100644 index 7de0d1a7513..00000000000 Binary files a/Master/texmf-dist/doc/latex/chemschemex/RuCH-R1.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/chemschemex/RuCH2.pdf b/Master/texmf-dist/doc/latex/chemschemex/RuCH2.pdf deleted file mode 100644 index ccdbc1fcb8c..00000000000 --- a/Master/texmf-dist/doc/latex/chemschemex/RuCH2.pdf +++ /dev/null @@ -1,119 +0,0 @@ -%PDF-1.4 -%쏢 -5 0 obj -<> -stream -xM˱0 _qcjt!ʆ -E?1ɀ> -/Contents 5 0 R ->> -endobj -3 0 obj -<< /Type /Pages /Kids [ -4 0 R -] /Count 1 ->> -endobj -1 0 obj -<> -endobj -7 0 obj -<>endobj -10 0 obj -<> -endobj -11 0 obj -<> -endobj -8 0 obj -<> -endobj -9 0 obj -<> -endobj -12 0 obj -<>stream -xU_HSq{o:6I7\edbNRJʦmMi =?")jRҊRP3"K+5$nW##z;|9!4zsf*r1dE60 ? e]e,:l9^ !e PTjAd0ڸ蘘m$&۲"jJjӚ,%5\ZeqzCYW_bԚERhTv"JFrIQ9f4Bwp&>7%VVHp4N6d X G5>|h#xMgc#Mgl^̊々Lș6 UtEtV]5_gWZF=|< C>R%Vcߖa,V-eɀmG=IyI:Ҟ(>e ޗI\bF+)7Φ1 M<$Jh==M6K(;h㭆F_>stream - - - - - -2014-03-19T09:43:32+01:00 -2014-03-19T09:43:32+01:00 -ChemDraw Ultra(tm) 11.0d1 - -Ru=CH2.eps - - - - - -endstream -endobj -2 0 obj -<>endobj -xref -0 14 -0000000000 65535 f -0000000451 00000 n -0000003405 00000 n -0000000392 00000 n -0000000243 00000 n -0000000015 00000 n -0000000224 00000 n -0000000516 00000 n -0000000617 00000 n -0000000920 00000 n -0000000557 00000 n -0000000587 00000 n -0000001187 00000 n -0000001975 00000 n -trailer -<< /Size 14 /Root 1 0 R /Info 2 0 R -/ID [] ->> -startxref -3585 -%%EOF diff --git a/Master/texmf-dist/doc/latex/chemschemex/chemschemex.pdf b/Master/texmf-dist/doc/latex/chemschemex/chemschemex.pdf index ec0013a4ac6..b227a74298e 100644 Binary files a/Master/texmf-dist/doc/latex/chemschemex/chemschemex.pdf and b/Master/texmf-dist/doc/latex/chemschemex/chemschemex.pdf 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 @@ % % \NeedsTeXFormat{LaTeX2e}[2005/12/01] % \ProvidesPackage{chemschemex} -% [2014/07/15 v1.0] +% [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 -- cgit v1.2.3