Index: doc/LaTeXmacros/common.tex
===================================================================
--- doc/LaTeXmacros/common.tex	(revision 9e620b6aabc834788c9b5a120703e5f7127137b6)
+++ doc/LaTeXmacros/common.tex	(revision 7cc532bd7bf50a99daef9129a4f15c7b523c7919)
@@ -11,6 +11,6 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Wed Sep 23 21:21:55 2020
-%% Update Count     : 454
+%% Last Modified On : Mon Oct  5 09:34:46 2020
+%% Update Count     : 464
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -251,7 +251,6 @@
 \makeatother
 
-\newcommand{\CFADefaults}{%
+\newcommand{\CFAStyle}{%
 \lstset{
-language=CFA,
 columns=fullflexible,
 basicstyle=\linespread{0.9}\sf,			% reduce line spacing and use sanserif font
@@ -272,8 +271,8 @@
 	{<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
 }% lstset
-}% CFADefaults
-
-\ifdefined\CFALatin%
-\lstnewenvironment{cfa}[1][]{\CFADefaults
+}% CFAStyle
+
+\ifdefined\CFALatin% extra Latin-1 escape characters
+\lstnewenvironment{cfa}[1][]{
 \lstset{
 language=CFA,
@@ -289,15 +288,10 @@
 % inline code ©...© (copyright symbol) emacs: C-q M-)
 \lstMakeShortInline©					% single-character for \lstinline
-\else% extra Latin-1 escape characters
+\else% regular ASCI characters
+\lstnewenvironment{cfa}[1][]{
 \lstset{
 language=CFA,
 escapechar=\$,							% LaTeX escape in CFA code
-moredelim=**[is][\color{red}]{@}{@},	% red highlighting `...` (backtick symbol)
-}% lstset
-\lstnewenvironment{cfa}[1][]{\CFADefaults
-\lstset{
-language=CFA,
-escapechar=\$,							% LaTeX escape in CFA code
-moredelim=**[is][\color{red}]{@}{@},	% red highlighting `...` (backtick symbol)
+moredelim=**[is][\color{red}]{@}{@},	% red highlighting @...@
 }% lstset
 \lstset{#1}