Index: doc/uC++toCFA/Makefile
===================================================================
--- doc/uC++toCFA/Makefile	(revision 4da914224e5b446785ef95fd5e05cba53d2518f7)
+++ doc/uC++toCFA/Makefile	(revision 2b6db0379d89499bcfb8fbfbc7cbd8da6e4b0e0d)
@@ -56,6 +56,6 @@
 	dvips ${Build}/$< -o $@
 
-${BASE}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
-		${Macros}/common.sty ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib build/version | ${Build}
+${BASE}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${Macros}/common.tex ${Macros}/common.sty \
+		${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib build/version | ${Build}
 	# Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
 	if [ ! -r ${basename $@}.ind ] ; then touch ${Build}/${basename $@}.ind ; fi
Index: doc/uC++toCFA/uC++toCFA.tex
===================================================================
--- doc/uC++toCFA/uC++toCFA.tex	(revision 4da914224e5b446785ef95fd5e05cba53d2518f7)
+++ doc/uC++toCFA/uC++toCFA.tex	(revision 2b6db0379d89499bcfb8fbfbc7cbd8da6e4b0e0d)
@@ -11,6 +11,6 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Thu Jan 11 14:46:14 2024
-%% Update Count     : 5942
+%% Last Modified On : Sat Apr 13 11:11:39 2024
+%% Update Count     : 5969
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -141,19 +141,18 @@
 \CFA uses parametric polymorphism and allows overloading of variables and routines:
 \begin{cfa}
-int i;  char i;  double i;		// overload name i
+int i;  char i;  double i;	$\C[2in]{// overload name i}$
 int i();  double i();  char i();
-i += 1;			$\C[1.5in]{// int i}$
-i += 1.0;		$\C{// double i}$
-i += 'a'; 		$\C{// char i}$
-int j = i();	$\C{// int i()}$
-double j = i();	$\C{// double i();}$
-char j = i();	$\C{// char i()}\CRT$
+i += 1;						$\C{// int i}$
+i += 1.0;					$\C{// double i}$
+i += 'a'; 					$\C{// char i}$
+int j = i();				$\C{// int i()}$
+double j = i();				$\C{// double i();}$
+char j = i();				$\C{// char i()}\CRT$
 \end{cfa}
 \CFA has rebindable references.
-
-\begin{cquote}
-\begin{tabular}{l|l}
-\multicolumn{2}{l}{\lstinline{	int x = 1, y = 2, * p1x = &x, * p1y = &y, ** p2i = &p1x,}} \\
-\multicolumn{2}{l}{\lstinline{\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ && r1x = x, & r1y = y, && r2i = r1x;}} \\
+\begin{cquote}
+\begin{tabular}{@{}l|l@{}}
+\multicolumn{2}{@{}l}{\lstinline{	int x = 1, y = 2, * p1x = &x, * p1y = &y, ** p2i = &p1x,}} \\
+\multicolumn{2}{@{}l}{\lstinline{\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ && r1x = x, & r1y = y, && r2i = r1x;}} \\
 \begin{uC++}
 **p2i = 3;
@@ -201,7 +200,6 @@
 
 \CFA output streams automatically separate values and insert a newline at the end of the print.
-
-\begin{cquote}
-\begin{tabular}{l|l}
+\begin{cquote}
+\begin{tabular}{@{}l|l@{}}
 \begin{uC++}
 #include <@iostream@>
@@ -226,5 +224,5 @@
 
 \begin{cquote}
-\begin{tabular}{l|l}
+\begin{tabular}{@{}l|l@{}}
 \begin{uC++}
 for ( @;;@ ) { ... }  /  while ( @true@ ) { ... }
@@ -280,5 +278,5 @@
 Currently, \CFA uses macros @ExceptionDecl@ and @ExceptionInst@ to declare and instantiate an exception.
 \begin{cquote}
-\begin{tabular}{l|ll}
+\begin{tabular}{@{}l|ll@{}}
 \begin{uC++}
 
@@ -321,5 +319,5 @@
 
 \begin{cquote}
-\begin{tabular}{l|ll}
+\begin{tabular}{@{}l|ll@{}}
 \begin{uC++}
 
@@ -360,5 +358,5 @@
 
 \begin{cquote}
-\begin{tabular}{l|l}
+\begin{tabular}{@{}l|l@{}}
 \begin{uC++}
 struct S {
@@ -383,6 +381,6 @@
 
 \begin{cquote}
-\begin{tabular}{l|l}
-\multicolumn{2}{l}{\lstinline{string s1, s2;}} \\
+\begin{tabular}{@{}l|l@{}}
+\multicolumn{2}{@{}l@{}}{\lstinline{string s1, s2;}} \\
 \begin{uC++}
 s1 = "hi";
@@ -425,5 +423,5 @@
 
 \begin{cquote}
-\begin{tabular}{l|l}
+\begin{tabular}{@{}l|l@{}}
 \begin{uC++}
 struct S {
@@ -456,5 +454,5 @@
 
 \begin{cquote}
-\begin{tabular}{l|l}
+\begin{tabular}{@{}l|l@{}}
 \begin{uC++}
 
@@ -493,5 +491,5 @@
 
 \begin{cquote}
-\begin{tabular}{l|ll}
+\begin{tabular}{@{}l|ll@{}}
 \begin{uC++}
 
@@ -532,5 +530,5 @@
 
 \begin{cquote}
-\begin{tabular}{l|ll}
+\begin{tabular}{@{}l|ll@{}}
 \begin{uC++}
 
@@ -567,5 +565,5 @@
 
 \begin{cquote}
-\begin{tabular}{l|ll}
+\begin{tabular}{@{}l|ll@{}}
 \begin{uC++}
 
@@ -604,5 +602,5 @@
 
 \begin{cquote}
-\begin{tabular}{l|ll}
+\begin{tabular}{@{}l|ll@{}}
 \begin{uC++}