Changes in / [678c540:e41c4c6]

Location:

doc/theses/colby_parsons_MMAth

Files:

• style/cfa-format.tex (modified) (4 diffs)
• text/intro.tex (modified) (1 diff)
• thesis.tex (modified) (2 diffs)

doc/theses/colby_parsons_MMAth/style/cfa-format.tex

@@ -9 +9 @@
 \definecolor{identifierCol}{HTML}{000000}
 
-% from https://gist.github.com/nikolajquorning/92bbbeef32e1dd80105c9bf2daceb89a
-\lstdefinelanguage{sml} {
-  morekeywords= {
-    EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before, bool, case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor, handle, if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op, open, option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature, string, struct, structure, substring, then, true, type, unit, val, vector, where, while, with, withtype, word
-  },
-  morestring=[b]",
-  morecomment=[s]{(*}{*)},
-}
-
-\lstdefinelanguage{D}{
-  % Keywords
-  morekeywords=[1]{
-    abstract, alias, align, auto, body, break, cast, catch, class, const,
-    continue, debug, delegate, delete, deprecated, do, else, enum, export,
-    false, final, finally, for, foreach, foreach_reverse, function, goto, if,
-    immutable, import, in, inout, interface, invariant, is, lazy, macro, mixin,
-    module, new, nothrow, null, out, override, package, pragma, private,
-    protected, public, pure, ref, return, shared, static, struct, super,
-    switch, synchronized, template, this, throw, true, try, typedef, typeid,
-    typeof, union, unittest, volatile, while, with
-  },
-  % Special identifiers, common functions
-  morekeywords=[2]{enforce},
-  % Ugly identifiers
-  morekeywords=[3]{
-    __DATE__, __EOF__, __FILE__, __LINE__, __TIMESTAMP__, __TIME__, __VENDOR__,
-    __VERSION__, __ctfe, __gshared, __monitor, __thread, __vptr, _argptr,
-    _arguments, _ctor, _dtor
-  },
-  % Basic types
-  morekeywords=[4]{
-     byte, ubyte, short, ushort, int, uint, long, ulong, cent, ucent, void,
-     bool, bit, float, double, real, ushort, int, uint, long, ulong, float,
-     char, wchar, dchar, string, wstring, dstring, ireal, ifloat, idouble,
-     creal, cfloat, cdouble, size_t, ptrdiff_t, sizediff_t, equals_t, hash_t
-  },
-  % Strings
-  morestring=[b]{"},
-  morestring=[b]{'},
-  morestring=[b]{`},
-  % Comments
-  comment=[l]{//},
-  morecomment=[s]{/*}{*/},
-  morecomment=[s][\color{blue}]{/**}{*/},
-  morecomment=[n]{/+}{+/},
-  morecomment=[n][\color{blue}]{/++}{+/},
-  % Options
-  sensitive=true
-}
-
-\lstdefinelanguage{rust}{
-  % Keywords
-  morekeywords=[1]{
-    abstract, alignof, as, become, box,
-    break, const, continue, crate, do,
-    else, enum, extern, false, final,
-    fn, for, if, impl, in,
-    let, loop, macro, match, mod,
-    move, mut, offsetof, override, priv,
-    proc, pub, pure, ref, return,
-    Self, self, sizeof, static, struct,
-    super, trait, true,  type, typeof,
-    unsafe, unsized, use, virtual, where,
-    while, yield
-  },
-  % Strings
-  morestring=[b]{"},
-  % Comments
-  comment=[l]{//},
-  morecomment=[s]{/*}{*/},
-  % Options
-  sensitive=true
-}
-
-\lstdefinelanguage{pseudo}{
-        morekeywords={string,uint,int,bool,float},%
-        sensitive=true,%
-        morecomment=[l]{//},%
-        morecomment=[s]{/*}{*/},%
-        morestring=[b]',%
-        morestring=[b]",%
-        morestring=[s]{`}{`},%
-}%
-
-\newcommand{\KWC}{K-W C\xspace}
-
-\lstdefinestyle{pseudoStyle}{
-  escapeinside={@@},
-%  basicstyle=\linespread{0.9}\sf\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=\itshape\color{OliveGreen},                 % green and italic comments
-%  identifierstyle=\color{identifierCol},
-%  stringstyle=\sf\color{Mahogany},                               % use sanserif font
-  mathescape=true,
-  columns=fixed,
-  aboveskip=4pt,                                  % spacing above/below code block
-  belowskip=3pt,
-  keepspaces=true,
-  tabsize=4,
-  % frame=lines,
-  literate=,
-  showlines=true,                                 % show blank lines at end of code
-  showspaces=false,
-  showstringspaces=false,
-  escapechar=\$,
-  xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
-  moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
-  % moredelim=* detects keywords, comments, strings, and other delimiters and applies their formatting
-  % moredelim=** allows cumulative application
-}
-
 \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,
@@ -174 +64 @@
   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,
 }
-
-% \lstMakeShortInline[basewidth=0.5em,breaklines=true,basicstyle=\normalsize\ttfamily\color{basicCol}]@  % single-character for \lstinline
-% \lstMakeShortInline@
 
 \lstnewenvironment{ccode}[1][]{
@@ -194 +81 @@
     language = CFA,
     style=cfaStyle,
-    captionpos=b,
-    #1
-  }
-}{}
-
-\lstnewenvironment{pseudo}[1][]{
-  \lstset{
-    language = pseudo,
-    style=pseudoStyle,
     captionpos=b,
     #1
@@ -235 +113 @@
 }{}
 
-\lstnewenvironment{scalacode}[1][]{
-  \lstset{
-    language = scala,
-    style=defaultStyle,
-    captionpos=b,
-    #1
-  }
-}{}
-
-\lstnewenvironment{smlcode}[1][]{
-  \lstset{
-    language = sml,
-    style=defaultStyle,
-    captionpos=b,
-    #1
-  }
-}{}
-
-\lstnewenvironment{dcode}[1][]{
-  \lstset{
-    language = D,
-    style=defaultStyle,
-    captionpos=b,
-    #1
-  }
-}{}
-
-\lstnewenvironment{rustcode}[1][]{
-  \lstset{
-    language = rust,
-    style=defaultStyle,
-    captionpos=b,
-    #1
-  }
-}{}
-
 \lstnewenvironment{gocode}[1][]{
   \lstset{

doc/theses/colby_parsons_MMAth/text/intro.tex

@@ -1 +1 @@
 % ======================================================================
 % ======================================================================
-\chapter{Introduction}\label{s:cfa}
+\chapter{Introduction}\label{s:intro}
 % ======================================================================
 % ======================================================================

doc/theses/colby_parsons_MMAth/thesis.tex

@@ -7 +7 @@
 % Latex packages used in the document.
 \usepackage{fullpage,times,comment}
-%\usepackage[T1]{fontenc}
-%\usepackage[scaled=0.88]{helvet}                                               % descent Helvetica font and scale to times size
 \usepackage{textcomp}
-%\usepackage[latin1]{inputenc}
 \usepackage{epic,eepic}
-\usepackage{upquote}                                            % switch curled `'" to straight
 \usepackage{dirtytalk}
-\usepackage{calc}
 \usepackage{xspace}
-% \usepackage[labelformat=simple]{subfig}
-% \renewcommand{\thesubfigure}{(\alph{subfigure})}
 \usepackage{subcaption}
-% \usepackage{subfigure}
 \usepackage{graphicx}
 \usepackage{tabularx}
-\usepackage{multicol}
 \usepackage[acronym]{glossaries}
-\usepackage{varioref}
 \usepackage{listings}                                           % format program code
 \usepackage[flushmargin]{footmisc}                              % support label/reference in footnote
-\usepackage{latexsym}                                           % \Box glyph
 \usepackage{mathptmx}                                           % better math font with "times"
 \usepackage[usenames]{color}
@@ -34 +23 @@
 \usepackage{fancyhdr}
 \usepackage{float}
-\usepackage{siunitx}
-\sisetup{ binary-units=true }
 \input{style}                                                   % bespoke macros used in the document
-\usepackage{url}
 \usepackage[dvips,plainpages=false,pdfpagelabels,pdfpagemode=UseNone,colorlinks=true,pagebackref=true,linkcolor=blue,citecolor=blue,urlcolor=blue,pagebackref=true,breaklinks=true]{hyperref}
-\usepackage{breakurl}
 \urlstyle{rm}
+% \usepackage{breakurl} % used to avoid line breaks inside urls -> uncomment later if needed
 
 \usepackage{tikz}
 \def\checkmark{\tikz\fill[scale=0.4](0,.35) -- (.25,0) -- (1,.7) -- (.25,.15) -- cycle;}
 
-\setlength{\topmargin}{-0.45in}                         % move running title into header
+% Setting up the page margins...
+\setlength{\textheight}{9in}
+\setlength{\topmargin}{-0.45in}
 \setlength{\headsep}{0.25in}
+% uWaterloo thesis requirements specify a minimum of 1 inch (72pt) margin at the
+% top, bottom, and outside page edges and a 1.125 in. (81pt) gutter margin (on binding side).
+% While this is not an issue for electronic viewing, a PDF may be printed, and so we have the same page layout for both printed and electronic versions, we leave the gutter margin in.
+% Set margins to minimum permitted by uWaterloo thesis regulations:
+\setlength{\marginparwidth}{0pt} % width of margin notes
+% N.B. If margin notes are used, you must adjust \textwidth, \marginparwidth
+% and \marginparsep so that the space left between the margin notes and page
+% edge is less than 15 mm (0.6 in.)
+\setlength{\marginparsep}{0pt} % width of space between body text and margin notes
+\setlength{\evensidemargin}{0.125in} % Adds 1/8 in. to binding side of all
+% even-numbered pages when the "twoside" printing option is selected
+\setlength{\oddsidemargin}{0.125in} % Adds 1/8 in. to the left of all pages when "oneside" printing is selected, and to the left of all odd-numbered pages when "twoside" printing is selected
+\setlength{\textwidth}{6.375in} % assuming US letter paper (8.5 in. x 11 in.) and side margins as above
+\raggedbottom
+
+% The following statement specifies the amount of space between paragraphs. Other reasonable specifications are \bigskipamount and \smallskipamount.
+\setlength{\parskip}{\medskipamount}
 
 \newsavebox{\myboxA}                                    % used with subfigure