From 1cd867ef11ec5a4a1a5e94fefa0d17de9b630e65 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Jun 2010 00:06:30 +0000 Subject: ryethesis 1.1 (17jun10) git-svn-id: svn://tug.org/texlive/trunk@19022 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/ryethesis/ryethesis.dtx | 28 ++++++++++++++-------- .../source/latex/ryethesis/ryethesis.ins | 2 +- 2 files changed, 19 insertions(+), 11 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 c90828af6fa..132438ea372 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> - [2009/09/30 v1.0 Ryerson University thesis class definition] + [2010/06/18 v1.1 Ryerson University thesis class definition] % % %<*driver> @@ -39,7 +39,7 @@ % % \fi % -% \CheckSum{749} +% \CheckSum{753} % % \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 @@ -59,6 +59,8 @@ % % % \changes{v1.0}{2009/09/30}{Initial version} +% \changes{v1.1}{2009/09/30}{Fixed bug with previous degrees. Added +% xcolor package earlier in file.} % % \GetFileInfo{ryethesis.dtx} % @@ -171,7 +173,7 @@ % Typically, most documents which include an appendix list the appendices within the Table of Contents. SGS formatting policy indicates a separate List of Appendices. This switch is enabled by default, and any |\chapter| or lower sectioning will appear in a separate List of Appendices. You must use the |\appendix| command for the appendices to be numbered and inserted correctly. No List of Appendices will appear if you do not use the |\appendix| command. % % \DescribeToggle{glossary}{noglossary}{\includeglossary}{\noglossary} -% Glossaries are supported using the |glossaries| package but are optional. You will need to do additional processing using the |makeglossaries| command to generate the glossary content. See the |glossaries| package for more details. Include glossary commands for identifying glossary items but do not issue the |\printglossaries| command as this is handled automatically if glossaries are enabled. +% Glossaries are supported using the |glossaries| package but are optional. You will need to do additional processing using the |makeglossaries| command to generate the glossary content. See the |glossaries| package for more details. Include glossary commands for identifying glossary items but do not issue the |\printglossary| command as this is handled automatically if glossaries are enabled. % % \vspace{\baselineskip}\DescribeToggle{index}{noindex}{\includeindex}{\noindex} % An optional index is supported using the |makeindex| command in the normal fashion. Indicate index items using the |\index| command but do not issue the |\printindex| command as this is handled automatically if indices enabled. @@ -190,6 +192,7 @@ % % \begin{macrocode} % A minimal set of packages as required by the class +\RequirePackage{xcolor} \RequirePackage{ifthen} \RequirePackage{fancyhdr} \RequirePackage{setspace} @@ -595,9 +598,9 @@ \vfill%\vspace{\baselineskip} {\@author}\\ {\ifx\empty\ryethesis@prevDegreeA\else{\ryethesis@prevDegreeA, \ryethesis@prevLocationA, \ryethesis@prevYearA}\\\fi} - {\ifx\empty\ryethesis@prevDegreeB\else{\ryethesis@prevDegreeB, \ryethesis@prevLocationA, \ryethesis@prevYearB}\\\fi} - {\ifx\empty\ryethesis@prevDegreeC\else{\ryethesis@prevDegreeC, \ryethesis@prevLocationA, \ryethesis@prevYearC}\\\fi} - {\ifx\empty\ryethesis@prevDegreeD\else{\ryethesis@prevDegreeD, \ryethesis@prevLocationA, \ryethesis@prevYearD}\\\fi} + {\ifx\empty\ryethesis@prevDegreeB\else{\ryethesis@prevDegreeB, \ryethesis@prevLocationB, \ryethesis@prevYearB}\\\fi} + {\ifx\empty\ryethesis@prevDegreeC\else{\ryethesis@prevDegreeC, \ryethesis@prevLocationC, \ryethesis@prevYearC}\\\fi} + {\ifx\empty\ryethesis@prevDegreeD\else{\ryethesis@prevDegreeD, \ryethesis@prevLocationD, \ryethesis@prevYearD}\\\fi} \vfill%\vspace{3\baselineskip} {A \ryethesis@documentType}\\ {presented to Ryerson University}\\ @@ -794,12 +797,12 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and \ryethesis@partner \ifthenelse{\boolean{@ryelistofappendices}} { \newcommand{\nohyphens}{\hyphenpenalty=10000\exhyphenpenalty=10000\relax} -\newcommand{\listofappendices}{\chapter*{List of Appendices}\ryethesis@starttoc{toa}} +\newcommand{\listofappendices}{\chapter*{List of Appendices}\@starttoc{toa}} } {} \newcommand{\ryethesis@insertloa}{% -\ifthenelse{\boolean{@ryelistofappendices}}{\ifx\empty\ryethesis@theappendices\else\listofappendices\clearemptydoublepage\fi}{} +\ifthenelse{\boolean{@ryelistofappendices}}{\listofappendices\clearemptydoublepage}{} } \renewcommand{\appendix}[1]{\ifx\empty#1\else\gdef\ryethesis@theappendices{#1}\fi} @@ -824,7 +827,10 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and \ryethesis@partner \clearemptydoublepage }\fi } -\ifthenelse{\boolean{@ryeglossary}}{\RequirePackage{glossaries}\makeglossaries}{} +\ifthenelse{\boolean{@ryeglossary}}{\RequirePackage{glossaries}\makeglossaries% + %Glossaries prints a confusing warning + \global\let\warn@noprintglossary\relax +}{} \ifthenelse{\boolean{@ryeindex}}{\RequirePackage{makeidx}\makeindex}{} @@ -844,7 +850,9 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and \ryethesis@partner \newcommand{\ryethesis@insertglossary}{% \ifthenelse{\boolean{@ryeglossary}} -{\printglossaries\addcontentsline{toc}{chapter}{Glossary}\clearemptydoublepage} +{\printglossaries%glossaries.sty prints a false warning. +\global\let\warn@noprintglossary\relax% +\addcontentsline{toc}{chapter}{Glossary}\clearemptydoublepage} {} } diff --git a/Master/texmf-dist/source/latex/ryethesis/ryethesis.ins b/Master/texmf-dist/source/latex/ryethesis/ryethesis.ins index 4c940a18f30..a85cb7ca0f9 100644 --- a/Master/texmf-dist/source/latex/ryethesis/ryethesis.ins +++ b/Master/texmf-dist/source/latex/ryethesis/ryethesis.ins @@ -34,7 +34,7 @@ and version 1.2 or later is part of all distributions of LaTeX version 1999/12/01 or later. \endpreamble - +\askforoverwritefalse \generate{\file{ryethesis.cls}{\from{ryethesis.dtx}{class}}} \obeyspaces -- cgit v1.2.3