Changeset e41c4c6 for doc/theses/colby_parsons_MMAth/style/cfa-format.tex

Timestamp:

Apr 2, 2023, 8:20:16 AM (13 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

fb7cda9

Parents:

1e6cecb (diff), 678c540 (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/colby_parsons_MMAth/style/cfa-format.tex (modified) (3 diffs)

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

@@ -11 +11 @@
 \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 +40 @@
 \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 +60 @@
   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,
 }