Index: doc/theses/fangren_yu_MMath/uw-ethesis-frontpgs.tex
===================================================================
--- doc/theses/fangren_yu_MMath/uw-ethesis-frontpgs.tex	(revision 9c2ac957a34057050aedb3ed52bb4396a68f6a4e)
+++ doc/theses/fangren_yu_MMath/uw-ethesis-frontpgs.tex	(revision 3f37f5beff02d9cfa7d88ada6e6363a230d63ae4)
@@ -24,5 +24,5 @@
 
         \Large
-        Fangren Yu \\
+		Fangren Yu \\
 
         \vspace*{3.0cm}
@@ -30,5 +30,5 @@
         \normalsize
         A thesis \\
-        presented to the University of Waterloo \\ 
+        presented to the University of Waterloo \\
         in fulfillment of the \\
         thesis requirement for the degree of \\
@@ -43,5 +43,5 @@
         \vspace*{1.0cm}
 
-        \copyright{} Fangren Yu \the\year \\
+        \copyright\ Fangren Yu \the\year \\
         \end{center}
 \end{titlepage}
@@ -63,13 +63,13 @@
 The following served on the Examining Committee for this thesis. The decision of the Examining Committee is by majority vote.
   \bigskip
-  
+
   \noindent
 \begin{tabbing}
 Internal-External Member: \=  \kill % using longest text to define tab length
-External Examiner: \>  Bruce Bruce \\ 
+External Examiner: \>  Bruce Bruce \\
 \> Professor, Dept. of Philosophy of Zoology, University of Wallamaloo \\
-\end{tabbing} 
+\end{tabbing}
   \bigskip
-  
+
   \noindent
 \begin{tabbing}
@@ -81,5 +81,5 @@
 \end{tabbing}
   \bigskip
-  
+
   \noindent
   \begin{tabbing}
@@ -89,5 +89,5 @@
 \end{tabbing}
   \bigskip
-  
+
   \noindent
 \begin{tabbing}
@@ -97,5 +97,5 @@
 \end{tabbing}
   \bigskip
-  
+
   \noindent
 \begin{tabbing}
@@ -114,10 +114,10 @@
  \addcontentsline{toc}{chapter}{Author's Declaration}
  \begin{center}\textbf{Author's Declaration}\end{center}
-  
+
  \noindent
 I hereby declare that I am the sole author of this thesis. This is a true copy of the thesis, including any required final revisions, as accepted by my examiners.
 
   \bigskip
-  
+
   \noindent
 I understand that my thesis may be made electronically available to the public.
@@ -179,4 +179,5 @@
 \phantomsection		% allows hyperref to link to the correct page
 
+\begin{comment}
 % L I S T   O F   A B B R E V I A T I O N S
 % ---------------------------
@@ -186,5 +187,4 @@
 \phantomsection		% allows hyperref to link to the correct page
 
-\begin{comment}
 % L I S T   O F   S Y M B O L S
 % ---------------------------
Index: doc/theses/fangren_yu_MMath/uw-ethesis.tex
===================================================================
--- doc/theses/fangren_yu_MMath/uw-ethesis.tex	(revision 9c2ac957a34057050aedb3ed52bb4396a68f6a4e)
+++ doc/theses/fangren_yu_MMath/uw-ethesis.tex	(revision 3f37f5beff02d9cfa7d88ada6e6363a230d63ae4)
@@ -91,13 +91,13 @@
 % cfa macros used in the document
 \input{common}
-%\usepackageinput{common}
+%\usepackage{common}
 \CFAStyle						% CFA code-style
-\lstset{language=CFA}					% default language
-\lstset{basicstyle=\linespread{0.9}\sf}			% CFA typewriter font
+\lstset{language=cfa,belowskip=-1pt} % set default language to CFA
+\lstnewenvironment{c++}[1][]{\lstset{language=[GNU]C++,escapechar=\$,moredelim=**[is][\color{red}]{@}{@},}\lstset{#1}}{}
+
+\newcommand{\PAB}[1]{{\color{red}PAB: #1}}
 \newcommand{\newtermFont}{\emph}
 \newcommand{\Newterm}[1]{\newtermFont{#1}}
 %\renewcommand{\newterm}[1]{\newtermFont{#1}}
-\newcommand{\uC}{$\mu$\CC}
-\newcommand{\PAB}[1]{{\color{red}PAB: #1}}
 
 % Hyperlinks make it very easy to navigate an electronic document.
@@ -108,5 +108,5 @@
 \usepackage[dvips,pagebackref=true]{hyperref} % with basic options
 %\usepackage[pdftex,pagebackref=true]{hyperref}
-		% N.B. pagebackref=true provides links back from the References to the body text. This can cause trouble for printing.
+% N.B. pagebackref=true provides links back from the References to the body text. This can cause trouble for printing.
 \hypersetup{
     plainpages=false,       % needed if Roman numbers in frontpages
@@ -140,6 +140,6 @@
 \urlstyle{sf}
 
-\usepackage[automake,toc,abbreviations]{glossaries-extra} % Exception to the rule of hyperref being the last add-on package
-\renewcommand*{\glstextformat}[1]{\textcolor{black}{#1}}
+%\usepackage[automake,toc,abbreviations]{glossaries-extra} % Exception to the rule of hyperref being the last add-on package
+%\renewcommand*{\glstextformat}[1]{\textcolor{black}{#1}}
 % If glossaries-extra is not in your LaTeX distribution, get it from CTAN (http://ctan.org/pkg/glossaries-extra), 
 % although it's supposed to be in both the TeX Live and MikTeX distributions. There are also documentation and 
@@ -182,8 +182,8 @@
 
 % Define Glossary terms (This is properly done here, in the preamble and could also be \input{} from a separate file...)
-\usepackage[automake,toc,abbreviations]{glossaries-extra} % Exception to the rule of hyperref being the last add-on package
-\renewcommand*{\glstextformat}[1]{\textcolor{black}{#1}}
-\input{glossary}
-\makeglossaries
+%\usepackage[automake,toc,abbreviations]{glossaries-extra} % Exception to the rule of hyperref being the last add-on package
+%\renewcommand*{\glstextformat}[1]{\textcolor{black}{#1}}
+%\input{glossary}
+%\makeglossaries
 
 %======================================================================
@@ -258,7 +258,7 @@
 % GLOSSARIES (Lists of definitions, abbreviations, symbols, etc. provided by the glossaries-extra package)
 % -----------------------------
-\printglossary
-\cleardoublepage
-\phantomsection		% allows hyperref to link to the correct page
+%\printglossaries
+%\cleardoublepage
+%\phantomsection		% allows hyperref to link to the correct page
 
 %----------------------------------------------------------------------