diff --git a/ChangeLog b/ChangeLog
index efc12a8..233ec93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Dec  9 15:08:17 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* Makefile.am xmlreader.c include/libxml/Makefile.am
+	  include/libxml/xmlreader.h:  Adding a new set of APIs based on
+	  the C# TextXmlReader API but converted to C. Allow to parse
+	  in constant memory usage, far simpler to program and explain
+	  than the SAX like APIs, unfinished but working.
+	* testReader.c: test program
+
 Sun Dec  8 18:36:01 CET 2002 Igor Zlatkovic <igor@stud.fh-frankfurt.de>
 
 	* win32/libxml2.def.src: applied YALDSP from Mark Vakoc
diff --git a/Makefile.am b/Makefile.am
index 3ec0e13..bf0f0cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
 
 noinst_PROGRAMS=testSchemas testSAX testHTML testXPath testURI testDocbook \
-                testThreads testC14N testAutomata testRegexp
+                testThreads testC14N testAutomata testRegexp testReader
 
 bin_PROGRAMS = xmllint xmlcatalog
 
@@ -26,14 +26,15 @@
 		xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c \
 		catalog.c globals.c threads.c c14n.c \
 		xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \
-		triostr.c trio.c
+		triostr.c trio.c xmlreader.c
 else
 libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
 		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  \
 		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  \
 		xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c \
 		catalog.c globals.c threads.c c14n.c \
-		xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c
+		xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \
+		xmlreader.c
 endif
 
 DEPS = $(top_builddir)/libxml2.la
@@ -104,6 +105,11 @@
 testSchemas_DEPENDENCIES = $(DEPS)
 testSchemas_LDADD= $(LDADDS)
 
+testReader_SOURCES=testReader.c
+testReader_LDFLAGS = 
+testReader_DEPENDENCIES = $(DEPS)
+testReader_LDADD= $(LDADDS)
+
 check-local: tests
 
 testall : tests SVGtests SAXtests
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html
index 542bde7..744abf9 100644
--- a/doc/APIchunk8.html
+++ b/doc/APIchunk8.html
@@ -525,6 +525,7 @@
 <dd>
 <a href="html/libxml-docbparser.html#DOCBPARSECHUNK">docbParseChunk</a>
 <a href="html/libxml-htmltree.html#HTMLDOCDUMP">htmlDocDump</a>
+<a href="html/libxml-htmltree.html#HTMLNODEDUMP">htmlNodeDump</a>
 <a href="html/libxml-htmltree.html#HTMLNODEDUMPFILEFORMAT">htmlNodeDumpFileFormat</a>
 <a href="html/libxml-htmlparser.html#HTMLPARSECHUNK">htmlParseChunk</a>
 <a href="html/libxml-htmltree.html#HTMLSAVEFILE">htmlSaveFile</a>
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 8b33f46..dd68dec 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -2714,7 +2714,7 @@
     </function>
     <function name='htmlNodeDump' file='HTMLtree'>
       <info>Dump an HTML node, recursive behaviour,children are printed too, and formatting returns are added.</info>
-      <return type='void'/>
+      <return type='int' info='the number of byte written or -1 in case of error '/>
       <arg name='buf' type='xmlBufferPtr' info='the HTML buffer output '/>
       <arg name='doc' type='xmlDocPtr' info='the document '/>
       <arg name='cur' type='xmlNodePtr' info='the current node '/>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index dfc0fba..97d16d9 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -13322,6 +13322,7 @@
         <word name='byte'>
           <ref name='docbParseChunk'/>
           <ref name='htmlDocDump'/>
+          <ref name='htmlNodeDump'/>
           <ref name='htmlNodeDumpFileFormat'/>
           <ref name='htmlParseChunk'/>
           <ref name='htmlSaveFile'/>
diff --git a/include/libxml/Makefile.am b/include/libxml/Makefile.am
index 97f3394..3a50bc1 100644
--- a/include/libxml/Makefile.am
+++ b/include/libxml/Makefile.am
@@ -37,7 +37,8 @@
 		xmlschemas.h \
 		schemasInternals.h \
 		xmlschemastypes.h \
