nddiss (23aug17)

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

1 files changed, 272 insertions, 128 deletions

diff --git a/Master/texmf-dist/tex/latex/nddiss/nddiss2e.cls b/Master/texmf-dist/tex/latex/nddiss/nddiss2e.cls
index 0d04f503c3e..deba8c3c80b 100644
--- a/Master/texmf-dist/tex/latex/nddiss/nddiss2e.cls
+++ b/Master/texmf-dist/tex/latex/nddiss/nddiss2e.cls
@@ -34,10 +34,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{nddiss2e}
-    [2005/07/27 v3.0 ^^J%
-     Notre Dame Dissertation document class by Sameer Vijay^^J]
-\providecommand{\dissfileversion}{3.0}
-\providecommand{\dissfiledate}{2005/07/27}
+    [2016/10/16 v3.2016%
+     Notre Dame Dissertation document class]
+\providecommand{\dissfileversion}{3.2017.2}
+\providecommand{\dissfiledate}{2017/05/09}
 \newif\ifdiss@draft             \diss@drafttrue
 \newif\ifdiss@review            \diss@reviewfalse
 \newif\ifdiss@final             \diss@finalfalse
@@ -46,6 +46,7 @@
 \newif\ifdiss@dedication        \diss@dedicationfalse
 \newif\ifnum@refs               \num@refstrue
 \newif\ifcentered@chaptitle     \centered@chaptitletrue
