--- a/doc/manual/manual_tex4ht.cfg	Mon Mar 07 01:45:36 2016 +0100
+++ b/doc/manual/manual_tex4ht.cfg	Sun Mar 13 21:08:59 2016 +0100
@@ -21,7 +21,7 @@
 % that next-links recurses.
 % Use b=1 for outputting one big html page. b=2 would partition by sections, b=3
 % by sections and subsections, and so on...
-\Preamble{html,info,index=2,1,next,pic-tabular,charset="utf-8",p-width,pic-align}
+\Preamble{html,info,index=2,1,pic-tabular,pic-align,charset="utf-8",p-width}
 % For manual partitioning we use b=1 above, then \CutAt
 %\CutAt{subsubsection,subsection,likesubsection,section,likesection,part}
 \CutAt{section}
@@ -76,6 +76,59 @@
 	\unless\ifnum \c=#1 \repeat
 }
 
+% Define layout of tables - for some reason tabular* renders fine
+% when pic-tabular is *not* used. When it is, it converts tabular
+% (without the asterisk) into pictures, but also changes the rendering
+% of tabular*, which we then mend with the code below. Not sure if
+% this is just a hack around a tex4ht bug, but it nicely lets us
+% pick which table should be a picture or not.
+\Configure{tabular}
+	{\HCode{<table>}}
+	{\HCode{</table>}}
+	{\HCode{<tr>}} %{\HCode{<tr class="row-\HRow">}}
+	{\HCode{</tr>}}
+	{\HCode{<td \ifnum \HMultispan>1 colspan="\HMultispan"\fi >}}
+	{\HCode{</td>}}
+
+% @@@ Did not get that below to work, and don't understand it, either.
+% @@@ Default output is ok, so we're simply changing class name in
+% @@@ instead of this postprocessing. See Makefile.
+%% Listings, so that caption below isn't in same block
+%\def\listingLineReset{\newcount\lstlineno}
+%\def\listingLine{\advance\lstlineno by 1}
+%\ConfigureEnv{lstlisting}{\listingLineReset\Tg<div class="ttDiv">}{\Tg</div>}{}{}
+%\Configure{listings}{}{}{}{\ifnum \lstlineno>0 \Tg<br> \fi \listingLine}
+
+% Make listing/table captions nicer.
+\Configure{caption}
+	{\Tg<div class="caption" style="margin-top:-1em;text-align:right;color:\#A0A0A0">}
+	{\HCode{<span class="id">}}
+	{\HCode{</span>: <span class="content">}}
+	{\HCode{</div>}}
+
+% All kinds of style setting for fonts, as we don't use the autogenerated
+% css file, but dyncall's website one.
+\Configure{texttt}{}{}
+\Configure{textit}{}{}
+\Configure{textrm}{}{}
+\Configure{textup}{}{}
+\Configure{textsl}{}{}
+\Configure{textsf}{}{}
+\Configure{textbf}{}{}
+\Configure{textsc}{}{}
+\Configure{emph}{\Tg<em>}{\Tg</em>}
+
+
+%\lstset{ language=C, basicstyle=\ttfamily, numbers=left,
+%numberstyle=\tiny, numbersep=10pt, showstringspaces=false}
+
+%http://www.itisnotoverengineering.com/2013/06/syntax-highlighting-with-tex4ht.html
+
+% Simplest possible paragraphs
+\Configure{HtmlPar}{\EndP\Tg<p >}{\EndP\Tg<p>}{\HCode{</p>\Hnewline}}{\HCode{</p>\Hnewline}}
+
+
+
 % On site navigation texts
 \Configure{crosslinks}%
 {}%left delimiter