Browse Source

Restoring authorship annotation for <wawaka@yandex-team.ru>. Commit 2 of 2.

wawaka 3 years ago
parent
commit
76cdacbb1f

+ 22 - 22
build/ya.conf.json

@@ -3414,13 +3414,13 @@
                 }
             ]
         },
-        "cmake": { 
-            "tools": { 
+        "cmake": {
+            "tools": {
                 "cmake": {
                     "bottle": "cmake",
                     "executable": "cmake"
                 }
-            }, 
+            },
             "platforms": [
                 {
                     "host": {
@@ -3441,7 +3441,7 @@
                     "default": true
                 }
             ]
-        }, 
+        },
         "cling": {
             "tools": {
                 "cling": {
@@ -3464,13 +3464,13 @@
                 }
             ]
         },
-        "ninja": { 
-            "tools": { 
+        "ninja": {
+            "tools": {
                 "ninja": {
                     "bottle": "ninja",
                     "executable": "ninja"
                 }
-            }, 
+            },
             "platforms": [
                 {
                     "host": {
@@ -3491,7 +3491,7 @@
                     "default": true
                 }
             ]
-        }, 
+        },
         "valgrind": {
             "tools": {
                 "valgrind": {
@@ -6994,18 +6994,18 @@
                 ]
             }
         },
-        "cmake": { 
-            "formula": { 
+        "cmake": {
+            "formula": {
                 "sandbox_id": 105454515,
-                "match": "cmake" 
-            }, 
-            "executable": { 
+                "match": "cmake"
+            },
+            "executable": {
                 "cmake": [
                     "bin",
                     "cmake"
                 ]
-            } 
-        }, 
+            }
+        },
         "cling": {
             "formula": {
                 "sandbox_id": 87671454,
@@ -7017,13 +7017,13 @@
                 ]
             }
         },
-        "ninja": { 
-            "formula": { 
-                "sandbox_id": 19094385, 
-                "match": "ninja" 
-            }, 
-            "executable": "ninja" 
-        }, 
+        "ninja": {
+            "formula": {
+                "sandbox_id": 19094385,
+                "match": "ninja"
+            },
+            "executable": "ninja"
+        },
         "kwfeed": {
             "formula": {
                 "sandbox_id": 36077631,

+ 13 - 13
build/ymake_conf.py

@@ -219,12 +219,12 @@ def which(prog):
         return None
 
     path = os.getenv('PATH', '')
- 
+
     pathext = os.environ.get('PATHEXT')
     # На Windows %PATHEXT% указывает на список расширений, которые нужно проверять
     # при поиске команды в пути. Точное совпадение без расширения имеет приоритет.
     pathext = [''] if pathext is None else [''] + pathext.lower().split(os.pathsep)
- 
+
     for dir_ in path.split(os.path.pathsep):
         for ext in pathext:
             p = os.path.join(dir_, prog + ext)
@@ -399,15 +399,15 @@ def unique(it):
 
 class Options(object):
     def __init__(self, argv):
-        def parse_presets(raw_presets): 
-            presets = {} 
+        def parse_presets(raw_presets):
+            presets = {}
             for p in raw_presets:
                 toks = p.split('=', 1)
-                name = toks[0] 
-                value = toks[1] if len(toks) >= 2 else '' 
-                presets[name] = value 
-            return presets 
- 
+                name = toks[0]
+                value = toks[1] if len(toks) >= 2 else ''
+                presets[name] = value
+            return presets
+
         parser = optparse.OptionParser(add_help_option=False)
         opt_group = optparse.OptionGroup(parser, 'Conf script options')
         opt_group.add_option('--toolchain-params', dest='toolchain_params', action='store', help='Set toolchain params via file')
@@ -446,7 +446,7 @@ class Profiler(object):
     Generic = 'generic'
     GProf = 'gprof'
 
- 
+
 class Arcadia(object):
     def __init__(self, root):
         self.root = root
@@ -969,7 +969,7 @@ class ToolchainOptions(object):
 
         logger.debug('c_compiler=%s', self.c_compiler)
         logger.debug('cxx_compiler=%s', self.cxx_compiler)
- 
+
         self.compiler_platform_projects = self.target.find_in_dict(self.params.get('platform'), [])
 
     def version_at_least(self, *args):
@@ -1011,8 +1011,8 @@ class ToolchainOptions(object):
                 logger.debug('Unexpected values in environment: %s', self._env)
                 raise ConfigureError('Internal error')
         return r
- 
- 
+
+
 class GnuToolchainOptions(ToolchainOptions):
     def __init__(self, build, detector):
         super(GnuToolchainOptions, self).__init__(build, detector)

+ 305 - 305
contrib/libs/libxml/DOCBparser.c

@@ -1,305 +1,305 @@
-/* 
- * DOCBparser.c : an attempt to parse SGML Docbook documents 
- * 
- * This is deprecated !!! 
- * Code removed with release 2.6.0 it was broken. 
- * The doc are expect to be migrated to XML DocBook 
- * 
- * See Copyright for the status of this software. 
- * 
- * daniel@veillard.com 
- */ 
- 
-#define IN_LIBXML 
-#include "libxml.h" 
-#ifdef LIBXML_DOCB_ENABLED 
- 
-#include <libxml/xmlerror.h> 
-#include <libxml/DOCBparser.h> 
- 
-/** 
- * docbEncodeEntities: 
- * @out:  a pointer to an array of bytes to store the result 
- * @outlen:  the length of @out 
- * @in:  a pointer to an array of UTF-8 chars 
- * @inlen:  the length of @in 
- * @quoteChar: the quote character to escape (' or ") or zero. 
- * 
- * Take a block of UTF-8 chars in and try to convert it to an ASCII 
- * plus SGML entities block of chars out. 
- * 
- * Returns 0 if success, -2 if the transcoding fails, or -1 otherwise 
- * The value of @inlen after return is the number of octets consumed 
- *     as the return value is positive, else unpredictable. 
- * The value of @outlen after return is the number of octets consumed. 
- */ 
-int 
-docbEncodeEntities(unsigned char *out ATTRIBUTE_UNUSED, 
-                   int *outlen ATTRIBUTE_UNUSED, 
-                   const unsigned char *in ATTRIBUTE_UNUSED, 
-                   int *inlen ATTRIBUTE_UNUSED, 
-                   int quoteChar ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbEncodeEntities() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
-    return(-1); 
-} 
- 
-/** 
- * docbParseDocument: 
- * @ctxt:  an SGML parser context 
- * 
- * parse an SGML document (and build a tree if using the standard SAX 
- * interface). 
- * 
- * Returns 0, -1 in case of error. the parser context is augmented 
- *                as a result of the parsing. 
- */ 
- 
-int 
-docbParseDocument(docbParserCtxtPtr ctxt ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbParseDocument() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
-    return (xmlParseDocument(ctxt)); 
-} 
- 
-/** 
- * docbFreeParserCtxt: 
- * @ctxt:  an SGML parser context 
- * 
- * Free all the memory used by a parser context. However the parsed 
- * document in ctxt->myDoc is not freed. 
- */ 
- 
-void 
-docbFreeParserCtxt(docbParserCtxtPtr ctxt ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbFreeParserCtxt() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
-    xmlFreeParserCtxt(ctxt); 
-} 
- 
-/** 
- * docbParseChunk: 
- * @ctxt:  an XML parser context 
- * @chunk:  an char array 
- * @size:  the size in byte of the chunk 
- * @terminate:  last chunk indicator 
- * 
- * Parse a Chunk of memory 
- * 
- * Returns zero if no error, the xmlParserErrors otherwise. 
- */ 
-int 
-docbParseChunk(docbParserCtxtPtr ctxt ATTRIBUTE_UNUSED, 
-               const char *chunk ATTRIBUTE_UNUSED, 
-	       int size ATTRIBUTE_UNUSED, 
-               int terminate ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbParseChunk() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
- 
-    return (xmlParseChunk(ctxt, chunk, size, terminate)); 
-} 
- 
-/** 
- * docbCreatePushParserCtxt: 
- * @sax:  a SAX handler 
- * @user_data:  The user data returned on SAX callbacks 
- * @chunk:  a pointer to an array of chars 
- * @size:  number of chars in the array 
- * @filename:  an optional file name or URI 
- * @enc:  an optional encoding 
- * 
- * Create a parser context for using the DocBook SGML parser in push mode 
- * To allow content encoding detection, @size should be >= 4 
- * The value of @filename is used for fetching external entities 
- * and error/warning reports. 
- * 
- * Returns the new parser context or NULL 
- */ 
-docbParserCtxtPtr 
-docbCreatePushParserCtxt(docbSAXHandlerPtr sax ATTRIBUTE_UNUSED, 
-                         void *user_data ATTRIBUTE_UNUSED, 
-                         const char *chunk ATTRIBUTE_UNUSED, 
-			 int size ATTRIBUTE_UNUSED, 
-			 const char *filename ATTRIBUTE_UNUSED, 
-                         xmlCharEncoding enc ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbParseChunk() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
- 
-    return(xmlCreatePushParserCtxt(sax, user_data, chunk, size, filename)); 
-} 
- 
-/** 
- * docbSAXParseDoc: 
- * @cur:  a pointer to an array of xmlChar 
- * @encoding:  a free form C string describing the SGML document encoding, or NULL 
- * @sax:  the SAX handler block 
- * @userData: if using SAX, this pointer will be provided on callbacks. 
- * 
- * parse an SGML in-memory document and build a tree. 
- * It use the given SAX function block to handle the parsing callback. 
- * If sax is NULL, fallback to the default DOM tree building routines. 
- * 
- * Returns the resulting document tree 
- */ 
- 
-docbDocPtr 
-docbSAXParseDoc(xmlChar * cur ATTRIBUTE_UNUSED, 
-                const char *encoding ATTRIBUTE_UNUSED, 
-		docbSAXHandlerPtr sax ATTRIBUTE_UNUSED, 
-                void *userData ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbParseChunk() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
- 
-    return (xmlSAXParseMemoryWithData(sax, (const char *)cur, 
-			  xmlStrlen((const xmlChar *) cur), 0,  userData)); 
-} 
- 
-/** 
- * docbParseDoc: 
- * @cur:  a pointer to an array of xmlChar 
- * @encoding:  a free form C string describing the SGML document encoding, or NULL 
- * 
- * parse an SGML in-memory document and build a tree. 
- * 
- * Returns the resulting document tree 
- */ 
- 
-docbDocPtr 
-docbParseDoc(xmlChar * cur ATTRIBUTE_UNUSED, 
-             const char *encoding ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbParseChunk() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
- 
-    return (xmlParseDoc(cur)); 
-} 
- 
- 
-/** 
- * docbCreateFileParserCtxt: 
- * @filename:  the filename 
- * @encoding:  the SGML document encoding, or NULL 
- * 
- * Create a parser context for a file content. 
- * Automatic support for ZLIB/Compress compressed document is provided 
- * by default if found at compile-time. 
- * 
- * Returns the new parser context or NULL 
- */ 
-docbParserCtxtPtr 
-docbCreateFileParserCtxt(const char *filename ATTRIBUTE_UNUSED, 
-                         const char *encoding ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbCreateFileParserCtxt() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
- 
-    return (xmlCreateFileParserCtxt(filename)); 
-} 
- 
-/** 
- * docbSAXParseFile: 
- * @filename:  the filename 
- * @encoding:  a free form C string describing the SGML document encoding, or NULL 
- * @sax:  the SAX handler block 
- * @userData: if using SAX, this pointer will be provided on callbacks. 
- * 
- * parse an SGML file and build a tree. Automatic support for ZLIB/Compress 
- * compressed document is provided by default if found at compile-time. 
- * It use the given SAX function block to handle the parsing callback. 
- * If sax is NULL, fallback to the default DOM tree building routines. 
- * 
- * Returns the resulting document tree 
- */ 
- 
-docbDocPtr 
-docbSAXParseFile(const char *filename ATTRIBUTE_UNUSED, 
-                 const char *encoding ATTRIBUTE_UNUSED, 
-                 docbSAXHandlerPtr sax ATTRIBUTE_UNUSED, 
-		 void *userData ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbSAXParseFile() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
- 
-    return (xmlSAXParseFileWithData(sax, filename, 0, userData)); 
-} 
- 
-/** 
- * docbParseFile: 
- * @filename:  the filename 
- * @encoding:  a free form C string describing document encoding, or NULL 
- * 
- * parse a Docbook SGML file and build a tree. Automatic support for 
- * ZLIB/Compress compressed document is provided by default if found 
- * at compile-time. 
- * 
- * Returns the resulting document tree 
- */ 
- 
-docbDocPtr 
-docbParseFile(const char *filename ATTRIBUTE_UNUSED, 
-              const char *encoding ATTRIBUTE_UNUSED) 
-{ 
-    static int deprecated = 0; 
- 
-    if (!deprecated) { 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "docbParseFile() deprecated function reached\n"); 
-        deprecated = 1; 
-    } 
- 
-    return (xmlParseFile(filename)); 
-} 
-#define bottom_DOCBparser 
-#include "elfgcchack.h" 
-#endif /* LIBXML_DOCB_ENABLED */ 
+/*
+ * DOCBparser.c : an attempt to parse SGML Docbook documents
+ *
+ * This is deprecated !!!
+ * Code removed with release 2.6.0 it was broken.
+ * The doc are expect to be migrated to XML DocBook
+ *
+ * See Copyright for the status of this software.
+ *
+ * daniel@veillard.com
+ */
+
+#define IN_LIBXML
+#include "libxml.h"
+#ifdef LIBXML_DOCB_ENABLED
+
+#include <libxml/xmlerror.h>
+#include <libxml/DOCBparser.h>
+
+/**
+ * docbEncodeEntities:
+ * @out:  a pointer to an array of bytes to store the result
+ * @outlen:  the length of @out
+ * @in:  a pointer to an array of UTF-8 chars
+ * @inlen:  the length of @in
+ * @quoteChar: the quote character to escape (' or ") or zero.
+ *
+ * Take a block of UTF-8 chars in and try to convert it to an ASCII
+ * plus SGML entities block of chars out.
+ *
+ * Returns 0 if success, -2 if the transcoding fails, or -1 otherwise
+ * The value of @inlen after return is the number of octets consumed
+ *     as the return value is positive, else unpredictable.
+ * The value of @outlen after return is the number of octets consumed.
+ */
+int
+docbEncodeEntities(unsigned char *out ATTRIBUTE_UNUSED,
+                   int *outlen ATTRIBUTE_UNUSED,
+                   const unsigned char *in ATTRIBUTE_UNUSED,
+                   int *inlen ATTRIBUTE_UNUSED,
+                   int quoteChar ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbEncodeEntities() deprecated function reached\n");
+        deprecated = 1;
+    }
+    return(-1);
+}
+
+/**
+ * docbParseDocument:
+ * @ctxt:  an SGML parser context
+ *
+ * parse an SGML document (and build a tree if using the standard SAX
+ * interface).
+ *
+ * Returns 0, -1 in case of error. the parser context is augmented
+ *                as a result of the parsing.
+ */
+
+int
+docbParseDocument(docbParserCtxtPtr ctxt ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbParseDocument() deprecated function reached\n");
+        deprecated = 1;
+    }
+    return (xmlParseDocument(ctxt));
+}
+
+/**
+ * docbFreeParserCtxt:
+ * @ctxt:  an SGML parser context
+ *
+ * Free all the memory used by a parser context. However the parsed
+ * document in ctxt->myDoc is not freed.
+ */
+
+void
+docbFreeParserCtxt(docbParserCtxtPtr ctxt ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbFreeParserCtxt() deprecated function reached\n");
+        deprecated = 1;
+    }
+    xmlFreeParserCtxt(ctxt);
+}
+
+/**
+ * docbParseChunk:
+ * @ctxt:  an XML parser context
+ * @chunk:  an char array
+ * @size:  the size in byte of the chunk
+ * @terminate:  last chunk indicator
+ *
+ * Parse a Chunk of memory
+ *
+ * Returns zero if no error, the xmlParserErrors otherwise.
+ */
+int
+docbParseChunk(docbParserCtxtPtr ctxt ATTRIBUTE_UNUSED,
+               const char *chunk ATTRIBUTE_UNUSED,
+	       int size ATTRIBUTE_UNUSED,
+               int terminate ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbParseChunk() deprecated function reached\n");
+        deprecated = 1;
+    }
+
+    return (xmlParseChunk(ctxt, chunk, size, terminate));
+}
+
+/**
+ * docbCreatePushParserCtxt:
+ * @sax:  a SAX handler
+ * @user_data:  The user data returned on SAX callbacks
+ * @chunk:  a pointer to an array of chars
+ * @size:  number of chars in the array
+ * @filename:  an optional file name or URI
+ * @enc:  an optional encoding
+ *
+ * Create a parser context for using the DocBook SGML parser in push mode
+ * To allow content encoding detection, @size should be >= 4
+ * The value of @filename is used for fetching external entities
+ * and error/warning reports.
+ *
+ * Returns the new parser context or NULL
+ */
+docbParserCtxtPtr
+docbCreatePushParserCtxt(docbSAXHandlerPtr sax ATTRIBUTE_UNUSED,
+                         void *user_data ATTRIBUTE_UNUSED,
+                         const char *chunk ATTRIBUTE_UNUSED,
+			 int size ATTRIBUTE_UNUSED,
+			 const char *filename ATTRIBUTE_UNUSED,
+                         xmlCharEncoding enc ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbParseChunk() deprecated function reached\n");
+        deprecated = 1;
+    }
+
+    return(xmlCreatePushParserCtxt(sax, user_data, chunk, size, filename));
+}
+
+/**
+ * docbSAXParseDoc:
+ * @cur:  a pointer to an array of xmlChar
+ * @encoding:  a free form C string describing the SGML document encoding, or NULL
+ * @sax:  the SAX handler block
+ * @userData: if using SAX, this pointer will be provided on callbacks.
+ *
+ * parse an SGML in-memory document and build a tree.
+ * It use the given SAX function block to handle the parsing callback.
+ * If sax is NULL, fallback to the default DOM tree building routines.
+ *
+ * Returns the resulting document tree
+ */
+
+docbDocPtr
+docbSAXParseDoc(xmlChar * cur ATTRIBUTE_UNUSED,
+                const char *encoding ATTRIBUTE_UNUSED,
+		docbSAXHandlerPtr sax ATTRIBUTE_UNUSED,
+                void *userData ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbParseChunk() deprecated function reached\n");
+        deprecated = 1;
+    }
+
+    return (xmlSAXParseMemoryWithData(sax, (const char *)cur,
+			  xmlStrlen((const xmlChar *) cur), 0,  userData));
+}
+
+/**
+ * docbParseDoc:
+ * @cur:  a pointer to an array of xmlChar
+ * @encoding:  a free form C string describing the SGML document encoding, or NULL
+ *
+ * parse an SGML in-memory document and build a tree.
+ *
+ * Returns the resulting document tree
+ */
+
+docbDocPtr
+docbParseDoc(xmlChar * cur ATTRIBUTE_UNUSED,
+             const char *encoding ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbParseChunk() deprecated function reached\n");
+        deprecated = 1;
+    }
+
+    return (xmlParseDoc(cur));
+}
+
+
+/**
+ * docbCreateFileParserCtxt:
+ * @filename:  the filename
+ * @encoding:  the SGML document encoding, or NULL
+ *
+ * Create a parser context for a file content.
+ * Automatic support for ZLIB/Compress compressed document is provided
+ * by default if found at compile-time.
+ *
+ * Returns the new parser context or NULL
+ */
+docbParserCtxtPtr
+docbCreateFileParserCtxt(const char *filename ATTRIBUTE_UNUSED,
+                         const char *encoding ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbCreateFileParserCtxt() deprecated function reached\n");
+        deprecated = 1;
+    }
+
+    return (xmlCreateFileParserCtxt(filename));
+}
+
+/**
+ * docbSAXParseFile:
+ * @filename:  the filename
+ * @encoding:  a free form C string describing the SGML document encoding, or NULL
+ * @sax:  the SAX handler block
+ * @userData: if using SAX, this pointer will be provided on callbacks.
+ *
+ * parse an SGML file and build a tree. Automatic support for ZLIB/Compress
+ * compressed document is provided by default if found at compile-time.
+ * It use the given SAX function block to handle the parsing callback.
+ * If sax is NULL, fallback to the default DOM tree building routines.
+ *
+ * Returns the resulting document tree
+ */
+
+docbDocPtr
+docbSAXParseFile(const char *filename ATTRIBUTE_UNUSED,
+                 const char *encoding ATTRIBUTE_UNUSED,
+                 docbSAXHandlerPtr sax ATTRIBUTE_UNUSED,
+		 void *userData ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbSAXParseFile() deprecated function reached\n");
+        deprecated = 1;
+    }
+
+    return (xmlSAXParseFileWithData(sax, filename, 0, userData));
+}
+
+/**
+ * docbParseFile:
+ * @filename:  the filename
+ * @encoding:  a free form C string describing document encoding, or NULL
+ *
+ * parse a Docbook SGML file and build a tree. Automatic support for
+ * ZLIB/Compress compressed document is provided by default if found
+ * at compile-time.
+ *
+ * Returns the resulting document tree
+ */
+
+docbDocPtr
+docbParseFile(const char *filename ATTRIBUTE_UNUSED,
+              const char *encoding ATTRIBUTE_UNUSED)
+{
+    static int deprecated = 0;
+
+    if (!deprecated) {
+        xmlGenericError(xmlGenericErrorContext,
+                        "docbParseFile() deprecated function reached\n");
+        deprecated = 1;
+    }
+
+    return (xmlParseFile(filename));
+}
+#define bottom_DOCBparser
+#include "elfgcchack.h"
+#endif /* LIBXML_DOCB_ENABLED */

+ 7136 - 7136
contrib/libs/libxml/HTMLparser.c

@@ -1,7178 +1,7178 @@
-/* 
- * HTMLparser.c : an HTML 4.0 non-verifying parser 
- * 
- * See Copyright for the status of this software. 
- * 
- * daniel@veillard.com 
- */ 
- 
-#define IN_LIBXML 
-#include "libxml.h" 
-#ifdef LIBXML_HTML_ENABLED 
- 
-#include <string.h> 
-#ifdef HAVE_CTYPE_H 
-#include <ctype.h> 
-#endif 
-#ifdef HAVE_STDLIB_H 
-#include <stdlib.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 
+/*
+ * HTMLparser.c : an HTML 4.0 non-verifying parser
+ *
+ * See Copyright for the status of this software.
+ *
+ * daniel@veillard.com
+ */
+
+#define IN_LIBXML
+#include "libxml.h"
+#ifdef LIBXML_HTML_ENABLED
+
+#include <string.h>
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.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 LIBXML_ZLIB_ENABLED
 #include <zlib.h>
-#endif 
- 
-#include <libxml/xmlmemory.h> 
-#include <libxml/tree.h> 
-#include <libxml/parser.h> 
-#include <libxml/parserInternals.h> 
-#include <libxml/xmlerror.h> 
-#include <libxml/HTMLparser.h> 
-#include <libxml/HTMLtree.h> 
-#include <libxml/entities.h> 
-#include <libxml/encoding.h> 
-#include <libxml/valid.h> 
-#include <libxml/xmlIO.h> 
-#include <libxml/globals.h> 
-#include <libxml/uri.h> 
- 
-#include "buf.h" 
-#include "enc.h" 
- 
-#define HTML_MAX_NAMELEN 1000 
-#define HTML_PARSER_BIG_BUFFER_SIZE 1000 
-#define HTML_PARSER_BUFFER_SIZE 100 
- 
-/* #define DEBUG */ 
-/* #define DEBUG_PUSH */ 
- 
-static int htmlOmittedDefaultValue = 1; 
- 
-xmlChar * htmlDecodeEntities(htmlParserCtxtPtr ctxt, int len, 
-			     xmlChar end, xmlChar  end2, xmlChar end3); 
-static void htmlParseComment(htmlParserCtxtPtr ctxt); 
- 
-/************************************************************************ 
- *									* 
- *		Some factorized error routines				* 
- *									* 
- ************************************************************************/ 
- 
-/** 
- * htmlErrMemory: 
- * @ctxt:  an HTML parser context 
- * @extra:  extra informations 
- * 
- * Handle a redefinition of attribute error 
- */ 
-static void 
-htmlErrMemory(xmlParserCtxtPtr ctxt, const char *extra) 
-{ 
-    if ((ctxt != NULL) && (ctxt->disableSAX != 0) && 
-        (ctxt->instate == XML_PARSER_EOF)) 
-	return; 
-    if (ctxt != NULL) { 
-        ctxt->errNo = XML_ERR_NO_MEMORY; 
-        ctxt->instate = XML_PARSER_EOF; 
-        ctxt->disableSAX = 1; 
-    } 
-    if (extra) 
-        __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_PARSER, 
-                        XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, extra, 
-                        NULL, NULL, 0, 0, 
-                        "Memory allocation failed : %s\n", extra); 
-    else 
-        __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_PARSER, 
-                        XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, NULL, 
-                        NULL, NULL, 0, 0, "Memory allocation failed\n"); 
-} 
- 
-/** 
- * htmlParseErr: 
- * @ctxt:  an HTML parser context 
- * @error:  the error number 
- * @msg:  the error message 
- * @str1:  string infor 
- * @str2:  string infor 
- * 
- * Handle a fatal parser error, i.e. violating Well-Formedness constraints 
- */ 
+#endif
+
+#include <libxml/xmlmemory.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
+#include <libxml/xmlerror.h>
+#include <libxml/HTMLparser.h>
+#include <libxml/HTMLtree.h>
+#include <libxml/entities.h>
+#include <libxml/encoding.h>
+#include <libxml/valid.h>
+#include <libxml/xmlIO.h>
+#include <libxml/globals.h>
+#include <libxml/uri.h>
+
+#include "buf.h"
+#include "enc.h"
+
+#define HTML_MAX_NAMELEN 1000
+#define HTML_PARSER_BIG_BUFFER_SIZE 1000
+#define HTML_PARSER_BUFFER_SIZE 100
+
+/* #define DEBUG */
+/* #define DEBUG_PUSH */
+
+static int htmlOmittedDefaultValue = 1;
+
+xmlChar * htmlDecodeEntities(htmlParserCtxtPtr ctxt, int len,
+			     xmlChar end, xmlChar  end2, xmlChar end3);
+static void htmlParseComment(htmlParserCtxtPtr ctxt);
+
+/************************************************************************
+ *									*
+ *		Some factorized error routines				*
+ *									*
+ ************************************************************************/
+
+/**
+ * htmlErrMemory:
+ * @ctxt:  an HTML parser context
+ * @extra:  extra informations
+ *
+ * Handle a redefinition of attribute error
+ */
+static void
+htmlErrMemory(xmlParserCtxtPtr ctxt, const char *extra)
+{
+    if ((ctxt != NULL) && (ctxt->disableSAX != 0) &&
+        (ctxt->instate == XML_PARSER_EOF))
+	return;
+    if (ctxt != NULL) {
+        ctxt->errNo = XML_ERR_NO_MEMORY;
+        ctxt->instate = XML_PARSER_EOF;
+        ctxt->disableSAX = 1;
+    }
+    if (extra)
+        __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_PARSER,
+                        XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, extra,
+                        NULL, NULL, 0, 0,
+                        "Memory allocation failed : %s\n", extra);
+    else
+        __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_PARSER,
+                        XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, NULL,
+                        NULL, NULL, 0, 0, "Memory allocation failed\n");
+}
+
+/**
+ * htmlParseErr:
+ * @ctxt:  an HTML parser context
+ * @error:  the error number
+ * @msg:  the error message
+ * @str1:  string infor
+ * @str2:  string infor
+ *
+ * Handle a fatal parser error, i.e. violating Well-Formedness constraints
+ */
 static void LIBXML_ATTR_FORMAT(3,0)
-htmlParseErr(xmlParserCtxtPtr ctxt, xmlParserErrors error, 
-             const char *msg, const xmlChar *str1, const xmlChar *str2) 
-{ 
-    if ((ctxt != NULL) && (ctxt->disableSAX != 0) && 
-        (ctxt->instate == XML_PARSER_EOF)) 
-	return; 
-    if (ctxt != NULL) 
-	ctxt->errNo = error; 
-    __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_HTML, error, 
-                    XML_ERR_ERROR, NULL, 0, 
-		    (const char *) str1, (const char *) str2, 
-		    NULL, 0, 0, 
-		    msg, str1, str2); 
-    if (ctxt != NULL) 
-	ctxt->wellFormed = 0; 
-} 
- 
-/** 
- * htmlParseErrInt: 
- * @ctxt:  an HTML parser context 
- * @error:  the error number 
- * @msg:  the error message 
- * @val:  integer info 
- * 
- * Handle a fatal parser error, i.e. violating Well-Formedness constraints 
- */ 
+htmlParseErr(xmlParserCtxtPtr ctxt, xmlParserErrors error,
+             const char *msg, const xmlChar *str1, const xmlChar *str2)
+{
+    if ((ctxt != NULL) && (ctxt->disableSAX != 0) &&
+        (ctxt->instate == XML_PARSER_EOF))
+	return;
+    if (ctxt != NULL)
+	ctxt->errNo = error;
+    __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_HTML, error,
+                    XML_ERR_ERROR, NULL, 0,
+		    (const char *) str1, (const char *) str2,
+		    NULL, 0, 0,
+		    msg, str1, str2);
+    if (ctxt != NULL)
+	ctxt->wellFormed = 0;
+}
+
+/**
+ * htmlParseErrInt:
+ * @ctxt:  an HTML parser context
+ * @error:  the error number
+ * @msg:  the error message
+ * @val:  integer info
+ *
+ * Handle a fatal parser error, i.e. violating Well-Formedness constraints
+ */
 static void LIBXML_ATTR_FORMAT(3,0)
-htmlParseErrInt(xmlParserCtxtPtr ctxt, xmlParserErrors error, 
-             const char *msg, int val) 
-{ 
-    if ((ctxt != NULL) && (ctxt->disableSAX != 0) && 
-        (ctxt->instate == XML_PARSER_EOF)) 
-	return; 
-    if (ctxt != NULL) 
-	ctxt->errNo = error; 
-    __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_HTML, error, 
-                    XML_ERR_ERROR, NULL, 0, NULL, NULL, 
-		    NULL, val, 0, msg, val); 
-    if (ctxt != NULL) 
-	ctxt->wellFormed = 0; 
-} 
- 
-/************************************************************************ 
- *									* 
- *	Parser stacks related functions and macros		* 
- *									* 
- ************************************************************************/ 
- 
-/** 
- * htmlnamePush: 
- * @ctxt:  an HTML parser context 
- * @value:  the element name 
- * 
- * Pushes a new element name on top of the name stack 
- * 
- * Returns 0 in case of error, the index in the stack otherwise 
- */ 
-static int 
-htmlnamePush(htmlParserCtxtPtr ctxt, const xmlChar * value) 
-{ 
-    if ((ctxt->html < 3) && (xmlStrEqual(value, BAD_CAST "head"))) 
-        ctxt->html = 3; 
-    if ((ctxt->html < 10) && (xmlStrEqual(value, BAD_CAST "body"))) 
-        ctxt->html = 10; 
-    if (ctxt->nameNr >= ctxt->nameMax) { 
-        ctxt->nameMax *= 2; 
-        ctxt->nameTab = (const xmlChar * *) 
-                         xmlRealloc((xmlChar * *)ctxt->nameTab, 
-                                    ctxt->nameMax * 
-                                    sizeof(ctxt->nameTab[0])); 
-        if (ctxt->nameTab == NULL) { 
-            htmlErrMemory(ctxt, NULL); 
-            return (0); 
-        } 
-    } 
-    ctxt->nameTab[ctxt->nameNr] = value; 
-    ctxt->name = value; 
-    return (ctxt->nameNr++); 
-} 
-/** 
- * htmlnamePop: 
- * @ctxt: an HTML parser context 
- * 
- * Pops the top element name from the name stack 
- * 
- * Returns the name just removed 
- */ 
-static const xmlChar * 
-htmlnamePop(htmlParserCtxtPtr ctxt) 
-{ 
-    const xmlChar *ret; 
- 
-    if (ctxt->nameNr <= 0) 
-        return (NULL); 
-    ctxt->nameNr--; 
-    if (ctxt->nameNr < 0) 
-        return (NULL); 
-    if (ctxt->nameNr > 0) 
-        ctxt->name = ctxt->nameTab[ctxt->nameNr - 1]; 
-    else 
-        ctxt->name = NULL; 
-    ret = ctxt->nameTab[ctxt->nameNr]; 
-    ctxt->nameTab[ctxt->nameNr] = NULL; 
-    return (ret); 
-} 
- 
-/** 
- * htmlNodeInfoPush: 
- * @ctxt:  an HTML parser context 
- * @value:  the node info 
- * 
- * Pushes a new element name on top of the node info stack 
- * 
- * Returns 0 in case of error, the index in the stack otherwise 
- */ 
-static int 
-htmlNodeInfoPush(htmlParserCtxtPtr ctxt, htmlParserNodeInfo *value) 
-{ 
-    if (ctxt->nodeInfoNr >= ctxt->nodeInfoMax) { 
-        if (ctxt->nodeInfoMax == 0) 
-                ctxt->nodeInfoMax = 5; 
-        ctxt->nodeInfoMax *= 2; 
-        ctxt->nodeInfoTab = (htmlParserNodeInfo *) 
-                         xmlRealloc((htmlParserNodeInfo *)ctxt->nodeInfoTab, 
-                                    ctxt->nodeInfoMax * 
-                                    sizeof(ctxt->nodeInfoTab[0])); 
-        if (ctxt->nodeInfoTab == NULL) { 
-            htmlErrMemory(ctxt, NULL); 
-            return (0); 
-        } 
-    } 
-    ctxt->nodeInfoTab[ctxt->nodeInfoNr] = *value; 
-    ctxt->nodeInfo = &ctxt->nodeInfoTab[ctxt->nodeInfoNr]; 
-    return (ctxt->nodeInfoNr++); 
-} 
- 
-/** 
- * htmlNodeInfoPop: 
- * @ctxt:  an HTML parser context 
- * 
- * Pops the top element name from the node info stack 
- * 
- * Returns 0 in case of error, the pointer to NodeInfo otherwise 
- */ 
-static htmlParserNodeInfo * 
-htmlNodeInfoPop(htmlParserCtxtPtr ctxt) 
-{ 
-    if (ctxt->nodeInfoNr <= 0) 
-        return (NULL); 
-    ctxt->nodeInfoNr--; 
-    if (ctxt->nodeInfoNr < 0) 
-        return (NULL); 
-    if (ctxt->nodeInfoNr > 0) 
-        ctxt->nodeInfo = &ctxt->nodeInfoTab[ctxt->nodeInfoNr - 1]; 
-    else 
-        ctxt->nodeInfo = NULL; 
-    return &ctxt->nodeInfoTab[ctxt->nodeInfoNr]; 
-} 
- 
-/* 
- * Macros for accessing the content. Those should be used only by the parser, 
- * and not exported. 
- * 
- * Dirty macros, i.e. one need to make assumption on the context to use them 
- * 
- *   CUR_PTR return the current pointer to the xmlChar to be parsed. 
- *   CUR     returns the current xmlChar value, i.e. a 8 bit value if compiled 
- *           in ISO-Latin or UTF-8, and the current 16 bit value if compiled 
- *           in UNICODE mode. This should be used internally by the parser 
- *           only to compare to ASCII values otherwise it would break when 
- *           running with UTF-8 encoding. 
- *   NXT(n)  returns the n'th next xmlChar. Same as CUR is should be used only 
- *           to compare on ASCII based substring. 
- *   UPP(n)  returns the n'th next xmlChar converted to uppercase. Same as CUR 
- *           it should be used only to compare on ASCII based substring. 
- *   SKIP(n) Skip n xmlChar, and must also be used only to skip ASCII defined 
- *           strings without newlines within the parser. 
- * 
- * Clean macros, not dependent of an ASCII context, expect UTF-8 encoding 
- * 
- *   CURRENT Returns the current char value, with the full decoding of 
- *           UTF-8 if we are using this mode. It returns an int. 
- *   NEXT    Skip to the next character, this does the proper decoding 
- *           in UTF-8 mode. It also pop-up unfinished entities on the fly. 
- *   NEXTL(l) Skip the current unicode character of l xmlChars long. 
- *   COPY(to) copy one char to *to, increment CUR_PTR and to accordingly 
- */ 
- 
-#define UPPER (toupper(*ctxt->input->cur)) 
- 
-#define SKIP(val) ctxt->nbChars += (val),ctxt->input->cur += (val),ctxt->input->col+=(val) 
- 
-#define NXT(val) ctxt->input->cur[(val)] 
- 
-#define UPP(val) (toupper(ctxt->input->cur[(val)])) 
- 
-#define CUR_PTR ctxt->input->cur 
+htmlParseErrInt(xmlParserCtxtPtr ctxt, xmlParserErrors error,
+             const char *msg, int val)
+{
+    if ((ctxt != NULL) && (ctxt->disableSAX != 0) &&
+        (ctxt->instate == XML_PARSER_EOF))
+	return;
+    if (ctxt != NULL)
+	ctxt->errNo = error;
+    __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_HTML, error,
+                    XML_ERR_ERROR, NULL, 0, NULL, NULL,
+		    NULL, val, 0, msg, val);
+    if (ctxt != NULL)
+	ctxt->wellFormed = 0;
+}
+
+/************************************************************************
+ *									*
+ *	Parser stacks related functions and macros		*
+ *									*
+ ************************************************************************/
+
+/**
+ * htmlnamePush:
+ * @ctxt:  an HTML parser context
+ * @value:  the element name
+ *
+ * Pushes a new element name on top of the name stack
+ *
+ * Returns 0 in case of error, the index in the stack otherwise
+ */
+static int
+htmlnamePush(htmlParserCtxtPtr ctxt, const xmlChar * value)
+{
+    if ((ctxt->html < 3) && (xmlStrEqual(value, BAD_CAST "head")))
+        ctxt->html = 3;
+    if ((ctxt->html < 10) && (xmlStrEqual(value, BAD_CAST "body")))
+        ctxt->html = 10;
+    if (ctxt->nameNr >= ctxt->nameMax) {
+        ctxt->nameMax *= 2;
+        ctxt->nameTab = (const xmlChar * *)
+                         xmlRealloc((xmlChar * *)ctxt->nameTab,
+                                    ctxt->nameMax *
+                                    sizeof(ctxt->nameTab[0]));
+        if (ctxt->nameTab == NULL) {
+            htmlErrMemory(ctxt, NULL);
+            return (0);
+        }
+    }
+    ctxt->nameTab[ctxt->nameNr] = value;
+    ctxt->name = value;
+    return (ctxt->nameNr++);
+}
+/**
+ * htmlnamePop:
+ * @ctxt: an HTML parser context
+ *
+ * Pops the top element name from the name stack
+ *
+ * Returns the name just removed
+ */
+static const xmlChar *
+htmlnamePop(htmlParserCtxtPtr ctxt)
+{
+    const xmlChar *ret;
+
+    if (ctxt->nameNr <= 0)
+        return (NULL);
+    ctxt->nameNr--;
+    if (ctxt->nameNr < 0)
+        return (NULL);
+    if (ctxt->nameNr > 0)
+        ctxt->name = ctxt->nameTab[ctxt->nameNr - 1];
+    else
+        ctxt->name = NULL;
+    ret = ctxt->nameTab[ctxt->nameNr];
+    ctxt->nameTab[ctxt->nameNr] = NULL;
+    return (ret);
+}
+
+/**
+ * htmlNodeInfoPush:
+ * @ctxt:  an HTML parser context
+ * @value:  the node info
+ *
+ * Pushes a new element name on top of the node info stack
+ *
+ * Returns 0 in case of error, the index in the stack otherwise
+ */
+static int
+htmlNodeInfoPush(htmlParserCtxtPtr ctxt, htmlParserNodeInfo *value)
+{
+    if (ctxt->nodeInfoNr >= ctxt->nodeInfoMax) {
+        if (ctxt->nodeInfoMax == 0)
+                ctxt->nodeInfoMax = 5;
+        ctxt->nodeInfoMax *= 2;
+        ctxt->nodeInfoTab = (htmlParserNodeInfo *)
+                         xmlRealloc((htmlParserNodeInfo *)ctxt->nodeInfoTab,
+                                    ctxt->nodeInfoMax *
+                                    sizeof(ctxt->nodeInfoTab[0]));
+        if (ctxt->nodeInfoTab == NULL) {
+            htmlErrMemory(ctxt, NULL);
+            return (0);
+        }
+    }
+    ctxt->nodeInfoTab[ctxt->nodeInfoNr] = *value;
+    ctxt->nodeInfo = &ctxt->nodeInfoTab[ctxt->nodeInfoNr];
+    return (ctxt->nodeInfoNr++);
+}
+
+/**
+ * htmlNodeInfoPop:
+ * @ctxt:  an HTML parser context
+ *
+ * Pops the top element name from the node info stack
+ *
+ * Returns 0 in case of error, the pointer to NodeInfo otherwise
+ */
+static htmlParserNodeInfo *
+htmlNodeInfoPop(htmlParserCtxtPtr ctxt)
+{
+    if (ctxt->nodeInfoNr <= 0)
+        return (NULL);
+    ctxt->nodeInfoNr--;
+    if (ctxt->nodeInfoNr < 0)
+        return (NULL);
+    if (ctxt->nodeInfoNr > 0)
+        ctxt->nodeInfo = &ctxt->nodeInfoTab[ctxt->nodeInfoNr - 1];
+    else
+        ctxt->nodeInfo = NULL;
+    return &ctxt->nodeInfoTab[ctxt->nodeInfoNr];
+}
+
+/*
+ * Macros for accessing the content. Those should be used only by the parser,
+ * and not exported.
+ *
+ * Dirty macros, i.e. one need to make assumption on the context to use them
+ *
+ *   CUR_PTR return the current pointer to the xmlChar to be parsed.
+ *   CUR     returns the current xmlChar value, i.e. a 8 bit value if compiled
+ *           in ISO-Latin or UTF-8, and the current 16 bit value if compiled
+ *           in UNICODE mode. This should be used internally by the parser
+ *           only to compare to ASCII values otherwise it would break when
+ *           running with UTF-8 encoding.
+ *   NXT(n)  returns the n'th next xmlChar. Same as CUR is should be used only
+ *           to compare on ASCII based substring.
+ *   UPP(n)  returns the n'th next xmlChar converted to uppercase. Same as CUR
+ *           it should be used only to compare on ASCII based substring.
+ *   SKIP(n) Skip n xmlChar, and must also be used only to skip ASCII defined
+ *           strings without newlines within the parser.
+ *
+ * Clean macros, not dependent of an ASCII context, expect UTF-8 encoding
+ *
+ *   CURRENT Returns the current char value, with the full decoding of
+ *           UTF-8 if we are using this mode. It returns an int.
+ *   NEXT    Skip to the next character, this does the proper decoding
+ *           in UTF-8 mode. It also pop-up unfinished entities on the fly.
+ *   NEXTL(l) Skip the current unicode character of l xmlChars long.
+ *   COPY(to) copy one char to *to, increment CUR_PTR and to accordingly
+ */
+
+#define UPPER (toupper(*ctxt->input->cur))
+
+#define SKIP(val) ctxt->nbChars += (val),ctxt->input->cur += (val),ctxt->input->col+=(val)
+
+#define NXT(val) ctxt->input->cur[(val)]
+
+#define UPP(val) (toupper(ctxt->input->cur[(val)]))
+
+#define CUR_PTR ctxt->input->cur
 #define BASE_PTR ctxt->input->base
- 
-#define SHRINK if ((ctxt->input->cur - ctxt->input->base > 2 * INPUT_CHUNK) && \ 
-		   (ctxt->input->end - ctxt->input->cur < 2 * INPUT_CHUNK)) \ 
-	xmlParserInputShrink(ctxt->input) 
- 
-#define GROW if ((ctxt->progressive == 0) &&				\ 
-		 (ctxt->input->end - ctxt->input->cur < INPUT_CHUNK))	\ 
-	xmlParserInputGrow(ctxt->input, INPUT_CHUNK) 
- 
-#define CURRENT ((int) (*ctxt->input->cur)) 
- 
-#define SKIP_BLANKS htmlSkipBlankChars(ctxt) 
- 
+
+#define SHRINK if ((ctxt->input->cur - ctxt->input->base > 2 * INPUT_CHUNK) && \
+		   (ctxt->input->end - ctxt->input->cur < 2 * INPUT_CHUNK)) \
+	xmlParserInputShrink(ctxt->input)
+
+#define GROW if ((ctxt->progressive == 0) &&				\
+		 (ctxt->input->end - ctxt->input->cur < INPUT_CHUNK))	\
+	xmlParserInputGrow(ctxt->input, INPUT_CHUNK)
+
+#define CURRENT ((int) (*ctxt->input->cur))
+
+#define SKIP_BLANKS htmlSkipBlankChars(ctxt)
+
 /* Imported from XML */
- 
-/* #define CUR (ctxt->token ? ctxt->token : (int) (*ctxt->input->cur)) */ 
-#define CUR ((int) (*ctxt->input->cur)) 
-#define NEXT xmlNextChar(ctxt) 
- 
-#define RAW (ctxt->token ? -1 : (*ctxt->input->cur)) 
- 
- 
-#define NEXTL(l) do {							\ 
-    if (*(ctxt->input->cur) == '\n') {					\ 
-	ctxt->input->line++; ctxt->input->col = 1;			\ 
-    } else ctxt->input->col++;						\ 
-    ctxt->token = 0; ctxt->input->cur += l; ctxt->nbChars++;		\ 
-  } while (0) 
- 
-/************ 
-    \ 
-    if (*ctxt->input->cur == '%') xmlParserHandlePEReference(ctxt);	\ 
-    if (*ctxt->input->cur == '&') xmlParserHandleReference(ctxt); 
- ************/ 
- 
-#define CUR_CHAR(l) htmlCurrentChar(ctxt, &l) 
-#define CUR_SCHAR(s, l) xmlStringCurrentChar(ctxt, s, &l) 
- 
-#define COPY_BUF(l,b,i,v)						\ 
-    if (l == 1) b[i++] = (xmlChar) v;					\ 
-    else i += xmlCopyChar(l,&b[i],v) 
- 
-/** 
- * htmlFindEncoding: 
- * @the HTML parser context 
- * 
- * Ty to find and encoding in the current data available in the input 
- * buffer this is needed to try to switch to the proper encoding when 
- * one face a character error. 
- * That's an heuristic, since it's operating outside of parsing it could 
- * try to use a meta which had been commented out, that's the reason it 
- * should only be used in case of error, not as a default. 
- * 
- * Returns an encoding string or NULL if not found, the string need to 
- *   be freed 
- */ 
-static xmlChar * 
-htmlFindEncoding(xmlParserCtxtPtr ctxt) { 
-    const xmlChar *start, *cur, *end; 
- 
-    if ((ctxt == NULL) || (ctxt->input == NULL) || 
-        (ctxt->input->encoding != NULL) || (ctxt->input->buf == NULL) || 
-        (ctxt->input->buf->encoder != NULL)) 
-        return(NULL); 
-    if ((ctxt->input->cur == NULL) || (ctxt->input->end == NULL)) 
-        return(NULL); 
- 
-    start = ctxt->input->cur; 
-    end = ctxt->input->end; 
-    /* we also expect the input buffer to be zero terminated */ 
-    if (*end != 0) 
-        return(NULL); 
- 
-    cur = xmlStrcasestr(start, BAD_CAST "HTTP-EQUIV"); 
-    if (cur == NULL) 
-        return(NULL); 
-    cur = xmlStrcasestr(cur, BAD_CAST  "CONTENT"); 
-    if (cur == NULL) 
-        return(NULL); 
-    cur = xmlStrcasestr(cur, BAD_CAST  "CHARSET="); 
-    if (cur == NULL) 
-        return(NULL); 
-    cur += 8; 
-    start = cur; 
-    while (((*cur >= 'A') && (*cur <= 'Z')) || 
-           ((*cur >= 'a') && (*cur <= 'z')) || 
-           ((*cur >= '0') && (*cur <= '9')) || 
-           (*cur == '-') || (*cur == '_') || (*cur == ':') || (*cur == '/')) 
-           cur++; 
-    if (cur == start) 
-        return(NULL); 
-    return(xmlStrndup(start, cur - start)); 
-} 
- 
-/** 
- * htmlCurrentChar: 
- * @ctxt:  the HTML parser context 
- * @len:  pointer to the length of the char read 
- * 
- * The current char value, if using UTF-8 this may actually span multiple 
- * bytes in the input buffer. Implement the end of line normalization: 
- * 2.11 End-of-Line Handling 
- * If the encoding is unspecified, in the case we find an ISO-Latin-1 
- * char, then the encoding converter is plugged in automatically. 
- * 
- * Returns the current char value and its length 
- */ 
- 
-static int 
-htmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) { 
-    if (ctxt->instate == XML_PARSER_EOF) 
-	return(0); 
- 
-    if (ctxt->token != 0) { 
-	*len = 0; 
-	return(ctxt->token); 
-    } 
-    if (ctxt->charset == XML_CHAR_ENCODING_UTF8) { 
-	/* 
-	 * We are supposed to handle UTF8, check it's valid 
-	 * From rfc2044: encoding of the Unicode values on UTF-8: 
-	 * 
-	 * UCS-4 range (hex.)           UTF-8 octet sequence (binary) 
-	 * 0000 0000-0000 007F   0xxxxxxx 
-	 * 0000 0080-0000 07FF   110xxxxx 10xxxxxx 
-	 * 0000 0800-0000 FFFF   1110xxxx 10xxxxxx 10xxxxxx 
-	 * 
-	 * Check for the 0x110000 limit too 
-	 */ 
-	const unsigned char *cur = ctxt->input->cur; 
-	unsigned char c; 
-	unsigned int val; 
- 
-	c = *cur; 
-	if (c & 0x80) { 
-	    if (cur[1] == 0) { 
-		xmlParserInputGrow(ctxt->input, INPUT_CHUNK); 
-                cur = ctxt->input->cur; 
-            } 
-	    if ((cur[1] & 0xc0) != 0x80) 
-		goto encoding_error; 
-	    if ((c & 0xe0) == 0xe0) { 
- 
-		if (cur[2] == 0) { 
-		    xmlParserInputGrow(ctxt->input, INPUT_CHUNK); 
-                    cur = ctxt->input->cur; 
-                } 
-		if ((cur[2] & 0xc0) != 0x80) 
-		    goto encoding_error; 
-		if ((c & 0xf0) == 0xf0) { 
-		    if (cur[3] == 0) { 
-			xmlParserInputGrow(ctxt->input, INPUT_CHUNK); 
-                        cur = ctxt->input->cur; 
-                    } 
-		    if (((c & 0xf8) != 0xf0) || 
-			((cur[3] & 0xc0) != 0x80)) 
-			goto encoding_error; 
-		    /* 4-byte code */ 
-		    *len = 4; 
-		    val = (cur[0] & 0x7) << 18; 
-		    val |= (cur[1] & 0x3f) << 12; 
-		    val |= (cur[2] & 0x3f) << 6; 
-		    val |= cur[3] & 0x3f; 
-		} else { 
-		  /* 3-byte code */ 
-		    *len = 3; 
-		    val = (cur[0] & 0xf) << 12; 
-		    val |= (cur[1] & 0x3f) << 6; 
-		    val |= cur[2] & 0x3f; 
-		} 
-	    } else { 
-	      /* 2-byte code */ 
-		*len = 2; 
-		val = (cur[0] & 0x1f) << 6; 
-		val |= cur[1] & 0x3f; 
-	    } 
-	    if (!IS_CHAR(val)) { 
-	        htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, 
-				"Char 0x%X out of allowed range\n", val); 
-	    } 
-	    return(val); 
-	} else { 
-            if ((*ctxt->input->cur == 0) && 
-                (ctxt->input->cur < ctxt->input->end)) { 
-                    htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, 
-				"Char 0x%X out of allowed range\n", 0); 
-                *len = 1; 
-                return(' '); 
-            } 
-	    /* 1-byte code */ 
-	    *len = 1; 
-	    return((int) *ctxt->input->cur); 
-	} 
-    } 
-    /* 
-     * Assume it's a fixed length encoding (1) with 
-     * a compatible encoding for the ASCII set, since 
-     * XML constructs only use < 128 chars 
-     */ 
-    *len = 1; 
-    if ((int) *ctxt->input->cur < 0x80) 
-	return((int) *ctxt->input->cur); 
- 
-    /* 
-     * Humm this is bad, do an automatic flow conversion 
-     */ 
-    { 
-        xmlChar * guess; 
-        xmlCharEncodingHandlerPtr handler; 
- 
-        guess = htmlFindEncoding(ctxt); 
-        if (guess == NULL) { 
-            xmlSwitchEncoding(ctxt, XML_CHAR_ENCODING_8859_1); 
-        } else { 
-            if (ctxt->input->encoding != NULL) 
-                xmlFree((xmlChar *) ctxt->input->encoding); 
-            ctxt->input->encoding = guess; 
-            handler = xmlFindCharEncodingHandler((const char *) guess); 
-            if (handler != NULL) { 
-                xmlSwitchToEncoding(ctxt, handler); 
-            } else { 
-                htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING, 
-                             "Unsupported encoding %s", guess, NULL); 
-            } 
-        } 
-        ctxt->charset = XML_CHAR_ENCODING_UTF8; 
-    } 
- 
-    return(xmlCurrentChar(ctxt, len)); 
- 
-encoding_error: 
-    /* 
-     * If we detect an UTF8 error that probably mean that the 
-     * input encoding didn't get properly advertised in the
-     * declaration header. Report the error and switch the encoding 
-     * to ISO-Latin-1 (if you don't like this policy, just declare the 
-     * encoding !) 
-     */ 
-    { 
-        char buffer[150]; 
- 
-	if (ctxt->input->end - ctxt->input->cur >= 4) { 
-	    snprintf(buffer, 149, "Bytes: 0x%02X 0x%02X 0x%02X 0x%02X\n", 
-			    ctxt->input->cur[0], ctxt->input->cur[1], 
-			    ctxt->input->cur[2], ctxt->input->cur[3]); 
-	} else { 
-	    snprintf(buffer, 149, "Bytes: 0x%02X\n", ctxt->input->cur[0]); 
-	} 
-	htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING, 
-		     "Input is not proper UTF-8, indicate encoding !\n", 
-		     BAD_CAST buffer, NULL); 
-    } 
- 
-    ctxt->charset = XML_CHAR_ENCODING_8859_1; 
-    *len = 1; 
-    return((int) *ctxt->input->cur); 
-} 
- 
-/** 
- * htmlSkipBlankChars: 
- * @ctxt:  the HTML parser context 
- * 
- * skip all blanks character found at that point in the input streams. 
- * 
- * Returns the number of space chars skipped 
- */ 
- 
-static int 
-htmlSkipBlankChars(xmlParserCtxtPtr ctxt) { 
-    int res = 0; 
- 
-    while (IS_BLANK_CH(*(ctxt->input->cur))) { 
-	if ((*ctxt->input->cur == 0) && 
-	    (xmlParserInputGrow(ctxt->input, INPUT_CHUNK) <= 0)) { 
-		xmlPopInput(ctxt); 
-	} else { 
-	    if (*(ctxt->input->cur) == '\n') { 
-		ctxt->input->line++; ctxt->input->col = 1; 
-	    } else ctxt->input->col++; 
-	    ctxt->input->cur++; 
-	    ctxt->nbChars++; 
-	    if (*ctxt->input->cur == 0) 
-		xmlParserInputGrow(ctxt->input, INPUT_CHUNK); 
-	} 
-	res++; 
-    } 
-    return(res); 
-} 
- 
- 
- 
-/************************************************************************ 
- *									* 
- *	The list of HTML elements and their properties		* 
- *									* 
- ************************************************************************/ 
- 
-/* 
- *  Start Tag: 1 means the start tag can be omitted
- *  End Tag:   1 means the end tag can be omitted
- *             2 means it's forbidden (empty elements) 
- *             3 means the tag is stylistic and should be closed easily 
- *  Depr:      this element is deprecated 
- *  DTD:       1 means that this element is valid only in the Loose DTD 
- *             2 means that this element is valid only in the Frameset DTD 
- * 
- * Name,Start Tag,End Tag,Save End,Empty,Deprecated,DTD,inline,Description 
-	, subElements , impliedsubelt , Attributes, userdata 
- */ 
- 
-/* Definitions and a couple of vars for HTML Elements */ 
- 
-#define FONTSTYLE "tt", "i", "b", "u", "s", "strike", "big", "small" 
-#define NB_FONTSTYLE 8 
-#define PHRASE "em", "strong", "dfn", "code", "samp", "kbd", "var", "cite", "abbr", "acronym" 
-#define NB_PHRASE 10 
-#define SPECIAL "a", "img", "applet", "embed", "object", "font", "basefont", "br", "script", "map", "q", "sub", "sup", "span", "bdo", "iframe" 
-#define NB_SPECIAL 16 
-#define INLINE FONTSTYLE, PHRASE, SPECIAL, FORMCTRL 
-#define NB_INLINE NB_PCDATA + NB_FONTSTYLE + NB_PHRASE + NB_SPECIAL + NB_FORMCTRL 
-#define BLOCK HEADING, LIST, "pre", "p", "dl", "div", "center", "noscript", "noframes", "blockquote", "form", "isindex", "hr", "table", "fieldset", "address" 
-#define NB_BLOCK NB_HEADING + NB_LIST + 14 
-#define FORMCTRL "input", "select", "textarea", "label", "button" 
-#define NB_FORMCTRL 5 
-#define PCDATA 
-#define NB_PCDATA 0 
-#define HEADING "h1", "h2", "h3", "h4", "h5", "h6" 
-#define NB_HEADING 6 
-#define LIST "ul", "ol", "dir", "menu" 
-#define NB_LIST 4 
-#define MODIFIER 
-#define NB_MODIFIER 0 
-#define FLOW BLOCK,INLINE 
-#define NB_FLOW NB_BLOCK + NB_INLINE 
-#define EMPTY NULL 
- 
- 
-static const char* const html_flow[] = { FLOW, NULL } ; 
-static const char* const html_inline[] = { INLINE, NULL } ; 
- 
-/* placeholders: elts with content but no subelements */ 
-static const char* const html_pcdata[] = { NULL } ; 
-#define html_cdata html_pcdata 
- 
- 
-/* ... and for HTML Attributes */ 
- 
-#define COREATTRS "id", "class", "style", "title" 
-#define NB_COREATTRS 4 
-#define I18N "lang", "dir" 
-#define NB_I18N 2 
-#define EVENTS "onclick", "ondblclick", "onmousedown", "onmouseup", "onmouseover", "onmouseout", "onkeypress", "onkeydown", "onkeyup" 
-#define NB_EVENTS 9 
-#define ATTRS COREATTRS,I18N,EVENTS 
-#define NB_ATTRS NB_NB_COREATTRS + NB_I18N + NB_EVENTS 
-#define CELLHALIGN "align", "char", "charoff" 
-#define NB_CELLHALIGN 3 
-#define CELLVALIGN "valign" 
-#define NB_CELLVALIGN 1 
- 
-static const char* const html_attrs[] = { ATTRS, NULL } ; 
-static const char* const core_i18n_attrs[] = { COREATTRS, I18N, NULL } ; 
-static const char* const core_attrs[] = { COREATTRS, NULL } ; 
-static const char* const i18n_attrs[] = { I18N, NULL } ; 
- 
- 
-/* Other declarations that should go inline ... */ 
-static const char* const a_attrs[] = { ATTRS, "charset", "type", "name", 
-	"href", "hreflang", "rel", "rev", "accesskey", "shape", "coords", 
-	"tabindex", "onfocus", "onblur", NULL } ; 
-static const char* const target_attr[] = { "target", NULL } ; 
-static const char* const rows_cols_attr[] = { "rows", "cols", NULL } ; 
-static const char* const alt_attr[] = { "alt", NULL } ; 
-static const char* const src_alt_attrs[] = { "src", "alt", NULL } ; 
-static const char* const href_attrs[] = { "href", NULL } ; 
-static const char* const clear_attrs[] = { "clear", NULL } ; 
-static const char* const inline_p[] = { INLINE, "p", NULL } ; 
- 
-static const char* const flow_param[] = { FLOW, "param", NULL } ; 
-static const char* const applet_attrs[] = { COREATTRS , "codebase", 
-		"archive", "alt", "name", "height", "width", "align", 
-		"hspace", "vspace", NULL } ; 
-static const char* const area_attrs[] = { "shape", "coords", "href", "nohref", 
-	"tabindex", "accesskey", "onfocus", "onblur", NULL } ; 
-static const char* const basefont_attrs[] = 
-	{ "id", "size", "color", "face", NULL } ; 
-static const char* const quote_attrs[] = { ATTRS, "cite", NULL } ; 
-static const char* const body_contents[] = { FLOW, "ins", "del", NULL } ; 
-static const char* const body_attrs[] = { ATTRS, "onload", "onunload", NULL } ; 
-static const char* const body_depr[] = { "background", "bgcolor", "text", 
-	"link", "vlink", "alink", NULL } ; 
-static const char* const button_attrs[] = { ATTRS, "name", "value", "type", 
-	"disabled", "tabindex", "accesskey", "onfocus", "onblur", NULL } ; 
- 
- 
-static const char* const col_attrs[] = { ATTRS, "span", "width", CELLHALIGN, CELLVALIGN, NULL } ; 
-static const char* const col_elt[] = { "col", NULL } ; 
-static const char* const edit_attrs[] = { ATTRS, "datetime", "cite", NULL } ; 
-static const char* const compact_attrs[] = { ATTRS, "compact", NULL } ; 
-static const char* const dl_contents[] = { "dt", "dd", NULL } ; 
-static const char* const compact_attr[] = { "compact", NULL } ; 
-static const char* const label_attr[] = { "label", NULL } ; 
-static const char* const fieldset_contents[] = { FLOW, "legend" } ; 
-static const char* const font_attrs[] = { COREATTRS, I18N, "size", "color", "face" , NULL } ; 
-static const char* const form_contents[] = { HEADING, LIST, INLINE, "pre", "p", "div", "center", "noscript", "noframes", "blockquote", "isindex", "hr", "table", "fieldset", "address", NULL } ; 
-static const char* const form_attrs[] = { ATTRS, "method", "enctype", "accept", "name", "onsubmit", "onreset", "accept-charset", NULL } ; 
-static const char* const frame_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "noresize", "scrolling" , NULL } ; 
-static const char* const frameset_attrs[] = { COREATTRS, "rows", "cols", "onload", "onunload", NULL } ; 
-static const char* const frameset_contents[] = { "frameset", "frame", "noframes", NULL } ; 
-static const char* const head_attrs[] = { I18N, "profile", NULL } ; 
-static const char* const head_contents[] = { "title", "isindex", "base", "script", "style", "meta", "link", "object", NULL } ; 
-static const char* const hr_depr[] = { "align", "noshade", "size", "width", NULL } ; 
-static const char* const version_attr[] = { "version", NULL } ; 
-static const char* const html_content[] = { "head", "body", "frameset", NULL } ; 
-static const char* const iframe_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "scrolling", "align", "height", "width", NULL } ; 
-static const char* const img_attrs[] = { ATTRS, "longdesc", "name", "height", "width", "usemap", "ismap", NULL } ; 
-static const char* const embed_attrs[] = { COREATTRS, "align", "alt", "border", "code", "codebase", "frameborder", "height", "hidden", "hspace", "name", "palette", "pluginspace", "pluginurl", "src", "type", "units", "vspace", "width", NULL } ; 
-static const char* const input_attrs[] = { ATTRS, "type", "name", "value", "checked", "disabled", "readonly", "size", "maxlength", "src", "alt", "usemap", "ismap", "tabindex", "accesskey", "onfocus", "onblur", "onselect", "onchange", "accept", NULL } ; 
-static const char* const prompt_attrs[] = { COREATTRS, I18N, "prompt", NULL } ; 
-static const char* const label_attrs[] = { ATTRS, "for", "accesskey", "onfocus", "onblur", NULL } ; 
-static const char* const legend_attrs[] = { ATTRS, "accesskey", NULL } ; 
-static const char* const align_attr[] = { "align", NULL } ; 
-static const char* const link_attrs[] = { ATTRS, "charset", "href", "hreflang", "type", "rel", "rev", "media", NULL } ; 
-static const char* const map_contents[] = { BLOCK, "area", NULL } ; 
-static const char* const name_attr[] = { "name", NULL } ; 
-static const char* const action_attr[] = { "action", NULL } ; 
-static const char* const blockli_elt[] = { BLOCK, "li", NULL } ; 
-static const char* const meta_attrs[] = { I18N, "http-equiv", "name", "scheme", "charset", NULL } ; 
-static const char* const content_attr[] = { "content", NULL } ; 
-static const char* const type_attr[] = { "type", NULL } ; 
-static const char* const noframes_content[] = { "body", FLOW MODIFIER, NULL } ; 
-static const char* const object_contents[] = { FLOW, "param", NULL } ; 
-static const char* const object_attrs[] = { ATTRS, "declare", "classid", "codebase", "data", "type", "codetype", "archive", "standby", "height", "width", "usemap", "name", "tabindex", NULL } ; 
-static const char* const object_depr[] = { "align", "border", "hspace", "vspace", NULL } ; 
-static const char* const ol_attrs[] = { "type", "compact", "start", NULL} ; 
-static const char* const option_elt[] = { "option", NULL } ; 
-static const char* const optgroup_attrs[] = { ATTRS, "disabled", NULL } ; 
-static const char* const option_attrs[] = { ATTRS, "disabled", "label", "selected", "value", NULL } ; 
-static const char* const param_attrs[] = { "id", "value", "valuetype", "type", NULL } ; 
-static const char* const width_attr[] = { "width", NULL } ; 
-static const char* const pre_content[] = { PHRASE, "tt", "i", "b", "u", "s", "strike", "a", "br", "script", "map", "q", "span", "bdo", "iframe", NULL } ; 
-static const char* const script_attrs[] = { "charset", "src", "defer", "event", "for", NULL } ; 
-static const char* const language_attr[] = { "language", NULL } ; 
-static const char* const select_content[] = { "optgroup", "option", NULL } ; 
-static const char* const select_attrs[] = { ATTRS, "name", "size", "multiple", "disabled", "tabindex", "onfocus", "onblur", "onchange", NULL } ; 
-static const char* const style_attrs[] = { I18N, "media", "title", NULL } ; 
-static const char* const table_attrs[] = { ATTRS, "summary", "width", "border", "frame", "rules", "cellspacing", "cellpadding", "datapagesize", NULL } ; 
-static const char* const table_depr[] = { "align", "bgcolor", NULL } ; 
-static const char* const table_contents[] = { "caption", "col", "colgroup", "thead", "tfoot", "tbody", "tr", NULL} ; 
-static const char* const tr_elt[] = { "tr", NULL } ; 
-static const char* const talign_attrs[] = { ATTRS, CELLHALIGN, CELLVALIGN, NULL} ; 
-static const char* const th_td_depr[] = { "nowrap", "bgcolor", "width", "height", NULL } ; 
-static const char* const th_td_attr[] = { ATTRS, "abbr", "axis", "headers", "scope", "rowspan", "colspan", CELLHALIGN, CELLVALIGN, NULL } ; 
-static const char* const textarea_attrs[] = { ATTRS, "name", "disabled", "readonly", "tabindex", "accesskey", "onfocus", "onblur", "onselect", "onchange", NULL } ; 
-static const char* const tr_contents[] = { "th", "td", NULL } ; 
-static const char* const bgcolor_attr[] = { "bgcolor", NULL } ; 
-static const char* const li_elt[] = { "li", NULL } ; 
-static const char* const ul_depr[] = { "type", "compact", NULL} ; 
-static const char* const dir_attr[] = { "dir", NULL} ; 
- 
-#define DECL (const char**) 
- 
-static const htmlElemDesc 
-html40ElementTable[] = { 
-{ "a",		0, 0, 0, 0, 0, 0, 1, "anchor ", 
-	DECL html_inline , NULL , DECL a_attrs , DECL target_attr, NULL 
-}, 
-{ "abbr",	0, 0, 0, 0, 0, 0, 1, "abbreviated form", 
-	DECL html_inline , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "acronym",	0, 0, 0, 0, 0, 0, 1, "", 
-	DECL html_inline , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "address",	0, 0, 0, 0, 0, 0, 0, "information on author ", 
-	DECL inline_p  , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "applet",	0, 0, 0, 0, 1, 1, 2, "java applet ", 
-	DECL flow_param , NULL , NULL , DECL applet_attrs, NULL 
-}, 
-{ "area",	0, 2, 2, 1, 0, 0, 0, "client-side image map area ", 
-	EMPTY ,  NULL , DECL area_attrs , DECL target_attr, DECL alt_attr 
-}, 
-{ "b",		0, 3, 0, 0, 0, 0, 1, "bold text style", 
-	DECL html_inline , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "base",	0, 2, 2, 1, 0, 0, 0, "document base uri ", 
-	EMPTY , NULL , NULL , DECL target_attr, DECL href_attrs 
-}, 
-{ "basefont",	0, 2, 2, 1, 1, 1, 1, "base font size " , 
-	EMPTY , NULL , NULL, DECL basefont_attrs, NULL 
-}, 
-{ "bdo",	0, 0, 0, 0, 0, 0, 1, "i18n bidi over-ride ", 
-	DECL html_inline , NULL , DECL core_i18n_attrs, NULL, DECL dir_attr 
-}, 
-{ "big",	0, 3, 0, 0, 0, 0, 1, "large text style", 
-	DECL html_inline , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "blockquote",	0, 0, 0, 0, 0, 0, 0, "long quotation ", 
-	DECL html_flow , NULL , DECL quote_attrs , NULL, NULL 
-}, 
-{ "body",	1, 1, 0, 0, 0, 0, 0, "document body ", 
-	DECL body_contents , "div" , DECL body_attrs, DECL body_depr, NULL 
-}, 
-{ "br",		0, 2, 2, 1, 0, 0, 1, "forced line break ", 
-	EMPTY , NULL , DECL core_attrs, DECL clear_attrs , NULL 
-}, 
-{ "button",	0, 0, 0, 0, 0, 0, 2, "push button ", 
-	DECL html_flow MODIFIER , NULL , DECL button_attrs, NULL, NULL 
-}, 
-{ "caption",	0, 0, 0, 0, 0, 0, 0, "table caption ", 
-	DECL html_inline , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "center",	0, 3, 0, 0, 1, 1, 0, "shorthand for div align=center ", 
-	DECL html_flow , NULL , NULL, DECL html_attrs, NULL 
-}, 
-{ "cite",	0, 0, 0, 0, 0, 0, 1, "citation", 
-	DECL html_inline , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "code",	0, 0, 0, 0, 0, 0, 1, "computer code fragment", 
-	DECL html_inline , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "col",	0, 2, 2, 1, 0, 0, 0, "table column ", 
-	EMPTY , NULL , DECL col_attrs , NULL, NULL 
-}, 
-{ "colgroup",	0, 1, 0, 0, 0, 0, 0, "table column group ", 
-	DECL col_elt , "col" , DECL col_attrs , NULL, NULL 
-}, 
-{ "dd",		0, 1, 0, 0, 0, 0, 0, "definition description ", 
-	DECL html_flow , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "del",	0, 0, 0, 0, 0, 0, 2, "deleted text ", 
-	DECL html_flow , NULL , DECL edit_attrs , NULL, NULL 
-}, 
-{ "dfn",	0, 0, 0, 0, 0, 0, 1, "instance definition", 
-	DECL html_inline , NULL , DECL html_attrs, NULL, NULL 
-}, 
-{ "dir",	0, 0, 0, 0, 1, 1, 0, "directory list", 
-	DECL blockli_elt, "li" , NULL, DECL compact_attrs, NULL 
-}, 
-{ "div",	0, 0, 0, 0, 0, 0, 0, "generic language/style container", 
-	DECL html_flow, NULL, DECL html_attrs, DECL align_attr, NULL 
-}, 
-{ "dl",		0, 0, 0, 0, 0, 0, 0, "definition list ", 
-	DECL dl_contents , "dd" , DECL html_attrs, DECL compact_attr, NULL 
-}, 
-{ "dt",		0, 1, 0, 0, 0, 0, 0, "definition term ", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "em",		0, 3, 0, 0, 0, 0, 1, "emphasis", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "embed",	0, 1, 0, 0, 1, 1, 1, "generic embedded object ", 
-	EMPTY, NULL, DECL embed_attrs, NULL, NULL 
-}, 
-{ "fieldset",	0, 0, 0, 0, 0, 0, 0, "form control group ", 
-	DECL fieldset_contents , NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "font",	0, 3, 0, 0, 1, 1, 1, "local change to font ", 
-	DECL html_inline, NULL, NULL, DECL font_attrs, NULL 
-}, 
-{ "form",	0, 0, 0, 0, 0, 0, 0, "interactive form ", 
-	DECL form_contents, "fieldset", DECL form_attrs , DECL target_attr, DECL action_attr 
-}, 
-{ "frame",	0, 2, 2, 1, 0, 2, 0, "subwindow " , 
-	EMPTY, NULL, NULL, DECL frame_attrs, NULL 
-}, 
-{ "frameset",	0, 0, 0, 0, 0, 2, 0, "window subdivision" , 
-	DECL frameset_contents, "noframes" , NULL , DECL frameset_attrs, NULL 
-}, 
-{ "h1",		0, 0, 0, 0, 0, 0, 0, "heading ", 
-	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL 
-}, 
-{ "h2",		0, 0, 0, 0, 0, 0, 0, "heading ", 
-	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL 
-}, 
-{ "h3",		0, 0, 0, 0, 0, 0, 0, "heading ", 
-	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL 
-}, 
-{ "h4",		0, 0, 0, 0, 0, 0, 0, "heading ", 
-	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL 
-}, 
-{ "h5",		0, 0, 0, 0, 0, 0, 0, "heading ", 
-	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL 
-}, 
-{ "h6",		0, 0, 0, 0, 0, 0, 0, "heading ", 
-	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL 
-}, 
-{ "head",	1, 1, 0, 0, 0, 0, 0, "document head ", 
-	DECL head_contents, NULL, DECL head_attrs, NULL, NULL 
-}, 
-{ "hr",		0, 2, 2, 1, 0, 0, 0, "horizontal rule " , 
-	EMPTY, NULL, DECL html_attrs, DECL hr_depr, NULL 
-}, 
-{ "html",	1, 1, 0, 0, 0, 0, 0, "document root element ", 
-	DECL html_content , NULL , DECL i18n_attrs, DECL version_attr, NULL 
-}, 
-{ "i",		0, 3, 0, 0, 0, 0, 1, "italic text style", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "iframe",	0, 0, 0, 0, 0, 1, 2, "inline subwindow ", 
-	DECL html_flow, NULL, NULL, DECL iframe_attrs, NULL 
-}, 
-{ "img",	0, 2, 2, 1, 0, 0, 1, "embedded image ", 
-	EMPTY, NULL, DECL img_attrs, DECL align_attr, DECL src_alt_attrs 
-}, 
-{ "input",	0, 2, 2, 1, 0, 0, 1, "form control ", 
-	EMPTY, NULL, DECL input_attrs , DECL align_attr, NULL 
-}, 
-{ "ins",	0, 0, 0, 0, 0, 0, 2, "inserted text", 
-	DECL html_flow, NULL, DECL edit_attrs, NULL, NULL 
-}, 
-{ "isindex",	0, 2, 2, 1, 1, 1, 0, "single line prompt ", 
-	EMPTY, NULL, NULL, DECL prompt_attrs, NULL 
-}, 
-{ "kbd",	0, 0, 0, 0, 0, 0, 1, "text to be entered by the user", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "label",	0, 0, 0, 0, 0, 0, 1, "form field label text ", 
-	DECL html_inline MODIFIER, NULL, DECL label_attrs , NULL, NULL 
-}, 
-{ "legend",	0, 0, 0, 0, 0, 0, 0, "fieldset legend ", 
-	DECL html_inline, NULL, DECL legend_attrs , DECL align_attr, NULL 
-}, 
-{ "li",		0, 1, 1, 0, 0, 0, 0, "list item ", 
-	DECL html_flow, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "link",	0, 2, 2, 1, 0, 0, 0, "a media-independent link ", 
-	EMPTY, NULL, DECL link_attrs, DECL target_attr, NULL 
-}, 
-{ "map",	0, 0, 0, 0, 0, 0, 2, "client-side image map ", 
-	DECL map_contents , NULL, DECL html_attrs , NULL, DECL name_attr 
-}, 
-{ "menu",	0, 0, 0, 0, 1, 1, 0, "menu list ", 
-	DECL blockli_elt , NULL, NULL, DECL compact_attrs, NULL 
-}, 
-{ "meta",	0, 2, 2, 1, 0, 0, 0, "generic metainformation ", 
-	EMPTY, NULL, DECL meta_attrs , NULL , DECL content_attr 
-}, 
-{ "noframes",	0, 0, 0, 0, 0, 2, 0, "alternate content container for non frame-based rendering ", 
-	DECL noframes_content, "body" , DECL html_attrs, NULL, NULL 
-}, 
-{ "noscript",	0, 0, 0, 0, 0, 0, 0, "alternate content container for non script-based rendering ", 
-	DECL html_flow, "div", DECL html_attrs, NULL, NULL 
-}, 
-{ "object",	0, 0, 0, 0, 0, 0, 2, "generic embedded object ", 
-	DECL object_contents , "div" , DECL object_attrs, DECL object_depr, NULL 
-}, 
-{ "ol",		0, 0, 0, 0, 0, 0, 0, "ordered list ", 
-	DECL li_elt , "li" , DECL html_attrs, DECL ol_attrs, NULL 
-}, 
-{ "optgroup",	0, 0, 0, 0, 0, 0, 0, "option group ", 
-	DECL option_elt , "option", DECL optgroup_attrs, NULL, DECL label_attr 
-}, 
-{ "option",	0, 1, 0, 0, 0, 0, 0, "selectable choice " , 
-	DECL html_pcdata, NULL, DECL option_attrs, NULL, NULL 
-}, 
-{ "p",		0, 1, 0, 0, 0, 0, 0, "paragraph ", 
-	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL 
-}, 
-{ "param",	0, 2, 2, 1, 0, 0, 0, "named property value ", 
-	EMPTY, NULL, DECL param_attrs, NULL, DECL name_attr 
-}, 
-{ "pre",	0, 0, 0, 0, 0, 0, 0, "preformatted text ", 
-	DECL pre_content, NULL, DECL html_attrs, DECL width_attr, NULL 
-}, 
-{ "q",		0, 0, 0, 0, 0, 0, 1, "short inline quotation ", 
-	DECL html_inline, NULL, DECL quote_attrs, NULL, NULL 
-}, 
-{ "s",		0, 3, 0, 0, 1, 1, 1, "strike-through text style", 
-	DECL html_inline, NULL, NULL, DECL html_attrs, NULL 
-}, 
-{ "samp",	0, 0, 0, 0, 0, 0, 1, "sample program output, scripts, etc.", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "script",	0, 0, 0, 0, 0, 0, 2, "script statements ", 
-	DECL html_cdata, NULL, DECL script_attrs, DECL language_attr, DECL type_attr 
-}, 
-{ "select",	0, 0, 0, 0, 0, 0, 1, "option selector ", 
-	DECL select_content, NULL, DECL select_attrs, NULL, NULL 
-}, 
-{ "small",	0, 3, 0, 0, 0, 0, 1, "small text style", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "span",	0, 0, 0, 0, 0, 0, 1, "generic language/style container ", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "strike",	0, 3, 0, 0, 1, 1, 1, "strike-through text", 
-	DECL html_inline, NULL, NULL, DECL html_attrs, NULL 
-}, 
-{ "strong",	0, 3, 0, 0, 0, 0, 1, "strong emphasis", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "style",	0, 0, 0, 0, 0, 0, 0, "style info ", 
-	DECL html_cdata, NULL, DECL style_attrs, NULL, DECL type_attr 
-}, 
-{ "sub",	0, 3, 0, 0, 0, 0, 1, "subscript", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "sup",	0, 3, 0, 0, 0, 0, 1, "superscript ", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "table",	0, 0, 0, 0, 0, 0, 0, "", 
-	DECL table_contents , "tr" , DECL table_attrs , DECL table_depr, NULL 
-}, 
-{ "tbody",	1, 0, 0, 0, 0, 0, 0, "table body ", 
-	DECL tr_elt , "tr" , DECL talign_attrs, NULL, NULL 
-}, 
-{ "td",		0, 0, 0, 0, 0, 0, 0, "table data cell", 
-	DECL html_flow, NULL, DECL th_td_attr, DECL th_td_depr, NULL 
-}, 
-{ "textarea",	0, 0, 0, 0, 0, 0, 1, "multi-line text field ", 
-	DECL html_pcdata, NULL, DECL textarea_attrs, NULL, DECL rows_cols_attr 
-}, 
-{ "tfoot",	0, 1, 0, 0, 0, 0, 0, "table footer ", 
-	DECL tr_elt , "tr" , DECL talign_attrs, NULL, NULL 
-}, 
-{ "th",		0, 1, 0, 0, 0, 0, 0, "table header cell", 
-	DECL html_flow, NULL, DECL th_td_attr, DECL th_td_depr, NULL 
-}, 
-{ "thead",	0, 1, 0, 0, 0, 0, 0, "table header ", 
-	DECL tr_elt , "tr" , DECL talign_attrs, NULL, NULL 
-}, 
-{ "title",	0, 0, 0, 0, 0, 0, 0, "document title ", 
-	DECL html_pcdata, NULL, DECL i18n_attrs, NULL, NULL 
-}, 
-{ "tr",		0, 0, 0, 0, 0, 0, 0, "table row ", 
-	DECL tr_contents , "td" , DECL talign_attrs, DECL bgcolor_attr, NULL 
-}, 
-{ "tt",		0, 3, 0, 0, 0, 0, 1, "teletype or monospaced text style", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-}, 
-{ "u",		0, 3, 0, 0, 1, 1, 1, "underlined text style", 
-	DECL html_inline, NULL, NULL, DECL html_attrs, NULL 
-}, 
-{ "ul",		0, 0, 0, 0, 0, 0, 0, "unordered list ", 
-	DECL li_elt , "li" , DECL html_attrs, DECL ul_depr, NULL 
-}, 
-{ "var",	0, 0, 0, 0, 0, 0, 1, "instance of a variable or program argument", 
-	DECL html_inline, NULL, DECL html_attrs, NULL, NULL 
-} 
-}; 
- 
-/* 
- * start tags that imply the end of current element 
- */ 
-static const char * const htmlStartClose[] = { 
-"form",		"form", "p", "hr", "h1", "h2", "h3", "h4", "h5", "h6", 
-		"dl", "ul", "ol", "menu", "dir", "address", "pre", 
-		"listing", "xmp", "head", NULL, 
-"head",		"p", NULL, 
-"title",	"p", NULL, 
-"body",		"head", "style", "link", "title", "p", NULL, 
-"frameset",	"head", "style", "link", "title", "p", NULL, 
-"li",		"p", "h1", "h2", "h3", "h4", "h5", "h6", "dl", "address", 
-		"pre", "listing", "xmp", "head", "li", NULL, 
-"hr",		"p", "head", NULL, 
-"h1",		"p", "head", NULL, 
-"h2",		"p", "head", NULL, 
-"h3",		"p", "head", NULL, 
-"h4",		"p", "head", NULL, 
-"h5",		"p", "head", NULL, 
-"h6",		"p", "head", NULL, 
-"dir",		"p", "head", NULL, 
-"address",	"p", "head", "ul", NULL, 
-"pre",		"p", "head", "ul", NULL, 
-"listing",	"p", "head", NULL, 
-"xmp",		"p", "head", NULL, 
-"blockquote",	"p", "head", NULL, 
-"dl",		"p", "dt", "menu", "dir", "address", "pre", "listing", 
-		"xmp", "head", NULL, 
-"dt",		"p", "menu", "dir", "address", "pre", "listing", "xmp", 
-                "head", "dd", NULL, 
-"dd",		"p", "menu", "dir", "address", "pre", "listing", "xmp", 
-                "head", "dt", NULL, 
-"ul",		"p", "head", "ol", "menu", "dir", "address", "pre", 
-		"listing", "xmp", NULL, 
-"ol",		"p", "head", "ul", NULL, 
-"menu",		"p", "head", "ul", NULL, 
-"p",		"p", "head", "h1", "h2", "h3", "h4", "h5", "h6", FONTSTYLE, NULL, 
-"div",		"p", "head", NULL, 
-"noscript",	"script", NULL,
-"center",	"font", "b", "i", "p", "head", NULL, 
-"a",		"a", "head", NULL, 
-"caption",	"p", NULL, 
-"colgroup",	"caption", "colgroup", "col", "p", NULL, 
-"col",		"caption", "col", "p", NULL, 
-"table",	"p", "head", "h1", "h2", "h3", "h4", "h5", "h6", "pre", 
-		"listing", "xmp", "a", NULL, 
-"th",		"th", "td", "p", "span", "font", "a", "b", "i", "u", NULL, 
-"td",		"th", "td", "p", "span", "font", "a", "b", "i", "u", NULL, 
-"tr",		"th", "td", "tr", "caption", "col", "colgroup", "p", NULL, 
-"thead",	"caption", "col", "colgroup", NULL, 
-"tfoot",	"th", "td", "tr", "caption", "col", "colgroup", "thead", 
-		"tbody", "p", NULL, 
-"tbody",	"th", "td", "tr", "caption", "col", "colgroup", "thead", 
-		"tfoot", "tbody", "p", NULL, 
-"optgroup",	"option", NULL, 
-"option",	"option", NULL, 
-"fieldset",	"legend", "p", "head", "h1", "h2", "h3", "h4", "h5", "h6", 
-		"pre", "listing", "xmp", "a", NULL, 
-/* most tags in in FONTSTYLE, PHRASE and SPECIAL should close <head> */ 
-"tt",		"head", NULL, 
-"i",		"head", NULL, 
-"b",		"head", NULL, 
-"u",		"head", NULL, 
-"s",		"head", NULL, 
-"strike",	"head", NULL, 
-"big",		"head", NULL, 
-"small",	"head", NULL, 
- 
-"em",		"head", NULL, 
-"strong",	"head", NULL, 
-"dfn",		"head", NULL, 
-"code",		"head", NULL, 
-"samp",		"head", NULL, 
-"kbd",		"head", NULL, 
-"var",		"head", NULL, 
-"cite",		"head", NULL, 
-"abbr",		"head", NULL, 
-"acronym",	"head", NULL, 
- 
-/* "a" */ 
-"img",		"head", NULL, 
-/* "applet" */ 
-/* "embed" */ 
-/* "object" */ 
-"font",		"head", NULL, 
-/* "basefont" */ 
-"br",		"head", NULL, 
-/* "script" */ 
-"map",		"head", NULL, 
-"q",		"head", NULL, 
-"sub",		"head", NULL, 
-"sup",		"head", NULL, 
-"span",		"head", NULL, 
-"bdo",		"head", NULL, 
-"iframe",	"head", NULL, 
-NULL 
-}; 
- 
-/* 
- * The list of HTML elements which are supposed not to have 
- * CDATA content and where a p element will be implied 
- * 
- * TODO: extend that list by reading the HTML SGML DTD on 
- *       implied paragraph 
- */ 
-static const char *const htmlNoContentElements[] = { 
-    "html", 
-    "head", 
-    NULL 
-}; 
- 
-/* 
- * The list of HTML attributes which are of content %Script; 
- * NOTE: when adding ones, check htmlIsScriptAttribute() since 
- *       it assumes the name starts with 'on' 
- */ 
-static const char *const htmlScriptAttributes[] = { 
-    "onclick", 
-    "ondblclick", 
-    "onmousedown", 
-    "onmouseup", 
-    "onmouseover", 
-    "onmousemove", 
-    "onmouseout", 
-    "onkeypress", 
-    "onkeydown", 
-    "onkeyup", 
-    "onload", 
-    "onunload", 
-    "onfocus", 
-    "onblur", 
-    "onsubmit", 
-    "onreset", 
-    "onchange", 
-    "onselect" 
-}; 
- 
-/* 
- * This table is used by the htmlparser to know what to do with 
- * broken html pages. By assigning different priorities to different 
- * elements the parser can decide how to handle extra endtags. 
- * Endtags are only allowed to close elements with lower or equal 
- * priority. 
- */ 
- 
-typedef struct { 
-    const char *name; 
-    int priority; 
-} elementPriority; 
- 
-static const elementPriority htmlEndPriority[] = { 
-    {"div",   150}, 
-    {"td",    160}, 
-    {"th",    160}, 
-    {"tr",    170}, 
-    {"thead", 180}, 
-    {"tbody", 180}, 
-    {"tfoot", 180}, 
-    {"table", 190}, 
-    {"head",  200}, 
-    {"body",  200}, 
-    {"html",  220}, 
-    {NULL,    100} /* Default priority */ 
-}; 
- 
-static const char** htmlStartCloseIndex[100]; 
-static int htmlStartCloseIndexinitialized = 0; 
- 
-/************************************************************************ 
- *									* 
- *	functions to handle HTML specific data			* 
- *									* 
- ************************************************************************/ 
- 
-/** 
- * htmlInitAutoClose: 
- * 
- * Initialize the htmlStartCloseIndex for fast lookup of closing tags names. 
- * This is not reentrant. Call xmlInitParser() once before processing in 
- * case of use in multithreaded programs. 
- */ 
-void 
-htmlInitAutoClose(void) { 
-    int indx, i = 0; 
- 
-    if (htmlStartCloseIndexinitialized) return; 
- 
-    for (indx = 0;indx < 100;indx ++) htmlStartCloseIndex[indx] = NULL; 
-    indx = 0; 
-    while ((htmlStartClose[i] != NULL) && (indx < 100 - 1)) { 
-        htmlStartCloseIndex[indx++] = (const char**) &htmlStartClose[i]; 
-	while (htmlStartClose[i] != NULL) i++; 
-	i++; 
-    } 
-    htmlStartCloseIndexinitialized = 1; 
-} 
- 
-/** 
- * htmlTagLookup: 
- * @tag:  The tag name in lowercase 
- * 
- * Lookup the HTML tag in the ElementTable 
- * 
- * Returns the related htmlElemDescPtr or NULL if not found. 
- */ 
-const htmlElemDesc * 
-htmlTagLookup(const xmlChar *tag) { 
-    unsigned int i; 
- 
-    for (i = 0; i < (sizeof(html40ElementTable) / 
-                     sizeof(html40ElementTable[0]));i++) { 
-        if (!xmlStrcasecmp(tag, BAD_CAST html40ElementTable[i].name)) 
-	    return((htmlElemDescPtr) &html40ElementTable[i]); 
-    } 
-    return(NULL); 
-} 
- 
-/** 
- * htmlGetEndPriority: 
- * @name: The name of the element to look up the priority for. 
- * 
- * Return value: The "endtag" priority. 
- **/ 
-static int 
-htmlGetEndPriority (const xmlChar *name) { 
-    int i = 0; 
- 
-    while ((htmlEndPriority[i].name != NULL) && 
-	   (!xmlStrEqual((const xmlChar *)htmlEndPriority[i].name, name))) 
-	i++; 
- 
-    return(htmlEndPriority[i].priority); 
-} 
- 
- 
-/** 
- * htmlCheckAutoClose: 
- * @newtag:  The new tag name 
- * @oldtag:  The old tag name 
- * 
- * Checks whether the new tag is one of the registered valid tags for 
- * closing old. 
- * Initialize the htmlStartCloseIndex for fast lookup of closing tags names. 
- * 
- * Returns 0 if no, 1 if yes. 
- */ 
-static int 
-htmlCheckAutoClose(const xmlChar * newtag, const xmlChar * oldtag) 
-{ 
-    int i, indx; 
-    const char **closed = NULL; 
- 
-    if (htmlStartCloseIndexinitialized == 0) 
-        htmlInitAutoClose(); 
- 
-    /* inefficient, but not a big deal */ 
-    for (indx = 0; indx < 100; indx++) { 
-        closed = htmlStartCloseIndex[indx]; 
-        if (closed == NULL) 
-            return (0); 
-        if (xmlStrEqual(BAD_CAST * closed, newtag)) 
-            break; 
-    } 
- 
-    i = closed - htmlStartClose; 
-    i++; 
-    while (htmlStartClose[i] != NULL) { 
-        if (xmlStrEqual(BAD_CAST htmlStartClose[i], oldtag)) { 
-            return (1); 
-        } 
-        i++; 
-    } 
-    return (0); 
-} 
- 
-/** 
- * htmlAutoCloseOnClose: 
- * @ctxt:  an HTML parser context 
- * @newtag:  The new tag name 
- * @force:  force the tag closure 
- * 
- * The HTML DTD allows an ending tag to implicitly close other tags. 
- */ 
-static void 
-htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag) 
-{ 
-    const htmlElemDesc *info; 
-    int i, priority; 
- 
-    priority = htmlGetEndPriority(newtag); 
- 
-    for (i = (ctxt->nameNr - 1); i >= 0; i--) { 
- 
-        if (xmlStrEqual(newtag, ctxt->nameTab[i])) 
-            break; 
-        /* 
-         * A misplaced endtag can only close elements with lower
-         * or equal priority, so if we find an element with higher 
-         * priority before we find an element with 
-         * matching name, we just ignore this endtag 
-         */ 
-        if (htmlGetEndPriority(ctxt->nameTab[i]) > priority) 
-            return; 
-    } 
-    if (i < 0) 
-        return; 
- 
-    while (!xmlStrEqual(newtag, ctxt->name)) { 
-        info = htmlTagLookup(ctxt->name); 
-        if ((info != NULL) && (info->endTag == 3)) { 
-            htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH, 
-	                 "Opening and ending tag mismatch: %s and %s\n", 
-			 newtag, ctxt->name); 
-        } 
-        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-            ctxt->sax->endElement(ctxt->userData, ctxt->name); 
-	htmlnamePop(ctxt); 
-    } 
-} 
- 
-/** 
- * htmlAutoCloseOnEnd: 
- * @ctxt:  an HTML parser context 
- * 
- * Close all remaining tags at the end of the stream 
- */ 
-static void 
-htmlAutoCloseOnEnd(htmlParserCtxtPtr ctxt) 
-{ 
-    int i; 
- 
-    if (ctxt->nameNr == 0) 
-        return; 
-    for (i = (ctxt->nameNr - 1); i >= 0; i--) { 
-        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-            ctxt->sax->endElement(ctxt->userData, ctxt->name); 
-	htmlnamePop(ctxt); 
-    } 
-} 
- 
-/** 
- * htmlAutoClose: 
- * @ctxt:  an HTML parser context 
- * @newtag:  The new tag name or NULL 
- * 
- * The HTML DTD allows a tag to implicitly close other tags. 
- * The list is kept in htmlStartClose array. This function is 
- * called when a new tag has been detected and generates the 
- * appropriates closes if possible/needed. 
- * If newtag is NULL this mean we are at the end of the resource 
- * and we should check 
- */ 
-static void 
-htmlAutoClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag) 
-{ 
-    while ((newtag != NULL) && (ctxt->name != NULL) && 
-           (htmlCheckAutoClose(newtag, ctxt->name))) { 
-        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-            ctxt->sax->endElement(ctxt->userData, ctxt->name); 
-	htmlnamePop(ctxt); 
-    } 
-    if (newtag == NULL) { 
-        htmlAutoCloseOnEnd(ctxt); 
-        return; 
-    } 
-    while ((newtag == NULL) && (ctxt->name != NULL) && 
-           ((xmlStrEqual(ctxt->name, BAD_CAST "head")) || 
-            (xmlStrEqual(ctxt->name, BAD_CAST "body")) || 
-            (xmlStrEqual(ctxt->name, BAD_CAST "html")))) { 
-        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-            ctxt->sax->endElement(ctxt->userData, ctxt->name); 
-	htmlnamePop(ctxt); 
-    } 
-} 
- 
-/** 
- * htmlAutoCloseTag: 
- * @doc:  the HTML document 
- * @name:  The tag name 
- * @elem:  the HTML element 
- * 
- * The HTML DTD allows a tag to implicitly close other tags. 
- * The list is kept in htmlStartClose array. This function checks 
- * if the element or one of it's children would autoclose the 
- * given tag. 
- * 
- * Returns 1 if autoclose, 0 otherwise 
- */ 
-int 
-htmlAutoCloseTag(htmlDocPtr doc, const xmlChar *name, htmlNodePtr elem) { 
-    htmlNodePtr child; 
- 
-    if (elem == NULL) return(1); 
-    if (xmlStrEqual(name, elem->name)) return(0); 
-    if (htmlCheckAutoClose(elem->name, name)) return(1); 
-    child = elem->children; 
-    while (child != NULL) { 
-        if (htmlAutoCloseTag(doc, name, child)) return(1); 
-	child = child->next; 
-    } 
-    return(0); 
-} 
- 
-/** 
- * htmlIsAutoClosed: 
- * @doc:  the HTML document 
- * @elem:  the HTML element 
- * 
- * The HTML DTD allows a tag to implicitly close other tags. 
- * The list is kept in htmlStartClose array. This function checks 
- * if a tag is autoclosed by one of it's child 
- * 
- * Returns 1 if autoclosed, 0 otherwise 
- */ 
-int 
-htmlIsAutoClosed(htmlDocPtr doc, htmlNodePtr elem) { 
-    htmlNodePtr child; 
- 
-    if (elem == NULL) return(1); 
-    child = elem->children; 
-    while (child != NULL) { 
-	if (htmlAutoCloseTag(doc, elem->name, child)) return(1); 
-	child = child->next; 
-    } 
-    return(0); 
-} 
- 
-/** 
- * htmlCheckImplied: 
- * @ctxt:  an HTML parser context 
- * @newtag:  The new tag name 
- * 
- * The HTML DTD allows a tag to exists only implicitly 
- * called when a new tag has been detected and generates the 
- * appropriates implicit tags if missing 
- */ 
-static void 
-htmlCheckImplied(htmlParserCtxtPtr ctxt, const xmlChar *newtag) { 
-    int i; 
- 
-    if (ctxt->options & HTML_PARSE_NOIMPLIED) 
-        return; 
-    if (!htmlOmittedDefaultValue) 
-	return; 
-    if (xmlStrEqual(newtag, BAD_CAST"html")) 
-	return; 
-    if (ctxt->nameNr <= 0) { 
-	htmlnamePush(ctxt, BAD_CAST"html"); 
-	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL)) 
-	    ctxt->sax->startElement(ctxt->userData, BAD_CAST"html", NULL); 
-    } 
-    if ((xmlStrEqual(newtag, BAD_CAST"body")) || (xmlStrEqual(newtag, BAD_CAST"head"))) 
-        return; 
-    if ((ctxt->nameNr <= 1) && 
-        ((xmlStrEqual(newtag, BAD_CAST"script")) || 
-	 (xmlStrEqual(newtag, BAD_CAST"style")) || 
-	 (xmlStrEqual(newtag, BAD_CAST"meta")) || 
-	 (xmlStrEqual(newtag, BAD_CAST"link")) || 
-	 (xmlStrEqual(newtag, BAD_CAST"title")) || 
-	 (xmlStrEqual(newtag, BAD_CAST"base")))) { 
-        if (ctxt->html >= 3) { 
-            /* we already saw or generated an <head> before */ 
-            return; 
-        } 
-        /* 
-         * dropped OBJECT ... i you put it first BODY will be 
-         * assumed ! 
-         */ 
-        htmlnamePush(ctxt, BAD_CAST"head"); 
-        if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL)) 
-            ctxt->sax->startElement(ctxt->userData, BAD_CAST"head", NULL); 
-    } else if ((!xmlStrEqual(newtag, BAD_CAST"noframes")) && 
-	       (!xmlStrEqual(newtag, BAD_CAST"frame")) && 
-	       (!xmlStrEqual(newtag, BAD_CAST"frameset"))) { 
-        if (ctxt->html >= 10) { 
-            /* we already saw or generated a <body> before */ 
-            return; 
-        } 
-	for (i = 0;i < ctxt->nameNr;i++) { 
-	    if (xmlStrEqual(ctxt->nameTab[i], BAD_CAST"body")) { 
-		return; 
-	    } 
-	    if (xmlStrEqual(ctxt->nameTab[i], BAD_CAST"head")) { 
-		return; 
-	    } 
-	} 
- 
-	htmlnamePush(ctxt, BAD_CAST"body"); 
-	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL)) 
-	    ctxt->sax->startElement(ctxt->userData, BAD_CAST"body", NULL); 
-    } 
-} 
- 
-/** 
- * htmlCheckParagraph 
- * @ctxt:  an HTML parser context 
- * 
- * Check whether a p element need to be implied before inserting 
- * characters in the current element. 
- * 
- * Returns 1 if a paragraph has been inserted, 0 if not and -1 
- *         in case of error. 
- */ 
- 
-static int 
-htmlCheckParagraph(htmlParserCtxtPtr ctxt) { 
-    const xmlChar *tag; 
-    int i; 
- 
-    if (ctxt == NULL) 
-	return(-1); 
-    tag = ctxt->name; 
-    if (tag == NULL) { 
-	htmlAutoClose(ctxt, BAD_CAST"p"); 
-	htmlCheckImplied(ctxt, BAD_CAST"p"); 
-	htmlnamePush(ctxt, BAD_CAST"p"); 
-	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL)) 
-	    ctxt->sax->startElement(ctxt->userData, BAD_CAST"p", NULL); 
-	return(1); 
-    } 
-    if (!htmlOmittedDefaultValue) 
-	return(0); 
-    for (i = 0; htmlNoContentElements[i] != NULL; i++) { 
-	if (xmlStrEqual(tag, BAD_CAST htmlNoContentElements[i])) { 
-	    htmlAutoClose(ctxt, BAD_CAST"p"); 
-	    htmlCheckImplied(ctxt, BAD_CAST"p"); 
-	    htmlnamePush(ctxt, BAD_CAST"p"); 
-	    if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL)) 
-		ctxt->sax->startElement(ctxt->userData, BAD_CAST"p", NULL); 
-	    return(1); 
-	} 
-    } 
-    return(0); 
-} 
- 
-/** 
- * htmlIsScriptAttribute: 
- * @name:  an attribute name 
- * 
- * Check if an attribute is of content type Script 
- * 
- * Returns 1 is the attribute is a script 0 otherwise 
- */ 
-int 
-htmlIsScriptAttribute(const xmlChar *name) { 
-    unsigned int i; 
- 
-    if (name == NULL) 
-      return(0); 
-    /* 
-     * all script attributes start with 'on' 
-     */ 
-    if ((name[0] != 'o') || (name[1] != 'n')) 
-      return(0); 
-    for (i = 0; 
-	 i < sizeof(htmlScriptAttributes)/sizeof(htmlScriptAttributes[0]); 
-	 i++) { 
-	if (xmlStrEqual(name, (const xmlChar *) htmlScriptAttributes[i])) 
-	    return(1); 
-    } 
-    return(0); 
-} 
- 
-/************************************************************************ 
- *									* 
- *	The list of HTML predefined entities			* 
- *									* 
- ************************************************************************/ 
- 
- 
-static const htmlEntityDesc  html40EntitiesTable[] = { 
-/* 
- * the 4 absolute ones, plus apostrophe. 
- */ 
-{ 34,	"quot",	"quotation mark = APL quote, U+0022 ISOnum" }, 
-{ 38,	"amp",	"ampersand, U+0026 ISOnum" }, 
-{ 39,	"apos",	"single quote" }, 
-{ 60,	"lt",	"less-than sign, U+003C ISOnum" }, 
-{ 62,	"gt",	"greater-than sign, U+003E ISOnum" }, 
- 
-/* 
- * A bunch still in the 128-255 range 
- * Replacing them depend really on the charset used. 
- */ 
-{ 160,	"nbsp",	"no-break space = non-breaking space, U+00A0 ISOnum" }, 
-{ 161,	"iexcl","inverted exclamation mark, U+00A1 ISOnum" }, 
-{ 162,	"cent",	"cent sign, U+00A2 ISOnum" }, 
-{ 163,	"pound","pound sign, U+00A3 ISOnum" }, 
-{ 164,	"curren","currency sign, U+00A4 ISOnum" }, 
-{ 165,	"yen",	"yen sign = yuan sign, U+00A5 ISOnum" }, 
-{ 166,	"brvbar","broken bar = broken vertical bar, U+00A6 ISOnum" }, 
-{ 167,	"sect",	"section sign, U+00A7 ISOnum" }, 
-{ 168,	"uml",	"diaeresis = spacing diaeresis, U+00A8 ISOdia" }, 
-{ 169,	"copy",	"copyright sign, U+00A9 ISOnum" }, 
-{ 170,	"ordf",	"feminine ordinal indicator, U+00AA ISOnum" }, 
-{ 171,	"laquo","left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum" }, 
-{ 172,	"not",	"not sign, U+00AC ISOnum" }, 
-{ 173,	"shy",	"soft hyphen = discretionary hyphen, U+00AD ISOnum" }, 
-{ 174,	"reg",	"registered sign = registered trade mark sign, U+00AE ISOnum" }, 
-{ 175,	"macr",	"macron = spacing macron = overline = APL overbar, U+00AF ISOdia" }, 
-{ 176,	"deg",	"degree sign, U+00B0 ISOnum" }, 
-{ 177,	"plusmn","plus-minus sign = plus-or-minus sign, U+00B1 ISOnum" }, 
-{ 178,	"sup2",	"superscript two = superscript digit two = squared, U+00B2 ISOnum" }, 
-{ 179,	"sup3",	"superscript three = superscript digit three = cubed, U+00B3 ISOnum" }, 
-{ 180,	"acute","acute accent = spacing acute, U+00B4 ISOdia" }, 
-{ 181,	"micro","micro sign, U+00B5 ISOnum" }, 
-{ 182,	"para",	"pilcrow sign = paragraph sign, U+00B6 ISOnum" }, 
-{ 183,	"middot","middle dot = Georgian comma Greek middle dot, U+00B7 ISOnum" }, 
-{ 184,	"cedil","cedilla = spacing cedilla, U+00B8 ISOdia" }, 
-{ 185,	"sup1",	"superscript one = superscript digit one, U+00B9 ISOnum" }, 
-{ 186,	"ordm",	"masculine ordinal indicator, U+00BA ISOnum" }, 
-{ 187,	"raquo","right-pointing double angle quotation mark right pointing guillemet, U+00BB ISOnum" }, 
-{ 188,	"frac14","vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum" }, 
-{ 189,	"frac12","vulgar fraction one half = fraction one half, U+00BD ISOnum" }, 
-{ 190,	"frac34","vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum" }, 
-{ 191,	"iquest","inverted question mark = turned question mark, U+00BF ISOnum" }, 
-{ 192,	"Agrave","latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1" }, 
-{ 193,	"Aacute","latin capital letter A with acute, U+00C1 ISOlat1" }, 
-{ 194,	"Acirc","latin capital letter A with circumflex, U+00C2 ISOlat1" }, 
-{ 195,	"Atilde","latin capital letter A with tilde, U+00C3 ISOlat1" }, 
-{ 196,	"Auml",	"latin capital letter A with diaeresis, U+00C4 ISOlat1" }, 
-{ 197,	"Aring","latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1" }, 
-{ 198,	"AElig","latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1" }, 
-{ 199,	"Ccedil","latin capital letter C with cedilla, U+00C7 ISOlat1" }, 
-{ 200,	"Egrave","latin capital letter E with grave, U+00C8 ISOlat1" }, 
-{ 201,	"Eacute","latin capital letter E with acute, U+00C9 ISOlat1" }, 
-{ 202,	"Ecirc","latin capital letter E with circumflex, U+00CA ISOlat1" }, 
-{ 203,	"Euml",	"latin capital letter E with diaeresis, U+00CB ISOlat1" }, 
-{ 204,	"Igrave","latin capital letter I with grave, U+00CC ISOlat1" }, 
-{ 205,	"Iacute","latin capital letter I with acute, U+00CD ISOlat1" }, 
-{ 206,	"Icirc","latin capital letter I with circumflex, U+00CE ISOlat1" }, 
-{ 207,	"Iuml",	"latin capital letter I with diaeresis, U+00CF ISOlat1" }, 
-{ 208,	"ETH",	"latin capital letter ETH, U+00D0 ISOlat1" }, 
-{ 209,	"Ntilde","latin capital letter N with tilde, U+00D1 ISOlat1" }, 
-{ 210,	"Ograve","latin capital letter O with grave, U+00D2 ISOlat1" }, 
-{ 211,	"Oacute","latin capital letter O with acute, U+00D3 ISOlat1" }, 
-{ 212,	"Ocirc","latin capital letter O with circumflex, U+00D4 ISOlat1" }, 
-{ 213,	"Otilde","latin capital letter O with tilde, U+00D5 ISOlat1" }, 
-{ 214,	"Ouml",	"latin capital letter O with diaeresis, U+00D6 ISOlat1" }, 
-{ 215,	"times","multiplication sign, U+00D7 ISOnum" }, 
-{ 216,	"Oslash","latin capital letter O with stroke latin capital letter O slash, U+00D8 ISOlat1" }, 
-{ 217,	"Ugrave","latin capital letter U with grave, U+00D9 ISOlat1" }, 
-{ 218,	"Uacute","latin capital letter U with acute, U+00DA ISOlat1" }, 
-{ 219,	"Ucirc","latin capital letter U with circumflex, U+00DB ISOlat1" }, 
-{ 220,	"Uuml",	"latin capital letter U with diaeresis, U+00DC ISOlat1" }, 
-{ 221,	"Yacute","latin capital letter Y with acute, U+00DD ISOlat1" }, 
-{ 222,	"THORN","latin capital letter THORN, U+00DE ISOlat1" }, 
-{ 223,	"szlig","latin small letter sharp s = ess-zed, U+00DF ISOlat1" }, 
-{ 224,	"agrave","latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1" }, 
-{ 225,	"aacute","latin small letter a with acute, U+00E1 ISOlat1" }, 
-{ 226,	"acirc","latin small letter a with circumflex, U+00E2 ISOlat1" }, 
-{ 227,	"atilde","latin small letter a with tilde, U+00E3 ISOlat1" }, 
-{ 228,	"auml",	"latin small letter a with diaeresis, U+00E4 ISOlat1" }, 
-{ 229,	"aring","latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1" }, 
-{ 230,	"aelig","latin small letter ae = latin small ligature ae, U+00E6 ISOlat1" }, 
-{ 231,	"ccedil","latin small letter c with cedilla, U+00E7 ISOlat1" }, 
-{ 232,	"egrave","latin small letter e with grave, U+00E8 ISOlat1" }, 
-{ 233,	"eacute","latin small letter e with acute, U+00E9 ISOlat1" }, 
-{ 234,	"ecirc","latin small letter e with circumflex, U+00EA ISOlat1" }, 
-{ 235,	"euml",	"latin small letter e with diaeresis, U+00EB ISOlat1" }, 
-{ 236,	"igrave","latin small letter i with grave, U+00EC ISOlat1" }, 
-{ 237,	"iacute","latin small letter i with acute, U+00ED ISOlat1" }, 
-{ 238,	"icirc","latin small letter i with circumflex, U+00EE ISOlat1" }, 
-{ 239,	"iuml",	"latin small letter i with diaeresis, U+00EF ISOlat1" }, 
-{ 240,	"eth",	"latin small letter eth, U+00F0 ISOlat1" }, 
-{ 241,	"ntilde","latin small letter n with tilde, U+00F1 ISOlat1" }, 
-{ 242,	"ograve","latin small letter o with grave, U+00F2 ISOlat1" }, 
-{ 243,	"oacute","latin small letter o with acute, U+00F3 ISOlat1" }, 
-{ 244,	"ocirc","latin small letter o with circumflex, U+00F4 ISOlat1" }, 
-{ 245,	"otilde","latin small letter o with tilde, U+00F5 ISOlat1" }, 
-{ 246,	"ouml",	"latin small letter o with diaeresis, U+00F6 ISOlat1" }, 
-{ 247,	"divide","division sign, U+00F7 ISOnum" }, 
-{ 248,	"oslash","latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1" }, 
-{ 249,	"ugrave","latin small letter u with grave, U+00F9 ISOlat1" }, 
-{ 250,	"uacute","latin small letter u with acute, U+00FA ISOlat1" }, 
-{ 251,	"ucirc","latin small letter u with circumflex, U+00FB ISOlat1" }, 
-{ 252,	"uuml",	"latin small letter u with diaeresis, U+00FC ISOlat1" }, 
-{ 253,	"yacute","latin small letter y with acute, U+00FD ISOlat1" }, 
-{ 254,	"thorn","latin small letter thorn with, U+00FE ISOlat1" }, 
-{ 255,	"yuml",	"latin small letter y with diaeresis, U+00FF ISOlat1" }, 
- 
-{ 338,	"OElig","latin capital ligature OE, U+0152 ISOlat2" }, 
-{ 339,	"oelig","latin small ligature oe, U+0153 ISOlat2" }, 
-{ 352,	"Scaron","latin capital letter S with caron, U+0160 ISOlat2" }, 
-{ 353,	"scaron","latin small letter s with caron, U+0161 ISOlat2" }, 
-{ 376,	"Yuml",	"latin capital letter Y with diaeresis, U+0178 ISOlat2" }, 
- 
-/* 
- * Anything below should really be kept as entities references 
- */ 
-{ 402,	"fnof",	"latin small f with hook = function = florin, U+0192 ISOtech" }, 
- 
-{ 710,	"circ",	"modifier letter circumflex accent, U+02C6 ISOpub" }, 
-{ 732,	"tilde","small tilde, U+02DC ISOdia" }, 
- 
-{ 913,	"Alpha","greek capital letter alpha, U+0391" }, 
-{ 914,	"Beta",	"greek capital letter beta, U+0392" }, 
-{ 915,	"Gamma","greek capital letter gamma, U+0393 ISOgrk3" }, 
-{ 916,	"Delta","greek capital letter delta, U+0394 ISOgrk3" }, 
-{ 917,	"Epsilon","greek capital letter epsilon, U+0395" }, 
-{ 918,	"Zeta",	"greek capital letter zeta, U+0396" }, 
-{ 919,	"Eta",	"greek capital letter eta, U+0397" }, 
-{ 920,	"Theta","greek capital letter theta, U+0398 ISOgrk3" }, 
-{ 921,	"Iota",	"greek capital letter iota, U+0399" }, 
-{ 922,	"Kappa","greek capital letter kappa, U+039A" }, 
-{ 923,	"Lambda", "greek capital letter lambda, U+039B ISOgrk3" }, 
-{ 924,	"Mu",	"greek capital letter mu, U+039C" }, 
-{ 925,	"Nu",	"greek capital letter nu, U+039D" }, 
-{ 926,	"Xi",	"greek capital letter xi, U+039E ISOgrk3" }, 
-{ 927,	"Omicron","greek capital letter omicron, U+039F" }, 
-{ 928,	"Pi",	"greek capital letter pi, U+03A0 ISOgrk3" }, 
-{ 929,	"Rho",	"greek capital letter rho, U+03A1" }, 
-{ 931,	"Sigma","greek capital letter sigma, U+03A3 ISOgrk3" }, 
-{ 932,	"Tau",	"greek capital letter tau, U+03A4" }, 
-{ 933,	"Upsilon","greek capital letter upsilon, U+03A5 ISOgrk3" }, 
-{ 934,	"Phi",	"greek capital letter phi, U+03A6 ISOgrk3" }, 
-{ 935,	"Chi",	"greek capital letter chi, U+03A7" }, 
-{ 936,	"Psi",	"greek capital letter psi, U+03A8 ISOgrk3" }, 
-{ 937,	"Omega","greek capital letter omega, U+03A9 ISOgrk3" }, 
- 
-{ 945,	"alpha","greek small letter alpha, U+03B1 ISOgrk3" }, 
-{ 946,	"beta",	"greek small letter beta, U+03B2 ISOgrk3" }, 
-{ 947,	"gamma","greek small letter gamma, U+03B3 ISOgrk3" }, 
-{ 948,	"delta","greek small letter delta, U+03B4 ISOgrk3" }, 
-{ 949,	"epsilon","greek small letter epsilon, U+03B5 ISOgrk3" }, 
-{ 950,	"zeta",	"greek small letter zeta, U+03B6 ISOgrk3" }, 
-{ 951,	"eta",	"greek small letter eta, U+03B7 ISOgrk3" }, 
-{ 952,	"theta","greek small letter theta, U+03B8 ISOgrk3" }, 
-{ 953,	"iota",	"greek small letter iota, U+03B9 ISOgrk3" }, 
-{ 954,	"kappa","greek small letter kappa, U+03BA ISOgrk3" }, 
-{ 955,	"lambda","greek small letter lambda, U+03BB ISOgrk3" }, 
-{ 956,	"mu",	"greek small letter mu, U+03BC ISOgrk3" }, 
-{ 957,	"nu",	"greek small letter nu, U+03BD ISOgrk3" }, 
-{ 958,	"xi",	"greek small letter xi, U+03BE ISOgrk3" }, 
-{ 959,	"omicron","greek small letter omicron, U+03BF NEW" }, 
-{ 960,	"pi",	"greek small letter pi, U+03C0 ISOgrk3" }, 
-{ 961,	"rho",	"greek small letter rho, U+03C1 ISOgrk3" }, 
-{ 962,	"sigmaf","greek small letter final sigma, U+03C2 ISOgrk3" }, 
-{ 963,	"sigma","greek small letter sigma, U+03C3 ISOgrk3" }, 
-{ 964,	"tau",	"greek small letter tau, U+03C4 ISOgrk3" }, 
-{ 965,	"upsilon","greek small letter upsilon, U+03C5 ISOgrk3" }, 
-{ 966,	"phi",	"greek small letter phi, U+03C6 ISOgrk3" }, 
-{ 967,	"chi",	"greek small letter chi, U+03C7 ISOgrk3" }, 
-{ 968,	"psi",	"greek small letter psi, U+03C8 ISOgrk3" }, 
-{ 969,	"omega","greek small letter omega, U+03C9 ISOgrk3" }, 
-{ 977,	"thetasym","greek small letter theta symbol, U+03D1 NEW" }, 
-{ 978,	"upsih","greek upsilon with hook symbol, U+03D2 NEW" }, 
-{ 982,	"piv",	"greek pi symbol, U+03D6 ISOgrk3" }, 
- 
-{ 8194,	"ensp",	"en space, U+2002 ISOpub" }, 
-{ 8195,	"emsp",	"em space, U+2003 ISOpub" }, 
-{ 8201,	"thinsp","thin space, U+2009 ISOpub" }, 
-{ 8204,	"zwnj",	"zero width non-joiner, U+200C NEW RFC 2070" }, 
-{ 8205,	"zwj",	"zero width joiner, U+200D NEW RFC 2070" }, 
-{ 8206,	"lrm",	"left-to-right mark, U+200E NEW RFC 2070" }, 
-{ 8207,	"rlm",	"right-to-left mark, U+200F NEW RFC 2070" }, 
-{ 8211,	"ndash","en dash, U+2013 ISOpub" }, 
-{ 8212,	"mdash","em dash, U+2014 ISOpub" }, 
-{ 8216,	"lsquo","left single quotation mark, U+2018 ISOnum" }, 
-{ 8217,	"rsquo","right single quotation mark, U+2019 ISOnum" }, 
-{ 8218,	"sbquo","single low-9 quotation mark, U+201A NEW" }, 
-{ 8220,	"ldquo","left double quotation mark, U+201C ISOnum" }, 
-{ 8221,	"rdquo","right double quotation mark, U+201D ISOnum" }, 
-{ 8222,	"bdquo","double low-9 quotation mark, U+201E NEW" }, 
-{ 8224,	"dagger","dagger, U+2020 ISOpub" }, 
-{ 8225,	"Dagger","double dagger, U+2021 ISOpub" }, 
- 
-{ 8226,	"bull",	"bullet = black small circle, U+2022 ISOpub" }, 
-{ 8230,	"hellip","horizontal ellipsis = three dot leader, U+2026 ISOpub" }, 
- 
-{ 8240,	"permil","per mille sign, U+2030 ISOtech" }, 
- 
-{ 8242,	"prime","prime = minutes = feet, U+2032 ISOtech" }, 
-{ 8243,	"Prime","double prime = seconds = inches, U+2033 ISOtech" }, 
- 
-{ 8249,	"lsaquo","single left-pointing angle quotation mark, U+2039 ISO proposed" }, 
-{ 8250,	"rsaquo","single right-pointing angle quotation mark, U+203A ISO proposed" }, 
- 
-{ 8254,	"oline","overline = spacing overscore, U+203E NEW" }, 
-{ 8260,	"frasl","fraction slash, U+2044 NEW" }, 
- 
-{ 8364,	"euro",	"euro sign, U+20AC NEW" }, 
- 
-{ 8465,	"image","blackletter capital I = imaginary part, U+2111 ISOamso" }, 
-{ 8472,	"weierp","script capital P = power set = Weierstrass p, U+2118 ISOamso" }, 
-{ 8476,	"real",	"blackletter capital R = real part symbol, U+211C ISOamso" }, 
-{ 8482,	"trade","trade mark sign, U+2122 ISOnum" }, 
-{ 8501,	"alefsym","alef symbol = first transfinite cardinal, U+2135 NEW" }, 
-{ 8592,	"larr",	"leftwards arrow, U+2190 ISOnum" }, 
-{ 8593,	"uarr",	"upwards arrow, U+2191 ISOnum" }, 
-{ 8594,	"rarr",	"rightwards arrow, U+2192 ISOnum" }, 
-{ 8595,	"darr",	"downwards arrow, U+2193 ISOnum" }, 
-{ 8596,	"harr",	"left right arrow, U+2194 ISOamsa" }, 
-{ 8629,	"crarr","downwards arrow with corner leftwards = carriage return, U+21B5 NEW" }, 
-{ 8656,	"lArr",	"leftwards double arrow, U+21D0 ISOtech" }, 
-{ 8657,	"uArr",	"upwards double arrow, U+21D1 ISOamsa" }, 
-{ 8658,	"rArr",	"rightwards double arrow, U+21D2 ISOtech" }, 
-{ 8659,	"dArr",	"downwards double arrow, U+21D3 ISOamsa" }, 
-{ 8660,	"hArr",	"left right double arrow, U+21D4 ISOamsa" }, 
- 
-{ 8704,	"forall","for all, U+2200 ISOtech" }, 
-{ 8706,	"part",	"partial differential, U+2202 ISOtech" }, 
-{ 8707,	"exist","there exists, U+2203 ISOtech" }, 
-{ 8709,	"empty","empty set = null set = diameter, U+2205 ISOamso" }, 
-{ 8711,	"nabla","nabla = backward difference, U+2207 ISOtech" }, 
-{ 8712,	"isin",	"element of, U+2208 ISOtech" }, 
-{ 8713,	"notin","not an element of, U+2209 ISOtech" }, 
-{ 8715,	"ni",	"contains as member, U+220B ISOtech" }, 
-{ 8719,	"prod",	"n-ary product = product sign, U+220F ISOamsb" }, 
-{ 8721,	"sum",	"n-ary summation, U+2211 ISOamsb" }, 
-{ 8722,	"minus","minus sign, U+2212 ISOtech" }, 
-{ 8727,	"lowast","asterisk operator, U+2217 ISOtech" }, 
-{ 8730,	"radic","square root = radical sign, U+221A ISOtech" }, 
-{ 8733,	"prop",	"proportional to, U+221D ISOtech" }, 
-{ 8734,	"infin","infinity, U+221E ISOtech" }, 
-{ 8736,	"ang",	"angle, U+2220 ISOamso" }, 
-{ 8743,	"and",	"logical and = wedge, U+2227 ISOtech" }, 
-{ 8744,	"or",	"logical or = vee, U+2228 ISOtech" }, 
-{ 8745,	"cap",	"intersection = cap, U+2229 ISOtech" }, 
-{ 8746,	"cup",	"union = cup, U+222A ISOtech" }, 
-{ 8747,	"int",	"integral, U+222B ISOtech" }, 
-{ 8756,	"there4","therefore, U+2234 ISOtech" }, 
-{ 8764,	"sim",	"tilde operator = varies with = similar to, U+223C ISOtech" }, 
-{ 8773,	"cong",	"approximately equal to, U+2245 ISOtech" }, 
-{ 8776,	"asymp","almost equal to = asymptotic to, U+2248 ISOamsr" }, 
-{ 8800,	"ne",	"not equal to, U+2260 ISOtech" }, 
-{ 8801,	"equiv","identical to, U+2261 ISOtech" }, 
-{ 8804,	"le",	"less-than or equal to, U+2264 ISOtech" }, 
-{ 8805,	"ge",	"greater-than or equal to, U+2265 ISOtech" }, 
-{ 8834,	"sub",	"subset of, U+2282 ISOtech" }, 
-{ 8835,	"sup",	"superset of, U+2283 ISOtech" }, 
-{ 8836,	"nsub",	"not a subset of, U+2284 ISOamsn" }, 
-{ 8838,	"sube",	"subset of or equal to, U+2286 ISOtech" }, 
-{ 8839,	"supe",	"superset of or equal to, U+2287 ISOtech" }, 
-{ 8853,	"oplus","circled plus = direct sum, U+2295 ISOamsb" }, 
-{ 8855,	"otimes","circled times = vector product, U+2297 ISOamsb" }, 
-{ 8869,	"perp",	"up tack = orthogonal to = perpendicular, U+22A5 ISOtech" }, 
-{ 8901,	"sdot",	"dot operator, U+22C5 ISOamsb" }, 
-{ 8968,	"lceil","left ceiling = apl upstile, U+2308 ISOamsc" }, 
-{ 8969,	"rceil","right ceiling, U+2309 ISOamsc" }, 
-{ 8970,	"lfloor","left floor = apl downstile, U+230A ISOamsc" }, 
-{ 8971,	"rfloor","right floor, U+230B ISOamsc" }, 
-{ 9001,	"lang",	"left-pointing angle bracket = bra, U+2329 ISOtech" }, 
-{ 9002,	"rang",	"right-pointing angle bracket = ket, U+232A ISOtech" }, 
-{ 9674,	"loz",	"lozenge, U+25CA ISOpub" }, 
- 
-{ 9824,	"spades","black spade suit, U+2660 ISOpub" }, 
-{ 9827,	"clubs","black club suit = shamrock, U+2663 ISOpub" }, 
-{ 9829,	"hearts","black heart suit = valentine, U+2665 ISOpub" }, 
-{ 9830,	"diams","black diamond suit, U+2666 ISOpub" }, 
- 
-}; 
- 
-/************************************************************************ 
- *									* 
- *		Commodity functions to handle entities			* 
- *									* 
- ************************************************************************/ 
- 
-/* 
- * Macro used to grow the current buffer. 
- */ 
-#define growBuffer(buffer) {						\ 
-    xmlChar *tmp;							\ 
-    buffer##_size *= 2;							\ 
-    tmp = (xmlChar *) xmlRealloc(buffer, buffer##_size * sizeof(xmlChar)); \ 
-    if (tmp == NULL) {						\ 
-	htmlErrMemory(ctxt, "growing buffer\n");			\ 
-	xmlFree(buffer);						\ 
-	return(NULL);							\ 
-    }									\ 
-    buffer = tmp;							\ 
-} 
- 
-/** 
- * htmlEntityLookup: 
- * @name: the entity name 
- * 
- * Lookup the given entity in EntitiesTable 
- * 
- * TODO: the linear scan is really ugly, an hash table is really needed. 
- * 
- * Returns the associated htmlEntityDescPtr if found, NULL otherwise. 
- */ 
-const htmlEntityDesc * 
-htmlEntityLookup(const xmlChar *name) { 
-    unsigned int i; 
- 
-    for (i = 0;i < (sizeof(html40EntitiesTable)/ 
-                    sizeof(html40EntitiesTable[0]));i++) { 
-        if (xmlStrEqual(name, BAD_CAST html40EntitiesTable[i].name)) { 
-            return((htmlEntityDescPtr) &html40EntitiesTable[i]); 
-	} 
-    } 
-    return(NULL); 
-} 
- 
-/** 
- * htmlEntityValueLookup: 
- * @value: the entity's unicode value 
- * 
- * Lookup the given entity in EntitiesTable 
- * 
- * TODO: the linear scan is really ugly, an hash table is really needed. 
- * 
- * Returns the associated htmlEntityDescPtr if found, NULL otherwise. 
- */ 
-const htmlEntityDesc * 
-htmlEntityValueLookup(unsigned int value) { 
-    unsigned int i; 
- 
-    for (i = 0;i < (sizeof(html40EntitiesTable)/ 
-                    sizeof(html40EntitiesTable[0]));i++) { 
-        if (html40EntitiesTable[i].value >= value) { 
-	    if (html40EntitiesTable[i].value > value) 
-		break; 
-            return((htmlEntityDescPtr) &html40EntitiesTable[i]); 
-	} 
-    } 
-    return(NULL); 
-} 
- 
-/** 
- * UTF8ToHtml: 
- * @out:  a pointer to an array of bytes to store the result 
- * @outlen:  the length of @out 
- * @in:  a pointer to an array of UTF-8 chars 
- * @inlen:  the length of @in 
- * 
- * Take a block of UTF-8 chars in and try to convert it to an ASCII 
- * plus HTML entities block of chars out. 
- * 
- * Returns 0 if success, -2 if the transcoding fails, or -1 otherwise 
- * The value of @inlen after return is the number of octets consumed 
- *     as the return value is positive, else unpredictable. 
- * The value of @outlen after return is the number of octets consumed. 
- */ 
-int 
-UTF8ToHtml(unsigned char* out, int *outlen, 
-              const unsigned char* in, int *inlen) { 
-    const unsigned char* processed = in; 
-    const unsigned char* outend; 
-    const unsigned char* outstart = out; 
-    const unsigned char* instart = in; 
-    const unsigned char* inend; 
-    unsigned int c, d; 
-    int trailing; 
- 
-    if ((out == NULL) || (outlen == NULL) || (inlen == NULL)) return(-1); 
-    if (in == NULL) { 
-        /* 
-	 * initialization nothing to do 
-	 */ 
-	*outlen = 0; 
-	*inlen = 0; 
-	return(0); 
-    } 
-    inend = in + (*inlen); 
-    outend = out + (*outlen); 
-    while (in < inend) { 
-	d = *in++; 
-	if      (d < 0x80)  { c= d; trailing= 0; } 
-	else if (d < 0xC0) { 
-	    /* trailing byte in leading position */ 
-	    *outlen = out - outstart; 
-	    *inlen = processed - instart; 
-	    return(-2); 
-        } else if (d < 0xE0)  { c= d & 0x1F; trailing= 1; } 
-        else if (d < 0xF0)  { c= d & 0x0F; trailing= 2; } 
-        else if (d < 0xF8)  { c= d & 0x07; trailing= 3; } 
-	else { 
-	    /* no chance for this in Ascii */ 
-	    *outlen = out - outstart; 
-	    *inlen = processed - instart; 
-	    return(-2); 
-	} 
- 
-	if (inend - in < trailing) { 
-	    break; 
-	} 
- 
-	for ( ; trailing; trailing--) { 
-	    if ((in >= inend) || (((d= *in++) & 0xC0) != 0x80)) 
-		break; 
-	    c <<= 6; 
-	    c |= d & 0x3F; 
-	} 
- 
-	/* assertion: c is a single UTF-4 value */ 
-	if (c < 0x80) { 
-	    if (out + 1 >= outend) 
-		break; 
-	    *out++ = c; 
-	} else { 
-	    int len; 
-	    const htmlEntityDesc * ent; 
-	    const char *cp; 
-	    char nbuf[16]; 
- 
-	    /* 
-	     * Try to lookup a predefined HTML entity for it 
-	     */ 
- 
-	    ent = htmlEntityValueLookup(c); 
-	    if (ent == NULL) { 
-	      snprintf(nbuf, sizeof(nbuf), "#%u", c); 
-	      cp = nbuf; 
-	    } 
-	    else 
-	      cp = ent->name; 
-	    len = strlen(cp); 
-	    if (out + 2 + len >= outend) 
-		break; 
-	    *out++ = '&'; 
-	    memcpy(out, cp, len); 
-	    out += len; 
-	    *out++ = ';'; 
-	} 
-	processed = in; 
-    } 
-    *outlen = out - outstart; 
-    *inlen = processed - instart; 
-    return(0); 
-} 
- 
-/** 
- * htmlEncodeEntities: 
- * @out:  a pointer to an array of bytes to store the result 
- * @outlen:  the length of @out 
- * @in:  a pointer to an array of UTF-8 chars 
- * @inlen:  the length of @in 
- * @quoteChar: the quote character to escape (' or ") or zero. 
- * 
- * Take a block of UTF-8 chars in and try to convert it to an ASCII 
- * plus HTML entities block of chars out. 
- * 
- * Returns 0 if success, -2 if the transcoding fails, or -1 otherwise 
- * The value of @inlen after return is the number of octets consumed 
- *     as the return value is positive, else unpredictable. 
- * The value of @outlen after return is the number of octets consumed. 
- */ 
-int 
-htmlEncodeEntities(unsigned char* out, int *outlen, 
-		   const unsigned char* in, int *inlen, int quoteChar) { 
-    const unsigned char* processed = in; 
-    const unsigned char* outend; 
-    const unsigned char* outstart = out; 
-    const unsigned char* instart = in; 
-    const unsigned char* inend; 
-    unsigned int c, d; 
-    int trailing; 
- 
-    if ((out == NULL) || (outlen == NULL) || (inlen == NULL) || (in == NULL)) 
-        return(-1); 
-    outend = out + (*outlen); 
-    inend = in + (*inlen); 
-    while (in < inend) { 
-	d = *in++; 
-	if      (d < 0x80)  { c= d; trailing= 0; } 
-	else if (d < 0xC0) { 
-	    /* trailing byte in leading position */ 
-	    *outlen = out - outstart; 
-	    *inlen = processed - instart; 
-	    return(-2); 
-        } else if (d < 0xE0)  { c= d & 0x1F; trailing= 1; } 
-        else if (d < 0xF0)  { c= d & 0x0F; trailing= 2; } 
-        else if (d < 0xF8)  { c= d & 0x07; trailing= 3; } 
-	else { 
-	    /* no chance for this in Ascii */ 
-	    *outlen = out - outstart; 
-	    *inlen = processed - instart; 
-	    return(-2); 
-	} 
- 
-	if (inend - in < trailing) 
-	    break; 
- 
-	while (trailing--) { 
-	    if (((d= *in++) & 0xC0) != 0x80) { 
-		*outlen = out - outstart; 
-		*inlen = processed - instart; 
-		return(-2); 
-	    } 
-	    c <<= 6; 
-	    c |= d & 0x3F; 
-	} 
- 
-	/* assertion: c is a single UTF-4 value */ 
-	if ((c < 0x80) && (c != (unsigned int) quoteChar) && 
-	    (c != '&') && (c != '<') && (c != '>')) { 
-	    if (out >= outend) 
-		break; 
-	    *out++ = c; 
-	} else { 
-	    const htmlEntityDesc * ent; 
-	    const char *cp; 
-	    char nbuf[16]; 
-	    int len; 
- 
-	    /* 
-	     * Try to lookup a predefined HTML entity for it 
-	     */ 
-	    ent = htmlEntityValueLookup(c); 
-	    if (ent == NULL) { 
-		snprintf(nbuf, sizeof(nbuf), "#%u", c); 
-		cp = nbuf; 
-	    } 
-	    else 
-		cp = ent->name; 
-	    len = strlen(cp); 
-	    if (out + 2 + len > outend) 
-		break; 
-	    *out++ = '&'; 
-	    memcpy(out, cp, len); 
-	    out += len; 
-	    *out++ = ';'; 
-	} 
-	processed = in; 
-    } 
-    *outlen = out - outstart; 
-    *inlen = processed - instart; 
-    return(0); 
-} 
- 
-/************************************************************************ 
- *									* 
- *		Commodity functions to handle streams			* 
- *									* 
- ************************************************************************/ 
- 
-#ifdef LIBXML_PUSH_ENABLED
-/** 
- * htmlNewInputStream: 
- * @ctxt:  an HTML parser context 
- * 
- * Create a new input stream structure 
- * Returns the new input stream or NULL 
- */ 
-static htmlParserInputPtr 
-htmlNewInputStream(htmlParserCtxtPtr ctxt) { 
-    htmlParserInputPtr input; 
- 
-    input = (xmlParserInputPtr) xmlMalloc(sizeof(htmlParserInput)); 
-    if (input == NULL) { 
-        htmlErrMemory(ctxt, "couldn't allocate a new input stream\n"); 
-	return(NULL); 
-    } 
-    memset(input, 0, sizeof(htmlParserInput)); 
-    input->filename = NULL; 
-    input->directory = NULL; 
-    input->base = NULL; 
-    input->cur = NULL; 
-    input->buf = NULL; 
-    input->line = 1; 
-    input->col = 1; 
-    input->buf = NULL; 
-    input->free = NULL; 
-    input->version = NULL; 
-    input->consumed = 0; 
-    input->length = 0; 
-    return(input); 
-} 
-#endif
- 
- 
-/************************************************************************ 
- *									* 
- *		Commodity functions, cleanup needed ?			* 
- *									* 
- ************************************************************************/ 
-/* 
- * all tags allowing pc data from the html 4.01 loose dtd 
- * NOTE: it might be more appropriate to integrate this information
- * into the html40ElementTable array but I don't want to risk any 
- * binary incompatibility
- */ 
-static const char *allowPCData[] = { 
-    "a", "abbr", "acronym", "address", "applet", "b", "bdo", "big", 
-    "blockquote", "body", "button", "caption", "center", "cite", "code", 
-    "dd", "del", "dfn", "div", "dt", "em", "font", "form", "h1", "h2", 
-    "h3", "h4", "h5", "h6", "i", "iframe", "ins", "kbd", "label", "legend", 
-    "li", "noframes", "noscript", "object", "p", "pre", "q", "s", "samp", 
-    "small", "span", "strike", "strong", "td", "th", "tt", "u", "var" 
-}; 
- 
-/** 
- * areBlanks: 
- * @ctxt:  an HTML parser context 
- * @str:  a xmlChar * 
- * @len:  the size of @str 
- * 
- * Is this a sequence of blank chars that one can ignore ? 
- * 
- * Returns 1 if ignorable 0 otherwise. 
- */ 
- 
-static int areBlanks(htmlParserCtxtPtr ctxt, const xmlChar *str, int len) { 
-    unsigned int i; 
-    int j; 
-    xmlNodePtr lastChild; 
-    xmlDtdPtr dtd; 
- 
-    for (j = 0;j < len;j++) 
-        if (!(IS_BLANK_CH(str[j]))) return(0); 
- 
-    if (CUR == 0) return(1); 
-    if (CUR != '<') return(0); 
-    if (ctxt->name == NULL) 
-	return(1); 
-    if (xmlStrEqual(ctxt->name, BAD_CAST"html")) 
-	return(1); 
-    if (xmlStrEqual(ctxt->name, BAD_CAST"head")) 
-	return(1); 
- 
-    /* Only strip CDATA children of the body tag for strict HTML DTDs */ 
-    if (xmlStrEqual(ctxt->name, BAD_CAST "body") && ctxt->myDoc != NULL) { 
-        dtd = xmlGetIntSubset(ctxt->myDoc); 
-        if (dtd != NULL && dtd->ExternalID != NULL) { 
-            if (!xmlStrcasecmp(dtd->ExternalID, BAD_CAST "-//W3C//DTD HTML 4.01//EN") || 
-                    !xmlStrcasecmp(dtd->ExternalID, BAD_CAST "-//W3C//DTD HTML 4//EN")) 
-                return(1); 
-        } 
-    } 
- 
-    if (ctxt->node == NULL) return(0); 
-    lastChild = xmlGetLastChild(ctxt->node); 
-    while ((lastChild) && (lastChild->type == XML_COMMENT_NODE)) 
-	lastChild = lastChild->prev; 
-    if (lastChild == NULL) { 
-        if ((ctxt->node->type != XML_ELEMENT_NODE) && 
-            (ctxt->node->content != NULL)) return(0); 
-	/* keep ws in constructs like ...<b> </b>... 
-	   for all tags "b" allowing PCDATA */ 
-	for ( i = 0; i < sizeof(allowPCData)/sizeof(allowPCData[0]); i++ ) { 
-	    if ( xmlStrEqual(ctxt->name, BAD_CAST allowPCData[i]) ) { 
-		return(0); 
-	    } 
-	} 
-    } else if (xmlNodeIsText(lastChild)) { 
-        return(0); 
-    } else { 
-	/* keep ws in constructs like <p><b>xy</b> <i>z</i><p> 
-	   for all tags "p" allowing PCDATA */ 
-	for ( i = 0; i < sizeof(allowPCData)/sizeof(allowPCData[0]); i++ ) { 
-	    if ( xmlStrEqual(lastChild->name, BAD_CAST allowPCData[i]) ) { 
-		return(0); 
-	    } 
-	} 
-    } 
-    return(1); 
-} 
- 
-/** 
- * htmlNewDocNoDtD: 
- * @URI:  URI for the dtd, or NULL 
- * @ExternalID:  the external ID of the DTD, or NULL 
- * 
- * Creates a new HTML document without a DTD node if @URI and @ExternalID 
- * are NULL 
- * 
- * Returns a new document, do not initialize the DTD if not provided 
- */ 
-htmlDocPtr 
-htmlNewDocNoDtD(const xmlChar *URI, const xmlChar *ExternalID) { 
-    xmlDocPtr cur; 
- 
-    /* 
-     * Allocate a new document and fill the fields. 
-     */ 
-    cur = (xmlDocPtr) xmlMalloc(sizeof(xmlDoc)); 
-    if (cur == NULL) { 
-	htmlErrMemory(NULL, "HTML document creation failed\n"); 
-	return(NULL); 
-    } 
-    memset(cur, 0, sizeof(xmlDoc)); 
- 
-    cur->type = XML_HTML_DOCUMENT_NODE; 
-    cur->version = NULL; 
-    cur->intSubset = NULL; 
-    cur->doc = cur; 
-    cur->name = NULL; 
-    cur->children = NULL; 
-    cur->extSubset = NULL; 
-    cur->oldNs = NULL; 
-    cur->encoding = NULL; 
-    cur->standalone = 1; 
-    cur->compression = 0; 
-    cur->ids = NULL; 
-    cur->refs = NULL; 
-    cur->_private = NULL; 
-    cur->charset = XML_CHAR_ENCODING_UTF8; 
-    cur->properties = XML_DOC_HTML | XML_DOC_USERBUILT; 
-    if ((ExternalID != NULL) || 
-	(URI != NULL)) 
-	xmlCreateIntSubset(cur, BAD_CAST "html", ExternalID, URI); 
-    return(cur); 
-} 
- 
-/** 
- * htmlNewDoc: 
- * @URI:  URI for the dtd, or NULL 
- * @ExternalID:  the external ID of the DTD, or NULL 
- * 
- * Creates a new HTML document 
- * 
- * Returns a new document 
- */ 
-htmlDocPtr 
-htmlNewDoc(const xmlChar *URI, const xmlChar *ExternalID) { 
-    if ((URI == NULL) && (ExternalID == NULL)) 
-	return(htmlNewDocNoDtD( 
-		    BAD_CAST "http://www.w3.org/TR/REC-html40/loose.dtd", 
-		    BAD_CAST "-//W3C//DTD HTML 4.0 Transitional//EN")); 
- 
-    return(htmlNewDocNoDtD(URI, ExternalID)); 
-} 
- 
- 
-/************************************************************************ 
- *									* 
- *			The parser itself				* 
- *	Relates to http://www.w3.org/TR/html40				* 
- *									* 
- ************************************************************************/ 
- 
-/************************************************************************ 
- *									* 
- *			The parser itself				* 
- *									* 
- ************************************************************************/ 
- 
-static const xmlChar * htmlParseNameComplex(xmlParserCtxtPtr ctxt); 
- 
-/** 
- * htmlParseHTMLName: 
- * @ctxt:  an HTML parser context 
- * 
- * parse an HTML tag or attribute name, note that we convert it to lowercase 
- * since HTML names are not case-sensitive. 
- * 
- * Returns the Tag Name parsed or NULL 
- */ 
- 
-static const xmlChar * 
-htmlParseHTMLName(htmlParserCtxtPtr ctxt) { 
-    int i = 0; 
-    xmlChar loc[HTML_PARSER_BUFFER_SIZE]; 
- 
-    if (!IS_ASCII_LETTER(CUR) && (CUR != '_') && 
-        (CUR != ':') && (CUR != '.')) return(NULL); 
- 
-    while ((i < HTML_PARSER_BUFFER_SIZE) && 
-           ((IS_ASCII_LETTER(CUR)) || (IS_ASCII_DIGIT(CUR)) || 
-	   (CUR == ':') || (CUR == '-') || (CUR == '_') || 
-           (CUR == '.'))) { 
-	if ((CUR >= 'A') && (CUR <= 'Z')) loc[i] = CUR + 0x20; 
-        else loc[i] = CUR; 
-	i++; 
- 
-	NEXT; 
-    } 
- 
-    return(xmlDictLookup(ctxt->dict, loc, i)); 
-} 
- 
- 
-/** 
- * htmlParseHTMLName_nonInvasive: 
- * @ctxt:  an HTML parser context 
- * 
- * parse an HTML tag or attribute name, note that we convert it to lowercase 
- * since HTML names are not case-sensitive, this doesn't consume the data 
- * from the stream, it's a look-ahead 
- * 
- * Returns the Tag Name parsed or NULL 
- */ 
- 
-static const xmlChar * 
-htmlParseHTMLName_nonInvasive(htmlParserCtxtPtr ctxt) { 
-    int i = 0; 
-    xmlChar loc[HTML_PARSER_BUFFER_SIZE]; 
- 
-    if (!IS_ASCII_LETTER(NXT(1)) && (NXT(1) != '_') && 
-        (NXT(1) != ':')) return(NULL); 
- 
-    while ((i < HTML_PARSER_BUFFER_SIZE) && 
-           ((IS_ASCII_LETTER(NXT(1+i))) || (IS_ASCII_DIGIT(NXT(1+i))) || 
-	   (NXT(1+i) == ':') || (NXT(1+i) == '-') || (NXT(1+i) == '_'))) { 
-	if ((NXT(1+i) >= 'A') && (NXT(1+i) <= 'Z')) loc[i] = NXT(1+i) + 0x20; 
-        else loc[i] = NXT(1+i); 
-	i++; 
-    } 
- 
-    return(xmlDictLookup(ctxt->dict, loc, i)); 
-} 
- 
- 
-/** 
- * htmlParseName: 
- * @ctxt:  an HTML parser context 
- * 
- * parse an HTML name, this routine is case sensitive. 
- * 
- * Returns the Name parsed or NULL 
- */ 
- 
-static const xmlChar * 
-htmlParseName(htmlParserCtxtPtr ctxt) { 
-    const xmlChar *in; 
-    const xmlChar *ret; 
-    int count = 0; 
- 
-    GROW; 
- 
-    /* 
-     * Accelerator for simple ASCII names 
-     */ 
-    in = ctxt->input->cur; 
-    if (((*in >= 0x61) && (*in <= 0x7A)) || 
-	((*in >= 0x41) && (*in <= 0x5A)) || 
-	(*in == '_') || (*in == ':')) { 
-	in++; 
-	while (((*in >= 0x61) && (*in <= 0x7A)) || 
-	       ((*in >= 0x41) && (*in <= 0x5A)) || 
-	       ((*in >= 0x30) && (*in <= 0x39)) || 
-	       (*in == '_') || (*in == '-') || 
-	       (*in == ':') || (*in == '.')) 
-	    in++; 
 
-	if (in == ctxt->input->end)
-	    return(NULL);
+/* #define CUR (ctxt->token ? ctxt->token : (int) (*ctxt->input->cur)) */
+#define CUR ((int) (*ctxt->input->cur))
+#define NEXT xmlNextChar(ctxt)
 
-	if ((*in > 0) && (*in < 0x80)) { 
-	    count = in - ctxt->input->cur; 
-	    ret = xmlDictLookup(ctxt->dict, ctxt->input->cur, count); 
-	    ctxt->input->cur = in; 
-	    ctxt->nbChars += count; 
-	    ctxt->input->col += count; 
-	    return(ret); 
-	} 
-    } 
-    return(htmlParseNameComplex(ctxt)); 
-} 
- 
-static const xmlChar * 
-htmlParseNameComplex(xmlParserCtxtPtr ctxt) { 
-    int len = 0, l; 
-    int c; 
-    int count = 0; 
-    const xmlChar *base = ctxt->input->base;
- 
-    /* 
-     * Handler for more complex cases 
-     */ 
-    GROW; 
-    c = CUR_CHAR(l); 
-    if ((c == ' ') || (c == '>') || (c == '/') || /* accelerators */ 
-	(!IS_LETTER(c) && (c != '_') && 
-         (c != ':'))) { 
-	return(NULL); 
-    } 
- 
-    while ((c != ' ') && (c != '>') && (c != '/') && /* test bigname.xml */ 
-	   ((IS_LETTER(c)) || (IS_DIGIT(c)) || 
-            (c == '.') || (c == '-') || 
-	    (c == '_') || (c == ':') || 
-	    (IS_COMBINING(c)) || 
-	    (IS_EXTENDER(c)))) { 
-	if (count++ > 100) { 
-	    count = 0; 
-	    GROW; 
-	} 
-	len += l; 
-	NEXTL(l); 
-	c = CUR_CHAR(l); 
-	if (ctxt->input->base != base) {
-	    /*
-	     * We changed encoding from an unknown encoding
-	     * Input buffer changed location, so we better start again
-	     */
-	    return(htmlParseNameComplex(ctxt));
+#define RAW (ctxt->token ? -1 : (*ctxt->input->cur))
+
+
+#define NEXTL(l) do {							\
+    if (*(ctxt->input->cur) == '\n') {					\
+	ctxt->input->line++; ctxt->input->col = 1;			\
+    } else ctxt->input->col++;						\
+    ctxt->token = 0; ctxt->input->cur += l; ctxt->nbChars++;		\
+  } while (0)
+
+/************
+    \
+    if (*ctxt->input->cur == '%') xmlParserHandlePEReference(ctxt);	\
+    if (*ctxt->input->cur == '&') xmlParserHandleReference(ctxt);
+ ************/
+
+#define CUR_CHAR(l) htmlCurrentChar(ctxt, &l)
+#define CUR_SCHAR(s, l) xmlStringCurrentChar(ctxt, s, &l)
+
+#define COPY_BUF(l,b,i,v)						\
+    if (l == 1) b[i++] = (xmlChar) v;					\
+    else i += xmlCopyChar(l,&b[i],v)
+
+/**
+ * htmlFindEncoding:
+ * @the HTML parser context
+ *
+ * Ty to find and encoding in the current data available in the input
+ * buffer this is needed to try to switch to the proper encoding when
+ * one face a character error.
+ * That's an heuristic, since it's operating outside of parsing it could
+ * try to use a meta which had been commented out, that's the reason it
+ * should only be used in case of error, not as a default.
+ *
+ * Returns an encoding string or NULL if not found, the string need to
+ *   be freed
+ */
+static xmlChar *
+htmlFindEncoding(xmlParserCtxtPtr ctxt) {
+    const xmlChar *start, *cur, *end;
+
+    if ((ctxt == NULL) || (ctxt->input == NULL) ||
+        (ctxt->input->encoding != NULL) || (ctxt->input->buf == NULL) ||
+        (ctxt->input->buf->encoder != NULL))
+        return(NULL);
+    if ((ctxt->input->cur == NULL) || (ctxt->input->end == NULL))
+        return(NULL);
+
+    start = ctxt->input->cur;
+    end = ctxt->input->end;
+    /* we also expect the input buffer to be zero terminated */
+    if (*end != 0)
+        return(NULL);
+
+    cur = xmlStrcasestr(start, BAD_CAST "HTTP-EQUIV");
+    if (cur == NULL)
+        return(NULL);
+    cur = xmlStrcasestr(cur, BAD_CAST  "CONTENT");
+    if (cur == NULL)
+        return(NULL);
+    cur = xmlStrcasestr(cur, BAD_CAST  "CHARSET=");
+    if (cur == NULL)
+        return(NULL);
+    cur += 8;
+    start = cur;
+    while (((*cur >= 'A') && (*cur <= 'Z')) ||
+           ((*cur >= 'a') && (*cur <= 'z')) ||
+           ((*cur >= '0') && (*cur <= '9')) ||
+           (*cur == '-') || (*cur == '_') || (*cur == ':') || (*cur == '/'))
+           cur++;
+    if (cur == start)
+        return(NULL);
+    return(xmlStrndup(start, cur - start));
+}
+
+/**
+ * htmlCurrentChar:
+ * @ctxt:  the HTML parser context
+ * @len:  pointer to the length of the char read
+ *
+ * The current char value, if using UTF-8 this may actually span multiple
+ * bytes in the input buffer. Implement the end of line normalization:
+ * 2.11 End-of-Line Handling
+ * If the encoding is unspecified, in the case we find an ISO-Latin-1
+ * char, then the encoding converter is plugged in automatically.
+ *
+ * Returns the current char value and its length
+ */
+
+static int
+htmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
+    if (ctxt->instate == XML_PARSER_EOF)
+	return(0);
+
+    if (ctxt->token != 0) {
+	*len = 0;
+	return(ctxt->token);
+    }
+    if (ctxt->charset == XML_CHAR_ENCODING_UTF8) {
+	/*
+	 * We are supposed to handle UTF8, check it's valid
+	 * From rfc2044: encoding of the Unicode values on UTF-8:
+	 *
+	 * UCS-4 range (hex.)           UTF-8 octet sequence (binary)
+	 * 0000 0000-0000 007F   0xxxxxxx
+	 * 0000 0080-0000 07FF   110xxxxx 10xxxxxx
+	 * 0000 0800-0000 FFFF   1110xxxx 10xxxxxx 10xxxxxx
+	 *
+	 * Check for the 0x110000 limit too
+	 */
+	const unsigned char *cur = ctxt->input->cur;
+	unsigned char c;
+	unsigned int val;
+
+	c = *cur;
+	if (c & 0x80) {
+	    if (cur[1] == 0) {
+		xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
+                cur = ctxt->input->cur;
+            }
+	    if ((cur[1] & 0xc0) != 0x80)
+		goto encoding_error;
+	    if ((c & 0xe0) == 0xe0) {
+
+		if (cur[2] == 0) {
+		    xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
+                    cur = ctxt->input->cur;
+                }
+		if ((cur[2] & 0xc0) != 0x80)
+		    goto encoding_error;
+		if ((c & 0xf0) == 0xf0) {
+		    if (cur[3] == 0) {
+			xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
+                        cur = ctxt->input->cur;
+                    }
+		    if (((c & 0xf8) != 0xf0) ||
+			((cur[3] & 0xc0) != 0x80))
+			goto encoding_error;
+		    /* 4-byte code */
+		    *len = 4;
+		    val = (cur[0] & 0x7) << 18;
+		    val |= (cur[1] & 0x3f) << 12;
+		    val |= (cur[2] & 0x3f) << 6;
+		    val |= cur[3] & 0x3f;
+		} else {
+		  /* 3-byte code */
+		    *len = 3;
+		    val = (cur[0] & 0xf) << 12;
+		    val |= (cur[1] & 0x3f) << 6;
+		    val |= cur[2] & 0x3f;
+		}
+	    } else {
+	      /* 2-byte code */
+		*len = 2;
+		val = (cur[0] & 0x1f) << 6;
+		val |= cur[1] & 0x3f;
+	    }
+	    if (!IS_CHAR(val)) {
+	        htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
+				"Char 0x%X out of allowed range\n", val);
+	    }
+	    return(val);
+	} else {
+            if ((*ctxt->input->cur == 0) &&
+                (ctxt->input->cur < ctxt->input->end)) {
+                    htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
+				"Char 0x%X out of allowed range\n", 0);
+                *len = 1;
+                return(' ');
+            }
+	    /* 1-byte code */
+	    *len = 1;
+	    return((int) *ctxt->input->cur);
 	}
-    } 
+    }
+    /*
+     * Assume it's a fixed length encoding (1) with
+     * a compatible encoding for the ASCII set, since
+     * XML constructs only use < 128 chars
+     */
+    *len = 1;
+    if ((int) *ctxt->input->cur < 0x80)
+	return((int) *ctxt->input->cur);
 
-    if (ctxt->input->cur - ctxt->input->base < len) {
-        /* Sanity check */
-	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
-                     "unexpected change of input buffer", NULL, NULL);
-        return (NULL);
+    /*
+     * Humm this is bad, do an automatic flow conversion
+     */
+    {
+        xmlChar * guess;
+        xmlCharEncodingHandlerPtr handler;
+
+        guess = htmlFindEncoding(ctxt);
+        if (guess == NULL) {
+            xmlSwitchEncoding(ctxt, XML_CHAR_ENCODING_8859_1);
+        } else {
+            if (ctxt->input->encoding != NULL)
+                xmlFree((xmlChar *) ctxt->input->encoding);
+            ctxt->input->encoding = guess;
+            handler = xmlFindCharEncodingHandler((const char *) guess);
+            if (handler != NULL) {
+                xmlSwitchToEncoding(ctxt, handler);
+            } else {
+                htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
+                             "Unsupported encoding %s", guess, NULL);
+            }
+        }
+        ctxt->charset = XML_CHAR_ENCODING_UTF8;
     }
 
-    return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len)); 
-} 
- 
- 
-/** 
- * htmlParseHTMLAttribute: 
- * @ctxt:  an HTML parser context 
- * @stop:  a char stop value 
- * 
- * parse an HTML attribute value till the stop (quote), if 
- * stop is 0 then it stops at the first space 
- * 
- * Returns the attribute parsed or NULL 
- */ 
- 
-static xmlChar * 
-htmlParseHTMLAttribute(htmlParserCtxtPtr ctxt, const xmlChar stop) { 
-    xmlChar *buffer = NULL; 
-    int buffer_size = 0; 
-    xmlChar *out = NULL; 
-    const xmlChar *name = NULL; 
-    const xmlChar *cur = NULL; 
-    const htmlEntityDesc * ent; 
- 
-    /* 
-     * allocate a translation buffer. 
-     */ 
-    buffer_size = HTML_PARSER_BUFFER_SIZE; 
-    buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar)); 
-    if (buffer == NULL) { 
-	htmlErrMemory(ctxt, "buffer allocation failed\n"); 
-	return(NULL); 
-    } 
-    out = buffer; 
- 
-    /* 
-     * Ok loop until we reach one of the ending chars 
-     */ 
-    while ((CUR != 0) && (CUR != stop)) { 
-	if ((stop == 0) && (CUR == '>')) break; 
-	if ((stop == 0) && (IS_BLANK_CH(CUR))) break; 
-        if (CUR == '&') { 
-	    if (NXT(1) == '#') { 
-		unsigned int c; 
-		int bits; 
- 
-		c = htmlParseCharRef(ctxt); 
-		if      (c <    0x80) 
-		        { *out++  = c;                bits= -6; } 
-		else if (c <   0x800) 
-		        { *out++  =((c >>  6) & 0x1F) | 0xC0;  bits=  0; } 
-		else if (c < 0x10000) 
-		        { *out++  =((c >> 12) & 0x0F) | 0xE0;  bits=  6; } 
-		else 
-		        { *out++  =((c >> 18) & 0x07) | 0xF0;  bits= 12; } 
- 
-		for ( ; bits >= 0; bits-= 6) { 
-		    *out++  = ((c >> bits) & 0x3F) | 0x80; 
-		} 
- 
-		if (out - buffer > buffer_size - 100) { 
-			int indx = out - buffer; 
- 
-			growBuffer(buffer); 
-			out = &buffer[indx]; 
-		} 
-	    } else { 
-		ent = htmlParseEntityRef(ctxt, &name); 
-		if (name == NULL) { 
-		    *out++ = '&'; 
-		    if (out - buffer > buffer_size - 100) { 
-			int indx = out - buffer; 
- 
-			growBuffer(buffer); 
-			out = &buffer[indx]; 
-		    } 
-		} else if (ent == NULL) { 
-		    *out++ = '&'; 
-		    cur = name; 
-		    while (*cur != 0) { 
-			if (out - buffer > buffer_size - 100) { 
-			    int indx = out - buffer; 
- 
-			    growBuffer(buffer); 
-			    out = &buffer[indx]; 
-			} 
-			*out++ = *cur++; 
-		    } 
-		} else { 
-		    unsigned int c; 
-		    int bits; 
- 
-		    if (out - buffer > buffer_size - 100) { 
-			int indx = out - buffer; 
- 
-			growBuffer(buffer); 
-			out = &buffer[indx]; 
-		    } 
-		    c = ent->value; 
-		    if      (c <    0x80) 
-			{ *out++  = c;                bits= -6; } 
-		    else if (c <   0x800) 
-			{ *out++  =((c >>  6) & 0x1F) | 0xC0;  bits=  0; } 
-		    else if (c < 0x10000) 
-			{ *out++  =((c >> 12) & 0x0F) | 0xE0;  bits=  6; } 
-		    else 
-			{ *out++  =((c >> 18) & 0x07) | 0xF0;  bits= 12; } 
- 
-		    for ( ; bits >= 0; bits-= 6) { 
-			*out++  = ((c >> bits) & 0x3F) | 0x80; 
-		    } 
-		} 
-	    } 
-	} else { 
-	    unsigned int c; 
-	    int bits, l; 
- 
-	    if (out - buffer > buffer_size - 100) { 
-		int indx = out - buffer; 
- 
-		growBuffer(buffer); 
-		out = &buffer[indx]; 
-	    } 
-	    c = CUR_CHAR(l); 
-	    if      (c <    0x80) 
-		    { *out++  = c;                bits= -6; } 
-	    else if (c <   0x800) 
-		    { *out++  =((c >>  6) & 0x1F) | 0xC0;  bits=  0; } 
-	    else if (c < 0x10000) 
-		    { *out++  =((c >> 12) & 0x0F) | 0xE0;  bits=  6; } 
-	    else 
-		    { *out++  =((c >> 18) & 0x07) | 0xF0;  bits= 12; } 
- 
-	    for ( ; bits >= 0; bits-= 6) { 
-		*out++  = ((c >> bits) & 0x3F) | 0x80; 
-	    } 
-	    NEXT; 
-	} 
-    } 
-    *out = 0; 
-    return(buffer); 
-} 
- 
-/** 
- * htmlParseEntityRef: 
- * @ctxt:  an HTML parser context 
- * @str:  location to store the entity name 
- * 
- * parse an HTML ENTITY references 
- * 
- * [68] EntityRef ::= '&' Name ';' 
- * 
- * Returns the associated htmlEntityDescPtr if found, or NULL otherwise, 
- *         if non-NULL *str will have to be freed by the caller. 
- */ 
-const htmlEntityDesc * 
-htmlParseEntityRef(htmlParserCtxtPtr ctxt, const xmlChar **str) { 
-    const xmlChar *name; 
-    const htmlEntityDesc * ent = NULL; 
- 
-    if (str != NULL) *str = NULL; 
-    if ((ctxt == NULL) || (ctxt->input == NULL)) return(NULL); 
- 
-    if (CUR == '&') { 
-        NEXT; 
-        name = htmlParseName(ctxt); 
-	if (name == NULL) { 
-	    htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED, 
-	                 "htmlParseEntityRef: no name\n", NULL, NULL); 
-	} else { 
-	    GROW; 
-	    if (CUR == ';') { 
-	        if (str != NULL) 
-		    *str = name; 
- 
-		/* 
-		 * Lookup the entity in the table. 
-		 */ 
-		ent = htmlEntityLookup(name); 
-		if (ent != NULL) /* OK that's ugly !!! */ 
-		    NEXT; 
-	    } else { 
-		htmlParseErr(ctxt, XML_ERR_ENTITYREF_SEMICOL_MISSING, 
-		             "htmlParseEntityRef: expecting ';'\n", 
-			     NULL, NULL); 
-	        if (str != NULL) 
-		    *str = name; 
-	    } 
-	} 
-    } 
-    return(ent); 
-} 
- 
-/** 
- * htmlParseAttValue: 
- * @ctxt:  an HTML parser context 
- * 
- * parse a value for an attribute 
- * Note: the parser won't do substitution of entities here, this 
- * will be handled later in xmlStringGetNodeList, unless it was 
- * asked for ctxt->replaceEntities != 0 
- * 
- * Returns the AttValue parsed or NULL. 
- */ 
- 
-static xmlChar * 
-htmlParseAttValue(htmlParserCtxtPtr ctxt) { 
-    xmlChar *ret = NULL; 
- 
-    if (CUR == '"') { 
-        NEXT; 
-	ret = htmlParseHTMLAttribute(ctxt, '"'); 
-        if (CUR != '"') { 
-	    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, 
-	                 "AttValue: \" expected\n", NULL, NULL); 
-	} else 
-	    NEXT; 
-    } else if (CUR == '\'') { 
-        NEXT; 
-	ret = htmlParseHTMLAttribute(ctxt, '\''); 
-        if (CUR != '\'') { 
-	    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, 
-	                 "AttValue: ' expected\n", NULL, NULL); 
-	} else 
-	    NEXT; 
-    } else { 
-        /* 
-	 * That's an HTMLism, the attribute value may not be quoted 
-	 */ 
-	ret = htmlParseHTMLAttribute(ctxt, 0); 
-	if (ret == NULL) { 
-	    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_WITHOUT_VALUE, 
-	                 "AttValue: no value found\n", NULL, NULL); 
-	} 
-    } 
-    return(ret); 
-} 
- 
-/** 
- * htmlParseSystemLiteral: 
- * @ctxt:  an HTML parser context 
- * 
- * parse an HTML Literal 
- * 
- * [11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'") 
- * 
- * Returns the SystemLiteral parsed or NULL 
- */ 
- 
-static xmlChar * 
-htmlParseSystemLiteral(htmlParserCtxtPtr ctxt) { 
-    size_t len = 0, startPosition = 0;
-    xmlChar *ret = NULL; 
- 
-    if (CUR == '"') { 
-        NEXT; 
+    return(xmlCurrentChar(ctxt, len));
 
-        if (CUR_PTR < BASE_PTR)
-            return(ret);
-        startPosition = CUR_PTR - BASE_PTR;
+encoding_error:
+    /*
+     * If we detect an UTF8 error that probably mean that the
+     * input encoding didn't get properly advertised in the
+     * declaration header. Report the error and switch the encoding
+     * to ISO-Latin-1 (if you don't like this policy, just declare the
+     * encoding !)
+     */
+    {
+        char buffer[150];
 
-	while ((IS_CHAR_CH(CUR)) && (CUR != '"')) {
-	    NEXT; 
-	    len++;
+	if (ctxt->input->end - ctxt->input->cur >= 4) {
+	    snprintf(buffer, 149, "Bytes: 0x%02X 0x%02X 0x%02X 0x%02X\n",
+			    ctxt->input->cur[0], ctxt->input->cur[1],
+			    ctxt->input->cur[2], ctxt->input->cur[3]);
+	} else {
+	    snprintf(buffer, 149, "Bytes: 0x%02X\n", ctxt->input->cur[0]);
 	}
-	if (!IS_CHAR_CH(CUR)) { 
-	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED, 
-			 "Unfinished SystemLiteral\n", NULL, NULL); 
-	} else { 
-	    ret = xmlStrndup((BASE_PTR+startPosition), len);
-	    NEXT; 
-        } 
-    } else if (CUR == '\'') { 
-        NEXT; 
+	htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
+		     "Input is not proper UTF-8, indicate encoding !\n",
+		     BAD_CAST buffer, NULL);
+    }
 
-        if (CUR_PTR < BASE_PTR)
-            return(ret);
-        startPosition = CUR_PTR - BASE_PTR;
+    ctxt->charset = XML_CHAR_ENCODING_8859_1;
+    *len = 1;
+    return((int) *ctxt->input->cur);
+}
 
-	while ((IS_CHAR_CH(CUR)) && (CUR != '\'')) {
-	    NEXT; 
-	    len++;
+/**
+ * htmlSkipBlankChars:
+ * @ctxt:  the HTML parser context
+ *
+ * skip all blanks character found at that point in the input streams.
+ *
+ * Returns the number of space chars skipped
+ */
+
+static int
+htmlSkipBlankChars(xmlParserCtxtPtr ctxt) {
+    int res = 0;
+
+    while (IS_BLANK_CH(*(ctxt->input->cur))) {
+	if ((*ctxt->input->cur == 0) &&
+	    (xmlParserInputGrow(ctxt->input, INPUT_CHUNK) <= 0)) {
+		xmlPopInput(ctxt);
+	} else {
+	    if (*(ctxt->input->cur) == '\n') {
+		ctxt->input->line++; ctxt->input->col = 1;
+	    } else ctxt->input->col++;
+	    ctxt->input->cur++;
+	    ctxt->nbChars++;
+	    if (*ctxt->input->cur == 0)
+		xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
 	}
-	if (!IS_CHAR_CH(CUR)) { 
-	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED, 
-			 "Unfinished SystemLiteral\n", NULL, NULL); 
-	} else { 
-	    ret = xmlStrndup((BASE_PTR+startPosition), len);
-	    NEXT; 
-        } 
-    } else { 
-	htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_STARTED, 
-	             " or ' expected\n", NULL, NULL); 
-    } 
- 
-    return(ret); 
-} 
- 
-/** 
- * htmlParsePubidLiteral: 
- * @ctxt:  an HTML parser context 
- * 
- * parse an HTML public literal 
- * 
- * [12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'" 
- * 
- * Returns the PubidLiteral parsed or NULL. 
- */ 
- 
-static xmlChar * 
-htmlParsePubidLiteral(htmlParserCtxtPtr ctxt) { 
-    size_t len = 0, startPosition = 0;
-    xmlChar *ret = NULL; 
-    /* 
-     * Name ::= (Letter | '_') (NameChar)* 
-     */ 
-    if (CUR == '"') { 
-        NEXT; 
+	res++;
+    }
+    return(res);
+}
 
-        if (CUR_PTR < BASE_PTR)
-            return(ret);
-        startPosition = CUR_PTR - BASE_PTR;
 
-        while (IS_PUBIDCHAR_CH(CUR)) {
-            len++;
-            NEXT;
-        }
 
-	if (CUR != '"') { 
-	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED, 
-	                 "Unfinished PubidLiteral\n", NULL, NULL); 
-	} else { 
-	    ret = xmlStrndup((BASE_PTR + startPosition), len);
-	    NEXT; 
-	} 
-    } else if (CUR == '\'') { 
-        NEXT; 
+/************************************************************************
+ *									*
+ *	The list of HTML elements and their properties		*
+ *									*
+ ************************************************************************/
 
-        if (CUR_PTR < BASE_PTR)
-            return(ret);
-        startPosition = CUR_PTR - BASE_PTR;
+/*
+ *  Start Tag: 1 means the start tag can be omitted
+ *  End Tag:   1 means the end tag can be omitted
+ *             2 means it's forbidden (empty elements)
+ *             3 means the tag is stylistic and should be closed easily
+ *  Depr:      this element is deprecated
+ *  DTD:       1 means that this element is valid only in the Loose DTD
+ *             2 means that this element is valid only in the Frameset DTD
+ *
+ * Name,Start Tag,End Tag,Save End,Empty,Deprecated,DTD,inline,Description
+	, subElements , impliedsubelt , Attributes, userdata
+ */
 
-        while ((IS_PUBIDCHAR_CH(CUR)) && (CUR != '\'')){
-            len++;
-            NEXT;
-        }
+/* Definitions and a couple of vars for HTML Elements */
 
-	if (CUR != '\'') { 
-	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED, 
-	                 "Unfinished PubidLiteral\n", NULL, NULL); 
-	} else { 
-	    ret = xmlStrndup((BASE_PTR + startPosition), len);
-	    NEXT; 
-	} 
-    } else { 
-	htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_STARTED, 
-	             "PubidLiteral \" or ' expected\n", NULL, NULL); 
-    } 
- 
-    return(ret); 
-} 
- 
-/** 
- * htmlParseScript: 
- * @ctxt:  an HTML parser context 
- * 
- * parse the content of an HTML SCRIPT or STYLE element 
- * http://www.w3.org/TR/html4/sgml/dtd.html#Script 
- * http://www.w3.org/TR/html4/sgml/dtd.html#StyleSheet 
- * http://www.w3.org/TR/html4/types.html#type-script 
- * http://www.w3.org/TR/html4/types.html#h-6.15 
- * http://www.w3.org/TR/html4/appendix/notes.html#h-B.3.2.1 
- * 
- * Script data ( %Script; in the DTD) can be the content of the SCRIPT 
- * element and the value of intrinsic event attributes. User agents must 
- * not evaluate script data as HTML markup but instead must pass it on as 
- * data to a script engine. 
- * NOTES: 
- * - The content is passed like CDATA 
- * - the attributes for style and scripting "onXXX" are also described 
- *   as CDATA but SGML allows entities references in attributes so their 
- *   processing is identical as other attributes 
- */ 
-static void 
-htmlParseScript(htmlParserCtxtPtr ctxt) { 
-    xmlChar buf[HTML_PARSER_BIG_BUFFER_SIZE + 5]; 
-    int nbchar = 0; 
-    int cur,l; 
- 
-    SHRINK; 
-    cur = CUR_CHAR(l); 
-    while (IS_CHAR_CH(cur)) { 
-	if ((cur == '<') && (NXT(1) == '/')) { 
-            /* 
-             * One should break here, the specification is clear: 
-             * Authors should therefore escape "</" within the content. 
-             * Escape mechanisms are specific to each scripting or 
-             * style sheet language. 
-             * 
-             * In recovery mode, only break if end tag match the 
-             * current tag, effectively ignoring all tags inside the 
-             * script/style block and treating the entire block as 
-             * CDATA. 
-             */ 
-            if (ctxt->recovery) { 
-                if (xmlStrncasecmp(ctxt->name, ctxt->input->cur+2, 
-				   xmlStrlen(ctxt->name)) == 0) 
-                { 
-                    break; /* while */ 
-                } else { 
-		    htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH, 
-				 "Element %s embeds close tag\n", 
-		                 ctxt->name, NULL); 
-		} 
-            } else { 
-                if (((NXT(2) >= 'A') && (NXT(2) <= 'Z')) || 
-                    ((NXT(2) >= 'a') && (NXT(2) <= 'z'))) 
-                { 
-                    break; /* while */ 
-                } 
-            } 
-	} 
-	COPY_BUF(l,buf,nbchar,cur); 
-	if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) { 
-            buf[nbchar] = 0;
-	    if (ctxt->sax->cdataBlock!= NULL) { 
-		/* 
-		 * Insert as CDATA, which is the same as HTML_PRESERVE_NODE 
-		 */ 
-		ctxt->sax->cdataBlock(ctxt->userData, buf, nbchar); 
-	    } else if (ctxt->sax->characters != NULL) { 
-		ctxt->sax->characters(ctxt->userData, buf, nbchar); 
-	    } 
-	    nbchar = 0; 
-	} 
-	GROW; 
-	NEXTL(l); 
-	cur = CUR_CHAR(l); 
-    } 
- 
-    if ((!(IS_CHAR_CH(cur))) && (!((cur == 0) && (ctxt->progressive)))) { 
-        htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, 
-                    "Invalid char in CDATA 0x%X\n", cur); 
-        if (ctxt->input->cur < ctxt->input->end) { 
-            NEXT; 
-        } 
-    } 
- 
-    if ((nbchar != 0) && (ctxt->sax != NULL) && (!ctxt->disableSAX)) { 
-        buf[nbchar] = 0;
-	if (ctxt->sax->cdataBlock!= NULL) { 
-	    /* 
-	     * Insert as CDATA, which is the same as HTML_PRESERVE_NODE 
-	     */ 
-	    ctxt->sax->cdataBlock(ctxt->userData, buf, nbchar); 
-	} else if (ctxt->sax->characters != NULL) { 
-	    ctxt->sax->characters(ctxt->userData, buf, nbchar); 
-	} 
-    } 
-} 
- 
- 
-/** 
- * htmlParseCharDataInternal:
- * @ctxt:  an HTML parser context 
- * @readahead: optional read ahead character in ascii range
- * 
- * parse a CharData section. 
- * if we are within a CDATA section ']]>' marks an end of section. 
- * 
- * [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) 
- */ 
- 
-static void 
-htmlParseCharDataInternal(htmlParserCtxtPtr ctxt, int readahead) {
-    xmlChar buf[HTML_PARSER_BIG_BUFFER_SIZE + 6];
-    int nbchar = 0; 
-    int cur, l; 
-    int chunk = 0; 
- 
-    if (readahead)
-        buf[nbchar++] = readahead;
+#define FONTSTYLE "tt", "i", "b", "u", "s", "strike", "big", "small"
+#define NB_FONTSTYLE 8
+#define PHRASE "em", "strong", "dfn", "code", "samp", "kbd", "var", "cite", "abbr", "acronym"
+#define NB_PHRASE 10
+#define SPECIAL "a", "img", "applet", "embed", "object", "font", "basefont", "br", "script", "map", "q", "sub", "sup", "span", "bdo", "iframe"
+#define NB_SPECIAL 16
+#define INLINE FONTSTYLE, PHRASE, SPECIAL, FORMCTRL
+#define NB_INLINE NB_PCDATA + NB_FONTSTYLE + NB_PHRASE + NB_SPECIAL + NB_FORMCTRL
+#define BLOCK HEADING, LIST, "pre", "p", "dl", "div", "center", "noscript", "noframes", "blockquote", "form", "isindex", "hr", "table", "fieldset", "address"
+#define NB_BLOCK NB_HEADING + NB_LIST + 14
+#define FORMCTRL "input", "select", "textarea", "label", "button"
+#define NB_FORMCTRL 5
+#define PCDATA
+#define NB_PCDATA 0
+#define HEADING "h1", "h2", "h3", "h4", "h5", "h6"
+#define NB_HEADING 6
+#define LIST "ul", "ol", "dir", "menu"
+#define NB_LIST 4
+#define MODIFIER
+#define NB_MODIFIER 0
+#define FLOW BLOCK,INLINE
+#define NB_FLOW NB_BLOCK + NB_INLINE
+#define EMPTY NULL
 
-    SHRINK; 
-    cur = CUR_CHAR(l); 
-    while (((cur != '<') || (ctxt->token == '<')) && 
-           ((cur != '&') || (ctxt->token == '&')) && 
-	   (cur != 0)) { 
-	if (!(IS_CHAR(cur))) { 
-	    htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, 
-	                "Invalid char in CDATA 0x%X\n", cur); 
-	} else { 
-	    COPY_BUF(l,buf,nbchar,cur); 
-	} 
-	if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) { 
-            buf[nbchar] = 0;
 
-	    /* 
-	     * Ok the segment is to be consumed as chars. 
-	     */ 
-	    if ((ctxt->sax != NULL) && (!ctxt->disableSAX)) { 
-		if (areBlanks(ctxt, buf, nbchar)) { 
-		    if (ctxt->keepBlanks) { 
-			if (ctxt->sax->characters != NULL) 
-			    ctxt->sax->characters(ctxt->userData, buf, nbchar); 
-		    } else { 
-			if (ctxt->sax->ignorableWhitespace != NULL) 
-			    ctxt->sax->ignorableWhitespace(ctxt->userData, 
-			                                   buf, nbchar); 
-		    } 
-		} else { 
-		    htmlCheckParagraph(ctxt); 
-		    if (ctxt->sax->characters != NULL) 
-			ctxt->sax->characters(ctxt->userData, buf, nbchar); 
-		} 
-	    } 
-	    nbchar = 0; 
-	} 
-	NEXTL(l); 
-        chunk++; 
-        if (chunk > HTML_PARSER_BUFFER_SIZE) { 
-            chunk = 0; 
-            SHRINK; 
-            GROW; 
-        } 
-	cur = CUR_CHAR(l); 
-	if (cur == 0) { 
-	    SHRINK; 
-	    GROW; 
-	    cur = CUR_CHAR(l); 
-	} 
-    } 
-    if (nbchar != 0) { 
-        buf[nbchar] = 0; 
- 
-	/* 
-	 * Ok the segment is to be consumed as chars. 
-	 */ 
-	if ((ctxt->sax != NULL) && (!ctxt->disableSAX)) { 
-	    if (areBlanks(ctxt, buf, nbchar)) { 
-		if (ctxt->keepBlanks) { 
-		    if (ctxt->sax->characters != NULL) 
-			ctxt->sax->characters(ctxt->userData, buf, nbchar); 
-		} else { 
-		    if (ctxt->sax->ignorableWhitespace != NULL) 
-			ctxt->sax->ignorableWhitespace(ctxt->userData, 
-			                               buf, nbchar); 
-		} 
-	    } else { 
-		htmlCheckParagraph(ctxt); 
-		if (ctxt->sax->characters != NULL) 
-		    ctxt->sax->characters(ctxt->userData, buf, nbchar); 
-	    } 
-	} 
-    } else { 
-	/* 
-	 * Loop detection 
-	 */ 
-	if (cur == 0) 
-	    ctxt->instate = XML_PARSER_EOF; 
-    } 
-} 
- 
-/** 
- * htmlParseCharData:
- * @ctxt:  an HTML parser context
+static const char* const html_flow[] = { FLOW, NULL } ;
+static const char* const html_inline[] = { INLINE, NULL } ;
+
+/* placeholders: elts with content but no subelements */
+static const char* const html_pcdata[] = { NULL } ;
+#define html_cdata html_pcdata
+
+
+/* ... and for HTML Attributes */
+
+#define COREATTRS "id", "class", "style", "title"
+#define NB_COREATTRS 4
+#define I18N "lang", "dir"
+#define NB_I18N 2
+#define EVENTS "onclick", "ondblclick", "onmousedown", "onmouseup", "onmouseover", "onmouseout", "onkeypress", "onkeydown", "onkeyup"
+#define NB_EVENTS 9
+#define ATTRS COREATTRS,I18N,EVENTS
+#define NB_ATTRS NB_NB_COREATTRS + NB_I18N + NB_EVENTS
+#define CELLHALIGN "align", "char", "charoff"
+#define NB_CELLHALIGN 3
+#define CELLVALIGN "valign"
+#define NB_CELLVALIGN 1
+
+static const char* const html_attrs[] = { ATTRS, NULL } ;
+static const char* const core_i18n_attrs[] = { COREATTRS, I18N, NULL } ;
+static const char* const core_attrs[] = { COREATTRS, NULL } ;
+static const char* const i18n_attrs[] = { I18N, NULL } ;
+
+
+/* Other declarations that should go inline ... */
+static const char* const a_attrs[] = { ATTRS, "charset", "type", "name",
+	"href", "hreflang", "rel", "rev", "accesskey", "shape", "coords",
+	"tabindex", "onfocus", "onblur", NULL } ;
+static const char* const target_attr[] = { "target", NULL } ;
+static const char* const rows_cols_attr[] = { "rows", "cols", NULL } ;
+static const char* const alt_attr[] = { "alt", NULL } ;
+static const char* const src_alt_attrs[] = { "src", "alt", NULL } ;
+static const char* const href_attrs[] = { "href", NULL } ;
+static const char* const clear_attrs[] = { "clear", NULL } ;
+static const char* const inline_p[] = { INLINE, "p", NULL } ;
+
+static const char* const flow_param[] = { FLOW, "param", NULL } ;
+static const char* const applet_attrs[] = { COREATTRS , "codebase",
+		"archive", "alt", "name", "height", "width", "align",
+		"hspace", "vspace", NULL } ;
+static const char* const area_attrs[] = { "shape", "coords", "href", "nohref",
+	"tabindex", "accesskey", "onfocus", "onblur", NULL } ;
+static const char* const basefont_attrs[] =
+	{ "id", "size", "color", "face", NULL } ;
+static const char* const quote_attrs[] = { ATTRS, "cite", NULL } ;
+static const char* const body_contents[] = { FLOW, "ins", "del", NULL } ;
+static const char* const body_attrs[] = { ATTRS, "onload", "onunload", NULL } ;
+static const char* const body_depr[] = { "background", "bgcolor", "text",
+	"link", "vlink", "alink", NULL } ;
+static const char* const button_attrs[] = { ATTRS, "name", "value", "type",
+	"disabled", "tabindex", "accesskey", "onfocus", "onblur", NULL } ;
+
+
+static const char* const col_attrs[] = { ATTRS, "span", "width", CELLHALIGN, CELLVALIGN, NULL } ;
+static const char* const col_elt[] = { "col", NULL } ;
+static const char* const edit_attrs[] = { ATTRS, "datetime", "cite", NULL } ;
+static const char* const compact_attrs[] = { ATTRS, "compact", NULL } ;
+static const char* const dl_contents[] = { "dt", "dd", NULL } ;
+static const char* const compact_attr[] = { "compact", NULL } ;
+static const char* const label_attr[] = { "label", NULL } ;
+static const char* const fieldset_contents[] = { FLOW, "legend" } ;
+static const char* const font_attrs[] = { COREATTRS, I18N, "size", "color", "face" , NULL } ;
+static const char* const form_contents[] = { HEADING, LIST, INLINE, "pre", "p", "div", "center", "noscript", "noframes", "blockquote", "isindex", "hr", "table", "fieldset", "address", NULL } ;
+static const char* const form_attrs[] = { ATTRS, "method", "enctype", "accept", "name", "onsubmit", "onreset", "accept-charset", NULL } ;
+static const char* const frame_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "noresize", "scrolling" , NULL } ;
+static const char* const frameset_attrs[] = { COREATTRS, "rows", "cols", "onload", "onunload", NULL } ;
+static const char* const frameset_contents[] = { "frameset", "frame", "noframes", NULL } ;
+static const char* const head_attrs[] = { I18N, "profile", NULL } ;
+static const char* const head_contents[] = { "title", "isindex", "base", "script", "style", "meta", "link", "object", NULL } ;
+static const char* const hr_depr[] = { "align", "noshade", "size", "width", NULL } ;
+static const char* const version_attr[] = { "version", NULL } ;
+static const char* const html_content[] = { "head", "body", "frameset", NULL } ;
+static const char* const iframe_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "scrolling", "align", "height", "width", NULL } ;
+static const char* const img_attrs[] = { ATTRS, "longdesc", "name", "height", "width", "usemap", "ismap", NULL } ;
+static const char* const embed_attrs[] = { COREATTRS, "align", "alt", "border", "code", "codebase", "frameborder", "height", "hidden", "hspace", "name", "palette", "pluginspace", "pluginurl", "src", "type", "units", "vspace", "width", NULL } ;
+static const char* const input_attrs[] = { ATTRS, "type", "name", "value", "checked", "disabled", "readonly", "size", "maxlength", "src", "alt", "usemap", "ismap", "tabindex", "accesskey", "onfocus", "onblur", "onselect", "onchange", "accept", NULL } ;
+static const char* const prompt_attrs[] = { COREATTRS, I18N, "prompt", NULL } ;
+static const char* const label_attrs[] = { ATTRS, "for", "accesskey", "onfocus", "onblur", NULL } ;
+static const char* const legend_attrs[] = { ATTRS, "accesskey", NULL } ;
+static const char* const align_attr[] = { "align", NULL } ;
+static const char* const link_attrs[] = { ATTRS, "charset", "href", "hreflang", "type", "rel", "rev", "media", NULL } ;
+static const char* const map_contents[] = { BLOCK, "area", NULL } ;
+static const char* const name_attr[] = { "name", NULL } ;
+static const char* const action_attr[] = { "action", NULL } ;
+static const char* const blockli_elt[] = { BLOCK, "li", NULL } ;
+static const char* const meta_attrs[] = { I18N, "http-equiv", "name", "scheme", "charset", NULL } ;
+static const char* const content_attr[] = { "content", NULL } ;
+static const char* const type_attr[] = { "type", NULL } ;
+static const char* const noframes_content[] = { "body", FLOW MODIFIER, NULL } ;
+static const char* const object_contents[] = { FLOW, "param", NULL } ;
+static const char* const object_attrs[] = { ATTRS, "declare", "classid", "codebase", "data", "type", "codetype", "archive", "standby", "height", "width", "usemap", "name", "tabindex", NULL } ;
+static const char* const object_depr[] = { "align", "border", "hspace", "vspace", NULL } ;
+static const char* const ol_attrs[] = { "type", "compact", "start", NULL} ;
+static const char* const option_elt[] = { "option", NULL } ;
+static const char* const optgroup_attrs[] = { ATTRS, "disabled", NULL } ;
+static const char* const option_attrs[] = { ATTRS, "disabled", "label", "selected", "value", NULL } ;
+static const char* const param_attrs[] = { "id", "value", "valuetype", "type", NULL } ;
+static const char* const width_attr[] = { "width", NULL } ;
+static const char* const pre_content[] = { PHRASE, "tt", "i", "b", "u", "s", "strike", "a", "br", "script", "map", "q", "span", "bdo", "iframe", NULL } ;
+static const char* const script_attrs[] = { "charset", "src", "defer", "event", "for", NULL } ;
+static const char* const language_attr[] = { "language", NULL } ;
+static const char* const select_content[] = { "optgroup", "option", NULL } ;
+static const char* const select_attrs[] = { ATTRS, "name", "size", "multiple", "disabled", "tabindex", "onfocus", "onblur", "onchange", NULL } ;
+static const char* const style_attrs[] = { I18N, "media", "title", NULL } ;
+static const char* const table_attrs[] = { ATTRS, "summary", "width", "border", "frame", "rules", "cellspacing", "cellpadding", "datapagesize", NULL } ;
+static const char* const table_depr[] = { "align", "bgcolor", NULL } ;
+static const char* const table_contents[] = { "caption", "col", "colgroup", "thead", "tfoot", "tbody", "tr", NULL} ;
+static const char* const tr_elt[] = { "tr", NULL } ;
+static const char* const talign_attrs[] = { ATTRS, CELLHALIGN, CELLVALIGN, NULL} ;
+static const char* const th_td_depr[] = { "nowrap", "bgcolor", "width", "height", NULL } ;
+static const char* const th_td_attr[] = { ATTRS, "abbr", "axis", "headers", "scope", "rowspan", "colspan", CELLHALIGN, CELLVALIGN, NULL } ;
+static const char* const textarea_attrs[] = { ATTRS, "name", "disabled", "readonly", "tabindex", "accesskey", "onfocus", "onblur", "onselect", "onchange", NULL } ;
+static const char* const tr_contents[] = { "th", "td", NULL } ;
+static const char* const bgcolor_attr[] = { "bgcolor", NULL } ;
+static const char* const li_elt[] = { "li", NULL } ;
+static const char* const ul_depr[] = { "type", "compact", NULL} ;
+static const char* const dir_attr[] = { "dir", NULL} ;
+
+#define DECL (const char**)
+
+static const htmlElemDesc
+html40ElementTable[] = {
+{ "a",		0, 0, 0, 0, 0, 0, 1, "anchor ",
+	DECL html_inline , NULL , DECL a_attrs , DECL target_attr, NULL
+},
+{ "abbr",	0, 0, 0, 0, 0, 0, 1, "abbreviated form",
+	DECL html_inline , NULL , DECL html_attrs, NULL, NULL
+},
+{ "acronym",	0, 0, 0, 0, 0, 0, 1, "",
+	DECL html_inline , NULL , DECL html_attrs, NULL, NULL
+},
+{ "address",	0, 0, 0, 0, 0, 0, 0, "information on author ",
+	DECL inline_p  , NULL , DECL html_attrs, NULL, NULL
+},
+{ "applet",	0, 0, 0, 0, 1, 1, 2, "java applet ",
+	DECL flow_param , NULL , NULL , DECL applet_attrs, NULL
+},
+{ "area",	0, 2, 2, 1, 0, 0, 0, "client-side image map area ",
+	EMPTY ,  NULL , DECL area_attrs , DECL target_attr, DECL alt_attr
+},
+{ "b",		0, 3, 0, 0, 0, 0, 1, "bold text style",
+	DECL html_inline , NULL , DECL html_attrs, NULL, NULL
+},
+{ "base",	0, 2, 2, 1, 0, 0, 0, "document base uri ",
+	EMPTY , NULL , NULL , DECL target_attr, DECL href_attrs
+},
+{ "basefont",	0, 2, 2, 1, 1, 1, 1, "base font size " ,
+	EMPTY , NULL , NULL, DECL basefont_attrs, NULL
+},
+{ "bdo",	0, 0, 0, 0, 0, 0, 1, "i18n bidi over-ride ",
+	DECL html_inline , NULL , DECL core_i18n_attrs, NULL, DECL dir_attr
+},
+{ "big",	0, 3, 0, 0, 0, 0, 1, "large text style",
+	DECL html_inline , NULL , DECL html_attrs, NULL, NULL
+},
+{ "blockquote",	0, 0, 0, 0, 0, 0, 0, "long quotation ",
+	DECL html_flow , NULL , DECL quote_attrs , NULL, NULL
+},
+{ "body",	1, 1, 0, 0, 0, 0, 0, "document body ",
+	DECL body_contents , "div" , DECL body_attrs, DECL body_depr, NULL
+},
+{ "br",		0, 2, 2, 1, 0, 0, 1, "forced line break ",
+	EMPTY , NULL , DECL core_attrs, DECL clear_attrs , NULL
+},
+{ "button",	0, 0, 0, 0, 0, 0, 2, "push button ",
+	DECL html_flow MODIFIER , NULL , DECL button_attrs, NULL, NULL
+},
+{ "caption",	0, 0, 0, 0, 0, 0, 0, "table caption ",
+	DECL html_inline , NULL , DECL html_attrs, NULL, NULL
+},
+{ "center",	0, 3, 0, 0, 1, 1, 0, "shorthand for div align=center ",
+	DECL html_flow , NULL , NULL, DECL html_attrs, NULL
+},
+{ "cite",	0, 0, 0, 0, 0, 0, 1, "citation",
+	DECL html_inline , NULL , DECL html_attrs, NULL, NULL
+},
+{ "code",	0, 0, 0, 0, 0, 0, 1, "computer code fragment",
+	DECL html_inline , NULL , DECL html_attrs, NULL, NULL
+},
+{ "col",	0, 2, 2, 1, 0, 0, 0, "table column ",
+	EMPTY , NULL , DECL col_attrs , NULL, NULL
+},
+{ "colgroup",	0, 1, 0, 0, 0, 0, 0, "table column group ",
+	DECL col_elt , "col" , DECL col_attrs , NULL, NULL
+},
+{ "dd",		0, 1, 0, 0, 0, 0, 0, "definition description ",
+	DECL html_flow , NULL , DECL html_attrs, NULL, NULL
+},
+{ "del",	0, 0, 0, 0, 0, 0, 2, "deleted text ",
+	DECL html_flow , NULL , DECL edit_attrs , NULL, NULL
+},
+{ "dfn",	0, 0, 0, 0, 0, 0, 1, "instance definition",
+	DECL html_inline , NULL , DECL html_attrs, NULL, NULL
+},
+{ "dir",	0, 0, 0, 0, 1, 1, 0, "directory list",
+	DECL blockli_elt, "li" , NULL, DECL compact_attrs, NULL
+},
+{ "div",	0, 0, 0, 0, 0, 0, 0, "generic language/style container",
+	DECL html_flow, NULL, DECL html_attrs, DECL align_attr, NULL
+},
+{ "dl",		0, 0, 0, 0, 0, 0, 0, "definition list ",
+	DECL dl_contents , "dd" , DECL html_attrs, DECL compact_attr, NULL
+},
+{ "dt",		0, 1, 0, 0, 0, 0, 0, "definition term ",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "em",		0, 3, 0, 0, 0, 0, 1, "emphasis",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "embed",	0, 1, 0, 0, 1, 1, 1, "generic embedded object ",
+	EMPTY, NULL, DECL embed_attrs, NULL, NULL
+},
+{ "fieldset",	0, 0, 0, 0, 0, 0, 0, "form control group ",
+	DECL fieldset_contents , NULL, DECL html_attrs, NULL, NULL
+},
+{ "font",	0, 3, 0, 0, 1, 1, 1, "local change to font ",
+	DECL html_inline, NULL, NULL, DECL font_attrs, NULL
+},
+{ "form",	0, 0, 0, 0, 0, 0, 0, "interactive form ",
+	DECL form_contents, "fieldset", DECL form_attrs , DECL target_attr, DECL action_attr
+},
+{ "frame",	0, 2, 2, 1, 0, 2, 0, "subwindow " ,
+	EMPTY, NULL, NULL, DECL frame_attrs, NULL
+},
+{ "frameset",	0, 0, 0, 0, 0, 2, 0, "window subdivision" ,
+	DECL frameset_contents, "noframes" , NULL , DECL frameset_attrs, NULL
+},
+{ "h1",		0, 0, 0, 0, 0, 0, 0, "heading ",
+	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL
+},
+{ "h2",		0, 0, 0, 0, 0, 0, 0, "heading ",
+	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL
+},
+{ "h3",		0, 0, 0, 0, 0, 0, 0, "heading ",
+	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL
+},
+{ "h4",		0, 0, 0, 0, 0, 0, 0, "heading ",
+	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL
+},
+{ "h5",		0, 0, 0, 0, 0, 0, 0, "heading ",
+	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL
+},
+{ "h6",		0, 0, 0, 0, 0, 0, 0, "heading ",
+	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL
+},
+{ "head",	1, 1, 0, 0, 0, 0, 0, "document head ",
+	DECL head_contents, NULL, DECL head_attrs, NULL, NULL
+},
+{ "hr",		0, 2, 2, 1, 0, 0, 0, "horizontal rule " ,
+	EMPTY, NULL, DECL html_attrs, DECL hr_depr, NULL
+},
+{ "html",	1, 1, 0, 0, 0, 0, 0, "document root element ",
+	DECL html_content , NULL , DECL i18n_attrs, DECL version_attr, NULL
+},
+{ "i",		0, 3, 0, 0, 0, 0, 1, "italic text style",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "iframe",	0, 0, 0, 0, 0, 1, 2, "inline subwindow ",
+	DECL html_flow, NULL, NULL, DECL iframe_attrs, NULL
+},
+{ "img",	0, 2, 2, 1, 0, 0, 1, "embedded image ",
+	EMPTY, NULL, DECL img_attrs, DECL align_attr, DECL src_alt_attrs
+},
+{ "input",	0, 2, 2, 1, 0, 0, 1, "form control ",
+	EMPTY, NULL, DECL input_attrs , DECL align_attr, NULL
+},
+{ "ins",	0, 0, 0, 0, 0, 0, 2, "inserted text",
+	DECL html_flow, NULL, DECL edit_attrs, NULL, NULL
+},
+{ "isindex",	0, 2, 2, 1, 1, 1, 0, "single line prompt ",
+	EMPTY, NULL, NULL, DECL prompt_attrs, NULL
+},
+{ "kbd",	0, 0, 0, 0, 0, 0, 1, "text to be entered by the user",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "label",	0, 0, 0, 0, 0, 0, 1, "form field label text ",
+	DECL html_inline MODIFIER, NULL, DECL label_attrs , NULL, NULL
+},
+{ "legend",	0, 0, 0, 0, 0, 0, 0, "fieldset legend ",
+	DECL html_inline, NULL, DECL legend_attrs , DECL align_attr, NULL
+},
+{ "li",		0, 1, 1, 0, 0, 0, 0, "list item ",
+	DECL html_flow, NULL, DECL html_attrs, NULL, NULL
+},
+{ "link",	0, 2, 2, 1, 0, 0, 0, "a media-independent link ",
+	EMPTY, NULL, DECL link_attrs, DECL target_attr, NULL
+},
+{ "map",	0, 0, 0, 0, 0, 0, 2, "client-side image map ",
+	DECL map_contents , NULL, DECL html_attrs , NULL, DECL name_attr
+},
+{ "menu",	0, 0, 0, 0, 1, 1, 0, "menu list ",
+	DECL blockli_elt , NULL, NULL, DECL compact_attrs, NULL
+},
+{ "meta",	0, 2, 2, 1, 0, 0, 0, "generic metainformation ",
+	EMPTY, NULL, DECL meta_attrs , NULL , DECL content_attr
+},
+{ "noframes",	0, 0, 0, 0, 0, 2, 0, "alternate content container for non frame-based rendering ",
+	DECL noframes_content, "body" , DECL html_attrs, NULL, NULL
+},
+{ "noscript",	0, 0, 0, 0, 0, 0, 0, "alternate content container for non script-based rendering ",
+	DECL html_flow, "div", DECL html_attrs, NULL, NULL
+},
+{ "object",	0, 0, 0, 0, 0, 0, 2, "generic embedded object ",
+	DECL object_contents , "div" , DECL object_attrs, DECL object_depr, NULL
+},
+{ "ol",		0, 0, 0, 0, 0, 0, 0, "ordered list ",
+	DECL li_elt , "li" , DECL html_attrs, DECL ol_attrs, NULL
+},
+{ "optgroup",	0, 0, 0, 0, 0, 0, 0, "option group ",
+	DECL option_elt , "option", DECL optgroup_attrs, NULL, DECL label_attr
+},
+{ "option",	0, 1, 0, 0, 0, 0, 0, "selectable choice " ,
+	DECL html_pcdata, NULL, DECL option_attrs, NULL, NULL
+},
+{ "p",		0, 1, 0, 0, 0, 0, 0, "paragraph ",
+	DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL
+},
+{ "param",	0, 2, 2, 1, 0, 0, 0, "named property value ",
+	EMPTY, NULL, DECL param_attrs, NULL, DECL name_attr
+},
+{ "pre",	0, 0, 0, 0, 0, 0, 0, "preformatted text ",
+	DECL pre_content, NULL, DECL html_attrs, DECL width_attr, NULL
+},
+{ "q",		0, 0, 0, 0, 0, 0, 1, "short inline quotation ",
+	DECL html_inline, NULL, DECL quote_attrs, NULL, NULL
+},
+{ "s",		0, 3, 0, 0, 1, 1, 1, "strike-through text style",
+	DECL html_inline, NULL, NULL, DECL html_attrs, NULL
+},
+{ "samp",	0, 0, 0, 0, 0, 0, 1, "sample program output, scripts, etc.",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "script",	0, 0, 0, 0, 0, 0, 2, "script statements ",
+	DECL html_cdata, NULL, DECL script_attrs, DECL language_attr, DECL type_attr
+},
+{ "select",	0, 0, 0, 0, 0, 0, 1, "option selector ",
+	DECL select_content, NULL, DECL select_attrs, NULL, NULL
+},
+{ "small",	0, 3, 0, 0, 0, 0, 1, "small text style",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "span",	0, 0, 0, 0, 0, 0, 1, "generic language/style container ",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "strike",	0, 3, 0, 0, 1, 1, 1, "strike-through text",
+	DECL html_inline, NULL, NULL, DECL html_attrs, NULL
+},
+{ "strong",	0, 3, 0, 0, 0, 0, 1, "strong emphasis",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "style",	0, 0, 0, 0, 0, 0, 0, "style info ",
+	DECL html_cdata, NULL, DECL style_attrs, NULL, DECL type_attr
+},
+{ "sub",	0, 3, 0, 0, 0, 0, 1, "subscript",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "sup",	0, 3, 0, 0, 0, 0, 1, "superscript ",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "table",	0, 0, 0, 0, 0, 0, 0, "",
+	DECL table_contents , "tr" , DECL table_attrs , DECL table_depr, NULL
+},
+{ "tbody",	1, 0, 0, 0, 0, 0, 0, "table body ",
+	DECL tr_elt , "tr" , DECL talign_attrs, NULL, NULL
+},
+{ "td",		0, 0, 0, 0, 0, 0, 0, "table data cell",
+	DECL html_flow, NULL, DECL th_td_attr, DECL th_td_depr, NULL
+},
+{ "textarea",	0, 0, 0, 0, 0, 0, 1, "multi-line text field ",
+	DECL html_pcdata, NULL, DECL textarea_attrs, NULL, DECL rows_cols_attr
+},
+{ "tfoot",	0, 1, 0, 0, 0, 0, 0, "table footer ",
+	DECL tr_elt , "tr" , DECL talign_attrs, NULL, NULL
+},
+{ "th",		0, 1, 0, 0, 0, 0, 0, "table header cell",
+	DECL html_flow, NULL, DECL th_td_attr, DECL th_td_depr, NULL
+},
+{ "thead",	0, 1, 0, 0, 0, 0, 0, "table header ",
+	DECL tr_elt , "tr" , DECL talign_attrs, NULL, NULL
+},
+{ "title",	0, 0, 0, 0, 0, 0, 0, "document title ",
+	DECL html_pcdata, NULL, DECL i18n_attrs, NULL, NULL
+},
+{ "tr",		0, 0, 0, 0, 0, 0, 0, "table row ",
+	DECL tr_contents , "td" , DECL talign_attrs, DECL bgcolor_attr, NULL
+},
+{ "tt",		0, 3, 0, 0, 0, 0, 1, "teletype or monospaced text style",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+},
+{ "u",		0, 3, 0, 0, 1, 1, 1, "underlined text style",
+	DECL html_inline, NULL, NULL, DECL html_attrs, NULL
+},
+{ "ul",		0, 0, 0, 0, 0, 0, 0, "unordered list ",
+	DECL li_elt , "li" , DECL html_attrs, DECL ul_depr, NULL
+},
+{ "var",	0, 0, 0, 0, 0, 0, 1, "instance of a variable or program argument",
+	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
+}
+};
+
+/*
+ * start tags that imply the end of current element
+ */
+static const char * const htmlStartClose[] = {
+"form",		"form", "p", "hr", "h1", "h2", "h3", "h4", "h5", "h6",
+		"dl", "ul", "ol", "menu", "dir", "address", "pre",
+		"listing", "xmp", "head", NULL,
+"head",		"p", NULL,
+"title",	"p", NULL,
+"body",		"head", "style", "link", "title", "p", NULL,
+"frameset",	"head", "style", "link", "title", "p", NULL,
+"li",		"p", "h1", "h2", "h3", "h4", "h5", "h6", "dl", "address",
+		"pre", "listing", "xmp", "head", "li", NULL,
+"hr",		"p", "head", NULL,
+"h1",		"p", "head", NULL,
+"h2",		"p", "head", NULL,
+"h3",		"p", "head", NULL,
+"h4",		"p", "head", NULL,
+"h5",		"p", "head", NULL,
+"h6",		"p", "head", NULL,
+"dir",		"p", "head", NULL,
+"address",	"p", "head", "ul", NULL,
+"pre",		"p", "head", "ul", NULL,
+"listing",	"p", "head", NULL,
+"xmp",		"p", "head", NULL,
+"blockquote",	"p", "head", NULL,
+"dl",		"p", "dt", "menu", "dir", "address", "pre", "listing",
+		"xmp", "head", NULL,
+"dt",		"p", "menu", "dir", "address", "pre", "listing", "xmp",
+                "head", "dd", NULL,
+"dd",		"p", "menu", "dir", "address", "pre", "listing", "xmp",
+                "head", "dt", NULL,
+"ul",		"p", "head", "ol", "menu", "dir", "address", "pre",
+		"listing", "xmp", NULL,
+"ol",		"p", "head", "ul", NULL,
+"menu",		"p", "head", "ul", NULL,
+"p",		"p", "head", "h1", "h2", "h3", "h4", "h5", "h6", FONTSTYLE, NULL,
+"div",		"p", "head", NULL,
+"noscript",	"script", NULL,
+"center",	"font", "b", "i", "p", "head", NULL,
+"a",		"a", "head", NULL,
+"caption",	"p", NULL,
+"colgroup",	"caption", "colgroup", "col", "p", NULL,
+"col",		"caption", "col", "p", NULL,
+"table",	"p", "head", "h1", "h2", "h3", "h4", "h5", "h6", "pre",
+		"listing", "xmp", "a", NULL,
+"th",		"th", "td", "p", "span", "font", "a", "b", "i", "u", NULL,
+"td",		"th", "td", "p", "span", "font", "a", "b", "i", "u", NULL,
+"tr",		"th", "td", "tr", "caption", "col", "colgroup", "p", NULL,
+"thead",	"caption", "col", "colgroup", NULL,
+"tfoot",	"th", "td", "tr", "caption", "col", "colgroup", "thead",
+		"tbody", "p", NULL,
+"tbody",	"th", "td", "tr", "caption", "col", "colgroup", "thead",
+		"tfoot", "tbody", "p", NULL,
+"optgroup",	"option", NULL,
+"option",	"option", NULL,
+"fieldset",	"legend", "p", "head", "h1", "h2", "h3", "h4", "h5", "h6",
+		"pre", "listing", "xmp", "a", NULL,
+/* most tags in in FONTSTYLE, PHRASE and SPECIAL should close <head> */
+"tt",		"head", NULL,
+"i",		"head", NULL,
+"b",		"head", NULL,
+"u",		"head", NULL,
+"s",		"head", NULL,
+"strike",	"head", NULL,
+"big",		"head", NULL,
+"small",	"head", NULL,
+
+"em",		"head", NULL,
+"strong",	"head", NULL,
+"dfn",		"head", NULL,
+"code",		"head", NULL,
+"samp",		"head", NULL,
+"kbd",		"head", NULL,
+"var",		"head", NULL,
+"cite",		"head", NULL,
+"abbr",		"head", NULL,
+"acronym",	"head", NULL,
+
+/* "a" */
+"img",		"head", NULL,
+/* "applet" */
+/* "embed" */
+/* "object" */
+"font",		"head", NULL,
+/* "basefont" */
+"br",		"head", NULL,
+/* "script" */
+"map",		"head", NULL,
+"q",		"head", NULL,
+"sub",		"head", NULL,
+"sup",		"head", NULL,
+"span",		"head", NULL,
+"bdo",		"head", NULL,
+"iframe",	"head", NULL,
+NULL
+};
+
+/*
+ * The list of HTML elements which are supposed not to have
+ * CDATA content and where a p element will be implied
  *
- * parse a CharData section.
- * if we are within a CDATA section ']]>' marks an end of section.
+ * TODO: extend that list by reading the HTML SGML DTD on
+ *       implied paragraph
+ */
+static const char *const htmlNoContentElements[] = {
+    "html",
+    "head",
+    NULL
+};
+
+/*
+ * The list of HTML attributes which are of content %Script;
+ * NOTE: when adding ones, check htmlIsScriptAttribute() since
+ *       it assumes the name starts with 'on'
+ */
+static const char *const htmlScriptAttributes[] = {
+    "onclick",
+    "ondblclick",
+    "onmousedown",
+    "onmouseup",
+    "onmouseover",
+    "onmousemove",
+    "onmouseout",
+    "onkeypress",
+    "onkeydown",
+    "onkeyup",
+    "onload",
+    "onunload",
+    "onfocus",
+    "onblur",
+    "onsubmit",
+    "onreset",
+    "onchange",
+    "onselect"
+};
+
+/*
+ * This table is used by the htmlparser to know what to do with
+ * broken html pages. By assigning different priorities to different
+ * elements the parser can decide how to handle extra endtags.
+ * Endtags are only allowed to close elements with lower or equal
+ * priority.
+ */
+
+typedef struct {
+    const char *name;
+    int priority;
+} elementPriority;
+
+static const elementPriority htmlEndPriority[] = {
+    {"div",   150},
+    {"td",    160},
+    {"th",    160},
+    {"tr",    170},
+    {"thead", 180},
+    {"tbody", 180},
+    {"tfoot", 180},
+    {"table", 190},
+    {"head",  200},
+    {"body",  200},
+    {"html",  220},
+    {NULL,    100} /* Default priority */
+};
+
+static const char** htmlStartCloseIndex[100];
+static int htmlStartCloseIndexinitialized = 0;
+
+/************************************************************************
+ *									*
+ *	functions to handle HTML specific data			*
+ *									*
+ ************************************************************************/
+
+/**
+ * htmlInitAutoClose:
  *
- * [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)
+ * Initialize the htmlStartCloseIndex for fast lookup of closing tags names.
+ * This is not reentrant. Call xmlInitParser() once before processing in
+ * case of use in multithreaded programs.
  */
+void
+htmlInitAutoClose(void) {
+    int indx, i = 0;
 
-static void
-htmlParseCharData(htmlParserCtxtPtr ctxt) {
-    htmlParseCharDataInternal(ctxt, 0);
+    if (htmlStartCloseIndexinitialized) return;
+
+    for (indx = 0;indx < 100;indx ++) htmlStartCloseIndex[indx] = NULL;
+    indx = 0;
+    while ((htmlStartClose[i] != NULL) && (indx < 100 - 1)) {
+        htmlStartCloseIndex[indx++] = (const char**) &htmlStartClose[i];
+	while (htmlStartClose[i] != NULL) i++;
+	i++;
+    }
+    htmlStartCloseIndexinitialized = 1;
 }
 
 /**
- * htmlParseExternalID: 
- * @ctxt:  an HTML parser context 
- * @publicID:  a xmlChar** receiving PubidLiteral 
- * 
- * Parse an External ID or a Public ID 
- * 
- * [75] ExternalID ::= 'SYSTEM' S SystemLiteral 
- *                   | 'PUBLIC' S PubidLiteral S SystemLiteral 
- * 
- * [83] PublicID ::= 'PUBLIC' S PubidLiteral 
- * 
- * Returns 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. 
- */ 
- 
-static xmlChar * 
-htmlParseExternalID(htmlParserCtxtPtr ctxt, xmlChar **publicID) { 
-    xmlChar *URI = NULL; 
- 
-    if ((UPPER == 'S') && (UPP(1) == 'Y') && 
-         (UPP(2) == 'S') && (UPP(3) == 'T') && 
-	 (UPP(4) == 'E') && (UPP(5) == 'M')) { 
-        SKIP(6); 
-	if (!IS_BLANK_CH(CUR)) { 
-	    htmlParseErr(ctxt, XML_ERR_SPACE_REQUIRED, 
-	                 "Space required after 'SYSTEM'\n", NULL, NULL); 
-	} 
-        SKIP_BLANKS; 
-	URI = htmlParseSystemLiteral(ctxt); 
-	if (URI == NULL) { 
-	    htmlParseErr(ctxt, XML_ERR_URI_REQUIRED, 
-	                 "htmlParseExternalID: SYSTEM, no URI\n", NULL, NULL); 
-        } 
-    } else if ((UPPER == 'P') && (UPP(1) == 'U') && 
-	       (UPP(2) == 'B') && (UPP(3) == 'L') && 
-	       (UPP(4) == 'I') && (UPP(5) == 'C')) { 
-        SKIP(6); 
-	if (!IS_BLANK_CH(CUR)) { 
-	    htmlParseErr(ctxt, XML_ERR_SPACE_REQUIRED, 
-	                 "Space required after 'PUBLIC'\n", NULL, NULL); 
-	} 
-        SKIP_BLANKS; 
-	*publicID = htmlParsePubidLiteral(ctxt); 
-	if (*publicID == NULL) { 
-	    htmlParseErr(ctxt, XML_ERR_PUBID_REQUIRED, 
-	                 "htmlParseExternalID: PUBLIC, no Public Identifier\n", 
-			 NULL, NULL); 
-	} 
-        SKIP_BLANKS; 
-        if ((CUR == '"') || (CUR == '\'')) { 
-	    URI = htmlParseSystemLiteral(ctxt); 
-	} 
-    } 
-    return(URI); 
-} 
- 
-/** 
- * xmlParsePI: 
- * @ctxt:  an XML parser context 
- * 
- * parse an XML Processing Instruction. 
- * 
- * [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' 
- */ 
-static void 
-htmlParsePI(htmlParserCtxtPtr ctxt) { 
-    xmlChar *buf = NULL; 
-    int len = 0; 
-    int size = HTML_PARSER_BUFFER_SIZE; 
-    int cur, l; 
-    const xmlChar *target; 
-    xmlParserInputState state; 
-    int count = 0; 
- 
-    if ((RAW == '<') && (NXT(1) == '?')) { 
-	state = ctxt->instate; 
-        ctxt->instate = XML_PARSER_PI; 
-	/* 
-	 * this is a Processing Instruction. 
-	 */ 
-	SKIP(2); 
-	SHRINK; 
- 
-	/* 
-	 * Parse the target name and check for special support like 
-	 * namespace. 
-	 */ 
-        target = htmlParseName(ctxt); 
-	if (target != NULL) { 
-	    if (RAW == '>') { 
-		SKIP(1); 
- 
-		/* 
-		 * SAX: PI detected. 
-		 */ 
-		if ((ctxt->sax) && (!ctxt->disableSAX) && 
-		    (ctxt->sax->processingInstruction != NULL)) 
-		    ctxt->sax->processingInstruction(ctxt->userData, 
-		                                     target, NULL); 
-		ctxt->instate = state; 
-		return; 
-	    } 
-	    buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar)); 
-	    if (buf == NULL) { 
-		htmlErrMemory(ctxt, NULL); 
-		ctxt->instate = state; 
-		return; 
-	    } 
-	    cur = CUR; 
-	    if (!IS_BLANK(cur)) { 
-		htmlParseErr(ctxt, XML_ERR_SPACE_REQUIRED, 
-			  "ParsePI: PI %s space expected\n", target, NULL); 
-	    } 
-            SKIP_BLANKS; 
-	    cur = CUR_CHAR(l); 
-	    while (IS_CHAR(cur) && (cur != '>')) { 
-		if (len + 5 >= size) { 
-		    xmlChar *tmp; 
- 
-		    size *= 2; 
-		    tmp = (xmlChar *) xmlRealloc(buf, size * sizeof(xmlChar)); 
-		    if (tmp == NULL) { 
-			htmlErrMemory(ctxt, NULL); 
-			xmlFree(buf); 
-			ctxt->instate = state; 
-			return; 
-		    } 
-		    buf = tmp; 
-		} 
-		count++; 
-		if (count > 50) { 
-		    GROW; 
-		    count = 0; 
-		} 
-		COPY_BUF(l,buf,len,cur); 
-		NEXTL(l); 
-		cur = CUR_CHAR(l); 
-		if (cur == 0) { 
-		    SHRINK; 
-		    GROW; 
-		    cur = CUR_CHAR(l); 
-		} 
-	    } 
-	    buf[len] = 0; 
-	    if (cur != '>') { 
-		htmlParseErr(ctxt, XML_ERR_PI_NOT_FINISHED, 
-		      "ParsePI: PI %s never end ...\n", target, NULL); 
-	    } else { 
-		SKIP(1); 
- 
-		/* 
-		 * SAX: PI detected. 
-		 */ 
-		if ((ctxt->sax) && (!ctxt->disableSAX) && 
-		    (ctxt->sax->processingInstruction != NULL)) 
-		    ctxt->sax->processingInstruction(ctxt->userData, 
-		                                     target, buf); 
-	    } 
-	    xmlFree(buf); 
-	} else { 
-	    htmlParseErr(ctxt, XML_ERR_PI_NOT_STARTED, 
-                         "PI is not started correctly", NULL, NULL); 
-	} 
-	ctxt->instate = state; 
-    } 
-} 
- 
-/** 
- * htmlParseComment: 
- * @ctxt:  an HTML parser context 
- * 
- * Parse an XML (SGML) comment <!-- .... --> 
- * 
- * [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->' 
- */ 
-static void 
-htmlParseComment(htmlParserCtxtPtr ctxt) { 
-    xmlChar *buf = NULL; 
-    int len; 
-    int size = HTML_PARSER_BUFFER_SIZE; 
-    int q, ql; 
-    int r, rl; 
-    int cur, l; 
-    xmlParserInputState state; 
- 
-    /* 
-     * Check that there is a comment right here. 
-     */ 
-    if ((RAW != '<') || (NXT(1) != '!') || 
-        (NXT(2) != '-') || (NXT(3) != '-')) return; 
- 
-    state = ctxt->instate; 
-    ctxt->instate = XML_PARSER_COMMENT; 
-    SHRINK; 
-    SKIP(4); 
-    buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar)); 
-    if (buf == NULL) { 
-        htmlErrMemory(ctxt, "buffer allocation failed\n"); 
-	ctxt->instate = state; 
-	return; 
-    } 
-    len = 0;
-    buf[len] = 0;
-    q = CUR_CHAR(ql); 
-    if (!IS_CHAR(q))
-        goto unfinished;
-    NEXTL(ql); 
-    r = CUR_CHAR(rl); 
-    if (!IS_CHAR(r))
-        goto unfinished;
-    NEXTL(rl); 
-    cur = CUR_CHAR(l); 
-    while (IS_CHAR(cur) && 
-           ((cur != '>') || 
-	    (r != '-') || (q != '-'))) { 
-	if (len + 5 >= size) { 
-	    xmlChar *tmp; 
- 
-	    size *= 2; 
-	    tmp = (xmlChar *) xmlRealloc(buf, size * sizeof(xmlChar)); 
-	    if (tmp == NULL) { 
-	        xmlFree(buf); 
-	        htmlErrMemory(ctxt, "growing buffer failed\n"); 
-		ctxt->instate = state; 
-		return; 
-	    } 
-	    buf = tmp; 
-	} 
-	COPY_BUF(ql,buf,len,q); 
-	q = r; 
-	ql = rl; 
-	r = cur; 
-	rl = l; 
-	NEXTL(l); 
-	cur = CUR_CHAR(l); 
-	if (cur == 0) { 
-	    SHRINK; 
-	    GROW; 
-	    cur = CUR_CHAR(l); 
-	} 
-    } 
-    buf[len] = 0; 
-    if (IS_CHAR(cur)) {
-        NEXT; 
-	if ((ctxt->sax != NULL) && (ctxt->sax->comment != NULL) && 
-	    (!ctxt->disableSAX)) 
-	    ctxt->sax->comment(ctxt->userData, buf); 
-	xmlFree(buf); 
-	ctxt->instate = state;
-	return;
-    } 
+ * htmlTagLookup:
+ * @tag:  The tag name in lowercase
+ *
+ * Lookup the HTML tag in the ElementTable
+ *
+ * Returns the related htmlElemDescPtr or NULL if not found.
+ */
+const htmlElemDesc *
+htmlTagLookup(const xmlChar *tag) {
+    unsigned int i;
 
-unfinished:
-    htmlParseErr(ctxt, XML_ERR_COMMENT_NOT_FINISHED,
-		 "Comment not terminated \n<!--%.50s\n", buf, NULL);
-    xmlFree(buf);
-} 
- 
-/** 
- * htmlParseCharRef: 
- * @ctxt:  an HTML parser context 
- * 
- * parse Reference declarations 
- * 
- * [66] CharRef ::= '&#' [0-9]+ ';' | 
- *                  '&#x' [0-9a-fA-F]+ ';' 
- * 
- * Returns the value parsed (as an int) 
- */ 
-int 
-htmlParseCharRef(htmlParserCtxtPtr ctxt) { 
-    int val = 0; 
- 
-    if ((ctxt == NULL) || (ctxt->input == NULL)) { 
-	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-		     "htmlParseCharRef: context error\n", 
-		     NULL, NULL); 
-        return(0); 
-    } 
-    if ((CUR == '&') && (NXT(1) == '#') && 
-        ((NXT(2) == 'x') || NXT(2) == 'X')) { 
-	SKIP(3); 
-	while (CUR != ';') { 
-	    if ((CUR >= '0') && (CUR <= '9')) 
-	        val = val * 16 + (CUR - '0'); 
-	    else if ((CUR >= 'a') && (CUR <= 'f')) 
-	        val = val * 16 + (CUR - 'a') + 10; 
-	    else if ((CUR >= 'A') && (CUR <= 'F')) 
-	        val = val * 16 + (CUR - 'A') + 10; 
-	    else { 
-	        htmlParseErr(ctxt, XML_ERR_INVALID_HEX_CHARREF, 
-		             "htmlParseCharRef: missing semicolon\n", 
-			     NULL, NULL); 
-		break; 
-	    } 
-	    NEXT; 
-	} 
-	if (CUR == ';') 
-	    NEXT; 
-    } else if  ((CUR == '&') && (NXT(1) == '#')) { 
-	SKIP(2); 
-	while (CUR != ';') { 
-	    if ((CUR >= '0') && (CUR <= '9')) 
-	        val = val * 10 + (CUR - '0'); 
-	    else { 
-	        htmlParseErr(ctxt, XML_ERR_INVALID_DEC_CHARREF, 
-		             "htmlParseCharRef: missing semicolon\n", 
-			     NULL, NULL); 
-		break; 
-	    } 
-	    NEXT; 
-	} 
-	if (CUR == ';') 
-	    NEXT; 
-    } else { 
-	htmlParseErr(ctxt, XML_ERR_INVALID_CHARREF, 
-	             "htmlParseCharRef: invalid value\n", NULL, NULL); 
-    } 
-    /* 
-     * Check the value IS_CHAR ... 
-     */ 
-    if (IS_CHAR(val)) { 
-        return(val); 
-    } else { 
-	htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, 
-			"htmlParseCharRef: invalid xmlChar value %d\n", 
-			val); 
-    } 
-    return(0); 
-} 
- 
- 
-/** 
- * htmlParseDocTypeDecl: 
- * @ctxt:  an HTML parser context 
- * 
- * parse a DOCTYPE declaration 
- * 
- * [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? 
- *                      ('[' (markupdecl | PEReference | S)* ']' S?)? '>' 
- */ 
- 
-static void 
-htmlParseDocTypeDecl(htmlParserCtxtPtr ctxt) { 
-    const xmlChar *name; 
-    xmlChar *ExternalID = NULL; 
-    xmlChar *URI = NULL; 
- 
-    /* 
-     * We know that '<!DOCTYPE' has been detected. 
-     */ 
-    SKIP(9); 
- 
-    SKIP_BLANKS; 
- 
-    /* 
-     * Parse the DOCTYPE name. 
-     */ 
-    name = htmlParseName(ctxt); 
-    if (name == NULL) { 
-	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED, 
-	             "htmlParseDocTypeDecl : no DOCTYPE name !\n", 
-		     NULL, NULL); 
-    } 
-    /* 
-     * Check that upper(name) == "HTML" !!!!!!!!!!!!! 
-     */ 
- 
-    SKIP_BLANKS; 
- 
-    /* 
-     * Check for SystemID and ExternalID 
-     */ 
-    URI = htmlParseExternalID(ctxt, &ExternalID); 
-    SKIP_BLANKS; 
- 
-    /* 
-     * We should be at the end of the DOCTYPE declaration. 
-     */ 
-    if (CUR != '>') { 
-	htmlParseErr(ctxt, XML_ERR_DOCTYPE_NOT_FINISHED, 
-	             "DOCTYPE improperly terminated\n", NULL, NULL); 
-        /* We shouldn't try to resynchronize ... */ 
-    } 
-    NEXT; 
- 
-    /* 
-     * Create or update the document accordingly to the DOCTYPE 
-     */ 
-    if ((ctxt->sax != NULL) && (ctxt->sax->internalSubset != NULL) && 
-	(!ctxt->disableSAX)) 
-	ctxt->sax->internalSubset(ctxt->userData, name, ExternalID, URI); 
- 
-    /* 
-     * Cleanup, since we don't use all those identifiers 
-     */ 
-    if (URI != NULL) xmlFree(URI); 
-    if (ExternalID != NULL) xmlFree(ExternalID); 
-} 
- 
-/** 
- * htmlParseAttribute: 
- * @ctxt:  an HTML parser context 
- * @value:  a xmlChar ** used to store the value of the attribute 
- * 
- * parse an attribute 
- * 
- * [41] Attribute ::= Name Eq AttValue 
- * 
- * [25] Eq ::= S? '=' S? 
- * 
- * With namespace: 
- * 
- * [NS 11] Attribute ::= QName Eq AttValue 
- * 
- * Also the case QName == xmlns:??? is handled independently as a namespace 
- * definition. 
- * 
- * Returns the attribute name, and the value in *value. 
- */ 
- 
-static const xmlChar * 
-htmlParseAttribute(htmlParserCtxtPtr ctxt, xmlChar **value) { 
-    const xmlChar *name; 
-    xmlChar *val = NULL; 
- 
-    *value = NULL; 
-    name = htmlParseHTMLName(ctxt); 
-    if (name == NULL) { 
-	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED, 
-	             "error parsing attribute name\n", NULL, NULL); 
-        return(NULL); 
-    } 
- 
-    /* 
-     * read the value 
-     */ 
-    SKIP_BLANKS; 
-    if (CUR == '=') { 
-        NEXT; 
-	SKIP_BLANKS; 
-	val = htmlParseAttValue(ctxt); 
-    } 
- 
-    *value = val; 
-    return(name); 
-} 
- 
-/** 
- * htmlCheckEncodingDirect: 
- * @ctxt:  an HTML parser context 
- * @attvalue: the attribute value 
- * 
- * Checks an attribute value to detect 
- * the encoding 
- * If a new encoding is detected the parser is switched to decode 
- * it and pass UTF8 
- */ 
-static void 
-htmlCheckEncodingDirect(htmlParserCtxtPtr ctxt, const xmlChar *encoding) { 
- 
-    if ((ctxt == NULL) || (encoding == NULL) || 
-        (ctxt->options & HTML_PARSE_IGNORE_ENC)) 
-	return; 
- 
-    /* do not change encoding */ 
-    if (ctxt->input->encoding != NULL) 
-        return; 
- 
-    if (encoding != NULL) { 
-	xmlCharEncoding enc; 
-	xmlCharEncodingHandlerPtr handler; 
- 
-	while ((*encoding == ' ') || (*encoding == '\t')) encoding++; 
- 
-	if (ctxt->input->encoding != NULL) 
-	    xmlFree((xmlChar *) ctxt->input->encoding); 
-	ctxt->input->encoding = xmlStrdup(encoding); 
- 
-	enc = xmlParseCharEncoding((const char *) encoding); 
-	/* 
-	 * registered set of known encodings 
-	 */ 
-	if (enc != XML_CHAR_ENCODING_ERROR) { 
-	    if (((enc == XML_CHAR_ENCODING_UTF16LE) || 
-	         (enc == XML_CHAR_ENCODING_UTF16BE) || 
-		 (enc == XML_CHAR_ENCODING_UCS4LE) || 
-		 (enc == XML_CHAR_ENCODING_UCS4BE)) && 
-		(ctxt->input->buf != NULL) && 
-		(ctxt->input->buf->encoder == NULL)) { 
-		htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING, 
-		             "htmlCheckEncoding: wrong encoding meta\n", 
-			     NULL, NULL); 
-	    } else { 
-		xmlSwitchEncoding(ctxt, enc); 
-	    } 
-	    ctxt->charset = XML_CHAR_ENCODING_UTF8; 
-	} else { 
-	    /* 
-	     * fallback for unknown encodings 
-	     */ 
-	    handler = xmlFindCharEncodingHandler((const char *) encoding); 
-	    if (handler != NULL) { 
-		xmlSwitchToEncoding(ctxt, handler); 
-		ctxt->charset = XML_CHAR_ENCODING_UTF8; 
-	    } else { 
-		htmlParseErr(ctxt, XML_ERR_UNSUPPORTED_ENCODING, 
-		             "htmlCheckEncoding: unknown encoding %s\n", 
-			     encoding, NULL); 
-	    } 
-	} 
- 
-	if ((ctxt->input->buf != NULL) && 
-	    (ctxt->input->buf->encoder != NULL) && 
-	    (ctxt->input->buf->raw != NULL) && 
-	    (ctxt->input->buf->buffer != NULL)) { 
-	    int nbchars; 
-	    int processed; 
- 
-	    /* 
-	     * convert as much as possible to the parser reading buffer. 
-	     */ 
-	    processed = ctxt->input->cur - ctxt->input->base; 
-	    xmlBufShrink(ctxt->input->buf->buffer, processed); 
-	    nbchars = xmlCharEncInput(ctxt->input->buf, 1); 
-            xmlBufResetInput(ctxt->input->buf->buffer, ctxt->input);
-	    if (nbchars < 0) { 
-		htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING, 
-		             "htmlCheckEncoding: encoder error\n", 
-			     NULL, NULL); 
-	    } 
-	} 
-    } 
-} 
- 
-/** 
- * htmlCheckEncoding: 
- * @ctxt:  an HTML parser context 
- * @attvalue: the attribute value 
- * 
- * Checks an http-equiv attribute from a Meta tag to detect 
- * the encoding 
- * If a new encoding is detected the parser is switched to decode 
- * it and pass UTF8 
- */ 
-static void 
-htmlCheckEncoding(htmlParserCtxtPtr ctxt, const xmlChar *attvalue) { 
-    const xmlChar *encoding; 
- 
-    if (!attvalue) 
-	return; 
- 
-    encoding = xmlStrcasestr(attvalue, BAD_CAST"charset"); 
-    if (encoding != NULL) { 
-	encoding += 7; 
-    } 
-    /* 
-     * skip blank 
-     */ 
-    if (encoding && IS_BLANK_CH(*encoding)) 
-	encoding = xmlStrcasestr(attvalue, BAD_CAST"="); 
-    if (encoding && *encoding == '=') { 
-	encoding ++; 
-	htmlCheckEncodingDirect(ctxt, encoding); 
-    } 
-} 
- 
-/** 
- * htmlCheckMeta: 
- * @ctxt:  an HTML parser context 
- * @atts:  the attributes values 
- * 
- * Checks an attributes from a Meta tag 
- */ 
-static void 
-htmlCheckMeta(htmlParserCtxtPtr ctxt, const xmlChar **atts) { 
-    int i; 
-    const xmlChar *att, *value; 
-    int http = 0; 
-    const xmlChar *content = NULL; 
- 
-    if ((ctxt == NULL) || (atts == NULL)) 
-	return; 
- 
-    i = 0; 
-    att = atts[i++]; 
-    while (att != NULL) { 
-	value = atts[i++]; 
-	if ((value != NULL) && (!xmlStrcasecmp(att, BAD_CAST"http-equiv")) 
-	 && (!xmlStrcasecmp(value, BAD_CAST"Content-Type"))) 
-	    http = 1; 
-	else if ((value != NULL) && (!xmlStrcasecmp(att, BAD_CAST"charset"))) 
-	    htmlCheckEncodingDirect(ctxt, value); 
-	else if ((value != NULL) && (!xmlStrcasecmp(att, BAD_CAST"content"))) 
-	    content = value; 
-	att = atts[i++]; 
-    } 
-    if ((http) && (content != NULL)) 
-	htmlCheckEncoding(ctxt, content); 
- 
-} 
- 
-/** 
- * htmlParseStartTag: 
- * @ctxt:  an HTML parser context 
- * 
- * parse a start of tag either for rule element or 
- * EmptyElement. In both case we don't parse the tag closing chars. 
- * 
- * [40] STag ::= '<' Name (S Attribute)* S? '>' 
- * 
- * [44] EmptyElemTag ::= '<' Name (S Attribute)* S? '/>' 
- * 
- * With namespace: 
- * 
- * [NS 8] STag ::= '<' QName (S Attribute)* S? '>' 
- * 
- * [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>' 
- * 
- * Returns 0 in case of success, -1 in case of error and 1 if discarded 
- */ 
- 
-static int 
-htmlParseStartTag(htmlParserCtxtPtr ctxt) { 
-    const xmlChar *name; 
-    const xmlChar *attname; 
-    xmlChar *attvalue; 
-    const xmlChar **atts; 
-    int nbatts = 0; 
-    int maxatts; 
-    int meta = 0; 
-    int i; 
-    int discardtag = 0; 
- 
-    if ((ctxt == NULL) || (ctxt->input == NULL)) { 
-	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-		     "htmlParseStartTag: context error\n", NULL, NULL); 
-	return -1; 
-    } 
-    if (ctxt->instate == XML_PARSER_EOF) 
-        return(-1); 
-    if (CUR != '<') return -1; 
-    NEXT; 
- 
-    atts = ctxt->atts; 
-    maxatts = ctxt->maxatts; 
- 
-    GROW; 
-    name = htmlParseHTMLName(ctxt); 
-    if (name == NULL) { 
-	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED, 
-	             "htmlParseStartTag: invalid element name\n", 
-		     NULL, NULL); 
-	/* if recover preserve text on classic misconstructs */
-	if ((ctxt->recovery) && ((IS_BLANK_CH(CUR)) || (CUR == '<') ||
+    for (i = 0; i < (sizeof(html40ElementTable) /
+                     sizeof(html40ElementTable[0]));i++) {
+        if (!xmlStrcasecmp(tag, BAD_CAST html40ElementTable[i].name))
+	    return((htmlElemDescPtr) &html40ElementTable[i]);
+    }
+    return(NULL);
+}
+
+/**
+ * htmlGetEndPriority:
+ * @name: The name of the element to look up the priority for.
+ *
+ * Return value: The "endtag" priority.
+ **/
+static int
+htmlGetEndPriority (const xmlChar *name) {
+    int i = 0;
+
+    while ((htmlEndPriority[i].name != NULL) &&
+	   (!xmlStrEqual((const xmlChar *)htmlEndPriority[i].name, name)))
+	i++;
+
+    return(htmlEndPriority[i].priority);
+}
+
+
+/**
+ * htmlCheckAutoClose:
+ * @newtag:  The new tag name
+ * @oldtag:  The old tag name
+ *
+ * Checks whether the new tag is one of the registered valid tags for
+ * closing old.
+ * Initialize the htmlStartCloseIndex for fast lookup of closing tags names.
+ *
+ * Returns 0 if no, 1 if yes.
+ */
+static int
+htmlCheckAutoClose(const xmlChar * newtag, const xmlChar * oldtag)
+{
+    int i, indx;
+    const char **closed = NULL;
+
+    if (htmlStartCloseIndexinitialized == 0)
+        htmlInitAutoClose();
+
+    /* inefficient, but not a big deal */
+    for (indx = 0; indx < 100; indx++) {
+        closed = htmlStartCloseIndex[indx];
+        if (closed == NULL)
+            return (0);
+        if (xmlStrEqual(BAD_CAST * closed, newtag))
+            break;
+    }
+
+    i = closed - htmlStartClose;
+    i++;
+    while (htmlStartClose[i] != NULL) {
+        if (xmlStrEqual(BAD_CAST htmlStartClose[i], oldtag)) {
+            return (1);
+        }
+        i++;
+    }
+    return (0);
+}
+
+/**
+ * htmlAutoCloseOnClose:
+ * @ctxt:  an HTML parser context
+ * @newtag:  The new tag name
+ * @force:  force the tag closure
+ *
+ * The HTML DTD allows an ending tag to implicitly close other tags.
+ */
+static void
+htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
+{
+    const htmlElemDesc *info;
+    int i, priority;
+
+    priority = htmlGetEndPriority(newtag);
+
+    for (i = (ctxt->nameNr - 1); i >= 0; i--) {
+
+        if (xmlStrEqual(newtag, ctxt->nameTab[i]))
+            break;
+        /*
+         * A misplaced endtag can only close elements with lower
+         * or equal priority, so if we find an element with higher
+         * priority before we find an element with
+         * matching name, we just ignore this endtag
+         */
+        if (htmlGetEndPriority(ctxt->nameTab[i]) > priority)
+            return;
+    }
+    if (i < 0)
+        return;
+
+    while (!xmlStrEqual(newtag, ctxt->name)) {
+        info = htmlTagLookup(ctxt->name);
+        if ((info != NULL) && (info->endTag == 3)) {
+            htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
+	                 "Opening and ending tag mismatch: %s and %s\n",
+			 newtag, ctxt->name);
+        }
+        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+            ctxt->sax->endElement(ctxt->userData, ctxt->name);
+	htmlnamePop(ctxt);
+    }
+}
+
+/**
+ * htmlAutoCloseOnEnd:
+ * @ctxt:  an HTML parser context
+ *
+ * Close all remaining tags at the end of the stream
+ */
+static void
+htmlAutoCloseOnEnd(htmlParserCtxtPtr ctxt)
+{
+    int i;
+
+    if (ctxt->nameNr == 0)
+        return;
+    for (i = (ctxt->nameNr - 1); i >= 0; i--) {
+        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+            ctxt->sax->endElement(ctxt->userData, ctxt->name);
+	htmlnamePop(ctxt);
+    }
+}
+
+/**
+ * htmlAutoClose:
+ * @ctxt:  an HTML parser context
+ * @newtag:  The new tag name or NULL
+ *
+ * The HTML DTD allows a tag to implicitly close other tags.
+ * The list is kept in htmlStartClose array. This function is
+ * called when a new tag has been detected and generates the
+ * appropriates closes if possible/needed.
+ * If newtag is NULL this mean we are at the end of the resource
+ * and we should check
+ */
+static void
+htmlAutoClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
+{
+    while ((newtag != NULL) && (ctxt->name != NULL) &&
+           (htmlCheckAutoClose(newtag, ctxt->name))) {
+        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+            ctxt->sax->endElement(ctxt->userData, ctxt->name);
+	htmlnamePop(ctxt);
+    }
+    if (newtag == NULL) {
+        htmlAutoCloseOnEnd(ctxt);
+        return;
+    }
+    while ((newtag == NULL) && (ctxt->name != NULL) &&
+           ((xmlStrEqual(ctxt->name, BAD_CAST "head")) ||
+            (xmlStrEqual(ctxt->name, BAD_CAST "body")) ||
+            (xmlStrEqual(ctxt->name, BAD_CAST "html")))) {
+        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+            ctxt->sax->endElement(ctxt->userData, ctxt->name);
+	htmlnamePop(ctxt);
+    }
+}
+
+/**
+ * htmlAutoCloseTag:
+ * @doc:  the HTML document
+ * @name:  The tag name
+ * @elem:  the HTML element
+ *
+ * The HTML DTD allows a tag to implicitly close other tags.
+ * The list is kept in htmlStartClose array. This function checks
+ * if the element or one of it's children would autoclose the
+ * given tag.
+ *
+ * Returns 1 if autoclose, 0 otherwise
+ */
+int
+htmlAutoCloseTag(htmlDocPtr doc, const xmlChar *name, htmlNodePtr elem) {
+    htmlNodePtr child;
+
+    if (elem == NULL) return(1);
+    if (xmlStrEqual(name, elem->name)) return(0);
+    if (htmlCheckAutoClose(elem->name, name)) return(1);
+    child = elem->children;
+    while (child != NULL) {
+        if (htmlAutoCloseTag(doc, name, child)) return(1);
+	child = child->next;
+    }
+    return(0);
+}
+
+/**
+ * htmlIsAutoClosed:
+ * @doc:  the HTML document
+ * @elem:  the HTML element
+ *
+ * The HTML DTD allows a tag to implicitly close other tags.
+ * The list is kept in htmlStartClose array. This function checks
+ * if a tag is autoclosed by one of it's child
+ *
+ * Returns 1 if autoclosed, 0 otherwise
+ */
+int
+htmlIsAutoClosed(htmlDocPtr doc, htmlNodePtr elem) {
+    htmlNodePtr child;
+
+    if (elem == NULL) return(1);
+    child = elem->children;
+    while (child != NULL) {
+	if (htmlAutoCloseTag(doc, elem->name, child)) return(1);
+	child = child->next;
+    }
+    return(0);
+}
+
+/**
+ * htmlCheckImplied:
+ * @ctxt:  an HTML parser context
+ * @newtag:  The new tag name
+ *
+ * The HTML DTD allows a tag to exists only implicitly
+ * called when a new tag has been detected and generates the
+ * appropriates implicit tags if missing
+ */
+static void
+htmlCheckImplied(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
+    int i;
+
+    if (ctxt->options & HTML_PARSE_NOIMPLIED)
+        return;
+    if (!htmlOmittedDefaultValue)
+	return;
+    if (xmlStrEqual(newtag, BAD_CAST"html"))
+	return;
+    if (ctxt->nameNr <= 0) {
+	htmlnamePush(ctxt, BAD_CAST"html");
+	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL))
+	    ctxt->sax->startElement(ctxt->userData, BAD_CAST"html", NULL);
+    }
+    if ((xmlStrEqual(newtag, BAD_CAST"body")) || (xmlStrEqual(newtag, BAD_CAST"head")))
+        return;
+    if ((ctxt->nameNr <= 1) &&
+        ((xmlStrEqual(newtag, BAD_CAST"script")) ||
+	 (xmlStrEqual(newtag, BAD_CAST"style")) ||
+	 (xmlStrEqual(newtag, BAD_CAST"meta")) ||
+	 (xmlStrEqual(newtag, BAD_CAST"link")) ||
+	 (xmlStrEqual(newtag, BAD_CAST"title")) ||
+	 (xmlStrEqual(newtag, BAD_CAST"base")))) {
+        if (ctxt->html >= 3) {
+            /* we already saw or generated an <head> before */
+            return;
+        }
+        /*
+         * dropped OBJECT ... i you put it first BODY will be
+         * assumed !
+         */
+        htmlnamePush(ctxt, BAD_CAST"head");
+        if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL))
+            ctxt->sax->startElement(ctxt->userData, BAD_CAST"head", NULL);
+    } else if ((!xmlStrEqual(newtag, BAD_CAST"noframes")) &&
+	       (!xmlStrEqual(newtag, BAD_CAST"frame")) &&
+	       (!xmlStrEqual(newtag, BAD_CAST"frameset"))) {
+        if (ctxt->html >= 10) {
+            /* we already saw or generated a <body> before */
+            return;
+        }
+	for (i = 0;i < ctxt->nameNr;i++) {
+	    if (xmlStrEqual(ctxt->nameTab[i], BAD_CAST"body")) {
+		return;
+	    }
+	    if (xmlStrEqual(ctxt->nameTab[i], BAD_CAST"head")) {
+		return;
+	    }
+	}
+
+	htmlnamePush(ctxt, BAD_CAST"body");
+	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL))
+	    ctxt->sax->startElement(ctxt->userData, BAD_CAST"body", NULL);
+    }
+}
+
+/**
+ * htmlCheckParagraph
+ * @ctxt:  an HTML parser context
+ *
+ * Check whether a p element need to be implied before inserting
+ * characters in the current element.
+ *
+ * Returns 1 if a paragraph has been inserted, 0 if not and -1
+ *         in case of error.
+ */
+
+static int
+htmlCheckParagraph(htmlParserCtxtPtr ctxt) {
+    const xmlChar *tag;
+    int i;
+
+    if (ctxt == NULL)
+	return(-1);
+    tag = ctxt->name;
+    if (tag == NULL) {
+	htmlAutoClose(ctxt, BAD_CAST"p");
+	htmlCheckImplied(ctxt, BAD_CAST"p");
+	htmlnamePush(ctxt, BAD_CAST"p");
+	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL))
+	    ctxt->sax->startElement(ctxt->userData, BAD_CAST"p", NULL);
+	return(1);
+    }
+    if (!htmlOmittedDefaultValue)
+	return(0);
+    for (i = 0; htmlNoContentElements[i] != NULL; i++) {
+	if (xmlStrEqual(tag, BAD_CAST htmlNoContentElements[i])) {
+	    htmlAutoClose(ctxt, BAD_CAST"p");
+	    htmlCheckImplied(ctxt, BAD_CAST"p");
+	    htmlnamePush(ctxt, BAD_CAST"p");
+	    if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL))
+		ctxt->sax->startElement(ctxt->userData, BAD_CAST"p", NULL);
+	    return(1);
+	}
+    }
+    return(0);
+}
+
+/**
+ * htmlIsScriptAttribute:
+ * @name:  an attribute name
+ *
+ * Check if an attribute is of content type Script
+ *
+ * Returns 1 is the attribute is a script 0 otherwise
+ */
+int
+htmlIsScriptAttribute(const xmlChar *name) {
+    unsigned int i;
+
+    if (name == NULL)
+      return(0);
+    /*
+     * all script attributes start with 'on'
+     */
+    if ((name[0] != 'o') || (name[1] != 'n'))
+      return(0);
+    for (i = 0;
+	 i < sizeof(htmlScriptAttributes)/sizeof(htmlScriptAttributes[0]);
+	 i++) {
+	if (xmlStrEqual(name, (const xmlChar *) htmlScriptAttributes[i]))
+	    return(1);
+    }
+    return(0);
+}
+
+/************************************************************************
+ *									*
+ *	The list of HTML predefined entities			*
+ *									*
+ ************************************************************************/
+
+
+static const htmlEntityDesc  html40EntitiesTable[] = {
+/*
+ * the 4 absolute ones, plus apostrophe.
+ */
+{ 34,	"quot",	"quotation mark = APL quote, U+0022 ISOnum" },
+{ 38,	"amp",	"ampersand, U+0026 ISOnum" },
+{ 39,	"apos",	"single quote" },
+{ 60,	"lt",	"less-than sign, U+003C ISOnum" },
+{ 62,	"gt",	"greater-than sign, U+003E ISOnum" },
+
+/*
+ * A bunch still in the 128-255 range
+ * Replacing them depend really on the charset used.
+ */
+{ 160,	"nbsp",	"no-break space = non-breaking space, U+00A0 ISOnum" },
+{ 161,	"iexcl","inverted exclamation mark, U+00A1 ISOnum" },
+{ 162,	"cent",	"cent sign, U+00A2 ISOnum" },
+{ 163,	"pound","pound sign, U+00A3 ISOnum" },
+{ 164,	"curren","currency sign, U+00A4 ISOnum" },
+{ 165,	"yen",	"yen sign = yuan sign, U+00A5 ISOnum" },
+{ 166,	"brvbar","broken bar = broken vertical bar, U+00A6 ISOnum" },
+{ 167,	"sect",	"section sign, U+00A7 ISOnum" },
+{ 168,	"uml",	"diaeresis = spacing diaeresis, U+00A8 ISOdia" },
+{ 169,	"copy",	"copyright sign, U+00A9 ISOnum" },
+{ 170,	"ordf",	"feminine ordinal indicator, U+00AA ISOnum" },
+{ 171,	"laquo","left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum" },
+{ 172,	"not",	"not sign, U+00AC ISOnum" },
+{ 173,	"shy",	"soft hyphen = discretionary hyphen, U+00AD ISOnum" },
+{ 174,	"reg",	"registered sign = registered trade mark sign, U+00AE ISOnum" },
+{ 175,	"macr",	"macron = spacing macron = overline = APL overbar, U+00AF ISOdia" },
+{ 176,	"deg",	"degree sign, U+00B0 ISOnum" },
+{ 177,	"plusmn","plus-minus sign = plus-or-minus sign, U+00B1 ISOnum" },
+{ 178,	"sup2",	"superscript two = superscript digit two = squared, U+00B2 ISOnum" },
+{ 179,	"sup3",	"superscript three = superscript digit three = cubed, U+00B3 ISOnum" },
+{ 180,	"acute","acute accent = spacing acute, U+00B4 ISOdia" },
+{ 181,	"micro","micro sign, U+00B5 ISOnum" },
+{ 182,	"para",	"pilcrow sign = paragraph sign, U+00B6 ISOnum" },
+{ 183,	"middot","middle dot = Georgian comma Greek middle dot, U+00B7 ISOnum" },
+{ 184,	"cedil","cedilla = spacing cedilla, U+00B8 ISOdia" },
+{ 185,	"sup1",	"superscript one = superscript digit one, U+00B9 ISOnum" },
+{ 186,	"ordm",	"masculine ordinal indicator, U+00BA ISOnum" },
+{ 187,	"raquo","right-pointing double angle quotation mark right pointing guillemet, U+00BB ISOnum" },
+{ 188,	"frac14","vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum" },
+{ 189,	"frac12","vulgar fraction one half = fraction one half, U+00BD ISOnum" },
+{ 190,	"frac34","vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum" },
+{ 191,	"iquest","inverted question mark = turned question mark, U+00BF ISOnum" },
+{ 192,	"Agrave","latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1" },
+{ 193,	"Aacute","latin capital letter A with acute, U+00C1 ISOlat1" },
+{ 194,	"Acirc","latin capital letter A with circumflex, U+00C2 ISOlat1" },
+{ 195,	"Atilde","latin capital letter A with tilde, U+00C3 ISOlat1" },
+{ 196,	"Auml",	"latin capital letter A with diaeresis, U+00C4 ISOlat1" },
+{ 197,	"Aring","latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1" },
+{ 198,	"AElig","latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1" },
+{ 199,	"Ccedil","latin capital letter C with cedilla, U+00C7 ISOlat1" },
+{ 200,	"Egrave","latin capital letter E with grave, U+00C8 ISOlat1" },
+{ 201,	"Eacute","latin capital letter E with acute, U+00C9 ISOlat1" },
+{ 202,	"Ecirc","latin capital letter E with circumflex, U+00CA ISOlat1" },
+{ 203,	"Euml",	"latin capital letter E with diaeresis, U+00CB ISOlat1" },
+{ 204,	"Igrave","latin capital letter I with grave, U+00CC ISOlat1" },
+{ 205,	"Iacute","latin capital letter I with acute, U+00CD ISOlat1" },
+{ 206,	"Icirc","latin capital letter I with circumflex, U+00CE ISOlat1" },
+{ 207,	"Iuml",	"latin capital letter I with diaeresis, U+00CF ISOlat1" },
+{ 208,	"ETH",	"latin capital letter ETH, U+00D0 ISOlat1" },
+{ 209,	"Ntilde","latin capital letter N with tilde, U+00D1 ISOlat1" },
+{ 210,	"Ograve","latin capital letter O with grave, U+00D2 ISOlat1" },
+{ 211,	"Oacute","latin capital letter O with acute, U+00D3 ISOlat1" },
+{ 212,	"Ocirc","latin capital letter O with circumflex, U+00D4 ISOlat1" },
+{ 213,	"Otilde","latin capital letter O with tilde, U+00D5 ISOlat1" },
+{ 214,	"Ouml",	"latin capital letter O with diaeresis, U+00D6 ISOlat1" },
+{ 215,	"times","multiplication sign, U+00D7 ISOnum" },
+{ 216,	"Oslash","latin capital letter O with stroke latin capital letter O slash, U+00D8 ISOlat1" },
+{ 217,	"Ugrave","latin capital letter U with grave, U+00D9 ISOlat1" },
+{ 218,	"Uacute","latin capital letter U with acute, U+00DA ISOlat1" },
+{ 219,	"Ucirc","latin capital letter U with circumflex, U+00DB ISOlat1" },
+{ 220,	"Uuml",	"latin capital letter U with diaeresis, U+00DC ISOlat1" },
+{ 221,	"Yacute","latin capital letter Y with acute, U+00DD ISOlat1" },
+{ 222,	"THORN","latin capital letter THORN, U+00DE ISOlat1" },
+{ 223,	"szlig","latin small letter sharp s = ess-zed, U+00DF ISOlat1" },
+{ 224,	"agrave","latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1" },
+{ 225,	"aacute","latin small letter a with acute, U+00E1 ISOlat1" },
+{ 226,	"acirc","latin small letter a with circumflex, U+00E2 ISOlat1" },
+{ 227,	"atilde","latin small letter a with tilde, U+00E3 ISOlat1" },
+{ 228,	"auml",	"latin small letter a with diaeresis, U+00E4 ISOlat1" },
+{ 229,	"aring","latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1" },
+{ 230,	"aelig","latin small letter ae = latin small ligature ae, U+00E6 ISOlat1" },
+{ 231,	"ccedil","latin small letter c with cedilla, U+00E7 ISOlat1" },
+{ 232,	"egrave","latin small letter e with grave, U+00E8 ISOlat1" },
+{ 233,	"eacute","latin small letter e with acute, U+00E9 ISOlat1" },
+{ 234,	"ecirc","latin small letter e with circumflex, U+00EA ISOlat1" },
+{ 235,	"euml",	"latin small letter e with diaeresis, U+00EB ISOlat1" },
+{ 236,	"igrave","latin small letter i with grave, U+00EC ISOlat1" },
+{ 237,	"iacute","latin small letter i with acute, U+00ED ISOlat1" },
+{ 238,	"icirc","latin small letter i with circumflex, U+00EE ISOlat1" },
+{ 239,	"iuml",	"latin small letter i with diaeresis, U+00EF ISOlat1" },
+{ 240,	"eth",	"latin small letter eth, U+00F0 ISOlat1" },
+{ 241,	"ntilde","latin small letter n with tilde, U+00F1 ISOlat1" },
+{ 242,	"ograve","latin small letter o with grave, U+00F2 ISOlat1" },
+{ 243,	"oacute","latin small letter o with acute, U+00F3 ISOlat1" },
+{ 244,	"ocirc","latin small letter o with circumflex, U+00F4 ISOlat1" },
+{ 245,	"otilde","latin small letter o with tilde, U+00F5 ISOlat1" },
+{ 246,	"ouml",	"latin small letter o with diaeresis, U+00F6 ISOlat1" },
+{ 247,	"divide","division sign, U+00F7 ISOnum" },
+{ 248,	"oslash","latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1" },
+{ 249,	"ugrave","latin small letter u with grave, U+00F9 ISOlat1" },
+{ 250,	"uacute","latin small letter u with acute, U+00FA ISOlat1" },
+{ 251,	"ucirc","latin small letter u with circumflex, U+00FB ISOlat1" },
+{ 252,	"uuml",	"latin small letter u with diaeresis, U+00FC ISOlat1" },
+{ 253,	"yacute","latin small letter y with acute, U+00FD ISOlat1" },
+{ 254,	"thorn","latin small letter thorn with, U+00FE ISOlat1" },
+{ 255,	"yuml",	"latin small letter y with diaeresis, U+00FF ISOlat1" },
+
+{ 338,	"OElig","latin capital ligature OE, U+0152 ISOlat2" },
+{ 339,	"oelig","latin small ligature oe, U+0153 ISOlat2" },
+{ 352,	"Scaron","latin capital letter S with caron, U+0160 ISOlat2" },
+{ 353,	"scaron","latin small letter s with caron, U+0161 ISOlat2" },
+{ 376,	"Yuml",	"latin capital letter Y with diaeresis, U+0178 ISOlat2" },
+
+/*
+ * Anything below should really be kept as entities references
+ */
+{ 402,	"fnof",	"latin small f with hook = function = florin, U+0192 ISOtech" },
+
+{ 710,	"circ",	"modifier letter circumflex accent, U+02C6 ISOpub" },
+{ 732,	"tilde","small tilde, U+02DC ISOdia" },
+
+{ 913,	"Alpha","greek capital letter alpha, U+0391" },
+{ 914,	"Beta",	"greek capital letter beta, U+0392" },
+{ 915,	"Gamma","greek capital letter gamma, U+0393 ISOgrk3" },
+{ 916,	"Delta","greek capital letter delta, U+0394 ISOgrk3" },
+{ 917,	"Epsilon","greek capital letter epsilon, U+0395" },
+{ 918,	"Zeta",	"greek capital letter zeta, U+0396" },
+{ 919,	"Eta",	"greek capital letter eta, U+0397" },
+{ 920,	"Theta","greek capital letter theta, U+0398 ISOgrk3" },
+{ 921,	"Iota",	"greek capital letter iota, U+0399" },
+{ 922,	"Kappa","greek capital letter kappa, U+039A" },
+{ 923,	"Lambda", "greek capital letter lambda, U+039B ISOgrk3" },
+{ 924,	"Mu",	"greek capital letter mu, U+039C" },
+{ 925,	"Nu",	"greek capital letter nu, U+039D" },
+{ 926,	"Xi",	"greek capital letter xi, U+039E ISOgrk3" },
+{ 927,	"Omicron","greek capital letter omicron, U+039F" },
+{ 928,	"Pi",	"greek capital letter pi, U+03A0 ISOgrk3" },
+{ 929,	"Rho",	"greek capital letter rho, U+03A1" },
+{ 931,	"Sigma","greek capital letter sigma, U+03A3 ISOgrk3" },
+{ 932,	"Tau",	"greek capital letter tau, U+03A4" },
+{ 933,	"Upsilon","greek capital letter upsilon, U+03A5 ISOgrk3" },
+{ 934,	"Phi",	"greek capital letter phi, U+03A6 ISOgrk3" },
+{ 935,	"Chi",	"greek capital letter chi, U+03A7" },
+{ 936,	"Psi",	"greek capital letter psi, U+03A8 ISOgrk3" },
+{ 937,	"Omega","greek capital letter omega, U+03A9 ISOgrk3" },
+
+{ 945,	"alpha","greek small letter alpha, U+03B1 ISOgrk3" },
+{ 946,	"beta",	"greek small letter beta, U+03B2 ISOgrk3" },
+{ 947,	"gamma","greek small letter gamma, U+03B3 ISOgrk3" },
+{ 948,	"delta","greek small letter delta, U+03B4 ISOgrk3" },
+{ 949,	"epsilon","greek small letter epsilon, U+03B5 ISOgrk3" },
+{ 950,	"zeta",	"greek small letter zeta, U+03B6 ISOgrk3" },
+{ 951,	"eta",	"greek small letter eta, U+03B7 ISOgrk3" },
+{ 952,	"theta","greek small letter theta, U+03B8 ISOgrk3" },
+{ 953,	"iota",	"greek small letter iota, U+03B9 ISOgrk3" },
+{ 954,	"kappa","greek small letter kappa, U+03BA ISOgrk3" },
+{ 955,	"lambda","greek small letter lambda, U+03BB ISOgrk3" },
+{ 956,	"mu",	"greek small letter mu, U+03BC ISOgrk3" },
+{ 957,	"nu",	"greek small letter nu, U+03BD ISOgrk3" },
+{ 958,	"xi",	"greek small letter xi, U+03BE ISOgrk3" },
+{ 959,	"omicron","greek small letter omicron, U+03BF NEW" },
+{ 960,	"pi",	"greek small letter pi, U+03C0 ISOgrk3" },
+{ 961,	"rho",	"greek small letter rho, U+03C1 ISOgrk3" },
+{ 962,	"sigmaf","greek small letter final sigma, U+03C2 ISOgrk3" },
+{ 963,	"sigma","greek small letter sigma, U+03C3 ISOgrk3" },
+{ 964,	"tau",	"greek small letter tau, U+03C4 ISOgrk3" },
+{ 965,	"upsilon","greek small letter upsilon, U+03C5 ISOgrk3" },
+{ 966,	"phi",	"greek small letter phi, U+03C6 ISOgrk3" },
+{ 967,	"chi",	"greek small letter chi, U+03C7 ISOgrk3" },
+{ 968,	"psi",	"greek small letter psi, U+03C8 ISOgrk3" },
+{ 969,	"omega","greek small letter omega, U+03C9 ISOgrk3" },
+{ 977,	"thetasym","greek small letter theta symbol, U+03D1 NEW" },
+{ 978,	"upsih","greek upsilon with hook symbol, U+03D2 NEW" },
+{ 982,	"piv",	"greek pi symbol, U+03D6 ISOgrk3" },
+
+{ 8194,	"ensp",	"en space, U+2002 ISOpub" },
+{ 8195,	"emsp",	"em space, U+2003 ISOpub" },
+{ 8201,	"thinsp","thin space, U+2009 ISOpub" },
+{ 8204,	"zwnj",	"zero width non-joiner, U+200C NEW RFC 2070" },
+{ 8205,	"zwj",	"zero width joiner, U+200D NEW RFC 2070" },
+{ 8206,	"lrm",	"left-to-right mark, U+200E NEW RFC 2070" },
+{ 8207,	"rlm",	"right-to-left mark, U+200F NEW RFC 2070" },
+{ 8211,	"ndash","en dash, U+2013 ISOpub" },
+{ 8212,	"mdash","em dash, U+2014 ISOpub" },
+{ 8216,	"lsquo","left single quotation mark, U+2018 ISOnum" },
+{ 8217,	"rsquo","right single quotation mark, U+2019 ISOnum" },
+{ 8218,	"sbquo","single low-9 quotation mark, U+201A NEW" },
+{ 8220,	"ldquo","left double quotation mark, U+201C ISOnum" },
+{ 8221,	"rdquo","right double quotation mark, U+201D ISOnum" },
+{ 8222,	"bdquo","double low-9 quotation mark, U+201E NEW" },
+{ 8224,	"dagger","dagger, U+2020 ISOpub" },
+{ 8225,	"Dagger","double dagger, U+2021 ISOpub" },
+
+{ 8226,	"bull",	"bullet = black small circle, U+2022 ISOpub" },
+{ 8230,	"hellip","horizontal ellipsis = three dot leader, U+2026 ISOpub" },
+
+{ 8240,	"permil","per mille sign, U+2030 ISOtech" },
+
+{ 8242,	"prime","prime = minutes = feet, U+2032 ISOtech" },
+{ 8243,	"Prime","double prime = seconds = inches, U+2033 ISOtech" },
+
+{ 8249,	"lsaquo","single left-pointing angle quotation mark, U+2039 ISO proposed" },
+{ 8250,	"rsaquo","single right-pointing angle quotation mark, U+203A ISO proposed" },
+
+{ 8254,	"oline","overline = spacing overscore, U+203E NEW" },
+{ 8260,	"frasl","fraction slash, U+2044 NEW" },
+
+{ 8364,	"euro",	"euro sign, U+20AC NEW" },
+
+{ 8465,	"image","blackletter capital I = imaginary part, U+2111 ISOamso" },
+{ 8472,	"weierp","script capital P = power set = Weierstrass p, U+2118 ISOamso" },
+{ 8476,	"real",	"blackletter capital R = real part symbol, U+211C ISOamso" },
+{ 8482,	"trade","trade mark sign, U+2122 ISOnum" },
+{ 8501,	"alefsym","alef symbol = first transfinite cardinal, U+2135 NEW" },
+{ 8592,	"larr",	"leftwards arrow, U+2190 ISOnum" },
+{ 8593,	"uarr",	"upwards arrow, U+2191 ISOnum" },
+{ 8594,	"rarr",	"rightwards arrow, U+2192 ISOnum" },
+{ 8595,	"darr",	"downwards arrow, U+2193 ISOnum" },
+{ 8596,	"harr",	"left right arrow, U+2194 ISOamsa" },
+{ 8629,	"crarr","downwards arrow with corner leftwards = carriage return, U+21B5 NEW" },
+{ 8656,	"lArr",	"leftwards double arrow, U+21D0 ISOtech" },
+{ 8657,	"uArr",	"upwards double arrow, U+21D1 ISOamsa" },
+{ 8658,	"rArr",	"rightwards double arrow, U+21D2 ISOtech" },
+{ 8659,	"dArr",	"downwards double arrow, U+21D3 ISOamsa" },
+{ 8660,	"hArr",	"left right double arrow, U+21D4 ISOamsa" },
+
+{ 8704,	"forall","for all, U+2200 ISOtech" },
+{ 8706,	"part",	"partial differential, U+2202 ISOtech" },
+{ 8707,	"exist","there exists, U+2203 ISOtech" },
+{ 8709,	"empty","empty set = null set = diameter, U+2205 ISOamso" },
+{ 8711,	"nabla","nabla = backward difference, U+2207 ISOtech" },
+{ 8712,	"isin",	"element of, U+2208 ISOtech" },
+{ 8713,	"notin","not an element of, U+2209 ISOtech" },
+{ 8715,	"ni",	"contains as member, U+220B ISOtech" },
+{ 8719,	"prod",	"n-ary product = product sign, U+220F ISOamsb" },
+{ 8721,	"sum",	"n-ary summation, U+2211 ISOamsb" },
+{ 8722,	"minus","minus sign, U+2212 ISOtech" },
+{ 8727,	"lowast","asterisk operator, U+2217 ISOtech" },
+{ 8730,	"radic","square root = radical sign, U+221A ISOtech" },
+{ 8733,	"prop",	"proportional to, U+221D ISOtech" },
+{ 8734,	"infin","infinity, U+221E ISOtech" },
+{ 8736,	"ang",	"angle, U+2220 ISOamso" },
+{ 8743,	"and",	"logical and = wedge, U+2227 ISOtech" },
+{ 8744,	"or",	"logical or = vee, U+2228 ISOtech" },
+{ 8745,	"cap",	"intersection = cap, U+2229 ISOtech" },
+{ 8746,	"cup",	"union = cup, U+222A ISOtech" },
+{ 8747,	"int",	"integral, U+222B ISOtech" },
+{ 8756,	"there4","therefore, U+2234 ISOtech" },
+{ 8764,	"sim",	"tilde operator = varies with = similar to, U+223C ISOtech" },
+{ 8773,	"cong",	"approximately equal to, U+2245 ISOtech" },
+{ 8776,	"asymp","almost equal to = asymptotic to, U+2248 ISOamsr" },
+{ 8800,	"ne",	"not equal to, U+2260 ISOtech" },
+{ 8801,	"equiv","identical to, U+2261 ISOtech" },
+{ 8804,	"le",	"less-than or equal to, U+2264 ISOtech" },
+{ 8805,	"ge",	"greater-than or equal to, U+2265 ISOtech" },
+{ 8834,	"sub",	"subset of, U+2282 ISOtech" },
+{ 8835,	"sup",	"superset of, U+2283 ISOtech" },
+{ 8836,	"nsub",	"not a subset of, U+2284 ISOamsn" },
+{ 8838,	"sube",	"subset of or equal to, U+2286 ISOtech" },
+{ 8839,	"supe",	"superset of or equal to, U+2287 ISOtech" },
+{ 8853,	"oplus","circled plus = direct sum, U+2295 ISOamsb" },
+{ 8855,	"otimes","circled times = vector product, U+2297 ISOamsb" },
+{ 8869,	"perp",	"up tack = orthogonal to = perpendicular, U+22A5 ISOtech" },
+{ 8901,	"sdot",	"dot operator, U+22C5 ISOamsb" },
+{ 8968,	"lceil","left ceiling = apl upstile, U+2308 ISOamsc" },
+{ 8969,	"rceil","right ceiling, U+2309 ISOamsc" },
+{ 8970,	"lfloor","left floor = apl downstile, U+230A ISOamsc" },
+{ 8971,	"rfloor","right floor, U+230B ISOamsc" },
+{ 9001,	"lang",	"left-pointing angle bracket = bra, U+2329 ISOtech" },
+{ 9002,	"rang",	"right-pointing angle bracket = ket, U+232A ISOtech" },
+{ 9674,	"loz",	"lozenge, U+25CA ISOpub" },
+
+{ 9824,	"spades","black spade suit, U+2660 ISOpub" },
+{ 9827,	"clubs","black club suit = shamrock, U+2663 ISOpub" },
+{ 9829,	"hearts","black heart suit = valentine, U+2665 ISOpub" },
+{ 9830,	"diams","black diamond suit, U+2666 ISOpub" },
+
+};
+
+/************************************************************************
+ *									*
+ *		Commodity functions to handle entities			*
+ *									*
+ ************************************************************************/
+
+/*
+ * Macro used to grow the current buffer.
+ */
+#define growBuffer(buffer) {						\
+    xmlChar *tmp;							\
+    buffer##_size *= 2;							\
+    tmp = (xmlChar *) xmlRealloc(buffer, buffer##_size * sizeof(xmlChar)); \
+    if (tmp == NULL) {						\
+	htmlErrMemory(ctxt, "growing buffer\n");			\
+	xmlFree(buffer);						\
+	return(NULL);							\
+    }									\
+    buffer = tmp;							\
+}
+
+/**
+ * htmlEntityLookup:
+ * @name: the entity name
+ *
+ * Lookup the given entity in EntitiesTable
+ *
+ * TODO: the linear scan is really ugly, an hash table is really needed.
+ *
+ * Returns the associated htmlEntityDescPtr if found, NULL otherwise.
+ */
+const htmlEntityDesc *
+htmlEntityLookup(const xmlChar *name) {
+    unsigned int i;
+
+    for (i = 0;i < (sizeof(html40EntitiesTable)/
+                    sizeof(html40EntitiesTable[0]));i++) {
+        if (xmlStrEqual(name, BAD_CAST html40EntitiesTable[i].name)) {
+            return((htmlEntityDescPtr) &html40EntitiesTable[i]);
+	}
+    }
+    return(NULL);
+}
+
+/**
+ * htmlEntityValueLookup:
+ * @value: the entity's unicode value
+ *
+ * Lookup the given entity in EntitiesTable
+ *
+ * TODO: the linear scan is really ugly, an hash table is really needed.
+ *
+ * Returns the associated htmlEntityDescPtr if found, NULL otherwise.
+ */
+const htmlEntityDesc *
+htmlEntityValueLookup(unsigned int value) {
+    unsigned int i;
+
+    for (i = 0;i < (sizeof(html40EntitiesTable)/
+                    sizeof(html40EntitiesTable[0]));i++) {
+        if (html40EntitiesTable[i].value >= value) {
+	    if (html40EntitiesTable[i].value > value)
+		break;
+            return((htmlEntityDescPtr) &html40EntitiesTable[i]);
+	}
+    }
+    return(NULL);
+}
+
+/**
+ * UTF8ToHtml:
+ * @out:  a pointer to an array of bytes to store the result
+ * @outlen:  the length of @out
+ * @in:  a pointer to an array of UTF-8 chars
+ * @inlen:  the length of @in
+ *
+ * Take a block of UTF-8 chars in and try to convert it to an ASCII
+ * plus HTML entities block of chars out.
+ *
+ * Returns 0 if success, -2 if the transcoding fails, or -1 otherwise
+ * The value of @inlen after return is the number of octets consumed
+ *     as the return value is positive, else unpredictable.
+ * The value of @outlen after return is the number of octets consumed.
+ */
+int
+UTF8ToHtml(unsigned char* out, int *outlen,
+              const unsigned char* in, int *inlen) {
+    const unsigned char* processed = in;
+    const unsigned char* outend;
+    const unsigned char* outstart = out;
+    const unsigned char* instart = in;
+    const unsigned char* inend;
+    unsigned int c, d;
+    int trailing;
+
+    if ((out == NULL) || (outlen == NULL) || (inlen == NULL)) return(-1);
+    if (in == NULL) {
+        /*
+	 * initialization nothing to do
+	 */
+	*outlen = 0;
+	*inlen = 0;
+	return(0);
+    }
+    inend = in + (*inlen);
+    outend = out + (*outlen);
+    while (in < inend) {
+	d = *in++;
+	if      (d < 0x80)  { c= d; trailing= 0; }
+	else if (d < 0xC0) {
+	    /* trailing byte in leading position */
+	    *outlen = out - outstart;
+	    *inlen = processed - instart;
+	    return(-2);
+        } else if (d < 0xE0)  { c= d & 0x1F; trailing= 1; }
+        else if (d < 0xF0)  { c= d & 0x0F; trailing= 2; }
+        else if (d < 0xF8)  { c= d & 0x07; trailing= 3; }
+	else {
+	    /* no chance for this in Ascii */
+	    *outlen = out - outstart;
+	    *inlen = processed - instart;
+	    return(-2);
+	}
+
+	if (inend - in < trailing) {
+	    break;
+	}
+
+	for ( ; trailing; trailing--) {
+	    if ((in >= inend) || (((d= *in++) & 0xC0) != 0x80))
+		break;
+	    c <<= 6;
+	    c |= d & 0x3F;
+	}
+
+	/* assertion: c is a single UTF-4 value */
+	if (c < 0x80) {
+	    if (out + 1 >= outend)
+		break;
+	    *out++ = c;
+	} else {
+	    int len;
+	    const htmlEntityDesc * ent;
+	    const char *cp;
+	    char nbuf[16];
+
+	    /*
+	     * Try to lookup a predefined HTML entity for it
+	     */
+
+	    ent = htmlEntityValueLookup(c);
+	    if (ent == NULL) {
+	      snprintf(nbuf, sizeof(nbuf), "#%u", c);
+	      cp = nbuf;
+	    }
+	    else
+	      cp = ent->name;
+	    len = strlen(cp);
+	    if (out + 2 + len >= outend)
+		break;
+	    *out++ = '&';
+	    memcpy(out, cp, len);
+	    out += len;
+	    *out++ = ';';
+	}
+	processed = in;
+    }
+    *outlen = out - outstart;
+    *inlen = processed - instart;
+    return(0);
+}
+
+/**
+ * htmlEncodeEntities:
+ * @out:  a pointer to an array of bytes to store the result
+ * @outlen:  the length of @out
+ * @in:  a pointer to an array of UTF-8 chars
+ * @inlen:  the length of @in
+ * @quoteChar: the quote character to escape (' or ") or zero.
+ *
+ * Take a block of UTF-8 chars in and try to convert it to an ASCII
+ * plus HTML entities block of chars out.
+ *
+ * Returns 0 if success, -2 if the transcoding fails, or -1 otherwise
+ * The value of @inlen after return is the number of octets consumed
+ *     as the return value is positive, else unpredictable.
+ * The value of @outlen after return is the number of octets consumed.
+ */
+int
+htmlEncodeEntities(unsigned char* out, int *outlen,
+		   const unsigned char* in, int *inlen, int quoteChar) {
+    const unsigned char* processed = in;
+    const unsigned char* outend;
+    const unsigned char* outstart = out;
+    const unsigned char* instart = in;
+    const unsigned char* inend;
+    unsigned int c, d;
+    int trailing;
+
+    if ((out == NULL) || (outlen == NULL) || (inlen == NULL) || (in == NULL))
+        return(-1);
+    outend = out + (*outlen);
+    inend = in + (*inlen);
+    while (in < inend) {
+	d = *in++;
+	if      (d < 0x80)  { c= d; trailing= 0; }
+	else if (d < 0xC0) {
+	    /* trailing byte in leading position */
+	    *outlen = out - outstart;
+	    *inlen = processed - instart;
+	    return(-2);
+        } else if (d < 0xE0)  { c= d & 0x1F; trailing= 1; }
+        else if (d < 0xF0)  { c= d & 0x0F; trailing= 2; }
+        else if (d < 0xF8)  { c= d & 0x07; trailing= 3; }
+	else {
+	    /* no chance for this in Ascii */
+	    *outlen = out - outstart;
+	    *inlen = processed - instart;
+	    return(-2);
+	}
+
+	if (inend - in < trailing)
+	    break;
+
+	while (trailing--) {
+	    if (((d= *in++) & 0xC0) != 0x80) {
+		*outlen = out - outstart;
+		*inlen = processed - instart;
+		return(-2);
+	    }
+	    c <<= 6;
+	    c |= d & 0x3F;
+	}
+
+	/* assertion: c is a single UTF-4 value */
+	if ((c < 0x80) && (c != (unsigned int) quoteChar) &&
+	    (c != '&') && (c != '<') && (c != '>')) {
+	    if (out >= outend)
+		break;
+	    *out++ = c;
+	} else {
+	    const htmlEntityDesc * ent;
+	    const char *cp;
+	    char nbuf[16];
+	    int len;
+
+	    /*
+	     * Try to lookup a predefined HTML entity for it
+	     */
+	    ent = htmlEntityValueLookup(c);
+	    if (ent == NULL) {
+		snprintf(nbuf, sizeof(nbuf), "#%u", c);
+		cp = nbuf;
+	    }
+	    else
+		cp = ent->name;
+	    len = strlen(cp);
+	    if (out + 2 + len > outend)
+		break;
+	    *out++ = '&';
+	    memcpy(out, cp, len);
+	    out += len;
+	    *out++ = ';';
+	}
+	processed = in;
+    }
+    *outlen = out - outstart;
+    *inlen = processed - instart;
+    return(0);
+}
+
+/************************************************************************
+ *									*
+ *		Commodity functions to handle streams			*
+ *									*
+ ************************************************************************/
+
+#ifdef LIBXML_PUSH_ENABLED
+/**
+ * htmlNewInputStream:
+ * @ctxt:  an HTML parser context
+ *
+ * Create a new input stream structure
+ * Returns the new input stream or NULL
+ */
+static htmlParserInputPtr
+htmlNewInputStream(htmlParserCtxtPtr ctxt) {
+    htmlParserInputPtr input;
+
+    input = (xmlParserInputPtr) xmlMalloc(sizeof(htmlParserInput));
+    if (input == NULL) {
+        htmlErrMemory(ctxt, "couldn't allocate a new input stream\n");
+	return(NULL);
+    }
+    memset(input, 0, sizeof(htmlParserInput));
+    input->filename = NULL;
+    input->directory = NULL;
+    input->base = NULL;
+    input->cur = NULL;
+    input->buf = NULL;
+    input->line = 1;
+    input->col = 1;
+    input->buf = NULL;
+    input->free = NULL;
+    input->version = NULL;
+    input->consumed = 0;
+    input->length = 0;
+    return(input);
+}
+#endif
+
+
+/************************************************************************
+ *									*
+ *		Commodity functions, cleanup needed ?			*
+ *									*
+ ************************************************************************/
+/*
+ * all tags allowing pc data from the html 4.01 loose dtd
+ * NOTE: it might be more appropriate to integrate this information
+ * into the html40ElementTable array but I don't want to risk any
+ * binary incompatibility
+ */
+static const char *allowPCData[] = {
+    "a", "abbr", "acronym", "address", "applet", "b", "bdo", "big",
+    "blockquote", "body", "button", "caption", "center", "cite", "code",
+    "dd", "del", "dfn", "div", "dt", "em", "font", "form", "h1", "h2",
+    "h3", "h4", "h5", "h6", "i", "iframe", "ins", "kbd", "label", "legend",
+    "li", "noframes", "noscript", "object", "p", "pre", "q", "s", "samp",
+    "small", "span", "strike", "strong", "td", "th", "tt", "u", "var"
+};
+
+/**
+ * areBlanks:
+ * @ctxt:  an HTML parser context
+ * @str:  a xmlChar *
+ * @len:  the size of @str
+ *
+ * Is this a sequence of blank chars that one can ignore ?
+ *
+ * Returns 1 if ignorable 0 otherwise.
+ */
+
+static int areBlanks(htmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
+    unsigned int i;
+    int j;
+    xmlNodePtr lastChild;
+    xmlDtdPtr dtd;
+
+    for (j = 0;j < len;j++)
+        if (!(IS_BLANK_CH(str[j]))) return(0);
+
+    if (CUR == 0) return(1);
+    if (CUR != '<') return(0);
+    if (ctxt->name == NULL)
+	return(1);
+    if (xmlStrEqual(ctxt->name, BAD_CAST"html"))
+	return(1);
+    if (xmlStrEqual(ctxt->name, BAD_CAST"head"))
+	return(1);
+
+    /* Only strip CDATA children of the body tag for strict HTML DTDs */
+    if (xmlStrEqual(ctxt->name, BAD_CAST "body") && ctxt->myDoc != NULL) {
+        dtd = xmlGetIntSubset(ctxt->myDoc);
+        if (dtd != NULL && dtd->ExternalID != NULL) {
+            if (!xmlStrcasecmp(dtd->ExternalID, BAD_CAST "-//W3C//DTD HTML 4.01//EN") ||
+                    !xmlStrcasecmp(dtd->ExternalID, BAD_CAST "-//W3C//DTD HTML 4//EN"))
+                return(1);
+        }
+    }
+
+    if (ctxt->node == NULL) return(0);
+    lastChild = xmlGetLastChild(ctxt->node);
+    while ((lastChild) && (lastChild->type == XML_COMMENT_NODE))
+	lastChild = lastChild->prev;
+    if (lastChild == NULL) {
+        if ((ctxt->node->type != XML_ELEMENT_NODE) &&
+            (ctxt->node->content != NULL)) return(0);
+	/* keep ws in constructs like ...<b> </b>...
+	   for all tags "b" allowing PCDATA */
+	for ( i = 0; i < sizeof(allowPCData)/sizeof(allowPCData[0]); i++ ) {
+	    if ( xmlStrEqual(ctxt->name, BAD_CAST allowPCData[i]) ) {
+		return(0);
+	    }
+	}
+    } else if (xmlNodeIsText(lastChild)) {
+        return(0);
+    } else {
+	/* keep ws in constructs like <p><b>xy</b> <i>z</i><p>
+	   for all tags "p" allowing PCDATA */
+	for ( i = 0; i < sizeof(allowPCData)/sizeof(allowPCData[0]); i++ ) {
+	    if ( xmlStrEqual(lastChild->name, BAD_CAST allowPCData[i]) ) {
+		return(0);
+	    }
+	}
+    }
+    return(1);
+}
+
+/**
+ * htmlNewDocNoDtD:
+ * @URI:  URI for the dtd, or NULL
+ * @ExternalID:  the external ID of the DTD, or NULL
+ *
+ * Creates a new HTML document without a DTD node if @URI and @ExternalID
+ * are NULL
+ *
+ * Returns a new document, do not initialize the DTD if not provided
+ */
+htmlDocPtr
+htmlNewDocNoDtD(const xmlChar *URI, const xmlChar *ExternalID) {
+    xmlDocPtr cur;
+
+    /*
+     * Allocate a new document and fill the fields.
+     */
+    cur = (xmlDocPtr) xmlMalloc(sizeof(xmlDoc));
+    if (cur == NULL) {
+	htmlErrMemory(NULL, "HTML document creation failed\n");
+	return(NULL);
+    }
+    memset(cur, 0, sizeof(xmlDoc));
+
+    cur->type = XML_HTML_DOCUMENT_NODE;
+    cur->version = NULL;
+    cur->intSubset = NULL;
+    cur->doc = cur;
+    cur->name = NULL;
+    cur->children = NULL;
+    cur->extSubset = NULL;
+    cur->oldNs = NULL;
+    cur->encoding = NULL;
+    cur->standalone = 1;
+    cur->compression = 0;
+    cur->ids = NULL;
+    cur->refs = NULL;
+    cur->_private = NULL;
+    cur->charset = XML_CHAR_ENCODING_UTF8;
+    cur->properties = XML_DOC_HTML | XML_DOC_USERBUILT;
+    if ((ExternalID != NULL) ||
+	(URI != NULL))
+	xmlCreateIntSubset(cur, BAD_CAST "html", ExternalID, URI);
+    return(cur);
+}
+
+/**
+ * htmlNewDoc:
+ * @URI:  URI for the dtd, or NULL
+ * @ExternalID:  the external ID of the DTD, or NULL
+ *
+ * Creates a new HTML document
+ *
+ * Returns a new document
+ */
+htmlDocPtr
+htmlNewDoc(const xmlChar *URI, const xmlChar *ExternalID) {
+    if ((URI == NULL) && (ExternalID == NULL))
+	return(htmlNewDocNoDtD(
+		    BAD_CAST "http://www.w3.org/TR/REC-html40/loose.dtd",
+		    BAD_CAST "-//W3C//DTD HTML 4.0 Transitional//EN"));
+
+    return(htmlNewDocNoDtD(URI, ExternalID));
+}
+
+
+/************************************************************************
+ *									*
+ *			The parser itself				*
+ *	Relates to http://www.w3.org/TR/html40				*
+ *									*
+ ************************************************************************/
+
+/************************************************************************
+ *									*
+ *			The parser itself				*
+ *									*
+ ************************************************************************/
+
+static const xmlChar * htmlParseNameComplex(xmlParserCtxtPtr ctxt);
+
+/**
+ * htmlParseHTMLName:
+ * @ctxt:  an HTML parser context
+ *
+ * parse an HTML tag or attribute name, note that we convert it to lowercase
+ * since HTML names are not case-sensitive.
+ *
+ * Returns the Tag Name parsed or NULL
+ */
+
+static const xmlChar *
+htmlParseHTMLName(htmlParserCtxtPtr ctxt) {
+    int i = 0;
+    xmlChar loc[HTML_PARSER_BUFFER_SIZE];
+
+    if (!IS_ASCII_LETTER(CUR) && (CUR != '_') &&
+        (CUR != ':') && (CUR != '.')) return(NULL);
+
+    while ((i < HTML_PARSER_BUFFER_SIZE) &&
+           ((IS_ASCII_LETTER(CUR)) || (IS_ASCII_DIGIT(CUR)) ||
+	   (CUR == ':') || (CUR == '-') || (CUR == '_') ||
+           (CUR == '.'))) {
+	if ((CUR >= 'A') && (CUR <= 'Z')) loc[i] = CUR + 0x20;
+        else loc[i] = CUR;
+	i++;
+
+	NEXT;
+    }
+
+    return(xmlDictLookup(ctxt->dict, loc, i));
+}
+
+
+/**
+ * htmlParseHTMLName_nonInvasive:
+ * @ctxt:  an HTML parser context
+ *
+ * parse an HTML tag or attribute name, note that we convert it to lowercase
+ * since HTML names are not case-sensitive, this doesn't consume the data
+ * from the stream, it's a look-ahead
+ *
+ * Returns the Tag Name parsed or NULL
+ */
+
+static const xmlChar *
+htmlParseHTMLName_nonInvasive(htmlParserCtxtPtr ctxt) {
+    int i = 0;
+    xmlChar loc[HTML_PARSER_BUFFER_SIZE];
+
+    if (!IS_ASCII_LETTER(NXT(1)) && (NXT(1) != '_') &&
+        (NXT(1) != ':')) return(NULL);
+
+    while ((i < HTML_PARSER_BUFFER_SIZE) &&
+           ((IS_ASCII_LETTER(NXT(1+i))) || (IS_ASCII_DIGIT(NXT(1+i))) ||
+	   (NXT(1+i) == ':') || (NXT(1+i) == '-') || (NXT(1+i) == '_'))) {
+	if ((NXT(1+i) >= 'A') && (NXT(1+i) <= 'Z')) loc[i] = NXT(1+i) + 0x20;
+        else loc[i] = NXT(1+i);
+	i++;
+    }
+
+    return(xmlDictLookup(ctxt->dict, loc, i));
+}
+
+
+/**
+ * htmlParseName:
+ * @ctxt:  an HTML parser context
+ *
+ * parse an HTML name, this routine is case sensitive.
+ *
+ * Returns the Name parsed or NULL
+ */
+
+static const xmlChar *
+htmlParseName(htmlParserCtxtPtr ctxt) {
+    const xmlChar *in;
+    const xmlChar *ret;
+    int count = 0;
+
+    GROW;
+
+    /*
+     * Accelerator for simple ASCII names
+     */
+    in = ctxt->input->cur;
+    if (((*in >= 0x61) && (*in <= 0x7A)) ||
+	((*in >= 0x41) && (*in <= 0x5A)) ||
+	(*in == '_') || (*in == ':')) {
+	in++;
+	while (((*in >= 0x61) && (*in <= 0x7A)) ||
+	       ((*in >= 0x41) && (*in <= 0x5A)) ||
+	       ((*in >= 0x30) && (*in <= 0x39)) ||
+	       (*in == '_') || (*in == '-') ||
+	       (*in == ':') || (*in == '.'))
+	    in++;
+
+	if (in == ctxt->input->end)
+	    return(NULL);
+
+	if ((*in > 0) && (*in < 0x80)) {
+	    count = in - ctxt->input->cur;
+	    ret = xmlDictLookup(ctxt->dict, ctxt->input->cur, count);
+	    ctxt->input->cur = in;
+	    ctxt->nbChars += count;
+	    ctxt->input->col += count;
+	    return(ret);
+	}
+    }
+    return(htmlParseNameComplex(ctxt));
+}
+
+static const xmlChar *
+htmlParseNameComplex(xmlParserCtxtPtr ctxt) {
+    int len = 0, l;
+    int c;
+    int count = 0;
+    const xmlChar *base = ctxt->input->base;
+
+    /*
+     * Handler for more complex cases
+     */
+    GROW;
+    c = CUR_CHAR(l);
+    if ((c == ' ') || (c == '>') || (c == '/') || /* accelerators */
+	(!IS_LETTER(c) && (c != '_') &&
+         (c != ':'))) {
+	return(NULL);
+    }
+
+    while ((c != ' ') && (c != '>') && (c != '/') && /* test bigname.xml */
+	   ((IS_LETTER(c)) || (IS_DIGIT(c)) ||
+            (c == '.') || (c == '-') ||
+	    (c == '_') || (c == ':') ||
+	    (IS_COMBINING(c)) ||
+	    (IS_EXTENDER(c)))) {
+	if (count++ > 100) {
+	    count = 0;
+	    GROW;
+	}
+	len += l;
+	NEXTL(l);
+	c = CUR_CHAR(l);
+	if (ctxt->input->base != base) {
+	    /*
+	     * We changed encoding from an unknown encoding
+	     * Input buffer changed location, so we better start again
+	     */
+	    return(htmlParseNameComplex(ctxt));
+	}
+    }
+
+    if (ctxt->input->cur - ctxt->input->base < len) {
+        /* Sanity check */
+	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+                     "unexpected change of input buffer", NULL, NULL);
+        return (NULL);
+    }
+
+    return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len));
+}
+
+
+/**
+ * htmlParseHTMLAttribute:
+ * @ctxt:  an HTML parser context
+ * @stop:  a char stop value
+ *
+ * parse an HTML attribute value till the stop (quote), if
+ * stop is 0 then it stops at the first space
+ *
+ * Returns the attribute parsed or NULL
+ */
+
+static xmlChar *
+htmlParseHTMLAttribute(htmlParserCtxtPtr ctxt, const xmlChar stop) {
+    xmlChar *buffer = NULL;
+    int buffer_size = 0;
+    xmlChar *out = NULL;
+    const xmlChar *name = NULL;
+    const xmlChar *cur = NULL;
+    const htmlEntityDesc * ent;
+
+    /*
+     * allocate a translation buffer.
+     */
+    buffer_size = HTML_PARSER_BUFFER_SIZE;
+    buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar));
+    if (buffer == NULL) {
+	htmlErrMemory(ctxt, "buffer allocation failed\n");
+	return(NULL);
+    }
+    out = buffer;
+
+    /*
+     * Ok loop until we reach one of the ending chars
+     */
+    while ((CUR != 0) && (CUR != stop)) {
+	if ((stop == 0) && (CUR == '>')) break;
+	if ((stop == 0) && (IS_BLANK_CH(CUR))) break;
+        if (CUR == '&') {
+	    if (NXT(1) == '#') {
+		unsigned int c;
+		int bits;
+
+		c = htmlParseCharRef(ctxt);
+		if      (c <    0x80)
+		        { *out++  = c;                bits= -6; }
+		else if (c <   0x800)
+		        { *out++  =((c >>  6) & 0x1F) | 0xC0;  bits=  0; }
+		else if (c < 0x10000)
+		        { *out++  =((c >> 12) & 0x0F) | 0xE0;  bits=  6; }
+		else
+		        { *out++  =((c >> 18) & 0x07) | 0xF0;  bits= 12; }
+
+		for ( ; bits >= 0; bits-= 6) {
+		    *out++  = ((c >> bits) & 0x3F) | 0x80;
+		}
+
+		if (out - buffer > buffer_size - 100) {
+			int indx = out - buffer;
+
+			growBuffer(buffer);
+			out = &buffer[indx];
+		}
+	    } else {
+		ent = htmlParseEntityRef(ctxt, &name);
+		if (name == NULL) {
+		    *out++ = '&';
+		    if (out - buffer > buffer_size - 100) {
+			int indx = out - buffer;
+
+			growBuffer(buffer);
+			out = &buffer[indx];
+		    }
+		} else if (ent == NULL) {
+		    *out++ = '&';
+		    cur = name;
+		    while (*cur != 0) {
+			if (out - buffer > buffer_size - 100) {
+			    int indx = out - buffer;
+
+			    growBuffer(buffer);
+			    out = &buffer[indx];
+			}
+			*out++ = *cur++;
+		    }
+		} else {
+		    unsigned int c;
+		    int bits;
+
+		    if (out - buffer > buffer_size - 100) {
+			int indx = out - buffer;
+
+			growBuffer(buffer);
+			out = &buffer[indx];
+		    }
+		    c = ent->value;
+		    if      (c <    0x80)
+			{ *out++  = c;                bits= -6; }
+		    else if (c <   0x800)
+			{ *out++  =((c >>  6) & 0x1F) | 0xC0;  bits=  0; }
+		    else if (c < 0x10000)
+			{ *out++  =((c >> 12) & 0x0F) | 0xE0;  bits=  6; }
+		    else
+			{ *out++  =((c >> 18) & 0x07) | 0xF0;  bits= 12; }
+
+		    for ( ; bits >= 0; bits-= 6) {
+			*out++  = ((c >> bits) & 0x3F) | 0x80;
+		    }
+		}
+	    }
+	} else {
+	    unsigned int c;
+	    int bits, l;
+
+	    if (out - buffer > buffer_size - 100) {
+		int indx = out - buffer;
+
+		growBuffer(buffer);
+		out = &buffer[indx];
+	    }
+	    c = CUR_CHAR(l);
+	    if      (c <    0x80)
+		    { *out++  = c;                bits= -6; }
+	    else if (c <   0x800)
+		    { *out++  =((c >>  6) & 0x1F) | 0xC0;  bits=  0; }
+	    else if (c < 0x10000)
+		    { *out++  =((c >> 12) & 0x0F) | 0xE0;  bits=  6; }
+	    else
+		    { *out++  =((c >> 18) & 0x07) | 0xF0;  bits= 12; }
+
+	    for ( ; bits >= 0; bits-= 6) {
+		*out++  = ((c >> bits) & 0x3F) | 0x80;
+	    }
+	    NEXT;
+	}
+    }
+    *out = 0;
+    return(buffer);
+}
+
+/**
+ * htmlParseEntityRef:
+ * @ctxt:  an HTML parser context
+ * @str:  location to store the entity name
+ *
+ * parse an HTML ENTITY references
+ *
+ * [68] EntityRef ::= '&' Name ';'
+ *
+ * Returns the associated htmlEntityDescPtr if found, or NULL otherwise,
+ *         if non-NULL *str will have to be freed by the caller.
+ */
+const htmlEntityDesc *
+htmlParseEntityRef(htmlParserCtxtPtr ctxt, const xmlChar **str) {
+    const xmlChar *name;
+    const htmlEntityDesc * ent = NULL;
+
+    if (str != NULL) *str = NULL;
+    if ((ctxt == NULL) || (ctxt->input == NULL)) return(NULL);
+
+    if (CUR == '&') {
+        NEXT;
+        name = htmlParseName(ctxt);
+	if (name == NULL) {
+	    htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+	                 "htmlParseEntityRef: no name\n", NULL, NULL);
+	} else {
+	    GROW;
+	    if (CUR == ';') {
+	        if (str != NULL)
+		    *str = name;
+
+		/*
+		 * Lookup the entity in the table.
+		 */
+		ent = htmlEntityLookup(name);
+		if (ent != NULL) /* OK that's ugly !!! */
+		    NEXT;
+	    } else {
+		htmlParseErr(ctxt, XML_ERR_ENTITYREF_SEMICOL_MISSING,
+		             "htmlParseEntityRef: expecting ';'\n",
+			     NULL, NULL);
+	        if (str != NULL)
+		    *str = name;
+	    }
+	}
+    }
+    return(ent);
+}
+
+/**
+ * htmlParseAttValue:
+ * @ctxt:  an HTML parser context
+ *
+ * parse a value for an attribute
+ * Note: the parser won't do substitution of entities here, this
+ * will be handled later in xmlStringGetNodeList, unless it was
+ * asked for ctxt->replaceEntities != 0
+ *
+ * Returns the AttValue parsed or NULL.
+ */
+
+static xmlChar *
+htmlParseAttValue(htmlParserCtxtPtr ctxt) {
+    xmlChar *ret = NULL;
+
+    if (CUR == '"') {
+        NEXT;
+	ret = htmlParseHTMLAttribute(ctxt, '"');
+        if (CUR != '"') {
+	    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
+	                 "AttValue: \" expected\n", NULL, NULL);
+	} else
+	    NEXT;
+    } else if (CUR == '\'') {
+        NEXT;
+	ret = htmlParseHTMLAttribute(ctxt, '\'');
+        if (CUR != '\'') {
+	    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
+	                 "AttValue: ' expected\n", NULL, NULL);
+	} else
+	    NEXT;
+    } else {
+        /*
+	 * That's an HTMLism, the attribute value may not be quoted
+	 */
+	ret = htmlParseHTMLAttribute(ctxt, 0);
+	if (ret == NULL) {
+	    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_WITHOUT_VALUE,
+	                 "AttValue: no value found\n", NULL, NULL);
+	}
+    }
+    return(ret);
+}
+
+/**
+ * htmlParseSystemLiteral:
+ * @ctxt:  an HTML parser context
+ *
+ * parse an HTML Literal
+ *
+ * [11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'")
+ *
+ * Returns the SystemLiteral parsed or NULL
+ */
+
+static xmlChar *
+htmlParseSystemLiteral(htmlParserCtxtPtr ctxt) {
+    size_t len = 0, startPosition = 0;
+    xmlChar *ret = NULL;
+
+    if (CUR == '"') {
+        NEXT;
+
+        if (CUR_PTR < BASE_PTR)
+            return(ret);
+        startPosition = CUR_PTR - BASE_PTR;
+
+	while ((IS_CHAR_CH(CUR)) && (CUR != '"')) {
+	    NEXT;
+	    len++;
+	}
+	if (!IS_CHAR_CH(CUR)) {
+	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED,
+			 "Unfinished SystemLiteral\n", NULL, NULL);
+	} else {
+	    ret = xmlStrndup((BASE_PTR+startPosition), len);
+	    NEXT;
+        }
+    } else if (CUR == '\'') {
+        NEXT;
+
+        if (CUR_PTR < BASE_PTR)
+            return(ret);
+        startPosition = CUR_PTR - BASE_PTR;
+
+	while ((IS_CHAR_CH(CUR)) && (CUR != '\'')) {
+	    NEXT;
+	    len++;
+	}
+	if (!IS_CHAR_CH(CUR)) {
+	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED,
+			 "Unfinished SystemLiteral\n", NULL, NULL);
+	} else {
+	    ret = xmlStrndup((BASE_PTR+startPosition), len);
+	    NEXT;
+        }
+    } else {
+	htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_STARTED,
+	             " or ' expected\n", NULL, NULL);
+    }
+
+    return(ret);
+}
+
+/**
+ * htmlParsePubidLiteral:
+ * @ctxt:  an HTML parser context
+ *
+ * parse an HTML public literal
+ *
+ * [12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'"
+ *
+ * Returns the PubidLiteral parsed or NULL.
+ */
+
+static xmlChar *
+htmlParsePubidLiteral(htmlParserCtxtPtr ctxt) {
+    size_t len = 0, startPosition = 0;
+    xmlChar *ret = NULL;
+    /*
+     * Name ::= (Letter | '_') (NameChar)*
+     */
+    if (CUR == '"') {
+        NEXT;
+
+        if (CUR_PTR < BASE_PTR)
+            return(ret);
+        startPosition = CUR_PTR - BASE_PTR;
+
+        while (IS_PUBIDCHAR_CH(CUR)) {
+            len++;
+            NEXT;
+        }
+
+	if (CUR != '"') {
+	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED,
+	                 "Unfinished PubidLiteral\n", NULL, NULL);
+	} else {
+	    ret = xmlStrndup((BASE_PTR + startPosition), len);
+	    NEXT;
+	}
+    } else if (CUR == '\'') {
+        NEXT;
+
+        if (CUR_PTR < BASE_PTR)
+            return(ret);
+        startPosition = CUR_PTR - BASE_PTR;
+
+        while ((IS_PUBIDCHAR_CH(CUR)) && (CUR != '\'')){
+            len++;
+            NEXT;
+        }
+
+	if (CUR != '\'') {
+	    htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_FINISHED,
+	                 "Unfinished PubidLiteral\n", NULL, NULL);
+	} else {
+	    ret = xmlStrndup((BASE_PTR + startPosition), len);
+	    NEXT;
+	}
+    } else {
+	htmlParseErr(ctxt, XML_ERR_LITERAL_NOT_STARTED,
+	             "PubidLiteral \" or ' expected\n", NULL, NULL);
+    }
+
+    return(ret);
+}
+
+/**
+ * htmlParseScript:
+ * @ctxt:  an HTML parser context
+ *
+ * parse the content of an HTML SCRIPT or STYLE element
+ * http://www.w3.org/TR/html4/sgml/dtd.html#Script
+ * http://www.w3.org/TR/html4/sgml/dtd.html#StyleSheet
+ * http://www.w3.org/TR/html4/types.html#type-script
+ * http://www.w3.org/TR/html4/types.html#h-6.15
+ * http://www.w3.org/TR/html4/appendix/notes.html#h-B.3.2.1
+ *
+ * Script data ( %Script; in the DTD) can be the content of the SCRIPT
+ * element and the value of intrinsic event attributes. User agents must
+ * not evaluate script data as HTML markup but instead must pass it on as
+ * data to a script engine.
+ * NOTES:
+ * - The content is passed like CDATA
+ * - the attributes for style and scripting "onXXX" are also described
+ *   as CDATA but SGML allows entities references in attributes so their
+ *   processing is identical as other attributes
+ */
+static void
+htmlParseScript(htmlParserCtxtPtr ctxt) {
+    xmlChar buf[HTML_PARSER_BIG_BUFFER_SIZE + 5];
+    int nbchar = 0;
+    int cur,l;
+
+    SHRINK;
+    cur = CUR_CHAR(l);
+    while (IS_CHAR_CH(cur)) {
+	if ((cur == '<') && (NXT(1) == '/')) {
+            /*
+             * One should break here, the specification is clear:
+             * Authors should therefore escape "</" within the content.
+             * Escape mechanisms are specific to each scripting or
+             * style sheet language.
+             *
+             * In recovery mode, only break if end tag match the
+             * current tag, effectively ignoring all tags inside the
+             * script/style block and treating the entire block as
+             * CDATA.
+             */
+            if (ctxt->recovery) {
+                if (xmlStrncasecmp(ctxt->name, ctxt->input->cur+2,
+				   xmlStrlen(ctxt->name)) == 0)
+                {
+                    break; /* while */
+                } else {
+		    htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
+				 "Element %s embeds close tag\n",
+		                 ctxt->name, NULL);
+		}
+            } else {
+                if (((NXT(2) >= 'A') && (NXT(2) <= 'Z')) ||
+                    ((NXT(2) >= 'a') && (NXT(2) <= 'z')))
+                {
+                    break; /* while */
+                }
+            }
+	}
+	COPY_BUF(l,buf,nbchar,cur);
+	if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) {
+            buf[nbchar] = 0;
+	    if (ctxt->sax->cdataBlock!= NULL) {
+		/*
+		 * Insert as CDATA, which is the same as HTML_PRESERVE_NODE
+		 */
+		ctxt->sax->cdataBlock(ctxt->userData, buf, nbchar);
+	    } else if (ctxt->sax->characters != NULL) {
+		ctxt->sax->characters(ctxt->userData, buf, nbchar);
+	    }
+	    nbchar = 0;
+	}
+	GROW;
+	NEXTL(l);
+	cur = CUR_CHAR(l);
+    }
+
+    if ((!(IS_CHAR_CH(cur))) && (!((cur == 0) && (ctxt->progressive)))) {
+        htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
+                    "Invalid char in CDATA 0x%X\n", cur);
+        if (ctxt->input->cur < ctxt->input->end) {
+            NEXT;
+        }
+    }
+
+    if ((nbchar != 0) && (ctxt->sax != NULL) && (!ctxt->disableSAX)) {
+        buf[nbchar] = 0;
+	if (ctxt->sax->cdataBlock!= NULL) {
+	    /*
+	     * Insert as CDATA, which is the same as HTML_PRESERVE_NODE
+	     */
+	    ctxt->sax->cdataBlock(ctxt->userData, buf, nbchar);
+	} else if (ctxt->sax->characters != NULL) {
+	    ctxt->sax->characters(ctxt->userData, buf, nbchar);
+	}
+    }
+}
+
+
+/**
+ * htmlParseCharDataInternal:
+ * @ctxt:  an HTML parser context
+ * @readahead: optional read ahead character in ascii range
+ *
+ * parse a CharData section.
+ * if we are within a CDATA section ']]>' marks an end of section.
+ *
+ * [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)
+ */
+
+static void
+htmlParseCharDataInternal(htmlParserCtxtPtr ctxt, int readahead) {
+    xmlChar buf[HTML_PARSER_BIG_BUFFER_SIZE + 6];
+    int nbchar = 0;
+    int cur, l;
+    int chunk = 0;
+
+    if (readahead)
+        buf[nbchar++] = readahead;
+
+    SHRINK;
+    cur = CUR_CHAR(l);
+    while (((cur != '<') || (ctxt->token == '<')) &&
+           ((cur != '&') || (ctxt->token == '&')) &&
+	   (cur != 0)) {
+	if (!(IS_CHAR(cur))) {
+	    htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
+	                "Invalid char in CDATA 0x%X\n", cur);
+	} else {
+	    COPY_BUF(l,buf,nbchar,cur);
+	}
+	if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) {
+            buf[nbchar] = 0;
+
+	    /*
+	     * Ok the segment is to be consumed as chars.
+	     */
+	    if ((ctxt->sax != NULL) && (!ctxt->disableSAX)) {
+		if (areBlanks(ctxt, buf, nbchar)) {
+		    if (ctxt->keepBlanks) {
+			if (ctxt->sax->characters != NULL)
+			    ctxt->sax->characters(ctxt->userData, buf, nbchar);
+		    } else {
+			if (ctxt->sax->ignorableWhitespace != NULL)
+			    ctxt->sax->ignorableWhitespace(ctxt->userData,
+			                                   buf, nbchar);
+		    }
+		} else {
+		    htmlCheckParagraph(ctxt);
+		    if (ctxt->sax->characters != NULL)
+			ctxt->sax->characters(ctxt->userData, buf, nbchar);
+		}
+	    }
+	    nbchar = 0;
+	}
+	NEXTL(l);
+        chunk++;
+        if (chunk > HTML_PARSER_BUFFER_SIZE) {
+            chunk = 0;
+            SHRINK;
+            GROW;
+        }
+	cur = CUR_CHAR(l);
+	if (cur == 0) {
+	    SHRINK;
+	    GROW;
+	    cur = CUR_CHAR(l);
+	}
+    }
+    if (nbchar != 0) {
+        buf[nbchar] = 0;
+
+	/*
+	 * Ok the segment is to be consumed as chars.
+	 */
+	if ((ctxt->sax != NULL) && (!ctxt->disableSAX)) {
+	    if (areBlanks(ctxt, buf, nbchar)) {
+		if (ctxt->keepBlanks) {
+		    if (ctxt->sax->characters != NULL)
+			ctxt->sax->characters(ctxt->userData, buf, nbchar);
+		} else {
+		    if (ctxt->sax->ignorableWhitespace != NULL)
+			ctxt->sax->ignorableWhitespace(ctxt->userData,
+			                               buf, nbchar);
+		}
+	    } else {
+		htmlCheckParagraph(ctxt);
+		if (ctxt->sax->characters != NULL)
+		    ctxt->sax->characters(ctxt->userData, buf, nbchar);
+	    }
+	}
+    } else {
+	/*
+	 * Loop detection
+	 */
+	if (cur == 0)
+	    ctxt->instate = XML_PARSER_EOF;
+    }
+}
+
+/**
+ * htmlParseCharData:
+ * @ctxt:  an HTML parser context
+ *
+ * parse a CharData section.
+ * if we are within a CDATA section ']]>' marks an end of section.
+ *
+ * [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)
+ */
+
+static void
+htmlParseCharData(htmlParserCtxtPtr ctxt) {
+    htmlParseCharDataInternal(ctxt, 0);
+}
+
+/**
+ * htmlParseExternalID:
+ * @ctxt:  an HTML parser context
+ * @publicID:  a xmlChar** receiving PubidLiteral
+ *
+ * Parse an External ID or a Public ID
+ *
+ * [75] ExternalID ::= 'SYSTEM' S SystemLiteral
+ *                   | 'PUBLIC' S PubidLiteral S SystemLiteral
+ *
+ * [83] PublicID ::= 'PUBLIC' S PubidLiteral
+ *
+ * Returns 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.
+ */
+
+static xmlChar *
+htmlParseExternalID(htmlParserCtxtPtr ctxt, xmlChar **publicID) {
+    xmlChar *URI = NULL;
+
+    if ((UPPER == 'S') && (UPP(1) == 'Y') &&
+         (UPP(2) == 'S') && (UPP(3) == 'T') &&
+	 (UPP(4) == 'E') && (UPP(5) == 'M')) {
+        SKIP(6);
+	if (!IS_BLANK_CH(CUR)) {
+	    htmlParseErr(ctxt, XML_ERR_SPACE_REQUIRED,
+	                 "Space required after 'SYSTEM'\n", NULL, NULL);
+	}
+        SKIP_BLANKS;
+	URI = htmlParseSystemLiteral(ctxt);
+	if (URI == NULL) {
+	    htmlParseErr(ctxt, XML_ERR_URI_REQUIRED,
+	                 "htmlParseExternalID: SYSTEM, no URI\n", NULL, NULL);
+        }
+    } else if ((UPPER == 'P') && (UPP(1) == 'U') &&
+	       (UPP(2) == 'B') && (UPP(3) == 'L') &&
+	       (UPP(4) == 'I') && (UPP(5) == 'C')) {
+        SKIP(6);
+	if (!IS_BLANK_CH(CUR)) {
+	    htmlParseErr(ctxt, XML_ERR_SPACE_REQUIRED,
+	                 "Space required after 'PUBLIC'\n", NULL, NULL);
+	}
+        SKIP_BLANKS;
+	*publicID = htmlParsePubidLiteral(ctxt);
+	if (*publicID == NULL) {
+	    htmlParseErr(ctxt, XML_ERR_PUBID_REQUIRED,
+	                 "htmlParseExternalID: PUBLIC, no Public Identifier\n",
+			 NULL, NULL);
+	}
+        SKIP_BLANKS;
+        if ((CUR == '"') || (CUR == '\'')) {
+	    URI = htmlParseSystemLiteral(ctxt);
+	}
+    }
+    return(URI);
+}
+
+/**
+ * xmlParsePI:
+ * @ctxt:  an XML parser context
+ *
+ * parse an XML Processing Instruction.
+ *
+ * [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>'
+ */
+static void
+htmlParsePI(htmlParserCtxtPtr ctxt) {
+    xmlChar *buf = NULL;
+    int len = 0;
+    int size = HTML_PARSER_BUFFER_SIZE;
+    int cur, l;
+    const xmlChar *target;
+    xmlParserInputState state;
+    int count = 0;
+
+    if ((RAW == '<') && (NXT(1) == '?')) {
+	state = ctxt->instate;
+        ctxt->instate = XML_PARSER_PI;
+	/*
+	 * this is a Processing Instruction.
+	 */
+	SKIP(2);
+	SHRINK;
+
+	/*
+	 * Parse the target name and check for special support like
+	 * namespace.
+	 */
+        target = htmlParseName(ctxt);
+	if (target != NULL) {
+	    if (RAW == '>') {
+		SKIP(1);
+
+		/*
+		 * SAX: PI detected.
+		 */
+		if ((ctxt->sax) && (!ctxt->disableSAX) &&
+		    (ctxt->sax->processingInstruction != NULL))
+		    ctxt->sax->processingInstruction(ctxt->userData,
+		                                     target, NULL);
+		ctxt->instate = state;
+		return;
+	    }
+	    buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar));
+	    if (buf == NULL) {
+		htmlErrMemory(ctxt, NULL);
+		ctxt->instate = state;
+		return;
+	    }
+	    cur = CUR;
+	    if (!IS_BLANK(cur)) {
+		htmlParseErr(ctxt, XML_ERR_SPACE_REQUIRED,
+			  "ParsePI: PI %s space expected\n", target, NULL);
+	    }
+            SKIP_BLANKS;
+	    cur = CUR_CHAR(l);
+	    while (IS_CHAR(cur) && (cur != '>')) {
+		if (len + 5 >= size) {
+		    xmlChar *tmp;
+
+		    size *= 2;
+		    tmp = (xmlChar *) xmlRealloc(buf, size * sizeof(xmlChar));
+		    if (tmp == NULL) {
+			htmlErrMemory(ctxt, NULL);
+			xmlFree(buf);
+			ctxt->instate = state;
+			return;
+		    }
+		    buf = tmp;
+		}
+		count++;
+		if (count > 50) {
+		    GROW;
+		    count = 0;
+		}
+		COPY_BUF(l,buf,len,cur);
+		NEXTL(l);
+		cur = CUR_CHAR(l);
+		if (cur == 0) {
+		    SHRINK;
+		    GROW;
+		    cur = CUR_CHAR(l);
+		}
+	    }
+	    buf[len] = 0;
+	    if (cur != '>') {
+		htmlParseErr(ctxt, XML_ERR_PI_NOT_FINISHED,
+		      "ParsePI: PI %s never end ...\n", target, NULL);
+	    } else {
+		SKIP(1);
+
+		/*
+		 * SAX: PI detected.
+		 */
+		if ((ctxt->sax) && (!ctxt->disableSAX) &&
+		    (ctxt->sax->processingInstruction != NULL))
+		    ctxt->sax->processingInstruction(ctxt->userData,
+		                                     target, buf);
+	    }
+	    xmlFree(buf);
+	} else {
+	    htmlParseErr(ctxt, XML_ERR_PI_NOT_STARTED,
+                         "PI is not started correctly", NULL, NULL);
+	}
+	ctxt->instate = state;
+    }
+}
+
+/**
+ * htmlParseComment:
+ * @ctxt:  an HTML parser context
+ *
+ * Parse an XML (SGML) comment <!-- .... -->
+ *
+ * [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
+ */
+static void
+htmlParseComment(htmlParserCtxtPtr ctxt) {
+    xmlChar *buf = NULL;
+    int len;
+    int size = HTML_PARSER_BUFFER_SIZE;
+    int q, ql;
+    int r, rl;
+    int cur, l;
+    xmlParserInputState state;
+
+    /*
+     * Check that there is a comment right here.
+     */
+    if ((RAW != '<') || (NXT(1) != '!') ||
+        (NXT(2) != '-') || (NXT(3) != '-')) return;
+
+    state = ctxt->instate;
+    ctxt->instate = XML_PARSER_COMMENT;
+    SHRINK;
+    SKIP(4);
+    buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar));
+    if (buf == NULL) {
+        htmlErrMemory(ctxt, "buffer allocation failed\n");
+	ctxt->instate = state;
+	return;
+    }
+    len = 0;
+    buf[len] = 0;
+    q = CUR_CHAR(ql);
+    if (!IS_CHAR(q))
+        goto unfinished;
+    NEXTL(ql);
+    r = CUR_CHAR(rl);
+    if (!IS_CHAR(r))
+        goto unfinished;
+    NEXTL(rl);
+    cur = CUR_CHAR(l);
+    while (IS_CHAR(cur) &&
+           ((cur != '>') ||
+	    (r != '-') || (q != '-'))) {
+	if (len + 5 >= size) {
+	    xmlChar *tmp;
+
+	    size *= 2;
+	    tmp = (xmlChar *) xmlRealloc(buf, size * sizeof(xmlChar));
+	    if (tmp == NULL) {
+	        xmlFree(buf);
+	        htmlErrMemory(ctxt, "growing buffer failed\n");
+		ctxt->instate = state;
+		return;
+	    }
+	    buf = tmp;
+	}
+	COPY_BUF(ql,buf,len,q);
+	q = r;
+	ql = rl;
+	r = cur;
+	rl = l;
+	NEXTL(l);
+	cur = CUR_CHAR(l);
+	if (cur == 0) {
+	    SHRINK;
+	    GROW;
+	    cur = CUR_CHAR(l);
+	}
+    }
+    buf[len] = 0;
+    if (IS_CHAR(cur)) {
+        NEXT;
+	if ((ctxt->sax != NULL) && (ctxt->sax->comment != NULL) &&
+	    (!ctxt->disableSAX))
+	    ctxt->sax->comment(ctxt->userData, buf);
+	xmlFree(buf);
+	ctxt->instate = state;
+	return;
+    }
+
+unfinished:
+    htmlParseErr(ctxt, XML_ERR_COMMENT_NOT_FINISHED,
+		 "Comment not terminated \n<!--%.50s\n", buf, NULL);
+    xmlFree(buf);
+}
+
+/**
+ * htmlParseCharRef:
+ * @ctxt:  an HTML parser context
+ *
+ * parse Reference declarations
+ *
+ * [66] CharRef ::= '&#' [0-9]+ ';' |
+ *                  '&#x' [0-9a-fA-F]+ ';'
+ *
+ * Returns the value parsed (as an int)
+ */
+int
+htmlParseCharRef(htmlParserCtxtPtr ctxt) {
+    int val = 0;
+
+    if ((ctxt == NULL) || (ctxt->input == NULL)) {
+	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		     "htmlParseCharRef: context error\n",
+		     NULL, NULL);
+        return(0);
+    }
+    if ((CUR == '&') && (NXT(1) == '#') &&
+        ((NXT(2) == 'x') || NXT(2) == 'X')) {
+	SKIP(3);
+	while (CUR != ';') {
+	    if ((CUR >= '0') && (CUR <= '9'))
+	        val = val * 16 + (CUR - '0');
+	    else if ((CUR >= 'a') && (CUR <= 'f'))
+	        val = val * 16 + (CUR - 'a') + 10;
+	    else if ((CUR >= 'A') && (CUR <= 'F'))
+	        val = val * 16 + (CUR - 'A') + 10;
+	    else {
+	        htmlParseErr(ctxt, XML_ERR_INVALID_HEX_CHARREF,
+		             "htmlParseCharRef: missing semicolon\n",
+			     NULL, NULL);
+		break;
+	    }
+	    NEXT;
+	}
+	if (CUR == ';')
+	    NEXT;
+    } else if  ((CUR == '&') && (NXT(1) == '#')) {
+	SKIP(2);
+	while (CUR != ';') {
+	    if ((CUR >= '0') && (CUR <= '9'))
+	        val = val * 10 + (CUR - '0');
+	    else {
+	        htmlParseErr(ctxt, XML_ERR_INVALID_DEC_CHARREF,
+		             "htmlParseCharRef: missing semicolon\n",
+			     NULL, NULL);
+		break;
+	    }
+	    NEXT;
+	}
+	if (CUR == ';')
+	    NEXT;
+    } else {
+	htmlParseErr(ctxt, XML_ERR_INVALID_CHARREF,
+	             "htmlParseCharRef: invalid value\n", NULL, NULL);
+    }
+    /*
+     * Check the value IS_CHAR ...
+     */
+    if (IS_CHAR(val)) {
+        return(val);
+    } else {
+	htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
+			"htmlParseCharRef: invalid xmlChar value %d\n",
+			val);
+    }
+    return(0);
+}
+
+
+/**
+ * htmlParseDocTypeDecl:
+ * @ctxt:  an HTML parser context
+ *
+ * parse a DOCTYPE declaration
+ *
+ * [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S?
+ *                      ('[' (markupdecl | PEReference | S)* ']' S?)? '>'
+ */
+
+static void
+htmlParseDocTypeDecl(htmlParserCtxtPtr ctxt) {
+    const xmlChar *name;
+    xmlChar *ExternalID = NULL;
+    xmlChar *URI = NULL;
+
+    /*
+     * We know that '<!DOCTYPE' has been detected.
+     */
+    SKIP(9);
+
+    SKIP_BLANKS;
+
+    /*
+     * Parse the DOCTYPE name.
+     */
+    name = htmlParseName(ctxt);
+    if (name == NULL) {
+	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+	             "htmlParseDocTypeDecl : no DOCTYPE name !\n",
+		     NULL, NULL);
+    }
+    /*
+     * Check that upper(name) == "HTML" !!!!!!!!!!!!!
+     */
+
+    SKIP_BLANKS;
+
+    /*
+     * Check for SystemID and ExternalID
+     */
+    URI = htmlParseExternalID(ctxt, &ExternalID);
+    SKIP_BLANKS;
+
+    /*
+     * We should be at the end of the DOCTYPE declaration.
+     */
+    if (CUR != '>') {
+	htmlParseErr(ctxt, XML_ERR_DOCTYPE_NOT_FINISHED,
+	             "DOCTYPE improperly terminated\n", NULL, NULL);
+        /* We shouldn't try to resynchronize ... */
+    }
+    NEXT;
+
+    /*
+     * Create or update the document accordingly to the DOCTYPE
+     */
+    if ((ctxt->sax != NULL) && (ctxt->sax->internalSubset != NULL) &&
+	(!ctxt->disableSAX))
+	ctxt->sax->internalSubset(ctxt->userData, name, ExternalID, URI);
+
+    /*
+     * Cleanup, since we don't use all those identifiers
+     */
+    if (URI != NULL) xmlFree(URI);
+    if (ExternalID != NULL) xmlFree(ExternalID);
+}
+
+/**
+ * htmlParseAttribute:
+ * @ctxt:  an HTML parser context
+ * @value:  a xmlChar ** used to store the value of the attribute
+ *
+ * parse an attribute
+ *
+ * [41] Attribute ::= Name Eq AttValue
+ *
+ * [25] Eq ::= S? '=' S?
+ *
+ * With namespace:
+ *
+ * [NS 11] Attribute ::= QName Eq AttValue
+ *
+ * Also the case QName == xmlns:??? is handled independently as a namespace
+ * definition.
+ *
+ * Returns the attribute name, and the value in *value.
+ */
+
+static const xmlChar *
+htmlParseAttribute(htmlParserCtxtPtr ctxt, xmlChar **value) {
+    const xmlChar *name;
+    xmlChar *val = NULL;
+
+    *value = NULL;
+    name = htmlParseHTMLName(ctxt);
+    if (name == NULL) {
+	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+	             "error parsing attribute name\n", NULL, NULL);
+        return(NULL);
+    }
+
+    /*
+     * read the value
+     */
+    SKIP_BLANKS;
+    if (CUR == '=') {
+        NEXT;
+	SKIP_BLANKS;
+	val = htmlParseAttValue(ctxt);
+    }
+
+    *value = val;
+    return(name);
+}
+
+/**
+ * htmlCheckEncodingDirect:
+ * @ctxt:  an HTML parser context
+ * @attvalue: the attribute value
+ *
+ * Checks an attribute value to detect
+ * the encoding
+ * If a new encoding is detected the parser is switched to decode
+ * it and pass UTF8
+ */
+static void
+htmlCheckEncodingDirect(htmlParserCtxtPtr ctxt, const xmlChar *encoding) {
+
+    if ((ctxt == NULL) || (encoding == NULL) ||
+        (ctxt->options & HTML_PARSE_IGNORE_ENC))
+	return;
+
+    /* do not change encoding */
+    if (ctxt->input->encoding != NULL)
+        return;
+
+    if (encoding != NULL) {
+	xmlCharEncoding enc;
+	xmlCharEncodingHandlerPtr handler;
+
+	while ((*encoding == ' ') || (*encoding == '\t')) encoding++;
+
+	if (ctxt->input->encoding != NULL)
+	    xmlFree((xmlChar *) ctxt->input->encoding);
+	ctxt->input->encoding = xmlStrdup(encoding);
+
+	enc = xmlParseCharEncoding((const char *) encoding);
+	/*
+	 * registered set of known encodings
+	 */
+	if (enc != XML_CHAR_ENCODING_ERROR) {
+	    if (((enc == XML_CHAR_ENCODING_UTF16LE) ||
+	         (enc == XML_CHAR_ENCODING_UTF16BE) ||
+		 (enc == XML_CHAR_ENCODING_UCS4LE) ||
+		 (enc == XML_CHAR_ENCODING_UCS4BE)) &&
+		(ctxt->input->buf != NULL) &&
+		(ctxt->input->buf->encoder == NULL)) {
+		htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
+		             "htmlCheckEncoding: wrong encoding meta\n",
+			     NULL, NULL);
+	    } else {
+		xmlSwitchEncoding(ctxt, enc);
+	    }
+	    ctxt->charset = XML_CHAR_ENCODING_UTF8;
+	} else {
+	    /*
+	     * fallback for unknown encodings
+	     */
+	    handler = xmlFindCharEncodingHandler((const char *) encoding);
+	    if (handler != NULL) {
+		xmlSwitchToEncoding(ctxt, handler);
+		ctxt->charset = XML_CHAR_ENCODING_UTF8;
+	    } else {
+		htmlParseErr(ctxt, XML_ERR_UNSUPPORTED_ENCODING,
+		             "htmlCheckEncoding: unknown encoding %s\n",
+			     encoding, NULL);
+	    }
+	}
+
+	if ((ctxt->input->buf != NULL) &&
+	    (ctxt->input->buf->encoder != NULL) &&
+	    (ctxt->input->buf->raw != NULL) &&
+	    (ctxt->input->buf->buffer != NULL)) {
+	    int nbchars;
+	    int processed;
+
+	    /*
+	     * convert as much as possible to the parser reading buffer.
+	     */
+	    processed = ctxt->input->cur - ctxt->input->base;
+	    xmlBufShrink(ctxt->input->buf->buffer, processed);
+	    nbchars = xmlCharEncInput(ctxt->input->buf, 1);
+            xmlBufResetInput(ctxt->input->buf->buffer, ctxt->input);
+	    if (nbchars < 0) {
+		htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
+		             "htmlCheckEncoding: encoder error\n",
+			     NULL, NULL);
+	    }
+	}
+    }
+}
+
+/**
+ * htmlCheckEncoding:
+ * @ctxt:  an HTML parser context
+ * @attvalue: the attribute value
+ *
+ * Checks an http-equiv attribute from a Meta tag to detect
+ * the encoding
+ * If a new encoding is detected the parser is switched to decode
+ * it and pass UTF8
+ */
+static void
+htmlCheckEncoding(htmlParserCtxtPtr ctxt, const xmlChar *attvalue) {
+    const xmlChar *encoding;
+
+    if (!attvalue)
+	return;
+
+    encoding = xmlStrcasestr(attvalue, BAD_CAST"charset");
+    if (encoding != NULL) {
+	encoding += 7;
+    }
+    /*
+     * skip blank
+     */
+    if (encoding && IS_BLANK_CH(*encoding))
+	encoding = xmlStrcasestr(attvalue, BAD_CAST"=");
+    if (encoding && *encoding == '=') {
+	encoding ++;
+	htmlCheckEncodingDirect(ctxt, encoding);
+    }
+}
+
+/**
+ * htmlCheckMeta:
+ * @ctxt:  an HTML parser context
+ * @atts:  the attributes values
+ *
+ * Checks an attributes from a Meta tag
+ */
+static void
+htmlCheckMeta(htmlParserCtxtPtr ctxt, const xmlChar **atts) {
+    int i;
+    const xmlChar *att, *value;
+    int http = 0;
+    const xmlChar *content = NULL;
+
+    if ((ctxt == NULL) || (atts == NULL))
+	return;
+
+    i = 0;
+    att = atts[i++];
+    while (att != NULL) {
+	value = atts[i++];
+	if ((value != NULL) && (!xmlStrcasecmp(att, BAD_CAST"http-equiv"))
+	 && (!xmlStrcasecmp(value, BAD_CAST"Content-Type")))
+	    http = 1;
+	else if ((value != NULL) && (!xmlStrcasecmp(att, BAD_CAST"charset")))
+	    htmlCheckEncodingDirect(ctxt, value);
+	else if ((value != NULL) && (!xmlStrcasecmp(att, BAD_CAST"content")))
+	    content = value;
+	att = atts[i++];
+    }
+    if ((http) && (content != NULL))
+	htmlCheckEncoding(ctxt, content);
+
+}
+
+/**
+ * htmlParseStartTag:
+ * @ctxt:  an HTML parser context
+ *
+ * parse a start of tag either for rule element or
+ * EmptyElement. In both case we don't parse the tag closing chars.
+ *
+ * [40] STag ::= '<' Name (S Attribute)* S? '>'
+ *
+ * [44] EmptyElemTag ::= '<' Name (S Attribute)* S? '/>'
+ *
+ * With namespace:
+ *
+ * [NS 8] STag ::= '<' QName (S Attribute)* S? '>'
+ *
+ * [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>'
+ *
+ * Returns 0 in case of success, -1 in case of error and 1 if discarded
+ */
+
+static int
+htmlParseStartTag(htmlParserCtxtPtr ctxt) {
+    const xmlChar *name;
+    const xmlChar *attname;
+    xmlChar *attvalue;
+    const xmlChar **atts;
+    int nbatts = 0;
+    int maxatts;
+    int meta = 0;
+    int i;
+    int discardtag = 0;
+
+    if ((ctxt == NULL) || (ctxt->input == NULL)) {
+	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		     "htmlParseStartTag: context error\n", NULL, NULL);
+	return -1;
+    }
+    if (ctxt->instate == XML_PARSER_EOF)
+        return(-1);
+    if (CUR != '<') return -1;
+    NEXT;
+
+    atts = ctxt->atts;
+    maxatts = ctxt->maxatts;
+
+    GROW;
+    name = htmlParseHTMLName(ctxt);
+    if (name == NULL) {
+	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+	             "htmlParseStartTag: invalid element name\n",
+		     NULL, NULL);
+	/* if recover preserve text on classic misconstructs */
+	if ((ctxt->recovery) && ((IS_BLANK_CH(CUR)) || (CUR == '<') ||
 	    (CUR == '=') || (CUR == '>') || (((CUR >= '0') && (CUR <= '9'))))) {
 	    htmlParseCharDataInternal(ctxt, '<');
 	    return(-1);
 	}
 
 
-	/* Dump the bogus tag like browsers do */ 
-	while ((IS_CHAR_CH(CUR)) && (CUR != '>') && 
-               (ctxt->instate != XML_PARSER_EOF)) 
-	    NEXT; 
-        return -1; 
-    } 
-    if (xmlStrEqual(name, BAD_CAST"meta")) 
-	meta = 1; 
- 
-    /* 
-     * Check for auto-closure of HTML elements. 
-     */ 
-    htmlAutoClose(ctxt, name); 
- 
-    /* 
-     * Check for implied HTML elements. 
-     */ 
-    htmlCheckImplied(ctxt, name); 
- 
-    /* 
-     * Avoid html at any level > 0, head at any level != 1 
-     * or any attempt to recurse body 
-     */ 
-    if ((ctxt->nameNr > 0) && (xmlStrEqual(name, BAD_CAST"html"))) { 
-	htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, 
-	             "htmlParseStartTag: misplaced <html> tag\n", 
-		     name, NULL); 
-	discardtag = 1; 
-	ctxt->depth++; 
-    } 
-    if ((ctxt->nameNr != 1) && 
-	(xmlStrEqual(name, BAD_CAST"head"))) { 
-	htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, 
-	             "htmlParseStartTag: misplaced <head> tag\n", 
-		     name, NULL); 
-	discardtag = 1; 
-	ctxt->depth++; 
-    } 
-    if (xmlStrEqual(name, BAD_CAST"body")) { 
-	int indx; 
-	for (indx = 0;indx < ctxt->nameNr;indx++) { 
-	    if (xmlStrEqual(ctxt->nameTab[indx], BAD_CAST"body")) { 
-		htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, 
-		             "htmlParseStartTag: misplaced <body> tag\n", 
-			     name, NULL); 
-		discardtag = 1; 
-		ctxt->depth++; 
-	    } 
-	} 
-    } 
- 
-    /* 
-     * Now parse the attributes, it ends up with the ending 
-     * 
-     * (S Attribute)* S? 
-     */ 
-    SKIP_BLANKS; 
-    while ((IS_CHAR_CH(CUR)) && 
-           (CUR != '>') && 
-	   ((CUR != '/') || (NXT(1) != '>'))) { 
-	long cons = ctxt->nbChars; 
- 
-	GROW; 
-	attname = htmlParseAttribute(ctxt, &attvalue); 
-        if (attname != NULL) { 
- 
-	    /* 
-	     * Well formedness requires at most one declaration of an attribute 
-	     */ 
-	    for (i = 0; i < nbatts;i += 2) { 
-	        if (xmlStrEqual(atts[i], attname)) { 
-		    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_REDEFINED, 
-		                 "Attribute %s redefined\n", attname, NULL); 
-		    if (attvalue != NULL) 
-			xmlFree(attvalue); 
-		    goto failed; 
-		} 
-	    } 
- 
-	    /* 
-	     * Add the pair to atts 
-	     */ 
-	    if (atts == NULL) { 
-	        maxatts = 22; /* allow for 10 attrs by default */ 
-	        atts = (const xmlChar **) 
-		       xmlMalloc(maxatts * sizeof(xmlChar *)); 
-		if (atts == NULL) { 
-		    htmlErrMemory(ctxt, NULL); 
-		    if (attvalue != NULL) 
-			xmlFree(attvalue); 
-		    goto failed; 
-		} 
-		ctxt->atts = atts; 
-		ctxt->maxatts = maxatts; 
-	    } else if (nbatts + 4 > maxatts) { 
-	        const xmlChar **n; 
- 
-	        maxatts *= 2; 
-	        n = (const xmlChar **) xmlRealloc((void *) atts, 
-					     maxatts * sizeof(const xmlChar *)); 
-		if (n == NULL) { 
-		    htmlErrMemory(ctxt, NULL); 
-		    if (attvalue != NULL) 
-			xmlFree(attvalue); 
-		    goto failed; 
-		} 
-		atts = n; 
-		ctxt->atts = atts; 
-		ctxt->maxatts = maxatts; 
-	    } 
-	    atts[nbatts++] = attname; 
-	    atts[nbatts++] = attvalue; 
-	    atts[nbatts] = NULL; 
-	    atts[nbatts + 1] = NULL; 
-	} 
-	else { 
-	    if (attvalue != NULL) 
-	        xmlFree(attvalue); 
-	    /* Dump the bogus attribute string up to the next blank or 
-	     * the end of the tag. */ 
-	    while ((IS_CHAR_CH(CUR)) && 
-	           !(IS_BLANK_CH(CUR)) && (CUR != '>') && 
-		   ((CUR != '/') || (NXT(1) != '>'))) 
-		NEXT; 
-	} 
- 
-failed: 
-	SKIP_BLANKS; 
-        if (cons == ctxt->nbChars) { 
-	    htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-	                 "htmlParseStartTag: problem parsing attributes\n", 
-			 NULL, NULL); 
-	    break; 
-	} 
-    } 
- 
-    /* 
-     * Handle specific association to the META tag 
-     */ 
-    if (meta && (nbatts != 0)) 
-	htmlCheckMeta(ctxt, atts); 
- 
-    /* 
-     * SAX: Start of Element ! 
-     */ 
-    if (!discardtag) { 
-	htmlnamePush(ctxt, name); 
-	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL)) { 
-	    if (nbatts != 0) 
-		ctxt->sax->startElement(ctxt->userData, name, atts); 
-	    else 
-		ctxt->sax->startElement(ctxt->userData, name, NULL); 
-	} 
-    } 
- 
-    if (atts != NULL) { 
-        for (i = 1;i < nbatts;i += 2) { 
-	    if (atts[i] != NULL) 
-		xmlFree((xmlChar *) atts[i]); 
-	} 
-    } 
- 
-    return(discardtag); 
-} 
- 
-/** 
- * htmlParseEndTag: 
- * @ctxt:  an HTML parser context 
- * 
- * parse an end of tag 
- * 
- * [42] ETag ::= '</' Name S? '>' 
- * 
- * With namespace 
- * 
- * [NS 9] ETag ::= '</' QName S? '>' 
- * 
- * Returns 1 if the current level should be closed. 
- */ 
- 
-static int 
-htmlParseEndTag(htmlParserCtxtPtr ctxt) 
-{ 
-    const xmlChar *name; 
-    const xmlChar *oldname; 
-    int i, ret; 
- 
-    if ((CUR != '<') || (NXT(1) != '/')) { 
-        htmlParseErr(ctxt, XML_ERR_LTSLASH_REQUIRED, 
-	             "htmlParseEndTag: '</' not found\n", NULL, NULL); 
-        return (0); 
-    } 
-    SKIP(2); 
- 
-    name = htmlParseHTMLName(ctxt); 
-    if (name == NULL) 
-        return (0); 
-    /* 
-     * We should definitely be at the ending "S? '>'" part 
-     */ 
-    SKIP_BLANKS; 
-    if ((!IS_CHAR_CH(CUR)) || (CUR != '>')) { 
-        htmlParseErr(ctxt, XML_ERR_GT_REQUIRED, 
-	             "End tag : expected '>'\n", NULL, NULL); 
-	if (ctxt->recovery) { 
-	    /* 
-	     * We're not at the ending > !! 
-	     * Error, unless in recover mode where we search forwards 
-	     * until we find a > 
-	     */ 
-	    while (CUR != '\0' && CUR != '>') NEXT; 
-	    NEXT; 
-	} 
-    } else 
-        NEXT; 
- 
-    /* 
-     * if we ignored misplaced tags in htmlParseStartTag don't pop them 
-     * out now. 
-     */ 
-    if ((ctxt->depth > 0) && 
-        (xmlStrEqual(name, BAD_CAST "html") || 
-         xmlStrEqual(name, BAD_CAST "body") || 
-	 xmlStrEqual(name, BAD_CAST "head"))) { 
-	ctxt->depth--; 
-	return (0); 
-    } 
- 
-    /* 
-     * If the name read is not one of the element in the parsing stack 
-     * then return, it's just an error. 
-     */ 
-    for (i = (ctxt->nameNr - 1); i >= 0; i--) { 
-        if (xmlStrEqual(name, ctxt->nameTab[i])) 
-            break; 
-    } 
-    if (i < 0) { 
-        htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH, 
-	             "Unexpected end tag : %s\n", name, NULL); 
-        return (0); 
-    } 
- 
- 
-    /* 
-     * Check for auto-closure of HTML elements. 
-     */ 
- 
-    htmlAutoCloseOnClose(ctxt, name); 
- 
-    /* 
-     * Well formedness constraints, opening and closing must match. 
-     * With the exception that the autoclose may have popped stuff out 
-     * of the stack. 
-     */ 
-    if (!xmlStrEqual(name, ctxt->name)) { 
-        if ((ctxt->name != NULL) && (!xmlStrEqual(ctxt->name, name))) { 
-            htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH, 
-	                 "Opening and ending tag mismatch: %s and %s\n", 
-			 name, ctxt->name); 
-        } 
-    } 
- 
-    /* 
-     * SAX: End of Tag 
-     */ 
-    oldname = ctxt->name; 
-    if ((oldname != NULL) && (xmlStrEqual(oldname, name))) { 
-        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-            ctxt->sax->endElement(ctxt->userData, name); 
-	htmlNodeInfoPop(ctxt); 
-        htmlnamePop(ctxt); 
-        ret = 1; 
-    } else { 
-        ret = 0; 
-    } 
- 
-    return (ret); 
-} 
- 
- 
-/** 
- * htmlParseReference: 
- * @ctxt:  an HTML parser context 
- * 
- * parse and handle entity references in content, 
- * this will end-up in a call to character() since this is either a 
- * CharRef, or a predefined entity. 
- */ 
-static void 
-htmlParseReference(htmlParserCtxtPtr ctxt) { 
-    const htmlEntityDesc * ent; 
-    xmlChar out[6]; 
-    const xmlChar *name; 
-    if (CUR != '&') return; 
- 
-    if (NXT(1) == '#') { 
-	unsigned int c; 
-	int bits, i = 0; 
- 
-	c = htmlParseCharRef(ctxt); 
-	if (c == 0) 
-	    return; 
- 
-        if      (c <    0x80) { out[i++]= c;                bits= -6; } 
-        else if (c <   0x800) { out[i++]=((c >>  6) & 0x1F) | 0xC0;  bits=  0; } 
-        else if (c < 0x10000) { out[i++]=((c >> 12) & 0x0F) | 0xE0;  bits=  6; } 
-        else                  { out[i++]=((c >> 18) & 0x07) | 0xF0;  bits= 12; } 
- 
-        for ( ; bits >= 0; bits-= 6) { 
-            out[i++]= ((c >> bits) & 0x3F) | 0x80; 
-        } 
-	out[i] = 0; 
- 
-	htmlCheckParagraph(ctxt); 
-	if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL)) 
-	    ctxt->sax->characters(ctxt->userData, out, i); 
-    } else { 
-	ent = htmlParseEntityRef(ctxt, &name); 
-	if (name == NULL) { 
-	    htmlCheckParagraph(ctxt); 
-	    if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL)) 
-	        ctxt->sax->characters(ctxt->userData, BAD_CAST "&", 1); 
-	    return; 
-	} 
-	if ((ent == NULL) || !(ent->value > 0)) { 
-	    htmlCheckParagraph(ctxt); 
-	    if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL)) { 
-		ctxt->sax->characters(ctxt->userData, BAD_CAST "&", 1); 
-		ctxt->sax->characters(ctxt->userData, name, xmlStrlen(name)); 
-		/* ctxt->sax->characters(ctxt->userData, BAD_CAST ";", 1); */ 
-	    } 
-	} else { 
-	    unsigned int c; 
-	    int bits, i = 0; 
- 
-	    c = ent->value; 
-	    if      (c <    0x80) 
-	            { out[i++]= c;                bits= -6; } 
-	    else if (c <   0x800) 
-	            { out[i++]=((c >>  6) & 0x1F) | 0xC0;  bits=  0; } 
-	    else if (c < 0x10000) 
-	            { out[i++]=((c >> 12) & 0x0F) | 0xE0;  bits=  6; } 
-	    else 
-	            { out[i++]=((c >> 18) & 0x07) | 0xF0;  bits= 12; } 
- 
-	    for ( ; bits >= 0; bits-= 6) { 
-		out[i++]= ((c >> bits) & 0x3F) | 0x80; 
-	    } 
-	    out[i] = 0; 
- 
-	    htmlCheckParagraph(ctxt); 
-	    if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL)) 
-		ctxt->sax->characters(ctxt->userData, out, i); 
-	} 
-    } 
-} 
- 
-/** 
- * htmlParseContent: 
- * @ctxt:  an HTML parser context 
- * 
- * Parse a content: comment, sub-element, reference or text. 
- * Kept for compatibility with old code 
- */ 
- 
-static void 
-htmlParseContent(htmlParserCtxtPtr ctxt) { 
-    xmlChar *currentNode; 
-    int depth; 
-    const xmlChar *name; 
- 
-    currentNode = xmlStrdup(ctxt->name); 
-    depth = ctxt->nameNr; 
-    while (1) { 
-	long cons = ctxt->nbChars; 
- 
-        GROW; 
- 
-        if (ctxt->instate == XML_PARSER_EOF) 
-            break; 
- 
-	/* 
-	 * Our tag or one of it's parent or children is ending. 
-	 */ 
-        if ((CUR == '<') && (NXT(1) == '/')) { 
-	    if (htmlParseEndTag(ctxt) && 
-		((currentNode != NULL) || (ctxt->nameNr == 0))) { 
-		if (currentNode != NULL) 
-		    xmlFree(currentNode); 
-		return; 
-	    } 
-	    continue; /* while */ 
-        } 
- 
-	else if ((CUR == '<') && 
-	         ((IS_ASCII_LETTER(NXT(1))) || 
-		  (NXT(1) == '_') || (NXT(1) == ':'))) { 
-	    name = htmlParseHTMLName_nonInvasive(ctxt); 
-	    if (name == NULL) { 
-	        htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED, 
-			 "htmlParseStartTag: invalid element name\n", 
-			 NULL, NULL); 
-	        /* Dump the bogus tag like browsers do */ 
-        while ((IS_CHAR_CH(CUR)) && (CUR != '>')) 
-	            NEXT; 
- 
-	        if (currentNode != NULL) 
-	            xmlFree(currentNode); 
-	        return; 
-	    } 
- 
-	    if (ctxt->name != NULL) { 
-	        if (htmlCheckAutoClose(name, ctxt->name) == 1) { 
-	            htmlAutoClose(ctxt, name); 
-	            continue; 
-	        } 
-	    } 
-	} 
- 
-	/* 
-	 * Has this node been popped out during parsing of 
-	 * the next element 
-	 */ 
-        if ((ctxt->nameNr > 0) && (depth >= ctxt->nameNr) && 
-	    (!xmlStrEqual(currentNode, ctxt->name))) 
-	     { 
-	    if (currentNode != NULL) xmlFree(currentNode); 
-	    return; 
-	} 
- 
-	if ((CUR != 0) && ((xmlStrEqual(currentNode, BAD_CAST"script")) || 
-	    (xmlStrEqual(currentNode, BAD_CAST"style")))) { 
-	    /* 
-	     * Handle SCRIPT/STYLE separately 
-	     */ 
-	    htmlParseScript(ctxt); 
-	} else { 
-	    /* 
-	     * Sometimes DOCTYPE arrives in the middle of the document 
-	     */ 
-	    if ((CUR == '<') && (NXT(1) == '!') && 
-		(UPP(2) == 'D') && (UPP(3) == 'O') && 
-		(UPP(4) == 'C') && (UPP(5) == 'T') && 
-		(UPP(6) == 'Y') && (UPP(7) == 'P') && 
-		(UPP(8) == 'E')) { 
-		htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, 
-		             "Misplaced DOCTYPE declaration\n", 
-			     BAD_CAST "DOCTYPE" , NULL); 
-		htmlParseDocTypeDecl(ctxt); 
-	    } 
- 
-	    /* 
-	     * First case :  a comment 
-	     */ 
-	    if ((CUR == '<') && (NXT(1) == '!') && 
-		(NXT(2) == '-') && (NXT(3) == '-')) { 
-		htmlParseComment(ctxt); 
-	    } 
- 
-	    /* 
-	     * Second case : a Processing Instruction. 
-	     */ 
-	    else if ((CUR == '<') && (NXT(1) == '?')) { 
-		htmlParsePI(ctxt); 
-	    } 
- 
-	    /* 
-	     * Third case :  a sub-element. 
-	     */ 
-	    else if (CUR == '<') { 
-		htmlParseElement(ctxt); 
-	    } 
- 
-	    /* 
-	     * Fourth case : a reference. If if has not been resolved, 
-	     *    parsing returns it's Name, create the node 
-	     */ 
-	    else if (CUR == '&') { 
-		htmlParseReference(ctxt); 
-	    } 
- 
-	    /* 
-	     * Fifth case : end of the resource 
-	     */ 
-	    else if (CUR == 0) { 
-		htmlAutoCloseOnEnd(ctxt); 
-		break; 
-	    } 
- 
-	    /* 
-	     * Last case, text. Note that References are handled directly. 
-	     */ 
-	    else { 
-		htmlParseCharData(ctxt); 
-	    } 
- 
-	    if (cons == ctxt->nbChars) { 
-		if (ctxt->node != NULL) { 
-		    htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-		                 "detected an error in element content\n", 
-				 NULL, NULL); 
-		} 
-		break; 
-	    } 
-	} 
-        GROW; 
-    } 
-    if (currentNode != NULL) xmlFree(currentNode); 
-} 
- 
-/** 
- * htmlParseElement: 
- * @ctxt:  an HTML parser context 
- * 
- * parse an HTML element, this is highly recursive 
- * this is kept for compatibility with previous code versions 
- * 
- * [39] element ::= EmptyElemTag | STag content ETag 
- * 
- * [41] Attribute ::= Name Eq AttValue 
- */ 
- 
-void 
-htmlParseElement(htmlParserCtxtPtr ctxt) { 
-    const xmlChar *name; 
-    xmlChar *currentNode = NULL; 
-    const htmlElemDesc * info; 
-    htmlParserNodeInfo node_info; 
-    int failed; 
-    int depth; 
-    const xmlChar *oldptr; 
- 
-    if ((ctxt == NULL) || (ctxt->input == NULL)) { 
-	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-		     "htmlParseElement: context error\n", NULL, NULL); 
-	return; 
-    } 
- 
-    if (ctxt->instate == XML_PARSER_EOF) 
-        return; 
- 
-    /* Capture start position */ 
-    if (ctxt->record_info) { 
-        node_info.begin_pos = ctxt->input->consumed + 
-                          (CUR_PTR - ctxt->input->base); 
-	node_info.begin_line = ctxt->input->line; 
-    } 
- 
-    failed = htmlParseStartTag(ctxt); 
-    name = ctxt->name; 
-    if ((failed == -1) || (name == NULL)) { 
-	if (CUR == '>') 
-	    NEXT; 
-        return; 
-    } 
- 
-    /* 
-     * Lookup the info for that element. 
-     */ 
-    info = htmlTagLookup(name); 
-    if (info == NULL) { 
-	htmlParseErr(ctxt, XML_HTML_UNKNOWN_TAG, 
-	             "Tag %s invalid\n", name, NULL); 
-    } 
- 
-    /* 
-     * Check for an Empty Element labeled the XML/SGML way 
-     */ 
-    if ((CUR == '/') && (NXT(1) == '>')) { 
-        SKIP(2); 
-	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-	    ctxt->sax->endElement(ctxt->userData, name); 
-	htmlnamePop(ctxt); 
-	return; 
-    } 
- 
-    if (CUR == '>') { 
-        NEXT; 
-    } else { 
-	htmlParseErr(ctxt, XML_ERR_GT_REQUIRED, 
-	             "Couldn't find end of Start Tag %s\n", name, NULL); 
- 
-	/* 
-	 * end of parsing of this node. 
-	 */ 
-	if (xmlStrEqual(name, ctxt->name)) { 
-	    nodePop(ctxt); 
-	    htmlnamePop(ctxt); 
-	} 
- 
-	/* 
-	 * Capture end position and add node 
-	 */ 
-	if (ctxt->record_info) { 
-	   node_info.end_pos = ctxt->input->consumed + 
-			      (CUR_PTR - ctxt->input->base); 
-	   node_info.end_line = ctxt->input->line; 
-	   node_info.node = ctxt->node; 
-	   xmlParserAddNodeInfo(ctxt, &node_info); 
-	} 
-	return; 
-    } 
- 
-    /* 
-     * Check for an Empty Element from DTD definition 
-     */ 
-    if ((info != NULL) && (info->empty)) { 
-	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-	    ctxt->sax->endElement(ctxt->userData, name); 
-	htmlnamePop(ctxt); 
-	return; 
-    } 
- 
-    /* 
-     * Parse the content of the element: 
-     */ 
-    currentNode = xmlStrdup(ctxt->name); 
-    depth = ctxt->nameNr; 
-    while (IS_CHAR_CH(CUR)) { 
-	oldptr = ctxt->input->cur; 
-	htmlParseContent(ctxt); 
-	if (oldptr==ctxt->input->cur) break; 
-	if (ctxt->nameNr < depth) break; 
-    } 
- 
-    /* 
-     * Capture end position and add node 
-     */ 
-    if ( currentNode != NULL && ctxt->record_info ) { 
-       node_info.end_pos = ctxt->input->consumed + 
-                          (CUR_PTR - ctxt->input->base); 
-       node_info.end_line = ctxt->input->line; 
-       node_info.node = ctxt->node; 
-       xmlParserAddNodeInfo(ctxt, &node_info); 
-    } 
-    if (!IS_CHAR_CH(CUR)) { 
-	htmlAutoCloseOnEnd(ctxt); 
-    } 
- 
-    if (currentNode != NULL) 
-	xmlFree(currentNode); 
-} 
- 
-static void 
-htmlParserFinishElementParsing(htmlParserCtxtPtr ctxt) { 
-    /* 
-     * Capture end position and add node 
-     */ 
-    if ( ctxt->node != NULL && ctxt->record_info ) { 
-       ctxt->nodeInfo->end_pos = ctxt->input->consumed + 
-                                (CUR_PTR - ctxt->input->base); 
-       ctxt->nodeInfo->end_line = ctxt->input->line; 
-       ctxt->nodeInfo->node = ctxt->node; 
-       xmlParserAddNodeInfo(ctxt, ctxt->nodeInfo); 
-       htmlNodeInfoPop(ctxt); 
-    } 
-    if (!IS_CHAR_CH(CUR)) { 
-       htmlAutoCloseOnEnd(ctxt); 
-    } 
-} 
- 
-/** 
- * htmlParseElementInternal: 
- * @ctxt:  an HTML parser context 
- * 
- * parse an HTML element, new version, non recursive 
- * 
- * [39] element ::= EmptyElemTag | STag content ETag 
- * 
- * [41] Attribute ::= Name Eq AttValue 
- */ 
- 
-static void 
-htmlParseElementInternal(htmlParserCtxtPtr ctxt) { 
-    const xmlChar *name; 
-    const htmlElemDesc * info; 
-    htmlParserNodeInfo node_info = { NULL, 0, 0, 0, 0 };
-    int failed; 
- 
-    if ((ctxt == NULL) || (ctxt->input == NULL)) { 
-	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-		     "htmlParseElementInternal: context error\n", NULL, NULL); 
-	return; 
-    } 
- 
-    if (ctxt->instate == XML_PARSER_EOF) 
-        return; 
- 
-    /* Capture start position */ 
-    if (ctxt->record_info) { 
-        node_info.begin_pos = ctxt->input->consumed + 
-                          (CUR_PTR - ctxt->input->base); 
-	node_info.begin_line = ctxt->input->line; 
-    } 
- 
-    failed = htmlParseStartTag(ctxt); 
-    name = ctxt->name; 
-    if ((failed == -1) || (name == NULL)) { 
-	if (CUR == '>') 
-	    NEXT; 
-        return; 
-    } 
- 
-    /* 
-     * Lookup the info for that element. 
-     */ 
-    info = htmlTagLookup(name); 
-    if (info == NULL) { 
-	htmlParseErr(ctxt, XML_HTML_UNKNOWN_TAG, 
-	             "Tag %s invalid\n", name, NULL); 
-    } 
- 
-    /* 
-     * Check for an Empty Element labeled the XML/SGML way 
-     */ 
-    if ((CUR == '/') && (NXT(1) == '>')) { 
-        SKIP(2); 
-	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-	    ctxt->sax->endElement(ctxt->userData, name); 
-	htmlnamePop(ctxt); 
-	return; 
-    } 
- 
-    if (CUR == '>') { 
-        NEXT; 
-    } else { 
-	htmlParseErr(ctxt, XML_ERR_GT_REQUIRED, 
-	             "Couldn't find end of Start Tag %s\n", name, NULL); 
- 
-	/* 
-	 * end of parsing of this node. 
-	 */ 
-	if (xmlStrEqual(name, ctxt->name)) { 
-	    nodePop(ctxt); 
-	    htmlnamePop(ctxt); 
-	} 
- 
-        if (ctxt->record_info) 
-            htmlNodeInfoPush(ctxt, &node_info); 
-        htmlParserFinishElementParsing(ctxt); 
-	return; 
-    } 
- 
-    /* 
-     * Check for an Empty Element from DTD definition 
-     */ 
-    if ((info != NULL) && (info->empty)) { 
-	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-	    ctxt->sax->endElement(ctxt->userData, name); 
-	htmlnamePop(ctxt); 
-	return; 
-    } 
- 
-    if (ctxt->record_info) 
-        htmlNodeInfoPush(ctxt, &node_info); 
-} 
- 
-/** 
- * htmlParseContentInternal: 
- * @ctxt:  an HTML parser context 
- * 
- * Parse a content: comment, sub-element, reference or text. 
- * New version for non recursive htmlParseElementInternal 
- */ 
- 
-static void 
-htmlParseContentInternal(htmlParserCtxtPtr ctxt) { 
-    xmlChar *currentNode; 
-    int depth; 
-    const xmlChar *name; 
- 
-    currentNode = xmlStrdup(ctxt->name); 
-    depth = ctxt->nameNr; 
-    while (1) { 
-	long cons = ctxt->nbChars; 
- 
-        GROW; 
- 
-        if (ctxt->instate == XML_PARSER_EOF) 
-            break; 
- 
-	/* 
-	 * Our tag or one of it's parent or children is ending. 
-	 */ 
-        if ((CUR == '<') && (NXT(1) == '/')) { 
-	    if (htmlParseEndTag(ctxt) && 
-		((currentNode != NULL) || (ctxt->nameNr == 0))) { 
-		if (currentNode != NULL) 
-		    xmlFree(currentNode); 
- 
-	        currentNode = xmlStrdup(ctxt->name); 
-	        depth = ctxt->nameNr; 
-	    } 
-	    continue; /* while */ 
-        } 
- 
-	else if ((CUR == '<') && 
-	         ((IS_ASCII_LETTER(NXT(1))) || 
-		  (NXT(1) == '_') || (NXT(1) == ':'))) { 
-	    name = htmlParseHTMLName_nonInvasive(ctxt); 
-	    if (name == NULL) { 
-	        htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED, 
-			 "htmlParseStartTag: invalid element name\n", 
-			 NULL, NULL); 
-	        /* Dump the bogus tag like browsers do */ 
-	        while ((IS_CHAR_CH(CUR)) && (CUR != '>')) 
-	            NEXT; 
- 
-	        htmlParserFinishElementParsing(ctxt); 
-	        if (currentNode != NULL) 
-	            xmlFree(currentNode); 
- 
-	        currentNode = xmlStrdup(ctxt->name); 
-	        depth = ctxt->nameNr; 
-	        continue; 
-	    } 
- 
-	    if (ctxt->name != NULL) { 
-	        if (htmlCheckAutoClose(name, ctxt->name) == 1) { 
-	            htmlAutoClose(ctxt, name); 
-	            continue; 
-	        } 
-	    } 
-	} 
- 
-	/* 
-	 * Has this node been popped out during parsing of 
-	 * the next element 
-	 */ 
-        if ((ctxt->nameNr > 0) && (depth >= ctxt->nameNr) && 
-	    (!xmlStrEqual(currentNode, ctxt->name))) 
-	     { 
-	    htmlParserFinishElementParsing(ctxt); 
-	    if (currentNode != NULL) xmlFree(currentNode); 
- 
-	    currentNode = xmlStrdup(ctxt->name); 
-	    depth = ctxt->nameNr; 
-	    continue; 
-	} 
- 
-	if ((CUR != 0) && ((xmlStrEqual(currentNode, BAD_CAST"script")) || 
-	    (xmlStrEqual(currentNode, BAD_CAST"style")))) { 
-	    /* 
-	     * Handle SCRIPT/STYLE separately 
-	     */ 
-	    htmlParseScript(ctxt); 
-	} else { 
-	    /* 
-	     * Sometimes DOCTYPE arrives in the middle of the document 
-	     */ 
-	    if ((CUR == '<') && (NXT(1) == '!') && 
-		(UPP(2) == 'D') && (UPP(3) == 'O') && 
-		(UPP(4) == 'C') && (UPP(5) == 'T') && 
-		(UPP(6) == 'Y') && (UPP(7) == 'P') && 
-		(UPP(8) == 'E')) { 
-		htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, 
-		             "Misplaced DOCTYPE declaration\n", 
-			     BAD_CAST "DOCTYPE" , NULL); 
-		htmlParseDocTypeDecl(ctxt); 
-	    } 
- 
-	    /* 
-	     * First case :  a comment 
-	     */ 
-	    if ((CUR == '<') && (NXT(1) == '!') && 
-		(NXT(2) == '-') && (NXT(3) == '-')) { 
-		htmlParseComment(ctxt); 
-	    } 
- 
-	    /* 
-	     * Second case : a Processing Instruction. 
-	     */ 
-	    else if ((CUR == '<') && (NXT(1) == '?')) { 
-		htmlParsePI(ctxt); 
-	    } 
- 
-	    /* 
-	     * Third case :  a sub-element. 
-	     */ 
-	    else if (CUR == '<') { 
-		htmlParseElementInternal(ctxt); 
-		if (currentNode != NULL) xmlFree(currentNode); 
- 
-		currentNode = xmlStrdup(ctxt->name); 
-		depth = ctxt->nameNr; 
-	    } 
- 
-	    /* 
-	     * Fourth case : a reference. If if has not been resolved, 
-	     *    parsing returns it's Name, create the node 
-	     */ 
-	    else if (CUR == '&') { 
-		htmlParseReference(ctxt); 
-	    } 
- 
-	    /* 
-	     * Fifth case : end of the resource 
-	     */ 
-	    else if (CUR == 0) { 
-		htmlAutoCloseOnEnd(ctxt); 
-		break; 
-	    } 
- 
-	    /* 
-	     * Last case, text. Note that References are handled directly. 
-	     */ 
-	    else { 
-		htmlParseCharData(ctxt); 
-	    } 
- 
-	    if (cons == ctxt->nbChars) { 
-		if (ctxt->node != NULL) { 
-		    htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-		                 "detected an error in element content\n", 
-				 NULL, NULL); 
-		} 
-		break; 
-	    } 
-	} 
-        GROW; 
-    } 
-    if (currentNode != NULL) xmlFree(currentNode); 
-} 
- 
-/** 
- * htmlParseContent: 
- * @ctxt:  an HTML parser context 
- * 
- * Parse a content: comment, sub-element, reference or text. 
- * This is the entry point when called from parser.c 
- */ 
- 
-void 
-__htmlParseContent(void *ctxt) { 
-    if (ctxt != NULL) 
-	htmlParseContentInternal((htmlParserCtxtPtr) ctxt); 
-} 
- 
-/** 
- * htmlParseDocument: 
- * @ctxt:  an HTML parser context 
- * 
- * parse an HTML document (and build a tree if using the standard SAX 
- * interface). 
- * 
- * Returns 0, -1 in case of error. the parser context is augmented 
- *                as a result of the parsing. 
- */ 
- 
-int 
-htmlParseDocument(htmlParserCtxtPtr ctxt) { 
-    xmlChar start[4]; 
-    xmlCharEncoding enc; 
-    xmlDtdPtr dtd; 
- 
-    xmlInitParser(); 
- 
-    htmlDefaultSAXHandlerInit(); 
- 
-    if ((ctxt == NULL) || (ctxt->input == NULL)) { 
-	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-		     "htmlParseDocument: context error\n", NULL, NULL); 
-	return(XML_ERR_INTERNAL_ERROR); 
-    } 
-    ctxt->html = 1; 
-    ctxt->linenumbers = 1; 
-    GROW; 
-    /* 
-     * SAX: beginning of the document processing. 
-     */ 
-    if ((ctxt->sax) && (ctxt->sax->setDocumentLocator)) 
-        ctxt->sax->setDocumentLocator(ctxt->userData, &xmlDefaultSAXLocator); 
- 
-    if ((ctxt->encoding == (const xmlChar *)XML_CHAR_ENCODING_NONE) && 
-        ((ctxt->input->end - ctxt->input->cur) >= 4)) { 
-	/* 
-	 * Get the 4 first bytes and decode the charset 
-	 * if enc != XML_CHAR_ENCODING_NONE 
-	 * plug some encoding conversion routines. 
-	 */ 
-	start[0] = RAW; 
-	start[1] = NXT(1); 
-	start[2] = NXT(2); 
-	start[3] = NXT(3); 
-	enc = xmlDetectCharEncoding(&start[0], 4); 
-	if (enc != XML_CHAR_ENCODING_NONE) { 
-	    xmlSwitchEncoding(ctxt, enc); 
-	} 
-    } 
- 
-    /* 
-     * Wipe out everything which is before the first '<' 
-     */ 
-    SKIP_BLANKS; 
-    if (CUR == 0) { 
-	htmlParseErr(ctxt, XML_ERR_DOCUMENT_EMPTY, 
-	             "Document is empty\n", NULL, NULL); 
-    } 
- 
-    if ((ctxt->sax) && (ctxt->sax->startDocument) && (!ctxt->disableSAX)) 
-	ctxt->sax->startDocument(ctxt->userData); 
- 
- 
-    /* 
-     * Parse possible comments and PIs before any content 
-     */ 
-    while (((CUR == '<') && (NXT(1) == '!') && 
-            (NXT(2) == '-') && (NXT(3) == '-')) || 
-	   ((CUR == '<') && (NXT(1) == '?'))) { 
-        htmlParseComment(ctxt); 
-        htmlParsePI(ctxt); 
-	SKIP_BLANKS; 
-    } 
- 
- 
-    /* 
-     * Then possibly doc type declaration(s) and more Misc 
-     * (doctypedecl Misc*)? 
-     */ 
-    if ((CUR == '<') && (NXT(1) == '!') && 
-	(UPP(2) == 'D') && (UPP(3) == 'O') && 
-	(UPP(4) == 'C') && (UPP(5) == 'T') && 
-	(UPP(6) == 'Y') && (UPP(7) == 'P') && 
-	(UPP(8) == 'E')) { 
-	htmlParseDocTypeDecl(ctxt); 
-    } 
-    SKIP_BLANKS; 
- 
-    /* 
-     * Parse possible comments and PIs before any content 
-     */ 
-    while (((CUR == '<') && (NXT(1) == '!') && 
-            (NXT(2) == '-') && (NXT(3) == '-')) || 
-	   ((CUR == '<') && (NXT(1) == '?'))) { 
-        htmlParseComment(ctxt); 
-        htmlParsePI(ctxt); 
-	SKIP_BLANKS; 
-    } 
- 
-    /* 
-     * Time to start parsing the tree itself 
-     */ 
-    htmlParseContentInternal(ctxt); 
- 
-    /* 
-     * autoclose 
-     */ 
-    if (CUR == 0) 
-	htmlAutoCloseOnEnd(ctxt); 
- 
- 
-    /* 
-     * SAX: end of the document processing. 
-     */ 
-    if ((ctxt->sax) && (ctxt->sax->endDocument != NULL)) 
-        ctxt->sax->endDocument(ctxt->userData); 
- 
-    if ((!(ctxt->options & HTML_PARSE_NODEFDTD)) && (ctxt->myDoc != NULL)) { 
-	dtd = xmlGetIntSubset(ctxt->myDoc); 
-	if (dtd == NULL) 
-	    ctxt->myDoc->intSubset = 
-		xmlCreateIntSubset(ctxt->myDoc, BAD_CAST "html", 
-		    BAD_CAST "-//W3C//DTD HTML 4.0 Transitional//EN", 
-		    BAD_CAST "http://www.w3.org/TR/REC-html40/loose.dtd"); 
-    } 
-    if (! ctxt->wellFormed) return(-1); 
-    return(0); 
-} 
- 
- 
-/************************************************************************ 
- *									* 
- *			Parser contexts handling			* 
- *									* 
- ************************************************************************/ 
- 
-/** 
- * htmlInitParserCtxt: 
- * @ctxt:  an HTML parser context 
- * 
- * Initialize a parser context 
- * 
- * Returns 0 in case of success and -1 in case of error 
- */ 
- 
-static int 
-htmlInitParserCtxt(htmlParserCtxtPtr ctxt) 
-{ 
-    htmlSAXHandler *sax; 
- 
-    if (ctxt == NULL) return(-1); 
-    memset(ctxt, 0, sizeof(htmlParserCtxt)); 
- 
-    ctxt->dict = xmlDictCreate(); 
-    if (ctxt->dict == NULL) { 
-        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n"); 
-	return(-1); 
-    } 
-    sax = (htmlSAXHandler *) xmlMalloc(sizeof(htmlSAXHandler)); 
-    if (sax == NULL) { 
-        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n"); 
-	return(-1); 
-    } 
-    else 
-        memset(sax, 0, sizeof(htmlSAXHandler)); 
- 
-    /* Allocate the Input stack */ 
-    ctxt->inputTab = (htmlParserInputPtr *) 
-                      xmlMalloc(5 * sizeof(htmlParserInputPtr)); 
-    if (ctxt->inputTab == NULL) { 
-        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n"); 
-	ctxt->inputNr = 0; 
-	ctxt->inputMax = 0; 
-	ctxt->input = NULL; 
-	return(-1); 
-    } 
-    ctxt->inputNr = 0; 
-    ctxt->inputMax = 5; 
-    ctxt->input = NULL; 
-    ctxt->version = NULL; 
-    ctxt->encoding = NULL; 
-    ctxt->standalone = -1; 
-    ctxt->instate = XML_PARSER_START; 
- 
-    /* Allocate the Node stack */ 
-    ctxt->nodeTab = (htmlNodePtr *) xmlMalloc(10 * sizeof(htmlNodePtr)); 
-    if (ctxt->nodeTab == NULL) { 
-        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n"); 
-	ctxt->nodeNr = 0; 
-	ctxt->nodeMax = 0; 
-	ctxt->node = NULL; 
-	ctxt->inputNr = 0; 
-	ctxt->inputMax = 0; 
-	ctxt->input = NULL; 
-	return(-1); 
-    } 
-    ctxt->nodeNr = 0; 
-    ctxt->nodeMax = 10; 
-    ctxt->node = NULL; 
- 
-    /* Allocate the Name stack */ 
-    ctxt->nameTab = (const xmlChar **) xmlMalloc(10 * sizeof(xmlChar *)); 
-    if (ctxt->nameTab == NULL) { 
-        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n"); 
-	ctxt->nameNr = 0; 
-	ctxt->nameMax = 0; 
-	ctxt->name = NULL; 
-	ctxt->nodeNr = 0; 
-	ctxt->nodeMax = 0; 
-	ctxt->node = NULL; 
-	ctxt->inputNr = 0; 
-	ctxt->inputMax = 0; 
-	ctxt->input = NULL; 
-	return(-1); 
-    } 
-    ctxt->nameNr = 0; 
-    ctxt->nameMax = 10; 
-    ctxt->name = NULL; 
- 
-    ctxt->nodeInfoTab = NULL; 
-    ctxt->nodeInfoNr  = 0; 
-    ctxt->nodeInfoMax = 0; 
- 
-    if (sax == NULL) ctxt->sax = (xmlSAXHandlerPtr) &htmlDefaultSAXHandler; 
-    else { 
-        ctxt->sax = sax; 
-	memcpy(sax, &htmlDefaultSAXHandler, sizeof(xmlSAXHandlerV1)); 
-    } 
-    ctxt->userData = ctxt; 
-    ctxt->myDoc = NULL; 
-    ctxt->wellFormed = 1; 
-    ctxt->replaceEntities = 0; 
-    ctxt->linenumbers = xmlLineNumbersDefaultValue; 
-    ctxt->keepBlanks = xmlKeepBlanksDefaultValue;
-    ctxt->html = 1; 
-    ctxt->vctxt.finishDtd = XML_CTXT_FINISH_DTD_0; 
-    ctxt->vctxt.userData = ctxt; 
-    ctxt->vctxt.error = xmlParserValidityError; 
-    ctxt->vctxt.warning = xmlParserValidityWarning; 
-    ctxt->record_info = 0; 
-    ctxt->validate = 0; 
-    ctxt->nbChars = 0; 
-    ctxt->checkIndex = 0; 
-    ctxt->catalogs = NULL; 
-    xmlInitNodeInfoSeq(&ctxt->node_seq); 
-    return(0); 
-} 
- 
-/** 
- * htmlFreeParserCtxt: 
- * @ctxt:  an HTML parser context 
- * 
- * Free all the memory used by a parser context. However the parsed 
- * document in ctxt->myDoc is not freed. 
- */ 
- 
-void 
-htmlFreeParserCtxt(htmlParserCtxtPtr ctxt) 
-{ 
-    xmlFreeParserCtxt(ctxt); 
-} 
- 
-/** 
- * htmlNewParserCtxt: 
- * 
- * Allocate and initialize a new parser context. 
- * 
- * Returns the htmlParserCtxtPtr or NULL in case of allocation error 
- */ 
- 
-htmlParserCtxtPtr 
-htmlNewParserCtxt(void) 
-{ 
-    xmlParserCtxtPtr ctxt; 
- 
-    ctxt = (xmlParserCtxtPtr) xmlMalloc(sizeof(xmlParserCtxt)); 
-    if (ctxt == NULL) { 
-        htmlErrMemory(NULL, "NewParserCtxt: out of memory\n"); 
-	return(NULL); 
-    } 
-    memset(ctxt, 0, sizeof(xmlParserCtxt)); 
-    if (htmlInitParserCtxt(ctxt) < 0) { 
-        htmlFreeParserCtxt(ctxt); 
-	return(NULL); 
-    } 
-    return(ctxt); 
-} 
- 
-/** 
- * htmlCreateMemoryParserCtxt: 
- * @buffer:  a pointer to a char array 
- * @size:  the size of the array 
- * 
- * Create a parser context for an HTML in-memory document. 
- * 
- * Returns the new parser context or NULL 
- */ 
-htmlParserCtxtPtr 
-htmlCreateMemoryParserCtxt(const char *buffer, int size) { 
-    xmlParserCtxtPtr ctxt; 
-    xmlParserInputPtr input; 
-    xmlParserInputBufferPtr buf; 
- 
-    if (buffer == NULL) 
-	return(NULL); 
-    if (size <= 0) 
-	return(NULL); 
- 
-    ctxt = htmlNewParserCtxt(); 
-    if (ctxt == NULL) 
-	return(NULL); 
- 
-    buf = xmlParserInputBufferCreateMem(buffer, size, XML_CHAR_ENCODING_NONE); 
-    if (buf == NULL) return(NULL); 
- 
-    input = xmlNewInputStream(ctxt); 
-    if (input == NULL) { 
-	xmlFreeParserCtxt(ctxt); 
-	return(NULL); 
-    } 
- 
-    input->filename = NULL; 
-    input->buf = buf; 
-    xmlBufResetInput(buf->buffer, input); 
- 
-    inputPush(ctxt, input); 
-    return(ctxt); 
-} 
- 
-/** 
- * htmlCreateDocParserCtxt: 
- * @cur:  a pointer to an array of xmlChar 
- * @encoding:  a free form C string describing the HTML document encoding, or NULL 
- * 
- * Create a parser context for an HTML document. 
- * 
- * TODO: check the need to add encoding handling there 
- * 
- * Returns the new parser context or NULL 
- */ 
-static htmlParserCtxtPtr 
-htmlCreateDocParserCtxt(const xmlChar *cur, const char *encoding) { 
-    int len; 
-    htmlParserCtxtPtr ctxt; 
- 
-    if (cur == NULL) 
-	return(NULL); 
-    len = xmlStrlen(cur); 
-    ctxt = htmlCreateMemoryParserCtxt((char *)cur, len); 
-    if (ctxt == NULL) 
-	return(NULL); 
- 
-    if (encoding != NULL) { 
-	xmlCharEncoding enc; 
-	xmlCharEncodingHandlerPtr handler; 
- 
-	if (ctxt->input->encoding != NULL) 
-	    xmlFree((xmlChar *) ctxt->input->encoding); 
-	ctxt->input->encoding = xmlStrdup((const xmlChar *) encoding); 
- 
-	enc = xmlParseCharEncoding(encoding); 
-	/* 
-	 * registered set of known encodings 
-	 */ 
-	if (enc != XML_CHAR_ENCODING_ERROR) { 
-	    xmlSwitchEncoding(ctxt, enc); 
-	    if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) { 
-		htmlParseErr(ctxt, XML_ERR_UNSUPPORTED_ENCODING, 
-		             "Unsupported encoding %s\n", 
-			     (const xmlChar *) encoding, NULL); 
-	    } 
-	} else { 
-	    /* 
-	     * fallback for unknown encodings 
-	     */ 
-	    handler = xmlFindCharEncodingHandler((const char *) encoding); 
-	    if (handler != NULL) { 
-		xmlSwitchToEncoding(ctxt, handler); 
-	    } else { 
-		htmlParseErr(ctxt, XML_ERR_UNSUPPORTED_ENCODING, 
-		             "Unsupported encoding %s\n", 
-			     (const xmlChar *) encoding, NULL); 
-	    } 
-	} 
-    } 
-    return(ctxt); 
-} 
- 
-#ifdef LIBXML_PUSH_ENABLED 
-/************************************************************************ 
- *									* 
- *	Progressive parsing interfaces				* 
- *									* 
- ************************************************************************/ 
- 
-/** 
- * htmlParseLookupSequence: 
- * @ctxt:  an HTML parser context 
- * @first:  the first char to lookup 
- * @next:  the next char to lookup or zero 
- * @third:  the next char to lookup or zero 
- * @comment: flag to force checking inside comments 
- * 
- * Try to find if a sequence (first, next, third) or  just (first next) or 
- * (first) is available in the input stream. 
- * This function has a side effect of (possibly) incrementing ctxt->checkIndex 
- * to avoid rescanning sequences of bytes, it DOES change the state of the 
- * parser, do not use liberally. 
- * This is basically similar to xmlParseLookupSequence() 
- * 
- * Returns the index to the current parsing point if the full sequence 
- *      is available, -1 otherwise. 
- */ 
-static int 
-htmlParseLookupSequence(htmlParserCtxtPtr ctxt, xmlChar first, 
-                        xmlChar next, xmlChar third, int iscomment, 
-                        int ignoreattrval) 
-{ 
-    int base, len; 
-    htmlParserInputPtr in; 
-    const xmlChar *buf; 
-    int incomment = 0; 
-    int invalue = 0; 
-    char valdellim = 0x0; 
- 
-    in = ctxt->input; 
-    if (in == NULL) 
-        return (-1); 
- 
-    base = in->cur - in->base; 
-    if (base < 0) 
-        return (-1); 
- 
-    if (ctxt->checkIndex > base) 
-        base = ctxt->checkIndex; 
- 
-    if (in->buf == NULL) { 
-        buf = in->base; 
-        len = in->length; 
-    } else { 
-        buf = xmlBufContent(in->buf->buffer); 
-        len = xmlBufUse(in->buf->buffer); 
-    } 
- 
-    /* take into account the sequence length */ 
-    if (third) 
-        len -= 2; 
-    else if (next) 
-        len--; 
-    for (; base < len; base++) { 
-        if ((!incomment) && (base + 4 < len) && (!iscomment)) { 
-            if ((buf[base] == '<') && (buf[base + 1] == '!') && 
-                (buf[base + 2] == '-') && (buf[base + 3] == '-')) { 
-                incomment = 1; 
-                /* do not increment past <! - some people use <!--> */ 
-                base += 2; 
-            } 
-        } 
-        if (ignoreattrval) { 
-            if (buf[base] == '"' || buf[base] == '\'') { 
-                if (invalue) { 
-                    if (buf[base] == valdellim) { 
-                        invalue = 0; 
-                        continue; 
-                    } 
-                } else { 
-                    valdellim = buf[base]; 
-                    invalue = 1; 
-                    continue; 
-                } 
-            } else if (invalue) { 
-                continue; 
-            } 
-        } 
-        if (incomment) { 
-            if (base + 3 > len) 
-                return (-1); 
-            if ((buf[base] == '-') && (buf[base + 1] == '-') && 
-                (buf[base + 2] == '>')) { 
-                incomment = 0; 
-                base += 2; 
-            } 
-            continue; 
-        } 
-        if (buf[base] == first) { 
-            if (third != 0) { 
-                if ((buf[base + 1] != next) || (buf[base + 2] != third)) 
-                    continue; 
-            } else if (next != 0) { 
-                if (buf[base + 1] != next) 
-                    continue; 
-            } 
-            ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-            if (next == 0) 
-                xmlGenericError(xmlGenericErrorContext, 
-                                "HPP: lookup '%c' found at %d\n", 
-                                first, base); 
-            else if (third == 0) 
-                xmlGenericError(xmlGenericErrorContext, 
-                                "HPP: lookup '%c%c' found at %d\n", 
-                                first, next, base); 
-            else 
-                xmlGenericError(xmlGenericErrorContext, 
-                                "HPP: lookup '%c%c%c' found at %d\n", 
-                                first, next, third, base); 
-#endif 
-            return (base - (in->cur - in->base)); 
-        } 
-    } 
-    if ((!incomment) && (!invalue)) 
-        ctxt->checkIndex = base; 
-#ifdef DEBUG_PUSH 
-    if (next == 0) 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "HPP: lookup '%c' failed\n", first); 
-    else if (third == 0) 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "HPP: lookup '%c%c' failed\n", first, next); 
-    else 
-        xmlGenericError(xmlGenericErrorContext, 
-                        "HPP: lookup '%c%c%c' failed\n", first, next, 
-                        third); 
-#endif 
-    return (-1); 
-} 
- 
-/** 
- * htmlParseLookupChars: 
- * @ctxt: an HTML parser context 
- * @stop: Array of chars, which stop the lookup. 
- * @stopLen: Length of stop-Array 
- * 
- * Try to find if any char of the stop-Array is available in the input 
- * stream. 
- * This function has a side effect of (possibly) incrementing ctxt->checkIndex 
- * to avoid rescanning sequences of bytes, it DOES change the state of the 
- * parser, do not use liberally. 
- * 
- * Returns the index to the current parsing point if a stopChar 
- *      is available, -1 otherwise. 
- */ 
-static int 
-htmlParseLookupChars(htmlParserCtxtPtr ctxt, const xmlChar * stop, 
-                     int stopLen) 
-{ 
-    int base, len; 
-    htmlParserInputPtr in; 
-    const xmlChar *buf; 
-    int incomment = 0; 
-    int i; 
- 
-    in = ctxt->input; 
-    if (in == NULL) 
-        return (-1); 
- 
-    base = in->cur - in->base; 
-    if (base < 0) 
-        return (-1); 
- 
-    if (ctxt->checkIndex > base) 
-        base = ctxt->checkIndex; 
- 
-    if (in->buf == NULL) { 
-        buf = in->base; 
-        len = in->length; 
-    } else { 
-        buf = xmlBufContent(in->buf->buffer); 
-        len = xmlBufUse(in->buf->buffer); 
-    } 
- 
-    for (; base < len; base++) { 
-        if (!incomment && (base + 4 < len)) { 
-            if ((buf[base] == '<') && (buf[base + 1] == '!') && 
-                (buf[base + 2] == '-') && (buf[base + 3] == '-')) { 
-                incomment = 1; 
-                /* do not increment past <! - some people use <!--> */ 
-                base += 2; 
-            } 
-        } 
-        if (incomment) { 
-            if (base + 3 > len) 
-                return (-1); 
-            if ((buf[base] == '-') && (buf[base + 1] == '-') && 
-                (buf[base + 2] == '>')) { 
-                incomment = 0; 
-                base += 2; 
-            } 
-            continue; 
-        } 
-        for (i = 0; i < stopLen; ++i) { 
-            if (buf[base] == stop[i]) { 
-                ctxt->checkIndex = 0; 
-                return (base - (in->cur - in->base)); 
-            } 
-        } 
-    } 
-    ctxt->checkIndex = base; 
-    return (-1); 
-} 
- 
-/** 
- * htmlParseTryOrFinish: 
- * @ctxt:  an HTML parser context 
- * @terminate:  last chunk indicator 
- * 
- * Try to progress on parsing 
- * 
- * Returns zero if no parsing was possible 
- */ 
-static int 
-htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) { 
-    int ret = 0; 
-    htmlParserInputPtr in; 
-    int avail = 0; 
-    xmlChar cur, next; 
- 
-    htmlParserNodeInfo node_info; 
- 
-#ifdef DEBUG_PUSH 
-    switch (ctxt->instate) { 
-	case XML_PARSER_EOF: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try EOF\n"); break; 
-	case XML_PARSER_START: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try START\n"); break; 
-	case XML_PARSER_MISC: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try MISC\n");break; 
-	case XML_PARSER_COMMENT: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try COMMENT\n");break; 
-	case XML_PARSER_PROLOG: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try PROLOG\n");break; 
-	case XML_PARSER_START_TAG: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try START_TAG\n");break; 
-	case XML_PARSER_CONTENT: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try CONTENT\n");break; 
-	case XML_PARSER_CDATA_SECTION: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try CDATA_SECTION\n");break; 
-	case XML_PARSER_END_TAG: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try END_TAG\n");break; 
-	case XML_PARSER_ENTITY_DECL: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try ENTITY_DECL\n");break; 
-	case XML_PARSER_ENTITY_VALUE: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try ENTITY_VALUE\n");break; 
-	case XML_PARSER_ATTRIBUTE_VALUE: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try ATTRIBUTE_VALUE\n");break; 
-	case XML_PARSER_DTD: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try DTD\n");break; 
-	case XML_PARSER_EPILOG: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try EPILOG\n");break; 
-	case XML_PARSER_PI: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try PI\n");break; 
-	case XML_PARSER_SYSTEM_LITERAL: 
-	    xmlGenericError(xmlGenericErrorContext, 
-		    "HPP: try SYSTEM_LITERAL\n");break; 
-    } 
-#endif 
- 
-    while (1) { 
- 
-	in = ctxt->input; 
-	if (in == NULL) break; 
-	if (in->buf == NULL) 
-	    avail = in->length - (in->cur - in->base); 
-	else 
-	    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base); 
-	if ((avail == 0) && (terminate)) { 
-	    htmlAutoCloseOnEnd(ctxt); 
-	    if ((ctxt->nameNr == 0) && (ctxt->instate != XML_PARSER_EOF)) { 
-		/* 
-		 * SAX: end of the document processing. 
-		 */ 
-		ctxt->instate = XML_PARSER_EOF; 
-		if ((ctxt->sax) && (ctxt->sax->endDocument != NULL)) 
-		    ctxt->sax->endDocument(ctxt->userData); 
-	    } 
-	} 
-        if (avail < 1) 
-	    goto done; 
-	cur = in->cur[0]; 
-	if (cur == 0) { 
-	    SKIP(1); 
-	    continue; 
-	} 
- 
-        switch (ctxt->instate) { 
-            case XML_PARSER_EOF: 
-	        /* 
-		 * Document parsing is done ! 
-		 */ 
-	        goto done; 
-            case XML_PARSER_START: 
-	        /* 
-		 * Very first chars read from the document flow. 
-		 */ 
-		cur = in->cur[0]; 
-		if (IS_BLANK_CH(cur)) { 
-		    SKIP_BLANKS; 
-		    if (in->buf == NULL) 
-			avail = in->length - (in->cur - in->base); 
-		    else 
-			avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base); 
-		} 
-		if ((ctxt->sax) && (ctxt->sax->setDocumentLocator)) 
-		    ctxt->sax->setDocumentLocator(ctxt->userData, 
-						  &xmlDefaultSAXLocator); 
-		if ((ctxt->sax) && (ctxt->sax->startDocument) && 
-	            (!ctxt->disableSAX)) 
-		    ctxt->sax->startDocument(ctxt->userData); 
- 
-		cur = in->cur[0]; 
-		next = in->cur[1]; 
-		if ((cur == '<') && (next == '!') && 
-		    (UPP(2) == 'D') && (UPP(3) == 'O') && 
-		    (UPP(4) == 'C') && (UPP(5) == 'T') && 
-		    (UPP(6) == 'Y') && (UPP(7) == 'P') && 
-		    (UPP(8) == 'E')) { 
-		    if ((!terminate) && 
-		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0)) 
-			goto done; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: Parsing internal subset\n"); 
-#endif 
-		    htmlParseDocTypeDecl(ctxt); 
-		    ctxt->instate = XML_PARSER_PROLOG; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering PROLOG\n"); 
-#endif 
-                } else { 
-		    ctxt->instate = XML_PARSER_MISC; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering MISC\n"); 
-#endif 
-		} 
-		break; 
-            case XML_PARSER_MISC: 
-		SKIP_BLANKS; 
-		if (in->buf == NULL) 
-		    avail = in->length - (in->cur - in->base); 
-		else 
-		    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base); 
-		/* 
-		 * no chars in buffer 
-		 */ 
-		if (avail < 1) 
-		    goto done; 
-		/* 
-		 * not enouth chars in buffer 
-		 */ 
-		if (avail < 2) { 
-		    if (!terminate) 
-			goto done; 
-		    else 
-			next = ' '; 
-		} else { 
-		    next = in->cur[1]; 
-		} 
-		cur = in->cur[0]; 
-	        if ((cur == '<') && (next == '!') && 
-		    (in->cur[2] == '-') && (in->cur[3] == '-')) { 
-		    if ((!terminate) && 
-		        (htmlParseLookupSequence(ctxt, '-', '-', '>', 1, 1) < 0)) 
-			goto done; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: Parsing Comment\n"); 
-#endif 
-		    htmlParseComment(ctxt); 
-		    ctxt->instate = XML_PARSER_MISC; 
-	        } else if ((cur == '<') && (next == '?')) { 
-		    if ((!terminate) && 
-		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0)) 
-			goto done; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: Parsing PI\n"); 
-#endif 
-		    htmlParsePI(ctxt); 
-		    ctxt->instate = XML_PARSER_MISC; 
-		} else if ((cur == '<') && (next == '!') && 
-		    (UPP(2) == 'D') && (UPP(3) == 'O') && 
-		    (UPP(4) == 'C') && (UPP(5) == 'T') && 
-		    (UPP(6) == 'Y') && (UPP(7) == 'P') && 
-		    (UPP(8) == 'E')) { 
-		    if ((!terminate) && 
-		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0)) 
-			goto done; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: Parsing internal subset\n"); 
-#endif 
-		    htmlParseDocTypeDecl(ctxt); 
-		    ctxt->instate = XML_PARSER_PROLOG; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering PROLOG\n"); 
-#endif 
-		} else if ((cur == '<') && (next == '!') && 
-		           (avail < 9)) { 
-		    goto done; 
-		} else { 
-		    ctxt->instate = XML_PARSER_START_TAG; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering START_TAG\n"); 
-#endif 
-		} 
-		break; 
-            case XML_PARSER_PROLOG: 
-		SKIP_BLANKS; 
-		if (in->buf == NULL) 
-		    avail = in->length - (in->cur - in->base); 
-		else 
-		    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base); 
-		if (avail < 2) 
-		    goto done; 
-		cur = in->cur[0]; 
-		next = in->cur[1]; 
-		if ((cur == '<') && (next == '!') && 
-		    (in->cur[2] == '-') && (in->cur[3] == '-')) { 
-		    if ((!terminate) && 
-		        (htmlParseLookupSequence(ctxt, '-', '-', '>', 1, 1) < 0)) 
-			goto done; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: Parsing Comment\n"); 
-#endif 
-		    htmlParseComment(ctxt); 
-		    ctxt->instate = XML_PARSER_PROLOG; 
-	        } else if ((cur == '<') && (next == '?')) { 
-		    if ((!terminate) && 
-		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0)) 
-			goto done; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: Parsing PI\n"); 
-#endif 
-		    htmlParsePI(ctxt); 
-		    ctxt->instate = XML_PARSER_PROLOG; 
-		} else if ((cur == '<') && (next == '!') && 
-		           (avail < 4)) { 
-		    goto done; 
-		} else { 
-		    ctxt->instate = XML_PARSER_START_TAG; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering START_TAG\n"); 
-#endif 
-		} 
-		break; 
-            case XML_PARSER_EPILOG: 
-		if (in->buf == NULL) 
-		    avail = in->length - (in->cur - in->base); 
-		else 
-		    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base); 
-		if (avail < 1) 
-		    goto done; 
-		cur = in->cur[0]; 
-		if (IS_BLANK_CH(cur)) { 
-		    htmlParseCharData(ctxt); 
-		    goto done; 
-		} 
-		if (avail < 2) 
-		    goto done; 
-		next = in->cur[1]; 
-	        if ((cur == '<') && (next == '!') && 
-		    (in->cur[2] == '-') && (in->cur[3] == '-')) { 
-		    if ((!terminate) && 
-		        (htmlParseLookupSequence(ctxt, '-', '-', '>', 1, 1) < 0)) 
-			goto done; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: Parsing Comment\n"); 
-#endif 
-		    htmlParseComment(ctxt); 
-		    ctxt->instate = XML_PARSER_EPILOG; 
-	        } else if ((cur == '<') && (next == '?')) { 
-		    if ((!terminate) && 
-		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0)) 
-			goto done; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: Parsing PI\n"); 
-#endif 
-		    htmlParsePI(ctxt); 
-		    ctxt->instate = XML_PARSER_EPILOG; 
-		} else if ((cur == '<') && (next == '!') && 
-		           (avail < 4)) { 
-		    goto done; 
-		} else { 
-		    ctxt->errNo = XML_ERR_DOCUMENT_END; 
-		    ctxt->wellFormed = 0; 
-		    ctxt->instate = XML_PARSER_EOF; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering EOF\n"); 
-#endif 
-		    if ((ctxt->sax) && (ctxt->sax->endDocument != NULL)) 
-			ctxt->sax->endDocument(ctxt->userData); 
-		    goto done; 
-		} 
-		break; 
-            case XML_PARSER_START_TAG: { 
-	        const xmlChar *name; 
-		int failed; 
-		const htmlElemDesc * info; 
- 
-		/* 
-		 * no chars in buffer 
-		 */ 
-		if (avail < 1) 
-		    goto done; 
-		/* 
-		 * not enouth chars in buffer 
-		 */ 
-		if (avail < 2) { 
-		    if (!terminate) 
-			goto done; 
-		    else 
-			next = ' '; 
-		} else { 
-		    next = in->cur[1]; 
-		} 
-		cur = in->cur[0]; 
-	        if (cur != '<') { 
-		    ctxt->instate = XML_PARSER_CONTENT; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering CONTENT\n"); 
-#endif 
-		    break; 
-		} 
-		if (next == '/') { 
-		    ctxt->instate = XML_PARSER_END_TAG; 
-		    ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering END_TAG\n"); 
-#endif 
-		    break; 
-		} 
-		if ((!terminate) && 
-		    (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0)) 
-		    goto done; 
- 
-                /* Capture start position */ 
-	        if (ctxt->record_info) { 
-	             node_info.begin_pos = ctxt->input->consumed + 
-	                                (CUR_PTR - ctxt->input->base); 
-	             node_info.begin_line = ctxt->input->line; 
-	        } 
- 
- 
-		failed = htmlParseStartTag(ctxt); 
-		name = ctxt->name; 
-		if ((failed == -1) || 
-		    (name == NULL)) { 
-		    if (CUR == '>') 
-			NEXT; 
-		    break; 
-		} 
- 
-		/* 
-		 * Lookup the info for that element. 
-		 */ 
-		info = htmlTagLookup(name); 
-		if (info == NULL) { 
-		    htmlParseErr(ctxt, XML_HTML_UNKNOWN_TAG, 
-		                 "Tag %s invalid\n", name, NULL); 
-		} 
- 
-		/* 
-		 * Check for an Empty Element labeled the XML/SGML way 
-		 */ 
-		if ((CUR == '/') && (NXT(1) == '>')) { 
-		    SKIP(2); 
-		    if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-			ctxt->sax->endElement(ctxt->userData, name); 
-		    htmlnamePop(ctxt); 
-		    ctxt->instate = XML_PARSER_CONTENT; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering CONTENT\n"); 
-#endif 
-		    break; 
-		} 
- 
-		if (CUR == '>') { 
-		    NEXT; 
-		} else { 
-		    htmlParseErr(ctxt, XML_ERR_GT_REQUIRED, 
-		                 "Couldn't find end of Start Tag %s\n", 
-				 name, NULL); 
- 
-		    /* 
-		     * end of parsing of this node. 
-		     */ 
-		    if (xmlStrEqual(name, ctxt->name)) { 
-			nodePop(ctxt); 
-			htmlnamePop(ctxt); 
-		    } 
- 
-		    if (ctxt->record_info) 
-		        htmlNodeInfoPush(ctxt, &node_info); 
- 
-		    ctxt->instate = XML_PARSER_CONTENT; 
-#ifdef DEBUG_PUSH 
-		    xmlGenericError(xmlGenericErrorContext, 
-			    "HPP: entering CONTENT\n"); 
-#endif 
-		    break; 
-		} 
- 
-		/* 
-		 * Check for an Empty Element from DTD definition 
-		 */ 
-		if ((info != NULL) && (info->empty)) { 
-		    if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) 
-			ctxt->sax->endElement(ctxt->userData, name); 
-		    htmlnamePop(ctxt); 
-		} 
- 
-                if (ctxt->record_info) 
-	            htmlNodeInfoPush(ctxt, &node_info); 
- 
-		ctxt->instate = XML_PARSER_CONTENT; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-                break; 
-	    } 
-            case XML_PARSER_CONTENT: { 
-		xmlChar chr[2] = { 0, 0 };
-		long cons; 
-
-                /* 
-		 * Handle preparsed entities and charRef 
-		 */ 
-		if (ctxt->token != 0) { 
-		    chr[0] = (xmlChar) ctxt->token; 
-		    htmlCheckParagraph(ctxt); 
-		    if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL)) 
-			ctxt->sax->characters(ctxt->userData, chr, 1); 
-		    ctxt->token = 0; 
-		    ctxt->checkIndex = 0; 
-		} 
-		if ((avail == 1) && (terminate)) { 
-		    cur = in->cur[0]; 
-		    if ((cur != '<') && (cur != '&')) { 
-			if (ctxt->sax != NULL) { 
-                            chr[0] = cur;
-			    if (IS_BLANK_CH(cur)) { 
-				if (ctxt->keepBlanks) { 
-				    if (ctxt->sax->characters != NULL) 
-					ctxt->sax->characters( 
-						ctxt->userData, chr, 1);
-				} else { 
-				    if (ctxt->sax->ignorableWhitespace != NULL) 
-					ctxt->sax->ignorableWhitespace( 
-						ctxt->userData, chr, 1);
-				} 
-			    } else { 
-				htmlCheckParagraph(ctxt); 
-				if (ctxt->sax->characters != NULL) 
-				    ctxt->sax->characters( 
-					    ctxt->userData, chr, 1);
-			    } 
-			} 
-			ctxt->token = 0; 
-			ctxt->checkIndex = 0; 
-			in->cur++; 
-			break; 
-		    } 
-		} 
-		if (avail < 2) 
-		    goto done; 
-		cur = in->cur[0]; 
-		next = in->cur[1]; 
-		cons = ctxt->nbChars; 
-		if ((xmlStrEqual(ctxt->name, BAD_CAST"script")) || 
-		    (xmlStrEqual(ctxt->name, BAD_CAST"style"))) { 
-		    /* 
-		     * Handle SCRIPT/STYLE separately 
-		     */ 
-		    if (!terminate) { 
-		        int idx; 
-			xmlChar val; 
- 
-			idx = htmlParseLookupSequence(ctxt, '<', '/', 0, 0, 0); 
-			if (idx < 0) 
-			    goto done; 
-		        val = in->cur[idx + 2]; 
-			if (val == 0) /* bad cut of input */ 
-			    goto done; 
-		    } 
-		    htmlParseScript(ctxt); 
-		    if ((cur == '<') && (next == '/')) { 
-			ctxt->instate = XML_PARSER_END_TAG; 
-			ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-			xmlGenericError(xmlGenericErrorContext, 
-				"HPP: entering END_TAG\n"); 
-#endif 
-			break; 
-		    } 
-		} else { 
-		    /* 
-		     * Sometimes DOCTYPE arrives in the middle of the document 
-		     */ 
-		    if ((cur == '<') && (next == '!') && 
-			(UPP(2) == 'D') && (UPP(3) == 'O') && 
-			(UPP(4) == 'C') && (UPP(5) == 'T') && 
-			(UPP(6) == 'Y') && (UPP(7) == 'P') && 
-			(UPP(8) == 'E')) { 
-			if ((!terminate) && 
-			    (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0)) 
-			    goto done; 
-			htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, 
-			             "Misplaced DOCTYPE declaration\n", 
-				     BAD_CAST "DOCTYPE" , NULL); 
-			htmlParseDocTypeDecl(ctxt); 
-		    } else if ((cur == '<') && (next == '!') && 
-			(in->cur[2] == '-') && (in->cur[3] == '-')) { 
-			if ((!terminate) && 
-			    (htmlParseLookupSequence( 
-				ctxt, '-', '-', '>', 1, 1) < 0)) 
-			    goto done; 
-#ifdef DEBUG_PUSH 
-			xmlGenericError(xmlGenericErrorContext, 
-				"HPP: Parsing Comment\n"); 
-#endif 
-			htmlParseComment(ctxt); 
-			ctxt->instate = XML_PARSER_CONTENT; 
-		    } else if ((cur == '<') && (next == '?')) { 
-			if ((!terminate) && 
-			    (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0)) 
-			    goto done; 
-#ifdef DEBUG_PUSH 
-			xmlGenericError(xmlGenericErrorContext, 
-				"HPP: Parsing PI\n"); 
-#endif 
-			htmlParsePI(ctxt); 
-			ctxt->instate = XML_PARSER_CONTENT; 
-		    } else if ((cur == '<') && (next == '!') && (avail < 4)) { 
-			goto done; 
-		    } else if ((cur == '<') && (next == '/')) { 
-			ctxt->instate = XML_PARSER_END_TAG; 
-			ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-			xmlGenericError(xmlGenericErrorContext, 
-				"HPP: entering END_TAG\n"); 
-#endif 
-			break; 
-		    } else if (cur == '<') { 
-			ctxt->instate = XML_PARSER_START_TAG; 
-			ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-			xmlGenericError(xmlGenericErrorContext, 
-				"HPP: entering START_TAG\n"); 
-#endif 
-			break; 
-		    } else if (cur == '&') { 
-			if ((!terminate) && 
-			    (htmlParseLookupChars(ctxt, 
-                                                  BAD_CAST "; >/", 4) < 0)) 
-			    goto done; 
-#ifdef DEBUG_PUSH 
-			xmlGenericError(xmlGenericErrorContext, 
-				"HPP: Parsing Reference\n"); 
-#endif 
-			/* TODO: check generation of subtrees if noent !!! */ 
-			htmlParseReference(ctxt); 
-		    } else { 
-		        /* 
-			 * check that the text sequence is complete 
-			 * before handing out the data to the parser 
-			 * to avoid problems with erroneous end of 
-			 * data detection. 
-			 */ 
-			if ((!terminate) && 
-                            (htmlParseLookupChars(ctxt, BAD_CAST "<&", 2) < 0)) 
-			    goto done; 
-			ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-			xmlGenericError(xmlGenericErrorContext, 
-				"HPP: Parsing char data\n"); 
-#endif 
-			htmlParseCharData(ctxt); 
-		    } 
-		} 
-		if (cons == ctxt->nbChars) { 
-		    if (ctxt->node != NULL) { 
-			htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			             "detected an error in element content\n", 
-				     NULL, NULL); 
-		    } 
-		    NEXT; 
-		    break; 
-		} 
- 
-		break; 
-	    } 
-            case XML_PARSER_END_TAG: 
-		if (avail < 2) 
-		    goto done; 
-		if ((!terminate) && 
-		    (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0)) 
-		    goto done; 
-		htmlParseEndTag(ctxt); 
-		if (ctxt->nameNr == 0) { 
-		    ctxt->instate = XML_PARSER_EPILOG; 
-		} else { 
-		    ctxt->instate = XML_PARSER_CONTENT; 
-		} 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-	        break; 
-            case XML_PARSER_CDATA_SECTION: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			"HPP: internal error, state == CDATA\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_CONTENT; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-		break; 
-            case XML_PARSER_DTD: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			"HPP: internal error, state == DTD\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_CONTENT; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-		break; 
-            case XML_PARSER_COMMENT: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			"HPP: internal error, state == COMMENT\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_CONTENT; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-		break; 
-            case XML_PARSER_PI: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			"HPP: internal error, state == PI\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_CONTENT; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-		break; 
-            case XML_PARSER_ENTITY_DECL: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			"HPP: internal error, state == ENTITY_DECL\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_CONTENT; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-		break; 
-            case XML_PARSER_ENTITY_VALUE: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			"HPP: internal error, state == ENTITY_VALUE\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_CONTENT; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering DTD\n"); 
-#endif 
-		break; 
-            case XML_PARSER_ATTRIBUTE_VALUE: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			"HPP: internal error, state == ATTRIBUTE_VALUE\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_START_TAG; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering START_TAG\n"); 
-#endif 
-		break; 
-	    case XML_PARSER_SYSTEM_LITERAL: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-		    "HPP: internal error, state == XML_PARSER_SYSTEM_LITERAL\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_CONTENT; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-		break; 
-	    case XML_PARSER_IGNORE: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			"HPP: internal error, state == XML_PARSER_IGNORE\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_CONTENT; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-		break; 
-	    case XML_PARSER_PUBLIC_LITERAL: 
-		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-			"HPP: internal error, state == XML_PARSER_LITERAL\n", 
-			     NULL, NULL); 
-		ctxt->instate = XML_PARSER_CONTENT; 
-		ctxt->checkIndex = 0; 
-#ifdef DEBUG_PUSH 
-		xmlGenericError(xmlGenericErrorContext, 
-			"HPP: entering CONTENT\n"); 
-#endif 
-		break; 
- 
-	} 
-    } 
-done: 
-    if ((avail == 0) && (terminate)) { 
-	htmlAutoCloseOnEnd(ctxt); 
-	if ((ctxt->nameNr == 0) && (ctxt->instate != XML_PARSER_EOF)) { 
-	    /* 
-	     * SAX: end of the document processing. 
-	     */ 
-	    ctxt->instate = XML_PARSER_EOF; 
-	    if ((ctxt->sax) && (ctxt->sax->endDocument != NULL)) 
-		ctxt->sax->endDocument(ctxt->userData); 
-	} 
-    } 
-    if ((!(ctxt->options & HTML_PARSE_NODEFDTD)) && (ctxt->myDoc != NULL) && 
-	((terminate) || (ctxt->instate == XML_PARSER_EOF) || 
-	 (ctxt->instate == XML_PARSER_EPILOG))) { 
-	xmlDtdPtr dtd; 
-	dtd = xmlGetIntSubset(ctxt->myDoc); 
-	if (dtd == NULL) 
-	    ctxt->myDoc->intSubset = 
-		xmlCreateIntSubset(ctxt->myDoc, BAD_CAST "html", 
-		    BAD_CAST "-//W3C//DTD HTML 4.0 Transitional//EN", 
-		    BAD_CAST "http://www.w3.org/TR/REC-html40/loose.dtd"); 
-    } 
-#ifdef DEBUG_PUSH 
-    xmlGenericError(xmlGenericErrorContext, "HPP: done %d\n", ret); 
-#endif 
-    return(ret); 
-} 
- 
-/** 
- * htmlParseChunk: 
- * @ctxt:  an HTML parser context 
- * @chunk:  an char array 
- * @size:  the size in byte of the chunk 
- * @terminate:  last chunk indicator 
- * 
- * Parse a Chunk of memory 
- * 
- * Returns zero if no error, the xmlParserErrors otherwise. 
- */ 
-int 
-htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size, 
-              int terminate) { 
-    if ((ctxt == NULL) || (ctxt->input == NULL)) { 
-	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, 
-		     "htmlParseChunk: context error\n", NULL, NULL); 
-	return(XML_ERR_INTERNAL_ERROR); 
-    } 
-    if ((size > 0) && (chunk != NULL) && (ctxt->input != NULL) && 
-        (ctxt->input->buf != NULL) && (ctxt->instate != XML_PARSER_EOF))  { 
-	size_t base = xmlBufGetInputBase(ctxt->input->buf->buffer, ctxt->input); 
-	size_t cur = ctxt->input->cur - ctxt->input->base; 
-	int res; 
- 
-	res = xmlParserInputBufferPush(ctxt->input->buf, size, chunk); 
-	if (res < 0) { 
-	    ctxt->errNo = XML_PARSER_EOF; 
-	    ctxt->disableSAX = 1; 
-	    return (XML_PARSER_EOF); 
-	} 
-        xmlBufSetInputBaseCur(ctxt->input->buf->buffer, ctxt->input, base, cur); 
-#ifdef DEBUG_PUSH 
-	xmlGenericError(xmlGenericErrorContext, "HPP: pushed %d\n", size); 
-#endif 
- 
-#if 0 
-	if ((terminate) || (ctxt->input->buf->buffer->use > 80)) 
-	    htmlParseTryOrFinish(ctxt, terminate); 
-#endif 
-    } else if (ctxt->instate != XML_PARSER_EOF) { 
-	if ((ctxt->input != NULL) && ctxt->input->buf != NULL) { 
-	    xmlParserInputBufferPtr in = ctxt->input->buf; 
-	    if ((in->encoder != NULL) && (in->buffer != NULL) && 
-		    (in->raw != NULL)) { 
-		int nbchars; 
-		size_t base = xmlBufGetInputBase(in->buffer, ctxt->input); 
-		size_t current = ctxt->input->cur - ctxt->input->base; 
- 
-		nbchars = xmlCharEncInput(in, terminate); 
-		if (nbchars < 0) { 
-		    htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING, 
-			         "encoder error\n", NULL, NULL); 
-		    return(XML_ERR_INVALID_ENCODING); 
-		} 
-		xmlBufSetInputBaseCur(in->buffer, ctxt->input, base, current); 
-	    } 
-	} 
-    } 
-    htmlParseTryOrFinish(ctxt, terminate); 
-    if (terminate) { 
-	if ((ctxt->instate != XML_PARSER_EOF) && 
-	    (ctxt->instate != XML_PARSER_EPILOG) && 
-	    (ctxt->instate != XML_PARSER_MISC)) { 
-	    ctxt->errNo = XML_ERR_DOCUMENT_END; 
-	    ctxt->wellFormed = 0; 
-	} 
-	if (ctxt->instate != XML_PARSER_EOF) { 
-	    if ((ctxt->sax) && (ctxt->sax->endDocument != NULL)) 
-		ctxt->sax->endDocument(ctxt->userData); 
-	} 
-	ctxt->instate = XML_PARSER_EOF; 
-    } 
-    return((xmlParserErrors) ctxt->errNo); 
-} 
- 
-/************************************************************************ 
- *									* 
- *			User entry points				* 
- *									* 
- ************************************************************************/ 
- 
-/** 
- * htmlCreatePushParserCtxt: 
- * @sax:  a SAX handler 
- * @user_data:  The user data returned on SAX callbacks 
- * @chunk:  a pointer to an array of chars 
- * @size:  number of chars in the array 
- * @filename:  an optional file name or URI 
- * @enc:  an optional encoding 
- * 
- * Create a parser context for using the HTML parser in push mode 
- * The value of @filename is used for fetching external entities 
- * and error/warning reports. 
- * 
- * Returns the new parser context or NULL 
- */ 
-htmlParserCtxtPtr 
-htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data, 
-                         const char *chunk, int size, const char *filename, 
-			 xmlCharEncoding enc) { 
-    htmlParserCtxtPtr ctxt; 
-    htmlParserInputPtr inputStream; 
-    xmlParserInputBufferPtr buf; 
- 
-    xmlInitParser(); 
- 
-    buf = xmlAllocParserInputBuffer(enc); 
-    if (buf == NULL) return(NULL); 
- 
-    ctxt = htmlNewParserCtxt(); 
-    if (ctxt == NULL) { 
-	xmlFreeParserInputBuffer(buf); 
-	return(NULL); 
-    } 
-    if(enc==XML_CHAR_ENCODING_UTF8 || buf->encoder) 
-	ctxt->charset=XML_CHAR_ENCODING_UTF8; 
-    if (sax != NULL) { 
-	if (ctxt->sax != (xmlSAXHandlerPtr) &htmlDefaultSAXHandler) 
-	    xmlFree(ctxt->sax); 
-	ctxt->sax = (htmlSAXHandlerPtr) xmlMalloc(sizeof(htmlSAXHandler)); 
-	if (ctxt->sax == NULL) { 
-	    xmlFree(buf); 
-	    xmlFree(ctxt); 
-	    return(NULL); 
-	} 
-	memcpy(ctxt->sax, sax, sizeof(htmlSAXHandler)); 
-	if (user_data != NULL) 
-	    ctxt->userData = user_data; 
-    } 
-    if (filename == NULL) { 
-	ctxt->directory = NULL; 
-    } else { 
-        ctxt->directory = xmlParserGetDirectory(filename); 
-    } 
- 
-    inputStream = htmlNewInputStream(ctxt); 
-    if (inputStream == NULL) { 
-	xmlFreeParserCtxt(ctxt); 
-	xmlFree(buf); 
-	return(NULL); 
-    } 
- 
-    if (filename == NULL) 
-	inputStream->filename = NULL; 
-    else 
-	inputStream->filename = (char *) 
-	    xmlCanonicPath((const xmlChar *) filename); 
-    inputStream->buf = buf; 
-    xmlBufResetInput(buf->buffer, inputStream); 
- 
-    inputPush(ctxt, inputStream); 
- 
-    if ((size > 0) && (chunk != NULL) && (ctxt->input != NULL) && 
-        (ctxt->input->buf != NULL))  { 
-	size_t base = xmlBufGetInputBase(ctxt->input->buf->buffer, ctxt->input); 
-	size_t cur = ctxt->input->cur - ctxt->input->base; 
- 
-	xmlParserInputBufferPush(ctxt->input->buf, size, chunk); 
- 
-        xmlBufSetInputBaseCur(ctxt->input->buf->buffer, ctxt->input, base, cur); 
-#ifdef DEBUG_PUSH 
-	xmlGenericError(xmlGenericErrorContext, "HPP: pushed %d\n", size); 
-#endif 
-    } 
-    ctxt->progressive = 1; 
- 
-    return(ctxt); 
-} 
-#endif /* LIBXML_PUSH_ENABLED */ 
- 
-/** 
- * htmlSAXParseDoc: 
- * @cur:  a pointer to an array of xmlChar 
- * @encoding:  a free form C string describing the HTML document encoding, or NULL 
- * @sax:  the SAX handler block 
- * @userData: if using SAX, this pointer will be provided on callbacks. 
- * 
- * Parse an HTML in-memory document. If sax is not NULL, use the SAX callbacks 
- * to handle parse events. If sax is NULL, fallback to the default DOM 
- * behavior and return a tree. 
- * 
- * Returns the resulting document tree unless SAX is NULL or the document is 
- *     not well formed. 
- */ 
- 
-htmlDocPtr 
-htmlSAXParseDoc(const xmlChar *cur, const char *encoding,
-                htmlSAXHandlerPtr sax, void *userData) {
-    htmlDocPtr ret; 
-    htmlParserCtxtPtr ctxt; 
- 
-    xmlInitParser(); 
- 
-    if (cur == NULL) return(NULL); 
- 
- 
-    ctxt = htmlCreateDocParserCtxt(cur, encoding); 
-    if (ctxt == NULL) return(NULL); 
-    if (sax != NULL) { 
-        if (ctxt->sax != NULL) xmlFree (ctxt->sax); 
-        ctxt->sax = sax; 
-        ctxt->userData = userData; 
-    } 
- 
-    htmlParseDocument(ctxt); 
-    ret = ctxt->myDoc; 
-    if (sax != NULL) { 
-	ctxt->sax = NULL; 
-	ctxt->userData = NULL; 
-    } 
-    htmlFreeParserCtxt(ctxt); 
- 
-    return(ret); 
-} 
- 
-/** 
- * htmlParseDoc: 
- * @cur:  a pointer to an array of xmlChar 
- * @encoding:  a free form C string describing the HTML document encoding, or NULL 
- * 
- * parse an HTML in-memory document and build a tree. 
- * 
- * Returns the resulting document tree 
- */ 
- 
-htmlDocPtr 
-htmlParseDoc(const xmlChar *cur, const char *encoding) {
-    return(htmlSAXParseDoc(cur, encoding, NULL, NULL)); 
-} 
- 
- 
-/** 
- * htmlCreateFileParserCtxt: 
- * @filename:  the filename 
- * @encoding:  a free form C string describing the HTML document encoding, or NULL 
- * 
- * Create a parser context for a file content. 
- * Automatic support for ZLIB/Compress compressed document is provided 
- * by default if found at compile-time. 
- * 
- * Returns the new parser context or NULL 
- */ 
-htmlParserCtxtPtr 
-htmlCreateFileParserCtxt(const char *filename, const char *encoding) 
-{ 
-    htmlParserCtxtPtr ctxt; 
-    htmlParserInputPtr inputStream; 
-    char *canonicFilename; 
-    /* htmlCharEncoding enc; */ 
-    xmlChar *content, *content_line = (xmlChar *) "charset="; 
- 
-    if (filename == NULL) 
-        return(NULL); 
- 
-    ctxt = htmlNewParserCtxt(); 
-    if (ctxt == NULL) { 
-	return(NULL); 
-    } 
-    canonicFilename = (char *) xmlCanonicPath((const xmlChar *) filename); 
-    if (canonicFilename == NULL) { 
-#ifdef LIBXML_SAX1_ENABLED 
-	if (xmlDefaultSAXHandler.error != NULL) { 
-	    xmlDefaultSAXHandler.error(NULL, "out of memory\n"); 
-	} 
-#endif 
-	xmlFreeParserCtxt(ctxt); 
-	return(NULL); 
-    } 
- 
-    inputStream = xmlLoadExternalEntity(canonicFilename, NULL, ctxt); 
-    xmlFree(canonicFilename); 
-    if (inputStream == NULL) { 
-	xmlFreeParserCtxt(ctxt); 
-	return(NULL); 
-    } 
- 
-    inputPush(ctxt, inputStream); 
- 
-    /* set encoding */ 
-    if (encoding) { 
-        size_t l = strlen(encoding); 
- 
-	if (l < 1000) { 
-	    content = xmlMallocAtomic (xmlStrlen(content_line) + l + 1); 
-	    if (content) { 
-		strcpy ((char *)content, (char *)content_line); 
-		strcat ((char *)content, (char *)encoding); 
-		htmlCheckEncoding (ctxt, content); 
-		xmlFree (content); 
-	    } 
-	} 
-    } 
- 
-    return(ctxt); 
-} 
- 
-/** 
- * htmlSAXParseFile: 
- * @filename:  the filename 
- * @encoding:  a free form C string describing the HTML document encoding, or NULL 
- * @sax:  the SAX handler block 
- * @userData: if using SAX, this pointer will be provided on callbacks. 
- * 
- * parse an HTML file and build a tree. Automatic support for ZLIB/Compress 
- * compressed document is provided by default if found at compile-time. 
- * It use the given SAX function block to handle the parsing callback. 
- * If sax is NULL, fallback to the default DOM tree building routines. 
- * 
- * Returns the resulting document tree unless SAX is NULL or the document is 
- *     not well formed. 
- */ 
- 
-htmlDocPtr 
-htmlSAXParseFile(const char *filename, const char *encoding, htmlSAXHandlerPtr sax, 
-                 void *userData) { 
-    htmlDocPtr ret; 
-    htmlParserCtxtPtr ctxt; 
-    htmlSAXHandlerPtr oldsax = NULL; 
- 
-    xmlInitParser(); 
- 
-    ctxt = htmlCreateFileParserCtxt(filename, encoding); 
-    if (ctxt == NULL) return(NULL); 
-    if (sax != NULL) { 
-	oldsax = ctxt->sax; 
-        ctxt->sax = sax; 
-        ctxt->userData = userData; 
-    } 
- 
-    htmlParseDocument(ctxt); 
- 
-    ret = ctxt->myDoc; 
-    if (sax != NULL) { 
-        ctxt->sax = oldsax; 
-        ctxt->userData = NULL; 
-    } 
-    htmlFreeParserCtxt(ctxt); 
- 
-    return(ret); 
-} 
- 
-/** 
- * htmlParseFile: 
- * @filename:  the filename 
- * @encoding:  a free form C string describing the HTML document encoding, or NULL 
- * 
- * parse an HTML file and build a tree. Automatic support for ZLIB/Compress 
- * compressed document is provided by default if found at compile-time. 
- * 
- * Returns the resulting document tree 
- */ 
- 
-htmlDocPtr 
-htmlParseFile(const char *filename, const char *encoding) { 
-    return(htmlSAXParseFile(filename, encoding, NULL, NULL)); 
-} 
- 
-/** 
- * htmlHandleOmittedElem: 
- * @val:  int 0 or 1 
- * 
- * Set and return the previous value for handling HTML omitted tags. 
- * 
- * Returns the last value for 0 for no handling, 1 for auto insertion. 
- */ 
- 
-int 
-htmlHandleOmittedElem(int val) { 
-    int old = htmlOmittedDefaultValue; 
- 
-    htmlOmittedDefaultValue = val; 
-    return(old); 
-} 
- 
-/** 
- * htmlElementAllowedHere: 
- * @parent: HTML parent element 
- * @elt: HTML element 
- * 
- * Checks whether an HTML element may be a direct child of a parent element. 
- * Note - doesn't check for deprecated elements 
- * 
- * Returns 1 if allowed; 0 otherwise. 
- */ 
-int 
-htmlElementAllowedHere(const htmlElemDesc* parent, const xmlChar* elt) { 
-  const char** p ; 
- 
-  if ( ! elt || ! parent || ! parent->subelts ) 
-	return 0 ; 
- 
-  for ( p = parent->subelts; *p; ++p ) 
-    if ( !xmlStrcmp((const xmlChar *)*p, elt) ) 
-      return 1 ; 
- 
-  return 0 ; 
-} 
-/** 
- * htmlElementStatusHere: 
- * @parent: HTML parent element 
- * @elt: HTML element 
- * 
- * Checks whether an HTML element may be a direct child of a parent element. 
- * and if so whether it is valid or deprecated. 
- * 
- * Returns one of HTML_VALID, HTML_DEPRECATED, HTML_INVALID 
- */ 
-htmlStatus 
-htmlElementStatusHere(const htmlElemDesc* parent, const htmlElemDesc* elt) { 
-  if ( ! parent || ! elt ) 
-    return HTML_INVALID ; 
-  if ( ! htmlElementAllowedHere(parent, (const xmlChar*) elt->name ) ) 
-    return HTML_INVALID ; 
- 
-  return ( elt->dtd == 0 ) ? HTML_VALID : HTML_DEPRECATED ; 
-} 
-/** 
- * htmlAttrAllowed: 
- * @elt: HTML element 
- * @attr: HTML attribute 
- * @legacy: whether to allow deprecated attributes 
- * 
- * Checks whether an attribute is valid for an element 
- * Has full knowledge of Required and Deprecated attributes 
- * 
- * Returns one of HTML_REQUIRED, HTML_VALID, HTML_DEPRECATED, HTML_INVALID 
- */ 
-htmlStatus 
-htmlAttrAllowed(const htmlElemDesc* elt, const xmlChar* attr, int legacy) { 
-  const char** p ; 
- 
-  if ( !elt || ! attr ) 
-	return HTML_INVALID ; 
- 
-  if ( elt->attrs_req ) 
-    for ( p = elt->attrs_req; *p; ++p) 
-      if ( !xmlStrcmp((const xmlChar*)*p, attr) ) 
-        return HTML_REQUIRED ; 
- 
-  if ( elt->attrs_opt ) 
-    for ( p = elt->attrs_opt; *p; ++p) 
-      if ( !xmlStrcmp((const xmlChar*)*p, attr) ) 
-        return HTML_VALID ; 
- 
-  if ( legacy && elt->attrs_depr ) 
-    for ( p = elt->attrs_depr; *p; ++p) 
-      if ( !xmlStrcmp((const xmlChar*)*p, attr) ) 
-        return HTML_DEPRECATED ; 
- 
-  return HTML_INVALID ; 
-} 
-/** 
- * htmlNodeStatus: 
- * @node: an htmlNodePtr in a tree 
- * @legacy: whether to allow deprecated elements (YES is faster here 
- *	for Element nodes) 
- * 
- * Checks whether the tree node is valid.  Experimental (the author 
- *     only uses the HTML enhancements in a SAX parser) 
- * 
- * Return: for Element nodes, a return from htmlElementAllowedHere (if 
- *	legacy allowed) or htmlElementStatusHere (otherwise). 
- *	for Attribute nodes, a return from htmlAttrAllowed 
- *	for other nodes, HTML_NA (no checks performed) 
- */ 
-htmlStatus 
-htmlNodeStatus(const htmlNodePtr node, int legacy) { 
-  if ( ! node ) 
-    return HTML_INVALID ; 
- 
-  switch ( node->type ) { 
-    case XML_ELEMENT_NODE: 
-      return legacy 
-	? ( htmlElementAllowedHere ( 
-		htmlTagLookup(node->parent->name) , node->name 
-		) ? HTML_VALID : HTML_INVALID ) 
-	: htmlElementStatusHere( 
-		htmlTagLookup(node->parent->name) , 
-		htmlTagLookup(node->name) ) 
-	; 
-    case XML_ATTRIBUTE_NODE: 
-      return htmlAttrAllowed( 
-	htmlTagLookup(node->parent->name) , node->name, legacy) ; 
-    default: return HTML_NA ; 
-  } 
-} 
-/************************************************************************ 
- *									* 
- *	New set (2.6.0) of simpler and more flexible APIs		* 
- *									* 
- ************************************************************************/ 
-/** 
- * DICT_FREE: 
- * @str:  a string 
- * 
+	/* Dump the bogus tag like browsers do */
+	while ((IS_CHAR_CH(CUR)) && (CUR != '>') &&
+               (ctxt->instate != XML_PARSER_EOF))
+	    NEXT;
+        return -1;
+    }
+    if (xmlStrEqual(name, BAD_CAST"meta"))
+	meta = 1;
+
+    /*
+     * Check for auto-closure of HTML elements.
+     */
+    htmlAutoClose(ctxt, name);
+
+    /*
+     * Check for implied HTML elements.
+     */
+    htmlCheckImplied(ctxt, name);
+
+    /*
+     * Avoid html at any level > 0, head at any level != 1
+     * or any attempt to recurse body
+     */
+    if ((ctxt->nameNr > 0) && (xmlStrEqual(name, BAD_CAST"html"))) {
+	htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+	             "htmlParseStartTag: misplaced <html> tag\n",
+		     name, NULL);
+	discardtag = 1;
+	ctxt->depth++;
+    }
+    if ((ctxt->nameNr != 1) &&
+	(xmlStrEqual(name, BAD_CAST"head"))) {
+	htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+	             "htmlParseStartTag: misplaced <head> tag\n",
+		     name, NULL);
+	discardtag = 1;
+	ctxt->depth++;
+    }
+    if (xmlStrEqual(name, BAD_CAST"body")) {
+	int indx;
+	for (indx = 0;indx < ctxt->nameNr;indx++) {
+	    if (xmlStrEqual(ctxt->nameTab[indx], BAD_CAST"body")) {
+		htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+		             "htmlParseStartTag: misplaced <body> tag\n",
+			     name, NULL);
+		discardtag = 1;
+		ctxt->depth++;
+	    }
+	}
+    }
+
+    /*
+     * Now parse the attributes, it ends up with the ending
+     *
+     * (S Attribute)* S?
+     */
+    SKIP_BLANKS;
+    while ((IS_CHAR_CH(CUR)) &&
+           (CUR != '>') &&
+	   ((CUR != '/') || (NXT(1) != '>'))) {
+	long cons = ctxt->nbChars;
+
+	GROW;
+	attname = htmlParseAttribute(ctxt, &attvalue);
+        if (attname != NULL) {
+
+	    /*
+	     * Well formedness requires at most one declaration of an attribute
+	     */
+	    for (i = 0; i < nbatts;i += 2) {
+	        if (xmlStrEqual(atts[i], attname)) {
+		    htmlParseErr(ctxt, XML_ERR_ATTRIBUTE_REDEFINED,
+		                 "Attribute %s redefined\n", attname, NULL);
+		    if (attvalue != NULL)
+			xmlFree(attvalue);
+		    goto failed;
+		}
+	    }
+
+	    /*
+	     * Add the pair to atts
+	     */
+	    if (atts == NULL) {
+	        maxatts = 22; /* allow for 10 attrs by default */
+	        atts = (const xmlChar **)
+		       xmlMalloc(maxatts * sizeof(xmlChar *));
+		if (atts == NULL) {
+		    htmlErrMemory(ctxt, NULL);
+		    if (attvalue != NULL)
+			xmlFree(attvalue);
+		    goto failed;
+		}
+		ctxt->atts = atts;
+		ctxt->maxatts = maxatts;
+	    } else if (nbatts + 4 > maxatts) {
+	        const xmlChar **n;
+
+	        maxatts *= 2;
+	        n = (const xmlChar **) xmlRealloc((void *) atts,
+					     maxatts * sizeof(const xmlChar *));
+		if (n == NULL) {
+		    htmlErrMemory(ctxt, NULL);
+		    if (attvalue != NULL)
+			xmlFree(attvalue);
+		    goto failed;
+		}
+		atts = n;
+		ctxt->atts = atts;
+		ctxt->maxatts = maxatts;
+	    }
+	    atts[nbatts++] = attname;
+	    atts[nbatts++] = attvalue;
+	    atts[nbatts] = NULL;
+	    atts[nbatts + 1] = NULL;
+	}
+	else {
+	    if (attvalue != NULL)
+	        xmlFree(attvalue);
+	    /* Dump the bogus attribute string up to the next blank or
+	     * the end of the tag. */
+	    while ((IS_CHAR_CH(CUR)) &&
+	           !(IS_BLANK_CH(CUR)) && (CUR != '>') &&
+		   ((CUR != '/') || (NXT(1) != '>')))
+		NEXT;
+	}
+
+failed:
+	SKIP_BLANKS;
+        if (cons == ctxt->nbChars) {
+	    htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+	                 "htmlParseStartTag: problem parsing attributes\n",
+			 NULL, NULL);
+	    break;
+	}
+    }
+
+    /*
+     * Handle specific association to the META tag
+     */
+    if (meta && (nbatts != 0))
+	htmlCheckMeta(ctxt, atts);
+
+    /*
+     * SAX: Start of Element !
+     */
+    if (!discardtag) {
+	htmlnamePush(ctxt, name);
+	if ((ctxt->sax != NULL) && (ctxt->sax->startElement != NULL)) {
+	    if (nbatts != 0)
+		ctxt->sax->startElement(ctxt->userData, name, atts);
+	    else
+		ctxt->sax->startElement(ctxt->userData, name, NULL);
+	}
+    }
+
+    if (atts != NULL) {
+        for (i = 1;i < nbatts;i += 2) {
+	    if (atts[i] != NULL)
+		xmlFree((xmlChar *) atts[i]);
+	}
+    }
+
+    return(discardtag);
+}
+
+/**
+ * htmlParseEndTag:
+ * @ctxt:  an HTML parser context
+ *
+ * parse an end of tag
+ *
+ * [42] ETag ::= '</' Name S? '>'
+ *
+ * With namespace
+ *
+ * [NS 9] ETag ::= '</' QName S? '>'
+ *
+ * Returns 1 if the current level should be closed.
+ */
+
+static int
+htmlParseEndTag(htmlParserCtxtPtr ctxt)
+{
+    const xmlChar *name;
+    const xmlChar *oldname;
+    int i, ret;
+
+    if ((CUR != '<') || (NXT(1) != '/')) {
+        htmlParseErr(ctxt, XML_ERR_LTSLASH_REQUIRED,
+	             "htmlParseEndTag: '</' not found\n", NULL, NULL);
+        return (0);
+    }
+    SKIP(2);
+
+    name = htmlParseHTMLName(ctxt);
+    if (name == NULL)
+        return (0);
+    /*
+     * We should definitely be at the ending "S? '>'" part
+     */
+    SKIP_BLANKS;
+    if ((!IS_CHAR_CH(CUR)) || (CUR != '>')) {
+        htmlParseErr(ctxt, XML_ERR_GT_REQUIRED,
+	             "End tag : expected '>'\n", NULL, NULL);
+	if (ctxt->recovery) {
+	    /*
+	     * We're not at the ending > !!
+	     * Error, unless in recover mode where we search forwards
+	     * until we find a >
+	     */
+	    while (CUR != '\0' && CUR != '>') NEXT;
+	    NEXT;
+	}
+    } else
+        NEXT;
+
+    /*
+     * if we ignored misplaced tags in htmlParseStartTag don't pop them
+     * out now.
+     */
+    if ((ctxt->depth > 0) &&
+        (xmlStrEqual(name, BAD_CAST "html") ||
+         xmlStrEqual(name, BAD_CAST "body") ||
+	 xmlStrEqual(name, BAD_CAST "head"))) {
+	ctxt->depth--;
+	return (0);
+    }
+
+    /*
+     * If the name read is not one of the element in the parsing stack
+     * then return, it's just an error.
+     */
+    for (i = (ctxt->nameNr - 1); i >= 0; i--) {
+        if (xmlStrEqual(name, ctxt->nameTab[i]))
+            break;
+    }
+    if (i < 0) {
+        htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
+	             "Unexpected end tag : %s\n", name, NULL);
+        return (0);
+    }
+
+
+    /*
+     * Check for auto-closure of HTML elements.
+     */
+
+    htmlAutoCloseOnClose(ctxt, name);
+
+    /*
+     * Well formedness constraints, opening and closing must match.
+     * With the exception that the autoclose may have popped stuff out
+     * of the stack.
+     */
+    if (!xmlStrEqual(name, ctxt->name)) {
+        if ((ctxt->name != NULL) && (!xmlStrEqual(ctxt->name, name))) {
+            htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
+	                 "Opening and ending tag mismatch: %s and %s\n",
+			 name, ctxt->name);
+        }
+    }
+
+    /*
+     * SAX: End of Tag
+     */
+    oldname = ctxt->name;
+    if ((oldname != NULL) && (xmlStrEqual(oldname, name))) {
+        if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+            ctxt->sax->endElement(ctxt->userData, name);
+	htmlNodeInfoPop(ctxt);
+        htmlnamePop(ctxt);
+        ret = 1;
+    } else {
+        ret = 0;
+    }
+
+    return (ret);
+}
+
+
+/**
+ * htmlParseReference:
+ * @ctxt:  an HTML parser context
+ *
+ * parse and handle entity references in content,
+ * this will end-up in a call to character() since this is either a
+ * CharRef, or a predefined entity.
+ */
+static void
+htmlParseReference(htmlParserCtxtPtr ctxt) {
+    const htmlEntityDesc * ent;
+    xmlChar out[6];
+    const xmlChar *name;
+    if (CUR != '&') return;
+
+    if (NXT(1) == '#') {
+	unsigned int c;
+	int bits, i = 0;
+
+	c = htmlParseCharRef(ctxt);
+	if (c == 0)
+	    return;
+
+        if      (c <    0x80) { out[i++]= c;                bits= -6; }
+        else if (c <   0x800) { out[i++]=((c >>  6) & 0x1F) | 0xC0;  bits=  0; }
+        else if (c < 0x10000) { out[i++]=((c >> 12) & 0x0F) | 0xE0;  bits=  6; }
+        else                  { out[i++]=((c >> 18) & 0x07) | 0xF0;  bits= 12; }
+
+        for ( ; bits >= 0; bits-= 6) {
+            out[i++]= ((c >> bits) & 0x3F) | 0x80;
+        }
+	out[i] = 0;
+
+	htmlCheckParagraph(ctxt);
+	if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL))
+	    ctxt->sax->characters(ctxt->userData, out, i);
+    } else {
+	ent = htmlParseEntityRef(ctxt, &name);
+	if (name == NULL) {
+	    htmlCheckParagraph(ctxt);
+	    if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL))
+	        ctxt->sax->characters(ctxt->userData, BAD_CAST "&", 1);
+	    return;
+	}
+	if ((ent == NULL) || !(ent->value > 0)) {
+	    htmlCheckParagraph(ctxt);
+	    if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL)) {
+		ctxt->sax->characters(ctxt->userData, BAD_CAST "&", 1);
+		ctxt->sax->characters(ctxt->userData, name, xmlStrlen(name));
+		/* ctxt->sax->characters(ctxt->userData, BAD_CAST ";", 1); */
+	    }
+	} else {
+	    unsigned int c;
+	    int bits, i = 0;
+
+	    c = ent->value;
+	    if      (c <    0x80)
+	            { out[i++]= c;                bits= -6; }
+	    else if (c <   0x800)
+	            { out[i++]=((c >>  6) & 0x1F) | 0xC0;  bits=  0; }
+	    else if (c < 0x10000)
+	            { out[i++]=((c >> 12) & 0x0F) | 0xE0;  bits=  6; }
+	    else
+	            { out[i++]=((c >> 18) & 0x07) | 0xF0;  bits= 12; }
+
+	    for ( ; bits >= 0; bits-= 6) {
+		out[i++]= ((c >> bits) & 0x3F) | 0x80;
+	    }
+	    out[i] = 0;
+
+	    htmlCheckParagraph(ctxt);
+	    if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL))
+		ctxt->sax->characters(ctxt->userData, out, i);
+	}
+    }
+}
+
+/**
+ * htmlParseContent:
+ * @ctxt:  an HTML parser context
+ *
+ * Parse a content: comment, sub-element, reference or text.
+ * Kept for compatibility with old code
+ */
+
+static void
+htmlParseContent(htmlParserCtxtPtr ctxt) {
+    xmlChar *currentNode;
+    int depth;
+    const xmlChar *name;
+
+    currentNode = xmlStrdup(ctxt->name);
+    depth = ctxt->nameNr;
+    while (1) {
+	long cons = ctxt->nbChars;
+
+        GROW;
+
+        if (ctxt->instate == XML_PARSER_EOF)
+            break;
+
+	/*
+	 * Our tag or one of it's parent or children is ending.
+	 */
+        if ((CUR == '<') && (NXT(1) == '/')) {
+	    if (htmlParseEndTag(ctxt) &&
+		((currentNode != NULL) || (ctxt->nameNr == 0))) {
+		if (currentNode != NULL)
+		    xmlFree(currentNode);
+		return;
+	    }
+	    continue; /* while */
+        }
+
+	else if ((CUR == '<') &&
+	         ((IS_ASCII_LETTER(NXT(1))) ||
+		  (NXT(1) == '_') || (NXT(1) == ':'))) {
+	    name = htmlParseHTMLName_nonInvasive(ctxt);
+	    if (name == NULL) {
+	        htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+			 "htmlParseStartTag: invalid element name\n",
+			 NULL, NULL);
+	        /* Dump the bogus tag like browsers do */
+        while ((IS_CHAR_CH(CUR)) && (CUR != '>'))
+	            NEXT;
+
+	        if (currentNode != NULL)
+	            xmlFree(currentNode);
+	        return;
+	    }
+
+	    if (ctxt->name != NULL) {
+	        if (htmlCheckAutoClose(name, ctxt->name) == 1) {
+	            htmlAutoClose(ctxt, name);
+	            continue;
+	        }
+	    }
+	}
+
+	/*
+	 * Has this node been popped out during parsing of
+	 * the next element
+	 */
+        if ((ctxt->nameNr > 0) && (depth >= ctxt->nameNr) &&
+	    (!xmlStrEqual(currentNode, ctxt->name)))
+	     {
+	    if (currentNode != NULL) xmlFree(currentNode);
+	    return;
+	}
+
+	if ((CUR != 0) && ((xmlStrEqual(currentNode, BAD_CAST"script")) ||
+	    (xmlStrEqual(currentNode, BAD_CAST"style")))) {
+	    /*
+	     * Handle SCRIPT/STYLE separately
+	     */
+	    htmlParseScript(ctxt);
+	} else {
+	    /*
+	     * Sometimes DOCTYPE arrives in the middle of the document
+	     */
+	    if ((CUR == '<') && (NXT(1) == '!') &&
+		(UPP(2) == 'D') && (UPP(3) == 'O') &&
+		(UPP(4) == 'C') && (UPP(5) == 'T') &&
+		(UPP(6) == 'Y') && (UPP(7) == 'P') &&
+		(UPP(8) == 'E')) {
+		htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+		             "Misplaced DOCTYPE declaration\n",
+			     BAD_CAST "DOCTYPE" , NULL);
+		htmlParseDocTypeDecl(ctxt);
+	    }
+
+	    /*
+	     * First case :  a comment
+	     */
+	    if ((CUR == '<') && (NXT(1) == '!') &&
+		(NXT(2) == '-') && (NXT(3) == '-')) {
+		htmlParseComment(ctxt);
+	    }
+
+	    /*
+	     * Second case : a Processing Instruction.
+	     */
+	    else if ((CUR == '<') && (NXT(1) == '?')) {
+		htmlParsePI(ctxt);
+	    }
+
+	    /*
+	     * Third case :  a sub-element.
+	     */
+	    else if (CUR == '<') {
+		htmlParseElement(ctxt);
+	    }
+
+	    /*
+	     * Fourth case : a reference. If if has not been resolved,
+	     *    parsing returns it's Name, create the node
+	     */
+	    else if (CUR == '&') {
+		htmlParseReference(ctxt);
+	    }
+
+	    /*
+	     * Fifth case : end of the resource
+	     */
+	    else if (CUR == 0) {
+		htmlAutoCloseOnEnd(ctxt);
+		break;
+	    }
+
+	    /*
+	     * Last case, text. Note that References are handled directly.
+	     */
+	    else {
+		htmlParseCharData(ctxt);
+	    }
+
+	    if (cons == ctxt->nbChars) {
+		if (ctxt->node != NULL) {
+		    htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		                 "detected an error in element content\n",
+				 NULL, NULL);
+		}
+		break;
+	    }
+	}
+        GROW;
+    }
+    if (currentNode != NULL) xmlFree(currentNode);
+}
+
+/**
+ * htmlParseElement:
+ * @ctxt:  an HTML parser context
+ *
+ * parse an HTML element, this is highly recursive
+ * this is kept for compatibility with previous code versions
+ *
+ * [39] element ::= EmptyElemTag | STag content ETag
+ *
+ * [41] Attribute ::= Name Eq AttValue
+ */
+
+void
+htmlParseElement(htmlParserCtxtPtr ctxt) {
+    const xmlChar *name;
+    xmlChar *currentNode = NULL;
+    const htmlElemDesc * info;
+    htmlParserNodeInfo node_info;
+    int failed;
+    int depth;
+    const xmlChar *oldptr;
+
+    if ((ctxt == NULL) || (ctxt->input == NULL)) {
+	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		     "htmlParseElement: context error\n", NULL, NULL);
+	return;
+    }
+
+    if (ctxt->instate == XML_PARSER_EOF)
+        return;
+
+    /* Capture start position */
+    if (ctxt->record_info) {
+        node_info.begin_pos = ctxt->input->consumed +
+                          (CUR_PTR - ctxt->input->base);
+	node_info.begin_line = ctxt->input->line;
+    }
+
+    failed = htmlParseStartTag(ctxt);
+    name = ctxt->name;
+    if ((failed == -1) || (name == NULL)) {
+	if (CUR == '>')
+	    NEXT;
+        return;
+    }
+
+    /*
+     * Lookup the info for that element.
+     */
+    info = htmlTagLookup(name);
+    if (info == NULL) {
+	htmlParseErr(ctxt, XML_HTML_UNKNOWN_TAG,
+	             "Tag %s invalid\n", name, NULL);
+    }
+
+    /*
+     * Check for an Empty Element labeled the XML/SGML way
+     */
+    if ((CUR == '/') && (NXT(1) == '>')) {
+        SKIP(2);
+	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+	    ctxt->sax->endElement(ctxt->userData, name);
+	htmlnamePop(ctxt);
+	return;
+    }
+
+    if (CUR == '>') {
+        NEXT;
+    } else {
+	htmlParseErr(ctxt, XML_ERR_GT_REQUIRED,
+	             "Couldn't find end of Start Tag %s\n", name, NULL);
+
+	/*
+	 * end of parsing of this node.
+	 */
+	if (xmlStrEqual(name, ctxt->name)) {
+	    nodePop(ctxt);
+	    htmlnamePop(ctxt);
+	}
+
+	/*
+	 * Capture end position and add node
+	 */
+	if (ctxt->record_info) {
+	   node_info.end_pos = ctxt->input->consumed +
+			      (CUR_PTR - ctxt->input->base);
+	   node_info.end_line = ctxt->input->line;
+	   node_info.node = ctxt->node;
+	   xmlParserAddNodeInfo(ctxt, &node_info);
+	}
+	return;
+    }
+
+    /*
+     * Check for an Empty Element from DTD definition
+     */
+    if ((info != NULL) && (info->empty)) {
+	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+	    ctxt->sax->endElement(ctxt->userData, name);
+	htmlnamePop(ctxt);
+	return;
+    }
+
+    /*
+     * Parse the content of the element:
+     */
+    currentNode = xmlStrdup(ctxt->name);
+    depth = ctxt->nameNr;
+    while (IS_CHAR_CH(CUR)) {
+	oldptr = ctxt->input->cur;
+	htmlParseContent(ctxt);
+	if (oldptr==ctxt->input->cur) break;
+	if (ctxt->nameNr < depth) break;
+    }
+
+    /*
+     * Capture end position and add node
+     */
+    if ( currentNode != NULL && ctxt->record_info ) {
+       node_info.end_pos = ctxt->input->consumed +
+                          (CUR_PTR - ctxt->input->base);
+       node_info.end_line = ctxt->input->line;
+       node_info.node = ctxt->node;
+       xmlParserAddNodeInfo(ctxt, &node_info);
+    }
+    if (!IS_CHAR_CH(CUR)) {
+	htmlAutoCloseOnEnd(ctxt);
+    }
+
+    if (currentNode != NULL)
+	xmlFree(currentNode);
+}
+
+static void
+htmlParserFinishElementParsing(htmlParserCtxtPtr ctxt) {
+    /*
+     * Capture end position and add node
+     */
+    if ( ctxt->node != NULL && ctxt->record_info ) {
+       ctxt->nodeInfo->end_pos = ctxt->input->consumed +
+                                (CUR_PTR - ctxt->input->base);
+       ctxt->nodeInfo->end_line = ctxt->input->line;
+       ctxt->nodeInfo->node = ctxt->node;
+       xmlParserAddNodeInfo(ctxt, ctxt->nodeInfo);
+       htmlNodeInfoPop(ctxt);
+    }
+    if (!IS_CHAR_CH(CUR)) {
+       htmlAutoCloseOnEnd(ctxt);
+    }
+}
+
+/**
+ * htmlParseElementInternal:
+ * @ctxt:  an HTML parser context
+ *
+ * parse an HTML element, new version, non recursive
+ *
+ * [39] element ::= EmptyElemTag | STag content ETag
+ *
+ * [41] Attribute ::= Name Eq AttValue
+ */
+
+static void
+htmlParseElementInternal(htmlParserCtxtPtr ctxt) {
+    const xmlChar *name;
+    const htmlElemDesc * info;
+    htmlParserNodeInfo node_info = { NULL, 0, 0, 0, 0 };
+    int failed;
+
+    if ((ctxt == NULL) || (ctxt->input == NULL)) {
+	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		     "htmlParseElementInternal: context error\n", NULL, NULL);
+	return;
+    }
+
+    if (ctxt->instate == XML_PARSER_EOF)
+        return;
+
+    /* Capture start position */
+    if (ctxt->record_info) {
+        node_info.begin_pos = ctxt->input->consumed +
+                          (CUR_PTR - ctxt->input->base);
+	node_info.begin_line = ctxt->input->line;
+    }
+
+    failed = htmlParseStartTag(ctxt);
+    name = ctxt->name;
+    if ((failed == -1) || (name == NULL)) {
+	if (CUR == '>')
+	    NEXT;
+        return;
+    }
+
+    /*
+     * Lookup the info for that element.
+     */
+    info = htmlTagLookup(name);
+    if (info == NULL) {
+	htmlParseErr(ctxt, XML_HTML_UNKNOWN_TAG,
+	             "Tag %s invalid\n", name, NULL);
+    }
+
+    /*
+     * Check for an Empty Element labeled the XML/SGML way
+     */
+    if ((CUR == '/') && (NXT(1) == '>')) {
+        SKIP(2);
+	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+	    ctxt->sax->endElement(ctxt->userData, name);
+	htmlnamePop(ctxt);
+	return;
+    }
+
+    if (CUR == '>') {
+        NEXT;
+    } else {
+	htmlParseErr(ctxt, XML_ERR_GT_REQUIRED,
+	             "Couldn't find end of Start Tag %s\n", name, NULL);
+
+	/*
+	 * end of parsing of this node.
+	 */
+	if (xmlStrEqual(name, ctxt->name)) {
+	    nodePop(ctxt);
+	    htmlnamePop(ctxt);
+	}
+
+        if (ctxt->record_info)
+            htmlNodeInfoPush(ctxt, &node_info);
+        htmlParserFinishElementParsing(ctxt);
+	return;
+    }
+
+    /*
+     * Check for an Empty Element from DTD definition
+     */
+    if ((info != NULL) && (info->empty)) {
+	if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+	    ctxt->sax->endElement(ctxt->userData, name);
+	htmlnamePop(ctxt);
+	return;
+    }
+
+    if (ctxt->record_info)
+        htmlNodeInfoPush(ctxt, &node_info);
+}
+
+/**
+ * htmlParseContentInternal:
+ * @ctxt:  an HTML parser context
+ *
+ * Parse a content: comment, sub-element, reference or text.
+ * New version for non recursive htmlParseElementInternal
+ */
+
+static void
+htmlParseContentInternal(htmlParserCtxtPtr ctxt) {
+    xmlChar *currentNode;
+    int depth;
+    const xmlChar *name;
+
+    currentNode = xmlStrdup(ctxt->name);
+    depth = ctxt->nameNr;
+    while (1) {
+	long cons = ctxt->nbChars;
+
+        GROW;
+
+        if (ctxt->instate == XML_PARSER_EOF)
+            break;
+
+	/*
+	 * Our tag or one of it's parent or children is ending.
+	 */
+        if ((CUR == '<') && (NXT(1) == '/')) {
+	    if (htmlParseEndTag(ctxt) &&
+		((currentNode != NULL) || (ctxt->nameNr == 0))) {
+		if (currentNode != NULL)
+		    xmlFree(currentNode);
+
+	        currentNode = xmlStrdup(ctxt->name);
+	        depth = ctxt->nameNr;
+	    }
+	    continue; /* while */
+        }
+
+	else if ((CUR == '<') &&
+	         ((IS_ASCII_LETTER(NXT(1))) ||
+		  (NXT(1) == '_') || (NXT(1) == ':'))) {
+	    name = htmlParseHTMLName_nonInvasive(ctxt);
+	    if (name == NULL) {
+	        htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
+			 "htmlParseStartTag: invalid element name\n",
+			 NULL, NULL);
+	        /* Dump the bogus tag like browsers do */
+	        while ((IS_CHAR_CH(CUR)) && (CUR != '>'))
+	            NEXT;
+
+	        htmlParserFinishElementParsing(ctxt);
+	        if (currentNode != NULL)
+	            xmlFree(currentNode);
+
+	        currentNode = xmlStrdup(ctxt->name);
+	        depth = ctxt->nameNr;
+	        continue;
+	    }
+
+	    if (ctxt->name != NULL) {
+	        if (htmlCheckAutoClose(name, ctxt->name) == 1) {
+	            htmlAutoClose(ctxt, name);
+	            continue;
+	        }
+	    }
+	}
+
+	/*
+	 * Has this node been popped out during parsing of
+	 * the next element
+	 */
+        if ((ctxt->nameNr > 0) && (depth >= ctxt->nameNr) &&
+	    (!xmlStrEqual(currentNode, ctxt->name)))
+	     {
+	    htmlParserFinishElementParsing(ctxt);
+	    if (currentNode != NULL) xmlFree(currentNode);
+
+	    currentNode = xmlStrdup(ctxt->name);
+	    depth = ctxt->nameNr;
+	    continue;
+	}
+
+	if ((CUR != 0) && ((xmlStrEqual(currentNode, BAD_CAST"script")) ||
+	    (xmlStrEqual(currentNode, BAD_CAST"style")))) {
+	    /*
+	     * Handle SCRIPT/STYLE separately
+	     */
+	    htmlParseScript(ctxt);
+	} else {
+	    /*
+	     * Sometimes DOCTYPE arrives in the middle of the document
+	     */
+	    if ((CUR == '<') && (NXT(1) == '!') &&
+		(UPP(2) == 'D') && (UPP(3) == 'O') &&
+		(UPP(4) == 'C') && (UPP(5) == 'T') &&
+		(UPP(6) == 'Y') && (UPP(7) == 'P') &&
+		(UPP(8) == 'E')) {
+		htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+		             "Misplaced DOCTYPE declaration\n",
+			     BAD_CAST "DOCTYPE" , NULL);
+		htmlParseDocTypeDecl(ctxt);
+	    }
+
+	    /*
+	     * First case :  a comment
+	     */
+	    if ((CUR == '<') && (NXT(1) == '!') &&
+		(NXT(2) == '-') && (NXT(3) == '-')) {
+		htmlParseComment(ctxt);
+	    }
+
+	    /*
+	     * Second case : a Processing Instruction.
+	     */
+	    else if ((CUR == '<') && (NXT(1) == '?')) {
+		htmlParsePI(ctxt);
+	    }
+
+	    /*
+	     * Third case :  a sub-element.
+	     */
+	    else if (CUR == '<') {
+		htmlParseElementInternal(ctxt);
+		if (currentNode != NULL) xmlFree(currentNode);
+
+		currentNode = xmlStrdup(ctxt->name);
+		depth = ctxt->nameNr;
+	    }
+
+	    /*
+	     * Fourth case : a reference. If if has not been resolved,
+	     *    parsing returns it's Name, create the node
+	     */
+	    else if (CUR == '&') {
+		htmlParseReference(ctxt);
+	    }
+
+	    /*
+	     * Fifth case : end of the resource
+	     */
+	    else if (CUR == 0) {
+		htmlAutoCloseOnEnd(ctxt);
+		break;
+	    }
+
+	    /*
+	     * Last case, text. Note that References are handled directly.
+	     */
+	    else {
+		htmlParseCharData(ctxt);
+	    }
+
+	    if (cons == ctxt->nbChars) {
+		if (ctxt->node != NULL) {
+		    htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		                 "detected an error in element content\n",
+				 NULL, NULL);
+		}
+		break;
+	    }
+	}
+        GROW;
+    }
+    if (currentNode != NULL) xmlFree(currentNode);
+}
+
+/**
+ * htmlParseContent:
+ * @ctxt:  an HTML parser context
+ *
+ * Parse a content: comment, sub-element, reference or text.
+ * This is the entry point when called from parser.c
+ */
+
+void
+__htmlParseContent(void *ctxt) {
+    if (ctxt != NULL)
+	htmlParseContentInternal((htmlParserCtxtPtr) ctxt);
+}
+
+/**
+ * htmlParseDocument:
+ * @ctxt:  an HTML parser context
+ *
+ * parse an HTML document (and build a tree if using the standard SAX
+ * interface).
+ *
+ * Returns 0, -1 in case of error. the parser context is augmented
+ *                as a result of the parsing.
+ */
+
+int
+htmlParseDocument(htmlParserCtxtPtr ctxt) {
+    xmlChar start[4];
+    xmlCharEncoding enc;
+    xmlDtdPtr dtd;
+
+    xmlInitParser();
+
+    htmlDefaultSAXHandlerInit();
+
+    if ((ctxt == NULL) || (ctxt->input == NULL)) {
+	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		     "htmlParseDocument: context error\n", NULL, NULL);
+	return(XML_ERR_INTERNAL_ERROR);
+    }
+    ctxt->html = 1;
+    ctxt->linenumbers = 1;
+    GROW;
+    /*
+     * SAX: beginning of the document processing.
+     */
+    if ((ctxt->sax) && (ctxt->sax->setDocumentLocator))
+        ctxt->sax->setDocumentLocator(ctxt->userData, &xmlDefaultSAXLocator);
+
+    if ((ctxt->encoding == (const xmlChar *)XML_CHAR_ENCODING_NONE) &&
+        ((ctxt->input->end - ctxt->input->cur) >= 4)) {
+	/*
+	 * Get the 4 first bytes and decode the charset
+	 * if enc != XML_CHAR_ENCODING_NONE
+	 * plug some encoding conversion routines.
+	 */
+	start[0] = RAW;
+	start[1] = NXT(1);
+	start[2] = NXT(2);
+	start[3] = NXT(3);
+	enc = xmlDetectCharEncoding(&start[0], 4);
+	if (enc != XML_CHAR_ENCODING_NONE) {
+	    xmlSwitchEncoding(ctxt, enc);
+	}
+    }
+
+    /*
+     * Wipe out everything which is before the first '<'
+     */
+    SKIP_BLANKS;
+    if (CUR == 0) {
+	htmlParseErr(ctxt, XML_ERR_DOCUMENT_EMPTY,
+	             "Document is empty\n", NULL, NULL);
+    }
+
+    if ((ctxt->sax) && (ctxt->sax->startDocument) && (!ctxt->disableSAX))
+	ctxt->sax->startDocument(ctxt->userData);
+
+
+    /*
+     * Parse possible comments and PIs before any content
+     */
+    while (((CUR == '<') && (NXT(1) == '!') &&
+            (NXT(2) == '-') && (NXT(3) == '-')) ||
+	   ((CUR == '<') && (NXT(1) == '?'))) {
+        htmlParseComment(ctxt);
+        htmlParsePI(ctxt);
+	SKIP_BLANKS;
+    }
+
+
+    /*
+     * Then possibly doc type declaration(s) and more Misc
+     * (doctypedecl Misc*)?
+     */
+    if ((CUR == '<') && (NXT(1) == '!') &&
+	(UPP(2) == 'D') && (UPP(3) == 'O') &&
+	(UPP(4) == 'C') && (UPP(5) == 'T') &&
+	(UPP(6) == 'Y') && (UPP(7) == 'P') &&
+	(UPP(8) == 'E')) {
+	htmlParseDocTypeDecl(ctxt);
+    }
+    SKIP_BLANKS;
+
+    /*
+     * Parse possible comments and PIs before any content
+     */
+    while (((CUR == '<') && (NXT(1) == '!') &&
+            (NXT(2) == '-') && (NXT(3) == '-')) ||
+	   ((CUR == '<') && (NXT(1) == '?'))) {
+        htmlParseComment(ctxt);
+        htmlParsePI(ctxt);
+	SKIP_BLANKS;
+    }
+
+    /*
+     * Time to start parsing the tree itself
+     */
+    htmlParseContentInternal(ctxt);
+
+    /*
+     * autoclose
+     */
+    if (CUR == 0)
+	htmlAutoCloseOnEnd(ctxt);
+
+
+    /*
+     * SAX: end of the document processing.
+     */
+    if ((ctxt->sax) && (ctxt->sax->endDocument != NULL))
+        ctxt->sax->endDocument(ctxt->userData);
+
+    if ((!(ctxt->options & HTML_PARSE_NODEFDTD)) && (ctxt->myDoc != NULL)) {
+	dtd = xmlGetIntSubset(ctxt->myDoc);
+	if (dtd == NULL)
+	    ctxt->myDoc->intSubset =
+		xmlCreateIntSubset(ctxt->myDoc, BAD_CAST "html",
+		    BAD_CAST "-//W3C//DTD HTML 4.0 Transitional//EN",
+		    BAD_CAST "http://www.w3.org/TR/REC-html40/loose.dtd");
+    }
+    if (! ctxt->wellFormed) return(-1);
+    return(0);
+}
+
+
+/************************************************************************
+ *									*
+ *			Parser contexts handling			*
+ *									*
+ ************************************************************************/
+
+/**
+ * htmlInitParserCtxt:
+ * @ctxt:  an HTML parser context
+ *
+ * Initialize a parser context
+ *
+ * Returns 0 in case of success and -1 in case of error
+ */
+
+static int
+htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
+{
+    htmlSAXHandler *sax;
+
+    if (ctxt == NULL) return(-1);
+    memset(ctxt, 0, sizeof(htmlParserCtxt));
+
+    ctxt->dict = xmlDictCreate();
+    if (ctxt->dict == NULL) {
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
+	return(-1);
+    }
+    sax = (htmlSAXHandler *) xmlMalloc(sizeof(htmlSAXHandler));
+    if (sax == NULL) {
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
+	return(-1);
+    }
+    else
+        memset(sax, 0, sizeof(htmlSAXHandler));
+
+    /* Allocate the Input stack */
+    ctxt->inputTab = (htmlParserInputPtr *)
+                      xmlMalloc(5 * sizeof(htmlParserInputPtr));
+    if (ctxt->inputTab == NULL) {
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
+	ctxt->inputNr = 0;
+	ctxt->inputMax = 0;
+	ctxt->input = NULL;
+	return(-1);
+    }
+    ctxt->inputNr = 0;
+    ctxt->inputMax = 5;
+    ctxt->input = NULL;
+    ctxt->version = NULL;
+    ctxt->encoding = NULL;
+    ctxt->standalone = -1;
+    ctxt->instate = XML_PARSER_START;
+
+    /* Allocate the Node stack */
+    ctxt->nodeTab = (htmlNodePtr *) xmlMalloc(10 * sizeof(htmlNodePtr));
+    if (ctxt->nodeTab == NULL) {
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
+	ctxt->nodeNr = 0;
+	ctxt->nodeMax = 0;
+	ctxt->node = NULL;
+	ctxt->inputNr = 0;
+	ctxt->inputMax = 0;
+	ctxt->input = NULL;
+	return(-1);
+    }
+    ctxt->nodeNr = 0;
+    ctxt->nodeMax = 10;
+    ctxt->node = NULL;
+
+    /* Allocate the Name stack */
+    ctxt->nameTab = (const xmlChar **) xmlMalloc(10 * sizeof(xmlChar *));
+    if (ctxt->nameTab == NULL) {
+        htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
+	ctxt->nameNr = 0;
+	ctxt->nameMax = 0;
+	ctxt->name = NULL;
+	ctxt->nodeNr = 0;
+	ctxt->nodeMax = 0;
+	ctxt->node = NULL;
+	ctxt->inputNr = 0;
+	ctxt->inputMax = 0;
+	ctxt->input = NULL;
+	return(-1);
+    }
+    ctxt->nameNr = 0;
+    ctxt->nameMax = 10;
+    ctxt->name = NULL;
+
+    ctxt->nodeInfoTab = NULL;
+    ctxt->nodeInfoNr  = 0;
+    ctxt->nodeInfoMax = 0;
+
+    if (sax == NULL) ctxt->sax = (xmlSAXHandlerPtr) &htmlDefaultSAXHandler;
+    else {
+        ctxt->sax = sax;
+	memcpy(sax, &htmlDefaultSAXHandler, sizeof(xmlSAXHandlerV1));
+    }
+    ctxt->userData = ctxt;
+    ctxt->myDoc = NULL;
+    ctxt->wellFormed = 1;
+    ctxt->replaceEntities = 0;
+    ctxt->linenumbers = xmlLineNumbersDefaultValue;
+    ctxt->keepBlanks = xmlKeepBlanksDefaultValue;
+    ctxt->html = 1;
+    ctxt->vctxt.finishDtd = XML_CTXT_FINISH_DTD_0;
+    ctxt->vctxt.userData = ctxt;
+    ctxt->vctxt.error = xmlParserValidityError;
+    ctxt->vctxt.warning = xmlParserValidityWarning;
+    ctxt->record_info = 0;
+    ctxt->validate = 0;
+    ctxt->nbChars = 0;
+    ctxt->checkIndex = 0;
+    ctxt->catalogs = NULL;
+    xmlInitNodeInfoSeq(&ctxt->node_seq);
+    return(0);
+}
+
+/**
+ * htmlFreeParserCtxt:
+ * @ctxt:  an HTML parser context
+ *
+ * Free all the memory used by a parser context. However the parsed
+ * document in ctxt->myDoc is not freed.
+ */
+
+void
+htmlFreeParserCtxt(htmlParserCtxtPtr ctxt)
+{
+    xmlFreeParserCtxt(ctxt);
+}
+
+/**
+ * htmlNewParserCtxt:
+ *
+ * Allocate and initialize a new parser context.
+ *
+ * Returns the htmlParserCtxtPtr or NULL in case of allocation error
+ */
+
+htmlParserCtxtPtr
+htmlNewParserCtxt(void)
+{
+    xmlParserCtxtPtr ctxt;
+
+    ctxt = (xmlParserCtxtPtr) xmlMalloc(sizeof(xmlParserCtxt));
+    if (ctxt == NULL) {
+        htmlErrMemory(NULL, "NewParserCtxt: out of memory\n");
+	return(NULL);
+    }
+    memset(ctxt, 0, sizeof(xmlParserCtxt));
+    if (htmlInitParserCtxt(ctxt) < 0) {
+        htmlFreeParserCtxt(ctxt);
+	return(NULL);
+    }
+    return(ctxt);
+}
+
+/**
+ * htmlCreateMemoryParserCtxt:
+ * @buffer:  a pointer to a char array
+ * @size:  the size of the array
+ *
+ * Create a parser context for an HTML in-memory document.
+ *
+ * Returns the new parser context or NULL
+ */
+htmlParserCtxtPtr
+htmlCreateMemoryParserCtxt(const char *buffer, int size) {
+    xmlParserCtxtPtr ctxt;
+    xmlParserInputPtr input;
+    xmlParserInputBufferPtr buf;
+
+    if (buffer == NULL)
+	return(NULL);
+    if (size <= 0)
+	return(NULL);
+
+    ctxt = htmlNewParserCtxt();
+    if (ctxt == NULL)
+	return(NULL);
+
+    buf = xmlParserInputBufferCreateMem(buffer, size, XML_CHAR_ENCODING_NONE);
+    if (buf == NULL) return(NULL);
+
+    input = xmlNewInputStream(ctxt);
+    if (input == NULL) {
+	xmlFreeParserCtxt(ctxt);
+	return(NULL);
+    }
+
+    input->filename = NULL;
+    input->buf = buf;
+    xmlBufResetInput(buf->buffer, input);
+
+    inputPush(ctxt, input);
+    return(ctxt);
+}
+
+/**
+ * htmlCreateDocParserCtxt:
+ * @cur:  a pointer to an array of xmlChar
+ * @encoding:  a free form C string describing the HTML document encoding, or NULL
+ *
+ * Create a parser context for an HTML document.
+ *
+ * TODO: check the need to add encoding handling there
+ *
+ * Returns the new parser context or NULL
+ */
+static htmlParserCtxtPtr
+htmlCreateDocParserCtxt(const xmlChar *cur, const char *encoding) {
+    int len;
+    htmlParserCtxtPtr ctxt;
+
+    if (cur == NULL)
+	return(NULL);
+    len = xmlStrlen(cur);
+    ctxt = htmlCreateMemoryParserCtxt((char *)cur, len);
+    if (ctxt == NULL)
+	return(NULL);
+
+    if (encoding != NULL) {
+	xmlCharEncoding enc;
+	xmlCharEncodingHandlerPtr handler;
+
+	if (ctxt->input->encoding != NULL)
+	    xmlFree((xmlChar *) ctxt->input->encoding);
+	ctxt->input->encoding = xmlStrdup((const xmlChar *) encoding);
+
+	enc = xmlParseCharEncoding(encoding);
+	/*
+	 * registered set of known encodings
+	 */
+	if (enc != XML_CHAR_ENCODING_ERROR) {
+	    xmlSwitchEncoding(ctxt, enc);
+	    if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) {
+		htmlParseErr(ctxt, XML_ERR_UNSUPPORTED_ENCODING,
+		             "Unsupported encoding %s\n",
+			     (const xmlChar *) encoding, NULL);
+	    }
+	} else {
+	    /*
+	     * fallback for unknown encodings
+	     */
+	    handler = xmlFindCharEncodingHandler((const char *) encoding);
+	    if (handler != NULL) {
+		xmlSwitchToEncoding(ctxt, handler);
+	    } else {
+		htmlParseErr(ctxt, XML_ERR_UNSUPPORTED_ENCODING,
+		             "Unsupported encoding %s\n",
+			     (const xmlChar *) encoding, NULL);
+	    }
+	}
+    }
+    return(ctxt);
+}
+
+#ifdef LIBXML_PUSH_ENABLED
+/************************************************************************
+ *									*
+ *	Progressive parsing interfaces				*
+ *									*
+ ************************************************************************/
+
+/**
+ * htmlParseLookupSequence:
+ * @ctxt:  an HTML parser context
+ * @first:  the first char to lookup
+ * @next:  the next char to lookup or zero
+ * @third:  the next char to lookup or zero
+ * @comment: flag to force checking inside comments
+ *
+ * Try to find if a sequence (first, next, third) or  just (first next) or
+ * (first) is available in the input stream.
+ * This function has a side effect of (possibly) incrementing ctxt->checkIndex
+ * to avoid rescanning sequences of bytes, it DOES change the state of the
+ * parser, do not use liberally.
+ * This is basically similar to xmlParseLookupSequence()
+ *
+ * Returns the index to the current parsing point if the full sequence
+ *      is available, -1 otherwise.
+ */
+static int
+htmlParseLookupSequence(htmlParserCtxtPtr ctxt, xmlChar first,
+                        xmlChar next, xmlChar third, int iscomment,
+                        int ignoreattrval)
+{
+    int base, len;
+    htmlParserInputPtr in;
+    const xmlChar *buf;
+    int incomment = 0;
+    int invalue = 0;
+    char valdellim = 0x0;
+
+    in = ctxt->input;
+    if (in == NULL)
+        return (-1);
+
+    base = in->cur - in->base;
+    if (base < 0)
+        return (-1);
+
+    if (ctxt->checkIndex > base)
+        base = ctxt->checkIndex;
+
+    if (in->buf == NULL) {
+        buf = in->base;
+        len = in->length;
+    } else {
+        buf = xmlBufContent(in->buf->buffer);
+        len = xmlBufUse(in->buf->buffer);
+    }
+
+    /* take into account the sequence length */
+    if (third)
+        len -= 2;
+    else if (next)
+        len--;
+    for (; base < len; base++) {
+        if ((!incomment) && (base + 4 < len) && (!iscomment)) {
+            if ((buf[base] == '<') && (buf[base + 1] == '!') &&
+                (buf[base + 2] == '-') && (buf[base + 3] == '-')) {
+                incomment = 1;
+                /* do not increment past <! - some people use <!--> */
+                base += 2;
+            }
+        }
+        if (ignoreattrval) {
+            if (buf[base] == '"' || buf[base] == '\'') {
+                if (invalue) {
+                    if (buf[base] == valdellim) {
+                        invalue = 0;
+                        continue;
+                    }
+                } else {
+                    valdellim = buf[base];
+                    invalue = 1;
+                    continue;
+                }
+            } else if (invalue) {
+                continue;
+            }
+        }
+        if (incomment) {
+            if (base + 3 > len)
+                return (-1);
+            if ((buf[base] == '-') && (buf[base + 1] == '-') &&
+                (buf[base + 2] == '>')) {
+                incomment = 0;
+                base += 2;
+            }
+            continue;
+        }
+        if (buf[base] == first) {
+            if (third != 0) {
+                if ((buf[base + 1] != next) || (buf[base + 2] != third))
+                    continue;
+            } else if (next != 0) {
+                if (buf[base + 1] != next)
+                    continue;
+            }
+            ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+            if (next == 0)
+                xmlGenericError(xmlGenericErrorContext,
+                                "HPP: lookup '%c' found at %d\n",
+                                first, base);
+            else if (third == 0)
+                xmlGenericError(xmlGenericErrorContext,
+                                "HPP: lookup '%c%c' found at %d\n",
+                                first, next, base);
+            else
+                xmlGenericError(xmlGenericErrorContext,
+                                "HPP: lookup '%c%c%c' found at %d\n",
+                                first, next, third, base);
+#endif
+            return (base - (in->cur - in->base));
+        }
+    }
+    if ((!incomment) && (!invalue))
+        ctxt->checkIndex = base;
+#ifdef DEBUG_PUSH
+    if (next == 0)
+        xmlGenericError(xmlGenericErrorContext,
+                        "HPP: lookup '%c' failed\n", first);
+    else if (third == 0)
+        xmlGenericError(xmlGenericErrorContext,
+                        "HPP: lookup '%c%c' failed\n", first, next);
+    else
+        xmlGenericError(xmlGenericErrorContext,
+                        "HPP: lookup '%c%c%c' failed\n", first, next,
+                        third);
+#endif
+    return (-1);
+}
+
+/**
+ * htmlParseLookupChars:
+ * @ctxt: an HTML parser context
+ * @stop: Array of chars, which stop the lookup.
+ * @stopLen: Length of stop-Array
+ *
+ * Try to find if any char of the stop-Array is available in the input
+ * stream.
+ * This function has a side effect of (possibly) incrementing ctxt->checkIndex
+ * to avoid rescanning sequences of bytes, it DOES change the state of the
+ * parser, do not use liberally.
+ *
+ * Returns the index to the current parsing point if a stopChar
+ *      is available, -1 otherwise.
+ */
+static int
+htmlParseLookupChars(htmlParserCtxtPtr ctxt, const xmlChar * stop,
+                     int stopLen)
+{
+    int base, len;
+    htmlParserInputPtr in;
+    const xmlChar *buf;
+    int incomment = 0;
+    int i;
+
+    in = ctxt->input;
+    if (in == NULL)
+        return (-1);
+
+    base = in->cur - in->base;
+    if (base < 0)
+        return (-1);
+
+    if (ctxt->checkIndex > base)
+        base = ctxt->checkIndex;
+
+    if (in->buf == NULL) {
+        buf = in->base;
+        len = in->length;
+    } else {
+        buf = xmlBufContent(in->buf->buffer);
+        len = xmlBufUse(in->buf->buffer);
+    }
+
+    for (; base < len; base++) {
+        if (!incomment && (base + 4 < len)) {
+            if ((buf[base] == '<') && (buf[base + 1] == '!') &&
+                (buf[base + 2] == '-') && (buf[base + 3] == '-')) {
+                incomment = 1;
+                /* do not increment past <! - some people use <!--> */
+                base += 2;
+            }
+        }
+        if (incomment) {
+            if (base + 3 > len)
+                return (-1);
+            if ((buf[base] == '-') && (buf[base + 1] == '-') &&
+                (buf[base + 2] == '>')) {
+                incomment = 0;
+                base += 2;
+            }
+            continue;
+        }
+        for (i = 0; i < stopLen; ++i) {
+            if (buf[base] == stop[i]) {
+                ctxt->checkIndex = 0;
+                return (base - (in->cur - in->base));
+            }
+        }
+    }
+    ctxt->checkIndex = base;
+    return (-1);
+}
+
+/**
+ * htmlParseTryOrFinish:
+ * @ctxt:  an HTML parser context
+ * @terminate:  last chunk indicator
+ *
+ * Try to progress on parsing
+ *
+ * Returns zero if no parsing was possible
+ */
+static int
+htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
+    int ret = 0;
+    htmlParserInputPtr in;
+    int avail = 0;
+    xmlChar cur, next;
+
+    htmlParserNodeInfo node_info;
+
+#ifdef DEBUG_PUSH
+    switch (ctxt->instate) {
+	case XML_PARSER_EOF:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try EOF\n"); break;
+	case XML_PARSER_START:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try START\n"); break;
+	case XML_PARSER_MISC:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try MISC\n");break;
+	case XML_PARSER_COMMENT:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try COMMENT\n");break;
+	case XML_PARSER_PROLOG:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try PROLOG\n");break;
+	case XML_PARSER_START_TAG:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try START_TAG\n");break;
+	case XML_PARSER_CONTENT:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try CONTENT\n");break;
+	case XML_PARSER_CDATA_SECTION:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try CDATA_SECTION\n");break;
+	case XML_PARSER_END_TAG:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try END_TAG\n");break;
+	case XML_PARSER_ENTITY_DECL:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try ENTITY_DECL\n");break;
+	case XML_PARSER_ENTITY_VALUE:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try ENTITY_VALUE\n");break;
+	case XML_PARSER_ATTRIBUTE_VALUE:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try ATTRIBUTE_VALUE\n");break;
+	case XML_PARSER_DTD:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try DTD\n");break;
+	case XML_PARSER_EPILOG:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try EPILOG\n");break;
+	case XML_PARSER_PI:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try PI\n");break;
+	case XML_PARSER_SYSTEM_LITERAL:
+	    xmlGenericError(xmlGenericErrorContext,
+		    "HPP: try SYSTEM_LITERAL\n");break;
+    }
+#endif
+
+    while (1) {
+
+	in = ctxt->input;
+	if (in == NULL) break;
+	if (in->buf == NULL)
+	    avail = in->length - (in->cur - in->base);
+	else
+	    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+	if ((avail == 0) && (terminate)) {
+	    htmlAutoCloseOnEnd(ctxt);
+	    if ((ctxt->nameNr == 0) && (ctxt->instate != XML_PARSER_EOF)) {
+		/*
+		 * SAX: end of the document processing.
+		 */
+		ctxt->instate = XML_PARSER_EOF;
+		if ((ctxt->sax) && (ctxt->sax->endDocument != NULL))
+		    ctxt->sax->endDocument(ctxt->userData);
+	    }
+	}
+        if (avail < 1)
+	    goto done;
+	cur = in->cur[0];
+	if (cur == 0) {
+	    SKIP(1);
+	    continue;
+	}
+
+        switch (ctxt->instate) {
+            case XML_PARSER_EOF:
+	        /*
+		 * Document parsing is done !
+		 */
+	        goto done;
+            case XML_PARSER_START:
+	        /*
+		 * Very first chars read from the document flow.
+		 */
+		cur = in->cur[0];
+		if (IS_BLANK_CH(cur)) {
+		    SKIP_BLANKS;
+		    if (in->buf == NULL)
+			avail = in->length - (in->cur - in->base);
+		    else
+			avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+		}
+		if ((ctxt->sax) && (ctxt->sax->setDocumentLocator))
+		    ctxt->sax->setDocumentLocator(ctxt->userData,
+						  &xmlDefaultSAXLocator);
+		if ((ctxt->sax) && (ctxt->sax->startDocument) &&
+	            (!ctxt->disableSAX))
+		    ctxt->sax->startDocument(ctxt->userData);
+
+		cur = in->cur[0];
+		next = in->cur[1];
+		if ((cur == '<') && (next == '!') &&
+		    (UPP(2) == 'D') && (UPP(3) == 'O') &&
+		    (UPP(4) == 'C') && (UPP(5) == 'T') &&
+		    (UPP(6) == 'Y') && (UPP(7) == 'P') &&
+		    (UPP(8) == 'E')) {
+		    if ((!terminate) &&
+		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0))
+			goto done;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: Parsing internal subset\n");
+#endif
+		    htmlParseDocTypeDecl(ctxt);
+		    ctxt->instate = XML_PARSER_PROLOG;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering PROLOG\n");
+#endif
+                } else {
+		    ctxt->instate = XML_PARSER_MISC;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering MISC\n");
+#endif
+		}
+		break;
+            case XML_PARSER_MISC:
+		SKIP_BLANKS;
+		if (in->buf == NULL)
+		    avail = in->length - (in->cur - in->base);
+		else
+		    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+		/*
+		 * no chars in buffer
+		 */
+		if (avail < 1)
+		    goto done;
+		/*
+		 * not enouth chars in buffer
+		 */
+		if (avail < 2) {
+		    if (!terminate)
+			goto done;
+		    else
+			next = ' ';
+		} else {
+		    next = in->cur[1];
+		}
+		cur = in->cur[0];
+	        if ((cur == '<') && (next == '!') &&
+		    (in->cur[2] == '-') && (in->cur[3] == '-')) {
+		    if ((!terminate) &&
+		        (htmlParseLookupSequence(ctxt, '-', '-', '>', 1, 1) < 0))
+			goto done;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: Parsing Comment\n");
+#endif
+		    htmlParseComment(ctxt);
+		    ctxt->instate = XML_PARSER_MISC;
+	        } else if ((cur == '<') && (next == '?')) {
+		    if ((!terminate) &&
+		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0))
+			goto done;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: Parsing PI\n");
+#endif
+		    htmlParsePI(ctxt);
+		    ctxt->instate = XML_PARSER_MISC;
+		} else if ((cur == '<') && (next == '!') &&
+		    (UPP(2) == 'D') && (UPP(3) == 'O') &&
+		    (UPP(4) == 'C') && (UPP(5) == 'T') &&
+		    (UPP(6) == 'Y') && (UPP(7) == 'P') &&
+		    (UPP(8) == 'E')) {
+		    if ((!terminate) &&
+		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0))
+			goto done;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: Parsing internal subset\n");
+#endif
+		    htmlParseDocTypeDecl(ctxt);
+		    ctxt->instate = XML_PARSER_PROLOG;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering PROLOG\n");
+#endif
+		} else if ((cur == '<') && (next == '!') &&
+		           (avail < 9)) {
+		    goto done;
+		} else {
+		    ctxt->instate = XML_PARSER_START_TAG;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering START_TAG\n");
+#endif
+		}
+		break;
+            case XML_PARSER_PROLOG:
+		SKIP_BLANKS;
+		if (in->buf == NULL)
+		    avail = in->length - (in->cur - in->base);
+		else
+		    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+		if (avail < 2)
+		    goto done;
+		cur = in->cur[0];
+		next = in->cur[1];
+		if ((cur == '<') && (next == '!') &&
+		    (in->cur[2] == '-') && (in->cur[3] == '-')) {
+		    if ((!terminate) &&
+		        (htmlParseLookupSequence(ctxt, '-', '-', '>', 1, 1) < 0))
+			goto done;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: Parsing Comment\n");
+#endif
+		    htmlParseComment(ctxt);
+		    ctxt->instate = XML_PARSER_PROLOG;
+	        } else if ((cur == '<') && (next == '?')) {
+		    if ((!terminate) &&
+		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0))
+			goto done;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: Parsing PI\n");
+#endif
+		    htmlParsePI(ctxt);
+		    ctxt->instate = XML_PARSER_PROLOG;
+		} else if ((cur == '<') && (next == '!') &&
+		           (avail < 4)) {
+		    goto done;
+		} else {
+		    ctxt->instate = XML_PARSER_START_TAG;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering START_TAG\n");
+#endif
+		}
+		break;
+            case XML_PARSER_EPILOG:
+		if (in->buf == NULL)
+		    avail = in->length - (in->cur - in->base);
+		else
+		    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+		if (avail < 1)
+		    goto done;
+		cur = in->cur[0];
+		if (IS_BLANK_CH(cur)) {
+		    htmlParseCharData(ctxt);
+		    goto done;
+		}
+		if (avail < 2)
+		    goto done;
+		next = in->cur[1];
+	        if ((cur == '<') && (next == '!') &&
+		    (in->cur[2] == '-') && (in->cur[3] == '-')) {
+		    if ((!terminate) &&
+		        (htmlParseLookupSequence(ctxt, '-', '-', '>', 1, 1) < 0))
+			goto done;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: Parsing Comment\n");
+#endif
+		    htmlParseComment(ctxt);
+		    ctxt->instate = XML_PARSER_EPILOG;
+	        } else if ((cur == '<') && (next == '?')) {
+		    if ((!terminate) &&
+		        (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0))
+			goto done;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: Parsing PI\n");
+#endif
+		    htmlParsePI(ctxt);
+		    ctxt->instate = XML_PARSER_EPILOG;
+		} else if ((cur == '<') && (next == '!') &&
+		           (avail < 4)) {
+		    goto done;
+		} else {
+		    ctxt->errNo = XML_ERR_DOCUMENT_END;
+		    ctxt->wellFormed = 0;
+		    ctxt->instate = XML_PARSER_EOF;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering EOF\n");
+#endif
+		    if ((ctxt->sax) && (ctxt->sax->endDocument != NULL))
+			ctxt->sax->endDocument(ctxt->userData);
+		    goto done;
+		}
+		break;
+            case XML_PARSER_START_TAG: {
+	        const xmlChar *name;
+		int failed;
+		const htmlElemDesc * info;
+
+		/*
+		 * no chars in buffer
+		 */
+		if (avail < 1)
+		    goto done;
+		/*
+		 * not enouth chars in buffer
+		 */
+		if (avail < 2) {
+		    if (!terminate)
+			goto done;
+		    else
+			next = ' ';
+		} else {
+		    next = in->cur[1];
+		}
+		cur = in->cur[0];
+	        if (cur != '<') {
+		    ctxt->instate = XML_PARSER_CONTENT;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering CONTENT\n");
+#endif
+		    break;
+		}
+		if (next == '/') {
+		    ctxt->instate = XML_PARSER_END_TAG;
+		    ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering END_TAG\n");
+#endif
+		    break;
+		}
+		if ((!terminate) &&
+		    (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0))
+		    goto done;
+
+                /* Capture start position */
+	        if (ctxt->record_info) {
+	             node_info.begin_pos = ctxt->input->consumed +
+	                                (CUR_PTR - ctxt->input->base);
+	             node_info.begin_line = ctxt->input->line;
+	        }
+
+
+		failed = htmlParseStartTag(ctxt);
+		name = ctxt->name;
+		if ((failed == -1) ||
+		    (name == NULL)) {
+		    if (CUR == '>')
+			NEXT;
+		    break;
+		}
+
+		/*
+		 * Lookup the info for that element.
+		 */
+		info = htmlTagLookup(name);
+		if (info == NULL) {
+		    htmlParseErr(ctxt, XML_HTML_UNKNOWN_TAG,
+		                 "Tag %s invalid\n", name, NULL);
+		}
+
+		/*
+		 * Check for an Empty Element labeled the XML/SGML way
+		 */
+		if ((CUR == '/') && (NXT(1) == '>')) {
+		    SKIP(2);
+		    if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+			ctxt->sax->endElement(ctxt->userData, name);
+		    htmlnamePop(ctxt);
+		    ctxt->instate = XML_PARSER_CONTENT;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering CONTENT\n");
+#endif
+		    break;
+		}
+
+		if (CUR == '>') {
+		    NEXT;
+		} else {
+		    htmlParseErr(ctxt, XML_ERR_GT_REQUIRED,
+		                 "Couldn't find end of Start Tag %s\n",
+				 name, NULL);
+
+		    /*
+		     * end of parsing of this node.
+		     */
+		    if (xmlStrEqual(name, ctxt->name)) {
+			nodePop(ctxt);
+			htmlnamePop(ctxt);
+		    }
+
+		    if (ctxt->record_info)
+		        htmlNodeInfoPush(ctxt, &node_info);
+
+		    ctxt->instate = XML_PARSER_CONTENT;
+#ifdef DEBUG_PUSH
+		    xmlGenericError(xmlGenericErrorContext,
+			    "HPP: entering CONTENT\n");
+#endif
+		    break;
+		}
+
+		/*
+		 * Check for an Empty Element from DTD definition
+		 */
+		if ((info != NULL) && (info->empty)) {
+		    if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
+			ctxt->sax->endElement(ctxt->userData, name);
+		    htmlnamePop(ctxt);
+		}
+
+                if (ctxt->record_info)
+	            htmlNodeInfoPush(ctxt, &node_info);
+
+		ctxt->instate = XML_PARSER_CONTENT;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+                break;
+	    }
+            case XML_PARSER_CONTENT: {
+		xmlChar chr[2] = { 0, 0 };
+		long cons;
+
+                /*
+		 * Handle preparsed entities and charRef
+		 */
+		if (ctxt->token != 0) {
+		    chr[0] = (xmlChar) ctxt->token;
+		    htmlCheckParagraph(ctxt);
+		    if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL))
+			ctxt->sax->characters(ctxt->userData, chr, 1);
+		    ctxt->token = 0;
+		    ctxt->checkIndex = 0;
+		}
+		if ((avail == 1) && (terminate)) {
+		    cur = in->cur[0];
+		    if ((cur != '<') && (cur != '&')) {
+			if (ctxt->sax != NULL) {
+                            chr[0] = cur;
+			    if (IS_BLANK_CH(cur)) {
+				if (ctxt->keepBlanks) {
+				    if (ctxt->sax->characters != NULL)
+					ctxt->sax->characters(
+						ctxt->userData, chr, 1);
+				} else {
+				    if (ctxt->sax->ignorableWhitespace != NULL)
+					ctxt->sax->ignorableWhitespace(
+						ctxt->userData, chr, 1);
+				}
+			    } else {
+				htmlCheckParagraph(ctxt);
+				if (ctxt->sax->characters != NULL)
+				    ctxt->sax->characters(
+					    ctxt->userData, chr, 1);
+			    }
+			}
+			ctxt->token = 0;
+			ctxt->checkIndex = 0;
+			in->cur++;
+			break;
+		    }
+		}
+		if (avail < 2)
+		    goto done;
+		cur = in->cur[0];
+		next = in->cur[1];
+		cons = ctxt->nbChars;
+		if ((xmlStrEqual(ctxt->name, BAD_CAST"script")) ||
+		    (xmlStrEqual(ctxt->name, BAD_CAST"style"))) {
+		    /*
+		     * Handle SCRIPT/STYLE separately
+		     */
+		    if (!terminate) {
+		        int idx;
+			xmlChar val;
+
+			idx = htmlParseLookupSequence(ctxt, '<', '/', 0, 0, 0);
+			if (idx < 0)
+			    goto done;
+		        val = in->cur[idx + 2];
+			if (val == 0) /* bad cut of input */
+			    goto done;
+		    }
+		    htmlParseScript(ctxt);
+		    if ((cur == '<') && (next == '/')) {
+			ctxt->instate = XML_PARSER_END_TAG;
+			ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+			xmlGenericError(xmlGenericErrorContext,
+				"HPP: entering END_TAG\n");
+#endif
+			break;
+		    }
+		} else {
+		    /*
+		     * Sometimes DOCTYPE arrives in the middle of the document
+		     */
+		    if ((cur == '<') && (next == '!') &&
+			(UPP(2) == 'D') && (UPP(3) == 'O') &&
+			(UPP(4) == 'C') && (UPP(5) == 'T') &&
+			(UPP(6) == 'Y') && (UPP(7) == 'P') &&
+			(UPP(8) == 'E')) {
+			if ((!terminate) &&
+			    (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0))
+			    goto done;
+			htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
+			             "Misplaced DOCTYPE declaration\n",
+				     BAD_CAST "DOCTYPE" , NULL);
+			htmlParseDocTypeDecl(ctxt);
+		    } else if ((cur == '<') && (next == '!') &&
+			(in->cur[2] == '-') && (in->cur[3] == '-')) {
+			if ((!terminate) &&
+			    (htmlParseLookupSequence(
+				ctxt, '-', '-', '>', 1, 1) < 0))
+			    goto done;
+#ifdef DEBUG_PUSH
+			xmlGenericError(xmlGenericErrorContext,
+				"HPP: Parsing Comment\n");
+#endif
+			htmlParseComment(ctxt);
+			ctxt->instate = XML_PARSER_CONTENT;
+		    } else if ((cur == '<') && (next == '?')) {
+			if ((!terminate) &&
+			    (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0))
+			    goto done;
+#ifdef DEBUG_PUSH
+			xmlGenericError(xmlGenericErrorContext,
+				"HPP: Parsing PI\n");
+#endif
+			htmlParsePI(ctxt);
+			ctxt->instate = XML_PARSER_CONTENT;
+		    } else if ((cur == '<') && (next == '!') && (avail < 4)) {
+			goto done;
+		    } else if ((cur == '<') && (next == '/')) {
+			ctxt->instate = XML_PARSER_END_TAG;
+			ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+			xmlGenericError(xmlGenericErrorContext,
+				"HPP: entering END_TAG\n");
+#endif
+			break;
+		    } else if (cur == '<') {
+			ctxt->instate = XML_PARSER_START_TAG;
+			ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+			xmlGenericError(xmlGenericErrorContext,
+				"HPP: entering START_TAG\n");
+#endif
+			break;
+		    } else if (cur == '&') {
+			if ((!terminate) &&
+			    (htmlParseLookupChars(ctxt,
+                                                  BAD_CAST "; >/", 4) < 0))
+			    goto done;
+#ifdef DEBUG_PUSH
+			xmlGenericError(xmlGenericErrorContext,
+				"HPP: Parsing Reference\n");
+#endif
+			/* TODO: check generation of subtrees if noent !!! */
+			htmlParseReference(ctxt);
+		    } else {
+		        /*
+			 * check that the text sequence is complete
+			 * before handing out the data to the parser
+			 * to avoid problems with erroneous end of
+			 * data detection.
+			 */
+			if ((!terminate) &&
+                            (htmlParseLookupChars(ctxt, BAD_CAST "<&", 2) < 0))
+			    goto done;
+			ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+			xmlGenericError(xmlGenericErrorContext,
+				"HPP: Parsing char data\n");
+#endif
+			htmlParseCharData(ctxt);
+		    }
+		}
+		if (cons == ctxt->nbChars) {
+		    if (ctxt->node != NULL) {
+			htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			             "detected an error in element content\n",
+				     NULL, NULL);
+		    }
+		    NEXT;
+		    break;
+		}
+
+		break;
+	    }
+            case XML_PARSER_END_TAG:
+		if (avail < 2)
+		    goto done;
+		if ((!terminate) &&
+		    (htmlParseLookupSequence(ctxt, '>', 0, 0, 0, 1) < 0))
+		    goto done;
+		htmlParseEndTag(ctxt);
+		if (ctxt->nameNr == 0) {
+		    ctxt->instate = XML_PARSER_EPILOG;
+		} else {
+		    ctxt->instate = XML_PARSER_CONTENT;
+		}
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+	        break;
+            case XML_PARSER_CDATA_SECTION:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == CDATA\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_CONTENT;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+		break;
+            case XML_PARSER_DTD:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == DTD\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_CONTENT;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+		break;
+            case XML_PARSER_COMMENT:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == COMMENT\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_CONTENT;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+		break;
+            case XML_PARSER_PI:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == PI\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_CONTENT;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+		break;
+            case XML_PARSER_ENTITY_DECL:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == ENTITY_DECL\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_CONTENT;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+		break;
+            case XML_PARSER_ENTITY_VALUE:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == ENTITY_VALUE\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_CONTENT;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering DTD\n");
+#endif
+		break;
+            case XML_PARSER_ATTRIBUTE_VALUE:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == ATTRIBUTE_VALUE\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_START_TAG;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering START_TAG\n");
+#endif
+		break;
+	    case XML_PARSER_SYSTEM_LITERAL:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		    "HPP: internal error, state == XML_PARSER_SYSTEM_LITERAL\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_CONTENT;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+		break;
+	    case XML_PARSER_IGNORE:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == XML_PARSER_IGNORE\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_CONTENT;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+		break;
+	    case XML_PARSER_PUBLIC_LITERAL:
+		htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+			"HPP: internal error, state == XML_PARSER_LITERAL\n",
+			     NULL, NULL);
+		ctxt->instate = XML_PARSER_CONTENT;
+		ctxt->checkIndex = 0;
+#ifdef DEBUG_PUSH
+		xmlGenericError(xmlGenericErrorContext,
+			"HPP: entering CONTENT\n");
+#endif
+		break;
+
+	}
+    }
+done:
+    if ((avail == 0) && (terminate)) {
+	htmlAutoCloseOnEnd(ctxt);
+	if ((ctxt->nameNr == 0) && (ctxt->instate != XML_PARSER_EOF)) {
+	    /*
+	     * SAX: end of the document processing.
+	     */
+	    ctxt->instate = XML_PARSER_EOF;
+	    if ((ctxt->sax) && (ctxt->sax->endDocument != NULL))
+		ctxt->sax->endDocument(ctxt->userData);
+	}
+    }
+    if ((!(ctxt->options & HTML_PARSE_NODEFDTD)) && (ctxt->myDoc != NULL) &&
+	((terminate) || (ctxt->instate == XML_PARSER_EOF) ||
+	 (ctxt->instate == XML_PARSER_EPILOG))) {
+	xmlDtdPtr dtd;
+	dtd = xmlGetIntSubset(ctxt->myDoc);
+	if (dtd == NULL)
+	    ctxt->myDoc->intSubset =
+		xmlCreateIntSubset(ctxt->myDoc, BAD_CAST "html",
+		    BAD_CAST "-//W3C//DTD HTML 4.0 Transitional//EN",
+		    BAD_CAST "http://www.w3.org/TR/REC-html40/loose.dtd");
+    }
+#ifdef DEBUG_PUSH
+    xmlGenericError(xmlGenericErrorContext, "HPP: done %d\n", ret);
+#endif
+    return(ret);
+}
+
+/**
+ * htmlParseChunk:
+ * @ctxt:  an HTML parser context
+ * @chunk:  an char array
+ * @size:  the size in byte of the chunk
+ * @terminate:  last chunk indicator
+ *
+ * Parse a Chunk of memory
+ *
+ * Returns zero if no error, the xmlParserErrors otherwise.
+ */
+int
+htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size,
+              int terminate) {
+    if ((ctxt == NULL) || (ctxt->input == NULL)) {
+	htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
+		     "htmlParseChunk: context error\n", NULL, NULL);
+	return(XML_ERR_INTERNAL_ERROR);
+    }
+    if ((size > 0) && (chunk != NULL) && (ctxt->input != NULL) &&
+        (ctxt->input->buf != NULL) && (ctxt->instate != XML_PARSER_EOF))  {
+	size_t base = xmlBufGetInputBase(ctxt->input->buf->buffer, ctxt->input);
+	size_t cur = ctxt->input->cur - ctxt->input->base;
+	int res;
+
+	res = xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
+	if (res < 0) {
+	    ctxt->errNo = XML_PARSER_EOF;
+	    ctxt->disableSAX = 1;
+	    return (XML_PARSER_EOF);
+	}
+        xmlBufSetInputBaseCur(ctxt->input->buf->buffer, ctxt->input, base, cur);
+#ifdef DEBUG_PUSH
+	xmlGenericError(xmlGenericErrorContext, "HPP: pushed %d\n", size);
+#endif
+
+#if 0
+	if ((terminate) || (ctxt->input->buf->buffer->use > 80))
+	    htmlParseTryOrFinish(ctxt, terminate);
+#endif
+    } else if (ctxt->instate != XML_PARSER_EOF) {
+	if ((ctxt->input != NULL) && ctxt->input->buf != NULL) {
+	    xmlParserInputBufferPtr in = ctxt->input->buf;
+	    if ((in->encoder != NULL) && (in->buffer != NULL) &&
+		    (in->raw != NULL)) {
+		int nbchars;
+		size_t base = xmlBufGetInputBase(in->buffer, ctxt->input);
+		size_t current = ctxt->input->cur - ctxt->input->base;
+
+		nbchars = xmlCharEncInput(in, terminate);
+		if (nbchars < 0) {
+		    htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
+			         "encoder error\n", NULL, NULL);
+		    return(XML_ERR_INVALID_ENCODING);
+		}
+		xmlBufSetInputBaseCur(in->buffer, ctxt->input, base, current);
+	    }
+	}
+    }
+    htmlParseTryOrFinish(ctxt, terminate);
+    if (terminate) {
+	if ((ctxt->instate != XML_PARSER_EOF) &&
+	    (ctxt->instate != XML_PARSER_EPILOG) &&
+	    (ctxt->instate != XML_PARSER_MISC)) {
+	    ctxt->errNo = XML_ERR_DOCUMENT_END;
+	    ctxt->wellFormed = 0;
+	}
+	if (ctxt->instate != XML_PARSER_EOF) {
+	    if ((ctxt->sax) && (ctxt->sax->endDocument != NULL))
+		ctxt->sax->endDocument(ctxt->userData);
+	}
+	ctxt->instate = XML_PARSER_EOF;
+    }
+    return((xmlParserErrors) ctxt->errNo);
+}
+
+/************************************************************************
+ *									*
+ *			User entry points				*
+ *									*
+ ************************************************************************/
+
+/**
+ * htmlCreatePushParserCtxt:
+ * @sax:  a SAX handler
+ * @user_data:  The user data returned on SAX callbacks
+ * @chunk:  a pointer to an array of chars
+ * @size:  number of chars in the array
+ * @filename:  an optional file name or URI
+ * @enc:  an optional encoding
+ *
+ * Create a parser context for using the HTML parser in push mode
+ * The value of @filename is used for fetching external entities
+ * and error/warning reports.
+ *
+ * Returns the new parser context or NULL
+ */
+htmlParserCtxtPtr
+htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data,
+                         const char *chunk, int size, const char *filename,
+			 xmlCharEncoding enc) {
+    htmlParserCtxtPtr ctxt;
+    htmlParserInputPtr inputStream;
+    xmlParserInputBufferPtr buf;
+
+    xmlInitParser();
+
+    buf = xmlAllocParserInputBuffer(enc);
+    if (buf == NULL) return(NULL);
+
+    ctxt = htmlNewParserCtxt();
+    if (ctxt == NULL) {
+	xmlFreeParserInputBuffer(buf);
+	return(NULL);
+    }
+    if(enc==XML_CHAR_ENCODING_UTF8 || buf->encoder)
+	ctxt->charset=XML_CHAR_ENCODING_UTF8;
+    if (sax != NULL) {
+	if (ctxt->sax != (xmlSAXHandlerPtr) &htmlDefaultSAXHandler)
+	    xmlFree(ctxt->sax);
+	ctxt->sax = (htmlSAXHandlerPtr) xmlMalloc(sizeof(htmlSAXHandler));
+	if (ctxt->sax == NULL) {
+	    xmlFree(buf);
+	    xmlFree(ctxt);
+	    return(NULL);
+	}
+	memcpy(ctxt->sax, sax, sizeof(htmlSAXHandler));
+	if (user_data != NULL)
+	    ctxt->userData = user_data;
+    }
+    if (filename == NULL) {
+	ctxt->directory = NULL;
+    } else {
+        ctxt->directory = xmlParserGetDirectory(filename);
+    }
+
+    inputStream = htmlNewInputStream(ctxt);
+    if (inputStream == NULL) {
+	xmlFreeParserCtxt(ctxt);
+	xmlFree(buf);
+	return(NULL);
+    }
+
+    if (filename == NULL)
+	inputStream->filename = NULL;
+    else
+	inputStream->filename = (char *)
+	    xmlCanonicPath((const xmlChar *) filename);
+    inputStream->buf = buf;
+    xmlBufResetInput(buf->buffer, inputStream);
+
+    inputPush(ctxt, inputStream);
+
+    if ((size > 0) && (chunk != NULL) && (ctxt->input != NULL) &&
+        (ctxt->input->buf != NULL))  {
+	size_t base = xmlBufGetInputBase(ctxt->input->buf->buffer, ctxt->input);
+	size_t cur = ctxt->input->cur - ctxt->input->base;
+
+	xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
+
+        xmlBufSetInputBaseCur(ctxt->input->buf->buffer, ctxt->input, base, cur);
+#ifdef DEBUG_PUSH
+	xmlGenericError(xmlGenericErrorContext, "HPP: pushed %d\n", size);
+#endif
+    }
+    ctxt->progressive = 1;
+
+    return(ctxt);
+}
+#endif /* LIBXML_PUSH_ENABLED */
+
+/**
+ * htmlSAXParseDoc:
+ * @cur:  a pointer to an array of xmlChar
+ * @encoding:  a free form C string describing the HTML document encoding, or NULL
+ * @sax:  the SAX handler block
+ * @userData: if using SAX, this pointer will be provided on callbacks.
+ *
+ * Parse an HTML in-memory document. If sax is not NULL, use the SAX callbacks
+ * to handle parse events. If sax is NULL, fallback to the default DOM
+ * behavior and return a tree.
+ *
+ * Returns the resulting document tree unless SAX is NULL or the document is
+ *     not well formed.
+ */
+
+htmlDocPtr
+htmlSAXParseDoc(const xmlChar *cur, const char *encoding,
+                htmlSAXHandlerPtr sax, void *userData) {
+    htmlDocPtr ret;
+    htmlParserCtxtPtr ctxt;
+
+    xmlInitParser();
+
+    if (cur == NULL) return(NULL);
+
+
+    ctxt = htmlCreateDocParserCtxt(cur, encoding);
+    if (ctxt == NULL) return(NULL);
+    if (sax != NULL) {
+        if (ctxt->sax != NULL) xmlFree (ctxt->sax);
+        ctxt->sax = sax;
+        ctxt->userData = userData;
+    }
+
+    htmlParseDocument(ctxt);
+    ret = ctxt->myDoc;
+    if (sax != NULL) {
+	ctxt->sax = NULL;
+	ctxt->userData = NULL;
+    }
+    htmlFreeParserCtxt(ctxt);
+
+    return(ret);
+}
+
+/**
+ * htmlParseDoc:
+ * @cur:  a pointer to an array of xmlChar
+ * @encoding:  a free form C string describing the HTML document encoding, or NULL
+ *
+ * parse an HTML in-memory document and build a tree.
+ *
+ * Returns the resulting document tree
+ */
+
+htmlDocPtr
+htmlParseDoc(const xmlChar *cur, const char *encoding) {
+    return(htmlSAXParseDoc(cur, encoding, NULL, NULL));
+}
+
+
+/**
+ * htmlCreateFileParserCtxt:
+ * @filename:  the filename
+ * @encoding:  a free form C string describing the HTML document encoding, or NULL
+ *
+ * Create a parser context for a file content.
+ * Automatic support for ZLIB/Compress compressed document is provided
+ * by default if found at compile-time.
+ *
+ * Returns the new parser context or NULL
+ */
+htmlParserCtxtPtr
+htmlCreateFileParserCtxt(const char *filename, const char *encoding)
+{
+    htmlParserCtxtPtr ctxt;
+    htmlParserInputPtr inputStream;
+    char *canonicFilename;
+    /* htmlCharEncoding enc; */
+    xmlChar *content, *content_line = (xmlChar *) "charset=";
+
+    if (filename == NULL)
+        return(NULL);
+
+    ctxt = htmlNewParserCtxt();
+    if (ctxt == NULL) {
+	return(NULL);
+    }
+    canonicFilename = (char *) xmlCanonicPath((const xmlChar *) filename);
+    if (canonicFilename == NULL) {
+#ifdef LIBXML_SAX1_ENABLED
+	if (xmlDefaultSAXHandler.error != NULL) {
+	    xmlDefaultSAXHandler.error(NULL, "out of memory\n");
+	}
+#endif
+	xmlFreeParserCtxt(ctxt);
+	return(NULL);
+    }
+
+    inputStream = xmlLoadExternalEntity(canonicFilename, NULL, ctxt);
+    xmlFree(canonicFilename);
+    if (inputStream == NULL) {
+	xmlFreeParserCtxt(ctxt);
+	return(NULL);
+    }
+
+    inputPush(ctxt, inputStream);
+
+    /* set encoding */
+    if (encoding) {
+        size_t l = strlen(encoding);
+
+	if (l < 1000) {
+	    content = xmlMallocAtomic (xmlStrlen(content_line) + l + 1);
+	    if (content) {
+		strcpy ((char *)content, (char *)content_line);
+		strcat ((char *)content, (char *)encoding);
+		htmlCheckEncoding (ctxt, content);
+		xmlFree (content);
+	    }
+	}
+    }
+
+    return(ctxt);
+}
+
+/**
+ * htmlSAXParseFile:
+ * @filename:  the filename
+ * @encoding:  a free form C string describing the HTML document encoding, or NULL
+ * @sax:  the SAX handler block
+ * @userData: if using SAX, this pointer will be provided on callbacks.
+ *
+ * parse an HTML file and build a tree. Automatic support for ZLIB/Compress
+ * compressed document is provided by default if found at compile-time.
+ * It use the given SAX function block to handle the parsing callback.
+ * If sax is NULL, fallback to the default DOM tree building routines.
+ *
+ * Returns the resulting document tree unless SAX is NULL or the document is
+ *     not well formed.
+ */
+
+htmlDocPtr
+htmlSAXParseFile(const char *filename, const char *encoding, htmlSAXHandlerPtr sax,
+                 void *userData) {
+    htmlDocPtr ret;
+    htmlParserCtxtPtr ctxt;
+    htmlSAXHandlerPtr oldsax = NULL;
+
+    xmlInitParser();
+
+    ctxt = htmlCreateFileParserCtxt(filename, encoding);
+    if (ctxt == NULL) return(NULL);
+    if (sax != NULL) {
+	oldsax = ctxt->sax;
+        ctxt->sax = sax;
+        ctxt->userData = userData;
+    }
+
+    htmlParseDocument(ctxt);
+
+    ret = ctxt->myDoc;
+    if (sax != NULL) {
+        ctxt->sax = oldsax;
+        ctxt->userData = NULL;
+    }
+    htmlFreeParserCtxt(ctxt);
+
+    return(ret);
+}
+
+/**
+ * htmlParseFile:
+ * @filename:  the filename
+ * @encoding:  a free form C string describing the HTML document encoding, or NULL
+ *
+ * parse an HTML file and build a tree. Automatic support for ZLIB/Compress
+ * compressed document is provided by default if found at compile-time.
+ *
+ * Returns the resulting document tree
+ */
+
+htmlDocPtr
+htmlParseFile(const char *filename, const char *encoding) {
+    return(htmlSAXParseFile(filename, encoding, NULL, NULL));
+}
+
+/**
+ * htmlHandleOmittedElem:
+ * @val:  int 0 or 1
+ *
+ * Set and return the previous value for handling HTML omitted tags.
+ *
+ * Returns the last value for 0 for no handling, 1 for auto insertion.
+ */
+
+int
+htmlHandleOmittedElem(int val) {
+    int old = htmlOmittedDefaultValue;
+
+    htmlOmittedDefaultValue = val;
+    return(old);
+}
+
+/**
+ * htmlElementAllowedHere:
+ * @parent: HTML parent element
+ * @elt: HTML element
+ *
+ * Checks whether an HTML element may be a direct child of a parent element.
+ * Note - doesn't check for deprecated elements
+ *
+ * Returns 1 if allowed; 0 otherwise.
+ */
+int
+htmlElementAllowedHere(const htmlElemDesc* parent, const xmlChar* elt) {
+  const char** p ;
+
+  if ( ! elt || ! parent || ! parent->subelts )
+	return 0 ;
+
+  for ( p = parent->subelts; *p; ++p )
+    if ( !xmlStrcmp((const xmlChar *)*p, elt) )
+      return 1 ;
+
+  return 0 ;
+}
+/**
+ * htmlElementStatusHere:
+ * @parent: HTML parent element
+ * @elt: HTML element
+ *
+ * Checks whether an HTML element may be a direct child of a parent element.
+ * and if so whether it is valid or deprecated.
+ *
+ * Returns one of HTML_VALID, HTML_DEPRECATED, HTML_INVALID
+ */
+htmlStatus
+htmlElementStatusHere(const htmlElemDesc* parent, const htmlElemDesc* elt) {
+  if ( ! parent || ! elt )
+    return HTML_INVALID ;
+  if ( ! htmlElementAllowedHere(parent, (const xmlChar*) elt->name ) )
+    return HTML_INVALID ;
+
+  return ( elt->dtd == 0 ) ? HTML_VALID : HTML_DEPRECATED ;
+}
+/**
+ * htmlAttrAllowed:
+ * @elt: HTML element
+ * @attr: HTML attribute
+ * @legacy: whether to allow deprecated attributes
+ *
+ * Checks whether an attribute is valid for an element
+ * Has full knowledge of Required and Deprecated attributes
+ *
+ * Returns one of HTML_REQUIRED, HTML_VALID, HTML_DEPRECATED, HTML_INVALID
+ */
+htmlStatus
+htmlAttrAllowed(const htmlElemDesc* elt, const xmlChar* attr, int legacy) {
+  const char** p ;
+
+  if ( !elt || ! attr )
+	return HTML_INVALID ;
+
+  if ( elt->attrs_req )
+    for ( p = elt->attrs_req; *p; ++p)
+      if ( !xmlStrcmp((const xmlChar*)*p, attr) )
+        return HTML_REQUIRED ;
+
+  if ( elt->attrs_opt )
+    for ( p = elt->attrs_opt; *p; ++p)
+      if ( !xmlStrcmp((const xmlChar*)*p, attr) )
+        return HTML_VALID ;
+
+  if ( legacy && elt->attrs_depr )
+    for ( p = elt->attrs_depr; *p; ++p)
+      if ( !xmlStrcmp((const xmlChar*)*p, attr) )
+        return HTML_DEPRECATED ;
+
+  return HTML_INVALID ;
+}
+/**
+ * htmlNodeStatus:
+ * @node: an htmlNodePtr in a tree
+ * @legacy: whether to allow deprecated elements (YES is faster here
+ *	for Element nodes)
+ *
+ * Checks whether the tree node is valid.  Experimental (the author
+ *     only uses the HTML enhancements in a SAX parser)
+ *
+ * Return: for Element nodes, a return from htmlElementAllowedHere (if
+ *	legacy allowed) or htmlElementStatusHere (otherwise).
+ *	for Attribute nodes, a return from htmlAttrAllowed
+ *	for other nodes, HTML_NA (no checks performed)
+ */
+htmlStatus
+htmlNodeStatus(const htmlNodePtr node, int legacy) {
+  if ( ! node )
+    return HTML_INVALID ;
+
+  switch ( node->type ) {
+    case XML_ELEMENT_NODE:
+      return legacy
+	? ( htmlElementAllowedHere (
+		htmlTagLookup(node->parent->name) , node->name
+		) ? HTML_VALID : HTML_INVALID )
+	: htmlElementStatusHere(
+		htmlTagLookup(node->parent->name) ,
+		htmlTagLookup(node->name) )
+	;
+    case XML_ATTRIBUTE_NODE:
+      return htmlAttrAllowed(
+	htmlTagLookup(node->parent->name) , node->name, legacy) ;
+    default: return HTML_NA ;
+  }
+}
+/************************************************************************
+ *									*
+ *	New set (2.6.0) of simpler and more flexible APIs		*
+ *									*
+ ************************************************************************/
+/**
+ * DICT_FREE:
+ * @str:  a string
+ *
  * Free a string if it is not owned by the "dict" dictionary in the
- * current scope 
- */ 
-#define DICT_FREE(str)						\ 
-	if ((str) && ((!dict) ||				\ 
-	    (xmlDictOwns(dict, (const xmlChar *)(str)) == 0)))	\ 
-	    xmlFree((char *)(str)); 
- 
-/** 
- * htmlCtxtReset: 
- * @ctxt: an HTML parser context 
- * 
- * Reset a parser context 
- */ 
-void 
-htmlCtxtReset(htmlParserCtxtPtr ctxt) 
-{ 
-    xmlParserInputPtr input; 
-    xmlDictPtr dict; 
- 
-    if (ctxt == NULL) 
-        return; 
- 
-    xmlInitParser(); 
-    dict = ctxt->dict; 
- 
-    while ((input = inputPop(ctxt)) != NULL) { /* Non consuming */ 
-        xmlFreeInputStream(input); 
-    } 
-    ctxt->inputNr = 0; 
-    ctxt->input = NULL; 
- 
-    ctxt->spaceNr = 0; 
-    if (ctxt->spaceTab != NULL) { 
-	ctxt->spaceTab[0] = -1; 
-	ctxt->space = &ctxt->spaceTab[0]; 
-    } else { 
-	ctxt->space = NULL; 
-    } 
- 
- 
-    ctxt->nodeNr = 0; 
-    ctxt->node = NULL; 
- 
-    ctxt->nameNr = 0; 
-    ctxt->name = NULL; 
- 
-    DICT_FREE(ctxt->version); 
-    ctxt->version = NULL; 
-    DICT_FREE(ctxt->encoding); 
-    ctxt->encoding = NULL; 
-    DICT_FREE(ctxt->directory); 
-    ctxt->directory = NULL; 
-    DICT_FREE(ctxt->extSubURI); 
-    ctxt->extSubURI = NULL; 
-    DICT_FREE(ctxt->extSubSystem); 
-    ctxt->extSubSystem = NULL; 
-    if (ctxt->myDoc != NULL) 
-        xmlFreeDoc(ctxt->myDoc); 
-    ctxt->myDoc = NULL; 
- 
-    ctxt->standalone = -1; 
-    ctxt->hasExternalSubset = 0; 
-    ctxt->hasPErefs = 0; 
-    ctxt->html = 1; 
-    ctxt->external = 0; 
-    ctxt->instate = XML_PARSER_START; 
-    ctxt->token = 0; 
- 
-    ctxt->wellFormed = 1; 
-    ctxt->nsWellFormed = 1; 
-    ctxt->disableSAX = 0; 
-    ctxt->valid = 1; 
-    ctxt->vctxt.userData = ctxt; 
-    ctxt->vctxt.error = xmlParserValidityError; 
-    ctxt->vctxt.warning = xmlParserValidityWarning; 
-    ctxt->record_info = 0; 
-    ctxt->nbChars = 0; 
-    ctxt->checkIndex = 0; 
-    ctxt->inSubset = 0; 
-    ctxt->errNo = XML_ERR_OK; 
-    ctxt->depth = 0; 
-    ctxt->charset = XML_CHAR_ENCODING_NONE; 
-    ctxt->catalogs = NULL; 
-    xmlInitNodeInfoSeq(&ctxt->node_seq); 
- 
-    if (ctxt->attsDefault != NULL) { 
+ * current scope
+ */
+#define DICT_FREE(str)						\
+	if ((str) && ((!dict) ||				\
+	    (xmlDictOwns(dict, (const xmlChar *)(str)) == 0)))	\
+	    xmlFree((char *)(str));
+
+/**
+ * htmlCtxtReset:
+ * @ctxt: an HTML parser context
+ *
+ * Reset a parser context
+ */
+void
+htmlCtxtReset(htmlParserCtxtPtr ctxt)
+{
+    xmlParserInputPtr input;
+    xmlDictPtr dict;
+
+    if (ctxt == NULL)
+        return;
+
+    xmlInitParser();
+    dict = ctxt->dict;
+
+    while ((input = inputPop(ctxt)) != NULL) { /* Non consuming */
+        xmlFreeInputStream(input);
+    }
+    ctxt->inputNr = 0;
+    ctxt->input = NULL;
+
+    ctxt->spaceNr = 0;
+    if (ctxt->spaceTab != NULL) {
+	ctxt->spaceTab[0] = -1;
+	ctxt->space = &ctxt->spaceTab[0];
+    } else {
+	ctxt->space = NULL;
+    }
+
+
+    ctxt->nodeNr = 0;
+    ctxt->node = NULL;
+
+    ctxt->nameNr = 0;
+    ctxt->name = NULL;
+
+    DICT_FREE(ctxt->version);
+    ctxt->version = NULL;
+    DICT_FREE(ctxt->encoding);
+    ctxt->encoding = NULL;
+    DICT_FREE(ctxt->directory);
+    ctxt->directory = NULL;
+    DICT_FREE(ctxt->extSubURI);
+    ctxt->extSubURI = NULL;
+    DICT_FREE(ctxt->extSubSystem);
+    ctxt->extSubSystem = NULL;
+    if (ctxt->myDoc != NULL)
+        xmlFreeDoc(ctxt->myDoc);
+    ctxt->myDoc = NULL;
+
+    ctxt->standalone = -1;
+    ctxt->hasExternalSubset = 0;
+    ctxt->hasPErefs = 0;
+    ctxt->html = 1;
+    ctxt->external = 0;
+    ctxt->instate = XML_PARSER_START;
+    ctxt->token = 0;
+
+    ctxt->wellFormed = 1;
+    ctxt->nsWellFormed = 1;
+    ctxt->disableSAX = 0;
+    ctxt->valid = 1;
+    ctxt->vctxt.userData = ctxt;
+    ctxt->vctxt.error = xmlParserValidityError;
+    ctxt->vctxt.warning = xmlParserValidityWarning;
+    ctxt->record_info = 0;
+    ctxt->nbChars = 0;
+    ctxt->checkIndex = 0;
+    ctxt->inSubset = 0;
+    ctxt->errNo = XML_ERR_OK;
+    ctxt->depth = 0;
+    ctxt->charset = XML_CHAR_ENCODING_NONE;
+    ctxt->catalogs = NULL;
+    xmlInitNodeInfoSeq(&ctxt->node_seq);
+
+    if (ctxt->attsDefault != NULL) {
         xmlHashFree(ctxt->attsDefault, xmlHashDefaultDeallocator);
-        ctxt->attsDefault = NULL; 
-    } 
-    if (ctxt->attsSpecial != NULL) { 
-        xmlHashFree(ctxt->attsSpecial, NULL); 
-        ctxt->attsSpecial = NULL; 
-    } 
-} 
- 
-/** 
- * htmlCtxtUseOptions: 
- * @ctxt: an HTML parser context 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * Applies the options to the parser context 
- * 
- * Returns 0 in case of success, the set of unknown or unimplemented options 
- *         in case of error. 
- */ 
-int 
-htmlCtxtUseOptions(htmlParserCtxtPtr ctxt, int options) 
-{ 
-    if (ctxt == NULL) 
-        return(-1); 
- 
-    if (options & HTML_PARSE_NOWARNING) { 
-        ctxt->sax->warning = NULL; 
-        ctxt->vctxt.warning = NULL; 
-        options -= XML_PARSE_NOWARNING; 
-	ctxt->options |= XML_PARSE_NOWARNING; 
-    } 
-    if (options & HTML_PARSE_NOERROR) { 
-        ctxt->sax->error = NULL; 
-        ctxt->vctxt.error = NULL; 
-        ctxt->sax->fatalError = NULL; 
-        options -= XML_PARSE_NOERROR; 
-	ctxt->options |= XML_PARSE_NOERROR; 
-    } 
-    if (options & HTML_PARSE_PEDANTIC) { 
-        ctxt->pedantic = 1; 
-        options -= XML_PARSE_PEDANTIC; 
-	ctxt->options |= XML_PARSE_PEDANTIC; 
-    } else 
-        ctxt->pedantic = 0; 
-    if (options & XML_PARSE_NOBLANKS) { 
-        ctxt->keepBlanks = 0; 
-        ctxt->sax->ignorableWhitespace = xmlSAX2IgnorableWhitespace; 
-        options -= XML_PARSE_NOBLANKS; 
-	ctxt->options |= XML_PARSE_NOBLANKS; 
-    } else 
-        ctxt->keepBlanks = 1; 
-    if (options & HTML_PARSE_RECOVER) { 
-        ctxt->recovery = 1; 
-	options -= HTML_PARSE_RECOVER; 
-    } else 
-        ctxt->recovery = 0; 
-    if (options & HTML_PARSE_COMPACT) { 
-	ctxt->options |= HTML_PARSE_COMPACT; 
-        options -= HTML_PARSE_COMPACT; 
-    } 
-    if (options & XML_PARSE_HUGE) { 
-	ctxt->options |= XML_PARSE_HUGE; 
-        options -= XML_PARSE_HUGE; 
-    } 
-    if (options & HTML_PARSE_NODEFDTD) { 
-	ctxt->options |= HTML_PARSE_NODEFDTD; 
-        options -= HTML_PARSE_NODEFDTD; 
-    } 
-    if (options & HTML_PARSE_IGNORE_ENC) { 
-	ctxt->options |= HTML_PARSE_IGNORE_ENC; 
-        options -= HTML_PARSE_IGNORE_ENC; 
-    } 
-    if (options & HTML_PARSE_NOIMPLIED) { 
-        ctxt->options |= HTML_PARSE_NOIMPLIED; 
-        options -= HTML_PARSE_NOIMPLIED; 
-    } 
-    ctxt->dictNames = 0; 
-    return (options); 
-} 
- 
-/** 
- * htmlDoRead: 
- * @ctxt:  an HTML parser context 
- * @URL:  the base URL to use for the document 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * @reuse:  keep the context for reuse 
- * 
- * Common front-end for the htmlRead functions 
- * 
- * Returns the resulting document tree or NULL 
- */ 
-static htmlDocPtr 
-htmlDoRead(htmlParserCtxtPtr ctxt, const char *URL, const char *encoding, 
-          int options, int reuse) 
-{ 
-    htmlDocPtr ret; 
- 
-    htmlCtxtUseOptions(ctxt, options); 
-    ctxt->html = 1; 
-    if (encoding != NULL) { 
-        xmlCharEncodingHandlerPtr hdlr; 
- 
-	hdlr = xmlFindCharEncodingHandler(encoding); 
-	if (hdlr != NULL) { 
-	    xmlSwitchToEncoding(ctxt, hdlr); 
-	    if (ctxt->input->encoding != NULL) 
-	      xmlFree((xmlChar *) ctxt->input->encoding); 
-            ctxt->input->encoding = xmlStrdup((xmlChar *)encoding); 
-        } 
-    } 
-    if ((URL != NULL) && (ctxt->input != NULL) && 
-        (ctxt->input->filename == NULL)) 
-        ctxt->input->filename = (char *) xmlStrdup((const xmlChar *) URL); 
-    htmlParseDocument(ctxt); 
-    ret = ctxt->myDoc; 
-    ctxt->myDoc = NULL; 
-    if (!reuse) { 
-        if ((ctxt->dictNames) && 
-	    (ret != NULL) && 
-	    (ret->dict == ctxt->dict)) 
-	    ctxt->dict = NULL; 
-	xmlFreeParserCtxt(ctxt); 
-    } 
-    return (ret); 
-} 
- 
-/** 
- * htmlReadDoc: 
- * @cur:  a pointer to a zero terminated string 
- * @URL:  the base URL to use for the document 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an XML in-memory document and build a tree. 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlReadDoc(const xmlChar * cur, const char *URL, const char *encoding, int options) 
-{ 
-    htmlParserCtxtPtr ctxt; 
- 
-    if (cur == NULL) 
-        return (NULL); 
- 
-    xmlInitParser(); 
-    ctxt = htmlCreateDocParserCtxt(cur, NULL); 
-    if (ctxt == NULL) 
-        return (NULL); 
-    return (htmlDoRead(ctxt, URL, encoding, options, 0)); 
-} 
- 
-/** 
- * htmlReadFile: 
- * @filename:  a file or URL 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an XML file from the filesystem or the network. 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlReadFile(const char *filename, const char *encoding, int options) 
-{ 
-    htmlParserCtxtPtr ctxt; 
- 
-    xmlInitParser(); 
-    ctxt = htmlCreateFileParserCtxt(filename, encoding); 
-    if (ctxt == NULL) 
-        return (NULL); 
-    return (htmlDoRead(ctxt, NULL, NULL, options, 0)); 
-} 
- 
-/** 
- * htmlReadMemory: 
- * @buffer:  a pointer to a char array 
- * @size:  the size of the array 
- * @URL:  the base URL to use for the document 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an XML in-memory document and build a tree. 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlReadMemory(const char *buffer, int size, const char *URL, const char *encoding, int options) 
-{ 
-    htmlParserCtxtPtr ctxt; 
- 
-    xmlInitParser(); 
-    ctxt = xmlCreateMemoryParserCtxt(buffer, size); 
-    if (ctxt == NULL) 
-        return (NULL); 
-    htmlDefaultSAXHandlerInit(); 
-    if (ctxt->sax != NULL) 
-        memcpy(ctxt->sax, &htmlDefaultSAXHandler, sizeof(xmlSAXHandlerV1)); 
-    return (htmlDoRead(ctxt, URL, encoding, options, 0)); 
-} 
- 
-/** 
- * htmlReadFd: 
- * @fd:  an open file descriptor 
- * @URL:  the base URL to use for the document 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an XML from a file descriptor and build a tree. 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlReadFd(int fd, const char *URL, const char *encoding, int options) 
-{ 
-    htmlParserCtxtPtr ctxt; 
-    xmlParserInputBufferPtr input; 
-    xmlParserInputPtr stream; 
- 
-    if (fd < 0) 
-        return (NULL); 
-    xmlInitParser(); 
- 
-    xmlInitParser(); 
-    input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE); 
-    if (input == NULL) 
-        return (NULL); 
-    ctxt = xmlNewParserCtxt(); 
-    if (ctxt == NULL) { 
-        xmlFreeParserInputBuffer(input); 
-        return (NULL); 
-    } 
-    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE); 
-    if (stream == NULL) { 
-        xmlFreeParserInputBuffer(input); 
-	xmlFreeParserCtxt(ctxt); 
-        return (NULL); 
-    } 
-    inputPush(ctxt, stream); 
-    return (htmlDoRead(ctxt, URL, encoding, options, 0)); 
-} 
- 
-/** 
- * htmlReadIO: 
- * @ioread:  an I/O read function 
- * @ioclose:  an I/O close function 
- * @ioctx:  an I/O handler 
- * @URL:  the base URL to use for the document 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an HTML document from I/O functions and source and build a tree. 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, 
-          void *ioctx, const char *URL, const char *encoding, int options) 
-{ 
-    htmlParserCtxtPtr ctxt; 
-    xmlParserInputBufferPtr input; 
-    xmlParserInputPtr stream; 
- 
-    if (ioread == NULL) 
-        return (NULL); 
-    xmlInitParser(); 
- 
-    input = xmlParserInputBufferCreateIO(ioread, ioclose, ioctx, 
-                                         XML_CHAR_ENCODING_NONE); 
-    if (input == NULL) { 
-        if (ioclose != NULL) 
-            ioclose(ioctx); 
-        return (NULL); 
-    } 
-    ctxt = htmlNewParserCtxt(); 
-    if (ctxt == NULL) { 
-        xmlFreeParserInputBuffer(input); 
-        return (NULL); 
-    } 
-    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE); 
-    if (stream == NULL) { 
-        xmlFreeParserInputBuffer(input); 
-	xmlFreeParserCtxt(ctxt); 
-        return (NULL); 
-    } 
-    inputPush(ctxt, stream); 
-    return (htmlDoRead(ctxt, URL, encoding, options, 0)); 
-} 
- 
-/** 
- * htmlCtxtReadDoc: 
- * @ctxt:  an HTML parser context 
- * @cur:  a pointer to a zero terminated string 
- * @URL:  the base URL to use for the document 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an XML in-memory document and build a tree. 
- * This reuses the existing @ctxt parser context 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlCtxtReadDoc(htmlParserCtxtPtr ctxt, const xmlChar * cur, 
-               const char *URL, const char *encoding, int options) 
-{ 
-    xmlParserInputPtr stream; 
- 
-    if (cur == NULL) 
-        return (NULL); 
-    if (ctxt == NULL) 
-        return (NULL); 
-    xmlInitParser(); 
- 
-    htmlCtxtReset(ctxt); 
- 
-    stream = xmlNewStringInputStream(ctxt, cur); 
-    if (stream == NULL) { 
-        return (NULL); 
-    } 
-    inputPush(ctxt, stream); 
-    return (htmlDoRead(ctxt, URL, encoding, options, 1)); 
-} 
- 
-/** 
- * htmlCtxtReadFile: 
- * @ctxt:  an HTML parser context 
- * @filename:  a file or URL 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an XML file from the filesystem or the network. 
- * This reuses the existing @ctxt parser context 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlCtxtReadFile(htmlParserCtxtPtr ctxt, const char *filename, 
-                const char *encoding, int options) 
-{ 
-    xmlParserInputPtr stream; 
- 
-    if (filename == NULL) 
-        return (NULL); 
-    if (ctxt == NULL) 
-        return (NULL); 
-    xmlInitParser(); 
- 
-    htmlCtxtReset(ctxt); 
- 
-    stream = xmlLoadExternalEntity(filename, NULL, ctxt); 
-    if (stream == NULL) { 
-        return (NULL); 
-    } 
-    inputPush(ctxt, stream); 
-    return (htmlDoRead(ctxt, NULL, encoding, options, 1)); 
-} 
- 
-/** 
- * htmlCtxtReadMemory: 
- * @ctxt:  an HTML parser context 
- * @buffer:  a pointer to a char array 
- * @size:  the size of the array 
- * @URL:  the base URL to use for the document 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an XML in-memory document and build a tree. 
- * This reuses the existing @ctxt parser context 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlCtxtReadMemory(htmlParserCtxtPtr ctxt, const char *buffer, int size, 
-                  const char *URL, const char *encoding, int options) 
-{ 
-    xmlParserInputBufferPtr input; 
-    xmlParserInputPtr stream; 
- 
-    if (ctxt == NULL) 
-        return (NULL); 
-    if (buffer == NULL) 
-        return (NULL); 
-    xmlInitParser(); 
- 
-    htmlCtxtReset(ctxt); 
- 
-    input = xmlParserInputBufferCreateMem(buffer, size, XML_CHAR_ENCODING_NONE); 
-    if (input == NULL) { 
-	return(NULL); 
-    } 
- 
-    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE); 
-    if (stream == NULL) { 
-	xmlFreeParserInputBuffer(input); 
-	return(NULL); 
-    } 
- 
-    inputPush(ctxt, stream); 
-    return (htmlDoRead(ctxt, URL, encoding, options, 1)); 
-} 
- 
-/** 
- * htmlCtxtReadFd: 
- * @ctxt:  an HTML parser context 
- * @fd:  an open file descriptor 
- * @URL:  the base URL to use for the document 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an XML from a file descriptor and build a tree. 
- * This reuses the existing @ctxt parser context 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlCtxtReadFd(htmlParserCtxtPtr ctxt, int fd, 
-              const char *URL, const char *encoding, int options) 
-{ 
-    xmlParserInputBufferPtr input; 
-    xmlParserInputPtr stream; 
- 
-    if (fd < 0) 
-        return (NULL); 
-    if (ctxt == NULL) 
-        return (NULL); 
-    xmlInitParser(); 
- 
-    htmlCtxtReset(ctxt); 
- 
- 
-    input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE); 
-    if (input == NULL) 
-        return (NULL); 
-    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE); 
-    if (stream == NULL) { 
-        xmlFreeParserInputBuffer(input); 
-        return (NULL); 
-    } 
-    inputPush(ctxt, stream); 
-    return (htmlDoRead(ctxt, URL, encoding, options, 1)); 
-} 
- 
-/** 
- * htmlCtxtReadIO: 
- * @ctxt:  an HTML parser context 
- * @ioread:  an I/O read function 
- * @ioclose:  an I/O close function 
- * @ioctx:  an I/O handler 
- * @URL:  the base URL to use for the document 
- * @encoding:  the document encoding, or NULL 
- * @options:  a combination of htmlParserOption(s) 
- * 
- * parse an HTML document from I/O functions and source and build a tree. 
- * This reuses the existing @ctxt parser context 
- * 
- * Returns the resulting document tree 
- */ 
-htmlDocPtr 
-htmlCtxtReadIO(htmlParserCtxtPtr ctxt, xmlInputReadCallback ioread, 
-              xmlInputCloseCallback ioclose, void *ioctx, 
-	      const char *URL, 
-              const char *encoding, int options) 
-{ 
-    xmlParserInputBufferPtr input; 
-    xmlParserInputPtr stream; 
- 
-    if (ioread == NULL) 
-        return (NULL); 
-    if (ctxt == NULL) 
-        return (NULL); 
-    xmlInitParser(); 
- 
-    htmlCtxtReset(ctxt); 
- 
-    input = xmlParserInputBufferCreateIO(ioread, ioclose, ioctx, 
-                                         XML_CHAR_ENCODING_NONE); 
-    if (input == NULL) { 
-        if (ioclose != NULL) 
-            ioclose(ioctx); 
-        return (NULL); 
-    } 
-    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE); 
-    if (stream == NULL) { 
-        xmlFreeParserInputBuffer(input); 
-        return (NULL); 
-    } 
-    inputPush(ctxt, stream); 
-    return (htmlDoRead(ctxt, URL, encoding, options, 1)); 
-} 
- 
-#define bottom_HTMLparser 
-#include "elfgcchack.h" 
-#endif /* LIBXML_HTML_ENABLED */ 
+        ctxt->attsDefault = NULL;
+    }
+    if (ctxt->attsSpecial != NULL) {
+        xmlHashFree(ctxt->attsSpecial, NULL);
+        ctxt->attsSpecial = NULL;
+    }
+}
+
+/**
+ * htmlCtxtUseOptions:
+ * @ctxt: an HTML parser context
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * Applies the options to the parser context
+ *
+ * Returns 0 in case of success, the set of unknown or unimplemented options
+ *         in case of error.
+ */
+int
+htmlCtxtUseOptions(htmlParserCtxtPtr ctxt, int options)
+{
+    if (ctxt == NULL)
+        return(-1);
+
+    if (options & HTML_PARSE_NOWARNING) {
+        ctxt->sax->warning = NULL;
+        ctxt->vctxt.warning = NULL;
+        options -= XML_PARSE_NOWARNING;
+	ctxt->options |= XML_PARSE_NOWARNING;
+    }
+    if (options & HTML_PARSE_NOERROR) {
+        ctxt->sax->error = NULL;
+        ctxt->vctxt.error = NULL;
+        ctxt->sax->fatalError = NULL;
+        options -= XML_PARSE_NOERROR;
+	ctxt->options |= XML_PARSE_NOERROR;
+    }
+    if (options & HTML_PARSE_PEDANTIC) {
+        ctxt->pedantic = 1;
+        options -= XML_PARSE_PEDANTIC;
+	ctxt->options |= XML_PARSE_PEDANTIC;
+    } else
+        ctxt->pedantic = 0;
+    if (options & XML_PARSE_NOBLANKS) {
+        ctxt->keepBlanks = 0;
+        ctxt->sax->ignorableWhitespace = xmlSAX2IgnorableWhitespace;
+        options -= XML_PARSE_NOBLANKS;
+	ctxt->options |= XML_PARSE_NOBLANKS;
+    } else
+        ctxt->keepBlanks = 1;
+    if (options & HTML_PARSE_RECOVER) {
+        ctxt->recovery = 1;
+	options -= HTML_PARSE_RECOVER;
+    } else
+        ctxt->recovery = 0;
+    if (options & HTML_PARSE_COMPACT) {
+	ctxt->options |= HTML_PARSE_COMPACT;
+        options -= HTML_PARSE_COMPACT;
+    }
+    if (options & XML_PARSE_HUGE) {
+	ctxt->options |= XML_PARSE_HUGE;
+        options -= XML_PARSE_HUGE;
+    }
+    if (options & HTML_PARSE_NODEFDTD) {
+	ctxt->options |= HTML_PARSE_NODEFDTD;
+        options -= HTML_PARSE_NODEFDTD;
+    }
+    if (options & HTML_PARSE_IGNORE_ENC) {
+	ctxt->options |= HTML_PARSE_IGNORE_ENC;
+        options -= HTML_PARSE_IGNORE_ENC;
+    }
+    if (options & HTML_PARSE_NOIMPLIED) {
+        ctxt->options |= HTML_PARSE_NOIMPLIED;
+        options -= HTML_PARSE_NOIMPLIED;
+    }
+    ctxt->dictNames = 0;
+    return (options);
+}
+
+/**
+ * htmlDoRead:
+ * @ctxt:  an HTML parser context
+ * @URL:  the base URL to use for the document
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ * @reuse:  keep the context for reuse
+ *
+ * Common front-end for the htmlRead functions
+ *
+ * Returns the resulting document tree or NULL
+ */
+static htmlDocPtr
+htmlDoRead(htmlParserCtxtPtr ctxt, const char *URL, const char *encoding,
+          int options, int reuse)
+{
+    htmlDocPtr ret;
+
+    htmlCtxtUseOptions(ctxt, options);
+    ctxt->html = 1;
+    if (encoding != NULL) {
+        xmlCharEncodingHandlerPtr hdlr;
+
+	hdlr = xmlFindCharEncodingHandler(encoding);
+	if (hdlr != NULL) {
+	    xmlSwitchToEncoding(ctxt, hdlr);
+	    if (ctxt->input->encoding != NULL)
+	      xmlFree((xmlChar *) ctxt->input->encoding);
+            ctxt->input->encoding = xmlStrdup((xmlChar *)encoding);
+        }
+    }
+    if ((URL != NULL) && (ctxt->input != NULL) &&
+        (ctxt->input->filename == NULL))
+        ctxt->input->filename = (char *) xmlStrdup((const xmlChar *) URL);
+    htmlParseDocument(ctxt);
+    ret = ctxt->myDoc;
+    ctxt->myDoc = NULL;
+    if (!reuse) {
+        if ((ctxt->dictNames) &&
+	    (ret != NULL) &&
+	    (ret->dict == ctxt->dict))
+	    ctxt->dict = NULL;
+	xmlFreeParserCtxt(ctxt);
+    }
+    return (ret);
+}
+
+/**
+ * htmlReadDoc:
+ * @cur:  a pointer to a zero terminated string
+ * @URL:  the base URL to use for the document
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an XML in-memory document and build a tree.
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlReadDoc(const xmlChar * cur, const char *URL, const char *encoding, int options)
+{
+    htmlParserCtxtPtr ctxt;
+
+    if (cur == NULL)
+        return (NULL);
+
+    xmlInitParser();
+    ctxt = htmlCreateDocParserCtxt(cur, NULL);
+    if (ctxt == NULL)
+        return (NULL);
+    return (htmlDoRead(ctxt, URL, encoding, options, 0));
+}
+
+/**
+ * htmlReadFile:
+ * @filename:  a file or URL
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an XML file from the filesystem or the network.
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlReadFile(const char *filename, const char *encoding, int options)
+{
+    htmlParserCtxtPtr ctxt;
+
+    xmlInitParser();
+    ctxt = htmlCreateFileParserCtxt(filename, encoding);
+    if (ctxt == NULL)
+        return (NULL);
+    return (htmlDoRead(ctxt, NULL, NULL, options, 0));
+}
+
+/**
+ * htmlReadMemory:
+ * @buffer:  a pointer to a char array
+ * @size:  the size of the array
+ * @URL:  the base URL to use for the document
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an XML in-memory document and build a tree.
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlReadMemory(const char *buffer, int size, const char *URL, const char *encoding, int options)
+{
+    htmlParserCtxtPtr ctxt;
+
+    xmlInitParser();
+    ctxt = xmlCreateMemoryParserCtxt(buffer, size);
+    if (ctxt == NULL)
+        return (NULL);
+    htmlDefaultSAXHandlerInit();
+    if (ctxt->sax != NULL)
+        memcpy(ctxt->sax, &htmlDefaultSAXHandler, sizeof(xmlSAXHandlerV1));
+    return (htmlDoRead(ctxt, URL, encoding, options, 0));
+}
+
+/**
+ * htmlReadFd:
+ * @fd:  an open file descriptor
+ * @URL:  the base URL to use for the document
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an XML from a file descriptor and build a tree.
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlReadFd(int fd, const char *URL, const char *encoding, int options)
+{
+    htmlParserCtxtPtr ctxt;
+    xmlParserInputBufferPtr input;
+    xmlParserInputPtr stream;
+
+    if (fd < 0)
+        return (NULL);
+    xmlInitParser();
+
+    xmlInitParser();
+    input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE);
+    if (input == NULL)
+        return (NULL);
+    ctxt = xmlNewParserCtxt();
+    if (ctxt == NULL) {
+        xmlFreeParserInputBuffer(input);
+        return (NULL);
+    }
+    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE);
+    if (stream == NULL) {
+        xmlFreeParserInputBuffer(input);
+	xmlFreeParserCtxt(ctxt);
+        return (NULL);
+    }
+    inputPush(ctxt, stream);
+    return (htmlDoRead(ctxt, URL, encoding, options, 0));
+}
+
+/**
+ * htmlReadIO:
+ * @ioread:  an I/O read function
+ * @ioclose:  an I/O close function
+ * @ioctx:  an I/O handler
+ * @URL:  the base URL to use for the document
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an HTML document from I/O functions and source and build a tree.
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose,
+          void *ioctx, const char *URL, const char *encoding, int options)
+{
+    htmlParserCtxtPtr ctxt;
+    xmlParserInputBufferPtr input;
+    xmlParserInputPtr stream;
+
+    if (ioread == NULL)
+        return (NULL);
+    xmlInitParser();
+
+    input = xmlParserInputBufferCreateIO(ioread, ioclose, ioctx,
+                                         XML_CHAR_ENCODING_NONE);
+    if (input == NULL) {
+        if (ioclose != NULL)
+            ioclose(ioctx);
+        return (NULL);
+    }
+    ctxt = htmlNewParserCtxt();
+    if (ctxt == NULL) {
+        xmlFreeParserInputBuffer(input);
+        return (NULL);
+    }
+    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE);
+    if (stream == NULL) {
+        xmlFreeParserInputBuffer(input);
+	xmlFreeParserCtxt(ctxt);
+        return (NULL);
+    }
+    inputPush(ctxt, stream);
+    return (htmlDoRead(ctxt, URL, encoding, options, 0));
+}
+
+/**
+ * htmlCtxtReadDoc:
+ * @ctxt:  an HTML parser context
+ * @cur:  a pointer to a zero terminated string
+ * @URL:  the base URL to use for the document
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an XML in-memory document and build a tree.
+ * This reuses the existing @ctxt parser context
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlCtxtReadDoc(htmlParserCtxtPtr ctxt, const xmlChar * cur,
+               const char *URL, const char *encoding, int options)
+{
+    xmlParserInputPtr stream;
+
+    if (cur == NULL)
+        return (NULL);
+    if (ctxt == NULL)
+        return (NULL);
+    xmlInitParser();
+
+    htmlCtxtReset(ctxt);
+
+    stream = xmlNewStringInputStream(ctxt, cur);
+    if (stream == NULL) {
+        return (NULL);
+    }
+    inputPush(ctxt, stream);
+    return (htmlDoRead(ctxt, URL, encoding, options, 1));
+}
+
+/**
+ * htmlCtxtReadFile:
+ * @ctxt:  an HTML parser context
+ * @filename:  a file or URL
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an XML file from the filesystem or the network.
+ * This reuses the existing @ctxt parser context
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlCtxtReadFile(htmlParserCtxtPtr ctxt, const char *filename,
+                const char *encoding, int options)
+{
+    xmlParserInputPtr stream;
+
+    if (filename == NULL)
+        return (NULL);
+    if (ctxt == NULL)
+        return (NULL);
+    xmlInitParser();
+
+    htmlCtxtReset(ctxt);
+
+    stream = xmlLoadExternalEntity(filename, NULL, ctxt);
+    if (stream == NULL) {
+        return (NULL);
+    }
+    inputPush(ctxt, stream);
+    return (htmlDoRead(ctxt, NULL, encoding, options, 1));
+}
+
+/**
+ * htmlCtxtReadMemory:
+ * @ctxt:  an HTML parser context
+ * @buffer:  a pointer to a char array
+ * @size:  the size of the array
+ * @URL:  the base URL to use for the document
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an XML in-memory document and build a tree.
+ * This reuses the existing @ctxt parser context
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlCtxtReadMemory(htmlParserCtxtPtr ctxt, const char *buffer, int size,
+                  const char *URL, const char *encoding, int options)
+{
+    xmlParserInputBufferPtr input;
+    xmlParserInputPtr stream;
+
+    if (ctxt == NULL)
+        return (NULL);
+    if (buffer == NULL)
+        return (NULL);
+    xmlInitParser();
+
+    htmlCtxtReset(ctxt);
+
+    input = xmlParserInputBufferCreateMem(buffer, size, XML_CHAR_ENCODING_NONE);
+    if (input == NULL) {
+	return(NULL);
+    }
+
+    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE);
+    if (stream == NULL) {
+	xmlFreeParserInputBuffer(input);
+	return(NULL);
+    }
+
+    inputPush(ctxt, stream);
+    return (htmlDoRead(ctxt, URL, encoding, options, 1));
+}
+
+/**
+ * htmlCtxtReadFd:
+ * @ctxt:  an HTML parser context
+ * @fd:  an open file descriptor
+ * @URL:  the base URL to use for the document
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an XML from a file descriptor and build a tree.
+ * This reuses the existing @ctxt parser context
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlCtxtReadFd(htmlParserCtxtPtr ctxt, int fd,
+              const char *URL, const char *encoding, int options)
+{
+    xmlParserInputBufferPtr input;
+    xmlParserInputPtr stream;
+
+    if (fd < 0)
+        return (NULL);
+    if (ctxt == NULL)
+        return (NULL);
+    xmlInitParser();
+
+    htmlCtxtReset(ctxt);
+
+
+    input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE);
+    if (input == NULL)
+        return (NULL);
+    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE);
+    if (stream == NULL) {
+        xmlFreeParserInputBuffer(input);
+        return (NULL);
+    }
+    inputPush(ctxt, stream);
+    return (htmlDoRead(ctxt, URL, encoding, options, 1));
+}
+
+/**
+ * htmlCtxtReadIO:
+ * @ctxt:  an HTML parser context
+ * @ioread:  an I/O read function
+ * @ioclose:  an I/O close function
+ * @ioctx:  an I/O handler
+ * @URL:  the base URL to use for the document
+ * @encoding:  the document encoding, or NULL
+ * @options:  a combination of htmlParserOption(s)
+ *
+ * parse an HTML document from I/O functions and source and build a tree.
+ * This reuses the existing @ctxt parser context
+ *
+ * Returns the resulting document tree
+ */
+htmlDocPtr
+htmlCtxtReadIO(htmlParserCtxtPtr ctxt, xmlInputReadCallback ioread,
+              xmlInputCloseCallback ioclose, void *ioctx,
+	      const char *URL,
+              const char *encoding, int options)
+{
+    xmlParserInputBufferPtr input;
+    xmlParserInputPtr stream;
+
+    if (ioread == NULL)
+        return (NULL);
+    if (ctxt == NULL)
+        return (NULL);
+    xmlInitParser();
+
+    htmlCtxtReset(ctxt);
+
+    input = xmlParserInputBufferCreateIO(ioread, ioclose, ioctx,
+                                         XML_CHAR_ENCODING_NONE);
+    if (input == NULL) {
+        if (ioclose != NULL)
+            ioclose(ioctx);
+        return (NULL);
+    }
+    stream = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE);
+    if (stream == NULL) {
+        xmlFreeParserInputBuffer(input);
+        return (NULL);
+    }
+    inputPush(ctxt, stream);
+    return (htmlDoRead(ctxt, URL, encoding, options, 1));
+}
+
+#define bottom_HTMLparser
+#include "elfgcchack.h"
+#endif /* LIBXML_HTML_ENABLED */

File diff suppressed because it is too large
+ 504 - 504
contrib/libs/libxml/HTMLtree.c


+ 180 - 180
contrib/libs/libxml/SAX.c

@@ -1,180 +1,180 @@
-/* 
- * SAX.c : Old SAX v1 handlers to build a tree. 
- *         Deprecated except for compatibility 
- * 
- * See Copyright for the status of this software. 
- * 
- * Daniel Veillard <daniel@veillard.com> 
- */ 
- 
- 
-#define IN_LIBXML 
-#include "libxml.h" 
-#include <stdlib.h> 
-#include <string.h> 
-#include <libxml/xmlmemory.h> 
-#include <libxml/tree.h> 
-#include <libxml/parser.h> 
-#include <libxml/parserInternals.h> 
-#include <libxml/valid.h> 
-#include <libxml/entities.h> 
-#include <libxml/xmlerror.h> 
-#include <libxml/debugXML.h> 
-#include <libxml/xmlIO.h> 
-#include <libxml/SAX.h> 
-#include <libxml/uri.h> 
-#include <libxml/valid.h> 
-#include <libxml/HTMLtree.h> 
-#include <libxml/globals.h> 
-#include <libxml/SAX2.h> 
- 
-#ifdef LIBXML_LEGACY_ENABLED 
-#ifdef LIBXML_SAX1_ENABLED 
-/** 
- * initxmlDefaultSAXHandler: 
- * @hdlr:  the SAX handler 
- * @warning:  flag if non-zero sets the handler warning procedure 
- * 
- * Initialize the default XML SAX version 1 handler 
- * DEPRECATED: use xmlSAX2InitDefaultSAXHandler() for the new SAX2 blocks 
- */ 
-void 
-initxmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr, int warning) 
-{ 
- 
-    if(hdlr->initialized == 1) 
-	return; 
- 
-    hdlr->internalSubset = xmlSAX2InternalSubset; 
-    hdlr->externalSubset = xmlSAX2ExternalSubset; 
-    hdlr->isStandalone = xmlSAX2IsStandalone; 
-    hdlr->hasInternalSubset = xmlSAX2HasInternalSubset; 
-    hdlr->hasExternalSubset = xmlSAX2HasExternalSubset; 
-    hdlr->resolveEntity = xmlSAX2ResolveEntity; 
-    hdlr->getEntity = xmlSAX2GetEntity; 
-    hdlr->getParameterEntity = xmlSAX2GetParameterEntity; 
-    hdlr->entityDecl = xmlSAX2EntityDecl; 
-    hdlr->attributeDecl = xmlSAX2AttributeDecl; 
-    hdlr->elementDecl = xmlSAX2ElementDecl; 
-    hdlr->notationDecl = xmlSAX2NotationDecl; 
-    hdlr->unparsedEntityDecl = xmlSAX2UnparsedEntityDecl; 
-    hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator; 
-    hdlr->startDocument = xmlSAX2StartDocument; 
-    hdlr->endDocument = xmlSAX2EndDocument; 
-    hdlr->startElement = xmlSAX2StartElement; 
-    hdlr->endElement = xmlSAX2EndElement; 
-    hdlr->reference = xmlSAX2Reference; 
-    hdlr->characters = xmlSAX2Characters; 
-    hdlr->cdataBlock = xmlSAX2CDataBlock; 
-    hdlr->ignorableWhitespace = xmlSAX2Characters; 
-    hdlr->processingInstruction = xmlSAX2ProcessingInstruction; 
-    if (warning == 0) 
-	hdlr->warning = NULL; 
-    else 
-	hdlr->warning = xmlParserWarning; 
-    hdlr->error = xmlParserError; 
-    hdlr->fatalError = xmlParserError; 
- 
-    hdlr->initialized = 1; 
-} 
- 
-#ifdef LIBXML_HTML_ENABLED 
- 
-/** 
- * inithtmlDefaultSAXHandler: 
- * @hdlr:  the SAX handler 
- * 
- * Initialize the default HTML SAX version 1 handler 
- * DEPRECATED: use xmlSAX2InitHtmlDefaultSAXHandler() for the new SAX2 blocks 
- */ 
-void 
-inithtmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr) 
-{ 
-    if(hdlr->initialized == 1) 
-	return; 
- 
-    hdlr->internalSubset = xmlSAX2InternalSubset; 
-    hdlr->externalSubset = NULL; 
-    hdlr->isStandalone = NULL; 
-    hdlr->hasInternalSubset = NULL; 
-    hdlr->hasExternalSubset = NULL; 
-    hdlr->resolveEntity = NULL; 
-    hdlr->getEntity = xmlSAX2GetEntity; 
-    hdlr->getParameterEntity = NULL; 
-    hdlr->entityDecl = NULL; 
-    hdlr->attributeDecl = NULL; 
-    hdlr->elementDecl = NULL; 
-    hdlr->notationDecl = NULL; 
-    hdlr->unparsedEntityDecl = NULL; 
-    hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator; 
-    hdlr->startDocument = xmlSAX2StartDocument; 
-    hdlr->endDocument = xmlSAX2EndDocument; 
-    hdlr->startElement = xmlSAX2StartElement; 
-    hdlr->endElement = xmlSAX2EndElement; 
-    hdlr->reference = NULL; 
-    hdlr->characters = xmlSAX2Characters; 
-    hdlr->cdataBlock = xmlSAX2CDataBlock; 
-    hdlr->ignorableWhitespace = xmlSAX2IgnorableWhitespace; 
-    hdlr->processingInstruction = xmlSAX2ProcessingInstruction; 
-    hdlr->comment = xmlSAX2Comment; 
-    hdlr->warning = xmlParserWarning; 
-    hdlr->error = xmlParserError; 
-    hdlr->fatalError = xmlParserError; 
- 
-    hdlr->initialized = 1; 
-} 
- 
-#endif /* LIBXML_HTML_ENABLED */ 
- 
-#ifdef LIBXML_DOCB_ENABLED 
-/** 
- * initdocbDefaultSAXHandler: 
- * @hdlr:  the SAX handler 
- * 
- * Initialize the default DocBook SAX version 1 handler 
- * DEPRECATED: use xmlSAX2InitDocbDefaultSAXHandler() for the new SAX2 blocks 
- */ 
-void 
-initdocbDefaultSAXHandler(xmlSAXHandlerV1 *hdlr) 
-{ 
-    if(hdlr->initialized == 1) 
-	return; 
- 
-    hdlr->internalSubset = xmlSAX2InternalSubset; 
-    hdlr->externalSubset = NULL; 
-    hdlr->isStandalone = xmlSAX2IsStandalone; 
-    hdlr->hasInternalSubset = xmlSAX2HasInternalSubset; 
-    hdlr->hasExternalSubset = xmlSAX2HasExternalSubset; 
-    hdlr->resolveEntity = xmlSAX2ResolveEntity; 
-    hdlr->getEntity = xmlSAX2GetEntity; 
-    hdlr->getParameterEntity = NULL; 
-    hdlr->entityDecl = xmlSAX2EntityDecl; 
-    hdlr->attributeDecl = NULL; 
-    hdlr->elementDecl = NULL; 
-    hdlr->notationDecl = NULL; 
-    hdlr->unparsedEntityDecl = NULL; 
-    hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator; 
-    hdlr->startDocument = xmlSAX2StartDocument; 
-    hdlr->endDocument = xmlSAX2EndDocument; 
-    hdlr->startElement = xmlSAX2StartElement; 
-    hdlr->endElement = xmlSAX2EndElement; 
-    hdlr->reference = xmlSAX2Reference; 
-    hdlr->characters = xmlSAX2Characters; 
-    hdlr->cdataBlock = NULL; 
-    hdlr->ignorableWhitespace = xmlSAX2IgnorableWhitespace; 
-    hdlr->processingInstruction = NULL; 
-    hdlr->comment = xmlSAX2Comment; 
-    hdlr->warning = xmlParserWarning; 
-    hdlr->error = xmlParserError; 
-    hdlr->fatalError = xmlParserError; 
- 
-    hdlr->initialized = 1; 
-} 
- 
-#endif /* LIBXML_DOCB_ENABLED */ 
- 
-#endif /* LIBXML_SAX1_ENABLED */ 
- 
-#define bottom_SAX 
-#include "elfgcchack.h" 
-#endif /* LIBXML_LEGACY_ENABLED */ 
+/*
+ * SAX.c : Old SAX v1 handlers to build a tree.
+ *         Deprecated except for compatibility
+ *
+ * See Copyright for the status of this software.
+ *
+ * Daniel Veillard <daniel@veillard.com>
+ */
+
+
+#define IN_LIBXML
+#include "libxml.h"
+#include <stdlib.h>
+#include <string.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
+#include <libxml/valid.h>
+#include <libxml/entities.h>
+#include <libxml/xmlerror.h>
+#include <libxml/debugXML.h>
+#include <libxml/xmlIO.h>
+#include <libxml/SAX.h>
+#include <libxml/uri.h>
+#include <libxml/valid.h>
+#include <libxml/HTMLtree.h>
+#include <libxml/globals.h>
+#include <libxml/SAX2.h>
+
+#ifdef LIBXML_LEGACY_ENABLED
+#ifdef LIBXML_SAX1_ENABLED
+/**
+ * initxmlDefaultSAXHandler:
+ * @hdlr:  the SAX handler
+ * @warning:  flag if non-zero sets the handler warning procedure
+ *
+ * Initialize the default XML SAX version 1 handler
+ * DEPRECATED: use xmlSAX2InitDefaultSAXHandler() for the new SAX2 blocks
+ */
+void
+initxmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr, int warning)
+{
+
+    if(hdlr->initialized == 1)
+	return;
+
+    hdlr->internalSubset = xmlSAX2InternalSubset;
+    hdlr->externalSubset = xmlSAX2ExternalSubset;
+    hdlr->isStandalone = xmlSAX2IsStandalone;
+    hdlr->hasInternalSubset = xmlSAX2HasInternalSubset;
+    hdlr->hasExternalSubset = xmlSAX2HasExternalSubset;
+    hdlr->resolveEntity = xmlSAX2ResolveEntity;
+    hdlr->getEntity = xmlSAX2GetEntity;
+    hdlr->getParameterEntity = xmlSAX2GetParameterEntity;
+    hdlr->entityDecl = xmlSAX2EntityDecl;
+    hdlr->attributeDecl = xmlSAX2AttributeDecl;
+    hdlr->elementDecl = xmlSAX2ElementDecl;
+    hdlr->notationDecl = xmlSAX2NotationDecl;
+    hdlr->unparsedEntityDecl = xmlSAX2UnparsedEntityDecl;
+    hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator;
+    hdlr->startDocument = xmlSAX2StartDocument;
+    hdlr->endDocument = xmlSAX2EndDocument;
+    hdlr->startElement = xmlSAX2StartElement;
+    hdlr->endElement = xmlSAX2EndElement;
+    hdlr->reference = xmlSAX2Reference;
+    hdlr->characters = xmlSAX2Characters;
+    hdlr->cdataBlock = xmlSAX2CDataBlock;
+    hdlr->ignorableWhitespace = xmlSAX2Characters;
+    hdlr->processingInstruction = xmlSAX2ProcessingInstruction;
+    if (warning == 0)
+	hdlr->warning = NULL;
+    else
+	hdlr->warning = xmlParserWarning;
+    hdlr->error = xmlParserError;
+    hdlr->fatalError = xmlParserError;
+
+    hdlr->initialized = 1;
+}
+
+#ifdef LIBXML_HTML_ENABLED
+
+/**
+ * inithtmlDefaultSAXHandler:
+ * @hdlr:  the SAX handler
+ *
+ * Initialize the default HTML SAX version 1 handler
+ * DEPRECATED: use xmlSAX2InitHtmlDefaultSAXHandler() for the new SAX2 blocks
+ */
+void
+inithtmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr)
+{
+    if(hdlr->initialized == 1)
+	return;
+
+    hdlr->internalSubset = xmlSAX2InternalSubset;
+    hdlr->externalSubset = NULL;
+    hdlr->isStandalone = NULL;
+    hdlr->hasInternalSubset = NULL;
+    hdlr->hasExternalSubset = NULL;
+    hdlr->resolveEntity = NULL;
+    hdlr->getEntity = xmlSAX2GetEntity;
+    hdlr->getParameterEntity = NULL;
+    hdlr->entityDecl = NULL;
+    hdlr->attributeDecl = NULL;
+    hdlr->elementDecl = NULL;
+    hdlr->notationDecl = NULL;
+    hdlr->unparsedEntityDecl = NULL;
+    hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator;
+    hdlr->startDocument = xmlSAX2StartDocument;
+    hdlr->endDocument = xmlSAX2EndDocument;
+    hdlr->startElement = xmlSAX2StartElement;
+    hdlr->endElement = xmlSAX2EndElement;
+    hdlr->reference = NULL;
+    hdlr->characters = xmlSAX2Characters;
+    hdlr->cdataBlock = xmlSAX2CDataBlock;
+    hdlr->ignorableWhitespace = xmlSAX2IgnorableWhitespace;
+    hdlr->processingInstruction = xmlSAX2ProcessingInstruction;
+    hdlr->comment = xmlSAX2Comment;
+    hdlr->warning = xmlParserWarning;
+    hdlr->error = xmlParserError;
+    hdlr->fatalError = xmlParserError;
+
+    hdlr->initialized = 1;
+}
+
+#endif /* LIBXML_HTML_ENABLED */
+
+#ifdef LIBXML_DOCB_ENABLED
+/**
+ * initdocbDefaultSAXHandler:
+ * @hdlr:  the SAX handler
+ *
+ * Initialize the default DocBook SAX version 1 handler
+ * DEPRECATED: use xmlSAX2InitDocbDefaultSAXHandler() for the new SAX2 blocks
+ */
+void
+initdocbDefaultSAXHandler(xmlSAXHandlerV1 *hdlr)
+{
+    if(hdlr->initialized == 1)
+	return;
+
+    hdlr->internalSubset = xmlSAX2InternalSubset;
+    hdlr->externalSubset = NULL;
+    hdlr->isStandalone = xmlSAX2IsStandalone;
+    hdlr->hasInternalSubset = xmlSAX2HasInternalSubset;
+    hdlr->hasExternalSubset = xmlSAX2HasExternalSubset;
+    hdlr->resolveEntity = xmlSAX2ResolveEntity;
+    hdlr->getEntity = xmlSAX2GetEntity;
+    hdlr->getParameterEntity = NULL;
+    hdlr->entityDecl = xmlSAX2EntityDecl;
+    hdlr->attributeDecl = NULL;
+    hdlr->elementDecl = NULL;
+    hdlr->notationDecl = NULL;
+    hdlr->unparsedEntityDecl = NULL;
+    hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator;
+    hdlr->startDocument = xmlSAX2StartDocument;
+    hdlr->endDocument = xmlSAX2EndDocument;
+    hdlr->startElement = xmlSAX2StartElement;
+    hdlr->endElement = xmlSAX2EndElement;
+    hdlr->reference = xmlSAX2Reference;
+    hdlr->characters = xmlSAX2Characters;
+    hdlr->cdataBlock = NULL;
+    hdlr->ignorableWhitespace = xmlSAX2IgnorableWhitespace;
+    hdlr->processingInstruction = NULL;
+    hdlr->comment = xmlSAX2Comment;
+    hdlr->warning = xmlParserWarning;
+    hdlr->error = xmlParserError;
+    hdlr->fatalError = xmlParserError;
+
+    hdlr->initialized = 1;
+}
+
+#endif /* LIBXML_DOCB_ENABLED */
+
+#endif /* LIBXML_SAX1_ENABLED */
+
+#define bottom_SAX
+#include "elfgcchack.h"
+#endif /* LIBXML_LEGACY_ENABLED */

File diff suppressed because it is too large
+ 1651 - 1651
contrib/libs/libxml/SAX2.c


File diff suppressed because it is too large
+ 735 - 735
contrib/libs/libxml/buf.c


+ 72 - 72
contrib/libs/libxml/buf.h

@@ -1,72 +1,72 @@
-/* 
- * Summary: Internal Interfaces for memory buffers in libxml2 
- * Description: this module describes most of the new xmlBuf buffer 
- *              entry points, those are private routines, with a 
- *              few exceptions exported in tree.h. This was added 
- *              in 2.9.0. 
- * 
- * Copy: See Copyright for the status of this software. 
- * 
- * Author: Daniel Veillard 
- */ 
- 
-#ifndef __XML_BUF_H__ 
-#define __XML_BUF_H__ 
- 
-#include <libxml/tree.h> 
- 
-#ifdef __cplusplus 
-extern "C" { 
-#endif 
- 
-xmlBufPtr xmlBufCreate(void); 
-xmlBufPtr xmlBufCreateSize(size_t size); 
-xmlBufPtr xmlBufCreateStatic(void *mem, size_t size); 
- 
-int xmlBufSetAllocationScheme(xmlBufPtr buf, 
-                              xmlBufferAllocationScheme scheme); 
-int xmlBufGetAllocationScheme(xmlBufPtr buf); 
- 
-void xmlBufFree(xmlBufPtr buf); 
-void xmlBufEmpty(xmlBufPtr buf); 
- 
-/* size_t xmlBufShrink(xmlBufPtr buf, size_t len); */ 
-int xmlBufGrow(xmlBufPtr buf, int len); 
-int xmlBufInflate(xmlBufPtr buf, size_t len); 
-int xmlBufResize(xmlBufPtr buf, size_t len); 
- 
-int xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len); 
-int xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len); 
-int xmlBufCat(xmlBufPtr buf, const xmlChar *str); 
-int xmlBufCCat(xmlBufPtr buf, const char *str); 
-int xmlBufWriteCHAR(xmlBufPtr buf, const xmlChar *string); 
-int xmlBufWriteChar(xmlBufPtr buf, const char *string); 
-int xmlBufWriteQuotedString(xmlBufPtr buf, const xmlChar *string); 
- 
-size_t xmlBufAvail(const xmlBufPtr buf); 
-size_t xmlBufLength(const xmlBufPtr buf); 
-/* size_t xmlBufUse(const xmlBufPtr buf); */ 
-int xmlBufIsEmpty(const xmlBufPtr buf); 
-int xmlBufAddLen(xmlBufPtr buf, size_t len); 
-int xmlBufErase(xmlBufPtr buf, size_t len); 
- 
-/* const xmlChar * xmlBufContent(const xmlBuf *buf); */ 
-/* const xmlChar * xmlBufEnd(xmlBufPtr buf); */ 
- 
-xmlChar * xmlBufDetach(xmlBufPtr buf); 
- 
-size_t xmlBufDump(FILE *file, xmlBufPtr buf); 
- 
-xmlBufPtr xmlBufFromBuffer(xmlBufferPtr buffer); 
-xmlBufferPtr xmlBufBackToBuffer(xmlBufPtr buf); 
-int xmlBufMergeBuffer(xmlBufPtr buf, xmlBufferPtr buffer); 
- 
-int xmlBufResetInput(xmlBufPtr buf, xmlParserInputPtr input); 
-size_t xmlBufGetInputBase(xmlBufPtr buf, xmlParserInputPtr input); 
-int xmlBufSetInputBaseCur(xmlBufPtr buf, xmlParserInputPtr input, 
-                          size_t base, size_t cur); 
-#ifdef __cplusplus 
-} 
-#endif 
-#endif /* __XML_BUF_H__ */ 
- 
+/*
+ * Summary: Internal Interfaces for memory buffers in libxml2
+ * Description: this module describes most of the new xmlBuf buffer
+ *              entry points, those are private routines, with a
+ *              few exceptions exported in tree.h. This was added
+ *              in 2.9.0.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_BUF_H__
+#define __XML_BUF_H__
+
+#include <libxml/tree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+xmlBufPtr xmlBufCreate(void);
+xmlBufPtr xmlBufCreateSize(size_t size);
+xmlBufPtr xmlBufCreateStatic(void *mem, size_t size);
+
+int xmlBufSetAllocationScheme(xmlBufPtr buf,
+                              xmlBufferAllocationScheme scheme);
+int xmlBufGetAllocationScheme(xmlBufPtr buf);
+
+void xmlBufFree(xmlBufPtr buf);
+void xmlBufEmpty(xmlBufPtr buf);
+
+/* size_t xmlBufShrink(xmlBufPtr buf, size_t len); */
+int xmlBufGrow(xmlBufPtr buf, int len);
+int xmlBufInflate(xmlBufPtr buf, size_t len);
+int xmlBufResize(xmlBufPtr buf, size_t len);
+
+int xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len);
+int xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len);
+int xmlBufCat(xmlBufPtr buf, const xmlChar *str);
+int xmlBufCCat(xmlBufPtr buf, const char *str);
+int xmlBufWriteCHAR(xmlBufPtr buf, const xmlChar *string);
+int xmlBufWriteChar(xmlBufPtr buf, const char *string);
+int xmlBufWriteQuotedString(xmlBufPtr buf, const xmlChar *string);
+
+size_t xmlBufAvail(const xmlBufPtr buf);
+size_t xmlBufLength(const xmlBufPtr buf);
+/* size_t xmlBufUse(const xmlBufPtr buf); */
+int xmlBufIsEmpty(const xmlBufPtr buf);
+int xmlBufAddLen(xmlBufPtr buf, size_t len);
+int xmlBufErase(xmlBufPtr buf, size_t len);
+
+/* const xmlChar * xmlBufContent(const xmlBuf *buf); */
+/* const xmlChar * xmlBufEnd(xmlBufPtr buf); */
+
+xmlChar * xmlBufDetach(xmlBufPtr buf);
+
+size_t xmlBufDump(FILE *file, xmlBufPtr buf);
+
+xmlBufPtr xmlBufFromBuffer(xmlBufferPtr buffer);
+xmlBufferPtr xmlBufBackToBuffer(xmlBufPtr buf);
+int xmlBufMergeBuffer(xmlBufPtr buf, xmlBufferPtr buffer);
+
+int xmlBufResetInput(xmlBufPtr buf, xmlParserInputPtr input);
+size_t xmlBufGetInputBase(xmlBufPtr buf, xmlParserInputPtr input);
+int xmlBufSetInputBaseCur(xmlBufPtr buf, xmlParserInputPtr input,
+                          size_t base, size_t cur);
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_BUF_H__ */
+

+ 2203 - 2203
contrib/libs/libxml/c14n.c

@@ -1,2234 +1,2234 @@
-/* 
- * "Canonical XML" implementation 
- * http://www.w3.org/TR/xml-c14n 
- * 
- * "Exclusive XML Canonicalization" implementation 
- * http://www.w3.org/TR/xml-exc-c14n 
- * 
- * See Copyright for the status of this software. 
- * 
- * Author: Aleksey Sanin <aleksey@aleksey.com> 
- */ 
-#define IN_LIBXML 
-#include "libxml.h" 
-#ifdef LIBXML_C14N_ENABLED 
-#ifdef LIBXML_OUTPUT_ENABLED 
- 
-#ifdef HAVE_STDLIB_H 
-#include <stdlib.h> 
-#endif 
-#include <string.h> 
- 
-#include <libxml/tree.h> 
-#include <libxml/parser.h> 
-#include <libxml/uri.h> 
-#include <libxml/xmlerror.h> 
-#include <libxml/globals.h> 
-#include <libxml/xpathInternals.h> 
-#include <libxml/c14n.h> 
- 
-#include "buf.h" 
- 
-/************************************************************************ 
- *									* 
- *		Some declaration better left private ATM		* 
- *									* 
- ************************************************************************/ 
- 
-typedef enum { 
-    XMLC14N_BEFORE_DOCUMENT_ELEMENT = 0, 
-    XMLC14N_INSIDE_DOCUMENT_ELEMENT = 1, 
-    XMLC14N_AFTER_DOCUMENT_ELEMENT = 2 
-} xmlC14NPosition; 
- 
-typedef struct _xmlC14NVisibleNsStack { 
-    int nsCurEnd;           /* number of nodes in the set */ 
+/*
+ * "Canonical XML" implementation
+ * http://www.w3.org/TR/xml-c14n
+ *
+ * "Exclusive XML Canonicalization" implementation
+ * http://www.w3.org/TR/xml-exc-c14n
+ *
+ * See Copyright for the status of this software.
+ *
+ * Author: Aleksey Sanin <aleksey@aleksey.com>
+ */
+#define IN_LIBXML
+#include "libxml.h"
+#ifdef LIBXML_C14N_ENABLED
+#ifdef LIBXML_OUTPUT_ENABLED
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
+
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/uri.h>
+#include <libxml/xmlerror.h>
+#include <libxml/globals.h>
+#include <libxml/xpathInternals.h>
+#include <libxml/c14n.h>
+
+#include "buf.h"
+
+/************************************************************************
+ *									*
+ *		Some declaration better left private ATM		*
+ *									*
+ ************************************************************************/
+
+typedef enum {
+    XMLC14N_BEFORE_DOCUMENT_ELEMENT = 0,
+    XMLC14N_INSIDE_DOCUMENT_ELEMENT = 1,
+    XMLC14N_AFTER_DOCUMENT_ELEMENT = 2
+} xmlC14NPosition;
+
+typedef struct _xmlC14NVisibleNsStack {
+    int nsCurEnd;           /* number of nodes in the set */
     int nsPrevStart;        /* the beginning of the stack for previous visible node */
-    int nsPrevEnd;          /* the end of the stack for previous visible node */ 
-    int nsMax;              /* size of the array as allocated */ 
-    xmlNsPtr	*nsTab;	    /* array of ns in no particular order */ 
-    xmlNodePtr	*nodeTab;   /* array of nodes in no particular order */ 
-} xmlC14NVisibleNsStack, *xmlC14NVisibleNsStackPtr; 
- 
-typedef struct _xmlC14NCtx { 
-    /* input parameters */ 
-    xmlDocPtr doc; 
-    xmlC14NIsVisibleCallback is_visible_callback; 
-    void* user_data; 
-    int with_comments; 
-    xmlOutputBufferPtr buf; 
- 
-    /* position in the XML document */ 
-    xmlC14NPosition pos; 
-    int parent_is_doc; 
-    xmlC14NVisibleNsStackPtr ns_rendered; 
- 
-    /* C14N mode */ 
-    xmlC14NMode mode; 
- 
-    /* exclusive canonicalization */ 
-    xmlChar **inclusive_ns_prefixes; 
- 
-    /* error number */ 
-    int error; 
-} xmlC14NCtx, *xmlC14NCtxPtr; 
- 
-static xmlC14NVisibleNsStackPtr	xmlC14NVisibleNsStackCreate	(void); 
-static void     xmlC14NVisibleNsStackDestroy	(xmlC14NVisibleNsStackPtr cur); 
-static void     xmlC14NVisibleNsStackAdd	    (xmlC14NVisibleNsStackPtr cur, 
-                                                 xmlNsPtr ns, 
-                                                 xmlNodePtr node); 
-static void			xmlC14NVisibleNsStackSave	(xmlC14NVisibleNsStackPtr cur, 
-								 xmlC14NVisibleNsStackPtr state); 
-static void			xmlC14NVisibleNsStackRestore	(xmlC14NVisibleNsStackPtr cur, 
-								 xmlC14NVisibleNsStackPtr state); 
-static void			xmlC14NVisibleNsStackShift	(xmlC14NVisibleNsStackPtr cur); 
-static int			xmlC14NVisibleNsStackFind	(xmlC14NVisibleNsStackPtr cur, 
-								 xmlNsPtr ns); 
-static int			xmlExcC14NVisibleNsStackFind	(xmlC14NVisibleNsStackPtr cur, 
-								 xmlNsPtr ns, 
-								 xmlC14NCtxPtr ctx); 
- 
+    int nsPrevEnd;          /* the end of the stack for previous visible node */
+    int nsMax;              /* size of the array as allocated */
+    xmlNsPtr	*nsTab;	    /* array of ns in no particular order */
+    xmlNodePtr	*nodeTab;   /* array of nodes in no particular order */
+} xmlC14NVisibleNsStack, *xmlC14NVisibleNsStackPtr;
+
+typedef struct _xmlC14NCtx {
+    /* input parameters */
+    xmlDocPtr doc;
+    xmlC14NIsVisibleCallback is_visible_callback;
+    void* user_data;
+    int with_comments;
+    xmlOutputBufferPtr buf;
+
+    /* position in the XML document */
+    xmlC14NPosition pos;
+    int parent_is_doc;
+    xmlC14NVisibleNsStackPtr ns_rendered;
+
+    /* C14N mode */
+    xmlC14NMode mode;
+
+    /* exclusive canonicalization */
+    xmlChar **inclusive_ns_prefixes;
+
+    /* error number */
+    int error;
+} xmlC14NCtx, *xmlC14NCtxPtr;
+
+static xmlC14NVisibleNsStackPtr	xmlC14NVisibleNsStackCreate	(void);
+static void     xmlC14NVisibleNsStackDestroy	(xmlC14NVisibleNsStackPtr cur);
+static void     xmlC14NVisibleNsStackAdd	    (xmlC14NVisibleNsStackPtr cur,
+                                                 xmlNsPtr ns,
+                                                 xmlNodePtr node);
+static void			xmlC14NVisibleNsStackSave	(xmlC14NVisibleNsStackPtr cur,
+								 xmlC14NVisibleNsStackPtr state);
+static void			xmlC14NVisibleNsStackRestore	(xmlC14NVisibleNsStackPtr cur,
+								 xmlC14NVisibleNsStackPtr state);
+static void			xmlC14NVisibleNsStackShift	(xmlC14NVisibleNsStackPtr cur);
+static int			xmlC14NVisibleNsStackFind	(xmlC14NVisibleNsStackPtr cur,
+								 xmlNsPtr ns);
+static int			xmlExcC14NVisibleNsStackFind	(xmlC14NVisibleNsStackPtr cur,
+								 xmlNsPtr ns,
+								 xmlC14NCtxPtr ctx);
+
 static int			xmlC14NIsNodeInNodeset		(void *user_data,
-								 xmlNodePtr node, 
-								 xmlNodePtr parent); 
- 
- 
- 
-static int xmlC14NProcessNode(xmlC14NCtxPtr ctx, xmlNodePtr cur); 
-static int xmlC14NProcessNodeList(xmlC14NCtxPtr ctx, xmlNodePtr cur); 
-typedef enum { 
-    XMLC14N_NORMALIZE_ATTR = 0, 
-    XMLC14N_NORMALIZE_COMMENT = 1, 
-    XMLC14N_NORMALIZE_PI = 2, 
-    XMLC14N_NORMALIZE_TEXT = 3 
-} xmlC14NNormalizationMode; 
- 
-static xmlChar *xmlC11NNormalizeString(const xmlChar * input, 
-                                       xmlC14NNormalizationMode mode); 
- 
-#define	xmlC11NNormalizeAttr( a ) \ 
-    xmlC11NNormalizeString((a), XMLC14N_NORMALIZE_ATTR) 
-#define	xmlC11NNormalizeComment( a ) \ 
-    xmlC11NNormalizeString((a), XMLC14N_NORMALIZE_COMMENT) 
-#define	xmlC11NNormalizePI( a )	\ 
-    xmlC11NNormalizeString((a), XMLC14N_NORMALIZE_PI) 
-#define	xmlC11NNormalizeText( a ) \ 
-    xmlC11NNormalizeString((a), XMLC14N_NORMALIZE_TEXT) 
- 
-#define	xmlC14NIsVisible( ctx, node, parent ) \ 
-     (((ctx)->is_visible_callback != NULL) ? \ 
-	(ctx)->is_visible_callback((ctx)->user_data, \ 
-		(xmlNodePtr)(node), (xmlNodePtr)(parent)) : 1) 
- 
-#define	xmlC14NIsExclusive( ctx ) \ 
-    ( (ctx)->mode == XML_C14N_EXCLUSIVE_1_0 ) 
- 
-/************************************************************************ 
- *									* 
- *		Some factorized error routines				* 
- *									* 
- ************************************************************************/ 
- 
-/** 
- * xmlC14NErrMemory: 
- * @extra:  extra informations 
- * 
- * Handle a redefinition of memory error 
- */ 
-static void 
-xmlC14NErrMemory(const char *extra) 
-{ 
-    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N, 
-		    XML_ERR_NO_MEMORY, XML_ERR_ERROR, NULL, 0, extra, 
-		    NULL, NULL, 0, 0, 
-		    "Memory allocation failed : %s\n", extra); 
-} 
- 
-/** 
- * xmlC14NErrParam: 
- * @extra:  extra informations 
- * 
- * Handle a redefinition of param error 
- */ 
-static void 
-xmlC14NErrParam(const char *extra) 
-{ 
-    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N, 
-		    XML_ERR_INTERNAL_ERROR, XML_ERR_ERROR, NULL, 0, extra, 
-		    NULL, NULL, 0, 0, 
-		    "Invalid parameter : %s\n", extra); 
-} 
- 
-/** 
- * xmlC14NErrInternal: 
- * @extra:  extra informations 
- * 
- * Handle a redefinition of internal error 
- */ 
-static void 
-xmlC14NErrInternal(const char *extra) 
-{ 
-    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N, 
-		    XML_ERR_INTERNAL_ERROR, XML_ERR_ERROR, NULL, 0, extra, 
-		    NULL, NULL, 0, 0, 
-		    "Internal error : %s\n", extra); 
-} 
- 
-/** 
- * xmlC14NErrInvalidNode: 
- * @extra:  extra informations 
- * 
- * Handle a redefinition of invalid node error 
- */ 
-static void 
-xmlC14NErrInvalidNode(const char *node_type, const char *extra) 
-{ 
-    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N, 
-		    XML_C14N_INVALID_NODE, XML_ERR_ERROR, NULL, 0, extra, 
-		    NULL, NULL, 0, 0, 
-		    "Node %s is invalid here : %s\n", node_type, extra); 
-} 
- 
-/** 
- * xmlC14NErrUnknownNode: 
- * @extra:  extra informations 
- * 
- * Handle a redefinition of unknown node error 
- */ 
-static void 
-xmlC14NErrUnknownNode(int node_type, const char *extra) 
-{ 
-    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N, 
-		    XML_C14N_UNKNOW_NODE, XML_ERR_ERROR, NULL, 0, extra, 
-		    NULL, NULL, 0, 0, 
-		    "Unknown node type %d found : %s\n", node_type, extra); 
-} 
- 
-/** 
- * xmlC14NErrRelativeNamespace: 
- * @extra:  extra informations 
- * 
- * Handle a redefinition of relative namespace error 
- */ 
-static void 
-xmlC14NErrRelativeNamespace(const char *ns_uri) 
-{ 
-    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N, 
-		    XML_C14N_RELATIVE_NAMESPACE, XML_ERR_ERROR, NULL, 0, NULL, 
-		    NULL, NULL, 0, 0, 
-		    "Relative namespace UR is invalid here : %s\n", ns_uri); 
-} 
- 
- 
- 
-/** 
- * xmlC14NErr: 
- * @ctxt:  a C14N evaluation context 
- * @node:  the context node 
+								 xmlNodePtr node,
+								 xmlNodePtr parent);
+
+
+
+static int xmlC14NProcessNode(xmlC14NCtxPtr ctx, xmlNodePtr cur);
+static int xmlC14NProcessNodeList(xmlC14NCtxPtr ctx, xmlNodePtr cur);
+typedef enum {
+    XMLC14N_NORMALIZE_ATTR = 0,
+    XMLC14N_NORMALIZE_COMMENT = 1,
+    XMLC14N_NORMALIZE_PI = 2,
+    XMLC14N_NORMALIZE_TEXT = 3
+} xmlC14NNormalizationMode;
+
+static xmlChar *xmlC11NNormalizeString(const xmlChar * input,
+                                       xmlC14NNormalizationMode mode);
+
+#define	xmlC11NNormalizeAttr( a ) \
+    xmlC11NNormalizeString((a), XMLC14N_NORMALIZE_ATTR)
+#define	xmlC11NNormalizeComment( a ) \
+    xmlC11NNormalizeString((a), XMLC14N_NORMALIZE_COMMENT)
+#define	xmlC11NNormalizePI( a )	\
+    xmlC11NNormalizeString((a), XMLC14N_NORMALIZE_PI)
+#define	xmlC11NNormalizeText( a ) \
+    xmlC11NNormalizeString((a), XMLC14N_NORMALIZE_TEXT)
+
+#define	xmlC14NIsVisible( ctx, node, parent ) \
+     (((ctx)->is_visible_callback != NULL) ? \
+	(ctx)->is_visible_callback((ctx)->user_data, \
+		(xmlNodePtr)(node), (xmlNodePtr)(parent)) : 1)
+
+#define	xmlC14NIsExclusive( ctx ) \
+    ( (ctx)->mode == XML_C14N_EXCLUSIVE_1_0 )
+
+/************************************************************************
+ *									*
+ *		Some factorized error routines				*
+ *									*
+ ************************************************************************/
+
+/**
+ * xmlC14NErrMemory:
+ * @extra:  extra informations
+ *
+ * Handle a redefinition of memory error
+ */
+static void
+xmlC14NErrMemory(const char *extra)
+{
+    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N,
+		    XML_ERR_NO_MEMORY, XML_ERR_ERROR, NULL, 0, extra,
+		    NULL, NULL, 0, 0,
+		    "Memory allocation failed : %s\n", extra);
+}
+
+/**
+ * xmlC14NErrParam:
+ * @extra:  extra informations
+ *
+ * Handle a redefinition of param error
+ */
+static void
+xmlC14NErrParam(const char *extra)
+{
+    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N,
+		    XML_ERR_INTERNAL_ERROR, XML_ERR_ERROR, NULL, 0, extra,
+		    NULL, NULL, 0, 0,
+		    "Invalid parameter : %s\n", extra);
+}
+
+/**
+ * xmlC14NErrInternal:
+ * @extra:  extra informations
+ *
+ * Handle a redefinition of internal error
+ */
+static void
+xmlC14NErrInternal(const char *extra)
+{
+    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N,
+		    XML_ERR_INTERNAL_ERROR, XML_ERR_ERROR, NULL, 0, extra,
+		    NULL, NULL, 0, 0,
+		    "Internal error : %s\n", extra);
+}
+
+/**
+ * xmlC14NErrInvalidNode:
+ * @extra:  extra informations
+ *
+ * Handle a redefinition of invalid node error
+ */
+static void
+xmlC14NErrInvalidNode(const char *node_type, const char *extra)
+{
+    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N,
+		    XML_C14N_INVALID_NODE, XML_ERR_ERROR, NULL, 0, extra,
+		    NULL, NULL, 0, 0,
+		    "Node %s is invalid here : %s\n", node_type, extra);
+}
+
+/**
+ * xmlC14NErrUnknownNode:
+ * @extra:  extra informations
+ *
+ * Handle a redefinition of unknown node error
+ */
+static void
+xmlC14NErrUnknownNode(int node_type, const char *extra)
+{
+    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N,
+		    XML_C14N_UNKNOW_NODE, XML_ERR_ERROR, NULL, 0, extra,
+		    NULL, NULL, 0, 0,
+		    "Unknown node type %d found : %s\n", node_type, extra);
+}
+
+/**
+ * xmlC14NErrRelativeNamespace:
+ * @extra:  extra informations
+ *
+ * Handle a redefinition of relative namespace error
+ */
+static void
+xmlC14NErrRelativeNamespace(const char *ns_uri)
+{
+    __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_C14N,
+		    XML_C14N_RELATIVE_NAMESPACE, XML_ERR_ERROR, NULL, 0, NULL,
+		    NULL, NULL, 0, 0,
+		    "Relative namespace UR is invalid here : %s\n", ns_uri);
+}
+
+
+
+/**
+ * xmlC14NErr:
+ * @ctxt:  a C14N evaluation context
+ * @node:  the context node
  * @error:  the error code
- * @msg:  the message 
- * @extra:  extra informations 
- * 
- * Handle a redefinition of attribute error 
- */ 
-static void 
-xmlC14NErr(xmlC14NCtxPtr ctxt, xmlNodePtr node, int error, 
-           const char * msg) 
-{ 
-    if (ctxt != NULL) 
-        ctxt->error = error; 
-    __xmlRaiseError(NULL, NULL, NULL, 
-		    ctxt, node, XML_FROM_C14N, error, 
-		    XML_ERR_ERROR, NULL, 0, 
-		    NULL, NULL, NULL, 0, 0, "%s", msg); 
-} 
- 
-/************************************************************************ 
- *									* 
- *		The implementation internals				* 
- *									* 
- ************************************************************************/ 
-#define XML_NAMESPACES_DEFAULT		16 
- 
-static int 
+ * @msg:  the message
+ * @extra:  extra informations
+ *
+ * Handle a redefinition of attribute error
+ */
+static void
+xmlC14NErr(xmlC14NCtxPtr ctxt, xmlNodePtr node, int error,
+           const char * msg)
+{
+    if (ctxt != NULL)
+        ctxt->error = error;
+    __xmlRaiseError(NULL, NULL, NULL,
+		    ctxt, node, XML_FROM_C14N, error,
+		    XML_ERR_ERROR, NULL, 0,
+		    NULL, NULL, NULL, 0, 0, "%s", msg);
+}
+
+/************************************************************************
+ *									*
+ *		The implementation internals				*
+ *									*
+ ************************************************************************/
+#define XML_NAMESPACES_DEFAULT		16
+
+static int
 xmlC14NIsNodeInNodeset(void *user_data, xmlNodePtr node, xmlNodePtr parent) {
     xmlNodeSetPtr nodes = (xmlNodeSetPtr) user_data;
-    if((nodes != NULL) && (node != NULL)) { 
-	if(node->type != XML_NAMESPACE_DECL) { 
-	    return(xmlXPathNodeSetContains(nodes, node)); 
-	} else { 
-	    xmlNs ns; 
- 
-	    memcpy(&ns, node, sizeof(ns)); 
- 
-	    /* this is a libxml hack! check xpath.c for details */ 
-	    if((parent != NULL) && (parent->type == XML_ATTRIBUTE_NODE)) { 
-		ns.next = (xmlNsPtr)parent->parent; 
-	    } else { 
-		ns.next = (xmlNsPtr)parent; 
-	    } 
- 
-	    /* 
-	     * If the input is an XPath node-set, then the node-set must explicitly 
-	     * contain every node to be rendered to the canonical form. 
-	     */ 
-	    return(xmlXPathNodeSetContains(nodes, (xmlNodePtr)&ns)); 
-	} 
-    } 
-    return(1); 
-} 
- 
-static xmlC14NVisibleNsStackPtr 
-xmlC14NVisibleNsStackCreate(void) { 
-    xmlC14NVisibleNsStackPtr ret; 
- 
-    ret = (xmlC14NVisibleNsStackPtr) xmlMalloc(sizeof(xmlC14NVisibleNsStack)); 
-    if (ret == NULL) { 
-        xmlC14NErrMemory("creating namespaces stack"); 
-	return(NULL); 
-    } 
-    memset(ret, 0 , (size_t) sizeof(xmlC14NVisibleNsStack)); 
-    return(ret); 
-} 
- 
-static void 
-xmlC14NVisibleNsStackDestroy(xmlC14NVisibleNsStackPtr cur) { 
-    if(cur == NULL) { 
-        xmlC14NErrParam("destroying namespaces stack"); 
-        return; 
-    } 
-    if(cur->nsTab != NULL) { 
-	memset(cur->nsTab, 0, cur->nsMax * sizeof(xmlNsPtr)); 
-	xmlFree(cur->nsTab); 
-    } 
-    if(cur->nodeTab != NULL) { 
-	memset(cur->nodeTab, 0, cur->nsMax * sizeof(xmlNodePtr)); 
-	xmlFree(cur->nodeTab); 
-    } 
-    memset(cur, 0, sizeof(xmlC14NVisibleNsStack)); 
-    xmlFree(cur); 
- 
-} 
- 
-static void 
-xmlC14NVisibleNsStackAdd(xmlC14NVisibleNsStackPtr cur, xmlNsPtr ns, xmlNodePtr node) { 
-    if((cur == NULL) || 
-       ((cur->nsTab == NULL) && (cur->nodeTab != NULL)) || 
-       ((cur->nsTab != NULL) && (cur->nodeTab == NULL))) { 
-        xmlC14NErrParam("adding namespace to stack"); 
-	return; 
-    } 
- 
-    if ((cur->nsTab == NULL) && (cur->nodeTab == NULL)) { 
-        cur->nsTab = (xmlNsPtr*) xmlMalloc(XML_NAMESPACES_DEFAULT * sizeof(xmlNsPtr)); 
-        cur->nodeTab = (xmlNodePtr*) xmlMalloc(XML_NAMESPACES_DEFAULT * sizeof(xmlNodePtr)); 
-	if ((cur->nsTab == NULL) || (cur->nodeTab == NULL)) { 
-	    xmlC14NErrMemory("adding node to stack"); 
-	    return; 
-	} 
-	memset(cur->nsTab, 0 , XML_NAMESPACES_DEFAULT * sizeof(xmlNsPtr)); 
-	memset(cur->nodeTab, 0 , XML_NAMESPACES_DEFAULT * sizeof(xmlNodePtr)); 
-        cur->nsMax = XML_NAMESPACES_DEFAULT; 
-    } else if(cur->nsMax == cur->nsCurEnd) { 
-	void *tmp; 
-	int tmpSize; 
- 
-	tmpSize = 2 * cur->nsMax; 
-	tmp = xmlRealloc(cur->nsTab, tmpSize * sizeof(xmlNsPtr)); 
-	if (tmp == NULL) { 
-	    xmlC14NErrMemory("adding node to stack"); 
-	    return; 
-	} 
-	cur->nsTab = (xmlNsPtr*)tmp; 
- 
-	tmp = xmlRealloc(cur->nodeTab, tmpSize * sizeof(xmlNodePtr)); 
-	if (tmp == NULL) { 
-	    xmlC14NErrMemory("adding node to stack"); 
-	    return; 
-	} 
-	cur->nodeTab = (xmlNodePtr*)tmp; 
- 
-	cur->nsMax = tmpSize; 
-    } 
-    cur->nsTab[cur->nsCurEnd] = ns; 
-    cur->nodeTab[cur->nsCurEnd] = node; 
- 
-    ++cur->nsCurEnd; 
-} 
- 
-static void 
-xmlC14NVisibleNsStackSave(xmlC14NVisibleNsStackPtr cur, xmlC14NVisibleNsStackPtr state) { 
-    if((cur == NULL) || (state == NULL)) { 
-        xmlC14NErrParam("saving namespaces stack"); 
-	return; 
-    } 
- 
-    state->nsCurEnd = cur->nsCurEnd; 
-    state->nsPrevStart = cur->nsPrevStart; 
-    state->nsPrevEnd = cur->nsPrevEnd; 
-} 
- 
-static void 
-xmlC14NVisibleNsStackRestore(xmlC14NVisibleNsStackPtr cur, xmlC14NVisibleNsStackPtr state) { 
-    if((cur == NULL) || (state == NULL)) { 
-        xmlC14NErrParam("restoring namespaces stack"); 
-	return; 
-    } 
-    cur->nsCurEnd = state->nsCurEnd; 
-    cur->nsPrevStart = state->nsPrevStart; 
-    cur->nsPrevEnd = state->nsPrevEnd; 
-} 
- 
-static void 
-xmlC14NVisibleNsStackShift(xmlC14NVisibleNsStackPtr cur) { 
-    if(cur == NULL) { 
-        xmlC14NErrParam("shifting namespaces stack"); 
-	return; 
-    } 
-    cur->nsPrevStart = cur->nsPrevEnd; 
-    cur->nsPrevEnd = cur->nsCurEnd; 
-} 
- 
-static int 
-xmlC14NStrEqual(const xmlChar *str1, const xmlChar *str2) { 
-    if (str1 == str2) return(1); 
-    if (str1 == NULL) return((*str2) == '\0'); 
-    if (str2 == NULL) return((*str1) == '\0'); 
-    do { 
-	if (*str1++ != *str2) return(0); 
-    } while (*str2++); 
-    return(1); 
-} 
- 
-/** 
- * xmlC14NVisibleNsStackFind: 
- * @ctx:		the C14N context 
- * @ns:			the namespace to check 
- * 
- * Checks whether the given namespace was already rendered or not 
- * 
- * Returns 1 if we already wrote this namespace or 0 otherwise 
- */ 
-static int 
-xmlC14NVisibleNsStackFind(xmlC14NVisibleNsStackPtr cur, xmlNsPtr ns) 
-{ 
-    int i; 
-    const xmlChar *prefix; 
-    const xmlChar *href; 
-    int has_empty_ns; 
- 
-    if(cur == NULL) { 
-        xmlC14NErrParam("searching namespaces stack (c14n)"); 
-        return (0); 
-    } 
- 
-    /* 
-     * if the default namespace xmlns="" is not defined yet then 
-     * we do not want to print it out 
-     */ 
-    prefix = ((ns == NULL) || (ns->prefix == NULL)) ? BAD_CAST "" : ns->prefix; 
-    href = ((ns == NULL) || (ns->href == NULL)) ? BAD_CAST "" : ns->href; 
-    has_empty_ns = (xmlC14NStrEqual(prefix, NULL) && xmlC14NStrEqual(href, NULL)); 
- 
-    if (cur->nsTab != NULL) { 
-	int start = (has_empty_ns) ? 0 : cur->nsPrevStart; 
-        for (i = cur->nsCurEnd - 1; i >= start; --i) { 
-            xmlNsPtr ns1 = cur->nsTab[i]; 
- 
-	    if(xmlC14NStrEqual(prefix, (ns1 != NULL) ? ns1->prefix : NULL)) { 
-		return(xmlC14NStrEqual(href, (ns1 != NULL) ? ns1->href : NULL)); 
-	    } 
-        } 
-    } 
-    return(has_empty_ns); 
-} 
- 
-static int 
-xmlExcC14NVisibleNsStackFind(xmlC14NVisibleNsStackPtr cur, xmlNsPtr ns, xmlC14NCtxPtr ctx) { 
-    int i; 
-    const xmlChar *prefix; 
-    const xmlChar *href; 
-    int has_empty_ns; 
- 
-    if(cur == NULL) { 
-        xmlC14NErrParam("searching namespaces stack (exc c14n)"); 
-        return (0); 
-    } 
- 
-    /* 
-     * if the default namespace xmlns="" is not defined yet then 
-     * we do not want to print it out 
-     */ 
-    prefix = ((ns == NULL) || (ns->prefix == NULL)) ? BAD_CAST "" : ns->prefix; 
-    href = ((ns == NULL) || (ns->href == NULL)) ? BAD_CAST "" : ns->href; 
-    has_empty_ns = (xmlC14NStrEqual(prefix, NULL) && xmlC14NStrEqual(href, NULL)); 
- 
-    if (cur->nsTab != NULL) { 
-	int start = 0; 
-        for (i = cur->nsCurEnd - 1; i >= start; --i) { 
-            xmlNsPtr ns1 = cur->nsTab[i]; 
- 
-	    if(xmlC14NStrEqual(prefix, (ns1 != NULL) ? ns1->prefix : NULL)) { 
-		if(xmlC14NStrEqual(href, (ns1 != NULL) ? ns1->href : NULL)) { 
-		    return(xmlC14NIsVisible(ctx, ns1, cur->nodeTab[i])); 
-		} else { 
-		    return(0); 
-		} 
-	    } 
-        } 
-    } 
-    return(has_empty_ns); 
-} 
- 
- 
- 
- 
-/** 
- * xmlC14NIsXmlNs: 
- * @ns:		the namespace to check 
- * 
- * Checks whether the given namespace is a default "xml:" namespace 
- * with href="http://www.w3.org/XML/1998/namespace" 
- * 
- * Returns 1 if the node is default or 0 otherwise 
- */ 
- 
-/* todo: make it a define? */ 
-static int 
-xmlC14NIsXmlNs(xmlNsPtr ns) 
-{ 
-    return ((ns != NULL) && 
-            (xmlStrEqual(ns->prefix, BAD_CAST "xml")) && 
-            (xmlStrEqual(ns->href, XML_XML_NAMESPACE))); 
-} 
- 
- 
-/** 
- * xmlC14NNsCompare: 
- * @ns1:		the pointer to first namespace 
- * @ns2:		the pointer to second namespace 
- * 
- * Compares the namespaces by names (prefixes). 
- * 
- * Returns -1 if ns1 < ns2, 0 if ns1 == ns2 or 1 if ns1 > ns2. 
- */ 
-static int 
+    if((nodes != NULL) && (node != NULL)) {
+	if(node->type != XML_NAMESPACE_DECL) {
+	    return(xmlXPathNodeSetContains(nodes, node));
+	} else {
+	    xmlNs ns;
+
+	    memcpy(&ns, node, sizeof(ns));
+
+	    /* this is a libxml hack! check xpath.c for details */
+	    if((parent != NULL) && (parent->type == XML_ATTRIBUTE_NODE)) {
+		ns.next = (xmlNsPtr)parent->parent;
+	    } else {
+		ns.next = (xmlNsPtr)parent;
+	    }
+
+	    /*
+	     * If the input is an XPath node-set, then the node-set must explicitly
+	     * contain every node to be rendered to the canonical form.
+	     */
+	    return(xmlXPathNodeSetContains(nodes, (xmlNodePtr)&ns));
+	}
+    }
+    return(1);
+}
+
+static xmlC14NVisibleNsStackPtr
+xmlC14NVisibleNsStackCreate(void) {
+    xmlC14NVisibleNsStackPtr ret;
+
+    ret = (xmlC14NVisibleNsStackPtr) xmlMalloc(sizeof(xmlC14NVisibleNsStack));
+    if (ret == NULL) {
+        xmlC14NErrMemory("creating namespaces stack");
+	return(NULL);
+    }
+    memset(ret, 0 , (size_t) sizeof(xmlC14NVisibleNsStack));
+    return(ret);
+}
+
+static void
+xmlC14NVisibleNsStackDestroy(xmlC14NVisibleNsStackPtr cur) {
+    if(cur == NULL) {
+        xmlC14NErrParam("destroying namespaces stack");
+        return;
+    }
+    if(cur->nsTab != NULL) {
+	memset(cur->nsTab, 0, cur->nsMax * sizeof(xmlNsPtr));
+	xmlFree(cur->nsTab);
+    }
+    if(cur->nodeTab != NULL) {
+	memset(cur->nodeTab, 0, cur->nsMax * sizeof(xmlNodePtr));
+	xmlFree(cur->nodeTab);
+    }
+    memset(cur, 0, sizeof(xmlC14NVisibleNsStack));
+    xmlFree(cur);
+
+}
+
+static void
+xmlC14NVisibleNsStackAdd(xmlC14NVisibleNsStackPtr cur, xmlNsPtr ns, xmlNodePtr node) {
+    if((cur == NULL) ||
+       ((cur->nsTab == NULL) && (cur->nodeTab != NULL)) ||
+       ((cur->nsTab != NULL) && (cur->nodeTab == NULL))) {
+        xmlC14NErrParam("adding namespace to stack");
+	return;
+    }
+
+    if ((cur->nsTab == NULL) && (cur->nodeTab == NULL)) {
+        cur->nsTab = (xmlNsPtr*) xmlMalloc(XML_NAMESPACES_DEFAULT * sizeof(xmlNsPtr));
+        cur->nodeTab = (xmlNodePtr*) xmlMalloc(XML_NAMESPACES_DEFAULT * sizeof(xmlNodePtr));
+	if ((cur->nsTab == NULL) || (cur->nodeTab == NULL)) {
+	    xmlC14NErrMemory("adding node to stack");
+	    return;
+	}
+	memset(cur->nsTab, 0 , XML_NAMESPACES_DEFAULT * sizeof(xmlNsPtr));
+	memset(cur->nodeTab, 0 , XML_NAMESPACES_DEFAULT * sizeof(xmlNodePtr));
+        cur->nsMax = XML_NAMESPACES_DEFAULT;
+    } else if(cur->nsMax == cur->nsCurEnd) {
+	void *tmp;
+	int tmpSize;
+
+	tmpSize = 2 * cur->nsMax;
+	tmp = xmlRealloc(cur->nsTab, tmpSize * sizeof(xmlNsPtr));
+	if (tmp == NULL) {
+	    xmlC14NErrMemory("adding node to stack");
+	    return;
+	}
+	cur->nsTab = (xmlNsPtr*)tmp;
+
+	tmp = xmlRealloc(cur->nodeTab, tmpSize * sizeof(xmlNodePtr));
+	if (tmp == NULL) {
+	    xmlC14NErrMemory("adding node to stack");
+	    return;
+	}
+	cur->nodeTab = (xmlNodePtr*)tmp;
+
+	cur->nsMax = tmpSize;
+    }
+    cur->nsTab[cur->nsCurEnd] = ns;
+    cur->nodeTab[cur->nsCurEnd] = node;
+
+    ++cur->nsCurEnd;
+}
+
+static void
+xmlC14NVisibleNsStackSave(xmlC14NVisibleNsStackPtr cur, xmlC14NVisibleNsStackPtr state) {
+    if((cur == NULL) || (state == NULL)) {
+        xmlC14NErrParam("saving namespaces stack");
+	return;
+    }
+
+    state->nsCurEnd = cur->nsCurEnd;
+    state->nsPrevStart = cur->nsPrevStart;
+    state->nsPrevEnd = cur->nsPrevEnd;
+}
+
+static void
+xmlC14NVisibleNsStackRestore(xmlC14NVisibleNsStackPtr cur, xmlC14NVisibleNsStackPtr state) {
+    if((cur == NULL) || (state == NULL)) {
+        xmlC14NErrParam("restoring namespaces stack");
+	return;
+    }
+    cur->nsCurEnd = state->nsCurEnd;
+    cur->nsPrevStart = state->nsPrevStart;
+    cur->nsPrevEnd = state->nsPrevEnd;
+}
+
+static void
+xmlC14NVisibleNsStackShift(xmlC14NVisibleNsStackPtr cur) {
+    if(cur == NULL) {
+        xmlC14NErrParam("shifting namespaces stack");
+	return;
+    }
+    cur->nsPrevStart = cur->nsPrevEnd;
+    cur->nsPrevEnd = cur->nsCurEnd;
+}
+
+static int
+xmlC14NStrEqual(const xmlChar *str1, const xmlChar *str2) {
+    if (str1 == str2) return(1);
+    if (str1 == NULL) return((*str2) == '\0');
+    if (str2 == NULL) return((*str1) == '\0');
+    do {
+	if (*str1++ != *str2) return(0);
+    } while (*str2++);
+    return(1);
+}
+
+/**
+ * xmlC14NVisibleNsStackFind:
+ * @ctx:		the C14N context
+ * @ns:			the namespace to check
+ *
+ * Checks whether the given namespace was already rendered or not
+ *
+ * Returns 1 if we already wrote this namespace or 0 otherwise
+ */
+static int
+xmlC14NVisibleNsStackFind(xmlC14NVisibleNsStackPtr cur, xmlNsPtr ns)
+{
+    int i;
+    const xmlChar *prefix;
+    const xmlChar *href;
+    int has_empty_ns;
+
+    if(cur == NULL) {
+        xmlC14NErrParam("searching namespaces stack (c14n)");
+        return (0);
+    }
+
+    /*
+     * if the default namespace xmlns="" is not defined yet then
+     * we do not want to print it out
+     */
+    prefix = ((ns == NULL) || (ns->prefix == NULL)) ? BAD_CAST "" : ns->prefix;
+    href = ((ns == NULL) || (ns->href == NULL)) ? BAD_CAST "" : ns->href;
+    has_empty_ns = (xmlC14NStrEqual(prefix, NULL) && xmlC14NStrEqual(href, NULL));
+
+    if (cur->nsTab != NULL) {
+	int start = (has_empty_ns) ? 0 : cur->nsPrevStart;
+        for (i = cur->nsCurEnd - 1; i >= start; --i) {
+            xmlNsPtr ns1 = cur->nsTab[i];
+
+	    if(xmlC14NStrEqual(prefix, (ns1 != NULL) ? ns1->prefix : NULL)) {
+		return(xmlC14NStrEqual(href, (ns1 != NULL) ? ns1->href : NULL));
+	    }
+        }
+    }
+    return(has_empty_ns);
+}
+
+static int
+xmlExcC14NVisibleNsStackFind(xmlC14NVisibleNsStackPtr cur, xmlNsPtr ns, xmlC14NCtxPtr ctx) {
+    int i;
+    const xmlChar *prefix;
+    const xmlChar *href;
+    int has_empty_ns;
+
+    if(cur == NULL) {
+        xmlC14NErrParam("searching namespaces stack (exc c14n)");
+        return (0);
+    }
+
+    /*
+     * if the default namespace xmlns="" is not defined yet then
+     * we do not want to print it out
+     */
+    prefix = ((ns == NULL) || (ns->prefix == NULL)) ? BAD_CAST "" : ns->prefix;
+    href = ((ns == NULL) || (ns->href == NULL)) ? BAD_CAST "" : ns->href;
+    has_empty_ns = (xmlC14NStrEqual(prefix, NULL) && xmlC14NStrEqual(href, NULL));
+
+    if (cur->nsTab != NULL) {
+	int start = 0;
+        for (i = cur->nsCurEnd - 1; i >= start; --i) {
+            xmlNsPtr ns1 = cur->nsTab[i];
+
+	    if(xmlC14NStrEqual(prefix, (ns1 != NULL) ? ns1->prefix : NULL)) {
+		if(xmlC14NStrEqual(href, (ns1 != NULL) ? ns1->href : NULL)) {
+		    return(xmlC14NIsVisible(ctx, ns1, cur->nodeTab[i]));
+		} else {
+		    return(0);
+		}
+	    }
+        }
+    }
+    return(has_empty_ns);
+}
+
+
+
+
+/**
+ * xmlC14NIsXmlNs:
+ * @ns:		the namespace to check
+ *
+ * Checks whether the given namespace is a default "xml:" namespace
+ * with href="http://www.w3.org/XML/1998/namespace"
+ *
+ * Returns 1 if the node is default or 0 otherwise
+ */
+
+/* todo: make it a define? */
+static int
+xmlC14NIsXmlNs(xmlNsPtr ns)
+{
+    return ((ns != NULL) &&
+            (xmlStrEqual(ns->prefix, BAD_CAST "xml")) &&
+            (xmlStrEqual(ns->href, XML_XML_NAMESPACE)));
+}
+
+
+/**
+ * xmlC14NNsCompare:
+ * @ns1:		the pointer to first namespace
+ * @ns2:		the pointer to second namespace
+ *
+ * Compares the namespaces by names (prefixes).
+ *
+ * Returns -1 if ns1 < ns2, 0 if ns1 == ns2 or 1 if ns1 > ns2.
+ */
+static int
 xmlC14NNsCompare(const void *data1, const void *data2)
-{ 
+{
     const xmlNsPtr ns1 = (const xmlNsPtr) data1;
     const xmlNsPtr ns2 = (const xmlNsPtr) data2;
-    if (ns1 == ns2) 
-        return (0); 
-    if (ns1 == NULL) 
-        return (-1); 
-    if (ns2 == NULL) 
-        return (1); 
- 
-    return (xmlStrcmp(ns1->prefix, ns2->prefix)); 
-} 
- 
- 
-/** 
- * xmlC14NPrintNamespaces: 
- * @ns:			the pointer to namespace 
- * @ctx:		the C14N context 
- * 
- * Prints the given namespace to the output buffer from C14N context. 
- * 
- * Returns 1 on success or 0 on fail. 
- */ 
-static int 
-xmlC14NPrintNamespaces(const xmlNsPtr ns, xmlC14NCtxPtr ctx) 
-{ 
- 
-    if ((ns == NULL) || (ctx == NULL)) { 
-        xmlC14NErrParam("writing namespaces"); 
-        return 0; 
-    } 
- 
-    if (ns->prefix != NULL) { 
-        xmlOutputBufferWriteString(ctx->buf, " xmlns:"); 
-        xmlOutputBufferWriteString(ctx->buf, (const char *) ns->prefix); 
-        xmlOutputBufferWriteString(ctx->buf, "="); 
-    } else { 
-        xmlOutputBufferWriteString(ctx->buf, " xmlns="); 
-    } 
-    if(ns->href != NULL) { 
-	xmlBufWriteQuotedString(ctx->buf->buffer, ns->href); 
-    } else { 
-    	xmlOutputBufferWriteString(ctx->buf, "\"\""); 
-    } 
-    return (1); 
-} 
- 
+    if (ns1 == ns2)
+        return (0);
+    if (ns1 == NULL)
+        return (-1);
+    if (ns2 == NULL)
+        return (1);
+
+    return (xmlStrcmp(ns1->prefix, ns2->prefix));
+}
+
+
+/**
+ * xmlC14NPrintNamespaces:
+ * @ns:			the pointer to namespace
+ * @ctx:		the C14N context
+ *
+ * Prints the given namespace to the output buffer from C14N context.
+ *
+ * Returns 1 on success or 0 on fail.
+ */
+static int
+xmlC14NPrintNamespaces(const xmlNsPtr ns, xmlC14NCtxPtr ctx)
+{
+
+    if ((ns == NULL) || (ctx == NULL)) {
+        xmlC14NErrParam("writing namespaces");
+        return 0;
+    }
+
+    if (ns->prefix != NULL) {
+        xmlOutputBufferWriteString(ctx->buf, " xmlns:");
+        xmlOutputBufferWriteString(ctx->buf, (const char *) ns->prefix);
+        xmlOutputBufferWriteString(ctx->buf, "=");
+    } else {
+        xmlOutputBufferWriteString(ctx->buf, " xmlns=");
+    }
+    if(ns->href != NULL) {
+	xmlBufWriteQuotedString(ctx->buf->buffer, ns->href);
+    } else {
+    	xmlOutputBufferWriteString(ctx->buf, "\"\"");
+    }
+    return (1);
+}
+
 static int
 xmlC14NPrintNamespacesWalker(const void *ns, void *ctx) {
     return xmlC14NPrintNamespaces((const xmlNsPtr) ns, (xmlC14NCtxPtr) ctx);
 }
 
-/** 
- * xmlC14NProcessNamespacesAxis: 
- * @ctx:		the C14N context 
- * @node:		the current node 
- * 
- * Prints out canonical namespace axis of the current node to the 
- * buffer from C14N context as follows 
- * 
- * Canonical XML v 1.0 (http://www.w3.org/TR/xml-c14n) 
- * 
- * Namespace Axis 
- * Consider a list L containing only namespace nodes in the 
- * axis and in the node-set in lexicographic order (ascending). To begin 
- * processing L, if the first node is not the default namespace node (a node 
- * with no namespace URI and no local name), then generate a space followed 
- * by xmlns="" if and only if the following conditions are met: 
- *    - the element E that owns the axis is in the node-set 
- *    - The nearest ancestor element of E in the node-set has a default 
- *	    namespace node in the node-set (default namespace nodes always 
- *      have non-empty values in XPath) 
- * The latter condition eliminates unnecessary occurrences of xmlns="" in 
- * the canonical form since an element only receives an xmlns="" if its 
- * default namespace is empty and if it has an immediate parent in the 
- * canonical form that has a non-empty default namespace. To finish 
- * processing  L, simply process every namespace node in L, except omit 
- * namespace node with local name xml, which defines the xml prefix, 
- * if its string value is http://www.w3.org/XML/1998/namespace. 
- * 
- * Exclusive XML Canonicalization v 1.0 (http://www.w3.org/TR/xml-exc-c14n) 
- * Canonical XML applied to a document subset requires the search of the 
- * ancestor nodes of each orphan element node for attributes in the xml 
- * namespace, such as xml:lang and xml:space. These are copied into the 
- * element node except if a declaration of the same attribute is already 
- * in the attribute axis of the element (whether or not it is included in 
- * the document subset). This search and copying are omitted from the 
- * Exclusive XML Canonicalization method. 
- * 
- * Returns 0 on success or -1 on fail. 
- */ 
-static int 
-xmlC14NProcessNamespacesAxis(xmlC14NCtxPtr ctx, xmlNodePtr cur, int visible) 
-{ 
-    xmlNodePtr n; 
-    xmlNsPtr ns, tmp; 
-    xmlListPtr list; 
-    int already_rendered; 
-    int has_empty_ns = 0; 
- 
-    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) { 
-        xmlC14NErrParam("processing namespaces axis (c14n)"); 
-        return (-1); 
-    } 
- 
-    /* 
-     * Create a sorted list to store element namespaces 
-     */ 
+/**
+ * xmlC14NProcessNamespacesAxis:
+ * @ctx:		the C14N context
+ * @node:		the current node
+ *
+ * Prints out canonical namespace axis of the current node to the
+ * buffer from C14N context as follows
+ *
+ * Canonical XML v 1.0 (http://www.w3.org/TR/xml-c14n)
+ *
+ * Namespace Axis
+ * Consider a list L containing only namespace nodes in the
+ * axis and in the node-set in lexicographic order (ascending). To begin
+ * processing L, if the first node is not the default namespace node (a node
+ * with no namespace URI and no local name), then generate a space followed
+ * by xmlns="" if and only if the following conditions are met:
+ *    - the element E that owns the axis is in the node-set
+ *    - The nearest ancestor element of E in the node-set has a default
+ *	    namespace node in the node-set (default namespace nodes always
+ *      have non-empty values in XPath)
+ * The latter condition eliminates unnecessary occurrences of xmlns="" in
+ * the canonical form since an element only receives an xmlns="" if its
+ * default namespace is empty and if it has an immediate parent in the
+ * canonical form that has a non-empty default namespace. To finish
+ * processing  L, simply process every namespace node in L, except omit
+ * namespace node with local name xml, which defines the xml prefix,
+ * if its string value is http://www.w3.org/XML/1998/namespace.
+ *
+ * Exclusive XML Canonicalization v 1.0 (http://www.w3.org/TR/xml-exc-c14n)
+ * Canonical XML applied to a document subset requires the search of the
+ * ancestor nodes of each orphan element node for attributes in the xml
+ * namespace, such as xml:lang and xml:space. These are copied into the
+ * element node except if a declaration of the same attribute is already
+ * in the attribute axis of the element (whether or not it is included in
+ * the document subset). This search and copying are omitted from the
+ * Exclusive XML Canonicalization method.
+ *
+ * Returns 0 on success or -1 on fail.
+ */
+static int
+xmlC14NProcessNamespacesAxis(xmlC14NCtxPtr ctx, xmlNodePtr cur, int visible)
+{
+    xmlNodePtr n;
+    xmlNsPtr ns, tmp;
+    xmlListPtr list;
+    int already_rendered;
+    int has_empty_ns = 0;
+
+    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) {
+        xmlC14NErrParam("processing namespaces axis (c14n)");
+        return (-1);
+    }
+
+    /*
+     * Create a sorted list to store element namespaces
+     */
     list = xmlListCreate(NULL, xmlC14NNsCompare);
-    if (list == NULL) { 
-        xmlC14NErrInternal("creating namespaces list (c14n)"); 
-        return (-1); 
-    } 
- 
-    /* check all namespaces */ 
-    for(n = cur; n != NULL; n = n->parent) { 
-	for(ns = n->nsDef; ns != NULL; ns = ns->next) { 
-	    tmp = xmlSearchNs(cur->doc, cur, ns->prefix); 
- 
-	    if((tmp == ns) && !xmlC14NIsXmlNs(ns) && xmlC14NIsVisible(ctx, ns, cur)) { 
-		already_rendered = xmlC14NVisibleNsStackFind(ctx->ns_rendered, ns); 
-		if(visible) { 
-	    xmlC14NVisibleNsStackAdd(ctx->ns_rendered, ns, cur); 
-		} 
-		if(!already_rendered) { 
-		    xmlListInsert(list, ns); 
-		} 
-		if(xmlStrlen(ns->prefix) == 0) { 
-		    has_empty_ns = 1; 
-		} 
-	    } 
-	} 
-    } 
- 
-    /** 
-     * if the first node is not the default namespace node (a node with no 
-     * namespace URI and no local name), then generate a space followed by 
-     * xmlns="" if and only if the following conditions are met: 
-     *  - the element E that owns the axis is in the node-set 
-     *  - the nearest ancestor element of E in the node-set has a default 
-     *     namespace node in the node-set (default namespace nodes always 
-     *     have non-empty values in XPath) 
-     */ 
-    if(visible && !has_empty_ns) { 
-        static xmlNs ns_default; 
- 
-        memset(&ns_default, 0, sizeof(ns_default)); 
-        if(!xmlC14NVisibleNsStackFind(ctx->ns_rendered, &ns_default)) { 
-	    xmlC14NPrintNamespaces(&ns_default, ctx); 
-	} 
-    } 
- 
- 
-    /* 
-     * print out all elements from list 
-     */ 
+    if (list == NULL) {
+        xmlC14NErrInternal("creating namespaces list (c14n)");
+        return (-1);
+    }
+
+    /* check all namespaces */
+    for(n = cur; n != NULL; n = n->parent) {
+	for(ns = n->nsDef; ns != NULL; ns = ns->next) {
+	    tmp = xmlSearchNs(cur->doc, cur, ns->prefix);
+
+	    if((tmp == ns) && !xmlC14NIsXmlNs(ns) && xmlC14NIsVisible(ctx, ns, cur)) {
+		already_rendered = xmlC14NVisibleNsStackFind(ctx->ns_rendered, ns);
+		if(visible) {
+	    xmlC14NVisibleNsStackAdd(ctx->ns_rendered, ns, cur);
+		}
+		if(!already_rendered) {
+		    xmlListInsert(list, ns);
+		}
+		if(xmlStrlen(ns->prefix) == 0) {
+		    has_empty_ns = 1;
+		}
+	    }
+	}
+    }
+
+    /**
+     * if the first node is not the default namespace node (a node with no
+     * namespace URI and no local name), then generate a space followed by
+     * xmlns="" if and only if the following conditions are met:
+     *  - the element E that owns the axis is in the node-set
+     *  - the nearest ancestor element of E in the node-set has a default
+     *     namespace node in the node-set (default namespace nodes always
+     *     have non-empty values in XPath)
+     */
+    if(visible && !has_empty_ns) {
+        static xmlNs ns_default;
+
+        memset(&ns_default, 0, sizeof(ns_default));
+        if(!xmlC14NVisibleNsStackFind(ctx->ns_rendered, &ns_default)) {
+	    xmlC14NPrintNamespaces(&ns_default, ctx);
+	}
+    }
+
+
+    /*
+     * print out all elements from list
+     */
     xmlListWalk(list, xmlC14NPrintNamespacesWalker, (void *) ctx);
- 
-    /* 
-     * Cleanup 
-     */ 
-    xmlListDelete(list); 
-    return (0); 
-} 
- 
- 
-/** 
- * xmlExcC14NProcessNamespacesAxis: 
- * @ctx:		the C14N context 
- * @node:		the current node 
- * 
- * Prints out exclusive canonical namespace axis of the current node to the 
- * buffer from C14N context as follows 
- * 
- * Exclusive XML Canonicalization 
- * http://www.w3.org/TR/xml-exc-c14n 
- * 
- * If the element node is in the XPath subset then output the node in 
- * accordance with Canonical XML except for namespace nodes which are 
- * rendered as follows: 
- * 
- * 1. Render each namespace node iff: 
- *    * it is visibly utilized by the immediate parent element or one of 
- *      its attributes, or is present in InclusiveNamespaces PrefixList, and 
- *    * its prefix and value do not appear in ns_rendered. ns_rendered is 
- *      obtained by popping the state stack in order to obtain a list of 
- *      prefixes and their values which have already been rendered by 
- *      an output ancestor of the namespace node's parent element. 
- * 2. Append the rendered namespace node to the list ns_rendered of namespace 
- * nodes rendered by output ancestors. Push ns_rendered on state stack and 
- * recurse. 
- * 3. After the recursion returns, pop thestate stack. 
- * 
- * 
- * Returns 0 on success or -1 on fail. 
- */ 
-static int 
-xmlExcC14NProcessNamespacesAxis(xmlC14NCtxPtr ctx, xmlNodePtr cur, int visible) 
-{ 
-    xmlNsPtr ns; 
-    xmlListPtr list; 
-    xmlAttrPtr attr; 
-    int already_rendered; 
-    int has_empty_ns = 0; 
-    int has_visibly_utilized_empty_ns = 0; 
-    int has_empty_ns_in_inclusive_list = 0; 
- 
-    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) { 
-        xmlC14NErrParam("processing namespaces axis (exc c14n)"); 
-        return (-1); 
-    } 
- 
-    if(!xmlC14NIsExclusive(ctx)) { 
-        xmlC14NErrParam("processing namespaces axis (exc c14n)"); 
-        return (-1); 
- 
-    } 
- 
-    /* 
-     * Create a sorted list to store element namespaces 
-     */ 
+
+    /*
+     * Cleanup
+     */
+    xmlListDelete(list);
+    return (0);
+}
+
+
+/**
+ * xmlExcC14NProcessNamespacesAxis:
+ * @ctx:		the C14N context
+ * @node:		the current node
+ *
+ * Prints out exclusive canonical namespace axis of the current node to the
+ * buffer from C14N context as follows
+ *
+ * Exclusive XML Canonicalization
+ * http://www.w3.org/TR/xml-exc-c14n
+ *
+ * If the element node is in the XPath subset then output the node in
+ * accordance with Canonical XML except for namespace nodes which are
+ * rendered as follows:
+ *
+ * 1. Render each namespace node iff:
+ *    * it is visibly utilized by the immediate parent element or one of
+ *      its attributes, or is present in InclusiveNamespaces PrefixList, and
+ *    * its prefix and value do not appear in ns_rendered. ns_rendered is
+ *      obtained by popping the state stack in order to obtain a list of
+ *      prefixes and their values which have already been rendered by
+ *      an output ancestor of the namespace node's parent element.
+ * 2. Append the rendered namespace node to the list ns_rendered of namespace
+ * nodes rendered by output ancestors. Push ns_rendered on state stack and
+ * recurse.
+ * 3. After the recursion returns, pop thestate stack.
+ *
+ *
+ * Returns 0 on success or -1 on fail.
+ */
+static int
+xmlExcC14NProcessNamespacesAxis(xmlC14NCtxPtr ctx, xmlNodePtr cur, int visible)
+{
+    xmlNsPtr ns;
+    xmlListPtr list;
+    xmlAttrPtr attr;
+    int already_rendered;
+    int has_empty_ns = 0;
+    int has_visibly_utilized_empty_ns = 0;
+    int has_empty_ns_in_inclusive_list = 0;
+
+    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) {
+        xmlC14NErrParam("processing namespaces axis (exc c14n)");
+        return (-1);
+    }
+
+    if(!xmlC14NIsExclusive(ctx)) {
+        xmlC14NErrParam("processing namespaces axis (exc c14n)");
+        return (-1);
+
+    }
+
+    /*
+     * Create a sorted list to store element namespaces
+     */
     list = xmlListCreate(NULL, xmlC14NNsCompare);
-    if (list == NULL) { 
-        xmlC14NErrInternal("creating namespaces list (exc c14n)"); 
-        return (-1); 
-    } 
- 
-    /* 
-     * process inclusive namespaces: 
-     * All namespace nodes appearing on inclusive ns list are 
-     * handled as provided in Canonical XML 
-     */ 
-    if(ctx->inclusive_ns_prefixes != NULL) { 
-	xmlChar *prefix; 
-	int i; 
- 
-	for (i = 0; ctx->inclusive_ns_prefixes[i] != NULL; ++i) { 
-	    prefix = ctx->inclusive_ns_prefixes[i]; 
-	    /* 
-	     * Special values for namespace with empty prefix 
-	     */ 
-            if (xmlStrEqual(prefix, BAD_CAST "#default") 
-                || xmlStrEqual(prefix, BAD_CAST "")) { 
-                prefix = NULL; 
-		has_empty_ns_in_inclusive_list = 1; 
-            } 
- 
-	    ns = xmlSearchNs(cur->doc, cur, prefix); 
-	    if((ns != NULL) && !xmlC14NIsXmlNs(ns) && xmlC14NIsVisible(ctx, ns, cur)) { 
-		already_rendered = xmlC14NVisibleNsStackFind(ctx->ns_rendered, ns); 
-		if(visible) { 
-		    xmlC14NVisibleNsStackAdd(ctx->ns_rendered, ns, cur); 
-		} 
-		if(!already_rendered) { 
-		    xmlListInsert(list, ns); 
-		} 
-		if(xmlStrlen(ns->prefix) == 0) { 
-		    has_empty_ns = 1; 
-		} 
-	    } 
-	} 
-    } 
- 
-    /* add node namespace */ 
-    if(cur->ns != NULL) { 
-	ns = cur->ns; 
-    } else { 
-        ns = xmlSearchNs(cur->doc, cur, NULL); 
-	has_visibly_utilized_empty_ns = 1; 
-    } 
-    if((ns != NULL) && !xmlC14NIsXmlNs(ns)) { 
-	if(visible && xmlC14NIsVisible(ctx, ns, cur)) { 
-	    if(!xmlExcC14NVisibleNsStackFind(ctx->ns_rendered, ns, ctx)) { 
-		xmlListInsert(list, ns); 
-	    } 
-	} 
-	if(visible) { 
-	    xmlC14NVisibleNsStackAdd(ctx->ns_rendered, ns, cur); 
-	} 
-	if(xmlStrlen(ns->prefix) == 0) { 
-	    has_empty_ns = 1; 
-	} 
-    } 
- 
- 
-    /* add attributes */ 
-    for(attr = cur->properties; attr != NULL; attr = attr->next) { 
-        /* 
-         * we need to check that attribute is visible and has non 
-         * default namespace (XML Namespaces: "default namespaces 
-	 * do not apply directly to attributes") 
-         */ 
-	if((attr->ns != NULL) && !xmlC14NIsXmlNs(attr->ns) && xmlC14NIsVisible(ctx, attr, cur)) { 
-	    already_rendered = xmlExcC14NVisibleNsStackFind(ctx->ns_rendered, attr->ns, ctx); 
-	    xmlC14NVisibleNsStackAdd(ctx->ns_rendered, attr->ns, cur); 
-	    if(!already_rendered && visible) { 
-		xmlListInsert(list, attr->ns); 
-	    } 
-	    if(xmlStrlen(attr->ns->prefix) == 0) { 
-		has_empty_ns = 1; 
-	    } 
-	} else if((attr->ns != NULL) && (xmlStrlen(attr->ns->prefix) == 0) && (xmlStrlen(attr->ns->href) == 0)) { 
-	    has_visibly_utilized_empty_ns = 1; 
-	} 
-    } 
- 
-    /* 
-     * Process xmlns="" 
-     */ 
-    if(visible && has_visibly_utilized_empty_ns && 
-	    !has_empty_ns && !has_empty_ns_in_inclusive_list) { 
-        static xmlNs ns_default; 
- 
-        memset(&ns_default, 0, sizeof(ns_default)); 
- 
-        already_rendered = xmlExcC14NVisibleNsStackFind(ctx->ns_rendered, &ns_default, ctx); 
-	if(!already_rendered) { 
-	    xmlC14NPrintNamespaces(&ns_default, ctx); 
-	} 
-    } else if(visible && !has_empty_ns && has_empty_ns_in_inclusive_list) { 
-        static xmlNs ns_default; 
- 
-        memset(&ns_default, 0, sizeof(ns_default)); 
-        if(!xmlC14NVisibleNsStackFind(ctx->ns_rendered, &ns_default)) { 
-	    xmlC14NPrintNamespaces(&ns_default, ctx); 
-	} 
-    } 
- 
- 
- 
-    /* 
-     * print out all elements from list 
-     */ 
+    if (list == NULL) {
+        xmlC14NErrInternal("creating namespaces list (exc c14n)");
+        return (-1);
+    }
+
+    /*
+     * process inclusive namespaces:
+     * All namespace nodes appearing on inclusive ns list are
+     * handled as provided in Canonical XML
+     */
+    if(ctx->inclusive_ns_prefixes != NULL) {
+	xmlChar *prefix;
+	int i;
+
+	for (i = 0; ctx->inclusive_ns_prefixes[i] != NULL; ++i) {
+	    prefix = ctx->inclusive_ns_prefixes[i];
+	    /*
+	     * Special values for namespace with empty prefix
+	     */
+            if (xmlStrEqual(prefix, BAD_CAST "#default")
+                || xmlStrEqual(prefix, BAD_CAST "")) {
+                prefix = NULL;
+		has_empty_ns_in_inclusive_list = 1;
+            }
+
+	    ns = xmlSearchNs(cur->doc, cur, prefix);
+	    if((ns != NULL) && !xmlC14NIsXmlNs(ns) && xmlC14NIsVisible(ctx, ns, cur)) {
+		already_rendered = xmlC14NVisibleNsStackFind(ctx->ns_rendered, ns);
+		if(visible) {
+		    xmlC14NVisibleNsStackAdd(ctx->ns_rendered, ns, cur);
+		}
+		if(!already_rendered) {
+		    xmlListInsert(list, ns);
+		}
+		if(xmlStrlen(ns->prefix) == 0) {
+		    has_empty_ns = 1;
+		}
+	    }
+	}
+    }
+
+    /* add node namespace */
+    if(cur->ns != NULL) {
+	ns = cur->ns;
+    } else {
+        ns = xmlSearchNs(cur->doc, cur, NULL);
+	has_visibly_utilized_empty_ns = 1;
+    }
+    if((ns != NULL) && !xmlC14NIsXmlNs(ns)) {
+	if(visible && xmlC14NIsVisible(ctx, ns, cur)) {
+	    if(!xmlExcC14NVisibleNsStackFind(ctx->ns_rendered, ns, ctx)) {
+		xmlListInsert(list, ns);
+	    }
+	}
+	if(visible) {
+	    xmlC14NVisibleNsStackAdd(ctx->ns_rendered, ns, cur);
+	}
+	if(xmlStrlen(ns->prefix) == 0) {
+	    has_empty_ns = 1;
+	}
+    }
+
+
+    /* add attributes */
+    for(attr = cur->properties; attr != NULL; attr = attr->next) {
+        /*
+         * we need to check that attribute is visible and has non
+         * default namespace (XML Namespaces: "default namespaces
+	 * do not apply directly to attributes")
+         */
+	if((attr->ns != NULL) && !xmlC14NIsXmlNs(attr->ns) && xmlC14NIsVisible(ctx, attr, cur)) {
+	    already_rendered = xmlExcC14NVisibleNsStackFind(ctx->ns_rendered, attr->ns, ctx);
+	    xmlC14NVisibleNsStackAdd(ctx->ns_rendered, attr->ns, cur);
+	    if(!already_rendered && visible) {
+		xmlListInsert(list, attr->ns);
+	    }
+	    if(xmlStrlen(attr->ns->prefix) == 0) {
+		has_empty_ns = 1;
+	    }
+	} else if((attr->ns != NULL) && (xmlStrlen(attr->ns->prefix) == 0) && (xmlStrlen(attr->ns->href) == 0)) {
+	    has_visibly_utilized_empty_ns = 1;
+	}
+    }
+
+    /*
+     * Process xmlns=""
+     */
+    if(visible && has_visibly_utilized_empty_ns &&
+	    !has_empty_ns && !has_empty_ns_in_inclusive_list) {
+        static xmlNs ns_default;
+
+        memset(&ns_default, 0, sizeof(ns_default));
+
+        already_rendered = xmlExcC14NVisibleNsStackFind(ctx->ns_rendered, &ns_default, ctx);
+	if(!already_rendered) {
+	    xmlC14NPrintNamespaces(&ns_default, ctx);
+	}
+    } else if(visible && !has_empty_ns && has_empty_ns_in_inclusive_list) {
+        static xmlNs ns_default;
+
+        memset(&ns_default, 0, sizeof(ns_default));
+        if(!xmlC14NVisibleNsStackFind(ctx->ns_rendered, &ns_default)) {
+	    xmlC14NPrintNamespaces(&ns_default, ctx);
+	}
+    }
+
+
+
+    /*
+     * print out all elements from list
+     */
     xmlListWalk(list, xmlC14NPrintNamespacesWalker, (void *) ctx);
- 
-    /* 
-     * Cleanup 
-     */ 
-    xmlListDelete(list); 
-    return (0); 
-} 
- 
- 
-/** 
- * xmlC14NIsXmlAttr: 
- * @attr:		the attr to check 
- * 
- * Checks whether the given attribute is a default "xml:" namespace 
- * with href="http://www.w3.org/XML/1998/namespace" 
- * 
- * Returns 1 if the node is default or 0 otherwise 
- */ 
- 
-/* todo: make it a define? */ 
-static int 
-xmlC14NIsXmlAttr(xmlAttrPtr attr) 
-{ 
-    return ((attr->ns != NULL) && 
-           (xmlC14NIsXmlNs(attr->ns) != 0)); 
-} 
- 
- 
-/** 
- * xmlC14NAttrsCompare: 
- * @attr1:		the pointer tls o first attr 
- * @attr2:		the pointer to second attr 
- * 
- * Prints the given attribute to the output buffer from C14N context. 
- * 
- * Returns -1 if attr1 < attr2, 0 if attr1 == attr2 or 1 if attr1 > attr2. 
- */ 
-static int 
+
+    /*
+     * Cleanup
+     */
+    xmlListDelete(list);
+    return (0);
+}
+
+
+/**
+ * xmlC14NIsXmlAttr:
+ * @attr:		the attr to check
+ *
+ * Checks whether the given attribute is a default "xml:" namespace
+ * with href="http://www.w3.org/XML/1998/namespace"
+ *
+ * Returns 1 if the node is default or 0 otherwise
+ */
+
+/* todo: make it a define? */
+static int
+xmlC14NIsXmlAttr(xmlAttrPtr attr)
+{
+    return ((attr->ns != NULL) &&
+           (xmlC14NIsXmlNs(attr->ns) != 0));
+}
+
+
+/**
+ * xmlC14NAttrsCompare:
+ * @attr1:		the pointer tls o first attr
+ * @attr2:		the pointer to second attr
+ *
+ * Prints the given attribute to the output buffer from C14N context.
+ *
+ * Returns -1 if attr1 < attr2, 0 if attr1 == attr2 or 1 if attr1 > attr2.
+ */
+static int
 xmlC14NAttrsCompare(const void *data1, const void *data2)
-{ 
+{
     const xmlAttrPtr attr1 = (const xmlAttrPtr) data1;
     const xmlAttrPtr attr2 = (const xmlAttrPtr) data2;
-    int ret = 0; 
- 
-    /* 
-     * Simple cases 
-     */ 
-    if (attr1 == attr2) 
-        return (0); 
-    if (attr1 == NULL) 
-        return (-1); 
-    if (attr2 == NULL) 
-        return (1); 
-    if (attr1->ns == attr2->ns) { 
-        return (xmlStrcmp(attr1->name, attr2->name)); 
-    } 
- 
-    /* 
-     * Attributes in the default namespace are first 
-     * because the default namespace is not applied to 
-     * unqualified attributes 
-     */ 
-    if (attr1->ns == NULL) 
-        return (-1); 
-    if (attr2->ns == NULL) 
-        return (1); 
-    if (attr1->ns->prefix == NULL) 
-        return (-1); 
-    if (attr2->ns->prefix == NULL) 
-        return (1); 
- 
-    ret = xmlStrcmp(attr1->ns->href, attr2->ns->href); 
-    if (ret == 0) { 
-        ret = xmlStrcmp(attr1->name, attr2->name); 
-    } 
-    return (ret); 
-} 
- 
- 
-/** 
- * xmlC14NPrintAttrs: 
- * @attr:		the pointer to attr 
- * @ctx:		the C14N context 
- * 
- * Prints out canonical attribute urrent node to the 
- * buffer from C14N context as follows 
- * 
- * Canonical XML v 1.0 (http://www.w3.org/TR/xml-c14n) 
- * 
- * Returns 1 on success or 0 on fail. 
- */ 
-static int 
+    int ret = 0;
+
+    /*
+     * Simple cases
+     */
+    if (attr1 == attr2)
+        return (0);
+    if (attr1 == NULL)
+        return (-1);
+    if (attr2 == NULL)
+        return (1);
+    if (attr1->ns == attr2->ns) {
+        return (xmlStrcmp(attr1->name, attr2->name));
+    }
+
+    /*
+     * Attributes in the default namespace are first
+     * because the default namespace is not applied to
+     * unqualified attributes
+     */
+    if (attr1->ns == NULL)
+        return (-1);
+    if (attr2->ns == NULL)
+        return (1);
+    if (attr1->ns->prefix == NULL)
+        return (-1);
+    if (attr2->ns->prefix == NULL)
+        return (1);
+
+    ret = xmlStrcmp(attr1->ns->href, attr2->ns->href);
+    if (ret == 0) {
+        ret = xmlStrcmp(attr1->name, attr2->name);
+    }
+    return (ret);
+}
+
+
+/**
+ * xmlC14NPrintAttrs:
+ * @attr:		the pointer to attr
+ * @ctx:		the C14N context
+ *
+ * Prints out canonical attribute urrent node to the
+ * buffer from C14N context as follows
+ *
+ * Canonical XML v 1.0 (http://www.w3.org/TR/xml-c14n)
+ *
+ * Returns 1 on success or 0 on fail.
+ */
+static int
 xmlC14NPrintAttrs(const void *data, void *user)
-{ 
+{
     const xmlAttrPtr attr = (const xmlAttrPtr) data;
     xmlC14NCtxPtr ctx = (xmlC14NCtxPtr) user;
-    xmlChar *value; 
-    xmlChar *buffer; 
- 
-    if ((attr == NULL) || (ctx == NULL)) { 
-        xmlC14NErrParam("writing attributes"); 
-        return (0); 
-    } 
- 
-    xmlOutputBufferWriteString(ctx->buf, " "); 
-    if (attr->ns != NULL && xmlStrlen(attr->ns->prefix) > 0) { 
-        xmlOutputBufferWriteString(ctx->buf, 
-                                   (const char *) attr->ns->prefix); 
-        xmlOutputBufferWriteString(ctx->buf, ":"); 
-    } 
-    xmlOutputBufferWriteString(ctx->buf, (const char *) attr->name); 
-    xmlOutputBufferWriteString(ctx->buf, "=\""); 
- 
-    value = xmlNodeListGetString(ctx->doc, attr->children, 1); 
-    /* todo: should we log an error if value==NULL ? */ 
-    if (value != NULL) { 
-        buffer = xmlC11NNormalizeAttr(value); 
-        xmlFree(value); 
-        if (buffer != NULL) { 
-            xmlOutputBufferWriteString(ctx->buf, (const char *) buffer); 
-            xmlFree(buffer); 
-        } else { 
-            xmlC14NErrInternal("normalizing attributes axis"); 
-            return (0); 
-        } 
-    } 
-    xmlOutputBufferWriteString(ctx->buf, "\""); 
-    return (1); 
-} 
- 
-/** 
- * xmlC14NFindHiddenParentAttr: 
- * 
- * Finds an attribute in a hidden parent node. 
- * 
- * Returns a pointer to the attribute node (if found) or NULL otherwise. 
- */ 
-static xmlAttrPtr 
-xmlC14NFindHiddenParentAttr(xmlC14NCtxPtr ctx, xmlNodePtr cur, const xmlChar * name, const xmlChar * ns) 
-{ 
-    xmlAttrPtr res; 
-    while((cur != NULL) && (!xmlC14NIsVisible(ctx, cur, cur->parent))) { 
-        res = xmlHasNsProp(cur, name, ns); 
-        if(res != NULL) { 
-            return res; 
-        } 
- 
-        cur = cur->parent; 
-    } 
- 
-    return NULL; 
-} 
- 
-/** 
- * xmlC14NFixupBaseAttr: 
- * 
- * Fixes up the xml:base attribute 
- * 
- * Returns the newly created attribute or NULL 
- */ 
-static xmlAttrPtr 
-xmlC14NFixupBaseAttr(xmlC14NCtxPtr ctx, xmlAttrPtr xml_base_attr) 
-{ 
-    xmlChar * res = NULL; 
-    xmlNodePtr cur; 
-    xmlAttrPtr attr; 
-    xmlChar * tmp_str; 
-    xmlChar * tmp_str2; 
-    int tmp_str_len; 
- 
-    if ((ctx == NULL) || (xml_base_attr == NULL) || (xml_base_attr->parent == NULL)) { 
-        xmlC14NErrParam("processing xml:base attribute"); 
-        return (NULL); 
-    } 
- 
-    /* start from current value */ 
-    res = xmlNodeListGetString(ctx->doc, xml_base_attr->children, 1); 
-    if(res == NULL) { 
-        xmlC14NErrInternal("processing xml:base attribute - can't get attr value"); 
-        return (NULL); 
-    } 
- 
-    /* go up the stack until we find a node that we rendered already */ 
-    cur = xml_base_attr->parent->parent; 
-    while((cur != NULL) && (!xmlC14NIsVisible(ctx, cur, cur->parent))) { 
-        attr = xmlHasNsProp(cur, BAD_CAST "base", XML_XML_NAMESPACE); 
-        if(attr != NULL) { 
-            /* get attr value */ 
-            tmp_str = xmlNodeListGetString(ctx->doc, attr->children, 1); 
-            if(tmp_str == NULL) { 
-                xmlFree(res); 
- 
-                xmlC14NErrInternal("processing xml:base attribute - can't get attr value"); 
-                return (NULL); 
-            } 
- 
-            /* we need to add '/' if our current base uri ends with '..' or '.' 
-            to ensure that we are forced to go "up" all the time */ 
-            tmp_str_len = xmlStrlen(tmp_str); 
-            if(tmp_str_len > 1 && tmp_str[tmp_str_len - 2] == '.') { 
-                tmp_str2 = xmlStrcat(tmp_str, BAD_CAST "/"); 
-                if(tmp_str2 == NULL) { 
-                    xmlFree(tmp_str); 
-                    xmlFree(res); 
- 
-                    xmlC14NErrInternal("processing xml:base attribute - can't modify uri"); 
-                    return (NULL); 
-                } 
- 
-                tmp_str = tmp_str2; 
-            } 
- 
-            /* build uri */ 
-            tmp_str2 = xmlBuildURI(res, tmp_str); 
-            if(tmp_str2 == NULL) { 
-                xmlFree(tmp_str); 
-                xmlFree(res); 
- 
-                xmlC14NErrInternal("processing xml:base attribute - can't construct uri"); 
-                return (NULL); 
-            } 
- 
-            /* cleanup and set the new res */ 
-            xmlFree(tmp_str); 
-            xmlFree(res); 
-            res = tmp_str2; 
-        } 
- 
-        /* next */ 
-        cur = cur->parent; 
-    } 
- 
-    /* check if result uri is empty or not */ 
-    if((res == NULL) || xmlStrEqual(res, BAD_CAST "")) { 
-        xmlFree(res); 
-        return (NULL); 
-    } 
- 
-    /* create and return the new attribute node */ 
-    attr = xmlNewNsProp(NULL, xml_base_attr->ns, BAD_CAST "base", res); 
-    if(attr == NULL) { 
-        xmlFree(res); 
- 
-        xmlC14NErrInternal("processing xml:base attribute - can't construct attribute"); 
-        return (NULL); 
-    } 
- 
-    /* done */ 
-    xmlFree(res); 
-    return (attr); 
-} 
- 
-/** 
- * xmlC14NProcessAttrsAxis: 
- * @ctx:		the C14N context 
- * @cur:		the current node 
- * @parent_visible:	the visibility of parent node 
- * @all_parents_visible: the visibility of all parent nodes 
- * 
- * Prints out canonical attribute axis of the current node to the 
- * buffer from C14N context as follows 
- * 
- * Canonical XML v 1.0 (http://www.w3.org/TR/xml-c14n) 
- * 
- * Attribute Axis 
- * In lexicographic order (ascending), process each node that 
- * is in the element's attribute axis and in the node-set. 
- * 
- * The processing of an element node E MUST be modified slightly 
- * when an XPath node-set is given as input and the element's 
- * parent is omitted from the node-set. 
- * 
- * 
- * Exclusive XML Canonicalization v 1.0 (http://www.w3.org/TR/xml-exc-c14n) 
- * 
- * Canonical XML applied to a document subset requires the search of the 
- * ancestor nodes of each orphan element node for attributes in the xml 
- * namespace, such as xml:lang and xml:space. These are copied into the 
- * element node except if a declaration of the same attribute is already 
- * in the attribute axis of the element (whether or not it is included in 
- * the document subset). This search and copying are omitted from the 
- * Exclusive XML Canonicalization method. 
- * 
- * Returns 0 on success or -1 on fail. 
- */ 
-static int 
-xmlC14NProcessAttrsAxis(xmlC14NCtxPtr ctx, xmlNodePtr cur, int parent_visible) 
-{ 
-    xmlAttrPtr attr; 
-    xmlListPtr list; 
-    xmlAttrPtr attrs_to_delete = NULL; 
- 
-    /* special processing for 1.1 spec */ 
-    xmlAttrPtr xml_base_attr = NULL; 
-    xmlAttrPtr xml_lang_attr = NULL; 
-    xmlAttrPtr xml_space_attr = NULL; 
- 
-    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) { 
-        xmlC14NErrParam("processing attributes axis"); 
-        return (-1); 
-    } 
- 
-    /* 
-     * Create a sorted list to store element attributes 
-     */ 
+    xmlChar *value;
+    xmlChar *buffer;
+
+    if ((attr == NULL) || (ctx == NULL)) {
+        xmlC14NErrParam("writing attributes");
+        return (0);
+    }
+
+    xmlOutputBufferWriteString(ctx->buf, " ");
+    if (attr->ns != NULL && xmlStrlen(attr->ns->prefix) > 0) {
+        xmlOutputBufferWriteString(ctx->buf,
+                                   (const char *) attr->ns->prefix);
+        xmlOutputBufferWriteString(ctx->buf, ":");
+    }
+    xmlOutputBufferWriteString(ctx->buf, (const char *) attr->name);
+    xmlOutputBufferWriteString(ctx->buf, "=\"");
+
+    value = xmlNodeListGetString(ctx->doc, attr->children, 1);
+    /* todo: should we log an error if value==NULL ? */
+    if (value != NULL) {
+        buffer = xmlC11NNormalizeAttr(value);
+        xmlFree(value);
+        if (buffer != NULL) {
+            xmlOutputBufferWriteString(ctx->buf, (const char *) buffer);
+            xmlFree(buffer);
+        } else {
+            xmlC14NErrInternal("normalizing attributes axis");
+            return (0);
+        }
+    }
+    xmlOutputBufferWriteString(ctx->buf, "\"");
+    return (1);
+}
+
+/**
+ * xmlC14NFindHiddenParentAttr:
+ *
+ * Finds an attribute in a hidden parent node.
+ *
+ * Returns a pointer to the attribute node (if found) or NULL otherwise.
+ */
+static xmlAttrPtr
+xmlC14NFindHiddenParentAttr(xmlC14NCtxPtr ctx, xmlNodePtr cur, const xmlChar * name, const xmlChar * ns)
+{
+    xmlAttrPtr res;
+    while((cur != NULL) && (!xmlC14NIsVisible(ctx, cur, cur->parent))) {
+        res = xmlHasNsProp(cur, name, ns);
+        if(res != NULL) {
+            return res;
+        }
+
+        cur = cur->parent;
+    }
+
+    return NULL;
+}
+
+/**
+ * xmlC14NFixupBaseAttr:
+ *
+ * Fixes up the xml:base attribute
+ *
+ * Returns the newly created attribute or NULL
+ */
+static xmlAttrPtr
+xmlC14NFixupBaseAttr(xmlC14NCtxPtr ctx, xmlAttrPtr xml_base_attr)
+{
+    xmlChar * res = NULL;
+    xmlNodePtr cur;
+    xmlAttrPtr attr;
+    xmlChar * tmp_str;
+    xmlChar * tmp_str2;
+    int tmp_str_len;
+
+    if ((ctx == NULL) || (xml_base_attr == NULL) || (xml_base_attr->parent == NULL)) {
+        xmlC14NErrParam("processing xml:base attribute");
+        return (NULL);
+    }
+
+    /* start from current value */
+    res = xmlNodeListGetString(ctx->doc, xml_base_attr->children, 1);
+    if(res == NULL) {
+        xmlC14NErrInternal("processing xml:base attribute - can't get attr value");
+        return (NULL);
+    }
+
+    /* go up the stack until we find a node that we rendered already */
+    cur = xml_base_attr->parent->parent;
+    while((cur != NULL) && (!xmlC14NIsVisible(ctx, cur, cur->parent))) {
+        attr = xmlHasNsProp(cur, BAD_CAST "base", XML_XML_NAMESPACE);
+        if(attr != NULL) {
+            /* get attr value */
+            tmp_str = xmlNodeListGetString(ctx->doc, attr->children, 1);
+            if(tmp_str == NULL) {
+                xmlFree(res);
+
+                xmlC14NErrInternal("processing xml:base attribute - can't get attr value");
+                return (NULL);
+            }
+
+            /* we need to add '/' if our current base uri ends with '..' or '.'
+            to ensure that we are forced to go "up" all the time */
+            tmp_str_len = xmlStrlen(tmp_str);
+            if(tmp_str_len > 1 && tmp_str[tmp_str_len - 2] == '.') {
+                tmp_str2 = xmlStrcat(tmp_str, BAD_CAST "/");
+                if(tmp_str2 == NULL) {
+                    xmlFree(tmp_str);
+                    xmlFree(res);
+
+                    xmlC14NErrInternal("processing xml:base attribute - can't modify uri");
+                    return (NULL);
+                }
+
+                tmp_str = tmp_str2;
+            }
+
+            /* build uri */
+            tmp_str2 = xmlBuildURI(res, tmp_str);
+            if(tmp_str2 == NULL) {
+                xmlFree(tmp_str);
+                xmlFree(res);
+
+                xmlC14NErrInternal("processing xml:base attribute - can't construct uri");
+                return (NULL);
+            }
+
+            /* cleanup and set the new res */
+            xmlFree(tmp_str);
+            xmlFree(res);
+            res = tmp_str2;
+        }
+
+        /* next */
+        cur = cur->parent;
+    }
+
+    /* check if result uri is empty or not */
+    if((res == NULL) || xmlStrEqual(res, BAD_CAST "")) {
+        xmlFree(res);
+        return (NULL);
+    }
+
+    /* create and return the new attribute node */
+    attr = xmlNewNsProp(NULL, xml_base_attr->ns, BAD_CAST "base", res);
+    if(attr == NULL) {
+        xmlFree(res);
+
+        xmlC14NErrInternal("processing xml:base attribute - can't construct attribute");
+        return (NULL);
+    }
+
+    /* done */
+    xmlFree(res);
+    return (attr);
+}
+
+/**
+ * xmlC14NProcessAttrsAxis:
+ * @ctx:		the C14N context
+ * @cur:		the current node
+ * @parent_visible:	the visibility of parent node
+ * @all_parents_visible: the visibility of all parent nodes
+ *
+ * Prints out canonical attribute axis of the current node to the
+ * buffer from C14N context as follows
+ *
+ * Canonical XML v 1.0 (http://www.w3.org/TR/xml-c14n)
+ *
+ * Attribute Axis
+ * In lexicographic order (ascending), process each node that
+ * is in the element's attribute axis and in the node-set.
+ *
+ * The processing of an element node E MUST be modified slightly
+ * when an XPath node-set is given as input and the element's
+ * parent is omitted from the node-set.
+ *
+ *
+ * Exclusive XML Canonicalization v 1.0 (http://www.w3.org/TR/xml-exc-c14n)
+ *
+ * Canonical XML applied to a document subset requires the search of the
+ * ancestor nodes of each orphan element node for attributes in the xml
+ * namespace, such as xml:lang and xml:space. These are copied into the
+ * element node except if a declaration of the same attribute is already
+ * in the attribute axis of the element (whether or not it is included in
+ * the document subset). This search and copying are omitted from the
+ * Exclusive XML Canonicalization method.
+ *
+ * Returns 0 on success or -1 on fail.
+ */
+static int
+xmlC14NProcessAttrsAxis(xmlC14NCtxPtr ctx, xmlNodePtr cur, int parent_visible)
+{
+    xmlAttrPtr attr;
+    xmlListPtr list;
+    xmlAttrPtr attrs_to_delete = NULL;
+
+    /* special processing for 1.1 spec */
+    xmlAttrPtr xml_base_attr = NULL;
+    xmlAttrPtr xml_lang_attr = NULL;
+    xmlAttrPtr xml_space_attr = NULL;
+
+    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) {
+        xmlC14NErrParam("processing attributes axis");
+        return (-1);
+    }
+
+    /*
+     * Create a sorted list to store element attributes
+     */
     list = xmlListCreate(NULL, xmlC14NAttrsCompare);
-    if (list == NULL) { 
-        xmlC14NErrInternal("creating attributes list"); 
-        return (-1); 
-    } 
- 
-    switch(ctx->mode) { 
-    case XML_C14N_1_0: 
-        /* The processing of an element node E MUST be modified slightly when an XPath node-set is 
-         * given as input and the element's parent is omitted from the node-set. The method for processing 
-         * the attribute axis of an element E in the node-set is enhanced. All element nodes along E's 
-         * ancestor axis are examined for nearest occurrences of attributes in the xml namespace, such 
-         * as xml:lang and xml:space (whether or not they are in the node-set). From this list of attributes, 
-         * remove any that are in E's attribute axis (whether or not they are in the node-set). Then, 
-         * lexicographically merge this attribute list with the nodes of E's attribute axis that are in 
-         * the node-set. The result of visiting the attribute axis is computed by processing the attribute 
-         * nodes in this merged attribute list. 
-         */ 
- 
-        /* 
-         * Add all visible attributes from current node. 
-         */ 
-        attr = cur->properties; 
-        while (attr != NULL) { 
-            /* check that attribute is visible */ 
-            if (xmlC14NIsVisible(ctx, attr, cur)) { 
-                xmlListInsert(list, attr); 
-            } 
-            attr = attr->next; 
-        } 
- 
-        /* 
-         * Handle xml attributes 
-         */ 
-        if (parent_visible && (cur->parent != NULL) && 
-            (!xmlC14NIsVisible(ctx, cur->parent, cur->parent->parent))) 
-        { 
-            xmlNodePtr tmp; 
- 
-            /* 
-             * If XPath node-set is not specified then the parent is always 
-             * visible! 
-             */ 
-            tmp = cur->parent; 
-            while (tmp != NULL) { 
-                attr = tmp->properties; 
-                while (attr != NULL) { 
-                    if (xmlC14NIsXmlAttr(attr) != 0) { 
-                        if (xmlListSearch(list, attr) == NULL) { 
-                            xmlListInsert(list, attr); 
-                        } 
-                    } 
-                    attr = attr->next; 
-                } 
-                tmp = tmp->parent; 
-            } 
-        } 
- 
-        /* done */ 
-        break; 
-    case XML_C14N_EXCLUSIVE_1_0: 
-        /* attributes in the XML namespace, such as xml:lang and xml:space 
-         * are not imported into orphan nodes of the document subset 
-         */ 
- 
-        /* 
-         * Add all visible attributes from current node. 
-         */ 
-        attr = cur->properties; 
-        while (attr != NULL) { 
-            /* check that attribute is visible */ 
-            if (xmlC14NIsVisible(ctx, attr, cur)) { 
-                xmlListInsert(list, attr); 
-            } 
-            attr = attr->next; 
-        } 
- 
-        /* do nothing special for xml attributes */ 
-        break; 
-    case XML_C14N_1_1: 
-        /* The processing of an element node E MUST be modified slightly when an XPath node-set is 
-         * given as input and some of the element's ancestors are omitted from the node-set. 
-         * 
-         * Simple inheritable attributes are attributes that have a value that requires at most a simple 
-         * redeclaration. This redeclaration is done by supplying a new value in the child axis. The 
-         * redeclaration of a simple inheritable attribute A contained in one of E's ancestors is done 
-         * by supplying a value to an attribute Ae inside E with the same name. Simple inheritable attributes 
-         * are xml:lang and xml:space. 
-         * 
-         * The method for processing the attribute axis of an element E in the node-set is hence enhanced. 
-         * All element nodes along E's ancestor axis are examined for the nearest occurrences of simple 
-         * inheritable attributes in the xml namespace, such as xml:lang and xml:space (whether or not they 
-         * are in the node-set). From this list of attributes, any simple inheritable attributes that are 
-         * already in E's attribute axis (whether or not they are in the node-set) are removed. Then, 
-         * lexicographically merge this attribute list with the nodes of E's attribute axis that are in 
-         * the node-set. The result of visiting the attribute axis is computed by processing the attribute 
-         * nodes in this merged attribute list. 
-         * 
-         * The xml:id attribute is not a simple inheritable attribute and no processing of these attributes is 
-         * performed. 
-         * 
-         * The xml:base attribute is not a simple inheritable attribute and requires special processing beyond 
-         * a simple redeclaration. 
-         * 
-         * Attributes in the XML namespace other than xml:base, xml:id, xml:lang, and xml:space MUST be processed 
-         * as ordinary attributes. 
-         */ 
- 
-        /* 
-         * Add all visible attributes from current node. 
-         */ 
-        attr = cur->properties; 
-        while (attr != NULL) { 
-            /* special processing for XML attribute kiks in only when we have invisible parents */ 
-            if ((!parent_visible) || (xmlC14NIsXmlAttr(attr) == 0)) { 
-                /* check that attribute is visible */ 
-                if (xmlC14NIsVisible(ctx, attr, cur)) { 
-                    xmlListInsert(list, attr); 
-                } 
-            } else { 
-                int matched = 0; 
- 
-                /* check for simple inheritance attributes */ 
-                if((!matched) && (xml_lang_attr == NULL) && xmlStrEqual(attr->name, BAD_CAST "lang")) { 
-                    xml_lang_attr = attr; 
-                    matched = 1; 
-                } 
-                if((!matched) && (xml_space_attr == NULL) && xmlStrEqual(attr->name, BAD_CAST "space")) { 
-                    xml_space_attr = attr; 
-                    matched = 1; 
-                } 
- 
-                /* check for base attr */ 
-                if((!matched) && (xml_base_attr == NULL) && xmlStrEqual(attr->name, BAD_CAST "base")) { 
-                    xml_base_attr = attr; 
-                    matched = 1; 
-                } 
- 
-                /* otherwise, it is a normal attribute, so just check if it is visible */ 
-                if((!matched) && xmlC14NIsVisible(ctx, attr, cur)) { 
-                    xmlListInsert(list, attr); 
-                } 
-            } 
- 
-            /* move to the next one */ 
-            attr = attr->next; 
-        } 
- 
-        /* special processing for XML attribute kiks in only when we have invisible parents */ 
-        if ((parent_visible)) { 
- 
-            /* simple inheritance attributes - copy */ 
-            if(xml_lang_attr == NULL) { 
-                xml_lang_attr = xmlC14NFindHiddenParentAttr(ctx, cur->parent, BAD_CAST "lang", XML_XML_NAMESPACE); 
-            } 
-            if(xml_lang_attr != NULL) { 
-                xmlListInsert(list, xml_lang_attr); 
-            } 
-            if(xml_space_attr == NULL) { 
-                xml_space_attr = xmlC14NFindHiddenParentAttr(ctx, cur->parent, BAD_CAST "space", XML_XML_NAMESPACE); 
-            } 
-            if(xml_space_attr != NULL) { 
-                xmlListInsert(list, xml_space_attr); 
-            } 
- 
-            /* base uri attribute - fix up */ 
-            if(xml_base_attr == NULL) { 
-                /* if we don't have base uri attribute, check if we have a "hidden" one above */ 
-                xml_base_attr = xmlC14NFindHiddenParentAttr(ctx, cur->parent, BAD_CAST "base", XML_XML_NAMESPACE); 
-            } 
-            if(xml_base_attr != NULL) { 
-                xml_base_attr = xmlC14NFixupBaseAttr(ctx, xml_base_attr); 
-                if(xml_base_attr != NULL) { 
-                    xmlListInsert(list, xml_base_attr); 
- 
-                    /* note that we MUST delete returned attr node ourselves! */ 
-                    xml_base_attr->next = attrs_to_delete; 
-                    attrs_to_delete = xml_base_attr; 
-                } 
-            } 
-        } 
- 
-        /* done */ 
-        break; 
-    } 
- 
-    /* 
-     * print out all elements from list 
-     */ 
+    if (list == NULL) {
+        xmlC14NErrInternal("creating attributes list");
+        return (-1);
+    }
+
+    switch(ctx->mode) {
+    case XML_C14N_1_0:
+        /* The processing of an element node E MUST be modified slightly when an XPath node-set is
+         * given as input and the element's parent is omitted from the node-set. The method for processing
+         * the attribute axis of an element E in the node-set is enhanced. All element nodes along E's
+         * ancestor axis are examined for nearest occurrences of attributes in the xml namespace, such
+         * as xml:lang and xml:space (whether or not they are in the node-set). From this list of attributes,
+         * remove any that are in E's attribute axis (whether or not they are in the node-set). Then,
+         * lexicographically merge this attribute list with the nodes of E's attribute axis that are in
+         * the node-set. The result of visiting the attribute axis is computed by processing the attribute
+         * nodes in this merged attribute list.
+         */
+
+        /*
+         * Add all visible attributes from current node.
+         */
+        attr = cur->properties;
+        while (attr != NULL) {
+            /* check that attribute is visible */
+            if (xmlC14NIsVisible(ctx, attr, cur)) {
+                xmlListInsert(list, attr);
+            }
+            attr = attr->next;
+        }
+
+        /*
+         * Handle xml attributes
+         */
+        if (parent_visible && (cur->parent != NULL) &&
+            (!xmlC14NIsVisible(ctx, cur->parent, cur->parent->parent)))
+        {
+            xmlNodePtr tmp;
+
+            /*
+             * If XPath node-set is not specified then the parent is always
+             * visible!
+             */
+            tmp = cur->parent;
+            while (tmp != NULL) {
+                attr = tmp->properties;
+                while (attr != NULL) {
+                    if (xmlC14NIsXmlAttr(attr) != 0) {
+                        if (xmlListSearch(list, attr) == NULL) {
+                            xmlListInsert(list, attr);
+                        }
+                    }
+                    attr = attr->next;
+                }
+                tmp = tmp->parent;
+            }
+        }
+
+        /* done */
+        break;
+    case XML_C14N_EXCLUSIVE_1_0:
+        /* attributes in the XML namespace, such as xml:lang and xml:space
+         * are not imported into orphan nodes of the document subset
+         */
+
+        /*
+         * Add all visible attributes from current node.
+         */
+        attr = cur->properties;
+        while (attr != NULL) {
+            /* check that attribute is visible */
+            if (xmlC14NIsVisible(ctx, attr, cur)) {
+                xmlListInsert(list, attr);
+            }
+            attr = attr->next;
+        }
+
+        /* do nothing special for xml attributes */
+        break;
+    case XML_C14N_1_1:
+        /* The processing of an element node E MUST be modified slightly when an XPath node-set is
+         * given as input and some of the element's ancestors are omitted from the node-set.
+         *
+         * Simple inheritable attributes are attributes that have a value that requires at most a simple
+         * redeclaration. This redeclaration is done by supplying a new value in the child axis. The
+         * redeclaration of a simple inheritable attribute A contained in one of E's ancestors is done
+         * by supplying a value to an attribute Ae inside E with the same name. Simple inheritable attributes
+         * are xml:lang and xml:space.
+         *
+         * The method for processing the attribute axis of an element E in the node-set is hence enhanced.
+         * All element nodes along E's ancestor axis are examined for the nearest occurrences of simple
+         * inheritable attributes in the xml namespace, such as xml:lang and xml:space (whether or not they
+         * are in the node-set). From this list of attributes, any simple inheritable attributes that are
+         * already in E's attribute axis (whether or not they are in the node-set) are removed. Then,
+         * lexicographically merge this attribute list with the nodes of E's attribute axis that are in
+         * the node-set. The result of visiting the attribute axis is computed by processing the attribute
+         * nodes in this merged attribute list.
+         *
+         * The xml:id attribute is not a simple inheritable attribute and no processing of these attributes is
+         * performed.
+         *
+         * The xml:base attribute is not a simple inheritable attribute and requires special processing beyond
+         * a simple redeclaration.
+         *
+         * Attributes in the XML namespace other than xml:base, xml:id, xml:lang, and xml:space MUST be processed
+         * as ordinary attributes.
+         */
+
+        /*
+         * Add all visible attributes from current node.
+         */
+        attr = cur->properties;
+        while (attr != NULL) {
+            /* special processing for XML attribute kiks in only when we have invisible parents */
+            if ((!parent_visible) || (xmlC14NIsXmlAttr(attr) == 0)) {
+                /* check that attribute is visible */
+                if (xmlC14NIsVisible(ctx, attr, cur)) {
+                    xmlListInsert(list, attr);
+                }
+            } else {
+                int matched = 0;
+
+                /* check for simple inheritance attributes */
+                if((!matched) && (xml_lang_attr == NULL) && xmlStrEqual(attr->name, BAD_CAST "lang")) {
+                    xml_lang_attr = attr;
+                    matched = 1;
+                }
+                if((!matched) && (xml_space_attr == NULL) && xmlStrEqual(attr->name, BAD_CAST "space")) {
+                    xml_space_attr = attr;
+                    matched = 1;
+                }
+
+                /* check for base attr */
+                if((!matched) && (xml_base_attr == NULL) && xmlStrEqual(attr->name, BAD_CAST "base")) {
+                    xml_base_attr = attr;
+                    matched = 1;
+                }
+
+                /* otherwise, it is a normal attribute, so just check if it is visible */
+                if((!matched) && xmlC14NIsVisible(ctx, attr, cur)) {
+                    xmlListInsert(list, attr);
+                }
+            }
+
+            /* move to the next one */
+            attr = attr->next;
+        }
+
+        /* special processing for XML attribute kiks in only when we have invisible parents */
+        if ((parent_visible)) {
+
+            /* simple inheritance attributes - copy */
+            if(xml_lang_attr == NULL) {
+                xml_lang_attr = xmlC14NFindHiddenParentAttr(ctx, cur->parent, BAD_CAST "lang", XML_XML_NAMESPACE);
+            }
+            if(xml_lang_attr != NULL) {
+                xmlListInsert(list, xml_lang_attr);
+            }
+            if(xml_space_attr == NULL) {
+                xml_space_attr = xmlC14NFindHiddenParentAttr(ctx, cur->parent, BAD_CAST "space", XML_XML_NAMESPACE);
+            }
+            if(xml_space_attr != NULL) {
+                xmlListInsert(list, xml_space_attr);
+            }
+
+            /* base uri attribute - fix up */
+            if(xml_base_attr == NULL) {
+                /* if we don't have base uri attribute, check if we have a "hidden" one above */
+                xml_base_attr = xmlC14NFindHiddenParentAttr(ctx, cur->parent, BAD_CAST "base", XML_XML_NAMESPACE);
+            }
+            if(xml_base_attr != NULL) {
+                xml_base_attr = xmlC14NFixupBaseAttr(ctx, xml_base_attr);
+                if(xml_base_attr != NULL) {
+                    xmlListInsert(list, xml_base_attr);
+
+                    /* note that we MUST delete returned attr node ourselves! */
+                    xml_base_attr->next = attrs_to_delete;
+                    attrs_to_delete = xml_base_attr;
+                }
+            }
+        }
+
+        /* done */
+        break;
+    }
+
+    /*
+     * print out all elements from list
+     */
     xmlListWalk(list, xmlC14NPrintAttrs, (void *) ctx);
- 
-    /* 
-     * Cleanup 
-     */ 
-    xmlFreePropList(attrs_to_delete); 
-    xmlListDelete(list); 
-    return (0); 
-} 
- 
-/** 
- * xmlC14NCheckForRelativeNamespaces: 
- * @ctx:		the C14N context 
- * @cur:		the current element node 
- * 
- * Checks that current element node has no relative namespaces defined 
- * 
- * Returns 0 if the node has no relative namespaces or -1 otherwise. 
- */ 
-static int 
-xmlC14NCheckForRelativeNamespaces(xmlC14NCtxPtr ctx, xmlNodePtr cur) 
-{ 
-    xmlNsPtr ns; 
- 
-    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) { 
-        xmlC14NErrParam("checking for relative namespaces"); 
-        return (-1); 
-    } 
- 
-    ns = cur->nsDef; 
-    while (ns != NULL) { 
-        if (xmlStrlen(ns->href) > 0) { 
-            xmlURIPtr uri; 
- 
-            uri = xmlParseURI((const char *) ns->href); 
-            if (uri == NULL) { 
-                xmlC14NErrInternal("parsing namespace uri"); 
-                return (-1); 
-            } 
-            if (xmlStrlen((const xmlChar *) uri->scheme) == 0) { 
-                xmlC14NErrRelativeNamespace(uri->scheme); 
-                xmlFreeURI(uri); 
-                return (-1); 
-            } 
-            xmlFreeURI(uri); 
-        } 
-        ns = ns->next; 
-    } 
-    return (0); 
-} 
- 
-/** 
- * xmlC14NProcessElementNode: 
- * @ctx:		the pointer to C14N context object 
- * @cur:		the node to process 
- * @visible:    this node is visible 
- * @all_parents_visible: whether all the parents of this node are visible 
- * 
- * Canonical XML v 1.0 (http://www.w3.org/TR/xml-c14n) 
- * 
- * Element Nodes 
- * If the element is not in the node-set, then the result is obtained 
- * by processing the namespace axis, then the attribute axis, then 
- * processing the child nodes of the element that are in the node-set 
- * (in document order). If the element is in the node-set, then the result 
- * is an open angle bracket (<), the element QName, the result of 
- * processing the namespace axis, the result of processing the attribute 
- * axis, a close angle bracket (>), the result of processing the child 
- * nodes of the element that are in the node-set (in document order), an 
- * open angle bracket, a forward slash (/), the element QName, and a close 
- * angle bracket. 
- * 
- * Returns non-negative value on success or negative value on fail 
- */ 
-static int 
-xmlC14NProcessElementNode(xmlC14NCtxPtr ctx, xmlNodePtr cur, int visible) 
-{ 
-    int ret; 
-    xmlC14NVisibleNsStack state; 
-    int parent_is_doc = 0; 
- 
-    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) { 
-        xmlC14NErrParam("processing element node"); 
-        return (-1); 
-    } 
- 
-    /* 
-     * Check relative relative namespaces: 
-     * implementations of XML canonicalization MUST report an operation 
-     * failure on documents containing relative namespace URIs. 
-     */ 
-    if (xmlC14NCheckForRelativeNamespaces(ctx, cur) < 0) { 
-        xmlC14NErrInternal("checking for relative namespaces"); 
-        return (-1); 
-    } 
- 
- 
-    /* 
-     * Save ns_rendered stack position 
-     */ 
-    memset(&state, 0, sizeof(state)); 
-    xmlC14NVisibleNsStackSave(ctx->ns_rendered, &state); 
- 
-    if (visible) { 
-        if (ctx->parent_is_doc) { 
-	    /* save this flag into the stack */ 
-	    parent_is_doc = ctx->parent_is_doc; 
-	    ctx->parent_is_doc = 0; 
-            ctx->pos = XMLC14N_INSIDE_DOCUMENT_ELEMENT; 
-        } 
-        xmlOutputBufferWriteString(ctx->buf, "<"); 
- 
-        if ((cur->ns != NULL) && (xmlStrlen(cur->ns->prefix) > 0)) { 
-            xmlOutputBufferWriteString(ctx->buf, 
-                                       (const char *) cur->ns->prefix); 
-            xmlOutputBufferWriteString(ctx->buf, ":"); 
-        } 
-        xmlOutputBufferWriteString(ctx->buf, (const char *) cur->name); 
-    } 
- 
-    if (!xmlC14NIsExclusive(ctx)) { 
-        ret = xmlC14NProcessNamespacesAxis(ctx, cur, visible); 
-    } else { 
-        ret = xmlExcC14NProcessNamespacesAxis(ctx, cur, visible); 
-    } 
-    if (ret < 0) { 
-        xmlC14NErrInternal("processing namespaces axis"); 
-        return (-1); 
-    } 
-    /* todo: shouldn't this go to "visible only"? */ 
-    if(visible) { 
-	xmlC14NVisibleNsStackShift(ctx->ns_rendered); 
-    } 
- 
-    ret = xmlC14NProcessAttrsAxis(ctx, cur, visible); 
-    if (ret < 0) { 
-	xmlC14NErrInternal("processing attributes axis"); 
-	return (-1); 
-    } 
- 
-    if (visible) { 
-        xmlOutputBufferWriteString(ctx->buf, ">"); 
-    } 
-    if (cur->children != NULL) { 
-        ret = xmlC14NProcessNodeList(ctx, cur->children); 
-        if (ret < 0) { 
-            xmlC14NErrInternal("processing childrens list"); 
-            return (-1); 
-        } 
-    } 
-    if (visible) { 
-        xmlOutputBufferWriteString(ctx->buf, "</"); 
-        if ((cur->ns != NULL) && (xmlStrlen(cur->ns->prefix) > 0)) { 
-            xmlOutputBufferWriteString(ctx->buf, 
-                                       (const char *) cur->ns->prefix); 
-            xmlOutputBufferWriteString(ctx->buf, ":"); 
-        } 
-        xmlOutputBufferWriteString(ctx->buf, (const char *) cur->name); 
-        xmlOutputBufferWriteString(ctx->buf, ">"); 
-        if (parent_is_doc) { 
-	    /* restore this flag from the stack for next node */ 
-            ctx->parent_is_doc = parent_is_doc; 
-	    ctx->pos = XMLC14N_AFTER_DOCUMENT_ELEMENT; 
-        } 
-    } 
- 
-    /* 
-     * Restore ns_rendered stack position 
-     */ 
-    xmlC14NVisibleNsStackRestore(ctx->ns_rendered, &state); 
-    return (0); 
-} 
- 
-/** 
- * xmlC14NProcessNode: 
- * @ctx:		the pointer to C14N context object 
- * @cur:		the node to process 
- * 
- * Processes the given node 
- * 
- * Returns non-negative value on success or negative value on fail 
- */ 
-static int 
-xmlC14NProcessNode(xmlC14NCtxPtr ctx, xmlNodePtr cur) 
-{ 
-    int ret = 0; 
-    int visible; 
- 
-    if ((ctx == NULL) || (cur == NULL)) { 
-        xmlC14NErrParam("processing node"); 
-        return (-1); 
-    } 
- 
-    visible = xmlC14NIsVisible(ctx, cur, cur->parent); 
-    switch (cur->type) { 
-        case XML_ELEMENT_NODE: 
-            ret = xmlC14NProcessElementNode(ctx, cur, visible); 
-            break; 
-        case XML_CDATA_SECTION_NODE: 
-        case XML_TEXT_NODE: 
-            /* 
-             * Text Nodes 
-             * the string value, except all ampersands are replaced 
-             * by &amp;, all open angle brackets (<) are replaced by &lt;, all closing 
-             * angle brackets (>) are replaced by &gt;, and all #xD characters are 
-             * replaced by &#xD;. 
-             */ 
-            /* cdata sections are processed as text nodes */ 
-            /* todo: verify that cdata sections are included in XPath nodes set */ 
-            if ((visible) && (cur->content != NULL)) { 
-                xmlChar *buffer; 
- 
-                buffer = xmlC11NNormalizeText(cur->content); 
-                if (buffer != NULL) { 
-                    xmlOutputBufferWriteString(ctx->buf, 
-                                               (const char *) buffer); 
-                    xmlFree(buffer); 
-                } else { 
-                    xmlC14NErrInternal("normalizing text node"); 
-                    return (-1); 
-                } 
-            } 
-            break; 
-        case XML_PI_NODE: 
-            /* 
-             * Processing Instruction (PI) Nodes- 
-             * The opening PI symbol (<?), the PI target name of the node, 
-             * a leading space and the string value if it is not empty, and 
-             * the closing PI symbol (?>). If the string value is empty, 
-             * then the leading space is not added. Also, a trailing #xA is 
-             * rendered after the closing PI symbol for PI children of the 
-             * root node with a lesser document order than the document 
-             * element, and a leading #xA is rendered before the opening PI 
-             * symbol of PI children of the root node with a greater document 
-             * order than the document element. 
-             */ 
-            if (visible) { 
-                if (ctx->pos == XMLC14N_AFTER_DOCUMENT_ELEMENT) { 
-                    xmlOutputBufferWriteString(ctx->buf, "\x0A<?"); 
-                } else { 
-                    xmlOutputBufferWriteString(ctx->buf, "<?"); 
-                } 
- 
-                xmlOutputBufferWriteString(ctx->buf, 
-                                           (const char *) cur->name); 
-                if ((cur->content != NULL) && (*(cur->content) != '\0')) { 
-                    xmlChar *buffer; 
- 
-                    xmlOutputBufferWriteString(ctx->buf, " "); 
- 
-                    /* todo: do we need to normalize pi? */ 
-                    buffer = xmlC11NNormalizePI(cur->content); 
-                    if (buffer != NULL) { 
-                        xmlOutputBufferWriteString(ctx->buf, 
-                                                   (const char *) buffer); 
-                        xmlFree(buffer); 
-                    } else { 
-                        xmlC14NErrInternal("normalizing pi node"); 
-                        return (-1); 
-                    } 
-                } 
- 
-                if (ctx->pos == XMLC14N_BEFORE_DOCUMENT_ELEMENT) { 
-                    xmlOutputBufferWriteString(ctx->buf, "?>\x0A"); 
-                } else { 
-                    xmlOutputBufferWriteString(ctx->buf, "?>"); 
-                } 
-            } 
-            break; 
-        case XML_COMMENT_NODE: 
-            /* 
-             * Comment Nodes 
-             * Nothing if generating canonical XML without  comments. For 
-             * canonical XML with comments, generate the opening comment 
-             * symbol (<!--), the string value of the node, and the 
-             * closing comment symbol (-->). Also, a trailing #xA is rendered 
-             * after the closing comment symbol for comment children of the 
-             * root node with a lesser document order than the document 
-             * element, and a leading #xA is rendered before the opening 
-             * comment symbol of comment children of the root node with a 
-             * greater document order than the document element. (Comment 
-             * children of the root node represent comments outside of the 
-             * top-level document element and outside of the document type 
-             * declaration). 
-             */ 
-            if (visible && ctx->with_comments) { 
-                if (ctx->pos == XMLC14N_AFTER_DOCUMENT_ELEMENT) { 
-                    xmlOutputBufferWriteString(ctx->buf, "\x0A<!--"); 
-                } else { 
-                    xmlOutputBufferWriteString(ctx->buf, "<!--"); 
-                } 
- 
-                if (cur->content != NULL) { 
-                    xmlChar *buffer; 
- 
-                    /* todo: do we need to normalize comment? */ 
-                    buffer = xmlC11NNormalizeComment(cur->content); 
-                    if (buffer != NULL) { 
-                        xmlOutputBufferWriteString(ctx->buf, 
-                                                   (const char *) buffer); 
-                        xmlFree(buffer); 
-                    } else { 
-                        xmlC14NErrInternal("normalizing comment node"); 
-                        return (-1); 
-                    } 
-                } 
- 
-                if (ctx->pos == XMLC14N_BEFORE_DOCUMENT_ELEMENT) { 
-                    xmlOutputBufferWriteString(ctx->buf, "-->\x0A"); 
-                } else { 
-                    xmlOutputBufferWriteString(ctx->buf, "-->"); 
-                } 
-            } 
-            break; 
-        case XML_DOCUMENT_NODE: 
-        case XML_DOCUMENT_FRAG_NODE:   /* should be processed as document? */ 
-#ifdef LIBXML_DOCB_ENABLED 
-        case XML_DOCB_DOCUMENT_NODE:   /* should be processed as document? */ 
-#endif 
-#ifdef LIBXML_HTML_ENABLED 
-        case XML_HTML_DOCUMENT_NODE:   /* should be processed as document? */ 
-#endif 
-            if (cur->children != NULL) { 
-                ctx->pos = XMLC14N_BEFORE_DOCUMENT_ELEMENT; 
-                ctx->parent_is_doc = 1; 
-                ret = xmlC14NProcessNodeList(ctx, cur->children); 
-            } 
-            break; 
- 
-        case XML_ATTRIBUTE_NODE: 
-            xmlC14NErrInvalidNode("XML_ATTRIBUTE_NODE", "processing node"); 
-            return (-1); 
-        case XML_NAMESPACE_DECL: 
-            xmlC14NErrInvalidNode("XML_NAMESPACE_DECL", "processing node"); 
-            return (-1); 
-        case XML_ENTITY_REF_NODE: 
-            xmlC14NErrInvalidNode("XML_ENTITY_REF_NODE", "processing node"); 
-            return (-1); 
-        case XML_ENTITY_NODE: 
-            xmlC14NErrInvalidNode("XML_ENTITY_NODE", "processing node"); 
-            return (-1); 
- 
-        case XML_DOCUMENT_TYPE_NODE: 
-        case XML_NOTATION_NODE: 
-        case XML_DTD_NODE: 
-        case XML_ELEMENT_DECL: 
-        case XML_ATTRIBUTE_DECL: 
-        case XML_ENTITY_DECL: 
-#ifdef LIBXML_XINCLUDE_ENABLED 
-        case XML_XINCLUDE_START: 
-        case XML_XINCLUDE_END: 
-#endif 
-            /* 
-             * should be ignored according to "W3C Canonical XML" 
-             */ 
-            break; 
-        default: 
-            xmlC14NErrUnknownNode(cur->type, "processing node"); 
-            return (-1); 
-    } 
- 
-    return (ret); 
-} 
- 
-/** 
- * xmlC14NProcessNodeList: 
- * @ctx:		the pointer to C14N context object 
- * @cur:		the node to start from 
- * 
- * Processes all nodes in the row starting from cur. 
- * 
- * Returns non-negative value on success or negative value on fail 
- */ 
-static int 
-xmlC14NProcessNodeList(xmlC14NCtxPtr ctx, xmlNodePtr cur) 
-{ 
-    int ret; 
- 
-    if (ctx == NULL) { 
-        xmlC14NErrParam("processing node list"); 
-        return (-1); 
-    } 
- 
-    for (ret = 0; cur != NULL && ret >= 0; cur = cur->next) { 
-        ret = xmlC14NProcessNode(ctx, cur); 
-    } 
-    return (ret); 
-} 
- 
- 
-/** 
- * xmlC14NFreeCtx: 
- * @ctx: the pointer to C14N context object 
- * 
- * Cleanups the C14N context object. 
- */ 
- 
-static void 
-xmlC14NFreeCtx(xmlC14NCtxPtr ctx) 
-{ 
-    if (ctx == NULL) { 
-        xmlC14NErrParam("freeing context"); 
-        return; 
-    } 
- 
-    if (ctx->ns_rendered != NULL) { 
-        xmlC14NVisibleNsStackDestroy(ctx->ns_rendered); 
-    } 
-    xmlFree(ctx); 
-} 
- 
-/** 
- * xmlC14NNewCtx: 
- * @doc:		the XML document for canonization 
- * @is_visible_callback:the function to use to determine is node visible 
- *			or not 
- * @user_data:		the first parameter for @is_visible_callback function 
- *			(in most cases, it is nodes set) 
- * @mode:   the c14n mode (see @xmlC14NMode) 
- * @inclusive_ns_prefixe the list of inclusive namespace prefixes 
- *			ended with a NULL or NULL if there is no 
- *			inclusive namespaces (only for ` 
- *			canonicalization) 
- * @with_comments:	include comments in the result (!=0) or not (==0) 
- * @buf:		the output buffer to store canonical XML; this 
- *			buffer MUST have encoder==NULL because C14N requires 
- *			UTF-8 output 
- * 
- * Creates new C14N context object to store C14N parameters. 
- * 
- * Returns pointer to newly created object (success) or NULL (fail) 
- */ 
-static xmlC14NCtxPtr 
-xmlC14NNewCtx(xmlDocPtr doc, 
-	      xmlC14NIsVisibleCallback is_visible_callback, void* user_data, 
-              xmlC14NMode mode, xmlChar ** inclusive_ns_prefixes, 
-              int with_comments, xmlOutputBufferPtr buf) 
-{ 
-    xmlC14NCtxPtr ctx = NULL; 
- 
-    if ((doc == NULL) || (buf == NULL)) { 
-        xmlC14NErrParam("creating new context"); 
-        return (NULL); 
-    } 
- 
-    /* 
-     *  Validate the encoding output buffer encoding 
-     */ 
-    if (buf->encoder != NULL) { 
-        xmlC14NErr(ctx, (xmlNodePtr) doc, XML_C14N_REQUIRES_UTF8, 
-"xmlC14NNewCtx: output buffer encoder != NULL but C14N requires UTF8 output\n"); 
-        return (NULL); 
-    } 
- 
-    /* 
-     * Allocate a new xmlC14NCtxPtr and fill the fields. 
-     */ 
-    ctx = (xmlC14NCtxPtr) xmlMalloc(sizeof(xmlC14NCtx)); 
-    if (ctx == NULL) { 
-	xmlC14NErrMemory("creating context"); 
-        return (NULL); 
-    } 
-    memset(ctx, 0, sizeof(xmlC14NCtx)); 
- 
-    /* 
-     * initialize C14N context 
-     */ 
-    ctx->doc = doc; 
-    ctx->with_comments = with_comments; 
-    ctx->is_visible_callback = is_visible_callback; 
-    ctx->user_data = user_data; 
-    ctx->buf = buf; 
-    ctx->parent_is_doc = 1; 
-    ctx->pos = XMLC14N_BEFORE_DOCUMENT_ELEMENT; 
-    ctx->ns_rendered = xmlC14NVisibleNsStackCreate(); 
- 
-    if(ctx->ns_rendered == NULL) { 
-        xmlC14NErr(ctx, (xmlNodePtr) doc, XML_C14N_CREATE_STACK, 
-		   "xmlC14NNewCtx: xmlC14NVisibleNsStackCreate failed\n"); 
-	xmlC14NFreeCtx(ctx); 
-        return (NULL); 
-    } 
- 
-    /* 
+
+    /*
+     * Cleanup
+     */
+    xmlFreePropList(attrs_to_delete);
+    xmlListDelete(list);
+    return (0);
+}
+
+/**
+ * xmlC14NCheckForRelativeNamespaces:
+ * @ctx:		the C14N context
+ * @cur:		the current element node
+ *
+ * Checks that current element node has no relative namespaces defined
+ *
+ * Returns 0 if the node has no relative namespaces or -1 otherwise.
+ */
+static int
+xmlC14NCheckForRelativeNamespaces(xmlC14NCtxPtr ctx, xmlNodePtr cur)
+{
+    xmlNsPtr ns;
+
+    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) {
+        xmlC14NErrParam("checking for relative namespaces");
+        return (-1);
+    }
+
+    ns = cur->nsDef;
+    while (ns != NULL) {
+        if (xmlStrlen(ns->href) > 0) {
+            xmlURIPtr uri;
+
+            uri = xmlParseURI((const char *) ns->href);
+            if (uri == NULL) {
+                xmlC14NErrInternal("parsing namespace uri");
+                return (-1);
+            }
+            if (xmlStrlen((const xmlChar *) uri->scheme) == 0) {
+                xmlC14NErrRelativeNamespace(uri->scheme);
+                xmlFreeURI(uri);
+                return (-1);
+            }
+            xmlFreeURI(uri);
+        }
+        ns = ns->next;
+    }
+    return (0);
+}
+
+/**
+ * xmlC14NProcessElementNode:
+ * @ctx:		the pointer to C14N context object
+ * @cur:		the node to process
+ * @visible:    this node is visible
+ * @all_parents_visible: whether all the parents of this node are visible
+ *
+ * Canonical XML v 1.0 (http://www.w3.org/TR/xml-c14n)
+ *
+ * Element Nodes
+ * If the element is not in the node-set, then the result is obtained
+ * by processing the namespace axis, then the attribute axis, then
+ * processing the child nodes of the element that are in the node-set
+ * (in document order). If the element is in the node-set, then the result
+ * is an open angle bracket (<), the element QName, the result of
+ * processing the namespace axis, the result of processing the attribute
+ * axis, a close angle bracket (>), the result of processing the child
+ * nodes of the element that are in the node-set (in document order), an
+ * open angle bracket, a forward slash (/), the element QName, and a close
+ * angle bracket.
+ *
+ * Returns non-negative value on success or negative value on fail
+ */
+static int
+xmlC14NProcessElementNode(xmlC14NCtxPtr ctx, xmlNodePtr cur, int visible)
+{
+    int ret;
+    xmlC14NVisibleNsStack state;
+    int parent_is_doc = 0;
+
+    if ((ctx == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE)) {
+        xmlC14NErrParam("processing element node");
+        return (-1);
+    }
+
+    /*
+     * Check relative relative namespaces:
+     * implementations of XML canonicalization MUST report an operation
+     * failure on documents containing relative namespace URIs.
+     */
+    if (xmlC14NCheckForRelativeNamespaces(ctx, cur) < 0) {
+        xmlC14NErrInternal("checking for relative namespaces");
+        return (-1);
+    }
+
+
+    /*
+     * Save ns_rendered stack position
+     */
+    memset(&state, 0, sizeof(state));
+    xmlC14NVisibleNsStackSave(ctx->ns_rendered, &state);
+
+    if (visible) {
+        if (ctx->parent_is_doc) {
+	    /* save this flag into the stack */
+	    parent_is_doc = ctx->parent_is_doc;
+	    ctx->parent_is_doc = 0;
+            ctx->pos = XMLC14N_INSIDE_DOCUMENT_ELEMENT;
+        }
+        xmlOutputBufferWriteString(ctx->buf, "<");
+
+        if ((cur->ns != NULL) && (xmlStrlen(cur->ns->prefix) > 0)) {
+            xmlOutputBufferWriteString(ctx->buf,
+                                       (const char *) cur->ns->prefix);
+            xmlOutputBufferWriteString(ctx->buf, ":");
+        }
+        xmlOutputBufferWriteString(ctx->buf, (const char *) cur->name);
+    }
+
+    if (!xmlC14NIsExclusive(ctx)) {
+        ret = xmlC14NProcessNamespacesAxis(ctx, cur, visible);
+    } else {
+        ret = xmlExcC14NProcessNamespacesAxis(ctx, cur, visible);
+    }
+    if (ret < 0) {
+        xmlC14NErrInternal("processing namespaces axis");
+        return (-1);
+    }
+    /* todo: shouldn't this go to "visible only"? */
+    if(visible) {
+	xmlC14NVisibleNsStackShift(ctx->ns_rendered);
+    }
+
+    ret = xmlC14NProcessAttrsAxis(ctx, cur, visible);
+    if (ret < 0) {
+	xmlC14NErrInternal("processing attributes axis");
+	return (-1);
+    }
+
+    if (visible) {
+        xmlOutputBufferWriteString(ctx->buf, ">");
+    }
+    if (cur->children != NULL) {
+        ret = xmlC14NProcessNodeList(ctx, cur->children);
+        if (ret < 0) {
+            xmlC14NErrInternal("processing childrens list");
+            return (-1);
+        }
+    }
+    if (visible) {
+        xmlOutputBufferWriteString(ctx->buf, "</");
+        if ((cur->ns != NULL) && (xmlStrlen(cur->ns->prefix) > 0)) {
+            xmlOutputBufferWriteString(ctx->buf,
+                                       (const char *) cur->ns->prefix);
+            xmlOutputBufferWriteString(ctx->buf, ":");
+        }
+        xmlOutputBufferWriteString(ctx->buf, (const char *) cur->name);
+        xmlOutputBufferWriteString(ctx->buf, ">");
+        if (parent_is_doc) {
+	    /* restore this flag from the stack for next node */
+            ctx->parent_is_doc = parent_is_doc;
+	    ctx->pos = XMLC14N_AFTER_DOCUMENT_ELEMENT;
+        }
+    }
+
+    /*
+     * Restore ns_rendered stack position
+     */
+    xmlC14NVisibleNsStackRestore(ctx->ns_rendered, &state);
+    return (0);
+}
+
+/**
+ * xmlC14NProcessNode:
+ * @ctx:		the pointer to C14N context object
+ * @cur:		the node to process
+ *
+ * Processes the given node
+ *
+ * Returns non-negative value on success or negative value on fail
+ */
+static int
+xmlC14NProcessNode(xmlC14NCtxPtr ctx, xmlNodePtr cur)
+{
+    int ret = 0;
+    int visible;
+
+    if ((ctx == NULL) || (cur == NULL)) {
+        xmlC14NErrParam("processing node");
+        return (-1);
+    }
+
+    visible = xmlC14NIsVisible(ctx, cur, cur->parent);
+    switch (cur->type) {
+        case XML_ELEMENT_NODE:
+            ret = xmlC14NProcessElementNode(ctx, cur, visible);
+            break;
+        case XML_CDATA_SECTION_NODE:
+        case XML_TEXT_NODE:
+            /*
+             * Text Nodes
+             * the string value, except all ampersands are replaced
+             * by &amp;, all open angle brackets (<) are replaced by &lt;, all closing
+             * angle brackets (>) are replaced by &gt;, and all #xD characters are
+             * replaced by &#xD;.
+             */
+            /* cdata sections are processed as text nodes */
+            /* todo: verify that cdata sections are included in XPath nodes set */
+            if ((visible) && (cur->content != NULL)) {
+                xmlChar *buffer;
+
+                buffer = xmlC11NNormalizeText(cur->content);
+                if (buffer != NULL) {
+                    xmlOutputBufferWriteString(ctx->buf,
+                                               (const char *) buffer);
+                    xmlFree(buffer);
+                } else {
+                    xmlC14NErrInternal("normalizing text node");
+                    return (-1);
+                }
+            }
+            break;
+        case XML_PI_NODE:
+            /*
+             * Processing Instruction (PI) Nodes-
+             * The opening PI symbol (<?), the PI target name of the node,
+             * a leading space and the string value if it is not empty, and
+             * the closing PI symbol (?>). If the string value is empty,
+             * then the leading space is not added. Also, a trailing #xA is
+             * rendered after the closing PI symbol for PI children of the
+             * root node with a lesser document order than the document
+             * element, and a leading #xA is rendered before the opening PI
+             * symbol of PI children of the root node with a greater document
+             * order than the document element.
+             */
+            if (visible) {
+                if (ctx->pos == XMLC14N_AFTER_DOCUMENT_ELEMENT) {
+                    xmlOutputBufferWriteString(ctx->buf, "\x0A<?");
+                } else {
+                    xmlOutputBufferWriteString(ctx->buf, "<?");
+                }
+
+                xmlOutputBufferWriteString(ctx->buf,
+                                           (const char *) cur->name);
+                if ((cur->content != NULL) && (*(cur->content) != '\0')) {
+                    xmlChar *buffer;
+
+                    xmlOutputBufferWriteString(ctx->buf, " ");
+
+                    /* todo: do we need to normalize pi? */
+                    buffer = xmlC11NNormalizePI(cur->content);
+                    if (buffer != NULL) {
+                        xmlOutputBufferWriteString(ctx->buf,
+                                                   (const char *) buffer);
+                        xmlFree(buffer);
+                    } else {
+                        xmlC14NErrInternal("normalizing pi node");
+                        return (-1);
+                    }
+                }
+
+                if (ctx->pos == XMLC14N_BEFORE_DOCUMENT_ELEMENT) {
+                    xmlOutputBufferWriteString(ctx->buf, "?>\x0A");
+                } else {
+                    xmlOutputBufferWriteString(ctx->buf, "?>");
+                }
+            }
+            break;
+        case XML_COMMENT_NODE:
+            /*
+             * Comment Nodes
+             * Nothing if generating canonical XML without  comments. For
+             * canonical XML with comments, generate the opening comment
+             * symbol (<!--), the string value of the node, and the
+             * closing comment symbol (-->). Also, a trailing #xA is rendered
+             * after the closing comment symbol for comment children of the
+             * root node with a lesser document order than the document
+             * element, and a leading #xA is rendered before the opening
+             * comment symbol of comment children of the root node with a
+             * greater document order than the document element. (Comment
+             * children of the root node represent comments outside of the
+             * top-level document element and outside of the document type
+             * declaration).
+             */
+            if (visible && ctx->with_comments) {
+                if (ctx->pos == XMLC14N_AFTER_DOCUMENT_ELEMENT) {
+                    xmlOutputBufferWriteString(ctx->buf, "\x0A<!--");
+                } else {
+                    xmlOutputBufferWriteString(ctx->buf, "<!--");
+                }
+
+                if (cur->content != NULL) {
+                    xmlChar *buffer;
+
+                    /* todo: do we need to normalize comment? */
+                    buffer = xmlC11NNormalizeComment(cur->content);
+                    if (buffer != NULL) {
+                        xmlOutputBufferWriteString(ctx->buf,
+                                                   (const char *) buffer);
+                        xmlFree(buffer);
+                    } else {
+                        xmlC14NErrInternal("normalizing comment node");
+                        return (-1);
+                    }
+                }
+
+                if (ctx->pos == XMLC14N_BEFORE_DOCUMENT_ELEMENT) {
+                    xmlOutputBufferWriteString(ctx->buf, "-->\x0A");
+                } else {
+                    xmlOutputBufferWriteString(ctx->buf, "-->");
+                }
+            }
+            break;
+        case XML_DOCUMENT_NODE:
+        case XML_DOCUMENT_FRAG_NODE:   /* should be processed as document? */
+#ifdef LIBXML_DOCB_ENABLED
+        case XML_DOCB_DOCUMENT_NODE:   /* should be processed as document? */
+#endif
+#ifdef LIBXML_HTML_ENABLED
+        case XML_HTML_DOCUMENT_NODE:   /* should be processed as document? */
+#endif
+            if (cur->children != NULL) {
+                ctx->pos = XMLC14N_BEFORE_DOCUMENT_ELEMENT;
+                ctx->parent_is_doc = 1;
+                ret = xmlC14NProcessNodeList(ctx, cur->children);
+            }
+            break;
+
+        case XML_ATTRIBUTE_NODE:
+            xmlC14NErrInvalidNode("XML_ATTRIBUTE_NODE", "processing node");
+            return (-1);
+        case XML_NAMESPACE_DECL:
+            xmlC14NErrInvalidNode("XML_NAMESPACE_DECL", "processing node");
+            return (-1);
+        case XML_ENTITY_REF_NODE:
+            xmlC14NErrInvalidNode("XML_ENTITY_REF_NODE", "processing node");
+            return (-1);
+        case XML_ENTITY_NODE:
+            xmlC14NErrInvalidNode("XML_ENTITY_NODE", "processing node");
+            return (-1);
+
+        case XML_DOCUMENT_TYPE_NODE:
+        case XML_NOTATION_NODE:
+        case XML_DTD_NODE:
+        case XML_ELEMENT_DECL:
+        case XML_ATTRIBUTE_DECL:
+        case XML_ENTITY_DECL:
+#ifdef LIBXML_XINCLUDE_ENABLED
+        case XML_XINCLUDE_START:
+        case XML_XINCLUDE_END:
+#endif
+            /*
+             * should be ignored according to "W3C Canonical XML"
+             */
+            break;
+        default:
+            xmlC14NErrUnknownNode(cur->type, "processing node");
+            return (-1);
+    }
+
+    return (ret);
+}
+
+/**
+ * xmlC14NProcessNodeList:
+ * @ctx:		the pointer to C14N context object
+ * @cur:		the node to start from
+ *
+ * Processes all nodes in the row starting from cur.
+ *
+ * Returns non-negative value on success or negative value on fail
+ */
+static int
+xmlC14NProcessNodeList(xmlC14NCtxPtr ctx, xmlNodePtr cur)
+{
+    int ret;
+
+    if (ctx == NULL) {
+        xmlC14NErrParam("processing node list");
+        return (-1);
+    }
+
+    for (ret = 0; cur != NULL && ret >= 0; cur = cur->next) {
+        ret = xmlC14NProcessNode(ctx, cur);
+    }
+    return (ret);
+}
+
+
+/**
+ * xmlC14NFreeCtx:
+ * @ctx: the pointer to C14N context object
+ *
+ * Cleanups the C14N context object.
+ */
+
+static void
+xmlC14NFreeCtx(xmlC14NCtxPtr ctx)
+{
+    if (ctx == NULL) {
+        xmlC14NErrParam("freeing context");
+        return;
+    }
+
+    if (ctx->ns_rendered != NULL) {
+        xmlC14NVisibleNsStackDestroy(ctx->ns_rendered);
+    }
+    xmlFree(ctx);
+}
+
+/**
+ * xmlC14NNewCtx:
+ * @doc:		the XML document for canonization
+ * @is_visible_callback:the function to use to determine is node visible
+ *			or not
+ * @user_data:		the first parameter for @is_visible_callback function
+ *			(in most cases, it is nodes set)
+ * @mode:   the c14n mode (see @xmlC14NMode)
+ * @inclusive_ns_prefixe the list of inclusive namespace prefixes
+ *			ended with a NULL or NULL if there is no
+ *			inclusive namespaces (only for `
+ *			canonicalization)
+ * @with_comments:	include comments in the result (!=0) or not (==0)
+ * @buf:		the output buffer to store canonical XML; this
+ *			buffer MUST have encoder==NULL because C14N requires
+ *			UTF-8 output
+ *
+ * Creates new C14N context object to store C14N parameters.
+ *
+ * Returns pointer to newly created object (success) or NULL (fail)
+ */
+static xmlC14NCtxPtr
+xmlC14NNewCtx(xmlDocPtr doc,
+	      xmlC14NIsVisibleCallback is_visible_callback, void* user_data,
+              xmlC14NMode mode, xmlChar ** inclusive_ns_prefixes,
+              int with_comments, xmlOutputBufferPtr buf)
+{
+    xmlC14NCtxPtr ctx = NULL;
+
+    if ((doc == NULL) || (buf == NULL)) {
+        xmlC14NErrParam("creating new context");
+        return (NULL);
+    }
+
+    /*
+     *  Validate the encoding output buffer encoding
+     */
+    if (buf->encoder != NULL) {
+        xmlC14NErr(ctx, (xmlNodePtr) doc, XML_C14N_REQUIRES_UTF8,
+"xmlC14NNewCtx: output buffer encoder != NULL but C14N requires UTF8 output\n");
+        return (NULL);
+    }
+
+    /*
+     * Allocate a new xmlC14NCtxPtr and fill the fields.
+     */
+    ctx = (xmlC14NCtxPtr) xmlMalloc(sizeof(xmlC14NCtx));
+    if (ctx == NULL) {
+	xmlC14NErrMemory("creating context");
+        return (NULL);
+    }
+    memset(ctx, 0, sizeof(xmlC14NCtx));
+
+    /*
+     * initialize C14N context
+     */
+    ctx->doc = doc;
+    ctx->with_comments = with_comments;
+    ctx->is_visible_callback = is_visible_callback;
+    ctx->user_data = user_data;
+    ctx->buf = buf;
+    ctx->parent_is_doc = 1;
+    ctx->pos = XMLC14N_BEFORE_DOCUMENT_ELEMENT;
+    ctx->ns_rendered = xmlC14NVisibleNsStackCreate();
+
+    if(ctx->ns_rendered == NULL) {
+        xmlC14NErr(ctx, (xmlNodePtr) doc, XML_C14N_CREATE_STACK,
+		   "xmlC14NNewCtx: xmlC14NVisibleNsStackCreate failed\n");
+	xmlC14NFreeCtx(ctx);
+        return (NULL);
+    }
+
+    /*
      * Set "mode" flag and remember list of inclusive prefixes
-     * for exclusive c14n 
-     */ 
-    ctx->mode = mode; 
-    if(xmlC14NIsExclusive(ctx)) { 
-        ctx->inclusive_ns_prefixes = inclusive_ns_prefixes; 
-    } 
-    return (ctx); 
-} 
- 
-/** 
- * xmlC14NExecute: 
- * @doc:		the XML document for canonization 
- * @is_visible_callback:the function to use to determine is node visible 
- *			or not 
- * @user_data:		the first parameter for @is_visible_callback function 
- *			(in most cases, it is nodes set) 
- * @mode:	the c14n mode (see @xmlC14NMode) 
- * @inclusive_ns_prefixes: the list of inclusive namespace prefixes 
- *			ended with a NULL or NULL if there is no 
- *			inclusive namespaces (only for exclusive 
- *			canonicalization, ignored otherwise) 
- * @with_comments:	include comments in the result (!=0) or not (==0) 
- * @buf:		the output buffer to store canonical XML; this 
- *			buffer MUST have encoder==NULL because C14N requires 
- *			UTF-8 output 
- * 
- * Dumps the canonized image of given XML document into the provided buffer. 
- * For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or 
- * "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n) 
- * 
- * Returns non-negative value on success or a negative value on fail 
- */ 
-int 
-xmlC14NExecute(xmlDocPtr doc, xmlC14NIsVisibleCallback is_visible_callback, 
-	 void* user_data, int mode, xmlChar **inclusive_ns_prefixes, 
-	 int with_comments, xmlOutputBufferPtr buf) { 
- 
-    xmlC14NCtxPtr ctx; 
-    xmlC14NMode c14n_mode = XML_C14N_1_0; 
-    int ret; 
- 
-    if ((buf == NULL) || (doc == NULL)) { 
-        xmlC14NErrParam("executing c14n"); 
-        return (-1); 
-    } 
- 
-    /* for backward compatibility, we have to have "mode" as "int" 
-       and here we check that user gives valid value */ 
-    switch(mode) { 
-    case XML_C14N_1_0: 
-    case XML_C14N_EXCLUSIVE_1_0: 
-    case XML_C14N_1_1: 
-         c14n_mode = (xmlC14NMode)mode; 
-         break; 
-    default: 
-        xmlC14NErrParam("invalid mode for executing c14n"); 
-        return (-1); 
-    } 
- 
-    /* 
-     *  Validate the encoding output buffer encoding 
-     */ 
-    if (buf->encoder != NULL) { 
-        xmlC14NErr(NULL, (xmlNodePtr) doc, XML_C14N_REQUIRES_UTF8, 
-"xmlC14NExecute: output buffer encoder != NULL but C14N requires UTF8 output\n"); 
-        return (-1); 
-    } 
- 
-    ctx = xmlC14NNewCtx(doc, is_visible_callback, user_data, 
-	            c14n_mode, inclusive_ns_prefixes, 
-                    with_comments, buf); 
-    if (ctx == NULL) { 
-        xmlC14NErr(NULL, (xmlNodePtr) doc, XML_C14N_CREATE_CTXT, 
-		   "xmlC14NExecute: unable to create C14N context\n"); 
-        return (-1); 
-    } 
- 
- 
- 
-    /* 
-     * Root Node 
-     * The root node is the parent of the top-level document element. The 
-     * result of processing each of its child nodes that is in the node-set 
-     * in document order. The root node does not generate a byte order mark, 
-     * XML declaration, nor anything from within the document type 
-     * declaration. 
-     */ 
-    if (doc->children != NULL) { 
-        ret = xmlC14NProcessNodeList(ctx, doc->children); 
-        if (ret < 0) { 
-            xmlC14NErrInternal("processing docs children list"); 
-            xmlC14NFreeCtx(ctx); 
-            return (-1); 
-        } 
-    } 
- 
-    /* 
-     * Flush buffer to get number of bytes written 
-     */ 
-    ret = xmlOutputBufferFlush(buf); 
-    if (ret < 0) { 
-        xmlC14NErrInternal("flushing output buffer"); 
-        xmlC14NFreeCtx(ctx); 
-        return (-1); 
-    } 
- 
-    /* 
-     * Cleanup 
-     */ 
-    xmlC14NFreeCtx(ctx); 
-    return (ret); 
-} 
- 
-/** 
- * xmlC14NDocSaveTo: 
- * @doc:		the XML document for canonization 
- * @nodes:		the nodes set to be included in the canonized image 
- *		or NULL if all document nodes should be included 
- * @mode:		the c14n mode (see @xmlC14NMode) 
- * @inclusive_ns_prefixes: the list of inclusive namespace prefixes 
- *			ended with a NULL or NULL if there is no 
- *			inclusive namespaces (only for exclusive 
- *			canonicalization, ignored otherwise) 
- * @with_comments:	include comments in the result (!=0) or not (==0) 
- * @buf:		the output buffer to store canonical XML; this 
- *			buffer MUST have encoder==NULL because C14N requires 
- *			UTF-8 output 
- * 
- * Dumps the canonized image of given XML document into the provided buffer. 
- * For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or 
- * "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n) 
- * 
- * Returns non-negative value on success or a negative value on fail 
- */ 
-int 
-xmlC14NDocSaveTo(xmlDocPtr doc, xmlNodeSetPtr nodes, 
-                 int mode, xmlChar ** inclusive_ns_prefixes, 
-                 int with_comments, xmlOutputBufferPtr buf) { 
-    return(xmlC14NExecute(doc, 
+     * for exclusive c14n
+     */
+    ctx->mode = mode;
+    if(xmlC14NIsExclusive(ctx)) {
+        ctx->inclusive_ns_prefixes = inclusive_ns_prefixes;
+    }
+    return (ctx);
+}
+
+/**
+ * xmlC14NExecute:
+ * @doc:		the XML document for canonization
+ * @is_visible_callback:the function to use to determine is node visible
+ *			or not
+ * @user_data:		the first parameter for @is_visible_callback function
+ *			(in most cases, it is nodes set)
+ * @mode:	the c14n mode (see @xmlC14NMode)
+ * @inclusive_ns_prefixes: the list of inclusive namespace prefixes
+ *			ended with a NULL or NULL if there is no
+ *			inclusive namespaces (only for exclusive
+ *			canonicalization, ignored otherwise)
+ * @with_comments:	include comments in the result (!=0) or not (==0)
+ * @buf:		the output buffer to store canonical XML; this
+ *			buffer MUST have encoder==NULL because C14N requires
+ *			UTF-8 output
+ *
+ * Dumps the canonized image of given XML document into the provided buffer.
+ * For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or
+ * "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
+ *
+ * Returns non-negative value on success or a negative value on fail
+ */
+int
+xmlC14NExecute(xmlDocPtr doc, xmlC14NIsVisibleCallback is_visible_callback,
+	 void* user_data, int mode, xmlChar **inclusive_ns_prefixes,
+	 int with_comments, xmlOutputBufferPtr buf) {
+
+    xmlC14NCtxPtr ctx;
+    xmlC14NMode c14n_mode = XML_C14N_1_0;
+    int ret;
+
+    if ((buf == NULL) || (doc == NULL)) {
+        xmlC14NErrParam("executing c14n");
+        return (-1);
+    }
+
+    /* for backward compatibility, we have to have "mode" as "int"
+       and here we check that user gives valid value */
+    switch(mode) {
+    case XML_C14N_1_0:
+    case XML_C14N_EXCLUSIVE_1_0:
+    case XML_C14N_1_1:
+         c14n_mode = (xmlC14NMode)mode;
+         break;
+    default:
+        xmlC14NErrParam("invalid mode for executing c14n");
+        return (-1);
+    }
+
+    /*
+     *  Validate the encoding output buffer encoding
+     */
+    if (buf->encoder != NULL) {
+        xmlC14NErr(NULL, (xmlNodePtr) doc, XML_C14N_REQUIRES_UTF8,
+"xmlC14NExecute: output buffer encoder != NULL but C14N requires UTF8 output\n");
+        return (-1);
+    }
+
+    ctx = xmlC14NNewCtx(doc, is_visible_callback, user_data,
+	            c14n_mode, inclusive_ns_prefixes,
+                    with_comments, buf);
+    if (ctx == NULL) {
+        xmlC14NErr(NULL, (xmlNodePtr) doc, XML_C14N_CREATE_CTXT,
+		   "xmlC14NExecute: unable to create C14N context\n");
+        return (-1);
+    }
+
+
+
+    /*
+     * Root Node
+     * The root node is the parent of the top-level document element. The
+     * result of processing each of its child nodes that is in the node-set
+     * in document order. The root node does not generate a byte order mark,
+     * XML declaration, nor anything from within the document type
+     * declaration.
+     */
+    if (doc->children != NULL) {
+        ret = xmlC14NProcessNodeList(ctx, doc->children);
+        if (ret < 0) {
+            xmlC14NErrInternal("processing docs children list");
+            xmlC14NFreeCtx(ctx);
+            return (-1);
+        }
+    }
+
+    /*
+     * Flush buffer to get number of bytes written
+     */
+    ret = xmlOutputBufferFlush(buf);
+    if (ret < 0) {
+        xmlC14NErrInternal("flushing output buffer");
+        xmlC14NFreeCtx(ctx);
+        return (-1);
+    }
+
+    /*
+     * Cleanup
+     */
+    xmlC14NFreeCtx(ctx);
+    return (ret);
+}
+
+/**
+ * xmlC14NDocSaveTo:
+ * @doc:		the XML document for canonization
+ * @nodes:		the nodes set to be included in the canonized image
+ *		or NULL if all document nodes should be included
+ * @mode:		the c14n mode (see @xmlC14NMode)
+ * @inclusive_ns_prefixes: the list of inclusive namespace prefixes
+ *			ended with a NULL or NULL if there is no
+ *			inclusive namespaces (only for exclusive
+ *			canonicalization, ignored otherwise)
+ * @with_comments:	include comments in the result (!=0) or not (==0)
+ * @buf:		the output buffer to store canonical XML; this
+ *			buffer MUST have encoder==NULL because C14N requires
+ *			UTF-8 output
+ *
+ * Dumps the canonized image of given XML document into the provided buffer.
+ * For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or
+ * "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
+ *
+ * Returns non-negative value on success or a negative value on fail
+ */
+int
+xmlC14NDocSaveTo(xmlDocPtr doc, xmlNodeSetPtr nodes,
+                 int mode, xmlChar ** inclusive_ns_prefixes,
+                 int with_comments, xmlOutputBufferPtr buf) {
+    return(xmlC14NExecute(doc,
 			xmlC14NIsNodeInNodeset,
-			nodes, 
-			mode, 
-			inclusive_ns_prefixes, 
-			with_comments, 
-			buf)); 
-} 
- 
- 
-/** 
- * xmlC14NDocDumpMemory: 
- * @doc:		the XML document for canonization 
- * @nodes:		the nodes set to be included in the canonized image 
- *		or NULL if all document nodes should be included 
- * @mode:		the c14n mode (see @xmlC14NMode) 
- * @inclusive_ns_prefixes: the list of inclusive namespace prefixes 
- *			ended with a NULL or NULL if there is no 
- *			inclusive namespaces (only for exclusive 
- *			canonicalization, ignored otherwise) 
- * @with_comments:	include comments in the result (!=0) or not (==0) 
- * @doc_txt_ptr:	the memory pointer for allocated canonical XML text; 
- *			the caller of this functions is responsible for calling 
- *			xmlFree() to free allocated memory 
- * 
- * Dumps the canonized image of given XML document into memory. 
- * For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or 
- * "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n) 
- * 
- * Returns the number of bytes written on success or a negative value on fail 
- */ 
-int 
-xmlC14NDocDumpMemory(xmlDocPtr doc, xmlNodeSetPtr nodes, 
-                     int mode, xmlChar ** inclusive_ns_prefixes, 
-                     int with_comments, xmlChar ** doc_txt_ptr) 
-{ 
-    int ret; 
-    xmlOutputBufferPtr buf; 
- 
-    if (doc_txt_ptr == NULL) { 
-        xmlC14NErrParam("dumping doc to memory"); 
-        return (-1); 
-    } 
- 
-    *doc_txt_ptr = NULL; 
- 
-    /* 
-     * create memory buffer with UTF8 (default) encoding 
-     */ 
-    buf = xmlAllocOutputBuffer(NULL); 
-    if (buf == NULL) { 
-        xmlC14NErrMemory("creating output buffer"); 
-        return (-1); 
-    } 
- 
-    /* 
-     * canonize document and write to buffer 
-     */ 
-    ret = xmlC14NDocSaveTo(doc, nodes, mode, inclusive_ns_prefixes, 
-                           with_comments, buf); 
-    if (ret < 0) { 
-        xmlC14NErrInternal("saving doc to output buffer"); 
-        (void) xmlOutputBufferClose(buf); 
-        return (-1); 
-    } 
- 
-    ret = xmlBufUse(buf->buffer); 
-    if (ret > 0) { 
-        *doc_txt_ptr = xmlStrndup(xmlBufContent(buf->buffer), ret); 
-    } 
-    (void) xmlOutputBufferClose(buf); 
- 
-    if ((*doc_txt_ptr == NULL) && (ret > 0)) { 
+			nodes,
+			mode,
+			inclusive_ns_prefixes,
+			with_comments,
+			buf));
+}
+
+
+/**
+ * xmlC14NDocDumpMemory:
+ * @doc:		the XML document for canonization
+ * @nodes:		the nodes set to be included in the canonized image
+ *		or NULL if all document nodes should be included
+ * @mode:		the c14n mode (see @xmlC14NMode)
+ * @inclusive_ns_prefixes: the list of inclusive namespace prefixes
+ *			ended with a NULL or NULL if there is no
+ *			inclusive namespaces (only for exclusive
+ *			canonicalization, ignored otherwise)
+ * @with_comments:	include comments in the result (!=0) or not (==0)
+ * @doc_txt_ptr:	the memory pointer for allocated canonical XML text;
+ *			the caller of this functions is responsible for calling
+ *			xmlFree() to free allocated memory
+ *
+ * Dumps the canonized image of given XML document into memory.
+ * For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or
+ * "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
+ *
+ * Returns the number of bytes written on success or a negative value on fail
+ */
+int
+xmlC14NDocDumpMemory(xmlDocPtr doc, xmlNodeSetPtr nodes,
+                     int mode, xmlChar ** inclusive_ns_prefixes,
+                     int with_comments, xmlChar ** doc_txt_ptr)
+{
+    int ret;
+    xmlOutputBufferPtr buf;
+
+    if (doc_txt_ptr == NULL) {
+        xmlC14NErrParam("dumping doc to memory");
+        return (-1);
+    }
+
+    *doc_txt_ptr = NULL;
+
+    /*
+     * create memory buffer with UTF8 (default) encoding
+     */
+    buf = xmlAllocOutputBuffer(NULL);
+    if (buf == NULL) {
+        xmlC14NErrMemory("creating output buffer");
+        return (-1);
+    }
+
+    /*
+     * canonize document and write to buffer
+     */
+    ret = xmlC14NDocSaveTo(doc, nodes, mode, inclusive_ns_prefixes,
+                           with_comments, buf);
+    if (ret < 0) {
+        xmlC14NErrInternal("saving doc to output buffer");
+        (void) xmlOutputBufferClose(buf);
+        return (-1);
+    }
+
+    ret = xmlBufUse(buf->buffer);
+    if (ret > 0) {
+        *doc_txt_ptr = xmlStrndup(xmlBufContent(buf->buffer), ret);
+    }
+    (void) xmlOutputBufferClose(buf);
+
+    if ((*doc_txt_ptr == NULL) && (ret > 0)) {
         xmlC14NErrMemory("coping canonicalized document");
-        return (-1); 
-    } 
-    return (ret); 
-} 
- 
-/** 
- * xmlC14NDocSave: 
- * @doc:		the XML document for canonization 
- * @nodes:		the nodes set to be included in the canonized image 
- *		or NULL if all document nodes should be included 
- * @mode:		the c14n mode (see @xmlC14NMode) 
- * @inclusive_ns_prefixes: the list of inclusive namespace prefixes 
- *			ended with a NULL or NULL if there is no 
- *			inclusive namespaces (only for exclusive 
- *			canonicalization, ignored otherwise) 
- * @with_comments:	include comments in the result (!=0) or not (==0) 
- * @filename:		the filename to store canonical XML image 
+        return (-1);
+    }
+    return (ret);
+}
+
+/**
+ * xmlC14NDocSave:
+ * @doc:		the XML document for canonization
+ * @nodes:		the nodes set to be included in the canonized image
+ *		or NULL if all document nodes should be included
+ * @mode:		the c14n mode (see @xmlC14NMode)
+ * @inclusive_ns_prefixes: the list of inclusive namespace prefixes
+ *			ended with a NULL or NULL if there is no
+ *			inclusive namespaces (only for exclusive
+ *			canonicalization, ignored otherwise)
+ * @with_comments:	include comments in the result (!=0) or not (==0)
+ * @filename:		the filename to store canonical XML image
  * @compression:	the compression level (zlib required):
- *				-1 - libxml default, 
- *				 0 - uncompressed, 
- *				>0 - compression level 
- * 
- * Dumps the canonized image of given XML document into the file. 
- * For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or 
- * "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n) 
- * 
- * Returns the number of bytes written success or a negative value on fail 
- */ 
-int 
-xmlC14NDocSave(xmlDocPtr doc, xmlNodeSetPtr nodes, 
-               int mode, xmlChar ** inclusive_ns_prefixes, 
-               int with_comments, const char *filename, int compression) 
-{ 
-    xmlOutputBufferPtr buf; 
-    int ret; 
- 
-    if (filename == NULL) { 
-        xmlC14NErrParam("saving doc"); 
-        return (-1); 
-    } 
+ *				-1 - libxml default,
+ *				 0 - uncompressed,
+ *				>0 - compression level
+ *
+ * Dumps the canonized image of given XML document into the file.
+ * For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or
+ * "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
+ *
+ * Returns the number of bytes written success or a negative value on fail
+ */
+int
+xmlC14NDocSave(xmlDocPtr doc, xmlNodeSetPtr nodes,
+               int mode, xmlChar ** inclusive_ns_prefixes,
+               int with_comments, const char *filename, int compression)
+{
+    xmlOutputBufferPtr buf;
+    int ret;
+
+    if (filename == NULL) {
+        xmlC14NErrParam("saving doc");
+        return (-1);
+    }
 #ifdef LIBXML_ZLIB_ENABLED
-    if (compression < 0) 
-        compression = xmlGetCompressMode(); 
-#endif 
- 
-    /* 
-     * save the content to a temp buffer, use default UTF8 encoding. 
-     */ 
-    buf = xmlOutputBufferCreateFilename(filename, NULL, compression); 
-    if (buf == NULL) { 
-        xmlC14NErrInternal("creating temporary filename"); 
-        return (-1); 
-    } 
- 
-    /* 
-     * canonize document and write to buffer 
-     */ 
-    ret = xmlC14NDocSaveTo(doc, nodes, mode, inclusive_ns_prefixes, 
-                           with_comments, buf); 
-    if (ret < 0) { 
+    if (compression < 0)
+        compression = xmlGetCompressMode();
+#endif
+
+    /*
+     * save the content to a temp buffer, use default UTF8 encoding.
+     */
+    buf = xmlOutputBufferCreateFilename(filename, NULL, compression);
+    if (buf == NULL) {
+        xmlC14NErrInternal("creating temporary filename");
+        return (-1);
+    }
+
+    /*
+     * canonize document and write to buffer
+     */
+    ret = xmlC14NDocSaveTo(doc, nodes, mode, inclusive_ns_prefixes,
+                           with_comments, buf);
+    if (ret < 0) {
         xmlC14NErrInternal("canonize document to buffer");
-        (void) xmlOutputBufferClose(buf); 
-        return (-1); 
-    } 
- 
-    /* 
-     * get the numbers of bytes written 
-     */ 
-    ret = xmlOutputBufferClose(buf); 
-    return (ret); 
-} 
- 
- 
- 
-/* 
- * Macro used to grow the current buffer. 
- */ 
-#define growBufferReentrant() {						\ 
-    buffer_size *= 2;							\ 
-    buffer = (xmlChar *)						\ 
-		xmlRealloc(buffer, buffer_size * sizeof(xmlChar));	\ 
-    if (buffer == NULL) {						\ 
-	xmlC14NErrMemory("growing buffer");				\ 
-	return(NULL);							\ 
-    }									\ 
-} 
- 
-/** 
- * xmlC11NNormalizeString: 
- * @input:		the input string 
- * @mode:		the normalization mode (attribute, comment, PI or text) 
- * 
- * Converts a string to a canonical (normalized) format. The code is stolen 
- * from xmlEncodeEntitiesReentrant(). Added normalization of \x09, \x0a, \x0A 
- * and the @mode parameter 
- * 
- * Returns a normalized string (caller is responsible for calling xmlFree()) 
- * or NULL if an error occurs 
- */ 
-static xmlChar * 
-xmlC11NNormalizeString(const xmlChar * input, 
-                       xmlC14NNormalizationMode mode) 
-{ 
-    const xmlChar *cur = input; 
-    xmlChar *buffer = NULL; 
-    xmlChar *out = NULL; 
-    int buffer_size = 0; 
- 
-    if (input == NULL) 
-        return (NULL); 
- 
-    /* 
-     * allocate an translation buffer. 
-     */ 
-    buffer_size = 1000; 
-    buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar)); 
-    if (buffer == NULL) { 
-	xmlC14NErrMemory("allocating buffer"); 
-        return (NULL); 
-    } 
-    out = buffer; 
- 
-    while (*cur != '\0') { 
-        if ((out - buffer) > (buffer_size - 10)) { 
-            int indx = out - buffer; 
- 
-            growBufferReentrant(); 
-            out = &buffer[indx]; 
-        } 
- 
-        if ((*cur == '<') && ((mode == XMLC14N_NORMALIZE_ATTR) || 
-                              (mode == XMLC14N_NORMALIZE_TEXT))) { 
-            *out++ = '&'; 
-            *out++ = 'l'; 
-            *out++ = 't'; 
-            *out++ = ';'; 
-        } else if ((*cur == '>') && (mode == XMLC14N_NORMALIZE_TEXT)) { 
-            *out++ = '&'; 
-            *out++ = 'g'; 
-            *out++ = 't'; 
-            *out++ = ';'; 
-        } else if ((*cur == '&') && ((mode == XMLC14N_NORMALIZE_ATTR) || 
-                                     (mode == XMLC14N_NORMALIZE_TEXT))) { 
-            *out++ = '&'; 
-            *out++ = 'a'; 
-            *out++ = 'm'; 
-            *out++ = 'p'; 
-            *out++ = ';'; 
-        } else if ((*cur == '"') && (mode == XMLC14N_NORMALIZE_ATTR)) { 
-            *out++ = '&'; 
-            *out++ = 'q'; 
-            *out++ = 'u'; 
-            *out++ = 'o'; 
-            *out++ = 't'; 
-            *out++ = ';'; 
-        } else if ((*cur == '\x09') && (mode == XMLC14N_NORMALIZE_ATTR)) { 
-            *out++ = '&'; 
-            *out++ = '#'; 
-            *out++ = 'x'; 
-            *out++ = '9'; 
-            *out++ = ';'; 
-        } else if ((*cur == '\x0A') && (mode == XMLC14N_NORMALIZE_ATTR)) { 
-            *out++ = '&'; 
-            *out++ = '#'; 
-            *out++ = 'x'; 
-            *out++ = 'A'; 
-            *out++ = ';'; 
-        } else if ((*cur == '\x0D') && ((mode == XMLC14N_NORMALIZE_ATTR) || 
-                                        (mode == XMLC14N_NORMALIZE_TEXT) || 
-                                        (mode == XMLC14N_NORMALIZE_COMMENT) || 
-					(mode == XMLC14N_NORMALIZE_PI))) { 
-            *out++ = '&'; 
-            *out++ = '#'; 
-            *out++ = 'x'; 
-            *out++ = 'D'; 
-            *out++ = ';'; 
-        } else { 
-            /* 
-             * Works because on UTF-8, all extended sequences cannot 
-             * result in bytes in the ASCII range. 
-             */ 
-            *out++ = *cur; 
-        } 
-        cur++; 
-    } 
-    *out = 0; 
-    return (buffer); 
-} 
-#endif /* LIBXML_OUTPUT_ENABLED */ 
-#define bottom_c14n 
-#include "elfgcchack.h" 
-#endif /* LIBXML_C14N_ENABLED */ 
+        (void) xmlOutputBufferClose(buf);
+        return (-1);
+    }
+
+    /*
+     * get the numbers of bytes written
+     */
+    ret = xmlOutputBufferClose(buf);
+    return (ret);
+}
+
+
+
+/*
+ * Macro used to grow the current buffer.
+ */
+#define growBufferReentrant() {						\
+    buffer_size *= 2;							\
+    buffer = (xmlChar *)						\
+		xmlRealloc(buffer, buffer_size * sizeof(xmlChar));	\
+    if (buffer == NULL) {						\
+	xmlC14NErrMemory("growing buffer");				\
+	return(NULL);							\
+    }									\
+}
+
+/**
+ * xmlC11NNormalizeString:
+ * @input:		the input string
+ * @mode:		the normalization mode (attribute, comment, PI or text)
+ *
+ * Converts a string to a canonical (normalized) format. The code is stolen
+ * from xmlEncodeEntitiesReentrant(). Added normalization of \x09, \x0a, \x0A
+ * and the @mode parameter
+ *
+ * Returns a normalized string (caller is responsible for calling xmlFree())
+ * or NULL if an error occurs
+ */
+static xmlChar *
+xmlC11NNormalizeString(const xmlChar * input,
+                       xmlC14NNormalizationMode mode)
+{
+    const xmlChar *cur = input;
+    xmlChar *buffer = NULL;
+    xmlChar *out = NULL;
+    int buffer_size = 0;
+
+    if (input == NULL)
+        return (NULL);
+
+    /*
+     * allocate an translation buffer.
+     */
+    buffer_size = 1000;
+    buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar));
+    if (buffer == NULL) {
+	xmlC14NErrMemory("allocating buffer");
+        return (NULL);
+    }
+    out = buffer;
+
+    while (*cur != '\0') {
+        if ((out - buffer) > (buffer_size - 10)) {
+            int indx = out - buffer;
+
+            growBufferReentrant();
+            out = &buffer[indx];
+        }
+
+        if ((*cur == '<') && ((mode == XMLC14N_NORMALIZE_ATTR) ||
+                              (mode == XMLC14N_NORMALIZE_TEXT))) {
+            *out++ = '&';
+            *out++ = 'l';
+            *out++ = 't';
+            *out++ = ';';
+        } else if ((*cur == '>') && (mode == XMLC14N_NORMALIZE_TEXT)) {
+            *out++ = '&';
+            *out++ = 'g';
+            *out++ = 't';
+            *out++ = ';';
+        } else if ((*cur == '&') && ((mode == XMLC14N_NORMALIZE_ATTR) ||
+                                     (mode == XMLC14N_NORMALIZE_TEXT))) {
+            *out++ = '&';
+            *out++ = 'a';
+            *out++ = 'm';
+            *out++ = 'p';
+            *out++ = ';';
+        } else if ((*cur == '"') && (mode == XMLC14N_NORMALIZE_ATTR)) {
+            *out++ = '&';
+            *out++ = 'q';
+            *out++ = 'u';
+            *out++ = 'o';
+            *out++ = 't';
+            *out++ = ';';
+        } else if ((*cur == '\x09') && (mode == XMLC14N_NORMALIZE_ATTR)) {
+            *out++ = '&';
+            *out++ = '#';
+            *out++ = 'x';
+            *out++ = '9';
+            *out++ = ';';
+        } else if ((*cur == '\x0A') && (mode == XMLC14N_NORMALIZE_ATTR)) {
+            *out++ = '&';
+            *out++ = '#';
+            *out++ = 'x';
+            *out++ = 'A';
+            *out++ = ';';
+        } else if ((*cur == '\x0D') && ((mode == XMLC14N_NORMALIZE_ATTR) ||
+                                        (mode == XMLC14N_NORMALIZE_TEXT) ||
+                                        (mode == XMLC14N_NORMALIZE_COMMENT) ||
+					(mode == XMLC14N_NORMALIZE_PI))) {
+            *out++ = '&';
+            *out++ = '#';
+            *out++ = 'x';
+            *out++ = 'D';
+            *out++ = ';';
+        } else {
+            /*
+             * Works because on UTF-8, all extended sequences cannot
+             * result in bytes in the ASCII range.
+             */
+            *out++ = *cur;
+        }
+        cur++;
+    }
+    *out = 0;
+    return (buffer);
+}
+#endif /* LIBXML_OUTPUT_ENABLED */
+#define bottom_c14n
+#include "elfgcchack.h"
+#endif /* LIBXML_C14N_ENABLED */

Some files were not shown because too many files changed in this diff