+\newif\if@ltfirstcaption
 \DeclareOption{draft}{
     \setlength\overfullrule{5pt}
     \typeout{DRAFT MODE}\typeout{}\info@pagefalse%
@@ -68,6 +69,15 @@
 \DeclareOption{openbib}{%
    \PassOptionsToPackage{openbib}{natbib}
 }
+\DeclareOption{sort}{%
+    \PassOptionsToPackage{sort}{natbib}
+}
+\DeclareOption{compress}{%
+    \PassOptionsToPackage{compress}{natbib}
+}
+\DeclareOption{sort&compress}{%
+    \PassOptionsToPackage{sort&compress}{natbib}
+}
 \DeclareOption{twoadvisors}{\typeout{TWO ADVISORS}\typeout{}%
     \advisors@twotrue}
 \DeclareOption{10pt}{%
@@ -98,76 +108,99 @@
     {UnknownOption `\CurrentOption'} }%
 \ProcessOptions\relax
 \LoadClass{book}
-\RequirePackage{ifthen,exscale}
-\RequirePackage{ifpdf}
+\RequirePackage{ifthen,exscale,etoolbox}
+\RequirePackage{ifpdf,ifluatex,ifxetex}
+\ifboolexpr{bool{pdf} or bool{xetex} or bool{luatex}}{}{%
+  \ClassError{nddiss2e}{%
+      PDF Output is required to support the PDF/A format.
+  }{DVI output is not supported. Use pdflatex to generate the dissertation.}
+}
+\RequirePackage[a-2b]{pdfx}
 \RequirePackage{longtable}
+\RequirePackage{threeparttable}
+\RequirePackage[flushleft]{threeparttablex}
 \RequirePackage{xspace}
 \RequirePackage{indentfirst}
 \RequirePackage{tabularx}
 \RequirePackage{enumerate}
 \RequirePackage{latexsym}
-\ifdiss@final\relax\else\RequirePackage{showkeys}\fi
-\ifpdf
-  \RequirePackage[pdftex]{epsfig}
-  \RequirePackage[pdftex]{color}
-  \RequirePackage[pdftex]{graphicx}
-  \RequirePackage[pdftex,
-            letterpaper=true,%
-            bookmarks=true,%
-            bookmarksnumbered=true,%
-            linktocpage=true,%
-            breaklinks=true,%
-            bookmarkstype=toc,%
-            colorlinks=false,%
-            pdfpagemode=UseOutlines]{hyperref}
+\RequirePackage{textcase}
+\ifboolexpr{bool{pdf} or bool{xetex} or bool{luatex}}{%
+  \RequirePackage{epsfig}
+  \RequirePackage{color}
+  \RequirePackage{graphicx}
   \AtBeginDocument{
   \pdfadjustspacing=1
   }
-\else
+}{%
   \RequirePackage[dvips]{epsfig}
   \RequirePackage[dvips]{color}
   \RequirePackage[dvips]{graphicx}
-\fi
+}
 \ifnum@refs
-  \RequirePackage[numbers,sort&compress]{natbib}
+  \RequirePackage[numbers]{natbib}
 \else
-  \RequirePackage[authoryear,sort]{natbib}
-\fi
-\ifpdf
-    \RequirePackage{hypernat}
+  \RequirePackage[authoryear]{natbib}
 \fi
 \AtBeginDocument{
-\RequirePackage{amsmath,amssymb}
+\RequirePackage{amsmath}
 \RequirePackage{float}
-\RequirePackage{lscape}
 \RequirePackage{booktabs}
 \RequirePackage{rotating}
 \RequirePackage{url}
 \RequirePackage[doublespacing]{setspace}[2000/12/01]
+\ifboolexpr{bool{pdf} or bool{xetex} or bool{luatex}}{%
+  \ifluatex
+    \RequirePackage[luatex]{pdflscape}
+  \else
+    \ifxetex
+      \RequirePackage[xetex]{pdflscape}
+    \else
+      \ifpdf
+        \RequirePackage{pdflscape}
+      \fi
+    \fi
+  \fi
+  % cannot use RequirePackage since pdfx also includes hyperref
+  \hypersetup{
+            plainpages=false,
+            pdfpagelabels,
+            bookmarks=true,%
+            bookmarksnumbered=true,%
+            linktocpage=true,%
+            breaklinks=true,%
+            bookmarkstype=toc,%
+            colorlinks=false,%
+            pdfpagemode=UseOutlines}
+}{}
 }
+\RequirePackage{metalogo}
 \AtBeginDocument{
 \pagestyle{plain}
 \normalspacing
 \typeout{Pagestyle and spacing normal}
 }
 \newcommand{\normalspacing}{\doublespacing}
-\newcommand\single@baselinestretch{1.0}
-\newcommand\double@baselinestretch{1.66}
+\newcommand\single@baselinestretch{0.979}
+\newcommand\double@baselinestretch{1.625}
+\newlength{\usedtextsize}
+\setlength{\usedtextsize}{\f@size pt}
 \newlength{\single@skip}
-\setlength{\single@skip}{\single@baselinestretch em}
+\setlength{\single@skip}{\single@baselinestretch \usedtextsize}
 \newlength{\double@skip}
-\setlength{\double@skip}{\double@baselinestretch em}
+\setlength{\double@skip}{\double@baselinestretch \usedtextsize}
+\setlength{\footnotesep}{\double@skip}
 \setlength{\hoffset}{0pt}
 \setlength{\voffset}{0pt}
-\addtolength{\topmargin}{-32pt}
-\setlength{\headsep}{12pt}
-\setlength{\marginparwidth}{54pt}
-\setlength{\marginparsep}{0pt}
-\addtolength{\textheight}{63pt}
-\addtolength{\textwidth}{26pt}
+\setlength{\topmargin}{-32pt}
+\setlength{\headsep}{20pt}
+\setlength{\marginparwidth}{47pt}
+\setlength{\marginparsep}{7pt}
+\setlength{\textheight}{648pt}
+\setlength{\textwidth}{432pt}
 \setlength{\oddsidemargin}{36pt}
-\setlength{\evensidemargin}{18pt}
-\setlength{\footskip}{36pt}
+\setlength{\evensidemargin}{36pt}
+\setlength{\footskip}{30pt}
 \setlength{\floatsep}{30pt}
 \setlength{\intextsep}{50pt}
 \newcommand{\clearemptydoublepage}{\newpage{\pagestyle{empty}%
@@ -175,9 +208,9 @@
 \DeclareRobustCommand{\nddiss}{%
         \textsf{{\scshape nd}diss}\kern-0.03em%
         2$_\mathsf{\textstyle\varepsilon}$}
+\renewcommand{\title}[1]{\def\@title{#1}}
 \newcommand{\work}[1]{\def\@work{#1}}
 \newcommand{\degaward}[1]{\def\@degaward{#1}}
-\newcommand{\degprior}[1]{\def\@degprior{#1}}
 \newcommand{\advisor}[1]{\def\@advisor{#1}}
 \ifadvisors@two
     \newcommand{\secondadvisor}[1]{\def\@secondadvisor{#1}}
@@ -192,7 +225,6 @@
   \author{}
   \work{}
   \degaward{}
-  \degprior{}
   \advisor{}
   \ifadvisors@two \secondadvisor{} \fi
   \department{}
@@ -200,7 +232,7 @@
   \thispagestyle{empty}
   \null\vspace*{\single@skip}
   \begin{center}
-  \large This \@work\space \\ entitled \\ \@title \\
+    This \@work\space \\ entitled \\ \MakeTextUppercase{\@title} \\
         typeset with \nddiss\ v%
       \dissfileversion\ (\dissfiledate) %
       on \today\space for\\
@@ -210,8 +242,8 @@
    \normalfont\normalsize\singlespacing
 
    \noindent This \LaTeXe\space classfile conforms to the
-   University of Notre Dame style guidelines established in
-   Spring  2004. However it is still possible to generate a
+   University of Notre Dame style guidelines as of Fall
+   2012. However it is still possible to generate a
    non-conformant document if the instructions in the class
    file documentation are not followed!
 
@@ -225,10 +257,6 @@
    \end{minipage}
    \end{center}
 
-   \noindent It is YOUR responsibility to ensure that the Chapter titles
-   and Table caption titles are put in CAPS LETTERS. This classfile does
-   {\em NOT\space} do that! \\
-
   \noindent\itshape This page can be disabled by
   specifying the ``{\upshape\ttfamily noinfo}'' option to the class invocation.
   \upshape
@@ -236,14 +264,15 @@
 )
   \begin{center}
     {\bfseries\large\singlespacing This page is \slshape NOT
-    \upshape part of the dissertation/thesis, but MUST be turned in to the
-    proofreader(s) or the reviwer(s)!}
+    \upshape part of the dissertation/thesis. It should be disabled before
+   making final, formal submission, but should be included in the version
+   submitted for format check.}
   \end{center}
     \normalsize\normalfont
     \nddiss\ documentation can be found at these locations:
   \begin{center}
-    \url{http://www.gsu.nd.edu}\\
-    \url{http://graduateschool.nd.edu}
+    \url{http://graduateschool.nd.edu} \\
+    \url{https://ctan.org/pkg/nddiss}
   \end{center}
 
 \vfill
@@ -276,31 +305,59 @@
             The title page may be incorrectly formatted.}%
   {Use \protect\secondadvisor\space for your second advisor}}{\relax}
 \fi
-\skip1=1.2\double@skip
+\skip1=2.1\double@skip
 \skip2=1.7\double@skip
 \skip3=2.7\double@skip
-\skip4=1em
-\ifadvisors@two \skip1=1.0\double@skip \skip4=1.5em \else\relax\fi
-\setbox0=\hbox{\@title}
-\ifdim \wd0 > 3\hsize
-   \advance\skip4 .5\double@skip
-   \advance\skip1 -.33\double@skip
-\else
-   \ifdim \wd0 > 2\hsize
-     \advance\skip4 .5\double@skip
-         \advance\skip1 -.167\double@skip
-  \else
-     \ifdim \wd0 > \hsize
-        \advance\skip4 .5\double@skip
-         \fi
+\skip4=36pt
+ \ifadvisors@two
+   \skip1=1.6\double@skip
+ \else\relax
+ \fi
+ \setbox0=\vbox{\MakeTextUppercase{\@title}}
+ \ifdim \ht0 > 3\double@skip
+   \advance \skip1 -.75\double@skip
+ \else
+   \ifdim \ht0 > 2\double@skip
+     \advance\skip1 -.5\double@skip
+   \else
+     \ifdim \ht0 > \double@skip
+       \advance\skip1 -.25\double@skip
+     \fi
+   \fi
+ \fi
+ \setbox1=\vbox{\@degaward}
+ \ifdim \ht1 > 2\double@skip
+   \advance\skip1 -.5\double@skip
+ \else
+   \ifdim \ht1 > \double@skip
+     \advance \skip1 -.25\double@skip
+   \else
+     \relax
+   \fi
+ \fi
+  \ifadvisors@two
+    \ifdim \ht0 > 3\double@skip
+      \ifdim \ht1 > \double@skip
+        \advance \skip4 -.675\double@skip
+        \advance \skip2 -.4\double@skip
+        \advance \skip1 .25\double@skip
+      \else \relax
+      \fi
+    \else
+      \ifdim \ht0 > 2\double@skip
+        \ifdim \ht1 > 2\double@skip
+          \advance \skip2 -.4\double@skip
+          \advance \skip1 .1\double@skip
+        \else \relax
+        \fi
+      \else \relax
+      \fi
+    \fi
+  \else \relax
   \fi
-\fi
-\setbox1=\vbox{\@degaward}
-\ifdim \ht1 > \double@skip\relax
-   \else \advance\skip1 .167\double@skip \fi
-  \null\vspace*{-\skip4}
+  \null\vspace*{\skip4}
   \begin{center}%
-    \@title \par%
+    \MakeTextUppercase{\@title} \par%
     \vskip\skip1%
     A \@work \par%
     \vskip\skip1%
@@ -311,21 +368,21 @@
         \vskip\skip1%
         \@degaward%
         \vskip\skip1%
-        by%
-        \vskip\skip1%
-    {\normalsize
-      \begin{tabular}[t]{c@{}l}%
-        \@author, &\ \@degprior
-      \end{tabular}\par }%
+        by \\%
+    \@author
      \ifadvisors@two
-        \vskip\skip2\else
-        \vskip\skip3\fi%
+        \vskip\skip2
+        \hspace*{2.75in}\underline{\hspace{2.75in}}\\%
+        \hspace*{2.75in}\@advisor, Co-Director\\
+     \else
+        \vskip\skip3
         \hspace*{2.75in}\underline{\hspace{2.75in}}\\%
         \hspace*{2.75in}\@advisor, Director\\
+     \fi%
 \ifadvisors@two %
       \vskip\double@skip%
         \hspace*{2.75in}\underline{\hspace{2.75in}}\\%
-        \hspace*{2.75in}\@secondadvisor, Director\\
+        \hspace*{2.75in}\@secondadvisor, Co-Director\\
 \fi
   \vskip\skip1%
   Graduate Program in \@department \\%
@@ -336,15 +393,17 @@
 }
 \newenvironment{copyrightpage}{%
   \clearemptydoublepage
-  \typeout{Copyleft page}
+  \typeout{Copyright page}
   \pagestyle{empty}
   \null\vfil
   \begin{center}\normalspacing}%
 { \end{center}\vfil\null \clearpage }
-\newcommand{\@copyrightyear}{\year}
+\newcommand{\@copyrightyear}{\the\year}
 \newcommand{\@copyrightholder}{\@author}
+\newcommand{\@copyrightlicense}{All Rights Reserved}
 \newcommand{\copyrightyear}[1]{\renewcommand{\@copyrightyear}{#1}}
 \newcommand{\copyrightholder}[1]{\renewcommand{\@copyrightholder}{#1}}
+\newcommand{\copyrightlicense}[1]{\renewcommand{\@copyrightlicense}{#1}}
 \newcommand{\makecopyright}{%
   \ifdiss@final
     \begin{copyrightpage}
@@ -352,7 +411,7 @@
     \copyright\space Copyright by \\
     \@copyrightholder \\
     \@copyrightyear\\
-    All Rights Reserved \\[10mm]
+    \@copyrightlicense \\[10mm]
     \end{copyrightpage}
   \fi
 }%
@@ -365,22 +424,23 @@
 }%
 \providecommand{\abstractname}{Abstract}
 \providecommand{\dedicationname}{\mbox{}}
-\providecommand{\prefacename}{PREFACE}
-\providecommand{\acknowledgename}{ACKNOWLEDGMENTS}
-\providecommand{\symbolsname}{SYMBOLS}
-\renewcommand{\tablename}{TABLE}
+\providecommand{\prefacename}{Preface}
+\providecommand{\acknowledgename}{Acknowledgments}
+\providecommand{\symbolsname}{Symbols}
+\renewcommand{\tablename}{Table}
 \renewcommand{\figurename}{Figure}
-\renewcommand{\chaptername}{CHAPTER}
-\renewcommand{\appendixname}{APPENDIX}
-\renewcommand{\contentsname}{CONTENTS}
-\renewcommand{\listfigurename}{FIGURES}
-\renewcommand{\listtablename}{TABLES}
-\renewcommand{\bibname}{BIBLIOGRAPHY}
-\renewcommand{\indexname}{INDEX}
+\renewcommand{\partname}{Part}
+\renewcommand{\chaptername}{Chapter}
+\renewcommand{\appendixname}{Appendix}
+\renewcommand{\contentsname}{Contents}
+\renewcommand{\listfigurename}{Figures}
+\renewcommand{\listtablename}{Tables}
+\renewcommand{\bibname}{Bibliography}
+\renewcommand{\indexname}{Index}
 \newenvironment{abstract}{%
-  \ifpdf
+  \ifboolexpr{bool{pdf} or bool{xetex} or bool{luatex}}{%
      \pdfbookmark[0]{\abstractname}{abstract}%abstract.0
-  \fi
+  }{}
   \typeout{Abstract page(s)}
   \renewcommand{\@oddfoot}{\@empty}
   \renewcommand{\@evenfoot}{\@empty}
@@ -389,9 +449,9 @@
   \titlepage
   \null
   \begin{center}
-  \vspace*{0.25in}
+  \vspace*{36pt}
   {\normalsize\mdseries \normalspacing
-     \@title \\[3.5ex]
+     \MakeTextUppercase{\@title} \\[3.5ex]
      \normalsize\abstractname \\ by \\ \@author\space}%
    \@endparpenalty \@M
    \end{center}\par}%
@@ -399,9 +459,6 @@
 \newenvironment{dedication}{%
   \global\diss@dedicationtrue
   \typeout{Dedication page}
-  \ifpdf
-      \pdfbookmark[0]{\dedicationname}{dedication}%dedication.0
-  \fi
   \chapter*{\dedicationname}%
   \thispagestyle{plain}
   \setcounter{page}{2}
@@ -410,9 +467,9 @@
 \renewcommand\tableofcontents{%
   \ifdiss@dedication\relax\else\setcounter{page}{2}\fi
   \chapter*{\contentsname}%
-  \ifpdf
+  \ifboolexpr{bool{pdf} or bool{xetex} or bool{luatex}}{%
       \pdfbookmark[0]{\contentsname}{contents}%contents.0
-  \fi
+  }{}
   \singlespacing
   \@starttoc{toc}%
   \normalspacing
@@ -445,6 +502,9 @@
   \addcontentsline{toc}{chapter}{\acknowledgename}%
 }%
 {\par\null\clearpage}%
+\newcommand\unnumchapter[1]{%
+  \chapter*{#1}%
+  \addcontentsline{toc}{chapter}{#1}}
 \newcommand{\sym}[2]{\ensuremath{#1} & #2 \\}
 \newenvironment{symbols}[1][rl]{%
   \typeout{Symbols page}
@@ -456,7 +516,7 @@
   \ifnum \c@secnumdepth >\m@ne
   \if@mainmatter
     \refstepcounter{chapter}%
-    \typeout{\@chapapp\space\thechapter.}%
+    \typeout{\MakeTextUppercase{\@chapapp\space\thechapter.}}%
     \addcontentsline{toc}{chapter}%
       {{\@chapapp\ \thechapter: #1}}%
     \else
@@ -468,16 +528,40 @@
   \chaptermark{#1}%
   \addtocontents{lof}{\protect\addvspace{10\p@}}%
   \addtocontents{lot}{\protect\addvspace{10\p@}}%
-  \@makechapterhead{#2}%
+  \@makechapterhead{\MakeTextUppercase{#2}}%
   \@afterheading }%
+\def\@part[#1]#2{%
+  \ifnum \c@secnumdepth >-2\relax
+    \refstepcounter{part}%
+    \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+  \else
+    \addcontentsline{toc}{part}{#1}%
+  \fi
+  \markboth{}{}%
+  {\centering
+   \interlinepenalty \@M
+   \normalfont
+   \ifnum \c@secnumdepth >-2\relax
+     \normalsize\mdseries \partname\nobreakspace\thepart
+     \par
+     \vskip 20\p@
+   \fi
+  \normalsize\mdseries \MakeTextUppercase{#2}\par}%
+  \@endpart}
+\def\@spart#1{%
+    {\centering
+     \interlinepenalty \@M
+     \normalfont
+     \normalsize\mdseries #1\par}%
+    \@endpart}
 \renewcommand{\@makechapterhead}[1]{%
-  \vspace*{.625in}%
+  \vspace*{30pt}%
   {\parindent \z@ \raggedright
     \ifnum \c@secnumdepth >\m@ne
       \normalfont\normalsize%
       \if@mainmatter
         \ifcentered@chaptitle\center\else\relax\fi%
-        \@chapapp{} \thechapter\par\nobreak
+        \MakeTextUppercase{\@chapapp{} \thechapter}\par\nobreak
       \fi
     \fi
     \interlinepenalty\@M
@@ -486,12 +570,12 @@
     \vskip 30\p@
   }}
 \renewcommand{\@makeschapterhead}[1]{%
-  \vspace*{.625in}%
+  \vspace*{30pt}%
   {\parindent \z@ \raggedright
      \normalfont\normalsize%
      \interlinepenalty\@M
      \ifcentered@chaptitle\center\else\relax\fi
-     \mdseries{#1}\par\nobreak
+     \mdseries{\MakeTextUppercase{#1}}\par\nobreak
      \vskip 30\p@
   }}
 \renewcommand\section{\suppressfloats[t]%
@@ -519,6 +603,19 @@
     {3.9ex \@plus1ex \@minus .2ex}%
     {-1em}%
     {\normalfont\normalsize\mdseries} }
+\renewcommand*\l@part[2]{%
+  \ifnum \c@tocdepth >-2\relax
+    \addpenalty{-\@highpenalty}%
+    \setlength\@tempdima{1.5em}%
+    \begingroup
+      {\leavevmode
+       \@dottedtocline{1}{0pt}{\@tempdima}{#1}{#2}
+      }\par
+       \nobreak
+         \global\@nobreaktrue
+         \everypar{\global\@nobreakfalse\everypar{}}%
+    \endgroup
+  \fi}
 \renewcommand*{\l@chapter}[2]{%
   \addpenalty{-\@highpenalty}%
   \setlength\@tempdima{1.5em}%
@@ -528,8 +625,6 @@
   \penalty\@highpenalty
   \endgroup
 }
-\renewcommand{\l@subsubsection}{%
-   \@dottedtocline{3}{3.8em}{4.1em}}
 \addtocounter{secnumdepth}{1}
 \addtocounter{tocdepth}{1}
 \renewcommand{\thesubsubsection}{%
@@ -539,6 +634,27 @@
                  \singlespacing
                \item\relax}
                {\endlist}
+\let\realitemize\itemize
+\let\endrealitemize\enditemize
+\renewenvironment{itemize}
+          {\realitemize
+            \singlespacing}
+          {\endrealitemize
+            \doublespacing}
+\let\realenumerate\enumerate
+\let\endrealenumerate\endenumerate
+\renewenvironment{enumerate}[1][1.]
+          {\realenumerate[#1]
+            \singlespacing}
+          {\endrealenumerate
+            \doublespacing}
+\let\realdescription\description
+\let\endrealdescription\enddescription
+\renewenvironment{description}
+          {\realdescription
+            \singlespacing}
+          {\endrealdescription
+            \doublespacing}
 \setlength\abovecaptionskip{20\p@}
 \newlength\capwidth
 \setlength{\capwidth}{0.90\textwidth}
@@ -568,13 +684,23 @@
   \vskip\belowcaptionskip\normalspacing }%
   \end{center}
 }%
-\renewenvironment{table}{%
+\renewenvironment{table}[1][tbp]{%
    \setlength{\abovecaptionskip}{\abovetableskip}
    \setlength{\belowcaptionskip}{\belowtableskip}
-   \singlespacing
    \renewcommand{\arraystretch}{\double@baselinestretch}
+   \let\scaption\caption%
+   \renewcommand*{\caption}[2][]{%
+     \ifthenelse{\equal{##1}{}}{%
+       \def\shortcaption{##2}%
+     }{%
+       \def\shortcaption{##1}%
+     }%
+     \scaption[\shortcaption]{\MakeTextUppercase{##2}}%
+   }%
    \let\@makecaption\@maketablecaption
-   \@float{table}}%
+   \@float{table}[#1]%
+   \singlespacing%
+   }%
    {%
    \addtocontents{lot}{ {\vskip 0.4em} }%
    \end@float%
@@ -582,17 +708,20 @@
 \long\def\@maketablecaption#1#2{
   \vskip\abovecaptionskip
   \begin{center}
-    \parbox{\capwidth}{
-    \centering\normalspacing
-    {#1}\\[\single@skip]
-    {#2}%\par
-  \vskip\belowcaptionskip }%
+    \makebox[\linewidth]{
+      \parbox{\capwidth}{
+      \centering\normalspacing
+      \MakeTextUppercase{#1}\\[\single@skip]
+      {#2}%\par
+    \vskip\belowcaptionskip }%
+    }%
   \end{center}
 }
 \renewcommand\longtable{%
    \singlespacing
    \renewcommand{\arraystretch}{\double@baselinestretch}
    \begingroup
+   \@ltfirstcaptiontrue
    \@ifnextchar[\LT@array{\LT@array[x]}}
 \renewcommand\endlongtable{%
   \crcr
@@ -628,8 +757,13 @@
   \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\LTcapwidth{%
   \vskip\abovetableskip%
     \centering\normalspacing
-    #1{#2 }\\[\single@skip]
-    {#3}\par
+    \if@ltfirstcaption
+    #1{\MakeTextUppercase{#2} }\\[\single@skip]
+    \MakeTextUppercase{#3}\par
+    \else%
+    #1{\MakeTextUppercase{#2 (continued)} }\par
+    \fi
+  \global\@ltfirstcaptionfalse
   \endgraf\vskip\belowtableskip}%
   \hss}}}
 \newcommand\timenow{%
@@ -666,7 +800,7 @@
   \chapter*{\bibname}%
   \addcontentsline{toc}{chapter}{\bibname}%
 }%
-\newcommand{\bibfont}{\singlespacing}
+\renewcommand{\bibfont}{\singlespacing}
 \ifnum@refs
   \renewcommand{\@biblabel}[1]{\hfill#1.\hfill}
 \fi
@@ -677,9 +811,19 @@
     \framebox[0.85\textwidth]{
     \begin{minipage}{0.80\textwidth}\footnotesize%
     \centering \itshape This document was prepared \& typeset with
-    \upshape\ifpdf pdf\LaTeX\else\LaTeXe\fi\itshape , and
+    \upshape
+    \ifluatex
+      \LuaLaTeX
+    \else\ifxetex
+      \XeLaTeX
+    \else\ifpdf
+      pdf\LaTeX
+    \else
+      \LaTeXe
+    \fi\fi\fi
+    \itshape , and
     formatted with \upshape\nddiss\xspace\itshape classfile
-    (v\dissfileversion [\dissfiledate]) provided by Sameer Vijay.
+    (v\dissfileversion [\dissfiledate])
     \end{minipage} }
     \clearpage}
 \else\relax\fi