various additions to tpm-ctan-check, and updated to packages

unitsdef, undertilde, ushort, units, umich-thsis, uiucthesis


git-svn-id: svn://tug.org/texlive/trunk@2343 c570f23f-e606-0410-a88d-b1316a301751

38 files changed, 560 insertions, 353 deletions

diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index fcf353dd705..254f541c6c2 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -289,6 +289,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";
  'txfonts',	"&MAKEflatten",
  'ucs',		"&MAKEucs",
  'ukrhyph',	"&MAKEukrhyph",
+ 'unitsdef',	"&MAKEflatten",
  'velthuis',	"&MAKEcopy",
  'vhistory',	"&MAKEflatten",
  'vntex',	"&MAKEcopy",
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index a6cce898adc..026d5eb1fe5 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -81,7 +81,9 @@ my @WorkingTPM = qw(
          textcase textpos thesis-titlepage-fhac thumbpdf ticket
          titlesec tokenizer tools totpages trajan tugboat
          twoup typedref
-       umlaute underlin
+       ucthesis uhrzeit uiucthesis
+         umlaute umich-thesis underlin undertilde units unitsdef 
+	 upquote ushort
        vancouver variations varindex vector velthuis verse versions 
        vhistory visualfaq vmargin volumes vpe
        wallpaper warning warpcol
diff --git a/Master/texmf-dist/doc/latex/uiucthesis/README b/Master/texmf-dist/doc/latex/uiucthesis/README
index bfb41603c17..93e4d76081c 100644
--- a/Master/texmf-dist/doc/latex/uiucthesis/README
+++ b/Master/texmf-dist/doc/latex/uiucthesis/README
@@ -1,5 +1,5 @@
 UIUCTHESIS Package/Class

-by Peter Czoschke (based on the version by David Hull)

+by Peter Czoschke (based on the original version by David Hull)

 

 

 Description

@@ -9,7 +9,7 @@ uiucthesis is a LaTeX package for formatting theses in the format
 required by the University of Illinois at Urbana-Champaign.

 

 A class file and style file are provided. Both provide identical

-functionality except that the class file loads the "book" standard

+functionality except that the class file loads the "book"

 class with the [oneside] option.

 

 

@@ -19,17 +19,25 @@ Files
 README                  This file

 uiucthesis.dtx		Source for uiucthesis.cls, uiucthesis.sty and thesis-ex.tex

 uiucthesis.ins          Driver file for uiucthesis.dtx

+uiucthesis.pdf		Precompiled PDF file of documentation from .dtx file

+thesis-ex.pdf		Precompiled PDF file of the example file generated from installation

+uiucthesis.cls		Pregenerated class file

+uiucthesis.sty		Pregenerated style file (for backwards-compatibility)

 

 

 Installation

 ------------

 

 latex uiucthesis.ins           <== Produces uiucthesis.cls, uiucthesis.sty

-					     and thesis-ex.tex

-

+				   and thesis-ex.tex

 latex uiucthesis.dtx           <== Produces uiucthesis.dvi (documentation)

 latex uiucthesis.dtx           <== One more time, to fix cross-references

 

-

 You can do the last two steps on thesis-ex.tex as well to generate the example

 file (DVI).

+

+

+Dependencies

+------------

+

+This package requires the setspace package.

diff --git a/Master/texmf-dist/doc/latex/uiucthesis/thesis-ex.pdf b/Master/texmf-dist/doc/latex/uiucthesis/thesis-ex.pdf
index 52b6014fd14..021f47746c1 100644
--- a/Master/texmf-dist/doc/latex/uiucthesis/thesis-ex.pdf
+++ b/Master/texmf-dist/doc/latex/uiucthesis/thesis-ex.pdf
diff --git a/Master/texmf-dist/doc/latex/uiucthesis/thesis-ex.tex b/Master/texmf-dist/doc/latex/uiucthesis/thesis-ex.tex
index 3eb2fa35cbd..d5ba258dd12 100644
--- a/Master/texmf-dist/doc/latex/uiucthesis/thesis-ex.tex
+++ b/Master/texmf-dist/doc/latex/uiucthesis/thesis-ex.tex
@@ -6,7 +6,7 @@
 %%
 %% uiucthesis.dtx  (with options: `example')
 %% 
-\def\fileversion{v2.0} \def\filedate{2005/02/01}
+\def\fileversion{v2.25} \def\filedate{2005/03/25}
 %% Package and Class "uiucthesis" for use with LaTeX2e.
 \documentclass[draftthesis,fullpage]{uiucthesis}
 
@@ -42,7 +42,7 @@ To Father and Mother.
 
 %% Create an Acknowledgements page, many departments require you to
 %% include funding support in this.
-\chapter*{Acknowledgements}
+\chapter*{Acknowledgments}
 
 This project would not have been possible without the support of
 many people. Many thanks to my adviser, Lawrence T. Strongarm, who
@@ -55,14 +55,16 @@ financial means to complete this project. And finally, thanks to
 my husband, parents, and numerous friends who endured this long
 process with me, always offering support and love.
 
-%% The thesis format requires these lists to come in the following
-%% order, all major sections after the Table of Contents must be listed
-%% therein, which is automatically taken care of in uiucthesis:
+%% The thesis format requires the Table of Contents to come
+%% before any other major sections, all of these sections after
+%% the Table of Contents must be listed therein (i.e., use \chapter,
+%% not \chapter*).  Common sections to have between the Table of
+%% Contents and the main text are:
 %%
-%% Table of Contents
 %% List of Tables
-%% List of Figures or List of Illustrations
-%% List of Symbols and/or Abbreviations
+%% List of Figures
+%% List Symbols and/or Abbreviations
+%% etc.
 
 \tableofcontents
 \listoftables
@@ -70,7 +72,7 @@ process with me, always offering support and love.
 
 %% Create a List of Abbreviations. The left column
 %% is 1 inch wide and left-justified
-\chapter*{List of Abbreviations}
+\chapter{List of Abbreviations}
 
 \begin{symbollist*}
 \item[CA] Caffeine Addict.
@@ -79,7 +81,7 @@ process with me, always offering support and love.
 
 %% Create a List of Symbols. The left column
 %% is 0.7 inch wide and centered
-\chapter*{List of Symbols}
+\chapter{List of Symbols}
 
 \begin{symbollist}[0.7in]
 \item[$\tau$] Time taken to drink one cup of coffee.
@@ -97,10 +99,9 @@ process with me, always offering support and love.
 
 We conclude that graduate students like coffee.
 
+\appendix*
 
-\appendix
-
-\include{A-data.tex}
+\include{Appendix.tex}
 
 \backmatter
 
diff --git a/Master/texmf-dist/doc/latex/uiucthesis/uiucthesis.pdf b/Master/texmf-dist/doc/latex/uiucthesis/uiucthesis.pdf
index 8d09acd829f..6ed4e260c10 100644
--- a/Master/texmf-dist/doc/latex/uiucthesis/uiucthesis.pdf
+++ b/Master/texmf-dist/doc/latex/uiucthesis/uiucthesis.pdf
diff --git a/Master/texmf-dist/doc/latex/undertilde/undertilde.pdf b/Master/texmf-dist/doc/latex/undertilde/undertilde.pdf
new file mode 100644
index 00000000000..e2d05516e1a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/undertilde/undertilde.pdf
diff --git a/Master/texmf-dist/source/latex/units/COPYING b/Master/texmf-dist/doc/latex/units/COPYING
index e77696ae8dd..e77696ae8dd 100644
--- a/Master/texmf-dist/source/latex/units/COPYING
+++ b/Master/texmf-dist/doc/latex/units/COPYING
diff --git a/Master/texmf-dist/source/latex/units/README b/Master/texmf-dist/doc/latex/units/README
index 1d675555200..1d675555200 100644
--- a/Master/texmf-dist/source/latex/units/README
+++ b/Master/texmf-dist/doc/latex/units/README
diff --git a/Master/texmf-dist/doc/latex/units/units.pdf b/Master/texmf-dist/doc/latex/units/units.pdf
new file mode 100644
index 00000000000..d41f5620989
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/units/units.pdf
diff --git a/Master/texmf-dist/doc/latex/ushort/ushort.dvi b/Master/texmf-dist/doc/latex/ushort/ushort.dvi
deleted file mode 100644
index 89bea7c4a37..00000000000
--- a/Master/texmf-dist/doc/latex/ushort/ushort.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ushort/ushort.pdf b/Master/texmf-dist/doc/latex/ushort/ushort.pdf
new file mode 100644
index 00000000000..e1a7005a487
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ushort/ushort.pdf
diff --git a/Master/texmf-dist/doc/latex/ushort/ushort.txt b/Master/texmf-dist/doc/latex/ushort/ushort.txt
index 46128d5c222..06268642c1e 100644
--- a/Master/texmf-dist/doc/latex/ushort/ushort.txt
+++ b/Master/texmf-dist/doc/latex/ushort/ushort.txt
@@ -50,6 +50,7 @@
 %%#    insert a line like
 %%#          \catcode`\@=11\relax \input ushort.sty \catcode`\@=12\relax
 %%#
+%%# For TeX insiders:
 %%# The only LaTeX-specific commands used in `ushort.sty' are:
 %%#
 %%#   \newcommand (only in the form \newcommand{\command}{} to ensure that
@@ -70,13 +71,22 @@
 %%#     This command is used analogously to \underline with the difference that
 %%#     the underlines are slightly shorter than usual (and so, in particular,
 %%#     in concatenations of `\ushort'ed variable names the underlines do not
-%%#     merge).
-%%# \ushortd
+%%#     merge). The length of the underline is chosen under the assumption that
+%%#     the argument is a single character. If you want to underline a variable
+%%#     name which consists of more than one character, use instead the command
+%%# \ushortw  [Mnemonic: ushort word]
+%%#     which is analogous to \ushort but such that the length of the underline
+%%#     is chosen appropriate for a `long' argument. (This does not look as
+%%#     good as \ushort if the argument is a single character).
+%%# \ushortd  [Mnemonic: ushort double]
 %%#     This is analogous to \ushort except that the underline is doubled.
+%%# \ushortdw [Mnemonic: ushortd word]
+%%#     This is analogous to \ushortw except that the underline is doubled.
 %%# \ushortdline
 %%#     This is analogous to \underline except that the underline is doubled.
-%%#     This command is internally used by \ushortd and thus redefinitions
-%%#     change also the behavior of \ushortd correspondingly.
+%%#     This command is internally used by \ushortd and \ushortdw and
+%%#     thus redefinitions change also the behavior of \ushortd and \ushortdw
+%%#     correspondingly.
 %%#     In Plain TeX, this macro can be used only in math mode.
 %%# \ushortCreate
 %%#     This can be used to generate a macro which behaves similarly to \ushort
@@ -99,7 +109,9 @@
 %%#
 %%# This command creates a new macro \Name. It is not tested whether \Name
 %%# already exists; if it exists already, it is overridden. In particular,
-%%# it is admissible to use \ushortCreate to redefine \ushort or \ushortd.
+%%# it is admissible to use \ushortCreate to redefine \ushort, \ushortw,
+%%# \ushortd, or \ushortdw. This is the recommended method, if you want to
+%%# change the default values.
 %%#
 %%# The macro \Name can be used analogously to \underline, but the precise
 %%# behavior depends on the arguments of \ushortCreate.
@@ -139,11 +151,13 @@
 %%#
 %%# Examples:
 %%#
-%%# The most important examples are the macros \ushort and \ushortd which
-%%# have been created by
+%%# The most important examples are the macros \ushort, \ushortw, \ushortd,
+%%# and \ushortdw which have been created by
 %%#
 %%#    \ushortCreate{ushort}
+%%#    \ushortCreate()[-.1em]{ushortw}
 %%#    \ushortCreate:\ushortdline{ushortd}
+%%#    \ushortCreate:\ushortdline()[-.1em]{ushortdw}
 %%#
 %%# A further example demonstrating other parameters is
 %%#
diff --git a/Master/texmf-dist/source/latex/uiucthesis/uiucthesis.dtx b/Master/texmf-dist/source/latex/uiucthesis/uiucthesis.dtx
index 70cc249ab42..b6e383ad587 100644
--- a/Master/texmf-dist/source/latex/uiucthesis/uiucthesis.dtx
+++ b/Master/texmf-dist/source/latex/uiucthesis/uiucthesis.dtx
@@ -1,4 +1,4 @@
-\def\fileversion{v2.0} \def\filedate{2005/02/01}
+\def\fileversion{v2.25} \def\filedate{2005/03/25}
 % \iffalse  % this is a METACOMMENT !
 %% Package and Class "uiucthesis" for use with LaTeX2e.
 %
@@ -21,7 +21,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1103}
+% \CheckSum{1143}
 %
 % \MakeShortVerb{\|}
 %
@@ -67,13 +67,12 @@
 % The |[draftthesis]| option causes each page to have a header
 % proclaiming the document to be a draft copy, along with the
 % current time and date.
-% It also omits the preliminary part of the
-% thesis---currently only the copyright page.
-% This is marginally useful for saving paper before you
-% produce the final version of the thesis.
+% It also omits the copyright page and prints out any marginal notes
+% added with the |\note| macro.
 % The |[fancy]| style option produces slightly fancier chapter headings.
 % The |[fullpage]| style option makes the margins as small as the
-% format requirements allow.  Because wide text columns are generally
+% format requirements allow and uses double-spacing for the text.
+% Because wide text columns are generally
 % considered harder on the reader
 % this is not the default, but is provided as an option because people
 % seem to want it.
@@ -81,10 +80,10 @@
 % one or the other.
 %
 % \DescribeMacro{[proquest]}
-% This option is meant to be used when you are ready to deposit your thesis.
+% The |[proquest]| option is meant to be used when you are ready to deposit your thesis.
 % For doctorates, the Grad College requires the submission of a specially
 % formatted abstract for the ProQuest publication service. To produce this
-% abstract, include the |[proquest]| option are reprocess your file. Everything
+% abstract, include the |[proquest]| option and reprocess your file. Everything
 % in your \LaTeX\ document will be ignored except the contents of the \env{abstract}
 % environment, which are printed out in the format required. Once the option is
 % removed from the |\documentclass| command, you can reprocess your thesis as
@@ -93,24 +92,28 @@
 % below).
 %
 % \DescribeMacro{[edeposit]}
