+++ /dev/null
---- ion3.orig/doc/artikel3.hva
-+++ ion3/doc/artikel3.hva
-@@ -0,0 +1 @@
-+\input{article.hva}
---- ion3.orig/doc/gpl.tex
-+++ ion3/doc/gpl.tex
-@@ -1,21 +1,29 @@
- \xchapter{The GNU General Public License}
-
- \begin{center}
-+%BEGIN LATEX
- {\parindent 0in
-+%END LATEX
-
- Version 2, June 1991
-
- Copyright \copyright\ 1989, 1991 Free Software Foundation, Inc.
-
-+%BEGIN LATEX
- \bigskip
-+%END LATEX
-
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-+%BEGIN LATEX
- \bigskip
-+%END LATEX
-
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-+%BEGIN LATEX
- }
-+%END LATEX
- \end{center}
-
- \begin{center}
---- ion3.orig/doc/ionconf.tex
-+++ ion3/doc/ionconf.tex
-@@ -56,17 +56,21 @@
- \markboth{\MakeUppercase{List of functions}}%
- {\MakeUppercase{List of functions}}%
-
--%begin{latexonly}
-+\begin{latexonly}
- \makeatletter
- \def\fnlisti#1{\@dottedtocline{1}{0em}{1.5em}{\lstinline!#1!}{\pageref{fn:#1}}}
- {\parskip\z@\input{fnlist}}
- \makeatother
--%end{latexonly}
-+\end{latexonly}
-
-+%BEGIN LATEX
- \begin{htmlonly}
-+%END LATEX
- \newcommand{\fnlisti}[1]{\fnref{#1}\\}
- \input{fnlist}
-+%BEGIN LATEX
- \end{htmlonly}
-+%END LATEX
-
- \printindex
-
---- ion3.orig/doc/macros.tex
-+++ ion3/doc/macros.tex
-@@ -14,6 +14,25 @@
- \usepackage[a4paper]{geometry}
- \usepackage{calc}
-
-+% hevea style
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+
-+%BEGIN LATEX
-+\begin{htmlonly}
-+%END LATEX
-+
-+\remakesection
-+ {\chapter}{-1}{chapter}
-+ {\@open{H1}{}}{\thechapter}{\quad}{\@close{H1}}
-+\setcounter{tocdepth}{3}
-+\setcounter{indexcols}{1}
-+\renewcommand{\@table@attributes}{CELLSPACING=10 CELLPADDING=0}
-+
-+%BEGIN LATEX
-+\end{htmlonly}
-+%END LATEX
-+
-+
- % URL settings
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-@@ -23,7 +42,7 @@
- % listings package
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--%begin{latexonly}
-+%BEGIN LATEX
- \usepackage{listings}
-
- \lstset{
-@@ -33,7 +52,7 @@
- alsoletter={",},
- alsoother={\_},
- }
--%end{latexonly}
-+%END LATEX
-
- % Some markup
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-@@ -44,7 +63,7 @@
- \newcommand{\spec}[1]{#1}
- \newcommand{\indextype}[1]{\index{#1@\type{#1}}}
-
--%begin{latexonly}
-+%BEGIN LATEX
- \newcommand{\key}[1]{\mbox{\textbf{#1}}}
- \newcommand{\code}[1]{\lstinline!#1!}
- \newcommand{\var}[1]{\lstinline!#1!}
-@@ -54,28 +73,33 @@
- \newcommand{\fnrefx}[2]{\hyperlink{fn:#1.#2}{\code{#2}}}
- \newcommand{\fnref}[1]{\hyperlink{fn:#1}{\code{#1}}}
- \newcommand{\myhref}[2]{\hyperlink{#1}{#2}}
-+%END LATEX
-
--%end{latexonly}
-+%BEGIN LATEX
- \begin{htmlonly}
--
-+%END LATEX
- \newcommand{\key}[1]{\textbf{#1}}
- \newcommand{\code}[1]{\texttt{#1}}
- \newcommand{\var}[1]{\texttt{#1}}
- \newcommand{\command}[1]{\texttt{#1}}
-
--\newcommand{\hyperlabel}[1]{\label{#1}}
--\newcommand{\fnref}[1]{\htmlref{\texttt{#1}}{fn:#1}}
--\newcommand{\fnrefx}[2]{\htmlref{\texttt{#2}}{fn:#1.#2}}
--\newcommand{\myhref}[2]{\htmlref{#2}{#1}}
-+% docode is not present nor needed in hevea
-+\newcommand{\docode}{}
-
-+\newcommand{\hyperlabel}[1]{\label{#1}}
-+\newcommand{\fnref}[1]{\aname{fn:#1}{\texttt{#1}}}
-+\newcommand{\fnrefx}[2]{\aname{fn:#1.#2}{\texttt{#1}}}
-+\newcommand{\myhref}[2]{\ahref{#2}{#1}}
-+%BEGIN LATEX
- \end{htmlonly}
-+%END LATEX
-
- \newcommand{\tabhead}[1]{\hline #1 \\ \hline}
-
- % function tables
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--%begin{latexonly}
-+%BEGIN LATEX
-
- \newcommand{\funclistlabel}[1]{#1\hfill}
- \newenvironment{function}{
-@@ -96,8 +120,11 @@
- \end{list}
- }
-
--%end{latexonly}
-+%END LATEX
-+
-+%BEGIN LATEX
- \begin{htmlonly}
-+%END LATEX
-
- \newenvironment{function}{
- \begin{description}
-@@ -105,7 +132,9 @@
- \end{description}
- }
-
-+%BEGIN LATEX
- \end{htmlonly}
-+%END LATEX
-
-
- \newcommand{\synopsis}[1]{
-@@ -128,7 +157,7 @@
- % While rapport3/artikel3 are otherwise nice classes,
- % itemize looks awful.
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--%begin{latexonly}
-+%BEGIN LATEX
- \makeatletter
- \renewenvironment{itemize}{%
- \ifnum \@itemdepth >3
-@@ -148,4 +177,4 @@
- \fi}
- {\global\@ignoretrue \endlist}
- \makeatletter
--%end{latexonly}
-+%END LATEX
---- ion3.orig/doc/Makefile
-+++ ion3/doc/Makefile
-@@ -1,10 +1,13 @@
- # Settings
- ######################################
-
--TOPDIR=../ion-3
-+TOPDIR=..
-
- include $(TOPDIR)/build/system-inc.mk
-
-+HEVEA=hevea
-+HACHA=hacha
-+
- L2H=latex2html -show_section_numbers -short_index -local_icons -noaddress \
- -up_url http://iki.fi/tuomov/ion/ -up_title "Ion homepage" -nofootnode\
- ## -style greyviolet.css
-@@ -58,8 +61,11 @@
- makeindex ionconf.idx
- latex ionconf
-
--ionconf-html:
-- $(L2H) -split 3 ionconf
-+ionconf-html:
-+ $(HEVEA) -fix ionconf 2>&1 | grep -v 'occuring outside math mode'
-+ rm -rf ionconf
-+ mkdir ionconf
-+ cd ionconf && $(HACHA) ../ionconf.html
-
- fntexes: $(FNTEXES)
-
-@@ -97,6 +103,7 @@
- rm -f $(FNTEXES) fnlist.tex
- rm -f *.aux *.toc *.log
- rm -f *.idx *.ild *.ilg *.ind
-+ rm -f *.haux *.hind *.htoc *.html .log
-
- realclean: clean
- rm -f *.ps *.pdf *.dvi
---- ion3.orig/doc/rapport3.hva
-+++ ion3/doc/rapport3.hva
-@@ -0,0 +1 @@
-+\input{report.hva}