Index: doc/LaTeXmacros/common.tex
===================================================================
--- doc/LaTeXmacros/common.tex	(revision 3bff885e5af1caaa28df2a7dfaffbd17d19e68d4)
+++ doc/LaTeXmacros/common.tex	(revision bd9bcc88e067ad7d0537b250bbdd05c0bf27948d)
@@ -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 : Tue Oct 25 22:04:19 2016
+%% Update Count     : 234
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -210,18 +210,11 @@
 \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,%
@@ -244,4 +237,30 @@
 }%
 
+\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}{
@@ -252,32 +271,38 @@
 }%
 
-\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=§,											% 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
+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
 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,
-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
+}%
+
+\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}
+}%
 
 % Local Variables: %
Index: doc/user/user.tex
===================================================================
--- doc/user/user.tex	(revision 3bff885e5af1caaa28df2a7dfaffbd17d19e68d4)
+++ doc/user/user.tex	(revision bd9bcc88e067ad7d0537b250bbdd05c0bf27948d)
@@ -11,9 +11,17 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Sun Feb 19 09:29:10 2017
-%% Update Count     : 1376
+%% Last Modified On : Tue Oct 25 23:03:59 2016
+%% Update Count     : 1357
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % requires tex packages: texlive-base texlive-latex-base tex-common texlive-humanities texlive-latex-extra texlive-fonts-recommended
+
+% inline code ©...© (copyright symbol) emacs: C-q M-)
+% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
+% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
+% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
+% LaTex escape §...§ (section symbol) emacs: C-q M-'
+% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
+% math escape $...$ (dollar symbol)
 
 \documentclass[twoside,11pt]{article}
@@ -50,18 +58,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\CFADefaultStyle										% use default CFA format-style
-
-% inline code ©...© (copyright symbol) emacs: C-q M-)
-% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
-% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
-% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
-% LaTex escape §...§ (section symbol) emacs: C-q M-'
-% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
-% math escape $...$ (dollar symbol)
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 % Names used in the document.
-\newcommand{\Version}{\input{version}}
+
+\newcommand{\Version}{1.0.0}
 \newcommand{\CS}{C\raisebox{-0.9ex}{\large$^\sharp$}\xspace}
 
@@ -343,7 +340,6 @@
 
 \item
-\Indexc{__CFA__}\index{preprocessor variables!__CFA__@©__CFA__©},
-\Indexc{__CFORALL__}\index{preprocessor variables!__CFORALL__@©__CFORALL__©} and
-\Indexc{__cforall}\index{preprocessor variables!__cforall@©__cforall©}
+\Indexc{__CFA__}\index{preprocessor variables!__CFA__@©__CFA__©} and
+\Indexc{__CFORALL__}\index{preprocessor variables!__CFORALL__@©__CFORALL__©}
 are always available during preprocessing and have no value.
 \end{description}
