Index: doc/LaTeXmacros/common.tex
===================================================================
--- doc/LaTeXmacros/common.tex	(revision 3f5a28bf0e1ee33d4bf447736a75a90858ddf0ac)
+++ doc/LaTeXmacros/common.tex	(revision 578e6037f1cd4d49eb6369e30c767ffec8ac7ea7)
@@ -11,6 +11,6 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Wed Jul 12 23:01:58 2017
-%% Update Count     : 327
+%% Last Modified On : Thu Jul 13 11:44:59 2017
+%% Update Count     : 335
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -55,9 +55,12 @@
 \setlength{\parindentlnth}{\parindent}
 
+\newcommand{\LstKeywordStyle}[1]{{\lst@basicstyle{\lst@keywordstyle{#1}}}}
+\newcommand{\LstCommentStyle}[1]{{\lst@basicstyle{\lst@commentstyle{#1}}}}
+
 \newlength{\gcolumnposn}				% temporary hack because lstlisting does not handle tabs correctly
 \newlength{\columnposn}
 \setlength{\gcolumnposn}{2.5in}
 \setlength{\columnposn}{\gcolumnposn}
-\newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@commentstyle{#2}}}
+\newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@basicstyle{\LstCommentStyle{#2}}}}
 \newcommand{\CRT}{\global\columnposn=\gcolumnposn}
 
Index: doc/user/user.tex
===================================================================
--- doc/user/user.tex	(revision 3f5a28bf0e1ee33d4bf447736a75a90858ddf0ac)
+++ doc/user/user.tex	(revision 578e6037f1cd4d49eb6369e30c767ffec8ac7ea7)
@@ -11,6 +11,6 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Thu Jul 13 07:08:58 2017
-%% Update Count     : 2673
+%% Last Modified On : Thu Jul 13 11:44:57 2017
+%% Update Count     : 2690
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -501,5 +501,5 @@
 
 
-\section{Labelled Continue/Break}
+\section{\texorpdfstring{Labelled \LstKeywordStyle{continue} / \LstKeywordStyle{break}}{Labelled continue / break}}
 
 While C provides ©continue© and ©break© statements for altering control flow, both are restricted to one level of nesting for a particular control structure.
@@ -633,5 +633,5 @@
 
 
-\section{Switch Statement}
+\section{\texorpdfstring{\LstKeywordStyle{switch} Statement}{switch Statement}}
 
 C allows a number of questionable forms for the ©switch© statement:
@@ -838,5 +838,5 @@
 
 
-\section{Case Clause}
+\section{\texorpdfstring{\LstKeywordStyle{case} Clause}{case Clause}}
 
 C restricts the ©case© clause of a ©switch© statement to a single value.
@@ -914,5 +914,5 @@
 
 
-\section{\protect\lstinline{with} Clause / Statement}
+\section{\texorpdfstring{\LstKeywordStyle{with} Clause / Statement}{with Clause / Statement}}
 \label{s:WithClauseStatement}
 
@@ -921,5 +921,5 @@
 class C {
 	int i, j;
-	int mem() {
+	int mem() {		 ®// implicit "this" parameter
 		i = 1;		®// this->i
 ®		j = 3;		®// this->j
@@ -932,6 +932,6 @@
 	int i, j;
 };
-int mem( C &this ) {
-	®this.®i = 1;	// "this" is not elided
+int mem( C &this ) {	// explicit "this" parameter
+	®this.®i = 1;			  // "this" is not elided
 	®this.®j = 2;
 }
@@ -964,5 +964,5 @@
 	®with s1® {
 		// access fields of s1 without qualification
-		®with s2® { // nesting
+		®with s2® {  // nesting
 			// access fields of s2 without qualification
 		}
@@ -987,4 +987,5 @@
 }
 \end{cfa}
+
 
 \section{Exception Handling}
@@ -1221,5 +1222,5 @@
 
 
-\section{Pointer/Reference}
+\section{Pointer / Reference}
 
 C provides a \newterm{pointer type};
@@ -5343,5 +5344,5 @@
 
 
-\section{\CFA Keywords}
+\section{\texorpdfstring{\CFA Keywords}{Cforall Keywords}}
 \label{s:CFAKeywords}