Index: doc/LaTeXmacros/common.tex
===================================================================
--- doc/LaTeXmacros/common.tex	(revision 93afb9651196fc4851e5fbfb2fe08f22c435275f)
+++ doc/LaTeXmacros/common.tex	(revision f92aa323eb5582c8fbbb703c08db45bad1558125)
@@ -11,6 +11,6 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Fri Feb 10 11:32:36 2017
-%% Update Count     : 249
+%% Last Modified On : Wed Apr  5 23:19:42 2017
+%% Update Count     : 255
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -256,5 +256,5 @@
 }%
 
-\newcommand{\CFADefaultStyle}{%
+\newcommand{\CFADefaults}{%
 \lstset{
 language=CFA,
@@ -267,5 +267,5 @@
 escapechar=§,											% LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
 mathescape=true,										% LaTeX math escape in CFA code $...$
-%keepspaces=true,										%
+keepspaces=true,										%
 showstringspaces=false,									% do not show spaces with cup
 showlines=true,											% show blank lines at end of code
@@ -281,7 +281,15 @@
 moredelim=[is][\lstset{keywords={}}]{¶}{¶}, 			% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
 }% lstset
+}% CFADefaults
+\newcommand{\CFAStyle}{%
+\CFADefaults
 % inline code ©...© (copyright symbol) emacs: C-q M-)
 \lstMakeShortInline©									% single-character for \lstinline
-}%CFADefaultStyle
+}% CFAStyle
+
+\lstnewenvironment{cfa}[1][]
+{\CFADefaults\lstset{#1}}
+{}
+
 
 % Local Variables: %
