Tried to build libxml2-2.2.5
Automake is a fucking piece of ugly shit full of tricks and without
any kind of sensible documentation or logic :-(((((((((
Daniel, pissed !
diff --git a/ChangeLog b/ChangeLog
index 2a3d035..f9ea27d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Oct  6 12:58:04 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* configure.in Makefile.am: 2.2.5, ship the include in an
+	  include/libxml subdirectory, use symlinks when using CVS
+	* testSAX.c: fixed small bug
+	* testXPath.c: changed the way testfiles are parsed
+	* debugXML.c: same kind of cleanup when parsing an argument expression
+	  XPath/XPointers can have blanks embedded
+	* xpath.[ch]: more cleanup, reorgs for XPointer work
+	* parserInternals.c parser.c HTMLparser.c: fixed wrong include
+	* win32/README.MSDev win32/libxml2/libxml2.dsp: Windows stuff
+
 Thu Oct  5 18:13:15 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* debugXML.c testXPath.c xpath.[ch]: got pissed by some nastyness
diff --git a/HTMLparser.c b/HTMLparser.c
index acb13b4..3212ce5 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -45,7 +45,7 @@
 #include <libxml/valid.h>
 #include <libxml/parserInternals.h>
 #include <libxml/xmlIO.h>
-#include "xml-error.h"
+#include <libxml/xml-error.h>
 
 #define HTML_MAX_NAMELEN 1000
 #define HTML_PARSER_BIG_BUFFER_SIZE 1000
diff --git a/Makefile.am b/Makefile.am
index cecc284..13a0fd8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = doc
 
-INCLUDES = -I@srcdir@ @Z_CFLAGS@ @CORBA_CFLAGS@ 
+INCLUDES = -I@srcdir@/include @Z_CFLAGS@ @CORBA_CFLAGS@ 
 
 noinst_PROGRAMS=testSAX testHTML testXPath testURI
 
@@ -35,27 +35,28 @@
 		nanohttp.c \
 		nanoftp.c
 
-xmlincdir = $(includedir)/libxml
+xmlincdir = $(srcdir)/include/libxml
+
 xmlinc_HEADERS = \
-		SAX.h \
-		entities.h \
-		encoding.h \
-		parser.h \
-		parserInternals.h \
-		xml-error.h \
-		HTMLparser.h \
-		HTMLtree.h \
-		debugXML.h \
-		tree.h \
-		xpath.h \
-		xmlIO.h \
-		xmlmemory.h \
-		nanohttp.h \
-		nanoftp.h \
-		uri.h \
-		valid.h \
-		xlink.h \
-		xmlversion.h
+		$(xmlincdir)/SAX.h \
+		$(xmlincdir)/entities.h \
+		$(xmlincdir)/encoding.h \
+		$(xmlincdir)/parser.h \
+		$(xmlincdir)/parserInternals.h \
+		$(xmlincdir)/xml-error.h \
+		$(xmlincdir)/HTMLparser.h \
+		$(xmlincdir)/HTMLtree.h \
+		$(xmlincdir)/debugXML.h \
+		$(xmlincdir)/tree.h \
+		$(xmlincdir)/xpath.h \
+		$(xmlincdir)/xmlIO.h \
+		$(xmlincdir)/xmlmemory.h \
+		$(xmlincdir)/nanohttp.h \
+		$(xmlincdir)/nanoftp.h \
+		$(xmlincdir)/uri.h \
+		$(xmlincdir)/valid.h \
+		$(xmlincdir)/xlink.h \
+		$(xmlincdir)/xmlversion.h
 
 DEPS = $(top_builddir)/libxml.la
 LDADDS = $(top_builddir)/libxml.la @Z_LIBS@ @M_LIBS@
@@ -356,7 +357,8 @@
 confexec_DATA = xmlConf.sh
 EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4 \
              example/Makefile.am example/gjobread.c example/gjobs.xml \
-	     $(man_MANS) libxml-2.0.pc.in
+	     $(man_MANS) libxml-2.0.pc.in include/libxml/*.h.in \
+	     win32/README.MSDev win32/libxml2/libxml2.dsp
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libxml-2.0.pc
diff --git a/configure.in b/configure.in
index 1473ad0..22e98d9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.2)
-AC_INIT(entities.h)
+AC_INIT(entities.c)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=2
-LIBXML_MICRO_VERSION=4
+LIBXML_MICRO_VERSION=5
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
 
@@ -116,7 +116,7 @@
   [M_LIBS="-lm"; AC_DEFINE(HAVE_ISINF)]))
 
 XML_LIBDIR='-L${libdir}'
-XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
+XML_INCLUDEDIR='-I${srcdir}/include -I${includedir}/libxml -I${includedir}'
 XML_LIBS="-lxml $Z_LIBS $M_LIBS $LIBS"
 
 dnl
@@ -295,16 +295,22 @@
 AC_SUBST(RDL_LIBS)
 
 dnl
-dnl create the libxml link needed to get dependencies right
+dnl create the libxml and include links needed to get dependencies right
 dnl
-if test -f $srcdir/libxml 
+if test ! -d $srcdir/include/libxml
 then
-    rm -f $srcdir/libxml libxml
+    rm -f $srcdir/include
+    rm -f $srcdir/libxml
+    (cd $srcdir ; ln -s . include)
     (cd $srcdir ; ln -s . libxml)
-    (ln -s . libxml)
-else
-    (cd $srcdir ; rm -f libxml ; ln -s . libxml)
-    (rm -f libxml ; ln -s . libxml)
 fi
-AC_OUTPUT(libxml.spec Makefile doc/Makefile example/Makefile xmlversion.h xml-config win32config.h libxml-2.0.pc)
+if test ! -e include/libxml
+then
+    rm -f include
+    rm -f libxml
+    (ln -s $srcdir/include include)
+    (ln -s $srcdir/include/libxml libxml)
+fi
+
+AC_OUTPUT(libxml.spec Makefile doc/Makefile example/Makefile include/libxml/xmlversion.h xml-config include/libxml/win32config.h libxml-2.0.pc)
 
diff --git a/debugXML.c b/debugXML.c
index 13180a7..3b34c3e 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -572,7 +572,8 @@
 	    return;
 	default:
 	    fprintf(output, shift);
-	    fprintf(output, "NODE_%d\n", node->type);
+	    fprintf(output, "NODE_%d !!!\n", node->type);
+	    return;
     }
     if (node->doc == NULL) {
         fprintf(output, shift);
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dcb86ac..aaf6530 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,6 +18,7 @@
 
 scan:
 	@(if [ -L $(DOC_SOURCE_DIR)/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/libxml ; fi)
+	@(if [ -L $(DOC_SOURCE_DIR)/include ] ; then rm -f $(DOC_SOURCE_DIR)/libxml ; fi)
 	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h"
 
 templates: scan
diff --git a/doc/html/gnome-xml-debugxml.html b/doc/html/gnome-xml-debugxml.html
index 8c14c18..d950dab 100644
--- a/doc/html/gnome-xml-debugxml.html
+++ b/doc/html/gnome-xml-debugxml.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15662"
+NAME="AEN15895"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15665"
+NAME="AEN15898"
 ></A
 ><H2
 >Synopsis</H2
@@ -315,7 +315,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15712"
+NAME="AEN15945"
 ></A
 ><H2
 >Description</H2
@@ -325,14 +325,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15715"
+NAME="AEN15948"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15717"
+NAME="AEN15950"
 ></A
 ><H3
 ><A
@@ -414,7 +414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15737"
+NAME="AEN15970"
 ></A
 ><H3
 ><A
@@ -514,7 +514,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15761"
+NAME="AEN15994"
 ></A
 ><H3
 ><A
@@ -614,7 +614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15785"
+NAME="AEN16018"
 ></A
 ><H3
 ><A
@@ -714,7 +714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15809"
+NAME="AEN16042"
 ></A
 ><H3
 ><A
@@ -814,7 +814,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15833"
+NAME="AEN16066"
 ></A
 ><H3
 ><A
@@ -914,7 +914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15857"
+NAME="AEN16090"
 ></A
 ><H3
 ><A
@@ -996,7 +996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15877"
+NAME="AEN16110"
 ></A
 ><H3
 ><A
@@ -1078,7 +1078,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15897"
+NAME="AEN16130"
 ></A
 ><H3
 ><A
@@ -1160,7 +1160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15917"
+NAME="AEN16150"
 ></A
 ><H3
 ><A
@@ -1242,7 +1242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15937"
+NAME="AEN16170"
 ></A
 ><H3
 ><A
@@ -1324,7 +1324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15957"
+NAME="AEN16190"
 ></A
 ><H3
 ><A
@@ -1397,7 +1397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15975"
+NAME="AEN16208"
 ></A
 ><H3
 ><A
@@ -1431,33 +1431,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15980"
+NAME="AEN16213"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLCTXTPTR"
 ></A
 >xmlShellCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlShellCtxt *xmlShellCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15985"
+NAME="AEN16217"
 ></A
 ><H3
 ><A
@@ -1593,7 +1580,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16018"
+NAME="AEN16250"
 ></A
 ><H3
 ><A
@@ -1657,7 +1644,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1674,7 +1661,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the output buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1691,7 +1678,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line reading function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1708,7 +1695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the output FILE*</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-encoding.html b/doc/html/gnome-xml-encoding.html
index eb05acb..4965c1c 100644
--- a/doc/html/gnome-xml-encoding.html
+++ b/doc/html/gnome-xml-encoding.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15196"
+NAME="AEN15431"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15199"
+NAME="AEN15434"
 ></A
 ><H2
 >Synopsis</H2
@@ -300,7 +300,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15241"
+NAME="AEN15476"
 ></A
 ><H2
 >Description</H2
@@ -310,14 +310,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15244"
+NAME="AEN15479"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15246"
+NAME="AEN15481"
 ></A
 ><H3
 ><A
@@ -368,7 +368,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15251"
+NAME="AEN15486"
 ></A
 ><H3
 ><A
@@ -495,7 +495,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15281"
+NAME="AEN15516"
 ></A
 ><H3
 ><A
@@ -622,7 +622,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15311"
+NAME="AEN15546"
 ></A
 ><H3
 ><A
@@ -656,33 +656,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15316"
+NAME="AEN15551"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCODINGHANDLERPTR"
 ></A
 >xmlCharEncodingHandlerPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15321"
+NAME="AEN15555"
 ></A
 ><H3
 ><A
@@ -713,7 +700,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15327"
+NAME="AEN15561"
 ></A
 ><H3
 ><A
@@ -742,7 +729,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15333"
+NAME="AEN15567"
 ></A
 ><H3
 ><A
@@ -795,7 +782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlCharEncodingHandlerPtr handler block</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -805,7 +792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15349"
+NAME="AEN15583"
 ></A
 ><H3
 ><A
@@ -862,7 +849,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string describing the char encoding.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -877,7 +864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the handler or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -887,7 +874,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15370"
+NAME="AEN15604"
 ></A
 ><H3
 ><A
@@ -964,7 +951,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15389"
+NAME="AEN15623"
 ></A
 ><H3
 ><A
@@ -1026,7 +1013,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1043,7 +1030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1058,7 +1045,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1068,7 +1055,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15414"
+NAME="AEN15648"
 ></A
 ><H3
 ><A
@@ -1123,7 +1110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1138,7 +1125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1148,7 +1135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15434"
+NAME="AEN15668"
 ></A
 ><H3
 ><A
@@ -1198,7 +1185,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1213,7 +1200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not found the original name otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1223,7 +1210,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15453"
+NAME="AEN15687"
 ></A
 ><H3
 ><A
@@ -1251,7 +1238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15459"
+NAME="AEN15693"
 ></A
 ><H3
 ><A
@@ -1306,7 +1293,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1321,8 +1308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->one of the XML_CHAR_ENCODING_... values or XML_CHAR_ENCODING_NONE
-if not recognized.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1332,7 +1318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15479"
+NAME="AEN15713"
 ></A
 ><H3
 ><A
@@ -1390,7 +1376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1405,7 +1391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the canonical name for the given encoding</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1415,7 +1401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15500"
+NAME="AEN15734"
 ></A
 ><H3
 ><A
@@ -1470,8 +1456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the first bytes of the XML entity, must be at least
-4 bytes long.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1488,7 +1473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1503,7 +1488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->one of the XML_CHAR_ENCODING_... values.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1513,7 +1498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15524"
+NAME="AEN15758"
 ></A
 ><H3
 ><A
@@ -1578,7 +1563,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> Pointer to putative utf-8 encoded string.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1593,12 +1578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> true if <TT
-CLASS="PARAMETER"
-><I
->utf</I
-></TT
-> is valid.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1608,7 +1588,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15546"
+NAME="AEN15779"
 ></A
 ><H3
 ><A
@@ -1679,7 +1659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1696,7 +1676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1713,7 +1693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1728,10 +1708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written if success, or 
--1 general error
--2 if the transcoding fails (for *in is not valid utf8 string or
-the result of transformation can't fit into the encoding we want), or</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1741,7 +1718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15577"
+NAME="AEN15810"
 ></A
 ><H3
 ><A
@@ -1802,7 +1779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1819,7 +1796,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1836,7 +1813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1851,10 +1828,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written if success, or 
--1 general error
--2 if the transcoding fails (for *in is not valid utf8 string or
-the result of transformation can't fit into the encoding we want), or</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1864,7 +1838,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15607"
+NAME="AEN15840"
 ></A
 ><H3
 ><A
@@ -1926,7 +1900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1943,7 +1917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1960,7 +1934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1975,10 +1949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written if success, or 
--1 general error
--2 if the transcoding fails (for *in is not valid utf8 string or
-the result of transformation can't fit into the encoding we want), or</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1988,7 +1959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15637"
+NAME="AEN15870"
 ></A
 ><H3
 ><A
@@ -2041,7 +2012,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2056,7 +2027,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if success, or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html
index df39d26..dc174b5 100644
--- a/doc/html/gnome-xml-entities.html
+++ b/doc/html/gnome-xml-entities.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN6862"
+NAME="AEN6837"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN6865"
+NAME="AEN6840"
 ></A
 ><H2
 >Synopsis</H2
@@ -382,7 +382,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6933"
+NAME="AEN6908"
 ></A
 ><H2
 >Description</H2
@@ -392,14 +392,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6936"
+NAME="AEN6911"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6938"
+NAME="AEN6913"
 ></A
 ><H3
 ><A
@@ -432,7 +432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6943"
+NAME="AEN6918"
 ></A
 ><H3
 ><A
@@ -488,33 +488,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6948"
+NAME="AEN6923"
 ></A
 ><H3
 ><A
 NAME="XMLENTITYPTR"
 ></A
 >xmlEntityPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlEntity *xmlEntityPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6953"
+NAME="AEN6927"
 ></A
 ><H3
 ><A
@@ -530,7 +517,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_ENTITIES_TABLE	32</PRE
+>#define     XML_MIN_ENTITIES_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -540,7 +527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6958"
+NAME="AEN6932"
 ></A
 ><H3
 ><A
@@ -570,33 +557,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6963"
+NAME="AEN6937"
 ></A
 ><H3
 ><A
 NAME="XMLENTITIESTABLEPTR"
 ></A
 >xmlEntitiesTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlEntitiesTable *xmlEntitiesTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6968"
+NAME="AEN6941"
 ></A
 ><H3
 ><A
@@ -624,7 +598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6974"
+NAME="AEN6947"
 ></A
 ><H3
 ><A
@@ -697,7 +671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -714,7 +688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -731,7 +705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type XML_xxx_yyy_ENTITY</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -748,7 +722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity external ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -765,7 +739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity system ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -782,7 +756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -797,7 +771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the entity or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -807,7 +781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7019"
+NAME="AEN6992"
 ></A
 ><H3
 ><A
@@ -880,7 +854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -897,7 +871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -914,7 +888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type XML_xxx_yyy_ENTITY</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -931,7 +905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity external ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -948,7 +922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity system ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -965,7 +939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -980,7 +954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the entity or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -990,7 +964,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7064"
+NAME="AEN7037"
 ></A
 ><H3
 ><A
@@ -1046,7 +1020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1061,7 +1035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1071,7 +1045,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7085"
+NAME="AEN7058"
 ></A
 ><H3
 ><A
@@ -1133,7 +1107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1150,7 +1124,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1165,7 +1139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1175,7 +1149,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7111"
+NAME="AEN7084"
 ></A
 ><H3
 ><A
@@ -1236,7 +1210,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1253,7 +1227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1268,7 +1242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1278,7 +1252,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7137"
+NAME="AEN7110"
 ></A
 ><H3
 ><A
@@ -1339,7 +1313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1356,7 +1330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1371,7 +1345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1381,7 +1355,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7163"
+NAME="AEN7136"
 ></A
 ><H3
 ><A
@@ -1448,7 +1422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1465,7 +1439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1480,7 +1454,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1490,7 +1464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7191"
+NAME="AEN7164"
 ></A
 ><H3
 ><A
@@ -1553,7 +1527,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1570,7 +1544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1585,7 +1559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1595,7 +1569,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7217"
+NAME="AEN7190"
 ></A
 ><H3
 ><A
@@ -1656,7 +1630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1673,7 +1647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1688,7 +1662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1698,7 +1672,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7243"
+NAME="AEN7216"
 ></A
 ><H3
 ><A
@@ -1749,7 +1723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntitiesTablePtr just created or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1759,7 +1733,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7259"
+NAME="AEN7232"
 ></A
 ><H3
 ><A
@@ -1815,7 +1789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1830,7 +1804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlEntitiesTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1840,7 +1814,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7280"
+NAME="AEN7253"
 ></A
 ><H3
 ><A
@@ -1893,7 +1867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1903,7 +1877,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7296"
+NAME="AEN7269"
 ></A
 ><H3
 ><A
@@ -1960,7 +1934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An XML buffer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1977,7 +1951,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1987,7 +1961,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7317"
+NAME="AEN7290"
 ></A
 ><H3
 ><A
@@ -2044,7 +2018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An XML buffer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2061,7 +2035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2071,7 +2045,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7338"
+NAME="AEN7311"
 ></A
 ><H3
 ><A
@@ -2099,7 +2073,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7344"
+NAME="AEN7317"
 ></A
 ><H3
 ><A
@@ -2158,7 +2132,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an existing entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2175,7 +2149,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name it's referencing</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2190,8 +2164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 0 if Okay, -1 in case of general error, 1 in case of loop 
-detection.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-htmlparser.html b/doc/html/gnome-xml-htmlparser.html
index 9452aea..ce38b23 100644
--- a/doc/html/gnome-xml-htmlparser.html
+++ b/doc/html/gnome-xml-htmlparser.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9543"
+NAME="AEN9508"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9546"
+NAME="AEN9511"
 ></A
 ><H2
 >Synopsis</H2
@@ -376,7 +376,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9607"
+NAME="AEN9572"
 ></A
 ><H2
 >Description</H2
@@ -386,248 +386,131 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9610"
+NAME="AEN9575"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9612"
+NAME="AEN9577"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERCTXT"
 ></A
 >htmlParserCtxt</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserCtxt htmlParserCtxt;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9617"
+NAME="AEN9581"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERCTXTPTR"
 ></A
 >htmlParserCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserCtxtPtr htmlParserCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9622"
+NAME="AEN9585"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERNODEINFO"
 ></A
 >htmlParserNodeInfo</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserNodeInfo htmlParserNodeInfo;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9627"
+NAME="AEN9589"
 ></A
 ><H3
 ><A
 NAME="HTMLSAXHANDLER"
 ></A
 >htmlSAXHandler</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXHandler htmlSAXHandler;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9632"
+NAME="AEN9593"
 ></A
 ><H3
 ><A
 NAME="HTMLSAXHANDLERPTR"
 ></A
 >htmlSAXHandlerPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9637"
+NAME="AEN9597"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERINPUT"
 ></A
 >htmlParserInput</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserInput htmlParserInput;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9642"
+NAME="AEN9601"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERINPUTPTR"
 ></A
 >htmlParserInputPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserInputPtr htmlParserInputPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9647"
+NAME="AEN9605"
 ></A
 ><H3
 ><A
 NAME="HTMLDOCPTR"
 ></A
 >htmlDocPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlDocPtr htmlDocPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9652"
+NAME="AEN9609"
 ></A
 ><H3
 ><A
 NAME="HTMLNODEPTR"
 ></A
 >htmlNodePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNodePtr htmlNodePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9657"
+NAME="AEN9613"
 ></A
 ><H3
 ><A
@@ -661,33 +544,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9662"
+NAME="AEN9618"
 ></A
 ><H3
 ><A
 NAME="HTMLELEMDESCPTR"
 ></A
 >htmlElemDescPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef htmlElemDesc *htmlElemDescPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9667"
+NAME="AEN9622"
 ></A
 ><H3
 ><A
@@ -717,33 +587,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9672"
+NAME="AEN9627"
 ></A
 ><H3
 ><A
 NAME="HTMLENTITYDESCPTR"
 ></A
 >htmlEntityDescPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef htmlEntityDesc *htmlEntityDescPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9677"
+NAME="AEN9631"
 ></A
 ><H3
 ><A
@@ -799,7 +656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The tag name in lowercase</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -814,7 +671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the related htmlElemDescPtr or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -824,7 +681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9698"
+NAME="AEN9652"
 ></A
 ><H3
 ><A
@@ -882,7 +739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -897,7 +754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -907,7 +764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9720"
+NAME="AEN9674"
 ></A
 ><H3
 ><A
@@ -962,7 +819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity's unicode value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -977,7 +834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -987,7 +844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9741"
+NAME="AEN9695"
 ></A
 ><H3
 ><A
@@ -1046,7 +903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1063,7 +920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1078,7 +935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if autoclosed, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1088,7 +945,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9766"
+NAME="AEN9720"
 ></A
 ><H3
 ><A
@@ -1152,7 +1009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1169,7 +1026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The tag name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1186,7 +1043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1201,7 +1058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if autoclose, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1211,7 +1068,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9796"
+NAME="AEN9750"
 ></A
 ><H3
 ><A
@@ -1273,7 +1130,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1290,7 +1147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  location to store the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1305,8 +1162,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, or NULL otherwise,
-if non-NULL *str will have to be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1316,7 +1172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9823"
+NAME="AEN9777"
 ></A
 ><H3
 ><A
@@ -1375,7 +1231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1390,7 +1246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value parsed (as an int)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1400,7 +1256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9845"
+NAME="AEN9799"
 ></A
 ><H3
 ><A
@@ -1457,7 +1313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1467,7 +1323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9863"
+NAME="AEN9817"
 ></A
 ><H3
 ><A
@@ -1531,7 +1387,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1548,7 +1404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1565,7 +1421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1582,7 +1438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1597,7 +1453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1607,7 +1463,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9897"
+NAME="AEN9851"
 ></A
 ><H3
 ><A
@@ -1664,7 +1520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1681,7 +1537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1696,7 +1552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1706,7 +1562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9922"
+NAME="AEN9876"
 ></A
 ><H3
 ><A
@@ -1768,7 +1624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1785,7 +1641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1802,7 +1658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1819,7 +1675,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1834,7 +1690,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1844,7 +1700,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9955"
+NAME="AEN9909"
 ></A
 ><H3
 ><A
@@ -1899,7 +1755,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1916,7 +1772,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1931,7 +1787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1941,7 +1797,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9979"
+NAME="AEN9933"
 ></A
 ><H3
 ><A
@@ -1995,7 +1851,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2012,12 +1868,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2034,7 +1885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2051,12 +1902,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2071,20 +1917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if success, -2 if the transcoding fails, or -1 otherwise
-The value of <TT
-CLASS="PARAMETER"
-><I
->inlen</I
-></TT
-> after return is the number of octets consumed
-as the return value is positive, else unpredictiable.
-The value of <TT
-CLASS="PARAMETER"
-><I
->outlen</I
-></TT
-> after return is the number of octets consumed.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2094,7 +1927,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10014"
+NAME="AEN9964"
 ></A
 ><H3
 ><A
@@ -2149,7 +1982,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2166,12 +1999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2188,7 +2016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2205,12 +2033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2227,7 +2050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the quote character to escape (' or ") or zero.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2242,20 +2065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if success, -2 if the transcoding fails, or -1 otherwise
-The value of <TT
-CLASS="PARAMETER"
-><I
->inlen</I
-></TT
-> after return is the number of octets consumed
-as the return value is positive, else unpredictiable.
-The value of <TT
-CLASS="PARAMETER"
-><I
->outlen</I
-></TT
-> after return is the number of octets consumed.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2265,7 +2075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10053"
+NAME="AEN9999"
 ></A
 ><H3
 ><A
@@ -2319,7 +2129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2329,7 +2139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10069"
+NAME="AEN10015"
 ></A
 ><H3
 ><A
@@ -2406,7 +2216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2423,7 +2233,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2440,7 +2250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2457,7 +2267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of chars in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2474,7 +2284,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional file name or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2491,7 +2301,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2506,7 +2316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2516,7 +2326,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10113"
+NAME="AEN10059"
 ></A
 ><H3
 ><A
@@ -2572,7 +2382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2589,7 +2399,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2606,7 +2416,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in byte of the chunk</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2623,7 +2433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  last chunk indicator</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2638,7 +2448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->zero if no error, the xmlParserErrors otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-htmltree.html b/doc/html/gnome-xml-htmltree.html
index 5d87ba7..84e9282 100644
--- a/doc/html/gnome-xml-htmltree.html
+++ b/doc/html/gnome-xml-htmltree.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10150"
+NAME="AEN10096"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10153"
+NAME="AEN10099"
 ></A
 ><H2
 >Synopsis</H2
@@ -276,7 +276,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10191"
+NAME="AEN10137"
 ></A
 ><H2
 >Description</H2
@@ -286,14 +286,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10194"
+NAME="AEN10140"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10196"
+NAME="AEN10142"
 ></A
 ><H3
 ><A
@@ -309,7 +309,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_TEXT_NODE		XML_TEXT_NODE</PRE
+>#define     HTML_TEXT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -319,7 +319,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10201"
+NAME="AEN10147"
 ></A
 ><H3
 ><A
@@ -335,7 +335,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_ENTITY_REF_NODE	XML_ENTITY_REF_NODE</PRE
+>#define     HTML_ENTITY_REF_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -345,7 +345,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10206"
+NAME="AEN10152"
 ></A
 ><H3
 ><A
@@ -361,7 +361,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_COMMENT_NODE	XML_COMMENT_NODE</PRE
+>#define     HTML_COMMENT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -371,7 +371,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10211"
+NAME="AEN10157"
 ></A
 ><H3
 ><A
@@ -431,7 +431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  URI for the dtd, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -448,7 +448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID of the DTD, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -463,7 +463,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -473,7 +473,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10237"
+NAME="AEN10183"
 ></A
 ><H3
 ><A
@@ -533,7 +533,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  URI for the dtd, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -550,7 +550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID of the DTD, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -565,7 +565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document, do not intialize the DTD if not provided</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -575,7 +575,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10263"
+NAME="AEN10209"
 ></A
 ><H3
 ><A
@@ -631,7 +631,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -646,7 +646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current encoding as flagged in the HTML source</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -656,7 +656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10284"
+NAME="AEN10230"
 ></A
 ><H3
 ><A
@@ -715,7 +715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -732,7 +732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -747,7 +747,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success and -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -757,7 +757,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10309"
+NAME="AEN10255"
 ></A
 ><H3
 ><A
@@ -816,7 +816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -833,7 +833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -850,7 +850,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory lenght</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -860,7 +860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10334"
+NAME="AEN10280"
 ></A
 ><H3
 ><A
@@ -917,7 +917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE*</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -934,7 +934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -949,7 +949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -959,7 +959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10359"
+NAME="AEN10305"
 ></A
 ><H3
 ><A
@@ -1019,7 +1019,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1036,7 +1036,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1051,7 +1051,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1061,7 +1061,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10384"
+NAME="AEN10330"
 ></A
 ><H3
 ><A
@@ -1122,7 +1122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1139,7 +1139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1156,7 +1156,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1166,7 +1166,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10410"
+NAME="AEN10356"
 ></A
 ><H3
 ><A
@@ -1227,7 +1227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1244,7 +1244,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1261,7 +1261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1271,7 +1271,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10436"
+NAME="AEN10382"
 ></A
 ><H3
 ><A
@@ -1326,7 +1326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1343,7 +1343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1375,7 +1375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-nanoftp.html b/doc/html/gnome-xml-nanoftp.html
index 03dc83e..ec19e6f 100644
--- a/doc/html/gnome-xml-nanoftp.html
+++ b/doc/html/gnome-xml-nanoftp.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11082"
+NAME="AEN11306"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11085"
+NAME="AEN11309"
 ></A
 ><H2
 >Synopsis</H2
@@ -275,7 +275,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11114"
+NAME="AEN11338"
 ></A
 ><H2
 >Description</H2
@@ -285,14 +285,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11117"
+NAME="AEN11341"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11119"
+NAME="AEN11343"
 ></A
 ><H3
 ><A
@@ -551,7 +551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11178"
+NAME="AEN11402"
 ></A
 ><H3
 ><A
@@ -645,7 +645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11200"
+NAME="AEN11424"
 ></A
 ><H3
 ><A
@@ -675,7 +675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11206"
+NAME="AEN11430"
 ></A
 ><H3
 ><A
@@ -701,7 +701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11211"
+NAME="AEN11435"
 ></A
 ><H3
 ><A
@@ -751,7 +751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL used to initialize the context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -761,7 +761,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11226"
+NAME="AEN11450"
 ></A
 ><H3
 ><A
@@ -811,7 +811,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -821,7 +821,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11241"
+NAME="AEN11465"
 ></A
 ><H3
 ><A
@@ -872,7 +872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP server name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -889,7 +889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the port (use 21 if 0)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -899,7 +899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11260"
+NAME="AEN11484"
 ></A
 ><H3
 ><A
@@ -949,7 +949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the URL to the resource</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -959,7 +959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11275"
+NAME="AEN11499"
 ></A
 ><H3
 ><A
@@ -1009,7 +1009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1024,7 +1024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1034,7 +1034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11294"
+NAME="AEN11518"
 ></A
 ><H3
 ><A
@@ -1084,7 +1084,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1099,7 +1099,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1109,7 +1109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11313"
+NAME="AEN11537"
 ></A
 ><H3
 ><A
@@ -1159,7 +1159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1174,7 +1174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1184,7 +1184,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11332"
+NAME="AEN11556"
 ></A
 ><H3
 ><A
@@ -1237,7 +1237,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The proxy URL used to initialize the proxy context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1247,7 +1247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11347"
+NAME="AEN11571"
 ></A
 ><H3
 ><A
@@ -1303,7 +1303,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy host name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1320,7 +1320,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy port</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1337,7 +1337,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy user name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1354,7 +1354,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy password</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1371,12 +1371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of proxy 1 for using SITE, 2 for USER a<TT
-CLASS="PARAMETER"
-><I
->b</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1386,7 +1381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11379"
+NAME="AEN11602"
 ></A
 ><H3
 ><A
@@ -1441,7 +1436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1458,7 +1453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL used to update the context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1473,7 +1468,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if Ok, -1 in case of error (other host).</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1483,7 +1478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11402"
+NAME="AEN11625"
 ></A
 ><H3
 ><A
@@ -1533,7 +1528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1548,7 +1543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the code number</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1558,7 +1553,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11421"
+NAME="AEN11644"
 ></A
 ><H3
 ><A
@@ -1608,7 +1603,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1623,7 +1618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the code number, or 0</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1633,7 +1628,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11440"
+NAME="AEN11663"
 ></A
 ><H3
 ><A
@@ -1684,7 +1679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1701,7 +1696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a directory on the server</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1716,7 +1711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 1 if CWD worked, 0 if it failed</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1726,7 +1721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11463"
+NAME="AEN11686"
 ></A
 ><H3
 ><A
@@ -1777,7 +1772,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1792,7 +1787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1802,7 +1797,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11482"
+NAME="AEN11705"
 ></A
 ><H3
 ><A
@@ -1852,7 +1847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1867,7 +1862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1877,7 +1872,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11501"
+NAME="AEN11724"
 ></A
 ><H3
 ><A
@@ -1934,7 +1929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1951,7 +1946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1968,7 +1963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1985,7 +1980,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  optional files to list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2000,7 +1995,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2010,7 +2005,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11533"
+NAME="AEN11756"
 ></A
 ><H3
 ><A
@@ -2061,7 +2056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2078,7 +2073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file to retrieve (or NULL if path is in context).</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2093,7 +2088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the socket for the data connection, or &lt;0 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2103,7 +2098,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11556"
+NAME="AEN11779"
 ></A
 ><H3
 ><A
@@ -2160,7 +2155,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2177,7 +2172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2194,7 +2189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2211,7 +2206,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file to retrieve</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2226,7 +2221,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2236,7 +2231,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11588"
+NAME="AEN11811"
 ></A
 ><H3
 ><A
@@ -2299,7 +2294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2316,7 +2311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2333,7 +2328,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2348,8 +2343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte read. 0 is an indication of an end of connection.
--1 indicates a parameter error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-nanohttp.html b/doc/html/gnome-xml-nanohttp.html
index 61bd5b5..78317b5 100644
--- a/doc/html/gnome-xml-nanohttp.html
+++ b/doc/html/gnome-xml-nanohttp.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10866"
+NAME="AEN11090"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10869"
+NAME="AEN11093"
 ></A
 ><H2
 >Synopsis</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10882"
+NAME="AEN11106"
 ></A
 ><H2
 >Description</H2
@@ -205,14 +205,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10885"
+NAME="AEN11109"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10887"
+NAME="AEN11111"
 ></A
 ><H3
 ><A
@@ -241,7 +241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10893"
+NAME="AEN11117"
 ></A
 ><H3
 ><A
@@ -267,7 +267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10898"
+NAME="AEN11122"
 ></A
 ><H3
 ><A
@@ -320,7 +320,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The proxy URL used to initialize the proxy context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -330,7 +330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10913"
+NAME="AEN11137"
 ></A
 ><H3
 ><A
@@ -383,7 +383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -400,7 +400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename where the content should be saved</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -417,8 +417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if available the Content-Type information will be
-returned at that location</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -433,8 +432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of failure, 0 incase of success. The contentType,
-if provided must be freed by the caller</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -444,7 +442,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10940"
+NAME="AEN11164"
 ></A
 ><H3
 ><A
@@ -505,7 +503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -522,7 +520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP method to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -539,7 +537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -556,7 +554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Content-Type information IN and OUT</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -573,7 +571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the extra headers</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -583,7 +581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10972"
+NAME="AEN11196"
 ></A
 ><H3
 ><A
@@ -635,7 +633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -652,8 +650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if available the Content-Type information will be
-returned at that location</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -663,7 +660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10991"
+NAME="AEN11215"
 ></A
 ><H3
 ><A
@@ -713,7 +710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -728,7 +725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the HTTP return code for the request.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -738,7 +735,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11010"
+NAME="AEN11234"
 ></A
 ><H3
 ><A
@@ -801,7 +798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -818,7 +815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -835,7 +832,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -850,8 +847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte read. 0 is an indication of an end of connection.
--1 indicates a parameter error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -861,7 +857,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11039"
+NAME="AEN11263"
 ></A
 ><H3
 ><A
@@ -913,7 +909,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -930,7 +926,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename where the content should be saved</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -945,7 +941,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of failure, 0 incase of success.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -955,7 +951,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11062"
+NAME="AEN11286"
 ></A
 ><H3
 ><A
@@ -1006,7 +1002,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-parser.html b/doc/html/gnome-xml-parser.html
index 16bba33..d420d66 100644
--- a/doc/html/gnome-xml-parser.html
+++ b/doc/html/gnome-xml-parser.html
@@ -1246,7 +1246,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_DEFAULT_VERSION	"1.0"</PRE
+>#define     XML_DEFAULT_VERSION</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1366,26 +1366,13 @@
 NAME="XMLPARSERINPUTPTR"
 ></A
 >xmlParserInputPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserInput *xmlParserInputPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN345"
+NAME="AEN344"
 ></A
 ><H3
 ><A
@@ -1418,33 +1405,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN350"
+NAME="AEN349"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERNODEINFOPTR"
 ></A
 >xmlParserNodeInfoPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserNodeInfo *xmlParserNodeInfoPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN355"
+NAME="AEN353"
 ></A
 ><H3
 ><A
@@ -1474,33 +1448,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN360"
+NAME="AEN358"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERNODEINFOSEQPTR"
 ></A
 >xmlParserNodeInfoSeqPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN365"
+NAME="AEN362"
 ></A
 ><H3
 ><A
@@ -1543,7 +1504,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN370"
+NAME="AEN367"
 ></A
 ><H3
 ><A
@@ -1639,33 +1600,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN375"
+NAME="AEN372"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERCTXTPTR"
 ></A
 >xmlParserCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserCtxt *xmlParserCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN380"
+NAME="AEN376"
 ></A
 ><H3
 ><A
@@ -1696,33 +1644,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN385"
+NAME="AEN381"
 ></A
 ><H3
 ><A
 NAME="XMLSAXLOCATORPTR"
 ></A
 >xmlSAXLocatorPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXLocator *xmlSAXLocatorPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN390"
+NAME="AEN385"
 ></A
 ><H3
 ><A
@@ -1840,7 +1775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN419"
+NAME="AEN414"
 ></A
 ><H3
 ><A
@@ -1961,7 +1896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN448"
+NAME="AEN443"
 ></A
 ><H3
 ><A
@@ -2082,7 +2017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN477"
+NAME="AEN472"
 ></A
 ><H3
 ><A
@@ -2179,7 +2114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN501"
+NAME="AEN496"
 ></A
 ><H3
 ><A
@@ -2276,7 +2211,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN525"
+NAME="AEN520"
 ></A
 ><H3
 ><A
@@ -2436,7 +2371,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN563"
+NAME="AEN558"
 ></A
 ><H3
 ><A
@@ -2557,7 +2492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN592"
+NAME="AEN587"
 ></A
 ><H3
 ><A
@@ -2735,7 +2670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN634"
+NAME="AEN629"
 ></A
 ><H3
 ><A
@@ -2853,7 +2788,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN662"
+NAME="AEN657"
 ></A
 ><H3
 ><A
@@ -2995,7 +2930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN696"
+NAME="AEN691"
 ></A
 ><H3
 ><A
@@ -3074,7 +3009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN715"
+NAME="AEN710"
 ></A
 ><H3
 ><A
@@ -3132,7 +3067,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN729"
+NAME="AEN724"
 ></A
 ><H3
 ><A
@@ -3190,7 +3125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN743"
+NAME="AEN738"
 ></A
 ><H3
 ><A
@@ -3290,7 +3225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN767"
+NAME="AEN762"
 ></A
 ><H3
 ><A
@@ -3369,7 +3304,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN786"
+NAME="AEN781"
 ></A
 ><H3
 ><A
@@ -3469,7 +3404,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN810"
+NAME="AEN805"
 ></A
 ><H3
 ><A
@@ -3548,7 +3483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN829"
+NAME="AEN824"
 ></A
 ><H3
 ><A
@@ -3645,7 +3580,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN852"
+NAME="AEN847"
 ></A
 ><H3
 ><A
@@ -3742,7 +3677,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN875"
+NAME="AEN870"
 ></A
 ><H3
 ><A
@@ -3842,7 +3777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN899"
+NAME="AEN894"
 ></A
 ><H3
 ><A
@@ -3921,7 +3856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN918"
+NAME="AEN913"
 ></A
 ><H3
 ><A
@@ -4018,7 +3953,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN941"
+NAME="AEN936"
 ></A
 ><H3
 ><A
@@ -4112,7 +4047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN963"
+NAME="AEN958"
 ></A
 ><H3
 ><A
@@ -4206,7 +4141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN985"
+NAME="AEN980"
 ></A
 ><H3
 ><A
@@ -4300,7 +4235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1007"
+NAME="AEN1002"
 ></A
 ><H3
 ><A
@@ -4373,7 +4308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1025"
+NAME="AEN1020"
 ></A
 ><H3
 ><A
@@ -4446,7 +4381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1043"
+NAME="AEN1038"
 ></A
 ><H3
 ><A
@@ -4519,7 +4454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1061"
+NAME="AEN1056"
 ></A
 ><H3
 ><A
@@ -4573,33 +4508,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1066"
+NAME="AEN1061"
 ></A
 ><H3
 ><A
 NAME="XMLSAXHANDLERPTR"
 ></A
 >xmlSAXHandlerPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXHandler *xmlSAXHandlerPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1071"
+NAME="AEN1065"
 ></A
 ><H3
 ><A
@@ -4715,7 +4637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1099"
+NAME="AEN1093"
 ></A
 ><H3
 ><A
@@ -4741,7 +4663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1104"
+NAME="AEN1098"
 ></A
 ><H3
 ><A
@@ -4767,7 +4689,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1109"
+NAME="AEN1103"
 ></A
 ><H3
 ><A
@@ -4793,7 +4715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1114"
+NAME="AEN1108"
 ></A
 ><H3
 ><A
@@ -4819,7 +4741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1119"
+NAME="AEN1113"
 ></A
 ><H3
 ><A
@@ -4845,7 +4767,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1124"
+NAME="AEN1118"
 ></A
 ><H3
 ><A
@@ -4871,7 +4793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1129"
+NAME="AEN1123"
 ></A
 ><H3
 ><A
@@ -4897,7 +4819,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1134"
+NAME="AEN1128"
 ></A
 ><H3
 ><A
@@ -4927,7 +4849,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1140"
+NAME="AEN1134"
 ></A
 ><H3
 ><A
@@ -4958,7 +4880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1146"
+NAME="AEN1140"
 ></A
 ><H3
 ><A
@@ -5013,7 +4935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5030,7 +4952,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an indicative size for the lookahead</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5045,8 +4967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChars read, or -1 in case of error, 0 indicate the
-end of this entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5056,7 +4977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1170"
+NAME="AEN1164"
 ></A
 ><H3
 ><A
@@ -5111,7 +5032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5128,7 +5049,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an indicative size for the lookahead</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5143,8 +5064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChars read, or -1 in case of error, 0 indicate the
-end of this entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5154,7 +5074,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1194"
+NAME="AEN1188"
 ></A
 ><H3
 ><A
@@ -5212,7 +5132,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5227,7 +5147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5237,7 +5157,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1215"
+NAME="AEN1209"
 ></A
 ><H3
 ><A
@@ -5294,7 +5214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5311,12 +5231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len of <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5331,7 +5246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5341,7 +5256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1241"
+NAME="AEN1234"
 ></A
 ><H3
 ><A
@@ -5399,7 +5314,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5416,7 +5331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the index of the first char (zero based)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5433,7 +5348,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the substring</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5448,7 +5363,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5458,7 +5373,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1270"
+NAME="AEN1263"
 ></A
 ><H3
 ><A
@@ -5518,7 +5433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5535,7 +5450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5550,7 +5465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5560,7 +5475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1296"
+NAME="AEN1289"
 ></A
 ><H3
 ><A
@@ -5620,7 +5535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5637,7 +5552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search (needle)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5652,7 +5567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5662,7 +5577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1322"
+NAME="AEN1315"
 ></A
 ><H3
 ><A
@@ -5722,7 +5637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5739,7 +5654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search (needle)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5754,7 +5669,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5764,7 +5679,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1348"
+NAME="AEN1341"
 ></A
 ><H3
 ><A
@@ -5821,7 +5736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5838,7 +5753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5853,7 +5768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5863,7 +5778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1373"
+NAME="AEN1366"
 ></A
 ><H3
 ><A
@@ -5921,7 +5836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5938,7 +5853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5955,7 +5870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the max comparison length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5970,7 +5885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5980,7 +5895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1402"
+NAME="AEN1395"
 ></A
 ><H3
 ><A
@@ -6037,7 +5952,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6054,7 +5969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6069,7 +5984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6079,7 +5994,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1427"
+NAME="AEN1420"
 ></A
 ><H3
 ><A
@@ -6137,7 +6052,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6154,7 +6069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6171,7 +6086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the max comparison length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6186,7 +6101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6196,7 +6111,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1456"
+NAME="AEN1449"
 ></A
 ><H3
 ><A
@@ -6257,7 +6172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6274,7 +6189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6289,7 +6204,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if they are equal, 0 if they are different</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6299,7 +6214,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1482"
+NAME="AEN1475"
 ></A
 ><H3
 ><A
@@ -6352,7 +6267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6367,7 +6282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar contained in the ARRAY.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6377,7 +6292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1502"
+NAME="AEN1495"
 ></A
 ><H3
 ><A
@@ -6439,7 +6354,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6456,7 +6371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6471,7 +6386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * containing the concatenated string.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6481,7 +6396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1528"
+NAME="AEN1521"
 ></A
 ><H3
 ><A
@@ -6542,7 +6457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6559,7 +6474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6576,12 +6491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->add</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6596,7 +6506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * containing the concatenated string.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6606,7 +6516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1559"
+NAME="AEN1551"
 ></A
 ><H3
 ><A
@@ -6662,7 +6572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6677,7 +6587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6687,7 +6597,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1580"
+NAME="AEN1572"
 ></A
 ><H3
 ><A
@@ -6741,7 +6651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6758,7 +6668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6773,7 +6683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6783,7 +6693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1604"
+NAME="AEN1596"
 ></A
 ><H3
 ><A
@@ -6837,7 +6747,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6852,7 +6762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6862,7 +6772,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1624"
+NAME="AEN1616"
 ></A
 ><H3
 ><A
@@ -6920,7 +6830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6935,7 +6845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6945,7 +6855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1644"
+NAME="AEN1636"
 ></A
 ><H3
 ><A
@@ -7022,7 +6932,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7037,7 +6947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7047,7 +6957,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1667"
+NAME="AEN1659"
 ></A
 ><H3
 ><A
@@ -7100,7 +7010,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7110,7 +7020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1683"
+NAME="AEN1675"
 ></A
 ><H3
 ><A
@@ -7160,7 +7070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7175,7 +7085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7185,7 +7095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1702"
+NAME="AEN1694"
 ></A
 ><H3
 ><A
@@ -7242,7 +7152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7257,7 +7167,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7267,7 +7177,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1723"
+NAME="AEN1715"
 ></A
 ><H3
 ><A
@@ -7322,7 +7232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7339,7 +7249,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7354,7 +7264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7364,7 +7274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1747"
+NAME="AEN1739"
 ></A
 ><H3
 ><A
@@ -7419,7 +7329,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7434,7 +7344,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7444,7 +7354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1767"
+NAME="AEN1759"
 ></A
 ><H3
 ><A
@@ -7502,7 +7412,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7517,8 +7427,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0, -1 in case of error. the parser context is augmented
-as a result of the parsing.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7528,7 +7437,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1789"
+NAME="AEN1781"
 ></A
 ><H3
 ><A
@@ -7585,7 +7494,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7600,8 +7509,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0, -1 in case of error. the parser context is augmented
-as a result of the parsing.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7611,7 +7519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1810"
+NAME="AEN1802"
 ></A
 ><H3
 ><A
@@ -7674,7 +7582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7691,7 +7599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7708,8 +7616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  work in recovery mode, i.e. tries to read no Well Formed
-documents</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7724,7 +7631,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7734,7 +7641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1840"
+NAME="AEN1832"
 ></A
 ><H3
 ><A
@@ -7790,7 +7697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7807,7 +7714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7824,7 +7731,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7839,7 +7746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success or a error number otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7849,7 +7756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1868"
+NAME="AEN1860"
 ></A
 ><H3
 ><A
@@ -7906,7 +7813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7923,7 +7830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7940,7 +7847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an in-memory XML document input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7957,7 +7864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the XML document in bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7972,7 +7879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success or a error number otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7982,7 +7889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1900"
+NAME="AEN1892"
 ></A
 ><H3
 ><A
@@ -8043,7 +7950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8060,7 +7967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8077,7 +7984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8094,8 +8001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  work in recovery mode, i.e. tries to read not Well Formed
-documents</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8110,7 +8016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8120,7 +8026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1933"
+NAME="AEN1925"
 ></A
 ><H3
 ><A
@@ -8181,7 +8087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8198,7 +8104,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8215,8 +8121,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  work in recovery mode, i.e. tries to read no Well Formed
-documents</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8231,7 +8136,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8241,7 +8146,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1962"
+NAME="AEN1954"
 ></A
 ><H3
 ><A
@@ -8304,7 +8209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8321,7 +8226,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8336,7 +8241,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8346,7 +8251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1989"
+NAME="AEN1981"
 ></A
 ><H3
 ><A
@@ -8403,7 +8308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8418,7 +8323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8428,7 +8333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2011"
+NAME="AEN2003"
 ></A
 ><H3
 ><A
@@ -8488,7 +8393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the External ID of the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8505,7 +8410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the URL to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8520,7 +8425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8530,7 +8435,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2037"
+NAME="AEN2029"
 ></A
 ><H3
 ><A
@@ -8594,7 +8499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8611,7 +8516,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the External ID of the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8628,7 +8533,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the URL to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8643,7 +8548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8653,7 +8558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2068"
+NAME="AEN2060"
 ></A
 ><H3
 ><A
@@ -8828,7 +8733,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2110"
+NAME="AEN2102"
 ></A
 ><H3
 ><A
@@ -8903,7 +8808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document the chunk pertains to</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8920,7 +8825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler bloc (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8937,7 +8842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8954,7 +8859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Used for loop detection, use 0</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8971,7 +8876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URL for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8988,7 +8893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the System ID for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9005,7 +8910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return value for the set of parsed nodes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9020,8 +8925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the entity is well formed, -1 in case of args problem and
-the parser error code otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9031,7 +8935,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2159"
+NAME="AEN2151"
 ></A
 ><H3
 ><A
@@ -9100,7 +9004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the existing parsing context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9117,7 +9021,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URL for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9134,7 +9038,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the System ID for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9151,7 +9055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return value for the set of parsed nodes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9166,8 +9070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the entity is well formed, -1 in case of args problem and
-the parser error code otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9177,7 +9080,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2195"
+NAME="AEN2187"
 ></A
 ><H3
 ><A
@@ -9205,7 +9108,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2201"
+NAME="AEN2193"
 ></A
 ><H3
 ><A
@@ -9233,7 +9136,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2207"
+NAME="AEN2199"
 ></A
 ><H3
 ><A
@@ -9286,7 +9189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9296,7 +9199,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2223"
+NAME="AEN2215"
 ></A
 ><H3
 ><A
@@ -9349,7 +9252,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9359,7 +9262,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2239"
+NAME="AEN2231"
 ></A
 ><H3
 ><A
@@ -9413,7 +9316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9423,7 +9326,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2255"
+NAME="AEN2247"
 ></A
 ><H3
 ><A
@@ -9483,7 +9386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9500,7 +9403,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar * buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9517,7 +9420,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file name</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9527,7 +9430,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2280"
+NAME="AEN2272"
 ></A
 ><H3
 ><A
@@ -9583,7 +9486,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9598,7 +9501,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9608,7 +9511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2301"
+NAME="AEN2293"
 ></A
 ><H3
 ><A
@@ -9699,7 +9602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2323"
+NAME="AEN2315"
 ></A
 ><H3
 ><A
@@ -9811,7 +9714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2350"
+NAME="AEN2342"
 ></A
 ><H3
 ><A
@@ -9923,7 +9826,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2377"
+NAME="AEN2369"
 ></A
 ><H3
 ><A
@@ -9996,7 +9899,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10013,7 +9916,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10030,7 +9933,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10047,7 +9950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of chars in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10064,7 +9967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional file name or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10079,7 +9982,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10089,7 +9992,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2416"
+NAME="AEN2408"
 ></A
 ><H3
 ><A
@@ -10145,7 +10048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10162,7 +10065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10179,7 +10082,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in byte of the chunk</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10196,7 +10099,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  last chunk indicator</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10211,7 +10114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->zero if no error, the xmlParserErrors otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10221,7 +10124,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2448"
+NAME="AEN2440"
 ></A
 ><H3
 ><A
@@ -10292,7 +10195,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10309,7 +10212,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10326,7 +10229,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O read function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10343,7 +10246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O close function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10360,7 +10263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10377,7 +10280,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10392,7 +10295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10402,7 +10305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2492"
+NAME="AEN2484"
 ></A
 ><H3
 ><A
@@ -10472,7 +10375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10489,7 +10392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O Input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10506,7 +10409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10521,7 +10424,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10531,7 +10434,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2524"
+NAME="AEN2516"
 ></A
 ><H3
 ><A
@@ -10592,7 +10495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10609,7 +10512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML node within the tree</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10624,7 +10527,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an xmlParserNodeInfo block pointer or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10634,7 +10537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2550"
+NAME="AEN2542"
 ></A
 ><H3
 ><A
@@ -10687,7 +10590,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10697,7 +10600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2566"
+NAME="AEN2558"
 ></A
 ><H3
 ><A
@@ -10751,7 +10654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10761,7 +10664,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2582"
+NAME="AEN2574"
 ></A
 ><H3
 ><A
@@ -10822,7 +10725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10839,7 +10742,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML node pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10854,7 +10757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a long indicating the position of the record</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10864,7 +10767,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2608"
+NAME="AEN2600"
 ></A
 ><H3
 ><A
@@ -10921,7 +10824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10938,7 +10841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10948,7 +10851,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2629"
+NAME="AEN2621"
 ></A
 ><H3
 ><A
@@ -11009,7 +10912,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2644"
+NAME="AEN2636"
 ></A
 ><H3
 ><A
@@ -11069,7 +10972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2659"
+NAME="AEN2651"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-parserinternals.html b/doc/html/gnome-xml-parserinternals.html
index 9c8459b..8870745 100644
--- a/doc/html/gnome-xml-parserinternals.html
+++ b/doc/html/gnome-xml-parserinternals.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12524"
+NAME="AEN12759"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12527"
+NAME="AEN12762"
 ></A
 ><H2
 >Synopsis</H2
@@ -1096,7 +1096,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12794"
+NAME="AEN13029"
 ></A
 ><H2
 >Description</H2
@@ -1106,14 +1106,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12797"
+NAME="AEN13032"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12799"
+NAME="AEN13034"
 ></A
 ><H3
 ><A
@@ -1129,7 +1129,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MAX_NAMELEN 100</PRE
+>#define     XML_MAX_NAMELEN</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1139,7 +1139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12804"
+NAME="AEN13039"
 ></A
 ><H3
 ><A
@@ -1155,7 +1155,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define INPUT_CHUNK	250</PRE
+>#define     INPUT_CHUNK</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1165,7 +1165,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12809"
+NAME="AEN13044"
 ></A
 ><H3
 ><A
@@ -1223,7 +1223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12823"
+NAME="AEN13058"
 ></A
 ><H3
 ><A
@@ -1281,7 +1281,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12837"
+NAME="AEN13072"
 ></A
 ><H3
 ><A
@@ -1297,7 +1297,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_BASECHAR(c) xmlIsBaseChar(c)</PRE
+>#define     IS_BASECHAR(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1339,7 +1339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12851"
+NAME="AEN13086"
 ></A
 ><H3
 ><A
@@ -1355,7 +1355,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_DIGIT(c) xmlIsDigit(c)</PRE
+>#define     IS_DIGIT(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1397,7 +1397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12865"
+NAME="AEN13100"
 ></A
 ><H3
 ><A
@@ -1413,7 +1413,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_COMBINING(c) xmlIsCombining(c)</PRE
+>#define     IS_COMBINING(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1455,7 +1455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12879"
+NAME="AEN13114"
 ></A
 ><H3
 ><A
@@ -1471,7 +1471,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_EXTENDER(c) xmlIsExtender(c)</PRE
+>#define     IS_EXTENDER(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1513,7 +1513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12893"
+NAME="AEN13128"
 ></A
 ><H3
 ><A
@@ -1529,7 +1529,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_IDEOGRAPHIC(c) xmlIsIdeographic(c)</PRE
+>#define     IS_IDEOGRAPHIC(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1571,7 +1571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12907"
+NAME="AEN13142"
 ></A
 ><H3
 ><A
@@ -1587,7 +1587,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))</PRE
+>#define     IS_LETTER(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1629,7 +1629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12921"
+NAME="AEN13156"
 ></A
 ><H3
 ><A
@@ -1645,7 +1645,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_PUBIDCHAR(c)	xmlIsPubidChar(c)</PRE
+>#define     IS_PUBIDCHAR(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1687,7 +1687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12935"
+NAME="AEN13170"
 ></A
 ><H3
 ><A
@@ -1745,7 +1745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12949"
+NAME="AEN13184"
 ></A
 ><H3
 ><A
@@ -1803,7 +1803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12963"
+NAME="AEN13198"
 ></A
 ><H3
 ><A
@@ -1861,7 +1861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12977"
+NAME="AEN13212"
 ></A
 ><H3
 ><A
@@ -1887,7 +1887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12982"
+NAME="AEN13217"
 ></A
 ><H3
 ><A
@@ -1913,7 +1913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12987"
+NAME="AEN13222"
 ></A
 ><H3
 ><A
@@ -1939,7 +1939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12992"
+NAME="AEN13227"
 ></A
 ><H3
 ><A
@@ -1965,7 +1965,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12997"
+NAME="AEN13232"
 ></A
 ><H3
 ><A
@@ -1991,7 +1991,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13002"
+NAME="AEN13237"
 ></A
 ><H3
 ><A
@@ -2017,7 +2017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13007"
+NAME="AEN13242"
 ></A
 ><H3
 ><A
@@ -2082,7 +2082,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2097,7 +2097,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2107,7 +2107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13030"
+NAME="AEN13265"
 ></A
 ><H3
 ><A
@@ -2174,7 +2174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2189,7 +2189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2199,7 +2199,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13054"
+NAME="AEN13289"
 ></A
 ><H3
 ><A
@@ -2259,7 +2259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2274,7 +2274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2284,7 +2284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13076"
+NAME="AEN13311"
 ></A
 ><H3
 ><A
@@ -2335,7 +2335,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2350,7 +2350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2360,7 +2360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13095"
+NAME="AEN13330"
 ></A
 ><H3
 ><A
@@ -2411,7 +2411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2426,7 +2426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2436,7 +2436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13114"
+NAME="AEN13349"
 ></A
 ><H3
 ><A
@@ -2502,7 +2502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2517,7 +2517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2527,7 +2527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13138"
+NAME="AEN13373"
 ></A
 ><H3
 ><A
@@ -2578,7 +2578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2593,7 +2593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2603,7 +2603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13157"
+NAME="AEN13392"
 ></A
 ><H3
 ><A
@@ -2698,7 +2698,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2713,7 +2713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2723,7 +2723,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13190"
+NAME="AEN13425"
 ></A
 ><H3
 ><A
@@ -2807,7 +2807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2822,7 +2822,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2832,7 +2832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13219"
+NAME="AEN13454"
 ></A
 ><H3
 ><A
@@ -2913,7 +2913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13240"
+NAME="AEN13475"
 ></A
 ><H3
 ><A
@@ -2968,7 +2968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2983,7 +2983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2993,7 +2993,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13260"
+NAME="AEN13495"
 ></A
 ><H3
 ><A
@@ -3047,7 +3047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3064,7 +3064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3079,7 +3079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3089,7 +3089,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13284"
+NAME="AEN13519"
 ></A
 ><H3
 ><A
@@ -3140,7 +3140,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlParserCtxtPtr or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3150,7 +3150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13300"
+NAME="AEN13535"
 ></A
 ><H3
 ><A
@@ -3216,7 +3216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity URL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3233,7 +3233,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity PUBLIC ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3250,7 +3250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a posible base for the target URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3265,7 +3265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3275,7 +3275,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13331"
+NAME="AEN13566"
 ></A
 ><H3
 ><A
@@ -3333,7 +3333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3350,7 +3350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding value (number)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3365,7 +3365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3375,7 +3375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13356"
+NAME="AEN13591"
 ></A
 ><H3
 ><A
@@ -3433,7 +3433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3450,7 +3450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3465,7 +3465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3475,7 +3475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13381"
+NAME="AEN13616"
 ></A
 ><H3
 ><A
@@ -3539,7 +3539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13397"
+NAME="AEN13632"
 ></A
 ><H3
 ><A
@@ -3599,7 +3599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3616,7 +3616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML entity pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3626,7 +3626,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13419"
+NAME="AEN13654"
 ></A
 ><H3
 ><A
@@ -3686,7 +3686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3703,7 +3703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Entity pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3718,7 +3718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3728,7 +3728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13445"
+NAME="AEN13680"
 ></A
 ><H3
 ><A
@@ -3786,7 +3786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3803,7 +3803,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input fragment (entity, XML fragment ...).</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3813,7 +3813,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13466"
+NAME="AEN13701"
 ></A
 ><H3
 ><A
@@ -3870,7 +3870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3885,7 +3885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current xmlChar in the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3895,7 +3895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13487"
+NAME="AEN13722"
 ></A
 ><H3
 ><A
@@ -3948,7 +3948,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3958,7 +3958,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13503"
+NAME="AEN13738"
 ></A
 ><H3
 ><A
@@ -4015,7 +4015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4032,7 +4032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename to use as entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4047,7 +4047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4057,7 +4057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13528"
+NAME="AEN13763"
 ></A
 ><H3
 ><A
@@ -4113,7 +4113,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4128,7 +4128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4138,7 +4138,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13549"
+NAME="AEN13784"
 ></A
 ><H3
 ><A
@@ -4208,7 +4208,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4225,7 +4225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4242,7 +4242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4257,8 +4257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the local part, and prefix is updated
-to get the Prefix if any.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4268,7 +4267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13583"
+NAME="AEN13818"
 ></A
 ><H3
 ><A
@@ -4332,7 +4331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4347,7 +4346,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4357,7 +4356,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13607"
+NAME="AEN13842"
 ></A
 ><H3
 ><A
@@ -4426,7 +4425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4443,7 +4442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4458,8 +4457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the local part, and prefix is updated
-to get the Prefix if any.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4469,7 +4467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13637"
+NAME="AEN13872"
 ></A
 ><H3
 ><A
@@ -4532,7 +4530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4547,7 +4545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4557,7 +4555,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13661"
+NAME="AEN13896"
 ></A
 ><H3
 ><A
@@ -4615,7 +4613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4630,7 +4628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string parser or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4640,7 +4638,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13683"
+NAME="AEN13918"
 ></A
 ><H3
 ><A
@@ -4701,7 +4699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4711,7 +4709,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13702"
+NAME="AEN13937"
 ></A
 ><H3
 ><A
@@ -4778,7 +4776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4793,7 +4791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Name parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4803,7 +4801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13727"
+NAME="AEN13962"
 ></A
 ><H3
 ><A
@@ -4866,7 +4864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4881,7 +4879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Name parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4891,7 +4889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13751"
+NAME="AEN13986"
 ></A
 ><H3
 ><A
@@ -4951,7 +4949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4966,7 +4964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Nmtoken parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4976,7 +4974,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13774"
+NAME="AEN14009"
 ></A
 ><H3
 ><A
@@ -5039,7 +5037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5056,7 +5054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if non-NULL store a copy of the original entity value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5071,7 +5069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the EntityValue parsed with reference substitued or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5081,7 +5079,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13801"
+NAME="AEN14036"
 ></A
 ><H3
 ><A
@@ -5194,7 +5192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5209,7 +5207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the AttValue parsed or NULL. The value has to be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5219,7 +5217,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13835"
+NAME="AEN14070"
 ></A
 ><H3
 ><A
@@ -5277,7 +5275,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5292,7 +5290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the SystemLiteral parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5302,7 +5300,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13857"
+NAME="AEN14092"
 ></A
 ><H3
 ><A
@@ -5360,7 +5358,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5375,7 +5373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the PubidLiteral parsed or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5385,7 +5383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13879"
+NAME="AEN14114"
 ></A
 ><H3
 ><A
@@ -5447,7 +5445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5464,7 +5462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int indicating whether we are within a CDATA section</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5474,7 +5472,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13901"
+NAME="AEN14136"
 ></A
 ><H3
 ><A
@@ -5543,7 +5541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5560,7 +5558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar** receiving PubidLiteral</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5577,8 +5575,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> indicate whether we should restrict parsing to only
-production [75], see NOTE below</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5593,9 +5590,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the function returns SystemLiteral and in the second
-case publicID receives PubidLiteral, is strict is off
-it is possible to return NULL and have publicID set.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5605,7 +5600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13934"
+NAME="AEN14169"
 ></A
 ><H3
 ><A
@@ -5662,7 +5657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5672,7 +5667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13951"
+NAME="AEN14186"
 ></A
 ><H3
 ><A
@@ -5730,7 +5725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5745,7 +5740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the PITarget name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5755,7 +5750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13973"
+NAME="AEN14208"
 ></A
 ><H3
 ><A
@@ -5812,7 +5807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5822,7 +5817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13991"
+NAME="AEN14226"
 ></A
 ><H3
 ><A
@@ -5887,7 +5882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5897,7 +5892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14011"
+NAME="AEN14246"
 ></A
 ><H3
 ><A
@@ -5965,7 +5960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5975,7 +5970,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14034"
+NAME="AEN14269"
 ></A
 ><H3
 ><A
@@ -6071,7 +6066,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6088,7 +6083,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Receive a possible fixed default value for the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6103,8 +6098,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> XML_ATTRIBUTE_NONE, XML_ATTRIBUTE_REQUIRED, XML_ATTRIBUTE_IMPLIED
-or XML_ATTRIBUTE_FIXED. </TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6114,7 +6108,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14071"
+NAME="AEN14306"
 ></A
 ><H3
 ><A
@@ -6178,7 +6172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6193,7 +6187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the notation attribute tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6203,7 +6197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14095"
+NAME="AEN14330"
 ></A
 ><H3
 ><A
@@ -6265,7 +6259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6280,7 +6274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the enumeration attribute tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6290,7 +6284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14118"
+NAME="AEN14353"
 ></A
 ><H3
 ><A
@@ -6351,7 +6345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6368,7 +6362,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6383,7 +6377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6393,7 +6387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14145"
+NAME="AEN14380"
 ></A
 ><H3
 ><A
@@ -6495,7 +6489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6512,7 +6506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6527,7 +6521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute type</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6537,7 +6531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14183"
+NAME="AEN14418"
 ></A
 ><H3
 ><A
@@ -6594,7 +6588,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6604,7 +6598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14201"
+NAME="AEN14436"
 ></A
 ><H3
 ><A
@@ -6677,7 +6671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6692,7 +6686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the list of the xmlElementContentPtr describing the element choices</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6702,7 +6696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14227"
+NAME="AEN14462"
 ></A
 ><H3
 ><A
@@ -6779,7 +6773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6794,8 +6788,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the tree of xmlElementContentPtr describing the element 
-hierarchy.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6805,7 +6798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14253"
+NAME="AEN14488"
 ></A
 ><H3
 ><A
@@ -6869,7 +6862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6886,7 +6879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the element being defined.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6903,7 +6896,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Element Content pointer will be stored here if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6918,7 +6911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the type of element content XML_ELEMENT_TYPE_xxx</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6928,7 +6921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14284"
+NAME="AEN14519"
 ></A
 ><H3
 ><A
@@ -6986,7 +6979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7001,7 +6994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the type of the element, or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7011,7 +7004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14306"
+NAME="AEN14541"
 ></A
 ><H3
 ><A
@@ -7080,7 +7073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7090,7 +7083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14325"
+NAME="AEN14560"
 ></A
 ><H3
 ><A
@@ -7153,7 +7146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7168,7 +7161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value parsed (as an int), 0 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7178,7 +7171,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14348"
+NAME="AEN14583"
 ></A
 ><H3
 ><A
@@ -7254,7 +7247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7269,7 +7262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found, or NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7279,7 +7272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14372"
+NAME="AEN14607"
 ></A
 ><H3
 ><A
@@ -7343,7 +7336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7353,7 +7346,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14391"
+NAME="AEN14626"
 ></A
 ><H3
 ><A
@@ -7429,7 +7422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7439,7 +7432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14412"
+NAME="AEN14647"
 ></A
 ><H3
 ><A
@@ -7499,7 +7492,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7509,7 +7502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14430"
+NAME="AEN14665"
 ></A
 ><H3
 ><A
@@ -7592,7 +7585,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7609,7 +7602,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** used to store the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7624,7 +7617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute name, and the value in *value.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7634,7 +7627,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14464"
+NAME="AEN14699"
 ></A
 ><H3
 ><A
@@ -7709,7 +7702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7724,7 +7717,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the element name parsed</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7734,7 +7727,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14492"
+NAME="AEN14727"
 ></A
 ><H3
 ><A
@@ -7793,7 +7786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7803,7 +7796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14511"
+NAME="AEN14746"
 ></A
 ><H3
 ><A
@@ -7864,7 +7857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7874,7 +7867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14531"
+NAME="AEN14766"
 ></A
 ><H3
 ><A
@@ -7929,7 +7922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7939,7 +7932,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14548"
+NAME="AEN14783"
 ></A
 ><H3
 ><A
@@ -8011,7 +8004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8021,7 +8014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14567"
+NAME="AEN14802"
 ></A
 ><H3
 ><A
@@ -8079,7 +8072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8094,7 +8087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string giving the XML version number, or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8104,7 +8097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14589"
+NAME="AEN14824"
 ></A
 ><H3
 ><A
@@ -8164,7 +8157,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8179,7 +8172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the version string, e.g. "1.0"</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8189,7 +8182,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14612"
+NAME="AEN14847"
 ></A
 ><H3
 ><A
@@ -8247,7 +8240,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8262,7 +8255,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the encoding name value or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8272,7 +8265,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14634"
+NAME="AEN14869"
 ></A
 ><H3
 ><A
@@ -8332,7 +8325,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8347,7 +8340,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the encoding value or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8357,7 +8350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14657"
+NAME="AEN14892"
 ></A
 ><H3
 ><A
@@ -8427,7 +8420,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8442,7 +8435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if standalone, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8452,7 +8445,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14679"
+NAME="AEN14914"
 ></A
 ><H3
 ><A
@@ -8507,7 +8500,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8517,7 +8510,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14696"
+NAME="AEN14931"
 ></A
 ><H3
 ><A
@@ -8574,7 +8567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8584,7 +8577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14714"
+NAME="AEN14949"
 ></A
 ><H3
 ><A
@@ -8639,7 +8632,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8649,7 +8642,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14731"
+NAME="AEN14966"
 ></A
 ><H3
 ><A
@@ -8714,7 +8707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8731,7 +8724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the external identifier</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8748,7 +8741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the system identifier (or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8758,7 +8751,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14759"
+NAME="AEN14994"
 ></A
 ><H3
 ><A
@@ -8774,7 +8767,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_NONE	0</PRE
+>#define     XML_SUBSTITUTE_NONE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8784,7 +8777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14764"
+NAME="AEN14999"
 ></A
 ><H3
 ><A
@@ -8800,7 +8793,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_REF	1</PRE
+>#define     XML_SUBSTITUTE_REF</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8810,7 +8803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14769"
+NAME="AEN15004"
 ></A
 ><H3
 ><A
@@ -8826,7 +8819,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_PEREF	2</PRE
+>#define     XML_SUBSTITUTE_PEREF</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8836,7 +8829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14774"
+NAME="AEN15009"
 ></A
 ><H3
 ><A
@@ -8852,7 +8845,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_BOTH 	3</PRE
+>#define     XML_SUBSTITUTE_BOTH</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8862,7 +8855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14779"
+NAME="AEN15014"
 ></A
 ><H3
 ><A
@@ -8939,7 +8932,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8956,7 +8949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len to decode (in bytes !), -1 for no size limit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8973,7 +8966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8990,7 +8983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9007,7 +9000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9024,7 +9017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9039,8 +9032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done. The caller
-must deallocate it !</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9050,7 +9042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14826"
+NAME="AEN15061"
 ></A
 ><H3
 ><A
@@ -9127,7 +9119,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9144,7 +9136,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9161,7 +9153,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9178,7 +9170,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9195,7 +9187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9212,7 +9204,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9227,8 +9219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done. The caller
-must deallocate it !</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9238,7 +9229,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14873"
+NAME="AEN15108"
 ></A
 ><H3
 ><A
@@ -9335,7 +9326,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14897"
+NAME="AEN15132"
 ></A
 ><H3
 ><A
@@ -9414,7 +9405,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14917"
+NAME="AEN15152"
 ></A
 ><H3
 ><A
@@ -9511,7 +9502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14941"
+NAME="AEN15176"
 ></A
 ><H3
 ><A
@@ -9590,7 +9581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14961"
+NAME="AEN15196"
 ></A
 ><H3
 ><A
@@ -9644,7 +9635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9659,7 +9650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of space chars skipped</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9669,7 +9660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14981"
+NAME="AEN15216"
 ></A
 ><H3
 ><A
@@ -9728,7 +9719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9745,7 +9736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the beginning of the char</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9762,7 +9753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the char read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9777,7 +9768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current char value and its lenght</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9787,7 +9778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15010"
+NAME="AEN15245"
 ></A
 ><H3
 ><A
@@ -9869,7 +9860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9879,7 +9870,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15032"
+NAME="AEN15267"
 ></A
 ><H3
 ><A
@@ -9959,7 +9950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9969,7 +9960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15056"
+NAME="AEN15291"
 ></A
 ><H3
 ><A
@@ -10048,7 +10039,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15076"
+NAME="AEN15311"
 ></A
 ><H3
 ><A
@@ -10124,7 +10115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15095"
+NAME="AEN15330"
 ></A
 ><H3
 ><A
@@ -10201,7 +10192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10218,7 +10209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the char read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10233,7 +10224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current char value and its lenght</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10243,7 +10234,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15124"
+NAME="AEN15359"
 ></A
 ><H3
 ><A
@@ -10298,7 +10289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the char read (or zero)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10332,7 +10323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10347,7 +10338,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar written</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10357,7 +10348,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15152"
+NAME="AEN15387"
 ></A
 ><H3
 ><A
@@ -10410,7 +10401,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10420,7 +10411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15168"
+NAME="AEN15403"
 ></A
 ><H3
 ><A
@@ -10473,7 +10464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10483,7 +10474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15184"
+NAME="AEN15419"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-sax.html b/doc/html/gnome-xml-sax.html
index 32c5c20..aa58efd 100644
--- a/doc/html/gnome-xml-sax.html
+++ b/doc/html/gnome-xml-sax.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2692"
+NAME="AEN2684"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2695"
+NAME="AEN2687"
 ></A
 ><H2
 >Synopsis</H2
@@ -486,7 +486,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2783"
+NAME="AEN2775"
 ></A
 ><H2
 >Description</H2
@@ -496,14 +496,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2786"
+NAME="AEN2778"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2788"
+NAME="AEN2780"
 ></A
 ><H3
 ><A
@@ -556,7 +556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -571,7 +571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -581,7 +581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2808"
+NAME="AEN2800"
 ></A
 ><H3
 ><A
@@ -635,7 +635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -650,7 +650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -660,7 +660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2828"
+NAME="AEN2820"
 ></A
 ><H3
 ><A
@@ -715,7 +715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -732,7 +732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> A SAX Locator</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -742,7 +742,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2848"
+NAME="AEN2840"
 ></A
 ><H3
 ><A
@@ -792,7 +792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -807,7 +807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -817,7 +817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2867"
+NAME="AEN2859"
 ></A
 ><H3
 ><A
@@ -867,7 +867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -882,7 +882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -892,7 +892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2886"
+NAME="AEN2878"
 ></A
 ><H3
 ><A
@@ -942,7 +942,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -957,7 +957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -967,7 +967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2905"
+NAME="AEN2897"
 ></A
 ><H3
 ><A
@@ -1017,7 +1017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1032,7 +1032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1042,7 +1042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2924"
+NAME="AEN2916"
 ></A
 ><H3
 ><A
@@ -1092,7 +1092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1107,7 +1107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1117,7 +1117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2943"
+NAME="AEN2935"
 ></A
 ><H3
 ><A
@@ -1179,7 +1179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1196,7 +1196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the root element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1213,7 +1213,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1230,7 +1230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SYSTEM ID (e.g. filename or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1240,7 +1240,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2973"
+NAME="AEN2965"
 ></A
 ><H3
 ><A
@@ -1297,7 +1297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1314,7 +1314,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1329,7 +1329,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1339,7 +1339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2998"
+NAME="AEN2990"
 ></A
 ><H3
 ><A
@@ -1396,7 +1396,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1413,7 +1413,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1428,7 +1428,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1438,7 +1438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3023"
+NAME="AEN3015"
 ></A
 ><H3
 ><A
@@ -1509,7 +1509,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1526,7 +1526,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1543,7 +1543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1558,7 +1558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlParserInputPtr if inlined or NULL for DOM behaviour.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1568,7 +1568,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3055"
+NAME="AEN3047"
 ></A
 ><H3
 ><A
@@ -1635,7 +1635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1652,7 +1652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1669,7 +1669,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1686,7 +1686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1703,7 +1703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1720,7 +1720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity value (without processing).</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1730,7 +1730,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3094"
+NAME="AEN3086"
 ></A
 ><H3
 ><A
@@ -1798,7 +1798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1815,7 +1815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1849,7 +1849,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1866,7 +1866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1883,7 +1883,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the attribute default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1900,7 +1900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree of enumerated value set</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1910,7 +1910,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3137"
+NAME="AEN3129"
 ></A
 ><H3
 ><A
@@ -1969,7 +1969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1986,7 +1986,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2003,7 +2003,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2020,7 +2020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the element value tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2030,7 +2030,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3166"
+NAME="AEN3158"
 ></A
 ><H3
 ><A
@@ -2092,7 +2092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2109,7 +2109,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The name of the notation</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2126,7 +2126,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2143,7 +2143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2153,7 +2153,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3196"
+NAME="AEN3188"
 ></A
 ><H3
 ><A
@@ -2219,7 +2219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2236,7 +2236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The name of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2253,7 +2253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2270,7 +2270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2287,7 +2287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the notation</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2297,7 +2297,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3231"
+NAME="AEN3223"
 ></A
 ><H3
 ><A
@@ -2347,7 +2347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2357,7 +2357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3246"
+NAME="AEN3238"
 ></A
 ><H3
 ><A
@@ -2407,7 +2407,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2417,7 +2417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3261"
+NAME="AEN3253"
 ></A
 ><H3
 ><A
@@ -2478,7 +2478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2495,7 +2495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The attribute name, including namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2512,7 +2512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The attribute value</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2522,7 +2522,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3286"
+NAME="AEN3278"
 ></A
 ><H3
 ><A
@@ -2580,7 +2580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2597,7 +2597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The element name, including namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2614,7 +2614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An array of name/value attributes pairs, NULL terminated</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2624,7 +2624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3311"
+NAME="AEN3303"
 ></A
 ><H3
 ><A
@@ -2678,7 +2678,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2695,7 +2695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The element name</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2705,7 +2705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3331"
+NAME="AEN3323"
 ></A
 ><H3
 ><A
@@ -2759,7 +2759,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2776,7 +2776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The entity name</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2786,7 +2786,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3351"
+NAME="AEN3343"
 ></A
 ><H3
 ><A
@@ -2842,7 +2842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2859,7 +2859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2876,7 +2876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2886,7 +2886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3375"
+NAME="AEN3367"
 ></A
 ><H3
 ><A
@@ -2942,7 +2942,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2959,7 +2959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2976,7 +2976,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2986,7 +2986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3399"
+NAME="AEN3391"
 ></A
 ><H3
 ><A
@@ -3044,7 +3044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3061,7 +3061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the target name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3078,7 +3078,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the PI data's</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3088,7 +3088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3424"
+NAME="AEN3416"
 ></A
 ><H3
 ><A
@@ -3146,7 +3146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3163,7 +3163,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace associated URN</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3180,7 +3180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3190,7 +3190,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3449"
+NAME="AEN3441"
 ></A
 ><H3
 ><A
@@ -3244,7 +3244,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3261,7 +3261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3271,7 +3271,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3469"
+NAME="AEN3461"
 ></A
 ><H3
 ><A
@@ -3324,7 +3324,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3339,7 +3339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNsPtr or NULL if none</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3349,7 +3349,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3489"
+NAME="AEN3481"
 ></A
 ><H3
 ><A
@@ -3404,7 +3404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3421,7 +3421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace to check against</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3436,7 +3436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3446,7 +3446,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3513"
+NAME="AEN3505"
 ></A
 ><H3
 ><A
@@ -3504,7 +3504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3521,7 +3521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace associated URN</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3538,7 +3538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3548,7 +3548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3538"
+NAME="AEN3530"
 ></A
 ><H3
 ><A
@@ -3602,7 +3602,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3619,7 +3619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3629,7 +3629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3558"
+NAME="AEN3550"
 ></A
 ><H3
 ><A
@@ -3684,7 +3684,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3701,7 +3701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The pcdata content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3718,7 +3718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the block length</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3728,7 +3728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3582"
+NAME="AEN3574"
 ></A
 ><H3
 ><A
@@ -3756,7 +3756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3588"
+NAME="AEN3580"
 ></A
 ><H3
 ><A
@@ -3784,7 +3784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3594"
+NAME="AEN3586"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-tree.html b/doc/html/gnome-xml-tree.html
index 45b38bb..e89893e 100644
--- a/doc/html/gnome-xml-tree.html
+++ b/doc/html/gnome-xml-tree.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3605"
+NAME="AEN3597"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3608"
+NAME="AEN3600"
 ></A
 ><H2
 >Synopsis</H2
@@ -1605,7 +1605,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4011"
+NAME="AEN4003"
 ></A
 ><H2
 >Description</H2
@@ -1615,14 +1615,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4014"
+NAME="AEN4006"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4016"
+NAME="AEN4008"
 ></A
 ><H3
 ><A
@@ -1671,33 +1671,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4021"
+NAME="AEN4013"
 ></A
 ><H3
 ><A
 NAME="XMLCHAR"
 ></A
 >xmlChar</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef unsigned char xmlChar;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4026"
+NAME="AEN4017"
 ></A
 ><H3
 ><A
@@ -1713,7 +1700,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define CHAR xmlChar</PRE
+>#define     CHAR</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1723,7 +1710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4031"
+NAME="AEN4022"
 ></A
 ><H3
 ><A
@@ -1739,7 +1726,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define BAD_CAST (xmlChar *)</PRE
+>#define     BAD_CAST</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1749,7 +1736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4036"
+NAME="AEN4027"
 ></A
 ><H3
 ><A
@@ -1779,33 +1766,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4041"
+NAME="AEN4032"
 ></A
 ><H3
 ><A
 NAME="XMLNOTATIONPTR"
 ></A
 >xmlNotationPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNotation *xmlNotationPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4046"
+NAME="AEN4036"
 ></A
 ><H3
 ><A
@@ -1842,7 +1816,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4051"
+NAME="AEN4041"
 ></A
 ><H3
 ><A
@@ -1873,7 +1847,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4056"
+NAME="AEN4046"
 ></A
 ><H3
 ><A
@@ -1902,33 +1876,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4061"
+NAME="AEN4051"
 ></A
 ><H3
 ><A
 NAME="XMLENUMERATIONPTR"
 ></A
 >xmlEnumerationPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlEnumeration *xmlEnumerationPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4066"
+NAME="AEN4055"
 ></A
 ><H3
 ><A
@@ -1974,33 +1935,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4071"
+NAME="AEN4060"
 ></A
 ><H3
 ><A
 NAME="XMLATTRIBUTEPTR"
 ></A
 >xmlAttributePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlAttribute *xmlAttributePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4076"
+NAME="AEN4064"
 ></A
 ><H3
 ><A
@@ -2031,7 +1979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4081"
+NAME="AEN4069"
 ></A
 ><H3
 ><A
@@ -2062,7 +2010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4086"
+NAME="AEN4074"
 ></A
 ><H3
 ><A
@@ -2094,33 +2042,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4091"
+NAME="AEN4079"
 ></A
 ><H3
 ><A
 NAME="XMLELEMENTCONTENTPTR"
 ></A
 >xmlElementContentPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlElementContent *xmlElementContentPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4096"
+NAME="AEN4083"
 ></A
 ><H3
 ><A
@@ -2151,7 +2086,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4101"
+NAME="AEN4088"
 ></A
 ><H3
 ><A
@@ -2194,33 +2129,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4106"
+NAME="AEN4093"
 ></A
 ><H3
 ><A
 NAME="XMLELEMENTPTR"
 ></A
 >xmlElementPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlElement *xmlElementPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4111"
+NAME="AEN4097"
 ></A
 ><H3
 ><A
@@ -2249,7 +2171,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4116"
+NAME="AEN4102"
 ></A
 ><H3
 ><A
@@ -2280,33 +2202,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4121"
+NAME="AEN4107"
 ></A
 ><H3
 ><A
 NAME="XMLNSPTR"
 ></A
 >xmlNsPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNs *xmlNsPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4126"
+NAME="AEN4111"
 ></A
 ><H3
 ><A
@@ -2352,33 +2261,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4131"
+NAME="AEN4116"
 ></A
 ><H3
 ><A
 NAME="XMLDTDPTR"
 ></A
 >xmlDtdPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlDtd *xmlDtdPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4136"
+NAME="AEN4120"
 ></A
 ><H3
 ><A
@@ -2418,33 +2314,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4141"
+NAME="AEN4125"
 ></A
 ><H3
 ><A
 NAME="XMLATTRPTR"
 ></A
 >xmlAttrPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlAttr *xmlAttrPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4146"
+NAME="AEN4129"
 ></A
 ><H3
 ><A
@@ -2474,33 +2357,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4151"
+NAME="AEN4134"
 ></A
 ><H3
 ><A
 NAME="XMLIDPTR"
 ></A
 >xmlIDPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlID *xmlIDPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4156"
+NAME="AEN4138"
 ></A
 ><H3
 ><A
@@ -2530,33 +2400,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4161"
+NAME="AEN4143"
 ></A
 ><H3
 ><A
 NAME="XMLREFPTR"
 ></A
 >xmlRefPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRef *xmlRefPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4166"
+NAME="AEN4147"
 ></A
 ><H3
 ><A
@@ -2585,7 +2442,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4171"
+NAME="AEN4152"
 ></A
 ><H3
 ><A
@@ -2616,33 +2473,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4176"
+NAME="AEN4157"
 ></A
 ><H3
 ><A
 NAME="XMLBUFFERPTR"
 ></A
 >xmlBufferPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlBuffer *xmlBufferPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4181"
+NAME="AEN4161"
 ></A
 ><H3
 ><A
@@ -2690,33 +2534,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4186"
+NAME="AEN4166"
 ></A
 ><H3
 ><A
 NAME="XMLNODEPTR"
 ></A
 >xmlNodePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNode *xmlNodePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4191"
+NAME="AEN4170"
 ></A
 ><H3
 ><A
@@ -2768,33 +2599,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4196"
+NAME="AEN4175"
 ></A
 ><H3
 ><A
 NAME="XMLDOCPTR"
 ></A
 >xmlDocPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlDoc *xmlDocPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4201"
+NAME="AEN4179"
 ></A
 ><H3
 ><A
@@ -2810,7 +2628,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlChildrenNode children</PRE
+>#define     xmlChildrenNode</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2820,7 +2638,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4206"
+NAME="AEN4184"
 ></A
 ><H3
 ><A
@@ -2836,7 +2654,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlRootNode children</PRE
+>#define     xmlRootNode</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2846,7 +2664,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4211"
+NAME="AEN4189"
 ></A
 ><H3
 ><A
@@ -2872,7 +2690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4216"
+NAME="AEN4194"
 ></A
 ><H3
 ><A
@@ -2898,7 +2716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4221"
+NAME="AEN4199"
 ></A
 ><H3
 ><A
@@ -2924,7 +2742,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4226"
+NAME="AEN4204"
 ></A
 ><H3
 ><A
@@ -2950,7 +2768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4231"
+NAME="AEN4209"
 ></A
 ><H3
 ><A
@@ -2976,7 +2794,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4236"
+NAME="AEN4214"
 ></A
 ><H3
 ><A
@@ -3027,7 +2845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new structure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3037,7 +2855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4252"
+NAME="AEN4230"
 ></A
 ><H3
 ><A
@@ -3093,7 +2911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> initial size of buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3108,7 +2926,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new structure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3118,7 +2936,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4273"
+NAME="AEN4251"
 ></A
 ><H3
 ><A
@@ -3171,7 +2989,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3181,7 +2999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4289"
+NAME="AEN4267"
 ></A
 ><H3
 ><A
@@ -3238,7 +3056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3255,7 +3073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3270,7 +3088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar written</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3280,7 +3098,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4314"
+NAME="AEN4292"
 ></A
 ><H3
 ><A
@@ -3339,7 +3157,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3356,7 +3174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3373,7 +3191,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to add</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3383,7 +3201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4339"
+NAME="AEN4317"
 ></A
 ><H3
 ><A
@@ -3447,7 +3265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3464,7 +3282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3481,7 +3299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to add</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3491,7 +3309,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4365"
+NAME="AEN4343"
 ></A
 ><H3
 ><A
@@ -3548,7 +3366,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3565,7 +3383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3575,7 +3393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4386"
+NAME="AEN4364"
 ></A
 ><H3
 ><A
@@ -3629,7 +3447,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3646,7 +3464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the C char string</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3656,7 +3474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4406"
+NAME="AEN4384"
 ></A
 ><H3
 ><A
@@ -3710,7 +3528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3727,7 +3545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to remove</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3742,7 +3560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar removed, or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3752,7 +3570,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4430"
+NAME="AEN4408"
 ></A
 ><H3
 ><A
@@ -3806,7 +3624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3823,7 +3641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the minimum free sie to allocate</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3838,7 +3656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new available space or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3848,7 +3666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4454"
+NAME="AEN4432"
 ></A
 ><H3
 ><A
@@ -3901,7 +3719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3911,7 +3729,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4470"
+NAME="AEN4448"
 ></A
 ><H3
 ><A
@@ -3967,7 +3785,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to resize</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3982,7 +3800,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the internal content</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3992,7 +3810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4491"
+NAME="AEN4469"
 ></A
 ><H3
 ><A
@@ -4068,7 +3886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4510"
+NAME="AEN4488"
 ></A
 ><H3
 ><A
@@ -4125,7 +3943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to free</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4142,7 +3960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  allocation scheme to use</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4152,7 +3970,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4531"
+NAME="AEN4509"
 ></A
 ><H3
 ><A
@@ -4205,7 +4023,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4220,7 +4038,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the length of data in the internal content</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4230,7 +4048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4551"
+NAME="AEN4529"
 ></A
 ><H3
 ><A
@@ -4298,7 +4116,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4315,7 +4133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4332,7 +4150,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4349,7 +4167,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4364,7 +4182,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new DTD structure</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4374,7 +4192,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4587"
+NAME="AEN4565"
 ></A
 ><H3
 ><A
@@ -4446,7 +4264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4463,7 +4281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4480,7 +4298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4497,7 +4315,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4512,7 +4330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new DTD structure</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4522,7 +4340,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4624"
+NAME="AEN4602"
 ></A
 ><H3
 ><A
@@ -4578,7 +4396,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4593,7 +4411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the DTD structure or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4603,7 +4421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4645"
+NAME="AEN4623"
 ></A
 ><H3
 ><A
@@ -4656,7 +4474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD structure to free up</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4666,7 +4484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4661"
+NAME="AEN4639"
 ></A
 ><H3
 ><A
@@ -4732,7 +4550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document carrying the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4749,7 +4567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4766,7 +4584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the prefix for the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4781,7 +4599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL this functionnality had been removed</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4791,7 +4609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4692"
+NAME="AEN4670"
 ></A
 ><H3
 ><A
@@ -4859,7 +4677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4876,7 +4694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4893,7 +4711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the prefix for the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4908,7 +4726,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->returns a new namespace pointer or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4918,7 +4736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4723"
+NAME="AEN4701"
 ></A
 ><H3
 ><A
@@ -4971,7 +4789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4981,7 +4799,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4739"
+NAME="AEN4717"
 ></A
 ><H3
 ><A
@@ -5037,7 +4855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  xmlChar string giving the version of XML "1.0"</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5052,7 +4870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5062,7 +4880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4760"
+NAME="AEN4738"
 ></A
 ><H3
 ><A
@@ -5115,8 +4933,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document
-@:  </TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5126,7 +4943,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4776"
+NAME="AEN4754"
 ></A
 ><H3
 ><A
@@ -5190,7 +5007,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5207,7 +5024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5224,7 +5041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5239,7 +5056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5249,7 +5066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4807"
+NAME="AEN4785"
 ></A
 ><H3
 ><A
@@ -5313,7 +5130,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the holding node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5330,7 +5147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5347,7 +5164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5362,7 +5179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5372,7 +5189,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4838"
+NAME="AEN4816"
 ></A
 ><H3
 ><A
@@ -5440,7 +5257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the holding node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5457,7 +5274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5474,7 +5291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5491,7 +5308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5506,7 +5323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5516,7 +5333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4874"
+NAME="AEN4852"
 ></A
 ><H3
 ><A
@@ -5569,7 +5386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first property in the list</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5579,7 +5396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4890"
+NAME="AEN4868"
 ></A
 ><H3
 ><A
@@ -5632,7 +5449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5642,7 +5459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4906"
+NAME="AEN4884"
 ></A
 ><H3
 ><A
@@ -5702,7 +5519,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element where the attribute will be grafted</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5719,7 +5536,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5734,7 +5551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlAttrPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5744,7 +5561,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4932"
+NAME="AEN4910"
 ></A
 ><H3
 ><A
@@ -5804,7 +5621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element where the attributes will be grafted</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5821,7 +5638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5836,7 +5653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlAttrPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5846,7 +5663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4958"
+NAME="AEN4936"
 ></A
 ><H3
 ><A
@@ -5902,7 +5719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the dtd</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5917,7 +5734,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlDtdPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5927,7 +5744,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4979"
+NAME="AEN4957"
 ></A
 ><H3
 ><A
@@ -5985,7 +5802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6002,7 +5819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6017,7 +5834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlDocPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6027,7 +5844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5004"
+NAME="AEN4982"
 ></A
 ><H3
 ><A
@@ -6121,7 +5938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6138,7 +5955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6155,7 +5972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6172,7 +5989,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML text content if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6187,7 +6004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6197,7 +6014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5045"
+NAME="AEN5023"
 ></A
 ><H3
 ><A
@@ -6276,7 +6093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6293,7 +6110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6310,7 +6127,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6327,7 +6144,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6342,7 +6159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6352,7 +6169,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5083"
+NAME="AEN5061"
 ></A
 ><H3
 ><A
@@ -6417,7 +6234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6434,7 +6251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6449,7 +6266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6459,7 +6276,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5110"
+NAME="AEN5088"
 ></A
 ><H3
 ><A
@@ -6559,7 +6376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6576,7 +6393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6593,7 +6410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the child</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6610,7 +6427,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML content of the child if any.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6625,7 +6442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6635,7 +6452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5152"
+NAME="AEN5130"
 ></A
 ><H3
 ><A
@@ -6720,7 +6537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6737,7 +6554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6754,7 +6571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the child</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6771,7 +6588,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content of the child if any.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6786,7 +6603,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6796,7 +6613,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5191"
+NAME="AEN5169"
 ></A
 ><H3
 ><A
@@ -6856,7 +6673,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6873,7 +6690,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6888,7 +6705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6898,7 +6715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5217"
+NAME="AEN5195"
 ></A
 ><H3
 ><A
@@ -6954,7 +6771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6969,7 +6786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6979,7 +6796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5238"
+NAME="AEN5216"
 ></A
 ><H3
 ><A
@@ -7039,7 +6856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the processing instruction name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7056,7 +6873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the PI content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7071,7 +6888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7081,7 +6898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5264"
+NAME="AEN5242"
 ></A
 ><H3
 ><A
@@ -7143,7 +6960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7160,7 +6977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7177,7 +6994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text len.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7192,7 +7009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7202,7 +7019,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5294"
+NAME="AEN5272"
 ></A
 ><H3
 ><A
@@ -7259,7 +7076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7276,7 +7093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text len.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7291,7 +7108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7301,7 +7118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5319"
+NAME="AEN5297"
 ></A
 ><H3
 ><A
@@ -7361,7 +7178,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7378,7 +7195,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7393,7 +7210,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7403,7 +7220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5345"
+NAME="AEN5323"
 ></A
 ><H3
 ><A
@@ -7459,7 +7276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7474,7 +7291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7484,7 +7301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5366"
+NAME="AEN5344"
 ></A
 ><H3
 ><A
@@ -7545,7 +7362,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7562,7 +7379,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the CData block content content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7579,7 +7396,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7594,7 +7411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7604,7 +7421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5396"
+NAME="AEN5374"
 ></A
 ><H3
 ><A
@@ -7664,7 +7481,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7681,7 +7498,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char ref string, starting with # or "&amp;# ... ;"</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7696,7 +7513,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7706,7 +7523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5422"
+NAME="AEN5400"
 ></A
 ><H3
 ><A
@@ -7766,7 +7583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7783,7 +7600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the reference name, or the reference string with &amp; and ;</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7798,7 +7615,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7808,7 +7625,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5448"
+NAME="AEN5426"
 ></A
 ><H3
 ><A
@@ -7865,7 +7682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7882,7 +7699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7897,7 +7714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7907,7 +7724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5473"
+NAME="AEN5451"
 ></A
 ><H3
 ><A
@@ -7963,7 +7780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7978,7 +7795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7988,7 +7805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5494"
+NAME="AEN5472"
 ></A
 ><H3
 ><A
@@ -8044,7 +7861,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document owning the fragment</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8059,7 +7876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8069,7 +7886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5515"
+NAME="AEN5493"
 ></A
 ><H3
 ><A
@@ -8126,7 +7943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8141,7 +7958,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNodePtr for the root or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8151,7 +7968,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5536"
+NAME="AEN5514"
 ></A
 ><H3
 ><A
@@ -8207,7 +8024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8222,7 +8039,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last child or NULL if none.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8232,7 +8049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5557"
+NAME="AEN5535"
 ></A
 ><H3
 ><A
@@ -8285,7 +8102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8300,7 +8117,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 yes, 0 no</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8310,7 +8127,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5577"
+NAME="AEN5555"
 ></A
 ><H3
 ><A
@@ -8364,7 +8181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8379,7 +8196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 yes, 0 no</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8389,7 +8206,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5597"
+NAME="AEN5575"
 ></A
 ><H3
 ><A
@@ -8450,7 +8267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8467,7 +8284,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new document root element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8482,7 +8299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the old root element if any was found</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8492,7 +8309,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5623"
+NAME="AEN5601"
 ></A
 ><H3
 ><A
@@ -8550,7 +8367,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8567,7 +8384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new tag name</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8577,7 +8394,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5644"
+NAME="AEN5622"
 ></A
 ><H3
 ><A
@@ -8642,7 +8459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8659,7 +8476,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8674,7 +8491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the child or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8684,7 +8501,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5671"
+NAME="AEN5649"
 ></A
 ><H3
 ><A
@@ -8744,7 +8561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8761,7 +8578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8776,7 +8593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last child or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8786,7 +8603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5697"
+NAME="AEN5675"
 ></A
 ><H3
 ><A
@@ -8848,7 +8665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the old node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8865,7 +8682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8880,7 +8697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the old node</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8890,7 +8707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5723"
+NAME="AEN5701"
 ></A
 ><H3
 ><A
@@ -8962,7 +8779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8979,7 +8796,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8994,7 +8811,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9004,7 +8821,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5751"
+NAME="AEN5729"
 ></A
 ><H3
 ><A
@@ -9076,7 +8893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9093,7 +8910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9108,7 +8925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9118,7 +8935,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5779"
+NAME="AEN5757"
 ></A
 ><H3
 ><A
@@ -9190,7 +9007,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9207,7 +9024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9222,7 +9039,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9232,7 +9049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5807"
+NAME="AEN5785"
 ></A
 ><H3
 ><A
@@ -9285,7 +9102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9295,7 +9112,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5823"
+NAME="AEN5801"
 ></A
 ><H3
 ><A
@@ -9355,7 +9172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first text node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9372,7 +9189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second text node being merged</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9387,7 +9204,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the first text node augmented</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9397,7 +9214,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5849"
+NAME="AEN5827"
 ></A
 ><H3
 ><A
@@ -9455,7 +9272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9472,7 +9289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9489,12 +9306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-> lenght</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9504,7 +9316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5875"
+NAME="AEN5852"
 ></A
 ><H3
 ><A
@@ -9558,7 +9370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9568,7 +9380,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5891"
+NAME="AEN5868"
 ></A
 ><H3
 ><A
@@ -9625,7 +9437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9635,7 +9447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5908"
+NAME="AEN5885"
 ></A
 ><H3
 ><A
@@ -9710,7 +9522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9727,7 +9539,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9744,7 +9556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9759,7 +9571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace pointer or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9769,7 +9581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5940"
+NAME="AEN5917"
 ></A
 ><H3
 ><A
@@ -9834,7 +9646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9851,7 +9663,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9868,7 +9680,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9883,7 +9695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace pointer or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9893,7 +9705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5971"
+NAME="AEN5948"
 ></A
 ><H3
 ><A
@@ -9953,7 +9765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9970,7 +9782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9985,9 +9797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an NULL terminated array of all the xmlNsPtr found
-that need to be freed by the caller or NULL if no
-namespace if defined</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9997,7 +9807,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5997"
+NAME="AEN5974"
 ></A
 ><H3
 ><A
@@ -10054,7 +9864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node in the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10071,7 +9881,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10081,7 +9891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6018"
+NAME="AEN5995"
 ></A
 ><H3
 ><A
@@ -10137,7 +9947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10152,7 +9962,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNsPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10162,7 +9972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6039"
+NAME="AEN6016"
 ></A
 ><H3
 ><A
@@ -10218,7 +10028,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10233,7 +10043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNsPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10243,7 +10053,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6060"
+NAME="AEN6037"
 ></A
 ><H3
 ><A
@@ -10307,7 +10117,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10324,7 +10134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10341,7 +10151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10356,7 +10166,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10366,7 +10176,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6091"
+NAME="AEN6068"
 ></A
 ><H3
 ><A
@@ -10432,7 +10242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10449,7 +10259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10464,8 +10274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute value or NULL if not found.
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10475,7 +10284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6118"
+NAME="AEN6095"
 ></A
 ><H3
 ><A
@@ -10540,7 +10349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10557,7 +10366,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10572,8 +10381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute or the attribute declaration or NULL if 
-neither was found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10583,7 +10391,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6145"
+NAME="AEN6122"
 ></A
 ><H3
 ><A
@@ -10654,7 +10462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10671,7 +10479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10688,7 +10496,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI of the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10703,8 +10511,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute value or NULL if not found.
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10714,7 +10521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6177"
+NAME="AEN6154"
 ></A
 ><H3
 ><A
@@ -10775,7 +10582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10792,7 +10599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10807,7 +10614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the first child</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10817,7 +10624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6203"
+NAME="AEN6180"
 ></A
 ><H3
 ><A
@@ -10879,7 +10686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10896,7 +10703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10913,7 +10720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the string value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10928,7 +10735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the first child</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10938,7 +10745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6233"
+NAME="AEN6210"
 ></A
 ><H3
 ><A
@@ -11000,7 +10807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11017,7 +10824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Node list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11034,7 +10841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should we replace entity contents or show their external form</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11049,7 +10856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the string copy, the calller must free it.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11059,7 +10866,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6263"
+NAME="AEN6240"
 ></A
 ><H3
 ><A
@@ -11125,7 +10932,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11142,7 +10949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Node list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11159,7 +10966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should we replace entity contents or show their external form</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11174,7 +10981,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the string copy, the calller must free it.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11184,7 +10991,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6294"
+NAME="AEN6271"
 ></A
 ><H3
 ><A
@@ -11241,7 +11048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11258,7 +11065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new value of the content</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11268,7 +11075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6315"
+NAME="AEN6292"
 ></A
 ><H3
 ><A
@@ -11326,7 +11133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11343,7 +11150,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new value of the content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11360,12 +11167,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11375,7 +11177,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6341"
+NAME="AEN6317"
 ></A
 ><H3
 ><A
@@ -11432,7 +11234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11449,7 +11251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra content</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11459,7 +11261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6362"
+NAME="AEN6338"
 ></A
 ><H3
 ><A
@@ -11517,7 +11319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11534,7 +11336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11551,12 +11353,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11566,7 +11363,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6388"
+NAME="AEN6363"
 ></A
 ><H3
 ><A
@@ -11625,7 +11422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11640,8 +11437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL if no content is available.
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11651,7 +11447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6409"
+NAME="AEN6384"
 ></A
 ><H3
 ><A
@@ -11708,7 +11504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11723,8 +11519,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the lang value, or NULL if not found
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11734,7 +11529,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6430"
+NAME="AEN6405"
 ></A
 ><H3
 ><A
@@ -11792,7 +11587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11809,7 +11604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the langage description</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11819,7 +11614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6451"
+NAME="AEN6426"
 ></A
 ><H3
 ><A
@@ -11873,7 +11668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11888,7 +11683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if xml:space is not inheried, 0 if "default", 1 if "preserve"</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11898,7 +11693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6471"
+NAME="AEN6446"
 ></A
 ><H3
 ><A
@@ -11959,7 +11754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document the node pertains to</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11976,7 +11771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11991,8 +11786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the base URL, or NULL if not found
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12002,7 +11796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6497"
+NAME="AEN6472"
 ></A
 ><H3
 ><A
@@ -12071,7 +11865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if success and -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12081,7 +11875,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6517"
+NAME="AEN6492"
 ></A
 ><H3
 ><A
@@ -12157,7 +11951,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6536"
+NAME="AEN6511"
 ></A
 ><H3
 ><A
@@ -12215,7 +12009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12232,7 +12026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12242,7 +12036,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6557"
+NAME="AEN6532"
 ></A
 ><H3
 ><A
@@ -12297,7 +12091,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12314,7 +12108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12324,7 +12118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6577"
+NAME="AEN6552"
 ></A
 ><H3
 ><A
@@ -12383,7 +12177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12400,7 +12194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12410,7 +12204,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6598"
+NAME="AEN6573"
 ></A
 ><H3
 ><A
@@ -12478,7 +12272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12495,7 +12289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node defining the subtree to reconciliate</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12510,7 +12304,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of namespace declarations created or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12520,7 +12314,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6624"
+NAME="AEN6599"
 ></A
 ><H3
 ><A
@@ -12579,7 +12373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12596,7 +12390,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12613,7 +12407,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory lenght</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12623,7 +12417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6649"
+NAME="AEN6624"
 ></A
 ><H3
 ><A
@@ -12680,7 +12474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE*</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12697,7 +12491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12712,7 +12506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12722,7 +12516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6674"
+NAME="AEN6649"
 ></A
 ><H3
 ><A
@@ -12783,7 +12577,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12800,7 +12594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12817,7 +12611,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12827,7 +12621,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6700"
+NAME="AEN6675"
 ></A
 ><H3
 ><A
@@ -12888,7 +12682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12905,7 +12699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12920,7 +12714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12930,7 +12724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6725"
+NAME="AEN6700"
 ></A
 ><H3
 ><A
@@ -12993,7 +12787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13010,7 +12804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13027,7 +12821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13044,7 +12838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the imbrication level for indenting</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13061,7 +12855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> is formatting allowed</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -13071,7 +12865,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6759"
+NAME="AEN6734"
 ></A
 ><H3
 ><A
@@ -13126,7 +12920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13143,7 +12937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13160,7 +12954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of an encoding (or NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13175,7 +12969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -13185,7 +12979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6787"
+NAME="AEN6762"
 ></A
 ><H3
 ><A
@@ -13238,7 +13032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13253,7 +13047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 (uncompressed) to 9 (max compression)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -13263,7 +13057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6807"
+NAME="AEN6782"
 ></A
 ><H3
 ><A
@@ -13318,7 +13112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13335,7 +13129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ratio</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -13345,7 +13139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6827"
+NAME="AEN6802"
 ></A
 ><H3
 ><A
@@ -13393,7 +13187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 (uncompressed) to 9 (max compression)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -13403,7 +13197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6842"
+NAME="AEN6817"
 ></A
 ><H3
 ><A
@@ -13454,7 +13248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ratio</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-valid.html b/doc/html/gnome-xml-valid.html
index 8461047..a6b0607 100644
--- a/doc/html/gnome-xml-valid.html
+++ b/doc/html/gnome-xml-valid.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7374"
+NAME="AEN7347"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7377"
+NAME="AEN7350"
 ></A
 ><H2
 >Synopsis</H2
@@ -938,7 +938,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7594"
+NAME="AEN7567"
 ></A
 ><H2
 >Description</H2
@@ -948,14 +948,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7597"
+NAME="AEN7570"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7599"
+NAME="AEN7572"
 ></A
 ><H3
 ><A
@@ -1049,7 +1049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7621"
+NAME="AEN7594"
 ></A
 ><H3
 ><A
@@ -1143,7 +1143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7643"
+NAME="AEN7616"
 ></A
 ><H3
 ><A
@@ -1181,33 +1181,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7648"
+NAME="AEN7621"
 ></A
 ><H3
 ><A
 NAME="XMLVALIDCTXTPTR"
 ></A
 >xmlValidCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlValidCtxt *xmlValidCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7653"
+NAME="AEN7625"
 ></A
 ><H3
 ><A
@@ -1223,7 +1210,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_NOTATION_TABLE	32</PRE
+>#define     XML_MIN_NOTATION_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1233,7 +1220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7658"
+NAME="AEN7630"
 ></A
 ><H3
 ><A
@@ -1263,33 +1250,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7663"
+NAME="AEN7635"
 ></A
 ><H3
 ><A
 NAME="XMLNOTATIONTABLEPTR"
 ></A
 >xmlNotationTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNotationTable *xmlNotationTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7668"
+NAME="AEN7639"
 ></A
 ><H3
 ><A
@@ -1305,7 +1279,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_ELEMENT_TABLE	32</PRE
+>#define     XML_MIN_ELEMENT_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1315,7 +1289,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7673"
+NAME="AEN7644"
 ></A
 ><H3
 ><A
@@ -1346,33 +1320,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7678"
+NAME="AEN7649"
 ></A
 ><H3
 ><A
 NAME="XMLELEMENTTABLEPTR"
 ></A
 >xmlElementTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlElementTable *xmlElementTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7683"
+NAME="AEN7653"
 ></A
 ><H3
 ><A
@@ -1388,7 +1349,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_ATTRIBUTE_TABLE	32</PRE
+>#define     XML_MIN_ATTRIBUTE_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1398,7 +1359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7688"
+NAME="AEN7658"
 ></A
 ><H3
 ><A
@@ -1428,33 +1389,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7693"
+NAME="AEN7663"
 ></A
 ><H3
 ><A
 NAME="XMLATTRIBUTETABLEPTR"
 ></A
 >xmlAttributeTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlAttributeTable *xmlAttributeTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7698"
+NAME="AEN7667"
 ></A
 ><H3
 ><A
@@ -1470,7 +1418,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_ID_TABLE	32</PRE
+>#define     XML_MIN_ID_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1480,7 +1428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7703"
+NAME="AEN7672"
 ></A
 ><H3
 ><A
@@ -1510,33 +1458,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7708"
+NAME="AEN7677"
 ></A
 ><H3
 ><A
 NAME="XMLIDTABLEPTR"
 ></A
 >xmlIDTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlIDTable *xmlIDTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7713"
+NAME="AEN7681"
 ></A
 ><H3
 ><A
@@ -1552,7 +1487,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_REF_TABLE	32</PRE
+>#define     XML_MIN_REF_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1562,7 +1497,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7718"
+NAME="AEN7686"
 ></A
 ><H3
 ><A
@@ -1592,33 +1527,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7723"
+NAME="AEN7691"
 ></A
 ><H3
 ><A
 NAME="XMLREFTABLEPTR"
 ></A
 >xmlRefTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRefTable *xmlRefTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7728"
+NAME="AEN7695"
 ></A
 ><H3
 ><A
@@ -1690,7 +1612,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1707,7 +1629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1724,7 +1646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1741,7 +1663,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public identifier or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1758,7 +1680,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system identifier or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1773,7 +1695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1783,7 +1705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7769"
+NAME="AEN7736"
 ></A
 ><H3
 ><A
@@ -1839,7 +1761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1854,7 +1776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlNotationTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1864,7 +1786,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7790"
+NAME="AEN7757"
 ></A
 ><H3
 ><A
@@ -1917,7 +1839,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An notation table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1927,7 +1849,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7806"
+NAME="AEN7773"
 ></A
 ><H3
 ><A
@@ -1984,7 +1906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2001,7 +1923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation declaration</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2011,7 +1933,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7827"
+NAME="AEN7794"
 ></A
 ><H3
 ><A
@@ -2068,7 +1990,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2085,7 +2007,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2095,7 +2017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7848"
+NAME="AEN7815"
 ></A
 ><H3
 ><A
@@ -2155,7 +2077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the subelement name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2172,7 +2094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of element content decl</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2187,7 +2109,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new element content structure</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2197,7 +2119,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7874"
+NAME="AEN7841"
 ></A
 ><H3
 ><A
@@ -2253,7 +2175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element content pointer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2268,7 +2190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlElementContentPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2278,7 +2200,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7895"
+NAME="AEN7862"
 ></A
 ><H3
 ><A
@@ -2331,7 +2253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element content tree to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2341,7 +2263,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7911"
+NAME="AEN7878"
 ></A
 ><H3
 ><A
@@ -2397,7 +2319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an output buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2414,7 +2336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2431,7 +2353,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 1 if one must print the englobing parenthesis, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2441,7 +2363,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7935"
+NAME="AEN7902"
 ></A
 ><H3
 ><A
@@ -2513,7 +2435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2530,7 +2452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2547,7 +2469,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2564,7 +2486,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2581,7 +2503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element content tree or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2596,7 +2518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2606,7 +2528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7976"
+NAME="AEN7943"
 ></A
 ><H3
 ><A
@@ -2662,7 +2584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2677,7 +2599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlElementTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2687,7 +2609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7997"
+NAME="AEN7964"
 ></A
 ><H3
 ><A
@@ -2740,7 +2662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2750,7 +2672,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8013"
+NAME="AEN7980"
 ></A
 ><H3
 ><A
@@ -2807,7 +2729,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2824,7 +2746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2834,7 +2756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8034"
+NAME="AEN8001"
 ></A
 ><H3
 ><A
@@ -2892,7 +2814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2909,7 +2831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2919,7 +2841,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8055"
+NAME="AEN8022"
 ></A
 ><H3
 ><A
@@ -2975,7 +2897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2990,8 +2912,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEnumerationPtr just created or NULL in case
-of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3001,7 +2922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8076"
+NAME="AEN8043"
 ></A
 ><H3
 ><A
@@ -3054,7 +2975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree to free.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3064,7 +2985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8092"
+NAME="AEN8059"
 ></A
 ><H3
 ><A
@@ -3120,7 +3041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree to copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3135,8 +3056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEnumerationPtr just created or NULL in case
-of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3146,7 +3066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8113"
+NAME="AEN8080"
 ></A
 ><H3
 ><A
@@ -3240,7 +3160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3257,7 +3177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3274,7 +3194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3291,7 +3211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3308,7 +3228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3325,7 +3245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3342,7 +3262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute default type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3359,7 +3279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3376,7 +3296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if it's an enumeration, the associated list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3391,7 +3311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not new, othervise the attribute decl</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3401,7 +3321,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8175"
+NAME="AEN8142"
 ></A
 ><H3
 ><A
@@ -3457,7 +3377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3472,7 +3392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlAttributeTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3482,7 +3402,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8196"
+NAME="AEN8163"
 ></A
 ><H3
 ><A
@@ -3535,7 +3455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3545,7 +3465,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8212"
+NAME="AEN8179"
 ></A
 ><H3
 ><A
@@ -3602,7 +3522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3619,7 +3539,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3629,7 +3549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8233"
+NAME="AEN8200"
 ></A
 ><H3
 ><A
@@ -3687,7 +3607,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3704,7 +3624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute declaration</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3714,7 +3634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8254"
+NAME="AEN8221"
 ></A
 ><H3
 ><A
@@ -3782,7 +3702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3799,7 +3719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3816,7 +3736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3833,7 +3753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute holding the ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3848,7 +3768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new xmlIDPtr</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3858,7 +3778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8290"
+NAME="AEN8257"
 ></A
 ><H3
 ><A
@@ -3937,7 +3857,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8310"
+NAME="AEN8277"
 ></A
 ><H3
 ><A
@@ -3990,7 +3910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An id table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4000,7 +3920,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8326"
+NAME="AEN8293"
 ></A
 ><H3
 ><A
@@ -4060,7 +3980,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4077,7 +3997,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ID value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4092,7 +4012,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not found, otherwise the xmlAttrPtr defining the ID</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4102,7 +4022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8352"
+NAME="AEN8319"
 ></A
 ><H3
 ><A
@@ -4165,7 +4085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4182,7 +4102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4199,7 +4119,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4214,7 +4134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the lookup result</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4224,7 +4144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8382"
+NAME="AEN8349"
 ></A
 ><H3
 ><A
@@ -4281,7 +4201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4298,7 +4218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4313,7 +4233,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if the lookup failed and 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4323,7 +4243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8407"
+NAME="AEN8374"
 ></A
 ><H3
 ><A
@@ -4391,7 +4311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4408,7 +4328,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4425,7 +4345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4442,7 +4362,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute holding the Ref</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4457,7 +4377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new xmlRefPtr</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4467,7 +4387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8443"
+NAME="AEN8410"
 ></A
 ><H3
 ><A
@@ -4546,7 +4466,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8463"
+NAME="AEN8430"
 ></A
 ><H3
 ><A
@@ -4599,7 +4519,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An ref table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4609,7 +4529,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8479"
+NAME="AEN8446"
 ></A
 ><H3
 ><A
@@ -4672,7 +4592,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4689,7 +4609,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4706,7 +4626,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4721,7 +4641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the lookup result</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4731,7 +4651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8509"
+NAME="AEN8476"
 ></A
 ><H3
 ><A
@@ -4788,7 +4708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4805,7 +4725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4820,7 +4740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if the lookup failed and 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4830,7 +4750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8534"
+NAME="AEN8501"
 ></A
 ><H3
 ><A
@@ -4891,7 +4811,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4908,7 +4828,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4923,7 +4843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4933,7 +4853,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8559"
+NAME="AEN8526"
 ></A
 ><H3
 ><A
@@ -4999,7 +4919,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5016,7 +4936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5033,7 +4953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5048,7 +4968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5058,7 +4978,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8589"
+NAME="AEN8556"
 ></A
 ><H3
 ><A
@@ -5141,7 +5061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5158,7 +5078,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5175,7 +5095,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5192,7 +5112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5207,8 +5127,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new normalized string if normalization is needed, NULL otherwise
-the caller must free the returned value.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5218,7 +5137,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8629"
+NAME="AEN8596"
 ></A
 ><H3
 ><A
@@ -5286,7 +5205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5303,7 +5222,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5320,7 +5239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5335,7 +5254,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5345,7 +5264,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8660"
+NAME="AEN8627"
 ></A
 ><H3
 ><A
@@ -5417,7 +5336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5434,7 +5353,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5449,7 +5368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5459,7 +5378,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8689"
+NAME="AEN8656"
 ></A
 ><H3
 ><A
@@ -5524,7 +5443,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5541,7 +5460,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5558,7 +5477,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a notation definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5573,7 +5492,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5583,7 +5502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8719"
+NAME="AEN8686"
 ></A
 ><H3
 ><A
@@ -5646,7 +5565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5663,7 +5582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5680,7 +5599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a dtd instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5695,7 +5614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5705,7 +5624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8750"
+NAME="AEN8717"
 ></A
 ><H3
 ><A
@@ -5769,7 +5688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5786,7 +5705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5801,7 +5720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5811,7 +5730,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8776"
+NAME="AEN8743"
 ></A
 ><H3
 ><A
@@ -5872,7 +5791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5889,7 +5808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5904,7 +5823,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5914,7 +5833,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8802"
+NAME="AEN8769"
 ></A
 ><H3
 ><A
@@ -5975,7 +5894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5992,7 +5911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6009,7 +5928,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6024,7 +5943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6034,7 +5953,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8832"
+NAME="AEN8799"
 ></A
 ><H3
 ><A
@@ -6105,7 +6024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6122,7 +6041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6139,7 +6058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6154,7 +6073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6164,7 +6083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8864"
+NAME="AEN8831"
 ></A
 ><H3
 ><A
@@ -6245,7 +6164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6262,7 +6181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6279,7 +6198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6296,7 +6215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6313,7 +6232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value (without entities processing)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6328,7 +6247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6338,7 +6257,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8905"
+NAME="AEN8872"
 ></A
 ><H3
 ><A
@@ -6398,7 +6317,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6415,7 +6334,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6430,7 +6349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6440,7 +6359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8931"
+NAME="AEN8898"
 ></A
 ><H3
 ><A
@@ -6502,7 +6421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6519,7 +6438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6536,7 +6455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the notation name to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6551,7 +6470,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6561,7 +6480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8961"
+NAME="AEN8928"
 ></A
 ><H3
 ><A
@@ -6619,7 +6538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6636,7 +6555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6651,7 +6570,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if no, 1 if yes, and -1 if no element description is available</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6661,7 +6580,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8986"
+NAME="AEN8953"
 ></A
 ><H3
 ><A
@@ -6726,7 +6645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6743,7 +6662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6760,7 +6679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6775,7 +6694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlAttributePtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6785,7 +6704,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9017"
+NAME="AEN8984"
 ></A
 ><H3
 ><A
@@ -6845,7 +6764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6862,7 +6781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the notation name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6877,7 +6796,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNotationPtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6887,7 +6806,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9043"
+NAME="AEN9010"
 ></A
 ><H3
 ><A
@@ -6947,7 +6866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6964,7 +6883,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6979,7 +6898,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlElementPtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6989,7 +6908,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9069"
+NAME="AEN9036"
 ></A
 ><H3
 ><A
@@ -7072,7 +6991,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element to insert after</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7089,7 +7008,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element to insert next</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7106,7 +7025,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an array to store the list of child names</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7123,7 +7042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7138,14 +7057,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of element in the list, or -1 in case of error. If
-the function returns the value <TT
-CLASS="PARAMETER"
-><I
->max</I
-></TT
-> the caller is invited to grow the
-receiving array and retry.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7155,7 +7067,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9107"
+NAME="AEN9073"
 ></A
 ><H3
 ><A
@@ -7214,7 +7126,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element content tree</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7231,7 +7143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an array to store the list of child names</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7248,7 +7160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the number of element in the list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7265,7 +7177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7280,7 +7192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of element in the list, or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xml-error.html b/doc/html/gnome-xml-xml-error.html
index 3533b95..a8fb726 100644
--- a/doc/html/gnome-xml-xml-error.html
+++ b/doc/html/gnome-xml-xml-error.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9389"
+NAME="AEN9354"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9392"
+NAME="AEN9357"
 ></A
 ><H2
 >Synopsis</H2
@@ -187,7 +187,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9404"
+NAME="AEN9369"
 ></A
 ><H2
 >Description</H2
@@ -197,14 +197,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9407"
+NAME="AEN9372"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9409"
+NAME="AEN9374"
 ></A
 ><H3
 ><A
@@ -357,7 +357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9414"
+NAME="AEN9379"
 ></A
 ><H3
 ><A
@@ -410,7 +410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -427,7 +427,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -444,7 +444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -454,7 +454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9437"
+NAME="AEN9402"
 ></A
 ><H3
 ><A
@@ -507,7 +507,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -524,7 +524,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -541,7 +541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -551,7 +551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9460"
+NAME="AEN9425"
 ></A
 ><H3
 ><A
@@ -604,7 +604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -621,7 +621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -638,7 +638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -648,7 +648,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9483"
+NAME="AEN9448"
 ></A
 ><H3
 ><A
@@ -701,7 +701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -718,7 +718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -735,7 +735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -745,7 +745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9506"
+NAME="AEN9471"
 ></A
 ><H3
 ><A
@@ -798,7 +798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr input</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -808,7 +808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9522"
+NAME="AEN9487"
 ></A
 ><H3
 ><A
@@ -861,7 +861,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr input</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xmlio.html b/doc/html/gnome-xml-xmlio.html
index 009138f..2c75f40 100644
--- a/doc/html/gnome-xml-xmlio.html
+++ b/doc/html/gnome-xml-xmlio.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11622"
+NAME="AEN11845"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11625"
+NAME="AEN11848"
 ></A
 ><H2
 >Synopsis</H2
@@ -190,6 +190,11 @@
 HREF="gnome-xml-xmlio.html#XMLOUTPUTBUFFERPTR"
 >xmlOutputBufferPtr</A
 >;
+void        <A
+HREF="gnome-xml-xmlio.html#XMLREGISTERDEFAULTINPUTCALLBACKS"
+>xmlRegisterDefaultInputCallbacks</A
+>
+                                            (void);
 <A
 HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
 >xmlParserInputBufferPtr</A
@@ -328,6 +333,11 @@
 HREF="gnome-xml-xmlio.html#XMLINPUTCLOSECALLBACK"
 >xmlInputCloseCallback</A
 > close);
+void        <A
+HREF="gnome-xml-xmlio.html#XMLREGISTERDEFAULTOUTPUTCALLBACKS"
+>xmlRegisterDefaultOutputCallbacks</A
+>
+                                            (void);
 <A
 HREF="gnome-xml-xmlio.html#XMLOUTPUTBUFFERPTR"
 >xmlOutputBufferPtr</A
@@ -483,7 +493,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11713"
+NAME="AEN11938"
 ></A
 ><H2
 >Description</H2
@@ -493,14 +503,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11716"
+NAME="AEN11941"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11718"
+NAME="AEN11943"
 ></A
 ><H3
 ><A
@@ -573,7 +583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11736"
+NAME="AEN11961"
 ></A
 ><H3
 ><A
@@ -631,7 +641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11750"
+NAME="AEN11975"
 ></A
 ><H3
 ><A
@@ -740,7 +750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11776"
+NAME="AEN12001"
 ></A
 ><H3
 ><A
@@ -798,7 +808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11790"
+NAME="AEN12015"
 ></A
 ><H3
 ><A
@@ -833,33 +843,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11795"
+NAME="AEN12020"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERINPUTBUFFERPTR"
 ></A
 >xmlParserInputBufferPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserInputBuffer *xmlParserInputBufferPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11800"
+NAME="AEN12024"
 ></A
 ><H3
 ><A
@@ -932,7 +929,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11818"
+NAME="AEN12042"
 ></A
 ><H3
 ><A
@@ -990,7 +987,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11832"
+NAME="AEN12056"
 ></A
 ><H3
 ><A
@@ -1099,7 +1096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11858"
+NAME="AEN12082"
 ></A
 ><H3
 ><A
@@ -1157,7 +1154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11872"
+NAME="AEN12096"
 ></A
 ><H3
 ><A
@@ -1193,13 +1190,26 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11877"
+NAME="AEN12101"
 ></A
 ><H3
 ><A
 NAME="XMLOUTPUTBUFFERPTR"
 ></A
 >xmlOutputBufferPtr</H3
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12105"
+></A
+><H3
+><A
+NAME="XMLREGISTERDEFAULTINPUTCALLBACKS"
+></A
+>xmlRegisterDefaultInputCallbacks ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1209,17 +1219,20 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->typedef xmlOutputBuffer *xmlOutputBufferPtr;</PRE
+>void        xmlRegisterDefaultInputCallbacks
+                                            (void);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Registers the default compiled-in I/O handlers.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11882"
+NAME="AEN12111"
 ></A
 ><H3
 ><A
@@ -1276,7 +1289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1291,7 +1304,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1301,7 +1314,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11903"
+NAME="AEN12132"
 ></A
 ><H3
 ><A
@@ -1363,7 +1376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a C string containing the URI or filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1380,7 +1393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1395,7 +1408,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1405,7 +1418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11928"
+NAME="AEN12157"
 ></A
 ><H3
 ><A
@@ -1467,7 +1480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE* </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1484,7 +1497,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1499,7 +1512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1509,7 +1522,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11954"
+NAME="AEN12183"
 ></A
 ><H3
 ><A
@@ -1568,7 +1581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file descriptor number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1585,7 +1598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1600,7 +1613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1610,7 +1623,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11979"
+NAME="AEN12208"
 ></A
 ><H3
 ><A
@@ -1670,7 +1683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the memory input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1687,7 +1700,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the memory block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1704,7 +1717,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1719,7 +1732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1729,7 +1742,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12008"
+NAME="AEN12237"
 ></A
 ><H3
 ><A
@@ -1796,7 +1809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O read function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1813,7 +1826,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O close function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1830,7 +1843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1847,7 +1860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1862,7 +1875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1872,7 +1885,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12043"
+NAME="AEN12272"
 ></A
 ><H3
 ><A
@@ -1928,7 +1941,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1945,7 +1958,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indicative value of the amount of chars to read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1960,8 +1973,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars read and stored in the buffer, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1971,7 +1983,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12067"
+NAME="AEN12296"
 ></A
 ><H3
 ><A
@@ -2030,7 +2042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2047,7 +2059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indicative value of the amount of chars to read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2062,8 +2074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars read and stored in the buffer, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2073,7 +2084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12092"
+NAME="AEN12321"
 ></A
 ><H3
 ><A
@@ -2130,7 +2141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2147,7 +2158,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in bytes of the array.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2164,7 +2175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2179,8 +2190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars read and stored in the buffer, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2190,7 +2200,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12120"
+NAME="AEN12349"
 ></A
 ><H3
 ><A
@@ -2243,7 +2253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2253,7 +2263,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12136"
+NAME="AEN12365"
 ></A
 ><H3
 ><A
@@ -2326,7 +2336,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12154"
+NAME="AEN12383"
 ></A
 ><H3
 ><A
@@ -2391,7 +2401,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputMatchCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2408,7 +2418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputOpenCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2425,7 +2435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputReadCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2442,7 +2452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputCloseCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2457,7 +2467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the registered handler number or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2467,7 +2477,36 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12189"
+NAME="AEN12418"
+></A
+><H3
+><A
+NAME="XMLREGISTERDEFAULTOUTPUTCALLBACKS"
+></A
+>xmlRegisterDefaultOutputCallbacks ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlRegisterDefaultOutputCallbacks
+                                            (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Registers the default compiled-in I/O handlers.</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12424"
 ></A
 ><H3
 ><A
@@ -2523,7 +2562,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2538,7 +2577,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2548,7 +2587,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12210"
+NAME="AEN12445"
 ></A
 ><H3
 ><A
@@ -2612,7 +2651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a C string containing the URI or filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2629,7 +2668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2646,7 +2685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ration (0 none, 9 max).</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2661,7 +2700,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2671,7 +2710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12239"
+NAME="AEN12474"
 ></A
 ><H3
 ><A
@@ -2733,7 +2772,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE* </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2750,7 +2789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2765,7 +2804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2775,7 +2814,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12265"
+NAME="AEN12500"
 ></A
 ><H3
 ><A
@@ -2833,7 +2872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file descriptor number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2850,7 +2889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2865,7 +2904,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2875,7 +2914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12290"
+NAME="AEN12525"
 ></A
 ><H3
 ><A
@@ -2941,7 +2980,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O write function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2958,7 +2997,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O close function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2975,7 +3014,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3007,7 +3046,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3017,7 +3056,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12325"
+NAME="AEN12560"
 ></A
 ><H3
 ><A
@@ -3075,7 +3114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3092,7 +3131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in bytes of the array.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3109,7 +3148,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3124,8 +3163,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars immediately written, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3135,7 +3173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12353"
+NAME="AEN12588"
 ></A
 ><H3
 ><A
@@ -3192,7 +3230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3209,7 +3247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a zero terminated C string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3224,8 +3262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars immediately written, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3235,7 +3272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12377"
+NAME="AEN12612"
 ></A
 ><H3
 ><A
@@ -3288,7 +3325,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3303,7 +3340,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3313,7 +3350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12397"
+NAME="AEN12632"
 ></A
 ><H3
 ><A
@@ -3367,7 +3404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3382,7 +3419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3392,7 +3429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12417"
+NAME="AEN12652"
 ></A
 ><H3
 ><A
@@ -3457,7 +3494,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputMatchCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3474,7 +3511,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputOpenCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3491,7 +3528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputWriteCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3508,7 +3545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputCloseCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3523,7 +3560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the registered handler number or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3533,7 +3570,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12452"
+NAME="AEN12687"
 ></A
 ><H3
 ><A
@@ -3591,7 +3628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an output I/O buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3608,7 +3645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3625,7 +3662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding if any assuming the i/O layer handles the trancoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3640,7 +3677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3650,7 +3687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12481"
+NAME="AEN12716"
 ></A
 ><H3
 ><A
@@ -3714,7 +3751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3731,7 +3768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3748,7 +3785,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3765,7 +3802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the imbrication level for indenting</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3782,7 +3819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> is formatting allowed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3799,7 +3836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional encoding string</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xmlmemory.html b/doc/html/gnome-xml-xmlmemory.html
index b7c9bed..248f70c 100644
--- a/doc/html/gnome-xml-xmlmemory.html
+++ b/doc/html/gnome-xml-xmlmemory.html
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16053"
+NAME="AEN16285"
 ></A
 ><H2
 >Name</H2
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16056"
+NAME="AEN16288"
 ></A
 ><H2
 >Synopsis</H2
@@ -258,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16089"
+NAME="AEN16321"
 ></A
 ><H2
 >Description</H2
@@ -268,14 +268,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16092"
+NAME="AEN16324"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16094"
+NAME="AEN16326"
 ></A
 ><H3
 ><A
@@ -291,7 +291,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define DEBUG_MEMORY</PRE
+>#define     DEBUG_MEMORY</PRE
 ></TD
 ></TR
 ></TABLE
@@ -301,7 +301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16099"
+NAME="AEN16331"
 ></A
 ><H3
 ><A
@@ -317,7 +317,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define MEM_LIST /* keep a list of all the allocated memory blocks */</PRE
+>#define     MEM_LIST</PRE
 ></TD
 ></TR
 ></TABLE
@@ -327,7 +327,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16104"
+NAME="AEN16336"
 ></A
 ><H3
 ><A
@@ -385,7 +385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16118"
+NAME="AEN16350"
 ></A
 ><H3
 ><A
@@ -443,7 +443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16132"
+NAME="AEN16364"
 ></A
 ><H3
 ><A
@@ -519,7 +519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16150"
+NAME="AEN16382"
 ></A
 ><H3
 ><A
@@ -592,7 +592,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16168"
+NAME="AEN16400"
 ></A
 ><H3
 ><A
@@ -618,7 +618,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16173"
+NAME="AEN16405"
 ></A
 ><H3
 ><A
@@ -644,7 +644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16178"
+NAME="AEN16410"
 ></A
 ><H3
 ><A
@@ -670,7 +670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16183"
+NAME="AEN16415"
 ></A
 ><H3
 ><A
@@ -696,7 +696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16188"
+NAME="AEN16420"
 ></A
 ><H3
 ><A
@@ -765,10 +765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="FREE"
->free</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -785,10 +782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="MALLOC"
->malloc</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -805,10 +799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="REALLOC"
->realloc</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -825,10 +816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="STRDUP"
->strdup</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -843,7 +831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -853,7 +841,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16228"
+NAME="AEN16456"
 ></A
 ><H3
 ><A
@@ -918,10 +906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="FREE"
->free</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -938,10 +923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="MALLOC"
->malloc</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -958,10 +940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="REALLOC"
->realloc</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -978,10 +957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="STRDUP"
->strdup</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -996,7 +972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1006,7 +982,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16267"
+NAME="AEN16491"
 ></A
 ><H3
 ><A
@@ -1054,7 +1030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1064,7 +1040,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16282"
+NAME="AEN16506"
 ></A
 ><H3
 ><A
@@ -1112,7 +1088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int representing the amount of memory allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1122,7 +1098,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16297"
+NAME="AEN16521"
 ></A
 ><H3
 ><A
@@ -1175,8 +1151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE descriptor used as the output file, if NULL, the result is
-written to the file .memorylist</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1186,7 +1161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16313"
+NAME="AEN16537"
 ></A
 ><H3
 ><A
@@ -1246,7 +1221,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE descriptor used as the output file</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1263,7 +1238,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of entries to dump</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1273,7 +1248,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16334"
+NAME="AEN16558"
 ></A
 ><H3
 ><A
@@ -1301,7 +1276,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16340"
+NAME="AEN16564"
 ></A
 ><H3
 ><A
@@ -1356,7 +1331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1373,7 +1348,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1390,7 +1365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1400,7 +1375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16364"
+NAME="AEN16588"
 ></A
 ><H3
 ><A
@@ -1456,7 +1431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial memory block pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1473,7 +1448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1490,7 +1465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1507,7 +1482,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1517,7 +1492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16392"
+NAME="AEN16616"
 ></A
 ><H3
 ><A
@@ -1589,7 +1564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1606,7 +1581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1621,7 +1596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new string or NULL if allocation error occured.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xpath.html b/doc/html/gnome-xml-xpath.html
index ec94875..6c89066 100644
--- a/doc/html/gnome-xml-xpath.html
+++ b/doc/html/gnome-xml-xpath.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10469"
+NAME="AEN10415"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10472"
+NAME="AEN10418"
 ></A
 ><H2
 >Synopsis</H2
@@ -154,6 +154,10 @@
 HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 >;
+enum        <A
+HREF="gnome-xml-xpath.html#XMLXPATHERROR"
+>xmlXPathError</A
+>;
 struct      <A
 HREF="gnome-xml-xpath.html#XMLNODESET"
 >xmlNodeSet</A
@@ -244,6 +248,104 @@
 >xmlXPathParserContextPtr</A
 > ctxt,
                                              int nargs);
+#define     <A
+HREF="gnome-xml-xpath.html#CHECK-ERROR"
+>CHECK_ERROR</A
+>
+#define     <A
+HREF="gnome-xml-xpath.html#CHECK-ERROR0"
+>CHECK_ERROR0</A
+>
+#define     <A
+HREF="gnome-xml-xpath.html#XP-ERROR"
+>XP_ERROR</A
+>                        (X)
+#define     <A
+HREF="gnome-xml-xpath.html#XP-ERROR0"
+>XP_ERROR0</A
+>                       (X)
+#define     <A
+HREF="gnome-xml-xpath.html#CHECK-TYPE"
+>CHECK_TYPE</A
+>                      (typeval)
+<A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="gnome-xml-xpath.html#VALUEPOP"
+>valuePop</A
+>                  (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);
+int         <A
+HREF="gnome-xml-xpath.html#VALUEPUSH"
+>valuePush</A
+>                       (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> value);
+<A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="gnome-xml-xpath.html#XMLXPATHNEWSTRING"
+>xmlXPathNewString</A
+>         (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *val);
+<A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="gnome-xml-xpath.html#XMLXPATHNEWNODESET"
+>xmlXPathNewNodeSet</A
+>        (<A
+HREF="gnome-xml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> val);
+void        <A
+HREF="gnome-xml-xpath.html#XMLXPATHNODESETADD"
+>xmlXPathNodeSetAdd</A
+>              (<A
+HREF="gnome-xml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> cur,
+                                             <A
+HREF="gnome-xml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> val);
+void        <A
+HREF="gnome-xml-xpath.html#XMLXPATHIDFUNCTION"
+>xmlXPathIdFunction</A
+>              (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             int nargs);
+void        <A
+HREF="gnome-xml-xpath.html#XMLXPATHROOT"
+>xmlXPathRoot</A
+>                    (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);
+void        <A
+HREF="gnome-xml-xpath.html#XMLXPATHEVALEXPR"
+>xmlXPathEvalExpr</A
+>                (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);
+void        <A
+HREF="gnome-xml-xpath.html#XMLXPATHINIT"
+>xmlXPathInit</A
+>                    (void);
 <A
 HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
 >xmlXPathContextPtr</A
@@ -275,6 +377,20 @@
 HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
 >xmlXPathContextPtr</A
 > ctxt);
+<A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="gnome-xml-xpath.html#XMLXPATHEVALXPTREXPR"
+>xmlXPathEvalXPtrExpr</A
+>      (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *str,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt);
 void        <A
 HREF="gnome-xml-xpath.html#XMLXPATHFREEOBJECT"
 >xmlXPathFreeObject</A
@@ -327,7 +443,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10524"
+NAME="AEN10502"
 ></A
 ><H2
 >Description</H2
@@ -337,14 +453,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10527"
+NAME="AEN10505"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10529"
+NAME="AEN10507"
 ></A
 ><H3
 ><A
@@ -363,7 +479,6 @@
 >struct xmlXPathContext {
     xmlDocPtr doc;			/* The current document */
     xmlNodePtr node;			/* The current node */
-    xmlNodeSetPtr nodelist;		/* The current node list */
 
     int nb_variables;			/* number of defined variables */
     int max_variables;			/* max number of variables */
@@ -389,6 +504,11 @@
     /* extra variables */
     int contextSize;			/* the context size */
     int proximityPosition;		/* the proximity position */
+
+    /* extra stuff for XPointer */
+    int xptr;				/* it this an XPointer context */
+    xmlNodePtr here;			/* for here() */
+    xmlNodePtr origin;			/* for origin() */
 };</PRE
 ></TD
 ></TR
@@ -399,33 +519,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10534"
+NAME="AEN10512"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHCONTEXTPTR"
 ></A
 >xmlXPathContextPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathContext *xmlXPathContextPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10539"
+NAME="AEN10516"
 ></A
 ><H3
 ><A
@@ -462,13 +569,26 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10544"
+NAME="AEN10521"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHPARSERCONTEXTPTR"
 ></A
 >xmlXPathParserContextPtr</H3
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10525"
+></A
+><H3
+><A
+NAME="XMLXPATHERROR"
+></A
+>enum xmlXPathError</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -478,17 +598,40 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->typedef xmlXPathParserContext *xmlXPathParserContextPtr;</PRE
+>typedef enum {
+    XPATH_EXPRESSION_OK = 0,
+    XPATH_NUMBER_ERROR,
+    XPATH_UNFINISHED_LITERAL_ERROR,
+    XPATH_START_LITERAL_ERROR,
+    XPATH_VARIABLE_REF_ERROR,
+    XPATH_UNDEF_VARIABLE_ERROR,
+    XPATH_INVALID_PREDICATE_ERROR,
+    XPATH_EXPR_ERROR,
+    XPATH_UNCLOSED_ERROR,
+    XPATH_UNKNOWN_FUNC_ERROR,
+    XPATH_INVALID_OPERAND,
+    XPATH_INVALID_TYPE,
+    XPATH_INVALID_ARITY,
+    XPATH_INVALID_CTXT_SIZE,
+    XPATH_INVALID_CTXT_POSITION
+} xmlXPathError;</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Create a new xmlNodeSetPtr of type double and of value <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+></P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10549"
+NAME="AEN10532"
 ></A
 ><H3
 ><A
@@ -518,33 +661,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10554"
+NAME="AEN10537"
 ></A
 ><H3
 ><A
 NAME="XMLNODESETPTR"
 ></A
 >xmlNodeSetPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNodeSet *xmlNodeSetPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10559"
+NAME="AEN10541"
 ></A
 ><H3
 ><A
@@ -566,7 +696,10 @@
     XPATH_BOOLEAN = 2,
     XPATH_NUMBER = 3,
     XPATH_STRING = 4,
-    XPATH_USERS = 5
+    XPATH_POINT = 5,
+    XPATH_RANGE = 6,
+    XPATH_LOCATIONSET = 7,
+    XPATH_USERS = 8
 } xmlXPathObjectType;</PRE
 ></TD
 ></TR
@@ -577,7 +710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10564"
+NAME="AEN10546"
 ></A
 ><H3
 ><A
@@ -600,6 +733,9 @@
     double floatval;
     xmlChar *stringval;
     void *user;
+    int index;
+    void *user2;
+    int index2;
 };</PRE
 ></TD
 ></TR
@@ -610,33 +746,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10569"
+NAME="AEN10551"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHOBJECTPTR"
 ></A
 >xmlXPathObjectPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathObject *xmlXPathObjectPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10574"
+NAME="AEN10555"
 ></A
 ><H3
 ><A
@@ -730,7 +853,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10597"
+NAME="AEN10578"
 ></A
 ><H3
 ><A
@@ -759,33 +882,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10602"
+NAME="AEN10583"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHTYPEPTR"
 ></A
 >xmlXPathTypePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathType *xmlXPathTypePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10607"
+NAME="AEN10587"
 ></A
 ><H3
 ><A
@@ -814,33 +924,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10612"
+NAME="AEN10592"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHVARIABLEPTR"
 ></A
 >xmlXPathVariablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathVariable *xmlXPathVariablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10617"
+NAME="AEN10596"
 ></A
 ><H3
 ><A
@@ -919,7 +1016,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10636"
+NAME="AEN10615"
 ></A
 ><H3
 ><A
@@ -948,33 +1045,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10641"
+NAME="AEN10620"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHFUNCPTR"
 ></A
 >xmlXPathFuncPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathFunct *xmlXPathFuncPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10646"
+NAME="AEN10624"
 ></A
 ><H3
 ><A
@@ -1074,7 +1158,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10671"
+NAME="AEN10649"
 ></A
 ><H3
 ><A
@@ -1103,33 +1187,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10676"
+NAME="AEN10654"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHAXISPTR"
 ></A
 >xmlXPathAxisPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathAxis *xmlXPathAxisPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10681"
+NAME="AEN10658"
 ></A
 ><H3
 ><A
@@ -1208,7 +1279,918 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10700"
+NAME="AEN10677"
+></A
+><H3
+><A
+NAME="CHECK-ERROR"
+></A
+>CHECK_ERROR</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     CHECK_ERROR</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10682"
+></A
+><H3
+><A
+NAME="CHECK-ERROR0"
+></A
+>CHECK_ERROR0</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     CHECK_ERROR0</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10687"
+></A
+><H3
+><A
+NAME="XP-ERROR"
+></A
+>XP_ERROR()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     XP_ERROR(X)</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>X</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10701"
+></A
+><H3
+><A
+NAME="XP-ERROR0"
+></A
+>XP_ERROR0()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     XP_ERROR0(X)</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>X</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10715"
+></A
+><H3
+><A
+NAME="CHECK-TYPE"
+></A
+>CHECK_TYPE()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     CHECK_TYPE(typeval)</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>typeval</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10729"
+></A
+><H3
+><A
+NAME="VALUEPOP"
+></A
+>valuePop ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> valuePop                  (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10749"
+></A
+><H3
+><A
+NAME="VALUEPUSH"
+></A
+>valuePush ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         valuePush                       (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> value);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>value</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10773"
+></A
+><H3
+><A
+NAME="XMLXPATHNEWSTRING"
+></A
+>xmlXPathNewString ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathNewString         (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type string and of value <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+></P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10795"
+></A
+><H3
+><A
+NAME="XMLXPATHNEWNODESET"
+></A
+>xmlXPathNewNodeSet ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathNewNodeSet        (<A
+HREF="gnome-xml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type NodeSet and initialize
+it with the single Node <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+></P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10817"
+></A
+><H3
+><A
+NAME="XMLXPATHNODESETADD"
+></A
+>xmlXPathNodeSetAdd ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathNodeSetAdd              (<A
+HREF="gnome-xml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> cur,
+                                             <A
+HREF="gnome-xml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>add a new xmlNodePtr ot an existing NodeSet</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10838"
+></A
+><H3
+><A
+NAME="XMLXPATHIDFUNCTION"
+></A
+>xmlXPathIdFunction ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathIdFunction              (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             int nargs);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implement the <GTKDOCLINK
+HREF="ID"
+>id</GTKDOCLINK
+>() XPath function
+The id function selects elements by their unique ID
+(see [5.2.1 Unique IDs]). When the argument to id is of type node-set,
+then the result is the union of the result of applying id to the
+string value of each of the nodes in the argument node-set. When the
+argument to id is of any other type, the argument is converted to a
+string as if by a call to the string function; the string is split
+into a whitespace-separated list of tokens (whitespace is any sequence
+of characters matching the production S); the result is a node-set
+containing the elements in the same document as the context node that
+have a unique ID equal to any of the tokens in the list.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>nargs</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10859"
+></A
+><H3
+><A
+NAME="XMLXPATHROOT"
+></A
+>xmlXPathRoot ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathRoot                    (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Initialize the context to the root of the document</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10875"
+></A
+><H3
+><A
+NAME="XMLXPATHEVALEXPR"
+></A
+>xmlXPathEvalExpr ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathEvalExpr                (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>[14]   Expr ::=   OrExpr 
+[21]   OrExpr ::=   AndExpr 
+| OrExpr 'or' AndExpr </P
+><P
+>Parse and evaluate an expression, then push the result on the stack</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10892"
+></A
+><H3
+><A
+NAME="XMLXPATHINIT"
+></A
+>xmlXPathInit ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathInit                    (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Initialize the XPath environment</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10898"
 ></A
 ><H3
 ><A
@@ -1264,7 +2246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1279,7 +2261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathContext just allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1289,7 +2271,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10721"
+NAME="AEN10919"
 ></A
 ><H3
 ><A
@@ -1342,7 +2324,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the context to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1352,7 +2334,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10737"
+NAME="AEN10935"
 ></A
 ><H3
 ><A
@@ -1412,7 +2394,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1429,7 +2411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1444,8 +2426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
-the caller has to free the object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1455,7 +2436,109 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10763"
+NAME="AEN10961"
+></A
+><H3
+><A
+NAME="XMLXPATHEVALXPTREXPR"
+></A
+>xmlXPathEvalXPtrExpr ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathEvalXPtrExpr      (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *str,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Evaluate the location set corresponding to this expression.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>str</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10987"
 ></A
 ><H3
 ><A
@@ -1508,7 +2591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the object to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1518,7 +2601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10779"
+NAME="AEN11003"
 ></A
 ><H3
 ><A
@@ -1578,7 +2661,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1595,7 +2678,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1610,8 +2693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the evaluation or NULL.
-the caller has to free the object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1621,7 +2703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10805"
+NAME="AEN11029"
 ></A
 ><H3
 ><A
@@ -1682,7 +2764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an initial xmlNodePtr, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1697,7 +2779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1707,7 +2789,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10827"
+NAME="AEN11051"
 ></A
 ><H3
 ><A
@@ -1769,7 +2851,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an existing NodeSetList object</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1779,7 +2861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10845"
+NAME="AEN11069"
 ></A
 ><H3
 ><A
@@ -1832,7 +2914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlNodeSetPtr to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index e081e36..cd49d79 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -470,6 +470,7 @@
 <ANCHOR id ="XMLXPATHCONTEXTPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHCONTEXTPTR">
 <ANCHOR id ="XMLXPATHPARSERCONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHPARSERCONTEXT">
 <ANCHOR id ="XMLXPATHPARSERCONTEXTPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR">
+<ANCHOR id ="XMLXPATHERROR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHERROR">
 <ANCHOR id ="XMLNODESET" href="gnome-xml/gnome-xml-xpath.html#XMLNODESET">
 <ANCHOR id ="XMLNODESETPTR" href="gnome-xml/gnome-xml-xpath.html#XMLNODESETPTR">
 <ANCHOR id ="XMLXPATHOBJECTTYPE" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHOBJECTTYPE">
@@ -487,9 +488,24 @@
 <ANCHOR id ="XMLXPATHAXIS" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHAXIS">
 <ANCHOR id ="XMLXPATHAXISPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHAXISPTR">
 <ANCHOR id ="XMLXPATHFUNCTION" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFUNCTION">
+<ANCHOR id ="CHECK-ERROR" href="gnome-xml/gnome-xml-xpath.html#CHECK-ERROR">
+<ANCHOR id ="CHECK-ERROR0" href="gnome-xml/gnome-xml-xpath.html#CHECK-ERROR0">
+<ANCHOR id ="XP-ERROR" href="gnome-xml/gnome-xml-xpath.html#XP-ERROR">
+<ANCHOR id ="XP-ERROR0" href="gnome-xml/gnome-xml-xpath.html#XP-ERROR0">
+<ANCHOR id ="CHECK-TYPE" href="gnome-xml/gnome-xml-xpath.html#CHECK-TYPE">
+<ANCHOR id ="VALUEPOP" href="gnome-xml/gnome-xml-xpath.html#VALUEPOP">
+<ANCHOR id ="VALUEPUSH" href="gnome-xml/gnome-xml-xpath.html#VALUEPUSH">
+<ANCHOR id ="XMLXPATHNEWSTRING" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNEWSTRING">
+<ANCHOR id ="XMLXPATHNEWNODESET" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNEWNODESET">
+<ANCHOR id ="XMLXPATHNODESETADD" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNODESETADD">
+<ANCHOR id ="XMLXPATHIDFUNCTION" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHIDFUNCTION">
+<ANCHOR id ="XMLXPATHROOT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHROOT">
+<ANCHOR id ="XMLXPATHEVALEXPR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVALEXPR">
+<ANCHOR id ="XMLXPATHINIT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHINIT">
 <ANCHOR id ="XMLXPATHNEWCONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNEWCONTEXT">
 <ANCHOR id ="XMLXPATHFREECONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREECONTEXT">
 <ANCHOR id ="XMLXPATHEVAL" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVAL">
+<ANCHOR id ="XMLXPATHEVALXPTREXPR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVALXPTREXPR">
 <ANCHOR id ="XMLXPATHFREEOBJECT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREEOBJECT">
 <ANCHOR id ="XMLXPATHEVALEXPRESSION" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVALEXPRESSION">
 <ANCHOR id ="XMLXPATHNODESETCREATE" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNODESETCREATE">
@@ -543,6 +559,7 @@
 <ANCHOR id ="XMLOUTPUTCLOSECALLBACK" href="gnome-xml/gnome-xml-xmlio.html#XMLOUTPUTCLOSECALLBACK">
 <ANCHOR id ="XMLOUTPUTBUFFER" href="gnome-xml/gnome-xml-xmlio.html#XMLOUTPUTBUFFER">
 <ANCHOR id ="XMLOUTPUTBUFFERPTR" href="gnome-xml/gnome-xml-xmlio.html#XMLOUTPUTBUFFERPTR">
+<ANCHOR id ="XMLREGISTERDEFAULTINPUTCALLBACKS" href="gnome-xml/gnome-xml-xmlio.html#XMLREGISTERDEFAULTINPUTCALLBACKS">
 <ANCHOR id ="XMLALLOCPARSERINPUTBUFFER" href="gnome-xml/gnome-xml-xmlio.html#XMLALLOCPARSERINPUTBUFFER">
 <ANCHOR id ="XMLPARSERINPUTBUFFERCREATEFILENAME" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERCREATEFILENAME">
 <ANCHOR id ="XMLPARSERINPUTBUFFERCREATEFILE" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERCREATEFILE">
@@ -555,6 +572,7 @@
 <ANCHOR id ="XMLFREEPARSERINPUTBUFFER" href="gnome-xml/gnome-xml-xmlio.html#XMLFREEPARSERINPUTBUFFER">
 <ANCHOR id ="XMLPARSERGETDIRECTORY" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERGETDIRECTORY">
 <ANCHOR id ="XMLREGISTERINPUTCALLBACKS" href="gnome-xml/gnome-xml-xmlio.html#XMLREGISTERINPUTCALLBACKS">
+<ANCHOR id ="XMLREGISTERDEFAULTOUTPUTCALLBACKS" href="gnome-xml/gnome-xml-xmlio.html#XMLREGISTERDEFAULTOUTPUTCALLBACKS">
 <ANCHOR id ="XMLALLOCOUTPUTBUFFER" href="gnome-xml/gnome-xml-xmlio.html#XMLALLOCOUTPUTBUFFER">
 <ANCHOR id ="XMLOUTPUTBUFFERCREATEFILENAME" href="gnome-xml/gnome-xml-xmlio.html#XMLOUTPUTBUFFERCREATEFILENAME">
 <ANCHOR id ="XMLOUTPUTBUFFERCREATEFILE" href="gnome-xml/gnome-xml-xmlio.html#XMLOUTPUTBUFFERCREATEFILE">
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index 496acc0..7031c57 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -267,7 +267,18 @@
  */
 xmlXPathObjectPtr valuePop			(xmlXPathParserContextPtr ctxt);
 int		  valuePush			(xmlXPathParserContextPtr ctxt,
-						 xmlXPathObjectPtr value);
+					 	xmlXPathObjectPtr value);
+
+xmlXPathObjectPtr xmlXPathNewString		(const xmlChar *val);
+xmlXPathObjectPtr xmlXPathNewNodeSet		(xmlNodePtr val);
+void		  xmlXPathNodeSetAdd		(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+
+
+void		  xmlXPathIdFunction		(xmlXPathParserContextPtr ctxt,
+					 	int nargs);
+void		  xmlXPathRoot			(xmlXPathParserContextPtr ctxt);
+void		  xmlXPathEvalExpr		(xmlXPathParserContextPtr ctxt);
 
 /************************************************************************
  *									*
diff --git a/parser.c b/parser.c
index ff0c4f7..1d68e5f 100644
--- a/parser.c
+++ b/parser.c
@@ -68,7 +68,7 @@
 #include <libxml/parserInternals.h>
 #include <libxml/xmlIO.h>
 #include <libxml/uri.h>
-#include "xml-error.h"
+#include <libxml/xml-error.h>
 
 #define XML_PARSER_BIG_BUFFER_SIZE 1000
 #define XML_PARSER_BUFFER_SIZE 100
diff --git a/parserInternals.c b/parserInternals.c
index ec5c7ea..98e49cd 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -45,7 +45,7 @@
 #include <libxml/parserInternals.h>
 #include <libxml/xmlIO.h>
 #include <libxml/uri.h>
-#include "xml-error.h"
+#include <libxml/xml-error.h>
 
 
 /************************************************************************
diff --git a/testSAX.c b/testSAX.c
index 7f3870a..5d5a189 100644
--- a/testSAX.c
+++ b/testSAX.c
@@ -255,7 +255,11 @@
               int type, int def, const xmlChar *defaultValue,
 	      xmlEnumerationPtr tree)
 {
-    fprintf(stdout, "SAX.attributeDecl(%s, %s, %d, %d, %s, ...)\n",
+    if (defaultValue == NULL)
+	fprintf(stdout, "SAX.attributeDecl(%s, %s, %d, %d, NULL, ...)\n",
+            elem, name, type, def);
+    else
+	fprintf(stdout, "SAX.attributeDecl(%s, %s, %d, %d, %s, ...)\n",
             elem, name, type, def, defaultValue);
 }
 
diff --git a/testXPath.c b/testXPath.c
index 4e0fc6c..dc0a347 100644
--- a/testXPath.c
+++ b/testXPath.c
@@ -84,28 +84,40 @@
 </EXAMPLE>\n\
 ";
 
-void xmlXPAthDebugDumpNode(FILE *output, xmlNodePtr cur) {
+void xmlXPAthDebugDumpNode(FILE *output, xmlNodePtr cur, int depth) {
+    int i;
+    char shift[100];
+
+    for (i = 0;((i < depth) && (i < 25));i++)
+        shift[2 * i] = shift[2 * i + 1] = ' ';
+    shift[2 * i] = shift[2 * i + 1] = 0;
     if (cur == NULL) {
+	fprintf(output, shift);
 	fprintf(output, "Node is NULL !\n");
 	return;
         
     }
 
-    if (cur == NULL)
-	fprintf(output, " NULL\n");
-    else if ((cur->type == XML_DOCUMENT_NODE) ||
-	     (cur->type == XML_HTML_DOCUMENT_NODE))
+    if ((cur->type == XML_DOCUMENT_NODE) ||
+	     (cur->type == XML_HTML_DOCUMENT_NODE)) {
+	fprintf(output, shift);
 	fprintf(output, " /\n");
-    else if (cur->type == XML_ATTRIBUTE_NODE)
-	xmlDebugDumpAttr(output, (xmlAttrPtr)cur, 2);
+    } else if (cur->type == XML_ATTRIBUTE_NODE)
+	xmlDebugDumpAttr(output, (xmlAttrPtr)cur, depth);
     else
-	xmlDebugDumpOneNode(output, cur, 2);
+	xmlDebugDumpOneNode(output, cur, depth);
 }
 
-void xmlXPAthDebugDumpNodeSet(FILE *output, xmlNodeSetPtr cur) {
+void xmlXPAthDebugDumpNodeSet(FILE *output, xmlNodeSetPtr cur, int depth) {
     int i;
+    char shift[100];
+
+    for (i = 0;((i < depth) && (i < 25));i++)
+        shift[2 * i] = shift[2 * i + 1] = ' ';
+    shift[2 * i] = shift[2 * i + 1] = 0;
 
     if (cur == NULL) {
+	fprintf(output, shift);
 	fprintf(output, "NodeSet is NULL !\n");
 	return;
         
@@ -113,31 +125,47 @@
 
     fprintf(output, "Set contains %d nodes:\n", cur->nodeNr);
     for (i = 0;i < cur->nodeNr;i++) {
+	fprintf(output, shift);
         fprintf(output, "%d", i + 1);
-	xmlXPAthDebugDumpNode(output, cur->nodeTab[i]);
+	xmlXPAthDebugDumpNode(output, cur->nodeTab[i], depth + 1);
     }
 }
 
 #if defined(LIBXML_XPTR_ENABLED)
-void xmlXPAthDebugDumpObject(FILE *output, xmlXPathObjectPtr cur);
-void xmlXPAthDebugDumpLocationSet(FILE *output, xmlLocationSetPtr cur) {
+void xmlXPAthDebugDumpObject(FILE *output, xmlXPathObjectPtr cur, int depth);
+void xmlXPAthDebugDumpLocationSet(FILE *output, xmlLocationSetPtr cur, int depth) {
     int i;
+    char shift[100];
+
+    for (i = 0;((i < depth) && (i < 25));i++)
+        shift[2 * i] = shift[2 * i + 1] = ' ';
+    shift[2 * i] = shift[2 * i + 1] = 0;
 
     if (cur == NULL) {
+	fprintf(output, shift);
 	fprintf(output, "LocationSet is NULL !\n");
 	return;
         
     }
 
-    fprintf(output, "Set contains %d ranges:\n", cur->locNr);
     for (i = 0;i < cur->locNr;i++) {
-        fprintf(output, "%d", i + 1);
-	xmlXPAthDebugDumpObject(output, cur->locTab[i]);
+	fprintf(output, shift);
+        fprintf(output, "%d :\n", i + 1);
+	xmlXPAthDebugDumpObject(output, cur->locTab[i], depth + 1);
     }
 }
 #endif
 
-void xmlXPAthDebugDumpObject(FILE *output, xmlXPathObjectPtr cur) {
+void xmlXPAthDebugDumpObject(FILE *output, xmlXPathObjectPtr cur, int depth) {
+    int i;
+    char shift[100];
+
+    for (i = 0;((i < depth) && (i < 25));i++)
+        shift[2 * i] = shift[2 * i + 1] = ' ';
+    shift[2 * i] = shift[2 * i + 1] = 0;
+
+    fprintf(output, shift);
+
     if (cur == NULL) {
         fprintf(output, "Object is empty (NULL)\n");
 	return;
@@ -148,7 +176,7 @@
 	    break;
         case XPATH_NODESET:
 	    fprintf(output, "Object is a Node Set :\n");
-	    xmlXPAthDebugDumpNodeSet(output, cur->nodesetval);
+	    xmlXPAthDebugDumpNodeSet(output, cur->nodesetval, depth);
 	    break;
         case XPATH_BOOLEAN:
 	    fprintf(output, "Object is a Boolean : ");
@@ -165,28 +193,33 @@
 	    break;
 	case XPATH_POINT:
 	    fprintf(output, "Object is a point : index %d in node", cur->index);
-	    xmlXPAthDebugDumpNode(output, (xmlNodePtr) cur->user);
+	    xmlXPAthDebugDumpNode(output, (xmlNodePtr) cur->user, depth + 1);
 	    fprintf(output, "\n");
 	    break;
 	case XPATH_RANGE:
-	    fprintf(output, "Object is a range : from");
+	    fprintf(output, "Object is a range : from ");
 	    if (cur->index >= 0)
 		fprintf(output, "index %d in ", cur->index);
 	    fprintf(output, "node");
-	    xmlXPAthDebugDumpNode(output, (xmlNodePtr) cur->user);
-	    fprintf(output, "   to ");
+	    xmlXPAthDebugDumpNode(output, (xmlNodePtr) cur->user, depth + 1);
+	    fprintf(output, shift);
+	    fprintf(output, "                      to ");
 	    if (cur->index2 >= 0)
 		fprintf(output, "index %d in ", cur->index2);
 	    fprintf(output, "node");
-	    xmlXPAthDebugDumpNode(output, (xmlNodePtr) cur->user2);
+	    xmlXPAthDebugDumpNode(output, (xmlNodePtr) cur->user2, depth + 1);
 	    fprintf(output, "\n");
+	    break;
 	case XPATH_LOCATIONSET:
 #if defined(LIBXML_XPTR_ENABLED)
-	    fprintf(output, "Object is a location set containing :");
-	    xmlXPAthDebugDumpLocationSet(output, (xmlLocationSetPtr) cur->user);
+	    fprintf(output, "Object is a Location Set:\n");
+	    xmlXPAthDebugDumpLocationSet(output,
+		    (xmlLocationSetPtr) cur->user, depth);
 #endif
+	    break;
 	case XPATH_USERS:
 	    fprintf(output, "Object is user defined\n");
+	    break;
     }
 }
 
@@ -208,7 +241,7 @@
 #if defined(LIBXML_XPTR_ENABLED)
     }
 #endif
-    xmlXPAthDebugDumpObject(stdout, res);
+    xmlXPAthDebugDumpObject(stdout, res, 0);
     xmlXPathFreeObject(res);
     xmlXPathFreeContext(ctxt);
 }
@@ -216,15 +249,24 @@
 void testXPathFile(const char *filename) {
     FILE *input;
     char expr[5000];
+    int len;
 
     input = fopen(filename, "r");
     if (input == NULL) {
         fprintf(stderr, "Cannot open %s for reading\n", filename);
 	return;
     }
-    while (fscanf(input, "%s", expr) != EOF) {
-        printf("\n========================\nExpression: %s\n", expr) ;
-        testXPath(expr);
+    while (fgets(expr, 4500, input) != NULL) {
+	len = strlen(expr);
+	len--;
+	while ((len >= 0) && 
+	       ((expr[len] == '\n') || (expr[len] == '\t') ||
+		(expr[len] == '\r') || (expr[len] == ' '))) len--;
+	expr[len + 1] = 0;      
+	if (len >= 0) {
+	    printf("\n========================\nExpression: %s\n", expr) ;
+	    testXPath(expr);
+	}
     }
 
     fclose(input);
diff --git a/win32/README.MSDev b/win32/README.MSDev
new file mode 100644
index 0000000..47b8dd8
--- /dev/null
+++ b/win32/README.MSDev
@@ -0,0 +1,63 @@
+The configuration stuff (i.e. what should be enabled/disabled) is in xmlversion.h

+I only tested it compiled fine with the current settings 

+(that is nearly everything disabled, I didn't need many features)

+

+----------------------------

+

+How did I get everything in place so the MSDev project works from the original archive?

+

+from the cygwin prompt (http://sources.redhat.com/cygwin) :

+$ ./configure --disable-corba --without-ftp --without-http --without-html --wit

+hout-xpath --without-iconv --without-debug

+

+created a libxml directory and copied the following headers in:

+HTMLparser.h       entities.h         tree.h             xmlIO.h

+HTMLtree.h         nanoftp.h          uri.h              xmlmemory.h

+SAX.h              nanohttp.h         valid.h            xmlversion.h

+debugXML.h         parser.h           xlink.h            xpath.h

+encoding.h         parserInternals.h  xml-error.h

+

+modified win32config.h to comment out 

+#define LIBXML_VERSION 20204

+#define LIBXML_VERSION_STRING "2.2.4"

+(is already in xmlversion.h)

+

+built the project file for the static library

+

+----------------------------

+

+diff after doing the changes and cleaning up the generated stuff:

+

+Only in libxml2-2.2.4: MSDev

+Common subdirectories: libxml2-2.2.4/SAXresult and libxml2-2.2.4-reference/SAXresult

+Common subdirectories: libxml2-2.2.4/doc and libxml2-2.2.4-reference/doc

+Common subdirectories: libxml2-2.2.4/example and libxml2-2.2.4-reference/example

+Only in libxml2-2.2.4: libxml

+Common subdirectories: libxml2-2.2.4/result and libxml2-2.2.4-reference/result

+Common subdirectories: libxml2-2.2.4/test and libxml2-2.2.4-reference/test

+Only in libxml2-2.2.4: win32config.h

+diff libxml2-2.2.4/xmlversion.h libxml2-2.2.4-reference/xmlversion.h

+38c38

+< #if 0

+---

+> #if 1

+47c47

+< #if 0

+---

+> #if 1

+56c56

+< #if 0

+---

+> #if 1

+74c74

+< #if 0

+---

+> #if 1

+83c83

+< #if 0

+---

+> #if 1

+92c92

+< #if 0

+---

+> #if 1

diff --git a/win32/libxml2/libxml2.dsp b/win32/libxml2/libxml2.dsp
new file mode 100644
index 0000000..286b250
--- /dev/null
+++ b/win32/libxml2/libxml2.dsp
@@ -0,0 +1,166 @@
+# Microsoft Developer Studio Project File - Name="libxml2" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

+

+CFG=libxml2 - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "libxml2.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "libxml2.mak" CFG="libxml2 - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "libxml2 - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "libxml2 - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "libxml2 - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+F90=df.exe

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo

+

+!ELSEIF  "$(CFG)" == "libxml2 - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Target_Dir ""

+F90=df.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c

+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo

+

+!ENDIF 

+

+# Begin Target

+

+# Name "libxml2 - Win32 Release"

+# Name "libxml2 - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=..\..\debugXML.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\encoding.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\entities.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\error.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\HTMLparser.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\HTMLtree.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\nanoftp.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\nanohttp.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\parser.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\parserInternals.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\SAX.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\tree.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\uri.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\valid.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\xlink.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\xmlIO.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\xmlmemory.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\xpath.c

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# End Group

+# End Target

+# End Project

diff --git a/xpath.c b/xpath.c
index 358e22e..a67a2f6 100644
--- a/xpath.c
+++ b/xpath.c
@@ -161,14 +161,6 @@
 
 FILE *xmlXPathDebug = NULL;
 
-#define TODO 								\
-    fprintf(xmlXPathDebug, "Unimplemented block at %s:%d\n",		\
-            __FILE__, __LINE__);
-
-#define STRANGE 							\
-    fprintf(xmlXPathDebug, "Internal error at %s:%d\n",			\
-            __FILE__, __LINE__);
-
 double xmlXPathStringEvalNumber(const xmlChar *str);
 void xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs);
 
@@ -178,6 +170,14 @@
  *									*
  ************************************************************************/
 
+#define TODO 								\
+    fprintf(xmlXPathDebug, "Unimplemented block at %s:%d\n",		\
+            __FILE__, __LINE__);
+
+#define STRANGE 							\
+    fprintf(xmlXPathDebug, "Internal error at %s:%d\n",			\
+            __FILE__, __LINE__);
+
 /*
  * Generic function for accessing stacks in the Parser Context
  */
@@ -547,6 +547,97 @@
 }
 #endif
 
+/**
+ * xmlXPathNewNodeSet:
+ * @val:  the NodePtr value
+ *
+ * Create a new xmlXPathObjectPtr of type NodeSet and initialize
+ * it with the single Node @val
+ *
+ * Returns the newly created object.
+ */
+xmlXPathObjectPtr
+xmlXPathNewNodeSet(xmlNodePtr val) {
+    xmlXPathObjectPtr ret;
+
+    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
+    if (ret == NULL) {
+        fprintf(xmlXPathDebug, "xmlXPathNewNodeSet: out of memory\n");
+	return(NULL);
+    }
+    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
+    ret->type = XPATH_NODESET;
+    ret->nodesetval = xmlXPathNodeSetCreate(val);
+    return(ret);
+}
+
+/**
+ * xmlXPathNewNodeSetList:
+ * @val:  an existing NodeSet
+ *
+ * Create a new xmlXPathObjectPtr of type NodeSet and initialize
+ * it with the Nodeset @val
+ *
+ * Returns the newly created object.
+ */
+xmlXPathObjectPtr
+xmlXPathNewNodeSetList(xmlNodeSetPtr val) {
+    xmlXPathObjectPtr ret;
+    int i;
+
+    if (val == NULL)
+    	ret = NULL;
+    else if (val->nodeTab == NULL)
+	    ret = xmlXPathNewNodeSet(NULL);
+    else
+    	{
+	    ret = xmlXPathNewNodeSet(val->nodeTab[0]);
+	    for (i = 1; i < val->nodeNr; ++i)
+	    	xmlXPathNodeSetAdd(ret->nodesetval, val->nodeTab[i]);
+	    }
+
+    return(ret);
+}
+
+/**
+ * xmlXPathWrapNodeSet:
+ * @val:  the NodePtr value
+ *
+ * Wrap the Nodeset @val in a new xmlXPathObjectPtr
+ *
+ * Returns the newly created object.
+ */
+xmlXPathObjectPtr
+xmlXPathWrapNodeSet(xmlNodeSetPtr val) {
+    xmlXPathObjectPtr ret;
+
+    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
+    if (ret == NULL) {
+        fprintf(xmlXPathDebug, "xmlXPathWrapNodeSet: out of memory\n");
+	return(NULL);
+    }
+    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
+    ret->type = XPATH_NODESET;
+    ret->nodesetval = val;
+    return(ret);
+}
+
+/**
+ * xmlXPathFreeNodeSetList:
+ * @obj:  an existing NodeSetList object
+ *
+ * Free up the xmlXPathObjectPtr @obj but don't deallocate the objects in
+ * the list contrary to xmlXPathFreeObject().
+ */
+void
+xmlXPathFreeNodeSetList(xmlXPathObjectPtr obj) {
+    if (obj == NULL) return;
+#ifdef DEBUG
+    memset(obj, 0xB , (size_t) sizeof(xmlXPathObject));
+#endif
+    xmlFree(obj);
+}
+
 /************************************************************************
  *									*
  *			Routines to handle Variable			*
@@ -675,600 +766,6 @@
 }
 
 /**
- * xmlXPathNewNodeSet:
- * @val:  the NodePtr value
- *
- * Create a new xmlXPathObjectPtr of type NodeSet and initialize
- * it with the single Node @val
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathNewNodeSet(xmlNodePtr val) {
-    xmlXPathObjectPtr ret;
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathNewNodeSet: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_NODESET;
-    ret->nodesetval = xmlXPathNodeSetCreate(val);
-    return(ret);
-}
-
-/**
- * xmlXPathNewNodeSetList:
- * @val:  an existing NodeSet
- *
- * Create a new xmlXPathObjectPtr of type NodeSet and initialize
- * it with the Nodeset @val
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathNewNodeSetList(xmlNodeSetPtr val) {
-    xmlXPathObjectPtr ret;
-    int i;
-
-    if (val == NULL)
-    	ret = NULL;
-    else if (val->nodeTab == NULL)
-	    ret = xmlXPathNewNodeSet(NULL);
-    else
-    	{
-	    ret = xmlXPathNewNodeSet(val->nodeTab[0]);
-	    for (i = 1; i < val->nodeNr; ++i)
-	    	xmlXPathNodeSetAdd(ret->nodesetval, val->nodeTab[i]);
-	    }
-
-    return(ret);
-}
-
-/**
- * xmlXPathWrapNodeSet:
- * @val:  the NodePtr value
- *
- * Wrap the Nodeset @val in a new xmlXPathObjectPtr
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathWrapNodeSet(xmlNodeSetPtr val) {
-    xmlXPathObjectPtr ret;
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathWrapNodeSet: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_NODESET;
-    ret->nodesetval = val;
-    return(ret);
-}
-
-/**
- * xmlXPathFreeNodeSetList:
- * @obj:  an existing NodeSetList object
- *
- * Free up the xmlXPathObjectPtr @obj but don't deallocate the objects in
- * the list contrary to xmlXPathFreeObject().
- */
-void
-xmlXPathFreeNodeSetList(xmlXPathObjectPtr obj) {
-    if (obj == NULL) return;
-#ifdef DEBUG
-    memset(obj, 0xB , (size_t) sizeof(xmlXPathObject));
-#endif
-    xmlFree(obj);
-}
-
-#ifdef LIBXML_XPTR_ENABLED
-/**
- * xmlXPathNewPoint:
- * @node:  the xmlNodePtr
- * @index:  the index within the node
- *
- * Create a new xmlXPathObjectPtr of type point
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathNewPoint(xmlNodePtr node, int index) {
-    xmlXPathObjectPtr ret;
-
-    if (node == NULL)
-	return(NULL);
-    if (index < 0)
-	return(NULL);
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathNewPoint: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_POINT;
-    ret->user = (void *) node;
-    ret->index = index;
-    return(ret);
-}
-
-/**
- * xmlXPathNewRangePoints:
- * @start:  the starting point
- * @end:  the ending point
- *
- * Create a new xmlXPathObjectPtr of type range using 2 Points
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathNewRangePoints(xmlXPathObjectPtr start, xmlXPathObjectPtr end) {
-    xmlXPathObjectPtr ret;
-
-    if (start == NULL)
-	return(NULL);
-    if (end == NULL)
-	return(NULL);
-    if (start->type != XPATH_POINT)
-	return(NULL);
-    if (end->type != XPATH_POINT)
-	return(NULL);
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathNewRangePoints: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_RANGE;
-    ret->user = start->user;
-    ret->index = start->index;
-    ret->user2 = end->user;
-    ret->index2 = end->index;
-    return(ret);
-}
-
-/**
- * xmlXPathNewRangePointNode:
- * @start:  the starting point
- * @end:  the ending node
- *
- * Create a new xmlXPathObjectPtr of type range from a point to a node
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathNewRangePointNode(xmlXPathObjectPtr start, xmlNodePtr end) {
-    xmlXPathObjectPtr ret;
-
-    if (start == NULL)
-	return(NULL);
-    if (end == NULL)
-	return(NULL);
-    if (start->type != XPATH_POINT)
-	return(NULL);
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathNewRangePointNode: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_RANGE;
-    ret->user = start->user;
-    ret->index = start->index;
-    ret->user2 = end;
-    ret->index2 = -1;
-    return(ret);
-}
-
-/**
- * xmlXPathNewRangeNodePoint:
- * @start:  the starting node
- * @end:  the ending point
- *
- * Create a new xmlXPathObjectPtr of type range from a node to a point
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathNewRangeNodePoint(xmlNodePtr start, xmlXPathObjectPtr end) {
-    xmlXPathObjectPtr ret;
-
-    if (start == NULL)
-	return(NULL);
-    if (end == NULL)
-	return(NULL);
-    if (start->type != XPATH_POINT)
-	return(NULL);
-    if (end->type != XPATH_POINT)
-	return(NULL);
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathNewRangeNodePoint: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_RANGE;
-    ret->user = start;
-    ret->index = -1;
-    ret->user2 = end->user;
-    ret->index2 = end->index;
-    return(ret);
-}
-
-/**
- * xmlXPathNewRangeNodes:
- * @start:  the starting node
- * @end:  the ending node
- *
- * Create a new xmlXPathObjectPtr of type range using 2 nodes
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathNewRangeNodes(xmlNodePtr start, xmlNodePtr end) {
-    xmlXPathObjectPtr ret;
-
-    if (start == NULL)
-	return(NULL);
-    if (end == NULL)
-	return(NULL);
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathNewRangeNodes: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_RANGE;
-    ret->user = start;
-    ret->index = -1;
-    ret->user2 = end;
-    ret->index2 = -1;
-    return(ret);
-}
-
-/**
- * xmlXPathNewRangeNodeObject:
- * @start:  the starting node
- * @end:  the ending object
- *
- * Create a new xmlXPathObjectPtr of type range from a not to an object
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) {
-    xmlXPathObjectPtr ret;
-
-    if (start == NULL)
-	return(NULL);
-    if (end == NULL)
-	return(NULL);
-    switch (end->type) {
-	case XPATH_POINT:
-	    break;
-	case XPATH_NODESET:
-	    /*
-	     * Empty set ... 
-	     */
-	    if (end->nodesetval->nodeNr <= 0)
-		return(NULL);
-	    break;
-	default:
-	    TODO
-	    return(NULL);
-    }
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathNewRangeNodeObject: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_RANGE;
-    ret->user = start;
-    ret->index = -1;
-    switch (end->type) {
-	case XPATH_POINT:
-	    ret->user2 = end->user;
-	    ret->index2 = end->index;
-	case XPATH_NODESET: {
-	    ret->user2 = end->nodesetval->nodeTab[end->nodesetval->nodeNr - -1];
-	    ret->index2 = -1;
-	    break;
-	}
-	default:
-	    STRANGE
-	    return(NULL);
-    }
-    ret->user2 = end;
-    ret->index2 = -1;
-    return(ret);
-}
-
-#define XML_RANGESET_DEFAULT	10
-
-/**
- * xmlXPathLocationSetCreate:
- * @val:  an initial xmlXPathObjectPtr, or NULL
- *
- * Create a new xmlLocationSetPtr of type double and of value @val
- *
- * Returns the newly created object.
- */
-xmlLocationSetPtr
-xmlXPathLocationSetCreate(xmlXPathObjectPtr val) {
-    xmlLocationSetPtr ret;
-
-    ret = (xmlLocationSetPtr) xmlMalloc(sizeof(xmlLocationSet));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathNewLocationSet: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlLocationSet));
-    if (val != NULL) {
-        ret->locTab = (xmlXPathObjectPtr *) xmlMalloc(XML_RANGESET_DEFAULT *
-					     sizeof(xmlXPathObjectPtr));
-	if (ret->locTab == NULL) {
-	    fprintf(xmlXPathDebug, "xmlXPathNewLocationSet: out of memory\n");
-	    return(NULL);
-	}
-	memset(ret->locTab, 0 ,
-	       XML_RANGESET_DEFAULT * (size_t) sizeof(xmlXPathObjectPtr));
-        ret->locMax = XML_RANGESET_DEFAULT;
-	ret->locTab[ret->locNr++] = val;
-    }
-    return(ret);
-}
-
-/**
- * xmlXPathLocationSetAdd:
- * @cur:  the initial range set
- * @val:  a new xmlXPathObjectPtr
- *
- * add a new xmlXPathObjectPtr ot an existing LocationSet
- */
-void
-xmlXPathLocationSetAdd(xmlLocationSetPtr cur, xmlXPathObjectPtr val) {
-    int i;
-
-    if (val == NULL) return;
-
-    /*
-     * check against doublons
-     */
-    for (i = 0;i < cur->locNr;i++)
-        if (cur->locTab[i] == val) return;
-
-    /*
-     * grow the locTab if needed
-     */
-    if (cur->locMax == 0) {
-        cur->locTab = (xmlXPathObjectPtr *) xmlMalloc(XML_RANGESET_DEFAULT *
-					     sizeof(xmlXPathObjectPtr));
-	if (cur->locTab == NULL) {
-	    fprintf(xmlXPathDebug, "xmlXPathLocationSetAdd: out of memory\n");
-	    return;
-	}
-	memset(cur->locTab, 0 ,
-	       XML_RANGESET_DEFAULT * (size_t) sizeof(xmlXPathObjectPtr));
-        cur->locMax = XML_RANGESET_DEFAULT;
-    } else if (cur->locNr == cur->locMax) {
-        xmlXPathObjectPtr *temp;
-
-        cur->locMax *= 2;
-	temp = (xmlXPathObjectPtr *) xmlRealloc(cur->locTab, cur->locMax *
-				      sizeof(xmlXPathObjectPtr));
-	if (temp == NULL) {
-	    fprintf(xmlXPathDebug, "xmlXPathLocationSetAdd: out of memory\n");
-	    return;
-	}
-	cur->locTab = temp;
-    }
-    cur->locTab[cur->locNr++] = val;
-}
-
-/**
- * xmlXPathLocationSetMerge:
- * @val1:  the first LocationSet
- * @val2:  the second LocationSet
- *
- * Merges two rangesets, all ranges from @val2 are added to @val1
- *
- * Returns val1 once extended or NULL in case of error.
- */
-xmlLocationSetPtr
-xmlXPathLocationSetMerge(xmlLocationSetPtr val1, xmlLocationSetPtr val2) {
-    int i;
-
-    if (val1 == NULL) return(NULL);
-    if (val2 == NULL) return(val1);
-
-    /*
-     * !!!!! this can be optimized a lot, knowing that both
-     *       val1 and val2 already have unicity of their values.
-     */
-
-    for (i = 0;i < val2->locNr;i++)
-        xmlXPathLocationSetAdd(val1, val2->locTab[i]);
-
-    return(val1);
-}
-
-/**
- * xmlXPathLocationSetDel:
- * @cur:  the initial range set
- * @val:  an xmlXPathObjectPtr
- *
- * Removes an xmlXPathObjectPtr from an existing LocationSet
- */
-void
-xmlXPathLocationSetDel(xmlLocationSetPtr cur, xmlXPathObjectPtr val) {
-    int i;
-
-    if (cur == NULL) return;
-    if (val == NULL) return;
-
-    /*
-     * check against doublons
-     */
-    for (i = 0;i < cur->locNr;i++)
-        if (cur->locTab[i] == val) break;
-
-    if (i >= cur->locNr) {
-#ifdef DEBUG
-        fprintf(xmlXPathDebug, 
-	        "xmlXPathLocationSetDel: Range %s wasn't found in RangeList\n",
-		val->name);
-#endif
-        return;
-    }
-    cur->locNr--;
-    for (;i < cur->locNr;i++)
-        cur->locTab[i] = cur->locTab[i + 1];
-    cur->locTab[cur->locNr] = NULL;
-}
-
-/**
- * xmlXPathLocationSetRemove:
- * @cur:  the initial range set
- * @val:  the index to remove
- *
- * Removes an entry from an existing LocationSet list.
- */
-void
-xmlXPathLocationSetRemove(xmlLocationSetPtr cur, int val) {
-    if (cur == NULL) return;
-    if (val >= cur->locNr) return;
-    cur->locNr--;
-    for (;val < cur->locNr;val++)
-        cur->locTab[val] = cur->locTab[val + 1];
-    cur->locTab[cur->locNr] = NULL;
-}
-
-/**
- * xmlXPathFreeLocationSet:
- * @obj:  the xmlLocationSetPtr to free
- *
- * Free the LocationSet compound (not the actual ranges !).
- */
-void
-xmlXPathFreeLocationSet(xmlLocationSetPtr obj) {
-    if (obj == NULL) return;
-    if (obj->locTab != NULL) {
-#ifdef DEBUG
-	memset(obj->locTab, 0xB ,
-	       (size_t) sizeof(xmlXPathObjectPtr) * obj->locMax);
-#endif
-	xmlFree(obj->locTab);
-    }
-#ifdef DEBUG
-    memset(obj, 0xB , (size_t) sizeof(xmlLocationSet));
-#endif
-    xmlFree(obj);
-}
-
-#if defined(DEBUG) || defined(DEBUG_STEP)
-/**
- * xmlXPathDebugLocationSet:
- * @output:  a FILE * for the output
- * @obj:  the xmlLocationSetPtr to free
- *
- * Quick display of a LocationSet
- */
-void
-xmlXPathDebugLocationSet(FILE *output, xmlLocationSetPtr obj) {
-    int i;
-
-    if (output == NULL) output = xmlXPathDebug;
-    if (obj == NULL)  {
-        fprintf(output, "LocationSet == NULL !\n");
-	return;
-    }
-    if (obj->locNr == 0) {
-        fprintf(output, "LocationSet is empty\n");
-	return;
-    }
-    if (obj->locTab == NULL) {
-	fprintf(output, " locTab == NULL !\n");
-	return;
-    }
-    for (i = 0; i < obj->locNr; i++) {
-        if (obj->locTab[i] == NULL) {
-	    fprintf(output, " NULL !\n");
-	    return;
-        }
-	if ((obj->locTab[i]->type == XML_DOCUMENT_NODE) ||
-	    (obj->locTab[i]->type == XML_HTML_DOCUMENT_NODE))
-	    fprintf(output, " /");
-	/******* TODO 
-	else if (obj->locTab[i]->name == NULL)
-	    fprintf(output, " noname!");
-	else fprintf(output, " %s", obj->locTab[i]->name);
-	 ********/
-    }
-    fprintf(output, "\n");
-}
-#endif
-
-/**
- * xmlXPathNewLocationSetNodes:
- * @start:  the NodePtr value
- * @end:  the NodePtr value
- *
- * Create a new xmlXPathObjectPtr of type LocationSet and initialize
- * it with the single range made of the two nodes @start and @end
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathNewLocationSetNodes(xmlNodePtr start, xmlNodePtr end) {
-    xmlXPathObjectPtr ret;
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathNewLocationSet: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_LOCATIONSET;
-    ret->user = xmlXPathLocationSetCreate(xmlXPathNewRangeNodes(start, end));
-    return(ret);
-}
-
-/**
- * xmlXPathWrapLocationSet:
- * @val:  the LocationSet value
- *
- * Wrap the LocationSet @val in a new xmlXPathObjectPtr
- *
- * Returns the newly created object.
- */
-xmlXPathObjectPtr
-xmlXPathWrapLocationSet(xmlLocationSetPtr val) {
-    xmlXPathObjectPtr ret;
-
-    ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
-    if (ret == NULL) {
-        fprintf(xmlXPathDebug, "xmlXPathWrapLocationSet: out of memory\n");
-	return(NULL);
-    }
-    memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
-    ret->type = XPATH_LOCATIONSET;
-    ret->user = (void *) val;
-    return(ret);
-}
-
-#endif /* LIBXML_XPTR_ENABLED */
-
-/**
  * xmlXPathFreeObject:
  * @obj:  the object to free
  *
@@ -1280,6 +777,9 @@
     if (obj->type == XPATH_NODESET) {
 	if (obj->nodesetval != NULL)
 	    xmlXPathFreeNodeSet(obj->nodesetval);
+    } else if (obj->type == XPATH_LOCATIONSET) {
+	if (obj->user != NULL)
+	    xmlXPathFreeLocationSet(obj->user);
     } else if (obj->type == XPATH_STRING) {
 	if (obj->stringval != NULL)
 	    xmlFree(obj->stringval);
diff --git a/xpath.h b/xpath.h
index 496acc0..7031c57 100644
--- a/xpath.h
+++ b/xpath.h
@@ -267,7 +267,18 @@
  */
 xmlXPathObjectPtr valuePop			(xmlXPathParserContextPtr ctxt);
 int		  valuePush			(xmlXPathParserContextPtr ctxt,
-						 xmlXPathObjectPtr value);
+					 	xmlXPathObjectPtr value);
+
+xmlXPathObjectPtr xmlXPathNewString		(const xmlChar *val);
+xmlXPathObjectPtr xmlXPathNewNodeSet		(xmlNodePtr val);
+void		  xmlXPathNodeSetAdd		(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+
+
+void		  xmlXPathIdFunction		(xmlXPathParserContextPtr ctxt,
+					 	int nargs);
+void		  xmlXPathRoot			(xmlXPathParserContextPtr ctxt);
+void		  xmlXPathEvalExpr		(xmlXPathParserContextPtr ctxt);
 
 /************************************************************************
  *									*