Index: doc/LaTeXmacros/common.sty
===================================================================
--- doc/LaTeXmacros/common.sty	(revision 0497bd6cecd899f17d5af510c55b6d0c4c887096)
+++ doc/LaTeXmacros/common.sty	(revision cc022a90a37e06f273243026ac3156588f886a70)
@@ -11,6 +11,6 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Sat May  8 08:48:35 2021
-%% Update Count     : 550
+%% Last Modified On : Mon May 31 09:08:37 2021
+%% Update Count     : 565
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -37,5 +37,5 @@
 
 \usepackage{xspace}
-\newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}} % Cforall icon
+\newcommand{\CFAIcon}{\textsf{C\raisebox{\depth}{\rotatebox{180}A}}} % Cforall icon
 \newcommand{\CFA}{\protect\CFAIcon\xspace}				% CFA symbolic name
 \newcommand{\CFL}{\textrm{Cforall}\xspace}				% Cforall non-icon name
@@ -72,7 +72,8 @@
 \setlength{\parindentlnth}{\parindent}
 
-\usepackage{pslatex}					% reduce size of san serif font
-\usepackage{relsize}					% must be after change to small or selects old size
+\usepackage{pslatex}									% reduce size of san serif font
+\usepackage{relsize}									% must be after change to small or selects old size
 \usepackage{rotating}
+\usepackage{calc}										% latex arithmetic
 
 % reduce size of chapter/section titles
@@ -157,24 +158,18 @@
 \newcommand{\CheckPeriod}{\@ifnextchar{.}{}{.\xspace}}
 
-\@ifundefined{eg}{
 \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
 \newcommand{\eg}{\EG\CheckCommaColon}
-}{}%
-\@ifundefined{ie}{
+
 \newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
 \newcommand{\ie}{\IE\CheckCommaColon}
-}{}%
-\@ifundefined{etc}{
+
 \newcommand{\ETC}{\abbrevFont{etc}}
 \newcommand{\etc}{\ETC\CheckPeriod}
-}{}%
-\@ifundefined{etal}{
+
 \newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
 \newcommand{\etal}{\ETAL\CheckPeriod}
-}{}%
-\@ifundefined{viz}{
+
 \newcommand{\VIZ}{\abbrevFont{viz}}
 \newcommand{\viz}{\VIZ\CheckPeriod}
-}{}%
 
 \newenvironment{cquote}{%
@@ -238,5 +233,4 @@
 \usepackage{listings}									% format program code
 \usepackage{lstlang}
-\usepackage{calc}										% latex arithmetic
 
 \newcommand{\LstBasicStyle}[1]{{\lst@basicstyle{#1}}}
@@ -277,7 +271,13 @@
 numberstyle=\footnotesize\sf,			% numbering style
 % replace/adjust listing characters that look bad in sanserif
-literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.75ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
-	{~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
-	{<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
+literate=
+  {-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.75ex}{0.1ex}}}}1
+  {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
+  {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1
+  {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
+  {<-}{$\leftarrow$}2
+  {=>}{$\Rightarrow$}2
+  {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
+defaultdialect={CFA},
 }% lstset
 }% CFAStyle
@@ -308,5 +308,7 @@
 }{}
 % inline code @...@ (at symbol)
+\makeatother
 \lstMakeShortInline@					% single-character for \lstinline
+\makeatletter
 \fi%
 
Index: doc/LaTeXmacros/common.tex
===================================================================
--- doc/LaTeXmacros/common.tex	(revision 0497bd6cecd899f17d5af510c55b6d0c4c887096)
+++ doc/LaTeXmacros/common.tex	(revision cc022a90a37e06f273243026ac3156588f886a70)
@@ -11,6 +11,6 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Sat May  8 08:48:37 2021
-%% Update Count     : 540
+%% Last Modified On : Mon May 31 09:10:49 2021
+%% Update Count     : 546
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -37,5 +37,5 @@
 
 \usepackage{xspace}
-\newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}} % Cforall icon
+\newcommand{\CFAIcon}{\textsf{C\raisebox{\depth}{\rotatebox{180}A}}} % Cforall icon
 \newcommand{\CFA}{\protect\CFAIcon\xspace}				% CFA symbolic name
 \newcommand{\CFL}{\textrm{Cforall}\xspace}				% Cforall non-icon name
@@ -73,7 +73,8 @@
 \setlength{\parindentlnth}{\parindent}
 
-\usepackage{pslatex}					% reduce size of san serif font
-\usepackage{relsize}					% must be after change to small or selects old size
+\usepackage{pslatex}									% reduce size of san serif font
+\usepackage{relsize}									% must be after change to small or selects old size
 \usepackage{rotating}
+\usepackage{calc}										% latex arithmetic
 
 % reduce size of chapter/section titles
@@ -158,24 +159,19 @@
 \newcommand{\CheckPeriod}{\@ifnextchar{.}{}{.\xspace}}
 
-\@ifundefined{eg}{
 \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
 \newcommand{\eg}{\EG\CheckCommaColon}
-}{}%
-\@ifundefined{ie}{
+
 \newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
 \newcommand{\ie}{\IE\CheckCommaColon}
-}{}%
-\@ifundefined{etc}{
+
 \newcommand{\ETC}{\abbrevFont{etc}}
 \newcommand{\etc}{\ETC\CheckPeriod}
-}{}%
-\@ifundefined{etal}{
+
 \newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
 \newcommand{\etal}{\ETAL\CheckPeriod}
-}{}%
-\@ifundefined{viz}{
+
 \newcommand{\VIZ}{\abbrevFont{viz}}
 \newcommand{\viz}{\VIZ\CheckPeriod}
-}{}%
+
 \makeatother
 
@@ -240,5 +236,4 @@
 \usepackage{listings}									% format program code
 \usepackage{lstlang}
-\usepackage{calc}										% latex arithmetic
 
 \makeatletter
@@ -281,7 +276,13 @@
 numberstyle=\footnotesize\sf,			% numbering style
 % replace/adjust listing characters that look bad in sanserif
-literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.75ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
-	{~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
-	{<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
+literate=
+  {-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.75ex}{0.1ex}}}}1
+  {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
+  {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1
+  {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
+  {<-}{$\leftarrow$}2
+  {=>}{$\Rightarrow$}2
+  {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
+defaultdialect={CFA},
 }% lstset
 }% CFAStyle