Changeset 44a88528 for doc/theses/andrew_beach_MMath/thesis.tex

Timestamp:

Mar 25, 2020, 2:08:43 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2a3b019, 63863f8

Parents:

6c6e36c (diff), c72ea7a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• doc/theses/andrew_beach_MMath/thesis.tex (modified) (3 diffs)

doc/theses/andrew_beach_MMath/thesis.tex

@@ -1 +1 @@
 % Main tex file for thesis document.
 \documentclass[digital]{uw-ethesis}
-\usepackage{comment}
-\usepackage{fullpage}
-\setlength{\textheight}{8.75in}
-\renewcommand\labelitemi{\footnotesize$\bullet$} % shrink bullet for level 1 itemize
-\usepackage{lmodern}                            % bold typewriter font
-
-\usepackage{listings}                           % format program code
-% Default underscore is too low and wide. Cannot use lstlisting "literate" as replacing underscore
-% removes it as a variable-name character so keywords in variables are highlighted. MUST APPEAR
-% AFTER HYPERREF.
-%\DeclareTextCommandDefault{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}
-\renewcommand{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.075ex}}}
-% parindent is relative, i.e., toggled on/off in environments like itemize, so store the value for
-% use rather than use \parident directly.
-\newlength{\parindentlnth}
-\setlength{\parindentlnth}{\parindent}
-
-% CFA programming language, based on ANSI C (with some gcc additions)
-\lstdefinelanguage{CFA}[ANSI]{C}{
-        morekeywords={
-                _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, __attribute, __attribute__,
-                auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__,
-                coroutine, disable, dtype, enable, exception, __extension__, fallthrough, fallthru, finally,
-                __float80, float80, __float128, float128, forall, ftype, generator, _Generic, _Imaginary, __imag, __imag__,
-                inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or,
-                otype, restrict, resume, __restrict, __restrict__, __signed, __signed__, _Static_assert, suspend, thread,
-                _Thread_local, throw, throwResume, timeout, trait, try, ttype, typeof, __typeof, __typeof__,
-                virtual, __volatile, __volatile__, waitfor, when, with, zero_t},
-        moredirectives={defined,include_next},
-        % replace/adjust listing characters that look bad in sanserif
-        literate={-}{\makebox[1ex][c]{\raisebox{0.5ex}{\rule{0.8ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1
-                {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 % {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
-                {<}{\textrm{\textless}}1 {>}{\textrm{\textgreater}}1
-                {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.5ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex{\textrm{\textgreater}}}2,
-}
-
-\lstset{
-language=CFA,
-columns=fullflexible,
-basicstyle=\linespread{0.9}\tt,                 % reduce line spacing and use sanserif font
-stringstyle=\tt,                                % use typewriter font
-tabsize=5,                                      % N space tabbing
-xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
-%mathescape=true,                               % LaTeX math escape in CFA code $...$
-escapechar=\$,                                  % LaTeX escape in CFA code
-keepspaces=true,
-showstringspaces=false,                         % do not show spaces with cup
-showlines=true,                                 % show blank lines at end of code
-aboveskip=4pt,                                  % spacing above/below code block
-belowskip=3pt,
-moredelim=**[is][\color{red}]{`}{`},
-}% lstset
-
-\lstnewenvironment{cfa}[1][]
-{\lstset{#1}}
-{}
-% inline code @...@
 
 % Commands used in documenting how to use the template. To remove.
@@ -81 +24 @@
 
 % The \phantomsection is used to help the hyperref package create links.
+
+% Post hyperref setup from cfalab.
+\lstset{style=cfalab}
+\settextunderscore{new}
 
 % Maybe only package that should be loaded after the hyperref package.
@@ -120 +67 @@
                each dimensional component is determined by a random process}
 }
-
-% Must be here of cause problems with glossaries-extra.
-\lstMakeShortInline$%
 
 % Generate the glossaries defined above.