Changeset bbdb0c6 for doc/theses

Timestamp:

Mar 18, 2020, 3:41:01 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

778452d, d658183

Parents:

c4fd4ef (diff), 45f4147 (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

Location:

doc/theses

Files:

• andrew_beach_MMath/Makefile (modified) (2 diffs)
• andrew_beach_MMath/cfalab.sty (added)
• andrew_beach_MMath/thesis.tex (modified) (6 diffs)
• andrew_beach_MMath/unwinding.tex (added)
• andrew_beach_MMath/uw-ethesis.cls (added)
• thierry_delisle_PhD/comp_II/comp_II.tex (modified) (3 diffs)

doc/theses/andrew_beach_MMath/Makefile

@@ -5 +5 @@
 TEXSRC=$(wildcard *.tex)
 BIBSRC=$(wildcard *.bib)
+STYSRC=$(wildcard *.sty)
+CLSSRC=$(wildcard *.cls)
 TEXLIB= .:${BUILD}:
 BIBLIB= .:../../bibliography
@@ -24 +26 @@
 all: ${DOC}
 
-${BUILD}/${DOC}: ${TEXSRC} ${BIBSRC} Makefile | ${BUILD}
+${BUILD}/${DOC}: ${TEXSRC} ${BIBSRC} ${STYSRC} ${CLSSRC} Makefile | ${BUILD}
         ${LATEX} ${BASE}
         ${BIBTEX} ${BUILD}/${BASE}

doc/theses/andrew_beach_MMath/thesis.tex

@@ -1 @@
-% uWaterloo Thesis Template for LaTeX 
-% Last Updated June 14, 2017 by Stephen Carr, IST Client Services
-% FOR ASSISTANCE, please send mail to rt-IST-CSmathsci@ist.uwaterloo.ca
-
-% Effective October 2006, the University of Waterloo 
-% requires electronic thesis submission. See the uWaterloo thesis regulations at
-% https://uwaterloo.ca/graduate-studies/thesis.
-
-% DON'T FORGET TO ADD YOUR OWN NAME AND TITLE in the "hyperref" package
-% configuration. THIS INFORMATION GETS EMBEDDED IN THE FINAL PDF DOCUMENT.
-% You can view the information if you view Properties of the PDF document.
-
-% Many faculties/departments also require one or more printed
-% copies. This template attempts to satisfy both types of output. 
-% It is based on the standard "book" document class which provides all
-% necessary sectioning structures and allows multi-part theses.
-
-% DISCLAIMER
-% To the best of our knowledge, this template satisfies the current uWaterloo
-% requirements. However, it is your responsibility to assure that you have met
-% all  requirements of the University and your particular department.
-% Many thanks for the feedback from many graduates that assisted the
-% development of this template.
-
-% -----------------------------------------------------------------------
-
-% By default, output is produced that is geared toward generating a PDF 
-% version optimized for viewing on an electronic display, including 
-% hyperlinks within the PDF.
- 
-% E.g. to process a thesis called "mythesis.tex" based on this template, run:
-
-% pdflatex mythesis     -- first pass of the pdflatex processor
-% bibtex mythesis       -- generates bibliography from .bib data file(s)
-% makeindex         -- should be run only if an index is used 
-% pdflatex mythesis     -- fixes numbering in cross-references,
-% pdflatex mythesis --   bibliographic references, glossaries, index, etc.
-
-% N.B. The "pdftex" program allows graphics in the following formats to be
-% included with the "\includegraphics" command: PNG, PDF, JPEG, TIFF
-% Tip 1: Generate your figures and photos in the size you want them to appear
-% in your thesis, rather than scaling them with \includegraphics options.
-% Tip 2: Any drawings you do should be in scalable vector graphic formats:
-% SVG, PNG, WMF, EPS and then converted to PNG or PDF, so they are scalable in
-% the final PDF as well.
-% Tip 3: Photographs should be cropped and compressed so as not to be too large.
-
-% To create a PDF output that is optimized for double-sided printing: 
-%
-% 1) comment-out the \documentclass statement in the preamble below, and
-% un-comment the second \documentclass line.
-%
-% 2) change the value assigned below to the boolean variable
-% "PrintVersion" from "false" to "true".
-
-% --------------------- Start of Document Preamble -----------------------
-
-% Specify the document class, default style attributes, and page dimensions
-% For hyperlinked PDF, suitable for viewing on a computer, use this:
-\documentclass[letterpaper,12pt,titlepage,oneside,final]{book}
- 
-% For PDF, suitable for double-sided printing, change the PrintVersion
-% variable below to "true" and use this \documentclass line instead of the one
-% above:
-%\documentclass[letterpaper,12pt,titlepage,openright,twoside,final]{book}
-
-% Some LaTeX commands I define for my own nomenclature.
-% If you have to, it's better to change nomenclature once here than in a 
-% million places throughout your thesis!
-\newcommand{\package}[1]{\textbf{#1}} % package names in bold text
-\newcommand{\cmmd}[1]{\textbackslash\texttt{#1}} % command name in tt font 
-\newcommand{\href}[1]{#1} % does nothing, but defines the command so the
-  % print-optimized version will ignore \href tags (redefined by hyperref pkg).
-%\newcommand{\texorpdfstring}[2]{#1} % does nothing, but defines the command
-% Anything defined here may be redefined by packages added below...
-
-% This package allows if-then-else control structures.
-\usepackage{ifthen}
-\newboolean{PrintVersion}
-\setboolean{PrintVersion}{false} 
-% CHANGE THIS VALUE TO "true" as necessary, to improve printed results for
-% hard copies by overriding some options of the hyperref package below.
+% 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.
+\newcommand{\package}[1]{\textbf{#1}}
+\newcommand{\cmmd}[1]{\textbackslash\texttt{#1}}
+\newcommand{\href}[1]{#1}
 
 % For a nomenclature (optional; available from ctan.org)
@@ -86 +68 @@
 % Lots of math symbols and environments
 \usepackage{amsmath,amssymb,amstext}
-% For including graphics N.B. pdftex graphics driver 
+% For including graphics, sets the pdftex graphics driver.
 \usepackage[pdftex]{graphicx}
 
-% I believe the general index function is covered by the glossaries.
-% \usepackage{makeidx}
-% \makeindex
-
-% Hyperlinks make it very easy to navigate an electronic document.
-% In addition, this is where you should specify the thesis title
-% and author as they appear in the properties of the PDF document.
-% Use the "hyperref" package 
-% N.B. HYPERREF MUST BE THE LAST PACKAGE LOADED; ADD ADDITIONAL PKGS ABOVE
-% N.B. pagebackref=true provides links back from the References to the body
-% text. This can cause trouble for printing.
-\usepackage[pdftex,pagebackref=false]{hyperref} % with basic options
-\hypersetup{
-    plainpages=false,       % needed if Roman numbers in frontpages
-    unicode=false,          % non-Latin characters in Acrobat’s bookmarks
-    pdftoolbar=true,        % show Acrobat’s toolbar?
-    pdfmenubar=true,        % show Acrobat’s menu?
-    pdffitwindow=false,     % window fit to page when opened
-    pdfstartview={FitH},    % fits the width of the page to the window
-    pdftitle={uWaterloo\ LaTeX\ Thesis\ Template},    % title: CHANGE THIS TEXT!
-%    pdfauthor={Author},    % author: CHANGE THIS TEXT! and uncomment this line
-%    pdfsubject={Subject},  % subject: CHANGE THIS TEXT! and uncomment this line
-%    pdfkeywords={keyword1} {key2} {key3}, % list of keywords, and uncomment this line if desired
-    pdfnewwindow=true,      % links in new window
-    colorlinks=true,        % false: boxed links; true: colored links
-    linkcolor=blue,         % color of internal links
-    citecolor=green,        % color of links to bibliography
-    filecolor=magenta,      % color of file links
-    urlcolor=cyan           % color of external links
-}
-\ifthenelse{\boolean{PrintVersion}}{
-  % for improved print quality, override some hyperref options
-\hypersetup{
-%    colorlinks,%
-    citecolor=black,%
-    filecolor=black,%
-    linkcolor=black,%
-    urlcolor=black}
-}{} % end of ifthenelse (no else)
-
-\usepackage[toc,abbreviations]{glossaries-extra} % Exception to the
-% rule of hyperref being the last add-on package. If glossaries-extra is not
-% in your LaTeX distribution, get it from CTAN
-% (http://ctan.org/pkg/glossaries-extra). 
-
-% Setting up the page margins...
-% 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.)
-% Width of space between body text and margin notes.
-\setlength{\marginparsep}{0pt}
-\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
-% Assuming US letter paper (8.5 in. x 11 in.) and side margins as above.
-\setlength{\textwidth}{6.375in}
-\raggedbottom
-
-% The following statement specifies the amount of space between paragraphs.
-% Other reasonable specifications are \bigskipamount and \smallskipamount.
-\setlength{\parskip}{\medskipamount}
-
-% The following statement controls the line spacing.  The default
-% spacing corresponds to good typographic conventions and only slight
-% changes (e.g., perhaps "1.2"), if any, should be made.
-\renewcommand{\baselinestretch}{1} % this is the default line space setting
-
-% By default, each chapter will start on a recto (right-hand side)
-% page.  We also force each section of the front pages to start on 
-% a recto page by inserting \cleardoublepage commands.
-% In many cases, this will require that the verso page be
-% blank and, while it should be counted, a page number should not be
-% printed.  The following statements ensure a page number is not
-% printed on an otherwise blank verso page.
-\let\origdoublepage\cleardoublepage
-\newcommand{\clearemptydoublepage}{%
-  \clearpage{\pagestyle{empty}\origdoublepage}}
-\let\cleardoublepage\clearemptydoublepage
-
-% Define Glossary terms (This is properly done here, in the preamble.
-% Could be \input{} from a file...)
+\usepackage{cfalab}
+
+\usehyperrefpackage[pdftex,pagebackref=false]{
+    pdftitle={Exception Handling in CFA},
+    pdfauthor={Andrew James Beach},
+    pdfsubject={Programming Languages},
+    pdfkeywords={exceptions,implementation},
+}
+
+% The \phantomsection is used to help the hyperref package create links.
+
+% Maybe only package that should be loaded after the hyperref package.
+% From http://ctan.org/pkg/glossaries-extra, extends glossaries which replaces
+% glossary and builds off of the makeindex system.
+\usepackage[toc,abbreviations]{glossaries-extra}
+
 % Main glossary entries -- definitions of relevant terminology
 \newglossaryentry{computer}
@@ -194 +102 @@
 type=nomenclature,
 name=dingledorf,
-description={A person of supposed average intelligence who makes incredibly brainless misjudgments}
+description={A person of supposed average intelligence who makes incredibly
+               brainless misjudgments}
 }
 
 % List of Abbreviations (abbreviations are from the glossaries-extra package)
-\newabbreviation{aaaaz}{AAAAZ}{American Association of Amature Astronomers and Zoologists}
+\newabbreviation{aaaaz}{AAAAZ}{American Association of Amature Astronomers
+               and Zoologists}
 
 % List of Symbols
@@ -207 +117 @@
 sort={label},
 type=symbols,
-description={Random vector: a location in n-dimensional Cartesian space, where each dimensional component is determined by a random process}
-}
- 
+description={Random vector: a location in n-dimensional Cartesian space, where
+               each dimensional component is determined by a random process}
+}
+
+% Must be here of cause problems with glossaries-extra.
+\lstMakeShortInline$%
+
+% Generate the glossaries defined above.
 \makeglossaries
 
-%======================================================================
-%   L O G I C A L    D O C U M E N T -- the content of your thesis
-%======================================================================
 \begin{document}
 
-% For a large document, it is a good idea to divide your thesis
-% into several files, each one containing one chapter.
-% To illustrate this idea, the "front pages" (i.e., title page,
-% declaration, borrowers' page, abstract, acknowledgements,
-% dedication, table of contents, list of tables, list of figures,
-% nomenclature) are contained within the file "uw-ethesis-frontpgs.tex" which
-% is included into the document by the following statement.
 %----------------------------------------------------------------------
 % FRONT MATERIAL
@@ -232 +137 @@
 % MAIN BODY
 %----------------------------------------------------------------------
-% Because this is a short document, and to reduce the number of files
-% needed for this template, the chapters are not separate
-% documents as suggested above, but you get the idea. If they were
-% separate documents, they would each start with the \chapter command, i.e, do
-% not contain \documentclass or \begin{document} and \end{document} commands.
+\input{unwinding}
+
 %======================================================================
 \chapter{Introduction}
@@ -327 +229 @@
 %----------------------------------------------------------------------
 
-% B I B L I O G R A P H Y
-% -----------------------
-
-% The following statement selects the style to use for references. It controls
-% the sort order of the entries in the bibliography and also the formatting
-% for the in-text labels.
-\bibliographystyle{plain}
-% This specifies the location of the file containing the bibliographic
-% information. It assumes you're using BibTeX (if not, why not?).
-
-% This is needed if the book class is used, to place the anchor in the correct
-% page, because the bibliography will start on its own page.
+%----------------------------------------------------------------------
+% BIBLIOGRAPHY
+%----------------------------------------------------------------------
+
 % Use \clearpage instead if the document class uses the "oneside" argument.
 \cleardoublepage
-% With hyperref package, enables hyperlinking from the table of contents to
-% bibliography
 \phantomsection
 
-% The following statement causes the title "References" to be used for the
-% bibliography section:
-\renewcommand*{\bibname}{References}
-
-% Add the References to the Table of Contents
-\addcontentsline{toc}{chapter}{\textbf{References}}
-
-% Tip 5: You can create multiple .bib files to organize your references. Just
-% list them all in the \bibliogaphy command, separated by commas (no spaces).
+% Bibliography setup and creation, renamed to References.
+\addcontentsline{toc}{chapter}{\textbf{\bibname}}
+\bibliographystyle{plain}
 \bibliography{thesis}
 
-% The following statement causes the specified references to be added to the
-% bibliography even if they were not cited in the text. The asterisk is a
-% wildcard that causes all entries in the bibliographic database to be
-% included (optional).
+% Include all uncited entries in the bibliography.
 \nocite{*}
 
-% The \appendix statement indicates the beginning of the appendices.
+% Begin the appendix, add a title and table of contents entry.
 \appendix
-% Add a title page before the appendices and a line in the Table of Contents
 \chapter*{APPENDICES}
 \addcontentsline{toc}{chapter}{APPENDICES}

doc/theses/thierry_delisle_PhD/comp_II/comp_II.tex

@@ -8 +8 @@
 \usepackage{graphicx}
 \usepackage{epic,eepic}
-\usepackage[hidelinks]{hyperref}
 \usepackage{glossaries}
 \usepackage{textcomp}
+\usepackage[hidelinks]{hyperref}
 %\usepackage[margin=1in]{geometry}
 %\usepackage{float}
@@ -151 +151 @@
 \begin{table}
         \begin{center}
-                \begin{tabular}{|c|c|c|}
-                        \hline
-                        & Many Processors & Few Processors \\
+                \begin{tabular}{|r|l|l|}
+                        \cline{2-3}
+                        \multicolumn{1}{r|}{} & \multicolumn{1}{c|}{Many Processors} & \multicolumn{1}{c|}{Few Processors} \\
                         \hline
                         Many Threads & A: good performance & B: good performance \\
@@ -260 +260 @@
 
 
-\cleardoublepage
-
 % B I B L I O G R A P H Y
 % -----------------------------
-\addcontentsline{toc}{chapter}{Bibliography}
+\cleardoublepage
+\phantomsection         % allows hyperref to link to the correct page
+\addcontentsline{toc}{section}{\refname}
 \bibliographystyle{plain}
 \bibliography{pl,local}
+
+% G L O S S A R Y
+% -----------------------------
 \cleardoublepage
 \phantomsection         % allows hyperref to link to the correct page
-
-% G L O S S A R Y
-% -----------------------------
-\addcontentsline{toc}{chapter}{Glossary}
+\addcontentsline{toc}{section}{Glossary}
 \printglossary
-\cleardoublepage
-\phantomsection         % allows hyperref to link to the correct page
 
 \end{document}