-		xmlunicode.h
+		xmlunicode.h \
+		xmlreader.h
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(xmlincdir)
diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h
new file mode 100644
index 0000000..8e4b057
--- /dev/null
+++ b/include/libxml/xmlreader.h
@@ -0,0 +1,56 @@
+/*
+ * xmlreader.h : Interfaces, constants and types of the XML streaming API.
+ *
+ * See Copyright for the status of this software.
+ *
+ * daniel@veillard.com
+ */
+
+#ifndef __XML_XMLREADER_H__
+#define __XML_XMLREADER_H__
+
+#include <libxml/tree.h>
+#include <libxml/xmlIO.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _xmlTextReader xmlTextReader;
+typedef xmlTextReader *xmlTextReaderPtr;
+
+/*
+ * Constructors & Destructor
+ */
+xmlTextReaderPtr	xmlNewTextReader	(xmlParserInputBufferPtr input);
+xmlTextReaderPtr	xmlNewTextReaderFilename(const char *URI);
+void			xmlFreeTextReader	(xmlTextReaderPtr reader);
+
+/*
+ * Iterators
+ */
+int		xmlTextReaderRead	(xmlTextReaderPtr reader);
+
+/*
+ * Attributes of the node
+ */
+int		xmlTextReaderAttributeCount(xmlTextReaderPtr reader);
+xmlChar *	xmlTextReaderBaseUri	(xmlTextReaderPtr reader);
+int		xmlTextReaderDepth	(xmlTextReaderPtr reader);
+int		xmlTextReaderHasAttributes(xmlTextReaderPtr reader);
+int		xmlTextReaderHasValue(xmlTextReaderPtr reader);
+int		xmlTextReaderIsDefault	(xmlTextReaderPtr reader);
+int		xmlTextReaderIsEmptyElement(xmlTextReaderPtr reader);
+xmlChar *	xmlTextReaderLocalName	(xmlTextReaderPtr reader);
+xmlChar *	xmlTextReaderName	(xmlTextReaderPtr reader);
+xmlChar *	xmlTextReaderNamespaceUri(xmlTextReaderPtr reader);
+int		xmlTextReaderNodeType	(xmlTextReaderPtr reader);
+xmlChar *	xmlTextReaderPrefix	(xmlTextReaderPtr reader);
+int		xmlTextReaderQuoteChar	(xmlTextReaderPtr reader);
+xmlChar *	xmlTextReaderValue	(xmlTextReaderPtr reader);
+xmlChar *	xmlTextReaderXmlLang	(xmlTextReaderPtr reader);
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_XMLREADER_H__ */
+
diff --git a/parser.c b/parser.c
index d281a7c..864f693 100644
--- a/parser.c
+++ b/parser.c
@@ -9871,6 +9871,7 @@
 
     oldsax = ctxt->sax;
     ctxt->sax = oldctxt->sax;
