From c581c0efcec2202e4516d289b60b992b0cd5ca29 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Apr 2014 21:38:00 +0000 Subject: ryethesis (23apr14) git-svn-id: svn://tug.org/texlive/trunk@33645 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/ryethesis/ryethesis.dtx | 63 ++++++++++++++-------- 1 file changed, 42 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/source/latex/ryethesis') diff --git a/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx b/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx index decf6247905..8bdf5f37364 100644 --- a/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx +++ b/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx @@ -22,7 +22,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{ryethesis} %<*class> - [2010/06/18 v1.3 Ryerson University thesis class definition] + [2014/04/23 v1.35 Ryerson University thesis class definition] % % %<*driver> @@ -39,7 +39,7 @@ % % \fi % -% \CheckSum{893} +% \CheckSum{903} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -73,6 +73,10 @@ % \changes{v1.33}{2010/09/14}{Added front matter to TOC} % \changes{v1.34}{2014/01/04}{Replaced \\AtBeginDocument with etoolbox % package and \\AfterEndPreamble. Thanks to A. Penniston.} +% \changes{v1.35}{2014/04/23}{Removed dependence on +% makeidx.sty. Replaced with equivalent commands. Moved \\addcontents +% redefinition to avoid conflict with siunitx.sty. Thanks to +% A. Penniston. } % % \GetFileInfo{ryethesis.dtx} % @@ -905,8 +909,13 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and \ifthenelse{\boolean{@ryeindex}} { -%\RequirePackage{index}\makeindex -\RequirePackage{makeidx}\makeindex +% In case underlying class does not define these parameters +\providecommand*\see[2]{\emph{\seename} #1} +\providecommand*\seealso[2]{\emph{\alsoname} #1} +\providecommand\printindex{\@input@{\jobname.ind}} +\providecommand\seename{see} +\providecommand*\alsoname{see also} +\makeindex \RequirePackage{multicol} \renewenvironment{theindex} {\begin{multicols}{2}[\@makeschapterhead{\indexname}\addcontentsline{toc}{chapter}{\indexname}% @@ -980,22 +989,11 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and % \end{macro} % \end{macro} -% \begin{macrocode} -%Adjust |\addtocontents| to switch from toc to toa file if using List -%of Appendices -\newcommand{\Saved@addtocontents}{} -\let\Saved@addtocontents\addtocontents -\def\addtocontents#1#2{% -\if@ryethesismatchtoc% -{\ifthenelse{\equal{#1}{toc}}% -{\Saved@addtocontents{toa}{#2}} -{\Saved@addtocontents{#1}{#2}}} -\else -{\Saved@addtocontents{#1}{#2}} -\fi} -% \end{macrocode} - -% Final commands to issue at the end of the class. In the case of draft mode, the line spacing is set to double spacing. In final mode, a line spacing of 1.5 is used, as required by SGS. The |\usereferences| command is used to label the bibliographic section as ``References'' by default. +% Final commands to issue at the end of the class. In the case of +% draft mode, the line spacing is set to double spacing. In final +% mode, a line spacing of 1.5 is used, as required by SGS. The +% |\usereferences| command is used to label the bibliographic section +% as ``References'' by default. % \begin{macrocode} \AtEndOfClass{ @@ -1005,14 +1003,37 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and {% Final mode uses 1.5 spacing as specified in SGS policy Sept. 2009. \onehalfspacing} \usereferences + + } % \end{macrocode} -% The |\AtBeginDocument| and |\AtEndDocument| are used to insert the front, main, and back matter in the correct place for the user. This tightly controls the order of appearance of each type of content. +% The |\AtBeginDocument| and |\AtEndDocument| are used to insert the +% front, main, and back matter in the correct place for the user. This +% tightly controls the order of appearance of each type of +% content. Note that the |\addcontents| command is redefined here to +% redirect List of Appendices entries into a separate file if so +% desired. % \begin{macrocode} % Insert front matter & mainmatter settings before user's material % Fix for use of color package \RequirePackage{etoolbox} \AfterEndPreamble{ + +%Adjust |\addtocontents| to switch from toc to toa file if using List +%of Appendices. This is processed at the end of the class to avoid +%conflicts with packages such as siunitx. + +\newcommand{\Saved@addtocontents}{} +\let\Saved@addtocontents\addtocontents +\def\addtocontents#1#2{% +\if@ryethesismatchtoc% +{\ifthenelse{\equal{#1}{toc}}% +{\Saved@addtocontents{toa}{#2}} +{\Saved@addtocontents{#1}{#2}}} +\else +{\Saved@addtocontents{#1}{#2}} +\fi} + \frontmatter\mainmatter } % Insert back matter at the end -- cgit v1.2.3