-% Use this option if you are depositing your thesis electronically. The title page
+% Use the |[edeposit]| option if you are depositing your thesis electronically. The title page
 % is different and the page numbering is slightly different since the committee
 % approval form is not included with your thesis.  If this option is used, you
 % must specify your committee members with the |\committee| command (see below).
 %
-% \DescribeMacro{[toclabels]}
-% This option includes the ``Page'' label on the right-hand side of the first page
-% in the Table of Contents, List of Figures, and List of Tables. This is required by
-% some departments (or you may just like the way it looks).
-%
 % \DescribeMacro{[offcenter]}
-% In the last version of \pkg{uiucthesis}, the |[fancy]| option produced text with
-% asymmetric margins so that enough room for the chapter numbers was available
-% in the left margin.  This version by default uses symmetric margins, even with the
-% |[fancy]| option. If you have a lot of chapters, your chapter numbers may spill into
-% the 1 inch margin required by the Grad College. In this case, the previous behavior
-% can be reproduced with the |[offcenter]| option, which shifts the margins approximately
-% 1/2 inch to the right.
+% The |[offcenter]| option adds 1/2 inch to the left margin of all pages.
+% This can be done to allow some extra space there for binding purposes, or
+% if you use the |[fancy]| option, to allow for more space for the chapter
+% numbers at the left side of the page.
+% In past versions of \pkg{uiucthesis}, the |[fancy]| option did this by default.
+% This version uses symmetric margins by default, even with the
+% |[fancy]| option. If you have a lot of chapters (i.e., more than 9), your chapter
+% numbers may spill into
+% the 1 inch margin required by the Grad College without using this option.
+% This option should not be used with the |[fullpage]| option.
+%
+% \DescribeMacro{[centerchapter]}
+% Normally, the chapter headings are all left-justified on the opening page of
+% each chapter. These headings can all be centered by using the |[centerchapter]|
+% option for the class. This option is not recommended for use with the |[fancy]|
+% option.
 %
 % \subsection{The Title Page}
 %
@@ -125,15 +128,15 @@
 % \DescribeMacro{\college}
 % Use the |\phdthesis| or |\msthesis| to set the correct thesis type.
 % If your thesis isn't for a ``Ph.D.'' or ``M.S.'', you can specify
-% your degree with either\linebreak
+% your degree with either\\
 % |\otherdoctorate{|\meta{degree name}|}{|\meta{abbreviation}|}| or\\
 % |\othermasters{|\meta{degree name}|}{|\meta{abbreviation}|}|.\\
 % For example, specifying |\phdthesis| is equivalent to giving the command\\
 % |\otherdoctorate{Doctor of Philosophy}{Ph.D.}|.\\
 % The default thesis type is |\phdthesis|. Set your department with\linebreak
-% |\department{|\meta{department}|}|. This defines the field your degree will be in, so leave out
-% ``Department of.''
-% The default department is ``Physics''.
+% |\department{|\meta{department}|}|. This defines the field your degree
+% will be in, so leave out ``Department of.''
+% The default department is ``Computer Science''.
 % Define your college with |\college{|\meta{college}|}|.
 % The default is college is ``Graduate College'';
 % you shouldn't need to change it.
@@ -149,7 +152,8 @@
 %
 % \DescribeMacro{\advisor}
 % \DescribeMacro{\adviser}
-% Use |\advisor{|\meta{advisor name}|}| or |\adviser{|\meta{advisor name}|}| to specify the name of your
+% Use |\advisor{|\meta{advisor name}|}| or |\adviser{|\meta{advisor name}|}|
+% to specify the name of your
 % advisor. This is needed to produce the ProQuest abstract
 % (see the |[proquest]| option above). You only need to submit a
 % ProQuest abstract if you are a doctoral candidate.
@@ -161,7 +165,7 @@
 % electronically deposited theses.
 %
 % \DescribeMacro{\volume}
-% This macro provides nominal support for very long theses that must
+% The |\volume| macro provides nominal support for very long theses that must
 % be broken up into multiple volumes. Use |\volume{|\meta{number}|}|
 % to specify the volume number (a single arabic numeral). All this macro
 % does is place the word VOLUME with the number you specify on the title
@@ -200,14 +204,15 @@
 % (The title page is page i, and the certificate
 % of committee approval, the ``red-bordered form,'' is page ii.)
 %
-% \DescribeMacro{abstract}
+% \DescribeEnv{abstract}
 % The abstract should appear in the \env{abstract} environment. Normally,
-% this just produces another chapter with |\chapter*{Abstract}|,
+% this just produces another chapter with |\chapter*{\abstractname}|,
+% where |\abstractname| is ``Abstract'' (see User Customization below),
 % but if the |[proquest]| option
 % is specified, then the contents of this environment are used
 % for the ProQuest abstract.
 %
-% \DescribeMacro{dedication}
+% \DescribeEnv{dedication}
 % A dedication page can be printed with the \env{dedication} environment.
 % This produces a separate page with the dedication centered horizontally
 % and vertically, with the text in italics.
@@ -218,10 +223,10 @@
 % to generate them.
 % In the \pkg{uiucthesis} format these lists are all single spaced.
 %
-% \DescribeMacro{symbollist}
-% \DescribeMacro{symbollist*}
+% \DescribeEnv{symbollist}
+% \DescribeEnv{symbollist*}
 % Optionally, these tables can be followed by a List of Abbreviations and/or
-% List of Symbols. Introduce these with the |\chapter*| command. To aid in
+% List of Symbols. Introduce these with the |\chapter| command. To aid in
 % making these lists, the \env{symbollist} and \env{symbollist*} environments are
 % defined in \pkg{uiucthesis}. These environments produce a two-column list
 % as illustrated below. By default the left column is 1 inch wide but can
@@ -251,7 +256,7 @@ To Father and Mother.
 
 %% Create an Acknowledgements page, many departments require you to
 %% include funding support in this.
-\chapter*{Acknowledgements}
+\chapter*{Acknowledgments}
 
 This project would not have been possible without the support of
 many people. Many thanks to my adviser, Lawrence T. Strongarm, who
@@ -264,28 +269,30 @@ financial means to complete this project. And finally, thanks to
 my husband, parents, and numerous friends who endured this long
 process with me, always offering support and love.
 
-%% The thesis format requires these lists to come in the following
-%% order, all major sections after the Table of Contents must be listed
-%% therein, which is automatically taken care of in uiucthesis:
+%% The thesis format requires the Table of Contents to come
+%% before any other major sections, all of these sections after
+%% the Table of Contents must be listed therein (i.e., use \chapter,
+%% not \chapter*).  Common sections to have between the Table of
+%% Contents and the main text are:
 %%
-%% Table of Contents
 %% List of Tables
-%% List of Figures or List of Illustrations
-%% List of Symbols and/or Abbreviations
+%% List of Figures
+%% List Symbols and/or Abbreviations
+%% etc.
 
 \tableofcontents
 \listoftables
 \listoffigures
-% \end{verbatim} \hrule \end{quote}
 % \iffalse
 %<example>
 % \fi
+% \end{verbatim} \hrule \end{quote}
 %
 % If you want a List of Symbols or Abbreviations, you can do so as follows:
 % \begin{quote} \hrule \begin{verbatim}
 %% Create a List of Abbreviations. The left column
 %% is 1 inch wide and left-justified
-\chapter*{List of Abbreviations}
+\chapter{List of Abbreviations}
 
 \begin{symbollist*}
 \item[CA] Caffeine Addict.
@@ -294,7 +301,7 @@ process with me, always offering support and love.
 
 %% Create a List of Symbols. The left column
 %% is 0.7 inch wide and centered
-\chapter*{List of Symbols}
+\chapter{List of Symbols}
 
 \begin{symbollist}[0.7in]
 \item[$\tau$] Time taken to drink one cup of coffee.
@@ -333,22 +340,27 @@ process with me, always offering support and love.
 \chapter{Conclusions}
 
 We conclude that graduate students like coffee.
-
-% \end{verbatim} \hrule \end{quote}
 % \iffalse
 %<example>
 % \fi
+% \end{verbatim} \hrule \end{quote}
 %
 % \subsection{Reference Matter}
 %
 % \DescribeMacro{\appendix}
 % To switch from the body of your thesis to the reference material
 % at the end, you should use the standard \LaTeX\ |\appendix| command.
+% In \pkg{uiucthesis}, there is also a starred version of this command
+% that eliminates the lettering of the appendices (use if you have
+% a single appendix). Note that if you use |\appendix*| along with
+% the |[fancy]| option, you may want to put ``Appendix:'' at
+% the beginning of the chapter title.
+%
 %
 % \begin{quote} \hrule \begin{verbatim}
-\appendix
+\appendix*
 
-\include{A-data.tex}
+\include{Appendix.tex}
 % \end{verbatim} \hrule \end{quote}
 % \iffalse
 %<example>
@@ -360,17 +372,16 @@ We conclude that graduate students like coffee.
 % The last few chapters in your thesis should not have chapter
 % numbers, but should be listed in the Table of Contents.
 % These chapters include the Bibliography, the Index,
-% and the Vita.  \LaTeX's |\backmatter| command provides the correct
-% formatting for these chapters.
+% and the Vita.  \LaTeX's |\backmatter| command accomplishes this.
 %
 % \DescribeMacro{\bibliography}
 % Use the standard \LaTeX\ bibliography commands to
