Index: doc/theses/colby_parsons_MMAth/style/cfa-format.tex
===================================================================
--- doc/theses/colby_parsons_MMAth/style/cfa-format.tex	(revision 3c17a10e03aa1976b5ba5d4d415a7e20deffad3f)
+++ doc/theses/colby_parsons_MMAth/style/cfa-format.tex	(revision e41c4c6c0aac6b2ea35512edc89eee3a327050f2)
@@ -11,14 +11,17 @@
 \lstdefinestyle{defaultStyle}{
   escapeinside={@@},
-  basicstyle=\linespread{0.9}\tt\footnotesize,		% reduce line spacing and use typewriter font
-  keywordstyle=\bfseries\color{blue},
-  keywordstyle=[2]\bfseries\color{Plum},
-  commentstyle=\itshape\color{OliveGreen},		    % green and italic comments
-  identifierstyle=\color{identifierCol},
-  stringstyle=\sf\color{Mahogany},			          % use sanserif font
+%   basicstyle=\linespread{0.9}\tt\footnotesize,		% reduce line spacing and use typewriter font
+  basicstyle=\linespread{0.9}\sf,		% reduce line spacing and use typewriter 
+%   keywordstyle=\bfseries\color{blue},
+%   keywordstyle=[2]\bfseries\color{Plum},
+%   commentstyle=\itshape\color{OliveGreen},		    % green and italic comments
+%   identifierstyle=\color{identifierCol},
+%   stringstyle=\sf\color{Mahogany},			          % use sanserif font
+  stringstyle=\tt,			          % use sanserif font
   mathescape=true,
-  columns=fixed,
-  aboveskip=4pt,                                  % spacing above/below code block
-  belowskip=3pt,
+%   columns=fixed,
+  columns=fullflexible,
+%   aboveskip=4pt,                                  % spacing above/below code block
+%   belowskip=3pt,
   keepspaces=true,
   tabsize=4,
@@ -37,14 +40,17 @@
 \lstdefinestyle{cfaStyle}{
   escapeinside={@@},
-  basicstyle=\linespread{0.9}\tt\footnotesize,		% reduce line spacing and use typewriter font
-  keywordstyle=\bfseries\color{blue},
-  keywordstyle=[2]\bfseries\color{Plum},
-  commentstyle=\sf\itshape\color{OliveGreen},		  % green and italic comments
-  identifierstyle=\color{identifierCol},
-  stringstyle=\sf\color{Mahogany},			          % use sanserif font
+%  basicstyle=\linespread{0.9}\tt\footnotesize,		% reduce line spacing and use typewriter font
+  basicstyle=\linespread{0.9}\sf,		% reduce line spacing and use typewriter font
+%  keywordstyle=\bfseries\color{blue},
+%  keywordstyle=[2]\bfseries\color{Plum},
+%  commentstyle=\sf\itshape\color{OliveGreen},		  % green and italic comments
+%  identifierstyle=\color{identifierCol},
+%  stringstyle=\sf\color{Mahogany},			          % use sanserif font
+  stringstyle=\tt,			          % use sanserif font
   mathescape=true,
-  columns=fixed,
-  aboveskip=4pt,                                  % spacing above/below code block
-  belowskip=3pt,
+%  columns=fixed,
+  columns=fullflexible,
+%  aboveskip=4pt,                                  % spacing above/below code block
+%  belowskip=3pt,
   keepspaces=true,
   tabsize=4,
@@ -54,8 +60,10 @@
   showspaces=false,
   showstringspaces=false,
+  showlines=true,							% show blank lines at end of code
   escapechar=\$,
   xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
   moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
-  morekeywords=[2]{accept, signal, signal_block, wait, waitfor},
+  morekeywords=[2]{accept, signal, signal_block, wait, waitfor, waituntil},
+  abovecaptionskip=5pt,
 }