Index: doc/LaTeXmacros/common.tex
===================================================================
--- doc/LaTeXmacros/common.tex	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ doc/LaTeXmacros/common.tex	(revision fc391936b7b07af9141fde9dac831f9c1f2582d5)
@@ -11,6 +11,6 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Tue Oct 25 22:04:19 2016
-%% Update Count     : 234
+%% Last Modified On : Fri Feb 10 11:32:36 2017
+%% Update Count     : 249
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -210,11 +210,18 @@
 \newcommand{\VPageref}[2][page]{\ifx#1\@empty\else{#1}\nobreakspace\fi\pageref{#2}}
 
+\let\Oldthebibliography\thebibliography
+\renewcommand\thebibliography[1]{
+  \Oldthebibliography{#1}
+  \setlength{\parskip}{0pt}				% reduce vertical spacing between references
+  \setlength{\itemsep}{5pt plus 0.3ex}
+}%
+
 % Go programming language: https://github.com/julienc91/listings-golang/blob/master/listings-golang.sty
 \lstdefinelanguage{Golang}{
-	morekeywords=[1]{package,import,func,type,struct,return,defer,panic, recover,select,var,const,iota,},%
-	morekeywords=[2]{string,uint,uint8,uint16,uint32,uint64,int,int8,int16, int32,int64,
+	morekeywords=[1]{package,import,func,type,struct,return,defer,panic,recover,select,var,const,iota,},%
+	morekeywords=[2]{string,uint,uint8,uint16,uint32,uint64,int,int8,int16,int32,int64,
 		bool,float32,float64,complex64,complex128,byte,rune,uintptr, error,interface},%
-	morekeywords=[3]{map,slice,make,new,nil,len,cap,copy,close,true,false, delete,append,real,imag,complex,chan,},%
-	morekeywords=[4]{for,break,continue,range,goto,switch,case,fallthrough,if, else,default,},%
+	morekeywords=[3]{map,slice,make,new,nil,len,cap,copy,close,true,false,delete,append,real,imag,complex,chan,},%
+	morekeywords=[4]{for,break,continue,range,goto,switch,case,fallthrough,if,else,default,},%
 	morekeywords=[5]{Println,Printf,Error,},%
 	sensitive=true,%
@@ -237,30 +244,4 @@
 }%
 
-\lstset{
-language=Pseudo,
-columns=fullflexible,
-basicstyle=\linespread{0.9}\tt\small,		% reduce line spacing and use typewriter font
-stringstyle=\sf\color{Mahogany},			% use sanserif font
-commentstyle=\itshape\color{OliveGreen},		% green and italic comments
-tabsize=4,							% 4 space tabbing
-xleftmargin=\parindentlnth,				% indent code to paragraph indentation
-extendedchars=true,					% allow ASCII characters in the range 128-255
-escapechar=§,						% escape to latex in CFA code
-mathescape=true,						% allow $...$ LaTeX math escapes in code
-%keepspaces=true,						%
-showstringspaces=false,					% do not show spaces with cup
-showlines=true,						% show blank lines at end of code
-aboveskip=4pt,						% spacing above/below code block
-belowskip=3pt,
-moredelim=**[is][\color{red}]{®}{®},	% red highlighting
-moredelim=**[is][\color{blue}]{ß}{ß},	% blue highlighting
-moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting
-moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
-% replace/adjust listing characters that look bad in sanserif
-literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 {Â©}{{\"u}}1
-	{~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
-	{<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2,
-}%
-
 % CFA programming language, based on ANSI C (with some gcc additions)
 \lstdefinelanguage{CFA}[ANSI]{C}{
@@ -271,38 +252,32 @@
 }%
 
+\newcommand{\CFADefaultStyle}{%
 \lstset{
 language=CFA,
 columns=fullflexible,
-basicstyle=\linespread{0.9}\sf,			% reduce line spacing and use sanserif font
-stringstyle=\tt,						% use typewriter font
-tabsize=4,								% 4 space tabbing
-xleftmargin=\parindentlnth,				% indent code to paragraph indentation
-extendedchars=true,						% allow ASCII characters in the range 128-255
-escapechar=§,							% escape to latex in CFA code
-mathescape=true,						% allow $...$ LaTeX math escapes in code
-%keepspaces=true,						% 
-showstringspaces=false,					% do not show spaces with cup
-showlines=true,							% show blank lines at end of code
-aboveskip=4pt,							% spacing above/below code block
+basicstyle=\linespread{0.9}\sf,							% reduce line spacing and use sanserif font
+stringstyle=\tt,										% use typewriter font
+tabsize=4,												% 4 space tabbing
+xleftmargin=\parindentlnth,								% indent code to paragraph indentation
+extendedchars=true,										% allow ASCII characters in the range 128-255
+escapechar=§,											% LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
+mathescape=true,										% LaTeX math escape in CFA code $...$
+%keepspaces=true,										% 
+showstringspaces=false,									% do not show spaces with cup
+showlines=true,											% show blank lines at end of code
+aboveskip=4pt,											% spacing above/below code block
 belowskip=3pt,
-moredelim=**[is][\color{red}]{®}{®},	% red highlighting
-moredelim=**[is][\color{blue}]{ß}{ß},	% blue highlighting
-moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting
-moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
 % replace/adjust listing characters that look bad in sanserif
 literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
 	{~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
 	{<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2,
-}%
-
-\lstMakeShortInline©	% single-character for \lstinline
-
-
-\let\Oldthebibliography\thebibliography
-\renewcommand\thebibliography[1]{
-  \Oldthebibliography{#1}
-  \setlength{\parskip}{0pt}				% reduce vertical spacing between references
-  \setlength{\itemsep}{5pt plus 0.3ex}
-}%
+moredelim=**[is][\color{red}]{®}{®},					% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
+moredelim=**[is][\color{blue}]{ß}{ß},					% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
+moredelim=**[is][\color{OliveGreen}]{¢}{¢}, 			% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
+moredelim=[is][\lstset{keywords={}}]{¶}{¶}, 			% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
+}% lstset
+% inline code ©...© (copyright symbol) emacs: C-q M-)
+\lstMakeShortInline©									% single-character for \lstinline
+}%CFADefaultStyle
 
 % Local Variables: %
