From 1d03914280e3a82f053bdf058db3f85a5ddcd6ef Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 6 Jul 2010 00:52:03 +0000 Subject: ryethesis update (5jul10) git-svn-id: svn://tug.org/texlive/trunk@19255 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ryethesis/Makefile | 2 +- .../texmf-dist/doc/latex/ryethesis/ryesample.pdf | Bin 224700 -> 224700 bytes .../texmf-dist/doc/latex/ryethesis/ryesample.tex | 4 ++-- .../texmf-dist/doc/latex/ryethesis/ryethesis.pdf | Bin 238181 -> 238988 bytes .../source/latex/ryethesis/ryethesis.dtx | 16 ++++++++++------ .../texmf-dist/tex/latex/ryethesis/ryethesis.cls | 4 ++-- 6 files changed, 15 insertions(+), 11 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/ryethesis/Makefile b/Master/texmf-dist/doc/latex/ryethesis/Makefile index 2f7255912d3..e92c0130ca6 100644 --- a/Master/texmf-dist/doc/latex/ryethesis/Makefile +++ b/Master/texmf-dist/doc/latex/ryethesis/Makefile @@ -1,7 +1,7 @@ FILEROOT= SHELL=/bin/sh -VERSION=1.1 +VERSION=1.2 LATEX=pdflatex diff --git a/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf b/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf index 0b6627a44bb..55a24085185 100644 Binary files a/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf and b/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf differ diff --git a/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex b/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex index d4ecf3c1b18..35689f65092 100644 --- a/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex +++ b/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex @@ -67,8 +67,8 @@ % Specify the type of degree (e.g. Masters of Applied Science, Doctor of Philosophy). Do not use % abbreviations. -% \degree{Full Degree Name} -\degree{Doctor of Philosophy} +% \degreeName{Full Degree Name} +\degreeName{Doctor of Philosophy} % Specify the year of the degree: % \degreeYear{####} diff --git a/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf b/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf index 49d74a677f7..e02ce90e7dc 100644 Binary files a/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf and b/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf differ diff --git a/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx b/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx index 132438ea372..abd7991d48b 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.1 Ryerson University thesis class definition] + [2010/06/18 v1.2 Ryerson University thesis class definition] % % %<*driver> @@ -39,7 +39,7 @@ % % \fi % -% \CheckSum{753} +% \CheckSum{755} % % \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,8 +59,10 @@ % % % \changes{v1.0}{2009/09/30}{Initial version} -% \changes{v1.1}{2009/09/30}{Fixed bug with previous degrees. Added +% \changes{v1.1}{2010/06/18}{Fixed bug with previous degrees. Added % xcolor package earlier in file.} +% \changes{v1.2}{2010/07/05}{Changed \\degree to \\degreeName to avoid +% conflict with package unitsdef.} % % \GetFileInfo{ryethesis.dtx} % @@ -98,9 +100,9 @@ % Your full name as it will appear on the title and abstract page. The usage is the same as with the |book| and other classes. % \begin{flushleft}|\author| \marg{Your Name}\end{flushleft} % -% \DescribeMacro{\degree} +% \DescribeMacro{\degreeName} % The full name of your degree (e.g.\ Doctor of Philosophy, Masters of Applied Science). Do not use abbreviations. -% \begin{flushleft}|\degree| \marg{Full Degree Name}\end{flushleft} +% \begin{flushleft}|\degreeName| \marg{Full Degree Name}\end{flushleft} % % \DescribeMacro{\degreeYear} % The year that the degree will be awarded, typically the year of convocation. @@ -539,7 +541,9 @@ % \begin{macro}{degree} % Specify the name of the degree (e.g. ``Doctor of Philosophy'' or ``Masters of Applied Science''). This affects the content of the title and abstract page. % \begin{macrocode} -\newcommand{\degree}[1]{\gdef\ryethesis@degree{#1}} +% Was \degree but changed to the more specific \degreeName to avoid +% conflict with other packages +\newcommand{\degreeName}[1]{\gdef\ryethesis@degree{#1}} % \end{macrocode} % \end{macro} % \begin{macro}{\degreeYear} diff --git a/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls b/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls index 008fe0f6912..f1250b85ade 100644 --- a/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls +++ b/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ryethesis} - [2010/06/18 v1.1 Ryerson University thesis class definition] + [2010/06/18 v1.2 Ryerson University thesis class definition] \RequirePackage{xcolor} \RequirePackage{ifthen} @@ -244,7 +244,7 @@ \newcommand{\dissertation}{\documenttype{dissertation}} \newcommand{\project}{\documenttype{project}} -\newcommand{\degree}[1]{\gdef\ryethesis@degree{#1}} +\newcommand{\degreeName}[1]{\gdef\ryethesis@degree{#1}} \newcommand{\degreeYear}[1]{\gdef\ryethesis@degreeYear{#1}} \newcommand{\program}[1]{\gdef\ryethesis@program{#1}} -- cgit v1.2.3