+    ctxt->_private = oldctxt->_private;
     if (oldctxt->myDoc == NULL) {
 	newDoc = xmlNewDoc(BAD_CAST "1.0");
 	if (newDoc == NULL) {
diff --git a/testReader.c b/testReader.c
new file mode 100644
index 0000000..b89992d
--- /dev/null
+++ b/testReader.c
@@ -0,0 +1,136 @@
+/*
+ * testSAX.c : a small tester program for parsing using the SAX API.
+ *
+ * See Copyright for the status of this software.
+ *
+ * daniel@veillard.com
+ */
+
+#include "libxml.h"
+
+#include <string.h>
+#include <stdarg.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+
+#include <libxml/xmlreader.h>
+
+int debug = 0;
+int dump = 0;
+int noent = 0;
+int count = 0;
+
+static void usage(const char *progname) {
+    printf("Usage : %s [options] XMLfiles ...\n", progname);
+    printf("\tParse the XML files using the xmlTextReader API\n");
+    printf("\tand output the result of the parsing\n");
+    exit(1);
+}
+static int elem, attrs;
+
+static void processNode(xmlTextReaderPtr reader) {
+    int type;
+
+    type = xmlTextReaderNodeType(reader);
+    if (count) {
+	if (type == 1) {
+	    elem++;
+	    attrs += xmlTextReaderAttributeCount(reader);
+	}
+    } else {
+	xmlChar *name = xmlTextReaderName(reader);
+	if (name != NULL) {
+	    printf("%s : %d", name, xmlTextReaderNodeType(reader));
+	    xmlFree(name);
+	} else {
+	    printf("NULL: %d", xmlTextReaderNodeType(reader));
+	}
+	if (xmlTextReaderIsEmptyElement(reader))
+	    printf(" empty");
+	printf("\n");
+    }
+}
+
+static void handleFile(const char *filename) {
+    xmlTextReaderPtr reader;
+    int ret;
+
+    if (count) {
+	elem = 0;
+	attrs = 0;
+    }
+
+    reader = xmlNewTextReaderFilename(filename);
+    if (reader != NULL) {
+	/*
+	 * Process all nodes in sequence
+	 */
+	ret = xmlTextReaderRead(reader);
+	while (ret == 1) {
+	    processNode(reader);
+	    ret = xmlTextReaderRead(reader);
+	}
+
+	/*
+	 * Done, cleanup and status
+	 */
+	xmlFreeTextReader(reader);
+	if (ret != 0) {
+	    printf("%s : failed to parse\n", filename);
+	} else if (count)
+	    printf("%s : %d elements, %d attributes\n", filename, elem, attrs);
+    } else {
+	fprintf(stderr, "Unable to open %s\n", filename);
+    }
+}
+
+int main(int argc, char **argv) {
+    int i;
+    int files = 0;
+
+    if (argc <= 1) {
+	usage(argv[0]);
+	return(1);
+    }
+    LIBXML_TEST_VERSION
+    for (i = 1; i < argc ; i++) {
+	if ((!strcmp(argv[i], "-debug")) || (!strcmp(argv[i], "--debug")))
+	    debug++;
+	else if ((!strcmp(argv[i], "-dump")) || (!strcmp(argv[i], "--dump")))
+	    dump++;
+	else if ((!strcmp(argv[i], "-count")) || (!strcmp(argv[i], "--count")))
+	    count++;
+	else if ((!strcmp(argv[i], "-noent")) ||
+	         (!strcmp(argv[i], "--noent")))
+	    noent++;
+    }
+    if (noent != 0) xmlSubstituteEntitiesDefault(1);
+    for (i = 1; i < argc ; i++) {
+	if (argv[i][0] != '-') {
+	    handleFile(argv[i]);
+	    files ++;
+	}
+    }
+    xmlCleanupParser();
+    xmlMemoryDump();
+
+    return(0);
+}
diff --git a/tree.c b/tree.c
index b995c78..cf50bce 100644
--- a/tree.c
+++ b/tree.c
@@ -2589,7 +2589,8 @@
 	    if ((cur->children != NULL) &&
 		(cur->type != XML_ENTITY_REF_NODE))
 		xmlFreeNodeList(cur->children);
-	    if (cur->properties != NULL)
+	    if ((cur->type == XML_ELEMENT_NODE) &&
+		(cur->properties != NULL))
 		xmlFreePropList(cur->properties);
 	    if ((cur->type != XML_ELEMENT_NODE) &&
 		(cur->type != XML_XINCLUDE_START) &&
@@ -2666,7 +2667,7 @@
     if ((cur->children != NULL) &&
 	(cur->type != XML_ENTITY_REF_NODE))
 	xmlFreeNodeList(cur->children);
-    if (cur->properties != NULL)
+    if ((cur->type == XML_ELEMENT_NODE) && (cur->properties != NULL))
 	xmlFreePropList(cur->properties);
     if ((cur->type != XML_ELEMENT_NODE) &&
 	(cur->content != NULL) &&
@@ -2701,7 +2702,11 @@
 	    xmlFree((char *) cur->name);
     }
 
-    if (cur->nsDef != NULL) xmlFreeNsList(cur->nsDef);
+    if (((cur->type == XML_ELEMENT_NODE) ||
+	 (cur->type == XML_XINCLUDE_START) ||
+	 (cur->type == XML_XINCLUDE_END)) &&
+	(cur->nsDef != NULL))
+	xmlFreeNsList(cur->nsDef);
     xmlFree(cur);
 }
 
diff --git a/xmlreader.c b/xmlreader.c
new file mode 100644
index 0000000..1215f4f
--- /dev/null
+++ b/xmlreader.c
@@ -0,0 +1,773 @@
+/*
+ * xmlreader.c: implements the xmlTextReader streaming node API
+ *
+ * See Copyright for the status of this software.
+ *
+ * daniel@veillard.com
+ */
+
+#define IN_LIBXML
+#include "libxml.h"
+
+#include <string.h> /* for memset() only ! */
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <libxml/xmlmemory.h>
+#include <libxml/xmlIO.h>
+#include <libxml/xmlreader.h>
+
+/* #define DEBUG_CALLBACKS */
+/* #define DEBUG_READER */
+
+/**
+ * TODO:
+ *
+ * macro to flag unimplemented blocks
+ */
+#define TODO 								\
+    xmlGenericError(xmlGenericErrorContext,				\
+	    "Unimplemented block at %s:%d\n",				\
+            __FILE__, __LINE__);
+
+#ifdef DEBUG_READER
+#define DUMP_READER xmlTextReaderDebug(reader);
+#else
+#define DUMP_READER
+#endif
+
+/************************************************************************
+ *									*
+ *	The parser: maps the Text Reader API on top of the existing	*
+ *		parsing routines building a tree			*
+ *									*
+ ************************************************************************/
+
+#define XML_TEXTREADER_INPUT	1
+#define XML_TEXTREADER_CTXT	2
+
+typedef enum {
+    XML_TEXTREADER_MODE_NORMAL = 0,
+    XML_TEXTREADER_MODE_EOF = 1
+} xmlTextReaderMode;
+
+typedef enum {
+    XML_TEXTREADER_NONE = -1,
+    XML_TEXTREADER_START= 0,
+    XML_TEXTREADER_ELEMENT= 1,
+    XML_TEXTREADER_END= 2,
+    XML_TEXTREADER_EMPTY= 3,
+    XML_TEXTREADER_BACKTRACK= 4
+} xmlTextReaderState;
+
+struct _xmlTextReader {
+    int				mode;	/* the parsing mode */
+    int				allocs;	/* what structure were deallocated */
+    xmlTextReaderState		state;
+    xmlParserCtxtPtr		ctxt;	/* the parser context */
+    xmlSAXHandlerPtr		sax;	/* the parser SAX callbacks */
+    xmlParserInputBufferPtr	input;	/* the input */
+    startElementSAXFunc		startElement;/* initial SAX callbacks */
+    endElementSAXFunc		endElement;  /* idem */
+    unsigned int 		base;	/* base of the segment in the input */
+    unsigned int 		cur;	/* current position in the input */
+    xmlNodePtr			node;	/* current node */
+    int				depth;  /* depth of the current node */
+};
+
+#ifdef DEBUG_READER
+static void
+xmlTextReaderDebug(xmlTextReaderPtr reader) {
+    if ((reader == NULL) || (reader->ctxt == NULL)) {
+	fprintf(stderr, "xmlTextReader NULL\n");
+	return;
+    }
+    fprintf(stderr, "xmlTextReader: state %d depth %d ",
+	    reader->state, reader->depth);
+    if (reader->node == NULL) {
+	fprintf(stderr, "node = NULL\n");
+    } else {
+	fprintf(stderr, "node %s\n", reader->node->name);
+    }
+    fprintf(stderr, "  input: base %d, cur %d, depth %d: ",
+	    reader->base, reader->cur, reader->ctxt->nodeNr);
+    if (reader->input->buffer == NULL) {
+	fprintf(stderr, "buffer is NULL\n");
+    } else {
+#ifdef LIBXML_DEBUG_ENABLED
+	xmlDebugDumpString(stderr,
+		&reader->input->buffer->content[reader->cur]);
+#endif
+	fprintf(stderr, "\n");
+    }
+}
+#endif
+
+/**
+ * xmlTextReaderStartElement:
+ * @ctx: the user data (XML parser context)
+ * @fullname:  The element name, including namespace prefix
+ * @atts:  An array of name/value attributes pairs, NULL terminated
+ *
+ * called when an opening tag has been processed.
+ */
+static void
+xmlTextReaderStartElement(void *ctx, const xmlChar *fullname,
+	                  const xmlChar **atts) {
+    xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
+    xmlTextReaderPtr reader = ctxt->_private;
+
+#ifdef DEBUG_CALLBACKS
+    printf("xmlTextReaderStartElement(%s)\n", fullname);
+#endif
+    if ((reader != NULL) && (reader->startElement != NULL))
+	reader->startElement(ctx, fullname, atts);
+    reader->state = XML_TEXTREADER_ELEMENT;
+}
+
+/**
+ * xmlTextReaderEndElement:
+ * @ctx: the user data (XML parser context)
+ * @fullname:  The element name, including namespace prefix
+ *
+ * called when an ending tag has been processed.
+ */
+static void
+xmlTextReaderEndElement(void *ctx, const xmlChar *fullname) {
+    xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
+    xmlTextReaderPtr reader = ctxt->_private;
+
+#ifdef DEBUG_CALLBACKS
+    printf("xmlTextReaderEndElement(%s)\n", fullname);
+#endif
+    if ((reader != NULL) && (reader->endElement != NULL))
+	reader->endElement(ctx, fullname);
+    if (reader->state == XML_TEXTREADER_ELEMENT)
+	reader->state = XML_TEXTREADER_EMPTY;
+    else
+	reader->state = XML_TEXTREADER_END;
+}
+
+/**
+ * xmlTextReaderPushData:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * Push data down the progressive parser until a significant callback
+ * got raised.
+ *
+ * Returns -1 in case of failure, 0 otherwise
+ */
+static int
+xmlTextReaderPushData(xmlTextReaderPtr reader) {
+    unsigned int cur = reader->cur;
+    xmlBufferPtr inbuf;
+    int val;
+
+    if ((reader->input == NULL) || (reader->input->buffer == NULL))
+	return(-1);
+
+    reader->state = XML_TEXTREADER_NONE;
+    inbuf = reader->input->buffer;
+    while (reader->state == XML_TEXTREADER_NONE) {
+	if (cur >= inbuf->use) {
+	    /*
+	     * Refill the buffer unless we are at the end of the stream
+	     */
+	    if (reader->mode != XML_TEXTREADER_MODE_EOF) {
+		val = xmlParserInputBufferRead(reader->input, 4096);
+		if (val <= 0) {
+		    reader->mode = XML_TEXTREADER_MODE_EOF;
+		    return(val);
+		}
+	    } else 
+		break;
+	}
+	if ((inbuf->content[cur] == '>') || (inbuf->content[cur] == '&')) {
+	    cur = cur + 1;
+	    val = xmlParseChunk(reader->ctxt,
+		          (const char *) &inbuf->content[reader->cur],
+			  cur - reader->cur, 0);
+	    if (val != 0)
+		return(-1);
+	    reader->cur = cur;
+	    break;
+	} else {
+	    cur = cur + 1;
+
+	    /*
+	     * One may have to force a flush at some point when parsing really
+	     * large CDATA sections
+	     */
+	    if ((cur - reader->cur > 4096) && (reader->base == 0) &&
+		(reader->mode == XML_TEXTREADER_MODE_NORMAL)) {
+		cur = cur + 1;
+		val = xmlParseChunk(reader->ctxt,
+			      (const char *) &inbuf->content[reader->cur],
+			      cur - reader->cur, 0);
+		if (val != 0)
+		    return(-1);
+		reader->cur = cur;
+	    }
+	}
+    }
+    /*
+     * Discard the consumed input when needed and possible
+     */
+    if (reader->mode == XML_TEXTREADER_MODE_NORMAL) {
+	if ((reader->cur >= 4096) && (reader->base == 0)) {
+	    val = xmlBufferShrink(inbuf, cur);
+	    if (val >= 0) {
+		reader->cur -= val;
+	    }
+	}
+    }
+
+    /*
+     * At the end of the stream signal that the work is done to the Push
+     * parser.
+     */
+    if ((reader->mode == XML_TEXTREADER_MODE_EOF) && (cur >= inbuf->use)) {
+	val = xmlParseChunk(reader->ctxt,
+		(const char *) &inbuf->content[reader->cur], 0, 1);
+    }
+    return(0);
+}
+
+/**
+ * xmlTextReaderRead:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ *  Moves the position of the current instance to the next node in
+ *  the stream, exposing its properties.
+ *
+ *  Returns 1 if the node was read successfully, 0 if there is no more
+ *          nodes to read, or -1 in case of error
+ */
+int
+xmlTextReaderRead(xmlTextReaderPtr reader) {
+    int val, olddepth;
+    xmlTextReaderState oldstate;
+    xmlNodePtr oldnode;
+
+    if ((reader == NULL) || (reader->ctxt == NULL))
+	return(-1);
+    if (reader->ctxt->wellFormed != 1)
+	return(-1);
+
+#ifdef DEBUG_READER
+    fprintf(stderr, "\nREAD ");
+    DUMP_READER
+#endif
+    if (reader->node == NULL) {
+	/*
+	 * Initial state
+	 */
+	do {
+	    val = xmlTextReaderPushData(reader);
+	    if (val < 0)
+		return(-1);
+	} while ((reader->ctxt->node == NULL) &&
+		 (reader->mode != XML_TEXTREADER_MODE_EOF));
+	if (reader->ctxt->node == NULL) {
+	    if (reader->ctxt->myDoc != NULL)
+		reader->node = reader->ctxt->myDoc->children;
+	    if (reader->node == NULL)
+		return(-1);
+	} else {
+	    reader->node = reader->ctxt->node;
+	}
+	reader->depth = 1;
+	return(1);
+    }
+    oldstate = reader->state;
+    olddepth = reader->ctxt->nodeNr;
+    oldnode = reader->node;
+    /*
+     * If we are not backtracking on ancestors or examined nodes,
+     * that the parser didn't finished or that we arent at the end
+     * of stream, continue processing.
+     */
+    if (oldstate != XML_TEXTREADER_BACKTRACK) {
+	while (((reader->node->children == NULL) ||
+		(reader->node->type == XML_ENTITY_REF_NODE) ||
+		(reader->node->type == XML_DTD_NODE)) &&
+	       (reader->node->next == NULL) &&
+	       (reader->ctxt->nodeNr == olddepth) &&
+	       (reader->ctxt->instate != XML_PARSER_EOF)) {
+	    val = xmlTextReaderPushData(reader);
+	    if (val < 0)
+		return(-1);
+	    if (reader->node == NULL)
+		return(0);
+	}
+	if ((reader->node->children != NULL) &&
+	    (reader->node->type != XML_ENTITY_REF_NODE) &&
+	    (reader->node->type != XML_DTD_NODE)) {
+	    reader->node = reader->node->children;
+	    reader->depth++;
+	    if ((reader->state != XML_TEXTREADER_ELEMENT) &&
+		(reader->state != XML_TEXTREADER_EMPTY))
+		reader->state = XML_TEXTREADER_ELEMENT;
+	    DUMP_READER
+	    return(1);
+	}
+    }
+    if (reader->node->next != NULL) {
+	if ((oldstate == XML_TEXTREADER_ELEMENT) &&
+            (reader->node->type == XML_ELEMENT_NODE)) {
+	    reader->state = XML_TEXTREADER_END;
+	    DUMP_READER
+	    return(1);
+	}
+	reader->node = reader->node->next;
+	reader->state = XML_TEXTREADER_ELEMENT;
+	DUMP_READER
+	/*
+	 * Cleanup of the old node
+	 */
+	if (oldnode->type != XML_DTD_NODE) {
+	    xmlUnlinkNode(oldnode);
+	    xmlFreeNode(oldnode);
+	}
+
+	return(1);
+    }
+    reader->node = reader->node->parent;
+    if ((reader->node == NULL) ||
+	(reader->node->type == XML_DOCUMENT_NODE) ||
+#ifdef LIBXML_DOCB_ENABLED
+	(reader->node->type == XML_DOCB_DOCUMENT_NODE) ||
+#endif
+	(reader->node->type == XML_HTML_DOCUMENT_NODE)) {
+	reader->node = NULL;
+	reader->depth = 0;
+
+	/*
+	 * Cleanup of the old node
+	 */
+	if (oldnode->type != XML_DTD_NODE) {
+	    xmlUnlinkNode(oldnode);
+	    xmlFreeNode(oldnode);
+	}
+
+	return(0);
+    }
+    reader->depth--;
+    reader->state = XML_TEXTREADER_BACKTRACK;
+    DUMP_READER
+    return(1);
+}
+
+/************************************************************************
+ *									*
+ *			Constructor and destructors			*
+ *									*
+ ************************************************************************/
+/**
+ * xmlNewTextReader:
+ * @input: the xmlParserInputBufferPtr used to read data
+ *
+ * Create an xmlTextReader structure fed with @input
+ *
+ * Returns the new xmlTextReaderPtr or NULL in case of error
+ */
+xmlTextReaderPtr
+xmlNewTextReader(xmlParserInputBufferPtr input) {
+    xmlTextReaderPtr ret;
+    int val;
+
+    if (input == NULL)
+	return(NULL);
+    ret = xmlMalloc(sizeof(xmlTextReader));
+    if (ret == NULL) {
+        xmlGenericError(xmlGenericErrorContext,
+		"xmlNewTextReader : malloc failed\n");
+	return(NULL);
+    }
+    memset(ret, 0, sizeof(xmlTextReader));
+    ret->input = input;
+    ret->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler));
+    if (ret->sax == NULL) {
+	xmlFree(ret);
+        xmlGenericError(xmlGenericErrorContext,
+		"xmlNewTextReader : malloc failed\n");
+	return(NULL);
+    }
+    memcpy(ret->sax, &xmlDefaultSAXHandler, sizeof(xmlSAXHandler));
+    ret->startElement = ret->sax->startElement;
+    ret->sax->startElement = xmlTextReaderStartElement;
+    ret->endElement = ret->sax->endElement;
+    ret->sax->endElement = xmlTextReaderEndElement;
+
+    ret->mode = XML_TEXTREADER_MODE_NORMAL;
+    ret->node = NULL;
+    val = xmlParserInputBufferRead(input, 4);
+    if (val >= 4) {
+	ret->ctxt = xmlCreatePushParserCtxt(ret->sax, NULL,
+			(const char *) ret->input->buffer->content, 4, NULL);
+	ret->base = 0;
+	ret->cur = 4;
+    } else {
+	ret->ctxt = xmlCreatePushParserCtxt(ret->sax, NULL, NULL, 0, NULL);
+	ret->base = 0;
+	ret->cur = 0;
+    }
+    ret->ctxt->_private = ret;
+    ret->allocs = XML_TEXTREADER_CTXT;
+    return(ret);
+
+}
+
+/**
+ * xmlNewTextReaderFilename:
+ * @URI: the URI of the resource to process
+ *
+ * Create an xmlTextReader structure fed with the resource at @URI
+ *
+ * Returns the new xmlTextReaderPtr or NULL in case of error
+ */
+xmlTextReaderPtr
+xmlNewTextReaderFilename(const char *URI) {
+    xmlParserInputBufferPtr input;
+    xmlTextReaderPtr ret;
+
+    input = xmlParserInputBufferCreateFilename(URI, XML_CHAR_ENCODING_NONE);
+    if (input == NULL)
+	return(NULL);
+    ret = xmlNewTextReader(input);
+    if (ret == NULL) {
+	xmlFreeParserInputBuffer(input);
+	return(NULL);
+    }
+    ret->allocs |= XML_TEXTREADER_INPUT;
+    return(ret);
+}
+
+/**
+ * xmlFreeTextReader:
+ * @reader:  the xmlTextReaderPtr
+ *
+ * Deallocate all the resources associated to the reader
+ */
+void
+xmlFreeTextReader(xmlTextReaderPtr reader) {
+    if (reader == NULL)
+	return;
+    if (reader->ctxt != NULL) {
+	if (reader->ctxt->myDoc != NULL) {
+	    xmlFreeDoc(reader->ctxt->myDoc);
+	    reader->ctxt->myDoc = NULL;
+	}
+	if (reader->allocs & XML_TEXTREADER_CTXT)
+	    xmlFreeParserCtxt(reader->ctxt);
+    }
+    if (reader->sax != NULL)
+	xmlFree(reader->sax);
+    if ((reader->input != NULL)  && (reader->allocs & XML_TEXTREADER_INPUT))
+	xmlFreeParserInputBuffer(reader->input);
+    xmlFree(reader);
+}
+
+/************************************************************************
+ *									*
+ *			Acces API to the current node			*
+ *									*
+ ************************************************************************/
+/**
+ * xmlTextReaderAttributeCount:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * Returns the number of attributes of the current node
+ *
+ * Returns 0 i no attributes, -1 in case of error or the attribute count
+ */
+int
+xmlTextReaderAttributeCount(xmlTextReaderPtr reader) {
+    int ret;
+    xmlAttrPtr attr;
+
+    if (reader == NULL)
+	return(-1);
+    if (reader->node == NULL)
+	return(0);
+    if (reader->node->type != XML_ELEMENT_NODE)
+	return(0);
+    if ((reader->state == XML_TEXTREADER_END) ||
+	(reader->state == XML_TEXTREADER_BACKTRACK))
+	return(0);
+    ret = 0;
+    attr = reader->node->properties;
+    while (attr != NULL) {
+	ret++;
+	attr = attr->next;
+    }
+    return(ret);
+}
+
+/**
+ * xmlTextReaderNodeType:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * Get the node type of the current node
+ * Reference:
+ * http://dotgnu.org/pnetlib-doc/System/Xml/XmlNodeType.html
+ *
+ * Returns the xmlNodeType of the current node or -1 in case of error
+ */
+int
+xmlTextReaderNodeType(xmlTextReaderPtr reader) {
+    if (reader == NULL)
+	return(-1);
+    if (reader->node == NULL)
+	return(0);
+    switch (reader->node->type) {
+        case XML_ELEMENT_NODE:
+	    if ((reader->state == XML_TEXTREADER_END) ||
+		(reader->state == XML_TEXTREADER_BACKTRACK))
+		return(15);
+	    return(1);
+        case XML_ATTRIBUTE_NODE:
+	    return(2);
+        case XML_TEXT_NODE:
+	    return(3); /* TODO: SignificantWhitespace == 14 Whitespace == 13 */
+        case XML_CDATA_SECTION_NODE:
+	    return(4);
+        case XML_ENTITY_REF_NODE:
+	    return(5);
+        case XML_ENTITY_NODE:
+	    return(6);
+        case XML_PI_NODE:
+	    return(7);
+        case XML_COMMENT_NODE:
+	    return(8);
+        case XML_DOCUMENT_NODE:
+        case XML_HTML_DOCUMENT_NODE:
+#ifdef LIBXML_DOCB_ENABLED
+        case XML_DOCB_DOCUMENT_NODE:
+#endif
+	    return(9);
+        case XML_DOCUMENT_FRAG_NODE:
+	    return(11);
+        case XML_NOTATION_NODE:
+	    return(12);
+        case XML_DOCUMENT_TYPE_NODE:
+        case XML_DTD_NODE:
+	    return(10);
+
+        case XML_ELEMENT_DECL:
+        case XML_ATTRIBUTE_DECL:
+        case XML_ENTITY_DECL:
+        case XML_NAMESPACE_DECL:
+        case XML_XINCLUDE_START:
+        case XML_XINCLUDE_END:
+	    return(0);
+    }
+    return(-1);
+}
+
+/**
+ * xmlTextReaderIsEmpty:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * Check if the current node is empty
+ *
+ * Returns 1 if empty, 0 if not and -1 in case of error
+ */
+int
+xmlTextReaderIsEmptyElement(xmlTextReaderPtr reader) {
+    if ((reader == NULL) || (reader->node == NULL))
+	return(-1);
+    if (reader->node->children != NULL)
+	return(0);
+    if ((reader->state == XML_TEXTREADER_EMPTY) ||
+	(reader->state == XML_TEXTREADER_BACKTRACK))
+	return(1);
+    return(0);
+}
+
+/**
+ * xmlTextReaderLocalName:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * The local name of the node.
+ *
+ * Returns the local name or NULL if not available
+ */
+xmlChar *
+xmlTextReaderLocalName(xmlTextReaderPtr reader) {
+    if ((reader == NULL) || (reader->node == NULL))
+	return(NULL);
+    if ((reader->node->type != XML_ELEMENT_NODE) &&
+	(reader->node->type != XML_ATTRIBUTE_NODE))
+	return(NULL);
+    return(xmlStrdup(reader->node->name));
+}
+
+/**
+ * xmlTextReaderName:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * The qualified name of the node, equal to Prefix :LocalName.
+ *
+ * Returns the local name or NULL if not available
+ */
+xmlChar *
+xmlTextReaderName(xmlTextReaderPtr reader) {
+    xmlChar *ret;
+
+    if ((reader == NULL) || (reader->node == NULL))
+	return(NULL);
+    if ((reader->node->type != XML_ELEMENT_NODE) &&
+	(reader->node->type != XML_ATTRIBUTE_NODE))
+	return(NULL);
+    if ((reader->node->ns == NULL) || (reader->node->ns->prefix == NULL))
+	return(xmlStrdup(reader->node->name));
+    
+    ret = xmlStrdup(reader->node->ns->prefix);
+    ret = xmlStrcat(ret, BAD_CAST ":");
+    ret = xmlStrcat(ret, reader->node->name);
+    return(ret);
+}
+
+/**
+ * xmlTextReaderPrefix:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * A shorthand reference to the namespace associated with the node.
+ *
+ * Returns the prefix or NULL if not available
+ */
+xmlChar *
+xmlTextReaderPrefix(xmlTextReaderPtr reader) {
+    if ((reader == NULL) || (reader->node == NULL))
+	return(NULL);
+    if ((reader->node->type != XML_ELEMENT_NODE) &&
+	(reader->node->type != XML_ATTRIBUTE_NODE))
+	return(NULL);
+    if ((reader->node->ns != NULL) || (reader->node->ns->prefix != NULL))
+	return(xmlStrdup(reader->node->ns->prefix));
+    return(NULL);
+}
+
+/**
+ * xmlTextReaderNamespaceUri:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * The URI defining the namespace associated with the node.
+ *
+ * Returns the namespace URI or NULL if not available
+ */
+xmlChar *
+xmlTextReaderNamespaceUri(xmlTextReaderPtr reader) {
+    if ((reader == NULL) || (reader->node == NULL))
+	return(NULL);
+    if ((reader->node->type != XML_ELEMENT_NODE) &&
+	(reader->node->type != XML_ATTRIBUTE_NODE))
+	return(NULL);
+    if (reader->node->ns != NULL)
+	return(xmlStrdup(reader->node->ns->href));
+    return(NULL);
+}
+
+/**
+ * xmlTextReaderBaseUri:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * The base URI of the node.
+ *
+ * Returns the base URI or NULL if not available
+ */
+xmlChar *
+xmlTextReaderBaseUri(xmlTextReaderPtr reader) {
+    if ((reader == NULL) || (reader->node == NULL))
+	return(NULL);
+    return(xmlNodeGetBase(NULL, reader->node));
+}
+
+/**
+ * xmlTextReaderDepth:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * The depth of the node in the tree.
+ *
+ * Returns the depth or -1 in case of error
+ */
+int
+xmlTextReaderDepth(xmlTextReaderPtr reader) {
+    if (reader == NULL)
+	return(-1);
+    if (reader->node == NULL)
+	return(0);
+
+    return(reader->depth);
+}
+
+/**
+ * xmlTextReaderHasAttributes:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * Whether the node has attributes.
+ *
+ * Returns 1 if true, 0 if false, and -1 in case or error
+ */
+int
+xmlTextReaderHasAttributes(xmlTextReaderPtr reader) {
+    if (reader == NULL)
+	return(-1);
+    if (reader->node == NULL)
+	return(0);
+
+    if ((reader->node->type == XML_ELEMENT_NODE) &&
+	(reader->node->properties != NULL))
+	return(1);
+    /* TODO: handle the xmlDecl */
+    return(0);
+}
+
+/**
+ * xmlTextReaderHasValue:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * Whether the node can have a text value.
+ *
+ * Returns 1 if true, 0 if false, and -1 in case or error
+ */
+int
+xmlTextReaderHasValue(xmlTextReaderPtr reader) {
+    if (reader == NULL)
+	return(-1);
+    if (reader->node == NULL)
+	return(0);
+
+    TODO
+    return(0);
+}
+
+/*
+int		xmlTextReaderIsDefault	(xmlTextReaderPtr reader);
+int		xmlTextReaderQuoteChar	(xmlTextReaderPtr reader);
+xmlChar *	xmlTextReaderValue	(xmlTextReaderPtr reader);
+ */
+
+/**
+ * xmlTextReaderXmlLang:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * The xml:lang scope within which the node resides.
+ *
+ * Returns the xml:lang value or NULL if none exists.
+ */
+xmlChar *
+xmlTextReaderXmlLang(xmlTextReaderPtr reader) {
+    if (reader == NULL)
+	return(NULL);
+    if (reader->node == NULL)
+	return(NULL);
+    return(xmlNodeGetLang(reader->node));
+}
+