-% create your bibliography. Most people will use Bib\TeX to do this.
+% create your bibliography. Most people will use Bib\TeX\ to do this.
 % (See \cite{Lamport}). For those in the sciences, you may want to
 % check out the \pkg{cite} package (it's pretty standard), which
 % will produce numerical citations that are sorted and compressed.
-% You can also use the \pkg{natbib} package, although it creates a
-% problem if the |headings| pagestyle is used.
+% You can also use the \pkg{natbib} package. Both of these packages
+% can do either bracketed citations or superscript citations.
 %
 % \DescribeMacro{\vita}
 % The |\vita| command begins a new chapter for your vita.
@@ -409,6 +420,20 @@ Juan Valdez was born\ldots.
 % If you're unhappy with that, you can override it by redefining the
 % |\thesisspacing| command.
 %
+% \DescribeMacro{\nocopyrightpage}
+% Unless the |[draftthesis]| option is used, a page with the copyright notice
+% is printed before the title page. If you don't want this page to
+% appear, even in the final version, put the |\nocopyrightpage| macro
+% somewhere in the preamble.
+%
+% \DescribeMacro{\toclabels}
+% Some departments require the Table of Contents, List of Tables and
+% List of Figures to have a ``Page'' heading over the page numbers
+% on the first page. This can be accomplished by putting the |\toclabels|
+% command somewhere before the |\tableofcontents| command. (NOTE: if you put
+% the |\tableofcontents| command in a separate file that you |\include| in
+% the main file, the |\toclabels| command must also be in that file.)
+%
 % \DescribeMacro{\chaptertitlefont}
 % \DescribeMacro{\sectiontitlefont}
 % \DescribeMacro{\subsectiontitlefont}
@@ -425,11 +450,11 @@ Juan Valdez was born\ldots.
 % |\renewcommand| to redefine this macro in the preamble.
 %
 % \DescribeMacro{\chaptertitleheight}
-% This is the amount of space allotted for the chapter title at the top
+% |\chaptertitleheight| is the amount of space allotted for the chapter title at the top
 % of the page. You can redefine it using |\setlength| in the preamble.
 %
 % \DescribeMacro{\bibname}
-% This is a standard \LaTeX\ macro that contains the title of the reference
+% |\bibname| is a standard \LaTeX\ macro that contains the title of the reference
 % section at the end of your thesis; ``References'' by default. Use
 % |\renewcommand| to redefine it in the preamble.
 %
@@ -438,13 +463,31 @@ Juan Valdez was born\ldots.
 % The Grad College allows ``Vita'', ``Author's Biography'', or ``Curriculum Vitae'',
 % each of which is slightly different in format.  See \cite{Handbook}.
 %
+% \DescribeMacro{\abstractname}
+% Like above, but for the abstract. By default, ``Abstract''.
+%
+% \DescribeMacro{other "name"s}
+% Similarly, the titles for the Table of Contents, List of Figures, and List of Tables
+% are stored in the macros |\contentsname|, |\listfigurename|, and |\listtablename|,
+% respectively. Their default values are the names in the previous sentence. There are
+% also the macros |\chaptername|, |\appendixname|, |\indexname|, |\partname|,
+% |\tablename|, and |\figurename| that contain the appellations for chapter and appendix
+% headings (not applicable with the |[fancy]| option), the index, parts, tables, and figures.
+% Their default values are Chapter, Appendix, Index, Part, Table, and Figure, respectively.
+% All of these macros can
+% be redefined in the preamble with |\renewcommand|.  These macros are all part of
+% the standard \LaTeX\ formalism, they are just included here for the reader's convenience.
+% For example, some departments require chapter headings to be in all caps, which can
+% be done by changing the |\chaptername| macro to be CHAPTER.
+%
 % \DescribeMacro{\note}
 % This command inserts a marginal note just like |\marginpar| with two distinctions:
-% First, the note is single-spaced for compactness. Second, it is only printed when
+% First, the note is single-spaced in a smaller type for compactness.
+% Second, it is only printed when
 % the |[draftthesis]| option is used. Since marginal notes are not allowed in the final
 % draft, the |\note| command is recommended over the |\marginpar| command.
 %
-% \section{Compatibility}
+% \section{Backwards Compatibility}
 %
 % Compatibility with previous versions of \pkg{uiucthesis} are supported. Previously it
 % was implemented as a package rather than a class, in which case you opened the document
@@ -458,6 +501,31 @@ Juan Valdez was born\ldots.
 % used the \env{preliminary} and \env{thesis} environments, which are now deprecated
 % but backwards-compatibility support is still provided.
 %
+% \section{Other Issues}
+%
+% \subsection{Paper Size and PDF Files}
+%
+% The default paper size for most \LaTeX\ distributions is A4, which is slightly different
+% the 8.5 x 11 size for letter paper in the U.S\@. The Graduate College requires theses
+% to be letter paper size.  In addition, many departments want soft copies of the thesis
+% in PDF format. Unfortunately, the program used to convert the dvi file to PDF format
+% (|dvipdfm| on my computer, which is a Windows machine with Mik\TeX installed on it)
+% often produces PDF files in A4 format, even if |letterpaper|
+% is specifically specified in the your \TeX source file. If you're having this problem,
+% either run the PDF conversion utility from the command line with the right flag ---
+% for example, |dvipdfm -p letter| on my computer --- or change the default paper size in
+% the config file for your PDF conversion utility, which will then fix this problem
+% permanently.  On my computer, this can be done by going to the |dvipdfm\config|
+% subdirectory off of the main \TeX installation directory (usually |C:\texmf|). In this
+% directory is a file called |config| that has a line for the default paper size.
+%
+% \subsection{Reference Lists at the Chapter Level}
+%
+% The \pkg{cite} package includes a style file \pkg{chapterbib.sty} that can be used
+% to do a list of references for each chapter instead of just one big list at the
+% end of the thesis.  I've not used this style before so you're on your own if you
+% want to do this, but I think it is rather straightforward\ldots.
+%
 % \StopEventually{%
 %   \begin{thebibliography}{9}
 %     \bibitem{Handbook}
@@ -515,6 +583,7 @@ Juan Valdez was born\ldots.
 \newif\if@proquest \@proquestfalse
 \newif\if@edeposit \@edepositfalse
 \newif\if@thesisoffcenter \@thesisoffcenterfalse
+\newif\if@centerchapter \@centerchapterfalse
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -522,9 +591,10 @@ Juan Valdez was born\ldots.
 \DeclareOption{fancy}{\@thesisfancytrue}
 \DeclareOption{fullpage}{\@fullpagetrue}
 \DeclareOption{proquest}{\@proquesttrue}
-\DeclareOption{toclabels}{\AtBeginDocument{\fancytoc}}
+\DeclareOption{toclabels}{\AtBeginDocument{\toclabels}}
 \DeclareOption{edeposit}{\@edeposittrue}
 \DeclareOption{offcenter}{\@thesisoffcentertrue}
+\DeclareOption{centerchapter}{\@centerchaptertrue}
 %    \end{macrocode}
 %
 % The |[largecaps]| option causes the title and author's name to
@@ -575,11 +645,11 @@ Juan Valdez was born\ldots.
 \fi
 %    \end{macrocode}
 %
-% Define the |\fancytoc| command which prints the headings in the Table of Contents,
-% List of Figures and List of Tables if the |[toclabels]| option is used.
+% Define the |\toclabels| command which prints the headings in the Table of Contents,
+% List of Figures and List of Tables.
 %
 %    \begin{macrocode}
-\newcommand{\fancytoc}{%
+\newcommand{\toclabels}{%
     \addtocontents{toc}{\vspace*{-\baselineskip}\hfill Page\endgraf}%
     \addtocontents{lof}{\vspace*{-\baselineskip}~Figure\hfill Page\endgraf}%
     \addtocontents{lot}{\vspace*{-\baselineskip}~Table\hfill Page\endgraf}}
@@ -660,11 +730,20 @@ Juan Valdez was born\ldots.
 \def\copyrightnotice{\copyright~\@degreeyear~by \@author. All rights reserved.}
 %    \end{macrocode}
 % \end{macro}
+% \begin{macro}{\nocopyrightpage}
+% The printing of the copyright page can also be turned off with the
+% |\nocopyrightpage| command (must come before |\maketitle|):
+%    \begin{macrocode}
+\newif\if@thesiscrpage \@thesiscrpagetrue
+\let\nocopyrightpage\@thesiscrpagefalse
+\if@thesisdraft\nocopyrightpage\fi
+%    \end{macrocode}
+% \end{macro}
 %
 % Set the default title page elements.
 %    \begin{macrocode}
 \phdthesis
-\department{Physics}
+\department{Computer Science}
 \college{Graduate College}
 \def\@schools{}
 \def\@degreeyear{\number\year}
@@ -678,9 +757,9 @@ Juan Valdez was born\ldots.
 %    \begin{macrocode}
 \renewcommand\maketitle{
 %    \end{macrocode}
-% If this is not a draft version, print the copyright page.
+% Print the copyright page if we're supposed to.
 %    \begin{macrocode}
-    \if@thesisdraft\else
+    \if@thesiscrpage
         \newpage
         \thispagestyle{empty}
         \null\vfill
@@ -821,15 +900,11 @@ Juan Valdez was born\ldots.
 %    First we make sure that if a pagebreak should occur, it occurs
 %    \emph{before} this entry. Also a little whitespace is added and a
 %    group begun to keep changes local.
-% \changes{v1.2i}{1994/04/28}{Don't print a toc line when the tocdepth
-%    counter is less then 0}
-% \changes{v1.3b}{1955/05/23}{Added missing braces around argument
-%           to \cs{addpenalty}.}
 %    \begin{macrocode}
 \renewcommand*\l@chapter[2]{%
   \ifnum \c@tocdepth >\m@ne
     \addpenalty{-\@highpenalty}%
-    \vskip 1.0em \@plus\p@
+    \vskip 1.0em \@plus 0.2em \@minus 0.2em
 %    \end{macrocode}
 %
 %    The macro |\numberline| requires that the width of the box that
@@ -864,11 +939,6 @@ Juan Valdez was born\ldots.
 %    \end{macrocode}
 % \end{macro}
 %
-% Create a flag that is set after the Table of Contents where every chapter (even
-% the starred chapters) are put in the TOC.
-%    \begin{macrocode}
-\newif\ifthesis@addtoc \thesis@addtocfalse
-%    \end{macrocode}
 % \begin{macro}{\tableofcontents}
 % We want the Table of Contents to be single-spaced, so
 % we save the original definition, and then arrange it so
@@ -876,25 +946,23 @@ Juan Valdez was born\ldots.
 % the original definition. Then set the flag mentioned above.
 %    \begin{macrocode}
 \let\thesis@tableofcontents=\tableofcontents
-\def\tableofcontents{%
-    \@mkboth{\MakeUppercase{\contentsname}}{\MakeUppercase{\contentsname}}%
-    {\singlespacing\thesis@tableofcontents}%
-    \thesis@addtoctrue%
-}
+\def\tableofcontents{{\singlespacing\thesis@tableofcontents}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\listoftables}
 % \begin{macro}{\listoffigures}
 % Similarly, redefine |\listoftables| and |\listoffigures| so
-% that they use single spacing.  Why bother, you ask?
-% Well, it {\em is} possible that some user might
-% call |\listoffigures| without calling |\tableofcontents|.  Right?
+% that they use single spacing.
 %    \begin{macrocode}
 \let\thesis@listoftables=\listoftables
-\def\listoftables{{\singlespacing\thesis@listoftables}}
+\def\listoftables{\newpage%
+    \addcontentsline{toc}{chapter}{\listtablename}%
+    {\singlespacing\thesis@listoftables}}
 \let\thesis@listoffigures=\listoffigures
-\def\listoffigures{{\singlespacing\thesis@listoffigures}}
+\def\listoffigures{\newpage%
+    \addcontentsline{toc}{chapter}{\listfigurename}%
+    {\singlespacing\thesis@listoffigures}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -919,6 +987,7 @@ Juan Valdez was born\ldots.
 % not specified. Then define the abstract environment to create the ProQuest abstract
 % and then end the document.
 %    \begin{macrocode}
+\def\abstractname{Abstract}
 \if@proquest
  \def\maketitle{}
  \def\@advisor{%
@@ -946,7 +1015,7 @@ Juan Valdez was born\ldots.
 % the \env{abstract} environment to start a regular chapter.
 %    \begin{macrocode}
 \else
- \newenvironment{abstract}{\chapter*{Abstract}}{}
+ \newenvironment{abstract}{\chapter*{\abstractname}}{}
 \fi
 %    \end{macrocode}
 % \end{environment}
@@ -1029,7 +1098,9 @@ Juan Valdez was born\ldots.
 %    |secnumdepth| is larger than $-1$ and, in the book
 %    class, |\@mainmatter| is true, we display the chapter
 %    number. We also inform the user that a new chapter is about to be
-%    typeset by writing a message to the terminal.
+%    typeset by writing a message to the terminal. This definition
+%    is the same as that in \pkg{book.cls} except that it makes different
+%    entries in the table of contents for fancy chapter heads.
 %    \begin{macrocode}
 \def\@chapter[#1]#2{%
   \ifnum \c@secnumdepth >\m@ne
@@ -1072,29 +1143,12 @@ Juan Valdez was born\ldots.
   \fi}
 %    \end{macrocode}
 % \end{macro}
-% \begin{macro}{\@schapter}
-% The macro |\@schapter| is called when |\chapter*{...}| is called. We need
-% to modify it so that if the |thesis@addtoc| flag is set, an entry to the
-% Table of Contents is made.
-%    \begin{macrocode}
-\def\@schapter#1{\if@twocolumn
-                   \@topnewpage[\@makeschapterhead{#1}]%
-                 \else
-                   \@makeschapterhead{#1}%
-                   \@afterheading
-                 \fi
-                 \ifthesis@addtoc
-                  \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}
-                  \addcontentsline{toc}{chapter}{#1}
-                 \fi}
-%    \end{macrocode}
-% \end{macro}
 %
 % For fancy chapter headings, compute the correct height to use for the
 % chapter number.  I want the chapter number to be centered on the first line
 % of the chapter title.  If $a$ is the height of the chapter number and $b$ is
 % the height of the chapter title, then if we set the chapter number in a
-% box of height $b + (a-b)/2=(a+b)/2$ then it aligns correctly.
+% box of height $b+(a-b)/2=(a+b)/2$ then it aligns correctly.
 %
 % We arrange for this value to be computed at the beginning of the document
 % in case the user loads a style file that changed the default fonts.
@@ -1157,11 +1211,14 @@ Juan Valdez was born\ldots.
   \vbox to \chaptertitleheight{
     \def\baselinestretch{1}\@normalsize
     \parindent \z@ \raggedright \normalfont
+    \if@centerchapter
+      \centering
+    \fi
     \ifnum \c@secnumdepth >\m@ne
       \if@mainmatter
         \thesis@chapskip=\z@
         \if@thesisfancy
-          \vspace*{10\p@}
+          \vspace*{10\p@}%
           \leavevmode\llap{\vbox to \chapternumberheight{\hbox{%
             \chapternumberfont\thechapter\,}\vss}}%
         \else
@@ -1172,7 +1229,7 @@ Juan Valdez was born\ldots.
       \fi
     \fi
     \interlinepenalty\@M
-    \vspace*{\thesis@chapskip}
+    \vspace*{\thesis@chapskip}%
     \chaptertitlefont #1
     \vfil
   }%
@@ -1191,6 +1248,9 @@ Juan Valdez was born\ldots.
   \vbox to \chaptertitleheight{
     \def\baselinestretch{1}\@normalsize
     \parindent \z@ \raggedright \normalfont
+    \if@centerchapter
+      \centering
+    \fi
     \interlinepenalty\@M
     \vspace*{\thesis@chapskip}
     \chaptertitlefont #1
@@ -1241,6 +1301,16 @@ Juan Valdez was born\ldots.
 % \end{macro}
 % \end{macro}
 %
+% \subsection{Appendices}
+%
+% \begin{macro}{\appendix}
+% Redefine the |\appendix| macro so that it can take a star
+% if unlettered appendices are desired.
+%    \begin{macrocode}
+\let\thesis@appendix\appendix
+\renewcommand\appendix{\thesis@appendix\@ifstar{\gdef\thechapter{}}{}}
+%    \end{macrocode}
+% \end{macro}
 %
 % \subsection{Bibliography}
 %
@@ -1254,15 +1324,20 @@ Juan Valdez was born\ldots.
 % \end{macro}
 %
 % \begin{environment}{thebibliography}
-% Note that due to the redefinition of the |\@schapter| command, the
-% bibliography is inserted into the Table of Contents as is and no modification
-% to the standard definition of \env{thebibliography} environment is really needed.
-% However, for aesthetics it is nice to have it single-spaced.
-%    \begin{macrocode}
-\let\thesis@thebib\thebibliography
-\let\thesis@endbib\endthebibliography
-\def\thebibliography{\begingroup\singlespacing\thesis@thebib}
-\def\endthebibliography{\thesis@endbib\endgroup}
+% The standard definition of \env{thebibliography} environment issues the |\chapter*|
+% command, which does not make the necessary entry to the TOC. Here the environment
+% is redefined so that the unstarred version is used instead. In addition,
+% the environment is also single-spaced for aesthetics. These modifications are done
+% at the beginning of the document since some packages (\pkg{natbib} in particular)
+% change the definition of \env{thebibliography} environment.
+%    \begin{macrocode}
+\AtBeginDocument{\let\thesis@thebib\thebibliography
+    \let\thesis@endbib\endthebibliography
+    \def\thebibliography{\begingroup\singlespacing%
+        \chapter{\bibname}%
+        \let\chapter\@gobbletwo%
+        \thesis@thebib}
+    \def\endthebibliography{\thesis@endbib\endgroup}}
 %    \end{macrocode}
 % \end{environment}
 %
@@ -1303,39 +1378,44 @@ Juan Valdez was born\ldots.
 % The |[fullpage]| option sets one-inch margins.
 %    \begin{macrocode}
 \if@fullpage
-  \oddsidemargin 0pt
-  \marginparwidth 0.5in
-  \textwidth\paperwidth
-  \advance\textwidth by -2in
+  \setlength{\textwidth}{\paperwidth}
+  \addtolength{\textwidth}{-2in}
+  \@settopoint\textwidth
 \fi
 %    \end{macrocode}
 % In the old version of \pkg{uiucthesis}, the ``fancy'' thesis style used
-% an asymmetrical page layout,
+% an asymmetric page layout,
 % shifting the text column slightly over to the right to leave
 % room for the chapter number to the left of the chapter title. This layout
-% is still used if the |[offcenter]| option is given, otherwise symmetrical
+% is still used if the |[offcenter]| option is given, otherwise symmetric
 % margins are used.
 %    \begin{macrocode}
-\if@thesisfancy
-  \if@thesisoffcenter
-    \advance\oddsidemargin by 36pt
-  \fi
+\setlength{\@tempdima}{\paperwidth}
+\addtolength{\@tempdima}{-\textwidth}
+\setlength{\oddsidemargin}{.5\@tempdima}
+\addtolength{\oddsidemargin}{-1in}
+\if@thesisoffcenter
+  \addtolength{\oddsidemargin}{0.5in}
+  \reversemarginpar
+\fi
 %    \end{macrocode}
-% Set |\marginparwidth|, leaving 36pt for the right margin.
+% Set |\marginparwidth|, leaving 24pt for the right margin.
 % Note that you're not allowed to actually use a marginal paragraph
 % this close to the edge in the final version of a thesis, but it is still
-% handy for leaving notes to yourself in the draft.
+% handy for leaving notes to yourself in the draft (with the |\note|
+% command, see below).
 %    \begin{macrocode}
-  \marginparwidth=\oddsidemargin
-  \advance\marginparwidth by 1in
-  \advance\marginparwidth by -\marginparsep
-  \advance\marginparwidth by -36pt
+\setlength{\marginparwidth}{\oddsidemargin}
+\addtolength{\marginparwidth}{1in}
+\addtolength{\marginparwidth}{-\marginparsep}
+\addtolength{\marginparwidth}{-24pt}
 %    \end{macrocode}
-% Put the marginal paragraphs on the left side, where there's more room.
+% Use the same margins for even and odd pages. Use the \LaTeX macro
+% |\@settopoint| to truncate arithmetic errors.
 %    \begin{macrocode}
-  \reversemarginpar
-\fi
-\let\evensidemargin=\oddsidemargin
+\@settopoint\oddsidemargin
+\@settopoint\marginparwidth
+\setlength{\evensidemargin}{\oddsidemargin}
 %    \end{macrocode}
 %
 %
@@ -1347,7 +1427,7 @@ Juan Valdez was born\ldots.
 % then these notes are not printed.
 %    \begin{macrocode}
 \if@thesisdraft
-    \newcommand{\note}[1]{\marginpar{\singlespacing\small\raggedright #1}}
+    \newcommand{\note}[1]{\marginpar{\def\baselinestretch{1}\small\raggedright #1}}
 \else
     \newcommand{\note}[1]{}
     \let\thesis@marginpar\marginpar
@@ -1402,15 +1482,15 @@ Juan Valdez was born\ldots.
     \let\@mkboth\markboth
     \if@thesisdraft
       \def\chaptermark##1{%
-        \markright {\MakeUppercase{%
+        \markboth {\MakeUppercase{%
           \ifnum \c@secnumdepth >\m@ne
             \if@mainmatter
               \@chapapp\ \thechapter%
             \fi
-          \fi}}}
+          \fi}}{}}
     \else
       \def\chaptermark##1{%
-        \markright {\MakeUppercase{%
+        \def\@chaphead{\MakeUppercase{%
           \ifnum \c@secnumdepth >\m@ne
             \if@mainmatter
               \if@thesisfancy
@@ -1420,7 +1500,8 @@ Juan Valdez was born\ldots.
               \fi
             \fi
           \fi
-          ##1}}}
+          ##1}}%
+        \markboth{\@chaphead}{\@chaphead}}
     \fi
     \def\sectionmark##1{%
       \markright {\MakeUppercase{%
@@ -1476,6 +1557,7 @@ Juan Valdez was born\ldots.
 % even chapter openings should have page numbers in UIUC theses.
 %    \begin{macrocode}
 \renewcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi
+  \@mkboth{}{}
   \thispagestyle{plain}
   \global\@topnum\z@
   \@afterindentfalse
diff --git a/Master/texmf-dist/source/latex/units/units.dtx b/Master/texmf-dist/source/latex/units/units.dtx
index c3ed958aaaa..e63a7554275 100644
--- a/Master/texmf-dist/source/latex/units/units.dtx
+++ b/Master/texmf-dist/source/latex/units/units.dtx
@@ -10,6 +10,9 @@
 %
 %    \CheckSum{174}
 %
+%    \changes{v0.9a}{1998-06-25}{First release}
+%    \changes{v0.9b}{1998-08-04}{Documentation update}
+%
 %% \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
 %%   Lower-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
@@ -34,7 +37,7 @@
 %
 %    \title{\file{units.sty} -- \file{nicefrac.sty}}
 %    \author{Axel Reichert}
-%    \date{1998-06-25}
+%    \date{1998-08-04}
 %    \maketitle
 %    \begin{abstract}
 %      \file{units.sty} is a package for setting units in a
@@ -91,6 +94,12 @@
 %    formula into such a fraction, you have misunderstood the purpose
 %    of this package.  \winkey
 %
+%    A common mistake is to forget the enclosing braces when using the
+%    optional argument of the commands inside another optional
+%    argument.  This is no package bug, but a \LaTeX{} feature.  Correct
+%    example:  |\section[{\unit[1]{m}}]{...}|.\footnote{Credits go to
+%    \person{Frank Knappe} for suggesting this documentation update.}  
+%
 %    It is very important to be aware of the fact that all these
 %    commands distinguish between text mode and math mode.  Within text
 %    mode, the font of the surrounding text will be used by default,
@@ -152,17 +161,17 @@
 %    ``\unit{m}'' is meter, ``$m$'' is a variable, for example a mass.
 %
 %    Why should the space between the value and the dimension be
-%    non-breakable? Because the reader is disturbed by linebreaks like
+%    non-breakable?  Because the reader is disturbed by linebreaks like
 %    1 $\mathrm{m}$.
 %
 %    Why should the space between the value and the dimension be a
-%    half word space only? Because things belonging together are
+%    half word space only?  Because things belonging together are
 %    typeset tighter.  Compare \unit[1]{m} with 1~m and the normal word
 %    spacing, which can vary from line to line.
 %
 %    Why should nice fractions be typeset so that the numerator does
 %    not extend above the height of the letter ``M'' and the
-%    denominator does not extend below the baseline? Because otherwise
+%    denominator does not extend below the baseline?  Because otherwise
 %    a stretching of the baselineskip could be necessary due to
 %    descenders.
 %
@@ -198,13 +207,14 @@
 %      slash is bad.  In fact, there is none.
 %    \item The combination of the \option{ugly} option with text mode
 %      can lead to ambiguous fractions.  Be happy that a warning is
-%      issued.  Why do you use this option?  Your boss? Ah, I see.
+%      issued.  Why do you use this option?  Your boss?  Ah, I see.
 %    \end{itemize}
 %    \section{Implementation}
 %    \subsection{Documentation Driver}
 %    \begin{macrocode}
 %<*driver>
-\documentclass[12pt,a4paper]{ltxdoc} \usepackage{units}
+\documentclass[12pt,a4paper]{ltxdoc} 
+\usepackage{units}
 \begin{document}
   \DocInput{units.dtx}
 \end{document}
@@ -247,7 +257,7 @@
 %    The package identifies itself with its release date, a version
 %    number, and a short description.
 %    \begin{macrocode}
-\ProvidesPackage{units}[1998/06/25 v0.9a Typesetting units]
+\ProvidesPackage{units}[1998/08/04 v0.9b Typesetting units]
 %    \end{macrocode}
 %    \subsubsection{Initialization}
 %    The \package{ifthen} package is loaded because a new boolean
@@ -283,7 +293,7 @@
 %    called \package{nicefrac}, which therefore is required by
 %    \file{units.sty}.
 %    \begin{macrocode}
-\RequirePackage{nicefrac}[1998/06/25]
+\RequirePackage{nicefrac}[1998/08/04]
 %    \end{macrocode}
 %    \subsubsection{Defining Commands}
 %    In order to make debugging easier for the package user (missing
@@ -355,7 +365,7 @@
 %    \subsubsection{Identification}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{nicefrac}[1998/06/25 v0.9a Nice fractions]
+\ProvidesPackage{nicefrac}[1998/08/04 v0.9b Nice fractions]
 %    \end{macrocode}
 %    \subsubsection{Initialization}
 %    First, some new lengths are allocated.
@@ -461,18 +471,22 @@
 %    \begin{macrocode}
     \mkern-2mu/\mkern-1mu%
 %    \end{macrocode}
+%    \changes{v0.9b}{1998-08-04}{\cmd{\bgroup} and \cmd{\egroup}
+%    instead of \cmd{\begingroup} and \cmd{\endgroup}}
 %    The denominator needs a seperate group to delimit the range of the
-%    font commands.  The choice for the fontsize and the font changing
-%    are made just like for the numerator.
+%    font commands.\footnote{Credits go to \person{Michael Switkes}
+%    for the bug report and to \person{Heiko Oberdiek} for telling me
+%    why the fix works.}  The choice for the fontsize and the font
+%    changing are made just like for the numerator.
 %    \begin{macrocode}
-    \begingroup
+    \bgroup
       \mathchoice
         {\scriptstyle}%
         {\scriptstyle}%
         {\scriptscriptstyle}%
         {\scriptscriptstyle}%
       #1{#3}%
-    \endgroup
+    \egroup
   }%
 %    \end{macrocode}
 %    Now the code for nice fractions in text mode:
@@ -529,6 +543,7 @@
 }
 %    \end{macrocode}
 %    \end{macro}
+%    \clearpage
 %    \begin{macro}{\@UnitsUglyFrac}
 %    Ugly fractions in math mode~\ldots
 %    \begin{macrocode}
@@ -540,7 +555,6 @@
     \frac{#1{#2}}{#1{#3}}%
   }%
 %    \end{macrocode}
-%    \newpage
 %    In text mode~\ldots
 %    \begin{macrocode}
   {%
diff --git a/Master/texmf-dist/source/latex/ushort/ushort.dtx b/Master/texmf-dist/source/latex/ushort/ushort.dtx
index cc6483debc9..79671790d66 100644
--- a/Master/texmf-dist/source/latex/ushort/ushort.dtx
+++ b/Master/texmf-dist/source/latex/ushort/ushort.dtx
@@ -1,4 +1,4 @@
-% \def\fileversion{2.1}\def\filedate{2001/06/07}\def\docdate{2001/06/08}
+% \def\fileversion{2.2}\def\filedate{2001/06/13}\def\docdate{2001/06/19}
 %\iffalse These lines are necessary for the doc and docstrip utilities
 %<*asciidocu>
 
@@ -100,6 +100,7 @@
 %%#    insert a line like
 %%#          \catcode`\@=11\relax \input ushort.sty \catcode`\@=12\relax
 %%#
+%%# For TeX insiders:
 %%# The only LaTeX-specific commands used in `ushort.sty' are:
 %%#
 %%#   \newcommand (only in the form \newcommand{\command}{} to ensure that
@@ -120,13 +121,22 @@
 %%#     This command is used analogously to \underline with the difference that
 %%#     the underlines are slightly shorter than usual (and so, in particular,
 %%#     in concatenations of `\ushort'ed variable names the underlines do not
-%%#     merge).
-%%# \ushortd
+%%#     merge). The length of the underline is chosen under the assumption that
+%%#     the argument is a single character. If you want to underline a variable
+%%#     name which consists of more than one character, use instead the command
+%%# \ushortw  [Mnemonic: ushort word]
+%%#     which is analogous to \ushort but such that the length of the underline
+%%#     is chosen appropriate for a `long' argument. (This does not look as
+%%#     good as \ushort if the argument is a single character).
+%%# \ushortd  [Mnemonic: ushort double]
 %%#     This is analogous to \ushort except that the underline is doubled.
+%%# \ushortdw [Mnemonic: ushortd word]
+%%#     This is analogous to \ushortw except that the underline is doubled.
 %%# \ushortdline
 %%#     This is analogous to \underline except that the underline is doubled.
-%%#     This command is internally used by \ushortd and thus redefinitions
-%%#     change also the behavior of \ushortd correspondingly.
+%%#     This command is internally used by \ushortd and \ushortdw and
+%%#     thus redefinitions change also the behavior of \ushortd and \ushortdw
+%%#     correspondingly.
 %%#     In Plain TeX, this macro can be used only in math mode.
 %%# \ushortCreate
 %%#     This can be used to generate a macro which behaves similarly to \ushort
@@ -149,7 +159,9 @@
 %%#
 %%# This command creates a new macro \Name. It is not tested whether \Name
 %%# already exists; if it exists already, it is overridden. In particular,
-%%# it is admissible to use \ushortCreate to redefine \ushort or \ushortd.
+%%# it is admissible to use \ushortCreate to redefine \ushort, \ushortw,
+%%# \ushortd, or \ushortdw. This is the recommended method, if you want to
+%%# change the default values.
 %%#
 %%# The macro \Name can be used analogously to \underline, but the precise
 %%# behavior depends on the arguments of \ushortCreate.
@@ -189,11 +201,13 @@
 %%#
 %%# Examples:
 %%#
-%%# The most important examples are the macros \ushort and \ushortd which
-%%# have been created by
+%%# The most important examples are the macros \ushort, \ushortw, \ushortd,
+%%# and \ushortdw which have been created by
 %%#
 %%#    \ushortCreate{ushort}
+%%#    \ushortCreate()[-.1em]{ushortw}
 %%#    \ushortCreate:\ushortdline{ushortd}
+%%#    \ushortCreate:\ushortdline()[-.1em]{ushortdw}
 %%#
 %%# A further example demonstrating other parameters is
 %%#
@@ -238,7 +252,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 
-% \CheckSum{265}
+% \CheckSum{272}
 
 % \iffalse
 %   \RecordChanges
@@ -250,6 +264,11 @@
 % \newcommand{\cmdcite}[1]{\texttt{\textbackslash#1}}
 % \def\mypar{}
 
+% \changes{2.2}{2001/06/13}{As
+%   Alessandro Russo \texttt{<russo@ian.pv.cnr.it>} suggested,
+%   the case of arguments consisting of more than a single character is
+%   now documented. Corresponding macros \cmdcite{ushortw} and
+%   \cmdcite{ushortdw} have been added}
 % \changes{2.1}{2001/06/07}{Improved speed dramatically (up to factor 4)
 %   by not using \cmdcite{phantom} anymore. Unfortunately, if bad hacks had
 %   been used for the argument ``Additional calculations'' in
@@ -360,7 +379,7 @@
 
 % \section{Installation}
 
-% This package was tested with \TeX, \LaTeX 2.09, and \LaTeXe, and it
+% This package was tested with plain \TeX, \LaTeX 2.09, and \LaTeXe, and it
 % should actually run with most other \TeX\ formats.
 
 % To use ``ushort'', you have to put the file "ushort.sty" in a path where
@@ -386,6 +405,7 @@
 %
 % \end{itemize}
 %
+% For \TeX\ insiders:
 % The only \LaTeX-specific commands used in "ushort.sty" are:
 %
 % \begin{itemize}
@@ -407,12 +427,23 @@
 %   "\underline" with the difference that the underlines are slightly shorter
 %   than usual (and so, in particular, in concatenations of "\ushort"'ed
 %   variable names the underlines do not merge).
-% \iDescribe{ushortd}
+%   The length of the underline is chosen under the assumption that
+%   the argument is a single character. If you want to underline a variable
+%   name which consists of more than one character, use instead the
+%   following command "\ushortw".
+% \iDescribe{ushortw} (Mnemonic: ``ushort word'').
+%   This command is analogous to "\ushort" but such that the length of the
+%   underline is chosen appropriate for a `long' argument. (This does not
+%   look as good as "\ushort" if the argument is a single character).
+% \iDescribe{ushortd} (Mnemonic: ``ushort double'').
 %   This is analogous to "\ushort" except that the underline is doubled.
+% \iDescribe{ushortdw} (Mnemonic: ``ushortd word'').
+%   This is analogous to "\ushortd" except that the underline is doubled.
 % \iDescribe{ushortdline}
 %   This is analogous to "\underline" except that the underline is doubled.
-%   This command is internally used by "\ushortd" and thus redefinitions
-%   change also the behavior of "\ushortd" correspondingly.
+%   This command is internally used by "\ushortd" and "\ushortdw",
+%   and thus redefinitions change also the behavior of "\ushortd" and
+%   "\ushortdw" correspondingly.
 %   In Plain \TeX, this macro can be used only in math mode.
 % \iDescribe{ushortCreate}
 %   This can be used to generate a macro which behaves similarly to "\ushort"
@@ -421,7 +452,7 @@
 % \iDescribe{ushortEnsuremath}
 %   This is rather equivalent to the \LaTeXe\ macro "\ensuremath"
 %   (but is available also e.g.\ in compatibility mode or if this package
-%    is used with plain \TeX\ or \LaTeX 2.09).
+%   is used with plain \TeX\ or \LaTeX 2.09).
 % \end{description}
 %
 % Only "\ushortCreate" needs a detailed description. Its call syntax is:
@@ -441,7 +472,9 @@
 % This command creates a new macro \textbackslash\meta{name}.
 % It is not tested whether \textbackslash\meta{name} already exists;
 % if it exists already, it is overridden. In particular,
-% it is admissible to use "\ushortCreate" to redefine "\ushort" or "\ushortd".
+% it is admissible to use "\ushortCreate" to redefine "\ushort", "\ushortw",
+% "\ushortd", or "\ushortdw". This is the recommended method, if you want to
+% change the default values.
 %
 % The macro \textbackslash\meta{name} can be used analogously to "\underline",
 % but the precise behavior depends on the arguments of "\ushortCreate".
@@ -489,15 +522,16 @@
 % \end{description}
 %
 % Examples:
-% The most important examples are the macros "\ushort" and "\ushortd"
-% which have been created by
+% The most important examples are the macros "\ushort", "\ushortw",
+% "\ushortd", and "\ushortdw" which have been created by
 % \begin{verbatim}
-%    \ushortCreate{ushort}\end{verbatim}
-% \begin{verbatim}
-%    \ushortCreate:\ushortdline{ushortd}\end{verbatim}
+%    \ushortCreate{ushort}
+%    \ushortCreate()[-.1em]{ushortw}
+%    \ushortCreate:\ushortdline{ushortd}
+%    \ushortCreate:\ushortdline()[-.1em]{ushortdw}\end{verbatim}
 % A further example demonstrating other parameters is
 % \begin{verbatim}
-% \ushortCreate*(3)(.5){uline}\end{verbatim}
+%    \ushortCreate*(3)(.5){uline}\end{verbatim}
 % This creates the macro "\uline" which underbars its argument but such that
 % the underbar has only half of the usual length (the argument "(3)" in
 % the above call is overridden by the later argument "(.5)").\par
@@ -538,22 +572,26 @@
 \else
   \let\ushrt@tmp\typeout
 \fi
-\ushrt@tmp{ushort.sty by M. Vaeth: Release: 2.1 }
+\ushrt@tmp{ushort.sty by M. Vaeth: Release: 2.2 }
 
 %% First, some LaTeX support:
 
 \ifx\ProvidesPackage\undefined\else
-  \ProvidesPackage{ushort}[2001/06/07 v2.1]
+  \ProvidesPackage{ushort}[2001/06/13 v2.2]
 \fi
 
 \ifx\newcommand\undefined\else
   \newcommand{\ushort}{}
+  \newcommand{\ushortw}{}
   \newcommand{\ushortd}{}
+  \newcommand{\ushortdw}{}
   \newcommand{\ushortdline}{}
   \newcommand{\ushortCreate}{}
   \newcommand{\ushortEnsuremath}{}
 \fi
 
+%% The implementation follows
+
 %    \end{macrocode}
 %
 % \begin{macro}{\ushortCreate}
@@ -646,13 +684,13 @@
       {\setbox0\hbox{\mathsurround0pt$##1##2$}%
         \dimen0=#4\wd0#3\dimen1\ht0\dimen2\dp0#2%
         \setbox0\hbox to#5\dimen0{}\ht0\dimen1\dp0\dimen2%
-        \box0}}$\hss}}}
+        \box0}}$\hss}}}%
   \else
     \def#7##1##2{\hbox to 0pt{#1{%
       {\setbox0\hbox{\mathsurround0pt$##1##2$}%
         \dimen0=#4\wd0#3\dimen1\ht0\dimen2\dp0#2%
         \setbox0\hbox to#5\dimen0{}\ht0\dimen1\dp0\dimen2%
-        \box0}}\hss}}
+        \box0}}\hss}}%
   \fi}
 
 %    \end{macrocode}
@@ -691,22 +729,36 @@
 % with the default values.
 %    \begin{macrocode}
 \ushortCreate{ushort}
-
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ushortw}
+% "\ushortw" is nothing else but an instance created by "\ushortCreate"
+% where the default values are changed by omitting \meta{factor after} and
+% by setting another value for \meta{summand}:
+%    \begin{macrocode}
+\ushortCreate()[-.1em]{ushortw}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\ushortd}
 % "\ushortd" is nothing else but an instance created by "\ushortCreate"
 % with the default values but the \textbackslash\meta{command} value
-% "\ushortdline"
+% "\ushortdline":
 %    \begin{macrocode}
 \ushortCreate:\ushortdline{ushortd}
 %    \end{macrocode}
-%  \begin{macro}{\ushortdline}
+% \end{macro}
+% \begin{macro}{\ushortdw}
+% "\ushortdw" is nothing else but an instance created by "\ushortCreate"
+% where the default values are modified as in "\ushortw" and "\ushortd":
+%    \begin{macrocode}
+\ushortCreate:\ushortdline()[-.1em]{ushortdw}
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ushortdline}
 %  "\ushortdline" in turn is very simple to implement:
 %    \begin{macrocode}
 \def\ushortdline#1{\underline{\underline #1}}
 %    \end{macrocode}
-%  \end{macro}
 % \end{macro}
 %
 %
diff --git a/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.cls b/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.cls
index 671ff9cf744..fef04c1a4e9 100644
--- a/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.cls
+++ b/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.cls
@@ -20,7 +20,7 @@
 %% original source files, as listed above, are part of the
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
-\def\fileversion{v2.0} \def\filedate{2005/02/01}
+\def\fileversion{v2.25} \def\filedate{2005/03/25}
 %% Package and Class "uiucthesis" for use with LaTeX2e.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{uiucthesis}
@@ -42,13 +42,15 @@
 \newif\if@proquest \@proquestfalse
 \newif\if@edeposit \@edepositfalse
 \newif\if@thesisoffcenter \@thesisoffcenterfalse
+\newif\if@centerchapter \@centerchapterfalse
 \DeclareOption{draftthesis}{\@thesisdrafttrue}
 \DeclareOption{fancy}{\@thesisfancytrue}
 \DeclareOption{fullpage}{\@fullpagetrue}
 \DeclareOption{proquest}{\@proquesttrue}
-\DeclareOption{toclabels}{\AtBeginDocument{\fancytoc}}
+\DeclareOption{toclabels}{\AtBeginDocument{\toclabels}}
 \DeclareOption{edeposit}{\@edeposittrue}
 \DeclareOption{offcenter}{\@thesisoffcentertrue}
+\DeclareOption{centerchapter}{\@centerchaptertrue}
 \DeclareOption{largecaps}{\@largecapstrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
 \PassOptionsToClass{letterpaper,oneside}{book}
@@ -68,7 +70,7 @@
   \def\draftheader{\slshape Draft of \today\ at
   \ifnum\timehh<10 0\fi\number\timehh\,:\,\ifnum\timemm<10 0\fi\number\timemm}%
 \fi
-\newcommand{\fancytoc}{%
+\newcommand{\toclabels}{%
     \addtocontents{toc}{\vspace*{-\baselineskip}\hfill Page\endgraf}%
     \addtocontents{lof}{\vspace*{-\baselineskip}~Figure\hfill Page\endgraf}%
     \addtocontents{lot}{\vspace*{-\baselineskip}~Table\hfill Page\endgraf}}
@@ -105,13 +107,16 @@
     {Use \protect\committee\space with members separated by \protect\\'s.}}
 \fi
 \def\copyrightnotice{\copyright~\@degreeyear~by \@author. All rights reserved.}
+\newif\if@thesiscrpage \@thesiscrpagetrue
+\let\nocopyrightpage\@thesiscrpagefalse
+\if@thesisdraft\nocopyrightpage\fi
 \phdthesis
-\department{Physics}
+\department{Computer Science}
 \college{Graduate College}
 \def\@schools{}
 \def\@degreeyear{\number\year}
 \renewcommand\maketitle{
-    \if@thesisdraft\else
+    \if@thesiscrpage
         \newpage
         \thispagestyle{empty}
         \null\vfill
@@ -201,7 +206,7 @@
 \renewcommand*\l@chapter[2]{%
   \ifnum \c@tocdepth >\m@ne
     \addpenalty{-\@highpenalty}%
-    \vskip 1.0em \@plus\p@
+    \vskip 1.0em \@plus 0.2em \@minus 0.2em
     \setlength\@tempdima{1.5em}
     \begingroup
       \leftskip \z@ \rightskip \@tocrmarg \parfillskip -\rightskip
@@ -215,19 +220,19 @@
       \penalty\@highpenalty
     \endgroup
   \fi}
-\newif\ifthesis@addtoc \thesis@addtocfalse
 \let\thesis@tableofcontents=\tableofcontents
-\def\tableofcontents{%
-    \@mkboth{\MakeUppercase{\contentsname}}{\MakeUppercase{\contentsname}}%
-    {\singlespacing\thesis@tableofcontents}%
-    \thesis@addtoctrue%
-}
+\def\tableofcontents{{\singlespacing\thesis@tableofcontents}}
 \let\thesis@listoftables=\listoftables
-\def\listoftables{{\singlespacing\thesis@listoftables}}
+\def\listoftables{\newpage%
+    \addcontentsline{toc}{chapter}{\listtablename}%
+    {\singlespacing\thesis@listoftables}}
 \let\thesis@listoffigures=\listoffigures
-\def\listoffigures{{\singlespacing\thesis@listoffigures}}
+\def\listoffigures{\newpage%
+    \addcontentsline{toc}{chapter}{\listfigurename}%
+    {\singlespacing\thesis@listoffigures}}
 \newcommand*{\advisor}[1]{\gdef\@advisor{#1}}
 \newcommand*{\adviser}[1]{\gdef\@advisor{#1}}
+\def\abstractname{Abstract}
 \if@proquest
  \def\maketitle{}
  \def\@advisor{%
@@ -250,7 +255,7 @@
     \aftergroup\endinput
     }
 \else
- \newenvironment{abstract}{\chapter*{Abstract}}{}
+ \newenvironment{abstract}{\chapter*{\abstractname}}{}
 \fi
 \newenvironment{dedication}{
     \newpage
@@ -310,16 +315,6 @@
     \@makechapterhead{#2}%
     \@afterheading
   \fi}
-\def\@schapter#1{\if@twocolumn
-                   \@topnewpage[\@makeschapterhead{#1}]%
-                 \else
-                   \@makeschapterhead{#1}%
-                   \@afterheading
-                 \fi
-                 \ifthesis@addtoc
-                  \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}
-                  \addcontentsline{toc}{chapter}{#1}
-                 \fi}
 \newskip\thesis@chapskip
 \AtBeginDocument{%
   \newdimen\chapternumberheight
@@ -355,11 +350,14 @@
   \vbox to \chaptertitleheight{
     \def\baselinestretch{1}\@normalsize
     \parindent \z@ \raggedright \normalfont
+    \if@centerchapter
+      \centering
+    \fi
     \ifnum \c@secnumdepth >\m@ne
       \if@mainmatter
         \thesis@chapskip=\z@
         \if@thesisfancy
-          \vspace*{10\p@}
+          \vspace*{10\p@}%
           \leavevmode\llap{\vbox to \chapternumberheight{\hbox{%
             \chapternumberfont\thechapter\,}\vss}}%
         \else
@@ -370,7 +368,7 @@
       \fi
     \fi
     \interlinepenalty\@M
-    \vspace*{\thesis@chapskip}
+    \vspace*{\thesis@chapskip}%
     \chaptertitlefont #1
     \vfil
   }%
@@ -380,6 +378,9 @@
   \vbox to \chaptertitleheight{
     \def\baselinestretch{1}\@normalsize
     \parindent \z@ \raggedright \normalfont
+    \if@centerchapter
+      \centering
+    \fi
     \interlinepenalty\@M
     \vspace*{\thesis@chapskip}
     \chaptertitlefont #1
@@ -402,11 +403,16 @@
   {-3.25ex\@plus -1ex \@minus -.2ex}%
   {1.5ex \@plus .2ex}%
   {\raggedright\normalfont\subsubsectiontitlefont}}
+\let\thesis@appendix\appendix
+\renewcommand\appendix{\thesis@appendix\@ifstar{\gdef\thechapter{}}{}}
 \renewcommand\bibname{References}
-\let\thesis@thebib\thebibliography
-\let\thesis@endbib\endthebibliography
-\def\thebibliography{\begingroup\singlespacing\thesis@thebib}
-\def\endthebibliography{\thesis@endbib\endgroup}
+\AtBeginDocument{\let\thesis@thebib\thebibliography
+    \let\thesis@endbib\endthebibliography
+    \def\thebibliography{\begingroup\singlespacing%
+        \chapter{\bibname}%
+        \let\chapter\@gobbletwo%
+        \thesis@thebib}
+    \def\endthebibliography{\thesis@endbib\endgroup}}
 \let\thesis@theindex=\theindex
 \def\theindex{\addcontentsline{toc}{chapter}{\indexname}%
     \begingroup\singlespacing\thesis@theindex}
@@ -417,24 +423,27 @@
 \advance \topmargin by -\headsep
 \textheight 8.9in
 \if@fullpage
-  \oddsidemargin 0pt
-  \marginparwidth 0.5in
-  \textwidth\paperwidth
-  \advance\textwidth by -2in
+  \setlength{\textwidth}{\paperwidth}
+  \addtolength{\textwidth}{-2in}
+  \@settopoint\textwidth
 \fi
-\if@thesisfancy
-  \if@thesisoffcenter
-    \advance\oddsidemargin by 36pt
-  \fi
-  \marginparwidth=\oddsidemargin
-  \advance\marginparwidth by 1in
-  \advance\marginparwidth by -\marginparsep
-  \advance\marginparwidth by -36pt
+\setlength{\@tempdima}{\paperwidth}
+\addtolength{\@tempdima}{-\textwidth}
+\setlength{\oddsidemargin}{.5\@tempdima}
+\addtolength{\oddsidemargin}{-1in}
+\if@thesisoffcenter
+  \addtolength{\oddsidemargin}{0.5in}
   \reversemarginpar
 \fi
-\let\evensidemargin=\oddsidemargin
+\setlength{\marginparwidth}{\oddsidemargin}
+\addtolength{\marginparwidth}{1in}
+\addtolength{\marginparwidth}{-\marginparsep}
+\addtolength{\marginparwidth}{-24pt}
+\@settopoint\oddsidemargin
+\@settopoint\marginparwidth
+\setlength{\evensidemargin}{\oddsidemargin}
 \if@thesisdraft
-    \newcommand{\note}[1]{\marginpar{\singlespacing\small\raggedright #1}}
+    \newcommand{\note}[1]{\marginpar{\def\baselinestretch{1}\small\raggedright #1}}
 \else
     \newcommand{\note}[1]{}
     \let\thesis@marginpar\marginpar
@@ -468,15 +477,15 @@
     \let\@mkboth\markboth
     \if@thesisdraft
       \def\chaptermark##1{%
-        \markright {\MakeUppercase{%
+        \markboth {\MakeUppercase{%
           \ifnum \c@secnumdepth >\m@ne
             \if@mainmatter
               \@chapapp\ \thechapter%
             \fi
-          \fi}}}
+          \fi}}{}}
     \else
       \def\chaptermark##1{%
-        \markright {\MakeUppercase{%
+        \def\@chaphead{\MakeUppercase{%
           \ifnum \c@secnumdepth >\m@ne
             \if@mainmatter
               \if@thesisfancy
@@ -486,7 +495,8 @@
               \fi
             \fi
           \fi
-          ##1}}}
+          ##1}}%
+        \markboth{\@chaphead}{\@chaphead}}
     \fi
     \def\sectionmark##1{%
       \markright {\MakeUppercase{%
@@ -531,6 +541,7 @@
 \fi
 \pagestyle{plain}
 \renewcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi
+  \@mkboth{}{}
   \thispagestyle{plain}
   \global\@topnum\z@
   \@afterindentfalse
diff --git a/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.sty b/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.sty
index c06042716f5..08374b687bd 100644
--- a/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.sty
+++ b/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.sty
@@ -20,7 +20,7 @@
 %% original source files, as listed above, are part of the
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
-\def\fileversion{v2.0} \def\filedate{2005/02/01}
+\def\fileversion{v2.25} \def\filedate{2005/03/25}
 %% Package and Class "uiucthesis" for use with LaTeX2e.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{uiucthesis}
@@ -42,13 +42,15 @@
 \newif\if@proquest \@proquestfalse
 \newif\if@edeposit \@edepositfalse
 \newif\if@thesisoffcenter \@thesisoffcenterfalse
+\newif\if@centerchapter \@centerchapterfalse
 \DeclareOption{draftthesis}{\@thesisdrafttrue}
 \DeclareOption{fancy}{\@thesisfancytrue}
 \DeclareOption{fullpage}{\@fullpagetrue}
 \DeclareOption{proquest}{\@proquesttrue}
-\DeclareOption{toclabels}{\AtBeginDocument{\fancytoc}}
+\DeclareOption{toclabels}{\AtBeginDocument{\toclabels}}
 \DeclareOption{edeposit}{\@edeposittrue}
 \DeclareOption{offcenter}{\@thesisoffcentertrue}
+\DeclareOption{centerchapter}{\@centerchaptertrue}
 \DeclareOption{largecaps}{\@largecapstrue}
 \ProcessOptions
 \if@proquest
@@ -65,7 +67,7 @@
   \def\draftheader{\slshape Draft of \today\ at
   \ifnum\timehh<10 0\fi\number\timehh\,:\,\ifnum\timemm<10 0\fi\number\timemm}%
 \fi
-\newcommand{\fancytoc}{%
+\newcommand{\toclabels}{%
     \addtocontents{toc}{\vspace*{-\baselineskip}\hfill Page\endgraf}%
     \addtocontents{lof}{\vspace*{-\baselineskip}~Figure\hfill Page\endgraf}%
     \addtocontents{lot}{\vspace*{-\baselineskip}~Table\hfill Page\endgraf}}
@@ -102,13 +104,16 @@
     {Use \protect\committee\space with members separated by \protect\\'s.}}
 \fi
 \def\copyrightnotice{\copyright~\@degreeyear~by \@author. All rights reserved.}
+\newif\if@thesiscrpage \@thesiscrpagetrue
+\let\nocopyrightpage\@thesiscrpagefalse
+\if@thesisdraft\nocopyrightpage\fi
 \phdthesis
-\department{Physics}
+\department{Computer Science}
 \college{Graduate College}
 \def\@schools{}
 \def\@degreeyear{\number\year}
 \renewcommand\maketitle{
-    \if@thesisdraft\else
+    \if@thesiscrpage
         \newpage
         \thispagestyle{empty}
         \null\vfill
@@ -198,7 +203,7 @@
 \renewcommand*\l@chapter[2]{%
   \ifnum \c@tocdepth >\m@ne
     \addpenalty{-\@highpenalty}%
-    \vskip 1.0em \@plus\p@
+    \vskip 1.0em \@plus 0.2em \@minus 0.2em
     \setlength\@tempdima{1.5em}
     \begingroup
       \leftskip \z@ \rightskip \@tocrmarg \parfillskip -\rightskip
@@ -212,19 +217,19 @@
       \penalty\@highpenalty
     \endgroup
   \fi}
-\newif\ifthesis@addtoc \thesis@addtocfalse
 \let\thesis@tableofcontents=\tableofcontents
-\def\tableofcontents{%
-    \@mkboth{\MakeUppercase{\contentsname}}{\MakeUppercase{\contentsname}}%
-    {\singlespacing\thesis@tableofcontents}%
-    \thesis@addtoctrue%
-}
+\def\tableofcontents{{\singlespacing\thesis@tableofcontents}}
 \let\thesis@listoftables=\listoftables
-\def\listoftables{{\singlespacing\thesis@listoftables}}
+\def\listoftables{\newpage%
+    \addcontentsline{toc}{chapter}{\listtablename}%
+    {\singlespacing\thesis@listoftables}}
 \let\thesis@listoffigures=\listoffigures
-\def\listoffigures{{\singlespacing\thesis@listoffigures}}
+\def\listoffigures{\newpage%
+    \addcontentsline{toc}{chapter}{\listfigurename}%
+    {\singlespacing\thesis@listoffigures}}
 \newcommand*{\advisor}[1]{\gdef\@advisor{#1}}
 \newcommand*{\adviser}[1]{\gdef\@advisor{#1}}
+\def\abstractname{Abstract}
 \if@proquest
  \def\maketitle{}
  \def\@advisor{%
@@ -247,7 +252,7 @@
     \aftergroup\endinput
     }
 \else
- \newenvironment{abstract}{\chapter*{Abstract}}{}
+ \newenvironment{abstract}{\chapter*{\abstractname}}{}
 \fi
 \newenvironment{dedication}{
     \newpage
@@ -307,16 +312,6 @@
     \@makechapterhead{#2}%
     \@afterheading
   \fi}
-\def\@schapter#1{\if@twocolumn
-                   \@topnewpage[\@makeschapterhead{#1}]%
-                 \else
-                   \@makeschapterhead{#1}%
-                   \@afterheading
-                 \fi
-                 \ifthesis@addtoc
-                  \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}
-                  \addcontentsline{toc}{chapter}{#1}
-                 \fi}
 \newskip\thesis@chapskip
 \AtBeginDocument{%
   \newdimen\chapternumberheight
@@ -352,11 +347,14 @@
   \vbox to \chaptertitleheight{
     \def\baselinestretch{1}\@normalsize
     \parindent \z@ \raggedright \normalfont
+    \if@centerchapter
+      \centering
+    \fi
     \ifnum \c@secnumdepth >\m@ne
       \if@mainmatter
         \thesis@chapskip=\z@
         \if@thesisfancy
-          \vspace*{10\p@}
+          \vspace*{10\p@}%
           \leavevmode\llap{\vbox to \chapternumberheight{\hbox{%
             \chapternumberfont\thechapter\,}\vss}}%
         \else
@@ -367,7 +365,7 @@
       \fi
     \fi
     \interlinepenalty\@M
-    \vspace*{\thesis@chapskip}
+    \vspace*{\thesis@chapskip}%
     \chaptertitlefont #1
     \vfil
   }%
@@ -377,6 +375,9 @@
   \vbox to \chaptertitleheight{
     \def\baselinestretch{1}\@normalsize
     \parindent \z@ \raggedright \normalfont
+    \if@centerchapter
+      \centering
+    \fi
     \interlinepenalty\@M
     \vspace*{\thesis@chapskip}
     \chaptertitlefont #1
@@ -399,11 +400,16 @@
   {-3.25ex\@plus -1ex \@minus -.2ex}%
   {1.5ex \@plus .2ex}%
   {\raggedright\normalfont\subsubsectiontitlefont}}
+\let\thesis@appendix\appendix
+\renewcommand\appendix{\thesis@appendix\@ifstar{\gdef\thechapter{}}{}}
 \renewcommand\bibname{References}
-\let\thesis@thebib\thebibliography
-\let\thesis@endbib\endthebibliography
-\def\thebibliography{\begingroup\singlespacing\thesis@thebib}
-\def\endthebibliography{\thesis@endbib\endgroup}
+\AtBeginDocument{\let\thesis@thebib\thebibliography
+    \let\thesis@endbib\endthebibliography
+    \def\thebibliography{\begingroup\singlespacing%
+        \chapter{\bibname}%
+        \let\chapter\@gobbletwo%
+        \thesis@thebib}
+    \def\endthebibliography{\thesis@endbib\endgroup}}
 \let\thesis@theindex=\theindex
 \def\theindex{\addcontentsline{toc}{chapter}{\indexname}%
     \begingroup\singlespacing\thesis@theindex}
@@ -414,24 +420,27 @@
 \advance \topmargin by -\headsep
 \textheight 8.9in
 \if@fullpage
-  \oddsidemargin 0pt
-  \marginparwidth 0.5in
-  \textwidth\paperwidth
-  \advance\textwidth by -2in
+  \setlength{\textwidth}{\paperwidth}
+  \addtolength{\textwidth}{-2in}
+  \@settopoint\textwidth
 \fi
-\if@thesisfancy
-  \if@thesisoffcenter
-    \advance\oddsidemargin by 36pt
-  \fi
-  \marginparwidth=\oddsidemargin
-  \advance\marginparwidth by 1in
-  \advance\marginparwidth by -\marginparsep
-  \advance\marginparwidth by -36pt
+\setlength{\@tempdima}{\paperwidth}
+\addtolength{\@tempdima}{-\textwidth}
+\setlength{\oddsidemargin}{.5\@tempdima}
+\addtolength{\oddsidemargin}{-1in}
+\if@thesisoffcenter
+  \addtolength{\oddsidemargin}{0.5in}
   \reversemarginpar
 \fi
-\let\evensidemargin=\oddsidemargin
+\setlength{\marginparwidth}{\oddsidemargin}
+\addtolength{\marginparwidth}{1in}
+\addtolength{\marginparwidth}{-\marginparsep}
+\addtolength{\marginparwidth}{-24pt}
+\@settopoint\oddsidemargin
+\@settopoint\marginparwidth
+\setlength{\evensidemargin}{\oddsidemargin}
 \if@thesisdraft
-    \newcommand{\note}[1]{\marginpar{\singlespacing\small\raggedright #1}}
+    \newcommand{\note}[1]{\marginpar{\def\baselinestretch{1}\small\raggedright #1}}
 \else
     \newcommand{\note}[1]{}
     \let\thesis@marginpar\marginpar
@@ -465,15 +474,15 @@
     \let\@mkboth\markboth
     \if@thesisdraft
       \def\chaptermark##1{%
-        \markright {\MakeUppercase{%
+        \markboth {\MakeUppercase{%
           \ifnum \c@secnumdepth >\m@ne
             \if@mainmatter
               \@chapapp\ \thechapter%
             \fi
-          \fi}}}
+          \fi}}{}}
     \else
       \def\chaptermark##1{%
-        \markright {\MakeUppercase{%
+        \def\@chaphead{\MakeUppercase{%
           \ifnum \c@secnumdepth >\m@ne
             \if@mainmatter
               \if@thesisfancy
@@ -483,7 +492,8 @@
               \fi
             \fi
           \fi
-          ##1}}}
+          ##1}}%
+        \markboth{\@chaphead}{\@chaphead}}
     \fi
     \def\sectionmark##1{%
       \markright {\MakeUppercase{%
@@ -528,6 +538,7 @@
 \fi
 \pagestyle{plain}
 \renewcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi
+  \@mkboth{}{}
   \thispagestyle{plain}
   \global\@topnum\z@
   \@afterindentfalse
diff --git a/Master/texmf-dist/doc/latex/unitsdef/config/ampabbrv.cfg b/Master/texmf-dist/tex/latex/unitsdef/ampabbrv.cfg
index 9c0b9e05836..9c0b9e05836 100644
--- a/Master/texmf-dist/doc/latex/unitsdef/config/ampabbrv.cfg
+++ b/Master/texmf-dist/tex/latex/unitsdef/ampabbrv.cfg
diff --git a/Master/texmf-dist/doc/latex/unitsdef/config/enerabbr.cfg b/Master/texmf-dist/tex/latex/unitsdef/enerabbr.cfg
index de433b12db7..de433b12db7 100644
--- a/Master/texmf-dist/doc/latex/unitsdef/config/enerabbr.cfg
+++ b/Master/texmf-dist/tex/latex/unitsdef/enerabbr.cfg
diff --git a/Master/texmf-dist/doc/latex/unitsdef/config/freqabbr.cfg b/Master/texmf-dist/tex/latex/unitsdef/freqabbr.cfg
index c847cff9cbf..c847cff9cbf 100644
--- a/Master/texmf-dist/doc/latex/unitsdef/config/freqabbr.cfg
+++ b/Master/texmf-dist/tex/latex/unitsdef/freqabbr.cfg
diff --git a/Master/texmf-dist/doc/latex/unitsdef/config/lengabbr.cfg b/Master/texmf-dist/tex/latex/unitsdef/lengabbr.cfg
index 5f3e1b97982..5f3e1b97982 100644
--- a/Master/texmf-dist/doc/latex/unitsdef/config/lengabbr.cfg
+++ b/Master/texmf-dist/tex/latex/unitsdef/lengabbr.cfg
diff --git a/Master/texmf-dist/doc/latex/unitsdef/config/molabbrv.cfg b/Master/texmf-dist/tex/latex/unitsdef/molabbrv.cfg
index f4922cf7857..f4922cf7857 100644
--- a/Master/texmf-dist/doc/latex/unitsdef/config/molabbrv.cfg
+++ b/Master/texmf-dist/tex/latex/unitsdef/molabbrv.cfg
diff --git a/Master/texmf-dist/doc/latex/unitsdef/config/timeabbr.cfg b/Master/texmf-dist/tex/latex/unitsdef/timeabbr.cfg
index cfc56134043..cfc56134043 100644
--- a/Master/texmf-dist/doc/latex/unitsdef/config/timeabbr.cfg
+++ b/Master/texmf-dist/tex/latex/unitsdef/timeabbr.cfg
diff --git a/Master/texmf-dist/doc/latex/unitsdef/config/volabbrv.cfg b/Master/texmf-dist/tex/latex/unitsdef/volabbrv.cfg
index 1bd400ecb86..1bd400ecb86 100644
--- a/Master/texmf-dist/doc/latex/unitsdef/config/volabbrv.cfg
+++ b/Master/texmf-dist/tex/latex/unitsdef/volabbrv.cfg
diff --git a/Master/texmf-dist/doc/latex/unitsdef/config/voltabbr.cfg b/Master/texmf-dist/tex/latex/unitsdef/voltabbr.cfg
index 73a68455da3..73a68455da3 100644
--- a/Master/texmf-dist/doc/latex/unitsdef/config/voltabbr.cfg
+++ b/Master/texmf-dist/tex/latex/unitsdef/voltabbr.cfg
diff --git a/Master/texmf-dist/doc/latex/unitsdef/config/weigabbr.cfg b/Master/texmf-dist/tex/latex/unitsdef/weigabbr.cfg
index 039220f2c45..039220f2c45 100644
--- a/Master/texmf-dist/doc/latex/unitsdef/config/weigabbr.cfg
+++ b/Master/texmf-dist/tex/latex/unitsdef/weigabbr.cfg
diff --git a/Master/texmf-dist/tex/latex/ushort/ushort.sty b/Master/texmf-dist/tex/latex/ushort/ushort.sty
index f0781fb37c3..a5db1e7b7f7 100644
--- a/Master/texmf-dist/tex/latex/ushort/ushort.sty
+++ b/Master/texmf-dist/tex/latex/ushort/ushort.sty
@@ -13,22 +13,26 @@
 \else
   \let\ushrt@tmp\typeout
 \fi
-\ushrt@tmp{ushort.sty by M. Vaeth: Release: 2.1 }
+\ushrt@tmp{ushort.sty by M. Vaeth: Release: 2.2 }
 
 %% First, some LaTeX support:
 
 \ifx\ProvidesPackage\undefined\else
-  \ProvidesPackage{ushort}[2001/06/07 v2.1]
+  \ProvidesPackage{ushort}[2001/06/13 v2.2]
 \fi
 
 \ifx\newcommand\undefined\else
   \newcommand{\ushort}{}
+  \newcommand{\ushortw}{}
   \newcommand{\ushortd}{}
+  \newcommand{\ushortdw}{}
   \newcommand{\ushortdline}{}
   \newcommand{\ushortCreate}{}
   \newcommand{\ushortEnsuremath}{}
 \fi
 
+%% The implementation follows
+
 \def\ushortCreate{\let\ushrt@calc\ushrt@empty\let\ushrt@TextMode\undefined
   \def\ushrt@FactorAfter{0.8}\let\ushrt@FactorBefore\ushrt@calc
   \let\ushrt@Summand\ushrt@empty\def\ushrt@cmd{\underline}\ushrt@TestLoop}
@@ -82,13 +86,13 @@
       {\setbox0\hbox{\mathsurround0pt$##1##2$}%
         \dimen0=#4\wd0#3\dimen1\ht0\dimen2\dp0#2%
         \setbox0\hbox to#5\dimen0{}\ht0\dimen1\dp0\dimen2%
-        \box0}}$\hss}}}
+        \box0}}$\hss}}}%
   \else
     \def#7##1##2{\hbox to 0pt{#1{%
       {\setbox0\hbox{\mathsurround0pt$##1##2$}%
         \dimen0=#4\wd0#3\dimen1\ht0\dimen2\dp0#2%
         \setbox0\hbox to#5\dimen0{}\ht0\dimen1\dp0\dimen2%
-        \box0}}\hss}}
+        \box0}}\hss}}%
   \fi}
 
 \def\ushortEnsuremath{\relax
@@ -103,8 +107,9 @@
 \def\ushrt@empty{}
 
 \ushortCreate{ushort}
-
+\ushortCreate()[-.1em]{ushortw}
 \ushortCreate:\ushortdline{ushortd}
+\ushortCreate:\ushortdline()[-.1em]{ushortdw}
 \def\ushortdline#1{\underline{\underline #1}}
 \endinput
 %%
diff --git a/Master/texmf-dist/tpm/uiucthesis.tpm b/Master/texmf-dist/tpm/uiucthesis.tpm
index 8f8bde60134..9229a600d45 100644
--- a/Master/texmf-dist/tpm/uiucthesis.tpm
+++ b/Master/texmf-dist/tpm/uiucthesis.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/uiucthesis.zip">
     <TPM:Name>uiucthesis</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:58:42</TPM:Date>
+    <TPM:Date>2006/10/17 22:31:07</TPM:Date>
     <TPM:Version>1.0</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>UIUC thesis class.</TPM:Title>
@@ -16,18 +16,18 @@ Preparing to Deposit.
     <TPM:Author>unknown</TPM:Author>
     <TPM:Size>381725</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="34521">
+    <TPM:RunFiles size="35411">
 texmf-dist/tex/latex/uiucthesis/uiucthesis.cls
 texmf-dist/tex/latex/uiucthesis/uiucthesis.sty
 texmf-dist/tpm/uiucthesis.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="293548">
+    <TPM:DocFiles size="274194">
 texmf-dist/doc/latex/uiucthesis/README
 texmf-dist/doc/latex/uiucthesis/thesis-ex.pdf
 texmf-dist/doc/latex/uiucthesis/thesis-ex.tex
 texmf-dist/doc/latex/uiucthesis/uiucthesis.pdf
     </TPM:DocFiles>
-    <TPM:SourceFiles size="53656">
+    <TPM:SourceFiles size="59744">
 texmf-dist/source/latex/uiucthesis/uiucthesis.dtx
 texmf-dist/source/latex/uiucthesis/uiucthesis.ins
     </TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/umich-thesis.tpm b/Master/texmf-dist/tpm/umich-thesis.tpm
index 08e13b09681..96e2eab14a7 100644
--- a/Master/texmf-dist/tpm/umich-thesis.tpm
+++ b/Master/texmf-dist/tpm/umich-thesis.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/umich-thesis.zip">
     <TPM:Name>umich-thesis</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/09 00:49:07</TPM:Date>
+    <TPM:Date>2004/03/12 21:43:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>University of Michigan Thesis LaTeX class.</TPM:Title>
diff --git a/Master/texmf-dist/tpm/undertilde.tpm b/Master/texmf-dist/tpm/undertilde.tpm
index de3ae6cea81..115d6800587 100644
--- a/Master/texmf-dist/tpm/undertilde.tpm
+++ b/Master/texmf-dist/tpm/undertilde.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/undertilde.zip">
     <TPM:Name>undertilde</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:58:47</TPM:Date>
+    <TPM:Date>2000/08/08 15:31:00</TPM:Date>
     <TPM:Version>1.0</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>
@@ -17,6 +17,9 @@ Typeset a tilde under one (or many) maths symbols.
 texmf-dist/tex/latex/undertilde/undertilde.sty
 texmf-dist/tpm/undertilde.tpm
     </TPM:RunFiles>
+    <TPM:DocFiles size="174295">
+texmf-dist/doc/latex/undertilde/undertilde.pdf
+    </TPM:DocFiles>
     <TPM:SourceFiles size="4827">
 texmf-dist/source/latex/undertilde/undertilde.dtx
 texmf-dist/source/latex/undertilde/undertilde.ins
diff --git a/Master/texmf-dist/tpm/units.tpm b/Master/texmf-dist/tpm/units.tpm
index 97000c17406..2a0cae1756f 100644
--- a/Master/texmf-dist/tpm/units.tpm
+++ b/Master/texmf-dist/tpm/units.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/units.zip">
     <TPM:Name>units</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:58:48</TPM:Date>
+    <TPM:Date>1998/08/05 00:00:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Typeset units.</TPM:Title>
@@ -24,9 +24,12 @@ texmf-dist/tex/latex/units/nicefrac.sty
 texmf-dist/tex/latex/units/units.sty
 texmf-dist/tpm/units.tpm
     </TPM:RunFiles>
-    <TPM:SourceFiles size="43315">
-texmf-dist/source/latex/units/COPYING
-texmf-dist/source/latex/units/README
+    <TPM:DocFiles size="240312">
+texmf-dist/doc/latex/units/COPYING
+texmf-dist/doc/latex/units/README
+texmf-dist/doc/latex/units/units.pdf
+    </TPM:DocFiles>
+    <TPM:SourceFiles size="24684">
 texmf-dist/source/latex/units/units.dtx
 texmf-dist/source/latex/units/units.ins
     </TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/unitsdef.tpm b/Master/texmf-dist/tpm/unitsdef.tpm
index 346c6c8932b..4898bf472e4 100644
--- a/Master/texmf-dist/tpm/unitsdef.tpm
+++ b/Master/texmf-dist/tpm/unitsdef.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/unitsdef.zip">
     <TPM:Name>unitsdef</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:58:49</TPM:Date>
+    <TPM:Date>2005/01/04 14:14:14</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Typesetting units in LaTeX2e.</TPM:Title>
@@ -21,21 +21,21 @@ surrounding font settings.
     <TPM:Author>Patrick Happel</TPM:Author>
     <TPM:Size>759430</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="18972">
+    <TPM:RunFiles size="20990">
+texmf-dist/tex/latex/unitsdef/ampabbrv.cfg
+texmf-dist/tex/latex/unitsdef/enerabbr.cfg
+texmf-dist/tex/latex/unitsdef/freqabbr.cfg
+texmf-dist/tex/latex/unitsdef/lengabbr.cfg
+texmf-dist/tex/latex/unitsdef/molabbrv.cfg
+texmf-dist/tex/latex/unitsdef/timeabbr.cfg
 texmf-dist/tex/latex/unitsdef/unitsdef.sty
+texmf-dist/tex/latex/unitsdef/volabbrv.cfg
+texmf-dist/tex/latex/unitsdef/voltabbr.cfg
+texmf-dist/tex/latex/unitsdef/weigabbr.cfg
 texmf-dist/tpm/unitsdef.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="688956">
+    <TPM:DocFiles size="686938">
 texmf-dist/doc/latex/unitsdef/README.1st
-texmf-dist/doc/latex/unitsdef/config/ampabbrv.cfg
-texmf-dist/doc/latex/unitsdef/config/enerabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/freqabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/lengabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/molabbrv.cfg
-texmf-dist/doc/latex/unitsdef/config/timeabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/volabbrv.cfg
-texmf-dist/doc/latex/unitsdef/config/voltabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/weigabbr.cfg
 texmf-dist/doc/latex/unitsdef/defedpraef.tex
 texmf-dist/doc/latex/unitsdef/defedunits.tex
 texmf-dist/doc/latex/unitsdef/unitsdef.pdf
diff --git a/Master/texmf-dist/tpm/ushort.tpm b/Master/texmf-dist/tpm/ushort.tpm
index f96955d23c0..87e6e283c04 100644
--- a/Master/texmf-dist/tpm/ushort.tpm
+++ b/Master/texmf-dist/tpm/ushort.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/ushort.zip">
     <TPM:Name>ushort</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/21 00:25:32</TPM:Date>
+    <TPM:Date>2006/10/17 22:05:28</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>
@@ -19,16 +19,16 @@ types.
     <TPM:Author>Martin Vaeth</TPM:Author>
     <TPM:Size>55752</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="5006">
+    <TPM:RunFiles size="5169">
 texmf-dist/tex/latex/ushort/ushort.sty
 texmf-dist/tpm/ushort.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="20096">
-texmf-dist/doc/latex/ushort/ushort.dvi
+    <TPM:DocFiles size="222153">
+texmf-dist/doc/latex/ushort/ushort.pdf
 texmf-dist/doc/latex/ushort/ushort.tex
 texmf-dist/doc/latex/ushort/ushort.txt
     </TPM:DocFiles>
-    <TPM:SourceFiles size="30650">
+    <TPM:SourceFiles size="33416">
 texmf-dist/source/latex/ushort/ushort.dtx
 texmf-dist/source/latex/ushort/ushort.ins
     </TPM:SourceFiles>
diff --git a/Master/texmf/lists/undertilde b/Master/texmf/lists/undertilde
index 17bc8f08bac..38ab6aa2d2c 100644
--- a/Master/texmf/lists/undertilde
+++ b/Master/texmf/lists/undertilde
@@ -1,4 +1,4 @@
-
+texmf-dist/doc/latex/undertilde/undertilde.pdf
 texmf-dist/source/latex/undertilde/undertilde.dtx
 texmf-dist/source/latex/undertilde/undertilde.ins
 texmf-dist/tex/latex/undertilde/undertilde.sty
diff --git a/Master/texmf/lists/units b/Master/texmf/lists/units
index 57d9d4c26df..9e98b54ded2 100644
--- a/Master/texmf/lists/units
+++ b/Master/texmf/lists/units
@@ -1,6 +1,6 @@
-
-texmf-dist/source/latex/units/COPYING
-texmf-dist/source/latex/units/README
+texmf-dist/doc/latex/units/COPYING
+texmf-dist/doc/latex/units/README
+texmf-dist/doc/latex/units/units.pdf
 texmf-dist/source/latex/units/units.dtx
 texmf-dist/source/latex/units/units.ins
 texmf-dist/tex/latex/units/nicefrac.sty
diff --git a/Master/texmf/lists/unitsdef b/Master/texmf/lists/unitsdef
index b0129adb78e..738934d268d 100644
--- a/Master/texmf/lists/unitsdef
+++ b/Master/texmf/lists/unitsdef
@@ -1,19 +1,19 @@
 texmf-dist/doc/latex/unitsdef/README.1st
-texmf-dist/doc/latex/unitsdef/config/ampabbrv.cfg
-texmf-dist/doc/latex/unitsdef/config/enerabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/freqabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/lengabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/molabbrv.cfg
-texmf-dist/doc/latex/unitsdef/config/timeabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/volabbrv.cfg
-texmf-dist/doc/latex/unitsdef/config/voltabbr.cfg
-texmf-dist/doc/latex/unitsdef/config/weigabbr.cfg
 texmf-dist/doc/latex/unitsdef/defedpraef.tex
 texmf-dist/doc/latex/unitsdef/defedunits.tex
 texmf-dist/doc/latex/unitsdef/unitsdef.pdf
 texmf-dist/source/latex/unitsdef/unitsdef.dtx
 texmf-dist/source/latex/unitsdef/unitsdef.ins
+texmf-dist/tex/latex/unitsdef/ampabbrv.cfg
+texmf-dist/tex/latex/unitsdef/enerabbr.cfg
+texmf-dist/tex/latex/unitsdef/freqabbr.cfg
+texmf-dist/tex/latex/unitsdef/lengabbr.cfg
+texmf-dist/tex/latex/unitsdef/molabbrv.cfg
+texmf-dist/tex/latex/unitsdef/timeabbr.cfg
 texmf-dist/tex/latex/unitsdef/unitsdef.sty
+texmf-dist/tex/latex/unitsdef/volabbrv.cfg
+texmf-dist/tex/latex/unitsdef/voltabbr.cfg
+texmf-dist/tex/latex/unitsdef/weigabbr.cfg
 texmf-dist/tpm/unitsdef.tpm
 
 texmf/lists/unitsdef
diff --git a/Master/texmf/lists/ushort b/Master/texmf/lists/ushort
index ec6bbcc2311..c2011860983 100644
--- a/Master/texmf/lists/ushort
+++ b/Master/texmf/lists/ushort
@@ -1,4 +1,4 @@
-texmf-dist/doc/latex/ushort/ushort.dvi
+texmf-dist/doc/latex/ushort/ushort.pdf
 texmf-dist/doc/latex/ushort/ushort.tex
 texmf-dist/doc/latex/ushort/ushort.txt
 texmf-dist/source/latex/ushort/ushort.dtx