Index: doc/refrat/Makefile
===================================================================
--- doc/refrat/Makefile	(revision 83e9bd3542d6b3c6755e50591bde755e42a80a44)
+++ doc/refrat/Makefile	(revision 83e680dfbc65dc18b4ac28572653c3e2af959cad)
@@ -9,4 +9,5 @@
 SOURCES = ${addsuffix .tex, \
 refrat \
+keywords \
 }
 
Index: doc/refrat/keywords.tex
===================================================================
--- doc/refrat/keywords.tex	(revision 83e680dfbc65dc18b4ac28572653c3e2af959cad)
+++ doc/refrat/keywords.tex	(revision 83e680dfbc65dc18b4ac28572653c3e2af959cad)
@@ -0,0 +1,69 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*- Mode: Latex -*- %%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% 
+%% Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+%%
+%% The contents of this file are covered under the licence agreement in the
+%% file "LICENCE" distributed with Cforall.
+%% 
+%% keywords.tex -- 
+%% 
+%% Author           : Peter A. Buhr
+%% Created On       : Sun Aug  6 08:17:27 2017
+%% Last Modified By : Peter A. Buhr
+%% Last Modified On : Sun Aug  6 08:31:42 2017
+%% Update Count     : 4
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\begin{tabular}{@{}llllll@{}}
+\begin{tabular}{@{}l@{}}
+©_At©			\\
+©catch©			\\
+©catchResume©	\\
+©choose©		\\
+©coroutine©		\\
+\end{tabular}
+&
+\begin{tabular}{@{}l@{}}
+©disable©		\\
+©dtype©			\\
+©enable©		\\
+©fallthrough©	\\
+©fallthru©		\\
+\end{tabular}
+&
+\begin{tabular}{@{}l@{}}
+©finally©		\\
+©forall©		\\
+©ftype©			\\
+©lvalue©		\\
+©monitor©		\\
+\end{tabular}
+&
+\begin{tabular}{@{}l@{}}
+©mutex©			\\
+©one_t©			\\
+©otype©			\\
+©throw©			\\
+©throwResume©	\\
+\end{tabular}
+&
+\begin{tabular}{@{}l@{}}
+©trait©			\\
+©try©			\\
+©ttype©			\\
+©virtual©		\\
+©with©			\\
+\end{tabular}
+&
+\begin{tabular}{@{}l@{}}
+©zero_t©		\\
+				\\
+				\\
+				\\
+				\\
+\end{tabular}
+\end{tabular}
+% Local Variables: %
+% tab-width: 4 %
+% fill-column: 100 %
+% compile-command: "make" %
+% End: %
Index: doc/refrat/refrat.tex
===================================================================
--- doc/refrat/refrat.tex	(revision 83e9bd3542d6b3c6755e50591bde755e42a80a44)
+++ doc/refrat/refrat.tex	(revision 83e680dfbc65dc18b4ac28572653c3e2af959cad)
@@ -11,11 +11,11 @@
 %% Created On       : Wed Apr  6 14:52:25 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Fri Jun  2 10:43:14 2017
-%% Update Count     : 83
+%% Last Modified On : Sun Aug  6 08:53:08 2017
+%% Update Count     : 99
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % requires tex packages: texlive-base texlive-latex-base tex-common texlive-humanities texlive-latex-extra texlive-fonts-recommended
 
-\documentclass[openright,twoside]{report}
+\documentclass[openright,twoside,11pt]{report}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37,11 +37,19 @@
 \usepackage{mathptmx}                                   % better math font with "times"
 \usepackage[usenames]{color}
-\usepackage[pagewise]{lineno}
-\renewcommand{\linenumberfont}{\scriptsize\sffamily}
-\input{common}                                          % bespoke macros used in the document
+\input{common}                                          % common CFA document macros
 \usepackage[dvips,plainpages=false,pdfpagelabels,pdfpagemode=UseNone,colorlinks=true,pagebackref=true,linkcolor=blue,citecolor=blue,urlcolor=blue,pagebackref=true,breaklinks=true]{hyperref}
 \usepackage{breakurl}
 \renewcommand{\UrlFont}{\small\sf}
 
+\usepackage[pagewise]{lineno}
+\renewcommand{\linenumberfont}{\scriptsize\sffamily}
+\usepackage[firstpage]{draftwatermark}
+\SetWatermarkLightness{0.9}
+
+% 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.
+\renewcommand{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.075ex}}}
+
 \setlength{\topmargin}{-0.45in}							% move running title into header
 \setlength{\headsep}{0.25in}
@@ -50,4 +58,7 @@
 
 \CFAStyle												% use default CFA format-style
+\lstnewenvironment{C++}[1][]                            % use C++ style
+{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{®}{®}#1}}
+{}
 
 % inline code ©...© (copyright symbol) emacs: C-q M-)
@@ -87,5 +98,5 @@
 
 \date{
-DRAFT \\ \today
+\today
 }% date
 
@@ -112,8 +123,10 @@
 
 \clearpage
+\thispagestyle{plain}
 \pdfbookmark[1]{Contents}{section}
 \tableofcontents
 
 \clearpage
+\thispagestyle{plain}
 \pagenumbering{arabic}
 
@@ -417,11 +430,7 @@
 
 \begin{syntax}
-\oldlhs{keyword}
-\rhs ©forall©
-\rhs ©lvalue©
-\rhs ©trait©
-\rhs ©dtype©
-\rhs ©ftype©
-\rhs ©otype©
+\lhs{keyword} one of
+\rhs \dots
+\rhs \input{keywords}
 \end{syntax}