diff --git a/doc/devhelp/libxml2-HTMLparser.html b/doc/devhelp/libxml2-HTMLparser.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1IVE1McGFyc2VyLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1IVE1McGFyc2VyLmh0bWw= 100644
--- a/doc/devhelp/libxml2-HTMLparser.html
+++ b/doc/devhelp/libxml2-HTMLparser.html
@@ -41,6 +41,11 @@
       <pre class="synopsis">#define <a href="#htmlDefaultSubelement">htmlDefaultSubelement</a>(elt);
 #define <a href="#htmlElementAllowedHereDesc">htmlElementAllowedHereDesc</a>(parent, elt);
 #define <a href="#htmlRequiredAttrs">htmlRequiredAttrs</a>(elt);
-typedef <a href="libxml2-parser.html#xmlParserNodeInfo">xmlParserNodeInfo</a> <a href="#htmlParserNodeInfo">htmlParserNodeInfo</a>;
-typedef <a href="libxml2-tree.html#xmlParserInput">xmlParserInput</a> <a href="#htmlParserInput">htmlParserInput</a>;
+typedef <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> <a href="#htmlDocPtr">htmlDocPtr</a>;
+typedef struct _htmlElemDesc <a href="#htmlElemDesc">htmlElemDesc</a>;
+typedef <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * <a href="#htmlElemDescPtr">htmlElemDescPtr</a>;
+typedef struct _htmlEntityDesc <a href="#htmlEntityDesc">htmlEntityDesc</a>;
+typedef <a href="libxml2-HTMLparser.html#htmlEntityDesc">htmlEntityDesc</a> * <a href="#htmlEntityDescPtr">htmlEntityDescPtr</a>;
+typedef <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> <a href="#htmlNodePtr">htmlNodePtr</a>;
+typedef <a href="libxml2-tree.html#xmlParserCtxt">xmlParserCtxt</a> <a href="#htmlParserCtxt">htmlParserCtxt</a>;
 typedef <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> <a href="#htmlParserCtxtPtr">htmlParserCtxtPtr</a>;
@@ -46,5 +51,8 @@
 typedef <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> <a href="#htmlParserCtxtPtr">htmlParserCtxtPtr</a>;
-typedef struct _htmlEntityDesc <a href="#htmlEntityDesc">htmlEntityDesc</a>;
-typedef <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> <a href="#htmlDocPtr">htmlDocPtr</a>;
+typedef <a href="libxml2-tree.html#xmlParserInput">xmlParserInput</a> <a href="#htmlParserInput">htmlParserInput</a>;
+typedef <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> <a href="#htmlParserInputPtr">htmlParserInputPtr</a>;
+typedef <a href="libxml2-parser.html#xmlParserNodeInfo">xmlParserNodeInfo</a> <a href="#htmlParserNodeInfo">htmlParserNodeInfo</a>;
+typedef enum <a href="#htmlParserOption">htmlParserOption</a>;
+typedef <a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> <a href="#htmlSAXHandler">htmlSAXHandler</a>;
 typedef <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> <a href="#htmlSAXHandlerPtr">htmlSAXHandlerPtr</a>;
 typedef enum <a href="#htmlStatus">htmlStatus</a>;
@@ -49,11 +57,23 @@
 typedef <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> <a href="#htmlSAXHandlerPtr">htmlSAXHandlerPtr</a>;
 typedef enum <a href="#htmlStatus">htmlStatus</a>;
-typedef <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> <a href="#htmlNodePtr">htmlNodePtr</a>;
-typedef <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * <a href="#htmlElemDescPtr">htmlElemDescPtr</a>;
-typedef struct _htmlElemDesc <a href="#htmlElemDesc">htmlElemDesc</a>;
-typedef <a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> <a href="#htmlSAXHandler">htmlSAXHandler</a>;
-typedef <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> <a href="#htmlParserInputPtr">htmlParserInputPtr</a>;
-typedef enum <a href="#htmlParserOption">htmlParserOption</a>;
-typedef <a href="libxml2-HTMLparser.html#htmlEntityDesc">htmlEntityDesc</a> * <a href="#htmlEntityDescPtr">htmlEntityDescPtr</a>;
-typedef <a href="libxml2-tree.html#xmlParserCtxt">xmlParserCtxt</a> <a href="#htmlParserCtxt">htmlParserCtxt</a>;
+int	<a href="#UTF8ToHtml">UTF8ToHtml</a>			(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
+<a href="libxml2-HTMLparser.html#htmlStatus">htmlStatus</a>	<a href="#htmlAttrAllowed">htmlAttrAllowed</a>		(const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * elt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * attr, <br/>					 int legacy);
+int	<a href="#htmlAutoCloseTag">htmlAutoCloseTag</a>		(<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-HTMLparser.html#htmlNodePtr">htmlNodePtr</a> elem);
+<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a>	<a href="#htmlCreateMemoryParserCtxt">htmlCreateMemoryParserCtxt</a>	(const char * buffer, <br/>							 int size);
+<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a>	<a href="#htmlCreatePushParserCtxt">htmlCreatePushParserCtxt</a>	(<a href="libxml2-HTMLparser.html#htmlSAXHandlerPtr">htmlSAXHandlerPtr</a> sax, <br/>							 void * user_data, <br/>							 const char * chunk, <br/>							 int size, <br/>							 const char * filename, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadDoc">htmlCtxtReadDoc</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadFd">htmlCtxtReadFd</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadFile">htmlCtxtReadFile</a>	(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 const char * filename, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadIO">htmlCtxtReadIO</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadMemory">htmlCtxtReadMemory</a>	(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+void	<a href="#htmlCtxtReset">htmlCtxtReset</a>			(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
+int	<a href="#htmlCtxtUseOptions">htmlCtxtUseOptions</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 int options);
+int	<a href="#htmlElementAllowedHere">htmlElementAllowedHere</a>		(const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * parent, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elt);
+<a href="libxml2-HTMLparser.html#htmlStatus">htmlStatus</a>	<a href="#htmlElementStatusHere">htmlElementStatusHere</a>	(const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * parent, <br/>					 const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * elt);
+int	<a href="#htmlEncodeEntities">htmlEncodeEntities</a>		(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen, <br/>					 int quoteChar);
+const <a href="libxml2-HTMLparser.html#htmlEntityDesc">htmlEntityDesc</a> *	<a href="#htmlEntityLookup">htmlEntityLookup</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+const <a href="libxml2-HTMLparser.html#htmlEntityDesc">htmlEntityDesc</a> *	<a href="#htmlEntityValueLookup">htmlEntityValueLookup</a>	(unsigned int value);
+void	<a href="#htmlFreeParserCtxt">htmlFreeParserCtxt</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
+int	<a href="#htmlHandleOmittedElem">htmlHandleOmittedElem</a>		(int val);
+int	<a href="#htmlIsAutoClosed">htmlIsAutoClosed</a>		(<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a> doc, <br/>					 <a href="libxml2-HTMLparser.html#htmlNodePtr">htmlNodePtr</a> elem);
 int	<a href="#htmlIsScriptAttribute">htmlIsScriptAttribute</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -59,3 +79,12 @@
 int	<a href="#htmlIsScriptAttribute">htmlIsScriptAttribute</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#htmlHandleOmittedElem">htmlHandleOmittedElem</a>		(int val);
+<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a>	<a href="#htmlNewParserCtxt">htmlNewParserCtxt</a>	(void);
+<a href="libxml2-HTMLparser.html#htmlStatus">htmlStatus</a>	<a href="#htmlNodeStatus">htmlNodeStatus</a>		(const <a href="libxml2-HTMLparser.html#htmlNodePtr">htmlNodePtr</a> node, <br/>					 int legacy);
+int	<a href="#htmlParseCharRef">htmlParseCharRef</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
+int	<a href="#htmlParseChunk">htmlParseChunk</a>			(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 const char * chunk, <br/>					 int size, <br/>					 int terminate);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlParseDoc">htmlParseDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * encoding);
+int	<a href="#htmlParseDocument">htmlParseDocument</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
+void	<a href="#htmlParseElement">htmlParseElement</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
+const <a href="libxml2-HTMLparser.html#htmlEntityDesc">htmlEntityDesc</a> *	<a href="#htmlParseEntityRef">htmlParseEntityRef</a>	(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** str);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlParseFile">htmlParseFile</a>		(const char * filename, <br/>					 const char * encoding);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadDoc">htmlReadDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
 <a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadFd">htmlReadFd</a>		(int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
@@ -61,2 +90,3 @@
 <a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadFd">htmlReadFd</a>		(int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadFile">htmlReadFile</a>		(const char * filename, <br/>					 const char * encoding, <br/>					 int options);
 <a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadIO">htmlReadIO</a>		(<a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
@@ -62,12 +92,2 @@
 <a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadIO">htmlReadIO</a>		(<a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlParseFile">htmlParseFile</a>		(const char * filename, <br/>					 const char * encoding);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadDoc">htmlCtxtReadDoc</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#htmlAutoCloseTag">htmlAutoCloseTag</a>		(<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-HTMLparser.html#htmlNodePtr">htmlNodePtr</a> elem);
-int	<a href="#htmlParseChunk">htmlParseChunk</a>			(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 const char * chunk, <br/>					 int size, <br/>					 int terminate);
-const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> *	<a href="#htmlTagLookup">htmlTagLookup</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * tag);
-<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a>	<a href="#htmlCreateMemoryParserCtxt">htmlCreateMemoryParserCtxt</a>	(const char * buffer, <br/>							 int size);
-void	<a href="#htmlCtxtReset">htmlCtxtReset</a>			(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
-int	<a href="#htmlElementAllowedHere">htmlElementAllowedHere</a>		(const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * parent, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elt);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadIO">htmlCtxtReadIO</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a>	<a href="#htmlCreatePushParserCtxt">htmlCreatePushParserCtxt</a>	(<a href="libxml2-HTMLparser.html#htmlSAXHandlerPtr">htmlSAXHandlerPtr</a> sax, <br/>							 void * user_data, <br/>							 const char * chunk, <br/>							 int size, <br/>							 const char * filename, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
 <a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadMemory">htmlReadMemory</a>		(const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
@@ -73,8 +93,3 @@
 <a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadMemory">htmlReadMemory</a>		(const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#htmlIsAutoClosed">htmlIsAutoClosed</a>		(<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a> doc, <br/>					 <a href="libxml2-HTMLparser.html#htmlNodePtr">htmlNodePtr</a> elem);
-int	<a href="#htmlParseCharRef">htmlParseCharRef</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadDoc">htmlReadDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#htmlEncodeEntities">htmlEncodeEntities</a>		(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen, <br/>					 int quoteChar);
-<a href="libxml2-HTMLparser.html#htmlStatus">htmlStatus</a>	<a href="#htmlNodeStatus">htmlNodeStatus</a>		(const <a href="libxml2-HTMLparser.html#htmlNodePtr">htmlNodePtr</a> node, <br/>					 int legacy);
-<a href="libxml2-HTMLparser.html#htmlStatus">htmlStatus</a>	<a href="#htmlAttrAllowed">htmlAttrAllowed</a>		(const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * elt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * attr, <br/>					 int legacy);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlSAXParseDoc">htmlSAXParseDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * encoding, <br/>					 <a href="libxml2-HTMLparser.html#htmlSAXHandlerPtr">htmlSAXHandlerPtr</a> sax, <br/>					 void * userData);
 <a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlSAXParseFile">htmlSAXParseFile</a>	(const char * filename, <br/>					 const char * encoding, <br/>					 <a href="libxml2-HTMLparser.html#htmlSAXHandlerPtr">htmlSAXHandlerPtr</a> sax, <br/>					 void * userData);
@@ -80,20 +95,5 @@
 <a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlSAXParseFile">htmlSAXParseFile</a>	(const char * filename, <br/>					 const char * encoding, <br/>					 <a href="libxml2-HTMLparser.html#htmlSAXHandlerPtr">htmlSAXHandlerPtr</a> sax, <br/>					 void * userData);
-const <a href="libxml2-HTMLparser.html#htmlEntityDesc">htmlEntityDesc</a> *	<a href="#htmlParseEntityRef">htmlParseEntityRef</a>	(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** str);
-<a href="libxml2-HTMLparser.html#htmlStatus">htmlStatus</a>	<a href="#htmlElementStatusHere">htmlElementStatusHere</a>	(const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * parent, <br/>					 const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> * elt);
-const <a href="libxml2-HTMLparser.html#htmlEntityDesc">htmlEntityDesc</a> *	<a href="#htmlEntityValueLookup">htmlEntityValueLookup</a>	(unsigned int value);
-void	<a href="#htmlParseElement">htmlParseElement</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
-int	<a href="#UTF8ToHtml">UTF8ToHtml</a>			(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
-const <a href="libxml2-HTMLparser.html#htmlEntityDesc">htmlEntityDesc</a> *	<a href="#htmlEntityLookup">htmlEntityLookup</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#htmlFreeParserCtxt">htmlFreeParserCtxt</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadMemory">htmlCtxtReadMemory</a>	(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadFd">htmlCtxtReadFd</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlReadFile">htmlReadFile</a>		(const char * filename, <br/>					 const char * encoding, <br/>					 int options);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlCtxtReadFile">htmlCtxtReadFile</a>	(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 const char * filename, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#htmlParseDocument">htmlParseDocument</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a>	<a href="#htmlNewParserCtxt">htmlNewParserCtxt</a>	(void);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlSAXParseDoc">htmlSAXParseDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * encoding, <br/>					 <a href="libxml2-HTMLparser.html#htmlSAXHandlerPtr">htmlSAXHandlerPtr</a> sax, <br/>					 void * userData);
-int	<a href="#htmlCtxtUseOptions">htmlCtxtUseOptions</a>		(<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a> ctxt, <br/>					 int options);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlParseDoc">htmlParseDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * encoding);
+const <a href="libxml2-HTMLparser.html#htmlElemDesc">htmlElemDesc</a> *	<a href="#htmlTagLookup">htmlTagLookup</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * tag);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-HTMLtree.html b/doc/devhelp/libxml2-HTMLtree.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1IVE1MdHJlZS5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1IVE1MdHJlZS5odG1s 100644
--- a/doc/devhelp/libxml2-HTMLtree.html
+++ b/doc/devhelp/libxml2-HTMLtree.html
@@ -43,7 +43,8 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#HTML_ENTITY_REF_NODE">HTML_ENTITY_REF_NODE</a>;
-#define <a href="#HTML_COMMENT_NODE">HTML_COMMENT_NODE</a>;
+      <pre class="synopsis">#define <a href="#HTML_COMMENT_NODE">HTML_COMMENT_NODE</a>;
+#define <a href="#HTML_ENTITY_REF_NODE">HTML_ENTITY_REF_NODE</a>;
+#define <a href="#HTML_PI_NODE">HTML_PI_NODE</a>;
 #define <a href="#HTML_PRESERVE_NODE">HTML_PRESERVE_NODE</a>;
 #define <a href="#HTML_TEXT_NODE">HTML_TEXT_NODE</a>;
@@ -48,7 +49,5 @@
 #define <a href="#HTML_PRESERVE_NODE">HTML_PRESERVE_NODE</a>;
 #define <a href="#HTML_TEXT_NODE">HTML_TEXT_NODE</a>;
-#define <a href="#HTML_PI_NODE">HTML_PI_NODE</a>;
-int	<a href="#htmlNodeDumpFileFormat">htmlNodeDumpFileFormat</a>		(FILE * out, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
-void	<a href="#htmlDocDumpMemory">htmlDocDumpMemory</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** mem, <br/>					 int * size);
-int	<a href="#htmlSaveFile">htmlSaveFile</a>			(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
+void	<a href="#htmlDocContentDumpFormatOutput">htmlDocContentDumpFormatOutput</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
+void	<a href="#htmlDocContentDumpOutput">htmlDocContentDumpOutput</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding);
 int	<a href="#htmlDocDump">htmlDocDump</a>			(FILE * f, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
@@ -54,2 +53,3 @@
 int	<a href="#htmlDocDump">htmlDocDump</a>			(FILE * f, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
+void	<a href="#htmlDocDumpMemory">htmlDocDumpMemory</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** mem, <br/>					 int * size);
 void	<a href="#htmlDocDumpMemoryFormat">htmlDocDumpMemoryFormat</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** mem, <br/>					 int * size, <br/>					 int format);
@@ -55,2 +55,3 @@
 void	<a href="#htmlDocDumpMemoryFormat">htmlDocDumpMemoryFormat</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** mem, <br/>					 int * size, <br/>					 int format);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#htmlGetMetaEncoding">htmlGetMetaEncoding</a>	(<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a> doc);
 int	<a href="#htmlIsBooleanAttr">htmlIsBooleanAttr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -56,2 +57,11 @@
 int	<a href="#htmlIsBooleanAttr">htmlIsBooleanAttr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlNewDoc">htmlNewDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID);
+<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlNewDocNoDtD">htmlNewDocNoDtD</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID);
+int	<a href="#htmlNodeDump">htmlNodeDump</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+void	<a href="#htmlNodeDumpFile">htmlNodeDumpFile</a>		(FILE * out, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+int	<a href="#htmlNodeDumpFileFormat">htmlNodeDumpFileFormat</a>		(FILE * out, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
+void	<a href="#htmlNodeDumpFormatOutput">htmlNodeDumpFormatOutput</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
+void	<a href="#htmlNodeDumpOutput">htmlNodeDumpOutput</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const char * encoding);
+int	<a href="#htmlSaveFile">htmlSaveFile</a>			(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
+int	<a href="#htmlSaveFileEnc">htmlSaveFileEnc</a>			(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding);
 int	<a href="#htmlSaveFileFormat">htmlSaveFileFormat</a>		(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
@@ -57,3 +67,2 @@
 int	<a href="#htmlSaveFileFormat">htmlSaveFileFormat</a>		(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
-void	<a href="#htmlNodeDumpFormatOutput">htmlNodeDumpFormatOutput</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
 int	<a href="#htmlSetMetaEncoding">htmlSetMetaEncoding</a>		(<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * encoding);
@@ -59,13 +68,4 @@
 int	<a href="#htmlSetMetaEncoding">htmlSetMetaEncoding</a>		(<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * encoding);
-int	<a href="#htmlSaveFileEnc">htmlSaveFileEnc</a>			(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding);
-void	<a href="#htmlNodeDumpOutput">htmlNodeDumpOutput</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const char * encoding);
-int	<a href="#htmlNodeDump">htmlNodeDump</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlNewDoc">htmlNewDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#htmlGetMetaEncoding">htmlGetMetaEncoding</a>	(<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a> doc);
-void	<a href="#htmlNodeDumpFile">htmlNodeDumpFile</a>		(FILE * out, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void	<a href="#htmlDocContentDumpFormatOutput">htmlDocContentDumpFormatOutput</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
-<a href="libxml2-HTMLparser.html#htmlDocPtr">htmlDocPtr</a>	<a href="#htmlNewDocNoDtD">htmlNewDocNoDtD</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID);
-void	<a href="#htmlDocContentDumpOutput">htmlDocContentDumpOutput</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-SAX.html b/doc/devhelp/libxml2-SAX.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1TQVguaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1TQVguaHRtbA== 100644
--- a/doc/devhelp/libxml2-SAX.html
+++ b/doc/devhelp/libxml2-SAX.html
@@ -44,5 +44,8 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">void	<a href="#comment">comment</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+      <pre class="synopsis">void	<a href="#attribute">attribute</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+void	<a href="#attributeDecl">attributeDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 int type, <br/>					 int def, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * defaultValue, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> tree);
+void	<a href="#cdataBlock">cdataBlock</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int len);
+void	<a href="#characters">characters</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
 int	<a href="#checkNamespace">checkNamespace</a>			(void * ctx, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespace);
@@ -48,3 +51,6 @@
 int	<a href="#checkNamespace">checkNamespace</a>			(void * ctx, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespace);
-int	<a href="#getColumnNumber">getColumnNumber</a>			(void * ctx);
+void	<a href="#comment">comment</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+void	<a href="#elementDecl">elementDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content);
+void	<a href="#endDocument">endDocument</a>			(void * ctx);
+void	<a href="#endElement">endElement</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 void	<a href="#entityDecl">entityDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
@@ -50,3 +56,6 @@
 void	<a href="#entityDecl">entityDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-void	<a href="#attribute">attribute</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+void	<a href="#externalSubset">externalSubset</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+int	<a href="#getColumnNumber">getColumnNumber</a>			(void * ctx);
+<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#getEntity">getEntity</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#getLineNumber">getLineNumber</a>			(void * ctx);
 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#getNamespace">getNamespace</a>		(void * ctx);
@@ -52,4 +61,8 @@
 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#getNamespace">getNamespace</a>		(void * ctx);
-void	<a href="#setDocumentLocator">setDocumentLocator</a>		(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlSAXLocatorPtr">xmlSAXLocatorPtr</a> loc);
-void	<a href="#initxmlDefaultSAXHandler">initxmlDefaultSAXHandler</a>	(<a href="libxml2-parser.html#xmlSAXHandlerV1">xmlSAXHandlerV1</a> * hdlr, <br/>					 int warning);
+<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#getParameterEntity">getParameterEntity</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#getPublicId">getPublicId</a>		(void * ctx);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#getSystemId">getSystemId</a>		(void * ctx);
+void	<a href="#globalNamespace">globalNamespace</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
+int	<a href="#hasExternalSubset">hasExternalSubset</a>		(void * ctx);
+int	<a href="#hasInternalSubset">hasInternalSubset</a>		(void * ctx);
 void	<a href="#ignorableWhitespace">ignorableWhitespace</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
@@ -55,6 +68,9 @@
 void	<a href="#ignorableWhitespace">ignorableWhitespace</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
-int	<a href="#hasExternalSubset">hasExternalSubset</a>		(void * ctx);
-void	<a href="#unparsedEntityDecl">unparsedEntityDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * notationName);
-void	<a href="#globalNamespace">globalNamespace</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
-int	<a href="#hasInternalSubset">hasInternalSubset</a>		(void * ctx);
+void	<a href="#inithtmlDefaultSAXHandler">inithtmlDefaultSAXHandler</a>	(<a href="libxml2-parser.html#xmlSAXHandlerV1">xmlSAXHandlerV1</a> * hdlr);
+void	<a href="#initxmlDefaultSAXHandler">initxmlDefaultSAXHandler</a>	(<a href="libxml2-parser.html#xmlSAXHandlerV1">xmlSAXHandlerV1</a> * hdlr, <br/>					 int warning);
+void	<a href="#internalSubset">internalSubset</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+int	<a href="#isStandalone">isStandalone</a>			(void * ctx);
+void	<a href="#namespaceDecl">namespaceDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
+void	<a href="#notationDecl">notationDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
+void	<a href="#processingInstruction">processingInstruction</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data);
 void	<a href="#reference">reference</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -60,5 +76,2 @@
 void	<a href="#reference">reference</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#notationDecl">notationDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#getSystemId">getSystemId</a>		(void * ctx);
-void	<a href="#externalSubset">externalSubset</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#resolveEntity">resolveEntity</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
@@ -64,3 +77,3 @@
 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#resolveEntity">resolveEntity</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
-void	<a href="#startDocument">startDocument</a>			(void * ctx);
+void	<a href="#setDocumentLocator">setDocumentLocator</a>		(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlSAXLocatorPtr">xmlSAXLocatorPtr</a> loc);
 void	<a href="#setNamespace">setNamespace</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -66,8 +79,3 @@
 void	<a href="#setNamespace">setNamespace</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#cdataBlock">cdataBlock</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int len);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#getPublicId">getPublicId</a>		(void * ctx);
-void	<a href="#inithtmlDefaultSAXHandler">inithtmlDefaultSAXHandler</a>	(<a href="libxml2-parser.html#xmlSAXHandlerV1">xmlSAXHandlerV1</a> * hdlr);
-void	<a href="#processingInstruction">processingInstruction</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data);
-void	<a href="#endElement">endElement</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#namespaceDecl">namespaceDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
+void	<a href="#startDocument">startDocument</a>			(void * ctx);
 void	<a href="#startElement">startElement</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** atts);
@@ -73,13 +81,5 @@
 void	<a href="#startElement">startElement</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** atts);
-<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#getEntity">getEntity</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#characters">characters</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
-void	<a href="#elementDecl">elementDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content);
-<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#getParameterEntity">getParameterEntity</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#attributeDecl">attributeDecl</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 int type, <br/>					 int def, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * defaultValue, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> tree);
-int	<a href="#isStandalone">isStandalone</a>			(void * ctx);
-void	<a href="#internalSubset">internalSubset</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-void	<a href="#endDocument">endDocument</a>			(void * ctx);
-int	<a href="#getLineNumber">getLineNumber</a>			(void * ctx);
+void	<a href="#unparsedEntityDecl">unparsedEntityDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * notationName);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-SAX2.html b/doc/devhelp/libxml2-SAX2.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1TQVgyLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1TQVgyLmh0bWw= 100644
--- a/doc/devhelp/libxml2-SAX2.html
+++ b/doc/devhelp/libxml2-SAX2.html
@@ -43,6 +43,10 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">void	<a href="#xmlSAX2EndElementNs">xmlSAX2EndElementNs</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
-void	<a href="#xmlSAX2Reference">xmlSAX2Reference</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+      <pre class="synopsis">void	<a href="#htmlDefaultSAXHandlerInit">htmlDefaultSAXHandlerInit</a>	(void);
+void	<a href="#xmlDefaultSAXHandlerInit">xmlDefaultSAXHandlerInit</a>	(void);
+void	<a href="#xmlSAX2AttributeDecl">xmlSAX2AttributeDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 int type, <br/>					 int def, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * defaultValue, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> tree);
+void	<a href="#xmlSAX2CDataBlock">xmlSAX2CDataBlock</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int len);
+void	<a href="#xmlSAX2Characters">xmlSAX2Characters</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
+void	<a href="#xmlSAX2Comment">xmlSAX2Comment</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
 void	<a href="#xmlSAX2ElementDecl">xmlSAX2ElementDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content);
@@ -48,5 +52,8 @@
 void	<a href="#xmlSAX2ElementDecl">xmlSAX2ElementDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content);
-void	<a href="#xmlSAX2AttributeDecl">xmlSAX2AttributeDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 int type, <br/>					 int def, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * defaultValue, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> tree);
-void	<a href="#xmlSAX2Comment">xmlSAX2Comment</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+void	<a href="#xmlSAX2EndDocument">xmlSAX2EndDocument</a>		(void * ctx);
+void	<a href="#xmlSAX2EndElement">xmlSAX2EndElement</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+void	<a href="#xmlSAX2EndElementNs">xmlSAX2EndElementNs</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
+void	<a href="#xmlSAX2EntityDecl">xmlSAX2EntityDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+void	<a href="#xmlSAX2ExternalSubset">xmlSAX2ExternalSubset</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
 int	<a href="#xmlSAX2GetColumnNumber">xmlSAX2GetColumnNumber</a>		(void * ctx);
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlSAX2GetEntity">xmlSAX2GetEntity</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -51,5 +58,9 @@
 int	<a href="#xmlSAX2GetColumnNumber">xmlSAX2GetColumnNumber</a>		(void * ctx);
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlSAX2GetEntity">xmlSAX2GetEntity</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#xmlSAX2UnparsedEntityDecl">xmlSAX2UnparsedEntityDecl</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * notationName);
-int	<a href="#xmlSAXVersion">xmlSAXVersion</a>			(<a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> * hdlr, <br/>					 int version);
+int	<a href="#xmlSAX2GetLineNumber">xmlSAX2GetLineNumber</a>		(void * ctx);
+<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlSAX2GetParameterEntity">xmlSAX2GetParameterEntity</a>	(void * ctx, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSAX2GetPublicId">xmlSAX2GetPublicId</a>	(void * ctx);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSAX2GetSystemId">xmlSAX2GetSystemId</a>	(void * ctx);
+int	<a href="#xmlSAX2HasExternalSubset">xmlSAX2HasExternalSubset</a>	(void * ctx);
+int	<a href="#xmlSAX2HasInternalSubset">xmlSAX2HasInternalSubset</a>	(void * ctx);
 void	<a href="#xmlSAX2IgnorableWhitespace">xmlSAX2IgnorableWhitespace</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
@@ -55,2 +66,6 @@
 void	<a href="#xmlSAX2IgnorableWhitespace">xmlSAX2IgnorableWhitespace</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
+void	<a href="#xmlSAX2InitDefaultSAXHandler">xmlSAX2InitDefaultSAXHandler</a>	(<a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> * hdlr, <br/>					 int warning);
+void	<a href="#xmlSAX2InitHtmlDefaultSAXHandler">xmlSAX2InitHtmlDefaultSAXHandler</a>	(<a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> * hdlr);
+void	<a href="#xmlSAX2InternalSubset">xmlSAX2InternalSubset</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+int	<a href="#xmlSAX2IsStandalone">xmlSAX2IsStandalone</a>		(void * ctx);
 void	<a href="#xmlSAX2NotationDecl">xmlSAX2NotationDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
@@ -56,4 +71,4 @@
 void	<a href="#xmlSAX2NotationDecl">xmlSAX2NotationDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
-void	<a href="#xmlSAX2StartDocument">xmlSAX2StartDocument</a>		(void * ctx);
-void	<a href="#xmlSAX2EndElement">xmlSAX2EndElement</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+void	<a href="#xmlSAX2ProcessingInstruction">xmlSAX2ProcessingInstruction</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data);
+void	<a href="#xmlSAX2Reference">xmlSAX2Reference</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlSAX2ResolveEntity">xmlSAX2ResolveEntity</a>	(void * ctx, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
@@ -59,9 +74,7 @@
 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlSAX2ResolveEntity">xmlSAX2ResolveEntity</a>	(void * ctx, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
-void	<a href="#xmlSAX2ExternalSubset">xmlSAX2ExternalSubset</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSAX2GetPublicId">xmlSAX2GetPublicId</a>	(void * ctx);
-int	<a href="#xmlSAX2IsStandalone">xmlSAX2IsStandalone</a>		(void * ctx);
-void	<a href="#xmlSAX2EndDocument">xmlSAX2EndDocument</a>		(void * ctx);
-void	<a href="#xmlSAX2ProcessingInstruction">xmlSAX2ProcessingInstruction</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data);
-void	<a href="#xmlSAX2InternalSubset">xmlSAX2InternalSubset</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-void	<a href="#xmlSAX2Characters">xmlSAX2Characters</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
+void	<a href="#xmlSAX2SetDocumentLocator">xmlSAX2SetDocumentLocator</a>	(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlSAXLocatorPtr">xmlSAXLocatorPtr</a> loc);
+void	<a href="#xmlSAX2StartDocument">xmlSAX2StartDocument</a>		(void * ctx);
+void	<a href="#xmlSAX2StartElement">xmlSAX2StartElement</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** atts);
+void	<a href="#xmlSAX2StartElementNs">xmlSAX2StartElementNs</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 int nb_namespaces, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** namespaces, <br/>					 int nb_attributes, <br/>					 int nb_defaulted, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** attributes);
+void	<a href="#xmlSAX2UnparsedEntityDecl">xmlSAX2UnparsedEntityDecl</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * notationName);
 int	<a href="#xmlSAXDefaultVersion">xmlSAXDefaultVersion</a>		(int version);
@@ -67,18 +80,5 @@
 int	<a href="#xmlSAXDefaultVersion">xmlSAXDefaultVersion</a>		(int version);
-void	<a href="#xmlSAX2StartElement">xmlSAX2StartElement</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** atts);
-void	<a href="#xmlSAX2SetDocumentLocator">xmlSAX2SetDocumentLocator</a>	(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlSAXLocatorPtr">xmlSAXLocatorPtr</a> loc);
-void	<a href="#xmlSAX2CDataBlock">xmlSAX2CDataBlock</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int len);
-void	<a href="#xmlSAX2StartElementNs">xmlSAX2StartElementNs</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 int nb_namespaces, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** namespaces, <br/>					 int nb_attributes, <br/>					 int nb_defaulted, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** attributes);
-int	<a href="#xmlSAX2HasExternalSubset">xmlSAX2HasExternalSubset</a>	(void * ctx);
-void	<a href="#htmlDefaultSAXHandlerInit">htmlDefaultSAXHandlerInit</a>	(void);
-int	<a href="#xmlSAX2GetLineNumber">xmlSAX2GetLineNumber</a>		(void * ctx);
-int	<a href="#xmlSAX2HasInternalSubset">xmlSAX2HasInternalSubset</a>	(void * ctx);
-void	<a href="#xmlSAX2InitHtmlDefaultSAXHandler">xmlSAX2InitHtmlDefaultSAXHandler</a>	(<a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> * hdlr);
-void	<a href="#xmlDefaultSAXHandlerInit">xmlDefaultSAXHandlerInit</a>	(void);
-void	<a href="#xmlSAX2InitDefaultSAXHandler">xmlSAX2InitDefaultSAXHandler</a>	(<a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> * hdlr, <br/>					 int warning);
-<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlSAX2GetParameterEntity">xmlSAX2GetParameterEntity</a>	(void * ctx, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSAX2GetSystemId">xmlSAX2GetSystemId</a>	(void * ctx);
-void	<a href="#xmlSAX2EntityDecl">xmlSAX2EntityDecl</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlSAXVersion">xmlSAXVersion</a>			(<a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> * hdlr, <br/>					 int version);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-c14n.html b/doc/devhelp/libxml2-c14n.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1jMTRuLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1jMTRuLmh0bWw= 100644
--- a/doc/devhelp/libxml2-c14n.html
+++ b/doc/devhelp/libxml2-c14n.html
@@ -44,4 +44,7 @@
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
       <pre class="synopsis">typedef enum <a href="#xmlC14NMode">xmlC14NMode</a>;
+int	<a href="#xmlC14NDocDumpMemory">xmlC14NDocDumpMemory</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 int mode, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** inclusive_ns_prefixes, <br/>					 int with_comments, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** doc_txt_ptr);
+int	<a href="#xmlC14NDocSave">xmlC14NDocSave</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 int mode, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** inclusive_ns_prefixes, <br/>					 int with_comments, <br/>					 const char * filename, <br/>					 int compression);
+int	<a href="#xmlC14NDocSaveTo">xmlC14NDocSaveTo</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 int mode, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** inclusive_ns_prefixes, <br/>					 int with_comments, <br/>					 <a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf);
 int	<a href="#xmlC14NExecute">xmlC14NExecute</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-c14n.html#xmlC14NIsVisibleCallback">xmlC14NIsVisibleCallback</a> is_visible_callback, <br/>					 void * user_data, <br/>					 int mode, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** inclusive_ns_prefixes, <br/>					 int with_comments, <br/>					 <a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf);
@@ -47,3 +50,2 @@
 int	<a href="#xmlC14NExecute">xmlC14NExecute</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-c14n.html#xmlC14NIsVisibleCallback">xmlC14NIsVisibleCallback</a> is_visible_callback, <br/>					 void * user_data, <br/>					 int mode, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** inclusive_ns_prefixes, <br/>					 int with_comments, <br/>					 <a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf);
-int	<a href="#xmlC14NDocSaveTo">xmlC14NDocSaveTo</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 int mode, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** inclusive_ns_prefixes, <br/>					 int with_comments, <br/>					 <a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf);
 typedef int <a href="#xmlC14NIsVisibleCallback">xmlC14NIsVisibleCallback</a>	(void * user_data, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent);
@@ -49,6 +51,4 @@
 typedef int <a href="#xmlC14NIsVisibleCallback">xmlC14NIsVisibleCallback</a>	(void * user_data, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent);
-int	<a href="#xmlC14NDocSave">xmlC14NDocSave</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 int mode, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** inclusive_ns_prefixes, <br/>					 int with_comments, <br/>					 const char * filename, <br/>					 int compression);
-int	<a href="#xmlC14NDocDumpMemory">xmlC14NDocDumpMemory</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 int mode, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** inclusive_ns_prefixes, <br/>					 int with_comments, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** doc_txt_ptr);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-catalog.html b/doc/devhelp/libxml2-catalog.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1jYXRhbG9nLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1jYXRhbG9nLmh0bWw= 100644
--- a/doc/devhelp/libxml2-catalog.html
+++ b/doc/devhelp/libxml2-catalog.html
@@ -43,7 +43,8 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#XML_CATALOG_PI">XML_CATALOG_PI</a>;
-#define <a href="#XML_CATALOGS_NAMESPACE">XML_CATALOGS_NAMESPACE</a>;
+      <pre class="synopsis">#define <a href="#XML_CATALOGS_NAMESPACE">XML_CATALOGS_NAMESPACE</a>;
+#define <a href="#XML_CATALOG_PI">XML_CATALOG_PI</a>;
+typedef struct _xmlCatalog <a href="#xmlCatalog">xmlCatalog</a>;
 typedef enum <a href="#xmlCatalogAllow">xmlCatalogAllow</a>;
 typedef enum <a href="#xmlCatalogPrefer">xmlCatalogPrefer</a>;
@@ -48,4 +49,3 @@
 typedef enum <a href="#xmlCatalogAllow">xmlCatalogAllow</a>;
 typedef enum <a href="#xmlCatalogPrefer">xmlCatalogPrefer</a>;
-typedef struct _xmlCatalog <a href="#xmlCatalog">xmlCatalog</a>;
 typedef <a href="libxml2-catalog.html#xmlCatalog">xmlCatalog</a> * <a href="#xmlCatalogPtr">xmlCatalogPtr</a>;
@@ -51,5 +51,2 @@
 typedef <a href="libxml2-catalog.html#xmlCatalog">xmlCatalog</a> * <a href="#xmlCatalogPtr">xmlCatalogPtr</a>;
-void	<a href="#xmlFreeCatalog">xmlFreeCatalog</a>			(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal);
-void	<a href="#xmlLoadCatalogs">xmlLoadCatalogs</a>			(const char * pathss);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogLocalResolve">xmlCatalogLocalResolve</a>	(void * catalogs, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
 int	<a href="#xmlACatalogAdd">xmlACatalogAdd</a>			(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * orig, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * replace);
@@ -55,2 +52,5 @@
 int	<a href="#xmlACatalogAdd">xmlACatalogAdd</a>			(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * orig, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * replace);
+void	<a href="#xmlACatalogDump">xmlACatalogDump</a>			(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 FILE * out);
+int	<a href="#xmlACatalogRemove">xmlACatalogRemove</a>		(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlACatalogResolve">xmlACatalogResolve</a>	(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlACatalogResolvePublic">xmlACatalogResolvePublic</a>	(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID);
@@ -56,6 +56,4 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlACatalogResolvePublic">xmlACatalogResolvePublic</a>	(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID);
-<a href="libxml2-catalog.html#xmlCatalogAllow">xmlCatalogAllow</a>	<a href="#xmlCatalogGetDefaults">xmlCatalogGetDefaults</a>	(void);
-int	<a href="#xmlACatalogRemove">xmlACatalogRemove</a>		(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-<a href="libxml2-catalog.html#xmlCatalogPrefer">xmlCatalogPrefer</a>	<a href="#xmlCatalogSetDefaultPrefer">xmlCatalogSetDefaultPrefer</a>	(<a href="libxml2-catalog.html#xmlCatalogPrefer">xmlCatalogPrefer</a> prefer);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlACatalogResolveSystem">xmlACatalogResolveSystem</a>	(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlACatalogResolveURI">xmlACatalogResolveURI</a>	(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
 int	<a href="#xmlCatalogAdd">xmlCatalogAdd</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * orig, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * replace);
@@ -60,10 +58,7 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlACatalogResolveURI">xmlACatalogResolveURI</a>	(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
 int	<a href="#xmlCatalogAdd">xmlCatalogAdd</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * orig, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * replace);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogResolvePublic">xmlCatalogResolvePublic</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogGetSystem">xmlCatalogGetSystem</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
-void	<a href="#xmlInitializeCatalog">xmlInitializeCatalog</a>		(void);
-int	<a href="#xmlLoadCatalog">xmlLoadCatalog</a>			(const char * filename);
-int	<a href="#xmlCatalogRemove">xmlCatalogRemove</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-int	<a href="#xmlCatalogIsEmpty">xmlCatalogIsEmpty</a>		(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal);
-void	<a href="#xmlACatalogDump">xmlACatalogDump</a>			(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 FILE * out);
+void *	<a href="#xmlCatalogAddLocal">xmlCatalogAddLocal</a>		(void * catalogs, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URL);
+void	<a href="#xmlCatalogCleanup">xmlCatalogCleanup</a>		(void);
+int	<a href="#xmlCatalogConvert">xmlCatalogConvert</a>		(void);
+void	<a href="#xmlCatalogDump">xmlCatalogDump</a>			(FILE * out);
 void	<a href="#xmlCatalogFreeLocal">xmlCatalogFreeLocal</a>		(void * catalogs);
@@ -69,6 +64,3 @@
 void	<a href="#xmlCatalogFreeLocal">xmlCatalogFreeLocal</a>		(void * catalogs);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlACatalogResolve">xmlACatalogResolve</a>	(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogResolveSystem">xmlCatalogResolveSystem</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
-<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a>	<a href="#xmlLoadSGMLSuperCatalog">xmlLoadSGMLSuperCatalog</a>	(const char * filename);
-int	<a href="#xmlCatalogConvert">xmlCatalogConvert</a>		(void);
+<a href="libxml2-catalog.html#xmlCatalogAllow">xmlCatalogAllow</a>	<a href="#xmlCatalogGetDefaults">xmlCatalogGetDefaults</a>	(void);
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogGetPublic">xmlCatalogGetPublic</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID);
@@ -74,4 +66,5 @@
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogGetPublic">xmlCatalogGetPublic</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID);
-<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a>	<a href="#xmlLoadACatalog">xmlLoadACatalog</a>		(const char * filename);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlACatalogResolveSystem">xmlACatalogResolveSystem</a>	(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogGetSystem">xmlCatalogGetSystem</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
+int	<a href="#xmlCatalogIsEmpty">xmlCatalogIsEmpty</a>		(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogLocalResolve">xmlCatalogLocalResolve</a>	(void * catalogs, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogLocalResolveURI">xmlCatalogLocalResolveURI</a>	(void * catalogs, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
@@ -77,2 +70,10 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogLocalResolveURI">xmlCatalogLocalResolveURI</a>	(void * catalogs, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
+int	<a href="#xmlCatalogRemove">xmlCatalogRemove</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogResolve">xmlCatalogResolve</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogResolvePublic">xmlCatalogResolvePublic</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogResolveSystem">xmlCatalogResolveSystem</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogResolveURI">xmlCatalogResolveURI</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
+int	<a href="#xmlCatalogSetDebug">xmlCatalogSetDebug</a>		(int level);
+<a href="libxml2-catalog.html#xmlCatalogPrefer">xmlCatalogPrefer</a>	<a href="#xmlCatalogSetDefaultPrefer">xmlCatalogSetDefaultPrefer</a>	(<a href="libxml2-catalog.html#xmlCatalogPrefer">xmlCatalogPrefer</a> prefer);
+void	<a href="#xmlCatalogSetDefaults">xmlCatalogSetDefaults</a>		(<a href="libxml2-catalog.html#xmlCatalogAllow">xmlCatalogAllow</a> allow);
 int	<a href="#xmlConvertSGMLCatalog">xmlConvertSGMLCatalog</a>		(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal);
@@ -78,4 +79,9 @@
 int	<a href="#xmlConvertSGMLCatalog">xmlConvertSGMLCatalog</a>		(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal);
-void *	<a href="#xmlCatalogAddLocal">xmlCatalogAddLocal</a>		(void * catalogs, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URL);
+void	<a href="#xmlFreeCatalog">xmlFreeCatalog</a>			(<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal);
+void	<a href="#xmlInitializeCatalog">xmlInitializeCatalog</a>		(void);
+<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a>	<a href="#xmlLoadACatalog">xmlLoadACatalog</a>		(const char * filename);
+int	<a href="#xmlLoadCatalog">xmlLoadCatalog</a>			(const char * filename);
+void	<a href="#xmlLoadCatalogs">xmlLoadCatalogs</a>			(const char * pathss);
+<a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a>	<a href="#xmlLoadSGMLSuperCatalog">xmlLoadSGMLSuperCatalog</a>	(const char * filename);
 <a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a>	<a href="#xmlNewCatalog">xmlNewCatalog</a>		(int sgml);
 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseCatalogFile">xmlParseCatalogFile</a>	(const char * filename);
@@ -80,11 +86,5 @@
 <a href="libxml2-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a>	<a href="#xmlNewCatalog">xmlNewCatalog</a>		(int sgml);
 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseCatalogFile">xmlParseCatalogFile</a>	(const char * filename);
-int	<a href="#xmlCatalogSetDebug">xmlCatalogSetDebug</a>		(int level);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogResolve">xmlCatalogResolve</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysID);
-void	<a href="#xmlCatalogSetDefaults">xmlCatalogSetDefaults</a>		(<a href="libxml2-catalog.html#xmlCatalogAllow">xmlCatalogAllow</a> allow);
-void	<a href="#xmlCatalogDump">xmlCatalogDump</a>			(FILE * out);
-void	<a href="#xmlCatalogCleanup">xmlCatalogCleanup</a>		(void);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCatalogResolveURI">xmlCatalogResolveURI</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-chvalid.html b/doc/devhelp/libxml2-chvalid.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1jaHZhbGlkLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1jaHZhbGlkLmh0bWw= 100644
--- a/doc/devhelp/libxml2-chvalid.html
+++ b/doc/devhelp/libxml2-chvalid.html
@@ -43,9 +43,9 @@
     <p>Author(s): William Brack &lt;wbrack@mmm.com.hk&gt; </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#xmlIsExtender_ch">xmlIsExtender_ch</a>(c);
-#define <a href="#xmlIsPubidCharQ">xmlIsPubidCharQ</a>(c);
-#define <a href="#xmlIsPubidChar_ch">xmlIsPubidChar_ch</a>(c);
-#define <a href="#xmlIsIdeographicQ">xmlIsIdeographicQ</a>(c);
-#define <a href="#xmlIsExtenderQ">xmlIsExtenderQ</a>(c);
+      <pre class="synopsis">#define <a href="#xmlIsBaseCharQ">xmlIsBaseCharQ</a>(c);
+#define <a href="#xmlIsBaseChar_ch">xmlIsBaseChar_ch</a>(c);
+#define <a href="#xmlIsBlankQ">xmlIsBlankQ</a>(c);
+#define <a href="#xmlIsBlank_ch">xmlIsBlank_ch</a>(c);
+#define <a href="#xmlIsCharQ">xmlIsCharQ</a>(c);
 #define <a href="#xmlIsChar_ch">xmlIsChar_ch</a>(c);
@@ -51,3 +51,4 @@
 #define <a href="#xmlIsChar_ch">xmlIsChar_ch</a>(c);
+#define <a href="#xmlIsCombiningQ">xmlIsCombiningQ</a>(c);
 #define <a href="#xmlIsDigitQ">xmlIsDigitQ</a>(c);
 #define <a href="#xmlIsDigit_ch">xmlIsDigit_ch</a>(c);
@@ -52,9 +53,8 @@
 #define <a href="#xmlIsDigitQ">xmlIsDigitQ</a>(c);
 #define <a href="#xmlIsDigit_ch">xmlIsDigit_ch</a>(c);
-#define <a href="#xmlIsBaseChar_ch">xmlIsBaseChar_ch</a>(c);
-#define <a href="#xmlIsCombiningQ">xmlIsCombiningQ</a>(c);
-#define <a href="#xmlIsBlankQ">xmlIsBlankQ</a>(c);
-#define <a href="#xmlIsCharQ">xmlIsCharQ</a>(c);
-#define <a href="#xmlIsBaseCharQ">xmlIsBaseCharQ</a>(c);
-#define <a href="#xmlIsBlank_ch">xmlIsBlank_ch</a>(c);
+#define <a href="#xmlIsExtenderQ">xmlIsExtenderQ</a>(c);
+#define <a href="#xmlIsExtender_ch">xmlIsExtender_ch</a>(c);
+#define <a href="#xmlIsIdeographicQ">xmlIsIdeographicQ</a>(c);
+#define <a href="#xmlIsPubidCharQ">xmlIsPubidCharQ</a>(c);
+#define <a href="#xmlIsPubidChar_ch">xmlIsPubidChar_ch</a>(c);
 typedef struct _xmlChLRange <a href="#xmlChLRange">xmlChLRange</a>;
@@ -60,3 +60,2 @@
 typedef struct _xmlChLRange <a href="#xmlChLRange">xmlChLRange</a>;
-typedef <a href="libxml2-chvalid.html#xmlChSRange">xmlChSRange</a> * <a href="#xmlChSRangePtr">xmlChSRangePtr</a>;
 typedef <a href="libxml2-chvalid.html#xmlChLRange">xmlChLRange</a> * <a href="#xmlChLRangePtr">xmlChLRangePtr</a>;
@@ -62,3 +61,4 @@
 typedef <a href="libxml2-chvalid.html#xmlChLRange">xmlChLRange</a> * <a href="#xmlChLRangePtr">xmlChLRangePtr</a>;
+typedef struct _xmlChRangeGroup <a href="#xmlChRangeGroup">xmlChRangeGroup</a>;
 typedef <a href="libxml2-chvalid.html#xmlChRangeGroup">xmlChRangeGroup</a> * <a href="#xmlChRangeGroupPtr">xmlChRangeGroupPtr</a>;
 typedef struct _xmlChSRange <a href="#xmlChSRange">xmlChSRange</a>;
@@ -63,4 +63,7 @@
 typedef <a href="libxml2-chvalid.html#xmlChRangeGroup">xmlChRangeGroup</a> * <a href="#xmlChRangeGroupPtr">xmlChRangeGroupPtr</a>;
 typedef struct _xmlChSRange <a href="#xmlChSRange">xmlChSRange</a>;
-typedef struct _xmlChRangeGroup <a href="#xmlChRangeGroup">xmlChRangeGroup</a>;
+typedef <a href="libxml2-chvalid.html#xmlChSRange">xmlChSRange</a> * <a href="#xmlChSRangePtr">xmlChSRangePtr</a>;
+int	<a href="#xmlCharInRange">xmlCharInRange</a>			(unsigned int val, <br/>					 const <a href="libxml2-chvalid.html#xmlChRangeGroup">xmlChRangeGroup</a> * rptr);
+int	<a href="#xmlIsBaseChar">xmlIsBaseChar</a>			(unsigned int ch);
+int	<a href="#xmlIsBlank">xmlIsBlank</a>			(unsigned int ch);
 int	<a href="#xmlIsChar">xmlIsChar</a>			(unsigned int ch);
@@ -66,2 +69,3 @@
 int	<a href="#xmlIsChar">xmlIsChar</a>			(unsigned int ch);
+int	<a href="#xmlIsCombining">xmlIsCombining</a>			(unsigned int ch);
 int	<a href="#xmlIsDigit">xmlIsDigit</a>			(unsigned int ch);
@@ -67,3 +71,3 @@
 int	<a href="#xmlIsDigit">xmlIsDigit</a>			(unsigned int ch);
-int	<a href="#xmlIsBlank">xmlIsBlank</a>			(unsigned int ch);
+int	<a href="#xmlIsExtender">xmlIsExtender</a>			(unsigned int ch);
 int	<a href="#xmlIsIdeographic">xmlIsIdeographic</a>		(unsigned int ch);
@@ -69,3 +73,2 @@
 int	<a href="#xmlIsIdeographic">xmlIsIdeographic</a>		(unsigned int ch);
-int	<a href="#xmlCharInRange">xmlCharInRange</a>			(unsigned int val, <br/>					 const <a href="libxml2-chvalid.html#xmlChRangeGroup">xmlChRangeGroup</a> * rptr);
 int	<a href="#xmlIsPubidChar">xmlIsPubidChar</a>			(unsigned int ch);
@@ -71,7 +74,4 @@
 int	<a href="#xmlIsPubidChar">xmlIsPubidChar</a>			(unsigned int ch);
-int	<a href="#xmlIsCombining">xmlIsCombining</a>			(unsigned int ch);
-int	<a href="#xmlIsBaseChar">xmlIsBaseChar</a>			(unsigned int ch);
-int	<a href="#xmlIsExtender">xmlIsExtender</a>			(unsigned int ch);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-debugXML.html b/doc/devhelp/libxml2-debugXML.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1kZWJ1Z1hNTC5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1kZWJ1Z1hNTC5odG1s 100644
--- a/doc/devhelp/libxml2-debugXML.html
+++ b/doc/devhelp/libxml2-debugXML.html
@@ -45,4 +45,7 @@
       <h2>Synopsis</h2>
       <pre class="synopsis">typedef struct _xmlShellCtxt <a href="#xmlShellCtxt">xmlShellCtxt</a>;
 typedef <a href="libxml2-debugXML.html#xmlShellCtxt">xmlShellCtxt</a> * <a href="#xmlShellCtxtPtr">xmlShellCtxtPtr</a>;
+const char *	<a href="#xmlBoolToText">xmlBoolToText</a>		(int boolval);
+int	<a href="#xmlDebugCheckDocument">xmlDebugCheckDocument</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+void	<a href="#xmlDebugDumpAttr">xmlDebugDumpAttr</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr, <br/>					 int depth);
 void	<a href="#xmlDebugDumpAttrList">xmlDebugDumpAttrList</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr, <br/>					 int depth);
@@ -48,2 +51,11 @@
 void	<a href="#xmlDebugDumpAttrList">xmlDebugDumpAttrList</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr, <br/>					 int depth);
+void	<a href="#xmlDebugDumpDTD">xmlDebugDumpDTD</a>			(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd);
+void	<a href="#xmlDebugDumpDocument">xmlDebugDumpDocument</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+void	<a href="#xmlDebugDumpDocumentHead">xmlDebugDumpDocumentHead</a>	(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+void	<a href="#xmlDebugDumpEntities">xmlDebugDumpEntities</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+void	<a href="#xmlDebugDumpNode">xmlDebugDumpNode</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int depth);
+void	<a href="#xmlDebugDumpNodeList">xmlDebugDumpNodeList</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int depth);
+void	<a href="#xmlDebugDumpOneNode">xmlDebugDumpOneNode</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int depth);
+void	<a href="#xmlDebugDumpString">xmlDebugDumpString</a>		(FILE * output, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
+int	<a href="#xmlLsCountNode">xmlLsCountNode</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
 void	<a href="#xmlLsOneNode">xmlLsOneNode</a>			(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
@@ -49,14 +61,4 @@
 void	<a href="#xmlLsOneNode">xmlLsOneNode</a>			(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-typedef char * <a href="#xmlShellReadlineFunc">xmlShellReadlineFunc</a>		(char * prompt);
-int	<a href="#xmlShellSave">xmlShellSave</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * filename, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-const char *	<a href="#xmlBoolToText">xmlBoolToText</a>		(int boolval);
-int	<a href="#xmlShellWrite">xmlShellWrite</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * filename, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-int	<a href="#xmlShellDu">xmlShellDu</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-int	<a href="#xmlShellValidate">xmlShellValidate</a>		(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * dtd, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-int	<a href="#xmlDebugCheckDocument">xmlDebugCheckDocument</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-void	<a href="#xmlShellPrintXPathResult">xmlShellPrintXPathResult</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> list);
-typedef int <a href="#xmlShellCmd">xmlShellCmd</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-int	<a href="#xmlShellLoad">xmlShellLoad</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * filename, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-void	<a href="#xmlDebugDumpString">xmlDebugDumpString</a>		(FILE * output, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
+void	<a href="#xmlShell">xmlShell</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 char * filename, <br/>					 <a href="libxml2-debugXML.html#xmlShellReadlineFunc">xmlShellReadlineFunc</a> input, <br/>					 FILE * output);
 int	<a href="#xmlShellBase">xmlShellBase</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
 int	<a href="#xmlShellCat">xmlShellCat</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
@@ -61,6 +63,8 @@
 int	<a href="#xmlShellBase">xmlShellBase</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
 int	<a href="#xmlShellCat">xmlShellCat</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-void	<a href="#xmlDebugDumpDTD">xmlDebugDumpDTD</a>			(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd);
-void	<a href="#xmlDebugDumpNode">xmlDebugDumpNode</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int depth);
-void	<a href="#xmlDebugDumpEntities">xmlDebugDumpEntities</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+typedef int <a href="#xmlShellCmd">xmlShellCmd</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
+int	<a href="#xmlShellDir">xmlShellDir</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
+int	<a href="#xmlShellDu">xmlShellDu</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
+int	<a href="#xmlShellList">xmlShellList</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
+int	<a href="#xmlShellLoad">xmlShellLoad</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * filename, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
 void	<a href="#xmlShellPrintNode">xmlShellPrintNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
@@ -66,2 +70,4 @@
 void	<a href="#xmlShellPrintNode">xmlShellPrintNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+void	<a href="#xmlShellPrintXPathError">xmlShellPrintXPathError</a>		(int errorType, <br/>					 const char * arg);
+void	<a href="#xmlShellPrintXPathResult">xmlShellPrintXPathResult</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> list);
 int	<a href="#xmlShellPwd">xmlShellPwd</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * buffer, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
@@ -67,14 +73,8 @@
 int	<a href="#xmlShellPwd">xmlShellPwd</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * buffer, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-void	<a href="#xmlDebugDumpNodeList">xmlDebugDumpNodeList</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int depth);
-void	<a href="#xmlDebugDumpAttr">xmlDebugDumpAttr</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr, <br/>					 int depth);
-void	<a href="#xmlDebugDumpDocument">xmlDebugDumpDocument</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-int	<a href="#xmlLsCountNode">xmlLsCountNode</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-void	<a href="#xmlShellPrintXPathError">xmlShellPrintXPathError</a>		(int errorType, <br/>					 const char * arg);
-int	<a href="#xmlShellDir">xmlShellDir</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-void	<a href="#xmlDebugDumpOneNode">xmlDebugDumpOneNode</a>		(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int depth);
-int	<a href="#xmlShellList">xmlShellList</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * arg, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-void	<a href="#xmlDebugDumpDocumentHead">xmlDebugDumpDocumentHead</a>	(FILE * output, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-void	<a href="#xmlShell">xmlShell</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 char * filename, <br/>					 <a href="libxml2-debugXML.html#xmlShellReadlineFunc">xmlShellReadlineFunc</a> input, <br/>					 FILE * output);
+typedef char * <a href="#xmlShellReadlineFunc">xmlShellReadlineFunc</a>		(char * prompt);
+int	<a href="#xmlShellSave">xmlShellSave</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * filename, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
+int	<a href="#xmlShellValidate">xmlShellValidate</a>		(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * dtd, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
+int	<a href="#xmlShellWrite">xmlShellWrite</a>			(<a href="libxml2-debugXML.html#xmlShellCtxtPtr">xmlShellCtxtPtr</a> ctxt, <br/>					 char * filename, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-dict.html b/doc/devhelp/libxml2-dict.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1kaWN0Lmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1kaWN0Lmh0bWw= 100644
--- a/doc/devhelp/libxml2-dict.html
+++ b/doc/devhelp/libxml2-dict.html
@@ -45,4 +45,9 @@
       <h2>Synopsis</h2>
       <pre class="synopsis">typedef struct _xmlDict <a href="#xmlDict">xmlDict</a>;
 typedef <a href="libxml2-dict.html#xmlDict">xmlDict</a> * <a href="#xmlDictPtr">xmlDictPtr</a>;
+void	<a href="#xmlDictCleanup">xmlDictCleanup</a>			(void);
+<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a>	<a href="#xmlDictCreate">xmlDictCreate</a>		(void);
+<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a>	<a href="#xmlDictCreateSub">xmlDictCreateSub</a>	(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> sub);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlDictExists">xmlDictExists</a>		(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int len);
+void	<a href="#xmlDictFree">xmlDictFree</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
 size_t	<a href="#xmlDictGetUsage">xmlDictGetUsage</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
@@ -48,8 +53,4 @@
 size_t	<a href="#xmlDictGetUsage">xmlDictGetUsage</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
-int	<a href="#xmlDictReference">xmlDictReference</a>		(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
-void	<a href="#xmlDictCleanup">xmlDictCleanup</a>			(void);
-int	<a href="#xmlDictSize">xmlDictSize</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlDictExists">xmlDictExists</a>		(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int len);
-size_t	<a href="#xmlDictSetLimit">xmlDictSetLimit</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 size_t limit);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlDictLookup">xmlDictLookup</a>		(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int len);
 int	<a href="#xmlDictOwns">xmlDictOwns</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlDictQLookup">xmlDictQLookup</a>		(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -54,3 +55,6 @@
 int	<a href="#xmlDictOwns">xmlDictOwns</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlDictQLookup">xmlDictQLookup</a>		(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlDictReference">xmlDictReference</a>		(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
+size_t	<a href="#xmlDictSetLimit">xmlDictSetLimit</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 size_t limit);
+int	<a href="#xmlDictSize">xmlDictSize</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
 int	<a href="#xmlInitializeDict">xmlInitializeDict</a>		(void);
@@ -56,8 +60,4 @@
 int	<a href="#xmlInitializeDict">xmlInitializeDict</a>		(void);
-<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a>	<a href="#xmlDictCreateSub">xmlDictCreateSub</a>	(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> sub);
-void	<a href="#xmlDictFree">xmlDictFree</a>			(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlDictLookup">xmlDictLookup</a>		(<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int len);
-<a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a>	<a href="#xmlDictCreate">xmlDictCreate</a>		(void);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-encoding.html b/doc/devhelp/libxml2-encoding.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1lbmNvZGluZy5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1lbmNvZGluZy5odG1s 100644
--- a/doc/devhelp/libxml2-encoding.html
+++ b/doc/devhelp/libxml2-encoding.html
@@ -46,7 +46,4 @@
       <pre class="synopsis">typedef enum <a href="#xmlCharEncoding">xmlCharEncoding</a>;
 typedef struct _xmlCharEncodingHandler <a href="#xmlCharEncodingHandler">xmlCharEncodingHandler</a>;
 typedef <a href="libxml2-encoding.html#xmlCharEncodingHandler">xmlCharEncodingHandler</a> * <a href="#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a>;
-int	<a href="#xmlDelEncodingAlias">xmlDelEncodingAlias</a>		(const char * alias);
-const char *	<a href="#xmlGetEncodingAlias">xmlGetEncodingAlias</a>	(const char * alias);
-void	<a href="#xmlRegisterCharEncodingHandler">xmlRegisterCharEncodingHandler</a>	(<a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> handler);
 int	<a href="#UTF8Toisolat1">UTF8Toisolat1</a>			(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
@@ -52,3 +49,3 @@
 int	<a href="#UTF8Toisolat1">UTF8Toisolat1</a>			(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
-void	<a href="#xmlInitCharEncodingHandlers">xmlInitCharEncodingHandlers</a>	(void);
+int	<a href="#isolat1ToUTF8">isolat1ToUTF8</a>			(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
 int	<a href="#xmlAddEncodingAlias">xmlAddEncodingAlias</a>		(const char * name, <br/>					 const char * alias);
@@ -54,3 +51,5 @@
 int	<a href="#xmlAddEncodingAlias">xmlAddEncodingAlias</a>		(const char * name, <br/>					 const char * alias);
-void	<a href="#xmlCleanupEncodingAliases">xmlCleanupEncodingAliases</a>	(void);
+int	<a href="#xmlCharEncCloseFunc">xmlCharEncCloseFunc</a>		(<a href="libxml2-encoding.html#xmlCharEncodingHandler">xmlCharEncodingHandler</a> * handler);
+int	<a href="#xmlCharEncFirstLine">xmlCharEncFirstLine</a>		(<a href="libxml2-encoding.html#xmlCharEncodingHandler">xmlCharEncodingHandler</a> * handler, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> out, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> in);
+int	<a href="#xmlCharEncInFunc">xmlCharEncInFunc</a>		(<a href="libxml2-encoding.html#xmlCharEncodingHandler">xmlCharEncodingHandler</a> * handler, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> out, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> in);
 int	<a href="#xmlCharEncOutFunc">xmlCharEncOutFunc</a>		(<a href="libxml2-encoding.html#xmlCharEncodingHandler">xmlCharEncodingHandler</a> * handler, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> out, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> in);
@@ -56,3 +55,2 @@
 int	<a href="#xmlCharEncOutFunc">xmlCharEncOutFunc</a>		(<a href="libxml2-encoding.html#xmlCharEncodingHandler">xmlCharEncodingHandler</a> * handler, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> out, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> in);
-<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a>	<a href="#xmlParseCharEncoding">xmlParseCharEncoding</a>	(const char * name);
 typedef int <a href="#xmlCharEncodingInputFunc">xmlCharEncodingInputFunc</a>	(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
@@ -58,2 +56,3 @@
 typedef int <a href="#xmlCharEncodingInputFunc">xmlCharEncodingInputFunc</a>	(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
+typedef int <a href="#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a>	(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
 void	<a href="#xmlCleanupCharEncodingHandlers">xmlCleanupCharEncodingHandlers</a>	(void);
@@ -59,5 +58,5 @@
 void	<a href="#xmlCleanupCharEncodingHandlers">xmlCleanupCharEncodingHandlers</a>	(void);
-<a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a>	<a href="#xmlNewCharEncodingHandler">xmlNewCharEncodingHandler</a>	(const char * name, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingInputFunc">xmlCharEncodingInputFunc</a> input, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a> output);
-typedef int <a href="#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a>	(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
-int	<a href="#isolat1ToUTF8">isolat1ToUTF8</a>			(unsigned char * out, <br/>					 int * outlen, <br/>					 const unsigned char * in, <br/>					 int * inlen);
+void	<a href="#xmlCleanupEncodingAliases">xmlCleanupEncodingAliases</a>	(void);
+int	<a href="#xmlDelEncodingAlias">xmlDelEncodingAlias</a>		(const char * alias);
+<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a>	<a href="#xmlDetectCharEncoding">xmlDetectCharEncoding</a>	(const unsigned char * in, <br/>					 int len);
 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a>	<a href="#xmlFindCharEncodingHandler">xmlFindCharEncodingHandler</a>	(const char * name);
@@ -63,3 +62,2 @@
 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a>	<a href="#xmlFindCharEncodingHandler">xmlFindCharEncodingHandler</a>	(const char * name);
-int	<a href="#xmlCharEncInFunc">xmlCharEncInFunc</a>		(<a href="libxml2-encoding.html#xmlCharEncodingHandler">xmlCharEncodingHandler</a> * handler, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> out, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> in);
 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a>	<a href="#xmlGetCharEncodingHandler">xmlGetCharEncodingHandler</a>	(<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
@@ -65,5 +63,2 @@
 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a>	<a href="#xmlGetCharEncodingHandler">xmlGetCharEncodingHandler</a>	(<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-int	<a href="#xmlCharEncFirstLine">xmlCharEncFirstLine</a>		(<a href="libxml2-encoding.html#xmlCharEncodingHandler">xmlCharEncodingHandler</a> * handler, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> out, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> in);
-<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a>	<a href="#xmlDetectCharEncoding">xmlDetectCharEncoding</a>	(const unsigned char * in, <br/>					 int len);
-int	<a href="#xmlCharEncCloseFunc">xmlCharEncCloseFunc</a>		(<a href="libxml2-encoding.html#xmlCharEncodingHandler">xmlCharEncodingHandler</a> * handler);
 const char *	<a href="#xmlGetCharEncodingName">xmlGetCharEncodingName</a>	(<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
@@ -69,4 +64,9 @@
 const char *	<a href="#xmlGetCharEncodingName">xmlGetCharEncodingName</a>	(<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+const char *	<a href="#xmlGetEncodingAlias">xmlGetEncodingAlias</a>	(const char * alias);
+void	<a href="#xmlInitCharEncodingHandlers">xmlInitCharEncodingHandlers</a>	(void);
+<a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a>	<a href="#xmlNewCharEncodingHandler">xmlNewCharEncodingHandler</a>	(const char * name, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingInputFunc">xmlCharEncodingInputFunc</a> input, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a> output);
+<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a>	<a href="#xmlParseCharEncoding">xmlParseCharEncoding</a>	(const char * name);
+void	<a href="#xmlRegisterCharEncodingHandler">xmlRegisterCharEncodingHandler</a>	(<a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> handler);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-entities.html b/doc/devhelp/libxml2-entities.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1lbnRpdGllcy5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1lbnRpdGllcy5odG1s 100644
--- a/doc/devhelp/libxml2-entities.html
+++ b/doc/devhelp/libxml2-entities.html
@@ -43,6 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef enum <a href="#xmlEntityType">xmlEntityType</a>;
-typedef struct _xmlHashTable <a href="#xmlEntitiesTable">xmlEntitiesTable</a>;
+      <pre class="synopsis">typedef struct _xmlHashTable <a href="#xmlEntitiesTable">xmlEntitiesTable</a>;
 typedef <a href="libxml2-entities.html#xmlEntitiesTable">xmlEntitiesTable</a> * <a href="#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a>;
@@ -48,2 +47,3 @@
 typedef <a href="libxml2-entities.html#xmlEntitiesTable">xmlEntitiesTable</a> * <a href="#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a>;
+typedef enum <a href="#xmlEntityType">xmlEntityType</a>;
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlAddDocEntity">xmlAddDocEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
@@ -49,3 +49,9 @@
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlAddDocEntity">xmlAddDocEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlNewEntity">xmlNewEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlAddDtdEntity">xmlAddDtdEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+void	<a href="#xmlCleanupPredefinedEntities">xmlCleanupPredefinedEntities</a>	(void);
+<a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a>	<a href="#xmlCopyEntitiesTable">xmlCopyEntitiesTable</a>	(<a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a> table);
+<a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a>	<a href="#xmlCreateEntitiesTable">xmlCreateEntitiesTable</a>	(void);
+void	<a href="#xmlDumpEntitiesTable">xmlDumpEntitiesTable</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a> table);
+void	<a href="#xmlDumpEntityDecl">xmlDumpEntityDecl</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> ent);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlEncodeEntities">xmlEncodeEntities</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * input);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlEncodeEntitiesReentrant">xmlEncodeEntitiesReentrant</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * input);
@@ -51,3 +57,5 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlEncodeEntitiesReentrant">xmlEncodeEntitiesReentrant</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * input);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlEncodeSpecialChars">xmlEncodeSpecialChars</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * input);
+void	<a href="#xmlFreeEntitiesTable">xmlFreeEntitiesTable</a>		(<a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a> table);
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlGetDocEntity">xmlGetDocEntity</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlGetDtdEntity">xmlGetDtdEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -52,6 +60,3 @@
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlGetDocEntity">xmlGetDocEntity</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlGetDtdEntity">xmlGetDtdEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlAddDtdEntity">xmlAddDtdEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-<a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a>	<a href="#xmlCopyEntitiesTable">xmlCopyEntitiesTable</a>	(<a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a> table);
-void	<a href="#xmlFreeEntitiesTable">xmlFreeEntitiesTable</a>		(<a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a> table);
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlGetParameterEntity">xmlGetParameterEntity</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -57,9 +62,3 @@
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlGetParameterEntity">xmlGetParameterEntity</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#xmlDumpEntitiesTable">xmlDumpEntitiesTable</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a> table);
-void	<a href="#xmlDumpEntityDecl">xmlDumpEntityDecl</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> ent);
-void	<a href="#xmlCleanupPredefinedEntities">xmlCleanupPredefinedEntities</a>	(void);
-<a href="libxml2-entities.html#xmlEntitiesTablePtr">xmlEntitiesTablePtr</a>	<a href="#xmlCreateEntitiesTable">xmlCreateEntitiesTable</a>	(void);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlEncodeEntities">xmlEncodeEntities</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * input);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlEncodeSpecialChars">xmlEncodeSpecialChars</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * input);
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlGetPredefinedEntity">xmlGetPredefinedEntity</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 void	<a href="#xmlInitializePredefinedEntities">xmlInitializePredefinedEntities</a>	(void);
@@ -64,5 +63,6 @@
 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlGetPredefinedEntity">xmlGetPredefinedEntity</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 void	<a href="#xmlInitializePredefinedEntities">xmlInitializePredefinedEntities</a>	(void);
+<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlNewEntity">xmlNewEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-globals.html b/doc/devhelp/libxml2-globals.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1nbG9iYWxzLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1nbG9iYWxzLmh0bWw= 100644
--- a/doc/devhelp/libxml2-globals.html
+++ b/doc/devhelp/libxml2-globals.html
@@ -43,7 +43,10 @@
     <p>Author(s): Gary Pennington &lt;Gary.Pennington@uk.sun.com&gt;, Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libxml2-globals.html#xmlGlobalState">xmlGlobalState</a> * <a href="#xmlGlobalStatePtr">xmlGlobalStatePtr</a>;
-typedef struct _xmlGlobalState <a href="#xmlGlobalState">xmlGlobalState</a>;
-void	<a href="#xmlThrDefSetStructuredErrorFunc">xmlThrDefSetStructuredErrorFunc</a>	(void * ctx, <br/>					 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> handler);
+      <pre class="synopsis">typedef struct _xmlGlobalState <a href="#xmlGlobalState">xmlGlobalState</a>;
+typedef <a href="libxml2-globals.html#xmlGlobalState">xmlGlobalState</a> * <a href="#xmlGlobalStatePtr">xmlGlobalStatePtr</a>;
+void	<a href="#xmlCleanupGlobals">xmlCleanupGlobals</a>		(void);
+<a href="libxml2-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a>	<a href="#xmlDeregisterNodeDefault">xmlDeregisterNodeDefault</a>	(<a href="libxml2-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a> func);
+typedef void <a href="#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+void	<a href="#xmlInitGlobals">xmlInitGlobals</a>			(void);
 void	<a href="#xmlInitializeGlobalState">xmlInitializeGlobalState</a>	(<a href="libxml2-globals.html#xmlGlobalStatePtr">xmlGlobalStatePtr</a> gs);
@@ -49,5 +52,5 @@
 void	<a href="#xmlInitializeGlobalState">xmlInitializeGlobalState</a>	(<a href="libxml2-globals.html#xmlGlobalStatePtr">xmlGlobalStatePtr</a> gs);
-<a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a>	<a href="#xmlThrDefBufferAllocScheme">xmlThrDefBufferAllocScheme</a>	(<a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a> v);
-int	<a href="#xmlThrDefPedanticParserDefaultValue">xmlThrDefPedanticParserDefaultValue</a>	(int v);
-<a href="libxml2-globals.html#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a>	<a href="#xmlRegisterNodeDefault">xmlRegisterNodeDefault</a>	(<a href="libxml2-globals.html#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a> func);
+<a href="libxml2-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a>	<a href="#xmlOutputBufferCreateFilenameDefault">xmlOutputBufferCreateFilenameDefault</a>	(<a href="libxml2-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a> func);
+typedef <a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> <a href="#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a>	(const char * URI, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder, <br/>							 int compression);
+<a href="libxml2-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a>	<a href="#xmlParserInputBufferCreateFilenameDefault">xmlParserInputBufferCreateFilenameDefault</a>	(<a href="libxml2-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a> func);
 typedef <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> <a href="#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a>	(const char * URI, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
@@ -53,4 +56,5 @@
 typedef <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> <a href="#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a>	(const char * URI, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-<a href="libxml2-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a>	<a href="#xmlThrDefOutputBufferCreateFilenameDefault">xmlThrDefOutputBufferCreateFilenameDefault</a>	(<a href="libxml2-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a> func);
-<a href="libxml2-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a>	<a href="#xmlDeregisterNodeDefault">xmlDeregisterNodeDefault</a>	(<a href="libxml2-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a> func);
+<a href="libxml2-globals.html#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a>	<a href="#xmlRegisterNodeDefault">xmlRegisterNodeDefault</a>	(<a href="libxml2-globals.html#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a> func);
+typedef void <a href="#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+<a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a>	<a href="#xmlThrDefBufferAllocScheme">xmlThrDefBufferAllocScheme</a>	(<a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a> v);
 int	<a href="#xmlThrDefDefaultBufferSize">xmlThrDefDefaultBufferSize</a>	(int v);
@@ -56,3 +60,8 @@
 int	<a href="#xmlThrDefDefaultBufferSize">xmlThrDefDefaultBufferSize</a>	(int v);
-<a href="libxml2-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a>	<a href="#xmlOutputBufferCreateFilenameDefault">xmlOutputBufferCreateFilenameDefault</a>	(<a href="libxml2-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a> func);
+<a href="libxml2-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a>	<a href="#xmlThrDefDeregisterNodeDefault">xmlThrDefDeregisterNodeDefault</a>	(<a href="libxml2-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a> func);
+int	<a href="#xmlThrDefDoValidityCheckingDefaultValue">xmlThrDefDoValidityCheckingDefaultValue</a>	(int v);
+int	<a href="#xmlThrDefGetWarningsDefaultValue">xmlThrDefGetWarningsDefaultValue</a>	(int v);
+int	<a href="#xmlThrDefIndentTreeOutput">xmlThrDefIndentTreeOutput</a>	(int v);
+int	<a href="#xmlThrDefKeepBlanksDefaultValue">xmlThrDefKeepBlanksDefaultValue</a>	(int v);
+int	<a href="#xmlThrDefLineNumbersDefaultValue">xmlThrDefLineNumbersDefaultValue</a>	(int v);
 int	<a href="#xmlThrDefLoadExtDtdDefaultValue">xmlThrDefLoadExtDtdDefaultValue</a>	(int v);
@@ -58,6 +67,4 @@
 int	<a href="#xmlThrDefLoadExtDtdDefaultValue">xmlThrDefLoadExtDtdDefaultValue</a>	(int v);
-<a href="libxml2-globals.html#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a>	<a href="#xmlThrDefRegisterNodeDefault">xmlThrDefRegisterNodeDefault</a>	(<a href="libxml2-globals.html#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a> func);
-int	<a href="#xmlThrDefKeepBlanksDefaultValue">xmlThrDefKeepBlanksDefaultValue</a>	(int v);
-typedef void <a href="#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+<a href="libxml2-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a>	<a href="#xmlThrDefOutputBufferCreateFilenameDefault">xmlThrDefOutputBufferCreateFilenameDefault</a>	(<a href="libxml2-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a> func);
 int	<a href="#xmlThrDefParserDebugEntities">xmlThrDefParserDebugEntities</a>	(int v);
 <a href="libxml2-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a>	<a href="#xmlThrDefParserInputBufferCreateFilenameDefault">xmlThrDefParserInputBufferCreateFilenameDefault</a>	(<a href="libxml2-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a> func);
@@ -62,3 +69,6 @@
 int	<a href="#xmlThrDefParserDebugEntities">xmlThrDefParserDebugEntities</a>	(int v);
 <a href="libxml2-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a>	<a href="#xmlThrDefParserInputBufferCreateFilenameDefault">xmlThrDefParserInputBufferCreateFilenameDefault</a>	(<a href="libxml2-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a> func);
+int	<a href="#xmlThrDefPedanticParserDefaultValue">xmlThrDefPedanticParserDefaultValue</a>	(int v);
+<a href="libxml2-globals.html#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a>	<a href="#xmlThrDefRegisterNodeDefault">xmlThrDefRegisterNodeDefault</a>	(<a href="libxml2-globals.html#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a> func);
+int	<a href="#xmlThrDefSaveNoEmptyTags">xmlThrDefSaveNoEmptyTags</a>	(int v);
 void	<a href="#xmlThrDefSetGenericErrorFunc">xmlThrDefSetGenericErrorFunc</a>	(void * ctx, <br/>					 <a href="libxml2-xmlerror.html#xmlGenericErrorFunc">xmlGenericErrorFunc</a> handler);
@@ -64,7 +74,3 @@
 void	<a href="#xmlThrDefSetGenericErrorFunc">xmlThrDefSetGenericErrorFunc</a>	(void * ctx, <br/>					 <a href="libxml2-xmlerror.html#xmlGenericErrorFunc">xmlGenericErrorFunc</a> handler);
-<a href="libxml2-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a>	<a href="#xmlParserInputBufferCreateFilenameDefault">xmlParserInputBufferCreateFilenameDefault</a>	(<a href="libxml2-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a> func);
-int	<a href="#xmlThrDefDoValidityCheckingDefaultValue">xmlThrDefDoValidityCheckingDefaultValue</a>	(int v);
-void	<a href="#xmlCleanupGlobals">xmlCleanupGlobals</a>		(void);
-int	<a href="#xmlThrDefGetWarningsDefaultValue">xmlThrDefGetWarningsDefaultValue</a>	(int v);
-<a href="libxml2-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a>	<a href="#xmlThrDefDeregisterNodeDefault">xmlThrDefDeregisterNodeDefault</a>	(<a href="libxml2-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a> func);
+void	<a href="#xmlThrDefSetStructuredErrorFunc">xmlThrDefSetStructuredErrorFunc</a>	(void * ctx, <br/>					 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> handler);
 int	<a href="#xmlThrDefSubstituteEntitiesDefaultValue">xmlThrDefSubstituteEntitiesDefaultValue</a>	(int v);
@@ -70,10 +76,4 @@
 int	<a href="#xmlThrDefSubstituteEntitiesDefaultValue">xmlThrDefSubstituteEntitiesDefaultValue</a>	(int v);
-typedef void <a href="#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-int	<a href="#xmlThrDefSaveNoEmptyTags">xmlThrDefSaveNoEmptyTags</a>	(int v);
-int	<a href="#xmlThrDefIndentTreeOutput">xmlThrDefIndentTreeOutput</a>	(int v);
-typedef <a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> <a href="#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a>	(const char * URI, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder, <br/>							 int compression);
-void	<a href="#xmlInitGlobals">xmlInitGlobals</a>			(void);
-int	<a href="#xmlThrDefLineNumbersDefaultValue">xmlThrDefLineNumbersDefaultValue</a>	(int v);
 const char *	<a href="#xmlThrDefTreeIndentString">xmlThrDefTreeIndentString</a>	(const char * v);
 </pre>
     </div>
diff --git a/doc/devhelp/libxml2-hash.html b/doc/devhelp/libxml2-hash.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1oYXNoLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1oYXNoLmh0bWw= 100644
--- a/doc/devhelp/libxml2-hash.html
+++ b/doc/devhelp/libxml2-hash.html
@@ -46,7 +46,10 @@
       <pre class="synopsis">#define <a href="#XML_CAST_FPTR">XML_CAST_FPTR</a>(fptr);
 typedef struct _xmlHashTable <a href="#xmlHashTable">xmlHashTable</a>;
 typedef <a href="libxml2-hash.html#xmlHashTable">xmlHashTable</a> * <a href="#xmlHashTablePtr">xmlHashTablePtr</a>;
-void	<a href="#xmlHashScanFull">xmlHashScanFull</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 <a href="libxml2-hash.html#xmlHashScannerFull">xmlHashScannerFull</a> f, <br/>					 void * data);
-void	<a href="#xmlHashScan">xmlHashScan</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 <a href="libxml2-hash.html#xmlHashScanner">xmlHashScanner</a> f, <br/>					 void * data);
-typedef void <a href="#xmlHashScannerFull">xmlHashScannerFull</a>		(void * payload, <br/>					 void * data, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3);
+int	<a href="#xmlHashAddEntry">xmlHashAddEntry</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 void * userdata);
+int	<a href="#xmlHashAddEntry2">xmlHashAddEntry2</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 void * userdata);
+int	<a href="#xmlHashAddEntry3">xmlHashAddEntry3</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 void * userdata);
+typedef void * <a href="#xmlHashCopier">xmlHashCopier</a>			(void * payload, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a>	<a href="#xmlHashCopy">xmlHashCopy</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 <a href="libxml2-hash.html#xmlHashCopier">xmlHashCopier</a> f);
+<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a>	<a href="#xmlHashCreate">xmlHashCreate</a>		(int size);
 <a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a>	<a href="#xmlHashCreateDict">xmlHashCreateDict</a>	(int size, <br/>					 <a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
@@ -52,8 +55,2 @@
 <a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a>	<a href="#xmlHashCreateDict">xmlHashCreateDict</a>	(int size, <br/>					 <a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
-int	<a href="#xmlHashAddEntry">xmlHashAddEntry</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 void * userdata);
-int	<a href="#xmlHashUpdateEntry">xmlHashUpdateEntry</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 void * userdata, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
-void *	<a href="#xmlHashQLookup3">xmlHashQLookup3</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix3, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3);
-void *	<a href="#xmlHashQLookup2">xmlHashQLookup2</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2);
-void	<a href="#xmlHashScan3">xmlHashScan3</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 <a href="libxml2-hash.html#xmlHashScanner">xmlHashScanner</a> f, <br/>					 void * data);
-typedef void <a href="#xmlHashScanner">xmlHashScanner</a>			(void * payload, <br/>					 void * data, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 typedef void <a href="#xmlHashDeallocator">xmlHashDeallocator</a>		(void * payload, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -59,4 +56,4 @@
 typedef void <a href="#xmlHashDeallocator">xmlHashDeallocator</a>		(void * payload, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a>	<a href="#xmlHashCreate">xmlHashCreate</a>		(int size);
+void	<a href="#xmlHashDefaultDeallocator">xmlHashDefaultDeallocator</a>	(void * entry, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 void	<a href="#xmlHashFree">xmlHashFree</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
 void *	<a href="#xmlHashLookup">xmlHashLookup</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -61,3 +58,5 @@
 void	<a href="#xmlHashFree">xmlHashFree</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
 void *	<a href="#xmlHashLookup">xmlHashLookup</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+void *	<a href="#xmlHashLookup2">xmlHashLookup2</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2);
+void *	<a href="#xmlHashLookup3">xmlHashLookup3</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3);
 void *	<a href="#xmlHashQLookup">xmlHashQLookup</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -63,4 +62,6 @@
 void *	<a href="#xmlHashQLookup">xmlHashQLookup</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlHashUpdateEntry2">xmlHashUpdateEntry2</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 void * userdata, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
+void *	<a href="#xmlHashQLookup2">xmlHashQLookup2</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2);
+void *	<a href="#xmlHashQLookup3">xmlHashQLookup3</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix3, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3);
+int	<a href="#xmlHashRemoveEntry">xmlHashRemoveEntry</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
 int	<a href="#xmlHashRemoveEntry2">xmlHashRemoveEntry2</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
 int	<a href="#xmlHashRemoveEntry3">xmlHashRemoveEntry3</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
@@ -65,4 +66,6 @@
 int	<a href="#xmlHashRemoveEntry2">xmlHashRemoveEntry2</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
 int	<a href="#xmlHashRemoveEntry3">xmlHashRemoveEntry3</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
-<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a>	<a href="#xmlHashCopy">xmlHashCopy</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 <a href="libxml2-hash.html#xmlHashCopier">xmlHashCopier</a> f);
+void	<a href="#xmlHashScan">xmlHashScan</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 <a href="libxml2-hash.html#xmlHashScanner">xmlHashScanner</a> f, <br/>					 void * data);
+void	<a href="#xmlHashScan3">xmlHashScan3</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 <a href="libxml2-hash.html#xmlHashScanner">xmlHashScanner</a> f, <br/>					 void * data);
+void	<a href="#xmlHashScanFull">xmlHashScanFull</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 <a href="libxml2-hash.html#xmlHashScannerFull">xmlHashScannerFull</a> f, <br/>					 void * data);
 void	<a href="#xmlHashScanFull3">xmlHashScanFull3</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 <a href="libxml2-hash.html#xmlHashScannerFull">xmlHashScannerFull</a> f, <br/>					 void * data);
@@ -68,2 +71,7 @@
 void	<a href="#xmlHashScanFull3">xmlHashScanFull3</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 <a href="libxml2-hash.html#xmlHashScannerFull">xmlHashScannerFull</a> f, <br/>					 void * data);
+typedef void <a href="#xmlHashScanner">xmlHashScanner</a>			(void * payload, <br/>					 void * data, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+typedef void <a href="#xmlHashScannerFull">xmlHashScannerFull</a>		(void * payload, <br/>					 void * data, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3);
+int	<a href="#xmlHashSize">xmlHashSize</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table);
+int	<a href="#xmlHashUpdateEntry">xmlHashUpdateEntry</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 void * userdata, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
+int	<a href="#xmlHashUpdateEntry2">xmlHashUpdateEntry2</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 void * userdata, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
 int	<a href="#xmlHashUpdateEntry3">xmlHashUpdateEntry3</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 void * userdata, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
@@ -69,12 +77,4 @@
 int	<a href="#xmlHashUpdateEntry3">xmlHashUpdateEntry3</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 void * userdata, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
-void	<a href="#xmlHashDefaultDeallocator">xmlHashDefaultDeallocator</a>	(void * entry, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void *	<a href="#xmlHashLookup3">xmlHashLookup3</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3);
-void *	<a href="#xmlHashLookup2">xmlHashLookup2</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2);
-int	<a href="#xmlHashRemoveEntry">xmlHashRemoveEntry</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-hash.html#xmlHashDeallocator">xmlHashDeallocator</a> f);
-typedef void * <a href="#xmlHashCopier">xmlHashCopier</a>			(void * payload, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlHashAddEntry2">xmlHashAddEntry2</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 void * userdata);
-int	<a href="#xmlHashAddEntry3">xmlHashAddEntry3</a>		(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name2, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name3, <br/>					 void * userdata);
-int	<a href="#xmlHashSize">xmlHashSize</a>			(<a href="libxml2-hash.html#xmlHashTablePtr">xmlHashTablePtr</a> table);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-list.html b/doc/devhelp/libxml2-list.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1saXN0Lmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1saXN0Lmh0bWw= 100644
--- a/doc/devhelp/libxml2-list.html
+++ b/doc/devhelp/libxml2-list.html
@@ -47,7 +47,10 @@
 typedef <a href="libxml2-list.html#xmlLink">xmlLink</a> * <a href="#xmlLinkPtr">xmlLinkPtr</a>;
 typedef struct _xmlList <a href="#xmlList">xmlList</a>;
 typedef <a href="libxml2-list.html#xmlList">xmlList</a> * <a href="#xmlListPtr">xmlListPtr</a>;
-int	<a href="#xmlListInsert">xmlListInsert</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
-int	<a href="#xmlListEmpty">xmlListEmpty</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
-void	<a href="#xmlListSort">xmlListSort</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+void *	<a href="#xmlLinkGetData">xmlLinkGetData</a>			(<a href="libxml2-list.html#xmlLinkPtr">xmlLinkPtr</a> lk);
+int	<a href="#xmlListAppend">xmlListAppend</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
+void	<a href="#xmlListClear">xmlListClear</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+int	<a href="#xmlListCopy">xmlListCopy</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> cur, <br/>					 const <a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> old);
+<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a>	<a href="#xmlListCreate">xmlListCreate</a>		(<a href="libxml2-list.html#xmlListDeallocator">xmlListDeallocator</a> deallocator, <br/>					 <a href="libxml2-list.html#xmlListDataCompare">xmlListDataCompare</a> compare);
+typedef int <a href="#xmlListDataCompare">xmlListDataCompare</a>		(const void * data0, <br/>					 const void * data1);
 typedef void <a href="#xmlListDeallocator">xmlListDeallocator</a>		(<a href="libxml2-list.html#xmlLinkPtr">xmlLinkPtr</a> lk);
@@ -53,4 +56,3 @@
 typedef void <a href="#xmlListDeallocator">xmlListDeallocator</a>		(<a href="libxml2-list.html#xmlLinkPtr">xmlLinkPtr</a> lk);
-void	<a href="#xmlListMerge">xmlListMerge</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l1, <br/>					 <a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l2);
-<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a>	<a href="#xmlListCreate">xmlListCreate</a>		(<a href="libxml2-list.html#xmlListDeallocator">xmlListDeallocator</a> deallocator, <br/>					 <a href="libxml2-list.html#xmlListDataCompare">xmlListDataCompare</a> compare);
+void	<a href="#xmlListDelete">xmlListDelete</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
 <a href="libxml2-list.html#xmlListPtr">xmlListPtr</a>	<a href="#xmlListDup">xmlListDup</a>		(const <a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> old);
@@ -56,4 +58,11 @@
 <a href="libxml2-list.html#xmlListPtr">xmlListPtr</a>	<a href="#xmlListDup">xmlListDup</a>		(const <a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> old);
-int	<a href="#xmlListRemoveLast">xmlListRemoveLast</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
-void	<a href="#xmlListWalk">xmlListWalk</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 <a href="libxml2-list.html#xmlListWalker">xmlListWalker</a> walker, <br/>					 void * user);
+int	<a href="#xmlListEmpty">xmlListEmpty</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+<a href="libxml2-list.html#xmlLinkPtr">xmlLinkPtr</a>	<a href="#xmlListEnd">xmlListEnd</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+<a href="libxml2-list.html#xmlLinkPtr">xmlLinkPtr</a>	<a href="#xmlListFront">xmlListFront</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+int	<a href="#xmlListInsert">xmlListInsert</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
+void	<a href="#xmlListMerge">xmlListMerge</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l1, <br/>					 <a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l2);
+void	<a href="#xmlListPopBack">xmlListPopBack</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+void	<a href="#xmlListPopFront">xmlListPopFront</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+int	<a href="#xmlListPushBack">xmlListPushBack</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
+int	<a href="#xmlListPushFront">xmlListPushFront</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
 int	<a href="#xmlListRemoveAll">xmlListRemoveAll</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
@@ -59,6 +68,2 @@
 int	<a href="#xmlListRemoveAll">xmlListRemoveAll</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
-int	<a href="#xmlListCopy">xmlListCopy</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> cur, <br/>					 const <a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> old);
-void	<a href="#xmlListPopFront">xmlListPopFront</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
-void *	<a href="#xmlListSearch">xmlListSearch</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
-typedef int <a href="#xmlListWalker">xmlListWalker</a>			(const void * data, <br/>					 void * user);
 int	<a href="#xmlListRemoveFirst">xmlListRemoveFirst</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
@@ -64,2 +69,5 @@
 int	<a href="#xmlListRemoveFirst">xmlListRemoveFirst</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
+int	<a href="#xmlListRemoveLast">xmlListRemoveLast</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
+void	<a href="#xmlListReverse">xmlListReverse</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+void *	<a href="#xmlListReverseSearch">xmlListReverseSearch</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
 void	<a href="#xmlListReverseWalk">xmlListReverseWalk</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 <a href="libxml2-list.html#xmlListWalker">xmlListWalker</a> walker, <br/>					 void * user);
@@ -65,7 +73,3 @@
 void	<a href="#xmlListReverseWalk">xmlListReverseWalk</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 <a href="libxml2-list.html#xmlListWalker">xmlListWalker</a> walker, <br/>					 void * user);
-void *	<a href="#xmlLinkGetData">xmlLinkGetData</a>			(<a href="libxml2-list.html#xmlLinkPtr">xmlLinkPtr</a> lk);
-void	<a href="#xmlListClear">xmlListClear</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
-int	<a href="#xmlListAppend">xmlListAppend</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
-void	<a href="#xmlListReverse">xmlListReverse</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
-typedef int <a href="#xmlListDataCompare">xmlListDataCompare</a>		(const void * data0, <br/>					 const void * data1);
+void *	<a href="#xmlListSearch">xmlListSearch</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
 int	<a href="#xmlListSize">xmlListSize</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
@@ -71,11 +75,7 @@
 int	<a href="#xmlListSize">xmlListSize</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
-int	<a href="#xmlListPushFront">xmlListPushFront</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
-<a href="libxml2-list.html#xmlLinkPtr">xmlLinkPtr</a>	<a href="#xmlListEnd">xmlListEnd</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
-void	<a href="#xmlListPopBack">xmlListPopBack</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
-void *	<a href="#xmlListReverseSearch">xmlListReverseSearch</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
-int	<a href="#xmlListPushBack">xmlListPushBack</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 void * data);
-<a href="libxml2-list.html#xmlLinkPtr">xmlLinkPtr</a>	<a href="#xmlListFront">xmlListFront</a>		(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
-void	<a href="#xmlListDelete">xmlListDelete</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+void	<a href="#xmlListSort">xmlListSort</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l);
+void	<a href="#xmlListWalk">xmlListWalk</a>			(<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a> l, <br/>					 <a href="libxml2-list.html#xmlListWalker">xmlListWalker</a> walker, <br/>					 void * user);
+typedef int <a href="#xmlListWalker">xmlListWalker</a>			(const void * data, <br/>					 void * user);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-nanoftp.html b/doc/devhelp/libxml2-nanoftp.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1uYW5vZnRwLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1uYW5vZnRwLmh0bWw= 100644
--- a/doc/devhelp/libxml2-nanoftp.html
+++ b/doc/devhelp/libxml2-nanoftp.html
@@ -46,5 +46,8 @@
       <h2>Synopsis</h2>
       <pre class="synopsis">#define <a href="#INVALID_SOCKET">INVALID_SOCKET</a>;
 #define <a href="#SOCKET">SOCKET</a>;
-int	<a href="#xmlNanoFTPQuit">xmlNanoFTPQuit</a>			(void * ctx);
+typedef void <a href="#ftpDataCallback">ftpDataCallback</a>			(void * userData, <br/>					 const char * data, <br/>					 int len);
+typedef void <a href="#ftpListCallback">ftpListCallback</a>			(void * userData, <br/>					 const char * filename, <br/>					 const char * attrib, <br/>					 const char * owner, <br/>					 const char * group, <br/>					 unsigned long size, <br/>					 int links, <br/>					 int year, <br/>					 const char * month, <br/>					 int day, <br/>					 int hour, <br/>					 int minute);
+int	<a href="#xmlNanoFTPCheckResponse">xmlNanoFTPCheckResponse</a>		(void * ctx);
+void	<a href="#xmlNanoFTPCleanup">xmlNanoFTPCleanup</a>		(void);
 int	<a href="#xmlNanoFTPClose">xmlNanoFTPClose</a>			(void * ctx);
@@ -50,3 +53,2 @@
 int	<a href="#xmlNanoFTPClose">xmlNanoFTPClose</a>			(void * ctx);
-typedef void <a href="#ftpListCallback">ftpListCallback</a>			(void * userData, <br/>					 const char * filename, <br/>					 const char * attrib, <br/>					 const char * owner, <br/>					 const char * group, <br/>					 unsigned long size, <br/>					 int links, <br/>					 int year, <br/>					 const char * month, <br/>					 int day, <br/>					 int hour, <br/>					 int minute);
 int	<a href="#xmlNanoFTPCloseConnection">xmlNanoFTPCloseConnection</a>	(void * ctx);
@@ -52,2 +54,15 @@
 int	<a href="#xmlNanoFTPCloseConnection">xmlNanoFTPCloseConnection</a>	(void * ctx);
+int	<a href="#xmlNanoFTPConnect">xmlNanoFTPConnect</a>		(void * ctx);
+void *	<a href="#xmlNanoFTPConnectTo">xmlNanoFTPConnectTo</a>		(const char * server, <br/>					 int port);
+int	<a href="#xmlNanoFTPCwd">xmlNanoFTPCwd</a>			(void * ctx, <br/>					 const char * directory);
+int	<a href="#xmlNanoFTPDele">xmlNanoFTPDele</a>			(void * ctx, <br/>					 const char * file);
+void	<a href="#xmlNanoFTPFreeCtxt">xmlNanoFTPFreeCtxt</a>		(void * ctx);
+int	<a href="#xmlNanoFTPGet">xmlNanoFTPGet</a>			(void * ctx, <br/>					 <a href="libxml2-nanoftp.html#ftpDataCallback">ftpDataCallback</a> callback, <br/>					 void * userData, <br/>					 const char * filename);
+<a href="libxml2-nanoftp.html#SOCKET">SOCKET</a>	<a href="#xmlNanoFTPGetConnection">xmlNanoFTPGetConnection</a>		(void * ctx);
+int	<a href="#xmlNanoFTPGetResponse">xmlNanoFTPGetResponse</a>		(void * ctx);
+<a href="libxml2-nanoftp.html#SOCKET">SOCKET</a>	<a href="#xmlNanoFTPGetSocket">xmlNanoFTPGetSocket</a>		(void * ctx, <br/>					 const char * filename);
+void	<a href="#xmlNanoFTPInit">xmlNanoFTPInit</a>			(void);
+int	<a href="#xmlNanoFTPList">xmlNanoFTPList</a>			(void * ctx, <br/>					 <a href="libxml2-nanoftp.html#ftpListCallback">ftpListCallback</a> callback, <br/>					 void * userData, <br/>					 const char * filename);
+void *	<a href="#xmlNanoFTPNewCtxt">xmlNanoFTPNewCtxt</a>		(const char * URL);
+void *	<a href="#xmlNanoFTPOpen">xmlNanoFTPOpen</a>			(const char * URL);
 void	<a href="#xmlNanoFTPProxy">xmlNanoFTPProxy</a>			(const char * host, <br/>					 int port, <br/>					 const char * user, <br/>					 const char * passwd, <br/>					 int type);
@@ -53,7 +68,4 @@
 void	<a href="#xmlNanoFTPProxy">xmlNanoFTPProxy</a>			(const char * host, <br/>					 int port, <br/>					 const char * user, <br/>					 const char * passwd, <br/>					 int type);
-int	<a href="#xmlNanoFTPUpdateURL">xmlNanoFTPUpdateURL</a>		(void * ctx, <br/>					 const char * URL);
-<a href="libxml2-nanoftp.html#SOCKET">SOCKET</a>	<a href="#xmlNanoFTPGetConnection">xmlNanoFTPGetConnection</a>		(void * ctx);
-int	<a href="#xmlNanoFTPDele">xmlNanoFTPDele</a>			(void * ctx, <br/>					 const char * file);
-void *	<a href="#xmlNanoFTPNewCtxt">xmlNanoFTPNewCtxt</a>		(const char * URL);
-int	<a href="#xmlNanoFTPCheckResponse">xmlNanoFTPCheckResponse</a>		(void * ctx);
+int	<a href="#xmlNanoFTPQuit">xmlNanoFTPQuit</a>			(void * ctx);
+int	<a href="#xmlNanoFTPRead">xmlNanoFTPRead</a>			(void * ctx, <br/>					 void * dest, <br/>					 int len);
 void	<a href="#xmlNanoFTPScanProxy">xmlNanoFTPScanProxy</a>		(const char * URL);
@@ -59,17 +71,5 @@
 void	<a href="#xmlNanoFTPScanProxy">xmlNanoFTPScanProxy</a>		(const char * URL);
-typedef void <a href="#ftpDataCallback">ftpDataCallback</a>			(void * userData, <br/>					 const char * data, <br/>					 int len);
-int	<a href="#xmlNanoFTPGetResponse">xmlNanoFTPGetResponse</a>		(void * ctx);
-int	<a href="#xmlNanoFTPCwd">xmlNanoFTPCwd</a>			(void * ctx, <br/>					 const char * directory);
-void	<a href="#xmlNanoFTPInit">xmlNanoFTPInit</a>			(void);
-void *	<a href="#xmlNanoFTPConnectTo">xmlNanoFTPConnectTo</a>		(const char * server, <br/>					 int port);
-int	<a href="#xmlNanoFTPList">xmlNanoFTPList</a>			(void * ctx, <br/>					 <a href="libxml2-nanoftp.html#ftpListCallback">ftpListCallback</a> callback, <br/>					 void * userData, <br/>					 const char * filename);
-void *	<a href="#xmlNanoFTPOpen">xmlNanoFTPOpen</a>			(const char * URL);
-int	<a href="#xmlNanoFTPConnect">xmlNanoFTPConnect</a>		(void * ctx);
-<a href="libxml2-nanoftp.html#SOCKET">SOCKET</a>	<a href="#xmlNanoFTPGetSocket">xmlNanoFTPGetSocket</a>		(void * ctx, <br/>					 const char * filename);
-int	<a href="#xmlNanoFTPGet">xmlNanoFTPGet</a>			(void * ctx, <br/>					 <a href="libxml2-nanoftp.html#ftpDataCallback">ftpDataCallback</a> callback, <br/>					 void * userData, <br/>					 const char * filename);
-int	<a href="#xmlNanoFTPRead">xmlNanoFTPRead</a>			(void * ctx, <br/>					 void * dest, <br/>					 int len);
-void	<a href="#xmlNanoFTPFreeCtxt">xmlNanoFTPFreeCtxt</a>		(void * ctx);
-void	<a href="#xmlNanoFTPCleanup">xmlNanoFTPCleanup</a>		(void);
+int	<a href="#xmlNanoFTPUpdateURL">xmlNanoFTPUpdateURL</a>		(void * ctx, <br/>					 const char * URL);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-nanohttp.html b/doc/devhelp/libxml2-nanohttp.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1uYW5vaHR0cC5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1uYW5vaHR0cC5odG1s 100644
--- a/doc/devhelp/libxml2-nanohttp.html
+++ b/doc/devhelp/libxml2-nanohttp.html
@@ -43,9 +43,7 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">int	<a href="#xmlNanoHTTPRead">xmlNanoHTTPRead</a>			(void * ctx, <br/>					 void * dest, <br/>					 int len);
-int	<a href="#xmlNanoHTTPSave">xmlNanoHTTPSave</a>			(void * ctxt, <br/>					 const char * filename);
-const char *	<a href="#xmlNanoHTTPRedir">xmlNanoHTTPRedir</a>	(void * ctx);
-const char *	<a href="#xmlNanoHTTPAuthHeader">xmlNanoHTTPAuthHeader</a>	(void * ctx);
-int	<a href="#xmlNanoHTTPFetch">xmlNanoHTTPFetch</a>		(const char * URL, <br/>					 const char * filename, <br/>					 char ** contentType);
+      <pre class="synopsis">const char *	<a href="#xmlNanoHTTPAuthHeader">xmlNanoHTTPAuthHeader</a>	(void * ctx);
+void	<a href="#xmlNanoHTTPCleanup">xmlNanoHTTPCleanup</a>		(void);
+void	<a href="#xmlNanoHTTPClose">xmlNanoHTTPClose</a>		(void * ctx);
 int	<a href="#xmlNanoHTTPContentLength">xmlNanoHTTPContentLength</a>	(void * ctx);
@@ -51,2 +49,7 @@
 int	<a href="#xmlNanoHTTPContentLength">xmlNanoHTTPContentLength</a>	(void * ctx);
+const char *	<a href="#xmlNanoHTTPEncoding">xmlNanoHTTPEncoding</a>	(void * ctx);
+int	<a href="#xmlNanoHTTPFetch">xmlNanoHTTPFetch</a>		(const char * URL, <br/>					 const char * filename, <br/>					 char ** contentType);
+void	<a href="#xmlNanoHTTPInit">xmlNanoHTTPInit</a>			(void);
+void *	<a href="#xmlNanoHTTPMethod">xmlNanoHTTPMethod</a>		(const char * URL, <br/>					 const char * method, <br/>					 const char * input, <br/>					 char ** contentType, <br/>					 const char * headers, <br/>					 int ilen);
+void *	<a href="#xmlNanoHTTPMethodRedir">xmlNanoHTTPMethodRedir</a>		(const char * URL, <br/>					 const char * method, <br/>					 const char * input, <br/>					 char ** contentType, <br/>					 char ** redir, <br/>					 const char * headers, <br/>					 int ilen);
 const char *	<a href="#xmlNanoHTTPMimeType">xmlNanoHTTPMimeType</a>	(void * ctx);
@@ -52,7 +55,3 @@
 const char *	<a href="#xmlNanoHTTPMimeType">xmlNanoHTTPMimeType</a>	(void * ctx);
-void	<a href="#xmlNanoHTTPClose">xmlNanoHTTPClose</a>		(void * ctx);
-void	<a href="#xmlNanoHTTPCleanup">xmlNanoHTTPCleanup</a>		(void);
-void *	<a href="#xmlNanoHTTPMethod">xmlNanoHTTPMethod</a>		(const char * URL, <br/>					 const char * method, <br/>					 const char * input, <br/>					 char ** contentType, <br/>					 const char * headers, <br/>					 int ilen);
-void	<a href="#xmlNanoHTTPInit">xmlNanoHTTPInit</a>			(void);
 void *	<a href="#xmlNanoHTTPOpen">xmlNanoHTTPOpen</a>			(const char * URL, <br/>					 char ** contentType);
 void *	<a href="#xmlNanoHTTPOpenRedir">xmlNanoHTTPOpenRedir</a>		(const char * URL, <br/>					 char ** contentType, <br/>					 char ** redir);
@@ -57,4 +56,7 @@
 void *	<a href="#xmlNanoHTTPOpen">xmlNanoHTTPOpen</a>			(const char * URL, <br/>					 char ** contentType);
 void *	<a href="#xmlNanoHTTPOpenRedir">xmlNanoHTTPOpenRedir</a>		(const char * URL, <br/>					 char ** contentType, <br/>					 char ** redir);
-void *	<a href="#xmlNanoHTTPMethodRedir">xmlNanoHTTPMethodRedir</a>		(const char * URL, <br/>					 const char * method, <br/>					 const char * input, <br/>					 char ** contentType, <br/>					 char ** redir, <br/>					 const char * headers, <br/>					 int ilen);
+int	<a href="#xmlNanoHTTPRead">xmlNanoHTTPRead</a>			(void * ctx, <br/>					 void * dest, <br/>					 int len);
+const char *	<a href="#xmlNanoHTTPRedir">xmlNanoHTTPRedir</a>	(void * ctx);
+int	<a href="#xmlNanoHTTPReturnCode">xmlNanoHTTPReturnCode</a>		(void * ctx);
+int	<a href="#xmlNanoHTTPSave">xmlNanoHTTPSave</a>			(void * ctxt, <br/>					 const char * filename);
 void	<a href="#xmlNanoHTTPScanProxy">xmlNanoHTTPScanProxy</a>		(const char * URL);
@@ -60,6 +62,4 @@
 void	<a href="#xmlNanoHTTPScanProxy">xmlNanoHTTPScanProxy</a>		(const char * URL);
-const char *	<a href="#xmlNanoHTTPEncoding">xmlNanoHTTPEncoding</a>	(void * ctx);
-int	<a href="#xmlNanoHTTPReturnCode">xmlNanoHTTPReturnCode</a>		(void * ctx);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1wYXJzZXIuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1wYXJzZXIuaHRtbA== 100644
--- a/doc/devhelp/libxml2-parser.html
+++ b/doc/devhelp/libxml2-parser.html
@@ -44,6 +44,5 @@
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
       <pre class="synopsis">#define <a href="#XML_COMPLETE_ATTRS">XML_COMPLETE_ATTRS</a>;
-#define <a href="#XML_SKIP_IDS">XML_SKIP_IDS</a>;
-#define <a href="#XML_SAX2_MAGIC">XML_SAX2_MAGIC</a>;
+#define <a href="#XML_DEFAULT_VERSION">XML_DEFAULT_VERSION</a>;
 #define <a href="#XML_DETECT_IDS">XML_DETECT_IDS</a>;
@@ -49,5 +48,5 @@
 #define <a href="#XML_DETECT_IDS">XML_DETECT_IDS</a>;
-#define <a href="#XML_DEFAULT_VERSION">XML_DEFAULT_VERSION</a>;
-typedef <a href="libxml2-parser.html#xmlParserNodeInfoSeq">xmlParserNodeInfoSeq</a> * <a href="#xmlParserNodeInfoSeqPtr">xmlParserNodeInfoSeqPtr</a>;
-typedef struct _xmlSAXHandlerV1 <a href="#xmlSAXHandlerV1">xmlSAXHandlerV1</a>;
+#define <a href="#XML_SAX2_MAGIC">XML_SAX2_MAGIC</a>;
+#define <a href="#XML_SKIP_IDS">XML_SKIP_IDS</a>;
+typedef enum <a href="#xmlFeature">xmlFeature</a>;
 typedef enum <a href="#xmlParserInputState">xmlParserInputState</a>;
@@ -53,3 +52,5 @@
 typedef enum <a href="#xmlParserInputState">xmlParserInputState</a>;
+typedef enum <a href="#xmlParserMode">xmlParserMode</a>;
+typedef struct _xmlParserNodeInfo <a href="#xmlParserNodeInfo">xmlParserNodeInfo</a>;
 typedef <a href="libxml2-parser.html#xmlParserNodeInfo">xmlParserNodeInfo</a> * <a href="#xmlParserNodeInfoPtr">xmlParserNodeInfoPtr</a>;
 typedef struct _xmlParserNodeInfoSeq <a href="#xmlParserNodeInfoSeq">xmlParserNodeInfoSeq</a>;
@@ -54,6 +55,4 @@
 typedef <a href="libxml2-parser.html#xmlParserNodeInfo">xmlParserNodeInfo</a> * <a href="#xmlParserNodeInfoPtr">xmlParserNodeInfoPtr</a>;
 typedef struct _xmlParserNodeInfoSeq <a href="#xmlParserNodeInfoSeq">xmlParserNodeInfoSeq</a>;
-typedef enum <a href="#xmlFeature">xmlFeature</a>;
-typedef enum <a href="#xmlParserMode">xmlParserMode</a>;
-typedef struct _xmlStartTag <a href="#xmlStartTag">xmlStartTag</a>;
+typedef <a href="libxml2-parser.html#xmlParserNodeInfoSeq">xmlParserNodeInfoSeq</a> * <a href="#xmlParserNodeInfoSeqPtr">xmlParserNodeInfoSeqPtr</a>;
 typedef enum <a href="#xmlParserOption">xmlParserOption</a>;
@@ -59,2 +58,3 @@
 typedef enum <a href="#xmlParserOption">xmlParserOption</a>;
+typedef struct _xmlSAXHandlerV1 <a href="#xmlSAXHandlerV1">xmlSAXHandlerV1</a>;
 typedef <a href="libxml2-parser.html#xmlSAXHandlerV1">xmlSAXHandlerV1</a> * <a href="#xmlSAXHandlerV1Ptr">xmlSAXHandlerV1Ptr</a>;
@@ -60,6 +60,3 @@
 typedef <a href="libxml2-parser.html#xmlSAXHandlerV1">xmlSAXHandlerV1</a> * <a href="#xmlSAXHandlerV1Ptr">xmlSAXHandlerV1Ptr</a>;
-typedef struct _xmlParserNodeInfo <a href="#xmlParserNodeInfo">xmlParserNodeInfo</a>;
-void	<a href="#xmlSetupParserForBuffer">xmlSetupParserForBuffer</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * buffer, <br/>					 const char * filename);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadFile">xmlCtxtReadFile</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * filename, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#xmlParseCtxtExternalEntity">xmlParseCtxtExternalEntity</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URL, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst);
+typedef struct _xmlStartTag <a href="#xmlStartTag">xmlStartTag</a>;
 typedef void <a href="#attributeDeclSAXFunc">attributeDeclSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 int type, <br/>					 int def, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * defaultValue, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> tree);
@@ -65,2 +62,14 @@
 typedef void <a href="#attributeDeclSAXFunc">attributeDeclSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * fullname, <br/>					 int type, <br/>					 int def, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * defaultValue, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> tree);
+typedef void <a href="#attributeSAXFunc">attributeSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+typedef void <a href="#cdataBlockSAXFunc">cdataBlockSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int len);
+typedef void <a href="#charactersSAXFunc">charactersSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
+typedef void <a href="#commentSAXFunc">commentSAXFunc</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+typedef void <a href="#elementDeclSAXFunc">elementDeclSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content);
+typedef void <a href="#endDocumentSAXFunc">endDocumentSAXFunc</a>		(void * ctx);
+typedef void <a href="#endElementNsSAX2Func">endElementNsSAX2Func</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
+typedef void <a href="#endElementSAXFunc">endElementSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+typedef void <a href="#entityDeclSAXFunc">entityDeclSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+typedef void <a href="#errorSAXFunc">errorSAXFunc</a>			(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+typedef void <a href="#externalSubsetSAXFunc">externalSubsetSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+typedef void <a href="#fatalErrorSAXFunc">fatalErrorSAXFunc</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
 typedef <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> <a href="#getEntitySAXFunc">getEntitySAXFunc</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -66,2 +75,15 @@
 typedef <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> <a href="#getEntitySAXFunc">getEntitySAXFunc</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+typedef <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> <a href="#getParameterEntitySAXFunc">getParameterEntitySAXFunc</a>	(void * ctx, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+typedef int <a href="#hasExternalSubsetSAXFunc">hasExternalSubsetSAXFunc</a>	(void * ctx);
+typedef int <a href="#hasInternalSubsetSAXFunc">hasInternalSubsetSAXFunc</a>	(void * ctx);
+typedef void <a href="#ignorableWhitespaceSAXFunc">ignorableWhitespaceSAXFunc</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
+typedef void <a href="#internalSubsetSAXFunc">internalSubsetSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+typedef int <a href="#isStandaloneSAXFunc">isStandaloneSAXFunc</a>		(void * ctx);
+typedef void <a href="#notationDeclSAXFunc">notationDeclSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
+typedef void <a href="#processingInstructionSAXFunc">processingInstructionSAXFunc</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data);
+typedef void <a href="#referenceSAXFunc">referenceSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+typedef <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> <a href="#resolveEntitySAXFunc">resolveEntitySAXFunc</a>	(void * ctx, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
+typedef void <a href="#setDocumentLocatorSAXFunc">setDocumentLocatorSAXFunc</a>	(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlSAXLocatorPtr">xmlSAXLocatorPtr</a> loc);
+typedef void <a href="#startDocumentSAXFunc">startDocumentSAXFunc</a>		(void * ctx);
+typedef void <a href="#startElementNsSAX2Func">startElementNsSAX2Func</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 int nb_namespaces, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** namespaces, <br/>					 int nb_attributes, <br/>					 int nb_defaulted, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** attributes);
 typedef void <a href="#startElementSAXFunc">startElementSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** atts);
@@ -67,3 +89,6 @@
 typedef void <a href="#startElementSAXFunc">startElementSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** atts);
-typedef void <a href="#charactersSAXFunc">charactersSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
+typedef void <a href="#unparsedEntityDeclSAXFunc">unparsedEntityDeclSAXFunc</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * notationName);
+typedef void <a href="#warningSAXFunc">warningSAXFunc</a>			(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+long	<a href="#xmlByteConsumed">xmlByteConsumed</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlCleanupParser">xmlCleanupParser</a>		(void);
 void	<a href="#xmlClearNodeInfoSeq">xmlClearNodeInfoSeq</a>		(<a href="libxml2-parser.html#xmlParserNodeInfoSeqPtr">xmlParserNodeInfoSeqPtr</a> seq);
@@ -69,7 +94,4 @@
 void	<a href="#xmlClearNodeInfoSeq">xmlClearNodeInfoSeq</a>		(<a href="libxml2-parser.html#xmlParserNodeInfoSeqPtr">xmlParserNodeInfoSeqPtr</a> seq);
-int	<a href="#xmlParseChunk">xmlParseChunk</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * chunk, <br/>					 int size, <br/>					 int terminate);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseEntity">xmlParseEntity</a>		(const char * filename);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlRecoverFile">xmlRecoverFile</a>		(const char * filename);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadDoc">xmlCtxtReadDoc</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-typedef void <a href="#startElementNsSAX2Func">startElementNsSAX2Func</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 int nb_namespaces, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** namespaces, <br/>					 int nb_attributes, <br/>					 int nb_defaulted, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** attributes);
+void	<a href="#xmlClearParserCtxt">xmlClearParserCtxt</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateDocParserCtxt">xmlCreateDocParserCtxt</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur);
 <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateIOParserCtxt">xmlCreateIOParserCtxt</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>						 void * user_data, <br/>						 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>						 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>						 void * ioctx, <br/>						 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
@@ -75,21 +97,6 @@
 <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateIOParserCtxt">xmlCreateIOParserCtxt</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>						 void * user_data, <br/>						 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>						 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>						 void * ioctx, <br/>						 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-<a href="libxml2-xmlerror.html#xmlParserErrors">xmlParserErrors</a>	<a href="#xmlParseInNodeContext">xmlParseInNodeContext</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const char * data, <br/>					 int datalen, <br/>					 int options, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst);
-typedef void <a href="#referenceSAXFunc">referenceSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-typedef int <a href="#hasExternalSubsetSAXFunc">hasExternalSubsetSAXFunc</a>	(void * ctx);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseDoc">xmlSAXParseDoc</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 int recovery);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadMemory">xmlReadMemory</a>		(const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseMemory">xmlParseMemory</a>		(const char * buffer, <br/>					 int size);
-<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewIOInputStream">xmlNewIOInputStream</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>						 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-typedef void <a href="#processingInstructionSAXFunc">processingInstructionSAXFunc</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data);
-int	<a href="#xmlParseBalancedChunkMemoryRecover">xmlParseBalancedChunkMemoryRecover</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>						 void * user_data, <br/>						 int depth, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst, <br/>						 int recover);
-void	<a href="#xmlInitParser">xmlInitParser</a>			(void);
-<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateDocParserCtxt">xmlCreateDocParserCtxt</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur);
-typedef void <a href="#errorSAXFunc">errorSAXFunc</a>			(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseMemory">xmlSAXParseMemory</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const char * buffer, <br/>					 int size, <br/>					 int recovery);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlRecoverMemory">xmlRecoverMemory</a>	(const char * buffer, <br/>					 int size);
-typedef <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> <a href="#xmlExternalEntityLoader">xmlExternalEntityLoader</a>	(const char * URL, <br/>						 const char * ID, <br/>						 <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> context);
-typedef int <a href="#hasInternalSubsetSAXFunc">hasInternalSubsetSAXFunc</a>	(void * ctx);
-typedef void <a href="#cdataBlockSAXFunc">cdataBlockSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int len);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseFile">xmlSAXParseFile</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const char * filename, <br/>					 int recovery);
-typedef void <a href="#xmlParserInputDeallocate">xmlParserInputDeallocate</a>	(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
+<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreatePushParserCtxt">xmlCreatePushParserCtxt</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>						 void * user_data, <br/>						 const char * chunk, <br/>						 int size, <br/>						 const char * filename);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadDoc">xmlCtxtReadDoc</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadFd">xmlCtxtReadFd</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadFile">xmlCtxtReadFile</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * filename, <br/>					 const char * encoding, <br/>					 int options);
 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadIO">xmlCtxtReadIO</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
@@ -95,12 +102,2 @@
 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadIO">xmlCtxtReadIO</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseMemoryWithData">xmlSAXParseMemoryWithData</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>						 const char * buffer, <br/>						 int size, <br/>						 int recovery, <br/>						 void * data);
-int	<a href="#xmlGetFeature">xmlGetFeature</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * name, <br/>					 void * result);
-<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlIOParseDTD">xmlIOParseDTD</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>					 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-void	<a href="#xmlFreeParserCtxt">xmlFreeParserCtxt</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlParseDTD">xmlParseDTD</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlRecoverDoc">xmlRecoverDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur);
-typedef void <a href="#commentSAXFunc">commentSAXFunc</a>			(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-int	<a href="#xmlInitParserCtxt">xmlInitParserCtxt</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-typedef void <a href="#attributeSAXFunc">attributeSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-int	<a href="#xmlParserInputGrow">xmlParserInputGrow</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> in, <br/>					 int len);
 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadMemory">xmlCtxtReadMemory</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
@@ -106,11 +103,4 @@
 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadMemory">xmlCtxtReadMemory</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-typedef void <a href="#externalSubsetSAXFunc">externalSubsetSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-typedef <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> <a href="#resolveEntitySAXFunc">resolveEntitySAXFunc</a>	(void * ctx, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
-int	<a href="#xmlPedanticParserDefault">xmlPedanticParserDefault</a>	(int val);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseEntity">xmlSAXParseEntity</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const char * filename);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseDoc">xmlParseDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseFileWithData">xmlSAXParseFileWithData</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const char * filename, <br/>					 int recovery, <br/>					 void * data);
-int	<a href="#xmlLineNumbersDefault">xmlLineNumbersDefault</a>		(int val);
-<a href="libxml2-parser.html#xmlExternalEntityLoader">xmlExternalEntityLoader</a>	<a href="#xmlGetExternalEntityLoader">xmlGetExternalEntityLoader</a>	(void);
-typedef void <a href="#elementDeclSAXFunc">elementDeclSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content);
+void	<a href="#xmlCtxtReset">xmlCtxtReset</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#xmlCtxtResetPush">xmlCtxtResetPush</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * chunk, <br/>					 int size, <br/>					 const char * filename, <br/>					 const char * encoding);
 int	<a href="#xmlCtxtUseOptions">xmlCtxtUseOptions</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int options);
@@ -116,24 +106,7 @@
 int	<a href="#xmlCtxtUseOptions">xmlCtxtUseOptions</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int options);
-<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreatePushParserCtxt">xmlCreatePushParserCtxt</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>						 void * user_data, <br/>						 const char * chunk, <br/>						 int size, <br/>						 const char * filename);
-void	<a href="#xmlParserAddNodeInfo">xmlParserAddNodeInfo</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-parser.html#xmlParserNodeInfoPtr">xmlParserNodeInfoPtr</a> info);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCtxtReadFd">xmlCtxtReadFd</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-typedef void <a href="#internalSubsetSAXFunc">internalSubsetSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlNewParserCtxt">xmlNewParserCtxt</a>	(void);
-typedef void <a href="#endDocumentSAXFunc">endDocumentSAXFunc</a>		(void * ctx);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseFile">xmlParseFile</a>		(const char * filename);
-int	<a href="#xmlParseDocument">xmlParseDocument</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-typedef void <a href="#setDocumentLocatorSAXFunc">setDocumentLocatorSAXFunc</a>	(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlSAXLocatorPtr">xmlSAXLocatorPtr</a> loc);
-typedef <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> <a href="#getParameterEntitySAXFunc">getParameterEntitySAXFunc</a>	(void * ctx, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-typedef void <a href="#ignorableWhitespaceSAXFunc">ignorableWhitespaceSAXFunc</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ch, <br/>					 int len);
-void	<a href="#xmlInitNodeInfoSeq">xmlInitNodeInfoSeq</a>		(<a href="libxml2-parser.html#xmlParserNodeInfoSeqPtr">xmlParserNodeInfoSeqPtr</a> seq);
-int	<a href="#xmlSubstituteEntitiesDefault">xmlSubstituteEntitiesDefault</a>	(int val);
-typedef void <a href="#endElementSAXFunc">endElementSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-unsigned long	<a href="#xmlParserFindNodeInfoIndex">xmlParserFindNodeInfoIndex</a>	(const <a href="libxml2-parser.html#xmlParserNodeInfoSeqPtr">xmlParserNodeInfoSeqPtr</a> seq, <br/>						 const <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-long	<a href="#xmlByteConsumed">xmlByteConsumed</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlCtxtReset">xmlCtxtReset</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#xmlSetFeature">xmlSetFeature</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * name, <br/>					 void * value);
-int	<a href="#xmlKeepBlanksDefault">xmlKeepBlanksDefault</a>		(int val);
-int	<a href="#xmlParserInputRead">xmlParserInputRead</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> in, <br/>					 int len);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadFile">xmlReadFile</a>		(const char * filename, <br/>					 const char * encoding, <br/>					 int options);
+typedef <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> <a href="#xmlExternalEntityLoader">xmlExternalEntityLoader</a>	(const char * URL, <br/>						 const char * ID, <br/>						 <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> context);
+void	<a href="#xmlFreeParserCtxt">xmlFreeParserCtxt</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-parser.html#xmlExternalEntityLoader">xmlExternalEntityLoader</a>	<a href="#xmlGetExternalEntityLoader">xmlGetExternalEntityLoader</a>	(void);
+int	<a href="#xmlGetFeature">xmlGetFeature</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * name, <br/>					 void * result);
 int	<a href="#xmlGetFeaturesList">xmlGetFeaturesList</a>		(int * len, <br/>					 const char ** result);
 int	<a href="#xmlHasFeature">xmlHasFeature</a>			(<a href="libxml2-parser.html#xmlFeature">xmlFeature</a> feature);
@@ -138,7 +111,26 @@
 int	<a href="#xmlGetFeaturesList">xmlGetFeaturesList</a>		(int * len, <br/>					 const char ** result);
 int	<a href="#xmlHasFeature">xmlHasFeature</a>			(<a href="libxml2-parser.html#xmlFeature">xmlFeature</a> feature);
-typedef void <a href="#unparsedEntityDeclSAXFunc">unparsedEntityDeclSAXFunc</a>	(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * notationName);
-int	<a href="#xmlSAXUserParseFile">xmlSAXUserParseFile</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data, <br/>					 const char * filename);
-typedef void <a href="#fatalErrorSAXFunc">fatalErrorSAXFunc</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
-<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlSAXParseDTD">xmlSAXParseDTD</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlIOParseDTD">xmlIOParseDTD</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>					 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+void	<a href="#xmlInitNodeInfoSeq">xmlInitNodeInfoSeq</a>		(<a href="libxml2-parser.html#xmlParserNodeInfoSeqPtr">xmlParserNodeInfoSeqPtr</a> seq);
+void	<a href="#xmlInitParser">xmlInitParser</a>			(void);
+int	<a href="#xmlInitParserCtxt">xmlInitParserCtxt</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#xmlKeepBlanksDefault">xmlKeepBlanksDefault</a>		(int val);
+int	<a href="#xmlLineNumbersDefault">xmlLineNumbersDefault</a>		(int val);
+<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlLoadExternalEntity">xmlLoadExternalEntity</a>	(const char * URL, <br/>						 const char * ID, <br/>						 <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewIOInputStream">xmlNewIOInputStream</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>						 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlNewParserCtxt">xmlNewParserCtxt</a>	(void);
+int	<a href="#xmlParseBalancedChunkMemory">xmlParseBalancedChunkMemory</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data, <br/>					 int depth, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst);
+int	<a href="#xmlParseBalancedChunkMemoryRecover">xmlParseBalancedChunkMemoryRecover</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>						 void * user_data, <br/>						 int depth, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst, <br/>						 int recover);
+int	<a href="#xmlParseChunk">xmlParseChunk</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * chunk, <br/>					 int size, <br/>					 int terminate);
+int	<a href="#xmlParseCtxtExternalEntity">xmlParseCtxtExternalEntity</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URL, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst);
+<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlParseDTD">xmlParseDTD</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseDoc">xmlParseDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur);
+int	<a href="#xmlParseDocument">xmlParseDocument</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseEntity">xmlParseEntity</a>		(const char * filename);
+int	<a href="#xmlParseExtParsedEnt">xmlParseExtParsedEnt</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#xmlParseExternalEntity">xmlParseExternalEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data, <br/>					 int depth, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URL, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseFile">xmlParseFile</a>		(const char * filename);
+<a href="libxml2-xmlerror.html#xmlParserErrors">xmlParserErrors</a>	<a href="#xmlParseInNodeContext">xmlParseInNodeContext</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const char * data, <br/>					 int datalen, <br/>					 int options, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlParseMemory">xmlParseMemory</a>		(const char * buffer, <br/>					 int size);
+void	<a href="#xmlParserAddNodeInfo">xmlParserAddNodeInfo</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-parser.html#xmlParserNodeInfoPtr">xmlParserNodeInfoPtr</a> info);
 const <a href="libxml2-parser.html#xmlParserNodeInfo">xmlParserNodeInfo</a> *	<a href="#xmlParserFindNodeInfo">xmlParserFindNodeInfo</a>	(const <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctx, <br/>							 const <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
@@ -144,8 +136,7 @@
 const <a href="libxml2-parser.html#xmlParserNodeInfo">xmlParserNodeInfo</a> *	<a href="#xmlParserFindNodeInfo">xmlParserFindNodeInfo</a>	(const <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctx, <br/>							 const <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-typedef void <a href="#entityDeclSAXFunc">entityDeclSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlLoadExternalEntity">xmlLoadExternalEntity</a>	(const char * URL, <br/>						 const char * ID, <br/>						 <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlStopParser">xmlStopParser</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadFd">xmlReadFd</a>		(int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#xmlParseExtParsedEnt">xmlParseExtParsedEnt</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadIO">xmlReadIO</a>		(<a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+unsigned long	<a href="#xmlParserFindNodeInfoIndex">xmlParserFindNodeInfoIndex</a>	(const <a href="libxml2-parser.html#xmlParserNodeInfoSeqPtr">xmlParserNodeInfoSeqPtr</a> seq, <br/>						 const <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+typedef void <a href="#xmlParserInputDeallocate">xmlParserInputDeallocate</a>	(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
+int	<a href="#xmlParserInputGrow">xmlParserInputGrow</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> in, <br/>					 int len);
+int	<a href="#xmlParserInputRead">xmlParserInputRead</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> in, <br/>					 int len);
+int	<a href="#xmlPedanticParserDefault">xmlPedanticParserDefault</a>	(int val);
 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadDoc">xmlReadDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
@@ -151,2 +142,17 @@
 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadDoc">xmlReadDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadFd">xmlReadFd</a>		(int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadFile">xmlReadFile</a>		(const char * filename, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadIO">xmlReadIO</a>		(<a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlReadMemory">xmlReadMemory</a>		(const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlRecoverDoc">xmlRecoverDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlRecoverFile">xmlRecoverFile</a>		(const char * filename);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlRecoverMemory">xmlRecoverMemory</a>	(const char * buffer, <br/>					 int size);
+<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlSAXParseDTD">xmlSAXParseDTD</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseDoc">xmlSAXParseDoc</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 int recovery);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseEntity">xmlSAXParseEntity</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const char * filename);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseFile">xmlSAXParseFile</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const char * filename, <br/>					 int recovery);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseFileWithData">xmlSAXParseFileWithData</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const char * filename, <br/>					 int recovery, <br/>					 void * data);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseMemory">xmlSAXParseMemory</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 const char * buffer, <br/>					 int size, <br/>					 int recovery);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlSAXParseMemoryWithData">xmlSAXParseMemoryWithData</a>	(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>						 const char * buffer, <br/>						 int size, <br/>						 int recovery, <br/>						 void * data);
+int	<a href="#xmlSAXUserParseFile">xmlSAXUserParseFile</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data, <br/>					 const char * filename);
 int	<a href="#xmlSAXUserParseMemory">xmlSAXUserParseMemory</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data, <br/>					 const char * buffer, <br/>					 int size);
@@ -152,12 +158,2 @@
 int	<a href="#xmlSAXUserParseMemory">xmlSAXUserParseMemory</a>		(<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data, <br/>					 const char * buffer, <br/>					 int size);
-int	<a href="#xmlParseBalancedChunkMemory">xmlParseBalancedChunkMemory</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data, <br/>					 int depth, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst);
-typedef void <a href="#endElementNsSAX2Func">endElementNsSAX2Func</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI);
-void	<a href="#xmlCleanupParser">xmlCleanupParser</a>		(void);
-int	<a href="#xmlCtxtResetPush">xmlCtxtResetPush</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * chunk, <br/>					 int size, <br/>					 const char * filename, <br/>					 const char * encoding);
-typedef int <a href="#isStandaloneSAXFunc">isStandaloneSAXFunc</a>		(void * ctx);
-typedef void <a href="#startDocumentSAXFunc">startDocumentSAXFunc</a>		(void * ctx);
-void	<a href="#xmlClearParserCtxt">xmlClearParserCtxt</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#xmlParseExternalEntity">xmlParseExternalEntity</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data, <br/>					 int depth, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URL, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * lst);
-typedef void <a href="#notationDeclSAXFunc">notationDeclSAXFunc</a>		(void * ctx, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicId, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemId);
-typedef void <a href="#warningSAXFunc">warningSAXFunc</a>			(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
 void	<a href="#xmlSetExternalEntityLoader">xmlSetExternalEntityLoader</a>	(<a href="libxml2-parser.html#xmlExternalEntityLoader">xmlExternalEntityLoader</a> f);
@@ -163,4 +159,8 @@
 void	<a href="#xmlSetExternalEntityLoader">xmlSetExternalEntityLoader</a>	(<a href="libxml2-parser.html#xmlExternalEntityLoader">xmlExternalEntityLoader</a> f);
+int	<a href="#xmlSetFeature">xmlSetFeature</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * name, <br/>					 void * value);
+void	<a href="#xmlSetupParserForBuffer">xmlSetupParserForBuffer</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * buffer, <br/>					 const char * filename);
+void	<a href="#xmlStopParser">xmlStopParser</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#xmlSubstituteEntitiesDefault">xmlSubstituteEntitiesDefault</a>	(int val);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-parserInternals.html b/doc/devhelp/libxml2-parserInternals.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1wYXJzZXJJbnRlcm5hbHMuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1wYXJzZXJJbnRlcm5hbHMuaHRtbA== 100644
--- a/doc/devhelp/libxml2-parserInternals.html
+++ b/doc/devhelp/libxml2-parserInternals.html
@@ -43,5 +43,8 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#XML_SUBSTITUTE_REF">XML_SUBSTITUTE_REF</a>;
+      <pre class="synopsis">#define <a href="#INPUT_CHUNK">INPUT_CHUNK</a>;
+#define <a href="#IS_ASCII_DIGIT">IS_ASCII_DIGIT</a>(c);
+#define <a href="#IS_ASCII_LETTER">IS_ASCII_LETTER</a>(c);
+#define <a href="#IS_BASECHAR">IS_BASECHAR</a>(c);
 #define <a href="#IS_BLANK">IS_BLANK</a>(c);
@@ -47,2 +50,3 @@
 #define <a href="#IS_BLANK">IS_BLANK</a>(c);
+#define <a href="#IS_BLANK_CH">IS_BLANK_CH</a>(c);
 #define <a href="#IS_BYTE_CHAR">IS_BYTE_CHAR</a>(c);
@@ -48,4 +52,8 @@
 #define <a href="#IS_BYTE_CHAR">IS_BYTE_CHAR</a>(c);
-#define <a href="#IS_PUBIDCHAR">IS_PUBIDCHAR</a>(c);
+#define <a href="#IS_CHAR">IS_CHAR</a>(c);
+#define <a href="#IS_CHAR_CH">IS_CHAR_CH</a>(c);
+#define <a href="#IS_COMBINING">IS_COMBINING</a>(c);
+#define <a href="#IS_COMBINING_CH">IS_COMBINING_CH</a>(c);
+#define <a href="#IS_DIGIT">IS_DIGIT</a>(c);
 #define <a href="#IS_DIGIT_CH">IS_DIGIT_CH</a>(c);
 #define <a href="#IS_EXTENDER">IS_EXTENDER</a>(c);
@@ -50,7 +58,4 @@
 #define <a href="#IS_DIGIT_CH">IS_DIGIT_CH</a>(c);
 #define <a href="#IS_EXTENDER">IS_EXTENDER</a>(c);
-#define <a href="#IS_ASCII_DIGIT">IS_ASCII_DIGIT</a>(c);
-#define <a href="#IS_COMBINING_CH">IS_COMBINING_CH</a>(c);
-#define <a href="#IS_CHAR">IS_CHAR</a>(c);
-#define <a href="#IS_LETTER">IS_LETTER</a>(c);
+#define <a href="#IS_EXTENDER_CH">IS_EXTENDER_CH</a>(c);
 #define <a href="#IS_IDEOGRAPHIC">IS_IDEOGRAPHIC</a>(c);
@@ -56,12 +61,3 @@
 #define <a href="#IS_IDEOGRAPHIC">IS_IDEOGRAPHIC</a>(c);
-#define <a href="#MOVETO_STARTTAG">MOVETO_STARTTAG</a>(p);
-#define <a href="#XML_MAX_NAME_LENGTH">XML_MAX_NAME_LENGTH</a>;
-#define <a href="#IS_ASCII_LETTER">IS_ASCII_LETTER</a>(c);
-#define <a href="#IS_DIGIT">IS_DIGIT</a>(c);
-#define <a href="#XML_MAX_DICTIONARY_LIMIT">XML_MAX_DICTIONARY_LIMIT</a>;
-#define <a href="#XML_SUBSTITUTE_PEREF">XML_SUBSTITUTE_PEREF</a>;
-#define <a href="#MOVETO_ENDTAG">MOVETO_ENDTAG</a>(p);
-#define <a href="#SKIP_EOL">SKIP_EOL</a>(p);
-#define <a href="#IS_EXTENDER_CH">IS_EXTENDER_CH</a>(c);
-#define <a href="#IS_BLANK_CH">IS_BLANK_CH</a>(c);
+#define <a href="#IS_LETTER">IS_LETTER</a>(c);
 #define <a href="#IS_LETTER_CH">IS_LETTER_CH</a>(c);
@@ -67,9 +63,3 @@
 #define <a href="#IS_LETTER_CH">IS_LETTER_CH</a>(c);
-#define <a href="#XML_MAX_LOOKUP_LIMIT">XML_MAX_LOOKUP_LIMIT</a>;
-#define <a href="#XML_MAX_TEXT_LENGTH">XML_MAX_TEXT_LENGTH</a>;
-#define <a href="#XML_SUBSTITUTE_NONE">XML_SUBSTITUTE_NONE</a>;
-#define <a href="#IS_COMBINING">IS_COMBINING</a>(c);
-#define <a href="#XML_MAX_NAMELEN">XML_MAX_NAMELEN</a>;
-#define <a href="#IS_BASECHAR">IS_BASECHAR</a>(c);
-#define <a href="#INPUT_CHUNK">INPUT_CHUNK</a>;
+#define <a href="#IS_PUBIDCHAR">IS_PUBIDCHAR</a>(c);
 #define <a href="#IS_PUBIDCHAR_CH">IS_PUBIDCHAR_CH</a>(c);
@@ -75,3 +65,10 @@
 #define <a href="#IS_PUBIDCHAR_CH">IS_PUBIDCHAR_CH</a>(c);
-#define <a href="#IS_CHAR_CH">IS_CHAR_CH</a>(c);
+#define <a href="#MOVETO_ENDTAG">MOVETO_ENDTAG</a>(p);
+#define <a href="#MOVETO_STARTTAG">MOVETO_STARTTAG</a>(p);
+#define <a href="#SKIP_EOL">SKIP_EOL</a>(p);
+#define <a href="#XML_MAX_DICTIONARY_LIMIT">XML_MAX_DICTIONARY_LIMIT</a>;
+#define <a href="#XML_MAX_LOOKUP_LIMIT">XML_MAX_LOOKUP_LIMIT</a>;
+#define <a href="#XML_MAX_NAMELEN">XML_MAX_NAMELEN</a>;
+#define <a href="#XML_MAX_NAME_LENGTH">XML_MAX_NAME_LENGTH</a>;
+#define <a href="#XML_MAX_TEXT_LENGTH">XML_MAX_TEXT_LENGTH</a>;
 #define <a href="#XML_SUBSTITUTE_BOTH">XML_SUBSTITUTE_BOTH</a>;
@@ -77,2 +74,11 @@
 #define <a href="#XML_SUBSTITUTE_BOTH">XML_SUBSTITUTE_BOTH</a>;
+#define <a href="#XML_SUBSTITUTE_NONE">XML_SUBSTITUTE_NONE</a>;
+#define <a href="#XML_SUBSTITUTE_PEREF">XML_SUBSTITUTE_PEREF</a>;
+#define <a href="#XML_SUBSTITUTE_REF">XML_SUBSTITUTE_REF</a>;
+<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a>	<a href="#htmlCreateFileParserCtxt">htmlCreateFileParserCtxt</a>	(const char * filename, <br/>							 const char * encoding);
+void	<a href="#htmlInitAutoClose">htmlInitAutoClose</a>		(void);
+<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#inputPop">inputPop</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#inputPush">inputPush</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> value);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#namePop">namePop</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#namePush">namePush</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#nodePop">nodePop</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
@@ -78,6 +84,23 @@
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#nodePop">nodePop</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlParseNotationDecl">xmlParseNotationDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlParseExternalSubset">xmlParseExternalSubset</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-void	<a href="#xmlParseMisc">xmlParseMisc</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#xmlSwitchInputEncoding">xmlSwitchInputEncoding</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> handler);
+int	<a href="#nodePush">nodePush</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> value);
+int	<a href="#xmlCheckLanguageID">xmlCheckLanguageID</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * lang);
+int	<a href="#xmlCopyChar">xmlCopyChar</a>			(int len, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * out, <br/>					 int val);
+int	<a href="#xmlCopyCharMultiByte">xmlCopyCharMultiByte</a>		(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * out, <br/>					 int val);
+<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateEntityParserCtxt">xmlCreateEntityParserCtxt</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URL, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * base);
+<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateFileParserCtxt">xmlCreateFileParserCtxt</a>	(const char * filename);
+<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateMemoryParserCtxt">xmlCreateMemoryParserCtxt</a>	(const char * buffer, <br/>							 int size);
+<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateURLParserCtxt">xmlCreateURLParserCtxt</a>	(const char * filename, <br/>						 int options);
+int	<a href="#xmlCurrentChar">xmlCurrentChar</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int * len);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlDecodeEntities">xmlDecodeEntities</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int len, <br/>					 int what, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end2, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end3);
+typedef void <a href="#xmlEntityReferenceFunc">xmlEntityReferenceFunc</a>		(<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> ent, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> firstNode, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> lastNode);
+void	<a href="#xmlErrMemory">xmlErrMemory</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * extra);
+void	<a href="#xmlFreeInputStream">xmlFreeInputStream</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input);
+void	<a href="#xmlHandleEntity">xmlHandleEntity</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> entity);
+int	<a href="#xmlIsLetter">xmlIsLetter</a>			(int c);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNamespaceParseNCName">xmlNamespaceParseNCName</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNamespaceParseNSDef">xmlNamespaceParseNSDef</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNamespaceParseQName">xmlNamespaceParseQName</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** prefix);
+<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewEntityInputStream">xmlNewEntityInputStream</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> entity);
+<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewInputFromFile">xmlNewInputFromFile</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 const char * filename);
+<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewInputStream">xmlNewInputStream</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewStringInputStream">xmlNewStringInputStream</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * buffer);
@@ -83,10 +106,11 @@
 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewStringInputStream">xmlNewStringInputStream</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * buffer);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseExternalID">xmlParseExternalID</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** publicID, <br/>					 int strict);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlScanName">xmlScanName</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#xmlParseElementDecl">xmlParseElementDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlParseMarkupDecl">xmlParseMarkupDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-HTMLparser.html#htmlParserCtxtPtr">htmlParserCtxtPtr</a>	<a href="#htmlCreateFileParserCtxt">htmlCreateFileParserCtxt</a>	(const char * filename, <br/>							 const char * encoding);
-int	<a href="#inputPush">inputPush</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> value);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStringLenDecodeEntities">xmlStringLenDecodeEntities</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>						 int len, <br/>						 int what, <br/>						 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end, <br/>						 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end2, <br/>						 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end3);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#namePop">namePop</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlNextChar">xmlNextChar</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseAttValue">xmlParseAttValue</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseAttribute">xmlParseAttribute</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** value);
+void	<a href="#xmlParseAttributeListDecl">xmlParseAttributeListDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#xmlParseAttributeType">xmlParseAttributeType</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> * tree);
+void	<a href="#xmlParseCDSect">xmlParseCDSect</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParseCharData">xmlParseCharData</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int cdata);
+int	<a href="#xmlParseCharRef">xmlParseCharRef</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParseComment">xmlParseComment</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
 void	<a href="#xmlParseContent">xmlParseContent</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
@@ -92,9 +116,4 @@
 void	<a href="#xmlParseContent">xmlParseContent</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewInputStream">xmlNewInputStream</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNamespaceParseQName">xmlNamespaceParseQName</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** prefix);
-<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewInputFromFile">xmlNewInputFromFile</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 const char * filename);
-void	<a href="#xmlParserHandlePEReference">xmlParserHandlePEReference</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStringDecodeEntities">xmlStringDecodeEntities</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int what, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end2, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end3);
-<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateFileParserCtxt">xmlCreateFileParserCtxt</a>	(const char * filename);
-int	<a href="#xmlParseCharRef">xmlParseCharRef</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#xmlParseDefaultDecl">xmlParseDefaultDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** value);
+void	<a href="#xmlParseDocTypeDecl">xmlParseDocTypeDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
 void	<a href="#xmlParseElement">xmlParseElement</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
@@ -100,5 +119,2 @@
 void	<a href="#xmlParseElement">xmlParseElement</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlParseTextDecl">xmlParseTextDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNewEntityInputStream">xmlNewEntityInputStream</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> entity);
-int	<a href="#xmlCopyCharMultiByte">xmlCopyCharMultiByte</a>		(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * out, <br/>					 int val);
 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlParseElementChildrenContentDecl">xmlParseElementChildrenContentDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>							 int inputchk);
@@ -104,5 +120,11 @@
 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlParseElementChildrenContentDecl">xmlParseElementChildrenContentDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>							 int inputchk);
-void	<a href="#xmlParseCharData">xmlParseCharData</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int cdata);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseVersionInfo">xmlParseVersionInfo</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#xmlParseSDDecl">xmlParseSDDecl</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#xmlParseElementContentDecl">xmlParseElementContentDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> * result);
+int	<a href="#xmlParseElementDecl">xmlParseElementDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlParseElementMixedContentDecl">xmlParseElementMixedContentDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>							 int inputchk);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseEncName">xmlParseEncName</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseEncodingDecl">xmlParseEncodingDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParseEndTag">xmlParseEndTag</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParseEntityDecl">xmlParseEntityDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlParseEntityRef">xmlParseEntityRef</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseEntityValue">xmlParseEntityValue</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** orig);
 int	<a href="#xmlParseEnumeratedType">xmlParseEnumeratedType</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> * tree);
@@ -108,5 +130,11 @@
 int	<a href="#xmlParseEnumeratedType">xmlParseEnumeratedType</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> * tree);
-void	<a href="#xmlHandleEntity">xmlHandleEntity</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> entity);
-int	<a href="#xmlCurrentChar">xmlCurrentChar</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int * len);
-int	<a href="#xmlSkipBlankChars">xmlSkipBlankChars</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a>	<a href="#xmlParseEnumerationType">xmlParseEnumerationType</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseExternalID">xmlParseExternalID</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** publicID, <br/>					 int strict);
+void	<a href="#xmlParseExternalSubset">xmlParseExternalSubset</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+void	<a href="#xmlParseMarkupDecl">xmlParseMarkupDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParseMisc">xmlParseMisc</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseName">xmlParseName</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParseNamespace">xmlParseNamespace</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseNmtoken">xmlParseNmtoken</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParseNotationDecl">xmlParseNotationDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a>	<a href="#xmlParseNotationType">xmlParseNotationType</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
@@ -112,5 +140,2 @@
 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a>	<a href="#xmlParseNotationType">xmlParseNotationType</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlParserInputShrink">xmlParserInputShrink</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> in);
-void	<a href="#xmlSetEntityReferenceFunc">xmlSetEntityReferenceFunc</a>	(<a href="libxml2-parserInternals.html#xmlEntityReferenceFunc">xmlEntityReferenceFunc</a> func);
-void	<a href="#xmlFreeInputStream">xmlFreeInputStream</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input);
 void	<a href="#xmlParsePEReference">xmlParsePEReference</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
@@ -116,9 +141,9 @@
 void	<a href="#xmlParsePEReference">xmlParsePEReference</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateURLParserCtxt">xmlCreateURLParserCtxt</a>	(const char * filename, <br/>						 int options);
-int	<a href="#xmlIsLetter">xmlIsLetter</a>			(int c);
-int	<a href="#xmlCheckLanguageID">xmlCheckLanguageID</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * lang);
-void	<a href="#xmlNextChar">xmlNextChar</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a>	<a href="#xmlParseEnumerationType">xmlParseEnumerationType</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#xmlParseAttributeType">xmlParseAttributeType</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> * tree);
-int	<a href="#xmlParseDefaultDecl">xmlParseDefaultDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** value);
+void	<a href="#xmlParsePI">xmlParsePI</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParsePITarget">xmlParsePITarget</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParsePubidLiteral">xmlParsePubidLiteral</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseQuotedString">xmlParseQuotedString</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParseReference">xmlParseReference</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#xmlParseSDDecl">xmlParseSDDecl</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseStartTag">xmlParseStartTag</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseSystemLiteral">xmlParseSystemLiteral</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
@@ -124,27 +149,5 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseSystemLiteral">xmlParseSystemLiteral</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseAttValue">xmlParseAttValue</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateMemoryParserCtxt">xmlCreateMemoryParserCtxt</a>	(const char * buffer, <br/>							 int size);
-void	<a href="#xmlParseAttributeListDecl">xmlParseAttributeListDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseName">xmlParseName</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseEncName">xmlParseEncName</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#nodePush">nodePush</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> value);
-int	<a href="#xmlSwitchEncoding">xmlSwitchEncoding</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-int	<a href="#xmlSwitchToEncoding">xmlSwitchToEncoding</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> handler);
-<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a>	<a href="#xmlParseEntityRef">xmlParseEntityRef</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseAttribute">xmlParseAttribute</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** value);
-void	<a href="#xmlParseEndTag">xmlParseEndTag</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseEncodingDecl">xmlParseEncodingDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#htmlInitAutoClose">htmlInitAutoClose</a>		(void);
-<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlCreateEntityParserCtxt">xmlCreateEntityParserCtxt</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URL, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * base);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSplitQName">xmlSplitQName</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** prefix);
-void	<a href="#xmlParserHandleReference">xmlParserHandleReference</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParsePITarget">xmlParsePITarget</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#xmlParseElementContentDecl">xmlParseElementContentDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> * result);
-<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#inputPop">inputPop</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a>	<a href="#xmlPopInput">xmlPopInput</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParsePubidLiteral">xmlParsePubidLiteral</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#xmlPushInput">xmlPushInput</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseEntityValue">xmlParseEntityValue</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** orig);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlDecodeEntities">xmlDecodeEntities</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 int len, <br/>					 int what, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end2, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end3);
+void	<a href="#xmlParseTextDecl">xmlParseTextDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseVersionInfo">xmlParseVersionInfo</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseVersionNum">xmlParseVersionNum</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
 void	<a href="#xmlParseXMLDecl">xmlParseXMLDecl</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
@@ -149,8 +152,12 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseVersionNum">xmlParseVersionNum</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
 void	<a href="#xmlParseXMLDecl">xmlParseXMLDecl</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-typedef void <a href="#xmlEntityReferenceFunc">xmlEntityReferenceFunc</a>		(<a href="libxml2-tree.html#xmlEntityPtr">xmlEntityPtr</a> ent, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> firstNode, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> lastNode);
-<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlParseElementMixedContentDecl">xmlParseElementMixedContentDecl</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>							 int inputchk);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseQuotedString">xmlParseQuotedString</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNamespaceParseNSDef">xmlNamespaceParseNSDef</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlParseCDSect">xmlParseCDSect</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParserHandlePEReference">xmlParserHandlePEReference</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParserHandleReference">xmlParserHandleReference</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlParserInputShrink">xmlParserInputShrink</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> in);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a>	<a href="#xmlPopInput">xmlPopInput</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+int	<a href="#xmlPushInput">xmlPushInput</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlScanName">xmlScanName</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+void	<a href="#xmlSetEntityReferenceFunc">xmlSetEntityReferenceFunc</a>	(<a href="libxml2-parserInternals.html#xmlEntityReferenceFunc">xmlEntityReferenceFunc</a> func);
+int	<a href="#xmlSkipBlankChars">xmlSkipBlankChars</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSplitQName">xmlSplitQName</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** prefix);
 int	<a href="#xmlStringCurrentChar">xmlStringCurrentChar</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 int * len);
@@ -156,16 +163,9 @@
 int	<a href="#xmlStringCurrentChar">xmlStringCurrentChar</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 int * len);
-void	<a href="#xmlParseComment">xmlParseComment</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlErrMemory">xmlErrMemory</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const char * extra);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNamespaceParseNCName">xmlNamespaceParseNCName</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseNmtoken">xmlParseNmtoken</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlParseReference">xmlParseReference</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#namePush">namePush</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-void	<a href="#xmlParseNamespace">xmlParseNamespace</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-int	<a href="#xmlCopyChar">xmlCopyChar</a>			(int len, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * out, <br/>					 int val);
-void	<a href="#xmlParsePI">xmlParsePI</a>			(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlParseDocTypeDecl">xmlParseDocTypeDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlParseStartTag">xmlParseStartTag</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-void	<a href="#xmlParseEntityDecl">xmlParseEntityDecl</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStringDecodeEntities">xmlStringDecodeEntities</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int what, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end2, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end3);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStringLenDecodeEntities">xmlStringLenDecodeEntities</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>						 int len, <br/>						 int what, <br/>						 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end, <br/>						 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end2, <br/>						 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> end3);
+int	<a href="#xmlSwitchEncoding">xmlSwitchEncoding</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+int	<a href="#xmlSwitchInputEncoding">xmlSwitchInputEncoding</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> handler);
+int	<a href="#xmlSwitchToEncoding">xmlSwitchToEncoding</a>		(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> handler);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-pattern.html b/doc/devhelp/libxml2-pattern.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1wYXR0ZXJuLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1wYXR0ZXJuLmh0bWw= 100644
--- a/doc/devhelp/libxml2-pattern.html
+++ b/doc/devhelp/libxml2-pattern.html
@@ -43,5 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libxml2-pattern.html#xmlStreamCtxt">xmlStreamCtxt</a> * <a href="#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a>;
+      <pre class="synopsis">typedef struct _xmlPattern <a href="#xmlPattern">xmlPattern</a>;
 typedef enum <a href="#xmlPatternFlags">xmlPatternFlags</a>;
@@ -47,4 +47,2 @@
 typedef enum <a href="#xmlPatternFlags">xmlPatternFlags</a>;
-typedef struct _xmlStreamCtxt <a href="#xmlStreamCtxt">xmlStreamCtxt</a>;
-typedef struct _xmlPattern <a href="#xmlPattern">xmlPattern</a>;
 typedef <a href="libxml2-pattern.html#xmlPattern">xmlPattern</a> * <a href="#xmlPatternPtr">xmlPatternPtr</a>;
@@ -50,3 +48,8 @@
 typedef <a href="libxml2-pattern.html#xmlPattern">xmlPattern</a> * <a href="#xmlPatternPtr">xmlPatternPtr</a>;
-int	<a href="#xmlPatternMinDepth">xmlPatternMinDepth</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
+typedef struct _xmlStreamCtxt <a href="#xmlStreamCtxt">xmlStreamCtxt</a>;
+typedef <a href="libxml2-pattern.html#xmlStreamCtxt">xmlStreamCtxt</a> * <a href="#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a>;
+void	<a href="#xmlFreePattern">xmlFreePattern</a>			(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
+void	<a href="#xmlFreePatternList">xmlFreePatternList</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
+void	<a href="#xmlFreeStreamCtxt">xmlFreeStreamCtxt</a>		(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream);
+int	<a href="#xmlPatternFromRoot">xmlPatternFromRoot</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
 <a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a>	<a href="#xmlPatternGetStreamCtxt">xmlPatternGetStreamCtxt</a>	(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
@@ -52,4 +55,5 @@
 <a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a>	<a href="#xmlPatternGetStreamCtxt">xmlPatternGetStreamCtxt</a>	(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
-int	<a href="#xmlPatternFromRoot">xmlPatternFromRoot</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
-void	<a href="#xmlFreePatternList">xmlFreePatternList</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
+int	<a href="#xmlPatternMatch">xmlPatternMatch</a>			(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+int	<a href="#xmlPatternMaxDepth">xmlPatternMaxDepth</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
+int	<a href="#xmlPatternMinDepth">xmlPatternMinDepth</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
 int	<a href="#xmlPatternStreamable">xmlPatternStreamable</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
@@ -55,5 +59,3 @@
 int	<a href="#xmlPatternStreamable">xmlPatternStreamable</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
-int	<a href="#xmlStreamPushAttr">xmlStreamPushAttr</a>		(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns);
-int	<a href="#xmlPatternMatch">xmlPatternMatch</a>			(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-int	<a href="#xmlStreamWantsAnyNode">xmlStreamWantsAnyNode</a>		(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> streamCtxt);
+<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a>	<a href="#xmlPatterncompile">xmlPatterncompile</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pattern, <br/>					 <a href="libxml2-dict.html#xmlDict">xmlDict</a> * dict, <br/>					 int flags, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** namespaces);
 int	<a href="#xmlStreamPop">xmlStreamPop</a>			(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream);
@@ -59,3 +61,2 @@
 int	<a href="#xmlStreamPop">xmlStreamPop</a>			(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream);
-void	<a href="#xmlFreePattern">xmlFreePattern</a>			(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
 int	<a href="#xmlStreamPush">xmlStreamPush</a>			(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns);
@@ -61,4 +62,3 @@
 int	<a href="#xmlStreamPush">xmlStreamPush</a>			(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns);
-int	<a href="#xmlPatternMaxDepth">xmlPatternMaxDepth</a>		(<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp);
-<a href="libxml2-pattern.html#xmlPatternPtr">xmlPatternPtr</a>	<a href="#xmlPatterncompile">xmlPatterncompile</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pattern, <br/>					 <a href="libxml2-dict.html#xmlDict">xmlDict</a> * dict, <br/>					 int flags, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** namespaces);
+int	<a href="#xmlStreamPushAttr">xmlStreamPushAttr</a>		(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns);
 int	<a href="#xmlStreamPushNode">xmlStreamPushNode</a>		(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns, <br/>					 int nodeType);
@@ -64,5 +64,5 @@
 int	<a href="#xmlStreamPushNode">xmlStreamPushNode</a>		(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns, <br/>					 int nodeType);
-void	<a href="#xmlFreeStreamCtxt">xmlFreeStreamCtxt</a>		(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream);
+int	<a href="#xmlStreamWantsAnyNode">xmlStreamWantsAnyNode</a>		(<a href="libxml2-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> streamCtxt);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-relaxng.html b/doc/devhelp/libxml2-relaxng.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1yZWxheG5nLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1yZWxheG5nLmh0bWw= 100644
--- a/doc/devhelp/libxml2-relaxng.html
+++ b/doc/devhelp/libxml2-relaxng.html
@@ -44,8 +44,6 @@
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
       <pre class="synopsis">typedef struct _xmlRelaxNG <a href="#xmlRelaxNG">xmlRelaxNG</a>;
-typedef <a href="libxml2-relaxng.html#xmlRelaxNG">xmlRelaxNG</a> * <a href="#xmlRelaxNGPtr">xmlRelaxNGPtr</a>;
-typedef enum <a href="#xmlRelaxNGValidErr">xmlRelaxNGValidErr</a>;
 typedef struct _xmlRelaxNGParserCtxt <a href="#xmlRelaxNGParserCtxt">xmlRelaxNGParserCtxt</a>;
 typedef <a href="libxml2-relaxng.html#xmlRelaxNGParserCtxt">xmlRelaxNGParserCtxt</a> * <a href="#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a>;
 typedef enum <a href="#xmlRelaxNGParserFlag">xmlRelaxNGParserFlag</a>;
@@ -49,5 +47,6 @@
 typedef struct _xmlRelaxNGParserCtxt <a href="#xmlRelaxNGParserCtxt">xmlRelaxNGParserCtxt</a>;
 typedef <a href="libxml2-relaxng.html#xmlRelaxNGParserCtxt">xmlRelaxNGParserCtxt</a> * <a href="#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a>;
 typedef enum <a href="#xmlRelaxNGParserFlag">xmlRelaxNGParserFlag</a>;
+typedef <a href="libxml2-relaxng.html#xmlRelaxNG">xmlRelaxNG</a> * <a href="#xmlRelaxNGPtr">xmlRelaxNGPtr</a>;
 typedef struct _xmlRelaxNGValidCtxt <a href="#xmlRelaxNGValidCtxt">xmlRelaxNGValidCtxt</a>;
 typedef <a href="libxml2-relaxng.html#xmlRelaxNGValidCtxt">xmlRelaxNGValidCtxt</a> * <a href="#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a>;
@@ -52,11 +51,5 @@
 typedef struct _xmlRelaxNGValidCtxt <a href="#xmlRelaxNGValidCtxt">xmlRelaxNGValidCtxt</a>;
 typedef <a href="libxml2-relaxng.html#xmlRelaxNGValidCtxt">xmlRelaxNGValidCtxt</a> * <a href="#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a>;
-void	<a href="#xmlRelaxNGFreeValidCtxt">xmlRelaxNGFreeValidCtxt</a>		(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt);
-<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a>	<a href="#xmlRelaxNGNewDocParserCtxt">xmlRelaxNGNewDocParserCtxt</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-void	<a href="#xmlRelaxNGSetValidErrors">xmlRelaxNGSetValidErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a> err, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a> warn, <br/>					 void * ctx);
-<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a>	<a href="#xmlRelaxNGNewParserCtxt">xmlRelaxNGNewParserCtxt</a>	(const char * URL);
-int	<a href="#xmlRelaxNGGetParserErrors">xmlRelaxNGGetParserErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a> * err, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a> * warn, <br/>					 void ** ctx);
-int	<a href="#xmlRelaxNGValidatePopElement">xmlRelaxNGValidatePopElement</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
-<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a>	<a href="#xmlRelaxNGNewValidCtxt">xmlRelaxNGNewValidCtxt</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
-<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a>	<a href="#xmlRelaxNGNewMemParserCtxt">xmlRelaxNGNewMemParserCtxt</a>	(const char * buffer, <br/>							 int size);
+typedef enum <a href="#xmlRelaxNGValidErr">xmlRelaxNGValidErr</a>;
+void	<a href="#xmlRelaxNGCleanupTypes">xmlRelaxNGCleanupTypes</a>		(void);
 void	<a href="#xmlRelaxNGDump">xmlRelaxNGDump</a>			(FILE * output, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
@@ -62,8 +55,3 @@
 void	<a href="#xmlRelaxNGDump">xmlRelaxNGDump</a>			(FILE * output, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
-void	<a href="#xmlRelaxNGSetParserErrors">xmlRelaxNGSetParserErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a> err, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a> warn, <br/>					 void * ctx);
-<a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a>	<a href="#xmlRelaxNGParse">xmlRelaxNGParse</a>		(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt);
-void	<a href="#xmlRelaxNGSetParserStructuredErrors">xmlRelaxNGSetParserStructuredErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
-int	<a href="#xmlRelaxNGValidateFullElement">xmlRelaxNGValidateFullElement</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
-typedef void <a href="#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
-int	<a href="#xmlRelaxNGValidatePushElement">xmlRelaxNGValidatePushElement</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
+void	<a href="#xmlRelaxNGDumpTree">xmlRelaxNGDumpTree</a>		(FILE * output, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
 void	<a href="#xmlRelaxNGFree">xmlRelaxNGFree</a>			(<a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
@@ -69,4 +57,2 @@
 void	<a href="#xmlRelaxNGFree">xmlRelaxNGFree</a>			(<a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
-int	<a href="#xmlRelaxNGValidateDoc">xmlRelaxNGValidateDoc</a>		(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-void	<a href="#xmlRelaxNGSetValidStructuredErrors">xmlRelaxNGSetValidStructuredErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
 void	<a href="#xmlRelaxNGFreeParserCtxt">xmlRelaxNGFreeParserCtxt</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt);
@@ -72,3 +58,5 @@
 void	<a href="#xmlRelaxNGFreeParserCtxt">xmlRelaxNGFreeParserCtxt</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt);
+void	<a href="#xmlRelaxNGFreeValidCtxt">xmlRelaxNGFreeValidCtxt</a>		(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt);
+int	<a href="#xmlRelaxNGGetParserErrors">xmlRelaxNGGetParserErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a> * err, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a> * warn, <br/>					 void ** ctx);
 int	<a href="#xmlRelaxNGGetValidErrors">xmlRelaxNGGetValidErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a> * err, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a> * warn, <br/>					 void ** ctx);
 int	<a href="#xmlRelaxNGInitTypes">xmlRelaxNGInitTypes</a>		(void);
@@ -73,5 +61,15 @@
 int	<a href="#xmlRelaxNGGetValidErrors">xmlRelaxNGGetValidErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a> * err, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a> * warn, <br/>					 void ** ctx);
 int	<a href="#xmlRelaxNGInitTypes">xmlRelaxNGInitTypes</a>		(void);
-void	<a href="#xmlRelaxNGDumpTree">xmlRelaxNGDumpTree</a>		(FILE * output, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
-void	<a href="#xmlRelaxNGCleanupTypes">xmlRelaxNGCleanupTypes</a>		(void);
+<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a>	<a href="#xmlRelaxNGNewDocParserCtxt">xmlRelaxNGNewDocParserCtxt</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a>	<a href="#xmlRelaxNGNewMemParserCtxt">xmlRelaxNGNewMemParserCtxt</a>	(const char * buffer, <br/>							 int size);
+<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a>	<a href="#xmlRelaxNGNewParserCtxt">xmlRelaxNGNewParserCtxt</a>	(const char * URL);
+<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a>	<a href="#xmlRelaxNGNewValidCtxt">xmlRelaxNGNewValidCtxt</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
+<a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a>	<a href="#xmlRelaxNGParse">xmlRelaxNGParse</a>		(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt);
+void	<a href="#xmlRelaxNGSetParserErrors">xmlRelaxNGSetParserErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a> err, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a> warn, <br/>					 void * ctx);
+void	<a href="#xmlRelaxNGSetParserStructuredErrors">xmlRelaxNGSetParserStructuredErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
+void	<a href="#xmlRelaxNGSetValidErrors">xmlRelaxNGSetValidErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a> err, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a> warn, <br/>					 void * ctx);
+void	<a href="#xmlRelaxNGSetValidStructuredErrors">xmlRelaxNGSetValidStructuredErrors</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
+int	<a href="#xmlRelaxNGValidateDoc">xmlRelaxNGValidateDoc</a>		(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+int	<a href="#xmlRelaxNGValidateFullElement">xmlRelaxNGValidateFullElement</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
+int	<a href="#xmlRelaxNGValidatePopElement">xmlRelaxNGValidatePopElement</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
 int	<a href="#xmlRelaxNGValidatePushCData">xmlRelaxNGValidatePushCData</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data, <br/>					 int len);
@@ -77,2 +75,5 @@
 int	<a href="#xmlRelaxNGValidatePushCData">xmlRelaxNGValidatePushCData</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data, <br/>					 int len);
+int	<a href="#xmlRelaxNGValidatePushElement">xmlRelaxNGValidatePushElement</a>	(<a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
+typedef void <a href="#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+typedef void <a href="#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
 int	<a href="#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a>		(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br/>					 int flags);
@@ -78,5 +79,4 @@
 int	<a href="#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a>		(<a href="libxml2-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br/>					 int flags);
-typedef void <a href="#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-schemasInternals.html b/doc/devhelp/libxml2-schemasInternals.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1zY2hlbWFzSW50ZXJuYWxzLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1zY2hlbWFzSW50ZXJuYWxzLmh0bWw= 100644
--- a/doc/devhelp/libxml2-schemasInternals.html
+++ b/doc/devhelp/libxml2-schemasInternals.html
@@ -43,47 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION">XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION</a>;
-#define <a href="#XML_SCHEMAS_FINAL_DEFAULT_EXTENSION">XML_SCHEMAS_FINAL_DEFAULT_EXTENSION</a>;
-#define <a href="#XML_SCHEMAS_TYPE_FIXUP_1">XML_SCHEMAS_TYPE_FIXUP_1</a>;
-#define <a href="#XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION">XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION</a>;
-#define <a href="#XML_SCHEMAS_ELEM_CIRCULAR">XML_SCHEMAS_ELEM_CIRCULAR</a>;
-#define <a href="#XML_SCHEMAS_QUALIF_ATTR">XML_SCHEMAS_QUALIF_ATTR</a>;
-#define <a href="#XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE">XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE</a>;
-#define <a href="#XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION">XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION</a>;
-#define <a href="#XML_SCHEMAS_ATTR_USE_REQUIRED">XML_SCHEMAS_ATTR_USE_REQUIRED</a>;
-#define <a href="#XML_SCHEMAS_FACET_COLLAPSE">XML_SCHEMAS_FACET_COLLAPSE</a>;
-#define <a href="#XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE">XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE</a>;
-#define <a href="#XML_SCHEMAS_TYPE_VARIETY_UNION">XML_SCHEMAS_TYPE_VARIETY_UNION</a>;
-#define <a href="#XML_SCHEMAS_ANY_STRICT">XML_SCHEMAS_ANY_STRICT</a>;
-#define <a href="#XML_SCHEMAS_TYPE_INTERNAL_RESOLVED">XML_SCHEMAS_TYPE_INTERNAL_RESOLVED</a>;
-#define <a href="#XML_SCHEMAS_QUALIF_ELEM">XML_SCHEMAS_QUALIF_ELEM</a>;
-#define <a href="#XML_SCHEMAS_TYPE_VARIETY_LIST">XML_SCHEMAS_TYPE_VARIETY_LIST</a>;
-#define <a href="#XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE">XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE</a>;
-#define <a href="#XML_SCHEMAS_ELEM_INTERNAL_CHECKED">XML_SCHEMAS_ELEM_INTERNAL_CHECKED</a>;
-#define <a href="#XML_SCHEMAS_INCLUDING_CONVERT_NS">XML_SCHEMAS_INCLUDING_CONVERT_NS</a>;
-#define <a href="#XML_SCHEMAS_ATTR_INTERNAL_RESOLVED">XML_SCHEMAS_ATTR_INTERNAL_RESOLVED</a>;
-#define <a href="#XML_SCHEMAS_ATTR_USE_PROHIBITED">XML_SCHEMAS_ATTR_USE_PROHIBITED</a>;
-#define <a href="#XML_SCHEMAS_ELEM_NILLABLE">XML_SCHEMAS_ELEM_NILLABLE</a>;
-#define <a href="#XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION">XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION</a>;
-#define <a href="#XML_SCHEMAS_ATTRGROUP_REDEFINED">XML_SCHEMAS_ATTRGROUP_REDEFINED</a>;
-#define <a href="#XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD">XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD</a>;
-#define <a href="#XML_SCHEMAS_TYPE_BLOCK_DEFAULT">XML_SCHEMAS_TYPE_BLOCK_DEFAULT</a>;
-#define <a href="#XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION">XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION</a>;
-#define <a href="#XML_SCHEMAS_TYPE_FINAL_EXTENSION">XML_SCHEMAS_TYPE_FINAL_EXTENSION</a>;
-#define <a href="#XML_SCHEMAS_TYPE_REDEFINED">XML_SCHEMAS_TYPE_REDEFINED</a>;
-#define <a href="#XML_SCHEMAS_ELEM_FIXED">XML_SCHEMAS_ELEM_FIXED</a>;
-#define <a href="#XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD">XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD</a>;
-#define <a href="#XML_SCHEMAS_TYPE_VARIETY_ATOMIC">XML_SCHEMAS_TYPE_VARIETY_ATOMIC</a>;
-#define <a href="#XML_SCHEMAS_TYPE_FINAL_LIST">XML_SCHEMAS_TYPE_FINAL_LIST</a>;
-#define <a href="#XML_SCHEMAS_ATTR_USE_OPTIONAL">XML_SCHEMAS_ATTR_USE_OPTIONAL</a>;
-#define <a href="#XML_SCHEMAS_ATTR_NSDEFAULT">XML_SCHEMAS_ATTR_NSDEFAULT</a>;
-#define <a href="#XML_SCHEMAS_TYPE_WHITESPACE_REPLACE">XML_SCHEMAS_TYPE_WHITESPACE_REPLACE</a>;
-#define <a href="#XML_SCHEMAS_TYPE_BLOCK_RESTRICTION">XML_SCHEMAS_TYPE_BLOCK_RESTRICTION</a>;
-#define <a href="#XML_SCHEMAS_ANYATTR_STRICT">XML_SCHEMAS_ANYATTR_STRICT</a>;
-#define <a href="#XML_SCHEMAS_FACET_UNKNOWN">XML_SCHEMAS_FACET_UNKNOWN</a>;
-#define <a href="#XML_SCHEMAS_ATTRGROUP_MARKED">XML_SCHEMAS_ATTRGROUP_MARKED</a>;
-#define <a href="#XML_SCHEMAS_FACET_PRESERVE">XML_SCHEMAS_FACET_PRESERVE</a>;
-#define <a href="#XML_SCHEMAS_ELEM_BLOCK_EXTENSION">XML_SCHEMAS_ELEM_BLOCK_EXTENSION</a>;
-#define <a href="#XML_SCHEMAS_ATTR_GLOBAL">XML_SCHEMAS_ATTR_GLOBAL</a>;
+      <pre class="synopsis">#define <a href="#XML_SCHEMAS_ANYATTR_LAX">XML_SCHEMAS_ANYATTR_LAX</a>;
 #define <a href="#XML_SCHEMAS_ANYATTR_SKIP">XML_SCHEMAS_ANYATTR_SKIP</a>;
@@ -89,9 +47,4 @@
 #define <a href="#XML_SCHEMAS_ANYATTR_SKIP">XML_SCHEMAS_ANYATTR_SKIP</a>;
-#define <a href="#XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION">XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION</a>;
-#define <a href="#XML_SCHEMAS_ANYATTR_LAX">XML_SCHEMAS_ANYATTR_LAX</a>;
-#define <a href="#XML_SCHEMAS_TYPE_GLOBAL">XML_SCHEMAS_TYPE_GLOBAL</a>;
-#define <a href="#XML_SCHEMAS_TYPE_ABSTRACT">XML_SCHEMAS_TYPE_ABSTRACT</a>;
-#define <a href="#XML_SCHEMAS_TYPE_MIXED">XML_SCHEMAS_TYPE_MIXED</a>;
-#define <a href="#XML_SCHEMAS_ATTR_FIXED">XML_SCHEMAS_ATTR_FIXED</a>;
-#define <a href="#XML_SCHEMAS_ELEM_INTERNAL_RESOLVED">XML_SCHEMAS_ELEM_INTERNAL_RESOLVED</a>;
+#define <a href="#XML_SCHEMAS_ANYATTR_STRICT">XML_SCHEMAS_ANYATTR_STRICT</a>;
+#define <a href="#XML_SCHEMAS_ANY_LAX">XML_SCHEMAS_ANY_LAX</a>;
 #define <a href="#XML_SCHEMAS_ANY_SKIP">XML_SCHEMAS_ANY_SKIP</a>;
@@ -97,6 +50,7 @@
 #define <a href="#XML_SCHEMAS_ANY_SKIP">XML_SCHEMAS_ANY_SKIP</a>;
-#define <a href="#XML_SCHEMAS_FINAL_DEFAULT_LIST">XML_SCHEMAS_FINAL_DEFAULT_LIST</a>;
-#define <a href="#XML_SCHEMAS_TYPE_VARIETY_ABSENT">XML_SCHEMAS_TYPE_VARIETY_ABSENT</a>;
-#define <a href="#XML_SCHEMAS_ELEM_FINAL_RESTRICTION">XML_SCHEMAS_ELEM_FINAL_RESTRICTION</a>;
-#define <a href="#XML_SCHEMAS_WILDCARD_COMPLETE">XML_SCHEMAS_WILDCARD_COMPLETE</a>;
+#define <a href="#XML_SCHEMAS_ANY_STRICT">XML_SCHEMAS_ANY_STRICT</a>;
+#define <a href="#XML_SCHEMAS_ATTRGROUP_GLOBAL">XML_SCHEMAS_ATTRGROUP_GLOBAL</a>;
+#define <a href="#XML_SCHEMAS_ATTRGROUP_HAS_REFS">XML_SCHEMAS_ATTRGROUP_HAS_REFS</a>;
+#define <a href="#XML_SCHEMAS_ATTRGROUP_MARKED">XML_SCHEMAS_ATTRGROUP_MARKED</a>;
+#define <a href="#XML_SCHEMAS_ATTRGROUP_REDEFINED">XML_SCHEMAS_ATTRGROUP_REDEFINED</a>;
 #define <a href="#XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED">XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED</a>;
@@ -102,10 +56,19 @@
 #define <a href="#XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED">XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED</a>;
-#define <a href="#XML_SCHEMAS_ELEM_NSDEFAULT">XML_SCHEMAS_ELEM_NSDEFAULT</a>;
-#define <a href="#XML_SCHEMAS_ELEM_GLOBAL">XML_SCHEMAS_ELEM_GLOBAL</a>;
-#define <a href="#XML_SCHEMAS_ELEM_TOPLEVEL">XML_SCHEMAS_ELEM_TOPLEVEL</a>;
-#define <a href="#XML_SCHEMAS_ANY_LAX">XML_SCHEMAS_ANY_LAX</a>;
-#define <a href="#XML_SCHEMAS_TYPE_FINAL_RESTRICTION">XML_SCHEMAS_TYPE_FINAL_RESTRICTION</a>;
-#define <a href="#XML_SCHEMAS_TYPE_HAS_FACETS">XML_SCHEMAS_TYPE_HAS_FACETS</a>;
-#define <a href="#XML_SCHEMAS_ELEM_FINAL_EXTENSION">XML_SCHEMAS_ELEM_FINAL_EXTENSION</a>;
-#define <a href="#XML_SCHEMAS_TYPE_NORMVALUENEEDED">XML_SCHEMAS_TYPE_NORMVALUENEEDED</a>;
+#define <a href="#XML_SCHEMAS_ATTR_FIXED">XML_SCHEMAS_ATTR_FIXED</a>;
+#define <a href="#XML_SCHEMAS_ATTR_GLOBAL">XML_SCHEMAS_ATTR_GLOBAL</a>;
+#define <a href="#XML_SCHEMAS_ATTR_INTERNAL_RESOLVED">XML_SCHEMAS_ATTR_INTERNAL_RESOLVED</a>;
+#define <a href="#XML_SCHEMAS_ATTR_NSDEFAULT">XML_SCHEMAS_ATTR_NSDEFAULT</a>;
+#define <a href="#XML_SCHEMAS_ATTR_USE_OPTIONAL">XML_SCHEMAS_ATTR_USE_OPTIONAL</a>;
+#define <a href="#XML_SCHEMAS_ATTR_USE_PROHIBITED">XML_SCHEMAS_ATTR_USE_PROHIBITED</a>;
+#define <a href="#XML_SCHEMAS_ATTR_USE_REQUIRED">XML_SCHEMAS_ATTR_USE_REQUIRED</a>;
+#define <a href="#XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION">XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION</a>;
+#define <a href="#XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION">XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION</a>;
+#define <a href="#XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION">XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION</a>;
+#define <a href="#XML_SCHEMAS_ELEM_ABSTRACT">XML_SCHEMAS_ELEM_ABSTRACT</a>;
+#define <a href="#XML_SCHEMAS_ELEM_BLOCK_ABSENT">XML_SCHEMAS_ELEM_BLOCK_ABSENT</a>;
+#define <a href="#XML_SCHEMAS_ELEM_BLOCK_EXTENSION">XML_SCHEMAS_ELEM_BLOCK_EXTENSION</a>;
+#define <a href="#XML_SCHEMAS_ELEM_BLOCK_RESTRICTION">XML_SCHEMAS_ELEM_BLOCK_RESTRICTION</a>;
+#define <a href="#XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION">XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION</a>;
+#define <a href="#XML_SCHEMAS_ELEM_CIRCULAR">XML_SCHEMAS_ELEM_CIRCULAR</a>;
+#define <a href="#XML_SCHEMAS_ELEM_DEFAULT">XML_SCHEMAS_ELEM_DEFAULT</a>;
 #define <a href="#XML_SCHEMAS_ELEM_FINAL_ABSENT">XML_SCHEMAS_ELEM_FINAL_ABSENT</a>;
@@ -111,12 +74,15 @@
 #define <a href="#XML_SCHEMAS_ELEM_FINAL_ABSENT">XML_SCHEMAS_ELEM_FINAL_ABSENT</a>;
-#define <a href="#XML_SCHEMAS_TYPE_BLOCK_EXTENSION">XML_SCHEMAS_TYPE_BLOCK_EXTENSION</a>;
-#define <a href="#XML_SCHEMAS_TYPE_INTERNAL_INVALID">XML_SCHEMAS_TYPE_INTERNAL_INVALID</a>;
-#define <a href="#XML_SCHEMAS_ATTRGROUP_HAS_REFS">XML_SCHEMAS_ATTRGROUP_HAS_REFS</a>;
-#define <a href="#XML_SCHEMAS_ELEM_ABSTRACT">XML_SCHEMAS_ELEM_ABSTRACT</a>;
-#define <a href="#XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION">XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION</a>;
-#define <a href="#XML_SCHEMAS_TYPE_FINAL_UNION">XML_SCHEMAS_TYPE_FINAL_UNION</a>;
-#define <a href="#XML_SCHEMAS_TYPE_FINAL_DEFAULT">XML_SCHEMAS_TYPE_FINAL_DEFAULT</a>;
-#define <a href="#XML_SCHEMAS_TYPE_FACETSNEEDVALUE">XML_SCHEMAS_TYPE_FACETSNEEDVALUE</a>;
-#define <a href="#XML_SCHEMAS_FINAL_DEFAULT_UNION">XML_SCHEMAS_FINAL_DEFAULT_UNION</a>;
-#define <a href="#XML_SCHEMAS_ELEM_BLOCK_RESTRICTION">XML_SCHEMAS_ELEM_BLOCK_RESTRICTION</a>;
+#define <a href="#XML_SCHEMAS_ELEM_FINAL_EXTENSION">XML_SCHEMAS_ELEM_FINAL_EXTENSION</a>;
+#define <a href="#XML_SCHEMAS_ELEM_FINAL_RESTRICTION">XML_SCHEMAS_ELEM_FINAL_RESTRICTION</a>;
+#define <a href="#XML_SCHEMAS_ELEM_FIXED">XML_SCHEMAS_ELEM_FIXED</a>;
+#define <a href="#XML_SCHEMAS_ELEM_GLOBAL">XML_SCHEMAS_ELEM_GLOBAL</a>;
+#define <a href="#XML_SCHEMAS_ELEM_INTERNAL_CHECKED">XML_SCHEMAS_ELEM_INTERNAL_CHECKED</a>;
+#define <a href="#XML_SCHEMAS_ELEM_INTERNAL_RESOLVED">XML_SCHEMAS_ELEM_INTERNAL_RESOLVED</a>;
+#define <a href="#XML_SCHEMAS_ELEM_NILLABLE">XML_SCHEMAS_ELEM_NILLABLE</a>;
+#define <a href="#XML_SCHEMAS_ELEM_NSDEFAULT">XML_SCHEMAS_ELEM_NSDEFAULT</a>;
+#define <a href="#XML_SCHEMAS_ELEM_REF">XML_SCHEMAS_ELEM_REF</a>;
+#define <a href="#XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD">XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD</a>;
+#define <a href="#XML_SCHEMAS_ELEM_TOPLEVEL">XML_SCHEMAS_ELEM_TOPLEVEL</a>;
+#define <a href="#XML_SCHEMAS_FACET_COLLAPSE">XML_SCHEMAS_FACET_COLLAPSE</a>;
+#define <a href="#XML_SCHEMAS_FACET_PRESERVE">XML_SCHEMAS_FACET_PRESERVE</a>;
 #define <a href="#XML_SCHEMAS_FACET_REPLACE">XML_SCHEMAS_FACET_REPLACE</a>;
@@ -122,3 +88,28 @@
 #define <a href="#XML_SCHEMAS_FACET_REPLACE">XML_SCHEMAS_FACET_REPLACE</a>;
-#define <a href="#XML_SCHEMAS_ELEM_DEFAULT">XML_SCHEMAS_ELEM_DEFAULT</a>;
+#define <a href="#XML_SCHEMAS_FACET_UNKNOWN">XML_SCHEMAS_FACET_UNKNOWN</a>;
+#define <a href="#XML_SCHEMAS_FINAL_DEFAULT_EXTENSION">XML_SCHEMAS_FINAL_DEFAULT_EXTENSION</a>;
+#define <a href="#XML_SCHEMAS_FINAL_DEFAULT_LIST">XML_SCHEMAS_FINAL_DEFAULT_LIST</a>;
+#define <a href="#XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION">XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION</a>;
+#define <a href="#XML_SCHEMAS_FINAL_DEFAULT_UNION">XML_SCHEMAS_FINAL_DEFAULT_UNION</a>;
+#define <a href="#XML_SCHEMAS_INCLUDING_CONVERT_NS">XML_SCHEMAS_INCLUDING_CONVERT_NS</a>;
+#define <a href="#XML_SCHEMAS_QUALIF_ATTR">XML_SCHEMAS_QUALIF_ATTR</a>;
+#define <a href="#XML_SCHEMAS_QUALIF_ELEM">XML_SCHEMAS_QUALIF_ELEM</a>;
+#define <a href="#XML_SCHEMAS_TYPE_ABSTRACT">XML_SCHEMAS_TYPE_ABSTRACT</a>;
+#define <a href="#XML_SCHEMAS_TYPE_BLOCK_DEFAULT">XML_SCHEMAS_TYPE_BLOCK_DEFAULT</a>;
+#define <a href="#XML_SCHEMAS_TYPE_BLOCK_EXTENSION">XML_SCHEMAS_TYPE_BLOCK_EXTENSION</a>;
+#define <a href="#XML_SCHEMAS_TYPE_BLOCK_RESTRICTION">XML_SCHEMAS_TYPE_BLOCK_RESTRICTION</a>;
+#define <a href="#XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE">XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE</a>;
+#define <a href="#XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION">XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION</a>;
+#define <a href="#XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION">XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION</a>;
+#define <a href="#XML_SCHEMAS_TYPE_FACETSNEEDVALUE">XML_SCHEMAS_TYPE_FACETSNEEDVALUE</a>;
+#define <a href="#XML_SCHEMAS_TYPE_FINAL_DEFAULT">XML_SCHEMAS_TYPE_FINAL_DEFAULT</a>;
+#define <a href="#XML_SCHEMAS_TYPE_FINAL_EXTENSION">XML_SCHEMAS_TYPE_FINAL_EXTENSION</a>;
+#define <a href="#XML_SCHEMAS_TYPE_FINAL_LIST">XML_SCHEMAS_TYPE_FINAL_LIST</a>;
+#define <a href="#XML_SCHEMAS_TYPE_FINAL_RESTRICTION">XML_SCHEMAS_TYPE_FINAL_RESTRICTION</a>;
+#define <a href="#XML_SCHEMAS_TYPE_FINAL_UNION">XML_SCHEMAS_TYPE_FINAL_UNION</a>;
+#define <a href="#XML_SCHEMAS_TYPE_FIXUP_1">XML_SCHEMAS_TYPE_FIXUP_1</a>;
+#define <a href="#XML_SCHEMAS_TYPE_GLOBAL">XML_SCHEMAS_TYPE_GLOBAL</a>;
+#define <a href="#XML_SCHEMAS_TYPE_HAS_FACETS">XML_SCHEMAS_TYPE_HAS_FACETS</a>;
+#define <a href="#XML_SCHEMAS_TYPE_INTERNAL_INVALID">XML_SCHEMAS_TYPE_INTERNAL_INVALID</a>;
+#define <a href="#XML_SCHEMAS_TYPE_INTERNAL_RESOLVED">XML_SCHEMAS_TYPE_INTERNAL_RESOLVED</a>;
 #define <a href="#XML_SCHEMAS_TYPE_MARKED">XML_SCHEMAS_TYPE_MARKED</a>;
@@ -124,12 +115,15 @@
 #define <a href="#XML_SCHEMAS_TYPE_MARKED">XML_SCHEMAS_TYPE_MARKED</a>;
-#define <a href="#XML_SCHEMAS_ELEM_BLOCK_ABSENT">XML_SCHEMAS_ELEM_BLOCK_ABSENT</a>;
-#define <a href="#XML_SCHEMAS_ATTRGROUP_GLOBAL">XML_SCHEMAS_ATTRGROUP_GLOBAL</a>;
-#define <a href="#XML_SCHEMAS_ELEM_REF">XML_SCHEMAS_ELEM_REF</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaAttributeGroup">xmlSchemaAttributeGroup</a> * <a href="#xmlSchemaAttributeGroupPtr">xmlSchemaAttributeGroupPtr</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaElement">xmlSchemaElement</a> * <a href="#xmlSchemaElementPtr">xmlSchemaElementPtr</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaFacetLink">xmlSchemaFacetLink</a> * <a href="#xmlSchemaFacetLinkPtr">xmlSchemaFacetLinkPtr</a>;
-typedef struct _xmlSchemaVal <a href="#xmlSchemaVal">xmlSchemaVal</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaAttributeLink">xmlSchemaAttributeLink</a> * <a href="#xmlSchemaAttributeLinkPtr">xmlSchemaAttributeLinkPtr</a>;
-typedef struct _xmlSchemaType <a href="#xmlSchemaType">xmlSchemaType</a>;
+#define <a href="#XML_SCHEMAS_TYPE_MIXED">XML_SCHEMAS_TYPE_MIXED</a>;
+#define <a href="#XML_SCHEMAS_TYPE_NORMVALUENEEDED">XML_SCHEMAS_TYPE_NORMVALUENEEDED</a>;
+#define <a href="#XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD">XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD</a>;
+#define <a href="#XML_SCHEMAS_TYPE_REDEFINED">XML_SCHEMAS_TYPE_REDEFINED</a>;
+#define <a href="#XML_SCHEMAS_TYPE_VARIETY_ABSENT">XML_SCHEMAS_TYPE_VARIETY_ABSENT</a>;
+#define <a href="#XML_SCHEMAS_TYPE_VARIETY_ATOMIC">XML_SCHEMAS_TYPE_VARIETY_ATOMIC</a>;
+#define <a href="#XML_SCHEMAS_TYPE_VARIETY_LIST">XML_SCHEMAS_TYPE_VARIETY_LIST</a>;
+#define <a href="#XML_SCHEMAS_TYPE_VARIETY_UNION">XML_SCHEMAS_TYPE_VARIETY_UNION</a>;
+#define <a href="#XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE">XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE</a>;
+#define <a href="#XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE">XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE</a>;
+#define <a href="#XML_SCHEMAS_TYPE_WHITESPACE_REPLACE">XML_SCHEMAS_TYPE_WHITESPACE_REPLACE</a>;
+#define <a href="#XML_SCHEMAS_WILDCARD_COMPLETE">XML_SCHEMAS_WILDCARD_COMPLETE</a>;
 typedef struct _xmlSchemaAnnot <a href="#xmlSchemaAnnot">xmlSchemaAnnot</a>;
 typedef <a href="libxml2-schemasInternals.html#xmlSchemaAnnot">xmlSchemaAnnot</a> * <a href="#xmlSchemaAnnotPtr">xmlSchemaAnnotPtr</a>;
@@ -134,3 +128,10 @@
 typedef struct _xmlSchemaAnnot <a href="#xmlSchemaAnnot">xmlSchemaAnnot</a>;
 typedef <a href="libxml2-schemasInternals.html#xmlSchemaAnnot">xmlSchemaAnnot</a> * <a href="#xmlSchemaAnnotPtr">xmlSchemaAnnotPtr</a>;
+typedef struct _xmlSchemaAttribute <a href="#xmlSchemaAttribute">xmlSchemaAttribute</a>;
+typedef struct _xmlSchemaAttributeGroup <a href="#xmlSchemaAttributeGroup">xmlSchemaAttributeGroup</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaAttributeGroup">xmlSchemaAttributeGroup</a> * <a href="#xmlSchemaAttributeGroupPtr">xmlSchemaAttributeGroupPtr</a>;
+typedef struct _xmlSchemaAttributeLink <a href="#xmlSchemaAttributeLink">xmlSchemaAttributeLink</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaAttributeLink">xmlSchemaAttributeLink</a> * <a href="#xmlSchemaAttributeLinkPtr">xmlSchemaAttributeLinkPtr</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaAttribute">xmlSchemaAttribute</a> * <a href="#xmlSchemaAttributePtr">xmlSchemaAttributePtr</a>;
+typedef enum <a href="#xmlSchemaContentType">xmlSchemaContentType</a>;
 typedef struct _xmlSchemaElement <a href="#xmlSchemaElement">xmlSchemaElement</a>;
@@ -136,4 +137,6 @@
 typedef struct _xmlSchemaElement <a href="#xmlSchemaElement">xmlSchemaElement</a>;
-typedef struct _xmlSchemaWildcard <a href="#xmlSchemaWildcard">xmlSchemaWildcard</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaWildcard">xmlSchemaWildcard</a> * <a href="#xmlSchemaWildcardPtr">xmlSchemaWildcardPtr</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaElement">xmlSchemaElement</a> * <a href="#xmlSchemaElementPtr">xmlSchemaElementPtr</a>;
+typedef struct _xmlSchemaFacet <a href="#xmlSchemaFacet">xmlSchemaFacet</a>;
+typedef struct _xmlSchemaFacetLink <a href="#xmlSchemaFacetLink">xmlSchemaFacetLink</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaFacetLink">xmlSchemaFacetLink</a> * <a href="#xmlSchemaFacetLinkPtr">xmlSchemaFacetLinkPtr</a>;
 typedef <a href="libxml2-schemasInternals.html#xmlSchemaFacet">xmlSchemaFacet</a> * <a href="#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a>;
@@ -139,2 +142,5 @@
 typedef <a href="libxml2-schemasInternals.html#xmlSchemaFacet">xmlSchemaFacet</a> * <a href="#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a>;
+typedef struct _xmlSchemaNotation <a href="#xmlSchemaNotation">xmlSchemaNotation</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaNotation">xmlSchemaNotation</a> * <a href="#xmlSchemaNotationPtr">xmlSchemaNotationPtr</a>;
+typedef struct _xmlSchemaType <a href="#xmlSchemaType">xmlSchemaType</a>;
 typedef struct _xmlSchemaTypeLink <a href="#xmlSchemaTypeLink">xmlSchemaTypeLink</a>;
@@ -140,7 +146,2 @@
 typedef struct _xmlSchemaTypeLink <a href="#xmlSchemaTypeLink">xmlSchemaTypeLink</a>;
-typedef struct _xmlSchemaAttributeLink <a href="#xmlSchemaAttributeLink">xmlSchemaAttributeLink</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaVal">xmlSchemaVal</a> * <a href="#xmlSchemaValPtr">xmlSchemaValPtr</a>;
-typedef struct _xmlSchemaFacetLink <a href="#xmlSchemaFacetLink">xmlSchemaFacetLink</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaWildcardNs">xmlSchemaWildcardNs</a> * <a href="#xmlSchemaWildcardNsPtr">xmlSchemaWildcardNsPtr</a>;
-typedef struct _xmlSchemaAttributeGroup <a href="#xmlSchemaAttributeGroup">xmlSchemaAttributeGroup</a>;
 typedef <a href="libxml2-schemasInternals.html#xmlSchemaTypeLink">xmlSchemaTypeLink</a> * <a href="#xmlSchemaTypeLinkPtr">xmlSchemaTypeLinkPtr</a>;
@@ -146,5 +147,6 @@
 typedef <a href="libxml2-schemasInternals.html#xmlSchemaTypeLink">xmlSchemaTypeLink</a> * <a href="#xmlSchemaTypeLinkPtr">xmlSchemaTypeLinkPtr</a>;
-typedef struct _xmlSchemaWildcardNs <a href="#xmlSchemaWildcardNs">xmlSchemaWildcardNs</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaAttribute">xmlSchemaAttribute</a> * <a href="#xmlSchemaAttributePtr">xmlSchemaAttributePtr</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaNotation">xmlSchemaNotation</a> * <a href="#xmlSchemaNotationPtr">xmlSchemaNotationPtr</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaType">xmlSchemaType</a> * <a href="#xmlSchemaTypePtr">xmlSchemaTypePtr</a>;
+typedef enum <a href="#xmlSchemaTypeType">xmlSchemaTypeType</a>;
+typedef struct _xmlSchemaVal <a href="#xmlSchemaVal">xmlSchemaVal</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaVal">xmlSchemaVal</a> * <a href="#xmlSchemaValPtr">xmlSchemaValPtr</a>;
 typedef enum <a href="#xmlSchemaValType">xmlSchemaValType</a>;
@@ -150,10 +152,8 @@
 typedef enum <a href="#xmlSchemaValType">xmlSchemaValType</a>;
-typedef <a href="libxml2-schemasInternals.html#xmlSchemaType">xmlSchemaType</a> * <a href="#xmlSchemaTypePtr">xmlSchemaTypePtr</a>;
-typedef struct _xmlSchemaNotation <a href="#xmlSchemaNotation">xmlSchemaNotation</a>;
-typedef struct _xmlSchemaFacet <a href="#xmlSchemaFacet">xmlSchemaFacet</a>;
-typedef enum <a href="#xmlSchemaContentType">xmlSchemaContentType</a>;
-typedef enum <a href="#xmlSchemaTypeType">xmlSchemaTypeType</a>;
-typedef struct _xmlSchemaAttribute <a href="#xmlSchemaAttribute">xmlSchemaAttribute</a>;
+typedef struct _xmlSchemaWildcard <a href="#xmlSchemaWildcard">xmlSchemaWildcard</a>;
+typedef struct _xmlSchemaWildcardNs <a href="#xmlSchemaWildcardNs">xmlSchemaWildcardNs</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaWildcardNs">xmlSchemaWildcardNs</a> * <a href="#xmlSchemaWildcardNsPtr">xmlSchemaWildcardNsPtr</a>;
+typedef <a href="libxml2-schemasInternals.html#xmlSchemaWildcard">xmlSchemaWildcard</a> * <a href="#xmlSchemaWildcardPtr">xmlSchemaWildcardPtr</a>;
 void	<a href="#xmlSchemaFreeType">xmlSchemaFreeType</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type);
 void	<a href="#xmlSchemaFreeWildcard">xmlSchemaFreeWildcard</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaWildcardPtr">xmlSchemaWildcardPtr</a> wildcard);
 </pre>
diff --git a/doc/devhelp/libxml2-schematron.html b/doc/devhelp/libxml2-schematron.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi1zY2hlbWF0cm9uLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi1zY2hlbWF0cm9uLmh0bWw= 100644
--- a/doc/devhelp/libxml2-schematron.html
+++ b/doc/devhelp/libxml2-schematron.html
@@ -43,7 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef struct _xmlSchematronValidCtxt <a href="#xmlSchematronValidCtxt">xmlSchematronValidCtxt</a>;
-typedef enum <a href="#xmlSchematronValidOptions">xmlSchematronValidOptions</a>;
-typedef <a href="libxml2-schematron.html#xmlSchematron">xmlSchematron</a> * <a href="#xmlSchematronPtr">xmlSchematronPtr</a>;
+      <pre class="synopsis">typedef struct _xmlSchematron <a href="#xmlSchematron">xmlSchematron</a>;
 typedef struct _xmlSchematronParserCtxt <a href="#xmlSchematronParserCtxt">xmlSchematronParserCtxt</a>;
@@ -49,3 +47,5 @@
 typedef struct _xmlSchematronParserCtxt <a href="#xmlSchematronParserCtxt">xmlSchematronParserCtxt</a>;
-typedef struct _xmlSchematron <a href="#xmlSchematron">xmlSchematron</a>;
+typedef <a href="libxml2-schematron.html#xmlSchematronParserCtxt">xmlSchematronParserCtxt</a> * <a href="#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a>;
+typedef <a href="libxml2-schematron.html#xmlSchematron">xmlSchematron</a> * <a href="#xmlSchematronPtr">xmlSchematronPtr</a>;
+typedef struct _xmlSchematronValidCtxt <a href="#xmlSchematronValidCtxt">xmlSchematronValidCtxt</a>;
 typedef <a href="libxml2-schematron.html#xmlSchematronValidCtxt">xmlSchematronValidCtxt</a> * <a href="#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a>;
@@ -51,4 +51,4 @@
 typedef <a href="libxml2-schematron.html#xmlSchematronValidCtxt">xmlSchematronValidCtxt</a> * <a href="#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a>;
-typedef <a href="libxml2-schematron.html#xmlSchematronParserCtxt">xmlSchematronParserCtxt</a> * <a href="#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a>;
-int	<a href="#xmlSchematronValidateDoc">xmlSchematronValidateDoc</a>	(<a href="libxml2-schematron.html#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> instance);
+typedef enum <a href="#xmlSchematronValidOptions">xmlSchematronValidOptions</a>;
+void	<a href="#xmlSchematronFree">xmlSchematronFree</a>		(<a href="libxml2-schematron.html#xmlSchematronPtr">xmlSchematronPtr</a> schema);
 void	<a href="#xmlSchematronFreeParserCtxt">xmlSchematronFreeParserCtxt</a>	(<a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a> ctxt);
@@ -54,2 +54,4 @@
 void	<a href="#xmlSchematronFreeParserCtxt">xmlSchematronFreeParserCtxt</a>	(<a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a> ctxt);
+void	<a href="#xmlSchematronFreeValidCtxt">xmlSchematronFreeValidCtxt</a>	(<a href="libxml2-schematron.html#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a> ctxt);
+<a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a>	<a href="#xmlSchematronNewDocParserCtxt">xmlSchematronNewDocParserCtxt</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
 <a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a>	<a href="#xmlSchematronNewMemParserCtxt">xmlSchematronNewMemParserCtxt</a>	(const char * buffer, <br/>							 int size);
@@ -55,3 +57,2 @@
 <a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a>	<a href="#xmlSchematronNewMemParserCtxt">xmlSchematronNewMemParserCtxt</a>	(const char * buffer, <br/>							 int size);
-typedef void <a href="#xmlSchematronValidityErrorFunc">xmlSchematronValidityErrorFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
 <a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a>	<a href="#xmlSchematronNewParserCtxt">xmlSchematronNewParserCtxt</a>	(const char * URL);
@@ -57,4 +58,4 @@
 <a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a>	<a href="#xmlSchematronNewParserCtxt">xmlSchematronNewParserCtxt</a>	(const char * URL);
-typedef void <a href="#xmlSchematronValidityWarningFunc">xmlSchematronValidityWarningFunc</a>	(void * ctx, <br/>						 const char * msg, <br/>						 ... ...);
-void	<a href="#xmlSchematronFree">xmlSchematronFree</a>		(<a href="libxml2-schematron.html#xmlSchematronPtr">xmlSchematronPtr</a> schema);
+<a href="libxml2-schematron.html#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a>	<a href="#xmlSchematronNewValidCtxt">xmlSchematronNewValidCtxt</a>	(<a href="libxml2-schematron.html#xmlSchematronPtr">xmlSchematronPtr</a> schema, <br/>							 int options);
+<a href="libxml2-schematron.html#xmlSchematronPtr">xmlSchematronPtr</a>	<a href="#xmlSchematronParse">xmlSchematronParse</a>	(<a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a> ctxt);
 void	<a href="#xmlSchematronSetValidStructuredErrors">xmlSchematronSetValidStructuredErrors</a>	(<a href="libxml2-schematron.html#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
@@ -60,8 +61,7 @@
 void	<a href="#xmlSchematronSetValidStructuredErrors">xmlSchematronSetValidStructuredErrors</a>	(<a href="libxml2-schematron.html#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
-void	<a href="#xmlSchematronFreeValidCtxt">xmlSchematronFreeValidCtxt</a>	(<a href="libxml2-schematron.html#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a> ctxt);
-<a href="libxml2-schematron.html#xmlSchematronPtr">xmlSchematronPtr</a>	<a href="#xmlSchematronParse">xmlSchematronParse</a>	(<a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a> ctxt);
-<a href="libxml2-schematron.html#xmlSchematronParserCtxtPtr">xmlSchematronParserCtxtPtr</a>	<a href="#xmlSchematronNewDocParserCtxt">xmlSchematronNewDocParserCtxt</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-<a href="libxml2-schematron.html#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a>	<a href="#xmlSchematronNewValidCtxt">xmlSchematronNewValidCtxt</a>	(<a href="libxml2-schematron.html#xmlSchematronPtr">xmlSchematronPtr</a> schema, <br/>							 int options);
+int	<a href="#xmlSchematronValidateDoc">xmlSchematronValidateDoc</a>	(<a href="libxml2-schematron.html#xmlSchematronValidCtxtPtr">xmlSchematronValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> instance);
+typedef void <a href="#xmlSchematronValidityErrorFunc">xmlSchematronValidityErrorFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+typedef void <a href="#xmlSchematronValidityWarningFunc">xmlSchematronValidityWarningFunc</a>	(void * ctx, <br/>						 const char * msg, <br/>						 ... ...);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-threads.html b/doc/devhelp/libxml2-threads.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi10aHJlYWRzLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi10aHJlYWRzLmh0bWw= 100644
--- a/doc/devhelp/libxml2-threads.html
+++ b/doc/devhelp/libxml2-threads.html
@@ -44,5 +44,6 @@
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
       <pre class="synopsis">typedef struct _xmlMutex <a href="#xmlMutex">xmlMutex</a>;
+typedef <a href="libxml2-threads.html#xmlMutex">xmlMutex</a> * <a href="#xmlMutexPtr">xmlMutexPtr</a>;
 typedef struct _xmlRMutex <a href="#xmlRMutex">xmlRMutex</a>;
 typedef <a href="libxml2-threads.html#xmlRMutex">xmlRMutex</a> * <a href="#xmlRMutexPtr">xmlRMutexPtr</a>;
@@ -47,7 +48,3 @@
 typedef struct _xmlRMutex <a href="#xmlRMutex">xmlRMutex</a>;
 typedef <a href="libxml2-threads.html#xmlRMutex">xmlRMutex</a> * <a href="#xmlRMutexPtr">xmlRMutexPtr</a>;
-typedef <a href="libxml2-threads.html#xmlMutex">xmlMutex</a> * <a href="#xmlMutexPtr">xmlMutexPtr</a>;
-void	<a href="#xmlFreeRMutex">xmlFreeRMutex</a>			(<a href="libxml2-threads.html#xmlRMutexPtr">xmlRMutexPtr</a> tok);
-int	<a href="#xmlGetThreadId">xmlGetThreadId</a>			(void);
-void	<a href="#xmlMutexUnlock">xmlMutexUnlock</a>			(<a href="libxml2-threads.html#xmlMutexPtr">xmlMutexPtr</a> tok);
 void	<a href="#xmlCleanupThreads">xmlCleanupThreads</a>		(void);
@@ -53,10 +50,3 @@
 void	<a href="#xmlCleanupThreads">xmlCleanupThreads</a>		(void);
-void	<a href="#xmlLockLibrary">xmlLockLibrary</a>			(void);
-<a href="libxml2-threads.html#xmlRMutexPtr">xmlRMutexPtr</a>	<a href="#xmlNewRMutex">xmlNewRMutex</a>		(void);
-void	<a href="#xmlMutexLock">xmlMutexLock</a>			(<a href="libxml2-threads.html#xmlMutexPtr">xmlMutexPtr</a> tok);
-int	<a href="#xmlIsMainThread">xmlIsMainThread</a>			(void);
-void	<a href="#xmlRMutexUnlock">xmlRMutexUnlock</a>			(<a href="libxml2-threads.html#xmlRMutexPtr">xmlRMutexPtr</a> tok);
-<a href="libxml2-globals.html#xmlGlobalStatePtr">xmlGlobalStatePtr</a>	<a href="#xmlGetGlobalState">xmlGetGlobalState</a>	(void);
-<a href="libxml2-threads.html#xmlMutexPtr">xmlMutexPtr</a>	<a href="#xmlNewMutex">xmlNewMutex</a>		(void);
 int	<a href="#xmlDllMain">xmlDllMain</a>			(void * hinstDLL, <br/>					 unsigned long fdwReason, <br/>					 void * lpvReserved);
 void	<a href="#xmlFreeMutex">xmlFreeMutex</a>			(<a href="libxml2-threads.html#xmlMutexPtr">xmlMutexPtr</a> tok);
@@ -61,4 +51,6 @@
 int	<a href="#xmlDllMain">xmlDllMain</a>			(void * hinstDLL, <br/>					 unsigned long fdwReason, <br/>					 void * lpvReserved);
 void	<a href="#xmlFreeMutex">xmlFreeMutex</a>			(<a href="libxml2-threads.html#xmlMutexPtr">xmlMutexPtr</a> tok);
-void	<a href="#xmlUnlockLibrary">xmlUnlockLibrary</a>		(void);
+void	<a href="#xmlFreeRMutex">xmlFreeRMutex</a>			(<a href="libxml2-threads.html#xmlRMutexPtr">xmlRMutexPtr</a> tok);
+<a href="libxml2-globals.html#xmlGlobalStatePtr">xmlGlobalStatePtr</a>	<a href="#xmlGetGlobalState">xmlGetGlobalState</a>	(void);
+int	<a href="#xmlGetThreadId">xmlGetThreadId</a>			(void);
 void	<a href="#xmlInitThreads">xmlInitThreads</a>			(void);
@@ -64,2 +56,8 @@
 void	<a href="#xmlInitThreads">xmlInitThreads</a>			(void);
+int	<a href="#xmlIsMainThread">xmlIsMainThread</a>			(void);
+void	<a href="#xmlLockLibrary">xmlLockLibrary</a>			(void);
+void	<a href="#xmlMutexLock">xmlMutexLock</a>			(<a href="libxml2-threads.html#xmlMutexPtr">xmlMutexPtr</a> tok);
+void	<a href="#xmlMutexUnlock">xmlMutexUnlock</a>			(<a href="libxml2-threads.html#xmlMutexPtr">xmlMutexPtr</a> tok);
+<a href="libxml2-threads.html#xmlMutexPtr">xmlMutexPtr</a>	<a href="#xmlNewMutex">xmlNewMutex</a>		(void);
+<a href="libxml2-threads.html#xmlRMutexPtr">xmlRMutexPtr</a>	<a href="#xmlNewRMutex">xmlNewRMutex</a>		(void);
 void	<a href="#xmlRMutexLock">xmlRMutexLock</a>			(<a href="libxml2-threads.html#xmlRMutexPtr">xmlRMutexPtr</a> tok);
@@ -65,4 +63,6 @@
 void	<a href="#xmlRMutexLock">xmlRMutexLock</a>			(<a href="libxml2-threads.html#xmlRMutexPtr">xmlRMutexPtr</a> tok);
+void	<a href="#xmlRMutexUnlock">xmlRMutexUnlock</a>			(<a href="libxml2-threads.html#xmlRMutexPtr">xmlRMutexPtr</a> tok);
+void	<a href="#xmlUnlockLibrary">xmlUnlockLibrary</a>		(void);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi10cmVlLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi10cmVlLmh0bWw= 100644
--- a/doc/devhelp/libxml2-tree.html
+++ b/doc/devhelp/libxml2-tree.html
@@ -43,5 +43,6 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#XML_LOCAL_NAMESPACE">XML_LOCAL_NAMESPACE</a>;
+      <pre class="synopsis">#define <a href="#BASE_BUFFER_SIZE">BASE_BUFFER_SIZE</a>;
+#define <a href="#LIBXML2_NEW_BUFFER">LIBXML2_NEW_BUFFER</a>;
 #define <a href="#XML_DOCB_DOCUMENT_NODE">XML_DOCB_DOCUMENT_NODE</a>;
@@ -47,6 +48,2 @@
 #define <a href="#XML_DOCB_DOCUMENT_NODE">XML_DOCB_DOCUMENT_NODE</a>;
-#define <a href="#BASE_BUFFER_SIZE">BASE_BUFFER_SIZE</a>;
-#define <a href="#XML_XML_ID">XML_XML_ID</a>;
-#define <a href="#xmlRootNode">xmlRootNode</a>;
-#define <a href="#XML_GET_LINE">XML_GET_LINE</a>;
 #define <a href="#XML_GET_CONTENT">XML_GET_CONTENT</a>;
@@ -52,3 +49,5 @@
 #define <a href="#XML_GET_CONTENT">XML_GET_CONTENT</a>;
-#define <a href="#xmlChildrenNode">xmlChildrenNode</a>;
+#define <a href="#XML_GET_LINE">XML_GET_LINE</a>;
+#define <a href="#XML_LOCAL_NAMESPACE">XML_LOCAL_NAMESPACE</a>;
+#define <a href="#XML_XML_ID">XML_XML_ID</a>;
 #define <a href="#XML_XML_NAMESPACE">XML_XML_NAMESPACE</a>;
@@ -54,6 +53,12 @@
 #define <a href="#XML_XML_NAMESPACE">XML_XML_NAMESPACE</a>;
-#define <a href="#LIBXML2_NEW_BUFFER">LIBXML2_NEW_BUFFER</a>;
-typedef struct _xmlNs <a href="#xmlNs">xmlNs</a>;
-typedef struct _xmlElementContent <a href="#xmlElementContent">xmlElementContent</a>;
-typedef <a href="libxml2-tree.html#xmlEnumeration">xmlEnumeration</a> * <a href="#xmlEnumerationPtr">xmlEnumerationPtr</a>;
+#define <a href="#xmlChildrenNode">xmlChildrenNode</a>;
+#define <a href="#xmlRootNode">xmlRootNode</a>;
+typedef struct _xmlAttr <a href="#xmlAttr">xmlAttr</a>;
+typedef <a href="libxml2-tree.html#xmlAttr">xmlAttr</a> * <a href="#xmlAttrPtr">xmlAttrPtr</a>;
+typedef struct _xmlAttribute <a href="#xmlAttribute">xmlAttribute</a>;
+typedef enum <a href="#xmlAttributeDefault">xmlAttributeDefault</a>;
+typedef <a href="libxml2-tree.html#xmlAttribute">xmlAttribute</a> * <a href="#xmlAttributePtr">xmlAttributePtr</a>;
+typedef enum <a href="#xmlAttributeType">xmlAttributeType</a>;
+typedef struct _xmlBuf <a href="#xmlBuf">xmlBuf</a>;
+typedef <a href="libxml2-tree.html#xmlBuf">xmlBuf</a> * <a href="#xmlBufPtr">xmlBufPtr</a>;
 typedef struct _xmlBuffer <a href="#xmlBuffer">xmlBuffer</a>;
@@ -59,7 +64,2 @@
 typedef struct _xmlBuffer <a href="#xmlBuffer">xmlBuffer</a>;
-typedef <a href="libxml2-tree.html#xmlParserInput">xmlParserInput</a> * <a href="#xmlParserInputPtr">xmlParserInputPtr</a>;
-typedef <a href="libxml2-tree.html#xmlSAXLocator">xmlSAXLocator</a> * <a href="#xmlSAXLocatorPtr">xmlSAXLocatorPtr</a>;
-typedef struct _xmlParserInput <a href="#xmlParserInput">xmlParserInput</a>;
-typedef struct _xmlElement <a href="#xmlElement">xmlElement</a>;
-typedef <a href="libxml2-tree.html#xmlElementType">xmlElementType</a> <a href="#xmlNsType">xmlNsType</a>;
 typedef enum <a href="#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a>;
@@ -65,4 +65,2 @@
 typedef enum <a href="#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a>;
-typedef struct _xmlNode <a href="#xmlNode">xmlNode</a>;
-typedef <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * <a href="#xmlDocPtr">xmlDocPtr</a>;
 typedef <a href="libxml2-tree.html#xmlBuffer">xmlBuffer</a> * <a href="#xmlBufferPtr">xmlBufferPtr</a>;
@@ -68,6 +66,2 @@
 typedef <a href="libxml2-tree.html#xmlBuffer">xmlBuffer</a> * <a href="#xmlBufferPtr">xmlBufferPtr</a>;
-typedef <a href="libxml2-tree.html#xmlDOMWrapCtxt">xmlDOMWrapCtxt</a> * <a href="#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a>;
-typedef <a href="libxml2-tree.html#xmlRef">xmlRef</a> * <a href="#xmlRefPtr">xmlRefPtr</a>;
-typedef struct _xmlParserInputBuffer <a href="#xmlParserInputBuffer">xmlParserInputBuffer</a>;
-typedef struct _xmlRef <a href="#xmlRef">xmlRef</a>;
 typedef struct _xmlDOMWrapCtxt <a href="#xmlDOMWrapCtxt">xmlDOMWrapCtxt</a>;
@@ -73,4 +67,7 @@
 typedef struct _xmlDOMWrapCtxt <a href="#xmlDOMWrapCtxt">xmlDOMWrapCtxt</a>;
-typedef <a href="libxml2-tree.html#xmlNode">xmlNode</a> * <a href="#xmlNodePtr">xmlNodePtr</a>;
-typedef struct _xmlParserCtxt <a href="#xmlParserCtxt">xmlParserCtxt</a>;
+typedef <a href="libxml2-tree.html#xmlDOMWrapCtxt">xmlDOMWrapCtxt</a> * <a href="#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a>;
+typedef struct _xmlDoc <a href="#xmlDoc">xmlDoc</a>;
+typedef enum <a href="#xmlDocProperties">xmlDocProperties</a>;
+typedef <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * <a href="#xmlDocPtr">xmlDocPtr</a>;
+typedef struct _xmlDtd <a href="#xmlDtd">xmlDtd</a>;
 typedef <a href="libxml2-tree.html#xmlDtd">xmlDtd</a> * <a href="#xmlDtdPtr">xmlDtdPtr</a>;
@@ -76,13 +73,4 @@
 typedef <a href="libxml2-tree.html#xmlDtd">xmlDtd</a> * <a href="#xmlDtdPtr">xmlDtdPtr</a>;
-typedef enum <a href="#xmlAttributeDefault">xmlAttributeDefault</a>;
-typedef struct _xmlBuf <a href="#xmlBuf">xmlBuf</a>;
-typedef struct _xmlNotation <a href="#xmlNotation">xmlNotation</a>;
-typedef enum <a href="#xmlElementType">xmlElementType</a>;
-typedef struct _xmlEntity <a href="#xmlEntity">xmlEntity</a>;
-typedef struct _xmlAttr <a href="#xmlAttr">xmlAttr</a>;
-typedef <a href="libxml2-tree.html#xmlAttribute">xmlAttribute</a> * <a href="#xmlAttributePtr">xmlAttributePtr</a>;
-typedef enum <a href="#xmlElementTypeVal">xmlElementTypeVal</a>;
-typedef <a href="libxml2-tree.html#xmlNotation">xmlNotation</a> * <a href="#xmlNotationPtr">xmlNotationPtr</a>;
-typedef <a href="libxml2-tree.html#xmlElement">xmlElement</a> * <a href="#xmlElementPtr">xmlElementPtr</a>;
-typedef <a href="libxml2-tree.html#xmlBuf">xmlBuf</a> * <a href="#xmlBufPtr">xmlBufPtr</a>;
+typedef struct _xmlElement <a href="#xmlElement">xmlElement</a>;
+typedef struct _xmlElementContent <a href="#xmlElementContent">xmlElementContent</a>;
 typedef enum <a href="#xmlElementContentOccur">xmlElementContentOccur</a>;
@@ -88,15 +76,3 @@
 typedef enum <a href="#xmlElementContentOccur">xmlElementContentOccur</a>;
-typedef <a href="libxml2-tree.html#xmlAttr">xmlAttr</a> * <a href="#xmlAttrPtr">xmlAttrPtr</a>;
-typedef struct _xmlDoc <a href="#xmlDoc">xmlDoc</a>;
-typedef struct _xmlID <a href="#xmlID">xmlID</a>;
-typedef <a href="libxml2-tree.html#xmlParserCtxt">xmlParserCtxt</a> * <a href="#xmlParserCtxtPtr">xmlParserCtxtPtr</a>;
-typedef <a href="libxml2-tree.html#xmlEntity">xmlEntity</a> * <a href="#xmlEntityPtr">xmlEntityPtr</a>;
-typedef struct _xmlEnumeration <a href="#xmlEnumeration">xmlEnumeration</a>;
-typedef enum <a href="#xmlAttributeType">xmlAttributeType</a>;
-typedef <a href="libxml2-tree.html#xmlNs">xmlNs</a> * <a href="#xmlNsPtr">xmlNsPtr</a>;
-typedef <a href="libxml2-tree.html#xmlParserInputBuffer">xmlParserInputBuffer</a> * <a href="#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>;
-typedef struct _xmlSAXHandler <a href="#xmlSAXHandler">xmlSAXHandler</a>;
-typedef struct _xmlOutputBuffer <a href="#xmlOutputBuffer">xmlOutputBuffer</a>;
-typedef struct _xmlSAXLocator <a href="#xmlSAXLocator">xmlSAXLocator</a>;
 typedef <a href="libxml2-tree.html#xmlElementContent">xmlElementContent</a> * <a href="#xmlElementContentPtr">xmlElementContentPtr</a>;
 typedef enum <a href="#xmlElementContentType">xmlElementContentType</a>;
@@ -101,4 +77,11 @@
 typedef <a href="libxml2-tree.html#xmlElementContent">xmlElementContent</a> * <a href="#xmlElementContentPtr">xmlElementContentPtr</a>;
 typedef enum <a href="#xmlElementContentType">xmlElementContentType</a>;
-typedef enum <a href="#xmlDocProperties">xmlDocProperties</a>;
+typedef <a href="libxml2-tree.html#xmlElement">xmlElement</a> * <a href="#xmlElementPtr">xmlElementPtr</a>;
+typedef enum <a href="#xmlElementType">xmlElementType</a>;
+typedef enum <a href="#xmlElementTypeVal">xmlElementTypeVal</a>;
+typedef struct _xmlEntity <a href="#xmlEntity">xmlEntity</a>;
+typedef <a href="libxml2-tree.html#xmlEntity">xmlEntity</a> * <a href="#xmlEntityPtr">xmlEntityPtr</a>;
+typedef struct _xmlEnumeration <a href="#xmlEnumeration">xmlEnumeration</a>;
+typedef <a href="libxml2-tree.html#xmlEnumeration">xmlEnumeration</a> * <a href="#xmlEnumerationPtr">xmlEnumerationPtr</a>;
+typedef struct _xmlID <a href="#xmlID">xmlID</a>;
 typedef <a href="libxml2-tree.html#xmlID">xmlID</a> * <a href="#xmlIDPtr">xmlIDPtr</a>;
@@ -104,4 +87,10 @@
 typedef <a href="libxml2-tree.html#xmlID">xmlID</a> * <a href="#xmlIDPtr">xmlIDPtr</a>;
-typedef struct _xmlDtd <a href="#xmlDtd">xmlDtd</a>;
-typedef struct _xmlAttribute <a href="#xmlAttribute">xmlAttribute</a>;
+typedef struct _xmlNode <a href="#xmlNode">xmlNode</a>;
+typedef <a href="libxml2-tree.html#xmlNode">xmlNode</a> * <a href="#xmlNodePtr">xmlNodePtr</a>;
+typedef struct _xmlNotation <a href="#xmlNotation">xmlNotation</a>;
+typedef <a href="libxml2-tree.html#xmlNotation">xmlNotation</a> * <a href="#xmlNotationPtr">xmlNotationPtr</a>;
+typedef struct _xmlNs <a href="#xmlNs">xmlNs</a>;
+typedef <a href="libxml2-tree.html#xmlNs">xmlNs</a> * <a href="#xmlNsPtr">xmlNsPtr</a>;
+typedef <a href="libxml2-tree.html#xmlElementType">xmlElementType</a> <a href="#xmlNsType">xmlNsType</a>;
+typedef struct _xmlOutputBuffer <a href="#xmlOutputBuffer">xmlOutputBuffer</a>;
 typedef <a href="libxml2-tree.html#xmlOutputBuffer">xmlOutputBuffer</a> * <a href="#xmlOutputBufferPtr">xmlOutputBufferPtr</a>;
@@ -107,2 +96,11 @@
 typedef <a href="libxml2-tree.html#xmlOutputBuffer">xmlOutputBuffer</a> * <a href="#xmlOutputBufferPtr">xmlOutputBufferPtr</a>;
+typedef struct _xmlParserCtxt <a href="#xmlParserCtxt">xmlParserCtxt</a>;
+typedef <a href="libxml2-tree.html#xmlParserCtxt">xmlParserCtxt</a> * <a href="#xmlParserCtxtPtr">xmlParserCtxtPtr</a>;
+typedef struct _xmlParserInput <a href="#xmlParserInput">xmlParserInput</a>;
+typedef struct _xmlParserInputBuffer <a href="#xmlParserInputBuffer">xmlParserInputBuffer</a>;
+typedef <a href="libxml2-tree.html#xmlParserInputBuffer">xmlParserInputBuffer</a> * <a href="#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>;
+typedef <a href="libxml2-tree.html#xmlParserInput">xmlParserInput</a> * <a href="#xmlParserInputPtr">xmlParserInputPtr</a>;
+typedef struct _xmlRef <a href="#xmlRef">xmlRef</a>;
+typedef <a href="libxml2-tree.html#xmlRef">xmlRef</a> * <a href="#xmlRefPtr">xmlRefPtr</a>;
+typedef struct _xmlSAXHandler <a href="#xmlSAXHandler">xmlSAXHandler</a>;
 typedef <a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> * <a href="#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a>;
@@ -108,4 +106,10 @@
 typedef <a href="libxml2-tree.html#xmlSAXHandler">xmlSAXHandler</a> * <a href="#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a>;
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlDocCopyNode">xmlDocCopyNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int extended);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocRawNode">xmlNewDocRawNode</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+typedef struct _xmlSAXLocator <a href="#xmlSAXLocator">xmlSAXLocator</a>;
+typedef <a href="libxml2-tree.html#xmlSAXLocator">xmlSAXLocator</a> * <a href="#xmlSAXLocatorPtr">xmlSAXLocatorPtr</a>;
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddChild">xmlAddChild</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddChildList">xmlAddChildList</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddNextSibling">xmlAddNextSibling</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddPrevSibling">xmlAddPrevSibling</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddSibling">xmlAddSibling</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
+void	<a href="#xmlAttrSerializeTxtContent">xmlAttrSerializeTxtContent</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBufContent">xmlBufContent</a>		(const <a href="libxml2-tree.html#xmlBuf">xmlBuf</a> * buf);
@@ -111,12 +115,12 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBufContent">xmlBufContent</a>		(const <a href="libxml2-tree.html#xmlBuf">xmlBuf</a> * buf);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlNewNsPropEatName">xmlNewNsPropEatName</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlStringGetNodeList">xmlStringGetNodeList</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewCDataBlock">xmlNewCDataBlock</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
-void	<a href="#xmlBufferWriteCHAR">xmlBufferWriteCHAR</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeGetBase">xmlNodeGetBase</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
-void	<a href="#xmlBufferEmpty">xmlBufferEmpty</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBuildQName">xmlBuildQName</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ncname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * memory, <br/>					 int len);
-int	<a href="#xmlValidateNMToken">xmlValidateNMToken</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int space);
-int	<a href="#xmlSaveFormatFileEnc">xmlSaveFormatFileEnc</a>		(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddSibling">xmlAddSibling</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBufEnd">xmlBufEnd</a>		(<a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf);
+int	<a href="#xmlBufGetNodeContent">xmlBufGetNodeContent</a>		(<a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
+size_t	<a href="#xmlBufNodeDump">xmlBufNodeDump</a>			(<a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 int level, <br/>					 int format);
+size_t	<a href="#xmlBufShrink">xmlBufShrink</a>			(<a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf, <br/>					 size_t len);
+size_t	<a href="#xmlBufUse">xmlBufUse</a>			(const <a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf);
+int	<a href="#xmlBufferAdd">xmlBufferAdd</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int len);
+int	<a href="#xmlBufferAddHead">xmlBufferAddHead</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int len);
+int	<a href="#xmlBufferCCat">xmlBufferCCat</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const char * str);
+int	<a href="#xmlBufferCat">xmlBufferCat</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBufferContent">xmlBufferContent</a>	(const <a href="libxml2-tree.html#xmlBuffer">xmlBuffer</a> * buf);
 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a>	<a href="#xmlBufferCreate">xmlBufferCreate</a>		(void);
@@ -122,14 +126,17 @@
 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a>	<a href="#xmlBufferCreate">xmlBufferCreate</a>		(void);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocFragment">xmlNewDocFragment</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlDocGetRootElement">xmlDocGetRootElement</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlGetProp">xmlGetProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlValidateName">xmlValidateName</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int space);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBufEnd">xmlBufEnd</a>		(<a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf);
-int	<a href="#xmlValidateQName">xmlValidateQName</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int space);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlHasNsProp">xmlHasNsProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nameSpace);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddPrevSibling">xmlAddPrevSibling</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
-int	<a href="#xmlBufferAddHead">xmlBufferAddHead</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int len);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewPI">xmlNewPI</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-void	<a href="#xmlDocDumpFormatMemoryEnc">xmlDocDumpFormatMemoryEnc</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> out_doc, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** doc_txt_ptr, <br/>					 int * doc_txt_len, <br/>					 const char * txt_encoding, <br/>					 int format);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlSetProp">xmlSetProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a>	<a href="#xmlBufferCreateSize">xmlBufferCreateSize</a>	(size_t size);
+<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a>	<a href="#xmlBufferCreateStatic">xmlBufferCreateStatic</a>	(void * mem, <br/>					 size_t size);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBufferDetach">xmlBufferDetach</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf);
+int	<a href="#xmlBufferDump">xmlBufferDump</a>			(FILE * file, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf);
+void	<a href="#xmlBufferEmpty">xmlBufferEmpty</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf);
+void	<a href="#xmlBufferFree">xmlBufferFree</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf);
+int	<a href="#xmlBufferGrow">xmlBufferGrow</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 unsigned int len);
+int	<a href="#xmlBufferLength">xmlBufferLength</a>			(const <a href="libxml2-tree.html#xmlBuffer">xmlBuffer</a> * buf);
+int	<a href="#xmlBufferResize">xmlBufferResize</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 unsigned int size);
+void	<a href="#xmlBufferSetAllocationScheme">xmlBufferSetAllocationScheme</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a> scheme);
+int	<a href="#xmlBufferShrink">xmlBufferShrink</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 unsigned int len);
+void	<a href="#xmlBufferWriteCHAR">xmlBufferWriteCHAR</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string);
+void	<a href="#xmlBufferWriteChar">xmlBufferWriteChar</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const char * string);
+void	<a href="#xmlBufferWriteQuotedString">xmlBufferWriteQuotedString</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBuildQName">xmlBuildQName</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ncname, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * memory, <br/>					 int len);
 unsigned long	<a href="#xmlChildElementCount">xmlChildElementCount</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent);
@@ -135,9 +142,13 @@
 unsigned long	<a href="#xmlChildElementCount">xmlChildElementCount</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent);
-void	<a href="#xmlElemDump">xmlElemDump</a>			(FILE * f, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-int	<a href="#xmlSaveFormatFileTo">xmlSaveFormatFileTo</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
-<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlGetIntSubset">xmlGetIntSubset</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc);
-int	<a href="#xmlNodeBufGetContent">xmlNodeBufGetContent</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buffer, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNextElementSibling">xmlNextElementSibling</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-void	<a href="#xmlBufferWriteChar">xmlBufferWriteChar</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const char * string);
-void	<a href="#xmlBufferFree">xmlBufferFree</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCopyDoc">xmlCopyDoc</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int recursive);
+<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlCopyDtd">xmlCopyDtd</a>		(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd);
+<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlCopyNamespace">xmlCopyNamespace</a>	(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> cur);
+<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlCopyNamespaceList">xmlCopyNamespaceList</a>	(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlCopyNode">xmlCopyNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int extended);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlCopyNodeList">xmlCopyNodeList</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlCopyProp">xmlCopyProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> target, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlCopyPropList">xmlCopyPropList</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> target, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
+<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlCreateIntSubset">xmlCreateIntSubset</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
+typedef <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> <a href="#xmlDOMWrapAcquireNsFunction">xmlDOMWrapAcquireNsFunction</a>	(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nsName, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nsPrefix);
+int	<a href="#xmlDOMWrapAdoptNode">xmlDOMWrapAdoptNode</a>		(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> sourceDoc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> destDoc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> destParent, <br/>					 int options);
 int	<a href="#xmlDOMWrapCloneNode">xmlDOMWrapCloneNode</a>		(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> sourceDoc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * resNode, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> destDoc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> destParent, <br/>					 int deep, <br/>					 int options);
@@ -143,29 +154,17 @@
 int	<a href="#xmlDOMWrapCloneNode">xmlDOMWrapCloneNode</a>		(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> sourceDoc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> * resNode, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> destDoc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> destParent, <br/>					 int deep, <br/>					 int options);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewNode">xmlNewNode</a>		(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlSaveFileTo">xmlSaveFileTo</a>			(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewTextLen">xmlNewTextLen</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewTextChild">xmlNewTextChild</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-void	<a href="#xmlNodeSetContent">xmlNodeSetContent</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlBufferAdd">xmlBufferAdd</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int len);
-void	<a href="#xmlNodeDumpOutput">xmlNodeDumpOutput</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 int level, <br/>					 int format, <br/>					 const char * encoding);
-<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlCopyNamespace">xmlCopyNamespace</a>	(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> cur);
-<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlSearchNsByHref">xmlSearchNsByHref</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddChild">xmlAddChild</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-int	<a href="#xmlReconciliateNs">xmlReconciliateNs</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree);
-int	<a href="#xmlValidateNCName">xmlValidateNCName</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int space);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocComment">xmlNewDocComment</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlGetCompressMode">xmlGetCompressMode</a>		(void);
-int	<a href="#xmlNodeDump">xmlNodeDump</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 int level, <br/>					 int format);
-<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a>	<a href="#xmlBufferCreateSize">xmlBufferCreateSize</a>	(size_t size);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeListGetString">xmlNodeListGetString</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * list, <br/>					 int inLine);
-void	<a href="#xmlSetCompressMode">xmlSetCompressMode</a>		(int mode);
-void	<a href="#xmlSetTreeDoc">xmlSetTreeDoc</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-int	<a href="#xmlDOMWrapAdoptNode">xmlDOMWrapAdoptNode</a>		(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> sourceDoc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> destDoc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> destParent, <br/>					 int options);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlCopyNodeList">xmlCopyNodeList</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocNodeEatName">xmlNewDocNodeEatName</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddChildList">xmlAddChildList</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlGetNodePath">xmlGetNodePath</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
-void	<a href="#xmlFreePropList">xmlFreePropList</a>			(<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
-void	<a href="#xmlNodeAddContent">xmlNodeAddContent</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlUnsetNsProp">xmlUnsetNsProp</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+void	<a href="#xmlDOMWrapFreeCtxt">xmlDOMWrapFreeCtxt</a>		(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt);
+<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a>	<a href="#xmlDOMWrapNewCtxt">xmlDOMWrapNewCtxt</a>	(void);
+int	<a href="#xmlDOMWrapReconcileNamespaces">xmlDOMWrapReconcileNamespaces</a>	(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 int options);
+int	<a href="#xmlDOMWrapRemoveNode">xmlDOMWrapRemoveNode</a>		(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int options);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlDocCopyNode">xmlDocCopyNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int extended);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlDocCopyNodeList">xmlDocCopyNodeList</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+int	<a href="#xmlDocDump">xmlDocDump</a>			(FILE * f, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
+void	<a href="#xmlDocDumpFormatMemory">xmlDocDumpFormatMemory</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** mem, <br/>					 int * size, <br/>					 int format);
+void	<a href="#xmlDocDumpFormatMemoryEnc">xmlDocDumpFormatMemoryEnc</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> out_doc, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** doc_txt_ptr, <br/>					 int * doc_txt_len, <br/>					 const char * txt_encoding, <br/>					 int format);
+void	<a href="#xmlDocDumpMemory">xmlDocDumpMemory</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** mem, <br/>					 int * size);
+void	<a href="#xmlDocDumpMemoryEnc">xmlDocDumpMemoryEnc</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> out_doc, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** doc_txt_ptr, <br/>					 int * doc_txt_len, <br/>					 const char * txt_encoding);
+int	<a href="#xmlDocFormatDump">xmlDocFormatDump</a>		(FILE * f, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 int format);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlDocGetRootElement">xmlDocGetRootElement</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlDocSetRootElement">xmlDocSetRootElement</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> root);
+void	<a href="#xmlElemDump">xmlElemDump</a>			(FILE * f, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlFirstElementChild">xmlFirstElementChild</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent);
@@ -171,14 +170,6 @@
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlFirstElementChild">xmlFirstElementChild</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlAddNextSibling">xmlAddNextSibling</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
-int	<a href="#xmlIsBlankNode">xmlIsBlankNode</a>			(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
-<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlNewGlobalNs">xmlNewGlobalNs</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
-int	<a href="#xmlBufferDump">xmlBufferDump</a>			(FILE * file, <br/>					 <a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeGetContent">xmlNodeGetContent</a>	(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlCopyDoc">xmlCopyDoc</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int recursive);
-<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a>	<a href="#xmlDOMWrapNewCtxt">xmlDOMWrapNewCtxt</a>	(void);
-void	<a href="#xmlDocDumpMemoryEnc">xmlDocDumpMemoryEnc</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> out_doc, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** doc_txt_ptr, <br/>					 int * doc_txt_len, <br/>					 const char * txt_encoding);
-int	<a href="#xmlBufGetNodeContent">xmlBufGetNodeContent</a>		(<a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlTextMerge">xmlTextMerge</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> first, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> second);
-void	<a href="#xmlDocDumpMemory">xmlDocDumpMemory</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** mem, <br/>					 int * size);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocPI">xmlNewDocPI</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+void	<a href="#xmlFreeDoc">xmlFreeDoc</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
+void	<a href="#xmlFreeDtd">xmlFreeDtd</a>			(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> cur);
+void	<a href="#xmlFreeNode">xmlFreeNode</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+void	<a href="#xmlFreeNodeList">xmlFreeNodeList</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
 void	<a href="#xmlFreeNs">xmlFreeNs</a>			(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> cur);
@@ -184,3 +175,3 @@
 void	<a href="#xmlFreeNs">xmlFreeNs</a>			(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> cur);
-int	<a href="#xmlDocDump">xmlDocDump</a>			(FILE * f, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
+void	<a href="#xmlFreeNsList">xmlFreeNsList</a>			(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> cur);
 void	<a href="#xmlFreeProp">xmlFreeProp</a>			(<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
@@ -186,21 +177,8 @@
 void	<a href="#xmlFreeProp">xmlFreeProp</a>			(<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlGetNoNsProp">xmlGetNoNsProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSplitQName2">xmlSplitQName2</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** prefix);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlNewProp">xmlNewProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-int	<a href="#xmlTextConcat">xmlTextConcat</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
-int	<a href="#xmlNodeGetSpacePreserve">xmlNodeGetSpacePreserve</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
-int	<a href="#xmlBufferShrink">xmlBufferShrink</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 unsigned int len);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlPreviousElementSibling">xmlPreviousElementSibling</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-void	<a href="#xmlNodeSetContentLen">xmlNodeSetContentLen</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
-void	<a href="#xmlNodeAddContentLen">xmlNodeAddContentLen</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
-void	<a href="#xmlBufferWriteQuotedString">xmlBufferWriteQuotedString</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlCopyProp">xmlCopyProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> target, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlReplaceNode">xmlReplaceNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> old, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void	<a href="#xmlSetDocCompressMode">xmlSetDocCompressMode</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int mode);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlCopyNode">xmlCopyNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int extended);
-void	<a href="#xmlUnlinkNode">xmlUnlinkNode</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSplitQName3">xmlSplitQName3</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int * len);
-typedef <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> <a href="#xmlDOMWrapAcquireNsFunction">xmlDOMWrapAcquireNsFunction</a>	(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nsName, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nsPrefix);
-size_t	<a href="#xmlBufUse">xmlBufUse</a>			(const <a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlDocSetRootElement">xmlDocSetRootElement</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> root);
+void	<a href="#xmlFreePropList">xmlFreePropList</a>			(<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
+<a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a>	<a href="#xmlGetBufferAllocationScheme">xmlGetBufferAllocationScheme</a>	(void);
+int	<a href="#xmlGetCompressMode">xmlGetCompressMode</a>		(void);
+int	<a href="#xmlGetDocCompressMode">xmlGetDocCompressMode</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc);
+<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlGetIntSubset">xmlGetIntSubset</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlGetLastChild">xmlGetLastChild</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * parent);
 long	<a href="#xmlGetLineNo">xmlGetLineNo</a>			(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
@@ -206,8 +184,5 @@
 long	<a href="#xmlGetLineNo">xmlGetLineNo</a>			(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBufferContent">xmlBufferContent</a>	(const <a href="libxml2-tree.html#xmlBuffer">xmlBuffer</a> * buf);
-int	<a href="#xmlRemoveProp">xmlRemoveProp</a>			(<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlLastElementChild">xmlLastElementChild</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeGetLang">xmlNodeGetLang</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
-int	<a href="#xmlGetDocCompressMode">xmlGetDocCompressMode</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc);
-size_t	<a href="#xmlBufNodeDump">xmlBufNodeDump</a>			(<a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 int level, <br/>					 int format);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlGetNoNsProp">xmlGetNoNsProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlGetNodePath">xmlGetNodePath</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
+<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> *	<a href="#xmlGetNsList">xmlGetNsList</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlGetNsProp">xmlGetNsProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nameSpace);
@@ -213,15 +188,4 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlGetNsProp">xmlGetNsProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nameSpace);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlNewDocProp">xmlNewDocProp</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-void	<a href="#xmlFreeNode">xmlFreeNode</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlNewNsProp">xmlNewNsProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-void	<a href="#xmlDOMWrapFreeCtxt">xmlDOMWrapFreeCtxt</a>		(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBufferDetach">xmlBufferDetach</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf);
-void	<a href="#xmlBufferSetAllocationScheme">xmlBufferSetAllocationScheme</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a> scheme);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewChild">xmlNewChild</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlSearchNs">xmlSearchNs</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nameSpace);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlStringLenGetNodeList">xmlStringLenGetNodeList</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int len);
-int	<a href="#xmlSaveFormatFile">xmlSaveFormatFile</a>		(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 int format);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlCopyPropList">xmlCopyPropList</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> target, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
-int	<a href="#xmlDocFormatDump">xmlDocFormatDump</a>		(FILE * f, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 int format);
-void	<a href="#xmlNodeSetSpacePreserve">xmlNodeSetSpacePreserve</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 int val);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlGetProp">xmlGetProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlHasNsProp">xmlHasNsProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nameSpace);
 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlHasProp">xmlHasProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -227,5 +191,6 @@
 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlHasProp">xmlHasProp</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlBufferCat">xmlBufferCat</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
-<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlCreateIntSubset">xmlCreateIntSubset</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlNewDoc">xmlNewDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * version);
+int	<a href="#xmlIsBlankNode">xmlIsBlankNode</a>			(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
+int	<a href="#xmlIsXHTML">xmlIsXHTML</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicID);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlLastElementChild">xmlLastElementChild</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewCDataBlock">xmlNewCDataBlock</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewCharRef">xmlNewCharRef</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -231,6 +196,3 @@
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewCharRef">xmlNewCharRef</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlCopyNamespaceList">xmlCopyNamespaceList</a>	(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> cur);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewNodeEatName">xmlNewNodeEatName</a>	(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlBufferResize">xmlBufferResize</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 unsigned int size);
-void	<a href="#xmlNodeSetBase">xmlNodeSetBase</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * uri);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewChild">xmlNewChild</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewComment">xmlNewComment</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
@@ -236,13 +198,10 @@
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewComment">xmlNewComment</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlBufferLength">xmlBufferLength</a>			(const <a href="libxml2-tree.html#xmlBuffer">xmlBuffer</a> * buf);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewText">xmlNewText</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlUnsetProp">xmlUnsetProp</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-<a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a>	<a href="#xmlGetBufferAllocationScheme">xmlGetBufferAllocationScheme</a>	(void);
-int	<a href="#xmlSaveFile">xmlSaveFile</a>			(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlDocCopyNodeList">xmlDocCopyNodeList</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-void	<a href="#xmlSetNs">xmlSetNs</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns);
-<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlNewNs">xmlNewNs</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
-int	<a href="#xmlDOMWrapRemoveNode">xmlDOMWrapRemoveNode</a>		(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int options);
-void	<a href="#xmlAttrSerializeTxtContent">xmlAttrSerializeTxtContent</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * string);
-<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlCopyDtd">xmlCopyDtd</a>		(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlNewDoc">xmlNewDoc</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * version);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocComment">xmlNewDocComment</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocFragment">xmlNewDocFragment</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocNode">xmlNewDocNode</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocNodeEatName">xmlNewDocNodeEatName</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocPI">xmlNewDocPI</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlNewDocProp">xmlNewDocProp</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocRawNode">xmlNewDocRawNode</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocText">xmlNewDocText</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
@@ -248,24 +207,3 @@
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocText">xmlNewDocText</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeListGetRawString">xmlNodeListGetRawString</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * list, <br/>					 int inLine);
-<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a>	<a href="#xmlBufferCreateStatic">xmlBufferCreateStatic</a>	(void * mem, <br/>					 size_t size);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewReference">xmlNewReference</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlDOMWrapReconcileNamespaces">xmlDOMWrapReconcileNamespaces</a>	(<a href="libxml2-tree.html#xmlDOMWrapCtxtPtr">xmlDOMWrapCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 int options);
-int	<a href="#xmlBufferCCat">xmlBufferCCat</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 const char * str);
-<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> *	<a href="#xmlGetNsList">xmlGetNsList</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
-int	<a href="#xmlBufferGrow">xmlBufferGrow</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 unsigned int len);
-int	<a href="#xmlNodeIsText">xmlNodeIsText</a>			(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
-void	<a href="#xmlSetBufferAllocationScheme">xmlSetBufferAllocationScheme</a>	(<a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a> scheme);
-int	<a href="#xmlIsXHTML">xmlIsXHTML</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * systemID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * publicID);
-void	<a href="#xmlNodeSetLang">xmlNodeSetLang</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * lang);
-void	<a href="#xmlFreeDtd">xmlFreeDtd</a>			(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> cur);
-void	<a href="#xmlFreeNodeList">xmlFreeNodeList</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void	<a href="#xmlFreeDoc">xmlFreeDoc</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
-size_t	<a href="#xmlBufShrink">xmlBufShrink</a>			(<a href="libxml2-tree.html#xmlBufPtr">xmlBufPtr</a> buf, <br/>					 size_t len);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocNode">xmlNewDocNode</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlSaveFileEnc">xmlSaveFileEnc</a>			(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlSetNsProp">xmlSetNsProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-void	<a href="#xmlDocDumpFormatMemory">xmlDocDumpFormatMemory</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** mem, <br/>					 int * size, <br/>					 int format);
-void	<a href="#xmlSetListDoc">xmlSetListDoc</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> list, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-void	<a href="#xmlNodeSetName">xmlNodeSetName</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocTextLen">xmlNewDocTextLen</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlNewDtd">xmlNewDtd</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
@@ -270,7 +208,69 @@
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewDocTextLen">xmlNewDocTextLen</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a>	<a href="#xmlNewDtd">xmlNewDtd</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-void	<a href="#xmlFreeNsList">xmlFreeNsList</a>			(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> cur);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlGetLastChild">xmlGetLastChild</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * parent);
+<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlNewGlobalNs">xmlNewGlobalNs</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewNode">xmlNewNode</a>		(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewNodeEatName">xmlNewNodeEatName</a>	(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlNewNs">xmlNewNs</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlNewNsProp">xmlNewNsProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlNewNsPropEatName">xmlNewNsPropEatName</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewPI">xmlNewPI</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlNewProp">xmlNewProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewReference">xmlNewReference</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewText">xmlNewText</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewTextChild">xmlNewTextChild</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> parent, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNewTextLen">xmlNewTextLen</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlNextElementSibling">xmlNextElementSibling</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+void	<a href="#xmlNodeAddContent">xmlNodeAddContent</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+void	<a href="#xmlNodeAddContentLen">xmlNodeAddContentLen</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
+int	<a href="#xmlNodeBufGetContent">xmlNodeBufGetContent</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buffer, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
+int	<a href="#xmlNodeDump">xmlNodeDump</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 int level, <br/>					 int format);
+void	<a href="#xmlNodeDumpOutput">xmlNodeDumpOutput</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 int level, <br/>					 int format, <br/>					 const char * encoding);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeGetBase">xmlNodeGetBase</a>		(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeGetContent">xmlNodeGetContent</a>	(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeGetLang">xmlNodeGetLang</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
+int	<a href="#xmlNodeGetSpacePreserve">xmlNodeGetSpacePreserve</a>		(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * cur);
+int	<a href="#xmlNodeIsText">xmlNodeIsText</a>			(const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * node);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeListGetRawString">xmlNodeListGetRawString</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * list, <br/>					 int inLine);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNodeListGetString">xmlNodeListGetString</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-tree.html#xmlNode">xmlNode</a> * list, <br/>					 int inLine);
+void	<a href="#xmlNodeSetBase">xmlNodeSetBase</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * uri);
+void	<a href="#xmlNodeSetContent">xmlNodeSetContent</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+void	<a href="#xmlNodeSetContentLen">xmlNodeSetContentLen</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
+void	<a href="#xmlNodeSetLang">xmlNodeSetLang</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * lang);
+void	<a href="#xmlNodeSetName">xmlNodeSetName</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+void	<a href="#xmlNodeSetSpacePreserve">xmlNodeSetSpacePreserve</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur, <br/>					 int val);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlPreviousElementSibling">xmlPreviousElementSibling</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+int	<a href="#xmlReconciliateNs">xmlReconciliateNs</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree);
+int	<a href="#xmlRemoveProp">xmlRemoveProp</a>			(<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlReplaceNode">xmlReplaceNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> old, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+int	<a href="#xmlSaveFile">xmlSaveFile</a>			(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur);
+int	<a href="#xmlSaveFileEnc">xmlSaveFileEnc</a>			(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding);
+int	<a href="#xmlSaveFileTo">xmlSaveFileTo</a>			(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding);
+int	<a href="#xmlSaveFormatFile">xmlSaveFormatFile</a>		(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 int format);
+int	<a href="#xmlSaveFormatFileEnc">xmlSaveFormatFileEnc</a>		(const char * filename, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
+int	<a href="#xmlSaveFormatFileTo">xmlSaveFormatFileTo</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> cur, <br/>					 const char * encoding, <br/>					 int format);
+<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlSearchNs">xmlSearchNs</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * nameSpace);
+<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a>	<a href="#xmlSearchNsByHref">xmlSearchNsByHref</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * href);
+void	<a href="#xmlSetBufferAllocationScheme">xmlSetBufferAllocationScheme</a>	(<a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a> scheme);
+void	<a href="#xmlSetCompressMode">xmlSetCompressMode</a>		(int mode);
+void	<a href="#xmlSetDocCompressMode">xmlSetDocCompressMode</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int mode);
+void	<a href="#xmlSetListDoc">xmlSetListDoc</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> list, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+void	<a href="#xmlSetNs">xmlSetNs</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlSetNsProp">xmlSetNsProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlSetProp">xmlSetProp</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+void	<a href="#xmlSetTreeDoc">xmlSetTreeDoc</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSplitQName2">xmlSplitQName2</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** prefix);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSplitQName3">xmlSplitQName3</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int * len);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlStringGetNodeList">xmlStringGetNodeList</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlStringLenGetNodeList">xmlStringLenGetNodeList</a>	(const <a href="libxml2-tree.html#xmlDoc">xmlDoc</a> * doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int len);
+int	<a href="#xmlTextConcat">xmlTextConcat</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlTextMerge">xmlTextMerge</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> first, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> second);
+void	<a href="#xmlUnlinkNode">xmlUnlinkNode</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+int	<a href="#xmlUnsetNsProp">xmlUnsetNsProp</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlUnsetProp">xmlUnsetProp</a>			(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlValidateNCName">xmlValidateNCName</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int space);
+int	<a href="#xmlValidateNMToken">xmlValidateNMToken</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int space);
+int	<a href="#xmlValidateName">xmlValidateName</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int space);
+int	<a href="#xmlValidateQName">xmlValidateQName</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 int space);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-uri.html b/doc/devhelp/libxml2-uri.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi11cmkuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi11cmkuaHRtbA== 100644
--- a/doc/devhelp/libxml2-uri.html
+++ b/doc/devhelp/libxml2-uri.html
@@ -45,9 +45,7 @@
       <h2>Synopsis</h2>
       <pre class="synopsis">typedef struct _xmlURI <a href="#xmlURI">xmlURI</a>;
 typedef <a href="libxml2-uri.html#xmlURI">xmlURI</a> * <a href="#xmlURIPtr">xmlURIPtr</a>;
-int	<a href="#xmlNormalizeURIPath">xmlNormalizeURIPath</a>		(char * path);
-void	<a href="#xmlPrintURI">xmlPrintURI</a>			(FILE * stream, <br/>					 <a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a> uri);
-<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a>	<a href="#xmlParseURIRaw">xmlParseURIRaw</a>		(const char * str, <br/>					 int raw);
-char *	<a href="#xmlURIUnescapeString">xmlURIUnescapeString</a>		(const char * str, <br/>					 int len, <br/>					 char * target);
-<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a>	<a href="#xmlParseURI">xmlParseURI</a>		(const char * str);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBuildRelativeURI">xmlBuildRelativeURI</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * base);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBuildURI">xmlBuildURI</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * base);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCanonicPath">xmlCanonicPath</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * path);
 <a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a>	<a href="#xmlCreateURI">xmlCreateURI</a>		(void);
@@ -53,3 +51,7 @@
 <a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a>	<a href="#xmlCreateURI">xmlCreateURI</a>		(void);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlURIEscapeStr">xmlURIEscapeStr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * list);
+void	<a href="#xmlFreeURI">xmlFreeURI</a>			(<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a> uri);
+int	<a href="#xmlNormalizeURIPath">xmlNormalizeURIPath</a>		(char * path);
+<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a>	<a href="#xmlParseURI">xmlParseURI</a>		(const char * str);
+<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a>	<a href="#xmlParseURIRaw">xmlParseURIRaw</a>		(const char * str, <br/>					 int raw);
+int	<a href="#xmlParseURIReference">xmlParseURIReference</a>		(<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a> uri, <br/>					 const char * str);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlPathToURI">xmlPathToURI</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * path);
@@ -55,7 +57,4 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlPathToURI">xmlPathToURI</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * path);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCanonicPath">xmlCanonicPath</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * path);
-void	<a href="#xmlFreeURI">xmlFreeURI</a>			(<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a> uri);
-int	<a href="#xmlParseURIReference">xmlParseURIReference</a>		(<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a> uri, <br/>					 const char * str);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBuildRelativeURI">xmlBuildRelativeURI</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * base);
+void	<a href="#xmlPrintURI">xmlPrintURI</a>			(FILE * stream, <br/>					 <a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a> uri);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSaveUri">xmlSaveUri</a>		(<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a> uri);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlURIEscape">xmlURIEscape</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
@@ -60,6 +59,7 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSaveUri">xmlSaveUri</a>		(<a href="libxml2-uri.html#xmlURIPtr">xmlURIPtr</a> uri);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlURIEscape">xmlURIEscape</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlBuildURI">xmlBuildURI</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * URI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * base);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlURIEscapeStr">xmlURIEscapeStr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * list);
+char *	<a href="#xmlURIUnescapeString">xmlURIUnescapeString</a>		(const char * str, <br/>					 int len, <br/>					 char * target);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-valid.html b/doc/devhelp/libxml2-valid.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi12YWxpZC5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi12YWxpZC5odG1s 100644
--- a/doc/devhelp/libxml2-valid.html
+++ b/doc/devhelp/libxml2-valid.html
@@ -45,15 +45,5 @@
       <h2>Synopsis</h2>
       <pre class="synopsis">#define <a href="#XML_VCTXT_DTD_VALIDATED">XML_VCTXT_DTD_VALIDATED</a>;
 #define <a href="#XML_VCTXT_USE_PCTXT">XML_VCTXT_USE_PCTXT</a>;
-typedef struct _xmlHashTable <a href="#xmlElementTable">xmlElementTable</a>;
-typedef <a href="libxml2-valid.html#xmlValidState">xmlValidState</a> * <a href="#xmlValidStatePtr">xmlValidStatePtr</a>;
-typedef <a href="libxml2-valid.html#xmlIDTable">xmlIDTable</a> * <a href="#xmlIDTablePtr">xmlIDTablePtr</a>;
-typedef <a href="libxml2-valid.html#xmlNotationTable">xmlNotationTable</a> * <a href="#xmlNotationTablePtr">xmlNotationTablePtr</a>;
-typedef struct _xmlValidCtxt <a href="#xmlValidCtxt">xmlValidCtxt</a>;
-typedef <a href="libxml2-valid.html#xmlElementTable">xmlElementTable</a> * <a href="#xmlElementTablePtr">xmlElementTablePtr</a>;
-typedef <a href="libxml2-valid.html#xmlRefTable">xmlRefTable</a> * <a href="#xmlRefTablePtr">xmlRefTablePtr</a>;
-typedef struct _xmlHashTable <a href="#xmlNotationTable">xmlNotationTable</a>;
-typedef struct _xmlHashTable <a href="#xmlRefTable">xmlRefTable</a>;
-typedef struct _xmlValidState <a href="#xmlValidState">xmlValidState</a>;
 typedef struct _xmlHashTable <a href="#xmlAttributeTable">xmlAttributeTable</a>;
 typedef <a href="libxml2-valid.html#xmlAttributeTable">xmlAttributeTable</a> * <a href="#xmlAttributeTablePtr">xmlAttributeTablePtr</a>;
@@ -58,3 +48,5 @@
 typedef struct _xmlHashTable <a href="#xmlAttributeTable">xmlAttributeTable</a>;
 typedef <a href="libxml2-valid.html#xmlAttributeTable">xmlAttributeTable</a> * <a href="#xmlAttributeTablePtr">xmlAttributeTablePtr</a>;
+typedef struct _xmlHashTable <a href="#xmlElementTable">xmlElementTable</a>;
+typedef <a href="libxml2-valid.html#xmlElementTable">xmlElementTable</a> * <a href="#xmlElementTablePtr">xmlElementTablePtr</a>;
 typedef struct _xmlHashTable <a href="#xmlIDTable">xmlIDTable</a>;
@@ -60,2 +52,8 @@
 typedef struct _xmlHashTable <a href="#xmlIDTable">xmlIDTable</a>;
+typedef <a href="libxml2-valid.html#xmlIDTable">xmlIDTable</a> * <a href="#xmlIDTablePtr">xmlIDTablePtr</a>;
+typedef struct _xmlHashTable <a href="#xmlNotationTable">xmlNotationTable</a>;
+typedef <a href="libxml2-valid.html#xmlNotationTable">xmlNotationTable</a> * <a href="#xmlNotationTablePtr">xmlNotationTablePtr</a>;
+typedef struct _xmlHashTable <a href="#xmlRefTable">xmlRefTable</a>;
+typedef <a href="libxml2-valid.html#xmlRefTable">xmlRefTable</a> * <a href="#xmlRefTablePtr">xmlRefTablePtr</a>;
+typedef struct _xmlValidCtxt <a href="#xmlValidCtxt">xmlValidCtxt</a>;
 typedef <a href="libxml2-valid.html#xmlValidCtxt">xmlValidCtxt</a> * <a href="#xmlValidCtxtPtr">xmlValidCtxtPtr</a>;
@@ -61,5 +59,8 @@
 typedef <a href="libxml2-valid.html#xmlValidCtxt">xmlValidCtxt</a> * <a href="#xmlValidCtxtPtr">xmlValidCtxtPtr</a>;
-void	<a href="#xmlFreeNotationTable">xmlFreeNotationTable</a>		(<a href="libxml2-valid.html#xmlNotationTablePtr">xmlNotationTablePtr</a> table);
-int	<a href="#xmlValidateNameValue">xmlValidateNameValue</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-void	<a href="#xmlSnprintfElementContent">xmlSnprintfElementContent</a>	(char * buf, <br/>					 int size, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content, <br/>					 int englob);
+typedef struct _xmlValidState <a href="#xmlValidState">xmlValidState</a>;
+typedef <a href="libxml2-valid.html#xmlValidState">xmlValidState</a> * <a href="#xmlValidStatePtr">xmlValidStatePtr</a>;
+<a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a>	<a href="#xmlAddAttributeDecl">xmlAddAttributeDecl</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns, <br/>					 <a href="libxml2-tree.html#xmlAttributeType">xmlAttributeType</a> type, <br/>					 <a href="libxml2-tree.html#xmlAttributeDefault">xmlAttributeDefault</a> def, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * defaultValue, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> tree);
+<a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a>	<a href="#xmlAddElementDecl">xmlAddElementDecl</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-tree.html#xmlElementTypeVal">xmlElementTypeVal</a> type, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content);
+<a href="libxml2-tree.html#xmlIDPtr">xmlIDPtr</a>	<a href="#xmlAddID">xmlAddID</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
+<a href="libxml2-tree.html#xmlNotationPtr">xmlNotationPtr</a>	<a href="#xmlAddNotationDecl">xmlAddNotationDecl</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * PublicID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
 <a href="libxml2-tree.html#xmlRefPtr">xmlRefPtr</a>	<a href="#xmlAddRef">xmlAddRef</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
@@ -65,6 +66,8 @@
 <a href="libxml2-tree.html#xmlRefPtr">xmlRefPtr</a>	<a href="#xmlAddRef">xmlAddRef</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
-void	<a href="#xmlDumpAttributeDecl">xmlDumpAttributeDecl</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a> attr);
-int	<a href="#xmlValidateDocumentFinal">xmlValidateDocumentFinal</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-int	<a href="#xmlValidateDtdFinal">xmlValidateDtdFinal</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-void	<a href="#xmlDumpAttributeTable">xmlDumpAttributeTable</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-valid.html#xmlAttributeTablePtr">xmlAttributeTablePtr</a> table);
+<a href="libxml2-valid.html#xmlAttributeTablePtr">xmlAttributeTablePtr</a>	<a href="#xmlCopyAttributeTable">xmlCopyAttributeTable</a>	(<a href="libxml2-valid.html#xmlAttributeTablePtr">xmlAttributeTablePtr</a> table);
+<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlCopyDocElementContent">xmlCopyDocElementContent</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>							 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur);
+<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlCopyElementContent">xmlCopyElementContent</a>	(<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur);
+<a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a>	<a href="#xmlCopyElementTable">xmlCopyElementTable</a>	(<a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a> table);
+<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a>	<a href="#xmlCopyEnumeration">xmlCopyEnumeration</a>	(<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> cur);
+<a href="libxml2-valid.html#xmlNotationTablePtr">xmlNotationTablePtr</a>	<a href="#xmlCopyNotationTable">xmlCopyNotationTable</a>	(<a href="libxml2-valid.html#xmlNotationTablePtr">xmlNotationTablePtr</a> table);
 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a>	<a href="#xmlCreateEnumeration">xmlCreateEnumeration</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -70,25 +73,5 @@
 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a>	<a href="#xmlCreateEnumeration">xmlCreateEnumeration</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlValidateOneAttribute">xmlValidateOneAttribute</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-int	<a href="#xmlValidGetValidElements">xmlValidGetValidElements</a>	(<a href="libxml2-tree.html#xmlNode">xmlNode</a> * prev, <br/>					 <a href="libxml2-tree.html#xmlNode">xmlNode</a> * next, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** names, <br/>					 int max);
-int	<a href="#xmlIsMixedElement">xmlIsMixedElement</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#xmlDumpNotationDecl">xmlDumpNotationDecl</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlNotationPtr">xmlNotationPtr</a> nota);
-int	<a href="#xmlIsID">xmlIsID</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
-<a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a>	<a href="#xmlGetDtdQAttrDesc">xmlGetDtdQAttrDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
-<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlNewDocElementContent">xmlNewDocElementContent</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 <a href="libxml2-tree.html#xmlElementContentType">xmlElementContentType</a> type);
-void	<a href="#xmlFreeAttributeTable">xmlFreeAttributeTable</a>		(<a href="libxml2-valid.html#xmlAttributeTablePtr">xmlAttributeTablePtr</a> table);
-typedef void <a href="#xmlValidityErrorFunc">xmlValidityErrorFunc</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
-int	<a href="#xmlValidateAttributeDecl">xmlValidateAttributeDecl</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a> attr);
-<a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a>	<a href="#xmlGetDtdQElementDesc">xmlGetDtdQElementDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
-<a href="libxml2-valid.html#xmlNotationTablePtr">xmlNotationTablePtr</a>	<a href="#xmlCopyNotationTable">xmlCopyNotationTable</a>	(<a href="libxml2-valid.html#xmlNotationTablePtr">xmlNotationTablePtr</a> table);
-int	<a href="#xmlValidateDocument">xmlValidateDocument</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-int	<a href="#xmlValidGetPotentialChildren">xmlValidGetPotentialChildren</a>	(<a href="libxml2-tree.html#xmlElementContent">xmlElementContent</a> * ctree, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** names, <br/>					 int * len, <br/>					 int max);
-<a href="libxml2-tree.html#xmlNotationPtr">xmlNotationPtr</a>	<a href="#xmlAddNotationDecl">xmlAddNotationDecl</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * PublicID, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID);
-int	<a href="#xmlValidateElementDecl">xmlValidateElementDecl</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a> elem);
-<a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a>	<a href="#xmlAddAttributeDecl">xmlAddAttributeDecl</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns, <br/>					 <a href="libxml2-tree.html#xmlAttributeType">xmlAttributeType</a> type, <br/>					 <a href="libxml2-tree.html#xmlAttributeDefault">xmlAttributeDefault</a> def, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * defaultValue, <br/>					 <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> tree);
-<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlGetID">xmlGetID</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID);
-<a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a>	<a href="#xmlCopyElementTable">xmlCopyElementTable</a>	(<a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a> table);
-<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a>	<a href="#xmlGetRefs">xmlGetRefs</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID);
-void	<a href="#xmlSprintfElementContent">xmlSprintfElementContent</a>	(char * buf, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content, <br/>					 int englob);
-int	<a href="#xmlValidateOneElement">xmlValidateOneElement</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
-int	<a href="#xmlValidateNmtokenValue">xmlValidateNmtokenValue</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+void	<a href="#xmlDumpAttributeDecl">xmlDumpAttributeDecl</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a> attr);
+void	<a href="#xmlDumpAttributeTable">xmlDumpAttributeTable</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-valid.html#xmlAttributeTablePtr">xmlAttributeTablePtr</a> table);
+void	<a href="#xmlDumpElementDecl">xmlDumpElementDecl</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a> elem);
 void	<a href="#xmlDumpElementTable">xmlDumpElementTable</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a> table);
@@ -94,4 +77,6 @@
 void	<a href="#xmlDumpElementTable">xmlDumpElementTable</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a> table);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlValidCtxtNormalizeAttributeValue">xmlValidCtxtNormalizeAttributeValue</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>							 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>							 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-void	<a href="#xmlDumpElementDecl">xmlDumpElementDecl</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a> elem);
+void	<a href="#xmlDumpNotationDecl">xmlDumpNotationDecl</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-tree.html#xmlNotationPtr">xmlNotationPtr</a> nota);
+void	<a href="#xmlDumpNotationTable">xmlDumpNotationTable</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-valid.html#xmlNotationTablePtr">xmlNotationTablePtr</a> table);
+void	<a href="#xmlFreeAttributeTable">xmlFreeAttributeTable</a>		(<a href="libxml2-valid.html#xmlAttributeTablePtr">xmlAttributeTablePtr</a> table);
+void	<a href="#xmlFreeDocElementContent">xmlFreeDocElementContent</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur);
 void	<a href="#xmlFreeElementContent">xmlFreeElementContent</a>		(<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur);
@@ -97,7 +82,6 @@
 void	<a href="#xmlFreeElementContent">xmlFreeElementContent</a>		(<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur);
-int	<a href="#xmlValidateOneNamespace">xmlValidateOneNamespace</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-int	<a href="#xmlValidatePushElement">xmlValidatePushElement</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * qname);
-int	<a href="#xmlIsRef">xmlIsRef</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
-<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlCopyDocElementContent">xmlCopyDocElementContent</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>							 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur);
-<a href="libxml2-tree.html#xmlIDPtr">xmlIDPtr</a>	<a href="#xmlAddID">xmlAddID</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
+void	<a href="#xmlFreeElementTable">xmlFreeElementTable</a>		(<a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a> table);
+void	<a href="#xmlFreeEnumeration">xmlFreeEnumeration</a>		(<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> cur);
+void	<a href="#xmlFreeIDTable">xmlFreeIDTable</a>			(<a href="libxml2-valid.html#xmlIDTablePtr">xmlIDTablePtr</a> table);
+void	<a href="#xmlFreeNotationTable">xmlFreeNotationTable</a>		(<a href="libxml2-valid.html#xmlNotationTablePtr">xmlNotationTablePtr</a> table);
 void	<a href="#xmlFreeRefTable">xmlFreeRefTable</a>			(<a href="libxml2-valid.html#xmlRefTablePtr">xmlRefTablePtr</a> table);
@@ -103,6 +87,2 @@
 void	<a href="#xmlFreeRefTable">xmlFreeRefTable</a>			(<a href="libxml2-valid.html#xmlRefTablePtr">xmlRefTablePtr</a> table);
-int	<a href="#xmlValidateNamesValue">xmlValidateNamesValue</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-int	<a href="#xmlRemoveID">xmlRemoveID</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
-void	<a href="#xmlFreeElementTable">xmlFreeElementTable</a>		(<a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a> table);
-void	<a href="#xmlFreeIDTable">xmlFreeIDTable</a>			(<a href="libxml2-valid.html#xmlIDTablePtr">xmlIDTablePtr</a> table);
 void	<a href="#xmlFreeValidCtxt">xmlFreeValidCtxt</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> cur);
@@ -108,10 +88,2 @@
 void	<a href="#xmlFreeValidCtxt">xmlFreeValidCtxt</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> cur);
-<a href="libxml2-valid.html#xmlAttributeTablePtr">xmlAttributeTablePtr</a>	<a href="#xmlCopyAttributeTable">xmlCopyAttributeTable</a>	(<a href="libxml2-valid.html#xmlAttributeTablePtr">xmlAttributeTablePtr</a> table);
-<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlCopyElementContent">xmlCopyElementContent</a>	(<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur);
-int	<a href="#xmlValidateAttributeValue">xmlValidateAttributeValue</a>	(<a href="libxml2-tree.html#xmlAttributeType">xmlAttributeType</a> type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-int	<a href="#xmlRemoveRef">xmlRemoveRef</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
-typedef void <a href="#xmlValidityWarningFunc">xmlValidityWarningFunc</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
-int	<a href="#xmlValidatePopElement">xmlValidatePopElement</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * qname);
-void	<a href="#xmlFreeEnumeration">xmlFreeEnumeration</a>		(<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> cur);
-<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a>	<a href="#xmlCopyEnumeration">xmlCopyEnumeration</a>	(<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> cur);
 <a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a>	<a href="#xmlGetDtdAttrDesc">xmlGetDtdAttrDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -117,14 +89,3 @@
 <a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a>	<a href="#xmlGetDtdAttrDesc">xmlGetDtdAttrDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlValidateDtd">xmlValidateDtd</a>			(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd);
-<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a>	<a href="#xmlNewValidCtxt">xmlNewValidCtxt</a>		(void);
-void	<a href="#xmlDumpNotationTable">xmlDumpNotationTable</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-valid.html#xmlNotationTablePtr">xmlNotationTablePtr</a> table);
-<a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a>	<a href="#xmlAddElementDecl">xmlAddElementDecl</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-tree.html#xmlElementTypeVal">xmlElementTypeVal</a> type, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlValidNormalizeAttributeValue">xmlValidNormalizeAttributeValue</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-int	<a href="#xmlValidBuildContentModel">xmlValidBuildContentModel</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a> elem);
-int	<a href="#xmlValidateElement">xmlValidateElement</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
-int	<a href="#xmlValidateNotationUse">xmlValidateNotationUse</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * notationName);
-int	<a href="#xmlValidateRoot">xmlValidateRoot</a>			(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-int	<a href="#xmlValidateNotationDecl">xmlValidateNotationDecl</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNotationPtr">xmlNotationPtr</a> nota);
-<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlNewElementContent">xmlNewElementContent</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 <a href="libxml2-tree.html#xmlElementContentType">xmlElementContentType</a> type);
 <a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a>	<a href="#xmlGetDtdElementDesc">xmlGetDtdElementDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 <a href="libxml2-tree.html#xmlNotationPtr">xmlNotationPtr</a>	<a href="#xmlGetDtdNotationDesc">xmlGetDtdNotationDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -129,4 +90,33 @@
 <a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a>	<a href="#xmlGetDtdElementDesc">xmlGetDtdElementDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 <a href="libxml2-tree.html#xmlNotationPtr">xmlNotationPtr</a>	<a href="#xmlGetDtdNotationDesc">xmlGetDtdNotationDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlValidatePushCData">xmlValidatePushCData</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data, <br/>					 int len);
+<a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a>	<a href="#xmlGetDtdQAttrDesc">xmlGetDtdQAttrDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
+<a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a>	<a href="#xmlGetDtdQElementDesc">xmlGetDtdQElementDesc</a>	(<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
+<a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a>	<a href="#xmlGetID">xmlGetID</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID);
+<a href="libxml2-list.html#xmlListPtr">xmlListPtr</a>	<a href="#xmlGetRefs">xmlGetRefs</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ID);
+int	<a href="#xmlIsID">xmlIsID</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
+int	<a href="#xmlIsMixedElement">xmlIsMixedElement</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlIsRef">xmlIsRef</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
+<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlNewDocElementContent">xmlNewDocElementContent</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 <a href="libxml2-tree.html#xmlElementContentType">xmlElementContentType</a> type);
+<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a>	<a href="#xmlNewElementContent">xmlNewElementContent</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 <a href="libxml2-tree.html#xmlElementContentType">xmlElementContentType</a> type);
+<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a>	<a href="#xmlNewValidCtxt">xmlNewValidCtxt</a>		(void);
+int	<a href="#xmlRemoveID">xmlRemoveID</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
+int	<a href="#xmlRemoveRef">xmlRemoveRef</a>			(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
+void	<a href="#xmlSnprintfElementContent">xmlSnprintfElementContent</a>	(char * buf, <br/>					 int size, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content, <br/>					 int englob);
+void	<a href="#xmlSprintfElementContent">xmlSprintfElementContent</a>	(char * buf, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> content, <br/>					 int englob);
+int	<a href="#xmlValidBuildContentModel">xmlValidBuildContentModel</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a> elem);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlValidCtxtNormalizeAttributeValue">xmlValidCtxtNormalizeAttributeValue</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>							 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>							 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlValidGetPotentialChildren">xmlValidGetPotentialChildren</a>	(<a href="libxml2-tree.html#xmlElementContent">xmlElementContent</a> * ctree, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** names, <br/>					 int * len, <br/>					 int max);
+int	<a href="#xmlValidGetValidElements">xmlValidGetValidElements</a>	(<a href="libxml2-tree.html#xmlNode">xmlNode</a> * prev, <br/>					 <a href="libxml2-tree.html#xmlNode">xmlNode</a> * next, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** names, <br/>					 int max);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlValidNormalizeAttributeValue">xmlValidNormalizeAttributeValue</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlValidateAttributeDecl">xmlValidateAttributeDecl</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a> attr);
+int	<a href="#xmlValidateAttributeValue">xmlValidateAttributeValue</a>	(<a href="libxml2-tree.html#xmlAttributeType">xmlAttributeType</a> type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlValidateDocument">xmlValidateDocument</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+int	<a href="#xmlValidateDocumentFinal">xmlValidateDocumentFinal</a>	(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+int	<a href="#xmlValidateDtd">xmlValidateDtd</a>			(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd);
+int	<a href="#xmlValidateDtdFinal">xmlValidateDtdFinal</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+int	<a href="#xmlValidateElement">xmlValidateElement</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
+int	<a href="#xmlValidateElementDecl">xmlValidateElementDecl</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlElementPtr">xmlElementPtr</a> elem);
+int	<a href="#xmlValidateNameValue">xmlValidateNameValue</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlValidateNamesValue">xmlValidateNamesValue</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlValidateNmtokenValue">xmlValidateNmtokenValue</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
 int	<a href="#xmlValidateNmtokensValue">xmlValidateNmtokensValue</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
@@ -132,5 +122,15 @@
 int	<a href="#xmlValidateNmtokensValue">xmlValidateNmtokensValue</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-void	<a href="#xmlFreeDocElementContent">xmlFreeDocElementContent</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur);
+int	<a href="#xmlValidateNotationDecl">xmlValidateNotationDecl</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNotationPtr">xmlNotationPtr</a> nota);
+int	<a href="#xmlValidateNotationUse">xmlValidateNotationUse</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * notationName);
+int	<a href="#xmlValidateOneAttribute">xmlValidateOneAttribute</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlValidateOneElement">xmlValidateOneElement</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
+int	<a href="#xmlValidateOneNamespace">xmlValidateOneNamespace</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlValidatePopElement">xmlValidatePopElement</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * qname);
+int	<a href="#xmlValidatePushCData">xmlValidatePushCData</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * data, <br/>					 int len);
+int	<a href="#xmlValidatePushElement">xmlValidatePushElement</a>		(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * qname);
+int	<a href="#xmlValidateRoot">xmlValidateRoot</a>			(<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+typedef void <a href="#xmlValidityErrorFunc">xmlValidityErrorFunc</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+typedef void <a href="#xmlValidityWarningFunc">xmlValidityWarningFunc</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xinclude.html b/doc/devhelp/libxml2-xinclude.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14aW5jbHVkZS5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14aW5jbHVkZS5odG1s 100644
--- a/doc/devhelp/libxml2-xinclude.html
+++ b/doc/devhelp/libxml2-xinclude.html
@@ -43,6 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#XINCLUDE_PARSE_TEXT">XINCLUDE_PARSE_TEXT</a>;
-#define <a href="#XINCLUDE_PARSE_XPOINTER">XINCLUDE_PARSE_XPOINTER</a>;
+      <pre class="synopsis">#define <a href="#XINCLUDE_FALLBACK">XINCLUDE_FALLBACK</a>;
 #define <a href="#XINCLUDE_HREF">XINCLUDE_HREF</a>;
@@ -48,3 +47,3 @@
 #define <a href="#XINCLUDE_HREF">XINCLUDE_HREF</a>;
-#define <a href="#XINCLUDE_FALLBACK">XINCLUDE_FALLBACK</a>;
+#define <a href="#XINCLUDE_NODE">XINCLUDE_NODE</a>;
 #define <a href="#XINCLUDE_NS">XINCLUDE_NS</a>;
@@ -50,2 +49,3 @@
 #define <a href="#XINCLUDE_NS">XINCLUDE_NS</a>;
+#define <a href="#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a>;
 #define <a href="#XINCLUDE_PARSE">XINCLUDE_PARSE</a>;
@@ -51,3 +51,4 @@
 #define <a href="#XINCLUDE_PARSE">XINCLUDE_PARSE</a>;
-#define <a href="#XINCLUDE_NODE">XINCLUDE_NODE</a>;
+#define <a href="#XINCLUDE_PARSE_ENCODING">XINCLUDE_PARSE_ENCODING</a>;
+#define <a href="#XINCLUDE_PARSE_TEXT">XINCLUDE_PARSE_TEXT</a>;
 #define <a href="#XINCLUDE_PARSE_XML">XINCLUDE_PARSE_XML</a>;
@@ -53,5 +54,4 @@
 #define <a href="#XINCLUDE_PARSE_XML">XINCLUDE_PARSE_XML</a>;
-#define <a href="#XINCLUDE_PARSE_ENCODING">XINCLUDE_PARSE_ENCODING</a>;
-#define <a href="#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a>;
+#define <a href="#XINCLUDE_PARSE_XPOINTER">XINCLUDE_PARSE_XPOINTER</a>;
 typedef struct _xmlXIncludeCtxt <a href="#xmlXIncludeCtxt">xmlXIncludeCtxt</a>;
 typedef <a href="libxml2-xinclude.html#xmlXIncludeCtxt">xmlXIncludeCtxt</a> * <a href="#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a>;
@@ -56,4 +56,7 @@
 typedef struct _xmlXIncludeCtxt <a href="#xmlXIncludeCtxt">xmlXIncludeCtxt</a>;
 typedef <a href="libxml2-xinclude.html#xmlXIncludeCtxt">xmlXIncludeCtxt</a> * <a href="#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a>;
-int	<a href="#xmlXIncludeProcessTreeFlagsData">xmlXIncludeProcessTreeFlagsData</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br/>					 int flags, <br/>					 void * data);
+void	<a href="#xmlXIncludeFreeContext">xmlXIncludeFreeContext</a>		(<a href="libxml2-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt);
+<a href="libxml2-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a>	<a href="#xmlXIncludeNewContext">xmlXIncludeNewContext</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+int	<a href="#xmlXIncludeProcess">xmlXIncludeProcess</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+int	<a href="#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int flags);
 int	<a href="#xmlXIncludeProcessFlagsData">xmlXIncludeProcessFlagsData</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int flags, <br/>					 void * data);
@@ -59,4 +62,2 @@
 int	<a href="#xmlXIncludeProcessFlagsData">xmlXIncludeProcessFlagsData</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int flags, <br/>					 void * data);
-int	<a href="#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 int flags);
-int	<a href="#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree);
 int	<a href="#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a>		(<a href="libxml2-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
@@ -62,3 +63,5 @@
 int	<a href="#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a>		(<a href="libxml2-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-void	<a href="#xmlXIncludeFreeContext">xmlXIncludeFreeContext</a>		(<a href="libxml2-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt);
+int	<a href="#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree);
+int	<a href="#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br/>					 int flags);
+int	<a href="#xmlXIncludeProcessTreeFlagsData">xmlXIncludeProcessTreeFlagsData</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br/>					 int flags, <br/>					 void * data);
 int	<a href="#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a>		(<a href="libxml2-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt, <br/>					 int flags);
@@ -64,7 +67,4 @@
 int	<a href="#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a>		(<a href="libxml2-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt, <br/>					 int flags);
-int	<a href="#xmlXIncludeProcess">xmlXIncludeProcess</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-<a href="libxml2-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a>	<a href="#xmlXIncludeNewContext">xmlXIncludeNewContext</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-int	<a href="#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br/>					 int flags);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xlink.html b/doc/devhelp/libxml2-xlink.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bGluay5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bGluay5odG1s 100644
--- a/doc/devhelp/libxml2-xlink.html
+++ b/doc/devhelp/libxml2-xlink.html
@@ -43,6 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xlinkTitle">xlinkTitle</a>;
-typedef enum <a href="#xlinkShow">xlinkShow</a>;
+      <pre class="synopsis">typedef enum <a href="#xlinkActuate">xlinkActuate</a>;
 typedef <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xlinkHRef">xlinkHRef</a>;
@@ -48,3 +47,2 @@
 typedef <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xlinkHRef">xlinkHRef</a>;
-typedef enum <a href="#xlinkActuate">xlinkActuate</a>;
 typedef struct _xlinkHandler <a href="#xlinkHandler">xlinkHandler</a>;
@@ -50,2 +48,3 @@
 typedef struct _xlinkHandler <a href="#xlinkHandler">xlinkHandler</a>;
+typedef <a href="libxml2-xlink.html#xlinkHandler">xlinkHandler</a> * <a href="#xlinkHandlerPtr">xlinkHandlerPtr</a>;
 typedef <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xlinkRole">xlinkRole</a>;
@@ -51,3 +50,4 @@
 typedef <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xlinkRole">xlinkRole</a>;
-typedef <a href="libxml2-xlink.html#xlinkHandler">xlinkHandler</a> * <a href="#xlinkHandlerPtr">xlinkHandlerPtr</a>;
+typedef enum <a href="#xlinkShow">xlinkShow</a>;
+typedef <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xlinkTitle">xlinkTitle</a>;
 typedef enum <a href="#xlinkType">xlinkType</a>;
@@ -53,3 +53,9 @@
 typedef enum <a href="#xlinkType">xlinkType</a>;
+typedef void <a href="#xlinkExtendedLinkFunk">xlinkExtendedLinkFunk</a>		(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int nbLocators, <br/>					 const <a href="libxml2-xlink.html#xlinkHRef">xlinkHRef</a> * hrefs, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> * roles, <br/>					 int nbArcs, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> * from, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> * to, <br/>					 <a href="libxml2-xlink.html#xlinkShow">xlinkShow</a> * show, <br/>					 <a href="libxml2-xlink.html#xlinkActuate">xlinkActuate</a> * actuate, <br/>					 int nbTitles, <br/>					 const <a href="libxml2-xlink.html#xlinkTitle">xlinkTitle</a> * titles, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** langs);
+typedef void <a href="#xlinkExtendedLinkSetFunk">xlinkExtendedLinkSetFunk</a>	(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int nbLocators, <br/>					 const <a href="libxml2-xlink.html#xlinkHRef">xlinkHRef</a> * hrefs, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> * roles, <br/>					 int nbTitles, <br/>					 const <a href="libxml2-xlink.html#xlinkTitle">xlinkTitle</a> * titles, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** langs);
+<a href="libxml2-xlink.html#xlinkNodeDetectFunc">xlinkNodeDetectFunc</a>	<a href="#xlinkGetDefaultDetect">xlinkGetDefaultDetect</a>	(void);
+<a href="libxml2-xlink.html#xlinkHandlerPtr">xlinkHandlerPtr</a>	<a href="#xlinkGetDefaultHandler">xlinkGetDefaultHandler</a>	(void);
+<a href="libxml2-xlink.html#xlinkType">xlinkType</a>	<a href="#xlinkIsLink">xlinkIsLink</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+typedef void <a href="#xlinkNodeDetectFunc">xlinkNodeDetectFunc</a>		(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
 void	<a href="#xlinkSetDefaultDetect">xlinkSetDefaultDetect</a>		(<a href="libxml2-xlink.html#xlinkNodeDetectFunc">xlinkNodeDetectFunc</a> func);
 void	<a href="#xlinkSetDefaultHandler">xlinkSetDefaultHandler</a>		(<a href="libxml2-xlink.html#xlinkHandlerPtr">xlinkHandlerPtr</a> handler);
@@ -54,5 +60,3 @@
 void	<a href="#xlinkSetDefaultDetect">xlinkSetDefaultDetect</a>		(<a href="libxml2-xlink.html#xlinkNodeDetectFunc">xlinkNodeDetectFunc</a> func);
 void	<a href="#xlinkSetDefaultHandler">xlinkSetDefaultHandler</a>		(<a href="libxml2-xlink.html#xlinkHandlerPtr">xlinkHandlerPtr</a> handler);
-typedef void <a href="#xlinkExtendedLinkFunk">xlinkExtendedLinkFunk</a>		(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int nbLocators, <br/>					 const <a href="libxml2-xlink.html#xlinkHRef">xlinkHRef</a> * hrefs, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> * roles, <br/>					 int nbArcs, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> * from, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> * to, <br/>					 <a href="libxml2-xlink.html#xlinkShow">xlinkShow</a> * show, <br/>					 <a href="libxml2-xlink.html#xlinkActuate">xlinkActuate</a> * actuate, <br/>					 int nbTitles, <br/>					 const <a href="libxml2-xlink.html#xlinkTitle">xlinkTitle</a> * titles, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** langs);
-typedef void <a href="#xlinkExtendedLinkSetFunk">xlinkExtendedLinkSetFunk</a>	(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 int nbLocators, <br/>					 const <a href="libxml2-xlink.html#xlinkHRef">xlinkHRef</a> * hrefs, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> * roles, <br/>					 int nbTitles, <br/>					 const <a href="libxml2-xlink.html#xlinkTitle">xlinkTitle</a> * titles, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** langs);
 typedef void <a href="#xlinkSimpleLinkFunk">xlinkSimpleLinkFunk</a>		(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xlink.html#xlinkHRef">xlinkHRef</a> href, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> role, <br/>					 const <a href="libxml2-xlink.html#xlinkTitle">xlinkTitle</a> title);
@@ -58,8 +62,4 @@
 typedef void <a href="#xlinkSimpleLinkFunk">xlinkSimpleLinkFunk</a>		(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 const <a href="libxml2-xlink.html#xlinkHRef">xlinkHRef</a> href, <br/>					 const <a href="libxml2-xlink.html#xlinkRole">xlinkRole</a> role, <br/>					 const <a href="libxml2-xlink.html#xlinkTitle">xlinkTitle</a> title);
-typedef void <a href="#xlinkNodeDetectFunc">xlinkNodeDetectFunc</a>		(void * ctx, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-<a href="libxml2-xlink.html#xlinkHandlerPtr">xlinkHandlerPtr</a>	<a href="#xlinkGetDefaultHandler">xlinkGetDefaultHandler</a>	(void);
-<a href="libxml2-xlink.html#xlinkType">xlinkType</a>	<a href="#xlinkIsLink">xlinkIsLink</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-<a href="libxml2-xlink.html#xlinkNodeDetectFunc">xlinkNodeDetectFunc</a>	<a href="#xlinkGetDefaultDetect">xlinkGetDefaultDetect</a>	(void);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlIO.html b/doc/devhelp/libxml2-xmlIO.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxJTy5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxJTy5odG1s 100644
--- a/doc/devhelp/libxml2-xmlIO.html
+++ b/doc/devhelp/libxml2-xmlIO.html
@@ -43,17 +43,6 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">int	<a href="#xmlIOHTTPRead">xmlIOHTTPRead</a>			(void * context, <br/>					 char * buffer, <br/>					 int len);
-typedef int <a href="#xmlInputMatchCallback">xmlInputMatchCallback</a>		(char const * filename);
-void	<a href="#xmlRegisterDefaultOutputCallbacks">xmlRegisterDefaultOutputCallbacks</a>	(void);
-int	<a href="#xmlFileClose">xmlFileClose</a>			(void * context);
-int	<a href="#xmlPopOutputCallbacks">xmlPopOutputCallbacks</a>		(void);
-typedef int <a href="#xmlOutputMatchCallback">xmlOutputMatchCallback</a>		(char const * filename);
-int	<a href="#xmlParserInputBufferPush">xmlParserInputBufferPush</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> in, <br/>					 int len, <br/>					 const char * buf);
-int	<a href="#xmlIOFTPRead">xmlIOFTPRead</a>			(void * context, <br/>					 char * buffer, <br/>					 int len);
-void	<a href="#xmlRegisterHTTPPostCallbacks">xmlRegisterHTTPPostCallbacks</a>	(void);
-void *	<a href="#xmlIOFTPOpen">xmlIOFTPOpen</a>			(const char * filename);
-int	<a href="#xmlIOFTPClose">xmlIOFTPClose</a>			(void * context);
-void *	<a href="#xmlFileOpen">xmlFileOpen</a>			(const char * filename);
-<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateFile">xmlOutputBufferCreateFile</a>	(FILE * file, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
+      <pre class="synopsis"><a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlAllocOutputBuffer">xmlAllocOutputBuffer</a>	(<a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
+<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlAllocParserInputBuffer">xmlAllocParserInputBuffer</a>	(<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
 int	<a href="#xmlCheckFilename">xmlCheckFilename</a>		(const char * path);
@@ -59,9 +48,2 @@
 int	<a href="#xmlCheckFilename">xmlCheckFilename</a>		(const char * path);
-typedef void * <a href="#xmlOutputOpenCallback">xmlOutputOpenCallback</a>		(char const * filename);
-<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateFilename">xmlParserInputBufferCreateFilename</a>	(const char * URI, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-int	<a href="#xmlOutputBufferClose">xmlOutputBufferClose</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
-<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlAllocParserInputBuffer">xmlAllocParserInputBuffer</a>	(<a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateIO">xmlOutputBufferCreateIO</a>	(<a href="libxml2-xmlIO.html#xmlOutputWriteCallback">xmlOutputWriteCallback</a> iowrite, <br/>						 <a href="libxml2-xmlIO.html#xmlOutputCloseCallback">xmlOutputCloseCallback</a> ioclose, <br/>						 void * ioctx, <br/>						 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
-typedef int <a href="#xmlOutputWriteCallback">xmlOutputWriteCallback</a>		(void * context, <br/>					 const char * buffer, <br/>					 int len);
-int	<a href="#xmlOutputBufferFlush">xmlOutputBufferFlush</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlCheckHTTPInput">xmlCheckHTTPInput</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> ret);
@@ -67,6 +49,8 @@
 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlCheckHTTPInput">xmlCheckHTTPInput</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> ret);
-int	<a href="#xmlRegisterOutputCallbacks">xmlRegisterOutputCallbacks</a>	(<a href="libxml2-xmlIO.html#xmlOutputMatchCallback">xmlOutputMatchCallback</a> matchFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlOutputOpenCallback">xmlOutputOpenCallback</a> openFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlOutputWriteCallback">xmlOutputWriteCallback</a> writeFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlOutputCloseCallback">xmlOutputCloseCallback</a> closeFunc);
-<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateMem">xmlParserInputBufferCreateMem</a>	(const char * mem, <br/>							 int size, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-int	<a href="#xmlIOFTPMatch">xmlIOFTPMatch</a>			(const char * filename);
-int	<a href="#xmlRegisterInputCallbacks">xmlRegisterInputCallbacks</a>	(<a href="libxml2-xmlIO.html#xmlInputMatchCallback">xmlInputMatchCallback</a> matchFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlInputOpenCallback">xmlInputOpenCallback</a> openFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> readFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> closeFunc);
+void	<a href="#xmlCleanupInputCallbacks">xmlCleanupInputCallbacks</a>	(void);
+void	<a href="#xmlCleanupOutputCallbacks">xmlCleanupOutputCallbacks</a>	(void);
+int	<a href="#xmlFileClose">xmlFileClose</a>			(void * context);
+int	<a href="#xmlFileMatch">xmlFileMatch</a>			(const char * filename);
+void *	<a href="#xmlFileOpen">xmlFileOpen</a>			(const char * filename);
+int	<a href="#xmlFileRead">xmlFileRead</a>			(void * context, <br/>					 char * buffer, <br/>					 int len);
 void	<a href="#xmlFreeParserInputBuffer">xmlFreeParserInputBuffer</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> in);
@@ -72,9 +56,8 @@
 void	<a href="#xmlFreeParserInputBuffer">xmlFreeParserInputBuffer</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> in);
-void	<a href="#xmlRegisterDefaultInputCallbacks">xmlRegisterDefaultInputCallbacks</a>	(void);
-int	<a href="#xmlParserInputBufferGrow">xmlParserInputBufferGrow</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> in, <br/>					 int len);
-typedef int <a href="#xmlOutputCloseCallback">xmlOutputCloseCallback</a>		(void * context);
-<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlAllocOutputBuffer">xmlAllocOutputBuffer</a>	(<a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
-<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNoNetExternalEntityLoader">xmlNoNetExternalEntityLoader</a>	(const char * URL, <br/>							 const char * ID, <br/>							 <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateBuffer">xmlOutputBufferCreateBuffer</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buffer, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
+int	<a href="#xmlIOFTPClose">xmlIOFTPClose</a>			(void * context);
+int	<a href="#xmlIOFTPMatch">xmlIOFTPMatch</a>			(const char * filename);
+void *	<a href="#xmlIOFTPOpen">xmlIOFTPOpen</a>			(const char * filename);
+int	<a href="#xmlIOFTPRead">xmlIOFTPRead</a>			(void * context, <br/>					 char * buffer, <br/>					 int len);
+int	<a href="#xmlIOHTTPClose">xmlIOHTTPClose</a>			(void * context);
 int	<a href="#xmlIOHTTPMatch">xmlIOHTTPMatch</a>			(const char * filename);
 void *	<a href="#xmlIOHTTPOpen">xmlIOHTTPOpen</a>			(const char * filename);
@@ -79,14 +62,7 @@
 int	<a href="#xmlIOHTTPMatch">xmlIOHTTPMatch</a>			(const char * filename);
 void *	<a href="#xmlIOHTTPOpen">xmlIOHTTPOpen</a>			(const char * filename);
-<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateIO">xmlParserInputBufferCreateIO</a>	(<a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>							 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>							 void * ioctx, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateFd">xmlOutputBufferCreateFd</a>	(int fd, <br/>						 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNormalizeWindowsPath">xmlNormalizeWindowsPath</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * path);
-typedef int <a href="#xmlInputReadCallback">xmlInputReadCallback</a>		(void * context, <br/>					 char * buffer, <br/>					 int len);
-<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateStatic">xmlParserInputBufferCreateStatic</a>	(const char * mem, <br/>							 int size, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlOutputBufferGetContent">xmlOutputBufferGetContent</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
-int	<a href="#xmlIOHTTPClose">xmlIOHTTPClose</a>			(void * context);
-int	<a href="#xmlOutputBufferWriteEscape">xmlOutputBufferWriteEscape</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a> escaping);
-<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateFilename">xmlOutputBufferCreateFilename</a>	(const char * URI, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder, <br/>							 int compression);
-size_t	<a href="#xmlOutputBufferGetSize">xmlOutputBufferGetSize</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
-void	<a href="#xmlCleanupOutputCallbacks">xmlCleanupOutputCallbacks</a>	(void);
+void *	<a href="#xmlIOHTTPOpenW">xmlIOHTTPOpenW</a>			(const char * post_uri, <br/>					 int compression);
+int	<a href="#xmlIOHTTPRead">xmlIOHTTPRead</a>			(void * context, <br/>					 char * buffer, <br/>					 int len);
+typedef int <a href="#xmlInputCloseCallback">xmlInputCloseCallback</a>		(void * context);
+typedef int <a href="#xmlInputMatchCallback">xmlInputMatchCallback</a>		(char const * filename);
 typedef void * <a href="#xmlInputOpenCallback">xmlInputOpenCallback</a>		(char const * filename);
@@ -92,3 +68,16 @@
 typedef void * <a href="#xmlInputOpenCallback">xmlInputOpenCallback</a>		(char const * filename);
-int	<a href="#xmlParserInputBufferRead">xmlParserInputBufferRead</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> in, <br/>					 int len);
+typedef int <a href="#xmlInputReadCallback">xmlInputReadCallback</a>		(void * context, <br/>					 char * buffer, <br/>					 int len);
+<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a>	<a href="#xmlNoNetExternalEntityLoader">xmlNoNetExternalEntityLoader</a>	(const char * URL, <br/>							 const char * ID, <br/>							 <a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlNormalizeWindowsPath">xmlNormalizeWindowsPath</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * path);
+int	<a href="#xmlOutputBufferClose">xmlOutputBufferClose</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
+<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateBuffer">xmlOutputBufferCreateBuffer</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buffer, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
+<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateFd">xmlOutputBufferCreateFd</a>	(int fd, <br/>						 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
+<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateFile">xmlOutputBufferCreateFile</a>	(FILE * file, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
+<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateFilename">xmlOutputBufferCreateFilename</a>	(const char * URI, <br/>							 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder, <br/>							 int compression);
+<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a>	<a href="#xmlOutputBufferCreateIO">xmlOutputBufferCreateIO</a>	(<a href="libxml2-xmlIO.html#xmlOutputWriteCallback">xmlOutputWriteCallback</a> iowrite, <br/>						 <a href="libxml2-xmlIO.html#xmlOutputCloseCallback">xmlOutputCloseCallback</a> ioclose, <br/>						 void * ioctx, <br/>						 <a href="libxml2-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> encoder);
+int	<a href="#xmlOutputBufferFlush">xmlOutputBufferFlush</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlOutputBufferGetContent">xmlOutputBufferGetContent</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
+size_t	<a href="#xmlOutputBufferGetSize">xmlOutputBufferGetSize</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
+int	<a href="#xmlOutputBufferWrite">xmlOutputBufferWrite</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out, <br/>					 int len, <br/>					 const char * buf);
+int	<a href="#xmlOutputBufferWriteEscape">xmlOutputBufferWriteEscape</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a> escaping);
 int	<a href="#xmlOutputBufferWriteString">xmlOutputBufferWriteString</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out, <br/>					 const char * str);
@@ -94,5 +83,8 @@
 int	<a href="#xmlOutputBufferWriteString">xmlOutputBufferWriteString</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out, <br/>					 const char * str);
-int	<a href="#xmlFileMatch">xmlFileMatch</a>			(const char * filename);
-int	<a href="#xmlPopInputCallbacks">xmlPopInputCallbacks</a>		(void);
-int	<a href="#xmlFileRead">xmlFileRead</a>			(void * context, <br/>					 char * buffer, <br/>					 int len);
+typedef int <a href="#xmlOutputCloseCallback">xmlOutputCloseCallback</a>		(void * context);
+typedef int <a href="#xmlOutputMatchCallback">xmlOutputMatchCallback</a>		(char const * filename);
+typedef void * <a href="#xmlOutputOpenCallback">xmlOutputOpenCallback</a>		(char const * filename);
+typedef int <a href="#xmlOutputWriteCallback">xmlOutputWriteCallback</a>		(void * context, <br/>					 const char * buffer, <br/>					 int len);
+char *	<a href="#xmlParserGetDirectory">xmlParserGetDirectory</a>		(const char * filename);
+<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateFd">xmlParserInputBufferCreateFd</a>	(int fd, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateFile">xmlParserInputBufferCreateFile</a>	(FILE * file, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
@@ -98,10 +90,18 @@
 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateFile">xmlParserInputBufferCreateFile</a>	(FILE * file, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
-char *	<a href="#xmlParserGetDirectory">xmlParserGetDirectory</a>		(const char * filename);
-int	<a href="#xmlOutputBufferWrite">xmlOutputBufferWrite</a>		(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out, <br/>					 int len, <br/>					 const char * buf);
-void	<a href="#xmlCleanupInputCallbacks">xmlCleanupInputCallbacks</a>	(void);
-typedef int <a href="#xmlInputCloseCallback">xmlInputCloseCallback</a>		(void * context);
-void *	<a href="#xmlIOHTTPOpenW">xmlIOHTTPOpenW</a>			(const char * post_uri, <br/>					 int compression);
-<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateFd">xmlParserInputBufferCreateFd</a>	(int fd, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateFilename">xmlParserInputBufferCreateFilename</a>	(const char * URI, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateIO">xmlParserInputBufferCreateIO</a>	(<a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>							 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>							 void * ioctx, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateMem">xmlParserInputBufferCreateMem</a>	(const char * mem, <br/>							 int size, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlParserInputBufferCreateStatic">xmlParserInputBufferCreateStatic</a>	(const char * mem, <br/>							 int size, <br/>							 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc);
+int	<a href="#xmlParserInputBufferGrow">xmlParserInputBufferGrow</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> in, <br/>					 int len);
+int	<a href="#xmlParserInputBufferPush">xmlParserInputBufferPush</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> in, <br/>					 int len, <br/>					 const char * buf);
+int	<a href="#xmlParserInputBufferRead">xmlParserInputBufferRead</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> in, <br/>					 int len);
+int	<a href="#xmlPopInputCallbacks">xmlPopInputCallbacks</a>		(void);
+int	<a href="#xmlPopOutputCallbacks">xmlPopOutputCallbacks</a>		(void);
+void	<a href="#xmlRegisterDefaultInputCallbacks">xmlRegisterDefaultInputCallbacks</a>	(void);
+void	<a href="#xmlRegisterDefaultOutputCallbacks">xmlRegisterDefaultOutputCallbacks</a>	(void);
+void	<a href="#xmlRegisterHTTPPostCallbacks">xmlRegisterHTTPPostCallbacks</a>	(void);
+int	<a href="#xmlRegisterInputCallbacks">xmlRegisterInputCallbacks</a>	(<a href="libxml2-xmlIO.html#xmlInputMatchCallback">xmlInputMatchCallback</a> matchFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlInputOpenCallback">xmlInputOpenCallback</a> openFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> readFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> closeFunc);
+int	<a href="#xmlRegisterOutputCallbacks">xmlRegisterOutputCallbacks</a>	(<a href="libxml2-xmlIO.html#xmlOutputMatchCallback">xmlOutputMatchCallback</a> matchFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlOutputOpenCallback">xmlOutputOpenCallback</a> openFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlOutputWriteCallback">xmlOutputWriteCallback</a> writeFunc, <br/>					 <a href="libxml2-xmlIO.html#xmlOutputCloseCallback">xmlOutputCloseCallback</a> closeFunc);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlautomata.html b/doc/devhelp/libxml2-xmlautomata.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxhdXRvbWF0YS5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxhdXRvbWF0YS5odG1s 100644
--- a/doc/devhelp/libxml2-xmlautomata.html
+++ b/doc/devhelp/libxml2-xmlautomata.html
@@ -43,7 +43,6 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libxml2-xmlautomata.html#xmlAutomataState">xmlAutomataState</a> * <a href="#xmlAutomataStatePtr">xmlAutomataStatePtr</a>;
-typedef struct _xmlAutomata <a href="#xmlAutomata">xmlAutomata</a>;
+      <pre class="synopsis">typedef struct _xmlAutomata <a href="#xmlAutomata">xmlAutomata</a>;
 typedef <a href="libxml2-xmlautomata.html#xmlAutomata">xmlAutomata</a> * <a href="#xmlAutomataPtr">xmlAutomataPtr</a>;
 typedef struct _xmlAutomataState <a href="#xmlAutomataState">xmlAutomataState</a>;
@@ -48,5 +47,5 @@
 typedef <a href="libxml2-xmlautomata.html#xmlAutomata">xmlAutomata</a> * <a href="#xmlAutomataPtr">xmlAutomataPtr</a>;
 typedef struct _xmlAutomataState <a href="#xmlAutomataState">xmlAutomataState</a>;
-void	<a href="#xmlFreeAutomata">xmlFreeAutomata</a>			(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
-int	<a href="#xmlAutomataNewCounter">xmlAutomataNewCounter</a>		(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>					 int min, <br/>					 int max);
+typedef <a href="libxml2-xmlautomata.html#xmlAutomataState">xmlAutomataState</a> * <a href="#xmlAutomataStatePtr">xmlAutomataStatePtr</a>;
+<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a>	<a href="#xmlAutomataCompile">xmlAutomataCompile</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataGetInitState">xmlAutomataGetInitState</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
@@ -52,4 +51,4 @@
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataGetInitState">xmlAutomataGetInitState</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
-<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewTransition2">xmlAutomataNewTransition2</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token2, <br/>							 void * data);
-<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewState">xmlAutomataNewState</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
+int	<a href="#xmlAutomataIsDeterminist">xmlAutomataIsDeterminist</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
+<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewAllTrans">xmlAutomataNewAllTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>						 int lax);
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewCountTrans">xmlAutomataNewCountTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 int min, <br/>							 int max, <br/>							 void * data);
@@ -55,4 +54,3 @@
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewCountTrans">xmlAutomataNewCountTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 int min, <br/>							 int max, <br/>							 void * data);
-<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewOnceTrans2">xmlAutomataNewOnceTrans2</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token2, <br/>							 int min, <br/>							 int max, <br/>							 void * data);
-<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewAllTrans">xmlAutomataNewAllTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>						 int lax);
+<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewCountTrans2">xmlAutomataNewCountTrans2</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token2, <br/>							 int min, <br/>							 int max, <br/>							 void * data);
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewCountedTrans">xmlAutomataNewCountedTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 int counter);
@@ -58,2 +56,3 @@
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewCountedTrans">xmlAutomataNewCountedTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 int counter);
+int	<a href="#xmlAutomataNewCounter">xmlAutomataNewCounter</a>		(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>					 int min, <br/>					 int max);
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewCounterTrans">xmlAutomataNewCounterTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 int counter);
@@ -59,3 +58,3 @@
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewCounterTrans">xmlAutomataNewCounterTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 int counter);
-<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a>	<a href="#xmlAutomataCompile">xmlAutomataCompile</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
+<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewEpsilon">xmlAutomataNewEpsilon</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to);
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewNegTrans">xmlAutomataNewNegTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token2, <br/>						 void * data);
@@ -61,4 +60,9 @@
 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewNegTrans">xmlAutomataNewNegTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token2, <br/>						 void * data);
-<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewEpsilon">xmlAutomataNewEpsilon</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to);
-<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewCountTrans2">xmlAutomataNewCountTrans2</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token2, <br/>							 int min, <br/>							 int max, <br/>							 void * data);
+<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewOnceTrans">xmlAutomataNewOnceTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>						 int min, <br/>						 int max, <br/>						 void * data);
+<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewOnceTrans2">xmlAutomataNewOnceTrans2</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token2, <br/>							 int min, <br/>							 int max, <br/>							 void * data);
+<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewState">xmlAutomataNewState</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
+<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewTransition">xmlAutomataNewTransition</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 void * data);
+<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewTransition2">xmlAutomataNewTransition2</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token2, <br/>							 void * data);
+int	<a href="#xmlAutomataSetFinalState">xmlAutomataSetFinalState</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>					 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> state);
+void	<a href="#xmlFreeAutomata">xmlFreeAutomata</a>			(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
 <a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a>	<a href="#xmlNewAutomata">xmlNewAutomata</a>		(void);
@@ -64,8 +68,4 @@
 <a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a>	<a href="#xmlNewAutomata">xmlNewAutomata</a>		(void);
-int	<a href="#xmlAutomataSetFinalState">xmlAutomataSetFinalState</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>					 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> state);
-<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewOnceTrans">xmlAutomataNewOnceTrans</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>						 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>						 int min, <br/>						 int max, <br/>						 void * data);
-<a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	<a href="#xmlAutomataNewTransition">xmlAutomataNewTransition</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> from, <br/>							 <a href="libxml2-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a> to, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>							 void * data);
-int	<a href="#xmlAutomataIsDeterminist">xmlAutomataIsDeterminist</a>	(<a href="libxml2-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxlcnJvci5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxlcnJvci5odG1s 100644
--- a/doc/devhelp/libxml2-xmlerror.html
+++ b/doc/devhelp/libxml2-xmlerror.html
@@ -43,7 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libxml2-xmlerror.html#xmlError">xmlError</a> * <a href="#xmlErrorPtr">xmlErrorPtr</a>;
-typedef enum <a href="#xmlErrorLevel">xmlErrorLevel</a>;
-typedef enum <a href="#xmlParserErrors">xmlParserErrors</a>;
+      <pre class="synopsis">typedef struct _xmlError <a href="#xmlError">xmlError</a>;
 typedef enum <a href="#xmlErrorDomain">xmlErrorDomain</a>;
@@ -49,10 +47,6 @@
 typedef enum <a href="#xmlErrorDomain">xmlErrorDomain</a>;
-typedef struct _xmlError <a href="#xmlError">xmlError</a>;
-void	<a href="#xmlParserValidityError">xmlParserValidityError</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
-typedef void <a href="#xmlGenericErrorFunc">xmlGenericErrorFunc</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
-void	<a href="#xmlSetGenericErrorFunc">xmlSetGenericErrorFunc</a>		(void * ctx, <br/>					 <a href="libxml2-xmlerror.html#xmlGenericErrorFunc">xmlGenericErrorFunc</a> handler);
-void	<a href="#xmlParserPrintFileInfo">xmlParserPrintFileInfo</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input);
-void	<a href="#xmlCtxtResetLastError">xmlCtxtResetLastError</a>		(void * ctx);
-void	<a href="#xmlResetLastError">xmlResetLastError</a>		(void);
+typedef enum <a href="#xmlErrorLevel">xmlErrorLevel</a>;
+typedef <a href="libxml2-xmlerror.html#xmlError">xmlError</a> * <a href="#xmlErrorPtr">xmlErrorPtr</a>;
+typedef enum <a href="#xmlParserErrors">xmlParserErrors</a>;
 void	<a href="#initGenericErrorDefaultFunc">initGenericErrorDefaultFunc</a>	(<a href="libxml2-xmlerror.html#xmlGenericErrorFunc">xmlGenericErrorFunc</a> * handler);
 int	<a href="#xmlCopyError">xmlCopyError</a>			(<a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a> from, <br/>					 <a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a> to);
@@ -57,4 +51,8 @@
 void	<a href="#initGenericErrorDefaultFunc">initGenericErrorDefaultFunc</a>	(<a href="libxml2-xmlerror.html#xmlGenericErrorFunc">xmlGenericErrorFunc</a> * handler);
 int	<a href="#xmlCopyError">xmlCopyError</a>			(<a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a> from, <br/>					 <a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a> to);
-void	<a href="#xmlParserValidityWarning">xmlParserValidityWarning</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+<a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a>	<a href="#xmlCtxtGetLastError">xmlCtxtGetLastError</a>	(void * ctx);
+void	<a href="#xmlCtxtResetLastError">xmlCtxtResetLastError</a>		(void * ctx);
+typedef void <a href="#xmlGenericErrorFunc">xmlGenericErrorFunc</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+<a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a>	<a href="#xmlGetLastError">xmlGetLastError</a>		(void);
+void	<a href="#xmlParserError">xmlParserError</a>			(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
 void	<a href="#xmlParserPrintFileContext">xmlParserPrintFileContext</a>	(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input);
@@ -60,3 +58,5 @@
 void	<a href="#xmlParserPrintFileContext">xmlParserPrintFileContext</a>	(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input);
-void	<a href="#xmlParserError">xmlParserError</a>			(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+void	<a href="#xmlParserPrintFileInfo">xmlParserPrintFileInfo</a>		(<a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input);
+void	<a href="#xmlParserValidityError">xmlParserValidityError</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+void	<a href="#xmlParserValidityWarning">xmlParserValidityWarning</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
 void	<a href="#xmlParserWarning">xmlParserWarning</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
@@ -62,2 +62,6 @@
 void	<a href="#xmlParserWarning">xmlParserWarning</a>		(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+void	<a href="#xmlResetError">xmlResetError</a>			(<a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a> err);
+void	<a href="#xmlResetLastError">xmlResetLastError</a>		(void);
+void	<a href="#xmlSetGenericErrorFunc">xmlSetGenericErrorFunc</a>		(void * ctx, <br/>					 <a href="libxml2-xmlerror.html#xmlGenericErrorFunc">xmlGenericErrorFunc</a> handler);
+void	<a href="#xmlSetStructuredErrorFunc">xmlSetStructuredErrorFunc</a>	(void * ctx, <br/>					 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> handler);
 typedef void <a href="#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a>		(void * userData, <br/>					 <a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a> error);
@@ -63,8 +67,4 @@
 typedef void <a href="#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a>		(void * userData, <br/>					 <a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a> error);
-void	<a href="#xmlSetStructuredErrorFunc">xmlSetStructuredErrorFunc</a>	(void * ctx, <br/>					 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> handler);
-void	<a href="#xmlResetError">xmlResetError</a>			(<a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a> err);
-<a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a>	<a href="#xmlGetLastError">xmlGetLastError</a>		(void);
-<a href="libxml2-xmlerror.html#xmlErrorPtr">xmlErrorPtr</a>	<a href="#xmlCtxtGetLastError">xmlCtxtGetLastError</a>	(void * ctx);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlexports.html b/doc/devhelp/libxml2-xmlexports.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxleHBvcnRzLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxleHBvcnRzLmh0bWw= 100644
--- a/doc/devhelp/libxml2-xmlexports.html
+++ b/doc/devhelp/libxml2-xmlexports.html
@@ -43,6 +43,9 @@
     <p>Author(s): </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#XMLCDECL">XMLCDECL</a>;
+      <pre class="synopsis">#define <a href="#LIBXML_DLL_IMPORT">LIBXML_DLL_IMPORT</a>;
+#define <a href="#XMLCALL">XMLCALL</a>;
+#define <a href="#XMLCDECL">XMLCDECL</a>;
+#define <a href="#XMLPUBFUN">XMLPUBFUN</a>;
 #define <a href="#XMLPUBLIC">XMLPUBLIC</a>;
 #define <a href="#XMLPUBVAR">XMLPUBVAR</a>;
@@ -47,8 +50,5 @@
 #define <a href="#XMLPUBLIC">XMLPUBLIC</a>;
 #define <a href="#XMLPUBVAR">XMLPUBVAR</a>;
-#define <a href="#LIBXML_DLL_IMPORT">LIBXML_DLL_IMPORT</a>;
-#define <a href="#XMLCALL">XMLCALL</a>;
-#define <a href="#XMLPUBFUN">XMLPUBFUN</a>;
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlmemory.html b/doc/devhelp/libxml2-xmlmemory.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxtZW1vcnkuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxtZW1vcnkuaHRtbA== 100644
--- a/doc/devhelp/libxml2-xmlmemory.html
+++ b/doc/devhelp/libxml2-xmlmemory.html
@@ -43,6 +43,6 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#xmlRealloc">xmlRealloc</a>;
+      <pre class="synopsis">#define <a href="#DEBUG_MEMORY">DEBUG_MEMORY</a>;
 #define <a href="#xmlMalloc">xmlMalloc</a>;
 #define <a href="#xmlMallocAtomic">xmlMallocAtomic</a>;
@@ -47,4 +47,3 @@
 #define <a href="#xmlMalloc">xmlMalloc</a>;
 #define <a href="#xmlMallocAtomic">xmlMallocAtomic</a>;
-#define <a href="#DEBUG_MEMORY">DEBUG_MEMORY</a>;
 #define <a href="#xmlMemStrdup">xmlMemStrdup</a>;
@@ -50,12 +49,5 @@
 #define <a href="#xmlMemStrdup">xmlMemStrdup</a>;
-void *	<a href="#xmlMemRealloc">xmlMemRealloc</a>			(void * ptr, <br/>					 size_t size);
-int	<a href="#xmlInitMemory">xmlInitMemory</a>			(void);
-void	<a href="#xmlMemFree">xmlMemFree</a>			(void * ptr);
-void *	<a href="#xmlMemMalloc">xmlMemMalloc</a>			(size_t size);
-void	<a href="#xmlMemDisplayLast">xmlMemDisplayLast</a>		(FILE * fp, <br/>					 long nbBytes);
-int	<a href="#xmlMemGet">xmlMemGet</a>			(<a href="libxml2-xmlmemory.html#xmlFreeFunc">xmlFreeFunc</a> * freeFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> * mallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlReallocFunc">xmlReallocFunc</a> * reallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlStrdupFunc">xmlStrdupFunc</a> * strdupFunc);
-void	<a href="#xmlMemoryDump">xmlMemoryDump</a>			(void);
-void *	<a href="#xmlMallocLoc">xmlMallocLoc</a>			(size_t size, <br/>					 const char * file, <br/>					 int line);
-void	<a href="#xmlMemDisplay">xmlMemDisplay</a>			(FILE * fp);
-int	<a href="#xmlMemBlocks">xmlMemBlocks</a>			(void);
+#define <a href="#xmlRealloc">xmlRealloc</a>;
+void	<a href="#xmlCleanupMemory">xmlCleanupMemory</a>		(void);
+typedef void <a href="#xmlFreeFunc">xmlFreeFunc</a>			(void * mem);
 int	<a href="#xmlGcMemGet">xmlGcMemGet</a>			(<a href="libxml2-xmlmemory.html#xmlFreeFunc">xmlFreeFunc</a> * freeFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> * mallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> * mallocAtomicFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlReallocFunc">xmlReallocFunc</a> * reallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlStrdupFunc">xmlStrdupFunc</a> * strdupFunc);
@@ -61,4 +53,15 @@
 int	<a href="#xmlGcMemGet">xmlGcMemGet</a>			(<a href="libxml2-xmlmemory.html#xmlFreeFunc">xmlFreeFunc</a> * freeFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> * mallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> * mallocAtomicFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlReallocFunc">xmlReallocFunc</a> * reallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlStrdupFunc">xmlStrdupFunc</a> * strdupFunc);
-typedef char * <a href="#xmlStrdupFunc">xmlStrdupFunc</a>			(const char * str);
-typedef void <a href="#xmlFreeFunc">xmlFreeFunc</a>			(void * mem);
+int	<a href="#xmlGcMemSetup">xmlGcMemSetup</a>			(<a href="libxml2-xmlmemory.html#xmlFreeFunc">xmlFreeFunc</a> freeFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> mallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> mallocAtomicFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlReallocFunc">xmlReallocFunc</a> reallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlStrdupFunc">xmlStrdupFunc</a> strdupFunc);
+int	<a href="#xmlInitMemory">xmlInitMemory</a>			(void);
+void *	<a href="#xmlMallocAtomicLoc">xmlMallocAtomicLoc</a>		(size_t size, <br/>					 const char * file, <br/>					 int line);
+typedef void * <a href="#xmlMallocFunc">xmlMallocFunc</a>			(size_t size);
+void *	<a href="#xmlMallocLoc">xmlMallocLoc</a>			(size_t size, <br/>					 const char * file, <br/>					 int line);
+int	<a href="#xmlMemBlocks">xmlMemBlocks</a>			(void);
+void	<a href="#xmlMemDisplay">xmlMemDisplay</a>			(FILE * fp);
+void	<a href="#xmlMemDisplayLast">xmlMemDisplayLast</a>		(FILE * fp, <br/>					 long nbBytes);
+void	<a href="#xmlMemFree">xmlMemFree</a>			(void * ptr);
+int	<a href="#xmlMemGet">xmlMemGet</a>			(<a href="libxml2-xmlmemory.html#xmlFreeFunc">xmlFreeFunc</a> * freeFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> * mallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlReallocFunc">xmlReallocFunc</a> * reallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlStrdupFunc">xmlStrdupFunc</a> * strdupFunc);
+void *	<a href="#xmlMemMalloc">xmlMemMalloc</a>			(size_t size);
+void *	<a href="#xmlMemRealloc">xmlMemRealloc</a>			(void * ptr, <br/>					 size_t size);
+int	<a href="#xmlMemSetup">xmlMemSetup</a>			(<a href="libxml2-xmlmemory.html#xmlFreeFunc">xmlFreeFunc</a> freeFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> mallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlReallocFunc">xmlReallocFunc</a> reallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlStrdupFunc">xmlStrdupFunc</a> strdupFunc);
 void	<a href="#xmlMemShow">xmlMemShow</a>			(FILE * fp, <br/>					 int nr);
@@ -64,5 +67,3 @@
 void	<a href="#xmlMemShow">xmlMemShow</a>			(FILE * fp, <br/>					 int nr);
-void *	<a href="#xmlMallocAtomicLoc">xmlMallocAtomicLoc</a>		(size_t size, <br/>					 const char * file, <br/>					 int line);
-void *	<a href="#xmlReallocLoc">xmlReallocLoc</a>			(void * ptr, <br/>					 size_t size, <br/>					 const char * file, <br/>					 int line);
-void	<a href="#xmlCleanupMemory">xmlCleanupMemory</a>		(void);
+char *	<a href="#xmlMemStrdupLoc">xmlMemStrdupLoc</a>			(const char * str, <br/>					 const char * file, <br/>					 int line);
 int	<a href="#xmlMemUsed">xmlMemUsed</a>			(void);
@@ -68,3 +69,4 @@
 int	<a href="#xmlMemUsed">xmlMemUsed</a>			(void);
-int	<a href="#xmlMemSetup">xmlMemSetup</a>			(<a href="libxml2-xmlmemory.html#xmlFreeFunc">xmlFreeFunc</a> freeFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> mallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlReallocFunc">xmlReallocFunc</a> reallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlStrdupFunc">xmlStrdupFunc</a> strdupFunc);
+void	<a href="#xmlMemoryDump">xmlMemoryDump</a>			(void);
+char *	<a href="#xmlMemoryStrdup">xmlMemoryStrdup</a>			(const char * str);
 typedef void * <a href="#xmlReallocFunc">xmlReallocFunc</a>			(void * mem, <br/>					 size_t size);
@@ -70,8 +72,6 @@
 typedef void * <a href="#xmlReallocFunc">xmlReallocFunc</a>			(void * mem, <br/>					 size_t size);
-typedef void * <a href="#xmlMallocFunc">xmlMallocFunc</a>			(size_t size);
-int	<a href="#xmlGcMemSetup">xmlGcMemSetup</a>			(<a href="libxml2-xmlmemory.html#xmlFreeFunc">xmlFreeFunc</a> freeFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> mallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlMallocFunc">xmlMallocFunc</a> mallocAtomicFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlReallocFunc">xmlReallocFunc</a> reallocFunc, <br/>					 <a href="libxml2-xmlmemory.html#xmlStrdupFunc">xmlStrdupFunc</a> strdupFunc);
-char *	<a href="#xmlMemoryStrdup">xmlMemoryStrdup</a>			(const char * str);
-char *	<a href="#xmlMemStrdupLoc">xmlMemStrdupLoc</a>			(const char * str, <br/>					 const char * file, <br/>					 int line);
+void *	<a href="#xmlReallocLoc">xmlReallocLoc</a>			(void * ptr, <br/>					 size_t size, <br/>					 const char * file, <br/>					 int line);
+typedef char * <a href="#xmlStrdupFunc">xmlStrdupFunc</a>			(const char * str);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlmodule.html b/doc/devhelp/libxml2-xmlmodule.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxtb2R1bGUuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxtb2R1bGUuaHRtbA== 100644
--- a/doc/devhelp/libxml2-xmlmodule.html
+++ b/doc/devhelp/libxml2-xmlmodule.html
@@ -44,4 +44,5 @@
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
       <pre class="synopsis">typedef struct _xmlModule <a href="#xmlModule">xmlModule</a>;
+typedef enum <a href="#xmlModuleOption">xmlModuleOption</a>;
 typedef <a href="libxml2-xmlmodule.html#xmlModule">xmlModule</a> * <a href="#xmlModulePtr">xmlModulePtr</a>;
@@ -47,3 +48,3 @@
 typedef <a href="libxml2-xmlmodule.html#xmlModule">xmlModule</a> * <a href="#xmlModulePtr">xmlModulePtr</a>;
-typedef enum <a href="#xmlModuleOption">xmlModuleOption</a>;
+int	<a href="#xmlModuleClose">xmlModuleClose</a>			(<a href="libxml2-xmlmodule.html#xmlModulePtr">xmlModulePtr</a> module);
 int	<a href="#xmlModuleFree">xmlModuleFree</a>			(<a href="libxml2-xmlmodule.html#xmlModulePtr">xmlModulePtr</a> module);
@@ -49,2 +50,3 @@
 int	<a href="#xmlModuleFree">xmlModuleFree</a>			(<a href="libxml2-xmlmodule.html#xmlModulePtr">xmlModulePtr</a> module);
+<a href="libxml2-xmlmodule.html#xmlModulePtr">xmlModulePtr</a>	<a href="#xmlModuleOpen">xmlModuleOpen</a>		(const char * name, <br/>					 int options);
 int	<a href="#xmlModuleSymbol">xmlModuleSymbol</a>			(<a href="libxml2-xmlmodule.html#xmlModulePtr">xmlModulePtr</a> module, <br/>					 const char * name, <br/>					 void ** symbol);
@@ -50,6 +52,4 @@
 int	<a href="#xmlModuleSymbol">xmlModuleSymbol</a>			(<a href="libxml2-xmlmodule.html#xmlModulePtr">xmlModulePtr</a> module, <br/>					 const char * name, <br/>					 void ** symbol);
-<a href="libxml2-xmlmodule.html#xmlModulePtr">xmlModulePtr</a>	<a href="#xmlModuleOpen">xmlModuleOpen</a>		(const char * name, <br/>					 int options);
-int	<a href="#xmlModuleClose">xmlModuleClose</a>			(<a href="libxml2-xmlmodule.html#xmlModulePtr">xmlModulePtr</a> module);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlreader.html b/doc/devhelp/libxml2-xmlreader.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxyZWFkZXIuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxyZWFkZXIuaHRtbA== 100644
--- a/doc/devhelp/libxml2-xmlreader.html
+++ b/doc/devhelp/libxml2-xmlreader.html
@@ -43,5 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libxml2-xmlreader.html#xmlTextReader">xmlTextReader</a> * <a href="#xmlTextReaderPtr">xmlTextReaderPtr</a>;
+      <pre class="synopsis">typedef enum <a href="#xmlParserProperties">xmlParserProperties</a>;
 typedef enum <a href="#xmlParserSeverities">xmlParserSeverities</a>;
@@ -47,5 +47,4 @@
 typedef enum <a href="#xmlParserSeverities">xmlParserSeverities</a>;
-typedef enum <a href="#xmlParserProperties">xmlParserProperties</a>;
-typedef enum <a href="#xmlTextReaderMode">xmlTextReaderMode</a>;
+typedef enum <a href="#xmlReaderTypes">xmlReaderTypes</a>;
 typedef struct _xmlTextReader <a href="#xmlTextReader">xmlTextReader</a>;
 typedef void * <a href="#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a>;
@@ -50,4 +49,7 @@
 typedef struct _xmlTextReader <a href="#xmlTextReader">xmlTextReader</a>;
 typedef void * <a href="#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a>;
-typedef enum <a href="#xmlReaderTypes">xmlReaderTypes</a>;
+typedef enum <a href="#xmlTextReaderMode">xmlTextReaderMode</a>;
+typedef <a href="libxml2-xmlreader.html#xmlTextReader">xmlTextReader</a> * <a href="#xmlTextReaderPtr">xmlTextReaderPtr</a>;
+void	<a href="#xmlFreeTextReader">xmlFreeTextReader</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlNewTextReader">xmlNewTextReader</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>						 const char * URI);
 <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlNewTextReaderFilename">xmlNewTextReaderFilename</a>	(const char * URI);
@@ -53,4 +55,4 @@
 <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlNewTextReaderFilename">xmlNewTextReaderFilename</a>	(const char * URI);
-int	<a href="#xmlTextReaderHasAttributes">xmlTextReaderHasAttributes</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderReadState">xmlTextReaderReadState</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForDoc">xmlReaderForDoc</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForFd">xmlReaderForFd</a>	(int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
 <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForFile">xmlReaderForFile</a>	(const char * filename, <br/>						 const char * encoding, <br/>						 int options);
@@ -56,8 +58,7 @@
 <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForFile">xmlReaderForFile</a>	(const char * filename, <br/>						 const char * encoding, <br/>						 int options);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstNamespaceUri">xmlTextReaderConstNamespaceUri</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlTextReaderCurrentDoc">xmlTextReaderCurrentDoc</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderGetParserLineNumber">xmlTextReaderGetParserLineNumber</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlTextReaderExpand">xmlTextReaderExpand</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderXmlLang">xmlTextReaderXmlLang</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForDoc">xmlReaderForDoc</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForIO">xmlReaderForIO</a>	(<a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForMemory">xmlReaderForMemory</a>	(const char * buffer, <br/>						 int size, <br/>						 const char * URL, <br/>						 const char * encoding, <br/>						 int options);
+int	<a href="#xmlReaderNewDoc">xmlReaderNewDoc</a>			(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+int	<a href="#xmlReaderNewFd">xmlReaderNewFd</a>			(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+int	<a href="#xmlReaderNewFile">xmlReaderNewFile</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const char * filename, <br/>					 const char * encoding, <br/>					 int options);
 int	<a href="#xmlReaderNewIO">xmlReaderNewIO</a>			(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
@@ -63,2 +64,8 @@
 int	<a href="#xmlReaderNewIO">xmlReaderNewIO</a>			(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+int	<a href="#xmlReaderNewMemory">xmlReaderNewMemory</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+int	<a href="#xmlReaderNewWalker">xmlReaderNewWalker</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderWalker">xmlReaderWalker</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+int	<a href="#xmlTextReaderAttributeCount">xmlTextReaderAttributeCount</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderBaseUri">xmlTextReaderBaseUri</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+long	<a href="#xmlTextReaderByteConsumed">xmlTextReaderByteConsumed</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
 int	<a href="#xmlTextReaderClose">xmlTextReaderClose</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
@@ -64,3 +71,3 @@
 int	<a href="#xmlTextReaderClose">xmlTextReaderClose</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderReadInnerXml">xmlTextReaderReadInnerXml</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstBaseUri">xmlTextReaderConstBaseUri</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstEncoding">xmlTextReaderConstEncoding</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
@@ -66,11 +73,7 @@
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstEncoding">xmlTextReaderConstEncoding</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderNormalization">xmlTextReaderNormalization</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderGetParserProp">xmlTextReaderGetParserProp</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 int prop);
-int	<a href="#xmlTextReaderMoveToAttribute">xmlTextReaderMoveToAttribute</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlTextReaderQuoteChar">xmlTextReaderQuoteChar</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderSetSchema">xmlTextReaderSetSchema</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a> schema);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderValue">xmlTextReaderValue</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderIsValid">xmlTextReaderIsValid</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderMoveToFirstAttribute">xmlTextReaderMoveToFirstAttribute</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderGetParserColumnNumber">xmlTextReaderGetParserColumnNumber</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstLocalName">xmlTextReaderConstLocalName</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstName">xmlTextReaderConstName</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstNamespaceUri">xmlTextReaderConstNamespaceUri</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstPrefix">xmlTextReaderConstPrefix</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstString">xmlTextReaderConstString</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstValue">xmlTextReaderConstValue</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
@@ -76,4 +79,11 @@
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstValue">xmlTextReaderConstValue</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlNewTextReader">xmlNewTextReader</a>	(<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>						 const char * URI);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstXmlLang">xmlTextReaderConstXmlLang</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstXmlVersion">xmlTextReaderConstXmlVersion</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a>	<a href="#xmlTextReaderCurrentDoc">xmlTextReaderCurrentDoc</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlTextReaderCurrentNode">xmlTextReaderCurrentNode</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderDepth">xmlTextReaderDepth</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+typedef void <a href="#xmlTextReaderErrorFunc">xmlTextReaderErrorFunc</a>		(void * arg, <br/>					 const char * msg, <br/>					 <a href="libxml2-xmlreader.html#xmlParserSeverities">xmlParserSeverities</a> severity, <br/>					 <a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> locator);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlTextReaderExpand">xmlTextReaderExpand</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderGetAttribute">xmlTextReaderGetAttribute</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderGetAttributeNo">xmlTextReaderGetAttributeNo</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 int no);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderGetAttributeNs">xmlTextReaderGetAttributeNs</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localName, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI);
@@ -78,8 +88,10 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderGetAttributeNo">xmlTextReaderGetAttributeNo</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 int no);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderGetAttributeNs">xmlTextReaderGetAttributeNs</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localName, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstName">xmlTextReaderConstName</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstString">xmlTextReaderConstString</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstXmlVersion">xmlTextReaderConstXmlVersion</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderDepth">xmlTextReaderDepth</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderReadString">xmlTextReaderReadString</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+void	<a href="#xmlTextReaderGetErrorHandler">xmlTextReaderGetErrorHandler</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlreader.html#xmlTextReaderErrorFunc">xmlTextReaderErrorFunc</a> * f, <br/>					 void ** arg);
+int	<a href="#xmlTextReaderGetParserColumnNumber">xmlTextReaderGetParserColumnNumber</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderGetParserLineNumber">xmlTextReaderGetParserLineNumber</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderGetParserProp">xmlTextReaderGetParserProp</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 int prop);
+<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlTextReaderGetRemainder">xmlTextReaderGetRemainder</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderHasAttributes">xmlTextReaderHasAttributes</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderHasValue">xmlTextReaderHasValue</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
 int	<a href="#xmlTextReaderIsDefault">xmlTextReaderIsDefault</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
@@ -85,2 +97,14 @@
 int	<a href="#xmlTextReaderIsDefault">xmlTextReaderIsDefault</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderIsEmptyElement">xmlTextReaderIsEmptyElement</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderIsNamespaceDecl">xmlTextReaderIsNamespaceDecl</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderIsValid">xmlTextReaderIsValid</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderLocalName">xmlTextReaderLocalName</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderLocatorBaseURI">xmlTextReaderLocatorBaseURI</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> locator);
+int	<a href="#xmlTextReaderLocatorLineNumber">xmlTextReaderLocatorLineNumber</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> locator);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderLookupNamespace">xmlTextReaderLookupNamespace</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
+int	<a href="#xmlTextReaderMoveToAttribute">xmlTextReaderMoveToAttribute</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlTextReaderMoveToAttributeNo">xmlTextReaderMoveToAttributeNo</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 int no);
+int	<a href="#xmlTextReaderMoveToAttributeNs">xmlTextReaderMoveToAttributeNs</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localName, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI);
+int	<a href="#xmlTextReaderMoveToElement">xmlTextReaderMoveToElement</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderMoveToFirstAttribute">xmlTextReaderMoveToFirstAttribute</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
 int	<a href="#xmlTextReaderMoveToNextAttribute">xmlTextReaderMoveToNextAttribute</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
@@ -86,6 +110,6 @@
 int	<a href="#xmlTextReaderMoveToNextAttribute">xmlTextReaderMoveToNextAttribute</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlReaderNewWalker">xmlReaderNewWalker</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstPrefix">xmlTextReaderConstPrefix</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderWalker">xmlReaderWalker</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstLocalName">xmlTextReaderConstLocalName</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderName">xmlTextReaderName</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderNamespaceUri">xmlTextReaderNamespaceUri</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderNext">xmlTextReaderNext</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderNextSibling">xmlTextReaderNextSibling</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
 int	<a href="#xmlTextReaderNodeType">xmlTextReaderNodeType</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
@@ -91,4 +115,7 @@
 int	<a href="#xmlTextReaderNodeType">xmlTextReaderNodeType</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-void	<a href="#xmlFreeTextReader">xmlFreeTextReader</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderName">xmlTextReaderName</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderNormalization">xmlTextReaderNormalization</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderPrefix">xmlTextReaderPrefix</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlTextReaderPreserve">xmlTextReaderPreserve</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderPreservePattern">xmlTextReaderPreservePattern</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pattern, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** namespaces);
+int	<a href="#xmlTextReaderQuoteChar">xmlTextReaderQuoteChar</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
 int	<a href="#xmlTextReaderRead">xmlTextReaderRead</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
@@ -94,16 +121,4 @@
 int	<a href="#xmlTextReaderRead">xmlTextReaderRead</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderIsEmptyElement">xmlTextReaderIsEmptyElement</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlReaderNewMemory">xmlReaderNewMemory</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const char * buffer, <br/>					 int size, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#xmlTextReaderSchemaValidateCtxt">xmlTextReaderSchemaValidateCtxt</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 int options);
-int	<a href="#xmlTextReaderHasValue">xmlTextReaderHasValue</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstBaseUri">xmlTextReaderConstBaseUri</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderBaseUri">xmlTextReaderBaseUri</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderMoveToAttributeNo">xmlTextReaderMoveToAttributeNo</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 int no);
-int	<a href="#xmlTextReaderLocatorLineNumber">xmlTextReaderLocatorLineNumber</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> locator);
-int	<a href="#xmlTextReaderMoveToAttributeNs">xmlTextReaderMoveToAttributeNs</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localName, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI);
-int	<a href="#xmlTextReaderNext">xmlTextReaderNext</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderAttributeCount">xmlTextReaderAttributeCount</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderLookupNamespace">xmlTextReaderLookupNamespace</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
-int	<a href="#xmlTextReaderMoveToElement">xmlTextReaderMoveToElement</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForIO">xmlReaderForIO</a>	(<a href="libxml2-xmlIO.html#xmlInputReadCallback">xmlInputReadCallback</a> ioread, <br/>					 <a href="libxml2-xmlIO.html#xmlInputCloseCallback">xmlInputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
+int	<a href="#xmlTextReaderReadAttributeValue">xmlTextReaderReadAttributeValue</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderReadInnerXml">xmlTextReaderReadInnerXml</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderReadOuterXml">xmlTextReaderReadOuterXml</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
@@ -109,2 +124,6 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderReadOuterXml">xmlTextReaderReadOuterXml</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderReadState">xmlTextReaderReadState</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderReadString">xmlTextReaderReadString</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderRelaxNGSetSchema">xmlTextReaderRelaxNGSetSchema</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
+int	<a href="#xmlTextReaderRelaxNGValidate">xmlTextReaderRelaxNGValidate</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const char * rng);
 int	<a href="#xmlTextReaderRelaxNGValidateCtxt">xmlTextReaderRelaxNGValidateCtxt</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 <a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>						 int options);
@@ -110,13 +129,4 @@
 int	<a href="#xmlTextReaderRelaxNGValidateCtxt">xmlTextReaderRelaxNGValidateCtxt</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 <a href="libxml2-relaxng.html#xmlRelaxNGValidCtxtPtr">xmlRelaxNGValidCtxtPtr</a> ctxt, <br/>						 int options);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderPrefix">xmlTextReaderPrefix</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderReadAttributeValue">xmlTextReaderReadAttributeValue</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderNextSibling">xmlTextReaderNextSibling</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-typedef void <a href="#xmlTextReaderErrorFunc">xmlTextReaderErrorFunc</a>		(void * arg, <br/>					 const char * msg, <br/>					 <a href="libxml2-xmlreader.html#xmlParserSeverities">xmlParserSeverities</a> severity, <br/>					 <a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> locator);
-<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForFd">xmlReaderForFd</a>	(int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderGetAttribute">xmlTextReaderGetAttribute</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderLocalName">xmlTextReaderLocalName</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlTextReaderPreserve">xmlTextReaderPreserve</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlTextReaderCurrentNode">xmlTextReaderCurrentNode</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderSetParserProp">xmlTextReaderSetParserProp</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 int prop, <br/>					 int value);
-<a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a>	<a href="#xmlTextReaderGetRemainder">xmlTextReaderGetRemainder</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+int	<a href="#xmlTextReaderSchemaValidate">xmlTextReaderSchemaValidate</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const char * xsd);
+int	<a href="#xmlTextReaderSchemaValidateCtxt">xmlTextReaderSchemaValidateCtxt</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 int options);
 void	<a href="#xmlTextReaderSetErrorHandler">xmlTextReaderSetErrorHandler</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlreader.html#xmlTextReaderErrorFunc">xmlTextReaderErrorFunc</a> f, <br/>					 void * arg);
@@ -122,7 +132,4 @@
 void	<a href="#xmlTextReaderSetErrorHandler">xmlTextReaderSetErrorHandler</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlreader.html#xmlTextReaderErrorFunc">xmlTextReaderErrorFunc</a> f, <br/>					 void * arg);
-int	<a href="#xmlTextReaderIsNamespaceDecl">xmlTextReaderIsNamespaceDecl</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlReaderNewDoc">xmlReaderNewDoc</a>			(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#xmlTextReaderPreservePattern">xmlTextReaderPreservePattern</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pattern, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** namespaces);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderConstXmlLang">xmlTextReaderConstXmlLang</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-void	<a href="#xmlTextReaderGetErrorHandler">xmlTextReaderGetErrorHandler</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlreader.html#xmlTextReaderErrorFunc">xmlTextReaderErrorFunc</a> * f, <br/>					 void ** arg);
+int	<a href="#xmlTextReaderSetParserProp">xmlTextReaderSetParserProp</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 int prop, <br/>					 int value);
+int	<a href="#xmlTextReaderSetSchema">xmlTextReaderSetSchema</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a> schema);
 void	<a href="#xmlTextReaderSetStructuredErrorHandler">xmlTextReaderSetStructuredErrorHandler</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> f, <br/>						 void * arg);
@@ -128,7 +135,2 @@
 void	<a href="#xmlTextReaderSetStructuredErrorHandler">xmlTextReaderSetStructuredErrorHandler</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> f, <br/>						 void * arg);
-int	<a href="#xmlReaderNewFile">xmlReaderNewFile</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const char * filename, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#xmlTextReaderRelaxNGSetSchema">xmlTextReaderRelaxNGSetSchema</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a> schema);
-int	<a href="#xmlReaderNewFd">xmlReaderNewFd</a>			(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 int fd, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#xmlTextReaderRelaxNGValidate">xmlTextReaderRelaxNGValidate</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const char * rng);
-<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	<a href="#xmlReaderForMemory">xmlReaderForMemory</a>	(const char * buffer, <br/>						 int size, <br/>						 const char * URL, <br/>						 const char * encoding, <br/>						 int options);
 int	<a href="#xmlTextReaderSetup">xmlTextReaderSetup</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
@@ -134,6 +136,2 @@
 int	<a href="#xmlTextReaderSetup">xmlTextReaderSetup</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>					 const char * URL, <br/>					 const char * encoding, <br/>					 int options);
-long	<a href="#xmlTextReaderByteConsumed">xmlTextReaderByteConsumed</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderLocatorBaseURI">xmlTextReaderLocatorBaseURI</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> locator);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderNamespaceUri">xmlTextReaderNamespaceUri</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
-int	<a href="#xmlTextReaderSchemaValidate">xmlTextReaderSchemaValidate</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader, <br/>					 const char * xsd);
 int	<a href="#xmlTextReaderStandalone">xmlTextReaderStandalone</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
@@ -139,4 +137,6 @@
 int	<a href="#xmlTextReaderStandalone">xmlTextReaderStandalone</a>		(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderValue">xmlTextReaderValue</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlTextReaderXmlLang">xmlTextReaderXmlLang</a>	(<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlregexp.html b/doc/devhelp/libxml2-xmlregexp.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxyZWdleHAuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxyZWdleHAuaHRtbA== 100644
--- a/doc/devhelp/libxml2-xmlregexp.html
+++ b/doc/devhelp/libxml2-xmlregexp.html
@@ -43,6 +43,7 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libxml2-xmlregexp.html#xmlRegExecCtxt">xmlRegExecCtxt</a> * <a href="#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a>;
-typedef struct _xmlExpCtxt <a href="#xmlExpCtxt">xmlExpCtxt</a>;
+      <pre class="synopsis">typedef struct _xmlExpCtxt <a href="#xmlExpCtxt">xmlExpCtxt</a>;
+typedef <a href="libxml2-xmlregexp.html#xmlExpCtxt">xmlExpCtxt</a> * <a href="#xmlExpCtxtPtr">xmlExpCtxtPtr</a>;
+typedef struct _xmlExpNode <a href="#xmlExpNode">xmlExpNode</a>;
 typedef <a href="libxml2-xmlregexp.html#xmlExpNode">xmlExpNode</a> * <a href="#xmlExpNodePtr">xmlExpNodePtr</a>;
@@ -48,4 +49,3 @@
 typedef <a href="libxml2-xmlregexp.html#xmlExpNode">xmlExpNode</a> * <a href="#xmlExpNodePtr">xmlExpNodePtr</a>;
-typedef <a href="libxml2-xmlregexp.html#xmlExpCtxt">xmlExpCtxt</a> * <a href="#xmlExpCtxtPtr">xmlExpCtxtPtr</a>;
 typedef enum <a href="#xmlExpNodeType">xmlExpNodeType</a>;
 typedef struct _xmlRegExecCtxt <a href="#xmlRegExecCtxt">xmlRegExecCtxt</a>;
@@ -50,5 +50,5 @@
 typedef enum <a href="#xmlExpNodeType">xmlExpNodeType</a>;
 typedef struct _xmlRegExecCtxt <a href="#xmlRegExecCtxt">xmlRegExecCtxt</a>;
-typedef struct _xmlExpNode <a href="#xmlExpNode">xmlExpNode</a>;
+typedef <a href="libxml2-xmlregexp.html#xmlRegExecCtxt">xmlRegExecCtxt</a> * <a href="#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a>;
 typedef struct _xmlRegexp <a href="#xmlRegexp">xmlRegexp</a>;
 typedef <a href="libxml2-xmlregexp.html#xmlRegexp">xmlRegexp</a> * <a href="#xmlRegexpPtr">xmlRegexpPtr</a>;
@@ -53,11 +53,3 @@
 typedef struct _xmlRegexp <a href="#xmlRegexp">xmlRegexp</a>;
 typedef <a href="libxml2-xmlregexp.html#xmlRegexp">xmlRegexp</a> * <a href="#xmlRegexpPtr">xmlRegexpPtr</a>;
-typedef void <a href="#xmlRegExecCallbacks">xmlRegExecCallbacks</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>					 void * transdata, <br/>					 void * inputdata);
-<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a>	<a href="#xmlRegNewExecCtxt">xmlRegNewExecCtxt</a>	(<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a> comp, <br/>						 <a href="libxml2-xmlregexp.html#xmlRegExecCallbacks">xmlRegExecCallbacks</a> callback, <br/>						 void * data);
-<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpNewOr">xmlExpNewOr</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> left, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> right);
-void	<a href="#xmlRegFreeRegexp">xmlRegFreeRegexp</a>		(<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a> regexp);
-void	<a href="#xmlExpRef">xmlExpRef</a>			(<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp);
-int	<a href="#xmlRegexpIsDeterminist">xmlRegexpIsDeterminist</a>		(<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a> comp);
-int	<a href="#xmlRegExecErrInfo">xmlRegExecErrInfo</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** string, <br/>					 int * nbval, <br/>					 int * nbneg, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** values, <br/>					 int * terminal);
-void	<a href="#xmlRegFreeExecCtxt">xmlRegFreeExecCtxt</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec);
 int	<a href="#xmlExpCtxtNbCons">xmlExpCtxtNbCons</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt);
@@ -63,5 +55,4 @@
 int	<a href="#xmlExpCtxtNbCons">xmlExpCtxtNbCons</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt);
-int	<a href="#xmlExpSubsume">xmlExpSubsume</a>			(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> sub);
-int	<a href="#xmlRegExecPushString2">xmlRegExecPushString2</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value2, <br/>					 void * data);
-int	<a href="#xmlRegExecNextValues">xmlRegExecNextValues</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 int * nbval, <br/>					 int * nbneg, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** values, <br/>					 int * terminal);
+int	<a href="#xmlExpCtxtNbNodes">xmlExpCtxtNbNodes</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt);
+void	<a href="#xmlExpDump">xmlExpDump</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> expr);
 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpExpDerive">xmlExpExpDerive</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> sub);
@@ -67,3 +58,3 @@
 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpExpDerive">xmlExpExpDerive</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> sub);
-int	<a href="#xmlExpIsNillable">xmlExpIsNillable</a>		(<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp);
+void	<a href="#xmlExpFree">xmlExpFree</a>			(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp);
 void	<a href="#xmlExpFreeCtxt">xmlExpFreeCtxt</a>			(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt);
@@ -69,5 +60,9 @@
 void	<a href="#xmlExpFreeCtxt">xmlExpFreeCtxt</a>			(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt);
-void	<a href="#xmlExpDump">xmlExpDump</a>			(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> expr);
-<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpNewSeq">xmlExpNewSeq</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> left, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> right);
-void	<a href="#xmlExpFree">xmlExpFree</a>			(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp);
+int	<a href="#xmlExpGetLanguage">xmlExpGetLanguage</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** langList, <br/>					 int len);
+int	<a href="#xmlExpGetStart">xmlExpGetStart</a>			(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** tokList, <br/>					 int len);
+int	<a href="#xmlExpIsNillable">xmlExpIsNillable</a>		(<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp);
+int	<a href="#xmlExpMaxToken">xmlExpMaxToken</a>			(<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> expr);
+<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpNewAtom">xmlExpNewAtom</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int len);
+<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a>	<a href="#xmlExpNewCtxt">xmlExpNewCtxt</a>		(int maxNodes, <br/>					 <a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
+<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpNewOr">xmlExpNewOr</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> left, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> right);
 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpNewRange">xmlExpNewRange</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> subset, <br/>					 int min, <br/>					 int max);
@@ -73,5 +68,10 @@
 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpNewRange">xmlExpNewRange</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> subset, <br/>					 int min, <br/>					 int max);
-<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a>	<a href="#xmlRegexpCompile">xmlRegexpCompile</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * regexp);
-<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpNewAtom">xmlExpNewAtom</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 int len);
-int	<a href="#xmlRegexpExec">xmlRegexpExec</a>			(<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a> comp, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpNewSeq">xmlExpNewSeq</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> left, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> right);
+<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpParse">xmlExpParse</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 const char * expr);
+void	<a href="#xmlExpRef">xmlExpRef</a>			(<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp);
+<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpStringDerive">xmlExpStringDerive</a>	(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int len);
+int	<a href="#xmlExpSubsume">xmlExpSubsume</a>			(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> sub);
+typedef void <a href="#xmlRegExecCallbacks">xmlRegExecCallbacks</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * token, <br/>					 void * transdata, <br/>					 void * inputdata);
+int	<a href="#xmlRegExecErrInfo">xmlRegExecErrInfo</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** string, <br/>					 int * nbval, <br/>					 int * nbneg, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** values, <br/>					 int * terminal);
+int	<a href="#xmlRegExecNextValues">xmlRegExecNextValues</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 int * nbval, <br/>					 int * nbneg, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** values, <br/>					 int * terminal);
 int	<a href="#xmlRegExecPushString">xmlRegExecPushString</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 void * data);
@@ -77,11 +77,11 @@
 int	<a href="#xmlRegExecPushString">xmlRegExecPushString</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 void * data);
-int	<a href="#xmlExpGetStart">xmlExpGetStart</a>			(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** tokList, <br/>					 int len);
-<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpParse">xmlExpParse</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 const char * expr);
-<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a>	<a href="#xmlExpNewCtxt">xmlExpNewCtxt</a>		(int maxNodes, <br/>					 <a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict);
-int	<a href="#xmlExpGetLanguage">xmlExpGetLanguage</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** langList, <br/>					 int len);
-<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a>	<a href="#xmlExpStringDerive">xmlExpStringDerive</a>	(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> exp, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int len);
-int	<a href="#xmlExpCtxtNbNodes">xmlExpCtxtNbNodes</a>		(<a href="libxml2-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt);
-int	<a href="#xmlExpMaxToken">xmlExpMaxToken</a>			(<a href="libxml2-xmlregexp.html#xmlExpNodePtr">xmlExpNodePtr</a> expr);
+int	<a href="#xmlRegExecPushString2">xmlRegExecPushString2</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value2, <br/>					 void * data);
+void	<a href="#xmlRegFreeExecCtxt">xmlRegFreeExecCtxt</a>		(<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a> exec);
+void	<a href="#xmlRegFreeRegexp">xmlRegFreeRegexp</a>		(<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a> regexp);
+<a href="libxml2-xmlregexp.html#xmlRegExecCtxtPtr">xmlRegExecCtxtPtr</a>	<a href="#xmlRegNewExecCtxt">xmlRegNewExecCtxt</a>	(<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a> comp, <br/>						 <a href="libxml2-xmlregexp.html#xmlRegExecCallbacks">xmlRegExecCallbacks</a> callback, <br/>						 void * data);
+<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a>	<a href="#xmlRegexpCompile">xmlRegexpCompile</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * regexp);
+int	<a href="#xmlRegexpExec">xmlRegexpExec</a>			(<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a> comp, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlRegexpIsDeterminist">xmlRegexpIsDeterminist</a>		(<a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a> comp);
 void	<a href="#xmlRegexpPrint">xmlRegexpPrint</a>			(FILE * output, <br/>					 <a href="libxml2-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a> regexp);
 </pre>
     </div>
diff --git a/doc/devhelp/libxml2-xmlsave.html b/doc/devhelp/libxml2-xmlsave.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxzYXZlLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxzYXZlLmh0bWw= 100644
--- a/doc/devhelp/libxml2-xmlsave.html
+++ b/doc/devhelp/libxml2-xmlsave.html
@@ -43,6 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef enum <a href="#xmlSaveOption">xmlSaveOption</a>;
-typedef struct _xmlSaveCtxt <a href="#xmlSaveCtxt">xmlSaveCtxt</a>;
+      <pre class="synopsis">typedef struct _xmlSaveCtxt <a href="#xmlSaveCtxt">xmlSaveCtxt</a>;
 typedef <a href="libxml2-xmlsave.html#xmlSaveCtxt">xmlSaveCtxt</a> * <a href="#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>;
@@ -48,4 +47,3 @@
 typedef <a href="libxml2-xmlsave.html#xmlSaveCtxt">xmlSaveCtxt</a> * <a href="#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>;
-<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>	<a href="#xmlSaveToIO">xmlSaveToIO</a>		(<a href="libxml2-xmlIO.html#xmlOutputWriteCallback">xmlOutputWriteCallback</a> iowrite, <br/>					 <a href="libxml2-xmlIO.html#xmlOutputCloseCallback">xmlOutputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * encoding, <br/>					 int options);
-<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>	<a href="#xmlSaveToFd">xmlSaveToFd</a>		(int fd, <br/>					 const char * encoding, <br/>					 int options);
+typedef enum <a href="#xmlSaveOption">xmlSaveOption</a>;
 int	<a href="#xmlSaveClose">xmlSaveClose</a>			(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt);
@@ -51,2 +49,4 @@
 int	<a href="#xmlSaveClose">xmlSaveClose</a>			(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt);
+long	<a href="#xmlSaveDoc">xmlSaveDoc</a>			(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+int	<a href="#xmlSaveFlush">xmlSaveFlush</a>			(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt);
 int	<a href="#xmlSaveSetAttrEscape">xmlSaveSetAttrEscape</a>		(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a> escape);
@@ -52,2 +52,3 @@
 int	<a href="#xmlSaveSetAttrEscape">xmlSaveSetAttrEscape</a>		(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a> escape);
+int	<a href="#xmlSaveSetEscape">xmlSaveSetEscape</a>		(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a> escape);
 <a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>	<a href="#xmlSaveToBuffer">xmlSaveToBuffer</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buffer, <br/>					 const char * encoding, <br/>					 int options);
@@ -53,2 +54,3 @@
 <a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>	<a href="#xmlSaveToBuffer">xmlSaveToBuffer</a>		(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buffer, <br/>					 const char * encoding, <br/>					 int options);
+<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>	<a href="#xmlSaveToFd">xmlSaveToFd</a>		(int fd, <br/>					 const char * encoding, <br/>					 int options);
 <a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>	<a href="#xmlSaveToFilename">xmlSaveToFilename</a>	(const char * filename, <br/>					 const char * encoding, <br/>					 int options);
@@ -54,7 +56,5 @@
 <a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>	<a href="#xmlSaveToFilename">xmlSaveToFilename</a>	(const char * filename, <br/>					 const char * encoding, <br/>					 int options);
-int	<a href="#xmlSaveFlush">xmlSaveFlush</a>			(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt);
-long	<a href="#xmlSaveDoc">xmlSaveDoc</a>			(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-int	<a href="#xmlSaveSetEscape">xmlSaveSetEscape</a>		(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-encoding.html#xmlCharEncodingOutputFunc">xmlCharEncodingOutputFunc</a> escape);
+<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a>	<a href="#xmlSaveToIO">xmlSaveToIO</a>		(<a href="libxml2-xmlIO.html#xmlOutputWriteCallback">xmlOutputWriteCallback</a> iowrite, <br/>					 <a href="libxml2-xmlIO.html#xmlOutputCloseCallback">xmlOutputCloseCallback</a> ioclose, <br/>					 void * ioctx, <br/>					 const char * encoding, <br/>					 int options);
 long	<a href="#xmlSaveTree">xmlSaveTree</a>			(<a href="libxml2-xmlsave.html#xmlSaveCtxtPtr">xmlSaveCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
 </pre>
     </div>
diff --git a/doc/devhelp/libxml2-xmlschemas.html b/doc/devhelp/libxml2-xmlschemas.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxzY2hlbWFzLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxzY2hlbWFzLmh0bWw= 100644
--- a/doc/devhelp/libxml2-xmlschemas.html
+++ b/doc/devhelp/libxml2-xmlschemas.html
@@ -43,5 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libxml2-xmlschemas.html#xmlSchema">xmlSchema</a> * <a href="#xmlSchemaPtr">xmlSchemaPtr</a>;
+      <pre class="synopsis">typedef struct _xmlSchema <a href="#xmlSchema">xmlSchema</a>;
 typedef struct _xmlSchemaParserCtxt <a href="#xmlSchemaParserCtxt">xmlSchemaParserCtxt</a>;
@@ -47,4 +47,5 @@
 typedef struct _xmlSchemaParserCtxt <a href="#xmlSchemaParserCtxt">xmlSchemaParserCtxt</a>;
-typedef enum <a href="#xmlSchemaValidOption">xmlSchemaValidOption</a>;
+typedef <a href="libxml2-xmlschemas.html#xmlSchemaParserCtxt">xmlSchemaParserCtxt</a> * <a href="#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a>;
+typedef <a href="libxml2-xmlschemas.html#xmlSchema">xmlSchema</a> * <a href="#xmlSchemaPtr">xmlSchemaPtr</a>;
 typedef <a href="libxml2-xmlschemas.html#xmlSchemaSAXPlugStruct">xmlSchemaSAXPlugStruct</a> * <a href="#xmlSchemaSAXPlugPtr">xmlSchemaSAXPlugPtr</a>;
 typedef struct _xmlSchemaSAXPlug <a href="#xmlSchemaSAXPlugStruct">xmlSchemaSAXPlugStruct</a>;
@@ -49,3 +50,4 @@
 typedef <a href="libxml2-xmlschemas.html#xmlSchemaSAXPlugStruct">xmlSchemaSAXPlugStruct</a> * <a href="#xmlSchemaSAXPlugPtr">xmlSchemaSAXPlugPtr</a>;
 typedef struct _xmlSchemaSAXPlug <a href="#xmlSchemaSAXPlugStruct">xmlSchemaSAXPlugStruct</a>;
+typedef struct _xmlSchemaValidCtxt <a href="#xmlSchemaValidCtxt">xmlSchemaValidCtxt</a>;
 typedef <a href="libxml2-xmlschemas.html#xmlSchemaValidCtxt">xmlSchemaValidCtxt</a> * <a href="#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a>;
@@ -51,4 +53,2 @@
 typedef <a href="libxml2-xmlschemas.html#xmlSchemaValidCtxt">xmlSchemaValidCtxt</a> * <a href="#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a>;
-typedef <a href="libxml2-xmlschemas.html#xmlSchemaParserCtxt">xmlSchemaParserCtxt</a> * <a href="#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a>;
-typedef struct _xmlSchema <a href="#xmlSchema">xmlSchema</a>;
 typedef enum <a href="#xmlSchemaValidError">xmlSchemaValidError</a>;
@@ -54,6 +54,5 @@
 typedef enum <a href="#xmlSchemaValidError">xmlSchemaValidError</a>;
-typedef struct _xmlSchemaValidCtxt <a href="#xmlSchemaValidCtxt">xmlSchemaValidCtxt</a>;
-<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a>	<a href="#xmlSchemaNewDocParserCtxt">xmlSchemaNewDocParserCtxt</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-int	<a href="#xmlSchemaSAXUnplug">xmlSchemaSAXUnplug</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaSAXPlugPtr">xmlSchemaSAXPlugPtr</a> plug);
-<a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a>	<a href="#xmlSchemaParse">xmlSchemaParse</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt);
+typedef enum <a href="#xmlSchemaValidOption">xmlSchemaValidOption</a>;
+void	<a href="#xmlSchemaDump">xmlSchemaDump</a>			(FILE * output, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a> schema);
+void	<a href="#xmlSchemaFree">xmlSchemaFree</a>			(<a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a> schema);
 void	<a href="#xmlSchemaFreeParserCtxt">xmlSchemaFreeParserCtxt</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt);
@@ -59,4 +58,5 @@
 void	<a href="#xmlSchemaFreeParserCtxt">xmlSchemaFreeParserCtxt</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt);
-void	<a href="#xmlSchemaValidateSetFilename">xmlSchemaValidateSetFilename</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> vctxt, <br/>					 const char * filename);
-<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a>	<a href="#xmlSchemaNewParserCtxt">xmlSchemaNewParserCtxt</a>	(const char * URL);
+void	<a href="#xmlSchemaFreeValidCtxt">xmlSchemaFreeValidCtxt</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt);
+int	<a href="#xmlSchemaGetParserErrors">xmlSchemaGetParserErrors</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a> * err, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a> * warn, <br/>					 void ** ctx);
+int	<a href="#xmlSchemaGetValidErrors">xmlSchemaGetValidErrors</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a> * err, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a> * warn, <br/>					 void ** ctx);
 int	<a href="#xmlSchemaIsValid">xmlSchemaIsValid</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt);
@@ -62,3 +62,7 @@
 int	<a href="#xmlSchemaIsValid">xmlSchemaIsValid</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt);
-typedef void <a href="#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
+<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a>	<a href="#xmlSchemaNewDocParserCtxt">xmlSchemaNewDocParserCtxt</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a>	<a href="#xmlSchemaNewMemParserCtxt">xmlSchemaNewMemParserCtxt</a>	(const char * buffer, <br/>							 int size);
+<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a>	<a href="#xmlSchemaNewParserCtxt">xmlSchemaNewParserCtxt</a>	(const char * URL);
+<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a>	<a href="#xmlSchemaNewValidCtxt">xmlSchemaNewValidCtxt</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a> schema);
+<a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a>	<a href="#xmlSchemaParse">xmlSchemaParse</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt);
 <a href="libxml2-xmlschemas.html#xmlSchemaSAXPlugPtr">xmlSchemaSAXPlugPtr</a>	<a href="#xmlSchemaSAXPlug">xmlSchemaSAXPlug</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> * sax, <br/>						 void ** user_data);
@@ -64,5 +68,12 @@
 <a href="libxml2-xmlschemas.html#xmlSchemaSAXPlugPtr">xmlSchemaSAXPlugPtr</a>	<a href="#xmlSchemaSAXPlug">xmlSchemaSAXPlug</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> * sax, <br/>						 void ** user_data);
-int	<a href="#xmlSchemaValidateStream">xmlSchemaValidateStream</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>					 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc, <br/>					 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data);
-int	<a href="#xmlSchemaGetParserErrors">xmlSchemaGetParserErrors</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a> * err, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a> * warn, <br/>					 void ** ctx);
-void	<a href="#xmlSchemaValidateSetLocator">xmlSchemaValidateSetLocator</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> vctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityLocatorFunc">xmlSchemaValidityLocatorFunc</a> f, <br/>					 void * ctxt);
+int	<a href="#xmlSchemaSAXUnplug">xmlSchemaSAXUnplug</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaSAXPlugPtr">xmlSchemaSAXPlugPtr</a> plug);
+void	<a href="#xmlSchemaSetParserErrors">xmlSchemaSetParserErrors</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a> err, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a> warn, <br/>					 void * ctx);
+void	<a href="#xmlSchemaSetParserStructuredErrors">xmlSchemaSetParserStructuredErrors</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
+void	<a href="#xmlSchemaSetValidErrors">xmlSchemaSetValidErrors</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a> err, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a> warn, <br/>					 void * ctx);
+int	<a href="#xmlSchemaSetValidOptions">xmlSchemaSetValidOptions</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 int options);
+void	<a href="#xmlSchemaSetValidStructuredErrors">xmlSchemaSetValidStructuredErrors</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
+int	<a href="#xmlSchemaValidCtxtGetOptions">xmlSchemaValidCtxtGetOptions</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt);
+<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlSchemaValidCtxtGetParserCtxt">xmlSchemaValidCtxtGetParserCtxt</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt);
+int	<a href="#xmlSchemaValidateDoc">xmlSchemaValidateDoc</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+int	<a href="#xmlSchemaValidateFile">xmlSchemaValidateFile</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 const char * filename, <br/>					 int options);
 int	<a href="#xmlSchemaValidateOneElement">xmlSchemaValidateOneElement</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
@@ -68,9 +79,6 @@
 int	<a href="#xmlSchemaValidateOneElement">xmlSchemaValidateOneElement</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem);
-void	<a href="#xmlSchemaSetValidStructuredErrors">xmlSchemaSetValidStructuredErrors</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
-void	<a href="#xmlSchemaSetValidErrors">xmlSchemaSetValidErrors</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a> err, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a> warn, <br/>					 void * ctx);
-int	<a href="#xmlSchemaValidCtxtGetOptions">xmlSchemaValidCtxtGetOptions</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt);
-int	<a href="#xmlSchemaValidateFile">xmlSchemaValidateFile</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 const char * filename, <br/>					 int options);
-int	<a href="#xmlSchemaValidateDoc">xmlSchemaValidateDoc</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-void	<a href="#xmlSchemaFree">xmlSchemaFree</a>			(<a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a> schema);
-<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a>	<a href="#xmlSchemaNewMemParserCtxt">xmlSchemaNewMemParserCtxt</a>	(const char * buffer, <br/>							 int size);
+void	<a href="#xmlSchemaValidateSetFilename">xmlSchemaValidateSetFilename</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> vctxt, <br/>					 const char * filename);
+void	<a href="#xmlSchemaValidateSetLocator">xmlSchemaValidateSetLocator</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> vctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityLocatorFunc">xmlSchemaValidityLocatorFunc</a> f, <br/>					 void * ctxt);
+int	<a href="#xmlSchemaValidateStream">xmlSchemaValidateStream</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/>					 <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc, <br/>					 <a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/>					 void * user_data);
+typedef void <a href="#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
 typedef int <a href="#xmlSchemaValidityLocatorFunc">xmlSchemaValidityLocatorFunc</a>	(void * ctx, <br/>					 const char ** file, <br/>					 unsigned long * line);
@@ -76,5 +84,2 @@
 typedef int <a href="#xmlSchemaValidityLocatorFunc">xmlSchemaValidityLocatorFunc</a>	(void * ctx, <br/>					 const char ** file, <br/>					 unsigned long * line);
-int	<a href="#xmlSchemaGetValidErrors">xmlSchemaGetValidErrors</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a> * err, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a> * warn, <br/>					 void ** ctx);
-int	<a href="#xmlSchemaSetValidOptions">xmlSchemaSetValidOptions</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt, <br/>					 int options);
-void	<a href="#xmlSchemaSetParserErrors">xmlSchemaSetParserErrors</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityErrorFunc">xmlSchemaValidityErrorFunc</a> err, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a> warn, <br/>					 void * ctx);
 typedef void <a href="#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
@@ -80,9 +85,4 @@
 typedef void <a href="#xmlSchemaValidityWarningFunc">xmlSchemaValidityWarningFunc</a>	(void * ctx, <br/>					 const char * msg, <br/>					 ... ...);
-void	<a href="#xmlSchemaDump">xmlSchemaDump</a>			(FILE * output, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a> schema);
-void	<a href="#xmlSchemaFreeValidCtxt">xmlSchemaFreeValidCtxt</a>		(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt);
-<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a>	<a href="#xmlSchemaValidCtxtGetParserCtxt">xmlSchemaValidCtxtGetParserCtxt</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a> ctxt);
-void	<a href="#xmlSchemaSetParserStructuredErrors">xmlSchemaSetParserStructuredErrors</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> ctxt, <br/>						 <a href="libxml2-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> serror, <br/>						 void * ctx);
-<a href="libxml2-xmlschemas.html#xmlSchemaValidCtxtPtr">xmlSchemaValidCtxtPtr</a>	<a href="#xmlSchemaNewValidCtxt">xmlSchemaNewValidCtxt</a>	(<a href="libxml2-xmlschemas.html#xmlSchemaPtr">xmlSchemaPtr</a> schema);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlschemastypes.html b/doc/devhelp/libxml2-xmlschemastypes.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxzY2hlbWFzdHlwZXMuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxzY2hlbWFzdHlwZXMuaHRtbA== 100644
--- a/doc/devhelp/libxml2-xmlschemastypes.html
+++ b/doc/devhelp/libxml2-xmlschemastypes.html
@@ -44,8 +44,14 @@
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
       <pre class="synopsis">typedef enum <a href="#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a>;
-int	<a href="#xmlSchemaValPredefTypeNode">xmlSchemaValPredefTypeNode</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> * val, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-int	<a href="#xmlSchemaGetCanonValueWhtsp">xmlSchemaGetCanonValueWhtsp</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** retValue, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> ws);
-int	<a href="#xmlSchemaValidateLengthFacetWhtsp">xmlSchemaValidateLengthFacetWhtsp</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>						 <a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a> valType, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>						 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>						 unsigned long * length, <br/>						 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> ws);
-int	<a href="#xmlSchemaIsBuiltInTypeFacet">xmlSchemaIsBuiltInTypeFacet</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>					 int facetType);
+int	<a href="#xmlSchemaCheckFacet">xmlSchemaCheckFacet</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> typeDecl, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> pctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+void	<a href="#xmlSchemaCleanupTypes">xmlSchemaCleanupTypes</a>		(void);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSchemaCollapseString">xmlSchemaCollapseString</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlSchemaCompareValues">xmlSchemaCompareValues</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> x, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> y);
+int	<a href="#xmlSchemaCompareValuesWhtsp">xmlSchemaCompareValuesWhtsp</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> x, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> xws, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> y, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> yws);
+<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaCopyValue">xmlSchemaCopyValue</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
+void	<a href="#xmlSchemaFreeFacet">xmlSchemaFreeFacet</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet);
+void	<a href="#xmlSchemaFreeValue">xmlSchemaFreeValue</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> value);
+<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a>	<a href="#xmlSchemaGetBuiltInListSimpleTypeItemType">xmlSchemaGetBuiltInListSimpleTypeItemType</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type);
+<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a>	<a href="#xmlSchemaGetBuiltInType">xmlSchemaGetBuiltInType</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a> type);
 int	<a href="#xmlSchemaGetCanonValue">xmlSchemaGetCanonValue</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** retValue);
@@ -51,7 +57,14 @@
 int	<a href="#xmlSchemaGetCanonValue">xmlSchemaGetCanonValue</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** retValue);
-<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a>	<a href="#xmlSchemaGetBuiltInListSimpleTypeItemType">xmlSchemaGetBuiltInListSimpleTypeItemType</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type);
-int	<a href="#xmlSchemaCompareValuesWhtsp">xmlSchemaCompareValuesWhtsp</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> x, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> xws, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> y, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> yws);
-int	<a href="#xmlSchemaValueGetAsBoolean">xmlSchemaValueGetAsBoolean</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSchemaCollapseString">xmlSchemaCollapseString</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlSchemaGetCanonValueWhtsp">xmlSchemaGetCanonValueWhtsp</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> ** retValue, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> ws);
+unsigned long	<a href="#xmlSchemaGetFacetValueAsULong">xmlSchemaGetFacetValueAsULong</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet);
+<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a>	<a href="#xmlSchemaGetPredefinedType">xmlSchemaGetPredefinedType</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns);
+<a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a>	<a href="#xmlSchemaGetValType">xmlSchemaGetValType</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
+void	<a href="#xmlSchemaInitTypes">xmlSchemaInitTypes</a>		(void);
+int	<a href="#xmlSchemaIsBuiltInTypeFacet">xmlSchemaIsBuiltInTypeFacet</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>					 int facetType);
+<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a>	<a href="#xmlSchemaNewFacet">xmlSchemaNewFacet</a>	(void);
+<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaNewNOTATIONValue">xmlSchemaNewNOTATIONValue</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns);
+<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaNewQNameValue">xmlSchemaNewQNameValue</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceName, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localName);
+<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaNewStringValue">xmlSchemaNewStringValue</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a> type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
+int	<a href="#xmlSchemaValPredefTypeNode">xmlSchemaValPredefTypeNode</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> * val, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
 int	<a href="#xmlSchemaValPredefTypeNodeNoNorm">xmlSchemaValPredefTypeNodeNoNorm</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>						 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> * val, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
 int	<a href="#xmlSchemaValidateFacet">xmlSchemaValidateFacet</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> base, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
@@ -56,6 +69,4 @@
 int	<a href="#xmlSchemaValPredefTypeNodeNoNorm">xmlSchemaValPredefTypeNodeNoNorm</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>						 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> * val, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
 int	<a href="#xmlSchemaValidateFacet">xmlSchemaValidateFacet</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> base, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
-<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a>	<a href="#xmlSchemaNewFacet">xmlSchemaNewFacet</a>	(void);
-int	<a href="#xmlSchemaValueAppend">xmlSchemaValueAppend</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> prev, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> cur);
-int	<a href="#xmlSchemaCompareValues">xmlSchemaCompareValues</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> x, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> y);
+int	<a href="#xmlSchemaValidateFacetWhtsp">xmlSchemaValidateFacetWhtsp</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> fws, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a> valType, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> ws);
 int	<a href="#xmlSchemaValidateLengthFacet">xmlSchemaValidateLengthFacet</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>					 unsigned long * length);
@@ -61,4 +72,4 @@
 int	<a href="#xmlSchemaValidateLengthFacet">xmlSchemaValidateLengthFacet</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>					 unsigned long * length);
-<a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a>	<a href="#xmlSchemaGetValType">xmlSchemaGetValType</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
-<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a>	<a href="#xmlSchemaGetPredefinedType">xmlSchemaGetPredefinedType</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns);
+int	<a href="#xmlSchemaValidateLengthFacetWhtsp">xmlSchemaValidateLengthFacetWhtsp</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>						 <a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a> valType, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>						 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>						 unsigned long * length, <br/>						 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> ws);
+int	<a href="#xmlSchemaValidateListSimpleTypeFacet">xmlSchemaValidateListSimpleTypeFacet</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>						 unsigned long actualLen, <br/>						 unsigned long * expectedLen);
 int	<a href="#xmlSchemaValidatePredefinedType">xmlSchemaValidatePredefinedType</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> * val);
@@ -64,6 +75,5 @@
 int	<a href="#xmlSchemaValidatePredefinedType">xmlSchemaValidatePredefinedType</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> * val);
-void	<a href="#xmlSchemaFreeFacet">xmlSchemaFreeFacet</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet);
-int	<a href="#xmlSchemaValidateListSimpleTypeFacet">xmlSchemaValidateListSimpleTypeFacet</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>						 unsigned long actualLen, <br/>						 unsigned long * expectedLen);
-unsigned long	<a href="#xmlSchemaGetFacetValueAsULong">xmlSchemaGetFacetValueAsULong</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet);
-void	<a href="#xmlSchemaFreeValue">xmlSchemaFreeValue</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> value);
+int	<a href="#xmlSchemaValueAppend">xmlSchemaValueAppend</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> prev, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> cur);
+int	<a href="#xmlSchemaValueGetAsBoolean">xmlSchemaValueGetAsBoolean</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSchemaValueGetAsString">xmlSchemaValueGetAsString</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaValueGetNext">xmlSchemaValueGetNext</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> cur);
@@ -69,7 +79,2 @@
 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaValueGetNext">xmlSchemaValueGetNext</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> cur);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSchemaValueGetAsString">xmlSchemaValueGetAsString</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
-<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaCopyValue">xmlSchemaCopyValue</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val);
-<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaNewNOTATIONValue">xmlSchemaNewNOTATIONValue</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns);
-<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaNewQNameValue">xmlSchemaNewQNameValue</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceName, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * localName);
-void	<a href="#xmlSchemaCleanupTypes">xmlSchemaCleanupTypes</a>		(void);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSchemaWhiteSpaceReplace">xmlSchemaWhiteSpaceReplace</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
@@ -75,9 +80,4 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlSchemaWhiteSpaceReplace">xmlSchemaWhiteSpaceReplace</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-<a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a>	<a href="#xmlSchemaNewStringValue">xmlSchemaNewStringValue</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a> type, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
-<a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a>	<a href="#xmlSchemaGetBuiltInType">xmlSchemaGetBuiltInType</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a> type);
-void	<a href="#xmlSchemaInitTypes">xmlSchemaInitTypes</a>		(void);
-int	<a href="#xmlSchemaValidateFacetWhtsp">xmlSchemaValidateFacetWhtsp</a>	(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> fws, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValType">xmlSchemaValType</a> valType, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaValPtr">xmlSchemaValPtr</a> val, <br/>					 <a href="libxml2-xmlschemastypes.html#xmlSchemaWhitespaceValueType">xmlSchemaWhitespaceValueType</a> ws);
-int	<a href="#xmlSchemaCheckFacet">xmlSchemaCheckFacet</a>		(<a href="libxml2-schemasInternals.html#xmlSchemaFacetPtr">xmlSchemaFacetPtr</a> facet, <br/>					 <a href="libxml2-schemasInternals.html#xmlSchemaTypePtr">xmlSchemaTypePtr</a> typeDecl, <br/>					 <a href="libxml2-xmlschemas.html#xmlSchemaParserCtxtPtr">xmlSchemaParserCtxtPtr</a> pctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlstring.html b/doc/devhelp/libxml2-xmlstring.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxzdHJpbmcuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWxzdHJpbmcuaHRtbA== 100644
--- a/doc/devhelp/libxml2-xmlstring.html
+++ b/doc/devhelp/libxml2-xmlstring.html
@@ -45,5 +45,5 @@
       <h2>Synopsis</h2>
       <pre class="synopsis">#define <a href="#BAD_CAST">BAD_CAST</a>;
 typedef unsigned char <a href="#xmlChar">xmlChar</a>;
-int	<a href="#xmlStrcmp">xmlStrcmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCharStrdup">xmlCharStrdup</a>		(const char * cur);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCharStrndup">xmlCharStrndup</a>		(const char * cur, <br/>					 int len);
@@ -49,3 +49,10 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCharStrndup">xmlCharStrndup</a>		(const char * cur, <br/>					 int len);
+int	<a href="#xmlCheckUTF8">xmlCheckUTF8</a>			(const unsigned char * utf);
+int	<a href="#xmlGetUTF8Char">xmlGetUTF8Char</a>			(const unsigned char * utf, <br/>					 int * len);
+int	<a href="#xmlStrEqual">xmlStrEqual</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2);
+int	<a href="#xmlStrPrintf">xmlStrPrintf</a>			(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * buf, <br/>					 int len, <br/>					 const char * msg, <br/>					 ... ...);
+int	<a href="#xmlStrQEqual">xmlStrQEqual</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pref, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
+int	<a href="#xmlStrVPrintf">xmlStrVPrintf</a>			(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * buf, <br/>					 int len, <br/>					 const char * msg, <br/>					 va_list ap);
+int	<a href="#xmlStrcasecmp">xmlStrcasecmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2);
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrcasestr">xmlStrcasestr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrcat">xmlStrcat</a>		(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * add);
@@ -50,9 +57,5 @@
 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrcasestr">xmlStrcasestr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrcat">xmlStrcat</a>		(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * add);
-int	<a href="#xmlStrPrintf">xmlStrPrintf</a>			(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * buf, <br/>					 int len, <br/>					 const char * msg, <br/>					 ... ...);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrstr">xmlStrstr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
-int	<a href="#xmlUTF8Size">xmlUTF8Size</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf);
-int	<a href="#xmlStrQEqual">xmlStrQEqual</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pref, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrncatNew">xmlStrncatNew</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2, <br/>					 int len);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlUTF8Strpos">xmlUTF8Strpos</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 int pos);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrchr">xmlStrchr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> val);
+int	<a href="#xmlStrcmp">xmlStrcmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrdup">xmlStrdup</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur);
@@ -58,4 +61,2 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrdup">xmlStrdup</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlCharStrdup">xmlCharStrdup</a>		(const char * cur);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrchr">xmlStrchr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> val);
 int	<a href="#xmlStrlen">xmlStrlen</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
@@ -61,4 +62,3 @@
 int	<a href="#xmlStrlen">xmlStrlen</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
-int	<a href="#xmlStrncmp">xmlStrncmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2, <br/>					 int len);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrsub">xmlStrsub</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int start, <br/>					 int len);
+int	<a href="#xmlStrncasecmp">xmlStrncasecmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2, <br/>					 int len);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrncat">xmlStrncat</a>		(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * add, <br/>					 int len);
@@ -64,4 +64,4 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrncat">xmlStrncat</a>		(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * add, <br/>					 int len);
-int	<a href="#xmlGetUTF8Char">xmlGetUTF8Char</a>			(const unsigned char * utf, <br/>					 int * len);
-int	<a href="#xmlStrcasecmp">xmlStrcasecmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrncatNew">xmlStrncatNew</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2, <br/>					 int len);
+int	<a href="#xmlStrncmp">xmlStrncmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2, <br/>					 int len);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrndup">xmlStrndup</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 int len);
@@ -67,3 +67,10 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrndup">xmlStrndup</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/>					 int len);
-int	<a href="#xmlStrVPrintf">xmlStrVPrintf</a>			(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * buf, <br/>					 int len, <br/>					 const char * msg, <br/>					 va_list ap);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrstr">xmlStrstr</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlStrsub">xmlStrsub</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 int start, <br/>					 int len);
+int	<a href="#xmlUTF8Charcmp">xmlUTF8Charcmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf2);
+int	<a href="#xmlUTF8Size">xmlUTF8Size</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf);
+int	<a href="#xmlUTF8Strlen">xmlUTF8Strlen</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf);
+int	<a href="#xmlUTF8Strloc">xmlUTF8Strloc</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utfchar);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlUTF8Strndup">xmlUTF8Strndup</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 int len);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlUTF8Strpos">xmlUTF8Strpos</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 int pos);
 int	<a href="#xmlUTF8Strsize">xmlUTF8Strsize</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 int len);
@@ -69,5 +76,2 @@
 int	<a href="#xmlUTF8Strsize">xmlUTF8Strsize</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 int len);
-int	<a href="#xmlCheckUTF8">xmlCheckUTF8</a>			(const unsigned char * utf);
-int	<a href="#xmlStrncasecmp">xmlStrncasecmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2, <br/>					 int len);
-int	<a href="#xmlUTF8Strlen">xmlUTF8Strlen</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlUTF8Strsub">xmlUTF8Strsub</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 int start, <br/>					 int len);
@@ -73,8 +77,4 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlUTF8Strsub">xmlUTF8Strsub</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 int start, <br/>					 int len);
-int	<a href="#xmlStrEqual">xmlStrEqual</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2);
-int	<a href="#xmlUTF8Charcmp">xmlUTF8Charcmp</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf1, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf2);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlUTF8Strndup">xmlUTF8Strndup</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 int len);
-int	<a href="#xmlUTF8Strloc">xmlUTF8Strloc</a>			(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utf, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * utfchar);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlunicode.html b/doc/devhelp/libxml2-xmlunicode.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWx1bmljb2RlLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWx1bmljb2RlLmh0bWw= 100644
--- a/doc/devhelp/libxml2-xmlunicode.html
+++ b/doc/devhelp/libxml2-xmlunicode.html
@@ -43,13 +43,11 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">int	<a href="#xmlUCSIsBlockElements">xmlUCSIsBlockElements</a>		(int code);
-int	<a href="#xmlUCSIsBopomofo">xmlUCSIsBopomofo</a>		(int code);
-int	<a href="#xmlUCSIsDingbats">xmlUCSIsDingbats</a>		(int code);
-int	<a href="#xmlUCSIsSuperscriptsandSubscripts">xmlUCSIsSuperscriptsandSubscripts</a>	(int code);
-int	<a href="#xmlUCSIsCombiningHalfMarks">xmlUCSIsCombiningHalfMarks</a>	(int code);
-int	<a href="#xmlUCSIsTibetan">xmlUCSIsTibetan</a>			(int code);
-int	<a href="#xmlUCSIsYiRadicals">xmlUCSIsYiRadicals</a>		(int code);
-int	<a href="#xmlUCSIsCombiningMarksforSymbols">xmlUCSIsCombiningMarksforSymbols</a>	(int code);
-int	<a href="#xmlUCSIsHangulSyllables">xmlUCSIsHangulSyllables</a>		(int code);
+      <pre class="synopsis">int	<a href="#xmlUCSIsAegeanNumbers">xmlUCSIsAegeanNumbers</a>		(int code);
+int	<a href="#xmlUCSIsAlphabeticPresentationForms">xmlUCSIsAlphabeticPresentationForms</a>	(int code);
+int	<a href="#xmlUCSIsArabic">xmlUCSIsArabic</a>			(int code);
+int	<a href="#xmlUCSIsArabicPresentationFormsA">xmlUCSIsArabicPresentationFormsA</a>	(int code);
+int	<a href="#xmlUCSIsArabicPresentationFormsB">xmlUCSIsArabicPresentationFormsB</a>	(int code);
+int	<a href="#xmlUCSIsArmenian">xmlUCSIsArmenian</a>		(int code);
+int	<a href="#xmlUCSIsArrows">xmlUCSIsArrows</a>			(int code);
 int	<a href="#xmlUCSIsBasicLatin">xmlUCSIsBasicLatin</a>		(int code);
@@ -55,20 +53,7 @@
 int	<a href="#xmlUCSIsBasicLatin">xmlUCSIsBasicLatin</a>		(int code);
-int	<a href="#xmlUCSIsCatSc">xmlUCSIsCatSc</a>			(int code);
-int	<a href="#xmlUCSIsCatSo">xmlUCSIsCatSo</a>			(int code);
-int	<a href="#xmlUCSIsLimbu">xmlUCSIsLimbu</a>			(int code);
-int	<a href="#xmlUCSIsCatSm">xmlUCSIsCatSm</a>			(int code);
-int	<a href="#xmlUCSIsCatSk">xmlUCSIsCatSk</a>			(int code);
-int	<a href="#xmlUCSIsKhmerSymbols">xmlUCSIsKhmerSymbols</a>		(int code);
-int	<a href="#xmlUCSIsMongolian">xmlUCSIsMongolian</a>		(int code);
-int	<a href="#xmlUCSIsMalayalam">xmlUCSIsMalayalam</a>		(int code);
-int	<a href="#xmlUCSIsMathematicalAlphanumericSymbols">xmlUCSIsMathematicalAlphanumericSymbols</a>	(int code);
-int	<a href="#xmlUCSIsThaana">xmlUCSIsThaana</a>			(int code);
-int	<a href="#xmlUCSIsMyanmar">xmlUCSIsMyanmar</a>			(int code);
-int	<a href="#xmlUCSIsTags">xmlUCSIsTags</a>			(int code);
-int	<a href="#xmlUCSIsCJKCompatibilityIdeographs">xmlUCSIsCJKCompatibilityIdeographs</a>	(int code);
-int	<a href="#xmlUCSIsTelugu">xmlUCSIsTelugu</a>			(int code);
-int	<a href="#xmlUCSIsLowSurrogates">xmlUCSIsLowSurrogates</a>		(int code);
-int	<a href="#xmlUCSIsOsmanya">xmlUCSIsOsmanya</a>			(int code);
-int	<a href="#xmlUCSIsSyriac">xmlUCSIsSyriac</a>			(int code);
-int	<a href="#xmlUCSIsEthiopic">xmlUCSIsEthiopic</a>		(int code);
+int	<a href="#xmlUCSIsBengali">xmlUCSIsBengali</a>			(int code);
+int	<a href="#xmlUCSIsBlock">xmlUCSIsBlock</a>			(int code, <br/>					 const char * block);
+int	<a href="#xmlUCSIsBlockElements">xmlUCSIsBlockElements</a>		(int code);
+int	<a href="#xmlUCSIsBopomofo">xmlUCSIsBopomofo</a>		(int code);
+int	<a href="#xmlUCSIsBopomofoExtended">xmlUCSIsBopomofoExtended</a>	(int code);
 int	<a href="#xmlUCSIsBoxDrawing">xmlUCSIsBoxDrawing</a>		(int code);
@@ -74,5 +59,4 @@
 int	<a href="#xmlUCSIsBoxDrawing">xmlUCSIsBoxDrawing</a>		(int code);
-int	<a href="#xmlUCSIsGreekExtended">xmlUCSIsGreekExtended</a>		(int code);
-int	<a href="#xmlUCSIsGreekandCoptic">xmlUCSIsGreekandCoptic</a>		(int code);
-int	<a href="#xmlUCSIsKannada">xmlUCSIsKannada</a>			(int code);
+int	<a href="#xmlUCSIsBraillePatterns">xmlUCSIsBraillePatterns</a>		(int code);
+int	<a href="#xmlUCSIsBuhid">xmlUCSIsBuhid</a>			(int code);
 int	<a href="#xmlUCSIsByzantineMusicalSymbols">xmlUCSIsByzantineMusicalSymbols</a>	(int code);
@@ -78,3 +62,3 @@
 int	<a href="#xmlUCSIsByzantineMusicalSymbols">xmlUCSIsByzantineMusicalSymbols</a>	(int code);
-int	<a href="#xmlUCSIsEnclosedCJKLettersandMonths">xmlUCSIsEnclosedCJKLettersandMonths</a>	(int code);
+int	<a href="#xmlUCSIsCJKCompatibility">xmlUCSIsCJKCompatibility</a>	(int code);
 int	<a href="#xmlUCSIsCJKCompatibilityForms">xmlUCSIsCJKCompatibilityForms</a>	(int code);
@@ -80,3 +64,4 @@
 int	<a href="#xmlUCSIsCJKCompatibilityForms">xmlUCSIsCJKCompatibilityForms</a>	(int code);
-int	<a href="#xmlUCSIsCatCs">xmlUCSIsCatCs</a>			(int code);
+int	<a href="#xmlUCSIsCJKCompatibilityIdeographs">xmlUCSIsCJKCompatibilityIdeographs</a>	(int code);
+int	<a href="#xmlUCSIsCJKCompatibilityIdeographsSupplement">xmlUCSIsCJKCompatibilityIdeographsSupplement</a>	(int code);
 int	<a href="#xmlUCSIsCJKRadicalsSupplement">xmlUCSIsCJKRadicalsSupplement</a>	(int code);
@@ -82,2 +67,9 @@
 int	<a href="#xmlUCSIsCJKRadicalsSupplement">xmlUCSIsCJKRadicalsSupplement</a>	(int code);
+int	<a href="#xmlUCSIsCJKSymbolsandPunctuation">xmlUCSIsCJKSymbolsandPunctuation</a>	(int code);
+int	<a href="#xmlUCSIsCJKUnifiedIdeographs">xmlUCSIsCJKUnifiedIdeographs</a>	(int code);
+int	<a href="#xmlUCSIsCJKUnifiedIdeographsExtensionA">xmlUCSIsCJKUnifiedIdeographsExtensionA</a>	(int code);
+int	<a href="#xmlUCSIsCJKUnifiedIdeographsExtensionB">xmlUCSIsCJKUnifiedIdeographsExtensionB</a>	(int code);
+int	<a href="#xmlUCSIsCat">xmlUCSIsCat</a>			(int code, <br/>					 const char * cat);
+int	<a href="#xmlUCSIsCatC">xmlUCSIsCatC</a>			(int code);
+int	<a href="#xmlUCSIsCatCc">xmlUCSIsCatCc</a>			(int code);
 int	<a href="#xmlUCSIsCatCf">xmlUCSIsCatCf</a>			(int code);
@@ -83,5 +75,2 @@
 int	<a href="#xmlUCSIsCatCf">xmlUCSIsCatCf</a>			(int code);
-int	<a href="#xmlUCSIsSmallFormVariants">xmlUCSIsSmallFormVariants</a>	(int code);
-int	<a href="#xmlUCSIsHangulCompatibilityJamo">xmlUCSIsHangulCompatibilityJamo</a>	(int code);
-int	<a href="#xmlUCSIsCatCc">xmlUCSIsCatCc</a>			(int code);
 int	<a href="#xmlUCSIsCatCo">xmlUCSIsCatCo</a>			(int code);
@@ -87,19 +76,16 @@
 int	<a href="#xmlUCSIsCatCo">xmlUCSIsCatCo</a>			(int code);
-int	<a href="#xmlUCSIsCherokee">xmlUCSIsCherokee</a>		(int code);
-int	<a href="#xmlUCSIsGothic">xmlUCSIsGothic</a>			(int code);
-int	<a href="#xmlUCSIsKhmer">xmlUCSIsKhmer</a>			(int code);
-int	<a href="#xmlUCSIsCombiningDiacriticalMarksforSymbols">xmlUCSIsCombiningDiacriticalMarksforSymbols</a>	(int code);
-int	<a href="#xmlUCSIsOgham">xmlUCSIsOgham</a>			(int code);
-int	<a href="#xmlUCSIsOriya">xmlUCSIsOriya</a>			(int code);
-int	<a href="#xmlUCSIsLinearBIdeograms">xmlUCSIsLinearBIdeograms</a>	(int code);
-int	<a href="#xmlUCSIsBlock">xmlUCSIsBlock</a>			(int code, <br/>					 const char * block);
-int	<a href="#xmlUCSIsBopomofoExtended">xmlUCSIsBopomofoExtended</a>	(int code);
-int	<a href="#xmlUCSIsHangulJamo">xmlUCSIsHangulJamo</a>		(int code);
-int	<a href="#xmlUCSIsTagbanwa">xmlUCSIsTagbanwa</a>		(int code);
-int	<a href="#xmlUCSIsGeneralPunctuation">xmlUCSIsGeneralPunctuation</a>	(int code);
-int	<a href="#xmlUCSIsCyrillic">xmlUCSIsCyrillic</a>		(int code);
-int	<a href="#xmlUCSIsArrows">xmlUCSIsArrows</a>			(int code);
-int	<a href="#xmlUCSIsControlPictures">xmlUCSIsControlPictures</a>		(int code);
-int	<a href="#xmlUCSIsCJKUnifiedIdeographs">xmlUCSIsCJKUnifiedIdeographs</a>	(int code);
+int	<a href="#xmlUCSIsCatCs">xmlUCSIsCatCs</a>			(int code);
+int	<a href="#xmlUCSIsCatL">xmlUCSIsCatL</a>			(int code);
+int	<a href="#xmlUCSIsCatLl">xmlUCSIsCatLl</a>			(int code);
+int	<a href="#xmlUCSIsCatLm">xmlUCSIsCatLm</a>			(int code);
+int	<a href="#xmlUCSIsCatLo">xmlUCSIsCatLo</a>			(int code);
+int	<a href="#xmlUCSIsCatLt">xmlUCSIsCatLt</a>			(int code);
+int	<a href="#xmlUCSIsCatLu">xmlUCSIsCatLu</a>			(int code);
+int	<a href="#xmlUCSIsCatM">xmlUCSIsCatM</a>			(int code);
+int	<a href="#xmlUCSIsCatMc">xmlUCSIsCatMc</a>			(int code);
+int	<a href="#xmlUCSIsCatMe">xmlUCSIsCatMe</a>			(int code);
+int	<a href="#xmlUCSIsCatMn">xmlUCSIsCatMn</a>			(int code);
+int	<a href="#xmlUCSIsCatN">xmlUCSIsCatN</a>			(int code);
+int	<a href="#xmlUCSIsCatNd">xmlUCSIsCatNd</a>			(int code);
 int	<a href="#xmlUCSIsCatNl">xmlUCSIsCatNl</a>			(int code);
 int	<a href="#xmlUCSIsCatNo">xmlUCSIsCatNo</a>			(int code);
@@ -104,17 +90,4 @@
 int	<a href="#xmlUCSIsCatNl">xmlUCSIsCatNl</a>			(int code);
 int	<a href="#xmlUCSIsCatNo">xmlUCSIsCatNo</a>			(int code);
-int	<a href="#xmlUCSIsYijingHexagramSymbols">xmlUCSIsYijingHexagramSymbols</a>	(int code);
-int	<a href="#xmlUCSIsVariationSelectorsSupplement">xmlUCSIsVariationSelectorsSupplement</a>	(int code);
-int	<a href="#xmlUCSIsBengali">xmlUCSIsBengali</a>			(int code);
-int	<a href="#xmlUCSIsPrivateUse">xmlUCSIsPrivateUse</a>		(int code);
-int	<a href="#xmlUCSIsMusicalSymbols">xmlUCSIsMusicalSymbols</a>		(int code);
-int	<a href="#xmlUCSIsMiscellaneousSymbols">xmlUCSIsMiscellaneousSymbols</a>	(int code);
-int	<a href="#xmlUCSIsCJKCompatibility">xmlUCSIsCJKCompatibility</a>	(int code);
-int	<a href="#xmlUCSIsAegeanNumbers">xmlUCSIsAegeanNumbers</a>		(int code);
-int	<a href="#xmlUCSIsDevanagari">xmlUCSIsDevanagari</a>		(int code);
-int	<a href="#xmlUCSIsSupplementalArrowsA">xmlUCSIsSupplementalArrowsA</a>	(int code);
-int	<a href="#xmlUCSIsSupplementalArrowsB">xmlUCSIsSupplementalArrowsB</a>	(int code);
-int	<a href="#xmlUCSIsNumberForms">xmlUCSIsNumberForms</a>		(int code);
-int	<a href="#xmlUCSIsSpacingModifierLetters">xmlUCSIsSpacingModifierLetters</a>	(int code);
-int	<a href="#xmlUCSIsOpticalCharacterRecognition">xmlUCSIsOpticalCharacterRecognition</a>	(int code);
+int	<a href="#xmlUCSIsCatP">xmlUCSIsCatP</a>			(int code);
 int	<a href="#xmlUCSIsCatPc">xmlUCSIsCatPc</a>			(int code);
@@ -120,2 +93,4 @@
 int	<a href="#xmlUCSIsCatPc">xmlUCSIsCatPc</a>			(int code);
+int	<a href="#xmlUCSIsCatPd">xmlUCSIsCatPd</a>			(int code);
+int	<a href="#xmlUCSIsCatPe">xmlUCSIsCatPe</a>			(int code);
 int	<a href="#xmlUCSIsCatPf">xmlUCSIsCatPf</a>			(int code);
@@ -121,5 +96,3 @@
 int	<a href="#xmlUCSIsCatPf">xmlUCSIsCatPf</a>			(int code);
-int	<a href="#xmlUCSIsCyrillicSupplement">xmlUCSIsCyrillicSupplement</a>	(int code);
-int	<a href="#xmlUCSIsCatPd">xmlUCSIsCatPd</a>			(int code);
 int	<a href="#xmlUCSIsCatPi">xmlUCSIsCatPi</a>			(int code);
 int	<a href="#xmlUCSIsCatPo">xmlUCSIsCatPo</a>			(int code);
@@ -124,5 +97,3 @@
 int	<a href="#xmlUCSIsCatPi">xmlUCSIsCatPi</a>			(int code);
 int	<a href="#xmlUCSIsCatPo">xmlUCSIsCatPo</a>			(int code);
-int	<a href="#xmlUCSIsHighPrivateUseSurrogates">xmlUCSIsHighPrivateUseSurrogates</a>	(int code);
-int	<a href="#xmlUCSIsLatinExtendedAdditional">xmlUCSIsLatinExtendedAdditional</a>	(int code);
 int	<a href="#xmlUCSIsCatPs">xmlUCSIsCatPs</a>			(int code);
@@ -128,28 +99,2 @@
 int	<a href="#xmlUCSIsCatPs">xmlUCSIsCatPs</a>			(int code);
-int	<a href="#xmlUCSIsHighSurrogates">xmlUCSIsHighSurrogates</a>		(int code);
-int	<a href="#xmlUCSIsLao">xmlUCSIsLao</a>			(int code);
-int	<a href="#xmlUCSIsBraillePatterns">xmlUCSIsBraillePatterns</a>		(int code);
-int	<a href="#xmlUCSIsDeseret">xmlUCSIsDeseret</a>			(int code);
-int	<a href="#xmlUCSIsEnclosedAlphanumerics">xmlUCSIsEnclosedAlphanumerics</a>	(int code);
-int	<a href="#xmlUCSIsCombiningDiacriticalMarks">xmlUCSIsCombiningDiacriticalMarks</a>	(int code);
-int	<a href="#xmlUCSIsIdeographicDescriptionCharacters">xmlUCSIsIdeographicDescriptionCharacters</a>	(int code);
-int	<a href="#xmlUCSIsPrivateUseArea">xmlUCSIsPrivateUseArea</a>		(int code);
-int	<a href="#xmlUCSIsCat">xmlUCSIsCat</a>			(int code, <br/>					 const char * cat);
-int	<a href="#xmlUCSIsCatLu">xmlUCSIsCatLu</a>			(int code);
-int	<a href="#xmlUCSIsCatLt">xmlUCSIsCatLt</a>			(int code);
-int	<a href="#xmlUCSIsYiSyllables">xmlUCSIsYiSyllables</a>		(int code);
-int	<a href="#xmlUCSIsShavian">xmlUCSIsShavian</a>			(int code);
-int	<a href="#xmlUCSIsCatLo">xmlUCSIsCatLo</a>			(int code);
-int	<a href="#xmlUCSIsCatLm">xmlUCSIsCatLm</a>			(int code);
-int	<a href="#xmlUCSIsCatLl">xmlUCSIsCatLl</a>			(int code);
-int	<a href="#xmlUCSIsMiscellaneousTechnical">xmlUCSIsMiscellaneousTechnical</a>	(int code);
-int	<a href="#xmlUCSIsUgaritic">xmlUCSIsUgaritic</a>		(int code);
-int	<a href="#xmlUCSIsCJKCompatibilityIdeographsSupplement">xmlUCSIsCJKCompatibilityIdeographsSupplement</a>	(int code);
-int	<a href="#xmlUCSIsCypriotSyllabary">xmlUCSIsCypriotSyllabary</a>	(int code);
-int	<a href="#xmlUCSIsTamil">xmlUCSIsTamil</a>			(int code);
-int	<a href="#xmlUCSIsCatC">xmlUCSIsCatC</a>			(int code);
-int	<a href="#xmlUCSIsCatN">xmlUCSIsCatN</a>			(int code);
-int	<a href="#xmlUCSIsCatL">xmlUCSIsCatL</a>			(int code);
-int	<a href="#xmlUCSIsCatM">xmlUCSIsCatM</a>			(int code);
-int	<a href="#xmlUCSIsUnifiedCanadianAboriginalSyllabics">xmlUCSIsUnifiedCanadianAboriginalSyllabics</a>	(int code);
 int	<a href="#xmlUCSIsCatS">xmlUCSIsCatS</a>			(int code);
@@ -155,5 +100,6 @@
 int	<a href="#xmlUCSIsCatS">xmlUCSIsCatS</a>			(int code);
-int	<a href="#xmlUCSIsCatP">xmlUCSIsCatP</a>			(int code);
-int	<a href="#xmlUCSIsSinhala">xmlUCSIsSinhala</a>			(int code);
-int	<a href="#xmlUCSIsGeorgian">xmlUCSIsGeorgian</a>		(int code);
+int	<a href="#xmlUCSIsCatSc">xmlUCSIsCatSc</a>			(int code);
+int	<a href="#xmlUCSIsCatSk">xmlUCSIsCatSk</a>			(int code);
+int	<a href="#xmlUCSIsCatSm">xmlUCSIsCatSm</a>			(int code);
+int	<a href="#xmlUCSIsCatSo">xmlUCSIsCatSo</a>			(int code);
 int	<a href="#xmlUCSIsCatZ">xmlUCSIsCatZ</a>			(int code);
@@ -159,18 +105,4 @@
 int	<a href="#xmlUCSIsCatZ">xmlUCSIsCatZ</a>			(int code);
-int	<a href="#xmlUCSIsIPAExtensions">xmlUCSIsIPAExtensions</a>		(int code);
-int	<a href="#xmlUCSIsKangxiRadicals">xmlUCSIsKangxiRadicals</a>		(int code);
-int	<a href="#xmlUCSIsGreek">xmlUCSIsGreek</a>			(int code);
-int	<a href="#xmlUCSIsCatPe">xmlUCSIsCatPe</a>			(int code);
-int	<a href="#xmlUCSIsHanunoo">xmlUCSIsHanunoo</a>			(int code);
-int	<a href="#xmlUCSIsArmenian">xmlUCSIsArmenian</a>		(int code);
-int	<a href="#xmlUCSIsSupplementaryPrivateUseAreaB">xmlUCSIsSupplementaryPrivateUseAreaB</a>	(int code);
-int	<a href="#xmlUCSIsSupplementaryPrivateUseAreaA">xmlUCSIsSupplementaryPrivateUseAreaA</a>	(int code);
-int	<a href="#xmlUCSIsKatakanaPhoneticExtensions">xmlUCSIsKatakanaPhoneticExtensions</a>	(int code);
-int	<a href="#xmlUCSIsLetterlikeSymbols">xmlUCSIsLetterlikeSymbols</a>	(int code);
-int	<a href="#xmlUCSIsPhoneticExtensions">xmlUCSIsPhoneticExtensions</a>	(int code);
-int	<a href="#xmlUCSIsArabic">xmlUCSIsArabic</a>			(int code);
-int	<a href="#xmlUCSIsHebrew">xmlUCSIsHebrew</a>			(int code);
-int	<a href="#xmlUCSIsOldItalic">xmlUCSIsOldItalic</a>		(int code);
-int	<a href="#xmlUCSIsArabicPresentationFormsA">xmlUCSIsArabicPresentationFormsA</a>	(int code);
+int	<a href="#xmlUCSIsCatZl">xmlUCSIsCatZl</a>			(int code);
 int	<a href="#xmlUCSIsCatZp">xmlUCSIsCatZp</a>			(int code);
 int	<a href="#xmlUCSIsCatZs">xmlUCSIsCatZs</a>			(int code);
@@ -175,4 +107,20 @@
 int	<a href="#xmlUCSIsCatZp">xmlUCSIsCatZp</a>			(int code);
 int	<a href="#xmlUCSIsCatZs">xmlUCSIsCatZs</a>			(int code);
-int	<a href="#xmlUCSIsArabicPresentationFormsB">xmlUCSIsArabicPresentationFormsB</a>	(int code);
+int	<a href="#xmlUCSIsCherokee">xmlUCSIsCherokee</a>		(int code);
+int	<a href="#xmlUCSIsCombiningDiacriticalMarks">xmlUCSIsCombiningDiacriticalMarks</a>	(int code);
+int	<a href="#xmlUCSIsCombiningDiacriticalMarksforSymbols">xmlUCSIsCombiningDiacriticalMarksforSymbols</a>	(int code);
+int	<a href="#xmlUCSIsCombiningHalfMarks">xmlUCSIsCombiningHalfMarks</a>	(int code);
+int	<a href="#xmlUCSIsCombiningMarksforSymbols">xmlUCSIsCombiningMarksforSymbols</a>	(int code);
+int	<a href="#xmlUCSIsControlPictures">xmlUCSIsControlPictures</a>		(int code);
+int	<a href="#xmlUCSIsCurrencySymbols">xmlUCSIsCurrencySymbols</a>		(int code);
+int	<a href="#xmlUCSIsCypriotSyllabary">xmlUCSIsCypriotSyllabary</a>	(int code);
+int	<a href="#xmlUCSIsCyrillic">xmlUCSIsCyrillic</a>		(int code);
+int	<a href="#xmlUCSIsCyrillicSupplement">xmlUCSIsCyrillicSupplement</a>	(int code);
+int	<a href="#xmlUCSIsDeseret">xmlUCSIsDeseret</a>			(int code);
+int	<a href="#xmlUCSIsDevanagari">xmlUCSIsDevanagari</a>		(int code);
+int	<a href="#xmlUCSIsDingbats">xmlUCSIsDingbats</a>		(int code);
+int	<a href="#xmlUCSIsEnclosedAlphanumerics">xmlUCSIsEnclosedAlphanumerics</a>	(int code);
+int	<a href="#xmlUCSIsEnclosedCJKLettersandMonths">xmlUCSIsEnclosedCJKLettersandMonths</a>	(int code);
+int	<a href="#xmlUCSIsEthiopic">xmlUCSIsEthiopic</a>		(int code);
+int	<a href="#xmlUCSIsGeneralPunctuation">xmlUCSIsGeneralPunctuation</a>	(int code);
 int	<a href="#xmlUCSIsGeometricShapes">xmlUCSIsGeometricShapes</a>		(int code);
@@ -178,5 +126,7 @@
 int	<a href="#xmlUCSIsGeometricShapes">xmlUCSIsGeometricShapes</a>		(int code);
-int	<a href="#xmlUCSIsCatZl">xmlUCSIsCatZl</a>			(int code);
-int	<a href="#xmlUCSIsTagalog">xmlUCSIsTagalog</a>			(int code);
-int	<a href="#xmlUCSIsSpecials">xmlUCSIsSpecials</a>		(int code);
+int	<a href="#xmlUCSIsGeorgian">xmlUCSIsGeorgian</a>		(int code);
+int	<a href="#xmlUCSIsGothic">xmlUCSIsGothic</a>			(int code);
+int	<a href="#xmlUCSIsGreek">xmlUCSIsGreek</a>			(int code);
+int	<a href="#xmlUCSIsGreekExtended">xmlUCSIsGreekExtended</a>		(int code);
+int	<a href="#xmlUCSIsGreekandCoptic">xmlUCSIsGreekandCoptic</a>		(int code);
 int	<a href="#xmlUCSIsGujarati">xmlUCSIsGujarati</a>		(int code);
@@ -182,3 +132,3 @@
 int	<a href="#xmlUCSIsGujarati">xmlUCSIsGujarati</a>		(int code);
-int	<a href="#xmlUCSIsKatakana">xmlUCSIsKatakana</a>		(int code);
+int	<a href="#xmlUCSIsGurmukhi">xmlUCSIsGurmukhi</a>		(int code);
 int	<a href="#xmlUCSIsHalfwidthandFullwidthForms">xmlUCSIsHalfwidthandFullwidthForms</a>	(int code);
@@ -184,3 +134,21 @@
 int	<a href="#xmlUCSIsHalfwidthandFullwidthForms">xmlUCSIsHalfwidthandFullwidthForms</a>	(int code);
-int	<a href="#xmlUCSIsLatinExtendedB">xmlUCSIsLatinExtendedB</a>		(int code);
+int	<a href="#xmlUCSIsHangulCompatibilityJamo">xmlUCSIsHangulCompatibilityJamo</a>	(int code);
+int	<a href="#xmlUCSIsHangulJamo">xmlUCSIsHangulJamo</a>		(int code);
+int	<a href="#xmlUCSIsHangulSyllables">xmlUCSIsHangulSyllables</a>		(int code);
+int	<a href="#xmlUCSIsHanunoo">xmlUCSIsHanunoo</a>			(int code);
+int	<a href="#xmlUCSIsHebrew">xmlUCSIsHebrew</a>			(int code);
+int	<a href="#xmlUCSIsHighPrivateUseSurrogates">xmlUCSIsHighPrivateUseSurrogates</a>	(int code);
+int	<a href="#xmlUCSIsHighSurrogates">xmlUCSIsHighSurrogates</a>		(int code);
+int	<a href="#xmlUCSIsHiragana">xmlUCSIsHiragana</a>		(int code);
+int	<a href="#xmlUCSIsIPAExtensions">xmlUCSIsIPAExtensions</a>		(int code);
+int	<a href="#xmlUCSIsIdeographicDescriptionCharacters">xmlUCSIsIdeographicDescriptionCharacters</a>	(int code);
+int	<a href="#xmlUCSIsKanbun">xmlUCSIsKanbun</a>			(int code);
+int	<a href="#xmlUCSIsKangxiRadicals">xmlUCSIsKangxiRadicals</a>		(int code);
+int	<a href="#xmlUCSIsKannada">xmlUCSIsKannada</a>			(int code);
+int	<a href="#xmlUCSIsKatakana">xmlUCSIsKatakana</a>		(int code);
+int	<a href="#xmlUCSIsKatakanaPhoneticExtensions">xmlUCSIsKatakanaPhoneticExtensions</a>	(int code);
+int	<a href="#xmlUCSIsKhmer">xmlUCSIsKhmer</a>			(int code);
+int	<a href="#xmlUCSIsKhmerSymbols">xmlUCSIsKhmerSymbols</a>		(int code);
+int	<a href="#xmlUCSIsLao">xmlUCSIsLao</a>			(int code);
+int	<a href="#xmlUCSIsLatin1Supplement">xmlUCSIsLatin1Supplement</a>	(int code);
 int	<a href="#xmlUCSIsLatinExtendedA">xmlUCSIsLatinExtendedA</a>		(int code);
@@ -186,8 +154,11 @@
 int	<a href="#xmlUCSIsLatinExtendedA">xmlUCSIsLatinExtendedA</a>		(int code);
-int	<a href="#xmlUCSIsBuhid">xmlUCSIsBuhid</a>			(int code);
-int	<a href="#xmlUCSIsMiscellaneousSymbolsandArrows">xmlUCSIsMiscellaneousSymbolsandArrows</a>	(int code);
-int	<a href="#xmlUCSIsTaiLe">xmlUCSIsTaiLe</a>			(int code);
-int	<a href="#xmlUCSIsCJKSymbolsandPunctuation">xmlUCSIsCJKSymbolsandPunctuation</a>	(int code);
-int	<a href="#xmlUCSIsTaiXuanJingSymbols">xmlUCSIsTaiXuanJingSymbols</a>	(int code);
-int	<a href="#xmlUCSIsGurmukhi">xmlUCSIsGurmukhi</a>		(int code);
+int	<a href="#xmlUCSIsLatinExtendedAdditional">xmlUCSIsLatinExtendedAdditional</a>	(int code);
+int	<a href="#xmlUCSIsLatinExtendedB">xmlUCSIsLatinExtendedB</a>		(int code);
+int	<a href="#xmlUCSIsLetterlikeSymbols">xmlUCSIsLetterlikeSymbols</a>	(int code);
+int	<a href="#xmlUCSIsLimbu">xmlUCSIsLimbu</a>			(int code);
+int	<a href="#xmlUCSIsLinearBIdeograms">xmlUCSIsLinearBIdeograms</a>	(int code);
+int	<a href="#xmlUCSIsLinearBSyllabary">xmlUCSIsLinearBSyllabary</a>	(int code);
+int	<a href="#xmlUCSIsLowSurrogates">xmlUCSIsLowSurrogates</a>		(int code);
+int	<a href="#xmlUCSIsMalayalam">xmlUCSIsMalayalam</a>		(int code);
+int	<a href="#xmlUCSIsMathematicalAlphanumericSymbols">xmlUCSIsMathematicalAlphanumericSymbols</a>	(int code);
 int	<a href="#xmlUCSIsMathematicalOperators">xmlUCSIsMathematicalOperators</a>	(int code);
@@ -193,9 +164,19 @@
 int	<a href="#xmlUCSIsMathematicalOperators">xmlUCSIsMathematicalOperators</a>	(int code);
-int	<a href="#xmlUCSIsAlphabeticPresentationForms">xmlUCSIsAlphabeticPresentationForms</a>	(int code);
-int	<a href="#xmlUCSIsCurrencySymbols">xmlUCSIsCurrencySymbols</a>		(int code);
-int	<a href="#xmlUCSIsSupplementalMathematicalOperators">xmlUCSIsSupplementalMathematicalOperators</a>	(int code);
-int	<a href="#xmlUCSIsCJKUnifiedIdeographsExtensionA">xmlUCSIsCJKUnifiedIdeographsExtensionA</a>	(int code);
-int	<a href="#xmlUCSIsKanbun">xmlUCSIsKanbun</a>			(int code);
-int	<a href="#xmlUCSIsCJKUnifiedIdeographsExtensionB">xmlUCSIsCJKUnifiedIdeographsExtensionB</a>	(int code);
-int	<a href="#xmlUCSIsThai">xmlUCSIsThai</a>			(int code);
+int	<a href="#xmlUCSIsMiscellaneousMathematicalSymbolsA">xmlUCSIsMiscellaneousMathematicalSymbolsA</a>	(int code);
+int	<a href="#xmlUCSIsMiscellaneousMathematicalSymbolsB">xmlUCSIsMiscellaneousMathematicalSymbolsB</a>	(int code);
+int	<a href="#xmlUCSIsMiscellaneousSymbols">xmlUCSIsMiscellaneousSymbols</a>	(int code);
+int	<a href="#xmlUCSIsMiscellaneousSymbolsandArrows">xmlUCSIsMiscellaneousSymbolsandArrows</a>	(int code);
+int	<a href="#xmlUCSIsMiscellaneousTechnical">xmlUCSIsMiscellaneousTechnical</a>	(int code);
+int	<a href="#xmlUCSIsMongolian">xmlUCSIsMongolian</a>		(int code);
+int	<a href="#xmlUCSIsMusicalSymbols">xmlUCSIsMusicalSymbols</a>		(int code);
+int	<a href="#xmlUCSIsMyanmar">xmlUCSIsMyanmar</a>			(int code);
+int	<a href="#xmlUCSIsNumberForms">xmlUCSIsNumberForms</a>		(int code);
+int	<a href="#xmlUCSIsOgham">xmlUCSIsOgham</a>			(int code);
+int	<a href="#xmlUCSIsOldItalic">xmlUCSIsOldItalic</a>		(int code);
+int	<a href="#xmlUCSIsOpticalCharacterRecognition">xmlUCSIsOpticalCharacterRecognition</a>	(int code);
+int	<a href="#xmlUCSIsOriya">xmlUCSIsOriya</a>			(int code);
+int	<a href="#xmlUCSIsOsmanya">xmlUCSIsOsmanya</a>			(int code);
+int	<a href="#xmlUCSIsPhoneticExtensions">xmlUCSIsPhoneticExtensions</a>	(int code);
+int	<a href="#xmlUCSIsPrivateUse">xmlUCSIsPrivateUse</a>		(int code);
+int	<a href="#xmlUCSIsPrivateUseArea">xmlUCSIsPrivateUseArea</a>		(int code);
 int	<a href="#xmlUCSIsRunic">xmlUCSIsRunic</a>			(int code);
@@ -201,9 +182,26 @@
 int	<a href="#xmlUCSIsRunic">xmlUCSIsRunic</a>			(int code);
-int	<a href="#xmlUCSIsCatNd">xmlUCSIsCatNd</a>			(int code);
-int	<a href="#xmlUCSIsLatin1Supplement">xmlUCSIsLatin1Supplement</a>	(int code);
-int	<a href="#xmlUCSIsLinearBSyllabary">xmlUCSIsLinearBSyllabary</a>	(int code);
-int	<a href="#xmlUCSIsHiragana">xmlUCSIsHiragana</a>		(int code);
-int	<a href="#xmlUCSIsMiscellaneousMathematicalSymbolsB">xmlUCSIsMiscellaneousMathematicalSymbolsB</a>	(int code);
-int	<a href="#xmlUCSIsMiscellaneousMathematicalSymbolsA">xmlUCSIsMiscellaneousMathematicalSymbolsA</a>	(int code);
-int	<a href="#xmlUCSIsCatMn">xmlUCSIsCatMn</a>			(int code);
+int	<a href="#xmlUCSIsShavian">xmlUCSIsShavian</a>			(int code);
+int	<a href="#xmlUCSIsSinhala">xmlUCSIsSinhala</a>			(int code);
+int	<a href="#xmlUCSIsSmallFormVariants">xmlUCSIsSmallFormVariants</a>	(int code);
+int	<a href="#xmlUCSIsSpacingModifierLetters">xmlUCSIsSpacingModifierLetters</a>	(int code);
+int	<a href="#xmlUCSIsSpecials">xmlUCSIsSpecials</a>		(int code);
+int	<a href="#xmlUCSIsSuperscriptsandSubscripts">xmlUCSIsSuperscriptsandSubscripts</a>	(int code);
+int	<a href="#xmlUCSIsSupplementalArrowsA">xmlUCSIsSupplementalArrowsA</a>	(int code);
+int	<a href="#xmlUCSIsSupplementalArrowsB">xmlUCSIsSupplementalArrowsB</a>	(int code);
+int	<a href="#xmlUCSIsSupplementalMathematicalOperators">xmlUCSIsSupplementalMathematicalOperators</a>	(int code);
+int	<a href="#xmlUCSIsSupplementaryPrivateUseAreaA">xmlUCSIsSupplementaryPrivateUseAreaA</a>	(int code);
+int	<a href="#xmlUCSIsSupplementaryPrivateUseAreaB">xmlUCSIsSupplementaryPrivateUseAreaB</a>	(int code);
+int	<a href="#xmlUCSIsSyriac">xmlUCSIsSyriac</a>			(int code);
+int	<a href="#xmlUCSIsTagalog">xmlUCSIsTagalog</a>			(int code);
+int	<a href="#xmlUCSIsTagbanwa">xmlUCSIsTagbanwa</a>		(int code);
+int	<a href="#xmlUCSIsTags">xmlUCSIsTags</a>			(int code);
+int	<a href="#xmlUCSIsTaiLe">xmlUCSIsTaiLe</a>			(int code);
+int	<a href="#xmlUCSIsTaiXuanJingSymbols">xmlUCSIsTaiXuanJingSymbols</a>	(int code);
+int	<a href="#xmlUCSIsTamil">xmlUCSIsTamil</a>			(int code);
+int	<a href="#xmlUCSIsTelugu">xmlUCSIsTelugu</a>			(int code);
+int	<a href="#xmlUCSIsThaana">xmlUCSIsThaana</a>			(int code);
+int	<a href="#xmlUCSIsThai">xmlUCSIsThai</a>			(int code);
+int	<a href="#xmlUCSIsTibetan">xmlUCSIsTibetan</a>			(int code);
+int	<a href="#xmlUCSIsUgaritic">xmlUCSIsUgaritic</a>		(int code);
+int	<a href="#xmlUCSIsUnifiedCanadianAboriginalSyllabics">xmlUCSIsUnifiedCanadianAboriginalSyllabics</a>	(int code);
 int	<a href="#xmlUCSIsVariationSelectors">xmlUCSIsVariationSelectors</a>	(int code);
@@ -209,6 +207,8 @@
 int	<a href="#xmlUCSIsVariationSelectors">xmlUCSIsVariationSelectors</a>	(int code);
-int	<a href="#xmlUCSIsCatMc">xmlUCSIsCatMc</a>			(int code);
-int	<a href="#xmlUCSIsCatMe">xmlUCSIsCatMe</a>			(int code);
+int	<a href="#xmlUCSIsVariationSelectorsSupplement">xmlUCSIsVariationSelectorsSupplement</a>	(int code);
+int	<a href="#xmlUCSIsYiRadicals">xmlUCSIsYiRadicals</a>		(int code);
+int	<a href="#xmlUCSIsYiSyllables">xmlUCSIsYiSyllables</a>		(int code);
+int	<a href="#xmlUCSIsYijingHexagramSymbols">xmlUCSIsYijingHexagramSymbols</a>	(int code);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xmlversion.html b/doc/devhelp/libxml2-xmlversion.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWx2ZXJzaW9uLmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWx2ZXJzaW9uLmh0bWw= 100644
--- a/doc/devhelp/libxml2-xmlversion.html
+++ b/doc/devhelp/libxml2-xmlversion.html
@@ -43,7 +43,22 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#LIBXML_VERSION_EXTRA">LIBXML_VERSION_EXTRA</a>;
-#define <a href="#LIBXML_MODULES_ENABLED">LIBXML_MODULES_ENABLED</a>;
+      <pre class="synopsis">#define <a href="#ATTRIBUTE_UNUSED">ATTRIBUTE_UNUSED</a>;
+#define <a href="#DEBUG_MEMORY_LOCATION">DEBUG_MEMORY_LOCATION</a>;
+#define <a href="#LIBXML_ATTR_ALLOC_SIZE">LIBXML_ATTR_ALLOC_SIZE</a>;
+#define <a href="#LIBXML_ATTR_FORMAT">LIBXML_ATTR_FORMAT</a>;
+#define <a href="#LIBXML_AUTOMATA_ENABLED">LIBXML_AUTOMATA_ENABLED</a>;
+#define <a href="#LIBXML_C14N_ENABLED">LIBXML_C14N_ENABLED</a>;
+#define <a href="#LIBXML_CATALOG_ENABLED">LIBXML_CATALOG_ENABLED</a>;
+#define <a href="#LIBXML_DEBUG_ENABLED">LIBXML_DEBUG_ENABLED</a>;
+#define <a href="#LIBXML_DEBUG_RUNTIME">LIBXML_DEBUG_RUNTIME</a>;
+#define <a href="#LIBXML_DOTTED_VERSION">LIBXML_DOTTED_VERSION</a>;
+#define <a href="#LIBXML_EXPR_ENABLED">LIBXML_EXPR_ENABLED</a>;
+#define <a href="#LIBXML_FTP_ENABLED">LIBXML_FTP_ENABLED</a>;
+#define <a href="#LIBXML_HTML_ENABLED">LIBXML_HTML_ENABLED</a>;
+#define <a href="#LIBXML_HTTP_ENABLED">LIBXML_HTTP_ENABLED</a>;
+#define <a href="#LIBXML_ICONV_ENABLED">LIBXML_ICONV_ENABLED</a>;
+#define <a href="#LIBXML_ICU_ENABLED">LIBXML_ICU_ENABLED</a>;
+#define <a href="#LIBXML_ISO8859X_ENABLED">LIBXML_ISO8859X_ENABLED</a>;
 #define <a href="#LIBXML_LEGACY_ENABLED">LIBXML_LEGACY_ENABLED</a>;
 #define <a href="#LIBXML_LZMA_ENABLED">LIBXML_LZMA_ENABLED</a>;
@@ -48,17 +63,5 @@
 #define <a href="#LIBXML_LEGACY_ENABLED">LIBXML_LEGACY_ENABLED</a>;
 #define <a href="#LIBXML_LZMA_ENABLED">LIBXML_LZMA_ENABLED</a>;
-#define <a href="#XML_DEPRECATED">XML_DEPRECATED</a>;
-#define <a href="#LIBXML_READER_ENABLED">LIBXML_READER_ENABLED</a>;
-#define <a href="#LIBXML_THREAD_ENABLED">LIBXML_THREAD_ENABLED</a>;
-#define <a href="#LIBXML_DOTTED_VERSION">LIBXML_DOTTED_VERSION</a>;
-#define <a href="#LIBXML_ISO8859X_ENABLED">LIBXML_ISO8859X_ENABLED</a>;
-#define <a href="#LIBXML_DEBUG_ENABLED">LIBXML_DEBUG_ENABLED</a>;
-#define <a href="#LIBXML_XINCLUDE_ENABLED">LIBXML_XINCLUDE_ENABLED</a>;
-#define <a href="#ATTRIBUTE_UNUSED">ATTRIBUTE_UNUSED</a>;
-#define <a href="#LIBXML_XPTR_LOCS_ENABLED">LIBXML_XPTR_LOCS_ENABLED</a>;
-#define <a href="#LIBXML_PUSH_ENABLED">LIBXML_PUSH_ENABLED</a>;
-#define <a href="#LIBXML_SAX1_ENABLED">LIBXML_SAX1_ENABLED</a>;
-#define <a href="#WITHOUT_TRIO">WITHOUT_TRIO</a>;
-#define <a href="#LIBXML_SCHEMATRON_ENABLED">LIBXML_SCHEMATRON_ENABLED</a>;
-#define <a href="#LIBXML_HTTP_ENABLED">LIBXML_HTTP_ENABLED</a>;
+#define <a href="#LIBXML_MODULES_ENABLED">LIBXML_MODULES_ENABLED</a>;
+#define <a href="#LIBXML_MODULE_EXTENSION">LIBXML_MODULE_EXTENSION</a>;
 #define <a href="#LIBXML_OUTPUT_ENABLED">LIBXML_OUTPUT_ENABLED</a>;
@@ -64,9 +67,5 @@
 #define <a href="#LIBXML_OUTPUT_ENABLED">LIBXML_OUTPUT_ENABLED</a>;
-#define <a href="#WITH_TRIO">WITH_TRIO</a>;
-#define <a href="#LIBXML_DEBUG_RUNTIME">LIBXML_DEBUG_RUNTIME</a>;
-#define <a href="#LIBXML_VERSION">LIBXML_VERSION</a>;
-#define <a href="#LIBXML_XPTR_ENABLED">LIBXML_XPTR_ENABLED</a>;
-#define <a href="#LIBXML_VERSION_STRING">LIBXML_VERSION_STRING</a>;
-#define <a href="#LIBXML_CATALOG_ENABLED">LIBXML_CATALOG_ENABLED</a>;
-#define <a href="#LIBXML_ATTR_ALLOC_SIZE">LIBXML_ATTR_ALLOC_SIZE</a>;
+#define <a href="#LIBXML_PATTERN_ENABLED">LIBXML_PATTERN_ENABLED</a>;
+#define <a href="#LIBXML_PUSH_ENABLED">LIBXML_PUSH_ENABLED</a>;
+#define <a href="#LIBXML_READER_ENABLED">LIBXML_READER_ENABLED</a>;
 #define <a href="#LIBXML_REGEXP_ENABLED">LIBXML_REGEXP_ENABLED</a>;
@@ -72,12 +71,3 @@
 #define <a href="#LIBXML_REGEXP_ENABLED">LIBXML_REGEXP_ENABLED</a>;
-#define <a href="#LIBXML_ICU_ENABLED">LIBXML_ICU_ENABLED</a>;
-#define <a href="#LIBXML_MODULE_EXTENSION">LIBXML_MODULE_EXTENSION</a>;
-#define <a href="#LIBXML_ICONV_ENABLED">LIBXML_ICONV_ENABLED</a>;
-#define <a href="#LIBXML_HTML_ENABLED">LIBXML_HTML_ENABLED</a>;
-#define <a href="#LIBXML_UNICODE_ENABLED">LIBXML_UNICODE_ENABLED</a>;
-#define <a href="#LIBXML_FTP_ENABLED">LIBXML_FTP_ENABLED</a>;
-#define <a href="#LIBXML_AUTOMATA_ENABLED">LIBXML_AUTOMATA_ENABLED</a>;
-#define <a href="#LIBXML_ZLIB_ENABLED">LIBXML_ZLIB_ENABLED</a>;
-#define <a href="#LIBXML_WRITER_ENABLED">LIBXML_WRITER_ENABLED</a>;
-#define <a href="#LIBXML_C14N_ENABLED">LIBXML_C14N_ENABLED</a>;
+#define <a href="#LIBXML_SAX1_ENABLED">LIBXML_SAX1_ENABLED</a>;
 #define <a href="#LIBXML_SCHEMAS_ENABLED">LIBXML_SCHEMAS_ENABLED</a>;
@@ -83,5 +73,4 @@
 #define <a href="#LIBXML_SCHEMAS_ENABLED">LIBXML_SCHEMAS_ENABLED</a>;
-#define <a href="#DEBUG_MEMORY_LOCATION">DEBUG_MEMORY_LOCATION</a>;
-#define <a href="#LIBXML_ATTR_FORMAT">LIBXML_ATTR_FORMAT</a>;
+#define <a href="#LIBXML_SCHEMATRON_ENABLED">LIBXML_SCHEMATRON_ENABLED</a>;
 #define <a href="#LIBXML_TEST_VERSION">LIBXML_TEST_VERSION</a>;
 #define <a href="#LIBXML_THREAD_ALLOC_ENABLED">LIBXML_THREAD_ALLOC_ENABLED</a>;
@@ -86,5 +75,6 @@
 #define <a href="#LIBXML_TEST_VERSION">LIBXML_TEST_VERSION</a>;
 #define <a href="#LIBXML_THREAD_ALLOC_ENABLED">LIBXML_THREAD_ALLOC_ENABLED</a>;
-#define <a href="#LIBXML_XPATH_ENABLED">LIBXML_XPATH_ENABLED</a>;
-#define <a href="#LIBXML_PATTERN_ENABLED">LIBXML_PATTERN_ENABLED</a>;
+#define <a href="#LIBXML_THREAD_ENABLED">LIBXML_THREAD_ENABLED</a>;
+#define <a href="#LIBXML_TREE_ENABLED">LIBXML_TREE_ENABLED</a>;
+#define <a href="#LIBXML_UNICODE_ENABLED">LIBXML_UNICODE_ENABLED</a>;
 #define <a href="#LIBXML_VALID_ENABLED">LIBXML_VALID_ENABLED</a>;
@@ -90,6 +80,16 @@
 #define <a href="#LIBXML_VALID_ENABLED">LIBXML_VALID_ENABLED</a>;
-#define <a href="#LIBXML_TREE_ENABLED">LIBXML_TREE_ENABLED</a>;
-#define <a href="#LIBXML_EXPR_ENABLED">LIBXML_EXPR_ENABLED</a>;
+#define <a href="#LIBXML_VERSION">LIBXML_VERSION</a>;
+#define <a href="#LIBXML_VERSION_EXTRA">LIBXML_VERSION_EXTRA</a>;
+#define <a href="#LIBXML_VERSION_STRING">LIBXML_VERSION_STRING</a>;
+#define <a href="#LIBXML_WRITER_ENABLED">LIBXML_WRITER_ENABLED</a>;
+#define <a href="#LIBXML_XINCLUDE_ENABLED">LIBXML_XINCLUDE_ENABLED</a>;
+#define <a href="#LIBXML_XPATH_ENABLED">LIBXML_XPATH_ENABLED</a>;
+#define <a href="#LIBXML_XPTR_ENABLED">LIBXML_XPTR_ENABLED</a>;
+#define <a href="#LIBXML_XPTR_LOCS_ENABLED">LIBXML_XPTR_LOCS_ENABLED</a>;
+#define <a href="#LIBXML_ZLIB_ENABLED">LIBXML_ZLIB_ENABLED</a>;
+#define <a href="#WITHOUT_TRIO">WITHOUT_TRIO</a>;
+#define <a href="#WITH_TRIO">WITH_TRIO</a>;
+#define <a href="#XML_DEPRECATED">XML_DEPRECATED</a>;
 void	<a href="#xmlCheckVersion">xmlCheckVersion</a>			(int version);
 </pre>
     </div>
diff --git a/doc/devhelp/libxml2-xmlwriter.html b/doc/devhelp/libxml2-xmlwriter.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14bWx3cml0ZXIuaHRtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14bWx3cml0ZXIuaHRtbA== 100644
--- a/doc/devhelp/libxml2-xmlwriter.html
+++ b/doc/devhelp/libxml2-xmlwriter.html
@@ -43,7 +43,7 @@
     <p>Author(s): Alfred Mickautsch &lt;alfred@mickautsch.de&gt; </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#xmlTextWriterWriteProcessingInstruction">xmlTextWriterWriteProcessingInstruction</a>;
-#define <a href="#xmlTextWriterWriteDocType">xmlTextWriterWriteDocType</a>;
+      <pre class="synopsis">#define <a href="#xmlTextWriterWriteDocType">xmlTextWriterWriteDocType</a>;
+#define <a href="#xmlTextWriterWriteProcessingInstruction">xmlTextWriterWriteProcessingInstruction</a>;
 typedef struct _xmlTextWriter <a href="#xmlTextWriter">xmlTextWriter</a>;
 typedef <a href="libxml2-xmlwriter.html#xmlTextWriter">xmlTextWriter</a> * <a href="#xmlTextWriterPtr">xmlTextWriterPtr</a>;
@@ -48,13 +48,8 @@
 typedef struct _xmlTextWriter <a href="#xmlTextWriter">xmlTextWriter</a>;
 typedef <a href="libxml2-xmlwriter.html#xmlTextWriter">xmlTextWriter</a> * <a href="#xmlTextWriterPtr">xmlTextWriterPtr</a>;
-int	<a href="#xmlTextWriterStartDocument">xmlTextWriterStartDocument</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * version, <br/>					 const char * encoding, <br/>					 const char * standalone);
-int	<a href="#xmlTextWriterEndPI">xmlTextWriterEndPI</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterWriteBase64">xmlTextWriterWriteBase64</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * data, <br/>					 int start, <br/>					 int len);
-int	<a href="#xmlTextWriterSetIndentString">xmlTextWriterSetIndentString</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
-int	<a href="#xmlTextWriterStartAttribute">xmlTextWriterStartAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlTextWriterEndComment">xmlTextWriterEndComment</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterWriteRawLen">xmlTextWriterWriteRawLen</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
-int	<a href="#xmlTextWriterWriteDTDExternalEntityContents">xmlTextWriterWriteDTDExternalEntityContents</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ndataid);
-int	<a href="#xmlTextWriterWriteVFormatCDATA">xmlTextWriterWriteVFormatCDATA</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 va_list argptr);
-int	<a href="#xmlTextWriterStartAttributeNS">xmlTextWriterStartAttributeNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI);
+void	<a href="#xmlFreeTextWriter">xmlFreeTextWriter</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriter">xmlNewTextWriter</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
+<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterDoc">xmlNewTextWriterDoc</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> * doc, <br/>						 int compression);
+<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterFilename">xmlNewTextWriterFilename</a>	(const char * uri, <br/>							 int compression);
+<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterMemory">xmlNewTextWriterMemory</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>						 int compression);
 <a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterPushParser">xmlNewTextWriterPushParser</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>							 int compression);
@@ -60,6 +55,3 @@
 <a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterPushParser">xmlNewTextWriterPushParser</a>	(<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt, <br/>							 int compression);
-int	<a href="#xmlTextWriterWriteFormatAttributeNS">xmlTextWriterWriteFormatAttributeNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>						 const char * format, <br/>						 ... ...);
-int	<a href="#xmlTextWriterWriteDTDEntity">xmlTextWriterWriteDTDEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 int pe, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ndataid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterWriteVFormatPI">xmlTextWriterWriteVFormatPI</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const char * format, <br/>					 va_list argptr);
-int	<a href="#xmlTextWriterWriteBinHex">xmlTextWriterWriteBinHex</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * data, <br/>					 int start, <br/>					 int len);
+<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterTree">xmlNewTextWriterTree</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>						 int compression);
 int	<a href="#xmlTextWriterEndAttribute">xmlTextWriterEndAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
@@ -65,4 +57,8 @@
 int	<a href="#xmlTextWriterEndAttribute">xmlTextWriterEndAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterSetIndent">xmlTextWriterSetIndent</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 int indent);
-int	<a href="#xmlTextWriterWriteFormatPI">xmlTextWriterWriteFormatPI</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const char * format, <br/>					 ... ...);
+int	<a href="#xmlTextWriterEndCDATA">xmlTextWriterEndCDATA</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterEndComment">xmlTextWriterEndComment</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterEndDTD">xmlTextWriterEndDTD</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterEndDTDAttlist">xmlTextWriterEndDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterEndDTDElement">xmlTextWriterEndDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterEndDTDEntity">xmlTextWriterEndDTDEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
 int	<a href="#xmlTextWriterEndDocument">xmlTextWriterEndDocument</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
@@ -68,3 +64,12 @@
 int	<a href="#xmlTextWriterEndDocument">xmlTextWriterEndDocument</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterWriteDTDAttlist">xmlTextWriterWriteDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlTextWriterEndElement">xmlTextWriterEndElement</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterEndPI">xmlTextWriterEndPI</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterFlush">xmlTextWriterFlush</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterFullEndElement">xmlTextWriterFullEndElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterSetIndent">xmlTextWriterSetIndent</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 int indent);
+int	<a href="#xmlTextWriterSetIndentString">xmlTextWriterSetIndentString</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
+int	<a href="#xmlTextWriterSetQuoteChar">xmlTextWriterSetQuoteChar</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> quotechar);
+int	<a href="#xmlTextWriterStartAttribute">xmlTextWriterStartAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlTextWriterStartAttributeNS">xmlTextWriterStartAttributeNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI);
+int	<a href="#xmlTextWriterStartCDATA">xmlTextWriterStartCDATA</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
 int	<a href="#xmlTextWriterStartComment">xmlTextWriterStartComment</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
@@ -70,4 +75,8 @@
 int	<a href="#xmlTextWriterStartComment">xmlTextWriterStartComment</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterWriteVFormatDTD">xmlTextWriterWriteVFormatDTD</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>					 const char * format, <br/>					 va_list argptr);
-int	<a href="#xmlTextWriterEndCDATA">xmlTextWriterEndCDATA</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
+int	<a href="#xmlTextWriterStartDTD">xmlTextWriterStartDTD</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid);
+int	<a href="#xmlTextWriterStartDTDAttlist">xmlTextWriterStartDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlTextWriterStartDTDElement">xmlTextWriterStartDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlTextWriterStartDTDEntity">xmlTextWriterStartDTDEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 int pe, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlTextWriterStartDocument">xmlTextWriterStartDocument</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * version, <br/>					 const char * encoding, <br/>					 const char * standalone);
+int	<a href="#xmlTextWriterStartElement">xmlTextWriterStartElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
 int	<a href="#xmlTextWriterStartElementNS">xmlTextWriterStartElementNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI);
@@ -73,6 +82,2 @@
 int	<a href="#xmlTextWriterStartElementNS">xmlTextWriterStartElementNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI);
-int	<a href="#xmlTextWriterEndDTDEntity">xmlTextWriterEndDTDEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriter">xmlNewTextWriter</a>	(<a href="libxml2-tree.html#xmlOutputBufferPtr">xmlOutputBufferPtr</a> out);
-void	<a href="#xmlFreeTextWriter">xmlFreeTextWriter</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterWriteVFormatDTDAttlist">xmlTextWriterWriteVFormatDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 va_list argptr);
 int	<a href="#xmlTextWriterStartPI">xmlTextWriterStartPI</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target);
@@ -78,5 +83,6 @@
 int	<a href="#xmlTextWriterStartPI">xmlTextWriterStartPI</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target);
-int	<a href="#xmlTextWriterStartElement">xmlTextWriterStartElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlTextWriterWriteDTDExternalEntity">xmlTextWriterWriteDTDExternalEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 int pe, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ndataid);
-int	<a href="#xmlTextWriterWriteFormatRaw">xmlTextWriterWriteFormatRaw</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 ... ...);
+int	<a href="#xmlTextWriterWriteAttribute">xmlTextWriterWriteAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlTextWriterWriteAttributeNS">xmlTextWriterWriteAttributeNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlTextWriterWriteBase64">xmlTextWriterWriteBase64</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * data, <br/>					 int start, <br/>					 int len);
+int	<a href="#xmlTextWriterWriteBinHex">xmlTextWriterWriteBinHex</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * data, <br/>					 int start, <br/>					 int len);
 int	<a href="#xmlTextWriterWriteCDATA">xmlTextWriterWriteCDATA</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
@@ -82,17 +88,9 @@
 int	<a href="#xmlTextWriterWriteCDATA">xmlTextWriterWriteCDATA</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterWriteVFormatDTDInternalEntity">xmlTextWriterWriteVFormatDTDInternalEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>							 int pe, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const char * format, <br/>							 va_list argptr);
-int	<a href="#xmlTextWriterWriteVFormatAttribute">xmlTextWriterWriteVFormatAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 va_list argptr);
-int	<a href="#xmlTextWriterEndDTDElement">xmlTextWriterEndDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterEndDTD">xmlTextWriterEndDTD</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterWriteElement">xmlTextWriterWriteElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterEndElement">xmlTextWriterEndElement</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterWriteVFormatComment">xmlTextWriterWriteVFormatComment</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const char * format, <br/>						 va_list argptr);
-int	<a href="#xmlTextWriterStartCDATA">xmlTextWriterStartCDATA</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterFilename">xmlNewTextWriterFilename</a>	(const char * uri, <br/>							 int compression);
-int	<a href="#xmlTextWriterWriteVFormatElement">xmlTextWriterWriteVFormatElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 va_list argptr);
-int	<a href="#xmlTextWriterWriteFormatComment">xmlTextWriterWriteFormatComment</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 ... ...);
-int	<a href="#xmlTextWriterWriteAttributeNS">xmlTextWriterWriteAttributeNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterWritePI">xmlTextWriterWritePI</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterWriteFormatDTDInternalEntity">xmlTextWriterWriteFormatDTDInternalEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>							 int pe, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const char * format, <br/>							 ... ...);
-int	<a href="#xmlTextWriterWriteVFormatString">xmlTextWriterWriteVFormatString</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 va_list argptr);
+int	<a href="#xmlTextWriterWriteComment">xmlTextWriterWriteComment</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlTextWriterWriteDTD">xmlTextWriterWriteDTD</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * subset);
+int	<a href="#xmlTextWriterWriteDTDAttlist">xmlTextWriterWriteDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlTextWriterWriteDTDElement">xmlTextWriterWriteDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlTextWriterWriteDTDEntity">xmlTextWriterWriteDTDEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 int pe, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ndataid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlTextWriterWriteDTDExternalEntity">xmlTextWriterWriteDTDExternalEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 int pe, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ndataid);
+int	<a href="#xmlTextWriterWriteDTDExternalEntityContents">xmlTextWriterWriteDTDExternalEntityContents</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ndataid);
 int	<a href="#xmlTextWriterWriteDTDInternalEntity">xmlTextWriterWriteDTDInternalEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 int pe, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
@@ -98,3 +96,2 @@
 int	<a href="#xmlTextWriterWriteDTDInternalEntity">xmlTextWriterWriteDTDInternalEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 int pe, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterWriteVFormatElementNS">xmlTextWriterWriteVFormatElementNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>						 const char * format, <br/>						 va_list argptr);
 int	<a href="#xmlTextWriterWriteDTDNotation">xmlTextWriterWriteDTDNotation</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid);
@@ -100,5 +97,3 @@
 int	<a href="#xmlTextWriterWriteDTDNotation">xmlTextWriterWriteDTDNotation</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid);
-int	<a href="#xmlTextWriterWriteFormatElement">xmlTextWriterWriteFormatElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const char * format, <br/>					 ... ...);
-int	<a href="#xmlTextWriterSetQuoteChar">xmlTextWriterSetQuoteChar</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> quotechar);
-int	<a href="#xmlTextWriterWriteString">xmlTextWriterWriteString</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlTextWriterWriteElement">xmlTextWriterWriteElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
 int	<a href="#xmlTextWriterWriteElementNS">xmlTextWriterWriteElementNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
@@ -104,12 +99,4 @@
 int	<a href="#xmlTextWriterWriteElementNS">xmlTextWriterWriteElementNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterFullEndElement">xmlTextWriterFullEndElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterWriteVFormatAttributeNS">xmlTextWriterWriteVFormatAttributeNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>						 const char * format, <br/>						 va_list argptr);
-int	<a href="#xmlTextWriterFlush">xmlTextWriterFlush</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-int	<a href="#xmlTextWriterStartDTD">xmlTextWriterStartDTD</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid);
-int	<a href="#xmlTextWriterWriteAttribute">xmlTextWriterWriteAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterDoc">xmlNewTextWriterDoc</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> * doc, <br/>						 int compression);
-int	<a href="#xmlTextWriterWriteFormatDTDElement">xmlTextWriterWriteFormatDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 ... ...);
-int	<a href="#xmlTextWriterEndDTDAttlist">xmlTextWriterEndDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer);
-<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterTree">xmlNewTextWriterTree</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>						 int compression);
-<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a>	<a href="#xmlNewTextWriterMemory">xmlNewTextWriterMemory</a>	(<a href="libxml2-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br/>						 int compression);
+int	<a href="#xmlTextWriterWriteFormatAttribute">xmlTextWriterWriteFormatAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 ... ...);
+int	<a href="#xmlTextWriterWriteFormatAttributeNS">xmlTextWriterWriteFormatAttributeNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>						 const char * format, <br/>						 ... ...);
 int	<a href="#xmlTextWriterWriteFormatCDATA">xmlTextWriterWriteFormatCDATA</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 ... ...);
@@ -115,7 +102,4 @@
 int	<a href="#xmlTextWriterWriteFormatCDATA">xmlTextWriterWriteFormatCDATA</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 ... ...);
-int	<a href="#xmlTextWriterStartDTDAttlist">xmlTextWriterStartDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlTextWriterWriteFormatString">xmlTextWriterWriteFormatString</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 ... ...);
-int	<a href="#xmlTextWriterWriteComment">xmlTextWriterWriteComment</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterWriteVFormatRaw">xmlTextWriterWriteVFormatRaw</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 va_list argptr);
+int	<a href="#xmlTextWriterWriteFormatComment">xmlTextWriterWriteFormatComment</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 ... ...);
 int	<a href="#xmlTextWriterWriteFormatDTD">xmlTextWriterWriteFormatDTD</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>					 const char * format, <br/>					 ... ...);
 int	<a href="#xmlTextWriterWriteFormatDTDAttlist">xmlTextWriterWriteFormatDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 ... ...);
@@ -120,3 +104,11 @@
 int	<a href="#xmlTextWriterWriteFormatDTD">xmlTextWriterWriteFormatDTD</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>					 const char * format, <br/>					 ... ...);
 int	<a href="#xmlTextWriterWriteFormatDTDAttlist">xmlTextWriterWriteFormatDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 ... ...);
+int	<a href="#xmlTextWriterWriteFormatDTDElement">xmlTextWriterWriteFormatDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 ... ...);
+int	<a href="#xmlTextWriterWriteFormatDTDInternalEntity">xmlTextWriterWriteFormatDTDInternalEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>							 int pe, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const char * format, <br/>							 ... ...);
+int	<a href="#xmlTextWriterWriteFormatElement">xmlTextWriterWriteFormatElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const char * format, <br/>					 ... ...);
+int	<a href="#xmlTextWriterWriteFormatElementNS">xmlTextWriterWriteFormatElementNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>						 const char * format, <br/>						 ... ...);
+int	<a href="#xmlTextWriterWriteFormatPI">xmlTextWriterWriteFormatPI</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const char * format, <br/>					 ... ...);
+int	<a href="#xmlTextWriterWriteFormatRaw">xmlTextWriterWriteFormatRaw</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 ... ...);
+int	<a href="#xmlTextWriterWriteFormatString">xmlTextWriterWriteFormatString</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 ... ...);
+int	<a href="#xmlTextWriterWritePI">xmlTextWriterWritePI</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
 int	<a href="#xmlTextWriterWriteRaw">xmlTextWriterWriteRaw</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
@@ -122,6 +114,10 @@
 int	<a href="#xmlTextWriterWriteRaw">xmlTextWriterWriteRaw</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterWriteDTDElement">xmlTextWriterWriteDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
-int	<a href="#xmlTextWriterWriteDTD">xmlTextWriterWriteDTD</a>		(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * subset);
-int	<a href="#xmlTextWriterWriteFormatAttribute">xmlTextWriterWriteFormatAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 ... ...);
-int	<a href="#xmlTextWriterStartDTDEntity">xmlTextWriterStartDTDEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 int pe, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+int	<a href="#xmlTextWriterWriteRawLen">xmlTextWriterWriteRawLen</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content, <br/>					 int len);
+int	<a href="#xmlTextWriterWriteString">xmlTextWriterWriteString</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * content);
+int	<a href="#xmlTextWriterWriteVFormatAttribute">xmlTextWriterWriteVFormatAttribute</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatAttributeNS">xmlTextWriterWriteVFormatAttributeNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>						 const char * format, <br/>						 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatCDATA">xmlTextWriterWriteVFormatCDATA</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatComment">xmlTextWriterWriteVFormatComment</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const char * format, <br/>						 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatDTD">xmlTextWriterWriteVFormatDTD</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * pubid, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * sysid, <br/>					 const char * format, <br/>					 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatDTDAttlist">xmlTextWriterWriteVFormatDTDAttlist</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 va_list argptr);
 int	<a href="#xmlTextWriterWriteVFormatDTDElement">xmlTextWriterWriteVFormatDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 va_list argptr);
@@ -127,6 +123,10 @@
 int	<a href="#xmlTextWriterWriteVFormatDTDElement">xmlTextWriterWriteVFormatDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 va_list argptr);
-int	<a href="#xmlTextWriterStartDTDElement">xmlTextWriterStartDTDElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-int	<a href="#xmlTextWriterWriteFormatElementNS">xmlTextWriterWriteFormatElementNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>						 const char * format, <br/>						 ... ...);
+int	<a href="#xmlTextWriterWriteVFormatDTDInternalEntity">xmlTextWriterWriteVFormatDTDInternalEntity</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>							 int pe, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const char * format, <br/>							 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatElement">xmlTextWriterWriteVFormatElement</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const char * format, <br/>						 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatElementNS">xmlTextWriterWriteVFormatElementNS</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * namespaceURI, <br/>						 const char * format, <br/>						 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatPI">xmlTextWriterWriteVFormatPI</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * target, <br/>					 const char * format, <br/>					 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatRaw">xmlTextWriterWriteVFormatRaw</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 va_list argptr);
+int	<a href="#xmlTextWriterWriteVFormatString">xmlTextWriterWriteVFormatString</a>	(<a href="libxml2-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> writer, <br/>					 const char * format, <br/>					 va_list argptr);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xpath.html b/doc/devhelp/libxml2-xpath.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14cGF0aC5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14cGF0aC5odG1s 100644
--- a/doc/devhelp/libxml2-xpath.html
+++ b/doc/devhelp/libxml2-xpath.html
@@ -43,8 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#xmlXPathNodeSetIsEmpty">xmlXPathNodeSetIsEmpty</a>(ns);
-#define <a href="#xmlXPathNodeSetItem">xmlXPathNodeSetItem</a>(ns, index);
-#define <a href="#XML_XPATH_CHECKNS">XML_XPATH_CHECKNS</a>;
-#define <a href="#xmlXPathNodeSetGetLength">xmlXPathNodeSetGetLength</a>(ns);
+      <pre class="synopsis">#define <a href="#XML_XPATH_CHECKNS">XML_XPATH_CHECKNS</a>;
 #define <a href="#XML_XPATH_NOVAR">XML_XPATH_NOVAR</a>;
@@ -50,9 +47,6 @@
 #define <a href="#XML_XPATH_NOVAR">XML_XPATH_NOVAR</a>;
-typedef enum <a href="#xmlXPathObjectType">xmlXPathObjectType</a>;
-typedef <a href="libxml2-xpath.html#xmlXPathVariable">xmlXPathVariable</a> * <a href="#xmlXPathVariablePtr">xmlXPathVariablePtr</a>;
-typedef struct _xmlXPathContext <a href="#xmlXPathContext">xmlXPathContext</a>;
-typedef enum <a href="#xmlXPathError">xmlXPathError</a>;
-typedef struct _xmlXPathFunct <a href="#xmlXPathFunct">xmlXPathFunct</a>;
-typedef <a href="libxml2-xpath.html#xmlXPathType">xmlXPathType</a> * <a href="#xmlXPathTypePtr">xmlXPathTypePtr</a>;
-typedef struct _xmlXPathType <a href="#xmlXPathType">xmlXPathType</a>;
+#define <a href="#xmlXPathNodeSetGetLength">xmlXPathNodeSetGetLength</a>(ns);
+#define <a href="#xmlXPathNodeSetIsEmpty">xmlXPathNodeSetIsEmpty</a>(ns);
+#define <a href="#xmlXPathNodeSetItem">xmlXPathNodeSetItem</a>(ns, index);
+typedef struct _xmlNodeSet <a href="#xmlNodeSet">xmlNodeSet</a>;
 typedef <a href="libxml2-xpath.html#xmlNodeSet">xmlNodeSet</a> * <a href="#xmlNodeSetPtr">xmlNodeSetPtr</a>;
@@ -58,12 +52,3 @@
 typedef <a href="libxml2-xpath.html#xmlNodeSet">xmlNodeSet</a> * <a href="#xmlNodeSetPtr">xmlNodeSetPtr</a>;
-typedef <a href="libxml2-xpath.html#xmlXPathFunct">xmlXPathFunct</a> * <a href="#xmlXPathFuncPtr">xmlXPathFuncPtr</a>;
-typedef <a href="libxml2-xpath.html#xmlXPathCompExpr">xmlXPathCompExpr</a> * <a href="#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a>;
-typedef struct _xmlXPathObject <a href="#xmlXPathObject">xmlXPathObject</a>;
-typedef struct _xmlXPathCompExpr <a href="#xmlXPathCompExpr">xmlXPathCompExpr</a>;
-typedef <a href="libxml2-xpath.html#xmlXPathContext">xmlXPathContext</a> * <a href="#xmlXPathContextPtr">xmlXPathContextPtr</a>;
-typedef <a href="libxml2-xpath.html#xmlXPathParserContext">xmlXPathParserContext</a> * <a href="#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a>;
-typedef struct _xmlNodeSet <a href="#xmlNodeSet">xmlNodeSet</a>;
-typedef struct _xmlXPathVariable <a href="#xmlXPathVariable">xmlXPathVariable</a>;
-typedef <a href="libxml2-xpath.html#xmlXPathObject">xmlXPathObject</a> * <a href="#xmlXPathObjectPtr">xmlXPathObjectPtr</a>;
 typedef struct _xmlXPathAxis <a href="#xmlXPathAxis">xmlXPathAxis</a>;
 typedef <a href="libxml2-xpath.html#xmlXPathAxis">xmlXPathAxis</a> * <a href="#xmlXPathAxisPtr">xmlXPathAxisPtr</a>;
@@ -68,3 +53,13 @@
 typedef struct _xmlXPathAxis <a href="#xmlXPathAxis">xmlXPathAxis</a>;
 typedef <a href="libxml2-xpath.html#xmlXPathAxis">xmlXPathAxis</a> * <a href="#xmlXPathAxisPtr">xmlXPathAxisPtr</a>;
+typedef struct _xmlXPathCompExpr <a href="#xmlXPathCompExpr">xmlXPathCompExpr</a>;
+typedef <a href="libxml2-xpath.html#xmlXPathCompExpr">xmlXPathCompExpr</a> * <a href="#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a>;
+typedef struct _xmlXPathContext <a href="#xmlXPathContext">xmlXPathContext</a>;
+typedef <a href="libxml2-xpath.html#xmlXPathContext">xmlXPathContext</a> * <a href="#xmlXPathContextPtr">xmlXPathContextPtr</a>;
+typedef enum <a href="#xmlXPathError">xmlXPathError</a>;
+typedef <a href="libxml2-xpath.html#xmlXPathFunct">xmlXPathFunct</a> * <a href="#xmlXPathFuncPtr">xmlXPathFuncPtr</a>;
+typedef struct _xmlXPathFunct <a href="#xmlXPathFunct">xmlXPathFunct</a>;
+typedef struct _xmlXPathObject <a href="#xmlXPathObject">xmlXPathObject</a>;
+typedef <a href="libxml2-xpath.html#xmlXPathObject">xmlXPathObject</a> * <a href="#xmlXPathObjectPtr">xmlXPathObjectPtr</a>;
+typedef enum <a href="#xmlXPathObjectType">xmlXPathObjectType</a>;
 typedef struct _xmlXPathParserContext <a href="#xmlXPathParserContext">xmlXPathParserContext</a>;
@@ -70,2 +65,10 @@
 typedef struct _xmlXPathParserContext <a href="#xmlXPathParserContext">xmlXPathParserContext</a>;
+typedef <a href="libxml2-xpath.html#xmlXPathParserContext">xmlXPathParserContext</a> * <a href="#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a>;
+typedef struct _xmlXPathType <a href="#xmlXPathType">xmlXPathType</a>;
+typedef <a href="libxml2-xpath.html#xmlXPathType">xmlXPathType</a> * <a href="#xmlXPathTypePtr">xmlXPathTypePtr</a>;
+typedef struct _xmlXPathVariable <a href="#xmlXPathVariable">xmlXPathVariable</a>;
+typedef <a href="libxml2-xpath.html#xmlXPathVariable">xmlXPathVariable</a> * <a href="#xmlXPathVariablePtr">xmlXPathVariablePtr</a>;
+typedef <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> <a href="#xmlXPathAxisFunc">xmlXPathAxisFunc</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> cur);
+double	<a href="#xmlXPathCastBooleanToNumber">xmlXPathCastBooleanToNumber</a>	(int val);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastBooleanToString">xmlXPathCastBooleanToString</a>	(int val);
 int	<a href="#xmlXPathCastNodeSetToBoolean">xmlXPathCastNodeSetToBoolean</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> ns);
@@ -71,4 +74,5 @@
 int	<a href="#xmlXPathCastNodeSetToBoolean">xmlXPathCastNodeSetToBoolean</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> ns);
-typedef <a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a> <a href="#xmlXPathFuncLookupFunc">xmlXPathFuncLookupFunc</a>	(void * ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNodeEval">xmlXPathNodeEval</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>						 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
+double	<a href="#xmlXPathCastNodeSetToNumber">xmlXPathCastNodeSetToNumber</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> ns);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastNodeSetToString">xmlXPathCastNodeSetToString</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> ns);
+double	<a href="#xmlXPathCastNodeToNumber">xmlXPathCastNodeToNumber</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastNodeToString">xmlXPathCastNodeToString</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
@@ -74,11 +78,5 @@
 <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastNodeToString">xmlXPathCastNodeToString</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-int	<a href="#xmlXPathIsNaN">xmlXPathIsNaN</a>			(double val);
-int	<a href="#xmlXPathContextSetCache">xmlXPathContextSetCache</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 int active, <br/>					 int value, <br/>					 int options);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathConvertString">xmlXPathConvertString</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
-int	<a href="#xmlXPathCompiledEvalToBoolean">xmlXPathCompiledEvalToBoolean</a>	(<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp, <br/>					 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
-int	<a href="#xmlXPathIsInf">xmlXPathIsInf</a>			(double val);
-long	<a href="#xmlXPathOrderDocElems">xmlXPathOrderDocElems</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeSetCreate">xmlXPathNodeSetCreate</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
-double	<a href="#xmlXPathCastBooleanToNumber">xmlXPathCastBooleanToNumber</a>	(int val);
-double	<a href="#xmlXPathCastNodeToNumber">xmlXPathCastNodeToNumber</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+int	<a href="#xmlXPathCastNumberToBoolean">xmlXPathCastNumberToBoolean</a>	(double val);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastNumberToString">xmlXPathCastNumberToString</a>	(double val);
+int	<a href="#xmlXPathCastStringToBoolean">xmlXPathCastStringToBoolean</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
 double	<a href="#xmlXPathCastStringToNumber">xmlXPathCastStringToNumber</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
@@ -84,3 +82,3 @@
 double	<a href="#xmlXPathCastStringToNumber">xmlXPathCastStringToNumber</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
-typedef <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> <a href="#xmlXPathAxisFunc">xmlXPathAxisFunc</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> cur);
+int	<a href="#xmlXPathCastToBoolean">xmlXPathCastToBoolean</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
 double	<a href="#xmlXPathCastToNumber">xmlXPathCastToNumber</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
@@ -86,12 +84,5 @@
 double	<a href="#xmlXPathCastToNumber">xmlXPathCastToNumber</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
-int	<a href="#xmlXPathCastStringToBoolean">xmlXPathCastStringToBoolean</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastNumberToString">xmlXPathCastNumberToString</a>	(double val);
-typedef <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> <a href="#xmlXPathVariableLookupFunc">xmlXPathVariableLookupFunc</a>	(void * ctxt, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
-void	<a href="#xmlXPathFreeObject">xmlXPathFreeObject</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj);
-int	<a href="#xmlXPathEvalPredicate">xmlXPathEvalPredicate</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> res);
-void	<a href="#xmlXPathFreeContext">xmlXPathFreeContext</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathObjectCopy">xmlXPathObjectCopy</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
-void	<a href="#xmlXPathFreeNodeSetList">xmlXPathFreeNodeSetList</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathEval">xmlXPathEval</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastNodeSetToString">xmlXPathCastNodeSetToString</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> ns);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastToString">xmlXPathCastToString</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
+int	<a href="#xmlXPathCmpNodes">xmlXPathCmpNodes</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node1, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
+<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a>	<a href="#xmlXPathCompile">xmlXPathCompile</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathCompiledEval">xmlXPathCompiledEval</a>	(<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp, <br/>						 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
@@ -97,5 +88,5 @@
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathCompiledEval">xmlXPathCompiledEval</a>	(<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp, <br/>						 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathEvalExpression">xmlXPathEvalExpression</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>						 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
-void	<a href="#xmlXPathInit">xmlXPathInit</a>			(void);
+int	<a href="#xmlXPathCompiledEvalToBoolean">xmlXPathCompiledEvalToBoolean</a>	(<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp, <br/>					 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+int	<a href="#xmlXPathContextSetCache">xmlXPathContextSetCache</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 int active, <br/>					 int value, <br/>					 int options);
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathConvertBoolean">xmlXPathConvertBoolean</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
 typedef int <a href="#xmlXPathConvertFunc">xmlXPathConvertFunc</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj, <br/>					 int type);
@@ -100,3 +91,16 @@
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathConvertBoolean">xmlXPathConvertBoolean</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
 typedef int <a href="#xmlXPathConvertFunc">xmlXPathConvertFunc</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj, <br/>					 int type);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathConvertNumber">xmlXPathConvertNumber</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathConvertString">xmlXPathConvertString</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
+<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a>	<a href="#xmlXPathCtxtCompile">xmlXPathCtxtCompile</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathEval">xmlXPathEval</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathEvalExpression">xmlXPathEvalExpression</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>						 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+typedef void <a href="#xmlXPathEvalFunc">xmlXPathEvalFunc</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+int	<a href="#xmlXPathEvalPredicate">xmlXPathEvalPredicate</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> res);
+void	<a href="#xmlXPathFreeCompExpr">xmlXPathFreeCompExpr</a>		(<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp);
+void	<a href="#xmlXPathFreeContext">xmlXPathFreeContext</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+void	<a href="#xmlXPathFreeNodeSet">xmlXPathFreeNodeSet</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> obj);
+void	<a href="#xmlXPathFreeNodeSetList">xmlXPathFreeNodeSetList</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj);
+void	<a href="#xmlXPathFreeObject">xmlXPathFreeObject</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj);
+typedef <a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a> <a href="#xmlXPathFuncLookupFunc">xmlXPathFuncLookupFunc</a>	(void * ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
 typedef void <a href="#xmlXPathFunction">xmlXPathFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
@@ -102,7 +106,10 @@
 typedef void <a href="#xmlXPathFunction">xmlXPathFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-int	<a href="#xmlXPathCmpNodes">xmlXPathCmpNodes</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node1, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node2);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastToString">xmlXPathCastToString</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
-<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a>	<a href="#xmlXPathCtxtCompile">xmlXPathCtxtCompile</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
-typedef void <a href="#xmlXPathEvalFunc">xmlXPathEvalFunc</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathCastBooleanToString">xmlXPathCastBooleanToString</a>	(int val);
+void	<a href="#xmlXPathInit">xmlXPathInit</a>			(void);
+int	<a href="#xmlXPathIsInf">xmlXPathIsInf</a>			(double val);
+int	<a href="#xmlXPathIsNaN">xmlXPathIsNaN</a>			(double val);
+<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a>	<a href="#xmlXPathNewContext">xmlXPathNewContext</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNodeEval">xmlXPathNodeEval</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>						 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeSetCreate">xmlXPathNodeSetCreate</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathObjectCopy">xmlXPathObjectCopy</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
+long	<a href="#xmlXPathOrderDocElems">xmlXPathOrderDocElems</a>		(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
 int	<a href="#xmlXPathSetContextNode">xmlXPathSetContextNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
@@ -108,12 +115,5 @@
 int	<a href="#xmlXPathSetContextNode">xmlXPathSetContextNode</a>		(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
-int	<a href="#xmlXPathCastNumberToBoolean">xmlXPathCastNumberToBoolean</a>	(double val);
-void	<a href="#xmlXPathFreeNodeSet">xmlXPathFreeNodeSet</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> obj);
-void	<a href="#xmlXPathFreeCompExpr">xmlXPathFreeCompExpr</a>		(<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp);
-<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a>	<a href="#xmlXPathNewContext">xmlXPathNewContext</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathConvertNumber">xmlXPathConvertNumber</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
-<a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a>	<a href="#xmlXPathCompile">xmlXPathCompile</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
-double	<a href="#xmlXPathCastNodeSetToNumber">xmlXPathCastNodeSetToNumber</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> ns);
-int	<a href="#xmlXPathCastToBoolean">xmlXPathCastToBoolean</a>		(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
+typedef <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> <a href="#xmlXPathVariableLookupFunc">xmlXPathVariableLookupFunc</a>	(void * ctxt, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xpathInternals.html b/doc/devhelp/libxml2-xpathInternals.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14cGF0aEludGVybmFscy5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14cGF0aEludGVybmFscy5odG1s 100644
--- a/doc/devhelp/libxml2-xpathInternals.html
+++ b/doc/devhelp/libxml2-xpathInternals.html
@@ -43,12 +43,5 @@
     <p>Author(s): Daniel Veillard </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
-      <pre class="synopsis">#define <a href="#xmlXPathStackIsExternal">xmlXPathStackIsExternal</a>(ctxt);
-#define <a href="#xmlXPathReturnEmptyString">xmlXPathReturnEmptyString</a>(ctxt);
-#define <a href="#XP_ERROR0">XP_ERROR0</a>(X);
-#define <a href="#xmlXPathSetTypeError">xmlXPathSetTypeError</a>(ctxt);
-#define <a href="#xmlXPathReturnEmptyNodeSet">xmlXPathReturnEmptyNodeSet</a>(ctxt);
-#define <a href="#xmlXPathReturnTrue">xmlXPathReturnTrue</a>(ctxt);
-#define <a href="#xmlXPathReturnBoolean">xmlXPathReturnBoolean</a>(ctxt, val);
-#define <a href="#xmlXPathGetContextNode">xmlXPathGetContextNode</a>(ctxt);
+      <pre class="synopsis">#define <a href="#CAST_TO_BOOLEAN">CAST_TO_BOOLEAN</a>;
 #define <a href="#CAST_TO_NUMBER">CAST_TO_NUMBER</a>;
@@ -54,4 +47,2 @@
 #define <a href="#CAST_TO_NUMBER">CAST_TO_NUMBER</a>;
-#define <a href="#CHECK_ARITY">CHECK_ARITY</a>(x);
-#define <a href="#CHECK_TYPE0">CHECK_TYPE0</a>(typeval);
 #define <a href="#CAST_TO_STRING">CAST_TO_STRING</a>;
@@ -57,6 +48,3 @@
 #define <a href="#CAST_TO_STRING">CAST_TO_STRING</a>;
-#define <a href="#xmlXPathReturnExternal">xmlXPathReturnExternal</a>(ctxt, val);
-#define <a href="#xmlXPathStackIsNodeSet">xmlXPathStackIsNodeSet</a>(ctxt);
-#define <a href="#xmlXPathCheckError">xmlXPathCheckError</a>(ctxt);
-#define <a href="#xmlXPathSetError">xmlXPathSetError</a>(ctxt, err);
+#define <a href="#CHECK_ARITY">CHECK_ARITY</a>(x);
 #define <a href="#CHECK_ERROR">CHECK_ERROR</a>;
@@ -62,5 +50,3 @@
 #define <a href="#CHECK_ERROR">CHECK_ERROR</a>;
-#define <a href="#xmlXPathReturnString">xmlXPathReturnString</a>(ctxt, str);
-#define <a href="#CAST_TO_BOOLEAN">CAST_TO_BOOLEAN</a>;
-#define <a href="#xmlXPathSetArityError">xmlXPathSetArityError</a>(ctxt);
+#define <a href="#CHECK_ERROR0">CHECK_ERROR0</a>;
 #define <a href="#CHECK_TYPE">CHECK_TYPE</a>(typeval);
@@ -66,6 +52,9 @@
 #define <a href="#CHECK_TYPE">CHECK_TYPE</a>(typeval);
-#define <a href="#xmlXPathReturnFalse">xmlXPathReturnFalse</a>(ctxt);
-#define <a href="#xmlXPathReturnNumber">xmlXPathReturnNumber</a>(ctxt, val);
-#define <a href="#CHECK_ERROR0">CHECK_ERROR0</a>;
+#define <a href="#CHECK_TYPE0">CHECK_TYPE0</a>(typeval);
+#define <a href="#XP_ERROR">XP_ERROR</a>(X);
+#define <a href="#XP_ERROR0">XP_ERROR0</a>(X);
+#define <a href="#xmlXPathCheckError">xmlXPathCheckError</a>(ctxt);
+#define <a href="#xmlXPathEmptyNodeSet">xmlXPathEmptyNodeSet</a>(ns);
+#define <a href="#xmlXPathGetContextNode">xmlXPathGetContextNode</a>(ctxt);
 #define <a href="#xmlXPathGetDocument">xmlXPathGetDocument</a>(ctxt);
 #define <a href="#xmlXPathGetError">xmlXPathGetError</a>(ctxt);
@@ -70,5 +59,8 @@
 #define <a href="#xmlXPathGetDocument">xmlXPathGetDocument</a>(ctxt);
 #define <a href="#xmlXPathGetError">xmlXPathGetError</a>(ctxt);
-#define <a href="#XP_ERROR">XP_ERROR</a>(X);
-#define <a href="#xmlXPathEmptyNodeSet">xmlXPathEmptyNodeSet</a>(ns);
+#define <a href="#xmlXPathReturnBoolean">xmlXPathReturnBoolean</a>(ctxt, val);
+#define <a href="#xmlXPathReturnEmptyNodeSet">xmlXPathReturnEmptyNodeSet</a>(ctxt);
+#define <a href="#xmlXPathReturnEmptyString">xmlXPathReturnEmptyString</a>(ctxt);
+#define <a href="#xmlXPathReturnExternal">xmlXPathReturnExternal</a>(ctxt, val);
+#define <a href="#xmlXPathReturnFalse">xmlXPathReturnFalse</a>(ctxt);
 #define <a href="#xmlXPathReturnNodeSet">xmlXPathReturnNodeSet</a>(ctxt, ns);
@@ -74,17 +66,16 @@
 #define <a href="#xmlXPathReturnNodeSet">xmlXPathReturnNodeSet</a>(ctxt, ns);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeSetMerge">xmlXPathNodeSetMerge</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> val1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> val2);
-void	<a href="#xmlXPathNumberFunction">xmlXPathNumberFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathNsLookup">xmlXPathNsLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewNodeSet">xmlXPathNewNodeSet</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextAncestorOrSelf">xmlXPathNextAncestorOrSelf</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void	<a href="#xmlXPathNodeSetRemove">xmlXPathNodeSetRemove</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 int val);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewNodeSetList">xmlXPathNewNodeSetList</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> val);
-int	<a href="#xmlXPathPopBoolean">xmlXPathPopBoolean</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewString">xmlXPathNewString</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeLeadingSorted">xmlXPathNodeLeadingSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextChild">xmlXPathNextChild</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextFollowingSibling">xmlXPathNextFollowingSibling</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathPopString">xmlXPathPopString</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathNamespaceURIFunction">xmlXPathNamespaceURIFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+#define <a href="#xmlXPathReturnNumber">xmlXPathReturnNumber</a>(ctxt, val);
+#define <a href="#xmlXPathReturnString">xmlXPathReturnString</a>(ctxt, str);
+#define <a href="#xmlXPathReturnTrue">xmlXPathReturnTrue</a>(ctxt);
+#define <a href="#xmlXPathSetArityError">xmlXPathSetArityError</a>(ctxt);
+#define <a href="#xmlXPathSetError">xmlXPathSetError</a>(ctxt, err);
+#define <a href="#xmlXPathSetTypeError">xmlXPathSetTypeError</a>(ctxt);
+#define <a href="#xmlXPathStackIsExternal">xmlXPathStackIsExternal</a>(ctxt);
+#define <a href="#xmlXPathStackIsNodeSet">xmlXPathStackIsNodeSet</a>(ctxt);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#valuePop">valuePop</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+int	<a href="#valuePush">valuePush</a>			(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> value);
+void	<a href="#xmlXPathAddValues">xmlXPathAddValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPathBooleanFunction">xmlXPathBooleanFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathCeilingFunction">xmlXPathCeilingFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
 int	<a href="#xmlXPathCompareValues">xmlXPathCompareValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int inf, <br/>					 int strict);
 void	<a href="#xmlXPathConcatFunction">xmlXPathConcatFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
@@ -89,9 +80,23 @@
 int	<a href="#xmlXPathCompareValues">xmlXPathCompareValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int inf, <br/>					 int strict);
 void	<a href="#xmlXPathConcatFunction">xmlXPathConcatFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-int	<a href="#xmlXPathNodeSetContains">xmlXPathNodeSetContains</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
-void	<a href="#xmlXPatherror">xmlXPatherror</a>			(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 const char * file, <br/>					 int line, <br/>					 int no);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextAncestor">xmlXPathNextAncestor</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void	<a href="#xmlXPathBooleanFunction">xmlXPathBooleanFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-void	<a href="#xmlXPathRoot">xmlXPathRoot</a>			(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathRegisteredNsCleanup">xmlXPathRegisteredNsCleanup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+void	<a href="#xmlXPathContainsFunction">xmlXPathContainsFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathCountFunction">xmlXPathCountFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathDebugDumpCompExpr">xmlXPathDebugDumpCompExpr</a>	(FILE * output, <br/>					 <a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp, <br/>					 int depth);
+void	<a href="#xmlXPathDebugDumpObject">xmlXPathDebugDumpObject</a>		(FILE * output, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> cur, <br/>					 int depth);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathDifference">xmlXPathDifference</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathDistinct">xmlXPathDistinct</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathDistinctSorted">xmlXPathDistinctSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes);
+void	<a href="#xmlXPathDivValues">xmlXPathDivValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+int	<a href="#xmlXPathEqualValues">xmlXPathEqualValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPathErr">xmlXPathErr</a>			(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int error);
+void	<a href="#xmlXPathEvalExpr">xmlXPathEvalExpr</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+int	<a href="#xmlXPathEvaluatePredicateResult">xmlXPathEvaluatePredicateResult</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> res);
+void	<a href="#xmlXPathFalseFunction">xmlXPathFalseFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathFloorFunction">xmlXPathFloorFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathFreeParserContext">xmlXPathFreeParserContext</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+<a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a>	<a href="#xmlXPathFunctionLookup">xmlXPathFunctionLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+<a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a>	<a href="#xmlXPathFunctionLookupNS">xmlXPathFunctionLookupNS</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
+int	<a href="#xmlXPathHasSameNodes">xmlXPathHasSameNodes</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
+void	<a href="#xmlXPathIdFunction">xmlXPathIdFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathIntersection">xmlXPathIntersection</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
 int	<a href="#xmlXPathIsNodeType">xmlXPathIsNodeType</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
@@ -97,2 +102,24 @@
 int	<a href="#xmlXPathIsNodeType">xmlXPathIsNodeType</a>		(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+void	<a href="#xmlXPathLangFunction">xmlXPathLangFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathLastFunction">xmlXPathLastFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathLeading">xmlXPathLeading</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathLeadingSorted">xmlXPathLeadingSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
+void	<a href="#xmlXPathLocalNameFunction">xmlXPathLocalNameFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathModValues">xmlXPathModValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPathMultValues">xmlXPathMultValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPathNamespaceURIFunction">xmlXPathNamespaceURIFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewBoolean">xmlXPathNewBoolean</a>	(int val);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewCString">xmlXPathNewCString</a>	(const char * val);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewFloat">xmlXPathNewFloat</a>	(double val);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewNodeSet">xmlXPathNewNodeSet</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewNodeSetList">xmlXPathNewNodeSetList</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> val);
+<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a>	<a href="#xmlXPathNewParserContext">xmlXPathNewParserContext</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>							 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewString">xmlXPathNewString</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewValueTree">xmlXPathNewValueTree</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextAncestor">xmlXPathNextAncestor</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextAncestorOrSelf">xmlXPathNextAncestorOrSelf</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextAttribute">xmlXPathNextAttribute</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextChild">xmlXPathNextChild</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextDescendant">xmlXPathNextDescendant</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextDescendantOrSelf">xmlXPathNextDescendantOrSelf</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextFollowing">xmlXPathNextFollowing</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
@@ -98,8 +125,18 @@
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextFollowing">xmlXPathNextFollowing</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void	<a href="#xmlXPathAddValues">xmlXPathAddValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-int	<a href="#xmlXPathRegisterVariable">xmlXPathRegisterVariable</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> value);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#valuePop">valuePop</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathCeilingFunction">xmlXPathCeilingFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathIntersection">xmlXPathIntersection</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
-void	<a href="#xmlXPathContainsFunction">xmlXPathContainsFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextFollowingSibling">xmlXPathNextFollowingSibling</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextNamespace">xmlXPathNextNamespace</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextParent">xmlXPathNextParent</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextPreceding">xmlXPathNextPreceding</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextPrecedingSibling">xmlXPathNextPrecedingSibling</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextSelf">xmlXPathNextSelf</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeLeading">xmlXPathNodeLeading</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeLeadingSorted">xmlXPathNodeLeadingSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+int	<a href="#xmlXPathNodeSetAdd">xmlXPathNodeSetAdd</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
+int	<a href="#xmlXPathNodeSetAddNs">xmlXPathNodeSetAddNs</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns);
+int	<a href="#xmlXPathNodeSetAddUnique">xmlXPathNodeSetAddUnique</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
+int	<a href="#xmlXPathNodeSetContains">xmlXPathNodeSetContains</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
+void	<a href="#xmlXPathNodeSetDel">xmlXPathNodeSetDel</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
+void	<a href="#xmlXPathNodeSetFreeNs">xmlXPathNodeSetFreeNs</a>		(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeSetMerge">xmlXPathNodeSetMerge</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> val1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> val2);
+void	<a href="#xmlXPathNodeSetRemove">xmlXPathNodeSetRemove</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 int val);
 void	<a href="#xmlXPathNodeSetSort">xmlXPathNodeSetSort</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> set);
@@ -105,5 +142,5 @@
 void	<a href="#xmlXPathNodeSetSort">xmlXPathNodeSetSort</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> set);
-void	<a href="#xmlXPathStartsWithFunction">xmlXPathStartsWithFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeLeading">xmlXPathNodeLeading</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-void	<a href="#xmlXPathSumFunction">xmlXPathSumFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeTrailing">xmlXPathNodeTrailing</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeTrailingSorted">xmlXPathNodeTrailingSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
+void	<a href="#xmlXPathNormalizeFunction">xmlXPathNormalizeFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
 int	<a href="#xmlXPathNotEqualValues">xmlXPathNotEqualValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
@@ -109,7 +146,13 @@
 int	<a href="#xmlXPathNotEqualValues">xmlXPathNotEqualValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-int	<a href="#xmlXPathEvaluatePredicateResult">xmlXPathEvaluatePredicateResult</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> res);
-void	<a href="#xmlXPathErr">xmlXPathErr</a>			(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int error);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextPreceding">xmlXPathNextPreceding</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-<a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a>	<a href="#xmlXPathFunctionLookupNS">xmlXPathFunctionLookupNS</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
-void	<a href="#xmlXPathRegisteredFuncsCleanup">xmlXPathRegisteredFuncsCleanup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+void	<a href="#xmlXPathNotFunction">xmlXPathNotFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathNsLookup">xmlXPathNsLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix);
+void	<a href="#xmlXPathNumberFunction">xmlXPathNumberFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathParseNCName">xmlXPathParseNCName</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathParseName">xmlXPathParseName</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+int	<a href="#xmlXPathPopBoolean">xmlXPathPopBoolean</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void *	<a href="#xmlXPathPopExternal">xmlXPathPopExternal</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathPopNodeSet">xmlXPathPopNodeSet</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+double	<a href="#xmlXPathPopNumber">xmlXPathPopNumber</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathPopString">xmlXPathPopString</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPathPositionFunction">xmlXPathPositionFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
 void	<a href="#xmlXPathRegisterAllFunctions">xmlXPathRegisterAllFunctions</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
@@ -115,7 +158,5 @@
 void	<a href="#xmlXPathRegisterAllFunctions">xmlXPathRegisterAllFunctions</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
-<a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a>	<a href="#xmlXPathFunctionLookup">xmlXPathFunctionLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#xmlXPathPositionFunction">xmlXPathPositionFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-void	<a href="#xmlXPathSubstringBeforeFunction">xmlXPathSubstringBeforeFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-void	<a href="#xmlXPathRegisteredVariablesCleanup">xmlXPathRegisteredVariablesCleanup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewFloat">xmlXPathNewFloat</a>	(double val);
+int	<a href="#xmlXPathRegisterFunc">xmlXPathRegisterFunc</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a> f);
+void	<a href="#xmlXPathRegisterFuncLookup">xmlXPathRegisterFuncLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathFuncLookupFunc">xmlXPathFuncLookupFunc</a> f, <br/>					 void * funcCtxt);
+int	<a href="#xmlXPathRegisterFuncNS">xmlXPathRegisterFuncNS</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri, <br/>					 <a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a> f);
 int	<a href="#xmlXPathRegisterNs">xmlXPathRegisterNs</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
@@ -121,8 +162,12 @@
 int	<a href="#xmlXPathRegisterNs">xmlXPathRegisterNs</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * prefix, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextParent">xmlXPathNextParent</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void	<a href="#xmlXPathNodeSetFreeNs">xmlXPathNodeSetFreeNs</a>		(<a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns);
-int	<a href="#xmlXPathHasSameNodes">xmlXPathHasSameNodes</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathDistinctSorted">xmlXPathDistinctSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes);
-int	<a href="#valuePush">valuePush</a>			(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> value);
-void	<a href="#xmlXPathSubstringFunction">xmlXPathSubstringFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+int	<a href="#xmlXPathRegisterVariable">xmlXPathRegisterVariable</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> value);
+void	<a href="#xmlXPathRegisterVariableLookup">xmlXPathRegisterVariableLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathVariableLookupFunc">xmlXPathVariableLookupFunc</a> f, <br/>					 void * data);
+int	<a href="#xmlXPathRegisterVariableNS">xmlXPathRegisterVariableNS</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> value);
+void	<a href="#xmlXPathRegisteredFuncsCleanup">xmlXPathRegisteredFuncsCleanup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+void	<a href="#xmlXPathRegisteredNsCleanup">xmlXPathRegisteredNsCleanup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+void	<a href="#xmlXPathRegisteredVariablesCleanup">xmlXPathRegisteredVariablesCleanup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+void	<a href="#xmlXPathRoot">xmlXPathRoot</a>			(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPathRoundFunction">xmlXPathRoundFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathStartsWithFunction">xmlXPathStartsWithFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+double	<a href="#xmlXPathStringEvalNumber">xmlXPathStringEvalNumber</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
 void	<a href="#xmlXPathStringFunction">xmlXPathStringFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
@@ -128,5 +173,2 @@
 void	<a href="#xmlXPathStringFunction">xmlXPathStringFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-void	<a href="#xmlXPathFloorFunction">xmlXPathFloorFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-void	<a href="#xmlXPathIdFunction">xmlXPathIdFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-void	<a href="#xmlXPathLastFunction">xmlXPathLastFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
 void	<a href="#xmlXPathStringLengthFunction">xmlXPathStringLengthFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
@@ -132,5 +174,11 @@
 void	<a href="#xmlXPathStringLengthFunction">xmlXPathStringLengthFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextSelf">xmlXPathNextSelf</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void	<a href="#xmlXPathDebugDumpCompExpr">xmlXPathDebugDumpCompExpr</a>	(FILE * output, <br/>					 <a href="libxml2-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp, <br/>					 int depth);
-void	<a href="#xmlXPathFalseFunction">xmlXPathFalseFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathSubValues">xmlXPathSubValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPathSubstringAfterFunction">xmlXPathSubstringAfterFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathSubstringBeforeFunction">xmlXPathSubstringBeforeFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathSubstringFunction">xmlXPathSubstringFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathSumFunction">xmlXPathSumFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathTrailing">xmlXPathTrailing</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
+<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathTrailingSorted">xmlXPathTrailingSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
+void	<a href="#xmlXPathTranslateFunction">xmlXPathTranslateFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+void	<a href="#xmlXPathTrueFunction">xmlXPathTrueFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
 void	<a href="#xmlXPathValueFlipSign">xmlXPathValueFlipSign</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
@@ -136,18 +184,7 @@
 void	<a href="#xmlXPathValueFlipSign">xmlXPathValueFlipSign</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathTranslateFunction">xmlXPathTranslateFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-void	<a href="#xmlXPathRegisterFuncLookup">xmlXPathRegisterFuncLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathFuncLookupFunc">xmlXPathFuncLookupFunc</a> f, <br/>					 void * funcCtxt);
-double	<a href="#xmlXPathPopNumber">xmlXPathPopNumber</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathRoundFunction">xmlXPathRoundFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathPopNodeSet">xmlXPathPopNodeSet</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathCountFunction">xmlXPathCountFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathParseNCName">xmlXPathParseNCName</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathTrueFunction">xmlXPathTrueFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewBoolean">xmlXPathNewBoolean</a>	(int val);
-void	<a href="#xmlXPathSubValues">xmlXPathSubValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-int	<a href="#xmlXPathEqualValues">xmlXPathEqualValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathTrailingSorted">xmlXPathTrailingSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
-void	<a href="#xmlXPathMultValues">xmlXPathMultValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathModValues">xmlXPathModValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a>	<a href="#xmlXPathNewParserContext">xmlXPathNewParserContext</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>							 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathVariableLookup">xmlXPathVariableLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathVariableLookupNS">xmlXPathVariableLookupNS</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathWrapCString">xmlXPathWrapCString</a>	(char * val);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathWrapExternal">xmlXPathWrapExternal</a>	(void * val);
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathWrapNodeSet">xmlXPathWrapNodeSet</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> val);
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathWrapString">xmlXPathWrapString</a>	(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
@@ -152,43 +189,6 @@
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathWrapNodeSet">xmlXPathWrapNodeSet</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> val);
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathWrapString">xmlXPathWrapString</a>	(<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val);
-void	<a href="#xmlXPathLangFunction">xmlXPathLangFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-int	<a href="#xmlXPathRegisterFuncNS">xmlXPathRegisterFuncNS</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri, <br/>					 <a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a> f);
-int	<a href="#xmlXPathNodeSetAddNs">xmlXPathNodeSetAddNs</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node, <br/>					 <a href="libxml2-tree.html#xmlNsPtr">xmlNsPtr</a> ns);
-void	<a href="#xmlXPathLocalNameFunction">xmlXPathLocalNameFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathDifference">xmlXPathDifference</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathLeadingSorted">xmlXPathLeadingSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextPrecedingSibling">xmlXPathNextPrecedingSibling</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void *	<a href="#xmlXPathPopExternal">xmlXPathPopExternal</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathNormalizeFunction">xmlXPathNormalizeFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-void	<a href="#xmlXPathRegisterVariableLookup">xmlXPathRegisterVariableLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 <a href="libxml2-xpath.html#xmlXPathVariableLookupFunc">xmlXPathVariableLookupFunc</a> f, <br/>					 void * data);
-void	<a href="#xmlXPathNodeSetDel">xmlXPathNodeSetDel</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeTrailingSorted">xmlXPathNodeTrailingSorted</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewCString">xmlXPathNewCString</a>	(const char * val);
-int	<a href="#xmlXPathRegisterFunc">xmlXPathRegisterFunc</a>		(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 <a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a> f);
-void	<a href="#xmlXPathSubstringAfterFunction">xmlXPathSubstringAfterFunction</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextDescendant">xmlXPathNextDescendant</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextNamespace">xmlXPathNextNamespace</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathWrapCString">xmlXPathWrapCString</a>	(char * val);
-void	<a href="#xmlXPathFreeParserContext">xmlXPathFreeParserContext</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathNodeTrailing">xmlXPathNodeTrailing</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node);
-int	<a href="#xmlXPathNodeSetAdd">xmlXPathNodeSetAdd</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
-int	<a href="#xmlXPathNodeSetAddUnique">xmlXPathNodeSetAddUnique</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> cur, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathNewValueTree">xmlXPathNewValueTree</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> val);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathDistinct">xmlXPathDistinct</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathVariableLookup">xmlXPathVariableLookup</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>						 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
-void	<a href="#xmlXPathNotFunction">xmlXPathNotFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-double	<a href="#xmlXPathStringEvalNumber">xmlXPathStringEvalNumber</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextDescendantOrSelf">xmlXPathNextDescendantOrSelf</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathWrapExternal">xmlXPathWrapExternal</a>	(void * val);
-<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPathNextAttribute">xmlXPathNextAttribute</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> cur);
-void	<a href="#xmlXPathDivValues">xmlXPathDivValues</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPathVariableLookupNS">xmlXPathVariableLookupNS</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>							 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri);
-int	<a href="#xmlXPathRegisterVariableNS">xmlXPathRegisterVariableNS</a>	(<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/>					 const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> value);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathTrailing">xmlXPathTrailing</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
-void	<a href="#xmlXPathEvalExpr">xmlXPathEvalExpr</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
-void	<a href="#xmlXPathDebugDumpObject">xmlXPathDebugDumpObject</a>		(FILE * output, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> cur, <br/>					 int depth);
-<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a>	<a href="#xmlXPathLeading">xmlXPathLeading</a>		(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes1, <br/>					 <a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> nodes2);
-<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlXPathParseName">xmlXPathParseName</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPatherror">xmlXPatherror</a>			(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 const char * file, <br/>					 int line, <br/>					 int no);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/devhelp/libxml2-xpointer.html b/doc/devhelp/libxml2-xpointer.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2RldmhlbHAvbGlieG1sMi14cG9pbnRlci5odG1s..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2RldmhlbHAvbGlieG1sMi14cG9pbnRlci5odG1s 100644
--- a/doc/devhelp/libxml2-xpointer.html
+++ b/doc/devhelp/libxml2-xpointer.html
@@ -40,8 +40,5 @@
       <h2>Synopsis</h2>
       <pre class="synopsis">typedef struct _xmlLocationSet <a href="#xmlLocationSet">xmlLocationSet</a>;
 typedef <a href="libxml2-xpointer.html#xmlLocationSet">xmlLocationSet</a> * <a href="#xmlLocationSetPtr">xmlLocationSetPtr</a>;
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRange">xmlXPtrNewRange</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>					 int startindex, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> end, <br/>					 int endindex);
-void	<a href="#xmlXPtrFreeLocationSet">xmlXPtrFreeLocationSet</a>		(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> obj);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrWrapLocationSet">xmlXPtrWrapLocationSet</a>	(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> val);
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPtrBuildNodeList">xmlXPtrBuildNodeList</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj);
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrEval">xmlXPtrEval</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
@@ -46,4 +43,5 @@
 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a>	<a href="#xmlXPtrBuildNodeList">xmlXPtrBuildNodeList</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj);
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrEval">xmlXPtrEval</a>	(const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/>					 <a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangeNodes">xmlXPtrNewRangeNodes</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> end);
+void	<a href="#xmlXPtrEvalRangePredicate">xmlXPtrEvalRangePredicate</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPtrFreeLocationSet">xmlXPtrFreeLocationSet</a>		(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> obj);
 void	<a href="#xmlXPtrLocationSetAdd">xmlXPtrLocationSetAdd</a>		(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> cur, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
@@ -49,7 +47,2 @@
 void	<a href="#xmlXPtrLocationSetAdd">xmlXPtrLocationSetAdd</a>		(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> cur, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
-void	<a href="#xmlXPtrRangeToFunction">xmlXPtrRangeToFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewCollapsedRange">xmlXPtrNewCollapsedRange</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangePoints">xmlXPtrNewRangePoints</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> start, <br/>						 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> end);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewLocationSetNodeSet">xmlXPtrNewLocationSetNodeSet</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> set);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangePointNode">xmlXPtrNewRangePointNode</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> start, <br/>							 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> end);
 <a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a>	<a href="#xmlXPtrLocationSetCreate">xmlXPtrLocationSetCreate</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
@@ -55,7 +48,3 @@
 <a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a>	<a href="#xmlXPtrLocationSetCreate">xmlXPtrLocationSetCreate</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangeNodeObject">xmlXPtrNewRangeNodeObject</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>							 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> end);
-<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a>	<a href="#xmlXPtrNewContext">xmlXPtrNewContext</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> here, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> origin);
-void	<a href="#xmlXPtrLocationSetRemove">xmlXPtrLocationSetRemove</a>	(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> cur, <br/>					 int val);
-<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangeNodePoint">xmlXPtrNewRangeNodePoint</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>							 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> end);
 void	<a href="#xmlXPtrLocationSetDel">xmlXPtrLocationSetDel</a>		(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> cur, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
 <a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a>	<a href="#xmlXPtrLocationSetMerge">xmlXPtrLocationSetMerge</a>	(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> val1, <br/>						 <a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> val2);
@@ -60,4 +49,7 @@
 void	<a href="#xmlXPtrLocationSetDel">xmlXPtrLocationSetDel</a>		(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> cur, <br/>					 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val);
 <a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a>	<a href="#xmlXPtrLocationSetMerge">xmlXPtrLocationSetMerge</a>	(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> val1, <br/>						 <a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> val2);
-void	<a href="#xmlXPtrEvalRangePredicate">xmlXPtrEvalRangePredicate</a>	(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt);
+void	<a href="#xmlXPtrLocationSetRemove">xmlXPtrLocationSetRemove</a>	(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> cur, <br/>					 int val);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewCollapsedRange">xmlXPtrNewCollapsedRange</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start);
+<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a>	<a href="#xmlXPtrNewContext">xmlXPtrNewContext</a>	(<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> here, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> origin);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewLocationSetNodeSet">xmlXPtrNewLocationSetNodeSet</a>	(<a href="libxml2-xpath.html#xmlNodeSetPtr">xmlNodeSetPtr</a> set);
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewLocationSetNodes">xmlXPtrNewLocationSetNodes</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>							 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> end);
@@ -63,4 +55,12 @@
 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewLocationSetNodes">xmlXPtrNewLocationSetNodes</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>							 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> end);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRange">xmlXPtrNewRange</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>					 int startindex, <br/>					 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> end, <br/>					 int endindex);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangeNodeObject">xmlXPtrNewRangeNodeObject</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>							 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> end);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangeNodePoint">xmlXPtrNewRangeNodePoint</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>							 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> end);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangeNodes">xmlXPtrNewRangeNodes</a>	(<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> start, <br/>						 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> end);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangePointNode">xmlXPtrNewRangePointNode</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> start, <br/>							 <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> end);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrNewRangePoints">xmlXPtrNewRangePoints</a>	(<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> start, <br/>						 <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> end);
+void	<a href="#xmlXPtrRangeToFunction">xmlXPtrRangeToFunction</a>		(<a href="libxml2-xpath.html#xmlXPathParserContextPtr">xmlXPathParserContextPtr</a> ctxt, <br/>					 int nargs);
+<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	<a href="#xmlXPtrWrapLocationSet">xmlXPtrWrapLocationSet</a>	(<a href="libxml2-xpointer.html#xmlLocationSetPtr">xmlLocationSetPtr</a> val);
 </pre>
     </div>
     <div class="refsect1" lang="en">
diff --git a/doc/examples/examples.xml b/doc/examples/examples.xml
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2V4YW1wbGVzL2V4YW1wbGVzLnhtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2V4YW1wbGVzL2V4YW1wbGVzLnhtbA== 100644
--- a/doc/examples/examples.xml
+++ b/doc/examples/examples.xml
@@ -8,9 +8,9 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>InputOutput</section>
     <includes>
-      <include>&lt;libxml/parser.h&gt;</include>
-      <include>&lt;libxml/xmlIO.h&gt;</include>
-      <include>&lt;libxml/xinclude.h&gt;</include>
-      <include>&lt;libxml/tree.h&gt;</include>
+      <include line='16'>&lt;libxml/parser.h&gt;</include>
+      <include line='17'>&lt;libxml/tree.h&gt;</include>
+      <include line='18'>&lt;libxml/xinclude.h&gt;</include>
+      <include line='19'>&lt;libxml/xmlIO.h&gt;</include>
     </includes>
     <uses>
@@ -15,6 +15,4 @@
     </includes>
     <uses>
-      <function line='143' file='tree' name='xmlDocDump'/>
-      <function line='158' file='xmlmemory' name='xmlMemoryDump'/>
-      <function line='149' file='tree' name='xmlFreeDoc'/>
+      <macro line='117' file='xmlversion' name='LIBXML_TEST_VERSION'/>
       <function line='154' file='parser' name='xmlCleanupParser'/>
@@ -20,4 +18,7 @@
       <function line='154' file='parser' name='xmlCleanupParser'/>
-      <macro line='117' file='xmlversion' name='LIBXML_TEST_VERSION'/>
-      <function line='134' file='xinclude' name='xmlXIncludeProcess'/>
+      <function line='143' file='tree' name='xmlDocDump'/>
+      <typedef line='105' file='tree' name='xmlDocPtr'/>
+      <function line='149' file='tree' name='xmlFreeDoc'/>
+      <function line='158' file='xmlmemory' name='xmlMemoryDump'/>
+      <function line='124' file='parser' name='xmlReadMemory'/>
       <function line='117' file='xmlIO' name='xmlRegisterInputCallbacks'/>
@@ -23,6 +24,5 @@
       <function line='117' file='xmlIO' name='xmlRegisterInputCallbacks'/>
-      <function line='124' file='parser' name='xmlReadMemory'/>
-      <typedef line='105' file='tree' name='xmlDocPtr'/>
+      <function line='134' file='xinclude' name='xmlXIncludeProcess'/>
     </uses>
   </example>
   <example filename='io2.c'>
@@ -34,6 +34,6 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>InputOutput</section>
     <includes>
-      <include>&lt;libxml/parser.h&gt;</include>
+      <include line='12'>&lt;libxml/parser.h&gt;</include>
     </includes>
     <uses>
@@ -38,5 +38,3 @@
     </includes>
     <uses>
-      <function line='29' file='tree' name='xmlNodeSetContent'/>
-      <function line='28' file='tree' name='xmlNewDocNode'/>
       <function line='36' file='tree' name='xmlDocDumpFormatMemory'/>
@@ -42,3 +40,3 @@
       <function line='36' file='tree' name='xmlDocDumpFormatMemory'/>
-      <variable line='42' file='globals' name='xmlFree'/>
+      <typedef line='20' file='tree' name='xmlDocPtr'/>
       <function line='30' file='tree' name='xmlDocSetRootElement'/>
@@ -44,3 +42,3 @@
       <function line='30' file='tree' name='xmlDocSetRootElement'/>
-      <typedef line='20' file='tree' name='xmlDocPtr'/>
+      <variable line='42' file='globals' name='xmlFree'/>
       <function line='43' file='tree' name='xmlFreeDoc'/>
@@ -46,2 +44,4 @@
       <function line='43' file='tree' name='xmlFreeDoc'/>
+      <function line='27' file='tree' name='xmlNewDoc'/>
+      <function line='28' file='tree' name='xmlNewDocNode'/>
       <typedef line='19' file='tree' name='xmlNodePtr'/>
@@ -47,5 +47,5 @@
       <typedef line='19' file='tree' name='xmlNodePtr'/>
-      <function line='27' file='tree' name='xmlNewDoc'/>
+      <function line='29' file='tree' name='xmlNodeSetContent'/>
     </uses>
   </example>
   <example filename='parse1.c'>
@@ -57,7 +57,7 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>Parsing</section>
     <includes>
-      <include>&lt;libxml/tree.h&gt;</include>
-      <include>&lt;libxml/parser.h&gt;</include>
+      <include line='13'>&lt;libxml/parser.h&gt;</include>
+      <include line='14'>&lt;libxml/tree.h&gt;</include>
     </includes>
     <uses>
@@ -62,4 +62,4 @@
     </includes>
     <uses>
-      <function line='54' file='xmlmemory' name='xmlMemoryDump'/>
+      <macro line='45' file='xmlversion' name='LIBXML_TEST_VERSION'/>
       <function line='50' file='parser' name='xmlCleanupParser'/>
@@ -65,4 +65,3 @@
       <function line='50' file='parser' name='xmlCleanupParser'/>
-      <macro line='45' file='xmlversion' name='LIBXML_TEST_VERSION'/>
       <typedef line='24' file='tree' name='xmlDocPtr'/>
       <function line='31' file='tree' name='xmlFreeDoc'/>
@@ -67,5 +66,6 @@
       <typedef line='24' file='tree' name='xmlDocPtr'/>
       <function line='31' file='tree' name='xmlFreeDoc'/>
+      <function line='54' file='xmlmemory' name='xmlMemoryDump'/>
       <function line='26' file='parser' name='xmlReadFile'/>
     </uses>
   </example>
@@ -78,7 +78,7 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>Parsing</section>
     <includes>
-      <include>&lt;libxml/tree.h&gt;</include>
-      <include>&lt;libxml/parser.h&gt;</include>
+      <include line='14'>&lt;libxml/parser.h&gt;</include>
+      <include line='15'>&lt;libxml/tree.h&gt;</include>
     </includes>
     <uses>
@@ -83,3 +83,9 @@
     </includes>
     <uses>
+      <macro line='61' file='xmlversion' name='LIBXML_TEST_VERSION'/>
+      <enum line='35' file='parser' name='XML_PARSE_DTDVALID'/>
+      <function line='66' file='parser' name='xmlCleanupParser'/>
+      <function line='35' file='parser' name='xmlCtxtReadFile'/>
+      <typedef line='26' file='tree' name='xmlDocPtr'/>
+      <function line='44' file='tree' name='xmlFreeDoc'/>
       <function line='47' file='parser' name='xmlFreeParserCtxt'/>
@@ -85,4 +91,4 @@
       <function line='47' file='parser' name='xmlFreeParserCtxt'/>
-      <enum line='35' file='parser' name='XML_PARSE_DTDVALID'/>
+      <function line='70' file='xmlmemory' name='xmlMemoryDump'/>
       <function line='29' file='parser' name='xmlNewParserCtxt'/>
       <typedef line='25' file='tree' name='xmlParserCtxtPtr'/>
@@ -87,11 +93,5 @@
       <function line='29' file='parser' name='xmlNewParserCtxt'/>
       <typedef line='25' file='tree' name='xmlParserCtxtPtr'/>
-      <function line='35' file='parser' name='xmlCtxtReadFile'/>
-      <function line='66' file='parser' name='xmlCleanupParser'/>
-      <macro line='61' file='xmlversion' name='LIBXML_TEST_VERSION'/>
-      <function line='44' file='tree' name='xmlFreeDoc'/>
-      <typedef line='26' file='tree' name='xmlDocPtr'/>
-      <function line='70' file='xmlmemory' name='xmlMemoryDump'/>
     </uses>
   </example>
   <example filename='parse3.c'>
@@ -103,7 +103,7 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>Parsing</section>
     <includes>
-      <include>&lt;libxml/tree.h&gt;</include>
-      <include>&lt;libxml/parser.h&gt;</include>
+      <include line='13'>&lt;libxml/parser.h&gt;</include>
+      <include line='14'>&lt;libxml/tree.h&gt;</include>
     </includes>
     <uses>
@@ -108,5 +108,4 @@
     </includes>
     <uses>
-      <function line='33' file='parser' name='xmlReadMemory'/>
-      <function line='58' file='xmlmemory' name='xmlMemoryDump'/>
+      <macro line='49' file='xmlversion' name='LIBXML_TEST_VERSION'/>
       <function line='54' file='parser' name='xmlCleanupParser'/>
@@ -112,3 +111,3 @@
       <function line='54' file='parser' name='xmlCleanupParser'/>
-      <macro line='49' file='xmlversion' name='LIBXML_TEST_VERSION'/>
+      <typedef line='27' file='tree' name='xmlDocPtr'/>
       <function line='38' file='tree' name='xmlFreeDoc'/>
@@ -114,5 +113,6 @@
       <function line='38' file='tree' name='xmlFreeDoc'/>
-      <typedef line='27' file='tree' name='xmlDocPtr'/>
+      <function line='58' file='xmlmemory' name='xmlMemoryDump'/>
+      <function line='33' file='parser' name='xmlReadMemory'/>
     </uses>
   </example>
   <example filename='parse4.c'>
@@ -124,7 +124,7 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>Parsing</section>
     <includes>
-      <include>&lt;libxml/tree.h&gt;</include>
-      <include>&lt;libxml/parser.h&gt;</include>
+      <include line='14'>&lt;libxml/parser.h&gt;</include>
+      <include line='15'>&lt;libxml/tree.h&gt;</include>
     </includes>
     <uses>
@@ -129,7 +129,5 @@
     </includes>
     <uses>
-      <function line='94' file='parser' name='xmlFreeParserCtxt'/>
-      <function line='86' file='parser' name='xmlParseChunk'/>
-      <function line='103' file='tree' name='xmlFreeDoc'/>
-      <function line='135' file='xmlmemory' name='xmlMemoryDump'/>
+      <macro line='120' file='xmlversion' name='LIBXML_TEST_VERSION'/>
+      <function line='131' file='parser' name='xmlCleanupParser'/>
       <function line='67' file='parser' name='xmlCreatePushParserCtxt'/>
@@ -135,4 +133,7 @@
       <function line='67' file='parser' name='xmlCreatePushParserCtxt'/>
-      <function line='131' file='parser' name='xmlCleanupParser'/>
-      <macro line='120' file='xmlversion' name='LIBXML_TEST_VERSION'/>
+      <typedef line='47' file='tree' name='xmlDocPtr'/>
+      <function line='103' file='tree' name='xmlFreeDoc'/>
+      <function line='94' file='parser' name='xmlFreeParserCtxt'/>
+      <function line='135' file='xmlmemory' name='xmlMemoryDump'/>
+      <function line='86' file='parser' name='xmlParseChunk'/>
       <typedef line='45' file='tree' name='xmlParserCtxtPtr'/>
@@ -138,5 +139,4 @@
       <typedef line='45' file='tree' name='xmlParserCtxtPtr'/>
-      <typedef line='47' file='tree' name='xmlDocPtr'/>
     </uses>
   </example>
   <example filename='reader1.c'>
@@ -148,6 +148,6 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>xmlReader</section>
     <includes>
-      <include>&lt;libxml/xmlreader.h&gt;</include>
+      <include line='15'>&lt;libxml/xmlreader.h&gt;</include>
     </includes>
     <uses>
@@ -152,3 +152,8 @@
     </includes>
     <uses>
+      <macro line='89' file='xmlversion' name='LIBXML_TEST_VERSION'/>
+      <function line='94' file='parser' name='xmlCleanupParser'/>
+      <function line='69' file='xmlreader' name='xmlFreeTextReader'/>
+      <function line='98' file='xmlmemory' name='xmlMemoryDump'/>
+      <function line='62' file='xmlreader' name='xmlReaderForFile'/>
       <function line='44' file='xmlstring' name='xmlStrlen'/>
@@ -154,4 +159,8 @@
       <function line='44' file='xmlstring' name='xmlStrlen'/>
-      <function line='94' file='parser' name='xmlCleanupParser'/>
+      <function line='29' file='xmlreader' name='xmlTextReaderConstName'/>
+      <function line='33' file='xmlreader' name='xmlTextReaderConstValue'/>
+      <function line='36' file='xmlreader' name='xmlTextReaderDepth'/>
+      <function line='40' file='xmlreader' name='xmlTextReaderHasValue'/>
+      <function line='39' file='xmlreader' name='xmlTextReaderIsEmptyElement'/>
       <function line='37' file='xmlreader' name='xmlTextReaderNodeType'/>
       <typedef line='59' file='xmlreader' name='xmlTextReaderPtr'/>
@@ -156,10 +165,3 @@
       <function line='37' file='xmlreader' name='xmlTextReaderNodeType'/>
       <typedef line='59' file='xmlreader' name='xmlTextReaderPtr'/>
-      <function line='98' file='xmlmemory' name='xmlMemoryDump'/>
-      <function line='33' file='xmlreader' name='xmlTextReaderConstValue'/>
-      <function line='36' file='xmlreader' name='xmlTextReaderDepth'/>
-      <function line='69' file='xmlreader' name='xmlFreeTextReader'/>
-      <macro line='89' file='xmlversion' name='LIBXML_TEST_VERSION'/>
-      <function line='29' file='xmlreader' name='xmlTextReaderConstName'/>
-      <function line='40' file='xmlreader' name='xmlTextReaderHasValue'/>
       <function line='67' file='xmlreader' name='xmlTextReaderRead'/>
@@ -165,6 +167,4 @@
       <function line='67' file='xmlreader' name='xmlTextReaderRead'/>
-      <function line='39' file='xmlreader' name='xmlTextReaderIsEmptyElement'/>
-      <function line='62' file='xmlreader' name='xmlReaderForFile'/>
     </uses>
   </example>
   <example filename='reader2.c'>
@@ -176,6 +176,6 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>xmlReader</section>
     <includes>
-      <include>&lt;libxml/xmlreader.h&gt;</include>
+      <include line='16'>&lt;libxml/xmlreader.h&gt;</include>
     </includes>
     <uses>
@@ -180,3 +180,8 @@
     </includes>
     <uses>
+      <enum line='69' file='parser' name='XML_PARSE_DTDATTR'/>
+      <enum line='71' file='parser' name='XML_PARSE_DTDVALID'/>
+      <enum line='70' file='parser' name='XML_PARSE_NOENT'/>
+      <function line='84' file='xmlreader' name='xmlFreeTextReader'/>
+      <function line='68' file='xmlreader' name='xmlReaderForFile'/>
       <function line='45' file='xmlstring' name='xmlStrlen'/>
@@ -182,3 +187,9 @@
       <function line='45' file='xmlstring' name='xmlStrlen'/>
+      <function line='30' file='xmlreader' name='xmlTextReaderConstName'/>
+      <function line='34' file='xmlreader' name='xmlTextReaderConstValue'/>
+      <function line='37' file='xmlreader' name='xmlTextReaderDepth'/>
+      <function line='41' file='xmlreader' name='xmlTextReaderHasValue'/>
+      <function line='40' file='xmlreader' name='xmlTextReaderIsEmptyElement'/>
+      <function line='81' file='xmlreader' name='xmlTextReaderIsValid'/>
       <function line='38' file='xmlreader' name='xmlTextReaderNodeType'/>
       <typedef line='60' file='xmlreader' name='xmlTextReaderPtr'/>
@@ -183,11 +194,3 @@
       <function line='38' file='xmlreader' name='xmlTextReaderNodeType'/>
       <typedef line='60' file='xmlreader' name='xmlTextReaderPtr'/>
-      <function line='34' file='xmlreader' name='xmlTextReaderConstValue'/>
-      <enum line='70' file='parser' name='XML_PARSE_NOENT'/>
-      <function line='37' file='xmlreader' name='xmlTextReaderDepth'/>
-      <enum line='71' file='parser' name='XML_PARSE_DTDVALID'/>
-      <enum line='69' file='parser' name='XML_PARSE_DTDATTR'/>
-      <function line='84' file='xmlreader' name='xmlFreeTextReader'/>
-      <function line='30' file='xmlreader' name='xmlTextReaderConstName'/>
-      <function line='41' file='xmlreader' name='xmlTextReaderHasValue'/>
       <function line='76' file='xmlreader' name='xmlTextReaderRead'/>
@@ -193,7 +196,4 @@
       <function line='76' file='xmlreader' name='xmlTextReaderRead'/>
-      <function line='40' file='xmlreader' name='xmlTextReaderIsEmptyElement'/>
-      <function line='68' file='xmlreader' name='xmlReaderForFile'/>
-      <function line='81' file='xmlreader' name='xmlTextReaderIsValid'/>
     </uses>
   </example>
   <example filename='reader3.c'>
@@ -205,6 +205,6 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>xmlReader</section>
     <includes>
-      <include>&lt;libxml/xmlreader.h&gt;</include>
+      <include line='16'>&lt;libxml/xmlreader.h&gt;</include>
     </includes>
     <uses>
@@ -209,4 +209,4 @@
     </includes>
     <uses>
-      <typedef line='32' file='xmlreader' name='xmlTextReaderPtr'/>
+      <function line='96' file='tree' name='xmlDocDump'/>
       <function line='66' file='xmlreader' name='xmlFreeTextReader'/>
@@ -212,5 +212,4 @@
       <function line='66' file='xmlreader' name='xmlFreeTextReader'/>
-      <function line='96' file='tree' name='xmlDocDump'/>
-      <function line='52' file='xmlreader' name='xmlTextReaderRead'/>
+      <function line='38' file='xmlreader' name='xmlReaderForFile'/>
       <function line='62' file='xmlreader' name='xmlTextReaderCurrentDoc'/>
       <function line='43' file='xmlreader' name='xmlTextReaderPreservePattern'/>
@@ -215,6 +214,7 @@
       <function line='62' file='xmlreader' name='xmlTextReaderCurrentDoc'/>
       <function line='43' file='xmlreader' name='xmlTextReaderPreservePattern'/>
-      <function line='38' file='xmlreader' name='xmlReaderForFile'/>
+      <typedef line='32' file='xmlreader' name='xmlTextReaderPtr'/>
+      <function line='52' file='xmlreader' name='xmlTextReaderRead'/>
     </uses>
   </example>
   <example filename='reader4.c'>
@@ -226,6 +226,6 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>xmlReader</section>
     <includes>
-      <include>&lt;libxml/xmlreader.h&gt;</include>
+      <include line='15'>&lt;libxml/xmlreader.h&gt;</include>
     </includes>
     <uses>
@@ -230,4 +230,5 @@
     </includes>
     <uses>
-      <typedef line='54' file='xmlreader' name='xmlTextReaderPtr'/>
+      <function line='104' file='xmlreader' name='xmlFreeTextReader'/>
+      <function line='72' file='xmlreader' name='xmlReaderForFile'/>
       <function line='83' file='xmlreader' name='xmlReaderNewFile'/>
@@ -233,3 +234,4 @@
       <function line='83' file='xmlreader' name='xmlReaderNewFile'/>
-      <function line='104' file='xmlreader' name='xmlFreeTextReader'/>
+      <function line='97' file='xmlreader' name='xmlTextReaderCurrentDoc'/>
+      <typedef line='54' file='xmlreader' name='xmlTextReaderPtr'/>
       <function line='26' file='xmlreader' name='xmlTextReaderRead'/>
@@ -235,6 +237,4 @@
       <function line='26' file='xmlreader' name='xmlTextReaderRead'/>
-      <function line='97' file='xmlreader' name='xmlTextReaderCurrentDoc'/>
-      <function line='72' file='xmlreader' name='xmlReaderForFile'/>
     </uses>
   </example>
   <example filename='testWriter.c'>
@@ -246,7 +246,7 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>xmlWriter</section>
     <includes>
-      <include>&lt;libxml/encoding.h&gt;</include>
-      <include>&lt;libxml/xmlwriter.h&gt;</include>
+      <include line='16'>&lt;libxml/encoding.h&gt;</include>
+      <include line='17'>&lt;libxml/xmlwriter.h&gt;</include>
     </includes>
     <uses>
@@ -251,9 +251,6 @@
     </includes>
     <uses>
-      <function line='913' file='xmlwriter' name='xmlTextWriterStartDocument'/>
-      <function line='1121' file='xmlwriter' name='xmlTextWriterEndDocument'/>
-      <variable line='1183' file='globals' name='xmlRealloc'/>
-      <function line='925' file='xmlwriter' name='xmlTextWriterWriteComment'/>
-      <function line='1156' file='encoding' name='xmlFindCharEncodingHandler'/>
-      <variable line='1166' file='globals' name='xmlMalloc'/>
+      <macro line='885' file='parser' name='XML_DEFAULT_VERSION'/>
+      <function line='347' file='tree' name='xmlBufferCreate'/>
+      <function line='613' file='tree' name='xmlBufferFree'/>
       <typedef line='341' file='tree' name='xmlBufferPtr'/>
@@ -259,3 +256,3 @@
       <typedef line='341' file='tree' name='xmlBufferPtr'/>
-      <macro line='885' file='parser' name='XML_DEFAULT_VERSION'/>
+      <typedef line='1151' file='encoding' name='xmlCharEncodingHandlerPtr'/>
       <function line='901' file='tree' name='xmlDocSetRootElement'/>
@@ -261,2 +258,4 @@
       <function line='901' file='tree' name='xmlDocSetRootElement'/>
+      <function line='1156' file='encoding' name='xmlFindCharEncodingHandler'/>
+      <variable line='1180' file='globals' name='xmlFree'/>
       <function line='1127' file='xmlwriter' name='xmlFreeTextWriter'/>
@@ -262,2 +261,16 @@
       <function line='1127' file='xmlwriter' name='xmlFreeTextWriter'/>
+      <variable line='1166' file='globals' name='xmlMalloc'/>
+      <function line='885' file='tree' name='xmlNewDoc'/>
+      <function line='894' file='tree' name='xmlNewDocNode'/>
+      <function line='632' file='xmlwriter' name='xmlNewTextWriterDoc'/>
+      <function line='76' file='xmlwriter' name='xmlNewTextWriterFilename'/>
+      <function line='355' file='xmlwriter' name='xmlNewTextWriterMemory'/>
+      <function line='904' file='xmlwriter' name='xmlNewTextWriterTree'/>
+      <typedef line='880' file='tree' name='xmlNodePtr'/>
+      <variable line='1183' file='globals' name='xmlRealloc'/>
+      <function line='1129' file='tree' name='xmlSaveFileEnc'/>
+      <function line='1121' file='xmlwriter' name='xmlTextWriterEndDocument'/>
+      <function line='1111' file='xmlwriter' name='xmlTextWriterEndElement'/>
+      <typedef line='878' file='xmlwriter' name='xmlTextWriterPtr'/>
+      <function line='913' file='xmlwriter' name='xmlTextWriterStartDocument'/>
       <function line='1096' file='xmlwriter' name='xmlTextWriterStartElement'/>
@@ -263,6 +276,6 @@
       <function line='1096' file='xmlwriter' name='xmlTextWriterStartElement'/>
-      <function line='347' file='tree' name='xmlBufferCreate'/>
-      <function line='1111' file='xmlwriter' name='xmlTextWriterEndElement'/>
-      <function line='76' file='xmlwriter' name='xmlNewTextWriterFilename'/>
+      <function line='949' file='xmlwriter' name='xmlTextWriterWriteAttribute'/>
+      <function line='925' file='xmlwriter' name='xmlTextWriterWriteComment'/>
+      <function line='1103' file='xmlwriter' name='xmlTextWriterWriteElement'/>
       <function line='959' file='xmlwriter' name='xmlTextWriterWriteFormatComment'/>
       <function line='1073' file='xmlwriter' name='xmlTextWriterWriteFormatElement'/>
@@ -267,18 +280,5 @@
       <function line='959' file='xmlwriter' name='xmlTextWriterWriteFormatComment'/>
       <function line='1073' file='xmlwriter' name='xmlTextWriterWriteFormatElement'/>
-      <typedef line='1151' file='encoding' name='xmlCharEncodingHandlerPtr'/>
-      <typedef line='880' file='tree' name='xmlNodePtr'/>
-      <function line='949' file='xmlwriter' name='xmlTextWriterWriteAttribute'/>
-      <function line='632' file='xmlwriter' name='xmlNewTextWriterDoc'/>
-      <function line='894' file='tree' name='xmlNewDocNode'/>
-      <function line='1129' file='tree' name='xmlSaveFileEnc'/>
-      <function line='904' file='xmlwriter' name='xmlNewTextWriterTree'/>
-      <function line='355' file='xmlwriter' name='xmlNewTextWriterMemory'/>
-      <variable line='1180' file='globals' name='xmlFree'/>
-      <function line='613' file='tree' name='xmlBufferFree'/>
-      <typedef line='878' file='xmlwriter' name='xmlTextWriterPtr'/>
-      <function line='1103' file='xmlwriter' name='xmlTextWriterWriteElement'/>
-      <function line='885' file='tree' name='xmlNewDoc'/>
     </uses>
   </example>
   <example filename='tree1.c'>
@@ -290,8 +290,8 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>Tree</section>
     <includes>
-      <include>&lt;libxml/tree.h&gt;</include>
-      <include>&lt;libxml/parser.h&gt;</include>
+      <include line='13'>&lt;libxml/parser.h&gt;</include>
+      <include line='14'>&lt;libxml/tree.h&gt;</include>
     </includes>
     <uses>
       <enum line='36' file='tree' name='XML_ELEMENT_NODE'/>
@@ -308,7 +308,7 @@
     <copy>see Copyright for the status of this software </copy>
     <section>Tree</section>
     <includes>
-      <include>&lt;libxml/tree.h&gt;</include>
-      <include>&lt;libxml/parser.h&gt;</include>
+      <include line='12'>&lt;libxml/parser.h&gt;</include>
+      <include line='13'>&lt;libxml/tree.h&gt;</include>
     </includes>
     <uses>
@@ -313,3 +313,8 @@
     </includes>
     <uses>
+      <function line='77' file='tree' name='xmlAddChild'/>
+      <function line='45' file='tree' name='xmlCreateIntSubset'/>
+      <function line='40' file='tree' name='xmlDocSetRootElement'/>
+      <function line='87' file='tree' name='xmlNewChild'/>
+      <function line='38' file='tree' name='xmlNewDoc'/>
       <function line='73' file='tree' name='xmlNewDocNode'/>
@@ -315,5 +320,3 @@
       <function line='73' file='tree' name='xmlNewDocNode'/>
-      <function line='95' file='tree' name='xmlSaveFormatFileEnc'/>
-      <function line='77' file='tree' name='xmlAddChild'/>
-      <function line='40' file='tree' name='xmlDocSetRootElement'/>
+      <function line='74' file='tree' name='xmlNewDocText'/>
       <function line='88' file='tree' name='xmlNewProp'/>
@@ -319,8 +322,5 @@
       <function line='88' file='tree' name='xmlNewProp'/>
-      <function line='87' file='tree' name='xmlNewChild'/>
-      <function line='74' file='tree' name='xmlNewDocText'/>
-      <function line='45' file='tree' name='xmlCreateIntSubset'/>
-      <function line='38' file='tree' name='xmlNewDoc'/>
+      <function line='95' file='tree' name='xmlSaveFormatFileEnc'/>
     </uses>
   </example>
   <example filename='xpath1.c'>
@@ -332,10 +332,10 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>XPath</section>
     <includes>
-      <include>&lt;libxml/parser.h&gt;</include>
-      <include>&lt;libxml/xpath.h&gt;</include>
-      <include>&lt;libxml/xpathInternals.h&gt;</include>
-      <include>&lt;libxml/tree.h&gt;</include>
+      <include line='17'>&lt;libxml/parser.h&gt;</include>
+      <include line='16'>&lt;libxml/tree.h&gt;</include>
+      <include line='18'>&lt;libxml/xpath.h&gt;</include>
+      <include line='19'>&lt;libxml/xpathInternals.h&gt;</include>
     </includes>
     <uses>
       <enum line='229' file='tree' name='XML_ELEMENT_NODE'/>
@@ -339,6 +339,9 @@
     </includes>
     <uses>
       <enum line='229' file='tree' name='XML_ELEMENT_NODE'/>
-      <typedef line='88' file='xpath' name='xmlXPathObjectPtr'/>
-      <function line='117' file='xpath' name='xmlXPathEvalExpression'/>
+      <enum line='217' file='tree' name='XML_NAMESPACE_DECL'/>
+      <variable line='193' file='globals' name='xmlFree'/>
+      <function line='39' file='parser' name='xmlInitParser'/>
+      <typedef line='206' file='tree' name='xmlNodePtr'/>
+      <typedef line='218' file='tree' name='xmlNsPtr'/>
       <function line='94' file='parser' name='xmlParseFile'/>
@@ -344,3 +347,7 @@
       <function line='94' file='parser' name='xmlParseFile'/>
-      <function line='186' file='xpathInternals' name='xmlXPathRegisterNs'/>
+      <function line='180' file='xmlstring' name='xmlStrchr'/>
+      <function line='156' file='xmlstring' name='xmlStrdup'/>
+      <typedef line='87' file='xpath' name='xmlXPathContextPtr'/>
+      <function line='117' file='xpath' name='xmlXPathEvalExpression'/>
+      <function line='130' file='xpath' name='xmlXPathFreeContext'/>
       <function line='129' file='xpath' name='xmlXPathFreeObject'/>
@@ -346,4 +353,2 @@
       <function line='129' file='xpath' name='xmlXPathFreeObject'/>
-      <variable line='193' file='globals' name='xmlFree'/>
-      <typedef line='218' file='tree' name='xmlNsPtr'/>
       <function line='101' file='xpath' name='xmlXPathNewContext'/>
@@ -349,11 +354,6 @@
       <function line='101' file='xpath' name='xmlXPathNewContext'/>
-      <typedef line='87' file='xpath' name='xmlXPathContextPtr'/>
-      <function line='130' file='xpath' name='xmlXPathFreeContext'/>
-      <function line='39' file='parser' name='xmlInitParser'/>
-      <function line='156' file='xmlstring' name='xmlStrdup'/>
-      <function line='180' file='xmlstring' name='xmlStrchr'/>
-      <typedef line='206' file='tree' name='xmlNodePtr'/>
-      <enum line='217' file='tree' name='XML_NAMESPACE_DECL'/>
+      <typedef line='88' file='xpath' name='xmlXPathObjectPtr'/>
+      <function line='186' file='xpathInternals' name='xmlXPathRegisterNs'/>
     </uses>
   </example>
   <example filename='xpath2.c'>
@@ -365,9 +365,9 @@
     <copy>see Copyright for the status of this software. </copy>
     <section>XPath</section>
     <includes>
-      <include>&lt;libxml/parser.h&gt;</include>
-      <include>&lt;libxml/xpath.h&gt;</include>
-      <include>&lt;libxml/xpathInternals.h&gt;</include>
-      <include>&lt;libxml/tree.h&gt;</include>
+      <include line='17'>&lt;libxml/parser.h&gt;</include>
+      <include line='16'>&lt;libxml/tree.h&gt;</include>
+      <include line='18'>&lt;libxml/xpath.h&gt;</include>
+      <include line='19'>&lt;libxml/xpathInternals.h&gt;</include>
     </includes>
     <uses>
@@ -372,4 +372,4 @@
     </includes>
     <uses>
-      <function line='162' file='tree' name='xmlNodeSetContent'/>
+      <enum line='180' file='tree' name='XML_NAMESPACE_DECL'/>
       <function line='127' file='tree' name='xmlDocDump'/>
@@ -375,3 +375,6 @@
       <function line='127' file='tree' name='xmlDocDump'/>
-      <typedef line='88' file='xpath' name='xmlXPathObjectPtr'/>
+      <function line='41' file='parser' name='xmlInitParser'/>
+      <function line='162' file='tree' name='xmlNodeSetContent'/>
+      <function line='95' file='parser' name='xmlParseFile'/>
+      <typedef line='87' file='xpath' name='xmlXPathContextPtr'/>
       <function line='110' file='xpath' name='xmlXPathEvalExpression'/>
@@ -377,4 +380,4 @@
       <function line='110' file='xpath' name='xmlXPathEvalExpression'/>
-      <function line='95' file='parser' name='xmlParseFile'/>
+      <function line='124' file='xpath' name='xmlXPathFreeContext'/>
       <function line='123' file='xpath' name='xmlXPathFreeObject'/>
       <function line='102' file='xpath' name='xmlXPathNewContext'/>
@@ -379,9 +382,6 @@
       <function line='123' file='xpath' name='xmlXPathFreeObject'/>
       <function line='102' file='xpath' name='xmlXPathNewContext'/>
-      <typedef line='87' file='xpath' name='xmlXPathContextPtr'/>
-      <function line='124' file='xpath' name='xmlXPathFreeContext'/>
-      <function line='41' file='parser' name='xmlInitParser'/>
-      <enum line='180' file='tree' name='XML_NAMESPACE_DECL'/>
+      <typedef line='88' file='xpath' name='xmlXPathObjectPtr'/>
     </uses>
   </example>
   <symbols>
diff --git a/doc/examples/index.html b/doc/examples/index.html
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2V4YW1wbGVzL2luZGV4Lmh0bWw=..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2V4YW1wbGVzL2luZGV4Lmh0bWw= 100644
--- a/doc/examples/index.html
+++ b/doc/examples/index.html
@@ -69,9 +69,9 @@
         <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
       </li>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-xmlIO.html">&lt;libxml/xmlIO.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
       </li>
       <li>
         <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-xinclude.html">&lt;libxml/xinclude.h&gt;</a>
       </li>
       <li>
@@ -73,9 +73,9 @@
       </li>
       <li>
         <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-xinclude.html">&lt;libxml/xinclude.h&gt;</a>
       </li>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-xmlIO.html">&lt;libxml/xmlIO.h&gt;</a>
       </li>
     </ul>
     <p>Uses:</p>
@@ -121,6 +121,6 @@
     <p>Includes:</p>
     <ul>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
       </li>
       <li>
@@ -125,6 +125,6 @@
       </li>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
       </li>
     </ul>
     <p>Uses:</p>
@@ -144,6 +144,6 @@
     <p>Includes:</p>
     <ul>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
       </li>
       <li>
@@ -148,6 +148,6 @@
       </li>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
       </li>
     </ul>
     <p>Uses:</p>
@@ -170,6 +170,6 @@
     <p>Includes:</p>
     <ul>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
       </li>
       <li>
@@ -174,6 +174,6 @@
       </li>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
       </li>
     </ul>
     <p>Uses:</p>
@@ -193,6 +193,6 @@
     <p>Includes:</p>
     <ul>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
       </li>
       <li>
@@ -197,6 +197,6 @@
       </li>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
       </li>
     </ul>
     <p>Uses:</p>
@@ -220,6 +220,6 @@
     <p>Includes:</p>
     <ul>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
       </li>
       <li>
@@ -224,6 +224,6 @@
       </li>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
       </li>
     </ul>
     <p>Uses:</p>
@@ -239,6 +239,6 @@
     <p>Includes:</p>
     <ul>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
       </li>
       <li>
@@ -243,6 +243,6 @@
       </li>
       <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
       </li>
     </ul>
     <p>Uses:</p>
@@ -266,6 +266,9 @@
     <p>Includes:</p>
     <ul>
       <li>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
+      </li>
+      <li>
         <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
       </li>
       <li>
@@ -274,9 +277,6 @@
       <li>
         <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-xpathInternals.html">&lt;libxml/xpathInternals.h&gt;</a>
       </li>
-      <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
-      </li>
     </ul>
     <p>Uses:</p>
     <ul>
@@ -302,6 +302,9 @@
     <p>Includes:</p>
     <ul>
       <li>
+        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
+      </li>
+      <li>
         <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html">&lt;libxml/parser.h&gt;</a>
       </li>
       <li>
@@ -310,9 +313,6 @@
       <li>
         <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-xpathInternals.html">&lt;libxml/xpathInternals.h&gt;</a>
       </li>
-      <li>
-        <a href="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html">&lt;libxml/tree.h&gt;</a>
-      </li>
     </ul>
     <p>Uses:</p>
     <ul>
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index ed9ebbd0a8c90e2808389db99e11fc964b23e7a2_ZG9jL2xpYnhtbDItYXBpLnhtbA==..cb2671655e2a547dd0dfab8dfa44d34ac5c15528_ZG9jL2xpYnhtbDItYXBpLnhtbA== 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -8,5 +8,5 @@
      <exports symbol='htmlDefaultSubelement' type='macro'/>
      <exports symbol='htmlElementAllowedHereDesc' type='macro'/>
      <exports symbol='htmlRequiredAttrs' type='macro'/>
-     <exports symbol='HTML_REQUIRED' type='enum'/>
+     <exports symbol='HTML_DEPRECATED' type='enum'/>
      <exports symbol='HTML_INVALID' type='enum'/>
@@ -12,4 +12,3 @@
      <exports symbol='HTML_INVALID' type='enum'/>
-     <exports symbol='HTML_PARSE_NONET' type='enum'/>
      <exports symbol='HTML_NA' type='enum'/>
      <exports symbol='HTML_PARSE_COMPACT' type='enum'/>
@@ -14,5 +13,5 @@
      <exports symbol='HTML_NA' type='enum'/>
      <exports symbol='HTML_PARSE_COMPACT' type='enum'/>
-     <exports symbol='HTML_VALID' type='enum'/>
+     <exports symbol='HTML_PARSE_IGNORE_ENC' type='enum'/>
      <exports symbol='HTML_PARSE_NOBLANKS' type='enum'/>
      <exports symbol='HTML_PARSE_NODEFDTD' type='enum'/>
@@ -17,5 +16,3 @@
      <exports symbol='HTML_PARSE_NOBLANKS' type='enum'/>
      <exports symbol='HTML_PARSE_NODEFDTD' type='enum'/>
-     <exports symbol='HTML_PARSE_RECOVER' type='enum'/>
-     <exports symbol='HTML_DEPRECATED' type='enum'/>
      <exports symbol='HTML_PARSE_NOERROR' type='enum'/>
@@ -21,4 +18,2 @@
      <exports symbol='HTML_PARSE_NOERROR' type='enum'/>
-     <exports symbol='HTML_PARSE_PEDANTIC' type='enum'/>
-     <exports symbol='HTML_PARSE_IGNORE_ENC' type='enum'/>
      <exports symbol='HTML_PARSE_NOIMPLIED' type='enum'/>
@@ -24,2 +19,3 @@
      <exports symbol='HTML_PARSE_NOIMPLIED' type='enum'/>
+     <exports symbol='HTML_PARSE_NONET' type='enum'/>
      <exports symbol='HTML_PARSE_NOWARNING' type='enum'/>
@@ -25,3 +21,14 @@
      <exports symbol='HTML_PARSE_NOWARNING' type='enum'/>
-     <exports symbol='htmlParserNodeInfo' type='typedef'/>
+     <exports symbol='HTML_PARSE_PEDANTIC' type='enum'/>
+     <exports symbol='HTML_PARSE_RECOVER' type='enum'/>
+     <exports symbol='HTML_REQUIRED' type='enum'/>
+     <exports symbol='HTML_VALID' type='enum'/>
+     <exports symbol='htmlDocPtr' type='typedef'/>
+     <exports symbol='htmlElemDesc' type='typedef'/>
+     <exports symbol='htmlElemDescPtr' type='typedef'/>
+     <exports symbol='htmlEntityDesc' type='typedef'/>
+     <exports symbol='htmlEntityDescPtr' type='typedef'/>
+     <exports symbol='htmlNodePtr' type='typedef'/>
+     <exports symbol='htmlParserCtxt' type='typedef'/>
+     <exports symbol='htmlParserCtxtPtr' type='typedef'/>
      <exports symbol='htmlParserInput' type='typedef'/>
@@ -27,6 +34,7 @@
      <exports symbol='htmlParserInput' type='typedef'/>
-     <exports symbol='htmlParserCtxtPtr' type='typedef'/>
-     <exports symbol='htmlEntityDesc' type='typedef'/>
-     <exports symbol='htmlDocPtr' type='typedef'/>
+     <exports symbol='htmlParserInputPtr' type='typedef'/>
+     <exports symbol='htmlParserNodeInfo' type='typedef'/>
+     <exports symbol='htmlParserOption' type='typedef'/>
+     <exports symbol='htmlSAXHandler' type='typedef'/>
      <exports symbol='htmlSAXHandlerPtr' type='typedef'/>
      <exports symbol='htmlStatus' type='typedef'/>
@@ -31,11 +39,4 @@
      <exports symbol='htmlSAXHandlerPtr' type='typedef'/>
      <exports symbol='htmlStatus' type='typedef'/>
-     <exports symbol='htmlNodePtr' type='typedef'/>
-     <exports symbol='htmlElemDescPtr' type='typedef'/>
-     <exports symbol='htmlElemDesc' type='typedef'/>
-     <exports symbol='htmlSAXHandler' type='typedef'/>
-     <exports symbol='htmlParserInputPtr' type='typedef'/>
-     <exports symbol='htmlParserOption' type='typedef'/>
-     <exports symbol='htmlEntityDescPtr' type='typedef'/>
-     <exports symbol='htmlParserCtxt' type='typedef'/>
+     <exports symbol='_htmlElemDesc' type='struct'/>
      <exports symbol='_htmlEntityDesc' type='struct'/>
@@ -41,9 +42,4 @@
      <exports symbol='_htmlEntityDesc' type='struct'/>
-     <exports symbol='_htmlElemDesc' type='struct'/>
-     <exports symbol='htmlIsScriptAttribute' type='function'/>
-     <exports symbol='htmlHandleOmittedElem' type='function'/>
-     <exports symbol='htmlReadFd' type='function'/>
-     <exports symbol='htmlReadIO' type='function'/>
-     <exports symbol='htmlParseFile' type='function'/>
-     <exports symbol='htmlCtxtReadDoc' type='function'/>
+     <exports symbol='UTF8ToHtml' type='function'/>
+     <exports symbol='htmlAttrAllowed' type='function'/>
      <exports symbol='htmlAutoCloseTag' type='function'/>
@@ -49,4 +45,2 @@
      <exports symbol='htmlAutoCloseTag' type='function'/>
-     <exports symbol='htmlParseChunk' type='function'/>
-     <exports symbol='htmlTagLookup' type='function'/>
      <exports symbol='htmlCreateMemoryParserCtxt' type='function'/>
@@ -52,5 +46,2 @@
      <exports symbol='htmlCreateMemoryParserCtxt' type='function'/>
-     <exports symbol='htmlCtxtReset' type='function'/>
-     <exports symbol='htmlElementAllowedHere' type='function'/>
-     <exports symbol='htmlCtxtReadIO' type='function'/>
      <exports symbol='htmlCreatePushParserCtxt' type='function'/>
@@ -56,3 +47,16 @@
      <exports symbol='htmlCreatePushParserCtxt' type='function'/>
-     <exports symbol='htmlReadMemory' type='function'/>
+     <exports symbol='htmlCtxtReadDoc' type='function'/>
+     <exports symbol='htmlCtxtReadFd' type='function'/>
+     <exports symbol='htmlCtxtReadFile' type='function'/>
+     <exports symbol='htmlCtxtReadIO' type='function'/>
+     <exports symbol='htmlCtxtReadMemory' type='function'/>
+     <exports symbol='htmlCtxtReset' type='function'/>
+     <exports symbol='htmlCtxtUseOptions' type='function'/>
+     <exports symbol='htmlElementAllowedHere' type='function'/>
+     <exports symbol='htmlElementStatusHere' type='function'/>
+     <exports symbol='htmlEncodeEntities' type='function'/>
+     <exports symbol='htmlEntityLookup' type='function'/>
+     <exports symbol='htmlEntityValueLookup' type='function'/>
+     <exports symbol='htmlFreeParserCtxt' type='function'/>
+     <exports symbol='htmlHandleOmittedElem' type='function'/>
      <exports symbol='htmlIsAutoClosed' type='function'/>
@@ -58,5 +62,4 @@
      <exports symbol='htmlIsAutoClosed' type='function'/>
-     <exports symbol='htmlParseCharRef' type='function'/>
-     <exports symbol='htmlReadDoc' type='function'/>
-     <exports symbol='htmlEncodeEntities' type='function'/>
+     <exports symbol='htmlIsScriptAttribute' type='function'/>
+     <exports symbol='htmlNewParserCtxt' type='function'/>
      <exports symbol='htmlNodeStatus' type='function'/>
@@ -62,7 +65,6 @@
      <exports symbol='htmlNodeStatus' type='function'/>
-     <exports symbol='htmlAttrAllowed' type='function'/>
-     <exports symbol='htmlSAXParseFile' type='function'/>
-     <exports symbol='htmlParseEntityRef' type='function'/>
-     <exports symbol='htmlElementStatusHere' type='function'/>
-     <exports symbol='htmlEntityValueLookup' type='function'/>
+     <exports symbol='htmlParseCharRef' type='function'/>
+     <exports symbol='htmlParseChunk' type='function'/>
+     <exports symbol='htmlParseDoc' type='function'/>
+     <exports symbol='htmlParseDocument' type='function'/>
      <exports symbol='htmlParseElement' type='function'/>
@@ -68,7 +70,6 @@
      <exports symbol='htmlParseElement' type='function'/>
-     <exports symbol='UTF8ToHtml' type='function'/>
-     <exports symbol='htmlEntityLookup' type='function'/>
-     <exports symbol='htmlFreeParserCtxt' type='function'/>
-     <exports symbol='htmlCtxtReadMemory' type='function'/>
-     <exports symbol='htmlCtxtReadFd' type='function'/>
+     <exports symbol='htmlParseEntityRef' type='function'/>
+     <exports symbol='htmlParseFile' type='function'/>
+     <exports symbol='htmlReadDoc' type='function'/>
+     <exports symbol='htmlReadFd' type='function'/>
      <exports symbol='htmlReadFile' type='function'/>
@@ -74,5 +75,4 @@
      <exports symbol='htmlReadFile' type='function'/>
-     <exports symbol='htmlCtxtReadFile' type='function'/>
-     <exports symbol='htmlParseDocument' type='function'/>
-     <exports symbol='htmlNewParserCtxt' type='function'/>
+     <exports symbol='htmlReadIO' type='function'/>
+     <exports symbol='htmlReadMemory' type='function'/>
      <exports symbol='htmlSAXParseDoc' type='function'/>
@@ -78,8 +78,8 @@
      <exports symbol='htmlSAXParseDoc' type='function'/>
-     <exports symbol='htmlCtxtUseOptions' type='function'/>
-     <exports symbol='htmlParseDoc' type='function'/>
+     <exports symbol='htmlSAXParseFile' type='function'/>
+     <exports symbol='htmlTagLookup' type='function'/>
     </file>
     <file name='HTMLtree'>
      <summary>specific APIs to process HTML tree, especially serialization</summary>
      <description>this module implements a few function needed to process tree in an HTML specific way. </description>
      <author>Daniel Veillard </author>
@@ -81,6 +81,7 @@
     </file>
     <file name='HTMLtree'>
      <summary>specific APIs to process HTML tree, especially serialization</summary>
      <description>this module implements a few function needed to process tree in an HTML specific way. </description>
      <author>Daniel Veillard </author>
+     <exports symbol='HTML_COMMENT_NODE' type='macro'/>
      <exports symbol='HTML_ENTITY_REF_NODE' type='macro'/>
@@ -86,4 +87,4 @@
      <exports symbol='HTML_ENTITY_REF_NODE' type='macro'/>
-     <exports symbol='HTML_COMMENT_NODE' type='macro'/>
+     <exports symbol='HTML_PI_NODE' type='macro'/>
      <exports symbol='HTML_PRESERVE_NODE' type='macro'/>
      <exports symbol='HTML_TEXT_NODE' type='macro'/>
@@ -88,7 +89,5 @@
      <exports symbol='HTML_PRESERVE_NODE' type='macro'/>
      <exports symbol='HTML_TEXT_NODE' type='macro'/>
-     <exports symbol='HTML_PI_NODE' type='macro'/>
-     <exports symbol='htmlNodeDumpFileFormat' type='function'/>
-     <exports symbol='htmlDocDumpMemory' type='function'/>
-     <exports symbol='htmlSaveFile' type='function'/>
+     <exports symbol='htmlDocContentDumpFormatOutput' type='function'/>
+     <exports symbol='htmlDocContentDumpOutput' type='function'/>
      <exports symbol='htmlDocDump' type='function'/>
@@ -94,2 +93,3 @@
      <exports symbol='htmlDocDump' type='function'/>
+     <exports symbol='htmlDocDumpMemory' type='function'/>
      <exports symbol='htmlDocDumpMemoryFormat' type='function'/>
@@ -95,2 +95,3 @@
      <exports symbol='htmlDocDumpMemoryFormat' type='function'/>
+     <exports symbol='htmlGetMetaEncoding' type='function'/>
      <exports symbol='htmlIsBooleanAttr' type='function'/>
@@ -96,2 +97,11 @@
      <exports symbol='htmlIsBooleanAttr' type='function'/>
+     <exports symbol='htmlNewDoc' type='function'/>
+     <exports symbol='htmlNewDocNoDtD' type='function'/>
+     <exports symbol='htmlNodeDump' type='function'/>
+     <exports symbol='htmlNodeDumpFile' type='function'/>
+     <exports symbol='htmlNodeDumpFileFormat' type='function'/>
+     <exports symbol='htmlNodeDumpFormatOutput' type='function'/>
+     <exports symbol='htmlNodeDumpOutput' type='function'/>
+     <exports symbol='htmlSaveFile' type='function'/>
+     <exports symbol='htmlSaveFileEnc' type='function'/>
      <exports symbol='htmlSaveFileFormat' type='function'/>
@@ -97,3 +107,2 @@
      <exports symbol='htmlSaveFileFormat' type='function'/>
-     <exports symbol='htmlNodeDumpFormatOutput' type='function'/>
      <exports symbol='htmlSetMetaEncoding' type='function'/>
@@ -99,16 +108,7 @@
      <exports symbol='htmlSetMetaEncoding' type='function'/>
-     <exports symbol='htmlSaveFileEnc' type='function'/>
-     <exports symbol='htmlNodeDumpOutput' type='function'/>
-     <exports symbol='htmlNodeDump' type='function'/>
-     <exports symbol='htmlNewDoc' type='function'/>
-     <exports symbol='htmlGetMetaEncoding' type='function'/>
-     <exports symbol='htmlNodeDumpFile' type='function'/>
-     <exports symbol='htmlDocContentDumpFormatOutput' type='function'/>
-     <exports symbol='htmlNewDocNoDtD' type='function'/>
-     <exports symbol='htmlDocContentDumpOutput' type='function'/>
     </file>
     <file name='SAX'>
      <summary>Old SAX version 1 handler, deprecated</summary>
      <description>DEPRECATED set of SAX version 1 interfaces used to build the DOM tree. </description>
      <author>Daniel Veillard </author>
      <deprecated/>
@@ -109,8 +109,11 @@
     </file>
     <file name='SAX'>
      <summary>Old SAX version 1 handler, deprecated</summary>
      <description>DEPRECATED set of SAX version 1 interfaces used to build the DOM tree. </description>
      <author>Daniel Veillard </author>
      <deprecated/>
-     <exports symbol='comment' type='function'/>
+     <exports symbol='attribute' type='function'/>
+     <exports symbol='attributeDecl' type='function'/>
+     <exports symbol='cdataBlock' type='function'/>
+     <exports symbol='characters' type='function'/>
      <exports symbol='checkNamespace' type='function'/>
@@ -116,3 +119,6 @@
      <exports symbol='checkNamespace' type='function'/>
-     <exports symbol='getColumnNumber' type='function'/>
+     <exports symbol='comment' type='function'/>
+     <exports symbol='elementDecl' type='function'/>
+     <exports symbol='endDocument' type='function'/>
+     <exports symbol='endElement' type='function'/>
      <exports symbol='entityDecl' type='function'/>
@@ -118,3 +124,6 @@
      <exports symbol='entityDecl' type='function'/>
-     <exports symbol='attribute' type='function'/>
+     <exports symbol='externalSubset' type='function'/>
+     <exports symbol='getColumnNumber' type='function'/>
+     <exports symbol='getEntity' type='function'/>
+     <exports symbol='getLineNumber' type='function'/>
      <exports symbol='getNamespace' type='function'/>
@@ -120,4 +129,8 @@
      <exports symbol='getNamespace' type='function'/>
-     <exports symbol='setDocumentLocator' type='function'/>
-     <exports symbol='initxmlDefaultSAXHandler' type='function'/>
+     <exports symbol='getParameterEntity' type='function'/>
+     <exports symbol='getPublicId' type='function'/>
+     <exports symbol='getSystemId' type='function'/>
+     <exports symbol='globalNamespace' type='function'/>
+     <exports symbol='hasExternalSubset' type='function'/>
+     <exports symbol='hasInternalSubset' type='function'/>
      <exports symbol='ignorableWhitespace' type='function'/>
@@ -123,6 +136,9 @@
      <exports symbol='ignorableWhitespace' type='function'/>
-     <exports symbol='hasExternalSubset' type='function'/>
-     <exports symbol='unparsedEntityDecl' type='function'/>
-     <exports symbol='globalNamespace' type='function'/>
-     <exports symbol='hasInternalSubset' type='function'/>
+     <exports symbol='inithtmlDefaultSAXHandler' type='function'/>
+     <exports symbol='initxmlDefaultSAXHandler' type='function'/>
+     <exports symbol='internalSubset' type='function'/>
+     <exports symbol='isStandalone' type='function'/>
+     <exports symbol='namespaceDecl' type='function'/>
+     <exports symbol='notationDecl' type='function'/>
+     <exports symbol='processingInstruction' type='function'/>
      <exports symbol='reference' type='function'/>
@@ -128,5 +144,2 @@
      <exports symbol='reference' type='function'/>
-     <exports symbol='notationDecl' type='function'/>
-     <exports symbol='getSystemId' type='function'/>
-     <exports symbol='externalSubset' type='function'/>
      <exports symbol='resolveEntity' type='function'/>
@@ -132,3 +145,3 @@
      <exports symbol='resolveEntity' type='function'/>
-     <exports symbol='startDocument' type='function'/>
+     <exports symbol='setDocumentLocator' type='function'/>
      <exports symbol='setNamespace' type='function'/>
@@ -134,8 +147,3 @@
      <exports symbol='setNamespace' type='function'/>
-     <exports symbol='cdataBlock' type='function'/>
-     <exports symbol='getPublicId' type='function'/>
-     <exports symbol='inithtmlDefaultSAXHandler' type='function'/>
-     <exports symbol='processingInstruction' type='function'/>
-     <exports symbol='endElement' type='function'/>
-     <exports symbol='namespaceDecl' type='function'/>
+     <exports symbol='startDocument' type='function'/>
      <exports symbol='startElement' type='function'/>
@@ -141,15 +149,7 @@
      <exports symbol='startElement' type='function'/>
-     <exports symbol='getEntity' type='function'/>
-     <exports symbol='characters' type='function'/>
-     <exports symbol='elementDecl' type='function'/>
-     <exports symbol='getParameterEntity' type='function'/>
-     <exports symbol='attributeDecl' type='function'/>
-     <exports symbol='isStandalone' type='function'/>
-     <exports symbol='internalSubset' type='function'/>
-     <exports symbol='endDocument' type='function'/>
-     <exports symbol='getLineNumber' type='function'/>
+     <exports symbol='unparsedEntityDecl' type='function'/>
     </file>
     <file name='SAX2'>
      <summary>SAX2 parser interface used to build the DOM tree</summary>
      <description>those are the default SAX2 interfaces used by the library when building DOM tree. </description>
      <author>Daniel Veillard </author>
@@ -151,8 +151,12 @@
     </file>
     <file name='SAX2'>
      <summary>SAX2 parser interface used to build the DOM tree</summary>
      <description>those are the default SAX2 interfaces used by the library when building DOM tree. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='xmlSAX2EndElementNs' type='function'/>
-     <exports symbol='xmlSAX2Reference' type='function'/>
+     <exports symbol='htmlDefaultSAXHandlerInit' type='function'/>
+     <exports symbol='xmlDefaultSAXHandlerInit' type='function'/>
+     <exports symbol='xmlSAX2AttributeDecl' type='function'/>
+     <exports symbol='xmlSAX2CDataBlock' type='function'/>
+     <exports symbol='xmlSAX2Characters' type='function'/>
+     <exports symbol='xmlSAX2Comment' type='function'/>
      <exports symbol='xmlSAX2ElementDecl' type='function'/>
@@ -158,5 +162,8 @@
      <exports symbol='xmlSAX2ElementDecl' type='function'/>
-     <exports symbol='xmlSAX2AttributeDecl' type='function'/>
-     <exports symbol='xmlSAX2Comment' type='function'/>
+     <exports symbol='xmlSAX2EndDocument' type='function'/>
+     <exports symbol='xmlSAX2EndElement' type='function'/>
+     <exports symbol='xmlSAX2EndElementNs' type='function'/>
+     <exports symbol='xmlSAX2EntityDecl' type='function'/>
+     <exports symbol='xmlSAX2ExternalSubset' type='function'/>
      <exports symbol='xmlSAX2GetColumnNumber' type='function'/>
      <exports symbol='xmlSAX2GetEntity' type='function'/>
@@ -161,5 +168,9 @@
      <exports symbol='xmlSAX2GetColumnNumber' type='function'/>
      <exports symbol='xmlSAX2GetEntity' type='function'/>
-     <exports symbol='xmlSAX2UnparsedEntityDecl' type='function'/>
-     <exports symbol='xmlSAXVersion' type='function'/>
+     <exports symbol='xmlSAX2GetLineNumber' type='function'/>
+     <exports symbol='xmlSAX2GetParameterEntity' type='function'/>
+     <exports symbol='xmlSAX2GetPublicId' type='function'/>
+     <exports symbol='xmlSAX2GetSystemId' type='function'/>
+     <exports symbol='xmlSAX2HasExternalSubset' type='function'/>
+     <exports symbol='xmlSAX2HasInternalSubset' type='function'/>
      <exports symbol='xmlSAX2IgnorableWhitespace' type='function'/>
@@ -165,2 +176,6 @@
      <exports symbol='xmlSAX2IgnorableWhitespace' type='function'/>
+     <exports symbol='xmlSAX2InitDefaultSAXHandler' type='function'/>
+     <exports symbol='xmlSAX2InitHtmlDefaultSAXHandler' type='function'/>
+     <exports symbol='xmlSAX2InternalSubset' type='function'/>
+     <exports symbol='xmlSAX2IsStandalone' type='function'/>
      <exports symbol='xmlSAX2NotationDecl' type='function'/>
@@ -166,4 +181,4 @@
      <exports symbol='xmlSAX2NotationDecl' type='function'/>
-     <exports symbol='xmlSAX2StartDocument' type='function'/>
-     <exports symbol='xmlSAX2EndElement' type='function'/>
+     <exports symbol='xmlSAX2ProcessingInstruction' type='function'/>
+     <exports symbol='xmlSAX2Reference' type='function'/>
      <exports symbol='xmlSAX2ResolveEntity' type='function'/>
@@ -169,9 +184,7 @@
      <exports symbol='xmlSAX2ResolveEntity' type='function'/>
-     <exports symbol='xmlSAX2ExternalSubset' type='function'/>
-     <exports symbol='xmlSAX2GetPublicId' type='function'/>
-     <exports symbol='xmlSAX2IsStandalone' type='function'/>
-     <exports symbol='xmlSAX2EndDocument' type='function'/>
-     <exports symbol='xmlSAX2ProcessingInstruction' type='function'/>
-     <exports symbol='xmlSAX2InternalSubset' type='function'/>
-     <exports symbol='xmlSAX2Characters' type='function'/>
+     <exports symbol='xmlSAX2SetDocumentLocator' type='function'/>
+     <exports symbol='xmlSAX2StartDocument' type='function'/>
+     <exports symbol='xmlSAX2StartElement' type='function'/>
+     <exports symbol='xmlSAX2StartElementNs' type='function'/>
+     <exports symbol='xmlSAX2UnparsedEntityDecl' type='function'/>
      <exports symbol='xmlSAXDefaultVersion' type='function'/>
@@ -177,20 +190,7 @@
      <exports symbol='xmlSAXDefaultVersion' type='function'/>
-     <exports symbol='xmlSAX2StartElement' type='function'/>
-     <exports symbol='xmlSAX2SetDocumentLocator' type='function'/>
-     <exports symbol='xmlSAX2CDataBlock' type='function'/>
-     <exports symbol='xmlSAX2StartElementNs' type='function'/>
-     <exports symbol='xmlSAX2HasExternalSubset' type='function'/>
-     <exports symbol='htmlDefaultSAXHandlerInit' type='function'/>
-     <exports symbol='xmlSAX2GetLineNumber' type='function'/>
-     <exports symbol='xmlSAX2HasInternalSubset' type='function'/>
-     <exports symbol='xmlSAX2InitHtmlDefaultSAXHandler' type='function'/>
-     <exports symbol='xmlDefaultSAXHandlerInit' type='function'/>
-     <exports symbol='xmlSAX2InitDefaultSAXHandler' type='function'/>
-     <exports symbol='xmlSAX2GetParameterEntity' type='function'/>
-     <exports symbol='xmlSAX2GetSystemId' type='function'/>
-     <exports symbol='xmlSAX2EntityDecl' type='function'/>
+     <exports symbol='xmlSAXVersion' type='function'/>
     </file>
     <file name='c14n'>
      <summary>Provide Canonical XML and Exclusive XML Canonicalization</summary>
      <description>the c14n modules provides a  &quot;Canonical XML&quot; implementation</description>
      <author>Aleksey Sanin &lt;aleksey@aleksey.com&gt; </author>
@@ -192,6 +192,7 @@
     </file>
     <file name='c14n'>
      <summary>Provide Canonical XML and Exclusive XML Canonicalization</summary>
      <description>the c14n modules provides a  &quot;Canonical XML&quot; implementation</description>
      <author>Aleksey Sanin &lt;aleksey@aleksey.com&gt; </author>
+     <exports symbol='XML_C14N_1_0' type='enum'/>
      <exports symbol='XML_C14N_1_1' type='enum'/>
@@ -197,4 +198,3 @@
      <exports symbol='XML_C14N_1_1' type='enum'/>
-     <exports symbol='XML_C14N_1_0' type='enum'/>
      <exports symbol='XML_C14N_EXCLUSIVE_1_0' type='enum'/>
      <exports symbol='xmlC14NMode' type='typedef'/>
@@ -199,3 +199,6 @@
      <exports symbol='XML_C14N_EXCLUSIVE_1_0' type='enum'/>
      <exports symbol='xmlC14NMode' type='typedef'/>
+     <exports symbol='xmlC14NDocDumpMemory' type='function'/>
+     <exports symbol='xmlC14NDocSave' type='function'/>
+     <exports symbol='xmlC14NDocSaveTo' type='function'/>
      <exports symbol='xmlC14NExecute' type='function'/>
@@ -201,3 +204,2 @@
      <exports symbol='xmlC14NExecute' type='function'/>
-     <exports symbol='xmlC14NDocSaveTo' type='function'/>
      <exports symbol='xmlC14NIsVisibleCallback' type='function'/>
@@ -203,8 +205,6 @@
      <exports symbol='xmlC14NIsVisibleCallback' type='function'/>
-     <exports symbol='xmlC14NDocSave' type='function'/>
-     <exports symbol='xmlC14NDocDumpMemory' type='function'/>
     </file>
     <file name='catalog'>
      <summary>interfaces to the Catalog handling system</summary>
      <description>the catalog module implements the support for XML Catalogs and SGML catalogs </description>
      <author>Daniel Veillard </author>
@@ -206,6 +206,7 @@
     </file>
     <file name='catalog'>
      <summary>interfaces to the Catalog handling system</summary>
      <description>the catalog module implements the support for XML Catalogs and SGML catalogs </description>
      <author>Daniel Veillard </author>
+     <exports symbol='XML_CATALOGS_NAMESPACE' type='macro'/>
      <exports symbol='XML_CATALOG_PI' type='macro'/>
@@ -211,4 +212,6 @@
      <exports symbol='XML_CATALOG_PI' type='macro'/>
-     <exports symbol='XML_CATALOGS_NAMESPACE' type='macro'/>
+     <exports symbol='XML_CATA_ALLOW_ALL' type='enum'/>
+     <exports symbol='XML_CATA_ALLOW_DOCUMENT' type='enum'/>
+     <exports symbol='XML_CATA_ALLOW_GLOBAL' type='enum'/>
      <exports symbol='XML_CATA_ALLOW_NONE' type='enum'/>
      <exports symbol='XML_CATA_PREFER_NONE' type='enum'/>
@@ -213,4 +216,3 @@
      <exports symbol='XML_CATA_ALLOW_NONE' type='enum'/>
      <exports symbol='XML_CATA_PREFER_NONE' type='enum'/>
-     <exports symbol='XML_CATA_ALLOW_GLOBAL' type='enum'/>
      <exports symbol='XML_CATA_PREFER_PUBLIC' type='enum'/>
@@ -216,4 +218,2 @@
      <exports symbol='XML_CATA_PREFER_PUBLIC' type='enum'/>
-     <exports symbol='XML_CATA_ALLOW_DOCUMENT' type='enum'/>
-     <exports symbol='XML_CATA_ALLOW_ALL' type='enum'/>
      <exports symbol='XML_CATA_PREFER_SYSTEM' type='enum'/>
@@ -219,3 +219,4 @@
      <exports symbol='XML_CATA_PREFER_SYSTEM' type='enum'/>
+     <exports symbol='xmlCatalog' type='typedef'/>
      <exports symbol='xmlCatalogAllow' type='typedef'/>
      <exports symbol='xmlCatalogPrefer' type='typedef'/>
@@ -220,4 +221,3 @@
      <exports symbol='xmlCatalogAllow' type='typedef'/>
      <exports symbol='xmlCatalogPrefer' type='typedef'/>
-     <exports symbol='xmlCatalog' type='typedef'/>
      <exports symbol='xmlCatalogPtr' type='typedef'/>
@@ -223,5 +223,2 @@
      <exports symbol='xmlCatalogPtr' type='typedef'/>
-     <exports symbol='xmlFreeCatalog' type='function'/>
-     <exports symbol='xmlLoadCatalogs' type='function'/>
-     <exports symbol='xmlCatalogLocalResolve' type='function'/>
      <exports symbol='xmlACatalogAdd' type='function'/>
@@ -227,2 +224,5 @@
      <exports symbol='xmlACatalogAdd' type='function'/>
+     <exports symbol='xmlACatalogDump' type='function'/>
+     <exports symbol='xmlACatalogRemove' type='function'/>
+     <exports symbol='xmlACatalogResolve' type='function'/>
      <exports symbol='xmlACatalogResolvePublic' type='function'/>
@@ -228,6 +228,4 @@
      <exports symbol='xmlACatalogResolvePublic' type='function'/>
-     <exports symbol='xmlCatalogGetDefaults' type='function'/>
-     <exports symbol='xmlACatalogRemove' type='function'/>
-     <exports symbol='xmlCatalogSetDefaultPrefer' type='function'/>
+     <exports symbol='xmlACatalogResolveSystem' type='function'/>
      <exports symbol='xmlACatalogResolveURI' type='function'/>
      <exports symbol='xmlCatalogAdd' type='function'/>
@@ -232,10 +230,7 @@
      <exports symbol='xmlACatalogResolveURI' type='function'/>
      <exports symbol='xmlCatalogAdd' type='function'/>
-     <exports symbol='xmlCatalogResolvePublic' type='function'/>
-     <exports symbol='xmlCatalogGetSystem' type='function'/>
-     <exports symbol='xmlInitializeCatalog' type='function'/>
-     <exports symbol='xmlLoadCatalog' type='function'/>
-     <exports symbol='xmlCatalogRemove' type='function'/>
-     <exports symbol='xmlCatalogIsEmpty' type='function'/>
-     <exports symbol='xmlACatalogDump' type='function'/>
+     <exports symbol='xmlCatalogAddLocal' type='function'/>
+     <exports symbol='xmlCatalogCleanup' type='function'/>
+     <exports symbol='xmlCatalogConvert' type='function'/>
+     <exports symbol='xmlCatalogDump' type='function'/>
      <exports symbol='xmlCatalogFreeLocal' type='function'/>
@@ -241,6 +236,3 @@
      <exports symbol='xmlCatalogFreeLocal' type='function'/>
-     <exports symbol='xmlACatalogResolve' type='function'/>
-     <exports symbol='xmlCatalogResolveSystem' type='function'/>
-     <exports symbol='xmlLoadSGMLSuperCatalog' type='function'/>
-     <exports symbol='xmlCatalogConvert' type='function'/>
+     <exports symbol='xmlCatalogGetDefaults' type='function'/>
      <exports symbol='xmlCatalogGetPublic' type='function'/>
@@ -246,4 +238,5 @@
      <exports symbol='xmlCatalogGetPublic' type='function'/>
-     <exports symbol='xmlLoadACatalog' type='function'/>
-     <exports symbol='xmlACatalogResolveSystem' type='function'/>
+     <exports symbol='xmlCatalogGetSystem' type='function'/>
+     <exports symbol='xmlCatalogIsEmpty' type='function'/>
+     <exports symbol='xmlCatalogLocalResolve' type='function'/>
      <exports symbol='xmlCatalogLocalResolveURI' type='function'/>
@@ -249,2 +242,10 @@
      <exports symbol='xmlCatalogLocalResolveURI' type='function'/>
+     <exports symbol='xmlCatalogRemove' type='function'/>
+     <exports symbol='xmlCatalogResolve' type='function'/>
+     <exports symbol='xmlCatalogResolvePublic' type='function'/>
+     <exports symbol='xmlCatalogResolveSystem' type='function'/>
+     <exports symbol='xmlCatalogResolveURI' type='function'/>
+     <exports symbol='xmlCatalogSetDebug' type='function'/>
+     <exports symbol='xmlCatalogSetDefaultPrefer' type='function'/>
+     <exports symbol='xmlCatalogSetDefaults' type='function'/>
      <exports symbol='xmlConvertSGMLCatalog' type='function'/>
@@ -250,4 +251,9 @@
      <exports symbol='xmlConvertSGMLCatalog' type='function'/>
-     <exports symbol='xmlCatalogAddLocal' type='function'/>
+     <exports symbol='xmlFreeCatalog' type='function'/>
+     <exports symbol='xmlInitializeCatalog' type='function'/>
+     <exports symbol='xmlLoadACatalog' type='function'/>
+     <exports symbol='xmlLoadCatalog' type='function'/>
+     <exports symbol='xmlLoadCatalogs' type='function'/>
+     <exports symbol='xmlLoadSGMLSuperCatalog' type='function'/>
      <exports symbol='xmlNewCatalog' type='function'/>
      <exports symbol='xmlParseCatalogFile' type='function'/>
@@ -252,13 +258,7 @@
      <exports symbol='xmlNewCatalog' type='function'/>
      <exports symbol='xmlParseCatalogFile' type='function'/>
-     <exports symbol='xmlCatalogSetDebug' type='function'/>
-     <exports symbol='xmlCatalogResolve' type='function'/>
-     <exports symbol='xmlCatalogSetDefaults' type='function'/>
-     <exports symbol='xmlCatalogDump' type='function'/>
-     <exports symbol='xmlCatalogCleanup' type='function'/>
-     <exports symbol='xmlCatalogResolveURI' type='function'/>
     </file>
     <file name='chvalid'>
      <summary>Unicode character range checking</summary>
      <description>this module exports interfaces for the character range validation APIs  This file is automatically generated from the cvs source definition files using the genChRanges.py Python script </description>
      <author>William Brack &lt;wbrack@mmm.com.hk&gt; </author>
@@ -260,11 +260,11 @@
     </file>
     <file name='chvalid'>
      <summary>Unicode character range checking</summary>
      <description>this module exports interfaces for the character range validation APIs  This file is automatically generated from the cvs source definition files using the genChRanges.py Python script </description>
      <author>William Brack &lt;wbrack@mmm.com.hk&gt; </author>
-     <exports symbol='xmlIsExtender_ch' type='macro'/>
-     <exports symbol='xmlIsPubidCharQ' type='macro'/>
-     <exports symbol='xmlIsPubidChar_ch' type='macro'/>
-     <exports symbol='xmlIsIdeographicQ' type='macro'/>
-     <exports symbol='xmlIsExtenderQ' type='macro'/>
+     <exports symbol='xmlIsBaseCharQ' type='macro'/>
+     <exports symbol='xmlIsBaseChar_ch' type='macro'/>
+     <exports symbol='xmlIsBlankQ' type='macro'/>
+     <exports symbol='xmlIsBlank_ch' type='macro'/>
+     <exports symbol='xmlIsCharQ' type='macro'/>
      <exports symbol='xmlIsChar_ch' type='macro'/>
@@ -270,3 +270,4 @@
      <exports symbol='xmlIsChar_ch' type='macro'/>
+     <exports symbol='xmlIsCombiningQ' type='macro'/>
      <exports symbol='xmlIsDigitQ' type='macro'/>
      <exports symbol='xmlIsDigit_ch' type='macro'/>
@@ -271,9 +272,8 @@
      <exports symbol='xmlIsDigitQ' type='macro'/>
      <exports symbol='xmlIsDigit_ch' type='macro'/>
-     <exports symbol='xmlIsBaseChar_ch' type='macro'/>
-     <exports symbol='xmlIsCombiningQ' type='macro'/>
-     <exports symbol='xmlIsBlankQ' type='macro'/>
-     <exports symbol='xmlIsCharQ' type='macro'/>
-     <exports symbol='xmlIsBaseCharQ' type='macro'/>
-     <exports symbol='xmlIsBlank_ch' type='macro'/>
+     <exports symbol='xmlIsExtenderQ' type='macro'/>
+     <exports symbol='xmlIsExtender_ch' type='macro'/>
+     <exports symbol='xmlIsIdeographicQ' type='macro'/>
+     <exports symbol='xmlIsPubidCharQ' type='macro'/>
+     <exports symbol='xmlIsPubidChar_ch' type='macro'/>
      <exports symbol='xmlChLRange' type='typedef'/>
@@ -279,3 +279,2 @@
      <exports symbol='xmlChLRange' type='typedef'/>
-     <exports symbol='xmlChSRangePtr' type='typedef'/>
      <exports symbol='xmlChLRangePtr' type='typedef'/>
@@ -281,3 +280,4 @@
      <exports symbol='xmlChLRangePtr' type='typedef'/>
+     <exports symbol='xmlChRangeGroup' type='typedef'/>
      <exports symbol='xmlChRangeGroupPtr' type='typedef'/>
      <exports symbol='xmlChSRange' type='typedef'/>
@@ -282,6 +282,5 @@
      <exports symbol='xmlChRangeGroupPtr' type='typedef'/>
      <exports symbol='xmlChSRange' type='typedef'/>
-     <exports symbol='xmlChRangeGroup' type='typedef'/>
-     <exports symbol='_xmlChSRange' type='struct'/>
+     <exports symbol='xmlChSRangePtr' type='typedef'/>
      <exports symbol='_xmlChLRange' type='struct'/>
      <exports symbol='_xmlChRangeGroup' type='struct'/>
@@ -286,3 +285,4 @@
      <exports symbol='_xmlChLRange' type='struct'/>
      <exports symbol='_xmlChRangeGroup' type='struct'/>
+     <exports symbol='_xmlChSRange' type='struct'/>
      <exports symbol='xmlIsBaseCharGroup' type='variable'/>
@@ -288,4 +288,5 @@
      <exports symbol='xmlIsBaseCharGroup' type='variable'/>
-     <exports symbol='xmlIsIdeographicGroup' type='variable'/>
+     <exports symbol='xmlIsCharGroup' type='variable'/>
+     <exports symbol='xmlIsCombiningGroup' type='variable'/>
      <exports symbol='xmlIsDigitGroup' type='variable'/>
      <exports symbol='xmlIsExtenderGroup' type='variable'/>
@@ -290,3 +291,4 @@
      <exports symbol='xmlIsDigitGroup' type='variable'/>
      <exports symbol='xmlIsExtenderGroup' type='variable'/>
+     <exports symbol='xmlIsIdeographicGroup' type='variable'/>
      <exports symbol='xmlIsPubidChar_tab' type='variable'/>
@@ -292,6 +294,4 @@
      <exports symbol='xmlIsPubidChar_tab' type='variable'/>
-     <exports symbol='xmlIsCharGroup' type='variable'/>
-     <exports symbol='xmlIsCombiningGroup' type='variable'/>
-     <exports symbol='xmlIsChar' type='function'/>
-     <exports symbol='xmlIsDigit' type='function'/>
+     <exports symbol='xmlCharInRange' type='function'/>
+     <exports symbol='xmlIsBaseChar' type='function'/>
      <exports symbol='xmlIsBlank' type='function'/>
@@ -297,2 +297,6 @@
      <exports symbol='xmlIsBlank' type='function'/>
+     <exports symbol='xmlIsChar' type='function'/>
+     <exports symbol='xmlIsCombining' type='function'/>
+     <exports symbol='xmlIsDigit' type='function'/>
+     <exports symbol='xmlIsExtender' type='function'/>
      <exports symbol='xmlIsIdeographic' type='function'/>
@@ -298,3 +302,2 @@
      <exports symbol='xmlIsIdeographic' type='function'/>
-     <exports symbol='xmlCharInRange' type='function'/>
      <exports symbol='xmlIsPubidChar' type='function'/>
@@ -300,7 +303,4 @@
      <exports symbol='xmlIsPubidChar' type='function'/>
-     <exports symbol='xmlIsCombining' type='function'/>
-     <exports symbol='xmlIsBaseChar' type='function'/>
-     <exports symbol='xmlIsExtender' type='function'/>
     </file>
     <file name='debugXML'>
      <summary>Tree debugging APIs</summary>
@@ -309,4 +309,7 @@
      <exports symbol='xmlShellCtxt' type='typedef'/>
      <exports symbol='xmlShellCtxtPtr' type='typedef'/>
      <exports symbol='_xmlShellCtxt' type='struct'/>
+     <exports symbol='xmlBoolToText' type='function'/>
+     <exports symbol='xmlDebugCheckDocument' type='function'/>
+     <exports symbol='xmlDebugDumpAttr' type='function'/>
      <exports symbol='xmlDebugDumpAttrList' type='function'/>
@@ -312,2 +315,11 @@
      <exports symbol='xmlDebugDumpAttrList' type='function'/>
+     <exports symbol='xmlDebugDumpDTD' type='function'/>
+     <exports symbol='xmlDebugDumpDocument' type='function'/>
+     <exports symbol='xmlDebugDumpDocumentHead' type='function'/>
+     <exports symbol='xmlDebugDumpEntities' type='function'/>
+     <exports symbol='xmlDebugDumpNode' type='function'/>
+     <exports symbol='xmlDebugDumpNodeList' type='function'/>
+     <exports symbol='xmlDebugDumpOneNode' type='function'/>
+     <exports symbol='xmlDebugDumpString' type='function'/>
+     <exports symbol='xmlLsCountNode' type='function'/>
      <exports symbol='xmlLsOneNode' type='function'/>
@@ -313,14 +325,4 @@
      <exports symbol='xmlLsOneNode' type='function'/>
-     <exports symbol='xmlShellReadlineFunc' type='function'/>
-     <exports symbol='xmlShellSave' type='function'/>
-     <exports symbol='xmlBoolToText' type='function'/>
-     <exports symbol='xmlShellWrite' type='function'/>
-     <exports symbol='xmlShellDu' type='function'/>
-     <exports symbol='xmlShellValidate' type='function'/>
-     <exports symbol='xmlDebugCheckDocument' type='function'/>
-     <exports symbol='xmlShellPrintXPathResult' type='function'/>
-     <exports symbol='xmlShellCmd' type='function'/>
-     <exports symbol='xmlShellLoad' type='function'/>
-     <exports symbol='xmlDebugDumpString' type='function'/>
+     <exports symbol='xmlShell' type='function'/>
      <exports symbol='xmlShellBase' type='function'/>
      <exports symbol='xmlShellCat' type='function'/>
@@ -325,6 +327,8 @@
      <exports symbol='xmlShellBase' type='function'/>
      <exports symbol='xmlShellCat' type='function'/>
-     <exports symbol='xmlDebugDumpDTD' type='function'/>
-     <exports symbol='xmlDebugDumpNode' type='function'/>
-     <exports symbol='xmlDebugDumpEntities' type='function'/>
+     <exports symbol='xmlShellCmd' type='function'/>
+     <exports symbol='xmlShellDir' type='function'/>
+     <exports symbol='xmlShellDu' type='function'/>
+     <exports symbol='xmlShellList' type='function'/>
+     <exports symbol='xmlShellLoad' type='function'/>
      <exports symbol='xmlShellPrintNode' type='function'/>
@@ -330,2 +334,4 @@
      <exports symbol='xmlShellPrintNode' type='function'/>
+     <exports symbol='xmlShellPrintXPathError' type='function'/>
+     <exports symbol='xmlShellPrintXPathResult' type='function'/>
      <exports symbol='xmlShellPwd' type='function'/>
@@ -331,14 +337,8 @@
      <exports symbol='xmlShellPwd' type='function'/>
-     <exports symbol='xmlDebugDumpNodeList' type='function'/>
-     <exports symbol='xmlDebugDumpAttr' type='function'/>
-     <exports symbol='xmlDebugDumpDocument' type='function'/>
-     <exports symbol='xmlLsCountNode' type='function'/>
-     <exports symbol='xmlShellPrintXPathError' type='function'/>
-     <exports symbol='xmlShellDir' type='function'/>
-     <exports symbol='xmlDebugDumpOneNode' type='function'/>
-     <exports symbol='xmlShellList' type='function'/>
-     <exports symbol='xmlDebugDumpDocumentHead' type='function'/>
-     <exports symbol='xmlShell' type='function'/>
+     <exports symbol='xmlShellReadlineFunc' type='function'/>
+     <exports symbol='xmlShellSave' type='function'/>
+     <exports symbol='xmlShellValidate' type='function'/>
+     <exports symbol='xmlShellWrite' type='function'/>
     </file>
     <file name='dict'>
      <summary>string dictionary</summary>
@@ -346,4 +346,9 @@
      <author>Daniel Veillard </author>
      <exports symbol='xmlDict' type='typedef'/>
      <exports symbol='xmlDictPtr' type='typedef'/>
+     <exports symbol='xmlDictCleanup' type='function'/>
+     <exports symbol='xmlDictCreate' type='function'/>
+     <exports symbol='xmlDictCreateSub' type='function'/>
+     <exports symbol='xmlDictExists' type='function'/>
+     <exports symbol='xmlDictFree' type='function'/>
      <exports symbol='xmlDictGetUsage' type='function'/>
@@ -349,8 +354,4 @@
      <exports symbol='xmlDictGetUsage' type='function'/>
-     <exports symbol='xmlDictReference' type='function'/>
-     <exports symbol='xmlDictCleanup' type='function'/>
-     <exports symbol='xmlDictSize' type='function'/>
-     <exports symbol='xmlDictExists' type='function'/>
-     <exports symbol='xmlDictSetLimit' type='function'/>
+     <exports symbol='xmlDictLookup' type='function'/>
      <exports symbol='xmlDictOwns' type='function'/>
      <exports symbol='xmlDictQLookup' type='function'/>
@@ -355,3 +356,6 @@
      <exports symbol='xmlDictOwns' type='function'/>
      <exports symbol='xmlDictQLookup' type='function'/>
+     <exports symbol='xmlDictReference' type='function'/>
+     <exports symbol='xmlDictSetLimit' type='function'/>
+     <exports symbol='xmlDictSize' type='function'/>
      <exports symbol='xmlInitializeDict' type='function'/>
@@ -357,10 +361,6 @@
      <exports symbol='xmlInitializeDict' type='function'/>
-     <exports symbol='xmlDictCreateSub' type='function'/>
-     <exports symbol='xmlDictFree' type='function'/>
-     <exports symbol='xmlDictLookup' type='function'/>
-     <exports symbol='xmlDictCreate' type='function'/>
     </file>
     <file name='encoding'>
      <summary>interface for the encoding conversion functions</summary>
      <description>interface for the encoding conversion functions needed for XML basic encoding and iconv() support.  Related specs are rfc2044        (UTF-8 and UTF-16) F. Yergeau Alis Technologies [ISO-10646]    UTF-8 and UTF-16 in Annexes [ISO-8859-1]   ISO Latin-1 characters codes. [UNICODE]      The Unicode Consortium, &quot;The Unicode Standard -- Worldwide Character Encoding -- Version 1.0&quot;, Addison- Wesley, Volume 1, 1991, Volume 2, 1992.  UTF-8 is described in Unicode Technical Report #4. [US-ASCII]     Coded Character Set--7-bit American Standard Code for Information Interchange, ANSI X3.4-1986. </description>
      <author>Daniel Veillard </author>
@@ -362,8 +362,11 @@
     </file>
     <file name='encoding'>
      <summary>interface for the encoding conversion functions</summary>
      <description>interface for the encoding conversion functions needed for XML basic encoding and iconv() support.  Related specs are rfc2044        (UTF-8 and UTF-16) F. Yergeau Alis Technologies [ISO-10646]    UTF-8 and UTF-16 in Annexes [ISO-8859-1]   ISO Latin-1 characters codes. [UNICODE]      The Unicode Consortium, &quot;The Unicode Standard -- Worldwide Character Encoding -- Version 1.0&quot;, Addison- Wesley, Volume 1, 1991, Volume 2, 1992.  UTF-8 is described in Unicode Technical Report #4. [US-ASCII]     Coded Character Set--7-bit American Standard Code for Information Interchange, ANSI X3.4-1986. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_CHAR_ENCODING_UCS4LE' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_ERROR' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_2022_JP' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_8859_1' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_8859_2' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_8859_3' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_8859_4' type='enum'/>
      <exports symbol='XML_CHAR_ENCODING_8859_5' type='enum'/>
@@ -369,13 +372,5 @@
      <exports symbol='XML_CHAR_ENCODING_8859_5' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_EBCDIC' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_ASCII' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_UCS4_2143' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_NONE' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_UTF16BE' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_2022_JP' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_SHIFT_JIS' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_UCS4BE' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_UTF16LE' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_UCS4_3412' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_8859_6' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_8859_7' type='enum'/>
      <exports symbol='XML_CHAR_ENCODING_8859_8' type='enum'/>
      <exports symbol='XML_CHAR_ENCODING_8859_9' type='enum'/>
@@ -380,6 +375,6 @@
      <exports symbol='XML_CHAR_ENCODING_8859_8' type='enum'/>
      <exports symbol='XML_CHAR_ENCODING_8859_9' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_8859_6' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_8859_7' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_8859_4' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_ASCII' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_EBCDIC' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_ERROR' type='enum'/>
      <exports symbol='XML_CHAR_ENCODING_EUC_JP' type='enum'/>
@@ -385,5 +380,11 @@
      <exports symbol='XML_CHAR_ENCODING_EUC_JP' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_8859_2' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_8859_3' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_8859_1' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_NONE' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_SHIFT_JIS' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_UCS2' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_UCS4BE' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_UCS4LE' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_UCS4_2143' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_UCS4_3412' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_UTF16BE' type='enum'/>
+     <exports symbol='XML_CHAR_ENCODING_UTF16LE' type='enum'/>
      <exports symbol='XML_CHAR_ENCODING_UTF8' type='enum'/>
@@ -389,6 +390,5 @@
      <exports symbol='XML_CHAR_ENCODING_UTF8' type='enum'/>
-     <exports symbol='XML_CHAR_ENCODING_UCS2' type='enum'/>
      <exports symbol='xmlCharEncoding' type='typedef'/>
      <exports symbol='xmlCharEncodingHandler' type='typedef'/>
      <exports symbol='xmlCharEncodingHandlerPtr' type='typedef'/>
      <exports symbol='_xmlCharEncodingHandler' type='struct'/>
@@ -391,8 +391,5 @@
      <exports symbol='xmlCharEncoding' type='typedef'/>
      <exports symbol='xmlCharEncodingHandler' type='typedef'/>
      <exports symbol='xmlCharEncodingHandlerPtr' type='typedef'/>
      <exports symbol='_xmlCharEncodingHandler' type='struct'/>
-     <exports symbol='xmlDelEncodingAlias' type='function'/>
-     <exports symbol='xmlGetEncodingAlias' type='function'/>
-     <exports symbol='xmlRegisterCharEncodingHandler' type='function'/>
      <exports symbol='UTF8Toisolat1' type='function'/>
@@ -398,3 +395,3 @@
      <exports symbol='UTF8Toisolat1' type='function'/>
-     <exports symbol='xmlInitCharEncodingHandlers' type='function'/>
+     <exports symbol='isolat1ToUTF8' type='function'/>
      <exports symbol='xmlAddEncodingAlias' type='function'/>
@@ -400,3 +397,5 @@
      <exports symbol='xmlAddEncodingAlias' type='function'/>
-     <exports symbol='xmlCleanupEncodingAliases' type='function'/>
+     <exports symbol='xmlCharEncCloseFunc' type='function'/>
+     <exports symbol='xmlCharEncFirstLine' type='function'/>
+     <exports symbol='xmlCharEncInFunc' type='function'/>
      <exports symbol='xmlCharEncOutFunc' type='function'/>
@@ -402,3 +401,2 @@
      <exports symbol='xmlCharEncOutFunc' type='function'/>
-     <exports symbol='xmlParseCharEncoding' type='function'/>
      <exports symbol='xmlCharEncodingInputFunc' type='function'/>
@@ -404,2 +402,3 @@
      <exports symbol='xmlCharEncodingInputFunc' type='function'/>
+     <exports symbol='xmlCharEncodingOutputFunc' type='function'/>
      <exports symbol='xmlCleanupCharEncodingHandlers' type='function'/>
@@ -405,5 +404,5 @@
      <exports symbol='xmlCleanupCharEncodingHandlers' type='function'/>
-     <exports symbol='xmlNewCharEncodingHandler' type='function'/>
-     <exports symbol='xmlCharEncodingOutputFunc' type='function'/>
-     <exports symbol='isolat1ToUTF8' type='function'/>
+     <exports symbol='xmlCleanupEncodingAliases' type='function'/>
+     <exports symbol='xmlDelEncodingAlias' type='function'/>
+     <exports symbol='xmlDetectCharEncoding' type='function'/>
      <exports symbol='xmlFindCharEncodingHandler' type='function'/>
@@ -409,3 +408,2 @@
      <exports symbol='xmlFindCharEncodingHandler' type='function'/>
-     <exports symbol='xmlCharEncInFunc' type='function'/>
      <exports symbol='xmlGetCharEncodingHandler' type='function'/>
@@ -411,5 +409,2 @@
      <exports symbol='xmlGetCharEncodingHandler' type='function'/>
-     <exports symbol='xmlCharEncFirstLine' type='function'/>
-     <exports symbol='xmlDetectCharEncoding' type='function'/>
-     <exports symbol='xmlCharEncCloseFunc' type='function'/>
      <exports symbol='xmlGetCharEncodingName' type='function'/>
@@ -415,4 +410,9 @@
      <exports symbol='xmlGetCharEncodingName' type='function'/>
+     <exports symbol='xmlGetEncodingAlias' type='function'/>
+     <exports symbol='xmlInitCharEncodingHandlers' type='function'/>
+     <exports symbol='xmlNewCharEncodingHandler' type='function'/>
+     <exports symbol='xmlParseCharEncoding' type='function'/>
+     <exports symbol='xmlRegisterCharEncodingHandler' type='function'/>
     </file>
     <file name='entities'>
      <summary>interface for the XML entities handling</summary>
@@ -420,5 +420,4 @@
      <author>Daniel Veillard </author>
      <exports symbol='XML_EXTERNAL_GENERAL_PARSED_ENTITY' type='enum'/>
      <exports symbol='XML_EXTERNAL_GENERAL_UNPARSED_ENTITY' type='enum'/>
-     <exports symbol='XML_INTERNAL_PREDEFINED_ENTITY' type='enum'/>
      <exports symbol='XML_EXTERNAL_PARAMETER_ENTITY' type='enum'/>
@@ -424,2 +423,3 @@
      <exports symbol='XML_EXTERNAL_PARAMETER_ENTITY' type='enum'/>
+     <exports symbol='XML_INTERNAL_GENERAL_ENTITY' type='enum'/>
      <exports symbol='XML_INTERNAL_PARAMETER_ENTITY' type='enum'/>
@@ -425,5 +425,4 @@
      <exports symbol='XML_INTERNAL_PARAMETER_ENTITY' type='enum'/>
-     <exports symbol='XML_INTERNAL_GENERAL_ENTITY' type='enum'/>
-     <exports symbol='xmlEntityType' type='typedef'/>
+     <exports symbol='XML_INTERNAL_PREDEFINED_ENTITY' type='enum'/>
      <exports symbol='xmlEntitiesTable' type='typedef'/>
      <exports symbol='xmlEntitiesTablePtr' type='typedef'/>
@@ -428,4 +427,5 @@
      <exports symbol='xmlEntitiesTable' type='typedef'/>
      <exports symbol='xmlEntitiesTablePtr' type='typedef'/>
+     <exports symbol='xmlEntityType' type='typedef'/>
      <exports symbol='_xmlEntity' type='struct'/>
      <exports symbol='xmlAddDocEntity' type='function'/>
@@ -430,4 +430,10 @@
      <exports symbol='_xmlEntity' type='struct'/>
      <exports symbol='xmlAddDocEntity' type='function'/>
-     <exports symbol='xmlNewEntity' type='function'/>
+     <exports symbol='xmlAddDtdEntity' type='function'/>
+     <exports symbol='xmlCleanupPredefinedEntities' type='function'/>
+     <exports symbol='xmlCopyEntitiesTable' type='function'/>
+     <exports symbol='xmlCreateEntitiesTable' type='function'/>
+     <exports symbol='xmlDumpEntitiesTable' type='function'/>
+     <exports symbol='xmlDumpEntityDecl' type='function'/>
+     <exports symbol='xmlEncodeEntities' type='function'/>
      <exports symbol='xmlEncodeEntitiesReentrant' type='function'/>
@@ -433,3 +439,5 @@
      <exports symbol='xmlEncodeEntitiesReentrant' type='function'/>
+     <exports symbol='xmlEncodeSpecialChars' type='function'/>
+     <exports symbol='xmlFreeEntitiesTable' type='function'/>
      <exports symbol='xmlGetDocEntity' type='function'/>
      <exports symbol='xmlGetDtdEntity' type='function'/>
@@ -434,6 +442,3 @@
      <exports symbol='xmlGetDocEntity' type='function'/>
      <exports symbol='xmlGetDtdEntity' type='function'/>
-     <exports symbol='xmlAddDtdEntity' type='function'/>
-     <exports symbol='xmlCopyEntitiesTable' type='function'/>
-     <exports symbol='xmlFreeEntitiesTable' type='function'/>
      <exports symbol='xmlGetParameterEntity' type='function'/>
@@ -439,9 +444,3 @@
      <exports symbol='xmlGetParameterEntity' type='function'/>
-     <exports symbol='xmlDumpEntitiesTable' type='function'/>
-     <exports symbol='xmlDumpEntityDecl' type='function'/>
-     <exports symbol='xmlCleanupPredefinedEntities' type='function'/>
-     <exports symbol='xmlCreateEntitiesTable' type='function'/>
-     <exports symbol='xmlEncodeEntities' type='function'/>
-     <exports symbol='xmlEncodeSpecialChars' type='function'/>
      <exports symbol='xmlGetPredefinedEntity' type='function'/>
      <exports symbol='xmlInitializePredefinedEntities' type='function'/>
@@ -446,7 +445,8 @@
      <exports symbol='xmlGetPredefinedEntity' type='function'/>
      <exports symbol='xmlInitializePredefinedEntities' type='function'/>
+     <exports symbol='xmlNewEntity' type='function'/>
     </file>
     <file name='globals'>
      <summary>interface for all global variables of the library</summary>
      <description>all the global variables and thread handling for those variables is handled by this module.  The bottom of this file is automatically generated by build_glob.py based on the description file global.data </description>
      <author>Gary Pennington &lt;Gary.Pennington@uk.sun.com&gt;, Daniel Veillard </author>
@@ -448,6 +448,7 @@
     </file>
     <file name='globals'>
      <summary>interface for all global variables of the library</summary>
      <description>all the global variables and thread handling for those variables is handled by this module.  The bottom of this file is automatically generated by build_glob.py based on the description file global.data </description>
      <author>Gary Pennington &lt;Gary.Pennington@uk.sun.com&gt;, Daniel Veillard </author>
+     <exports symbol='xmlGlobalState' type='typedef'/>
      <exports symbol='xmlGlobalStatePtr' type='typedef'/>
@@ -453,3 +454,2 @@
      <exports symbol='xmlGlobalStatePtr' type='typedef'/>
-     <exports symbol='xmlGlobalState' type='typedef'/>
      <exports symbol='_xmlGlobalState' type='struct'/>
@@ -455,3 +455,14 @@
      <exports symbol='_xmlGlobalState' type='struct'/>
-     <exports symbol='xmlTreeIndentString' type='variable'/>
+     <exports symbol='htmlDefaultSAXHandler' type='variable'/>
+     <exports symbol='oldXMLWDcompatibility' type='variable'/>
+     <exports symbol='xmlBufferAllocScheme' type='variable'/>
+     <exports symbol='xmlDefaultBufferSize' type='variable'/>
+     <exports symbol='xmlDefaultSAXHandler' type='variable'/>
+     <exports symbol='xmlDefaultSAXLocator' type='variable'/>
+     <exports symbol='xmlDeregisterNodeDefaultValue' type='variable'/>
+     <exports symbol='xmlDoValidityCheckingDefaultValue' type='variable'/>
+     <exports symbol='xmlFree' type='variable'/>
+     <exports symbol='xmlGenericError' type='variable'/>
+     <exports symbol='xmlGenericErrorContext' type='variable'/>
+     <exports symbol='xmlGetWarningsDefaultValue' type='variable'/>
      <exports symbol='xmlIndentTreeOutput' type='variable'/>
@@ -457,3 +468,15 @@
      <exports symbol='xmlIndentTreeOutput' type='variable'/>
-     <exports symbol='xmlDefaultBufferSize' type='variable'/>
+     <exports symbol='xmlKeepBlanksDefaultValue' type='variable'/>
+     <exports symbol='xmlLastError' type='variable'/>
+     <exports symbol='xmlLineNumbersDefaultValue' type='variable'/>
+     <exports symbol='xmlLoadExtDtdDefaultValue' type='variable'/>
+     <exports symbol='xmlMalloc' type='variable'/>
+     <exports symbol='xmlMallocAtomic' type='variable'/>
+     <exports symbol='xmlMemStrdup' type='variable'/>
+     <exports symbol='xmlOutputBufferCreateFilenameValue' type='variable'/>
+     <exports symbol='xmlParserDebugEntities' type='variable'/>
+     <exports symbol='xmlParserInputBufferCreateFilenameValue' type='variable'/>
+     <exports symbol='xmlParserVersion' type='variable'/>
+     <exports symbol='xmlPedanticParserDefaultValue' type='variable'/>
+     <exports symbol='xmlRealloc' type='variable'/>
      <exports symbol='xmlRegisterNodeDefaultValue' type='variable'/>
@@ -459,9 +482,4 @@
      <exports symbol='xmlRegisterNodeDefaultValue' type='variable'/>
-     <exports symbol='xmlGetWarningsDefaultValue' type='variable'/>
-     <exports symbol='xmlGenericErrorContext' type='variable'/>
-     <exports symbol='xmlDeregisterNodeDefaultValue' type='variable'/>
-     <exports symbol='xmlGenericError' type='variable'/>
-     <exports symbol='xmlMalloc' type='variable'/>
-     <exports symbol='xmlParserVersion' type='variable'/>
+     <exports symbol='xmlSaveNoEmptyTags' type='variable'/>
      <exports symbol='xmlStructuredError' type='variable'/>
      <exports symbol='xmlStructuredErrorContext' type='variable'/>
@@ -466,13 +484,3 @@
      <exports symbol='xmlStructuredError' type='variable'/>
      <exports symbol='xmlStructuredErrorContext' type='variable'/>
-     <exports symbol='xmlDoValidityCheckingDefaultValue' type='variable'/>
-     <exports symbol='xmlOutputBufferCreateFilenameValue' type='variable'/>
-     <exports symbol='xmlPedanticParserDefaultValue' type='variable'/>
-     <exports symbol='xmlParserDebugEntities' type='variable'/>
-     <exports symbol='xmlRealloc' type='variable'/>
-     <exports symbol='xmlMemStrdup' type='variable'/>
-     <exports symbol='htmlDefaultSAXHandler' type='variable'/>
-     <exports symbol='xmlSaveNoEmptyTags' type='variable'/>
-     <exports symbol='xmlParserInputBufferCreateFilenameValue' type='variable'/>
-     <exports symbol='xmlKeepBlanksDefaultValue' type='variable'/>
      <exports symbol='xmlSubstituteEntitiesDefaultValue' type='variable'/>
@@ -478,12 +486,7 @@
      <exports symbol='xmlSubstituteEntitiesDefaultValue' type='variable'/>
-     <exports symbol='xmlMallocAtomic' type='variable'/>
-     <exports symbol='xmlBufferAllocScheme' type='variable'/>
-     <exports symbol='oldXMLWDcompatibility' type='variable'/>
-     <exports symbol='xmlFree' type='variable'/>
-     <exports symbol='xmlLoadExtDtdDefaultValue' type='variable'/>
-     <exports symbol='xmlLastError' type='variable'/>
-     <exports symbol='xmlLineNumbersDefaultValue' type='variable'/>
-     <exports symbol='xmlDefaultSAXHandler' type='variable'/>
-     <exports symbol='xmlDefaultSAXLocator' type='variable'/>
-     <exports symbol='xmlThrDefSetStructuredErrorFunc' type='function'/>
+     <exports symbol='xmlTreeIndentString' type='variable'/>
+     <exports symbol='xmlCleanupGlobals' type='function'/>
+     <exports symbol='xmlDeregisterNodeDefault' type='function'/>
+     <exports symbol='xmlDeregisterNodeFunc' type='function'/>
+     <exports symbol='xmlInitGlobals' type='function'/>
      <exports symbol='xmlInitializeGlobalState' type='function'/>
@@ -489,2 +492,8 @@
      <exports symbol='xmlInitializeGlobalState' type='function'/>
+     <exports symbol='xmlOutputBufferCreateFilenameDefault' type='function'/>
+     <exports symbol='xmlOutputBufferCreateFilenameFunc' type='function'/>
+     <exports symbol='xmlParserInputBufferCreateFilenameDefault' type='function'/>
+     <exports symbol='xmlParserInputBufferCreateFilenameFunc' type='function'/>
+     <exports symbol='xmlRegisterNodeDefault' type='function'/>
+     <exports symbol='xmlRegisterNodeFunc' type='function'/>
      <exports symbol='xmlThrDefBufferAllocScheme' type='function'/>
@@ -490,5 +499,10 @@
      <exports symbol='xmlThrDefBufferAllocScheme' type='function'/>
-     <exports symbol='xmlThrDefPedanticParserDefaultValue' type='function'/>
-     <exports symbol='xmlRegisterNodeDefault' type='function'/>
-     <exports symbol='xmlParserInputBufferCreateFilenameFunc' type='function'/>
+     <exports symbol='xmlThrDefDefaultBufferSize' type='function'/>
+     <exports symbol='xmlThrDefDeregisterNodeDefault' type='function'/>
+     <exports symbol='xmlThrDefDoValidityCheckingDefaultValue' type='function'/>
+     <exports symbol='xmlThrDefGetWarningsDefaultValue' type='function'/>
+     <exports symbol='xmlThrDefIndentTreeOutput' type='function'/>
+     <exports symbol='xmlThrDefKeepBlanksDefaultValue' type='function'/>
+     <exports symbol='xmlThrDefLineNumbersDefaultValue' type='function'/>
+     <exports symbol='xmlThrDefLoadExtDtdDefaultValue' type='function'/>
      <exports symbol='xmlThrDefOutputBufferCreateFilenameDefault' type='function'/>
@@ -494,10 +508,3 @@
      <exports symbol='xmlThrDefOutputBufferCreateFilenameDefault' type='function'/>
-     <exports symbol='xmlDeregisterNodeDefault' type='function'/>
-     <exports symbol='xmlThrDefDefaultBufferSize' type='function'/>
-     <exports symbol='xmlOutputBufferCreateFilenameDefault' type='function'/>
-     <exports symbol='xmlThrDefLoadExtDtdDefaultValue' type='function'/>
-     <exports symbol='xmlThrDefRegisterNodeDefault' type='function'/>
-     <exports symbol='xmlThrDefKeepBlanksDefaultValue' type='function'/>
-     <exports symbol='xmlDeregisterNodeFunc' type='function'/>
      <exports symbol='xmlThrDefParserDebugEntities' type='function'/>
      <exports symbol='xmlThrDefParserInputBufferCreateFilenameDefault' type='function'/>
@@ -502,3 +509,6 @@
      <exports symbol='xmlThrDefParserDebugEntities' type='function'/>
      <exports symbol='xmlThrDefParserInputBufferCreateFilenameDefault' type='function'/>
+     <exports symbol='xmlThrDefPedanticParserDefaultValue' type='function'/>
+     <exports symbol='xmlThrDefRegisterNodeDefault' type='function'/>
+     <exports symbol='xmlThrDefSaveNoEmptyTags' type='function'/>
      <exports symbol='xmlThrDefSetGenericErrorFunc' type='function'/>
@@ -504,7 +514,3 @@
      <exports symbol='xmlThrDefSetGenericErrorFunc' type='function'/>
-     <exports symbol='xmlParserInputBufferCreateFilenameDefault' type='function'/>
-     <exports symbol='xmlThrDefDoValidityCheckingDefaultValue' type='function'/>
-     <exports symbol='xmlCleanupGlobals' type='function'/>
-     <exports symbol='xmlThrDefGetWarningsDefaultValue' type='function'/>
-     <exports symbol='xmlThrDefDeregisterNodeDefault' type='function'/>
+     <exports symbol='xmlThrDefSetStructuredErrorFunc' type='function'/>
      <exports symbol='xmlThrDefSubstituteEntitiesDefaultValue' type='function'/>
@@ -510,10 +516,4 @@
      <exports symbol='xmlThrDefSubstituteEntitiesDefaultValue' type='function'/>
-     <exports symbol='xmlRegisterNodeFunc' type='function'/>
-     <exports symbol='xmlThrDefSaveNoEmptyTags' type='function'/>
-     <exports symbol='xmlThrDefIndentTreeOutput' type='function'/>
-     <exports symbol='xmlOutputBufferCreateFilenameFunc' type='function'/>
-     <exports symbol='xmlInitGlobals' type='function'/>
-     <exports symbol='xmlThrDefLineNumbersDefaultValue' type='function'/>
      <exports symbol='xmlThrDefTreeIndentString' type='function'/>
     </file>
     <file name='hash'>
@@ -523,7 +523,10 @@
      <exports symbol='XML_CAST_FPTR' type='macro'/>
      <exports symbol='xmlHashTable' type='typedef'/>
      <exports symbol='xmlHashTablePtr' type='typedef'/>
-     <exports symbol='xmlHashScanFull' type='function'/>
-     <exports symbol='xmlHashScan' type='function'/>
-     <exports symbol='xmlHashScannerFull' type='function'/>
+     <exports symbol='xmlHashAddEntry' type='function'/>
+     <exports symbol='xmlHashAddEntry2' type='function'/>
+     <exports symbol='xmlHashAddEntry3' type='function'/>
+     <exports symbol='xmlHashCopier' type='function'/>
+     <exports symbol='xmlHashCopy' type='function'/>
+     <exports symbol='xmlHashCreate' type='function'/>
      <exports symbol='xmlHashCreateDict' type='function'/>
@@ -529,8 +532,2 @@
      <exports symbol='xmlHashCreateDict' type='function'/>
-     <exports symbol='xmlHashAddEntry' type='function'/>
-     <exports symbol='xmlHashUpdateEntry' type='function'/>
-     <exports symbol='xmlHashQLookup3' type='function'/>
-     <exports symbol='xmlHashQLookup2' type='function'/>
-     <exports symbol='xmlHashScan3' type='function'/>
-     <exports symbol='xmlHashScanner' type='function'/>
      <exports symbol='xmlHashDeallocator' type='function'/>
@@ -536,4 +533,4 @@
      <exports symbol='xmlHashDeallocator' type='function'/>
-     <exports symbol='xmlHashCreate' type='function'/>
+     <exports symbol='xmlHashDefaultDeallocator' type='function'/>
      <exports symbol='xmlHashFree' type='function'/>
      <exports symbol='xmlHashLookup' type='function'/>
@@ -538,3 +535,5 @@
      <exports symbol='xmlHashFree' type='function'/>
      <exports symbol='xmlHashLookup' type='function'/>
+     <exports symbol='xmlHashLookup2' type='function'/>
+     <exports symbol='xmlHashLookup3' type='function'/>
      <exports symbol='xmlHashQLookup' type='function'/>
@@ -540,4 +539,6 @@
      <exports symbol='xmlHashQLookup' type='function'/>
-     <exports symbol='xmlHashUpdateEntry2' type='function'/>
+     <exports symbol='xmlHashQLookup2' type='function'/>
+     <exports symbol='xmlHashQLookup3' type='function'/>
+     <exports symbol='xmlHashRemoveEntry' type='function'/>
      <exports symbol='xmlHashRemoveEntry2' type='function'/>
      <exports symbol='xmlHashRemoveEntry3' type='function'/>
@@ -542,4 +543,6 @@
      <exports symbol='xmlHashRemoveEntry2' type='function'/>
      <exports symbol='xmlHashRemoveEntry3' type='function'/>
-     <exports symbol='xmlHashCopy' type='function'/>
+     <exports symbol='xmlHashScan' type='function'/>
+     <exports symbol='xmlHashScan3' type='function'/>
+     <exports symbol='xmlHashScanFull' type='function'/>
      <exports symbol='xmlHashScanFull3' type='function'/>
@@ -545,2 +548,7 @@
      <exports symbol='xmlHashScanFull3' type='function'/>
+     <exports symbol='xmlHashScanner' type='function'/>
+     <exports symbol='xmlHashScannerFull' type='function'/>
+     <exports symbol='xmlHashSize' type='function'/>
+     <exports symbol='xmlHashUpdateEntry' type='function'/>
+     <exports symbol='xmlHashUpdateEntry2' type='function'/>
      <exports symbol='xmlHashUpdateEntry3' type='function'/>
@@ -546,12 +554,4 @@
      <exports symbol='xmlHashUpdateEntry3' type='function'/>
-     <exports symbol='xmlHashDefaultDeallocator' type='function'/>
-     <exports symbol='xmlHashLookup3' type='function'/>
-     <exports symbol='xmlHashLookup2' type='function'/>
-     <exports symbol='xmlHashRemoveEntry' type='function'/>
-     <exports symbol='xmlHashCopier' type='function'/>
-     <exports symbol='xmlHashAddEntry2' type='function'/>
-     <exports symbol='xmlHashAddEntry3' type='function'/>
-     <exports symbol='xmlHashSize' type='function'/>
     </file>
     <file name='list'>
      <summary>lists interfaces</summary>
@@ -561,7 +561,10 @@
      <exports symbol='xmlLinkPtr' type='typedef'/>
      <exports symbol='xmlList' type='typedef'/>
      <exports symbol='xmlListPtr' type='typedef'/>
-     <exports symbol='xmlListInsert' type='function'/>
-     <exports symbol='xmlListEmpty' type='function'/>
-     <exports symbol='xmlListSort' type='function'/>
+     <exports symbol='xmlLinkGetData' type='function'/>
+     <exports symbol='xmlListAppend' type='function'/>
+     <exports symbol='xmlListClear' type='function'/>
+     <exports symbol='xmlListCopy' type='function'/>
+     <exports symbol='xmlListCreate' type='function'/>
+     <exports symbol='xmlListDataCompare' type='function'/>
      <exports symbol='xmlListDeallocator' type='function'/>
@@ -567,4 +570,3 @@
      <exports symbol='xmlListDeallocator' type='function'/>
-     <exports symbol='xmlListMerge' type='function'/>
-     <exports symbol='xmlListCreate' type='function'/>
+     <exports symbol='xmlListDelete' type='function'/>
      <exports symbol='xmlListDup' type='function'/>
@@ -570,4 +572,11 @@
      <exports symbol='xmlListDup' type='function'/>
-     <exports symbol='xmlListRemoveLast' type='function'/>
-     <exports symbol='xmlListWalk' type='function'/>
+     <exports symbol='xmlListEmpty' type='function'/>
+     <exports symbol='xmlListEnd' type='function'/>
+     <exports symbol='xmlListFront' type='function'/>
+     <exports symbol='xmlListInsert' type='function'/>
+     <exports symbol='xmlListMerge' type='function'/>
+     <exports symbol='xmlListPopBack' type='function'/>
+     <exports symbol='xmlListPopFront' type='function'/>
+     <exports symbol='xmlListPushBack' type='function'/>
+     <exports symbol='xmlListPushFront' type='function'/>
      <exports symbol='xmlListRemoveAll' type='function'/>
@@ -573,6 +582,2 @@
      <exports symbol='xmlListRemoveAll' type='function'/>
-     <exports symbol='xmlListCopy' type='function'/>
-     <exports symbol='xmlListPopFront' type='function'/>
-     <exports symbol='xmlListSearch' type='function'/>
-     <exports symbol='xmlListWalker' type='function'/>
      <exports symbol='xmlListRemoveFirst' type='function'/>
@@ -578,2 +583,5 @@
      <exports symbol='xmlListRemoveFirst' type='function'/>
+     <exports symbol='xmlListRemoveLast' type='function'/>
+     <exports symbol='xmlListReverse' type='function'/>
+     <exports symbol='xmlListReverseSearch' type='function'/>
      <exports symbol='xmlListReverseWalk' type='function'/>
@@ -579,7 +587,3 @@
      <exports symbol='xmlListReverseWalk' type='function'/>
-     <exports symbol='xmlLinkGetData' type='function'/>
-     <exports symbol='xmlListClear' type='function'/>
-     <exports symbol='xmlListAppend' type='function'/>
-     <exports symbol='xmlListReverse' type='function'/>
-     <exports symbol='xmlListDataCompare' type='function'/>
+     <exports symbol='xmlListSearch' type='function'/>
      <exports symbol='xmlListSize' type='function'/>
@@ -585,11 +589,7 @@
      <exports symbol='xmlListSize' type='function'/>
-     <exports symbol='xmlListPushFront' type='function'/>
-     <exports symbol='xmlListEnd' type='function'/>
-     <exports symbol='xmlListPopBack' type='function'/>
-     <exports symbol='xmlListReverseSearch' type='function'/>
-     <exports symbol='xmlListPushBack' type='function'/>
-     <exports symbol='xmlListFront' type='function'/>
-     <exports symbol='xmlListDelete' type='function'/>
+     <exports symbol='xmlListSort' type='function'/>
+     <exports symbol='xmlListWalk' type='function'/>
+     <exports symbol='xmlListWalker' type='function'/>
     </file>
     <file name='nanoftp'>
      <summary>minimal FTP implementation</summary>
@@ -598,5 +598,8 @@
      <deprecated/>
      <exports symbol='INVALID_SOCKET' type='macro'/>
      <exports symbol='SOCKET' type='macro'/>
-     <exports symbol='xmlNanoFTPQuit' type='function'/>
+     <exports symbol='ftpDataCallback' type='function'/>
+     <exports symbol='ftpListCallback' type='function'/>
+     <exports symbol='xmlNanoFTPCheckResponse' type='function'/>
+     <exports symbol='xmlNanoFTPCleanup' type='function'/>
      <exports symbol='xmlNanoFTPClose' type='function'/>
@@ -602,3 +605,2 @@
      <exports symbol='xmlNanoFTPClose' type='function'/>
-     <exports symbol='ftpListCallback' type='function'/>
      <exports symbol='xmlNanoFTPCloseConnection' type='function'/>
@@ -604,2 +606,15 @@
      <exports symbol='xmlNanoFTPCloseConnection' type='function'/>
+     <exports symbol='xmlNanoFTPConnect' type='function'/>
+     <exports symbol='xmlNanoFTPConnectTo' type='function'/>
+     <exports symbol='xmlNanoFTPCwd' type='function'/>
+     <exports symbol='xmlNanoFTPDele' type='function'/>
+     <exports symbol='xmlNanoFTPFreeCtxt' type='function'/>
+     <exports symbol='xmlNanoFTPGet' type='function'/>
+     <exports symbol='xmlNanoFTPGetConnection' type='function'/>
+     <exports symbol='xmlNanoFTPGetResponse' type='function'/>
+     <exports symbol='xmlNanoFTPGetSocket' type='function'/>
+     <exports symbol='xmlNanoFTPInit' type='function'/>
+     <exports symbol='xmlNanoFTPList' type='function'/>
+     <exports symbol='xmlNanoFTPNewCtxt' type='function'/>
+     <exports symbol='xmlNanoFTPOpen' type='function'/>
      <exports symbol='xmlNanoFTPProxy' type='function'/>
@@ -605,7 +620,4 @@
      <exports symbol='xmlNanoFTPProxy' type='function'/>
-     <exports symbol='xmlNanoFTPUpdateURL' type='function'/>
-     <exports symbol='xmlNanoFTPGetConnection' type='function'/>
-     <exports symbol='xmlNanoFTPDele' type='function'/>
-     <exports symbol='xmlNanoFTPNewCtxt' type='function'/>
-     <exports symbol='xmlNanoFTPCheckResponse' type='function'/>
+     <exports symbol='xmlNanoFTPQuit' type='function'/>
+     <exports symbol='xmlNanoFTPRead' type='function'/>
      <exports symbol='xmlNanoFTPScanProxy' type='function'/>
@@ -611,19 +623,7 @@
      <exports symbol='xmlNanoFTPScanProxy' type='function'/>
-     <exports symbol='ftpDataCallback' type='function'/>
-     <exports symbol='xmlNanoFTPGetResponse' type='function'/>
-     <exports symbol='xmlNanoFTPCwd' type='function'/>
-     <exports symbol='xmlNanoFTPInit' type='function'/>
-     <exports symbol='xmlNanoFTPConnectTo' type='function'/>
-     <exports symbol='xmlNanoFTPList' type='function'/>
-     <exports symbol='xmlNanoFTPOpen' type='function'/>
-     <exports symbol='xmlNanoFTPConnect' type='function'/>
-     <exports symbol='xmlNanoFTPGetSocket' type='function'/>
-     <exports symbol='xmlNanoFTPGet' type='function'/>
-     <exports symbol='xmlNanoFTPRead' type='function'/>
-     <exports symbol='xmlNanoFTPFreeCtxt' type='function'/>
-     <exports symbol='xmlNanoFTPCleanup' type='function'/>
+     <exports symbol='xmlNanoFTPUpdateURL' type='function'/>
     </file>
     <file name='nanohttp'>
      <summary>minimal HTTP implementation</summary>
      <description>minimal HTTP implementation allowing to fetch resources like external subset. </description>
      <author>Daniel Veillard </author>
@@ -625,9 +625,6 @@
     </file>
     <file name='nanohttp'>
      <summary>minimal HTTP implementation</summary>
      <description>minimal HTTP implementation allowing to fetch resources like external subset. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='xmlNanoHTTPRead' type='function'/>
-     <exports symbol='xmlNanoHTTPSave' type='function'/>
-     <exports symbol='xmlNanoHTTPRedir' type='function'/>
      <exports symbol='xmlNanoHTTPAuthHeader' type='function'/>
@@ -633,3 +630,4 @@
      <exports symbol='xmlNanoHTTPAuthHeader' type='function'/>
-     <exports symbol='xmlNanoHTTPFetch' type='function'/>
+     <exports symbol='xmlNanoHTTPCleanup' type='function'/>
+     <exports symbol='xmlNanoHTTPClose' type='function'/>
      <exports symbol='xmlNanoHTTPContentLength' type='function'/>
@@ -635,2 +633,7 @@
      <exports symbol='xmlNanoHTTPContentLength' type='function'/>
+     <exports symbol='xmlNanoHTTPEncoding' type='function'/>
+     <exports symbol='xmlNanoHTTPFetch' type='function'/>
+     <exports symbol='xmlNanoHTTPInit' type='function'/>
+     <exports symbol='xmlNanoHTTPMethod' type='function'/>
+     <exports symbol='xmlNanoHTTPMethodRedir' type='function'/>
      <exports symbol='xmlNanoHTTPMimeType' type='function'/>
@@ -636,7 +639,3 @@
      <exports symbol='xmlNanoHTTPMimeType' type='function'/>
-     <exports symbol='xmlNanoHTTPClose' type='function'/>
-     <exports symbol='xmlNanoHTTPCleanup' type='function'/>
-     <exports symbol='xmlNanoHTTPMethod' type='function'/>
-     <exports symbol='xmlNanoHTTPInit' type='function'/>
      <exports symbol='xmlNanoHTTPOpen' type='function'/>
      <exports symbol='xmlNanoHTTPOpenRedir' type='function'/>
@@ -641,4 +640,7 @@
      <exports symbol='xmlNanoHTTPOpen' type='function'/>
      <exports symbol='xmlNanoHTTPOpenRedir' type='function'/>
-     <exports symbol='xmlNanoHTTPMethodRedir' type='function'/>
+     <exports symbol='xmlNanoHTTPRead' type='function'/>
+     <exports symbol='xmlNanoHTTPRedir' type='function'/>
+     <exports symbol='xmlNanoHTTPReturnCode' type='function'/>
+     <exports symbol='xmlNanoHTTPSave' type='function'/>
      <exports symbol='xmlNanoHTTPScanProxy' type='function'/>
@@ -644,9 +646,7 @@
      <exports symbol='xmlNanoHTTPScanProxy' type='function'/>
-     <exports symbol='xmlNanoHTTPEncoding' type='function'/>
-     <exports symbol='xmlNanoHTTPReturnCode' type='function'/>
     </file>
     <file name='parser'>
      <summary>the core parser module</summary>
      <description>Interfaces, constants and types related to the XML parser </description>
      <author>Daniel Veillard </author>
      <exports symbol='XML_COMPLETE_ATTRS' type='macro'/>
@@ -647,9 +647,8 @@
     </file>
     <file name='parser'>
      <summary>the core parser module</summary>
      <description>Interfaces, constants and types related to the XML parser </description>
      <author>Daniel Veillard </author>
      <exports symbol='XML_COMPLETE_ATTRS' type='macro'/>
-     <exports symbol='XML_SKIP_IDS' type='macro'/>
-     <exports symbol='XML_SAX2_MAGIC' type='macro'/>
+     <exports symbol='XML_DEFAULT_VERSION' type='macro'/>
      <exports symbol='XML_DETECT_IDS' type='macro'/>
@@ -655,5 +654,10 @@
      <exports symbol='XML_DETECT_IDS' type='macro'/>
-     <exports symbol='XML_DEFAULT_VERSION' type='macro'/>
-     <exports symbol='XML_WITH_NONE' type='enum'/>
-     <exports symbol='XML_WITH_SCHEMATRON' type='enum'/>
+     <exports symbol='XML_SAX2_MAGIC' type='macro'/>
+     <exports symbol='XML_SKIP_IDS' type='macro'/>
+     <exports symbol='XML_PARSER_ATTRIBUTE_VALUE' type='enum'/>
+     <exports symbol='XML_PARSER_CDATA_SECTION' type='enum'/>
+     <exports symbol='XML_PARSER_COMMENT' type='enum'/>
+     <exports symbol='XML_PARSER_CONTENT' type='enum'/>
+     <exports symbol='XML_PARSER_DTD' type='enum'/>
+     <exports symbol='XML_PARSER_END_TAG' type='enum'/>
      <exports symbol='XML_PARSER_ENTITY_DECL' type='enum'/>
@@ -659,8 +663,7 @@
      <exports symbol='XML_PARSER_ENTITY_DECL' type='enum'/>
-     <exports symbol='XML_PARSER_CONTENT' type='enum'/>
-     <exports symbol='XML_PARSE_NOBLANKS' type='enum'/>
-     <exports symbol='XML_WITH_PATTERN' type='enum'/>
-     <exports symbol='XML_PARSE_NODICT' type='enum'/>
-     <exports symbol='XML_PARSER_SYSTEM_LITERAL' type='enum'/>
-     <exports symbol='XML_WITH_REGEXP' type='enum'/>
+     <exports symbol='XML_PARSER_ENTITY_VALUE' type='enum'/>
+     <exports symbol='XML_PARSER_EOF' type='enum'/>
+     <exports symbol='XML_PARSER_EPILOG' type='enum'/>
+     <exports symbol='XML_PARSER_IGNORE' type='enum'/>
+     <exports symbol='XML_PARSER_MISC' type='enum'/>
      <exports symbol='XML_PARSER_PI' type='enum'/>
@@ -666,10 +669,2 @@
      <exports symbol='XML_PARSER_PI' type='enum'/>
-     <exports symbol='XML_PARSE_UNKNOWN' type='enum'/>
-     <exports symbol='XML_WITH_XPATH' type='enum'/>
-     <exports symbol='XML_WITH_HTML' type='enum'/>
-     <exports symbol='XML_PARSE_OLDSAX' type='enum'/>
-     <exports symbol='XML_WITH_LZMA' type='enum'/>
-     <exports symbol='XML_WITH_ICU' type='enum'/>
-     <exports symbol='XML_WITH_C14N' type='enum'/>
-     <exports symbol='XML_PARSE_PUSH_DOM' type='enum'/>
      <exports symbol='XML_PARSER_PROLOG' type='enum'/>
@@ -675,9 +670,8 @@
      <exports symbol='XML_PARSER_PROLOG' type='enum'/>
-     <exports symbol='XML_PARSE_NONET' type='enum'/>
-     <exports symbol='XML_WITH_HTTP' type='enum'/>
-     <exports symbol='XML_PARSER_EPILOG' type='enum'/>
-     <exports symbol='XML_PARSER_END_TAG' type='enum'/>
-     <exports symbol='XML_WITH_DEBUG' type='enum'/>
-     <exports symbol='XML_WITH_READER' type='enum'/>
-     <exports symbol='XML_PARSE_DTDVALID' type='enum'/>
+     <exports symbol='XML_PARSER_PUBLIC_LITERAL' type='enum'/>
+     <exports symbol='XML_PARSER_START' type='enum'/>
+     <exports symbol='XML_PARSER_START_TAG' type='enum'/>
+     <exports symbol='XML_PARSER_SYSTEM_LITERAL' type='enum'/>
+     <exports symbol='XML_PARSE_BIG_LINES' type='enum'/>
+     <exports symbol='XML_PARSE_COMPACT' type='enum'/>
      <exports symbol='XML_PARSE_DOM' type='enum'/>
@@ -683,14 +677,7 @@
      <exports symbol='XML_PARSE_DOM' type='enum'/>
-     <exports symbol='XML_PARSER_ATTRIBUTE_VALUE' type='enum'/>
-     <exports symbol='XML_PARSE_PUSH_SAX' type='enum'/>
-     <exports symbol='XML_WITH_TREE' type='enum'/>
-     <exports symbol='XML_PARSE_RECOVER' type='enum'/>
-     <exports symbol='XML_WITH_SCHEMAS' type='enum'/>
-     <exports symbol='XML_PARSE_PEDANTIC' type='enum'/>
-     <exports symbol='XML_PARSER_EOF' type='enum'/>
-     <exports symbol='XML_PARSER_CDATA_SECTION' type='enum'/>
-     <exports symbol='XML_WITH_LEGACY' type='enum'/>
-     <exports symbol='XML_WITH_OUTPUT' type='enum'/>
-     <exports symbol='XML_PARSE_XINCLUDE' type='enum'/>
-     <exports symbol='XML_PARSE_NOCDATA' type='enum'/>
+     <exports symbol='XML_PARSE_DTDATTR' type='enum'/>
+     <exports symbol='XML_PARSE_DTDLOAD' type='enum'/>
+     <exports symbol='XML_PARSE_DTDVALID' type='enum'/>
+     <exports symbol='XML_PARSE_HUGE' type='enum'/>
+     <exports symbol='XML_PARSE_IGNORE_ENC' type='enum'/>
      <exports symbol='XML_PARSE_NOBASEFIX' type='enum'/>
@@ -696,8 +683,5 @@
      <exports symbol='XML_PARSE_NOBASEFIX' type='enum'/>
-     <exports symbol='XML_PARSE_BIG_LINES' type='enum'/>
-     <exports symbol='XML_WITH_XINCLUDE' type='enum'/>
-     <exports symbol='XML_WITH_PUSH' type='enum'/>
-     <exports symbol='XML_PARSE_READER' type='enum'/>
-     <exports symbol='XML_WITH_THREAD' type='enum'/>
-     <exports symbol='XML_PARSE_SAX' type='enum'/>
+     <exports symbol='XML_PARSE_NOBLANKS' type='enum'/>
+     <exports symbol='XML_PARSE_NOCDATA' type='enum'/>
+     <exports symbol='XML_PARSE_NODICT' type='enum'/>
      <exports symbol='XML_PARSE_NOENT' type='enum'/>
@@ -703,5 +687,4 @@
      <exports symbol='XML_PARSE_NOENT' type='enum'/>
-     <exports symbol='XML_PARSER_ENTITY_VALUE' type='enum'/>
-     <exports symbol='XML_PARSE_DTDLOAD' type='enum'/>
-     <exports symbol='XML_PARSE_DTDATTR' type='enum'/>
+     <exports symbol='XML_PARSE_NOERROR' type='enum'/>
+     <exports symbol='XML_PARSE_NONET' type='enum'/>
      <exports symbol='XML_PARSE_NOWARNING' type='enum'/>
@@ -707,2 +690,4 @@
      <exports symbol='XML_PARSE_NOWARNING' type='enum'/>
+     <exports symbol='XML_PARSE_NOXINCNODE' type='enum'/>
+     <exports symbol='XML_PARSE_NSCLEAN' type='enum'/>
      <exports symbol='XML_PARSE_OLD10' type='enum'/>
@@ -708,4 +693,18 @@
      <exports symbol='XML_PARSE_OLD10' type='enum'/>
-     <exports symbol='XML_PARSE_NOERROR' type='enum'/>
-     <exports symbol='XML_WITH_ISO8859X' type='enum'/>
+     <exports symbol='XML_PARSE_OLDSAX' type='enum'/>
+     <exports symbol='XML_PARSE_PEDANTIC' type='enum'/>
+     <exports symbol='XML_PARSE_PUSH_DOM' type='enum'/>
+     <exports symbol='XML_PARSE_PUSH_SAX' type='enum'/>
+     <exports symbol='XML_PARSE_READER' type='enum'/>
+     <exports symbol='XML_PARSE_RECOVER' type='enum'/>
+     <exports symbol='XML_PARSE_SAX' type='enum'/>
+     <exports symbol='XML_PARSE_SAX1' type='enum'/>
+     <exports symbol='XML_PARSE_UNKNOWN' type='enum'/>
+     <exports symbol='XML_PARSE_XINCLUDE' type='enum'/>
+     <exports symbol='XML_WITH_AUTOMATA' type='enum'/>
+     <exports symbol='XML_WITH_C14N' type='enum'/>
+     <exports symbol='XML_WITH_CATALOG' type='enum'/>
+     <exports symbol='XML_WITH_DEBUG' type='enum'/>
+     <exports symbol='XML_WITH_DEBUG_MEM' type='enum'/>
+     <exports symbol='XML_WITH_DEBUG_RUN' type='enum'/>
      <exports symbol='XML_WITH_EXPR' type='enum'/>
@@ -711,3 +710,22 @@
      <exports symbol='XML_WITH_EXPR' type='enum'/>
-     <exports symbol='XML_PARSE_NSCLEAN' type='enum'/>
+     <exports symbol='XML_WITH_FTP' type='enum'/>
+     <exports symbol='XML_WITH_HTML' type='enum'/>
+     <exports symbol='XML_WITH_HTTP' type='enum'/>
+     <exports symbol='XML_WITH_ICONV' type='enum'/>
+     <exports symbol='XML_WITH_ICU' type='enum'/>
+     <exports symbol='XML_WITH_ISO8859X' type='enum'/>
+     <exports symbol='XML_WITH_LEGACY' type='enum'/>
+     <exports symbol='XML_WITH_LZMA' type='enum'/>
+     <exports symbol='XML_WITH_MODULES' type='enum'/>
+     <exports symbol='XML_WITH_NONE' type='enum'/>
+     <exports symbol='XML_WITH_OUTPUT' type='enum'/>
+     <exports symbol='XML_WITH_PATTERN' type='enum'/>
+     <exports symbol='XML_WITH_PUSH' type='enum'/>
+     <exports symbol='XML_WITH_READER' type='enum'/>
+     <exports symbol='XML_WITH_REGEXP' type='enum'/>
+     <exports symbol='XML_WITH_SAX1' type='enum'/>
+     <exports symbol='XML_WITH_SCHEMAS' type='enum'/>
+     <exports symbol='XML_WITH_SCHEMATRON' type='enum'/>
+     <exports symbol='XML_WITH_THREAD' type='enum'/>
+     <exports symbol='XML_WITH_TREE' type='enum'/>
      <exports symbol='XML_WITH_UNICODE' type='enum'/>
@@ -713,4 +731,6 @@
      <exports symbol='XML_WITH_UNICODE' type='enum'/>
-     <exports symbol='XML_WITH_CATALOG' type='enum'/>
-     <exports symbol='XML_WITH_MODULES' type='enum'/>
+     <exports symbol='XML_WITH_VALID' type='enum'/>
+     <exports symbol='XML_WITH_WRITER' type='enum'/>
+     <exports symbol='XML_WITH_XINCLUDE' type='enum'/>
+     <exports symbol='XML_WITH_XPATH' type='enum'/>
      <exports symbol='XML_WITH_XPTR' type='enum'/>
@@ -716,5 +736,2 @@
      <exports symbol='XML_WITH_XPTR' type='enum'/>
-     <exports symbol='XML_PARSE_IGNORE_ENC' type='enum'/>
-     <exports symbol='XML_PARSE_COMPACT' type='enum'/>
-     <exports symbol='XML_PARSE_SAX1' type='enum'/>
      <exports symbol='XML_WITH_ZLIB' type='enum'/>
@@ -720,21 +737,3 @@
      <exports symbol='XML_WITH_ZLIB' type='enum'/>
-     <exports symbol='XML_PARSE_NOXINCNODE' type='enum'/>
-     <exports symbol='XML_PARSER_DTD' type='enum'/>
-     <exports symbol='XML_PARSER_MISC' type='enum'/>
-     <exports symbol='XML_PARSER_START' type='enum'/>
-     <exports symbol='XML_WITH_DEBUG_MEM' type='enum'/>
-     <exports symbol='XML_PARSE_HUGE' type='enum'/>
-     <exports symbol='XML_WITH_FTP' type='enum'/>
-     <exports symbol='XML_PARSER_START_TAG' type='enum'/>
-     <exports symbol='XML_PARSER_IGNORE' type='enum'/>
-     <exports symbol='XML_PARSER_COMMENT' type='enum'/>
-     <exports symbol='XML_PARSER_PUBLIC_LITERAL' type='enum'/>
-     <exports symbol='XML_WITH_ICONV' type='enum'/>
-     <exports symbol='XML_WITH_WRITER' type='enum'/>
-     <exports symbol='XML_WITH_AUTOMATA' type='enum'/>
-     <exports symbol='XML_WITH_DEBUG_RUN' type='enum'/>
-     <exports symbol='XML_WITH_SAX1' type='enum'/>
-     <exports symbol='XML_WITH_VALID' type='enum'/>
-     <exports symbol='xmlParserNodeInfoSeqPtr' type='typedef'/>
-     <exports symbol='xmlSAXHandlerV1' type='typedef'/>
+     <exports symbol='xmlFeature' type='typedef'/>
      <exports symbol='xmlParserInputState' type='typedef'/>
@@ -740,3 +739,5 @@
      <exports symbol='xmlParserInputState' type='typedef'/>
+     <exports symbol='xmlParserMode' type='typedef'/>
+     <exports symbol='xmlParserNodeInfo' type='typedef'/>
      <exports symbol='xmlParserNodeInfoPtr' type='typedef'/>
      <exports symbol='xmlParserNodeInfoSeq' type='typedef'/>
@@ -741,6 +742,4 @@
      <exports symbol='xmlParserNodeInfoPtr' type='typedef'/>
      <exports symbol='xmlParserNodeInfoSeq' type='typedef'/>
-     <exports symbol='xmlFeature' type='typedef'/>
-     <exports symbol='xmlParserMode' type='typedef'/>
-     <exports symbol='xmlStartTag' type='typedef'/>
+     <exports symbol='xmlParserNodeInfoSeqPtr' type='typedef'/>
      <exports symbol='xmlParserOption' type='typedef'/>
@@ -746,2 +745,3 @@
      <exports symbol='xmlParserOption' type='typedef'/>
+     <exports symbol='xmlSAXHandlerV1' type='typedef'/>
      <exports symbol='xmlSAXHandlerV1Ptr' type='typedef'/>
@@ -747,4 +747,3 @@
      <exports symbol='xmlSAXHandlerV1Ptr' type='typedef'/>
-     <exports symbol='xmlParserNodeInfo' type='typedef'/>
-     <exports symbol='_xmlParserNodeInfo' type='struct'/>
+     <exports symbol='xmlStartTag' type='typedef'/>
      <exports symbol='_xmlParserCtxt' type='struct'/>
@@ -750,3 +749,2 @@
      <exports symbol='_xmlParserCtxt' type='struct'/>
-     <exports symbol='_xmlSAXHandlerV1' type='struct'/>
      <exports symbol='_xmlParserInput' type='struct'/>
@@ -752,3 +750,3 @@
      <exports symbol='_xmlParserInput' type='struct'/>
-     <exports symbol='_xmlSAXHandler' type='struct'/>
+     <exports symbol='_xmlParserNodeInfo' type='struct'/>
      <exports symbol='_xmlParserNodeInfoSeq' type='struct'/>
@@ -754,2 +752,4 @@
      <exports symbol='_xmlParserNodeInfoSeq' type='struct'/>
+     <exports symbol='_xmlSAXHandler' type='struct'/>
+     <exports symbol='_xmlSAXHandlerV1' type='struct'/>
      <exports symbol='_xmlSAXLocator' type='struct'/>
@@ -755,5 +755,2 @@
      <exports symbol='_xmlSAXLocator' type='struct'/>
-     <exports symbol='xmlSetupParserForBuffer' type='function'/>
-     <exports symbol='xmlCtxtReadFile' type='function'/>
-     <exports symbol='xmlParseCtxtExternalEntity' type='function'/>
      <exports symbol='attributeDeclSAXFunc' type='function'/>
@@ -759,28 +756,3 @@
      <exports symbol='attributeDeclSAXFunc' type='function'/>
-     <exports symbol='getEntitySAXFunc' type='function'/>
-     <exports symbol='startElementSAXFunc' type='function'/>
-     <exports symbol='charactersSAXFunc' type='function'/>
-     <exports symbol='xmlClearNodeInfoSeq' type='function'/>
-     <exports symbol='xmlParseChunk' type='function'/>
-     <exports symbol='xmlParseEntity' type='function'/>
-     <exports symbol='xmlRecoverFile' type='function'/>
-     <exports symbol='xmlCtxtReadDoc' type='function'/>
-     <exports symbol='startElementNsSAX2Func' type='function'/>
-     <exports symbol='xmlCreateIOParserCtxt' type='function'/>
-     <exports symbol='xmlParseInNodeContext' type='function'/>
-     <exports symbol='referenceSAXFunc' type='function'/>
-     <exports symbol='hasExternalSubsetSAXFunc' type='function'/>
-     <exports symbol='xmlSAXParseDoc' type='function'/>
-     <exports symbol='xmlReadMemory' type='function'/>
-     <exports symbol='xmlParseMemory' type='function'/>
-     <exports symbol='xmlNewIOInputStream' type='function'/>
-     <exports symbol='processingInstructionSAXFunc' type='function'/>
-     <exports symbol='xmlParseBalancedChunkMemoryRecover' type='function'/>
-     <exports symbol='xmlInitParser' type='function'/>
-     <exports symbol='xmlCreateDocParserCtxt' type='function'/>
-     <exports symbol='errorSAXFunc' type='function'/>
-     <exports symbol='xmlSAXParseMemory' type='function'/>
-     <exports symbol='xmlRecoverMemory' type='function'/>
-     <exports symbol='xmlExternalEntityLoader' type='function'/>
-     <exports symbol='hasInternalSubsetSAXFunc' type='function'/>
+     <exports symbol='attributeSAXFunc' type='function'/>
      <exports symbol='cdataBlockSAXFunc' type='function'/>
@@ -786,11 +758,3 @@
      <exports symbol='cdataBlockSAXFunc' type='function'/>
-     <exports symbol='xmlSAXParseFile' type='function'/>
-     <exports symbol='xmlParserInputDeallocate' type='function'/>
-     <exports symbol='xmlCtxtReadIO' type='function'/>
-     <exports symbol='xmlSAXParseMemoryWithData' type='function'/>
-     <exports symbol='xmlGetFeature' type='function'/>
-     <exports symbol='xmlIOParseDTD' type='function'/>
-     <exports symbol='xmlFreeParserCtxt' type='function'/>
-     <exports symbol='xmlParseDTD' type='function'/>
-     <exports symbol='xmlRecoverDoc' type='function'/>
+     <exports symbol='charactersSAXFunc' type='function'/>
      <exports symbol='commentSAXFunc' type='function'/>
@@ -796,14 +760,2 @@
      <exports symbol='commentSAXFunc' type='function'/>
-     <exports symbol='xmlInitParserCtxt' type='function'/>
-     <exports symbol='attributeSAXFunc' type='function'/>
-     <exports symbol='xmlParserInputGrow' type='function'/>
-     <exports symbol='xmlCtxtReadMemory' type='function'/>
-     <exports symbol='externalSubsetSAXFunc' type='function'/>
-     <exports symbol='resolveEntitySAXFunc' type='function'/>
-     <exports symbol='xmlPedanticParserDefault' type='function'/>
-     <exports symbol='xmlSAXParseEntity' type='function'/>
-     <exports symbol='xmlParseDoc' type='function'/>
-     <exports symbol='xmlSAXParseFileWithData' type='function'/>
-     <exports symbol='xmlLineNumbersDefault' type='function'/>
-     <exports symbol='xmlGetExternalEntityLoader' type='function'/>
      <exports symbol='elementDeclSAXFunc' type='function'/>
@@ -809,8 +761,2 @@
      <exports symbol='elementDeclSAXFunc' type='function'/>
-     <exports symbol='xmlCtxtUseOptions' type='function'/>
-     <exports symbol='xmlCreatePushParserCtxt' type='function'/>
-     <exports symbol='xmlParserAddNodeInfo' type='function'/>
-     <exports symbol='xmlCtxtReadFd' type='function'/>
-     <exports symbol='internalSubsetSAXFunc' type='function'/>
-     <exports symbol='xmlNewParserCtxt' type='function'/>
      <exports symbol='endDocumentSAXFunc' type='function'/>
@@ -816,5 +762,9 @@
      <exports symbol='endDocumentSAXFunc' type='function'/>
-     <exports symbol='xmlParseFile' type='function'/>
-     <exports symbol='xmlParseDocument' type='function'/>
-     <exports symbol='setDocumentLocatorSAXFunc' type='function'/>
+     <exports symbol='endElementNsSAX2Func' type='function'/>
+     <exports symbol='endElementSAXFunc' type='function'/>
+     <exports symbol='entityDeclSAXFunc' type='function'/>
+     <exports symbol='errorSAXFunc' type='function'/>
+     <exports symbol='externalSubsetSAXFunc' type='function'/>
+     <exports symbol='fatalErrorSAXFunc' type='function'/>
+     <exports symbol='getEntitySAXFunc' type='function'/>
      <exports symbol='getParameterEntitySAXFunc' type='function'/>
@@ -820,2 +770,4 @@
      <exports symbol='getParameterEntitySAXFunc' type='function'/>
+     <exports symbol='hasExternalSubsetSAXFunc' type='function'/>
+     <exports symbol='hasInternalSubsetSAXFunc' type='function'/>
      <exports symbol='ignorableWhitespaceSAXFunc' type='function'/>
@@ -821,6 +773,14 @@
      <exports symbol='ignorableWhitespaceSAXFunc' type='function'/>
-     <exports symbol='xmlInitNodeInfoSeq' type='function'/>
-     <exports symbol='xmlSubstituteEntitiesDefault' type='function'/>
-     <exports symbol='endElementSAXFunc' type='function'/>
-     <exports symbol='xmlParserFindNodeInfoIndex' type='function'/>
+     <exports symbol='internalSubsetSAXFunc' type='function'/>
+     <exports symbol='isStandaloneSAXFunc' type='function'/>
+     <exports symbol='notationDeclSAXFunc' type='function'/>
+     <exports symbol='processingInstructionSAXFunc' type='function'/>
+     <exports symbol='referenceSAXFunc' type='function'/>
+     <exports symbol='resolveEntitySAXFunc' type='function'/>
+     <exports symbol='setDocumentLocatorSAXFunc' type='function'/>
+     <exports symbol='startDocumentSAXFunc' type='function'/>
+     <exports symbol='startElementNsSAX2Func' type='function'/>
+     <exports symbol='startElementSAXFunc' type='function'/>
+     <exports symbol='unparsedEntityDeclSAXFunc' type='function'/>
+     <exports symbol='warningSAXFunc' type='function'/>
      <exports symbol='xmlByteConsumed' type='function'/>
@@ -826,2 +786,13 @@
      <exports symbol='xmlByteConsumed' type='function'/>
+     <exports symbol='xmlCleanupParser' type='function'/>
+     <exports symbol='xmlClearNodeInfoSeq' type='function'/>
+     <exports symbol='xmlClearParserCtxt' type='function'/>
+     <exports symbol='xmlCreateDocParserCtxt' type='function'/>
+     <exports symbol='xmlCreateIOParserCtxt' type='function'/>
+     <exports symbol='xmlCreatePushParserCtxt' type='function'/>
+     <exports symbol='xmlCtxtReadDoc' type='function'/>
+     <exports symbol='xmlCtxtReadFd' type='function'/>
+     <exports symbol='xmlCtxtReadFile' type='function'/>
+     <exports symbol='xmlCtxtReadIO' type='function'/>
+     <exports symbol='xmlCtxtReadMemory' type='function'/>
      <exports symbol='xmlCtxtReset' type='function'/>
@@ -827,7 +798,9 @@
      <exports symbol='xmlCtxtReset' type='function'/>
-     <exports symbol='xmlSetFeature' type='function'/>
-     <exports symbol='xmlKeepBlanksDefault' type='function'/>
-     <exports symbol='xmlParserInputRead' type='function'/>
-     <exports symbol='xmlReadFile' type='function'/>
+     <exports symbol='xmlCtxtResetPush' type='function'/>
+     <exports symbol='xmlCtxtUseOptions' type='function'/>
+     <exports symbol='xmlExternalEntityLoader' type='function'/>
+     <exports symbol='xmlFreeParserCtxt' type='function'/>
+     <exports symbol='xmlGetExternalEntityLoader' type='function'/>
+     <exports symbol='xmlGetFeature' type='function'/>
      <exports symbol='xmlGetFeaturesList' type='function'/>
      <exports symbol='xmlHasFeature' type='function'/>
@@ -832,7 +805,26 @@
      <exports symbol='xmlGetFeaturesList' type='function'/>
      <exports symbol='xmlHasFeature' type='function'/>
-     <exports symbol='unparsedEntityDeclSAXFunc' type='function'/>
-     <exports symbol='xmlSAXUserParseFile' type='function'/>
-     <exports symbol='fatalErrorSAXFunc' type='function'/>
-     <exports symbol='xmlSAXParseDTD' type='function'/>
+     <exports symbol='xmlIOParseDTD' type='function'/>
+     <exports symbol='xmlInitNodeInfoSeq' type='function'/>
+     <exports symbol='xmlInitParser' type='function'/>
+     <exports symbol='xmlInitParserCtxt' type='function'/>
+     <exports symbol='xmlKeepBlanksDefault' type='function'/>
+     <exports symbol='xmlLineNumbersDefault' type='function'/>
+     <exports symbol='xmlLoadExternalEntity' type='function'/>
+     <exports symbol='xmlNewIOInputStream' type='function'/>
+     <exports symbol='xmlNewParserCtxt' type='function'/>
+     <exports symbol='xmlParseBalancedChunkMemory' type='function'/>
+     <exports symbol='xmlParseBalancedChunkMemoryRecover' type='function'/>
+     <exports symbol='xmlParseChunk' type='function'/>
+     <exports symbol='xmlParseCtxtExternalEntity' type='function'/>
+     <exports symbol='xmlParseDTD' type='function'/>
+     <exports symbol='xmlParseDoc' type='function'/>
+     <exports symbol='xmlParseDocument' type='function'/>
+     <exports symbol='xmlParseEntity' type='function'/>
+     <exports symbol='xmlParseExtParsedEnt' type='function'/>
+     <exports symbol='xmlParseExternalEntity' type='function'/>
+     <exports symbol='xmlParseFile' type='function'/>
+     <exports symbol='xmlParseInNodeContext' type='function'/>
+     <exports symbol='xmlParseMemory' type='function'/>
+     <exports symbol='xmlParserAddNodeInfo' type='function'/>
      <exports symbol='xmlParserFindNodeInfo' type='function'/>
@@ -838,8 +830,7 @@
      <exports symbol='xmlParserFindNodeInfo' type='function'/>
-     <exports symbol='entityDeclSAXFunc' type='function'/>
-     <exports symbol='xmlLoadExternalEntity' type='function'/>
-     <exports symbol='xmlStopParser' type='function'/>
-     <exports symbol='xmlReadFd' type='function'/>
-     <exports symbol='xmlParseExtParsedEnt' type='function'/>
-     <exports symbol='xmlReadIO' type='function'/>
+     <exports symbol='xmlParserFindNodeInfoIndex' type='function'/>
+     <exports symbol='xmlParserInputDeallocate' type='function'/>
+     <exports symbol='xmlParserInputGrow' type='function'/>
+     <exports symbol='xmlParserInputRead' type='function'/>
+     <exports symbol='xmlPedanticParserDefault' type='function'/>
      <exports symbol='xmlReadDoc' type='function'/>
@@ -845,2 +836,17 @@
      <exports symbol='xmlReadDoc' type='function'/>
+     <exports symbol='xmlReadFd' type='function'/>
+     <exports symbol='xmlReadFile' type='function'/>
+     <exports symbol='xmlReadIO' type='function'/>
+     <exports symbol='xmlReadMemory' type='function'/>
+     <exports symbol='xmlRecoverDoc' type='function'/>
+     <exports symbol='xmlRecoverFile' type='function'/>
+     <exports symbol='xmlRecoverMemory' type='function'/>
+     <exports symbol='xmlSAXParseDTD' type='function'/>
+     <exports symbol='xmlSAXParseDoc' type='function'/>
+     <exports symbol='xmlSAXParseEntity' type='function'/>
+     <exports symbol='xmlSAXParseFile' type='function'/>
+     <exports symbol='xmlSAXParseFileWithData' type='function'/>
+     <exports symbol='xmlSAXParseMemory' type='function'/>
+     <exports symbol='xmlSAXParseMemoryWithData' type='function'/>
+     <exports symbol='xmlSAXUserParseFile' type='function'/>
      <exports symbol='xmlSAXUserParseMemory' type='function'/>
@@ -846,12 +852,2 @@
      <exports symbol='xmlSAXUserParseMemory' type='function'/>
-     <exports symbol='xmlParseBalancedChunkMemory' type='function'/>
-     <exports symbol='endElementNsSAX2Func' type='function'/>
-     <exports symbol='xmlCleanupParser' type='function'/>
-     <exports symbol='xmlCtxtResetPush' type='function'/>
-     <exports symbol='isStandaloneSAXFunc' type='function'/>
-     <exports symbol='startDocumentSAXFunc' type='function'/>
-     <exports symbol='xmlClearParserCtxt' type='function'/>
-     <exports symbol='xmlParseExternalEntity' type='function'/>
-     <exports symbol='notationDeclSAXFunc' type='function'/>
-     <exports symbol='warningSAXFunc' type='function'/>
      <exports symbol='xmlSetExternalEntityLoader' type='function'/>
@@ -857,6 +853,10 @@
      <exports symbol='xmlSetExternalEntityLoader' type='function'/>
+     <exports symbol='xmlSetFeature' type='function'/>
+     <exports symbol='xmlSetupParserForBuffer' type='function'/>
+     <exports symbol='xmlStopParser' type='function'/>
+     <exports symbol='xmlSubstituteEntitiesDefault' type='function'/>
     </file>
     <file name='parserInternals'>
      <summary>internals routines and limits exported by the parser.</summary>
      <description>this module exports a number of internal parsing routines they are not really all intended for applications but can prove useful doing low level processing. </description>
      <author>Daniel Veillard </author>
@@ -858,7 +858,10 @@
     </file>
     <file name='parserInternals'>
      <summary>internals routines and limits exported by the parser.</summary>
      <description>this module exports a number of internal parsing routines they are not really all intended for applications but can prove useful doing low level processing. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_SUBSTITUTE_REF' type='macro'/>
+     <exports symbol='INPUT_CHUNK' type='macro'/>
+     <exports symbol='IS_ASCII_DIGIT' type='macro'/>
+     <exports symbol='IS_ASCII_LETTER' type='macro'/>
+     <exports symbol='IS_BASECHAR' type='macro'/>
      <exports symbol='IS_BLANK' type='macro'/>
@@ -864,2 +867,3 @@
      <exports symbol='IS_BLANK' type='macro'/>
+     <exports symbol='IS_BLANK_CH' type='macro'/>
      <exports symbol='IS_BYTE_CHAR' type='macro'/>
@@ -865,4 +869,8 @@
      <exports symbol='IS_BYTE_CHAR' type='macro'/>
-     <exports symbol='IS_PUBIDCHAR' type='macro'/>
+     <exports symbol='IS_CHAR' type='macro'/>
+     <exports symbol='IS_CHAR_CH' type='macro'/>
+     <exports symbol='IS_COMBINING' type='macro'/>
+     <exports symbol='IS_COMBINING_CH' type='macro'/>
+     <exports symbol='IS_DIGIT' type='macro'/>
      <exports symbol='IS_DIGIT_CH' type='macro'/>
      <exports symbol='IS_EXTENDER' type='macro'/>
@@ -867,6 +875,5 @@
      <exports symbol='IS_DIGIT_CH' type='macro'/>
      <exports symbol='IS_EXTENDER' type='macro'/>
-     <exports symbol='IS_ASCII_DIGIT' type='macro'/>
-     <exports symbol='IS_COMBINING_CH' type='macro'/>
-     <exports symbol='IS_CHAR' type='macro'/>
+     <exports symbol='IS_EXTENDER_CH' type='macro'/>
+     <exports symbol='IS_IDEOGRAPHIC' type='macro'/>
      <exports symbol='IS_LETTER' type='macro'/>
@@ -872,3 +879,6 @@
      <exports symbol='IS_LETTER' type='macro'/>
-     <exports symbol='IS_IDEOGRAPHIC' type='macro'/>
+     <exports symbol='IS_LETTER_CH' type='macro'/>
+     <exports symbol='IS_PUBIDCHAR' type='macro'/>
+     <exports symbol='IS_PUBIDCHAR_CH' type='macro'/>
+     <exports symbol='MOVETO_ENDTAG' type='macro'/>
      <exports symbol='MOVETO_STARTTAG' type='macro'/>
@@ -874,8 +884,2 @@
      <exports symbol='MOVETO_STARTTAG' type='macro'/>
-     <exports symbol='XML_MAX_NAME_LENGTH' type='macro'/>
-     <exports symbol='IS_ASCII_LETTER' type='macro'/>
-     <exports symbol='IS_DIGIT' type='macro'/>
-     <exports symbol='XML_MAX_DICTIONARY_LIMIT' type='macro'/>
-     <exports symbol='XML_SUBSTITUTE_PEREF' type='macro'/>
-     <exports symbol='MOVETO_ENDTAG' type='macro'/>
      <exports symbol='SKIP_EOL' type='macro'/>
@@ -881,5 +885,3 @@
      <exports symbol='SKIP_EOL' type='macro'/>
-     <exports symbol='IS_EXTENDER_CH' type='macro'/>
-     <exports symbol='IS_BLANK_CH' type='macro'/>
-     <exports symbol='IS_LETTER_CH' type='macro'/>
+     <exports symbol='XML_MAX_DICTIONARY_LIMIT' type='macro'/>
      <exports symbol='XML_MAX_LOOKUP_LIMIT' type='macro'/>
@@ -885,2 +887,4 @@
      <exports symbol='XML_MAX_LOOKUP_LIMIT' type='macro'/>
+     <exports symbol='XML_MAX_NAMELEN' type='macro'/>
+     <exports symbol='XML_MAX_NAME_LENGTH' type='macro'/>
      <exports symbol='XML_MAX_TEXT_LENGTH' type='macro'/>
@@ -886,2 +890,3 @@
      <exports symbol='XML_MAX_TEXT_LENGTH' type='macro'/>
+     <exports symbol='XML_SUBSTITUTE_BOTH' type='macro'/>
      <exports symbol='XML_SUBSTITUTE_NONE' type='macro'/>
@@ -887,11 +892,6 @@
      <exports symbol='XML_SUBSTITUTE_NONE' type='macro'/>
-     <exports symbol='IS_COMBINING' type='macro'/>
-     <exports symbol='XML_MAX_NAMELEN' type='macro'/>
-     <exports symbol='IS_BASECHAR' type='macro'/>
-     <exports symbol='INPUT_CHUNK' type='macro'/>
-     <exports symbol='IS_PUBIDCHAR_CH' type='macro'/>
-     <exports symbol='IS_CHAR_CH' type='macro'/>
-     <exports symbol='XML_SUBSTITUTE_BOTH' type='macro'/>
-     <exports symbol='xmlStringTextNoenc' type='variable'/>
+     <exports symbol='XML_SUBSTITUTE_PEREF' type='macro'/>
+     <exports symbol='XML_SUBSTITUTE_REF' type='macro'/>
+     <exports symbol='xmlParserMaxDepth' type='variable'/>
      <exports symbol='xmlStringComment' type='variable'/>
      <exports symbol='xmlStringText' type='variable'/>
@@ -896,4 +896,10 @@
      <exports symbol='xmlStringComment' type='variable'/>
      <exports symbol='xmlStringText' type='variable'/>
-     <exports symbol='xmlParserMaxDepth' type='variable'/>
+     <exports symbol='xmlStringTextNoenc' type='variable'/>
+     <exports symbol='htmlCreateFileParserCtxt' type='function'/>
+     <exports symbol='htmlInitAutoClose' type='function'/>
+     <exports symbol='inputPop' type='function'/>
+     <exports symbol='inputPush' type='function'/>
+     <exports symbol='namePop' type='function'/>
+     <exports symbol='namePush' type='function'/>
      <exports symbol='nodePop' type='function'/>
@@ -899,17 +905,19 @@
      <exports symbol='nodePop' type='function'/>
-     <exports symbol='xmlParseNotationDecl' type='function'/>
-     <exports symbol='xmlParseExternalSubset' type='function'/>
-     <exports symbol='xmlParseMisc' type='function'/>
-     <exports symbol='xmlSwitchInputEncoding' type='function'/>
-     <exports symbol='xmlNewStringInputStream' type='function'/>
-     <exports symbol='xmlParseExternalID' type='function'/>
-     <exports symbol='xmlScanName' type='function'/>
-     <exports symbol='xmlParseElementDecl' type='function'/>
-     <exports symbol='xmlParseMarkupDecl' type='function'/>
-     <exports symbol='htmlCreateFileParserCtxt' type='function'/>
-     <exports symbol='inputPush' type='function'/>
-     <exports symbol='xmlStringLenDecodeEntities' type='function'/>
-     <exports symbol='namePop' type='function'/>
-     <exports symbol='xmlParseContent' type='function'/>
-     <exports symbol='xmlNewInputStream' type='function'/>
+     <exports symbol='nodePush' type='function'/>
+     <exports symbol='xmlCheckLanguageID' type='function'/>
+     <exports symbol='xmlCopyChar' type='function'/>
+     <exports symbol='xmlCopyCharMultiByte' type='function'/>
+     <exports symbol='xmlCreateEntityParserCtxt' type='function'/>
+     <exports symbol='xmlCreateFileParserCtxt' type='function'/>
+     <exports symbol='xmlCreateMemoryParserCtxt' type='function'/>
+     <exports symbol='xmlCreateURLParserCtxt' type='function'/>
+     <exports symbol='xmlCurrentChar' type='function'/>
+     <exports symbol='xmlDecodeEntities' type='function'/>
+     <exports symbol='xmlEntityReferenceFunc' type='function'/>
+     <exports symbol='xmlErrMemory' type='function'/>
+     <exports symbol='xmlFreeInputStream' type='function'/>
+     <exports symbol='xmlHandleEntity' type='function'/>
+     <exports symbol='xmlIsLetter' type='function'/>
+     <exports symbol='xmlNamespaceParseNCName' type='function'/>
+     <exports symbol='xmlNamespaceParseNSDef' type='function'/>
      <exports symbol='xmlNamespaceParseQName' type='function'/>
@@ -915,2 +923,3 @@
      <exports symbol='xmlNamespaceParseQName' type='function'/>
+     <exports symbol='xmlNewEntityInputStream' type='function'/>
      <exports symbol='xmlNewInputFromFile' type='function'/>
@@ -916,5 +925,11 @@
      <exports symbol='xmlNewInputFromFile' type='function'/>
-     <exports symbol='xmlParserHandlePEReference' type='function'/>
-     <exports symbol='xmlStringDecodeEntities' type='function'/>
-     <exports symbol='xmlCreateFileParserCtxt' type='function'/>
+     <exports symbol='xmlNewInputStream' type='function'/>
+     <exports symbol='xmlNewStringInputStream' type='function'/>
+     <exports symbol='xmlNextChar' type='function'/>
+     <exports symbol='xmlParseAttValue' type='function'/>
+     <exports symbol='xmlParseAttribute' type='function'/>
+     <exports symbol='xmlParseAttributeListDecl' type='function'/>
+     <exports symbol='xmlParseAttributeType' type='function'/>
+     <exports symbol='xmlParseCDSect' type='function'/>
+     <exports symbol='xmlParseCharData' type='function'/>
      <exports symbol='xmlParseCharRef' type='function'/>
@@ -920,2 +935,6 @@
      <exports symbol='xmlParseCharRef' type='function'/>
+     <exports symbol='xmlParseComment' type='function'/>
+     <exports symbol='xmlParseContent' type='function'/>
+     <exports symbol='xmlParseDefaultDecl' type='function'/>
+     <exports symbol='xmlParseDocTypeDecl' type='function'/>
      <exports symbol='xmlParseElement' type='function'/>
@@ -921,5 +940,2 @@
      <exports symbol='xmlParseElement' type='function'/>
-     <exports symbol='xmlParseTextDecl' type='function'/>
-     <exports symbol='xmlNewEntityInputStream' type='function'/>
-     <exports symbol='xmlCopyCharMultiByte' type='function'/>
      <exports symbol='xmlParseElementChildrenContentDecl' type='function'/>
@@ -925,5 +941,11 @@
      <exports symbol='xmlParseElementChildrenContentDecl' type='function'/>
-     <exports symbol='xmlParseCharData' type='function'/>
-     <exports symbol='xmlParseVersionInfo' type='function'/>
-     <exports symbol='xmlParseSDDecl' type='function'/>
+     <exports symbol='xmlParseElementContentDecl' type='function'/>
+     <exports symbol='xmlParseElementDecl' type='function'/>
+     <exports symbol='xmlParseElementMixedContentDecl' type='function'/>
+     <exports symbol='xmlParseEncName' type='function'/>
+     <exports symbol='xmlParseEncodingDecl' type='function'/>
+     <exports symbol='xmlParseEndTag' type='function'/>
+     <exports symbol='xmlParseEntityDecl' type='function'/>
+     <exports symbol='xmlParseEntityRef' type='function'/>
+     <exports symbol='xmlParseEntityValue' type='function'/>
      <exports symbol='xmlParseEnumeratedType' type='function'/>
@@ -929,5 +951,11 @@
      <exports symbol='xmlParseEnumeratedType' type='function'/>
-     <exports symbol='xmlHandleEntity' type='function'/>
-     <exports symbol='xmlCurrentChar' type='function'/>
-     <exports symbol='xmlSkipBlankChars' type='function'/>
+     <exports symbol='xmlParseEnumerationType' type='function'/>
+     <exports symbol='xmlParseExternalID' type='function'/>
+     <exports symbol='xmlParseExternalSubset' type='function'/>
+     <exports symbol='xmlParseMarkupDecl' type='function'/>
+     <exports symbol='xmlParseMisc' type='function'/>
+     <exports symbol='xmlParseName' type='function'/>
+     <exports symbol='xmlParseNamespace' type='function'/>
+     <exports symbol='xmlParseNmtoken' type='function'/>
+     <exports symbol='xmlParseNotationDecl' type='function'/>
      <exports symbol='xmlParseNotationType' type='function'/>
@@ -933,5 +961,2 @@
      <exports symbol='xmlParseNotationType' type='function'/>
-     <exports symbol='xmlParserInputShrink' type='function'/>
-     <exports symbol='xmlSetEntityReferenceFunc' type='function'/>
-     <exports symbol='xmlFreeInputStream' type='function'/>
      <exports symbol='xmlParsePEReference' type='function'/>
@@ -937,9 +962,9 @@
      <exports symbol='xmlParsePEReference' type='function'/>
-     <exports symbol='xmlCreateURLParserCtxt' type='function'/>
-     <exports symbol='xmlIsLetter' type='function'/>
-     <exports symbol='xmlCheckLanguageID' type='function'/>
-     <exports symbol='xmlNextChar' type='function'/>
-     <exports symbol='xmlParseEnumerationType' type='function'/>
-     <exports symbol='xmlParseAttributeType' type='function'/>
-     <exports symbol='xmlParseDefaultDecl' type='function'/>
+     <exports symbol='xmlParsePI' type='function'/>
+     <exports symbol='xmlParsePITarget' type='function'/>
+     <exports symbol='xmlParsePubidLiteral' type='function'/>
+     <exports symbol='xmlParseQuotedString' type='function'/>
+     <exports symbol='xmlParseReference' type='function'/>
+     <exports symbol='xmlParseSDDecl' type='function'/>
+     <exports symbol='xmlParseStartTag' type='function'/>
      <exports symbol='xmlParseSystemLiteral' type='function'/>
@@ -945,27 +970,5 @@
      <exports symbol='xmlParseSystemLiteral' type='function'/>
-     <exports symbol='xmlParseAttValue' type='function'/>
-     <exports symbol='xmlCreateMemoryParserCtxt' type='function'/>
-     <exports symbol='xmlParseAttributeListDecl' type='function'/>
-     <exports symbol='xmlParseName' type='function'/>
-     <exports symbol='xmlParseEncName' type='function'/>
-     <exports symbol='nodePush' type='function'/>
-     <exports symbol='xmlSwitchEncoding' type='function'/>
-     <exports symbol='xmlSwitchToEncoding' type='function'/>
-     <exports symbol='xmlParseEntityRef' type='function'/>
-     <exports symbol='xmlParseAttribute' type='function'/>
-     <exports symbol='xmlParseEndTag' type='function'/>
-     <exports symbol='xmlParseEncodingDecl' type='function'/>
-     <exports symbol='htmlInitAutoClose' type='function'/>
-     <exports symbol='xmlCreateEntityParserCtxt' type='function'/>
-     <exports symbol='xmlSplitQName' type='function'/>
-     <exports symbol='xmlParserHandleReference' type='function'/>
-     <exports symbol='xmlParsePITarget' type='function'/>
-     <exports symbol='xmlParseElementContentDecl' type='function'/>
-     <exports symbol='inputPop' type='function'/>
-     <exports symbol='xmlPopInput' type='function'/>
-     <exports symbol='xmlParsePubidLiteral' type='function'/>
-     <exports symbol='xmlPushInput' type='function'/>
-     <exports symbol='xmlParseEntityValue' type='function'/>
-     <exports symbol='xmlDecodeEntities' type='function'/>
+     <exports symbol='xmlParseTextDecl' type='function'/>
+     <exports symbol='xmlParseVersionInfo' type='function'/>
      <exports symbol='xmlParseVersionNum' type='function'/>
      <exports symbol='xmlParseXMLDecl' type='function'/>
@@ -970,8 +973,12 @@
      <exports symbol='xmlParseVersionNum' type='function'/>
      <exports symbol='xmlParseXMLDecl' type='function'/>
-     <exports symbol='xmlEntityReferenceFunc' type='function'/>
-     <exports symbol='xmlParseElementMixedContentDecl' type='function'/>
-     <exports symbol='xmlParseQuotedString' type='function'/>
-     <exports symbol='xmlNamespaceParseNSDef' type='function'/>
-     <exports symbol='xmlParseCDSect' type='function'/>
+     <exports symbol='xmlParserHandlePEReference' type='function'/>
+     <exports symbol='xmlParserHandleReference' type='function'/>
+     <exports symbol='xmlParserInputShrink' type='function'/>
+     <exports symbol='xmlPopInput' type='function'/>
+     <exports symbol='xmlPushInput' type='function'/>
+     <exports symbol='xmlScanName' type='function'/>
+     <exports symbol='xmlSetEntityReferenceFunc' type='function'/>
+     <exports symbol='xmlSkipBlankChars' type='function'/>
+     <exports symbol='xmlSplitQName' type='function'/>
      <exports symbol='xmlStringCurrentChar' type='function'/>
@@ -977,19 +984,12 @@
      <exports symbol='xmlStringCurrentChar' type='function'/>
-     <exports symbol='xmlParseComment' type='function'/>
-     <exports symbol='xmlErrMemory' type='function'/>
-     <exports symbol='xmlNamespaceParseNCName' type='function'/>
-     <exports symbol='xmlParseNmtoken' type='function'/>
-     <exports symbol='xmlParseReference' type='function'/>
-     <exports symbol='namePush' type='function'/>
-     <exports symbol='xmlParseNamespace' type='function'/>
-     <exports symbol='xmlCopyChar' type='function'/>
-     <exports symbol='xmlParsePI' type='function'/>
-     <exports symbol='xmlParseDocTypeDecl' type='function'/>
-     <exports symbol='xmlParseStartTag' type='function'/>
-     <exports symbol='xmlParseEntityDecl' type='function'/>
+     <exports symbol='xmlStringDecodeEntities' type='function'/>
+     <exports symbol='xmlStringLenDecodeEntities' type='function'/>
+     <exports symbol='xmlSwitchEncoding' type='function'/>
+     <exports symbol='xmlSwitchInputEncoding' type='function'/>
+     <exports symbol='xmlSwitchToEncoding' type='function'/>
     </file>
     <file name='pattern'>
      <summary>pattern expression handling</summary>
      <description>allows to compile and test pattern expressions for nodes either in a tree or based on a parser state. </description>
      <author>Daniel Veillard </author>
      <exports symbol='XML_PATTERN_DEFAULT' type='enum'/>
@@ -990,8 +990,9 @@
     </file>
     <file name='pattern'>
      <summary>pattern expression handling</summary>
      <description>allows to compile and test pattern expressions for nodes either in a tree or based on a parser state. </description>
      <author>Daniel Veillard </author>
      <exports symbol='XML_PATTERN_DEFAULT' type='enum'/>
+     <exports symbol='XML_PATTERN_XPATH' type='enum'/>
      <exports symbol='XML_PATTERN_XSFIELD' type='enum'/>
      <exports symbol='XML_PATTERN_XSSEL' type='enum'/>
@@ -996,5 +997,4 @@
      <exports symbol='XML_PATTERN_XSFIELD' type='enum'/>
      <exports symbol='XML_PATTERN_XSSEL' type='enum'/>
-     <exports symbol='XML_PATTERN_XPATH' type='enum'/>
-     <exports symbol='xmlStreamCtxtPtr' type='typedef'/>
+     <exports symbol='xmlPattern' type='typedef'/>
      <exports symbol='xmlPatternFlags' type='typedef'/>
@@ -1000,2 +1000,3 @@
      <exports symbol='xmlPatternFlags' type='typedef'/>
+     <exports symbol='xmlPatternPtr' type='typedef'/>
      <exports symbol='xmlStreamCtxt' type='typedef'/>
@@ -1001,4 +1002,10 @@
      <exports symbol='xmlStreamCtxt' type='typedef'/>
-     <exports symbol='xmlPattern' type='typedef'/>
-     <exports symbol='xmlPatternPtr' type='typedef'/>
+     <exports symbol='xmlStreamCtxtPtr' type='typedef'/>
+     <exports symbol='xmlFreePattern' type='function'/>
+     <exports symbol='xmlFreePatternList' type='function'/>
+     <exports symbol='xmlFreeStreamCtxt' type='function'/>
+     <exports symbol='xmlPatternFromRoot' type='function'/>
+     <exports symbol='xmlPatternGetStreamCtxt' type='function'/>
+     <exports symbol='xmlPatternMatch' type='function'/>
+     <exports symbol='xmlPatternMaxDepth' type='function'/>
      <exports symbol='xmlPatternMinDepth' type='function'/>
@@ -1004,5 +1011,2 @@
      <exports symbol='xmlPatternMinDepth' type='function'/>
-     <exports symbol='xmlPatternGetStreamCtxt' type='function'/>
-     <exports symbol='xmlPatternFromRoot' type='function'/>
-     <exports symbol='xmlFreePatternList' type='function'/>
      <exports symbol='xmlPatternStreamable' type='function'/>
@@ -1008,5 +1012,3 @@
      <exports symbol='xmlPatternStreamable' type='function'/>
-     <exports symbol='xmlStreamPushAttr' type='function'/>
-     <exports symbol='xmlPatternMatch' type='function'/>
-     <exports symbol='xmlStreamWantsAnyNode' type='function'/>
+     <exports symbol='xmlPatterncompile' type='function'/>
      <exports symbol='xmlStreamPop' type='function'/>
@@ -1012,3 +1014,2 @@
      <exports symbol='xmlStreamPop' type='function'/>
-     <exports symbol='xmlFreePattern' type='function'/>
      <exports symbol='xmlStreamPush' type='function'/>
@@ -1014,4 +1015,3 @@
      <exports symbol='xmlStreamPush' type='function'/>
-     <exports symbol='xmlPatternMaxDepth' type='function'/>
-     <exports symbol='xmlPatterncompile' type='function'/>
+     <exports symbol='xmlStreamPushAttr' type='function'/>
      <exports symbol='xmlStreamPushNode' type='function'/>
@@ -1017,7 +1017,7 @@
      <exports symbol='xmlStreamPushNode' type='function'/>
-     <exports symbol='xmlFreeStreamCtxt' type='function'/>
+     <exports symbol='xmlStreamWantsAnyNode' type='function'/>
     </file>
     <file name='relaxng'>
      <summary>implementation of the Relax-NG validation</summary>
      <description>implementation of the Relax-NG validation </description>
      <author>Daniel Veillard </author>
@@ -1019,8 +1019,12 @@
     </file>
     <file name='relaxng'>
      <summary>implementation of the Relax-NG validation</summary>
      <description>implementation of the Relax-NG validation </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_RELAXNG_ERR_DUPID' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_VALELEM' type='enum'/>
+     <exports symbol='XML_RELAXNGP_CRNG' type='enum'/>
+     <exports symbol='XML_RELAXNGP_FREE_DOC' type='enum'/>
+     <exports symbol='XML_RELAXNGP_NONE' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ATTREXTRANS' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ATTRNAME' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ATTRNONS' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_ATTRVALID' type='enum'/>
@@ -1026,7 +1030,7 @@
      <exports symbol='XML_RELAXNG_ERR_ATTRVALID' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_LISTELEM' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_LISTEXTRA' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ATTRNONS' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_EXTRADATA' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ELEMNONS' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ATTRWRONGNS' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_CONTENTVALID' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_DATAELEM' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_DATATYPE' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_DUPID' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_ELEMEXTRANS' type='enum'/>
@@ -1032,10 +1036,4 @@
      <exports symbol='XML_RELAXNG_ERR_ELEMEXTRANS' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_DATATYPE' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_TYPECMP' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_VALUE' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_NOGRAMMAR' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_INTERSEQ' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_LACKDATA' type='enum'/>
-     <exports symbol='XML_RELAXNGP_FREE_DOC' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ATTRNAME' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ELEMNAME' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ELEMNONS' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_ELEMNOTEMPTY' type='enum'/>
@@ -1041,5 +1039,4 @@
      <exports symbol='XML_RELAXNG_ERR_ELEMNOTEMPTY' type='enum'/>
-     <exports symbol='XML_RELAXNG_OK' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_INTERNODATA' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ATTRWRONGNS' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ELEMWRONG' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ELEMWRONGNS' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_EXTRACONTENT' type='enum'/>
@@ -1045,21 +1042,4 @@
      <exports symbol='XML_RELAXNG_ERR_EXTRACONTENT' type='enum'/>
-     <exports symbol='XML_RELAXNGP_NONE' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ELEMWRONG' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_LISTEMPTY' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ATTREXTRANS' type='enum'/>
-     <exports symbol='XML_RELAXNGP_CRNG' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_TEXTWRONG' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_INVALIDATTR' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ELEMWRONGNS' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_CONTENTVALID' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_TYPEVAL' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_LIST' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_TYPE' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_NOELEM' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_MEMORY' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ELEMNAME' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_DATAELEM' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_NODEFINE' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_NOSTATE' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_EXTRADATA' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_INTEREXTRA' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_INTERNAL' type='enum'/>
@@ -1064,3 +1044,16 @@
      <exports symbol='XML_RELAXNG_ERR_INTEREXTRA' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_INTERNAL' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_INTERNODATA' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_INTERSEQ' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_INVALIDATTR' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_LACKDATA' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_LIST' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_LISTELEM' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_LISTEMPTY' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_LISTEXTRA' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_MEMORY' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_NODEFINE' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_NOELEM' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_NOGRAMMAR' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_NOSTATE' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_NOTELEM' type='enum'/>
@@ -1066,2 +1059,9 @@
      <exports symbol='XML_RELAXNG_ERR_NOTELEM' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_TEXTWRONG' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_TYPE' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_TYPECMP' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_TYPEVAL' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_VALELEM' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_VALUE' type='enum'/>
+     <exports symbol='XML_RELAXNG_OK' type='enum'/>
      <exports symbol='xmlRelaxNG' type='typedef'/>
@@ -1067,6 +1067,4 @@
      <exports symbol='xmlRelaxNG' type='typedef'/>
-     <exports symbol='xmlRelaxNGPtr' type='typedef'/>
-     <exports symbol='xmlRelaxNGValidErr' type='typedef'/>
      <exports symbol='xmlRelaxNGParserCtxt' type='typedef'/>
      <exports symbol='xmlRelaxNGParserCtxtPtr' type='typedef'/>
      <exports symbol='xmlRelaxNGParserFlag' type='typedef'/>
@@ -1070,5 +1068,6 @@
      <exports symbol='xmlRelaxNGParserCtxt' type='typedef'/>
      <exports symbol='xmlRelaxNGParserCtxtPtr' type='typedef'/>
      <exports symbol='xmlRelaxNGParserFlag' type='typedef'/>
+     <exports symbol='xmlRelaxNGPtr' type='typedef'/>
      <exports symbol='xmlRelaxNGValidCtxt' type='typedef'/>
      <exports symbol='xmlRelaxNGValidCtxtPtr' type='typedef'/>
@@ -1073,11 +1072,5 @@
      <exports symbol='xmlRelaxNGValidCtxt' type='typedef'/>
      <exports symbol='xmlRelaxNGValidCtxtPtr' type='typedef'/>
-     <exports symbol='xmlRelaxNGFreeValidCtxt' type='function'/>
-     <exports symbol='xmlRelaxNGNewDocParserCtxt' type='function'/>
-     <exports symbol='xmlRelaxNGSetValidErrors' type='function'/>
-     <exports symbol='xmlRelaxNGNewParserCtxt' type='function'/>
-     <exports symbol='xmlRelaxNGGetParserErrors' type='function'/>
-     <exports symbol='xmlRelaxNGValidatePopElement' type='function'/>
-     <exports symbol='xmlRelaxNGNewValidCtxt' type='function'/>
-     <exports symbol='xmlRelaxNGNewMemParserCtxt' type='function'/>
+     <exports symbol='xmlRelaxNGValidErr' type='typedef'/>
+     <exports symbol='xmlRelaxNGCleanupTypes' type='function'/>
      <exports symbol='xmlRelaxNGDump' type='function'/>
@@ -1083,8 +1076,3 @@
      <exports symbol='xmlRelaxNGDump' type='function'/>
-     <exports symbol='xmlRelaxNGSetParserErrors' type='function'/>
-     <exports symbol='xmlRelaxNGParse' type='function'/>
-     <exports symbol='xmlRelaxNGSetParserStructuredErrors' type='function'/>
-     <exports symbol='xmlRelaxNGValidateFullElement' type='function'/>
-     <exports symbol='xmlRelaxNGValidityErrorFunc' type='function'/>
-     <exports symbol='xmlRelaxNGValidatePushElement' type='function'/>
+     <exports symbol='xmlRelaxNGDumpTree' type='function'/>
      <exports symbol='xmlRelaxNGFree' type='function'/>
@@ -1090,4 +1078,2 @@
      <exports symbol='xmlRelaxNGFree' type='function'/>
-     <exports symbol='xmlRelaxNGValidateDoc' type='function'/>
-     <exports symbol='xmlRelaxNGSetValidStructuredErrors' type='function'/>
      <exports symbol='xmlRelaxNGFreeParserCtxt' type='function'/>
@@ -1093,3 +1079,5 @@
      <exports symbol='xmlRelaxNGFreeParserCtxt' type='function'/>
+     <exports symbol='xmlRelaxNGFreeValidCtxt' type='function'/>
+     <exports symbol='xmlRelaxNGGetParserErrors' type='function'/>
      <exports symbol='xmlRelaxNGGetValidErrors' type='function'/>
      <exports symbol='xmlRelaxNGInitTypes' type='function'/>
@@ -1094,5 +1082,15 @@
      <exports symbol='xmlRelaxNGGetValidErrors' type='function'/>
      <exports symbol='xmlRelaxNGInitTypes' type='function'/>
-     <exports symbol='xmlRelaxNGDumpTree' type='function'/>
-     <exports symbol='xmlRelaxNGCleanupTypes' type='function'/>
+     <exports symbol='xmlRelaxNGNewDocParserCtxt' type='function'/>
+     <exports symbol='xmlRelaxNGNewMemParserCtxt' type='function'/>
+     <exports symbol='xmlRelaxNGNewParserCtxt' type='function'/>
+     <exports symbol='xmlRelaxNGNewValidCtxt' type='function'/>
+     <exports symbol='xmlRelaxNGParse' type='function'/>
+     <exports symbol='xmlRelaxNGSetParserErrors' type='function'/>
+     <exports symbol='xmlRelaxNGSetParserStructuredErrors' type='function'/>
+     <exports symbol='xmlRelaxNGSetValidErrors' type='function'/>
+     <exports symbol='xmlRelaxNGSetValidStructuredErrors' type='function'/>
+     <exports symbol='xmlRelaxNGValidateDoc' type='function'/>
+     <exports symbol='xmlRelaxNGValidateFullElement' type='function'/>
+     <exports symbol='xmlRelaxNGValidatePopElement' type='function'/>
      <exports symbol='xmlRelaxNGValidatePushCData' type='function'/>
@@ -1098,2 +1096,5 @@
      <exports symbol='xmlRelaxNGValidatePushCData' type='function'/>
+     <exports symbol='xmlRelaxNGValidatePushElement' type='function'/>
+     <exports symbol='xmlRelaxNGValidityErrorFunc' type='function'/>
+     <exports symbol='xmlRelaxNGValidityWarningFunc' type='function'/>
      <exports symbol='xmlRelaxParserSetFlag' type='function'/>
@@ -1099,7 +1100,6 @@
      <exports symbol='xmlRelaxParserSetFlag' type='function'/>
-     <exports symbol='xmlRelaxNGValidityWarningFunc' type='function'/>
     </file>
     <file name='schemasInternals'>
      <summary>internal interfaces for XML Schemas</summary>
      <description>internal interfaces for the XML Schemas handling and schema validity checking The Schemas development is a Work In Progress. Some of those interfaces are not guaranteed to be API or ABI stable ! </description>
      <author>Daniel Veillard </author>
@@ -1101,18 +1101,11 @@
     </file>
     <file name='schemasInternals'>
      <summary>internal interfaces for XML Schemas</summary>
      <description>internal interfaces for the XML Schemas handling and schema validity checking The Schemas development is a Work In Progress. Some of those interfaces are not guaranteed to be API or ABI stable ! </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_FINAL_DEFAULT_EXTENSION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_FIXUP_1' type='macro'/>
-     <exports symbol='XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_CIRCULAR' type='macro'/>
-     <exports symbol='XML_SCHEMAS_QUALIF_ATTR' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTR_USE_REQUIRED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_FACET_COLLAPSE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_VARIETY_UNION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ANYATTR_LAX' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ANYATTR_SKIP' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ANYATTR_STRICT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ANY_LAX' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ANY_SKIP' type='macro'/>
      <exports symbol='XML_SCHEMAS_ANY_STRICT' type='macro'/>
@@ -1118,12 +1111,5 @@
      <exports symbol='XML_SCHEMAS_ANY_STRICT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_INTERNAL_RESOLVED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_QUALIF_ELEM' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_VARIETY_LIST' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_INTERNAL_CHECKED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_INCLUDING_CONVERT_NS' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTR_INTERNAL_RESOLVED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTR_USE_PROHIBITED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_NILLABLE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTRGROUP_GLOBAL' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTRGROUP_HAS_REFS' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTRGROUP_MARKED' type='macro'/>
      <exports symbol='XML_SCHEMAS_ATTRGROUP_REDEFINED' type='macro'/>
@@ -1129,20 +1115,4 @@
      <exports symbol='XML_SCHEMAS_ATTRGROUP_REDEFINED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_BLOCK_DEFAULT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_FINAL_EXTENSION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_REDEFINED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_FIXED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_VARIETY_ATOMIC' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_FINAL_LIST' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTR_USE_OPTIONAL' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTR_NSDEFAULT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_WHITESPACE_REPLACE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_BLOCK_RESTRICTION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ANYATTR_STRICT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_FACET_UNKNOWN' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTRGROUP_MARKED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_FACET_PRESERVE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_BLOCK_EXTENSION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTR_FIXED' type='macro'/>
      <exports symbol='XML_SCHEMAS_ATTR_GLOBAL' type='macro'/>
@@ -1148,9 +1118,23 @@
      <exports symbol='XML_SCHEMAS_ATTR_GLOBAL' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ANYATTR_SKIP' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ANYATTR_LAX' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_GLOBAL' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_ABSTRACT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_MIXED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTR_FIXED' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTR_INTERNAL_RESOLVED' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTR_NSDEFAULT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTR_USE_OPTIONAL' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTR_USE_PROHIBITED' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ATTR_USE_REQUIRED' type='macro'/>
+     <exports symbol='XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_ABSTRACT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_BLOCK_ABSENT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_BLOCK_EXTENSION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_BLOCK_RESTRICTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_CIRCULAR' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_DEFAULT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_FINAL_ABSENT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_FINAL_EXTENSION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_FINAL_RESTRICTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_FIXED' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_GLOBAL' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_INTERNAL_CHECKED' type='macro'/>
      <exports symbol='XML_SCHEMAS_ELEM_INTERNAL_RESOLVED' type='macro'/>
@@ -1156,3 +1140,12 @@
      <exports symbol='XML_SCHEMAS_ELEM_INTERNAL_RESOLVED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ANY_SKIP' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_NILLABLE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_NSDEFAULT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_REF' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_TOPLEVEL' type='macro'/>
+     <exports symbol='XML_SCHEMAS_FACET_COLLAPSE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_FACET_PRESERVE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_FACET_REPLACE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_FACET_UNKNOWN' type='macro'/>
+     <exports symbol='XML_SCHEMAS_FINAL_DEFAULT_EXTENSION' type='macro'/>
      <exports symbol='XML_SCHEMAS_FINAL_DEFAULT_LIST' type='macro'/>
@@ -1158,10 +1151,18 @@
      <exports symbol='XML_SCHEMAS_FINAL_DEFAULT_LIST' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_VARIETY_ABSENT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_FINAL_RESTRICTION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_WILDCARD_COMPLETE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_NSDEFAULT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_GLOBAL' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_TOPLEVEL' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ANY_LAX' type='macro'/>
+     <exports symbol='XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_FINAL_DEFAULT_UNION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_INCLUDING_CONVERT_NS' type='macro'/>
+     <exports symbol='XML_SCHEMAS_QUALIF_ATTR' type='macro'/>
+     <exports symbol='XML_SCHEMAS_QUALIF_ELEM' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_ABSTRACT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_BLOCK_DEFAULT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_BLOCK_EXTENSION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_BLOCK_RESTRICTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_FACETSNEEDVALUE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_FINAL_DEFAULT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_FINAL_EXTENSION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_FINAL_LIST' type='macro'/>
      <exports symbol='XML_SCHEMAS_TYPE_FINAL_RESTRICTION' type='macro'/>
@@ -1167,2 +1168,5 @@
      <exports symbol='XML_SCHEMAS_TYPE_FINAL_RESTRICTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_FINAL_UNION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_FIXUP_1' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_GLOBAL' type='macro'/>
      <exports symbol='XML_SCHEMAS_TYPE_HAS_FACETS' type='macro'/>
@@ -1168,3 +1172,6 @@
      <exports symbol='XML_SCHEMAS_TYPE_HAS_FACETS' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_FINAL_EXTENSION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_INTERNAL_INVALID' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_INTERNAL_RESOLVED' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_MARKED' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_MIXED' type='macro'/>
      <exports symbol='XML_SCHEMAS_TYPE_NORMVALUENEEDED' type='macro'/>
@@ -1170,21 +1177,42 @@
      <exports symbol='XML_SCHEMAS_TYPE_NORMVALUENEEDED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_FINAL_ABSENT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_BLOCK_EXTENSION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_INTERNAL_INVALID' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTRGROUP_HAS_REFS' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_ABSTRACT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_FINAL_UNION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_FINAL_DEFAULT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_FACETSNEEDVALUE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_FINAL_DEFAULT_UNION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_BLOCK_RESTRICTION' type='macro'/>
-     <exports symbol='XML_SCHEMAS_FACET_REPLACE' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_DEFAULT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_TYPE_MARKED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_BLOCK_ABSENT' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ATTRGROUP_GLOBAL' type='macro'/>
-     <exports symbol='XML_SCHEMAS_ELEM_REF' type='macro'/>
-     <exports symbol='XML_SCHEMA_EXTRA_QNAMEREF' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_EXTENSION' type='enum'/>
+     <exports symbol='XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_REDEFINED' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_VARIETY_ABSENT' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_VARIETY_ATOMIC' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_VARIETY_LIST' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_VARIETY_UNION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_TYPE_WHITESPACE_REPLACE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_WILDCARD_COMPLETE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ANYSIMPLETYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ANYTYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ANYURI' type='enum'/>
+     <exports symbol='XML_SCHEMAS_BASE64BINARY' type='enum'/>
+     <exports symbol='XML_SCHEMAS_BOOLEAN' type='enum'/>
+     <exports symbol='XML_SCHEMAS_BYTE' type='enum'/>
+     <exports symbol='XML_SCHEMAS_DATE' type='enum'/>
+     <exports symbol='XML_SCHEMAS_DATETIME' type='enum'/>
+     <exports symbol='XML_SCHEMAS_DECIMAL' type='enum'/>
+     <exports symbol='XML_SCHEMAS_DOUBLE' type='enum'/>
+     <exports symbol='XML_SCHEMAS_DURATION' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ENTITIES' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ENTITY' type='enum'/>
+     <exports symbol='XML_SCHEMAS_FLOAT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_GDAY' type='enum'/>
+     <exports symbol='XML_SCHEMAS_GMONTH' type='enum'/>
+     <exports symbol='XML_SCHEMAS_GMONTHDAY' type='enum'/>
+     <exports symbol='XML_SCHEMAS_GYEAR' type='enum'/>
+     <exports symbol='XML_SCHEMAS_GYEARMONTH' type='enum'/>
+     <exports symbol='XML_SCHEMAS_HEXBINARY' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ID' type='enum'/>
+     <exports symbol='XML_SCHEMAS_IDREF' type='enum'/>
+     <exports symbol='XML_SCHEMAS_IDREFS' type='enum'/>
+     <exports symbol='XML_SCHEMAS_INT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_INTEGER' type='enum'/>
+     <exports symbol='XML_SCHEMAS_LANGUAGE' type='enum'/>
+     <exports symbol='XML_SCHEMAS_LONG' type='enum'/>
+     <exports symbol='XML_SCHEMAS_NAME' type='enum'/>
+     <exports symbol='XML_SCHEMAS_NCNAME' type='enum'/>
+     <exports symbol='XML_SCHEMAS_NINTEGER' type='enum'/>
      <exports symbol='XML_SCHEMAS_NMTOKEN' type='enum'/>
@@ -1190,3 +1218,11 @@
      <exports symbol='XML_SCHEMAS_NMTOKEN' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ID' type='enum'/>
+     <exports symbol='XML_SCHEMAS_NMTOKENS' type='enum'/>
+     <exports symbol='XML_SCHEMAS_NNINTEGER' type='enum'/>
+     <exports symbol='XML_SCHEMAS_NORMSTRING' type='enum'/>
+     <exports symbol='XML_SCHEMAS_NOTATION' type='enum'/>
+     <exports symbol='XML_SCHEMAS_NPINTEGER' type='enum'/>
+     <exports symbol='XML_SCHEMAS_PINTEGER' type='enum'/>
+     <exports symbol='XML_SCHEMAS_QNAME' type='enum'/>
+     <exports symbol='XML_SCHEMAS_SHORT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_STRING' type='enum'/>
      <exports symbol='XML_SCHEMAS_TIME' type='enum'/>
@@ -1192,2 +1228,3 @@
      <exports symbol='XML_SCHEMAS_TIME' type='enum'/>
+     <exports symbol='XML_SCHEMAS_TOKEN' type='enum'/>
      <exports symbol='XML_SCHEMAS_UBYTE' type='enum'/>
@@ -1193,7 +1230,2 @@
      <exports symbol='XML_SCHEMAS_UBYTE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_DATETIME' type='enum'/>
-     <exports symbol='XML_SCHEMAS_NNINTEGER' type='enum'/>
-     <exports symbol='XML_SCHEMAS_HEXBINARY' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_UNION' type='enum'/>
-     <exports symbol='XML_SCHEMAS_UNKNOWN' type='enum'/>
      <exports symbol='XML_SCHEMAS_UINT' type='enum'/>
@@ -1199,5 +1231,2 @@
      <exports symbol='XML_SCHEMAS_UINT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_NPINTEGER' type='enum'/>
-     <exports symbol='XML_SCHEMAS_GMONTHDAY' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_MAXEXCLUSIVE' type='enum'/>
      <exports symbol='XML_SCHEMAS_ULONG' type='enum'/>
@@ -1203,27 +1232,5 @@
      <exports symbol='XML_SCHEMAS_ULONG' type='enum'/>
-     <exports symbol='XML_SCHEMAS_PINTEGER' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_CHOICE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_DECIMAL' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_UR' type='enum'/>
-     <exports symbol='XML_SCHEMAS_DOUBLE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_NINTEGER' type='enum'/>
-     <exports symbol='XML_SCHEMAS_NORMSTRING' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_PARTICLE' type='enum'/>
-     <exports symbol='XML_SCHEMA_CONTENT_MIXED_OR_ELEMENTS' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_SIMPLE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_NCNAME' type='enum'/>
-     <exports symbol='XML_SCHEMAS_LONG' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_ANY_ATTRIBUTE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_BOOLEAN' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ENTITY' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_GROUP' type='enum'/>
-     <exports symbol='XML_SCHEMAS_GYEARMONTH' type='enum'/>
-     <exports symbol='XML_SCHEMAS_BASE64BINARY' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_FRACTIONDIGITS' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_WHITESPACE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_IDREF' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_ATTRIBUTE' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_TOTALDIGITS' type='enum'/>
-     <exports symbol='XML_SCHEMAS_QNAME' type='enum'/>
-     <exports symbol='XML_SCHEMAS_TOKEN' type='enum'/>
+     <exports symbol='XML_SCHEMAS_UNKNOWN' type='enum'/>
+     <exports symbol='XML_SCHEMAS_USHORT' type='enum'/>
+     <exports symbol='XML_SCHEMA_CONTENT_ANY' type='enum'/>
      <exports symbol='XML_SCHEMA_CONTENT_BASIC' type='enum'/>
@@ -1229,7 +1236,2 @@
      <exports symbol='XML_SCHEMA_CONTENT_BASIC' type='enum'/>
-     <exports symbol='XML_SCHEMA_CONTENT_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_ENUMERATION' type='enum'/>
-     <exports symbol='XML_SCHEMA_CONTENT_UNKNOWN' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_MININCLUSIVE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_GMONTH' type='enum'/>
      <exports symbol='XML_SCHEMA_CONTENT_ELEMENTS' type='enum'/>
@@ -1235,3 +1237,7 @@
      <exports symbol='XML_SCHEMA_CONTENT_ELEMENTS' type='enum'/>
-     <exports symbol='XML_SCHEMAS_GYEAR' type='enum'/>
+     <exports symbol='XML_SCHEMA_CONTENT_EMPTY' type='enum'/>
+     <exports symbol='XML_SCHEMA_CONTENT_MIXED' type='enum'/>
+     <exports symbol='XML_SCHEMA_CONTENT_MIXED_OR_ELEMENTS' type='enum'/>
+     <exports symbol='XML_SCHEMA_CONTENT_SIMPLE' type='enum'/>
+     <exports symbol='XML_SCHEMA_CONTENT_UNKNOWN' type='enum'/>
      <exports symbol='XML_SCHEMA_EXTRA_ATTR_USE_PROHIB' type='enum'/>
@@ -1237,6 +1243,7 @@
      <exports symbol='XML_SCHEMA_EXTRA_ATTR_USE_PROHIB' type='enum'/>
-     <exports symbol='XML_SCHEMAS_BYTE' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_ALL' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_IDC_KEYREF' type='enum'/>
-     <exports symbol='XML_SCHEMAS_NOTATION' type='enum'/>
+     <exports symbol='XML_SCHEMA_EXTRA_QNAMEREF' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_ENUMERATION' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_FRACTIONDIGITS' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_LENGTH' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_MAXEXCLUSIVE' type='enum'/>
      <exports symbol='XML_SCHEMA_FACET_MAXINCLUSIVE' type='enum'/>
@@ -1242,15 +1249,6 @@
      <exports symbol='XML_SCHEMA_FACET_MAXINCLUSIVE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_NAME' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_LIST' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_ATTRIBUTE_USE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_GDAY' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_ANY' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ANYURI' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_COMPLEX' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_ATTRIBUTEGROUP' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_BASIC' type='enum'/>
-     <exports symbol='XML_SCHEMAS_IDREFS' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_IDC_UNIQUE' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_LENGTH' type='enum'/>
-     <exports symbol='XML_SCHEMA_CONTENT_SIMPLE' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_MAXLENGTH' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_MINEXCLUSIVE' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_MININCLUSIVE' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_MINLENGTH' type='enum'/>
      <exports symbol='XML_SCHEMA_FACET_PATTERN' type='enum'/>
@@ -1256,12 +1254,13 @@
      <exports symbol='XML_SCHEMA_FACET_PATTERN' type='enum'/>
-     <exports symbol='XML_SCHEMAS_SHORT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_LANGUAGE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ANYSIMPLETYPE' type='enum'/>
-     <exports symbol='XML_SCHEMA_CONTENT_MIXED' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ANYTYPE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_DURATION' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_FACET' type='enum'/>
-     <exports symbol='XML_SCHEMAS_NMTOKENS' type='enum'/>
-     <exports symbol='XML_SCHEMAS_USHORT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_INTEGER' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_TOTALDIGITS' type='enum'/>
+     <exports symbol='XML_SCHEMA_FACET_WHITESPACE' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_ALL' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_ANY' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_ANY_ATTRIBUTE' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_ATTRIBUTE' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_ATTRIBUTEGROUP' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_ATTRIBUTE_USE' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_BASIC' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_CHOICE' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_COMPLEX' type='enum'/>
      <exports symbol='XML_SCHEMA_TYPE_COMPLEX_CONTENT' type='enum'/>
@@ -1267,3 +1266,6 @@
      <exports symbol='XML_SCHEMA_TYPE_COMPLEX_CONTENT' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_MINEXCLUSIVE' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_ELEMENT' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_EXTENSION' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_FACET' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_GROUP' type='enum'/>
      <exports symbol='XML_SCHEMA_TYPE_IDC_KEY' type='enum'/>
@@ -1269,8 +1271,5 @@
      <exports symbol='XML_SCHEMA_TYPE_IDC_KEY' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_SIMPLE_CONTENT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_FLOAT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ENTITIES' type='enum'/>
-     <exports symbol='XML_SCHEMAS_DATE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_STRING' type='enum'/>
-     <exports symbol='XML_SCHEMAS_INT' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_IDC_KEYREF' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_IDC_UNIQUE' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_LIST' type='enum'/>
      <exports symbol='XML_SCHEMA_TYPE_NOTATION' type='enum'/>
@@ -1276,5 +1275,4 @@
      <exports symbol='XML_SCHEMA_TYPE_NOTATION' type='enum'/>
-     <exports symbol='XML_SCHEMA_CONTENT_ANY' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_MINLENGTH' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_PARTICLE' type='enum'/>
      <exports symbol='XML_SCHEMA_TYPE_RESTRICTION' type='enum'/>
      <exports symbol='XML_SCHEMA_TYPE_SEQUENCE' type='enum'/>
@@ -1279,12 +1277,8 @@
      <exports symbol='XML_SCHEMA_TYPE_RESTRICTION' type='enum'/>
      <exports symbol='XML_SCHEMA_TYPE_SEQUENCE' type='enum'/>
-     <exports symbol='XML_SCHEMA_TYPE_ELEMENT' type='enum'/>
-     <exports symbol='XML_SCHEMA_FACET_MAXLENGTH' type='enum'/>
-     <exports symbol='xmlSchemaAttributeGroupPtr' type='typedef'/>
-     <exports symbol='xmlSchemaElementPtr' type='typedef'/>
-     <exports symbol='xmlSchemaFacetLinkPtr' type='typedef'/>
-     <exports symbol='xmlSchemaVal' type='typedef'/>
-     <exports symbol='xmlSchemaAttributeLinkPtr' type='typedef'/>
-     <exports symbol='xmlSchemaType' type='typedef'/>
+     <exports symbol='XML_SCHEMA_TYPE_SIMPLE' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_SIMPLE_CONTENT' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_UNION' type='enum'/>
+     <exports symbol='XML_SCHEMA_TYPE_UR' type='enum'/>
      <exports symbol='xmlSchemaAnnot' type='typedef'/>
      <exports symbol='xmlSchemaAnnotPtr' type='typedef'/>
@@ -1289,3 +1283,10 @@
      <exports symbol='xmlSchemaAnnot' type='typedef'/>
      <exports symbol='xmlSchemaAnnotPtr' type='typedef'/>
+     <exports symbol='xmlSchemaAttribute' type='typedef'/>
+     <exports symbol='xmlSchemaAttributeGroup' type='typedef'/>
+     <exports symbol='xmlSchemaAttributeGroupPtr' type='typedef'/>
+     <exports symbol='xmlSchemaAttributeLink' type='typedef'/>
+     <exports symbol='xmlSchemaAttributeLinkPtr' type='typedef'/>
+     <exports symbol='xmlSchemaAttributePtr' type='typedef'/>
+     <exports symbol='xmlSchemaContentType' type='typedef'/>
      <exports symbol='xmlSchemaElement' type='typedef'/>
@@ -1291,8 +1292,4 @@
      <exports symbol='xmlSchemaElement' type='typedef'/>
-     <exports symbol='xmlSchemaWildcard' type='typedef'/>
-     <exports symbol='xmlSchemaWildcardPtr' type='typedef'/>
-     <exports symbol='xmlSchemaFacetPtr' type='typedef'/>
-     <exports symbol='xmlSchemaTypeLink' type='typedef'/>
-     <exports symbol='xmlSchemaAttributeLink' type='typedef'/>
-     <exports symbol='xmlSchemaValPtr' type='typedef'/>
+     <exports symbol='xmlSchemaElementPtr' type='typedef'/>
+     <exports symbol='xmlSchemaFacet' type='typedef'/>
      <exports symbol='xmlSchemaFacetLink' type='typedef'/>
@@ -1298,10 +1295,4 @@
      <exports symbol='xmlSchemaFacetLink' type='typedef'/>
-     <exports symbol='xmlSchemaWildcardNsPtr' type='typedef'/>
-     <exports symbol='xmlSchemaAttributeGroup' type='typedef'/>
-     <exports symbol='xmlSchemaTypeLinkPtr' type='typedef'/>
-     <exports symbol='xmlSchemaWildcardNs' type='typedef'/>
-     <exports symbol='xmlSchemaAttributePtr' type='typedef'/>
-     <exports symbol='xmlSchemaNotationPtr' type='typedef'/>
-     <exports symbol='xmlSchemaValType' type='typedef'/>
-     <exports symbol='xmlSchemaTypePtr' type='typedef'/>
+     <exports symbol='xmlSchemaFacetLinkPtr' type='typedef'/>
+     <exports symbol='xmlSchemaFacetPtr' type='typedef'/>
      <exports symbol='xmlSchemaNotation' type='typedef'/>
@@ -1307,4 +1298,7 @@
      <exports symbol='xmlSchemaNotation' type='typedef'/>
-     <exports symbol='xmlSchemaFacet' type='typedef'/>
-     <exports symbol='xmlSchemaContentType' type='typedef'/>
+     <exports symbol='xmlSchemaNotationPtr' type='typedef'/>
+     <exports symbol='xmlSchemaType' type='typedef'/>
+     <exports symbol='xmlSchemaTypeLink' type='typedef'/>
+     <exports symbol='xmlSchemaTypeLinkPtr' type='typedef'/>
+     <exports symbol='xmlSchemaTypePtr' type='typedef'/>
      <exports symbol='xmlSchemaTypeType' type='typedef'/>
@@ -1310,5 +1304,11 @@
      <exports symbol='xmlSchemaTypeType' type='typedef'/>
-     <exports symbol='xmlSchemaAttribute' type='typedef'/>
-     <exports symbol='_xmlSchemaWildcardNs' type='struct'/>
-     <exports symbol='_xmlSchemaNotation' type='struct'/>
+     <exports symbol='xmlSchemaVal' type='typedef'/>
+     <exports symbol='xmlSchemaValPtr' type='typedef'/>
+     <exports symbol='xmlSchemaValType' type='typedef'/>
+     <exports symbol='xmlSchemaWildcard' type='typedef'/>
+     <exports symbol='xmlSchemaWildcardNs' type='typedef'/>
+     <exports symbol='xmlSchemaWildcardNsPtr' type='typedef'/>
+     <exports symbol='xmlSchemaWildcardPtr' type='typedef'/>
+     <exports symbol='_xmlSchema' type='struct'/>
+     <exports symbol='_xmlSchemaAnnot' type='struct'/>
      <exports symbol='_xmlSchemaAttribute' type='struct'/>
@@ -1314,3 +1314,2 @@
      <exports symbol='_xmlSchemaAttribute' type='struct'/>
-     <exports symbol='_xmlSchemaType' type='struct'/>
      <exports symbol='_xmlSchemaAttributeGroup' type='struct'/>
@@ -1316,3 +1315,3 @@
      <exports symbol='_xmlSchemaAttributeGroup' type='struct'/>
-     <exports symbol='_xmlSchemaFacetLink' type='struct'/>
+     <exports symbol='_xmlSchemaAttributeLink' type='struct'/>
      <exports symbol='_xmlSchemaElement' type='struct'/>
@@ -1318,4 +1317,2 @@
      <exports symbol='_xmlSchemaElement' type='struct'/>
-     <exports symbol='_xmlSchema' type='struct'/>
-     <exports symbol='_xmlSchemaAttributeLink' type='struct'/>
      <exports symbol='_xmlSchemaFacet' type='struct'/>
@@ -1321,3 +1318,5 @@
      <exports symbol='_xmlSchemaFacet' type='struct'/>
-     <exports symbol='_xmlSchemaWildcard' type='struct'/>
+     <exports symbol='_xmlSchemaFacetLink' type='struct'/>
+     <exports symbol='_xmlSchemaNotation' type='struct'/>
+     <exports symbol='_xmlSchemaType' type='struct'/>
      <exports symbol='_xmlSchemaTypeLink' type='struct'/>
@@ -1323,5 +1322,6 @@
      <exports symbol='_xmlSchemaTypeLink' type='struct'/>
-     <exports symbol='_xmlSchemaAnnot' type='struct'/>
+     <exports symbol='_xmlSchemaWildcard' type='struct'/>
+     <exports symbol='_xmlSchemaWildcardNs' type='struct'/>
      <exports symbol='xmlSchemaFreeType' type='function'/>
      <exports symbol='xmlSchemaFreeWildcard' type='function'/>
     </file>
@@ -1329,5 +1329,5 @@
      <summary>XML Schematron implementation</summary>
      <description>interface to the XML Schematron validity checking. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_SCHEMATRON_OUT_IO' type='enum'/>
+     <exports symbol='XML_SCHEMATRON_OUT_BUFFER' type='enum'/>
      <exports symbol='XML_SCHEMATRON_OUT_ERROR' type='enum'/>
@@ -1333,3 +1333,2 @@
      <exports symbol='XML_SCHEMATRON_OUT_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMATRON_OUT_BUFFER' type='enum'/>
      <exports symbol='XML_SCHEMATRON_OUT_FILE' type='enum'/>
@@ -1335,3 +1334,4 @@
      <exports symbol='XML_SCHEMATRON_OUT_FILE' type='enum'/>
-     <exports symbol='XML_SCHEMATRON_OUT_XML' type='enum'/>
+     <exports symbol='XML_SCHEMATRON_OUT_IO' type='enum'/>
+     <exports symbol='XML_SCHEMATRON_OUT_QUIET' type='enum'/>
      <exports symbol='XML_SCHEMATRON_OUT_TEXT' type='enum'/>
@@ -1337,3 +1337,7 @@
      <exports symbol='XML_SCHEMATRON_OUT_TEXT' type='enum'/>
-     <exports symbol='XML_SCHEMATRON_OUT_QUIET' type='enum'/>
+     <exports symbol='XML_SCHEMATRON_OUT_XML' type='enum'/>
+     <exports symbol='xmlSchematron' type='typedef'/>
+     <exports symbol='xmlSchematronParserCtxt' type='typedef'/>
+     <exports symbol='xmlSchematronParserCtxtPtr' type='typedef'/>
+     <exports symbol='xmlSchematronPtr' type='typedef'/>
      <exports symbol='xmlSchematronValidCtxt' type='typedef'/>
@@ -1339,6 +1343,2 @@
      <exports symbol='xmlSchematronValidCtxt' type='typedef'/>
-     <exports symbol='xmlSchematronValidOptions' type='typedef'/>
-     <exports symbol='xmlSchematronPtr' type='typedef'/>
-     <exports symbol='xmlSchematronParserCtxt' type='typedef'/>
-     <exports symbol='xmlSchematron' type='typedef'/>
      <exports symbol='xmlSchematronValidCtxtPtr' type='typedef'/>
@@ -1344,4 +1344,4 @@
      <exports symbol='xmlSchematronValidCtxtPtr' type='typedef'/>
-     <exports symbol='xmlSchematronParserCtxtPtr' type='typedef'/>
-     <exports symbol='xmlSchematronValidateDoc' type='function'/>
+     <exports symbol='xmlSchematronValidOptions' type='typedef'/>
+     <exports symbol='xmlSchematronFree' type='function'/>
      <exports symbol='xmlSchematronFreeParserCtxt' type='function'/>
@@ -1347,2 +1347,4 @@
      <exports symbol='xmlSchematronFreeParserCtxt' type='function'/>
+     <exports symbol='xmlSchematronFreeValidCtxt' type='function'/>
+     <exports symbol='xmlSchematronNewDocParserCtxt' type='function'/>
      <exports symbol='xmlSchematronNewMemParserCtxt' type='function'/>
@@ -1348,2 +1350,7 @@
      <exports symbol='xmlSchematronNewMemParserCtxt' type='function'/>
+     <exports symbol='xmlSchematronNewParserCtxt' type='function'/>
+     <exports symbol='xmlSchematronNewValidCtxt' type='function'/>
+     <exports symbol='xmlSchematronParse' type='function'/>
+     <exports symbol='xmlSchematronSetValidStructuredErrors' type='function'/>
+     <exports symbol='xmlSchematronValidateDoc' type='function'/>
      <exports symbol='xmlSchematronValidityErrorFunc' type='function'/>
@@ -1349,3 +1356,2 @@
      <exports symbol='xmlSchematronValidityErrorFunc' type='function'/>
-     <exports symbol='xmlSchematronNewParserCtxt' type='function'/>
      <exports symbol='xmlSchematronValidityWarningFunc' type='function'/>
@@ -1351,13 +1357,7 @@
      <exports symbol='xmlSchematronValidityWarningFunc' type='function'/>
-     <exports symbol='xmlSchematronFree' type='function'/>
-     <exports symbol='xmlSchematronSetValidStructuredErrors' type='function'/>
-     <exports symbol='xmlSchematronFreeValidCtxt' type='function'/>
-     <exports symbol='xmlSchematronParse' type='function'/>
-     <exports symbol='xmlSchematronNewDocParserCtxt' type='function'/>
-     <exports symbol='xmlSchematronNewValidCtxt' type='function'/>
     </file>
     <file name='threads'>
      <summary>interfaces for thread handling</summary>
      <description>set of generic threading related routines should work with pthreads, Windows native or TLS threads </description>
      <author>Daniel Veillard </author>
      <exports symbol='xmlMutex' type='typedef'/>
@@ -1358,8 +1358,9 @@
     </file>
     <file name='threads'>
      <summary>interfaces for thread handling</summary>
      <description>set of generic threading related routines should work with pthreads, Windows native or TLS threads </description>
      <author>Daniel Veillard </author>
      <exports symbol='xmlMutex' type='typedef'/>
+     <exports symbol='xmlMutexPtr' type='typedef'/>
      <exports symbol='xmlRMutex' type='typedef'/>
      <exports symbol='xmlRMutexPtr' type='typedef'/>
@@ -1364,7 +1365,3 @@
      <exports symbol='xmlRMutex' type='typedef'/>
      <exports symbol='xmlRMutexPtr' type='typedef'/>
-     <exports symbol='xmlMutexPtr' type='typedef'/>
-     <exports symbol='xmlFreeRMutex' type='function'/>
-     <exports symbol='xmlGetThreadId' type='function'/>
-     <exports symbol='xmlMutexUnlock' type='function'/>
      <exports symbol='xmlCleanupThreads' type='function'/>
@@ -1370,10 +1367,3 @@
      <exports symbol='xmlCleanupThreads' type='function'/>
-     <exports symbol='xmlLockLibrary' type='function'/>
-     <exports symbol='xmlNewRMutex' type='function'/>
-     <exports symbol='xmlMutexLock' type='function'/>
-     <exports symbol='xmlIsMainThread' type='function'/>
-     <exports symbol='xmlRMutexUnlock' type='function'/>
-     <exports symbol='xmlGetGlobalState' type='function'/>
-     <exports symbol='xmlNewMutex' type='function'/>
      <exports symbol='xmlDllMain' type='function'/>
      <exports symbol='xmlFreeMutex' type='function'/>
@@ -1378,4 +1368,6 @@
      <exports symbol='xmlDllMain' type='function'/>
      <exports symbol='xmlFreeMutex' type='function'/>
-     <exports symbol='xmlUnlockLibrary' type='function'/>
+     <exports symbol='xmlFreeRMutex' type='function'/>
+     <exports symbol='xmlGetGlobalState' type='function'/>
+     <exports symbol='xmlGetThreadId' type='function'/>
      <exports symbol='xmlInitThreads' type='function'/>
@@ -1381,2 +1373,8 @@
      <exports symbol='xmlInitThreads' type='function'/>
+     <exports symbol='xmlIsMainThread' type='function'/>
+     <exports symbol='xmlLockLibrary' type='function'/>
+     <exports symbol='xmlMutexLock' type='function'/>
+     <exports symbol='xmlMutexUnlock' type='function'/>
+     <exports symbol='xmlNewMutex' type='function'/>
+     <exports symbol='xmlNewRMutex' type='function'/>
      <exports symbol='xmlRMutexLock' type='function'/>
@@ -1382,6 +1380,8 @@
      <exports symbol='xmlRMutexLock' type='function'/>
+     <exports symbol='xmlRMutexUnlock' type='function'/>
+     <exports symbol='xmlUnlockLibrary' type='function'/>
     </file>
     <file name='tree'>
      <summary>interfaces for tree manipulation</summary>
      <description>this module describes the structures found in an tree resulting from an XML or HTML parsing, as well as the API provided for various processing on that tree </description>
      <author>Daniel Veillard </author>
@@ -1383,7 +1383,8 @@
     </file>
     <file name='tree'>
      <summary>interfaces for tree manipulation</summary>
      <description>this module describes the structures found in an tree resulting from an XML or HTML parsing, as well as the API provided for various processing on that tree </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_LOCAL_NAMESPACE' type='macro'/>
+     <exports symbol='BASE_BUFFER_SIZE' type='macro'/>
+     <exports symbol='LIBXML2_NEW_BUFFER' type='macro'/>
      <exports symbol='XML_DOCB_DOCUMENT_NODE' type='macro'/>
@@ -1389,6 +1390,2 @@
      <exports symbol='XML_DOCB_DOCUMENT_NODE' type='macro'/>
-     <exports symbol='BASE_BUFFER_SIZE' type='macro'/>
-     <exports symbol='XML_XML_ID' type='macro'/>
-     <exports symbol='xmlRootNode' type='macro'/>
-     <exports symbol='XML_GET_LINE' type='macro'/>
      <exports symbol='XML_GET_CONTENT' type='macro'/>
@@ -1394,3 +1391,5 @@
      <exports symbol='XML_GET_CONTENT' type='macro'/>
-     <exports symbol='xmlChildrenNode' type='macro'/>
+     <exports symbol='XML_GET_LINE' type='macro'/>
+     <exports symbol='XML_LOCAL_NAMESPACE' type='macro'/>
+     <exports symbol='XML_XML_ID' type='macro'/>
      <exports symbol='XML_XML_NAMESPACE' type='macro'/>
@@ -1396,6 +1395,12 @@
      <exports symbol='XML_XML_NAMESPACE' type='macro'/>
-     <exports symbol='LIBXML2_NEW_BUFFER' type='macro'/>
-     <exports symbol='XML_ATTRIBUTE_IMPLIED' type='enum'/>
-     <exports symbol='XML_ELEMENT_CONTENT_ELEMENT' type='enum'/>
-     <exports symbol='XML_ENTITY_REF_NODE' type='enum'/>
+     <exports symbol='xmlChildrenNode' type='macro'/>
+     <exports symbol='xmlRootNode' type='macro'/>
+     <exports symbol='XML_ATTRIBUTE_CDATA' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_DECL' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_ENTITIES' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_ENTITY' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_ENUMERATION' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_FIXED' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_ID' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_IDREF' type='enum'/>
      <exports symbol='XML_ATTRIBUTE_IDREFS' type='enum'/>
@@ -1401,5 +1406,4 @@
      <exports symbol='XML_ATTRIBUTE_IDREFS' type='enum'/>
-     <exports symbol='XML_BUFFER_ALLOC_DOUBLEIT' type='enum'/>
-     <exports symbol='XML_XINCLUDE_END' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_NODE' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_IMPLIED' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_NMTOKEN' type='enum'/>
      <exports symbol='XML_ATTRIBUTE_NMTOKENS' type='enum'/>
@@ -1405,5 +1409,12 @@
      <exports symbol='XML_ATTRIBUTE_NMTOKENS' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_IDREF' type='enum'/>
-     <exports symbol='XML_ELEMENT_TYPE_ELEMENT' type='enum'/>
-     <exports symbol='XML_TEXT_NODE' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_NODE' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_NONE' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_NOTATION' type='enum'/>
+     <exports symbol='XML_ATTRIBUTE_REQUIRED' type='enum'/>
+     <exports symbol='XML_BUFFER_ALLOC_BOUNDED' type='enum'/>
+     <exports symbol='XML_BUFFER_ALLOC_DOUBLEIT' type='enum'/>
+     <exports symbol='XML_BUFFER_ALLOC_EXACT' type='enum'/>
+     <exports symbol='XML_BUFFER_ALLOC_HYBRID' type='enum'/>
+     <exports symbol='XML_BUFFER_ALLOC_IMMUTABLE' type='enum'/>
+     <exports symbol='XML_BUFFER_ALLOC_IO' type='enum'/>
      <exports symbol='XML_CDATA_SECTION_NODE' type='enum'/>
@@ -1409,7 +1420,3 @@
      <exports symbol='XML_CDATA_SECTION_NODE' type='enum'/>
-     <exports symbol='XML_ELEMENT_NODE' type='enum'/>
-     <exports symbol='XML_ELEMENT_DECL' type='enum'/>
-     <exports symbol='XML_DOC_USERBUILT' type='enum'/>
-     <exports symbol='XML_DOC_INTERNAL' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_REQUIRED' type='enum'/>
+     <exports symbol='XML_COMMENT_NODE' type='enum'/>
      <exports symbol='XML_DOCUMENT_FRAG_NODE' type='enum'/>
@@ -1415,2 +1422,4 @@
      <exports symbol='XML_DOCUMENT_FRAG_NODE' type='enum'/>
+     <exports symbol='XML_DOCUMENT_NODE' type='enum'/>
+     <exports symbol='XML_DOCUMENT_TYPE_NODE' type='enum'/>
      <exports symbol='XML_DOC_DTDVALID' type='enum'/>
@@ -1416,3 +1425,4 @@
      <exports symbol='XML_DOC_DTDVALID' type='enum'/>
-     <exports symbol='XML_ELEMENT_TYPE_ANY' type='enum'/>
+     <exports symbol='XML_DOC_HTML' type='enum'/>
+     <exports symbol='XML_DOC_INTERNAL' type='enum'/>
      <exports symbol='XML_DOC_NSVALID' type='enum'/>
@@ -1418,13 +1428,5 @@
      <exports symbol='XML_DOC_NSVALID' type='enum'/>
-     <exports symbol='XML_BUFFER_ALLOC_BOUNDED' type='enum'/>
-     <exports symbol='XML_ELEMENT_CONTENT_PCDATA' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_FIXED' type='enum'/>
-     <exports symbol='XML_DOCUMENT_TYPE_NODE' type='enum'/>
-     <exports symbol='XML_DOC_HTML' type='enum'/>
-     <exports symbol='XML_ELEMENT_CONTENT_ONCE' type='enum'/>
-     <exports symbol='XML_NAMESPACE_DECL' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_NOTATION' type='enum'/>
-     <exports symbol='XML_ELEMENT_TYPE_MIXED' type='enum'/>
-     <exports symbol='XML_XINCLUDE_START' type='enum'/>
-     <exports symbol='XML_BUFFER_ALLOC_HYBRID' type='enum'/>
+     <exports symbol='XML_DOC_OLD10' type='enum'/>
+     <exports symbol='XML_DOC_USERBUILT' type='enum'/>
+     <exports symbol='XML_DOC_WELLFORMED' type='enum'/>
      <exports symbol='XML_DOC_XINCLUDE' type='enum'/>
@@ -1430,16 +1432,2 @@
      <exports symbol='XML_DOC_XINCLUDE' type='enum'/>
-     <exports symbol='XML_BUFFER_ALLOC_EXACT' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_ENTITIES' type='enum'/>
-     <exports symbol='XML_BUFFER_ALLOC_IMMUTABLE' type='enum'/>
-     <exports symbol='XML_NOTATION_NODE' type='enum'/>
-     <exports symbol='XML_ELEMENT_CONTENT_SEQ' type='enum'/>
-     <exports symbol='XML_ELEMENT_TYPE_EMPTY' type='enum'/>
-     <exports symbol='XML_ELEMENT_CONTENT_OPT' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_ENUMERATION' type='enum'/>
-     <exports symbol='XML_DOC_OLD10' type='enum'/>
-     <exports symbol='XML_HTML_DOCUMENT_NODE' type='enum'/>
-     <exports symbol='XML_ELEMENT_TYPE_UNDEFINED' type='enum'/>
-     <exports symbol='XML_DOCUMENT_NODE' type='enum'/>
-     <exports symbol='XML_COMMENT_NODE' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_NONE' type='enum'/>
      <exports symbol='XML_DTD_NODE' type='enum'/>
@@ -1445,2 +1433,6 @@
      <exports symbol='XML_DTD_NODE' type='enum'/>
+     <exports symbol='XML_ELEMENT_CONTENT_ELEMENT' type='enum'/>
+     <exports symbol='XML_ELEMENT_CONTENT_MULT' type='enum'/>
+     <exports symbol='XML_ELEMENT_CONTENT_ONCE' type='enum'/>
+     <exports symbol='XML_ELEMENT_CONTENT_OPT' type='enum'/>
      <exports symbol='XML_ELEMENT_CONTENT_OR' type='enum'/>
@@ -1446,13 +1438,3 @@
      <exports symbol='XML_ELEMENT_CONTENT_OR' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_NMTOKEN' type='enum'/>
-     <exports symbol='XML_PI_NODE' type='enum'/>
-     <exports symbol='XML_BUFFER_ALLOC_IO' type='enum'/>
-     <exports symbol='XML_ENTITY_NODE' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_ENTITY' type='enum'/>
-     <exports symbol='XML_DOC_WELLFORMED' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_DECL' type='enum'/>
-     <exports symbol='XML_ENTITY_DECL' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_ID' type='enum'/>
-     <exports symbol='XML_ATTRIBUTE_CDATA' type='enum'/>
-     <exports symbol='XML_ELEMENT_CONTENT_MULT' type='enum'/>
+     <exports symbol='XML_ELEMENT_CONTENT_PCDATA' type='enum'/>
      <exports symbol='XML_ELEMENT_CONTENT_PLUS' type='enum'/>
@@ -1458,5 +1440,28 @@
      <exports symbol='XML_ELEMENT_CONTENT_PLUS' type='enum'/>
-     <exports symbol='xmlNs' type='typedef'/>
-     <exports symbol='xmlElementContent' type='typedef'/>
-     <exports symbol='xmlEnumerationPtr' type='typedef'/>
+     <exports symbol='XML_ELEMENT_CONTENT_SEQ' type='enum'/>
+     <exports symbol='XML_ELEMENT_DECL' type='enum'/>
+     <exports symbol='XML_ELEMENT_NODE' type='enum'/>
+     <exports symbol='XML_ELEMENT_TYPE_ANY' type='enum'/>
+     <exports symbol='XML_ELEMENT_TYPE_ELEMENT' type='enum'/>
+     <exports symbol='XML_ELEMENT_TYPE_EMPTY' type='enum'/>
+     <exports symbol='XML_ELEMENT_TYPE_MIXED' type='enum'/>
+     <exports symbol='XML_ELEMENT_TYPE_UNDEFINED' type='enum'/>
+     <exports symbol='XML_ENTITY_DECL' type='enum'/>
+     <exports symbol='XML_ENTITY_NODE' type='enum'/>
+     <exports symbol='XML_ENTITY_REF_NODE' type='enum'/>
+     <exports symbol='XML_HTML_DOCUMENT_NODE' type='enum'/>
+     <exports symbol='XML_NAMESPACE_DECL' type='enum'/>
+     <exports symbol='XML_NOTATION_NODE' type='enum'/>
+     <exports symbol='XML_PI_NODE' type='enum'/>
+     <exports symbol='XML_TEXT_NODE' type='enum'/>
+     <exports symbol='XML_XINCLUDE_END' type='enum'/>
+     <exports symbol='XML_XINCLUDE_START' type='enum'/>
+     <exports symbol='xmlAttr' type='typedef'/>
+     <exports symbol='xmlAttrPtr' type='typedef'/>
+     <exports symbol='xmlAttribute' type='typedef'/>
+     <exports symbol='xmlAttributeDefault' type='typedef'/>
+     <exports symbol='xmlAttributePtr' type='typedef'/>
+     <exports symbol='xmlAttributeType' type='typedef'/>
+     <exports symbol='xmlBuf' type='typedef'/>
+     <exports symbol='xmlBufPtr' type='typedef'/>
      <exports symbol='xmlBuffer' type='typedef'/>
@@ -1462,7 +1467,2 @@
      <exports symbol='xmlBuffer' type='typedef'/>
-     <exports symbol='xmlParserInputPtr' type='typedef'/>
-     <exports symbol='xmlSAXLocatorPtr' type='typedef'/>
-     <exports symbol='xmlParserInput' type='typedef'/>
-     <exports symbol='xmlElement' type='typedef'/>
-     <exports symbol='xmlNsType' type='typedef'/>
      <exports symbol='xmlBufferAllocationScheme' type='typedef'/>
@@ -1468,4 +1468,2 @@
      <exports symbol='xmlBufferAllocationScheme' type='typedef'/>
-     <exports symbol='xmlNode' type='typedef'/>
-     <exports symbol='xmlDocPtr' type='typedef'/>
      <exports symbol='xmlBufferPtr' type='typedef'/>
@@ -1471,2 +1469,3 @@
      <exports symbol='xmlBufferPtr' type='typedef'/>
+     <exports symbol='xmlDOMWrapCtxt' type='typedef'/>
      <exports symbol='xmlDOMWrapCtxtPtr' type='typedef'/>
@@ -1472,8 +1471,6 @@
      <exports symbol='xmlDOMWrapCtxtPtr' type='typedef'/>
-     <exports symbol='xmlRefPtr' type='typedef'/>
-     <exports symbol='xmlParserInputBuffer' type='typedef'/>
-     <exports symbol='xmlRef' type='typedef'/>
-     <exports symbol='xmlDOMWrapCtxt' type='typedef'/>
-     <exports symbol='xmlNodePtr' type='typedef'/>
-     <exports symbol='xmlParserCtxt' type='typedef'/>
+     <exports symbol='xmlDoc' type='typedef'/>
+     <exports symbol='xmlDocProperties' type='typedef'/>
+     <exports symbol='xmlDocPtr' type='typedef'/>
+     <exports symbol='xmlDtd' type='typedef'/>
      <exports symbol='xmlDtdPtr' type='typedef'/>
@@ -1479,13 +1476,4 @@
      <exports symbol='xmlDtdPtr' type='typedef'/>
-     <exports symbol='xmlAttributeDefault' type='typedef'/>
-     <exports symbol='xmlBuf' type='typedef'/>
-     <exports symbol='xmlNotation' type='typedef'/>
-     <exports symbol='xmlElementType' type='typedef'/>
-     <exports symbol='xmlEntity' type='typedef'/>
-     <exports symbol='xmlAttr' type='typedef'/>
-     <exports symbol='xmlAttributePtr' type='typedef'/>
-     <exports symbol='xmlElementTypeVal' type='typedef'/>
-     <exports symbol='xmlNotationPtr' type='typedef'/>
-     <exports symbol='xmlElementPtr' type='typedef'/>
-     <exports symbol='xmlBufPtr' type='typedef'/>
+     <exports symbol='xmlElement' type='typedef'/>
+     <exports symbol='xmlElementContent' type='typedef'/>
      <exports symbol='xmlElementContentOccur' type='typedef'/>
@@ -1491,15 +1479,3 @@
      <exports symbol='xmlElementContentOccur' type='typedef'/>
-     <exports symbol='xmlAttrPtr' type='typedef'/>
-     <exports symbol='xmlDoc' type='typedef'/>
-     <exports symbol='xmlID' type='typedef'/>
-     <exports symbol='xmlParserCtxtPtr' type='typedef'/>
-     <exports symbol='xmlEntityPtr' type='typedef'/>
-     <exports symbol='xmlEnumeration' type='typedef'/>
-     <exports symbol='xmlAttributeType' type='typedef'/>
-     <exports symbol='xmlNsPtr' type='typedef'/>
-     <exports symbol='xmlParserInputBufferPtr' type='typedef'/>
-     <exports symbol='xmlSAXHandler' type='typedef'/>
-     <exports symbol='xmlOutputBuffer' type='typedef'/>
-     <exports symbol='xmlSAXLocator' type='typedef'/>
      <exports symbol='xmlElementContentPtr' type='typedef'/>
      <exports symbol='xmlElementContentType' type='typedef'/>
@@ -1504,4 +1480,11 @@
      <exports symbol='xmlElementContentPtr' type='typedef'/>
      <exports symbol='xmlElementContentType' type='typedef'/>
-     <exports symbol='xmlDocProperties' type='typedef'/>
+     <exports symbol='xmlElementPtr' type='typedef'/>
+     <exports symbol='xmlElementType' type='typedef'/>
+     <exports symbol='xmlElementTypeVal' type='typedef'/>
+     <exports symbol='xmlEntity' type='typedef'/>
+     <exports symbol='xmlEntityPtr' type='typedef'/>
+     <exports symbol='xmlEnumeration' type='typedef'/>
+     <exports symbol='xmlEnumerationPtr' type='typedef'/>
+     <exports symbol='xmlID' type='typedef'/>
      <exports symbol='xmlIDPtr' type='typedef'/>
@@ -1507,4 +1490,10 @@
      <exports symbol='xmlIDPtr' type='typedef'/>
-     <exports symbol='xmlDtd' type='typedef'/>
-     <exports symbol='xmlAttribute' type='typedef'/>
+     <exports symbol='xmlNode' type='typedef'/>
+     <exports symbol='xmlNodePtr' type='typedef'/>
+     <exports symbol='xmlNotation' type='typedef'/>
+     <exports symbol='xmlNotationPtr' type='typedef'/>
+     <exports symbol='xmlNs' type='typedef'/>
+     <exports symbol='xmlNsPtr' type='typedef'/>
+     <exports symbol='xmlNsType' type='typedef'/>
+     <exports symbol='xmlOutputBuffer' type='typedef'/>
      <exports symbol='xmlOutputBufferPtr' type='typedef'/>
@@ -1510,2 +1499,11 @@
      <exports symbol='xmlOutputBufferPtr' type='typedef'/>
+     <exports symbol='xmlParserCtxt' type='typedef'/>
+     <exports symbol='xmlParserCtxtPtr' type='typedef'/>
+     <exports symbol='xmlParserInput' type='typedef'/>
+     <exports symbol='xmlParserInputBuffer' type='typedef'/>
+     <exports symbol='xmlParserInputBufferPtr' type='typedef'/>
+     <exports symbol='xmlParserInputPtr' type='typedef'/>
+     <exports symbol='xmlRef' type='typedef'/>
+     <exports symbol='xmlRefPtr' type='typedef'/>
+     <exports symbol='xmlSAXHandler' type='typedef'/>
      <exports symbol='xmlSAXHandlerPtr' type='typedef'/>
@@ -1511,2 +1509,6 @@
      <exports symbol='xmlSAXHandlerPtr' type='typedef'/>
+     <exports symbol='xmlSAXLocator' type='typedef'/>
+     <exports symbol='xmlSAXLocatorPtr' type='typedef'/>
+     <exports symbol='_xmlAttr' type='struct'/>
+     <exports symbol='_xmlAttribute' type='struct'/>
      <exports symbol='_xmlBuffer' type='struct'/>
@@ -1512,3 +1514,7 @@
      <exports symbol='_xmlBuffer' type='struct'/>
-     <exports symbol='_xmlAttribute' type='struct'/>
+     <exports symbol='_xmlDOMWrapCtxt' type='struct'/>
+     <exports symbol='_xmlDoc' type='struct'/>
+     <exports symbol='_xmlDtd' type='struct'/>
+     <exports symbol='_xmlElement' type='struct'/>
+     <exports symbol='_xmlElementContent' type='struct'/>
      <exports symbol='_xmlEnumeration' type='struct'/>
@@ -1514,2 +1520,5 @@
      <exports symbol='_xmlEnumeration' type='struct'/>
+     <exports symbol='_xmlID' type='struct'/>
+     <exports symbol='_xmlNode' type='struct'/>
+     <exports symbol='_xmlNotation' type='struct'/>
      <exports symbol='_xmlNs' type='struct'/>
@@ -1515,8 +1524,2 @@
      <exports symbol='_xmlNs' type='struct'/>
-     <exports symbol='_xmlNode' type='struct'/>
-     <exports symbol='_xmlDoc' type='struct'/>
-     <exports symbol='_xmlElement' type='struct'/>
-     <exports symbol='_xmlID' type='struct'/>
-     <exports symbol='_xmlNotation' type='struct'/>
-     <exports symbol='_xmlDtd' type='struct'/>
      <exports symbol='_xmlRef' type='struct'/>
@@ -1522,5 +1525,52 @@
      <exports symbol='_xmlRef' type='struct'/>
-     <exports symbol='_xmlAttr' type='struct'/>
-     <exports symbol='_xmlDOMWrapCtxt' type='struct'/>
-     <exports symbol='_xmlElementContent' type='struct'/>
+     <exports symbol='xmlAddChild' type='function'/>
+     <exports symbol='xmlAddChildList' type='function'/>
+     <exports symbol='xmlAddNextSibling' type='function'/>
+     <exports symbol='xmlAddPrevSibling' type='function'/>
+     <exports symbol='xmlAddSibling' type='function'/>
+     <exports symbol='xmlAttrSerializeTxtContent' type='function'/>
+     <exports symbol='xmlBufContent' type='function'/>
+     <exports symbol='xmlBufEnd' type='function'/>
+     <exports symbol='xmlBufGetNodeContent' type='function'/>
+     <exports symbol='xmlBufNodeDump' type='function'/>
+     <exports symbol='xmlBufShrink' type='function'/>
+     <exports symbol='xmlBufUse' type='function'/>
+     <exports symbol='xmlBufferAdd' type='function'/>
+     <exports symbol='xmlBufferAddHead' type='function'/>
+     <exports symbol='xmlBufferCCat' type='function'/>
+     <exports symbol='xmlBufferCat' type='function'/>
+     <exports symbol='xmlBufferContent' type='function'/>
+     <exports symbol='xmlBufferCreate' type='function'/>
+     <exports symbol='xmlBufferCreateSize' type='function'/>
+     <exports symbol='xmlBufferCreateStatic' type='function'/>
+     <exports symbol='xmlBufferDetach' type='function'/>
+     <exports symbol='xmlBufferDump' type='function'/>
+     <exports symbol='xmlBufferEmpty' type='function'/>
+     <exports symbol='xmlBufferFree' type='function'/>
+     <exports symbol='xmlBufferGrow' type='function'/>
+     <exports symbol='xmlBufferLength' type='function'/>
+     <exports symbol='xmlBufferResize' type='function'/>
+     <exports symbol='xmlBufferSetAllocationScheme' type='function'/>
+     <exports symbol='xmlBufferShrink' type='function'/>
+     <exports symbol='xmlBufferWriteCHAR' type='function'/>
+     <exports symbol='xmlBufferWriteChar' type='function'/>
+     <exports symbol='xmlBufferWriteQuotedString' type='function'/>
+     <exports symbol='xmlBuildQName' type='function'/>
+     <exports symbol='xmlChildElementCount' type='function'/>
+     <exports symbol='xmlCopyDoc' type='function'/>
+     <exports symbol='xmlCopyDtd' type='function'/>
+     <exports symbol='xmlCopyNamespace' type='function'/>
+     <exports symbol='xmlCopyNamespaceList' type='function'/>
+     <exports symbol='xmlCopyNode' type='function'/>
+     <exports symbol='xmlCopyNodeList' type='function'/>
+     <exports symbol='xmlCopyProp' type='function'/>
+     <exports symbol='xmlCopyPropList' type='function'/>
+     <exports symbol='xmlCreateIntSubset' type='function'/>
+     <exports symbol='xmlDOMWrapAcquireNsFunction' type='function'/>
+     <exports symbol='xmlDOMWrapAdoptNode' type='function'/>
+     <exports symbol='xmlDOMWrapCloneNode' type='function'/>
+     <exports symbol='xmlDOMWrapFreeCtxt' type='function'/>
+     <exports symbol='xmlDOMWrapNewCtxt' type='function'/>
+     <exports symbol='xmlDOMWrapReconcileNamespaces' type='function'/>
+     <exports symbol='xmlDOMWrapRemoveNode' type='function'/>
      <exports symbol='xmlDocCopyNode' type='function'/>
@@ -1526,25 +1576,5 @@
      <exports symbol='xmlDocCopyNode' type='function'/>
-     <exports symbol='xmlNewDocRawNode' type='function'/>
-     <exports symbol='xmlBufContent' type='function'/>
-     <exports symbol='xmlNewNsPropEatName' type='function'/>
-     <exports symbol='xmlStringGetNodeList' type='function'/>
-     <exports symbol='xmlNewCDataBlock' type='function'/>
-     <exports symbol='xmlBufferWriteCHAR' type='function'/>
-     <exports symbol='xmlNodeGetBase' type='function'/>
-     <exports symbol='xmlBufferEmpty' type='function'/>
-     <exports symbol='xmlBuildQName' type='function'/>
-     <exports symbol='xmlValidateNMToken' type='function'/>
-     <exports symbol='xmlSaveFormatFileEnc' type='function'/>
-     <exports symbol='xmlAddSibling' type='function'/>
-     <exports symbol='xmlBufferCreate' type='function'/>
-     <exports symbol='xmlNewDocFragment' type='function'/>
-     <exports symbol='xmlDocGetRootElement' type='function'/>
-     <exports symbol='xmlGetProp' type='function'/>
-     <exports symbol='xmlValidateName' type='function'/>
-     <exports symbol='xmlBufEnd' type='function'/>
-     <exports symbol='xmlValidateQName' type='function'/>
-     <exports symbol='xmlHasNsProp' type='function'/>
-     <exports symbol='xmlAddPrevSibling' type='function'/>
-     <exports symbol='xmlBufferAddHead' type='function'/>
-     <exports symbol='xmlNewPI' type='function'/>
+     <exports symbol='xmlDocCopyNodeList' type='function'/>
+     <exports symbol='xmlDocDump' type='function'/>
+     <exports symbol='xmlDocDumpFormatMemory' type='function'/>
      <exports symbol='xmlDocDumpFormatMemoryEnc' type='function'/>
@@ -1550,47 +1580,3 @@
      <exports symbol='xmlDocDumpFormatMemoryEnc' type='function'/>
-     <exports symbol='xmlSetProp' type='function'/>
-     <exports symbol='xmlChildElementCount' type='function'/>
-     <exports symbol='xmlElemDump' type='function'/>
-     <exports symbol='xmlSaveFormatFileTo' type='function'/>
-     <exports symbol='xmlGetIntSubset' type='function'/>
-     <exports symbol='xmlNodeBufGetContent' type='function'/>
-     <exports symbol='xmlNextElementSibling' type='function'/>
-     <exports symbol='xmlBufferWriteChar' type='function'/>
-     <exports symbol='xmlBufferFree' type='function'/>
-     <exports symbol='xmlDOMWrapCloneNode' type='function'/>
-     <exports symbol='xmlNewNode' type='function'/>
-     <exports symbol='xmlSaveFileTo' type='function'/>
-     <exports symbol='xmlNewTextLen' type='function'/>
-     <exports symbol='xmlNewTextChild' type='function'/>
-     <exports symbol='xmlNodeSetContent' type='function'/>
-     <exports symbol='xmlBufferAdd' type='function'/>
-     <exports symbol='xmlNodeDumpOutput' type='function'/>
-     <exports symbol='xmlCopyNamespace' type='function'/>
-     <exports symbol='xmlSearchNsByHref' type='function'/>
-     <exports symbol='xmlAddChild' type='function'/>
-     <exports symbol='xmlReconciliateNs' type='function'/>
-     <exports symbol='xmlValidateNCName' type='function'/>
-     <exports symbol='xmlNewDocComment' type='function'/>
-     <exports symbol='xmlGetCompressMode' type='function'/>
-     <exports symbol='xmlNodeDump' type='function'/>
-     <exports symbol='xmlBufferCreateSize' type='function'/>
-     <exports symbol='xmlNodeListGetString' type='function'/>
-     <exports symbol='xmlSetCompressMode' type='function'/>
-     <exports symbol='xmlSetTreeDoc' type='function'/>
-     <exports symbol='xmlDOMWrapAdoptNode' type='function'/>
-     <exports symbol='xmlCopyNodeList' type='function'/>
-     <exports symbol='xmlNewDocNodeEatName' type='function'/>
-     <exports symbol='xmlAddChildList' type='function'/>
-     <exports symbol='xmlGetNodePath' type='function'/>
-     <exports symbol='xmlFreePropList' type='function'/>
-     <exports symbol='xmlNodeAddContent' type='function'/>
-     <exports symbol='xmlUnsetNsProp' type='function'/>
-     <exports symbol='xmlFirstElementChild' type='function'/>
-     <exports symbol='xmlAddNextSibling' type='function'/>
-     <exports symbol='xmlIsBlankNode' type='function'/>
-     <exports symbol='xmlNewGlobalNs' type='function'/>
-     <exports symbol='xmlBufferDump' type='function'/>
-     <exports symbol='xmlNodeGetContent' type='function'/>
-     <exports symbol='xmlCopyDoc' type='function'/>
-     <exports symbol='xmlDOMWrapNewCtxt' type='function'/>
+     <exports symbol='xmlDocDumpMemory' type='function'/>
      <exports symbol='xmlDocDumpMemoryEnc' type='function'/>
@@ -1596,6 +1582,11 @@
      <exports symbol='xmlDocDumpMemoryEnc' type='function'/>
-     <exports symbol='xmlBufGetNodeContent' type='function'/>
-     <exports symbol='xmlTextMerge' type='function'/>
-     <exports symbol='xmlDocDumpMemory' type='function'/>
-     <exports symbol='xmlNewDocPI' type='function'/>
+     <exports symbol='xmlDocFormatDump' type='function'/>
+     <exports symbol='xmlDocGetRootElement' type='function'/>
+     <exports symbol='xmlDocSetRootElement' type='function'/>
+     <exports symbol='xmlElemDump' type='function'/>
+     <exports symbol='xmlFirstElementChild' type='function'/>
+     <exports symbol='xmlFreeDoc' type='function'/>
+     <exports symbol='xmlFreeDtd' type='function'/>
+     <exports symbol='xmlFreeNode' type='function'/>
+     <exports symbol='xmlFreeNodeList' type='function'/>
      <exports symbol='xmlFreeNs' type='function'/>
@@ -1601,3 +1592,3 @@
      <exports symbol='xmlFreeNs' type='function'/>
-     <exports symbol='xmlDocDump' type='function'/>
+     <exports symbol='xmlFreeNsList' type='function'/>
      <exports symbol='xmlFreeProp' type='function'/>
@@ -1603,2 +1594,9 @@
      <exports symbol='xmlFreeProp' type='function'/>
+     <exports symbol='xmlFreePropList' type='function'/>
+     <exports symbol='xmlGetBufferAllocationScheme' type='function'/>
+     <exports symbol='xmlGetCompressMode' type='function'/>
+     <exports symbol='xmlGetDocCompressMode' type='function'/>
+     <exports symbol='xmlGetIntSubset' type='function'/>
+     <exports symbol='xmlGetLastChild' type='function'/>
+     <exports symbol='xmlGetLineNo' type='function'/>
      <exports symbol='xmlGetNoNsProp' type='function'/>
@@ -1604,23 +1602,10 @@
      <exports symbol='xmlGetNoNsProp' type='function'/>
-     <exports symbol='xmlSplitQName2' type='function'/>
-     <exports symbol='xmlNewProp' type='function'/>
-     <exports symbol='xmlTextConcat' type='function'/>
-     <exports symbol='xmlNodeGetSpacePreserve' type='function'/>
-     <exports symbol='xmlBufferShrink' type='function'/>
-     <exports symbol='xmlPreviousElementSibling' type='function'/>
-     <exports symbol='xmlNodeSetContentLen' type='function'/>
-     <exports symbol='xmlNodeAddContentLen' type='function'/>
-     <exports symbol='xmlBufferWriteQuotedString' type='function'/>
-     <exports symbol='xmlCopyProp' type='function'/>
-     <exports symbol='xmlReplaceNode' type='function'/>
-     <exports symbol='xmlSetDocCompressMode' type='function'/>
-     <exports symbol='xmlCopyNode' type='function'/>
-     <exports symbol='xmlUnlinkNode' type='function'/>
-     <exports symbol='xmlSplitQName3' type='function'/>
-     <exports symbol='xmlDOMWrapAcquireNsFunction' type='function'/>
-     <exports symbol='xmlBufUse' type='function'/>
-     <exports symbol='xmlDocSetRootElement' type='function'/>
-     <exports symbol='xmlGetLineNo' type='function'/>
-     <exports symbol='xmlBufferContent' type='function'/>
-     <exports symbol='xmlRemoveProp' type='function'/>
+     <exports symbol='xmlGetNodePath' type='function'/>
+     <exports symbol='xmlGetNsList' type='function'/>
+     <exports symbol='xmlGetNsProp' type='function'/>
+     <exports symbol='xmlGetProp' type='function'/>
+     <exports symbol='xmlHasNsProp' type='function'/>
+     <exports symbol='xmlHasProp' type='function'/>
+     <exports symbol='xmlIsBlankNode' type='function'/>
+     <exports symbol='xmlIsXHTML' type='function'/>
      <exports symbol='xmlLastElementChild' type='function'/>
@@ -1626,12 +1611,4 @@
      <exports symbol='xmlLastElementChild' type='function'/>
-     <exports symbol='xmlNodeGetLang' type='function'/>
-     <exports symbol='xmlGetDocCompressMode' type='function'/>
-     <exports symbol='xmlBufNodeDump' type='function'/>
-     <exports symbol='xmlGetNsProp' type='function'/>
-     <exports symbol='xmlNewDocProp' type='function'/>
-     <exports symbol='xmlFreeNode' type='function'/>
-     <exports symbol='xmlNewNsProp' type='function'/>
-     <exports symbol='xmlDOMWrapFreeCtxt' type='function'/>
-     <exports symbol='xmlBufferDetach' type='function'/>
-     <exports symbol='xmlBufferSetAllocationScheme' type='function'/>
+     <exports symbol='xmlNewCDataBlock' type='function'/>
+     <exports symbol='xmlNewCharRef' type='function'/>
      <exports symbol='xmlNewChild' type='function'/>
@@ -1637,11 +1614,3 @@
      <exports symbol='xmlNewChild' type='function'/>
-     <exports symbol='xmlSearchNs' type='function'/>
-     <exports symbol='xmlStringLenGetNodeList' type='function'/>
-     <exports symbol='xmlSaveFormatFile' type='function'/>
-     <exports symbol='xmlCopyPropList' type='function'/>
-     <exports symbol='xmlDocFormatDump' type='function'/>
-     <exports symbol='xmlNodeSetSpacePreserve' type='function'/>
-     <exports symbol='xmlHasProp' type='function'/>
-     <exports symbol='xmlBufferCat' type='function'/>
-     <exports symbol='xmlCreateIntSubset' type='function'/>
+     <exports symbol='xmlNewComment' type='function'/>
      <exports symbol='xmlNewDoc' type='function'/>
@@ -1647,19 +1616,9 @@
      <exports symbol='xmlNewDoc' type='function'/>
-     <exports symbol='xmlNewCharRef' type='function'/>
-     <exports symbol='xmlCopyNamespaceList' type='function'/>
-     <exports symbol='xmlNewNodeEatName' type='function'/>
-     <exports symbol='xmlBufferResize' type='function'/>
-     <exports symbol='xmlNodeSetBase' type='function'/>
-     <exports symbol='xmlNewComment' type='function'/>
-     <exports symbol='xmlBufferLength' type='function'/>
-     <exports symbol='xmlNewText' type='function'/>
-     <exports symbol='xmlUnsetProp' type='function'/>
-     <exports symbol='xmlGetBufferAllocationScheme' type='function'/>
-     <exports symbol='xmlSaveFile' type='function'/>
-     <exports symbol='xmlDocCopyNodeList' type='function'/>
-     <exports symbol='xmlSetNs' type='function'/>
-     <exports symbol='xmlNewNs' type='function'/>
-     <exports symbol='xmlDOMWrapRemoveNode' type='function'/>
-     <exports symbol='xmlAttrSerializeTxtContent' type='function'/>
-     <exports symbol='xmlCopyDtd' type='function'/>
+     <exports symbol='xmlNewDocComment' type='function'/>
+     <exports symbol='xmlNewDocFragment' type='function'/>
+     <exports symbol='xmlNewDocNode' type='function'/>
+     <exports symbol='xmlNewDocNodeEatName' type='function'/>
+     <exports symbol='xmlNewDocPI' type='function'/>
+     <exports symbol='xmlNewDocProp' type='function'/>
+     <exports symbol='xmlNewDocRawNode' type='function'/>
      <exports symbol='xmlNewDocText' type='function'/>
@@ -1665,24 +1624,3 @@
      <exports symbol='xmlNewDocText' type='function'/>
-     <exports symbol='xmlNodeListGetRawString' type='function'/>
-     <exports symbol='xmlBufferCreateStatic' type='function'/>
-     <exports symbol='xmlNewReference' type='function'/>
-     <exports symbol='xmlDOMWrapReconcileNamespaces' type='function'/>
-     <exports symbol='xmlBufferCCat' type='function'/>
-     <exports symbol='xmlGetNsList' type='function'/>
-     <exports symbol='xmlBufferGrow' type='function'/>
-     <exports symbol='xmlNodeIsText' type='function'/>
-     <exports symbol='xmlSetBufferAllocationScheme' type='function'/>
-     <exports symbol='xmlIsXHTML' type='function'/>
-     <exports symbol='xmlNodeSetLang' type='function'/>
-     <exports symbol='xmlFreeDtd' type='function'/>
-     <exports symbol='xmlFreeNodeList' type='function'/>
-     <exports symbol='xmlFreeDoc' type='function'/>
-     <exports symbol='xmlBufShrink' type='function'/>
-     <exports symbol='xmlNewDocNode' type='function'/>
-     <exports symbol='xmlSaveFileEnc' type='function'/>
-     <exports symbol='xmlSetNsProp' type='function'/>
-     <exports symbol='xmlDocDumpFormatMemory' type='function'/>
-     <exports symbol='xmlSetListDoc' type='function'/>
-     <exports symbol='xmlNodeSetName' type='function'/>
      <exports symbol='xmlNewDocTextLen' type='function'/>
      <exports symbol='xmlNewDtd' type='function'/>
@@ -1687,7 +1625,69 @@
      <exports symbol='xmlNewDocTextLen' type='function'/>
      <exports symbol='xmlNewDtd' type='function'/>
-     <exports symbol='xmlFreeNsList' type='function'/>
-     <exports symbol='xmlGetLastChild' type='function'/>
+     <exports symbol='xmlNewGlobalNs' type='function'/>
+     <exports symbol='xmlNewNode' type='function'/>
+     <exports symbol='xmlNewNodeEatName' type='function'/>
+     <exports symbol='xmlNewNs' type='function'/>
+     <exports symbol='xmlNewNsProp' type='function'/>
+     <exports symbol='xmlNewNsPropEatName' type='function'/>
+     <exports symbol='xmlNewPI' type='function'/>
+     <exports symbol='xmlNewProp' type='function'/>
+     <exports symbol='xmlNewReference' type='function'/>
+     <exports symbol='xmlNewText' type='function'/>
+     <exports symbol='xmlNewTextChild' type='function'/>
+     <exports symbol='xmlNewTextLen' type='function'/>
+     <exports symbol='xmlNextElementSibling' type='function'/>
+     <exports symbol='xmlNodeAddContent' type='function'/>
+     <exports symbol='xmlNodeAddContentLen' type='function'/>
+     <exports symbol='xmlNodeBufGetContent' type='function'/>
+     <exports symbol='xmlNodeDump' type='function'/>
+     <exports symbol='xmlNodeDumpOutput' type='function'/>
+     <exports symbol='xmlNodeGetBase' type='function'/>
+     <exports symbol='xmlNodeGetContent' type='function'/>
+     <exports symbol='xmlNodeGetLang' type='function'/>
+     <exports symbol='xmlNodeGetSpacePreserve' type='function'/>
+     <exports symbol='xmlNodeIsText' type='function'/>
+     <exports symbol='xmlNodeListGetRawString' type='function'/>
+     <exports symbol='xmlNodeListGetString' type='function'/>
+     <exports symbol='xmlNodeSetBase' type='function'/>
+     <exports symbol='xmlNodeSetContent' type='function'/>
+     <exports symbol='xmlNodeSetContentLen' type='function'/>
+     <exports symbol='xmlNodeSetLang' type='function'/>
+     <exports symbol='xmlNodeSetName' type='function'/>
+     <exports symbol='xmlNodeSetSpacePreserve' type='function'/>
+     <exports symbol='xmlPreviousElementSibling' type='function'/>
+     <exports symbol='xmlReconciliateNs' type='function'/>
+     <exports symbol='xmlRemoveProp' type='function'/>
+     <exports symbol='xmlReplaceNode' type='function'/>
+     <exports symbol='xmlSaveFile' type='function'/>
+     <exports symbol='xmlSaveFileEnc' type='function'/>
+     <exports symbol='xmlSaveFileTo' type='function'/>
+     <exports symbol='xmlSaveFormatFile' type='function'/>
+     <exports symbol='xmlSaveFormatFileEnc' type='function'/>
+     <exports symbol='xmlSaveFormatFileTo' type='function'/>
+     <exports symbol='xmlSearchNs' type='function'/>
+     <exports symbol='xmlSearchNsByHref' type='function'/>
+     <exports symbol='xmlSetBufferAllocationScheme' type='function'/>
+     <exports symbol='xmlSetCompressMode' type='function'/>
+     <exports symbol='xmlSetDocCompressMode' type='function'/>
+     <exports symbol='xmlSetListDoc' type='function'/>
+     <exports symbol='xmlSetNs' type='function'/>
+     <exports symbol='xmlSetNsProp' type='function'/>
+     <exports symbol='xmlSetProp' type='function'/>
+     <exports symbol='xmlSetTreeDoc' type='function'/>
+     <exports symbol='xmlSplitQName2' type='function'/>
+     <exports symbol='xmlSplitQName3' type='function'/>
+     <exports symbol='xmlStringGetNodeList' type='function'/>
+     <exports symbol='xmlStringLenGetNodeList' type='function'/>
+     <exports symbol='xmlTextConcat' type='function'/>
+     <exports symbol='xmlTextMerge' type='function'/>
+     <exports symbol='xmlUnlinkNode' type='function'/>
+     <exports symbol='xmlUnsetNsProp' type='function'/>
+     <exports symbol='xmlUnsetProp' type='function'/>
+     <exports symbol='xmlValidateNCName' type='function'/>
+     <exports symbol='xmlValidateNMToken' type='function'/>
+     <exports symbol='xmlValidateName' type='function'/>
+     <exports symbol='xmlValidateQName' type='function'/>
     </file>
     <file name='uri'>
      <summary>library of generic URI related routines</summary>
@@ -1696,9 +1696,7 @@
      <exports symbol='xmlURI' type='typedef'/>
      <exports symbol='xmlURIPtr' type='typedef'/>
      <exports symbol='_xmlURI' type='struct'/>
-     <exports symbol='xmlNormalizeURIPath' type='function'/>
-     <exports symbol='xmlPrintURI' type='function'/>
-     <exports symbol='xmlParseURIRaw' type='function'/>
-     <exports symbol='xmlURIUnescapeString' type='function'/>
-     <exports symbol='xmlParseURI' type='function'/>
+     <exports symbol='xmlBuildRelativeURI' type='function'/>
+     <exports symbol='xmlBuildURI' type='function'/>
+     <exports symbol='xmlCanonicPath' type='function'/>
      <exports symbol='xmlCreateURI' type='function'/>
@@ -1704,3 +1702,7 @@
      <exports symbol='xmlCreateURI' type='function'/>
-     <exports symbol='xmlURIEscapeStr' type='function'/>
+     <exports symbol='xmlFreeURI' type='function'/>
+     <exports symbol='xmlNormalizeURIPath' type='function'/>
+     <exports symbol='xmlParseURI' type='function'/>
+     <exports symbol='xmlParseURIRaw' type='function'/>
+     <exports symbol='xmlParseURIReference' type='function'/>
      <exports symbol='xmlPathToURI' type='function'/>
@@ -1706,7 +1708,4 @@
      <exports symbol='xmlPathToURI' type='function'/>
-     <exports symbol='xmlCanonicPath' type='function'/>
-     <exports symbol='xmlFreeURI' type='function'/>
-     <exports symbol='xmlParseURIReference' type='function'/>
-     <exports symbol='xmlBuildRelativeURI' type='function'/>
+     <exports symbol='xmlPrintURI' type='function'/>
      <exports symbol='xmlSaveUri' type='function'/>
      <exports symbol='xmlURIEscape' type='function'/>
@@ -1711,6 +1710,7 @@
      <exports symbol='xmlSaveUri' type='function'/>
      <exports symbol='xmlURIEscape' type='function'/>
-     <exports symbol='xmlBuildURI' type='function'/>
+     <exports symbol='xmlURIEscapeStr' type='function'/>
+     <exports symbol='xmlURIUnescapeString' type='function'/>
     </file>
     <file name='valid'>
      <summary>The DTD validation</summary>
@@ -1718,15 +1718,5 @@
      <author>Daniel Veillard </author>
      <exports symbol='XML_VCTXT_DTD_VALIDATED' type='macro'/>
      <exports symbol='XML_VCTXT_USE_PCTXT' type='macro'/>
-     <exports symbol='xmlElementTable' type='typedef'/>
-     <exports symbol='xmlValidStatePtr' type='typedef'/>
-     <exports symbol='xmlIDTablePtr' type='typedef'/>
-     <exports symbol='xmlNotationTablePtr' type='typedef'/>
-     <exports symbol='xmlValidCtxt' type='typedef'/>
-     <exports symbol='xmlElementTablePtr' type='typedef'/>
-     <exports symbol='xmlRefTablePtr' type='typedef'/>
-     <exports symbol='xmlNotationTable' type='typedef'/>
-     <exports symbol='xmlRefTable' type='typedef'/>
-     <exports symbol='xmlValidState' type='typedef'/>
      <exports symbol='xmlAttributeTable' type='typedef'/>
      <exports symbol='xmlAttributeTablePtr' type='typedef'/>
@@ -1731,3 +1721,5 @@
      <exports symbol='xmlAttributeTable' type='typedef'/>
      <exports symbol='xmlAttributeTablePtr' type='typedef'/>
+     <exports symbol='xmlElementTable' type='typedef'/>
+     <exports symbol='xmlElementTablePtr' type='typedef'/>
      <exports symbol='xmlIDTable' type='typedef'/>
@@ -1733,2 +1725,8 @@
      <exports symbol='xmlIDTable' type='typedef'/>
+     <exports symbol='xmlIDTablePtr' type='typedef'/>
+     <exports symbol='xmlNotationTable' type='typedef'/>
+     <exports symbol='xmlNotationTablePtr' type='typedef'/>
+     <exports symbol='xmlRefTable' type='typedef'/>
+     <exports symbol='xmlRefTablePtr' type='typedef'/>
+     <exports symbol='xmlValidCtxt' type='typedef'/>
      <exports symbol='xmlValidCtxtPtr' type='typedef'/>
@@ -1734,2 +1732,4 @@
      <exports symbol='xmlValidCtxtPtr' type='typedef'/>
+     <exports symbol='xmlValidState' type='typedef'/>
+     <exports symbol='xmlValidStatePtr' type='typedef'/>
      <exports symbol='_xmlValidCtxt' type='struct'/>
@@ -1735,5 +1735,6 @@
      <exports symbol='_xmlValidCtxt' type='struct'/>
-     <exports symbol='xmlFreeNotationTable' type='function'/>
-     <exports symbol='xmlValidateNameValue' type='function'/>
-     <exports symbol='xmlSnprintfElementContent' type='function'/>
+     <exports symbol='xmlAddAttributeDecl' type='function'/>
+     <exports symbol='xmlAddElementDecl' type='function'/>
+     <exports symbol='xmlAddID' type='function'/>
+     <exports symbol='xmlAddNotationDecl' type='function'/>
      <exports symbol='xmlAddRef' type='function'/>
@@ -1739,25 +1740,5 @@
      <exports symbol='xmlAddRef' type='function'/>
-     <exports symbol='xmlDumpAttributeDecl' type='function'/>
-     <exports symbol='xmlValidateDocumentFinal' type='function'/>
-     <exports symbol='xmlValidateDtdFinal' type='function'/>
-     <exports symbol='xmlDumpAttributeTable' type='function'/>
-     <exports symbol='xmlCreateEnumeration' type='function'/>
-     <exports symbol='xmlValidateOneAttribute' type='function'/>
-     <exports symbol='xmlValidGetValidElements' type='function'/>
-     <exports symbol='xmlIsMixedElement' type='function'/>
-     <exports symbol='xmlDumpNotationDecl' type='function'/>
-     <exports symbol='xmlIsID' type='function'/>
-     <exports symbol='xmlGetDtdQAttrDesc' type='function'/>
-     <exports symbol='xmlNewDocElementContent' type='function'/>
-     <exports symbol='xmlFreeAttributeTable' type='function'/>
-     <exports symbol='xmlValidityErrorFunc' type='function'/>
-     <exports symbol='xmlValidateAttributeDecl' type='function'/>
-     <exports symbol='xmlGetDtdQElementDesc' type='function'/>
-     <exports symbol='xmlCopyNotationTable' type='function'/>
-     <exports symbol='xmlValidateDocument' type='function'/>
-     <exports symbol='xmlValidGetPotentialChildren' type='function'/>
-     <exports symbol='xmlAddNotationDecl' type='function'/>
-     <exports symbol='xmlValidateElementDecl' type='function'/>
-     <exports symbol='xmlAddAttributeDecl' type='function'/>
-     <exports symbol='xmlGetID' type='function'/>
+     <exports symbol='xmlCopyAttributeTable' type='function'/>
+     <exports symbol='xmlCopyDocElementContent' type='function'/>
+     <exports symbol='xmlCopyElementContent' type='function'/>
      <exports symbol='xmlCopyElementTable' type='function'/>
@@ -1763,6 +1744,8 @@
      <exports symbol='xmlCopyElementTable' type='function'/>
-     <exports symbol='xmlGetRefs' type='function'/>
-     <exports symbol='xmlSprintfElementContent' type='function'/>
-     <exports symbol='xmlValidateOneElement' type='function'/>
-     <exports symbol='xmlValidateNmtokenValue' type='function'/>
+     <exports symbol='xmlCopyEnumeration' type='function'/>
+     <exports symbol='xmlCopyNotationTable' type='function'/>
+     <exports symbol='xmlCreateEnumeration' type='function'/>
+     <exports symbol='xmlDumpAttributeDecl' type='function'/>
+     <exports symbol='xmlDumpAttributeTable' type='function'/>
+     <exports symbol='xmlDumpElementDecl' type='function'/>
      <exports symbol='xmlDumpElementTable' type='function'/>
@@ -1768,4 +1751,6 @@
      <exports symbol='xmlDumpElementTable' type='function'/>
-     <exports symbol='xmlValidCtxtNormalizeAttributeValue' type='function'/>
-     <exports symbol='xmlDumpElementDecl' type='function'/>
+     <exports symbol='xmlDumpNotationDecl' type='function'/>
+     <exports symbol='xmlDumpNotationTable' type='function'/>
+     <exports symbol='xmlFreeAttributeTable' type='function'/>
+     <exports symbol='xmlFreeDocElementContent' type='function'/>
      <exports symbol='xmlFreeElementContent' type='function'/>
@@ -1771,7 +1756,6 @@
      <exports symbol='xmlFreeElementContent' type='function'/>
-     <exports symbol='xmlValidateOneNamespace' type='function'/>
-     <exports symbol='xmlValidatePushElement' type='function'/>
-     <exports symbol='xmlIsRef' type='function'/>
-     <exports symbol='xmlCopyDocElementContent' type='function'/>
-     <exports symbol='xmlAddID' type='function'/>
+     <exports symbol='xmlFreeElementTable' type='function'/>
+     <exports symbol='xmlFreeEnumeration' type='function'/>
+     <exports symbol='xmlFreeIDTable' type='function'/>
+     <exports symbol='xmlFreeNotationTable' type='function'/>
      <exports symbol='xmlFreeRefTable' type='function'/>
@@ -1777,6 +1761,2 @@
      <exports symbol='xmlFreeRefTable' type='function'/>
-     <exports symbol='xmlValidateNamesValue' type='function'/>
-     <exports symbol='xmlRemoveID' type='function'/>
-     <exports symbol='xmlFreeElementTable' type='function'/>
-     <exports symbol='xmlFreeIDTable' type='function'/>
      <exports symbol='xmlFreeValidCtxt' type='function'/>
@@ -1782,10 +1762,2 @@
      <exports symbol='xmlFreeValidCtxt' type='function'/>
-     <exports symbol='xmlCopyAttributeTable' type='function'/>
-     <exports symbol='xmlCopyElementContent' type='function'/>
-     <exports symbol='xmlValidateAttributeValue' type='function'/>
-     <exports symbol='xmlRemoveRef' type='function'/>
-     <exports symbol='xmlValidityWarningFunc' type='function'/>
-     <exports symbol='xmlValidatePopElement' type='function'/>
-     <exports symbol='xmlFreeEnumeration' type='function'/>
-     <exports symbol='xmlCopyEnumeration' type='function'/>
      <exports symbol='xmlGetDtdAttrDesc' type='function'/>
@@ -1791,14 +1763,3 @@
      <exports symbol='xmlGetDtdAttrDesc' type='function'/>
-     <exports symbol='xmlValidateDtd' type='function'/>
-     <exports symbol='xmlNewValidCtxt' type='function'/>
-     <exports symbol='xmlDumpNotationTable' type='function'/>
-     <exports symbol='xmlAddElementDecl' type='function'/>
-     <exports symbol='xmlValidNormalizeAttributeValue' type='function'/>
-     <exports symbol='xmlValidBuildContentModel' type='function'/>
-     <exports symbol='xmlValidateElement' type='function'/>
-     <exports symbol='xmlValidateNotationUse' type='function'/>
-     <exports symbol='xmlValidateRoot' type='function'/>
-     <exports symbol='xmlValidateNotationDecl' type='function'/>
-     <exports symbol='xmlNewElementContent' type='function'/>
      <exports symbol='xmlGetDtdElementDesc' type='function'/>
      <exports symbol='xmlGetDtdNotationDesc' type='function'/>
@@ -1803,4 +1764,33 @@
      <exports symbol='xmlGetDtdElementDesc' type='function'/>
      <exports symbol='xmlGetDtdNotationDesc' type='function'/>
-     <exports symbol='xmlValidatePushCData' type='function'/>
+     <exports symbol='xmlGetDtdQAttrDesc' type='function'/>
+     <exports symbol='xmlGetDtdQElementDesc' type='function'/>
+     <exports symbol='xmlGetID' type='function'/>
+     <exports symbol='xmlGetRefs' type='function'/>
+     <exports symbol='xmlIsID' type='function'/>
+     <exports symbol='xmlIsMixedElement' type='function'/>
+     <exports symbol='xmlIsRef' type='function'/>
+     <exports symbol='xmlNewDocElementContent' type='function'/>
+     <exports symbol='xmlNewElementContent' type='function'/>
+     <exports symbol='xmlNewValidCtxt' type='function'/>
+     <exports symbol='xmlRemoveID' type='function'/>
+     <exports symbol='xmlRemoveRef' type='function'/>
+     <exports symbol='xmlSnprintfElementContent' type='function'/>
+     <exports symbol='xmlSprintfElementContent' type='function'/>
+     <exports symbol='xmlValidBuildContentModel' type='function'/>
+     <exports symbol='xmlValidCtxtNormalizeAttributeValue' type='function'/>
+     <exports symbol='xmlValidGetPotentialChildren' type='function'/>
+     <exports symbol='xmlValidGetValidElements' type='function'/>
+     <exports symbol='xmlValidNormalizeAttributeValue' type='function'/>
+     <exports symbol='xmlValidateAttributeDecl' type='function'/>
+     <exports symbol='xmlValidateAttributeValue' type='function'/>
+     <exports symbol='xmlValidateDocument' type='function'/>
+     <exports symbol='xmlValidateDocumentFinal' type='function'/>
+     <exports symbol='xmlValidateDtd' type='function'/>
+     <exports symbol='xmlValidateDtdFinal' type='function'/>
+     <exports symbol='xmlValidateElement' type='function'/>
+     <exports symbol='xmlValidateElementDecl' type='function'/>
+     <exports symbol='xmlValidateNameValue' type='function'/>
+     <exports symbol='xmlValidateNamesValue' type='function'/>
+     <exports symbol='xmlValidateNmtokenValue' type='function'/>
      <exports symbol='xmlValidateNmtokensValue' type='function'/>
@@ -1806,7 +1796,17 @@
      <exports symbol='xmlValidateNmtokensValue' type='function'/>
-     <exports symbol='xmlFreeDocElementContent' type='function'/>
+     <exports symbol='xmlValidateNotationDecl' type='function'/>
+     <exports symbol='xmlValidateNotationUse' type='function'/>
+     <exports symbol='xmlValidateOneAttribute' type='function'/>
+     <exports symbol='xmlValidateOneElement' type='function'/>
+     <exports symbol='xmlValidateOneNamespace' type='function'/>
+     <exports symbol='xmlValidatePopElement' type='function'/>
+     <exports symbol='xmlValidatePushCData' type='function'/>
+     <exports symbol='xmlValidatePushElement' type='function'/>
+     <exports symbol='xmlValidateRoot' type='function'/>
+     <exports symbol='xmlValidityErrorFunc' type='function'/>
+     <exports symbol='xmlValidityWarningFunc' type='function'/>
     </file>
     <file name='xinclude'>
      <summary>implementation of XInclude</summary>
      <description>API to handle XInclude processing, implements the World Wide Web Consortium Last Call Working Draft 10 November 2003</description>
      <author>Daniel Veillard </author>
@@ -1808,8 +1808,7 @@
     </file>
     <file name='xinclude'>
      <summary>implementation of XInclude</summary>
      <description>API to handle XInclude processing, implements the World Wide Web Consortium Last Call Working Draft 10 November 2003</description>
      <author>Daniel Veillard </author>
-     <exports symbol='XINCLUDE_PARSE_TEXT' type='macro'/>
-     <exports symbol='XINCLUDE_PARSE_XPOINTER' type='macro'/>
+     <exports symbol='XINCLUDE_FALLBACK' type='macro'/>
      <exports symbol='XINCLUDE_HREF' type='macro'/>
@@ -1815,3 +1814,3 @@
      <exports symbol='XINCLUDE_HREF' type='macro'/>
-     <exports symbol='XINCLUDE_FALLBACK' type='macro'/>
+     <exports symbol='XINCLUDE_NODE' type='macro'/>
      <exports symbol='XINCLUDE_NS' type='macro'/>
@@ -1817,2 +1816,3 @@
      <exports symbol='XINCLUDE_NS' type='macro'/>
+     <exports symbol='XINCLUDE_OLD_NS' type='macro'/>
      <exports symbol='XINCLUDE_PARSE' type='macro'/>
@@ -1818,3 +1818,4 @@
      <exports symbol='XINCLUDE_PARSE' type='macro'/>
-     <exports symbol='XINCLUDE_NODE' type='macro'/>
+     <exports symbol='XINCLUDE_PARSE_ENCODING' type='macro'/>
+     <exports symbol='XINCLUDE_PARSE_TEXT' type='macro'/>
      <exports symbol='XINCLUDE_PARSE_XML' type='macro'/>
@@ -1820,5 +1821,4 @@
      <exports symbol='XINCLUDE_PARSE_XML' type='macro'/>
-     <exports symbol='XINCLUDE_PARSE_ENCODING' type='macro'/>
-     <exports symbol='XINCLUDE_OLD_NS' type='macro'/>
+     <exports symbol='XINCLUDE_PARSE_XPOINTER' type='macro'/>
      <exports symbol='xmlXIncludeCtxt' type='typedef'/>
      <exports symbol='xmlXIncludeCtxtPtr' type='typedef'/>
@@ -1823,4 +1823,7 @@
      <exports symbol='xmlXIncludeCtxt' type='typedef'/>
      <exports symbol='xmlXIncludeCtxtPtr' type='typedef'/>
-     <exports symbol='xmlXIncludeProcessTreeFlagsData' type='function'/>
+     <exports symbol='xmlXIncludeFreeContext' type='function'/>
+     <exports symbol='xmlXIncludeNewContext' type='function'/>
+     <exports symbol='xmlXIncludeProcess' type='function'/>
+     <exports symbol='xmlXIncludeProcessFlags' type='function'/>
      <exports symbol='xmlXIncludeProcessFlagsData' type='function'/>
@@ -1826,4 +1829,2 @@
      <exports symbol='xmlXIncludeProcessFlagsData' type='function'/>
-     <exports symbol='xmlXIncludeProcessFlags' type='function'/>
-     <exports symbol='xmlXIncludeProcessTree' type='function'/>
      <exports symbol='xmlXIncludeProcessNode' type='function'/>
@@ -1829,3 +1830,5 @@
      <exports symbol='xmlXIncludeProcessNode' type='function'/>
-     <exports symbol='xmlXIncludeFreeContext' type='function'/>
+     <exports symbol='xmlXIncludeProcessTree' type='function'/>
+     <exports symbol='xmlXIncludeProcessTreeFlags' type='function'/>
+     <exports symbol='xmlXIncludeProcessTreeFlagsData' type='function'/>
      <exports symbol='xmlXIncludeSetFlags' type='function'/>
@@ -1831,9 +1834,6 @@
      <exports symbol='xmlXIncludeSetFlags' type='function'/>
-     <exports symbol='xmlXIncludeProcess' type='function'/>
-     <exports symbol='xmlXIncludeNewContext' type='function'/>
-     <exports symbol='xmlXIncludeProcessTreeFlags' type='function'/>
     </file>
     <file name='xlink'>
      <summary>unfinished XLink detection module</summary>
      <description>unfinished XLink detection module </description>
      <author>Daniel Veillard </author>
@@ -1835,6 +1835,7 @@
     </file>
     <file name='xlink'>
      <summary>unfinished XLink detection module</summary>
      <description>unfinished XLink detection module </description>
      <author>Daniel Veillard </author>
+     <exports symbol='XLINK_ACTUATE_AUTO' type='enum'/>
      <exports symbol='XLINK_ACTUATE_NONE' type='enum'/>
@@ -1840,2 +1841,4 @@
      <exports symbol='XLINK_ACTUATE_NONE' type='enum'/>
+     <exports symbol='XLINK_ACTUATE_ONREQUEST' type='enum'/>
+     <exports symbol='XLINK_SHOW_EMBED' type='enum'/>
      <exports symbol='XLINK_SHOW_NEW' type='enum'/>
@@ -1841,4 +1844,3 @@
      <exports symbol='XLINK_SHOW_NEW' type='enum'/>
-     <exports symbol='XLINK_ACTUATE_AUTO' type='enum'/>
-     <exports symbol='XLINK_TYPE_NONE' type='enum'/>
+     <exports symbol='XLINK_SHOW_NONE' type='enum'/>
      <exports symbol='XLINK_SHOW_REPLACE' type='enum'/>
@@ -1844,4 +1846,3 @@
      <exports symbol='XLINK_SHOW_REPLACE' type='enum'/>
-     <exports symbol='XLINK_ACTUATE_ONREQUEST' type='enum'/>
      <exports symbol='XLINK_TYPE_EXTENDED' type='enum'/>
      <exports symbol='XLINK_TYPE_EXTENDED_SET' type='enum'/>
@@ -1846,5 +1847,4 @@
      <exports symbol='XLINK_TYPE_EXTENDED' type='enum'/>
      <exports symbol='XLINK_TYPE_EXTENDED_SET' type='enum'/>
-     <exports symbol='XLINK_SHOW_NONE' type='enum'/>
-     <exports symbol='XLINK_SHOW_EMBED' type='enum'/>
+     <exports symbol='XLINK_TYPE_NONE' type='enum'/>
      <exports symbol='XLINK_TYPE_SIMPLE' type='enum'/>
@@ -1850,3 +1850,7 @@
      <exports symbol='XLINK_TYPE_SIMPLE' type='enum'/>
-     <exports symbol='xlinkTitle' type='typedef'/>
+     <exports symbol='xlinkActuate' type='typedef'/>
+     <exports symbol='xlinkHRef' type='typedef'/>
+     <exports symbol='xlinkHandler' type='typedef'/>
+     <exports symbol='xlinkHandlerPtr' type='typedef'/>
+     <exports symbol='xlinkRole' type='typedef'/>
      <exports symbol='xlinkShow' type='typedef'/>
@@ -1852,8 +1856,4 @@
      <exports symbol='xlinkShow' type='typedef'/>
-     <exports symbol='xlinkHRef' type='typedef'/>
-     <exports symbol='xlinkActuate' type='typedef'/>
-     <exports symbol='xlinkHandler' type='typedef'/>
-     <exports symbol='xlinkRole' type='typedef'/>
-     <exports symbol='xlinkHandlerPtr' type='typedef'/>
+     <exports symbol='xlinkTitle' type='typedef'/>
      <exports symbol='xlinkType' type='typedef'/>
      <exports symbol='_xlinkHandler' type='struct'/>
@@ -1858,6 +1858,4 @@
      <exports symbol='xlinkType' type='typedef'/>
      <exports symbol='_xlinkHandler' type='struct'/>
-     <exports symbol='xlinkSetDefaultDetect' type='function'/>
-     <exports symbol='xlinkSetDefaultHandler' type='function'/>
      <exports symbol='xlinkExtendedLinkFunk' type='function'/>
      <exports symbol='xlinkExtendedLinkSetFunk' type='function'/>
@@ -1862,6 +1860,5 @@
      <exports symbol='xlinkExtendedLinkFunk' type='function'/>
      <exports symbol='xlinkExtendedLinkSetFunk' type='function'/>
-     <exports symbol='xlinkSimpleLinkFunk' type='function'/>
-     <exports symbol='xlinkNodeDetectFunc' type='function'/>
+     <exports symbol='xlinkGetDefaultDetect' type='function'/>
      <exports symbol='xlinkGetDefaultHandler' type='function'/>
      <exports symbol='xlinkIsLink' type='function'/>
@@ -1866,8 +1863,11 @@
      <exports symbol='xlinkGetDefaultHandler' type='function'/>
      <exports symbol='xlinkIsLink' type='function'/>
-     <exports symbol='xlinkGetDefaultDetect' type='function'/>
+     <exports symbol='xlinkNodeDetectFunc' type='function'/>
+     <exports symbol='xlinkSetDefaultDetect' type='function'/>
+     <exports symbol='xlinkSetDefaultHandler' type='function'/>
+     <exports symbol='xlinkSimpleLinkFunk' type='function'/>
     </file>
     <file name='xmlIO'>
      <summary>interface for the I/O interfaces used by the parser</summary>
      <description>interface for the I/O interfaces used by the parser </description>
      <author>Daniel Veillard </author>
@@ -1869,6 +1869,7 @@
     </file>
     <file name='xmlIO'>
      <summary>interface for the I/O interfaces used by the parser</summary>
      <description>interface for the I/O interfaces used by the parser </description>
      <author>Daniel Veillard </author>
+     <exports symbol='_xmlOutputBuffer' type='struct'/>
      <exports symbol='_xmlParserInputBuffer' type='struct'/>
@@ -1874,16 +1875,4 @@
      <exports symbol='_xmlParserInputBuffer' type='struct'/>
-     <exports symbol='_xmlOutputBuffer' type='struct'/>
-     <exports symbol='xmlIOHTTPRead' type='function'/>
-     <exports symbol='xmlInputMatchCallback' type='function'/>
-     <exports symbol='xmlRegisterDefaultOutputCallbacks' type='function'/>
-     <exports symbol='xmlFileClose' type='function'/>
-     <exports symbol='xmlPopOutputCallbacks' type='function'/>
-     <exports symbol='xmlOutputMatchCallback' type='function'/>
-     <exports symbol='xmlParserInputBufferPush' type='function'/>
-     <exports symbol='xmlIOFTPRead' type='function'/>
-     <exports symbol='xmlRegisterHTTPPostCallbacks' type='function'/>
-     <exports symbol='xmlIOFTPOpen' type='function'/>
-     <exports symbol='xmlIOFTPClose' type='function'/>
-     <exports symbol='xmlFileOpen' type='function'/>
-     <exports symbol='xmlOutputBufferCreateFile' type='function'/>
+     <exports symbol='xmlAllocOutputBuffer' type='function'/>
+     <exports symbol='xmlAllocParserInputBuffer' type='function'/>
      <exports symbol='xmlCheckFilename' type='function'/>
@@ -1889,9 +1878,2 @@
      <exports symbol='xmlCheckFilename' type='function'/>
-     <exports symbol='xmlOutputOpenCallback' type='function'/>
-     <exports symbol='xmlParserInputBufferCreateFilename' type='function'/>
-     <exports symbol='xmlOutputBufferClose' type='function'/>
-     <exports symbol='xmlAllocParserInputBuffer' type='function'/>
-     <exports symbol='xmlOutputBufferCreateIO' type='function'/>
-     <exports symbol='xmlOutputWriteCallback' type='function'/>
-     <exports symbol='xmlOutputBufferFlush' type='function'/>
      <exports symbol='xmlCheckHTTPInput' type='function'/>
@@ -1897,6 +1879,8 @@
      <exports symbol='xmlCheckHTTPInput' type='function'/>
-     <exports symbol='xmlRegisterOutputCallbacks' type='function'/>
-     <exports symbol='xmlParserInputBufferCreateMem' type='function'/>
-     <exports symbol='xmlIOFTPMatch' type='function'/>
-     <exports symbol='xmlRegisterInputCallbacks' type='function'/>
+     <exports symbol='xmlCleanupInputCallbacks' type='function'/>
+     <exports symbol='xmlCleanupOutputCallbacks' type='function'/>
+     <exports symbol='xmlFileClose' type='function'/>
+     <exports symbol='xmlFileMatch' type='function'/>
+     <exports symbol='xmlFileOpen' type='function'/>
+     <exports symbol='xmlFileRead' type='function'/>
      <exports symbol='xmlFreeParserInputBuffer' type='function'/>
@@ -1902,9 +1886,8 @@
      <exports symbol='xmlFreeParserInputBuffer' type='function'/>
-     <exports symbol='xmlRegisterDefaultInputCallbacks' type='function'/>
-     <exports symbol='xmlParserInputBufferGrow' type='function'/>
-     <exports symbol='xmlOutputCloseCallback' type='function'/>
-     <exports symbol='xmlAllocOutputBuffer' type='function'/>
-     <exports symbol='xmlNoNetExternalEntityLoader' type='function'/>
-     <exports symbol='xmlOutputBufferCreateBuffer' type='function'/>
+     <exports symbol='xmlIOFTPClose' type='function'/>
+     <exports symbol='xmlIOFTPMatch' type='function'/>
+     <exports symbol='xmlIOFTPOpen' type='function'/>
+     <exports symbol='xmlIOFTPRead' type='function'/>
+     <exports symbol='xmlIOHTTPClose' type='function'/>
      <exports symbol='xmlIOHTTPMatch' type='function'/>
      <exports symbol='xmlIOHTTPOpen' type='function'/>
@@ -1909,14 +1892,7 @@
      <exports symbol='xmlIOHTTPMatch' type='function'/>
      <exports symbol='xmlIOHTTPOpen' type='function'/>
-     <exports symbol='xmlParserInputBufferCreateIO' type='function'/>
-     <exports symbol='xmlOutputBufferCreateFd' type='function'/>
-     <exports symbol='xmlNormalizeWindowsPath' type='function'/>
-     <exports symbol='xmlInputReadCallback' type='function'/>
-     <exports symbol='xmlParserInputBufferCreateStatic' type='function'/>
-     <exports symbol='xmlOutputBufferGetContent' type='function'/>
-     <exports symbol='xmlIOHTTPClose' type='function'/>
-     <exports symbol='xmlOutputBufferWriteEscape' type='function'/>
-     <exports symbol='xmlOutputBufferCreateFilename' type='function'/>
-     <exports symbol='xmlOutputBufferGetSize' type='function'/>
-     <exports symbol='xmlCleanupOutputCallbacks' type='function'/>
+     <exports symbol='xmlIOHTTPOpenW' type='function'/>
+     <exports symbol='xmlIOHTTPRead' type='function'/>
+     <exports symbol='xmlInputCloseCallback' type='function'/>
+     <exports symbol='xmlInputMatchCallback' type='function'/>
      <exports symbol='xmlInputOpenCallback' type='function'/>
@@ -1922,3 +1898,16 @@
      <exports symbol='xmlInputOpenCallback' type='function'/>
-     <exports symbol='xmlParserInputBufferRead' type='function'/>
+     <exports symbol='xmlInputReadCallback' type='function'/>
+     <exports symbol='xmlNoNetExternalEntityLoader' type='function'/>
+     <exports symbol='xmlNormalizeWindowsPath' type='function'/>
+     <exports symbol='xmlOutputBufferClose' type='function'/>
+     <exports symbol='xmlOutputBufferCreateBuffer' type='function'/>
+     <exports symbol='xmlOutputBufferCreateFd' type='function'/>
+     <exports symbol='xmlOutputBufferCreateFile' type='function'/>
+     <exports symbol='xmlOutputBufferCreateFilename' type='function'/>
+     <exports symbol='xmlOutputBufferCreateIO' type='function'/>
+     <exports symbol='xmlOutputBufferFlush' type='function'/>
+     <exports symbol='xmlOutputBufferGetContent' type='function'/>
+     <exports symbol='xmlOutputBufferGetSize' type='function'/>
+     <exports symbol='xmlOutputBufferWrite' type='function'/>
+     <exports symbol='xmlOutputBufferWriteEscape' type='function'/>
      <exports symbol='xmlOutputBufferWriteString' type='function'/>
@@ -1924,5 +1913,8 @@
      <exports symbol='xmlOutputBufferWriteString' type='function'/>
-     <exports symbol='xmlFileMatch' type='function'/>
-     <exports symbol='xmlPopInputCallbacks' type='function'/>
-     <exports symbol='xmlFileRead' type='function'/>
+     <exports symbol='xmlOutputCloseCallback' type='function'/>
+     <exports symbol='xmlOutputMatchCallback' type='function'/>
+     <exports symbol='xmlOutputOpenCallback' type='function'/>
+     <exports symbol='xmlOutputWriteCallback' type='function'/>
+     <exports symbol='xmlParserGetDirectory' type='function'/>
+     <exports symbol='xmlParserInputBufferCreateFd' type='function'/>
      <exports symbol='xmlParserInputBufferCreateFile' type='function'/>
@@ -1928,12 +1920,20 @@
      <exports symbol='xmlParserInputBufferCreateFile' type='function'/>
-     <exports symbol='xmlParserGetDirectory' type='function'/>
-     <exports symbol='xmlOutputBufferWrite' type='function'/>
-     <exports symbol='xmlCleanupInputCallbacks' type='function'/>
-     <exports symbol='xmlInputCloseCallback' type='function'/>
-     <exports symbol='xmlIOHTTPOpenW' type='function'/>
-     <exports symbol='xmlParserInputBufferCreateFd' type='function'/>
+     <exports symbol='xmlParserInputBufferCreateFilename' type='function'/>
+     <exports symbol='xmlParserInputBufferCreateIO' type='function'/>
+     <exports symbol='xmlParserInputBufferCreateMem' type='function'/>
+     <exports symbol='xmlParserInputBufferCreateStatic' type='function'/>
+     <exports symbol='xmlParserInputBufferGrow' type='function'/>
+     <exports symbol='xmlParserInputBufferPush' type='function'/>
+     <exports symbol='xmlParserInputBufferRead' type='function'/>
+     <exports symbol='xmlPopInputCallbacks' type='function'/>
+     <exports symbol='xmlPopOutputCallbacks' type='function'/>
+     <exports symbol='xmlRegisterDefaultInputCallbacks' type='function'/>
+     <exports symbol='xmlRegisterDefaultOutputCallbacks' type='function'/>
+     <exports symbol='xmlRegisterHTTPPostCallbacks' type='function'/>
+     <exports symbol='xmlRegisterInputCallbacks' type='function'/>
+     <exports symbol='xmlRegisterOutputCallbacks' type='function'/>
     </file>
     <file name='xmlautomata'>
      <summary>API to build regexp automata</summary>
      <description>the API to build regexp automata </description>
      <author>Daniel Veillard </author>
@@ -1935,9 +1935,8 @@
     </file>
     <file name='xmlautomata'>
      <summary>API to build regexp automata</summary>
      <description>the API to build regexp automata </description>
      <author>Daniel Veillard </author>
-     <exports symbol='xmlAutomataStatePtr' type='typedef'/>
      <exports symbol='xmlAutomata' type='typedef'/>
      <exports symbol='xmlAutomataPtr' type='typedef'/>
      <exports symbol='xmlAutomataState' type='typedef'/>
@@ -1941,6 +1940,6 @@
      <exports symbol='xmlAutomata' type='typedef'/>
      <exports symbol='xmlAutomataPtr' type='typedef'/>
      <exports symbol='xmlAutomataState' type='typedef'/>
-     <exports symbol='xmlFreeAutomata' type='function'/>
-     <exports symbol='xmlAutomataNewCounter' type='function'/>
+     <exports symbol='xmlAutomataStatePtr' type='typedef'/>
+     <exports symbol='xmlAutomataCompile' type='function'/>
      <exports symbol='xmlAutomataGetInitState' type='function'/>
@@ -1946,4 +1945,4 @@
      <exports symbol='xmlAutomataGetInitState' type='function'/>
-     <exports symbol='xmlAutomataNewTransition2' type='function'/>
-     <exports symbol='xmlAutomataNewState' type='function'/>
+     <exports symbol='xmlAutomataIsDeterminist' type='function'/>
+     <exports symbol='xmlAutomataNewAllTrans' type='function'/>
      <exports symbol='xmlAutomataNewCountTrans' type='function'/>
@@ -1949,4 +1948,3 @@
      <exports symbol='xmlAutomataNewCountTrans' type='function'/>
-     <exports symbol='xmlAutomataNewOnceTrans2' type='function'/>
-     <exports symbol='xmlAutomataNewAllTrans' type='function'/>
+     <exports symbol='xmlAutomataNewCountTrans2' type='function'/>
      <exports symbol='xmlAutomataNewCountedTrans' type='function'/>
@@ -1952,2 +1950,3 @@
      <exports symbol='xmlAutomataNewCountedTrans' type='function'/>
+     <exports symbol='xmlAutomataNewCounter' type='function'/>
      <exports symbol='xmlAutomataNewCounterTrans' type='function'/>
@@ -1953,3 +1952,3 @@
      <exports symbol='xmlAutomataNewCounterTrans' type='function'/>
-     <exports symbol='xmlAutomataCompile' type='function'/>
+     <exports symbol='xmlAutomataNewEpsilon' type='function'/>
      <exports symbol='xmlAutomataNewNegTrans' type='function'/>
@@ -1955,4 +1954,9 @@
      <exports symbol='xmlAutomataNewNegTrans' type='function'/>
-     <exports symbol='xmlAutomataNewEpsilon' type='function'/>
-     <exports symbol='xmlAutomataNewCountTrans2' type='function'/>
+     <exports symbol='xmlAutomataNewOnceTrans' type='function'/>
+     <exports symbol='xmlAutomataNewOnceTrans2' type='function'/>
+     <exports symbol='xmlAutomataNewState' type='function'/>
+     <exports symbol='xmlAutomataNewTransition' type='function'/>
+     <exports symbol='xmlAutomataNewTransition2' type='function'/>
+     <exports symbol='xmlAutomataSetFinalState' type='function'/>
+     <exports symbol='xmlFreeAutomata' type='function'/>
      <exports symbol='xmlNewAutomata' type='function'/>
@@ -1958,10 +1962,6 @@
      <exports symbol='xmlNewAutomata' type='function'/>
-     <exports symbol='xmlAutomataSetFinalState' type='function'/>
-     <exports symbol='xmlAutomataNewOnceTrans' type='function'/>
-     <exports symbol='xmlAutomataNewTransition' type='function'/>
-     <exports symbol='xmlAutomataIsDeterminist' type='function'/>
     </file>
     <file name='xmlerror'>
      <summary>error handling</summary>
      <description>the API used to report errors </description>
      <author>Daniel Veillard </author>
@@ -1963,6 +1963,58 @@
     </file>
     <file name='xmlerror'>
      <summary>error handling</summary>
      <description>the API used to report errors </description>
      <author>Daniel Veillard </author>
+     <exports symbol='XML_BUF_OVERFLOW' type='enum'/>
+     <exports symbol='XML_C14N_CREATE_CTXT' type='enum'/>
+     <exports symbol='XML_C14N_CREATE_STACK' type='enum'/>
+     <exports symbol='XML_C14N_INVALID_NODE' type='enum'/>
+     <exports symbol='XML_C14N_RELATIVE_NAMESPACE' type='enum'/>
+     <exports symbol='XML_C14N_REQUIRES_UTF8' type='enum'/>
+     <exports symbol='XML_C14N_UNKNOW_NODE' type='enum'/>
+     <exports symbol='XML_CATALOG_ENTRY_BROKEN' type='enum'/>
+     <exports symbol='XML_CATALOG_MISSING_ATTR' type='enum'/>
+     <exports symbol='XML_CATALOG_NOT_CATALOG' type='enum'/>
+     <exports symbol='XML_CATALOG_PREFER_VALUE' type='enum'/>
+     <exports symbol='XML_CATALOG_RECURSION' type='enum'/>
+     <exports symbol='XML_CHECK_ENTITY_TYPE' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_ATTRIBUTE' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_CDATA' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_COMMENT' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_DOCTYPE' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_ELEMENT' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_ENTITY' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_ENTITYREF' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_FRAGMENT' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_NOTATION' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_PI' type='enum'/>
+     <exports symbol='XML_CHECK_FOUND_TEXT' type='enum'/>
+     <exports symbol='XML_CHECK_NAME_NOT_NULL' type='enum'/>
+     <exports symbol='XML_CHECK_NOT_ATTR' type='enum'/>
+     <exports symbol='XML_CHECK_NOT_ATTR_DECL' type='enum'/>
+     <exports symbol='XML_CHECK_NOT_DTD' type='enum'/>
+     <exports symbol='XML_CHECK_NOT_ELEM_DECL' type='enum'/>
+     <exports symbol='XML_CHECK_NOT_ENTITY_DECL' type='enum'/>
+     <exports symbol='XML_CHECK_NOT_NCNAME' type='enum'/>
+     <exports symbol='XML_CHECK_NOT_NS_DECL' type='enum'/>
+     <exports symbol='XML_CHECK_NOT_UTF8' type='enum'/>
+     <exports symbol='XML_CHECK_NO_DICT' type='enum'/>
+     <exports symbol='XML_CHECK_NO_DOC' type='enum'/>
+     <exports symbol='XML_CHECK_NO_ELEM' type='enum'/>
+     <exports symbol='XML_CHECK_NO_HREF' type='enum'/>
+     <exports symbol='XML_CHECK_NO_NAME' type='enum'/>
+     <exports symbol='XML_CHECK_NO_NEXT' type='enum'/>
+     <exports symbol='XML_CHECK_NO_PARENT' type='enum'/>
+     <exports symbol='XML_CHECK_NO_PREV' type='enum'/>
+     <exports symbol='XML_CHECK_NS_ANCESTOR' type='enum'/>
+     <exports symbol='XML_CHECK_NS_SCOPE' type='enum'/>
+     <exports symbol='XML_CHECK_OUTSIDE_DICT' type='enum'/>
+     <exports symbol='XML_CHECK_UNKNOWN_NODE' type='enum'/>
+     <exports symbol='XML_CHECK_WRONG_DOC' type='enum'/>
+     <exports symbol='XML_CHECK_WRONG_NAME' type='enum'/>
+     <exports symbol='XML_CHECK_WRONG_NEXT' type='enum'/>
+     <exports symbol='XML_CHECK_WRONG_PARENT' type='enum'/>
+     <exports symbol='XML_CHECK_WRONG_PREV' type='enum'/>
+     <exports symbol='XML_DTD_ATTRIBUTE_DEFAULT' type='enum'/>
+     <exports symbol='XML_DTD_ATTRIBUTE_REDEFINED' type='enum'/>
      <exports symbol='XML_DTD_ATTRIBUTE_VALUE' type='enum'/>
@@ -1968,13 +2020,61 @@
      <exports symbol='XML_DTD_ATTRIBUTE_VALUE' type='enum'/>
-     <exports symbol='XML_RNGP_PARAM_NAME_MISSING' type='enum'/>
-     <exports symbol='XML_RNGP_PARENTREF_NO_PARENT' type='enum'/>
-     <exports symbol='XML_IO_EISCONN' type='enum'/>
-     <exports symbol='XML_RNGP_VALUE_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAP_IMPORT_SCHEMA_NOT_URI' type='enum'/>
-     <exports symbol='XML_SCHEMAP_ELEM_NONAME_NOREF' type='enum'/>
-     <exports symbol='XML_CHECK_NOT_DTD' type='enum'/>
-     <exports symbol='XML_SCHEMAP_S4S_ATTR_MISSING' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_IMPORT' type='enum'/>
-     <exports symbol='XML_SCHEMAV_VALUE' type='enum'/>
-     <exports symbol='XML_XPATH_UNKNOWN_FUNC_ERROR' type='enum'/>
+     <exports symbol='XML_DTD_CONTENT_ERROR' type='enum'/>
+     <exports symbol='XML_DTD_CONTENT_MODEL' type='enum'/>
+     <exports symbol='XML_DTD_CONTENT_NOT_DETERMINIST' type='enum'/>
+     <exports symbol='XML_DTD_DIFFERENT_PREFIX' type='enum'/>
+     <exports symbol='XML_DTD_DUP_TOKEN' type='enum'/>
+     <exports symbol='XML_DTD_ELEM_DEFAULT_NAMESPACE' type='enum'/>
+     <exports symbol='XML_DTD_ELEM_NAMESPACE' type='enum'/>
+     <exports symbol='XML_DTD_ELEM_REDEFINED' type='enum'/>
+     <exports symbol='XML_DTD_EMPTY_NOTATION' type='enum'/>
+     <exports symbol='XML_DTD_ENTITY_TYPE' type='enum'/>
+     <exports symbol='XML_DTD_ID_FIXED' type='enum'/>
+     <exports symbol='XML_DTD_ID_REDEFINED' type='enum'/>
+     <exports symbol='XML_DTD_ID_SUBSET' type='enum'/>
+     <exports symbol='XML_DTD_INVALID_CHILD' type='enum'/>
+     <exports symbol='XML_DTD_INVALID_DEFAULT' type='enum'/>
+     <exports symbol='XML_DTD_LOAD_ERROR' type='enum'/>
+     <exports symbol='XML_DTD_MISSING_ATTRIBUTE' type='enum'/>
+     <exports symbol='XML_DTD_MIXED_CORRUPT' type='enum'/>
+     <exports symbol='XML_DTD_MULTIPLE_ID' type='enum'/>
+     <exports symbol='XML_DTD_NOTATION_REDEFINED' type='enum'/>
+     <exports symbol='XML_DTD_NOTATION_VALUE' type='enum'/>
+     <exports symbol='XML_DTD_NOT_EMPTY' type='enum'/>
+     <exports symbol='XML_DTD_NOT_PCDATA' type='enum'/>
+     <exports symbol='XML_DTD_NOT_STANDALONE' type='enum'/>
+     <exports symbol='XML_DTD_NO_DOC' type='enum'/>
+     <exports symbol='XML_DTD_NO_DTD' type='enum'/>
+     <exports symbol='XML_DTD_NO_ELEM_NAME' type='enum'/>
+     <exports symbol='XML_DTD_NO_PREFIX' type='enum'/>
+     <exports symbol='XML_DTD_NO_ROOT' type='enum'/>
+     <exports symbol='XML_DTD_ROOT_NAME' type='enum'/>
+     <exports symbol='XML_DTD_STANDALONE_DEFAULTED' type='enum'/>
+     <exports symbol='XML_DTD_STANDALONE_WHITE_SPACE' type='enum'/>
+     <exports symbol='XML_DTD_UNKNOWN_ATTRIBUTE' type='enum'/>
+     <exports symbol='XML_DTD_UNKNOWN_ELEM' type='enum'/>
+     <exports symbol='XML_DTD_UNKNOWN_ENTITY' type='enum'/>
+     <exports symbol='XML_DTD_UNKNOWN_ID' type='enum'/>
+     <exports symbol='XML_DTD_UNKNOWN_NOTATION' type='enum'/>
+     <exports symbol='XML_DTD_XMLID_TYPE' type='enum'/>
+     <exports symbol='XML_DTD_XMLID_VALUE' type='enum'/>
+     <exports symbol='XML_ERR_ATTLIST_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_ATTLIST_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_ATTRIBUTE_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_ATTRIBUTE_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_ATTRIBUTE_REDEFINED' type='enum'/>
+     <exports symbol='XML_ERR_ATTRIBUTE_WITHOUT_VALUE' type='enum'/>
+     <exports symbol='XML_ERR_CDATA_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_CHARREF_AT_EOF' type='enum'/>
+     <exports symbol='XML_ERR_CHARREF_IN_DTD' type='enum'/>
+     <exports symbol='XML_ERR_CHARREF_IN_EPILOG' type='enum'/>
+     <exports symbol='XML_ERR_CHARREF_IN_PROLOG' type='enum'/>
+     <exports symbol='XML_ERR_COMMENT_ABRUPTLY_ENDED' type='enum'/>
+     <exports symbol='XML_ERR_COMMENT_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_CONDSEC_INVALID' type='enum'/>
+     <exports symbol='XML_ERR_CONDSEC_INVALID_KEYWORD' type='enum'/>
+     <exports symbol='XML_ERR_CONDSEC_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_CONDSEC_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_DOCTYPE_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_DOCUMENT_EMPTY' type='enum'/>
+     <exports symbol='XML_ERR_DOCUMENT_END' type='enum'/>
      <exports symbol='XML_ERR_DOCUMENT_START' type='enum'/>
@@ -1980,16 +2080,26 @@
      <exports symbol='XML_ERR_DOCUMENT_START' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_TEXT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_AG_PROPS_CORRECT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_IMPORT_2_1' type='enum'/>
-     <exports symbol='XML_DTD_NOT_STANDALONE' type='enum'/>
-     <exports symbol='XML_HTTP_USE_IP' type='enum'/>
-     <exports symbol='XML_ERR_XMLDECL_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING' type='enum'/>
-     <exports symbol='XML_SCHEMAV_ELEMENT_CONTENT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_1_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_IMPORT_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_SCHEMAS_CHILD' type='enum'/>
-     <exports symbol='XML_ERR_LT_IN_ATTRIBUTE' type='enum'/>
-     <exports symbol='XML_XINCLUDE_ENTITY_DEF_MISMATCH' type='enum'/>
-     <exports symbol='XML_SAVE_NOT_UTF8' type='enum'/>
+     <exports symbol='XML_ERR_ELEMCONTENT_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_ELEMCONTENT_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_ENCODING_NAME' type='enum'/>
+     <exports symbol='XML_ERR_ENTITYREF_AT_EOF' type='enum'/>
+     <exports symbol='XML_ERR_ENTITYREF_IN_DTD' type='enum'/>
+     <exports symbol='XML_ERR_ENTITYREF_IN_EPILOG' type='enum'/>
+     <exports symbol='XML_ERR_ENTITYREF_IN_PROLOG' type='enum'/>
+     <exports symbol='XML_ERR_ENTITYREF_NO_NAME' type='enum'/>
+     <exports symbol='XML_ERR_ENTITYREF_SEMICOL_MISSING' type='enum'/>
+     <exports symbol='XML_ERR_ENTITY_BOUNDARY' type='enum'/>
+     <exports symbol='XML_ERR_ENTITY_CHAR_ERROR' type='enum'/>
+     <exports symbol='XML_ERR_ENTITY_IS_EXTERNAL' type='enum'/>
+     <exports symbol='XML_ERR_ENTITY_IS_PARAMETER' type='enum'/>
+     <exports symbol='XML_ERR_ENTITY_LOOP' type='enum'/>
+     <exports symbol='XML_ERR_ENTITY_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_ENTITY_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_ENTITY_PE_INTERNAL' type='enum'/>
+     <exports symbol='XML_ERR_ENTITY_PROCESSING' type='enum'/>
+     <exports symbol='XML_ERR_EQUAL_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_ERROR' type='enum'/>
+     <exports symbol='XML_ERR_EXTRA_CONTENT' type='enum'/>
+     <exports symbol='XML_ERR_EXT_ENTITY_STANDALONE' type='enum'/>
+     <exports symbol='XML_ERR_EXT_SUBSET_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_FATAL' type='enum'/>
      <exports symbol='XML_ERR_GT_REQUIRED' type='enum'/>
@@ -1995,7 +2105,120 @@
      <exports symbol='XML_ERR_GT_REQUIRED' type='enum'/>
-     <exports symbol='XML_XPTR_EXTRA_OBJECTS' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_ATTR_USE' type='enum'/>
-     <exports symbol='XML_IO_UNKNOWN' type='enum'/>
-     <exports symbol='XML_RNGP_INTERLEAVE_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_ATTR_INLINE_COMBINATION' type='enum'/>
+     <exports symbol='XML_ERR_HYPHEN_IN_COMMENT' type='enum'/>
+     <exports symbol='XML_ERR_INTERNAL_ERROR' type='enum'/>
+     <exports symbol='XML_ERR_INVALID_CHAR' type='enum'/>
+     <exports symbol='XML_ERR_INVALID_CHARREF' type='enum'/>
+     <exports symbol='XML_ERR_INVALID_DEC_CHARREF' type='enum'/>
+     <exports symbol='XML_ERR_INVALID_ENCODING' type='enum'/>
+     <exports symbol='XML_ERR_INVALID_HEX_CHARREF' type='enum'/>
+     <exports symbol='XML_ERR_INVALID_URI' type='enum'/>
+     <exports symbol='XML_ERR_LITERAL_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_LITERAL_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_LTSLASH_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_LT_IN_ATTRIBUTE' type='enum'/>
+     <exports symbol='XML_ERR_LT_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_MISPLACED_CDATA_END' type='enum'/>
+     <exports symbol='XML_ERR_MISSING_ENCODING' type='enum'/>
+     <exports symbol='XML_ERR_MIXED_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_MIXED_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_NAME_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_NAME_TOO_LONG' type='enum'/>
+     <exports symbol='XML_ERR_NMTOKEN_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_NONE' type='enum'/>
+     <exports symbol='XML_ERR_NOTATION_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_NOTATION_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_NOTATION_PROCESSING' type='enum'/>
+     <exports symbol='XML_ERR_NOT_STANDALONE' type='enum'/>
+     <exports symbol='XML_ERR_NOT_WELL_BALANCED' type='enum'/>
+     <exports symbol='XML_ERR_NO_DTD' type='enum'/>
+     <exports symbol='XML_ERR_NO_MEMORY' type='enum'/>
+     <exports symbol='XML_ERR_NS_DECL_ERROR' type='enum'/>
+     <exports symbol='XML_ERR_OK' type='enum'/>
+     <exports symbol='XML_ERR_PCDATA_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_PEREF_AT_EOF' type='enum'/>
+     <exports symbol='XML_ERR_PEREF_IN_EPILOG' type='enum'/>
+     <exports symbol='XML_ERR_PEREF_IN_INT_SUBSET' type='enum'/>
+     <exports symbol='XML_ERR_PEREF_IN_PROLOG' type='enum'/>
+     <exports symbol='XML_ERR_PEREF_NO_NAME' type='enum'/>
+     <exports symbol='XML_ERR_PEREF_SEMICOL_MISSING' type='enum'/>
+     <exports symbol='XML_ERR_PI_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_PI_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_PUBID_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_RESERVED_XML_NAME' type='enum'/>
+     <exports symbol='XML_ERR_SEPARATOR_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_SPACE_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_STANDALONE_VALUE' type='enum'/>
+     <exports symbol='XML_ERR_STRING_NOT_CLOSED' type='enum'/>
+     <exports symbol='XML_ERR_STRING_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_ERR_TAG_NAME_MISMATCH' type='enum'/>
+     <exports symbol='XML_ERR_TAG_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_UNDECLARED_ENTITY' type='enum'/>
+     <exports symbol='XML_ERR_UNKNOWN_ENCODING' type='enum'/>
+     <exports symbol='XML_ERR_UNKNOWN_VERSION' type='enum'/>
+     <exports symbol='XML_ERR_UNPARSED_ENTITY' type='enum'/>
+     <exports symbol='XML_ERR_UNSUPPORTED_ENCODING' type='enum'/>
+     <exports symbol='XML_ERR_URI_FRAGMENT' type='enum'/>
+     <exports symbol='XML_ERR_URI_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_USER_STOP' type='enum'/>
+     <exports symbol='XML_ERR_VALUE_REQUIRED' type='enum'/>
+     <exports symbol='XML_ERR_VERSION_MISMATCH' type='enum'/>
+     <exports symbol='XML_ERR_VERSION_MISSING' type='enum'/>
+     <exports symbol='XML_ERR_WARNING' type='enum'/>
+     <exports symbol='XML_ERR_XMLDECL_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_ERR_XMLDECL_NOT_STARTED' type='enum'/>
+     <exports symbol='XML_FROM_BUFFER' type='enum'/>
+     <exports symbol='XML_FROM_C14N' type='enum'/>
+     <exports symbol='XML_FROM_CATALOG' type='enum'/>
+     <exports symbol='XML_FROM_CHECK' type='enum'/>
+     <exports symbol='XML_FROM_DATATYPE' type='enum'/>
+     <exports symbol='XML_FROM_DTD' type='enum'/>
+     <exports symbol='XML_FROM_FTP' type='enum'/>
+     <exports symbol='XML_FROM_HTML' type='enum'/>
+     <exports symbol='XML_FROM_HTTP' type='enum'/>
+     <exports symbol='XML_FROM_I18N' type='enum'/>
+     <exports symbol='XML_FROM_IO' type='enum'/>
+     <exports symbol='XML_FROM_MEMORY' type='enum'/>
+     <exports symbol='XML_FROM_MODULE' type='enum'/>
+     <exports symbol='XML_FROM_NAMESPACE' type='enum'/>
+     <exports symbol='XML_FROM_NONE' type='enum'/>
+     <exports symbol='XML_FROM_OUTPUT' type='enum'/>
+     <exports symbol='XML_FROM_PARSER' type='enum'/>
+     <exports symbol='XML_FROM_REGEXP' type='enum'/>
+     <exports symbol='XML_FROM_RELAXNGP' type='enum'/>
+     <exports symbol='XML_FROM_RELAXNGV' type='enum'/>
+     <exports symbol='XML_FROM_SCHEMASP' type='enum'/>
+     <exports symbol='XML_FROM_SCHEMASV' type='enum'/>
+     <exports symbol='XML_FROM_SCHEMATRONV' type='enum'/>
+     <exports symbol='XML_FROM_TREE' type='enum'/>
+     <exports symbol='XML_FROM_URI' type='enum'/>
+     <exports symbol='XML_FROM_VALID' type='enum'/>
+     <exports symbol='XML_FROM_WRITER' type='enum'/>
+     <exports symbol='XML_FROM_XINCLUDE' type='enum'/>
+     <exports symbol='XML_FROM_XPATH' type='enum'/>
+     <exports symbol='XML_FROM_XPOINTER' type='enum'/>
+     <exports symbol='XML_FROM_XSLT' type='enum'/>
+     <exports symbol='XML_FTP_ACCNT' type='enum'/>
+     <exports symbol='XML_FTP_EPSV_ANSWER' type='enum'/>
+     <exports symbol='XML_FTP_PASV_ANSWER' type='enum'/>
+     <exports symbol='XML_FTP_URL_SYNTAX' type='enum'/>
+     <exports symbol='XML_HTML_INCORRECTLY_OPENED_COMMENT' type='enum'/>
+     <exports symbol='XML_HTML_STRUCURE_ERROR' type='enum'/>
+     <exports symbol='XML_HTML_UNKNOWN_TAG' type='enum'/>
+     <exports symbol='XML_HTTP_UNKNOWN_HOST' type='enum'/>
+     <exports symbol='XML_HTTP_URL_SYNTAX' type='enum'/>
+     <exports symbol='XML_HTTP_USE_IP' type='enum'/>
+     <exports symbol='XML_I18N_CONV_FAILED' type='enum'/>
+     <exports symbol='XML_I18N_EXCESS_HANDLER' type='enum'/>
+     <exports symbol='XML_I18N_NO_HANDLER' type='enum'/>
+     <exports symbol='XML_I18N_NO_NAME' type='enum'/>
+     <exports symbol='XML_I18N_NO_OUTPUT' type='enum'/>
+     <exports symbol='XML_IO_BUFFER_FULL' type='enum'/>
+     <exports symbol='XML_IO_EACCES' type='enum'/>
+     <exports symbol='XML_IO_EADDRINUSE' type='enum'/>
+     <exports symbol='XML_IO_EAFNOSUPPORT' type='enum'/>
+     <exports symbol='XML_IO_EAGAIN' type='enum'/>
+     <exports symbol='XML_IO_EALREADY' type='enum'/>
+     <exports symbol='XML_IO_EBADF' type='enum'/>
+     <exports symbol='XML_IO_EBADMSG' type='enum'/>
+     <exports symbol='XML_IO_EBUSY' type='enum'/>
+     <exports symbol='XML_IO_ECANCELED' type='enum'/>
      <exports symbol='XML_IO_ECHILD' type='enum'/>
@@ -2001,6 +2224,9 @@
      <exports symbol='XML_IO_ECHILD' type='enum'/>
-     <exports symbol='XML_RNGP_NAME_MISSING' type='enum'/>
-     <exports symbol='XML_ERR_CONDSEC_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_COMPLEXCONTENT_CHILD' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_SIMPLE_TYPE_2' type='enum'/>
+     <exports symbol='XML_IO_ECONNREFUSED' type='enum'/>
+     <exports symbol='XML_IO_EDEADLK' type='enum'/>
+     <exports symbol='XML_IO_EDOM' type='enum'/>
+     <exports symbol='XML_IO_EEXIST' type='enum'/>
+     <exports symbol='XML_IO_EFAULT' type='enum'/>
+     <exports symbol='XML_IO_EFBIG' type='enum'/>
+     <exports symbol='XML_IO_EINPROGRESS' type='enum'/>
      <exports symbol='XML_IO_EINTR' type='enum'/>
@@ -2006,4 +2232,53 @@
      <exports symbol='XML_IO_EINTR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_SIMPLE_TYPE_1' type='enum'/>
-     <exports symbol='XML_RNGP_XMLNS_NAME' type='enum'/>
+     <exports symbol='XML_IO_EINVAL' type='enum'/>
+     <exports symbol='XML_IO_EIO' type='enum'/>
+     <exports symbol='XML_IO_EISCONN' type='enum'/>
+     <exports symbol='XML_IO_EISDIR' type='enum'/>
+     <exports symbol='XML_IO_EMFILE' type='enum'/>
+     <exports symbol='XML_IO_EMLINK' type='enum'/>
+     <exports symbol='XML_IO_EMSGSIZE' type='enum'/>
+     <exports symbol='XML_IO_ENAMETOOLONG' type='enum'/>
+     <exports symbol='XML_IO_ENCODER' type='enum'/>
+     <exports symbol='XML_IO_ENETUNREACH' type='enum'/>
+     <exports symbol='XML_IO_ENFILE' type='enum'/>
+     <exports symbol='XML_IO_ENODEV' type='enum'/>
+     <exports symbol='XML_IO_ENOENT' type='enum'/>
+     <exports symbol='XML_IO_ENOEXEC' type='enum'/>
+     <exports symbol='XML_IO_ENOLCK' type='enum'/>
+     <exports symbol='XML_IO_ENOMEM' type='enum'/>
+     <exports symbol='XML_IO_ENOSPC' type='enum'/>
+     <exports symbol='XML_IO_ENOSYS' type='enum'/>
+     <exports symbol='XML_IO_ENOTDIR' type='enum'/>
+     <exports symbol='XML_IO_ENOTEMPTY' type='enum'/>
+     <exports symbol='XML_IO_ENOTSOCK' type='enum'/>
+     <exports symbol='XML_IO_ENOTSUP' type='enum'/>
+     <exports symbol='XML_IO_ENOTTY' type='enum'/>
+     <exports symbol='XML_IO_ENXIO' type='enum'/>
+     <exports symbol='XML_IO_EPERM' type='enum'/>
+     <exports symbol='XML_IO_EPIPE' type='enum'/>
+     <exports symbol='XML_IO_ERANGE' type='enum'/>
+     <exports symbol='XML_IO_EROFS' type='enum'/>
+     <exports symbol='XML_IO_ESPIPE' type='enum'/>
+     <exports symbol='XML_IO_ESRCH' type='enum'/>
+     <exports symbol='XML_IO_ETIMEDOUT' type='enum'/>
+     <exports symbol='XML_IO_EXDEV' type='enum'/>
+     <exports symbol='XML_IO_FLUSH' type='enum'/>
+     <exports symbol='XML_IO_LOAD_ERROR' type='enum'/>
+     <exports symbol='XML_IO_NETWORK_ATTEMPT' type='enum'/>
+     <exports symbol='XML_IO_NO_INPUT' type='enum'/>
+     <exports symbol='XML_IO_UNKNOWN' type='enum'/>
+     <exports symbol='XML_IO_WRITE' type='enum'/>
+     <exports symbol='XML_MODULE_CLOSE' type='enum'/>
+     <exports symbol='XML_MODULE_OPEN' type='enum'/>
+     <exports symbol='XML_NS_ERR_ATTRIBUTE_REDEFINED' type='enum'/>
+     <exports symbol='XML_NS_ERR_COLON' type='enum'/>
+     <exports symbol='XML_NS_ERR_EMPTY' type='enum'/>
+     <exports symbol='XML_NS_ERR_QNAME' type='enum'/>
+     <exports symbol='XML_NS_ERR_UNDEFINED_NAMESPACE' type='enum'/>
+     <exports symbol='XML_NS_ERR_XML_NAMESPACE' type='enum'/>
+     <exports symbol='XML_REGEXP_COMPILE_ERROR' type='enum'/>
+     <exports symbol='XML_RNGP_ANYNAME_ATTR_ANCESTOR' type='enum'/>
+     <exports symbol='XML_RNGP_ATTRIBUTE_CHILDREN' type='enum'/>
+     <exports symbol='XML_RNGP_ATTRIBUTE_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_ATTRIBUTE_EMPTY' type='enum'/>
      <exports symbol='XML_RNGP_ATTRIBUTE_NOOP' type='enum'/>
@@ -2009,15 +2284,16 @@
      <exports symbol='XML_RNGP_ATTRIBUTE_NOOP' type='enum'/>
-     <exports symbol='XML_SCHEMAP_REDEFINED_GROUP' type='enum'/>
-     <exports symbol='XML_SCHEMAP_IMPORT_NAMESPACE_NOT_URI' type='enum'/>
-     <exports symbol='XML_ERR_CHARREF_IN_EPILOG' type='enum'/>
-     <exports symbol='XML_DTD_ID_SUBSET' type='enum'/>
-     <exports symbol='XML_SCHEMAP_FAILED_BUILD_IMPORT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_ATTRGRP_CHILD' type='enum'/>
-     <exports symbol='XML_XPTR_CHILDSEQ_START' type='enum'/>
-     <exports symbol='XML_ERR_EXT_SUBSET_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_FROM_DTD' type='enum'/>
-     <exports symbol='XML_CHECK_NOT_ATTR' type='enum'/>
-     <exports symbol='XML_DTD_ATTRIBUTE_DEFAULT' type='enum'/>
-     <exports symbol='XML_FROM_MODULE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_EXTRACONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_ATTR_CONFLICT' type='enum'/>
+     <exports symbol='XML_RNGP_CHOICE_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_CHOICE_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_CREATE_FAILURE' type='enum'/>
+     <exports symbol='XML_RNGP_DATA_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_DEFINE_CREATE_FAILED' type='enum'/>
+     <exports symbol='XML_RNGP_DEFINE_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_DEFINE_MISSING' type='enum'/>
+     <exports symbol='XML_RNGP_DEFINE_NAME_MISSING' type='enum'/>
+     <exports symbol='XML_RNGP_DEF_CHOICE_AND_INTERLEAVE' type='enum'/>
+     <exports symbol='XML_RNGP_ELEMENT_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_ELEMENT_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_ELEMENT_NAME' type='enum'/>
+     <exports symbol='XML_RNGP_ELEMENT_NO_CONTENT' type='enum'/>
      <exports symbol='XML_RNGP_ELEM_CONTENT_EMPTY' type='enum'/>
@@ -2023,11 +2299,4 @@
      <exports symbol='XML_RNGP_ELEM_CONTENT_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAP_WARN_UNLOCATED_SCHEMA' type='enum'/>
-     <exports symbol='XML_IO_EMLINK' type='enum'/>
-     <exports symbol='XML_ERR_NMTOKEN_REQUIRED' type='enum'/>
-     <exports symbol='XML_RNGP_ANYNAME_ATTR_ANCESTOR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_3_1' type='enum'/>
-     <exports symbol='XML_ERR_PI_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_RNGP_START_CONTENT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_3_2' type='enum'/>
-     <exports symbol='XML_RNGP_GROUP_ATTR_CONFLICT' type='enum'/>
+     <exports symbol='XML_RNGP_ELEM_CONTENT_ERROR' type='enum'/>
+     <exports symbol='XML_RNGP_ELEM_TEXT_CONFLICT' type='enum'/>
      <exports symbol='XML_RNGP_EMPTY' type='enum'/>
@@ -2033,21 +2302,30 @@
      <exports symbol='XML_RNGP_EMPTY' type='enum'/>
-     <exports symbol='XML_ERR_DOCUMENT_EMPTY' type='enum'/>
-     <exports symbol='XML_XINCLUDE_RECURSION' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_RESOLVE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_FACET_VALID' type='enum'/>
-     <exports symbol='XML_SCHEMAP_RESTRICTION_NONAME_NOREF' type='enum'/>
-     <exports symbol='XML_I18N_NO_OUTPUT' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_ATTRIBUTE' type='enum'/>
-     <exports symbol='XML_ERR_STANDALONE_VALUE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_REDEFINED_ATTR' type='enum'/>
-     <exports symbol='XML_ERR_ENTITY_LOOP' type='enum'/>
-     <exports symbol='XML_IO_EINPROGRESS' type='enum'/>
-     <exports symbol='XML_SCHEMAP_REDEFINED_NOTATION' type='enum'/>
-     <exports symbol='XML_HTML_STRUCURE_ERROR' type='enum'/>
-     <exports symbol='XML_DTD_INVALID_DEFAULT' type='enum'/>
-     <exports symbol='XML_FROM_SCHEMATRONV' type='enum'/>
-     <exports symbol='XML_DTD_EMPTY_NOTATION' type='enum'/>
-     <exports symbol='XML_RNGP_ELEMENT_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAP_S4S_ELEM_NOT_ALLOWED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INCLUDE_SCHEMA_NOT_URI' type='enum'/>
+     <exports symbol='XML_RNGP_EMPTY_CONSTRUCT' type='enum'/>
+     <exports symbol='XML_RNGP_EMPTY_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_EMPTY_NOT_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_ERROR_TYPE_LIB' type='enum'/>
+     <exports symbol='XML_RNGP_EXCEPT_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_EXCEPT_MISSING' type='enum'/>
+     <exports symbol='XML_RNGP_EXCEPT_MULTIPLE' type='enum'/>
+     <exports symbol='XML_RNGP_EXCEPT_NO_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_EXTERNALREF_EMTPY' type='enum'/>
+     <exports symbol='XML_RNGP_EXTERNALREF_RECURSE' type='enum'/>
+     <exports symbol='XML_RNGP_EXTERNAL_REF_FAILURE' type='enum'/>
+     <exports symbol='XML_RNGP_FORBIDDEN_ATTRIBUTE' type='enum'/>
+     <exports symbol='XML_RNGP_FOREIGN_ELEMENT' type='enum'/>
+     <exports symbol='XML_RNGP_GRAMMAR_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_GRAMMAR_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_GRAMMAR_MISSING' type='enum'/>
+     <exports symbol='XML_RNGP_GRAMMAR_NO_START' type='enum'/>
+     <exports symbol='XML_RNGP_GROUP_ATTR_CONFLICT' type='enum'/>
+     <exports symbol='XML_RNGP_HREF_ERROR' type='enum'/>
+     <exports symbol='XML_RNGP_INCLUDE_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_INCLUDE_FAILURE' type='enum'/>
+     <exports symbol='XML_RNGP_INCLUDE_RECURSE' type='enum'/>
+     <exports symbol='XML_RNGP_INTERLEAVE_ADD' type='enum'/>
+     <exports symbol='XML_RNGP_INTERLEAVE_CREATE_FAILED' type='enum'/>
+     <exports symbol='XML_RNGP_INTERLEAVE_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_INTERLEAVE_NO_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_INVALID_DEFINE_NAME' type='enum'/>
+     <exports symbol='XML_RNGP_INVALID_URI' type='enum'/>
      <exports symbol='XML_RNGP_INVALID_VALUE' type='enum'/>
@@ -2053,3 +2331,92 @@
      <exports symbol='XML_RNGP_INVALID_VALUE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_1_2' type='enum'/>
+     <exports symbol='XML_RNGP_MISSING_HREF' type='enum'/>
+     <exports symbol='XML_RNGP_NAME_MISSING' type='enum'/>
+     <exports symbol='XML_RNGP_NEED_COMBINE' type='enum'/>
+     <exports symbol='XML_RNGP_NOTALLOWED_NOT_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_NSNAME_ATTR_ANCESTOR' type='enum'/>
+     <exports symbol='XML_RNGP_NSNAME_NO_NS' type='enum'/>
+     <exports symbol='XML_RNGP_PARAM_FORBIDDEN' type='enum'/>
+     <exports symbol='XML_RNGP_PARAM_NAME_MISSING' type='enum'/>
+     <exports symbol='XML_RNGP_PARENTREF_CREATE_FAILED' type='enum'/>
+     <exports symbol='XML_RNGP_PARENTREF_NAME_INVALID' type='enum'/>
+     <exports symbol='XML_RNGP_PARENTREF_NOT_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_PARENTREF_NO_NAME' type='enum'/>
+     <exports symbol='XML_RNGP_PARENTREF_NO_PARENT' type='enum'/>
+     <exports symbol='XML_RNGP_PARSE_ERROR' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_ANYNAME_EXCEPT_ANYNAME' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_ATTR_ATTR' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_ATTR_ELEM' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_ATTR' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_ELEM' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_GROUP' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_INTERLEAVE' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_LIST' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_ONEMORE' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_REF' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_TEXT' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_LIST_ATTR' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_LIST_ELEM' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_LIST_INTERLEAVE' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_LIST_LIST' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_LIST_REF' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_LIST_TEXT' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_NSNAME_EXCEPT_ANYNAME' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_NSNAME_EXCEPT_NSNAME' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_ONEMORE_GROUP_ATTR' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_ONEMORE_INTERLEAVE_ATTR' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_START_ATTR' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_START_DATA' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_START_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_START_GROUP' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_START_INTERLEAVE' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_START_LIST' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_START_ONEMORE' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_START_TEXT' type='enum'/>
+     <exports symbol='XML_RNGP_PAT_START_VALUE' type='enum'/>
+     <exports symbol='XML_RNGP_PREFIX_UNDEFINED' type='enum'/>
+     <exports symbol='XML_RNGP_REF_CREATE_FAILED' type='enum'/>
+     <exports symbol='XML_RNGP_REF_CYCLE' type='enum'/>
+     <exports symbol='XML_RNGP_REF_NAME_INVALID' type='enum'/>
+     <exports symbol='XML_RNGP_REF_NOT_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_REF_NO_DEF' type='enum'/>
+     <exports symbol='XML_RNGP_REF_NO_NAME' type='enum'/>
+     <exports symbol='XML_RNGP_START_CHOICE_AND_INTERLEAVE' type='enum'/>
+     <exports symbol='XML_RNGP_START_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_START_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_START_MISSING' type='enum'/>
+     <exports symbol='XML_RNGP_TEXT_EXPECTED' type='enum'/>
+     <exports symbol='XML_RNGP_TEXT_HAS_CHILD' type='enum'/>
+     <exports symbol='XML_RNGP_TYPE_MISSING' type='enum'/>
+     <exports symbol='XML_RNGP_TYPE_NOT_FOUND' type='enum'/>
+     <exports symbol='XML_RNGP_TYPE_VALUE' type='enum'/>
+     <exports symbol='XML_RNGP_UNKNOWN_ATTRIBUTE' type='enum'/>
+     <exports symbol='XML_RNGP_UNKNOWN_COMBINE' type='enum'/>
+     <exports symbol='XML_RNGP_UNKNOWN_CONSTRUCT' type='enum'/>
+     <exports symbol='XML_RNGP_UNKNOWN_TYPE_LIB' type='enum'/>
+     <exports symbol='XML_RNGP_URI_FRAGMENT' type='enum'/>
+     <exports symbol='XML_RNGP_URI_NOT_ABSOLUTE' type='enum'/>
+     <exports symbol='XML_RNGP_VALUE_EMPTY' type='enum'/>
+     <exports symbol='XML_RNGP_VALUE_NO_CONTENT' type='enum'/>
+     <exports symbol='XML_RNGP_XMLNS_NAME' type='enum'/>
+     <exports symbol='XML_RNGP_XML_NS' type='enum'/>
+     <exports symbol='XML_SAVE_CHAR_INVALID' type='enum'/>
+     <exports symbol='XML_SAVE_NOT_UTF8' type='enum'/>
+     <exports symbol='XML_SAVE_NO_DOCTYPE' type='enum'/>
+     <exports symbol='XML_SAVE_UNKNOWN_ENCODING' type='enum'/>
+     <exports symbol='XML_SCHEMAP_AG_PROPS_CORRECT' type='enum'/>
+     <exports symbol='XML_SCHEMAP_ATTRFORMDEFAULT_VALUE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_ATTRGRP_NONAME_NOREF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_ATTR_NONAME_NOREF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_AU_PROPS_CORRECT' type='enum'/>
+     <exports symbol='XML_SCHEMAP_AU_PROPS_CORRECT_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_A_PROPS_CORRECT_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_A_PROPS_CORRECT_3' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COMPLEXTYPE_NONAME_NOREF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ALL_LIMITED' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_CT_EXTENDS_1_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_CT_EXTENDS_1_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_CT_EXTENDS_1_3' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_DERIVED_OK_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_DERIVED_OK_2_2' type='enum'/>
      <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_1_1' type='enum'/>
@@ -2055,7 +2422,37 @@
      <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_1_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_SIMPLETYPE_CHILD' type='enum'/>
-     <exports symbol='XML_ERR_PEREF_AT_EOF' type='enum'/>
-     <exports symbol='XML_DTD_NOT_EMPTY' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_START_LIST' type='enum'/>
-     <exports symbol='XML_ERR_LT_REQUIRED' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_1_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_1_3_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_1_3_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_3' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_4' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_5' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_1_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_3' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_4' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_5' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_VALID_DEFAULT_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_VALID_DEFAULT_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_COS_VALID_DEFAULT_2_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_3' type='enum'/>
+     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_4' type='enum'/>
+     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_5' type='enum'/>
+     <exports symbol='XML_SCHEMAP_CVC_SIMPLE_TYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_C_PROPS_CORRECT' type='enum'/>
+     <exports symbol='XML_SCHEMAP_DEF_AND_PREFIX' type='enum'/>
+     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_3' type='enum'/>
      <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_2' type='enum'/>
@@ -2061,20 +2458,5 @@
      <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_AU_PROPS_CORRECT_2' type='enum'/>
-     <exports symbol='XML_ERR_ATTLIST_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_ERR_PCDATA_REQUIRED' type='enum'/>
-     <exports symbol='XML_SCHEMAV_INTERNAL' type='enum'/>
-     <exports symbol='XML_ERR_STRING_NOT_CLOSED' type='enum'/>
-     <exports symbol='XML_ERR_ENTITYREF_IN_DTD' type='enum'/>
-     <exports symbol='XML_XPATH_VARIABLE_REF_ERROR' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_NSNAME_EXCEPT_NSNAME' type='enum'/>
-     <exports symbol='XML_IO_ECANCELED' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_2' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_3' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_1' type='enum'/>
-     <exports symbol='XML_SCHEMAV_NOTSIMPLE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_MINEXCLUSIVE_VALID' type='enum'/>
-     <exports symbol='XML_IO_EADDRINUSE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_LIST_CHILD' type='enum'/>
-     <exports symbol='XML_DTD_UNKNOWN_ID' type='enum'/>
+     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_3' type='enum'/>
+     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_1' type='enum'/>
      <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_2' type='enum'/>
      <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_3' type='enum'/>
@@ -2079,8 +2461,79 @@
      <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_2' type='enum'/>
      <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_3' type='enum'/>
-     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_1' type='enum'/>
-     <exports symbol='XML_IO_EDOM' type='enum'/>
-     <exports symbol='XML_CHECK_NOT_ELEM_DECL' type='enum'/>
-     <exports symbol='XML_RNGP_DEFINE_CREATE_FAILED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ELEMENT_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_ELEMFORMDEFAULT_VALUE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_ELEM_DEFAULT_FIXED' type='enum'/>
+     <exports symbol='XML_SCHEMAP_ELEM_NONAME_NOREF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_EXTENSION_NO_BASE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_3' type='enum'/>
+     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_4' type='enum'/>
+     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_5' type='enum'/>
+     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_6' type='enum'/>
+     <exports symbol='XML_SCHEMAP_FACET_NO_VALUE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_FAILED_BUILD_IMPORT' type='enum'/>
+     <exports symbol='XML_SCHEMAP_FAILED_LOAD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_FAILED_PARSE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_GROUP_NONAME_NOREF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_IMPORT_NAMESPACE_NOT_URI' type='enum'/>
+     <exports symbol='XML_SCHEMAP_IMPORT_REDEFINE_NSNAME' type='enum'/>
+     <exports symbol='XML_SCHEMAP_IMPORT_SCHEMA_NOT_URI' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INCLUDE_SCHEMA_NOT_URI' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INTERNAL' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INTERSECTION_NOT_EXPRESSIBLE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_ATTR_COMBINATION' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_ATTR_INLINE_COMBINATION' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_ATTR_NAME' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_ATTR_USE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_BOOLEAN' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_ENUM' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_FACET' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_FACET_VALUE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_MAXOCCURS' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_MINOCCURS' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_REF_AND_SUBTYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_INVALID_WHITE_SPACE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_MG_PROPS_CORRECT_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_MG_PROPS_CORRECT_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_NOATTR_NOREF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_NOROOT' type='enum'/>
+     <exports symbol='XML_SCHEMAP_NOTATION_NO_NAME' type='enum'/>
+     <exports symbol='XML_SCHEMAP_NOTHING_TO_PARSE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_NOTYPE_NOREF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_NOT_DETERMINISTIC' type='enum'/>
+     <exports symbol='XML_SCHEMAP_NOT_SCHEMA' type='enum'/>
+     <exports symbol='XML_SCHEMAP_NO_XMLNS' type='enum'/>
+     <exports symbol='XML_SCHEMAP_NO_XSI' type='enum'/>
+     <exports symbol='XML_SCHEMAP_PREFIX_UNDEFINED' type='enum'/>
+     <exports symbol='XML_SCHEMAP_P_PROPS_CORRECT_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_P_PROPS_CORRECT_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_P_PROPS_CORRECT_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_RECURSIVE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_REDEFINED_ATTR' type='enum'/>
+     <exports symbol='XML_SCHEMAP_REDEFINED_ATTRGROUP' type='enum'/>
+     <exports symbol='XML_SCHEMAP_REDEFINED_ELEMENT' type='enum'/>
+     <exports symbol='XML_SCHEMAP_REDEFINED_GROUP' type='enum'/>
+     <exports symbol='XML_SCHEMAP_REDEFINED_NOTATION' type='enum'/>
+     <exports symbol='XML_SCHEMAP_REDEFINED_TYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_REF_AND_CONTENT' type='enum'/>
+     <exports symbol='XML_SCHEMAP_REF_AND_SUBTYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_REGEXP_INVALID' type='enum'/>
+     <exports symbol='XML_SCHEMAP_RESTRICTION_NONAME_NOREF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_S4S_ATTR_INVALID_VALUE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_S4S_ATTR_MISSING' type='enum'/>
+     <exports symbol='XML_SCHEMAP_S4S_ATTR_NOT_ALLOWED' type='enum'/>
+     <exports symbol='XML_SCHEMAP_S4S_ELEM_MISSING' type='enum'/>
+     <exports symbol='XML_SCHEMAP_S4S_ELEM_NOT_ALLOWED' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SIMPLETYPE_NONAME' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_3_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_3_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_4' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_3' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_CT_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ELEMENT_1' type='enum'/>
      <exports symbol='XML_SCHEMAP_SRC_ELEMENT_2_1' type='enum'/>
@@ -2086,27 +2539,6 @@
      <exports symbol='XML_SCHEMAP_SRC_ELEMENT_2_1' type='enum'/>
-     <exports symbol='XML_RNGP_INVALID_URI' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_LIST' type='enum'/>
-     <exports symbol='XML_RNGP_EXCEPT_NO_CONTENT' type='enum'/>
-     <exports symbol='XML_RNGP_EXTERNALREF_EMTPY' type='enum'/>
-     <exports symbol='XML_ERR_SPACE_REQUIRED' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_MAXLENGTH_VALID' type='enum'/>
-     <exports symbol='XML_DTD_DIFFERENT_PREFIX' type='enum'/>
-     <exports symbol='XML_SCHEMAV_NOTDETERMINIST' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_EXTENSION_CHILD' type='enum'/>
-     <exports symbol='XML_SCHEMAV_MISSING' type='enum'/>
-     <exports symbol='XML_IO_EFAULT' type='enum'/>
-     <exports symbol='XML_XINCLUDE_XPTR_FAILED' type='enum'/>
-     <exports symbol='XML_FROM_FTP' type='enum'/>
-     <exports symbol='XML_RNGP_PARENTREF_CREATE_FAILED' type='enum'/>
-     <exports symbol='XML_ERR_RESERVED_XML_NAME' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_IMPORT_3_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_IMPORT_3_1' type='enum'/>
-     <exports symbol='XML_IO_EBADMSG' type='enum'/>
-     <exports symbol='XML_XPTR_RESOURCE_ERROR' type='enum'/>
-     <exports symbol='XML_RNGP_ATTR_CONFLICT' type='enum'/>
-     <exports symbol='XML_DTD_ELEM_REDEFINED' type='enum'/>
-     <exports symbol='XML_XINCLUDE_UNKNOWN_ENCODING' type='enum'/>
-     <exports symbol='XML_CATALOG_PREFER_VALUE' type='enum'/>
-     <exports symbol='XML_ERR_PEREF_SEMICOL_MISSING' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ELEMENT_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_ELEMENT_3' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_IMPORT' type='enum'/>
      <exports symbol='XML_SCHEMAP_SRC_IMPORT_1_1' type='enum'/>
      <exports symbol='XML_SCHEMAP_SRC_IMPORT_1_2' type='enum'/>
@@ -2111,104 +2543,15 @@
      <exports symbol='XML_SCHEMAP_SRC_IMPORT_1_1' type='enum'/>
      <exports symbol='XML_SCHEMAP_SRC_IMPORT_1_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_TYPE_AND_SUBTYPE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_NO_XMLNS' type='enum'/>
-     <exports symbol='XML_IO_ENOTDIR' type='enum'/>
-     <exports symbol='XML_SAVE_CHAR_INVALID' type='enum'/>
-     <exports symbol='XML_ERR_ENTITYREF_NO_NAME' type='enum'/>
-     <exports symbol='XML_DTD_ID_FIXED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_A_PROPS_CORRECT_3' type='enum'/>
-     <exports symbol='XML_SCHEMAP_A_PROPS_CORRECT_2' type='enum'/>
-     <exports symbol='XML_WAR_NS_COLUMN' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_VALID_DEFAULT_2_1' type='enum'/>
-     <exports symbol='XML_ERR_EXTRA_CONTENT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_SEQUENCE_CHILD' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_GROUP' type='enum'/>
-     <exports symbol='XML_ERR_LITERAL_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_REF_AND_SUBTYPE' type='enum'/>
-     <exports symbol='XML_RNGP_ELEM_TEXT_CONFLICT' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_TYPE_1' type='enum'/>
-     <exports symbol='XML_XPATH_INVALID_CHAR_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_3' type='enum'/>
-     <exports symbol='XML_CHECK_NO_DICT' type='enum'/>
-     <exports symbol='XML_XINCLUDE_XPTR_RESULT' type='enum'/>
-     <exports symbol='XML_IO_ENXIO' type='enum'/>
-     <exports symbol='XML_XINCLUDE_FRAGMENT_ID' type='enum'/>
-     <exports symbol='XML_FROM_HTTP' type='enum'/>
-     <exports symbol='XML_DTD_NOTATION_REDEFINED' type='enum'/>
-     <exports symbol='XML_WAR_LANG_VALUE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_AU_PROPS_CORRECT' type='enum'/>
-     <exports symbol='XML_ERR_SEPARATOR_REQUIRED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_S4S_ATTR_NOT_ALLOWED' type='enum'/>
-     <exports symbol='XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE' type='enum'/>
-     <exports symbol='XML_RNGP_ATTRIBUTE_CONTENT' type='enum'/>
-     <exports symbol='XML_DTD_XMLID_TYPE' type='enum'/>
-     <exports symbol='XML_RNGP_INTERLEAVE_ADD' type='enum'/>
-     <exports symbol='XML_DTD_ATTRIBUTE_REDEFINED' type='enum'/>
-     <exports symbol='XML_RNGP_UNKNOWN_ATTRIBUTE' type='enum'/>
-     <exports symbol='XML_ERR_UNDECLARED_ENTITY' type='enum'/>
-     <exports symbol='XML_ERR_PUBID_REQUIRED' type='enum'/>
-     <exports symbol='XML_IO_ENOTSOCK' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_START_GROUP' type='enum'/>
-     <exports symbol='XML_RNGP_NOTALLOWED_NOT_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ATTRIBUTE_4' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ATTRIBUTE_3' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ATTRIBUTE_2' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ATTRIBUTE_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_PREFIX_UNDEFINED' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_ATTR_ELEM' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_4_3' type='enum'/>
-     <exports symbol='XML_FTP_ACCNT' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_4_1' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_START_DATA' type='enum'/>
-     <exports symbol='XML_IO_ENOENT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_3' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_2' type='enum'/>
-     <exports symbol='XML_FROM_C14N' type='enum'/>
-     <exports symbol='XML_IO_EIO' type='enum'/>
-     <exports symbol='XML_DTD_NOT_PCDATA' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_ATTR_COMBINATION' type='enum'/>
-     <exports symbol='XML_RNGP_PARAM_FORBIDDEN' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_PROCESSCONTENT_CHILD' type='enum'/>
-     <exports symbol='XML_FROM_WRITER' type='enum'/>
-     <exports symbol='XML_ERR_UNSUPPORTED_ENCODING' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_NSNAME_EXCEPT_ANYNAME' type='enum'/>
-     <exports symbol='XML_ERR_ENTITYREF_IN_PROLOG' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_IDC' type='enum'/>
-     <exports symbol='XML_IO_ENOTTY' type='enum'/>
-     <exports symbol='XML_SCHEMAP_WARN_SKIP_SCHEMA' type='enum'/>
-     <exports symbol='XML_DTD_UNKNOWN_NOTATION' type='enum'/>
-     <exports symbol='XML_FROM_DATATYPE' type='enum'/>
-     <exports symbol='XML_ERR_WARNING' type='enum'/>
-     <exports symbol='XML_SCHEMAP_ATTRFORMDEFAULT_VALUE' type='enum'/>
-     <exports symbol='XML_IO_EISDIR' type='enum'/>
-     <exports symbol='XML_XINCLUDE_MULTIPLE_ROOT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_UNION_CHILD' type='enum'/>
-     <exports symbol='XML_XPATH_MEMORY_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_NOROOT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_WARN_ATTR_REDECL_PROH' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_3_2_1' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_3_2_2' type='enum'/>
-     <exports symbol='XML_XPATH_UNCLOSED_ERROR' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_NOTATION' type='enum'/>
-     <exports symbol='XML_CHECK_NO_NEXT' type='enum'/>
-     <exports symbol='XML_CHECK_NOT_ATTR_DECL' type='enum'/>
-     <exports symbol='XML_CHECK_NO_PARENT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SUPERNUMEROUS_LIST_ITEM_TYPE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_TOTALDIGITS_VALID' type='enum'/>
-     <exports symbol='XML_IO_ENOLCK' type='enum'/>
-     <exports symbol='XML_XINCLUDE_DEPRECATED_NS' type='enum'/>
-     <exports symbol='XML_RNGP_CHOICE_EMPTY' type='enum'/>
-     <exports symbol='XML_ERR_LITERAL_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_ERR_ENTITYREF_SEMICOL_MISSING' type='enum'/>
-     <exports symbol='XML_DTD_MULTIPLE_ID' type='enum'/>
-     <exports symbol='XML_FROM_XPATH' type='enum'/>
-     <exports symbol='XML_TREE_INVALID_DEC' type='enum'/>
-     <exports symbol='XML_SCHEMAP_EXTENSION_NO_BASE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_5' type='enum'/>
-     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_4' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_DOCTYPE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_3' type='enum'/>
-     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_ATTRIBUTE_GROUP' type='enum'/>
-     <exports symbol='XML_SCHEMAP_NO_XSI' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_IMPORT_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_IMPORT_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_IMPORT_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_IMPORT_3_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_IMPORT_3_2' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_INCLUDE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_REDEFINE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_RESOLVE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_SIMPLE_TYPE_1' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_SIMPLE_TYPE_2' type='enum'/>
      <exports symbol='XML_SCHEMAP_SRC_SIMPLE_TYPE_3' type='enum'/>
@@ -2214,14 +2557,2 @@
      <exports symbol='XML_SCHEMAP_SRC_SIMPLE_TYPE_3' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_1' type='enum'/>
-     <exports symbol='XML_CHECK_NO_NAME' type='enum'/>
-     <exports symbol='XML_ERR_CONDSEC_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_PI' type='enum'/>
-     <exports symbol='XML_ERR_EQUAL_REQUIRED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_WHITE_SPACE' type='enum'/>
-     <exports symbol='XML_DTD_UNKNOWN_ATTRIBUTE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_5_1_2' type='enum'/>
-     <exports symbol='XML_RNGP_INTERLEAVE_CREATE_FAILED' type='enum'/>
-     <exports symbol='XML_IO_EAGAIN' type='enum'/>
-     <exports symbol='XML_ERR_NOTATION_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_DTD_ENTITY_TYPE' type='enum'/>
      <exports symbol='XML_SCHEMAP_SRC_SIMPLE_TYPE_4' type='enum'/>
@@ -2227,60 +2558,5 @@
      <exports symbol='XML_SCHEMAP_SRC_SIMPLE_TYPE_4' type='enum'/>
-     <exports symbol='XML_RNGP_GRAMMAR_CONTENT' type='enum'/>
-     <exports symbol='XML_FTP_URL_SYNTAX' type='enum'/>
-     <exports symbol='XML_ERR_NONE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_COMPLEXTYPE_CHILD' type='enum'/>
-     <exports symbol='XML_XPATH_NUMBER_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_FACET_TYPE' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_START_ONEMORE' type='enum'/>
-     <exports symbol='XML_ERR_CONDSEC_INVALID' type='enum'/>
-     <exports symbol='XML_XINCLUDE_INCLUDE_IN_INCLUDE' type='enum'/>
-     <exports symbol='XML_ERR_ENTITYREF_IN_EPILOG' type='enum'/>
-     <exports symbol='XML_RNGP_GRAMMAR_MISSING' type='enum'/>
-     <exports symbol='XML_RNGP_GRAMMAR_NO_START' type='enum'/>
-     <exports symbol='XML_SCHEMAP_WILDCARD_INVALID_NS_MEMBER' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_LIST_INTERLEAVE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ELEMENT_3' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_REF' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_EMPTY' type='enum'/>
-     <exports symbol='XML_FROM_I18N' type='enum'/>
-     <exports symbol='XML_DTD_MISSING_ATTRIBUTE' type='enum'/>
-     <exports symbol='XML_IO_EMFILE' type='enum'/>
-     <exports symbol='XML_RNGP_EMPTY_NOT_EMPTY' type='enum'/>
-     <exports symbol='XML_ERR_VERSION_MISSING' type='enum'/>
-     <exports symbol='XML_IO_NO_INPUT' type='enum'/>
-     <exports symbol='XML_NS_ERR_UNDEFINED_NAMESPACE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_MINLENGTH_VALID' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_WILDCARD' type='enum'/>
-     <exports symbol='XML_IO_WRITE' type='enum'/>
-     <exports symbol='XML_ERR_ENTITY_PE_INTERNAL' type='enum'/>
-     <exports symbol='XML_DTD_XMLID_VALUE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_DERIVED_OK_2_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_DERIVED_OK_2_1' type='enum'/>
-     <exports symbol='XML_CHECK_NOT_NS_DECL' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_ELEM' type='enum'/>
-     <exports symbol='XML_ERR_COMMENT_ABRUPTLY_ENDED' type='enum'/>
-     <exports symbol='XML_IO_NETWORK_ATTEMPT' type='enum'/>
-     <exports symbol='XML_MODULE_CLOSE' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_START_EMPTY' type='enum'/>
-     <exports symbol='XML_ERR_ATTLIST_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_XINCLUDE_TEXT_FRAGMENT' type='enum'/>
-     <exports symbol='XML_C14N_RELATIVE_NAMESPACE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_FAILED_LOAD' type='enum'/>
-     <exports symbol='XML_ERR_ATTRIBUTE_WITHOUT_VALUE' type='enum'/>
-     <exports symbol='XML_ERR_NAME_TOO_LONG' type='enum'/>
-     <exports symbol='XML_XPTR_SYNTAX_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_TYPE' type='enum'/>
-     <exports symbol='XML_CHECK_WRONG_DOC' type='enum'/>
-     <exports symbol='XML_NS_ERR_XML_NAMESPACE' type='enum'/>
-     <exports symbol='XML_ERR_DOCTYPE_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_XINCLUDE_PARSE_VALUE' type='enum'/>
-     <exports symbol='XML_RNGP_NSNAME_NO_NS' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_INCLUDE_CHILD' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_IMPORT_2_2' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_ELEMENT' type='enum'/>
-     <exports symbol='XML_RNGP_PARENTREF_NAME_INVALID' type='enum'/>
-     <exports symbol='XML_NS_ERR_QNAME' type='enum'/>
-     <exports symbol='XML_DTD_NOTATION_VALUE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SRC_UNION_MEMBERTYPES_OR_SIMPLETYPES' type='enum'/>
+     <exports symbol='XML_SCHEMAP_ST_PROPS_CORRECT_1' type='enum'/>
      <exports symbol='XML_SCHEMAP_ST_PROPS_CORRECT_2' type='enum'/>
      <exports symbol='XML_SCHEMAP_ST_PROPS_CORRECT_3' type='enum'/>
@@ -2285,8 +2561,6 @@
      <exports symbol='XML_SCHEMAP_ST_PROPS_CORRECT_2' type='enum'/>
      <exports symbol='XML_SCHEMAP_ST_PROPS_CORRECT_3' type='enum'/>
-     <exports symbol='XML_I18N_NO_NAME' type='enum'/>
-     <exports symbol='XML_SCHEMAP_ST_PROPS_CORRECT_1' type='enum'/>
-     <exports symbol='XML_RNGP_EXCEPT_MISSING' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_CT_EXTENDS_1_2' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_MAXINCLUSIVE_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAP_SUPERNUMEROUS_LIST_ITEM_TYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_TYPE_AND_SUBTYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNION_NOT_EXPRESSIBLE' type='enum'/>
      <exports symbol='XML_SCHEMAP_UNKNOWN_ALL_CHILD' type='enum'/>
@@ -2292,114 +2566,2 @@
      <exports symbol='XML_SCHEMAP_UNKNOWN_ALL_CHILD' type='enum'/>
-     <exports symbol='XML_DTD_MIXED_CORRUPT' type='enum'/>
-     <exports symbol='XML_ERR_ENTITY_BOUNDARY' type='enum'/>
-     <exports symbol='XML_SCHEMAP_ELEMFORMDEFAULT_VALUE' type='enum'/>
-     <exports symbol='XML_I18N_EXCESS_HANDLER' type='enum'/>
-     <exports symbol='XML_RNGP_DATA_CONTENT' type='enum'/>
-     <exports symbol='XML_ERR_STRING_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_RNGP_EXCEPT_MULTIPLE' type='enum'/>
-     <exports symbol='XML_IO_EDEADLK' type='enum'/>
-     <exports symbol='XML_ERR_ATTRIBUTE_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_FRACTIONDIGITS_VALID' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE' type='enum'/>
-     <exports symbol='XML_IO_EINVAL' type='enum'/>
-     <exports symbol='XML_IO_ENAMETOOLONG' type='enum'/>
-     <exports symbol='XML_RNGP_EXTERNAL_REF_FAILURE' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_START_TEXT' type='enum'/>
-     <exports symbol='XML_CHECK_NO_DOC' type='enum'/>
-     <exports symbol='XML_DTD_INVALID_CHILD' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_PATTERN_VALID' type='enum'/>
-     <exports symbol='XML_RNGP_TYPE_MISSING' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_1' type='enum'/>
-     <exports symbol='XML_ERR_TAG_NAME_MISMATCH' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_3' type='enum'/>
-     <exports symbol='XML_ERR_ENCODING_NAME' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_5' type='enum'/>
-     <exports symbol='XML_SCHEMAV_MISC' type='enum'/>
-     <exports symbol='XML_IO_ECONNREFUSED' type='enum'/>
-     <exports symbol='XML_ERR_XMLDECL_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_P_PROPS_CORRECT_1' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_ENTITYREF' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_5_2_2_1' type='enum'/>
-     <exports symbol='XML_XINCLUDE_BUILD_FAILED' type='enum'/>
-     <exports symbol='XML_ERR_PEREF_NO_NAME' type='enum'/>
-     <exports symbol='XML_ERR_ENTITYREF_AT_EOF' type='enum'/>
-     <exports symbol='XML_SCHEMAP_NOATTR_NOREF' type='enum'/>
-     <exports symbol='XML_RNGP_ATTRIBUTE_CHILDREN' type='enum'/>
-     <exports symbol='XML_XPATH_UNDEF_PREFIX_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_1' type='enum'/>
-     <exports symbol='XML_SAVE_NO_DOCTYPE' type='enum'/>
-     <exports symbol='XML_ERR_PEREF_IN_EPILOG' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_4' type='enum'/>
-     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_4' type='enum'/>
-     <exports symbol='XML_ERR_URI_FRAGMENT' type='enum'/>
-     <exports symbol='XML_IO_ESPIPE' type='enum'/>
-     <exports symbol='XML_DTD_NO_DOC' type='enum'/>
-     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_NOT_SCHEMA' type='enum'/>
-     <exports symbol='XML_FROM_SCHEMASV' type='enum'/>
-     <exports symbol='XML_FROM_SCHEMASP' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_3_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_VALID_DEFAULT_1' type='enum'/>
-     <exports symbol='XML_ERR_MIXED_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_DTD_STANDALONE_WHITE_SPACE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_FACET' type='enum'/>
-     <exports symbol='XML_IO_ENOTEMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAV_WRONGELEM' type='enum'/>
-     <exports symbol='XML_RNGP_TYPE_NOT_FOUND' type='enum'/>
-     <exports symbol='XML_IO_BUFFER_FULL' type='enum'/>
-     <exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_6' type='enum'/>
-     <exports symbol='XML_DTD_CONTENT_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_MEMBER_TYPE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_NOROOT' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_6' type='enum'/>
-     <exports symbol='XML_SCHEMAP_REDEFINED_TYPE' type='enum'/>
-     <exports symbol='XML_ERR_CDATA_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_TYPE_3_1_2' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_TYPE_3_1_1' type='enum'/>
-     <exports symbol='XML_CHECK_NS_ANCESTOR' type='enum'/>
-     <exports symbol='XML_ERR_DOCUMENT_END' type='enum'/>
-     <exports symbol='XML_ERR_ENTITY_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ENUMERATION_VALID' type='enum'/>
-     <exports symbol='XML_ERR_CHARREF_IN_PROLOG' type='enum'/>
-     <exports symbol='XML_RNGP_INVALID_DEFINE_NAME' type='enum'/>
-     <exports symbol='XML_SAVE_UNKNOWN_ENCODING' type='enum'/>
-     <exports symbol='XML_ERR_CONDSEC_INVALID_KEYWORD' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_7' type='enum'/>
-     <exports symbol='XML_SCHEMAV_NOTYPE' type='enum'/>
-     <exports symbol='XML_ERR_NO_MEMORY' type='enum'/>
-     <exports symbol='XML_FROM_IO' type='enum'/>
-     <exports symbol='XML_HTML_UNKNOWN_TAG' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_ATTR_NAME' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_START_ATTR' type='enum'/>
-     <exports symbol='XML_CHECK_WRONG_NAME' type='enum'/>
-     <exports symbol='XML_SCHEMAV_NOTEMPTY' type='enum'/>
-     <exports symbol='XML_IO_EROFS' type='enum'/>
-     <exports symbol='XML_IO_EXDEV' type='enum'/>
-     <exports symbol='XML_XINCLUDE_NO_FALLBACK' type='enum'/>
-     <exports symbol='XML_RNGP_URI_FRAGMENT' type='enum'/>
-     <exports symbol='XML_FROM_MEMORY' type='enum'/>
-     <exports symbol='XML_ERR_MISSING_ENCODING' type='enum'/>
-     <exports symbol='XML_RNGP_ELEMENT_CONTENT' type='enum'/>
-     <exports symbol='XML_RNGP_UNKNOWN_TYPE_LIB' type='enum'/>
-     <exports symbol='XML_SCHEMAP_NOT_DETERMINISTIC' type='enum'/>
-     <exports symbol='XML_XPATH_EXPRESSION_OK' type='enum'/>
-     <exports symbol='XML_HTTP_UNKNOWN_HOST' type='enum'/>
-     <exports symbol='XML_ERR_ENTITY_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_DTD_NO_DTD' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_ONEMORE_GROUP_ATTR' type='enum'/>
-     <exports symbol='XML_ERR_VALUE_REQUIRED' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_LIST_TEXT' type='enum'/>
-     <exports symbol='XML_RNGP_URI_NOT_ABSOLUTE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNION_NOT_EXPRESSIBLE' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_ATTR' type='enum'/>
-     <exports symbol='XML_FTP_PASV_ANSWER' type='enum'/>
-     <exports symbol='XML_ERR_VERSION_MISMATCH' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_BOOLEAN' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_4_2' type='enum'/>
-     <exports symbol='XML_DTD_ELEM_DEFAULT_NAMESPACE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_4' type='enum'/>
-     <exports symbol='XML_SCHEMAP_REGEXP_INVALID' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_1' type='enum'/>
-     <exports symbol='XML_C14N_CREATE_STACK' type='enum'/>
      <exports symbol='XML_SCHEMAP_UNKNOWN_ANYATTRIBUTE_CHILD' type='enum'/>
@@ -2405,58 +2567,4 @@
      <exports symbol='XML_SCHEMAP_UNKNOWN_ANYATTRIBUTE_CHILD' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_5_2_1' type='enum'/>
-     <exports symbol='XML_FROM_RELAXNGV' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_ANYNAME_EXCEPT_ANYNAME' type='enum'/>
-     <exports symbol='XML_CHECK_ENTITY_TYPE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CONSTRUCT' type='enum'/>
-     <exports symbol='XML_RNGP_EXTERNALREF_RECURSE' type='enum'/>
-     <exports symbol='XML_RNGP_CHOICE_CONTENT' type='enum'/>
-     <exports symbol='XML_RNGP_UNKNOWN_COMBINE' type='enum'/>
-     <exports symbol='XML_RNGP_START_EMPTY' type='enum'/>
-     <exports symbol='XML_IO_ENCODER' type='enum'/>
-     <exports symbol='XML_WAR_NS_URI' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_UNION_MEMBERTYPES_OR_SIMPLETYPES' type='enum'/>
-     <exports symbol='XML_SCHEMAP_ATTRGRP_NONAME_NOREF' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_1' type='enum'/>
-     <exports symbol='XML_ERR_ENTITY_IS_EXTERNAL' type='enum'/>
-     <exports symbol='XML_WAR_UNDECLARED_ENTITY' type='enum'/>
-     <exports symbol='XML_SCHEMAV_ATTRUNKNOWN' type='enum'/>
-     <exports symbol='XML_IO_ENODEV' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_REF' type='enum'/>
-     <exports symbol='XML_FROM_PARSER' type='enum'/>
-     <exports symbol='XML_C14N_CREATE_CTXT' type='enum'/>
-     <exports symbol='XML_XINCLUDE_TEXT_DOCUMENT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_PREFIX' type='enum'/>
-     <exports symbol='XML_XINCLUDE_FALLBACKS_IN_INCLUDE' type='enum'/>
-     <exports symbol='XML_XPATH_INVALID_TYPE' type='enum'/>
-     <exports symbol='XML_CHECK_NS_SCOPE' type='enum'/>
-     <exports symbol='XML_IO_FLUSH' type='enum'/>
-     <exports symbol='XML_CATALOG_ENTRY_BROKEN' type='enum'/>
-     <exports symbol='XML_XPATH_INVALID_CTXT_POSITION' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_LENGTH_VALID' type='enum'/>
-     <exports symbol='XML_DTD_STANDALONE_DEFAULTED' type='enum'/>
-     <exports symbol='XML_DTD_UNKNOWN_ELEM' type='enum'/>
-     <exports symbol='XML_WAR_SPACE_VALUE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_FACET_CHILD' type='enum'/>
-     <exports symbol='XML_SCHEMAP_NOTATION_NO_NAME' type='enum'/>
-     <exports symbol='XML_XPATH_START_LITERAL_ERROR' type='enum'/>
-     <exports symbol='XML_ERR_ELEMCONTENT_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_RNGP_INCLUDE_FAILURE' type='enum'/>
-     <exports symbol='XML_ERR_COMMENT_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_2' type='enum'/>
-     <exports symbol='XML_BUF_OVERFLOW' type='enum'/>
-     <exports symbol='XML_IO_EMSGSIZE' type='enum'/>
-     <exports symbol='XML_FROM_CATALOG' type='enum'/>
-     <exports symbol='XML_SCHEMAV_ATTRINVALID' type='enum'/>
-     <exports symbol='XML_NS_ERR_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_2' type='enum'/>
-     <exports symbol='XML_FROM_HTML' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_MAXOCCURS' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_RESTRICTION_CHILD' type='enum'/>
-     <exports symbol='XML_RNGP_ELEMENT_NAME' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_START_VALUE' type='enum'/>
-     <exports symbol='XML_XPATH_INVALID_ARITY' type='enum'/>
-     <exports symbol='XML_RNGP_ERROR_TYPE_LIB' type='enum'/>
-     <exports symbol='XML_XPTR_EVAL_FAILED' type='enum'/>
-     <exports symbol='XML_DTD_NO_ROOT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_IMPORT_REDEFINE_NSNAME' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_ATTRGRP_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_ATTRIBUTE_GROUP' type='enum'/>
      <exports symbol='XML_SCHEMAP_UNKNOWN_ATTR_CHILD' type='enum'/>
@@ -2462,76 +2570,3 @@
      <exports symbol='XML_SCHEMAP_UNKNOWN_ATTR_CHILD' type='enum'/>
-     <exports symbol='XML_ERR_UNKNOWN_ENCODING' type='enum'/>
-     <exports symbol='XML_HTML_INCORRECTLY_OPENED_COMMENT' type='enum'/>
-     <exports symbol='XML_C14N_UNKNOW_NODE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_REF_AND_SUBTYPE' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_ONEMORE_INTERLEAVE_ATTR' type='enum'/>
-     <exports symbol='XML_C14N_INVALID_NODE' type='enum'/>
-     <exports symbol='XML_RNGP_TEXT_EXPECTED' type='enum'/>
-     <exports symbol='XML_XPATH_UNDEF_VARIABLE_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAV_NOROLLBACK' type='enum'/>
-     <exports symbol='XML_SCHEMAV_FACET' type='enum'/>
-     <exports symbol='XML_ERR_INVALID_DEC_CHARREF' type='enum'/>
-     <exports symbol='XML_RNGP_NEED_COMBINE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_NOTTOPLEVEL' type='enum'/>
-     <exports symbol='XML_CATALOG_MISSING_ATTR' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_LIST_LIST' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_TYPE_2' type='enum'/>
-     <exports symbol='XML_RNGP_EXCEPT_EMPTY' type='enum'/>
-     <exports symbol='XML_XPATH_UNFINISHED_LITERAL_ERROR' type='enum'/>
-     <exports symbol='XML_RNGP_INTERLEAVE_NO_CONTENT' type='enum'/>
-     <exports symbol='XML_ERR_INVALID_HEX_CHARREF' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COMPLEXTYPE_NONAME_NOREF' type='enum'/>
-     <exports symbol='XML_ERR_CHARREF_IN_DTD' type='enum'/>
-     <exports symbol='XML_IO_ENFILE' type='enum'/>
-     <exports symbol='XML_ERR_ENTITY_IS_PARAMETER' type='enum'/>
-     <exports symbol='XML_I18N_CONV_FAILED' type='enum'/>
-     <exports symbol='XML_CHECK_WRONG_PARENT' type='enum'/>
-     <exports symbol='XML_RNGP_PARENTREF_NO_NAME' type='enum'/>
-     <exports symbol='XML_IO_EPERM' type='enum'/>
-     <exports symbol='XML_IO_ENETUNREACH' type='enum'/>
-     <exports symbol='XML_ERR_CHARREF_AT_EOF' type='enum'/>
-     <exports symbol='XML_IO_ENOMEM' type='enum'/>
-     <exports symbol='XML_IO_ENOSPC' type='enum'/>
-     <exports symbol='XML_FROM_NONE' type='enum'/>
-     <exports symbol='XML_RNGP_TYPE_VALUE' type='enum'/>
-     <exports symbol='XML_FROM_REGEXP' type='enum'/>
-     <exports symbol='XML_RNGP_DEF_CHOICE_AND_INTERLEAVE' type='enum'/>
-     <exports symbol='XML_TREE_UNTERMINATED_ENTITY' type='enum'/>
-     <exports symbol='XML_ERR_URI_REQUIRED' type='enum'/>
-     <exports symbol='XML_FROM_TREE' type='enum'/>
-     <exports symbol='XML_ERR_EXT_ENTITY_STANDALONE' type='enum'/>
-     <exports symbol='XML_TREE_INVALID_HEX' type='enum'/>
-     <exports symbol='XML_C14N_REQUIRES_UTF8' type='enum'/>
-     <exports symbol='XML_ERR_ENTITY_PROCESSING' type='enum'/>
-     <exports symbol='XML_FROM_XINCLUDE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_CVC_SIMPLE_TYPE' type='enum'/>
-     <exports symbol='XML_RNGP_GRAMMAR_EMPTY' type='enum'/>
-     <exports symbol='XML_CHECK_NOT_NCNAME' type='enum'/>
-     <exports symbol='XML_RNGP_ELEMENT_NO_CONTENT' type='enum'/>
-     <exports symbol='XML_XINCLUDE_NO_HREF' type='enum'/>
-     <exports symbol='XML_XPATH_INVALID_OPERAND' type='enum'/>
-     <exports symbol='XML_IO_ENOEXEC' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_LIST_REF' type='enum'/>
-     <exports symbol='XML_XINCLUDE_HREF_URI' type='enum'/>
-     <exports symbol='XML_SCHEMAP_FAILED_PARSE' type='enum'/>
-     <exports symbol='XML_RNGP_HREF_ERROR' type='enum'/>
-     <exports symbol='XML_ERR_ATTRIBUTE_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_ATTR_NONAME_NOREF' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_ELEMENT_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INTERSECTION_NOT_EXPRESSIBLE' type='enum'/>
-     <exports symbol='XML_MODULE_OPEN' type='enum'/>
-     <exports symbol='XML_ERR_ENTITY_CHAR_ERROR' type='enum'/>
-     <exports symbol='XML_DTD_UNKNOWN_ENTITY' type='enum'/>
-     <exports symbol='XML_RNGP_PARSE_ERROR' type='enum'/>
-     <exports symbol='XML_ERR_NOTATION_PROCESSING' type='enum'/>
-     <exports symbol='XML_RNGP_XML_NS' type='enum'/>
-     <exports symbol='XML_ERR_MISPLACED_CDATA_END' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_ONEMORE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_CT_EXTENDS_1_1' type='enum'/>
-     <exports symbol='XML_RNGP_REF_CREATE_FAILED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_CT_EXTENDS_1_3' type='enum'/>
-     <exports symbol='XML_DTD_ROOT_NAME' type='enum'/>
-     <exports symbol='XML_RNGP_REF_NOT_EMPTY' type='enum'/>
-     <exports symbol='XML_CHECK_NO_HREF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_BASE_TYPE' type='enum'/>
      <exports symbol='XML_SCHEMAP_UNKNOWN_CHOICE_CHILD' type='enum'/>
@@ -2537,18 +2572,29 @@
      <exports symbol='XML_SCHEMAP_UNKNOWN_CHOICE_CHILD' type='enum'/>
-     <exports symbol='XML_RNGP_ELEM_CONTENT_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAV_HAVEDEFAULT' type='enum'/>
-     <exports symbol='XML_I18N_NO_HANDLER' type='enum'/>
-     <exports symbol='XML_RNGP_MISSING_HREF' type='enum'/>
-     <exports symbol='XML_ERR_PI_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_ERR_UNKNOWN_VERSION' type='enum'/>
-     <exports symbol='XML_FROM_RELAXNGP' type='enum'/>
-     <exports symbol='XML_FROM_VALID' type='enum'/>
-     <exports symbol='XML_SCHEMAP_S4S_ATTR_INVALID_VALUE' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_TEXT' type='enum'/>
-     <exports symbol='XML_ERR_NO_DTD' type='enum'/>
-     <exports symbol='XML_RNGP_START_CHOICE_AND_INTERLEAVE' type='enum'/>
-     <exports symbol='XML_FROM_XSLT' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_LIST_ATTR' type='enum'/>
-     <exports symbol='XML_IO_EACCES' type='enum'/>
-     <exports symbol='XML_ERR_NOTATION_NOT_FINISHED' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_COMPLEXCONTENT_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_COMPLEXTYPE_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_ELEM_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_EXTENSION_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_FACET_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_FACET_TYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_GROUP_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_IMPORT_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_INCLUDE_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_LIST_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_MEMBER_TYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_NOTATION_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_PREFIX' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_PROCESSCONTENT_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_REF' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_RESTRICTION_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_SCHEMAS_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_SEQUENCE_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_SIMPLECONTENT_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_SIMPLETYPE_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_TYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAP_UNKNOWN_UNION_CHILD' type='enum'/>
+     <exports symbol='XML_SCHEMAP_WARN_ATTR_POINTLESS_PROH' type='enum'/>
+     <exports symbol='XML_SCHEMAP_WARN_ATTR_REDECL_PROH' type='enum'/>
+     <exports symbol='XML_SCHEMAP_WARN_SKIP_SCHEMA' type='enum'/>
+     <exports symbol='XML_SCHEMAP_WARN_UNLOCATED_SCHEMA' type='enum'/>
+     <exports symbol='XML_SCHEMAP_WILDCARD_INVALID_NS_MEMBER' type='enum'/>
      <exports symbol='XML_SCHEMATRONV_ASSERT' type='enum'/>
@@ -2554,36 +2600,2 @@
      <exports symbol='XML_SCHEMATRONV_ASSERT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_2' type='enum'/>
-     <exports symbol='XML_SCHEMAV_INVALIDATTR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_RECURSIVE' type='enum'/>
-     <exports symbol='XML_HTTP_URL_SYNTAX' type='enum'/>
-     <exports symbol='XML_SCHEMAP_GROUP_NONAME_NOREF' type='enum'/>
-     <exports symbol='XML_DTD_DUP_TOKEN' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_4' type='enum'/>
-     <exports symbol='XML_SCHEMAP_S4S_ELEM_MISSING' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_5_1_1' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_FRAGMENT' type='enum'/>
-     <exports symbol='XML_DTD_LOAD_ERROR' type='enum'/>
-     <exports symbol='XML_CHECK_UNKNOWN_NODE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_NOTATION_CHILD' type='enum'/>
-     <exports symbol='XML_SCHEMAP_C_PROPS_CORRECT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_CT_1' type='enum'/>
-     <exports symbol='XML_RNGP_EMPTY_CONTENT' type='enum'/>
-     <exports symbol='XML_IO_EALREADY' type='enum'/>
-     <exports symbol='XML_IO_ERANGE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_1' type='enum'/>
-     <exports symbol='XML_IO_ENOSYS' type='enum'/>
-     <exports symbol='XML_SCHEMAP_NOTHING_TO_PARSE' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_DATA_EXCEPT_INTERLEAVE' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_3_1' type='enum'/>
-     <exports symbol='XML_XPATH_INVALID_CTXT_SIZE' type='enum'/>
-     <exports symbol='XML_CHECK_NO_ELEM' type='enum'/>
-     <exports symbol='XML_XPATH_EXPR_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI' type='enum'/>
-     <exports symbol='XML_RNGP_DEFINE_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_5_2' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_ENTITY' type='enum'/>
-     <exports symbol='XML_CHECK_NAME_NOT_NULL' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_MINOCCURS' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ALL_LIMITED' type='enum'/>
      <exports symbol='XML_SCHEMATRONV_REPORT' type='enum'/>
@@ -2589,104 +2601,9 @@
      <exports symbol='XML_SCHEMATRONV_REPORT' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_MAXEXCLUSIVE_VALID' type='enum'/>
-     <exports symbol='XML_IO_EPIPE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_NOTYPE_NOREF' type='enum'/>
-     <exports symbol='XML_RNGP_ATTRIBUTE_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD' type='enum'/>
-     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_1' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_5_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_3' type='enum'/>
-     <exports symbol='XML_IO_LOAD_ERROR' type='enum'/>
-     <exports symbol='XML_CHECK_NOT_ENTITY_DECL' type='enum'/>
-     <exports symbol='XML_RNGP_CREATE_FAILURE' type='enum'/>
-     <exports symbol='XML_IO_EBADF' type='enum'/>
-     <exports symbol='XML_RNGP_PREFIX_UNDEFINED' type='enum'/>
-     <exports symbol='XML_ERR_HYPHEN_IN_COMMENT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE' type='enum'/>
-     <exports symbol='XML_RNGP_INCLUDE_EMPTY' type='enum'/>
-     <exports symbol='XML_RNGP_PARENTREF_NOT_EMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAP_FACET_NO_VALUE' type='enum'/>
-     <exports symbol='XML_XPTR_SUB_RESOURCE_ERROR' type='enum'/>
-     <exports symbol='XML_ERR_NOT_STANDALONE' type='enum'/>
-     <exports symbol='XML_RNGP_START_MISSING' type='enum'/>
-     <exports symbol='XML_DTD_NO_PREFIX' type='enum'/>
-     <exports symbol='XML_CATALOG_RECURSION' type='enum'/>
-     <exports symbol='XML_RNGP_UNKNOWN_CONSTRUCT' type='enum'/>
-     <exports symbol='XML_ERR_UNPARSED_ENTITY' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_IMPORT_CHILD' type='enum'/>
-     <exports symbol='XML_FTP_EPSV_ANSWER' type='enum'/>
-     <exports symbol='XML_CHECK_NOT_UTF8' type='enum'/>
-     <exports symbol='XML_ERR_FATAL' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_1' type='enum'/>
-     <exports symbol='XML_DTD_ID_REDEFINED' type='enum'/>
-     <exports symbol='XML_XPATH_ENCODING_ERROR' type='enum'/>
-     <exports symbol='XML_RNGP_REF_NO_NAME' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_INCLUDE' type='enum'/>
-     <exports symbol='XML_RNGP_NSNAME_ATTR_ANCESTOR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SRC_REDEFINE' type='enum'/>
-     <exports symbol='XML_RNGP_REF_CYCLE' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_ATTR_ATTR' type='enum'/>
-     <exports symbol='XML_XPTR_UNKNOWN_SCHEME' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_FACET_VALUE' type='enum'/>
-     <exports symbol='XML_FROM_CHECK' type='enum'/>
-     <exports symbol='XML_SCHEMAV_ELEMCONT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_REF_AND_CONTENT' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_START_INTERLEAVE' type='enum'/>
-     <exports symbol='XML_DTD_CONTENT_NOT_DETERMINIST' type='enum'/>
-     <exports symbol='XML_DTD_NO_ELEM_NAME' type='enum'/>
-     <exports symbol='XML_CHECK_NO_PREV' type='enum'/>
-     <exports symbol='XML_RNGP_VALUE_NO_CONTENT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_SIMPLECONTENT_CHILD' type='enum'/>
-     <exports symbol='XML_TREE_NOT_UTF8' type='enum'/>
-     <exports symbol='XML_IO_EAFNOSUPPORT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_1' type='enum'/>
-     <exports symbol='XML_CATALOG_NOT_CATALOG' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_5' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_4' type='enum'/>
-     <exports symbol='XML_IO_EFBIG' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_COMMENT' type='enum'/>
-     <exports symbol='XML_RNGP_REF_NAME_INVALID' type='enum'/>
-     <exports symbol='XML_ERR_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_1' type='enum'/>
-     <exports symbol='XML_DTD_ELEM_NAMESPACE' type='enum'/>
-     <exports symbol='XML_CHECK_OUTSIDE_DICT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_P_PROPS_CORRECT_2_1' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_5_2_2_2_2' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_ELT_5_2_2_2_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_P_PROPS_CORRECT_2_2' type='enum'/>
-     <exports symbol='XML_WAR_CATALOG_PI' type='enum'/>
-     <exports symbol='XML_REGEXP_COMPILE_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_MININCLUSIVE_VALID' type='enum'/>
-     <exports symbol='XML_SCHEMAV_ISABSTRACT' type='enum'/>
-     <exports symbol='XML_RNGP_DEFINE_MISSING' type='enum'/>
-     <exports symbol='XML_ERR_NS_DECL_ERROR' type='enum'/>
-     <exports symbol='XML_ERR_INTERNAL_ERROR' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_1_3_1' type='enum'/>
-     <exports symbol='XML_ERR_ELEMCONTENT_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_FROM_NAMESPACE' type='enum'/>
-     <exports symbol='XML_IO_EBUSY' type='enum'/>
-     <exports symbol='XML_RNGP_INCLUDE_RECURSE' type='enum'/>
-     <exports symbol='XML_ERR_INVALID_URI' type='enum'/>
-     <exports symbol='XML_IO_ESRCH' type='enum'/>
-     <exports symbol='XML_FROM_XPOINTER' type='enum'/>
-     <exports symbol='XML_FROM_BUFFER' type='enum'/>
-     <exports symbol='XML_ERR_PEREF_IN_PROLOG' type='enum'/>
-     <exports symbol='XML_RNGP_TEXT_HAS_CHILD' type='enum'/>
-     <exports symbol='XML_SCHEMAV_NOTNILLABLE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_ELEM_DEFAULT_FIXED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_REDEFINED_ELEMENT' type='enum'/>
-     <exports symbol='XML_RNGP_REF_NO_DEF' type='enum'/>
-     <exports symbol='XML_ERR_NOT_WELL_BALANCED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_5' type='enum'/>
-     <exports symbol='XML_ERR_INVALID_CHARREF' type='enum'/>
-     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_2' type='enum'/>
-     <exports symbol='XML_ERR_INVALID_CHAR' type='enum'/>
-     <exports symbol='XML_RNGP_FOREIGN_ELEMENT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_DEF_AND_PREFIX' type='enum'/>
-     <exports symbol='XML_ERR_MIXED_NOT_STARTED' type='enum'/>
-     <exports symbol='XML_ERR_USER_STOP' type='enum'/>
-     <exports symbol='XML_CHECK_FOUND_CDATA' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INTERNAL' type='enum'/>
-     <exports symbol='XML_SCHEMAV_INVALIDELEM' type='enum'/>
-     <exports symbol='XML_ERR_INVALID_ENCODING' type='enum'/>
+     <exports symbol='XML_SCHEMAV_ATTRINVALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_ATTRUNKNOWN' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CONSTRUCT' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ATTRIBUTE_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ATTRIBUTE_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ATTRIBUTE_3' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ATTRIBUTE_4' type='enum'/>
      <exports symbol='XML_SCHEMAV_CVC_AU' type='enum'/>
@@ -2692,34 +2609,3 @@
      <exports symbol='XML_SCHEMAV_CVC_AU' type='enum'/>
-     <exports symbol='XML_CHECK_WRONG_NEXT' type='enum'/>
-     <exports symbol='XML_ERR_TAG_NOT_FINISHED' type='enum'/>
-     <exports symbol='XML_ERR_LTSLASH_REQUIRED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_REDEFINED_ATTRGROUP' type='enum'/>
-     <exports symbol='XML_SCHEMAP_WARN_ATTR_POINTLESS_PROH' type='enum'/>
-     <exports symbol='XML_ERR_PEREF_IN_INT_SUBSET' type='enum'/>
-     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_3' type='enum'/>
-     <exports symbol='XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_1' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_BASE_TYPE' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_ELEM_CHILD' type='enum'/>
-     <exports symbol='XML_WAR_UNKNOWN_VERSION' type='enum'/>
-     <exports symbol='XML_DTD_CONTENT_MODEL' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_VALID_DEFAULT_2_2_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1' type='enum'/>
-     <exports symbol='XML_ERR_OK' type='enum'/>
-     <exports symbol='XML_NS_ERR_COLON' type='enum'/>
-     <exports symbol='XML_WAR_ENTITY_REDEFINED' type='enum'/>
-     <exports symbol='XML_ERR_ATTRIBUTE_REDEFINED' type='enum'/>
-     <exports symbol='XML_SCHEMAP_SIMPLETYPE_NONAME' type='enum'/>
-     <exports symbol='XML_SCHEMAP_UNKNOWN_GROUP_CHILD' type='enum'/>
-     <exports symbol='XML_IO_ENOTSUP' type='enum'/>
-     <exports symbol='XML_WAR_NS_URI_RELATIVE' type='enum'/>
-     <exports symbol='XML_NS_ERR_ATTRIBUTE_REDEFINED' type='enum'/>
-     <exports symbol='XML_ERR_NAME_REQUIRED' type='enum'/>
-     <exports symbol='XML_IO_ETIMEDOUT' type='enum'/>
-     <exports symbol='XML_SCHEMAP_INVALID_ENUM' type='enum'/>
-     <exports symbol='XML_RNGP_DEFINE_NAME_MISSING' type='enum'/>
-     <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_1_3_2' type='enum'/>
-     <exports symbol='XML_RNGP_EMPTY_CONSTRUCT' type='enum'/>
-     <exports symbol='XML_RNGP_FORBIDDEN_ATTRIBUTE' type='enum'/>
-     <exports symbol='XML_FROM_OUTPUT' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_1' type='enum'/>
      <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_2_1' type='enum'/>
@@ -2725,10 +2611,3 @@
      <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_2_1' type='enum'/>
-     <exports symbol='XML_CHECK_WRONG_PREV' type='enum'/>
-     <exports symbol='XML_IO_EEXIST' type='enum'/>
-     <exports symbol='XML_SCHEMAP_MG_PROPS_CORRECT_2' type='enum'/>
-     <exports symbol='XML_SCHEMAP_MG_PROPS_CORRECT_1' type='enum'/>
-     <exports symbol='XML_FROM_URI' type='enum'/>
-     <exports symbol='XML_RNGP_PAT_LIST_ELEM' type='enum'/>
-     <exports symbol='XML_SCHEMAV_UNDECLAREDELEM' type='enum'/>
      <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_2_2' type='enum'/>
      <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_2_3' type='enum'/>
@@ -2733,4 +2612,91 @@
      <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_2_2' type='enum'/>
      <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_2_3' type='enum'/>
-     <exports symbol='XML_SCHEMAP_CT_PROPS_CORRECT_3' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_2_4' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_3_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_4' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_5_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_5_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_3' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_3_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_3_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_3_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_4_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_4_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_4_3' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_5_1_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_5_1_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_5_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_5_2_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_5_2_2_2_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_5_2_2_2_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_6' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ELT_7' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_ENUMERATION_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_FACET_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_FRACTIONDIGITS_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_IDC' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_LENGTH_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_MAXEXCLUSIVE_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_MAXINCLUSIVE_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_MAXLENGTH_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_MINEXCLUSIVE_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_MININCLUSIVE_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_MINLENGTH_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_PATTERN_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_TOTALDIGITS_VALID' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_TYPE_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_TYPE_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_TYPE_3_1_1' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_TYPE_3_1_2' type='enum'/>
+     <exports symbol='XML_SCHEMAV_CVC_WILDCARD' type='enum'/>
+     <exports symbol='XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING' type='enum'/>
+     <exports symbol='XML_SCHEMAV_ELEMCONT' type='enum'/>
+     <exports symbol='XML_SCHEMAV_ELEMENT_CONTENT' type='enum'/>
+     <exports symbol='XML_SCHEMAV_EXTRACONTENT' type='enum'/>
+     <exports symbol='XML_SCHEMAV_FACET' type='enum'/>
+     <exports symbol='XML_SCHEMAV_HAVEDEFAULT' type='enum'/>
+     <exports symbol='XML_SCHEMAV_INTERNAL' type='enum'/>
+     <exports symbol='XML_SCHEMAV_INVALIDATTR' type='enum'/>
+     <exports symbol='XML_SCHEMAV_INVALIDELEM' type='enum'/>
+     <exports symbol='XML_SCHEMAV_ISABSTRACT' type='enum'/>
+     <exports symbol='XML_SCHEMAV_MISC' type='enum'/>
+     <exports symbol='XML_SCHEMAV_MISSING' type='enum'/>
+     <exports symbol='XML_SCHEMAV_NOROLLBACK' type='enum'/>
+     <exports symbol='XML_SCHEMAV_NOROOT' type='enum'/>
+     <exports symbol='XML_SCHEMAV_NOTDETERMINIST' type='enum'/>
+     <exports symbol='XML_SCHEMAV_NOTEMPTY' type='enum'/>
+     <exports symbol='XML_SCHEMAV_NOTNILLABLE' type='enum'/>
+     <exports symbol='XML_SCHEMAV_NOTSIMPLE' type='enum'/>
+     <exports symbol='XML_SCHEMAV_NOTTOPLEVEL' type='enum'/>
+     <exports symbol='XML_SCHEMAV_NOTYPE' type='enum'/>
+     <exports symbol='XML_SCHEMAV_UNDECLAREDELEM' type='enum'/>
+     <exports symbol='XML_SCHEMAV_VALUE' type='enum'/>
+     <exports symbol='XML_SCHEMAV_WRONGELEM' type='enum'/>
+     <exports symbol='XML_TREE_INVALID_DEC' type='enum'/>
+     <exports symbol='XML_TREE_INVALID_HEX' type='enum'/>
+     <exports symbol='XML_TREE_NOT_UTF8' type='enum'/>
+     <exports symbol='XML_TREE_UNTERMINATED_ENTITY' type='enum'/>
+     <exports symbol='XML_WAR_CATALOG_PI' type='enum'/>
+     <exports symbol='XML_WAR_ENTITY_REDEFINED' type='enum'/>
+     <exports symbol='XML_WAR_LANG_VALUE' type='enum'/>
+     <exports symbol='XML_WAR_NS_COLUMN' type='enum'/>
+     <exports symbol='XML_WAR_NS_URI' type='enum'/>
+     <exports symbol='XML_WAR_NS_URI_RELATIVE' type='enum'/>
+     <exports symbol='XML_WAR_SPACE_VALUE' type='enum'/>
+     <exports symbol='XML_WAR_UNDECLARED_ENTITY' type='enum'/>
+     <exports symbol='XML_WAR_UNKNOWN_VERSION' type='enum'/>
+     <exports symbol='XML_XINCLUDE_BUILD_FAILED' type='enum'/>
+     <exports symbol='XML_XINCLUDE_DEPRECATED_NS' type='enum'/>
+     <exports symbol='XML_XINCLUDE_ENTITY_DEF_MISMATCH' type='enum'/>
+     <exports symbol='XML_XINCLUDE_FALLBACKS_IN_INCLUDE' type='enum'/>
+     <exports symbol='XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE' type='enum'/>
+     <exports symbol='XML_XINCLUDE_FRAGMENT_ID' type='enum'/>
+     <exports symbol='XML_XINCLUDE_HREF_URI' type='enum'/>
+     <exports symbol='XML_XINCLUDE_INCLUDE_IN_INCLUDE' type='enum'/>
      <exports symbol='XML_XINCLUDE_INVALID_CHAR' type='enum'/>
@@ -2736,3 +2702,20 @@
      <exports symbol='XML_XINCLUDE_INVALID_CHAR' type='enum'/>
-     <exports symbol='XML_SCHEMAV_CVC_COMPLEX_TYPE_2_4' type='enum'/>
+     <exports symbol='XML_XINCLUDE_MULTIPLE_ROOT' type='enum'/>
+     <exports symbol='XML_XINCLUDE_NO_FALLBACK' type='enum'/>
+     <exports symbol='XML_XINCLUDE_NO_HREF' type='enum'/>
+     <exports symbol='XML_XINCLUDE_PARSE_VALUE' type='enum'/>
+     <exports symbol='XML_XINCLUDE_RECURSION' type='enum'/>
+     <exports symbol='XML_XINCLUDE_TEXT_DOCUMENT' type='enum'/>
+     <exports symbol='XML_XINCLUDE_TEXT_FRAGMENT' type='enum'/>
+     <exports symbol='XML_XINCLUDE_UNKNOWN_ENCODING' type='enum'/>
+     <exports symbol='XML_XINCLUDE_XPTR_FAILED' type='enum'/>
+     <exports symbol='XML_XINCLUDE_XPTR_RESULT' type='enum'/>
+     <exports symbol='XML_XPATH_ENCODING_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_EXPRESSION_OK' type='enum'/>
+     <exports symbol='XML_XPATH_EXPR_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_INVALID_ARITY' type='enum'/>
+     <exports symbol='XML_XPATH_INVALID_CHAR_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_INVALID_CTXT_POSITION' type='enum'/>
+     <exports symbol='XML_XPATH_INVALID_CTXT_SIZE' type='enum'/>
+     <exports symbol='XML_XPATH_INVALID_OPERAND' type='enum'/>
      <exports symbol='XML_XPATH_INVALID_PREDICATE_ERROR' type='enum'/>
@@ -2738,5 +2721,20 @@
      <exports symbol='XML_XPATH_INVALID_PREDICATE_ERROR' type='enum'/>
-     <exports symbol='xmlErrorPtr' type='typedef'/>
-     <exports symbol='xmlErrorLevel' type='typedef'/>
-     <exports symbol='xmlParserErrors' type='typedef'/>
+     <exports symbol='XML_XPATH_INVALID_TYPE' type='enum'/>
+     <exports symbol='XML_XPATH_MEMORY_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_NUMBER_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_START_LITERAL_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_UNCLOSED_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_UNDEF_PREFIX_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_UNDEF_VARIABLE_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_UNFINISHED_LITERAL_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_UNKNOWN_FUNC_ERROR' type='enum'/>
+     <exports symbol='XML_XPATH_VARIABLE_REF_ERROR' type='enum'/>
+     <exports symbol='XML_XPTR_CHILDSEQ_START' type='enum'/>
+     <exports symbol='XML_XPTR_EVAL_FAILED' type='enum'/>
+     <exports symbol='XML_XPTR_EXTRA_OBJECTS' type='enum'/>
+     <exports symbol='XML_XPTR_RESOURCE_ERROR' type='enum'/>
+     <exports symbol='XML_XPTR_SUB_RESOURCE_ERROR' type='enum'/>
+     <exports symbol='XML_XPTR_SYNTAX_ERROR' type='enum'/>
+     <exports symbol='XML_XPTR_UNKNOWN_SCHEME' type='enum'/>
+     <exports symbol='xmlError' type='typedef'/>
      <exports symbol='xmlErrorDomain' type='typedef'/>
@@ -2742,3 +2740,5 @@
      <exports symbol='xmlErrorDomain' type='typedef'/>
-     <exports symbol='xmlError' type='typedef'/>
+     <exports symbol='xmlErrorLevel' type='typedef'/>
+     <exports symbol='xmlErrorPtr' type='typedef'/>
+     <exports symbol='xmlParserErrors' type='typedef'/>
      <exports symbol='_xmlError' type='struct'/>
@@ -2744,9 +2744,3 @@
      <exports symbol='_xmlError' type='struct'/>
-     <exports symbol='xmlParserValidityError' type='function'/>
-     <exports symbol='xmlGenericErrorFunc' type='function'/>
-     <exports symbol='xmlSetGenericErrorFunc' type='function'/>
-     <exports symbol='xmlParserPrintFileInfo' type='function'/>
-     <exports symbol='xmlCtxtResetLastError' type='function'/>
-     <exports symbol='xmlResetLastError' type='function'/>
      <exports symbol='initGenericErrorDefaultFunc' type='function'/>
      <exports symbol='xmlCopyError' type='function'/>
@@ -2751,4 +2745,8 @@
      <exports symbol='initGenericErrorDefaultFunc' type='function'/>
      <exports symbol='xmlCopyError' type='function'/>
-     <exports symbol='xmlParserValidityWarning' type='function'/>
+     <exports symbol='xmlCtxtGetLastError' type='function'/>
+     <exports symbol='xmlCtxtResetLastError' type='function'/>
+     <exports symbol='xmlGenericErrorFunc' type='function'/>
+     <exports symbol='xmlGetLastError' type='function'/>
+     <exports symbol='xmlParserError' type='function'/>
      <exports symbol='xmlParserPrintFileContext' type='function'/>
@@ -2754,3 +2752,5 @@
      <exports symbol='xmlParserPrintFileContext' type='function'/>
-     <exports symbol='xmlParserError' type='function'/>
+     <exports symbol='xmlParserPrintFileInfo' type='function'/>
+     <exports symbol='xmlParserValidityError' type='function'/>
+     <exports symbol='xmlParserValidityWarning' type='function'/>
      <exports symbol='xmlParserWarning' type='function'/>
@@ -2756,2 +2756,6 @@
      <exports symbol='xmlParserWarning' type='function'/>
+     <exports symbol='xmlResetError' type='function'/>
+     <exports symbol='xmlResetLastError' type='function'/>
+     <exports symbol='xmlSetGenericErrorFunc' type='function'/>
+     <exports symbol='xmlSetStructuredErrorFunc' type='function'/>
      <exports symbol='xmlStructuredErrorFunc' type='function'/>
@@ -2757,9 +2761,5 @@
      <exports symbol='xmlStructuredErrorFunc' type='function'/>
-     <exports symbol='xmlSetStructuredErrorFunc' type='function'/>
-     <exports symbol='xmlResetError' type='function'/>
-     <exports symbol='xmlGetLastError' type='function'/>
-     <exports symbol='xmlCtxtGetLastError' type='function'/>
     </file>
     <file name='xmlexports'>
      <summary>macros for marking symbols as exportable/importable.</summary>
      <description>macros for marking symbols as exportable/importable. </description>
@@ -2762,5 +2762,7 @@
     </file>
     <file name='xmlexports'>
      <summary>macros for marking symbols as exportable/importable.</summary>
      <description>macros for marking symbols as exportable/importable. </description>
+     <exports symbol='LIBXML_DLL_IMPORT' type='macro'/>
+     <exports symbol='XMLCALL' type='macro'/>
      <exports symbol='XMLCDECL' type='macro'/>
@@ -2766,3 +2768,4 @@
      <exports symbol='XMLCDECL' type='macro'/>
+     <exports symbol='XMLPUBFUN' type='macro'/>
      <exports symbol='XMLPUBLIC' type='macro'/>
      <exports symbol='XMLPUBVAR' type='macro'/>
@@ -2767,10 +2770,7 @@
      <exports symbol='XMLPUBLIC' type='macro'/>
      <exports symbol='XMLPUBVAR' type='macro'/>
-     <exports symbol='LIBXML_DLL_IMPORT' type='macro'/>
-     <exports symbol='XMLCALL' type='macro'/>
-     <exports symbol='XMLPUBFUN' type='macro'/>
     </file>
     <file name='xmlmemory'>
      <summary>interface for the memory allocator</summary>
      <description>provides interfaces for the memory allocator, including debugging capabilities. </description>
      <author>Daniel Veillard </author>
@@ -2772,8 +2772,8 @@
     </file>
     <file name='xmlmemory'>
      <summary>interface for the memory allocator</summary>
      <description>provides interfaces for the memory allocator, including debugging capabilities. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='xmlRealloc' type='macro'/>
+     <exports symbol='DEBUG_MEMORY' type='macro'/>
      <exports symbol='xmlMalloc' type='macro'/>
      <exports symbol='xmlMallocAtomic' type='macro'/>
@@ -2778,4 +2778,3 @@
      <exports symbol='xmlMalloc' type='macro'/>
      <exports symbol='xmlMallocAtomic' type='macro'/>
-     <exports symbol='DEBUG_MEMORY' type='macro'/>
      <exports symbol='xmlMemStrdup' type='macro'/>
@@ -2781,12 +2780,5 @@
      <exports symbol='xmlMemStrdup' type='macro'/>
-     <exports symbol='xmlMemRealloc' type='function'/>
-     <exports symbol='xmlInitMemory' type='function'/>
-     <exports symbol='xmlMemFree' type='function'/>
-     <exports symbol='xmlMemMalloc' type='function'/>
-     <exports symbol='xmlMemDisplayLast' type='function'/>
-     <exports symbol='xmlMemGet' type='function'/>
-     <exports symbol='xmlMemoryDump' type='function'/>
-     <exports symbol='xmlMallocLoc' type='function'/>
-     <exports symbol='xmlMemDisplay' type='function'/>
-     <exports symbol='xmlMemBlocks' type='function'/>
+     <exports symbol='xmlRealloc' type='macro'/>
+     <exports symbol='xmlCleanupMemory' type='function'/>
+     <exports symbol='xmlFreeFunc' type='function'/>
      <exports symbol='xmlGcMemGet' type='function'/>
@@ -2792,4 +2784,15 @@
      <exports symbol='xmlGcMemGet' type='function'/>
-     <exports symbol='xmlStrdupFunc' type='function'/>
-     <exports symbol='xmlFreeFunc' type='function'/>
+     <exports symbol='xmlGcMemSetup' type='function'/>
+     <exports symbol='xmlInitMemory' type='function'/>
+     <exports symbol='xmlMallocAtomicLoc' type='function'/>
+     <exports symbol='xmlMallocFunc' type='function'/>
+     <exports symbol='xmlMallocLoc' type='function'/>
+     <exports symbol='xmlMemBlocks' type='function'/>
+     <exports symbol='xmlMemDisplay' type='function'/>
+     <exports symbol='xmlMemDisplayLast' type='function'/>
+     <exports symbol='xmlMemFree' type='function'/>
+     <exports symbol='xmlMemGet' type='function'/>
+     <exports symbol='xmlMemMalloc' type='function'/>
+     <exports symbol='xmlMemRealloc' type='function'/>
+     <exports symbol='xmlMemSetup' type='function'/>
      <exports symbol='xmlMemShow' type='function'/>
@@ -2795,5 +2798,3 @@
      <exports symbol='xmlMemShow' type='function'/>
-     <exports symbol='xmlMallocAtomicLoc' type='function'/>
-     <exports symbol='xmlReallocLoc' type='function'/>
-     <exports symbol='xmlCleanupMemory' type='function'/>
+     <exports symbol='xmlMemStrdupLoc' type='function'/>
      <exports symbol='xmlMemUsed' type='function'/>
@@ -2799,3 +2800,4 @@
      <exports symbol='xmlMemUsed' type='function'/>
-     <exports symbol='xmlMemSetup' type='function'/>
+     <exports symbol='xmlMemoryDump' type='function'/>
+     <exports symbol='xmlMemoryStrdup' type='function'/>
      <exports symbol='xmlReallocFunc' type='function'/>
@@ -2801,8 +2803,6 @@
      <exports symbol='xmlReallocFunc' type='function'/>
-     <exports symbol='xmlMallocFunc' type='function'/>
-     <exports symbol='xmlGcMemSetup' type='function'/>
-     <exports symbol='xmlMemoryStrdup' type='function'/>
-     <exports symbol='xmlMemStrdupLoc' type='function'/>
+     <exports symbol='xmlReallocLoc' type='function'/>
+     <exports symbol='xmlStrdupFunc' type='function'/>
     </file>
     <file name='xmlmodule'>
      <summary>dynamic module loading</summary>
@@ -2811,4 +2811,5 @@
      <exports symbol='XML_MODULE_LAZY' type='enum'/>
      <exports symbol='XML_MODULE_LOCAL' type='enum'/>
      <exports symbol='xmlModule' type='typedef'/>
+     <exports symbol='xmlModuleOption' type='typedef'/>
      <exports symbol='xmlModulePtr' type='typedef'/>
@@ -2814,3 +2815,3 @@
      <exports symbol='xmlModulePtr' type='typedef'/>
-     <exports symbol='xmlModuleOption' type='typedef'/>
+     <exports symbol='xmlModuleClose' type='function'/>
      <exports symbol='xmlModuleFree' type='function'/>
@@ -2816,2 +2817,3 @@
      <exports symbol='xmlModuleFree' type='function'/>
+     <exports symbol='xmlModuleOpen' type='function'/>
      <exports symbol='xmlModuleSymbol' type='function'/>
@@ -2817,8 +2819,6 @@
      <exports symbol='xmlModuleSymbol' type='function'/>
-     <exports symbol='xmlModuleOpen' type='function'/>
-     <exports symbol='xmlModuleClose' type='function'/>
     </file>
     <file name='xmlreader'>
      <summary>the XMLReader implementation</summary>
      <description>API of the XML streaming API based on C# interfaces. </description>
      <author>Daniel Veillard </author>
@@ -2820,7 +2820,8 @@
     </file>
     <file name='xmlreader'>
      <summary>the XMLReader implementation</summary>
      <description>API of the XML streaming API based on C# interfaces. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_READER_TYPE_DOCUMENT_FRAGMENT' type='enum'/>
+     <exports symbol='XML_PARSER_DEFAULTATTRS' type='enum'/>
+     <exports symbol='XML_PARSER_LOADDTD' type='enum'/>
      <exports symbol='XML_PARSER_SEVERITY_ERROR' type='enum'/>
@@ -2826,6 +2827,2 @@
      <exports symbol='XML_PARSER_SEVERITY_ERROR' type='enum'/>
-     <exports symbol='XML_READER_TYPE_ELEMENT' type='enum'/>
-     <exports symbol='XML_READER_TYPE_TEXT' type='enum'/>
-     <exports symbol='XML_READER_TYPE_XML_DECLARATION' type='enum'/>
-     <exports symbol='XML_READER_TYPE_NONE' type='enum'/>
      <exports symbol='XML_PARSER_SEVERITY_VALIDITY_ERROR' type='enum'/>
@@ -2831,4 +2828,6 @@
      <exports symbol='XML_PARSER_SEVERITY_VALIDITY_ERROR' type='enum'/>
-     <exports symbol='XML_READER_TYPE_PROCESSING_INSTRUCTION' type='enum'/>
-     <exports symbol='XML_TEXTREADER_MODE_ERROR' type='enum'/>
+     <exports symbol='XML_PARSER_SEVERITY_VALIDITY_WARNING' type='enum'/>
+     <exports symbol='XML_PARSER_SEVERITY_WARNING' type='enum'/>
+     <exports symbol='XML_PARSER_SUBST_ENTITIES' type='enum'/>
+     <exports symbol='XML_PARSER_VALIDATE' type='enum'/>
      <exports symbol='XML_READER_TYPE_ATTRIBUTE' type='enum'/>
@@ -2834,3 +2833,4 @@
      <exports symbol='XML_READER_TYPE_ATTRIBUTE' type='enum'/>
-     <exports symbol='XML_PARSER_SEVERITY_WARNING' type='enum'/>
+     <exports symbol='XML_READER_TYPE_CDATA' type='enum'/>
+     <exports symbol='XML_READER_TYPE_COMMENT' type='enum'/>
      <exports symbol='XML_READER_TYPE_DOCUMENT' type='enum'/>
@@ -2836,2 +2836,3 @@
      <exports symbol='XML_READER_TYPE_DOCUMENT' type='enum'/>
+     <exports symbol='XML_READER_TYPE_DOCUMENT_FRAGMENT' type='enum'/>
      <exports symbol='XML_READER_TYPE_DOCUMENT_TYPE' type='enum'/>
@@ -2837,2 +2838,3 @@
      <exports symbol='XML_READER_TYPE_DOCUMENT_TYPE' type='enum'/>
+     <exports symbol='XML_READER_TYPE_ELEMENT' type='enum'/>
      <exports symbol='XML_READER_TYPE_END_ELEMENT' type='enum'/>
@@ -2838,5 +2840,4 @@
      <exports symbol='XML_READER_TYPE_END_ELEMENT' type='enum'/>
-     <exports symbol='XML_READER_TYPE_WHITESPACE' type='enum'/>
-     <exports symbol='XML_READER_TYPE_NOTATION' type='enum'/>
-     <exports symbol='XML_PARSER_SUBST_ENTITIES' type='enum'/>
+     <exports symbol='XML_READER_TYPE_END_ENTITY' type='enum'/>
+     <exports symbol='XML_READER_TYPE_ENTITY' type='enum'/>
      <exports symbol='XML_READER_TYPE_ENTITY_REFERENCE' type='enum'/>
@@ -2842,7 +2843,5 @@
      <exports symbol='XML_READER_TYPE_ENTITY_REFERENCE' type='enum'/>
-     <exports symbol='XML_TEXTREADER_MODE_INITIAL' type='enum'/>
-     <exports symbol='XML_READER_TYPE_COMMENT' type='enum'/>
-     <exports symbol='XML_TEXTREADER_MODE_CLOSED' type='enum'/>
-     <exports symbol='XML_PARSER_DEFAULTATTRS' type='enum'/>
-     <exports symbol='XML_READER_TYPE_ENTITY' type='enum'/>
+     <exports symbol='XML_READER_TYPE_NONE' type='enum'/>
+     <exports symbol='XML_READER_TYPE_NOTATION' type='enum'/>
+     <exports symbol='XML_READER_TYPE_PROCESSING_INSTRUCTION' type='enum'/>
      <exports symbol='XML_READER_TYPE_SIGNIFICANT_WHITESPACE' type='enum'/>
@@ -2848,6 +2847,6 @@
      <exports symbol='XML_READER_TYPE_SIGNIFICANT_WHITESPACE' type='enum'/>
-     <exports symbol='XML_READER_TYPE_END_ENTITY' type='enum'/>
-     <exports symbol='XML_PARSER_VALIDATE' type='enum'/>
-     <exports symbol='XML_PARSER_SEVERITY_VALIDITY_WARNING' type='enum'/>
-     <exports symbol='XML_TEXTREADER_MODE_READING' type='enum'/>
+     <exports symbol='XML_READER_TYPE_TEXT' type='enum'/>
+     <exports symbol='XML_READER_TYPE_WHITESPACE' type='enum'/>
+     <exports symbol='XML_READER_TYPE_XML_DECLARATION' type='enum'/>
+     <exports symbol='XML_TEXTREADER_MODE_CLOSED' type='enum'/>
      <exports symbol='XML_TEXTREADER_MODE_EOF' type='enum'/>
@@ -2853,4 +2852,4 @@
      <exports symbol='XML_TEXTREADER_MODE_EOF' type='enum'/>
-     <exports symbol='XML_READER_TYPE_CDATA' type='enum'/>
-     <exports symbol='XML_PARSER_LOADDTD' type='enum'/>
+     <exports symbol='XML_TEXTREADER_MODE_ERROR' type='enum'/>
+     <exports symbol='XML_TEXTREADER_MODE_INITIAL' type='enum'/>
      <exports symbol='XML_TEXTREADER_MODE_INTERACTIVE' type='enum'/>
@@ -2856,3 +2855,4 @@
      <exports symbol='XML_TEXTREADER_MODE_INTERACTIVE' type='enum'/>
-     <exports symbol='xmlTextReaderPtr' type='typedef'/>
+     <exports symbol='XML_TEXTREADER_MODE_READING' type='enum'/>
+     <exports symbol='xmlParserProperties' type='typedef'/>
      <exports symbol='xmlParserSeverities' type='typedef'/>
@@ -2858,5 +2858,4 @@
      <exports symbol='xmlParserSeverities' type='typedef'/>
-     <exports symbol='xmlParserProperties' type='typedef'/>
-     <exports symbol='xmlTextReaderMode' type='typedef'/>
+     <exports symbol='xmlReaderTypes' type='typedef'/>
      <exports symbol='xmlTextReader' type='typedef'/>
      <exports symbol='xmlTextReaderLocatorPtr' type='typedef'/>
@@ -2861,4 +2860,7 @@
      <exports symbol='xmlTextReader' type='typedef'/>
      <exports symbol='xmlTextReaderLocatorPtr' type='typedef'/>
-     <exports symbol='xmlReaderTypes' type='typedef'/>
+     <exports symbol='xmlTextReaderMode' type='typedef'/>
+     <exports symbol='xmlTextReaderPtr' type='typedef'/>
+     <exports symbol='xmlFreeTextReader' type='function'/>
+     <exports symbol='xmlNewTextReader' type='function'/>
      <exports symbol='xmlNewTextReaderFilename' type='function'/>
@@ -2864,4 +2866,4 @@
      <exports symbol='xmlNewTextReaderFilename' type='function'/>
-     <exports symbol='xmlTextReaderHasAttributes' type='function'/>
-     <exports symbol='xmlTextReaderReadState' type='function'/>
+     <exports symbol='xmlReaderForDoc' type='function'/>
+     <exports symbol='xmlReaderForFd' type='function'/>
      <exports symbol='xmlReaderForFile' type='function'/>
@@ -2867,8 +2869,7 @@
      <exports symbol='xmlReaderForFile' type='function'/>
-     <exports symbol='xmlTextReaderConstNamespaceUri' type='function'/>
-     <exports symbol='xmlTextReaderCurrentDoc' type='function'/>
-     <exports symbol='xmlTextReaderGetParserLineNumber' type='function'/>
-     <exports symbol='xmlTextReaderExpand' type='function'/>
-     <exports symbol='xmlTextReaderXmlLang' type='function'/>
-     <exports symbol='xmlReaderForDoc' type='function'/>
+     <exports symbol='xmlReaderForIO' type='function'/>
+     <exports symbol='xmlReaderForMemory' type='function'/>
+     <exports symbol='xmlReaderNewDoc' type='function'/>
+     <exports symbol='xmlReaderNewFd' type='function'/>
+     <exports symbol='xmlReaderNewFile' type='function'/>
      <exports symbol='xmlReaderNewIO' type='function'/>
@@ -2874,2 +2875,8 @@
      <exports symbol='xmlReaderNewIO' type='function'/>
+     <exports symbol='xmlReaderNewMemory' type='function'/>
+     <exports symbol='xmlReaderNewWalker' type='function'/>
+     <exports symbol='xmlReaderWalker' type='function'/>
+     <exports symbol='xmlTextReaderAttributeCount' type='function'/>
+     <exports symbol='xmlTextReaderBaseUri' type='function'/>
+     <exports symbol='xmlTextReaderByteConsumed' type='function'/>
      <exports symbol='xmlTextReaderClose' type='function'/>
@@ -2875,3 +2882,3 @@
      <exports symbol='xmlTextReaderClose' type='function'/>
-     <exports symbol='xmlTextReaderReadInnerXml' type='function'/>
+     <exports symbol='xmlTextReaderConstBaseUri' type='function'/>
      <exports symbol='xmlTextReaderConstEncoding' type='function'/>
@@ -2877,11 +2884,7 @@
      <exports symbol='xmlTextReaderConstEncoding' type='function'/>
-     <exports symbol='xmlTextReaderNormalization' type='function'/>
-     <exports symbol='xmlTextReaderGetParserProp' type='function'/>
-     <exports symbol='xmlTextReaderMoveToAttribute' type='function'/>
-     <exports symbol='xmlTextReaderQuoteChar' type='function'/>
-     <exports symbol='xmlTextReaderSetSchema' type='function'/>
-     <exports symbol='xmlTextReaderValue' type='function'/>
-     <exports symbol='xmlTextReaderIsValid' type='function'/>
-     <exports symbol='xmlTextReaderMoveToFirstAttribute' type='function'/>
-     <exports symbol='xmlTextReaderGetParserColumnNumber' type='function'/>
+     <exports symbol='xmlTextReaderConstLocalName' type='function'/>
+     <exports symbol='xmlTextReaderConstName' type='function'/>
+     <exports symbol='xmlTextReaderConstNamespaceUri' type='function'/>
+     <exports symbol='xmlTextReaderConstPrefix' type='function'/>
+     <exports symbol='xmlTextReaderConstString' type='function'/>
      <exports symbol='xmlTextReaderConstValue' type='function'/>
@@ -2887,4 +2890,11 @@
      <exports symbol='xmlTextReaderConstValue' type='function'/>
-     <exports symbol='xmlNewTextReader' type='function'/>
+     <exports symbol='xmlTextReaderConstXmlLang' type='function'/>
+     <exports symbol='xmlTextReaderConstXmlVersion' type='function'/>
+     <exports symbol='xmlTextReaderCurrentDoc' type='function'/>
+     <exports symbol='xmlTextReaderCurrentNode' type='function'/>
+     <exports symbol='xmlTextReaderDepth' type='function'/>
+     <exports symbol='xmlTextReaderErrorFunc' type='function'/>
+     <exports symbol='xmlTextReaderExpand' type='function'/>
+     <exports symbol='xmlTextReaderGetAttribute' type='function'/>
      <exports symbol='xmlTextReaderGetAttributeNo' type='function'/>
      <exports symbol='xmlTextReaderGetAttributeNs' type='function'/>
@@ -2889,8 +2899,10 @@
      <exports symbol='xmlTextReaderGetAttributeNo' type='function'/>
      <exports symbol='xmlTextReaderGetAttributeNs' type='function'/>
-     <exports symbol='xmlTextReaderConstName' type='function'/>
-     <exports symbol='xmlTextReaderConstString' type='function'/>
-     <exports symbol='xmlTextReaderConstXmlVersion' type='function'/>
-     <exports symbol='xmlTextReaderDepth' type='function'/>
-     <exports symbol='xmlTextReaderReadString' type='function'/>
+     <exports symbol='xmlTextReaderGetErrorHandler' type='function'/>
+     <exports symbol='xmlTextReaderGetParserColumnNumber' type='function'/>
+     <exports symbol='xmlTextReaderGetParserLineNumber' type='function'/>
+     <exports symbol='xmlTextReaderGetParserProp' type='function'/>
+     <exports symbol='xmlTextReaderGetRemainder' type='function'/>
+     <exports symbol='xmlTextReaderHasAttributes' type='function'/>
+     <exports symbol='xmlTextReaderHasValue' type='function'/>
      <exports symbol='xmlTextReaderIsDefault' type='function'/>
@@ -2896,2 +2908,14 @@
      <exports symbol='xmlTextReaderIsDefault' type='function'/>
+     <exports symbol='xmlTextReaderIsEmptyElement' type='function'/>
+     <exports symbol='xmlTextReaderIsNamespaceDecl' type='function'/>
+     <exports symbol='xmlTextReaderIsValid' type='function'/>
+     <exports symbol='xmlTextReaderLocalName' type='function'/>
+     <exports symbol='xmlTextReaderLocatorBaseURI' type='function'/>
+     <exports symbol='xmlTextReaderLocatorLineNumber' type='function'/>
+     <exports symbol='xmlTextReaderLookupNamespace' type='function'/>
+     <exports symbol='xmlTextReaderMoveToAttribute' type='function'/>
+     <exports symbol='xmlTextReaderMoveToAttributeNo' type='function'/>
+     <exports symbol='xmlTextReaderMoveToAttributeNs' type='function'/>
+     <exports symbol='xmlTextReaderMoveToElement' type='function'/>
+     <exports symbol='xmlTextReaderMoveToFirstAttribute' type='function'/>
      <exports symbol='xmlTextReaderMoveToNextAttribute' type='function'/>
@@ -2897,6 +2921,6 @@
      <exports symbol='xmlTextReaderMoveToNextAttribute' type='function'/>
-     <exports symbol='xmlReaderNewWalker' type='function'/>
-     <exports symbol='xmlTextReaderConstPrefix' type='function'/>
-     <exports symbol='xmlReaderWalker' type='function'/>
-     <exports symbol='xmlTextReaderConstLocalName' type='function'/>
+     <exports symbol='xmlTextReaderName' type='function'/>
+     <exports symbol='xmlTextReaderNamespaceUri' type='function'/>
+     <exports symbol='xmlTextReaderNext' type='function'/>
+     <exports symbol='xmlTextReaderNextSibling' type='function'/>
      <exports symbol='xmlTextReaderNodeType' type='function'/>
@@ -2902,4 +2926,7 @@
      <exports symbol='xmlTextReaderNodeType' type='function'/>
-     <exports symbol='xmlFreeTextReader' type='function'/>
-     <exports symbol='xmlTextReaderName' type='function'/>
+     <exports symbol='xmlTextReaderNormalization' type='function'/>
+     <exports symbol='xmlTextReaderPrefix' type='function'/>
+     <exports symbol='xmlTextReaderPreserve' type='function'/>
+     <exports symbol='xmlTextReaderPreservePattern' type='function'/>
+     <exports symbol='xmlTextReaderQuoteChar' type='function'/>
      <exports symbol='xmlTextReaderRead' type='function'/>
@@ -2905,16 +2932,4 @@
      <exports symbol='xmlTextReaderRead' type='function'/>
-     <exports symbol='xmlTextReaderIsEmptyElement' type='function'/>
-     <exports symbol='xmlReaderNewMemory' type='function'/>
-     <exports symbol='xmlTextReaderSchemaValidateCtxt' type='function'/>
-     <exports symbol='xmlTextReaderHasValue' type='function'/>
-     <exports symbol='xmlTextReaderConstBaseUri' type='function'/>
-     <exports symbol='xmlTextReaderBaseUri' type='function'/>
-     <exports symbol='xmlTextReaderMoveToAttributeNo' type='function'/>
-     <exports symbol='xmlTextReaderLocatorLineNumber' type='function'/>
-     <exports symbol='xmlTextReaderMoveToAttributeNs' type='function'/>
-     <exports symbol='xmlTextReaderNext' type='function'/>
-     <exports symbol='xmlTextReaderAttributeCount' type='function'/>
-     <exports symbol='xmlTextReaderLookupNamespace' type='function'/>
-     <exports symbol='xmlTextReaderMoveToElement' type='function'/>
-     <exports symbol='xmlReaderForIO' type='function'/>
+     <exports symbol='xmlTextReaderReadAttributeValue' type='function'/>
+     <exports symbol='xmlTextReaderReadInnerXml' type='function'/>
      <exports symbol='xmlTextReaderReadOuterXml' type='function'/>
@@ -2920,2 +2935,6 @@
      <exports symbol='xmlTextReaderReadOuterXml' type='function'/>
+     <exports symbol='xmlTextReaderReadState' type='function'/>
+     <exports symbol='xmlTextReaderReadString' type='function'/>
+     <exports symbol='xmlTextReaderRelaxNGSetSchema' type='function'/>
+     <exports symbol='xmlTextReaderRelaxNGValidate' type='function'/>
      <exports symbol='xmlTextReaderRelaxNGValidateCtxt' type='function'/>
@@ -2921,13 +2940,4 @@
      <exports symbol='xmlTextReaderRelaxNGValidateCtxt' type='function'/>
-     <exports symbol='xmlTextReaderPrefix' type='function'/>
-     <exports symbol='xmlTextReaderReadAttributeValue' type='function'/>
-     <exports symbol='xmlTextReaderNextSibling' type='function'/>
-     <exports symbol='xmlTextReaderErrorFunc' type='function'/>
-     <exports symbol='xmlReaderForFd' type='function'/>
-     <exports symbol='xmlTextReaderGetAttribute' type='function'/>
-     <exports symbol='xmlTextReaderLocalName' type='function'/>
-     <exports symbol='xmlTextReaderPreserve' type='function'/>
-     <exports symbol='xmlTextReaderCurrentNode' type='function'/>
-     <exports symbol='xmlTextReaderSetParserProp' type='function'/>
-     <exports symbol='xmlTextReaderGetRemainder' type='function'/>
+     <exports symbol='xmlTextReaderSchemaValidate' type='function'/>
+     <exports symbol='xmlTextReaderSchemaValidateCtxt' type='function'/>
      <exports symbol='xmlTextReaderSetErrorHandler' type='function'/>
@@ -2933,7 +2943,4 @@
      <exports symbol='xmlTextReaderSetErrorHandler' type='function'/>
-     <exports symbol='xmlTextReaderIsNamespaceDecl' type='function'/>
-     <exports symbol='xmlReaderNewDoc' type='function'/>
-     <exports symbol='xmlTextReaderPreservePattern' type='function'/>
-     <exports symbol='xmlTextReaderConstXmlLang' type='function'/>
-     <exports symbol='xmlTextReaderGetErrorHandler' type='function'/>
+     <exports symbol='xmlTextReaderSetParserProp' type='function'/>
+     <exports symbol='xmlTextReaderSetSchema' type='function'/>
      <exports symbol='xmlTextReaderSetStructuredErrorHandler' type='function'/>
@@ -2939,7 +2946,2 @@
      <exports symbol='xmlTextReaderSetStructuredErrorHandler' type='function'/>
-     <exports symbol='xmlReaderNewFile' type='function'/>
-     <exports symbol='xmlTextReaderRelaxNGSetSchema' type='function'/>
-     <exports symbol='xmlReaderNewFd' type='function'/>
-     <exports symbol='xmlTextReaderRelaxNGValidate' type='function'/>
-     <exports symbol='xmlReaderForMemory' type='function'/>
      <exports symbol='xmlTextReaderSetup' type='function'/>
@@ -2945,6 +2947,2 @@
      <exports symbol='xmlTextReaderSetup' type='function'/>
-     <exports symbol='xmlTextReaderByteConsumed' type='function'/>
-     <exports symbol='xmlTextReaderLocatorBaseURI' type='function'/>
-     <exports symbol='xmlTextReaderNamespaceUri' type='function'/>
-     <exports symbol='xmlTextReaderSchemaValidate' type='function'/>
      <exports symbol='xmlTextReaderStandalone' type='function'/>
@@ -2950,6 +2948,8 @@
      <exports symbol='xmlTextReaderStandalone' type='function'/>
+     <exports symbol='xmlTextReaderValue' type='function'/>
+     <exports symbol='xmlTextReaderXmlLang' type='function'/>
     </file>
     <file name='xmlregexp'>
      <summary>regular expressions handling</summary>
      <description>basic API for libxml regular expressions handling used for XML Schemas and validation. </description>
      <author>Daniel Veillard </author>
@@ -2951,7 +2951,8 @@
     </file>
     <file name='xmlregexp'>
      <summary>regular expressions handling</summary>
      <description>basic API for libxml regular expressions handling used for XML Schemas and validation. </description>
      <author>Daniel Veillard </author>
+     <exports symbol='XML_EXP_ATOM' type='enum'/>
      <exports symbol='XML_EXP_COUNT' type='enum'/>
      <exports symbol='XML_EXP_EMPTY' type='enum'/>
@@ -2956,5 +2957,4 @@
      <exports symbol='XML_EXP_COUNT' type='enum'/>
      <exports symbol='XML_EXP_EMPTY' type='enum'/>
-     <exports symbol='XML_EXP_SEQ' type='enum'/>
-     <exports symbol='XML_EXP_ATOM' type='enum'/>
+     <exports symbol='XML_EXP_FORBID' type='enum'/>
      <exports symbol='XML_EXP_OR' type='enum'/>
@@ -2960,4 +2960,3 @@
      <exports symbol='XML_EXP_OR' type='enum'/>
-     <exports symbol='XML_EXP_FORBID' type='enum'/>
-     <exports symbol='xmlRegExecCtxtPtr' type='typedef'/>
+     <exports symbol='XML_EXP_SEQ' type='enum'/>
      <exports symbol='xmlExpCtxt' type='typedef'/>
@@ -2963,2 +2962,4 @@
      <exports symbol='xmlExpCtxt' type='typedef'/>
+     <exports symbol='xmlExpCtxtPtr' type='typedef'/>
+     <exports symbol='xmlExpNode' type='typedef'/>
      <exports symbol='xmlExpNodePtr' type='typedef'/>
@@ -2964,4 +2965,3 @@
      <exports symbol='xmlExpNodePtr' type='typedef'/>
-     <exports symbol='xmlExpCtxtPtr' type='typedef'/>
      <exports symbol='xmlExpNodeType' type='typedef'/>
      <exports symbol='xmlRegExecCtxt' type='typedef'/>
@@ -2966,5 +2966,5 @@
      <exports symbol='xmlExpNodeType' type='typedef'/>
      <exports symbol='xmlRegExecCtxt' type='typedef'/>
-     <exports symbol='xmlExpNode' type='typedef'/>
+     <exports symbol='xmlRegExecCtxtPtr' type='typedef'/>
      <exports symbol='xmlRegexp' type='typedef'/>
      <exports symbol='xmlRegexpPtr' type='typedef'/>
@@ -2969,3 +2969,4 @@
      <exports symbol='xmlRegexp' type='typedef'/>
      <exports symbol='xmlRegexpPtr' type='typedef'/>
+     <exports symbol='emptyExp' type='variable'/>
      <exports symbol='forbiddenExp' type='variable'/>
@@ -2971,11 +2972,2 @@
      <exports symbol='forbiddenExp' type='variable'/>
-     <exports symbol='emptyExp' type='variable'/>
-     <exports symbol='xmlRegExecCallbacks' type='function'/>
-     <exports symbol='xmlRegNewExecCtxt' type='function'/>
-     <exports symbol='xmlExpNewOr' type='function'/>
-     <exports symbol='xmlRegFreeRegexp' type='function'/>
-     <exports symbol='xmlExpRef' type='function'/>
-     <exports symbol='xmlRegexpIsDeterminist' type='function'/>
-     <exports symbol='xmlRegExecErrInfo' type='function'/>
-     <exports symbol='xmlRegFreeExecCtxt' type='function'/>
      <exports symbol='xmlExpCtxtNbCons' type='function'/>
@@ -2981,5 +2973,4 @@
      <exports symbol='xmlExpCtxtNbCons' type='function'/>
-     <exports symbol='xmlExpSubsume' type='function'/>
-     <exports symbol='xmlRegExecPushString2' type='function'/>
-     <exports symbol='xmlRegExecNextValues' type='function'/>
+     <exports symbol='xmlExpCtxtNbNodes' type='function'/>
+     <exports symbol='xmlExpDump' type='function'/>
      <exports symbol='xmlExpExpDerive' type='function'/>
@@ -2985,2 +2976,6 @@
      <exports symbol='xmlExpExpDerive' type='function'/>
+     <exports symbol='xmlExpFree' type='function'/>
+     <exports symbol='xmlExpFreeCtxt' type='function'/>
+     <exports symbol='xmlExpGetLanguage' type='function'/>
+     <exports symbol='xmlExpGetStart' type='function'/>
      <exports symbol='xmlExpIsNillable' type='function'/>
@@ -2986,4 +2981,7 @@
      <exports symbol='xmlExpIsNillable' type='function'/>
-     <exports symbol='xmlExpFreeCtxt' type='function'/>
-     <exports symbol='xmlExpDump' type='function'/>
+     <exports symbol='xmlExpMaxToken' type='function'/>
+     <exports symbol='xmlExpNewAtom' type='function'/>
+     <exports symbol='xmlExpNewCtxt' type='function'/>
+     <exports symbol='xmlExpNewOr' type='function'/>
+     <exports symbol='xmlExpNewRange' type='function'/>
      <exports symbol='xmlExpNewSeq' type='function'/>
@@ -2989,4 +2987,14 @@
      <exports symbol='xmlExpNewSeq' type='function'/>
-     <exports symbol='xmlExpFree' type='function'/>
-     <exports symbol='xmlExpNewRange' type='function'/>
+     <exports symbol='xmlExpParse' type='function'/>
+     <exports symbol='xmlExpRef' type='function'/>
+     <exports symbol='xmlExpStringDerive' type='function'/>
+     <exports symbol='xmlExpSubsume' type='function'/>
+     <exports symbol='xmlRegExecCallbacks' type='function'/>
+     <exports symbol='xmlRegExecErrInfo' type='function'/>
+     <exports symbol='xmlRegExecNextValues' type='function'/>
+     <exports symbol='xmlRegExecPushString' type='function'/>
+     <exports symbol='xmlRegExecPushString2' type='function'/>
+     <exports symbol='xmlRegFreeExecCtxt' type='function'/>
+     <exports symbol='xmlRegFreeRegexp' type='function'/>
+     <exports symbol='xmlRegNewExecCtxt' type='function'/>
      <exports symbol='xmlRegexpCompile' type='function'/>
@@ -2992,3 +3000,2 @@
      <exports symbol='xmlRegexpCompile' type='function'/>
-     <exports symbol='xmlExpNewAtom' type='function'/>
      <exports symbol='xmlRegexpExec' type='function'/>
@@ -2994,15 +3001,8 @@
      <exports symbol='xmlRegexpExec' type='function'/>
-     <exports symbol='xmlRegExecPushString' type='function'/>
-     <exports symbol='xmlExpGetStart' type='function'/>
-     <exports symbol='xmlExpParse' type='function'/>
-     <exports symbol='xmlExpNewCtxt' type='function'/>
-     <exports symbol='xmlExpGetLanguage' type='function'/>
-     <exports symbol='xmlExpStringDerive' type='function'/>
-     <exports symbol='xmlExpCtxtNbNodes' type='function'/>
-     <exports symbol='xmlExpMaxToken' type='function'/>
+     <exports symbol='xmlRegexpIsDeterminist' type='function'/>
      <exports symbol='xmlRegexpPrint' type='function'/>
     </file>
     <file name='xmlsave'>
      <summary>the XML document serializer</summary>
      <description>API to save document or subtree of document </description>
      <author>Daniel Veillard </author>
@@ -3003,8 +3003,8 @@
      <exports symbol='xmlRegexpPrint' type='function'/>
     </file>
     <file name='xmlsave'>
      <summary>the XML document serializer</summary>
      <description>API to save document or subtree of document </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_SAVE_XHTML' type='enum'/>
+     <exports symbol='XML_SAVE_AS_HTML' type='enum'/>
      <exports symbol='XML_SAVE_AS_XML' type='enum'/>
@@ -3010,3 +3010,5 @@
      <exports symbol='XML_SAVE_AS_XML' type='enum'/>
+     <exports symbol='XML_SAVE_FORMAT' type='enum'/>
+     <exports symbol='XML_SAVE_NO_DECL' type='enum'/>
      <exports symbol='XML_SAVE_NO_EMPTY' type='enum'/>
      <exports symbol='XML_SAVE_NO_XHTML' type='enum'/>
@@ -3011,6 +3013,3 @@
      <exports symbol='XML_SAVE_NO_EMPTY' type='enum'/>
      <exports symbol='XML_SAVE_NO_XHTML' type='enum'/>
-     <exports symbol='XML_SAVE_NO_DECL' type='enum'/>
-     <exports symbol='XML_SAVE_AS_HTML' type='enum'/>
-     <exports symbol='XML_SAVE_FORMAT' type='enum'/>
      <exports symbol='XML_SAVE_WSNONSIG' type='enum'/>
@@ -3016,4 +3015,4 @@
      <exports symbol='XML_SAVE_WSNONSIG' type='enum'/>
-     <exports symbol='xmlSaveOption' type='typedef'/>
+     <exports symbol='XML_SAVE_XHTML' type='enum'/>
      <exports symbol='xmlSaveCtxt' type='typedef'/>
      <exports symbol='xmlSaveCtxtPtr' type='typedef'/>
@@ -3018,5 +3017,4 @@
      <exports symbol='xmlSaveCtxt' type='typedef'/>
      <exports symbol='xmlSaveCtxtPtr' type='typedef'/>
-     <exports symbol='xmlSaveToIO' type='function'/>
-     <exports symbol='xmlSaveToFd' type='function'/>
+     <exports symbol='xmlSaveOption' type='typedef'/>
      <exports symbol='xmlSaveClose' type='function'/>
@@ -3022,2 +3020,4 @@
      <exports symbol='xmlSaveClose' type='function'/>
+     <exports symbol='xmlSaveDoc' type='function'/>
+     <exports symbol='xmlSaveFlush' type='function'/>
      <exports symbol='xmlSaveSetAttrEscape' type='function'/>
@@ -3023,2 +3023,3 @@
      <exports symbol='xmlSaveSetAttrEscape' type='function'/>
+     <exports symbol='xmlSaveSetEscape' type='function'/>
      <exports symbol='xmlSaveToBuffer' type='function'/>
@@ -3024,2 +3025,3 @@
      <exports symbol='xmlSaveToBuffer' type='function'/>
+     <exports symbol='xmlSaveToFd' type='function'/>
      <exports symbol='xmlSaveToFilename' type='function'/>
@@ -3025,10 +3027,8 @@
      <exports symbol='xmlSaveToFilename' type='function'/>
-     <exports symbol='xmlSaveFlush' type='function'/>
-     <exports symbol='xmlSaveDoc' type='function'/>
-     <exports symbol='xmlSaveSetEscape' type='function'/>
+     <exports symbol='xmlSaveToIO' type='function'/>
      <exports symbol='xmlSaveTree' type='function'/>
     </file>
     <file name='xmlschemas'>
      <summary>incomplete XML Schemas structure implementation</summary>
      <description>interface to the XML Schemas handling and schema validity checking, it is incomplete right now. </description>
      <author>Daniel Veillard </author>
@@ -3029,7 +3029,24 @@
      <exports symbol='xmlSaveTree' type='function'/>
     </file>
     <file name='xmlschemas'>
      <summary>incomplete XML Schemas structure implementation</summary>
      <description>interface to the XML Schemas handling and schema validity checking, it is incomplete right now. </description>
      <author>Daniel Veillard </author>
+     <exports symbol='XML_SCHEMAS_ERR_' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_ATTRINVALID' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_ATTRUNKNOWN' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_CONSTRUCT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_ELEMCONT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_EXTRACONTENT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_FACET' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_HAVEDEFAULT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_INTERNAL' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_INVALIDATTR' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_INVALIDELEM' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_ISABSTRACT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_MISSING' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_NOROLLBACK' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_NOROOT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_NOTDETERMINIST' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_NOTEMPTY' type='enum'/>
      <exports symbol='XML_SCHEMAS_ERR_NOTNILLABLE' type='enum'/>
@@ -3035,2 +3052,5 @@
      <exports symbol='XML_SCHEMAS_ERR_NOTNILLABLE' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_NOTSIMPLE' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_NOTTOPLEVEL' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_NOTYPE' type='enum'/>
      <exports symbol='XML_SCHEMAS_ERR_OK' type='enum'/>
@@ -3036,4 +3056,6 @@
      <exports symbol='XML_SCHEMAS_ERR_OK' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_NOROOT' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_UNDECLAREDELEM' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_VALUE' type='enum'/>
+     <exports symbol='XML_SCHEMAS_ERR_WRONGELEM' type='enum'/>
      <exports symbol='XML_SCHEMAS_ERR_XXX' type='enum'/>
      <exports symbol='XML_SCHEMA_VAL_VC_I_CREATE' type='enum'/>
@@ -3038,25 +3060,6 @@
      <exports symbol='XML_SCHEMAS_ERR_XXX' type='enum'/>
      <exports symbol='XML_SCHEMA_VAL_VC_I_CREATE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_ISABSTRACT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_ATTRUNKNOWN' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_WRONGELEM' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_NOTDETERMINIST' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_INTERNAL' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_MISSING' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_INVALIDATTR' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_CONSTRUCT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_FACET' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_NOTYPE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_VALUE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_NOROLLBACK' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_NOTTOPLEVEL' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_NOTEMPTY' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_INVALIDELEM' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_ATTRINVALID' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_EXTRACONTENT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_NOTSIMPLE' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_UNDECLAREDELEM' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_HAVEDEFAULT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_ELEMCONT' type='enum'/>
-     <exports symbol='XML_SCHEMAS_ERR_' type='enum'/>
+     <exports symbol='xmlSchema' type='typedef'/>
+     <exports symbol='xmlSchemaParserCtxt' type='typedef'/>
+     <exports symbol='xmlSchemaParserCtxtPtr' type='typedef'/>
      <exports symbol='xmlSchemaPtr' type='typedef'/>
@@ -3062,5 +3065,3 @@
      <exports symbol='xmlSchemaPtr' type='typedef'/>
-     <exports symbol='xmlSchemaParserCtxt' type='typedef'/>
-     <exports symbol='xmlSchemaValidOption' type='typedef'/>
      <exports symbol='xmlSchemaSAXPlugPtr' type='typedef'/>
      <exports symbol='xmlSchemaSAXPlugStruct' type='typedef'/>
@@ -3065,3 +3066,4 @@
      <exports symbol='xmlSchemaSAXPlugPtr' type='typedef'/>
      <exports symbol='xmlSchemaSAXPlugStruct' type='typedef'/>
+     <exports symbol='xmlSchemaValidCtxt' type='typedef'/>
      <exports symbol='xmlSchemaValidCtxtPtr' type='typedef'/>
@@ -3067,4 +3069,2 @@
      <exports symbol='xmlSchemaValidCtxtPtr' type='typedef'/>
-     <exports symbol='xmlSchemaParserCtxtPtr' type='typedef'/>
-     <exports symbol='xmlSchema' type='typedef'/>
      <exports symbol='xmlSchemaValidError' type='typedef'/>
@@ -3070,6 +3070,5 @@
      <exports symbol='xmlSchemaValidError' type='typedef'/>
-     <exports symbol='xmlSchemaValidCtxt' type='typedef'/>
-     <exports symbol='xmlSchemaNewDocParserCtxt' type='function'/>
-     <exports symbol='xmlSchemaSAXUnplug' type='function'/>
-     <exports symbol='xmlSchemaParse' type='function'/>
+     <exports symbol='xmlSchemaValidOption' type='typedef'/>
+     <exports symbol='xmlSchemaDump' type='function'/>
+     <exports symbol='xmlSchemaFree' type='function'/>
      <exports symbol='xmlSchemaFreeParserCtxt' type='function'/>
@@ -3075,4 +3074,5 @@
      <exports symbol='xmlSchemaFreeParserCtxt' type='function'/>
-     <exports symbol='xmlSchemaValidateSetFilename' type='function'/>
-     <exports symbol='xmlSchemaNewParserCtxt' type='function'/>
+     <exports symbol='xmlSchemaFreeValidCtxt' type='function'/>
+     <exports symbol='xmlSchemaGetParserErrors' type='function'/>
+     <exports symbol='xmlSchemaGetValidErrors' type='function'/>
      <exports symbol='xmlSchemaIsValid' type='function'/>
@@ -3078,3 +3078,7 @@
      <exports symbol='xmlSchemaIsValid' type='function'/>
-     <exports symbol='xmlSchemaValidityErrorFunc' type='function'/>
+     <exports symbol='xmlSchemaNewDocParserCtxt' type='function'/>
+     <exports symbol='xmlSchemaNewMemParserCtxt' type='function'/>
+     <exports symbol='xmlSchemaNewParserCtxt' type='function'/>
+     <exports symbol='xmlSchemaNewValidCtxt' type='function'/>
+     <exports symbol='xmlSchemaParse' type='function'/>
      <exports symbol='xmlSchemaSAXPlug' type='function'/>
@@ -3080,5 +3084,12 @@
      <exports symbol='xmlSchemaSAXPlug' type='function'/>
-     <exports symbol='xmlSchemaValidateStream' type='function'/>
-     <exports symbol='xmlSchemaGetParserErrors' type='function'/>
-     <exports symbol='xmlSchemaValidateSetLocator' type='function'/>
+     <exports symbol='xmlSchemaSAXUnplug' type='function'/>
+     <exports symbol='xmlSchemaSetParserErrors' type='function'/>
+     <exports symbol='xmlSchemaSetParserStructuredErrors' type='function'/>
+     <exports symbol='xmlSchemaSetValidErrors' type='function'/>
+     <exports symbol='xmlSchemaSetValidOptions' type='function'/>
+     <exports symbol='xmlSchemaSetValidStructuredErrors' type='function'/>
+     <exports symbol='xmlSchemaValidCtxtGetOptions' type='function'/>
+     <exports symbol='xmlSchemaValidCtxtGetParserCtxt' type='function'/>
+     <exports symbol='xmlSchemaValidateDoc' type='function'/>
+     <exports symbol='xmlSchemaValidateFile' type='function'/>
      <exports symbol='xmlSchemaValidateOneElement' type='function'/>
@@ -3084,9 +3095,6 @@
      <exports symbol='xmlSchemaValidateOneElement' type='function'/>
-     <exports symbol='xmlSchemaSetValidStructuredErrors' type='function'/>
-     <exports symbol='xmlSchemaSetValidErrors' type='function'/>
-     <exports symbol='xmlSchemaValidCtxtGetOptions' type='function'/>
-     <exports symbol='xmlSchemaValidateFile' type='function'/>
-     <exports symbol='xmlSchemaValidateDoc' type='function'/>
-     <exports symbol='xmlSchemaFree' type='function'/>
-     <exports symbol='xmlSchemaNewMemParserCtxt' type='function'/>
+     <exports symbol='xmlSchemaValidateSetFilename' type='function'/>
+     <exports symbol='xmlSchemaValidateSetLocator' type='function'/>
+     <exports symbol='xmlSchemaValidateStream' type='function'/>
+     <exports symbol='xmlSchemaValidityErrorFunc' type='function'/>
      <exports symbol='xmlSchemaValidityLocatorFunc' type='function'/>
@@ -3092,5 +3100,2 @@
      <exports symbol='xmlSchemaValidityLocatorFunc' type='function'/>
-     <exports symbol='xmlSchemaGetValidErrors' type='function'/>
-     <exports symbol='xmlSchemaSetValidOptions' type='function'/>
-     <exports symbol='xmlSchemaSetParserErrors' type='function'/>
      <exports symbol='xmlSchemaValidityWarningFunc' type='function'/>
@@ -3096,11 +3101,6 @@
      <exports symbol='xmlSchemaValidityWarningFunc' type='function'/>
-     <exports symbol='xmlSchemaDump' type='function'/>
-     <exports symbol='xmlSchemaFreeValidCtxt' type='function'/>
-     <exports symbol='xmlSchemaValidCtxtGetParserCtxt' type='function'/>
-     <exports symbol='xmlSchemaSetParserStructuredErrors' type='function'/>
-     <exports symbol='xmlSchemaNewValidCtxt' type='function'/>
     </file>
     <file name='xmlschemastypes'>
      <summary>implementation of XML Schema Datatypes</summary>
      <description>module providing the XML Schema Datatypes implementation both definition and validity checking </description>
      <author>Daniel Veillard </author>
@@ -3102,7 +3102,6 @@
     </file>
     <file name='xmlschemastypes'>
      <summary>implementation of XML Schema Datatypes</summary>
      <description>module providing the XML Schema Datatypes implementation both definition and validity checking </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_SCHEMA_WHITESPACE_UNKNOWN' type='enum'/>
      <exports symbol='XML_SCHEMA_WHITESPACE_COLLAPSE' type='enum'/>
@@ -3108,2 +3107,3 @@
      <exports symbol='XML_SCHEMA_WHITESPACE_COLLAPSE' type='enum'/>
+     <exports symbol='XML_SCHEMA_WHITESPACE_PRESERVE' type='enum'/>
      <exports symbol='XML_SCHEMA_WHITESPACE_REPLACE' type='enum'/>
@@ -3109,3 +3109,3 @@
      <exports symbol='XML_SCHEMA_WHITESPACE_REPLACE' type='enum'/>
-     <exports symbol='XML_SCHEMA_WHITESPACE_PRESERVE' type='enum'/>
+     <exports symbol='XML_SCHEMA_WHITESPACE_UNKNOWN' type='enum'/>
      <exports symbol='xmlSchemaWhitespaceValueType' type='typedef'/>
@@ -3111,3 +3111,13 @@
      <exports symbol='xmlSchemaWhitespaceValueType' type='typedef'/>
-     <exports symbol='xmlSchemaValPredefTypeNode' type='function'/>
+     <exports symbol='xmlSchemaCheckFacet' type='function'/>
+     <exports symbol='xmlSchemaCleanupTypes' type='function'/>
+     <exports symbol='xmlSchemaCollapseString' type='function'/>
+     <exports symbol='xmlSchemaCompareValues' type='function'/>
+     <exports symbol='xmlSchemaCompareValuesWhtsp' type='function'/>
+     <exports symbol='xmlSchemaCopyValue' type='function'/>
+     <exports symbol='xmlSchemaFreeFacet' type='function'/>
+     <exports symbol='xmlSchemaFreeValue' type='function'/>
+     <exports symbol='xmlSchemaGetBuiltInListSimpleTypeItemType' type='function'/>
+     <exports symbol='xmlSchemaGetBuiltInType' type='function'/>
+     <exports symbol='xmlSchemaGetCanonValue' type='function'/>
      <exports symbol='xmlSchemaGetCanonValueWhtsp' type='function'/>
@@ -3113,3 +3123,6 @@
      <exports symbol='xmlSchemaGetCanonValueWhtsp' type='function'/>
-     <exports symbol='xmlSchemaValidateLengthFacetWhtsp' type='function'/>
+     <exports symbol='xmlSchemaGetFacetValueAsULong' type='function'/>
+     <exports symbol='xmlSchemaGetPredefinedType' type='function'/>
+     <exports symbol='xmlSchemaGetValType' type='function'/>
+     <exports symbol='xmlSchemaInitTypes' type='function'/>
      <exports symbol='xmlSchemaIsBuiltInTypeFacet' type='function'/>
@@ -3115,8 +3128,8 @@
      <exports symbol='xmlSchemaIsBuiltInTypeFacet' type='function'/>
-     <exports symbol='xmlSchemaGetCanonValue' type='function'/>
-     <exports symbol='xmlSchemaGetBuiltInListSimpleTypeItemType' type='function'/>
-     <exports symbol='xmlSchemaCompareValuesWhtsp' type='function'/>
-     <exports symbol='xmlSchemaValueGetAsBoolean' type='function'/>
-     <exports symbol='xmlSchemaCollapseString' type='function'/>
+     <exports symbol='xmlSchemaNewFacet' type='function'/>
+     <exports symbol='xmlSchemaNewNOTATIONValue' type='function'/>
+     <exports symbol='xmlSchemaNewQNameValue' type='function'/>
+     <exports symbol='xmlSchemaNewStringValue' type='function'/>
+     <exports symbol='xmlSchemaValPredefTypeNode' type='function'/>
      <exports symbol='xmlSchemaValPredefTypeNodeNoNorm' type='function'/>
      <exports symbol='xmlSchemaValidateFacet' type='function'/>
@@ -3121,6 +3134,4 @@
      <exports symbol='xmlSchemaValPredefTypeNodeNoNorm' type='function'/>
      <exports symbol='xmlSchemaValidateFacet' type='function'/>
-     <exports symbol='xmlSchemaNewFacet' type='function'/>
-     <exports symbol='xmlSchemaValueAppend' type='function'/>
-     <exports symbol='xmlSchemaCompareValues' type='function'/>
+     <exports symbol='xmlSchemaValidateFacetWhtsp' type='function'/>
      <exports symbol='xmlSchemaValidateLengthFacet' type='function'/>
@@ -3126,4 +3137,4 @@
      <exports symbol='xmlSchemaValidateLengthFacet' type='function'/>
-     <exports symbol='xmlSchemaGetValType' type='function'/>
-     <exports symbol='xmlSchemaGetPredefinedType' type='function'/>
+     <exports symbol='xmlSchemaValidateLengthFacetWhtsp' type='function'/>
+     <exports symbol='xmlSchemaValidateListSimpleTypeFacet' type='function'/>
      <exports symbol='xmlSchemaValidatePredefinedType' type='function'/>
@@ -3129,6 +3140,5 @@
      <exports symbol='xmlSchemaValidatePredefinedType' type='function'/>
-     <exports symbol='xmlSchemaFreeFacet' type='function'/>
-     <exports symbol='xmlSchemaValidateListSimpleTypeFacet' type='function'/>
-     <exports symbol='xmlSchemaGetFacetValueAsULong' type='function'/>
-     <exports symbol='xmlSchemaFreeValue' type='function'/>
+     <exports symbol='xmlSchemaValueAppend' type='function'/>
+     <exports symbol='xmlSchemaValueGetAsBoolean' type='function'/>
+     <exports symbol='xmlSchemaValueGetAsString' type='function'/>
      <exports symbol='xmlSchemaValueGetNext' type='function'/>
@@ -3134,7 +3144,2 @@
      <exports symbol='xmlSchemaValueGetNext' type='function'/>
-     <exports symbol='xmlSchemaValueGetAsString' type='function'/>
-     <exports symbol='xmlSchemaCopyValue' type='function'/>
-     <exports symbol='xmlSchemaNewNOTATIONValue' type='function'/>
-     <exports symbol='xmlSchemaNewQNameValue' type='function'/>
-     <exports symbol='xmlSchemaCleanupTypes' type='function'/>
      <exports symbol='xmlSchemaWhiteSpaceReplace' type='function'/>
@@ -3140,9 +3145,4 @@
      <exports symbol='xmlSchemaWhiteSpaceReplace' type='function'/>
-     <exports symbol='xmlSchemaNewStringValue' type='function'/>
-     <exports symbol='xmlSchemaGetBuiltInType' type='function'/>
-     <exports symbol='xmlSchemaInitTypes' type='function'/>
-     <exports symbol='xmlSchemaValidateFacetWhtsp' type='function'/>
-     <exports symbol='xmlSchemaCheckFacet' type='function'/>
     </file>
     <file name='xmlstring'>
      <summary>set of routines to process strings</summary>
@@ -3150,5 +3150,5 @@
      <author>Daniel Veillard </author>
      <exports symbol='BAD_CAST' type='macro'/>
      <exports symbol='xmlChar' type='typedef'/>
-     <exports symbol='xmlStrcmp' type='function'/>
+     <exports symbol='xmlCharStrdup' type='function'/>
      <exports symbol='xmlCharStrndup' type='function'/>
@@ -3154,3 +3154,10 @@
      <exports symbol='xmlCharStrndup' type='function'/>
+     <exports symbol='xmlCheckUTF8' type='function'/>
+     <exports symbol='xmlGetUTF8Char' type='function'/>
+     <exports symbol='xmlStrEqual' type='function'/>
+     <exports symbol='xmlStrPrintf' type='function'/>
+     <exports symbol='xmlStrQEqual' type='function'/>
+     <exports symbol='xmlStrVPrintf' type='function'/>
+     <exports symbol='xmlStrcasecmp' type='function'/>
      <exports symbol='xmlStrcasestr' type='function'/>
      <exports symbol='xmlStrcat' type='function'/>
@@ -3155,9 +3162,5 @@
      <exports symbol='xmlStrcasestr' type='function'/>
      <exports symbol='xmlStrcat' type='function'/>
-     <exports symbol='xmlStrPrintf' type='function'/>
-     <exports symbol='xmlStrstr' type='function'/>
-     <exports symbol='xmlUTF8Size' type='function'/>
-     <exports symbol='xmlStrQEqual' type='function'/>
-     <exports symbol='xmlStrncatNew' type='function'/>
-     <exports symbol='xmlUTF8Strpos' type='function'/>
+     <exports symbol='xmlStrchr' type='function'/>
+     <exports symbol='xmlStrcmp' type='function'/>
      <exports symbol='xmlStrdup' type='function'/>
@@ -3163,4 +3166,2 @@
      <exports symbol='xmlStrdup' type='function'/>
-     <exports symbol='xmlCharStrdup' type='function'/>
-     <exports symbol='xmlStrchr' type='function'/>
      <exports symbol='xmlStrlen' type='function'/>
@@ -3166,4 +3167,3 @@
      <exports symbol='xmlStrlen' type='function'/>
-     <exports symbol='xmlStrncmp' type='function'/>
-     <exports symbol='xmlStrsub' type='function'/>
+     <exports symbol='xmlStrncasecmp' type='function'/>
      <exports symbol='xmlStrncat' type='function'/>
@@ -3169,4 +3169,4 @@
      <exports symbol='xmlStrncat' type='function'/>
-     <exports symbol='xmlGetUTF8Char' type='function'/>
-     <exports symbol='xmlStrcasecmp' type='function'/>
+     <exports symbol='xmlStrncatNew' type='function'/>
+     <exports symbol='xmlStrncmp' type='function'/>
      <exports symbol='xmlStrndup' type='function'/>
@@ -3172,3 +3172,10 @@
      <exports symbol='xmlStrndup' type='function'/>
-     <exports symbol='xmlStrVPrintf' type='function'/>
+     <exports symbol='xmlStrstr' type='function'/>
+     <exports symbol='xmlStrsub' type='function'/>
+     <exports symbol='xmlUTF8Charcmp' type='function'/>
+     <exports symbol='xmlUTF8Size' type='function'/>
+     <exports symbol='xmlUTF8Strlen' type='function'/>
+     <exports symbol='xmlUTF8Strloc' type='function'/>
+     <exports symbol='xmlUTF8Strndup' type='function'/>
+     <exports symbol='xmlUTF8Strpos' type='function'/>
      <exports symbol='xmlUTF8Strsize' type='function'/>
@@ -3174,5 +3181,2 @@
      <exports symbol='xmlUTF8Strsize' type='function'/>
-     <exports symbol='xmlCheckUTF8' type='function'/>
-     <exports symbol='xmlStrncasecmp' type='function'/>
-     <exports symbol='xmlUTF8Strlen' type='function'/>
      <exports symbol='xmlUTF8Strsub' type='function'/>
@@ -3178,10 +3182,6 @@
      <exports symbol='xmlUTF8Strsub' type='function'/>
-     <exports symbol='xmlStrEqual' type='function'/>
-     <exports symbol='xmlUTF8Charcmp' type='function'/>
-     <exports symbol='xmlUTF8Strndup' type='function'/>
-     <exports symbol='xmlUTF8Strloc' type='function'/>
     </file>
     <file name='xmlunicode'>
      <summary>Unicode character APIs</summary>
      <description>API for the Unicode character APIs  This file is automatically generated from the UCS description files of the Unicode Character Database</description>
      <author>Daniel Veillard </author>
@@ -3183,7 +3183,17 @@
     </file>
     <file name='xmlunicode'>
      <summary>Unicode character APIs</summary>
      <description>API for the Unicode character APIs  This file is automatically generated from the UCS description files of the Unicode Character Database</description>
      <author>Daniel Veillard </author>
+     <exports symbol='xmlUCSIsAegeanNumbers' type='function'/>
+     <exports symbol='xmlUCSIsAlphabeticPresentationForms' type='function'/>
+     <exports symbol='xmlUCSIsArabic' type='function'/>
+     <exports symbol='xmlUCSIsArabicPresentationFormsA' type='function'/>
+     <exports symbol='xmlUCSIsArabicPresentationFormsB' type='function'/>
+     <exports symbol='xmlUCSIsArmenian' type='function'/>
+     <exports symbol='xmlUCSIsArrows' type='function'/>
+     <exports symbol='xmlUCSIsBasicLatin' type='function'/>
+     <exports symbol='xmlUCSIsBengali' type='function'/>
+     <exports symbol='xmlUCSIsBlock' type='function'/>
      <exports symbol='xmlUCSIsBlockElements' type='function'/>
      <exports symbol='xmlUCSIsBopomofo' type='function'/>
@@ -3188,29 +3198,4 @@
      <exports symbol='xmlUCSIsBlockElements' type='function'/>
      <exports symbol='xmlUCSIsBopomofo' type='function'/>
-     <exports symbol='xmlUCSIsDingbats' type='function'/>
-     <exports symbol='xmlUCSIsSuperscriptsandSubscripts' type='function'/>
-     <exports symbol='xmlUCSIsCombiningHalfMarks' type='function'/>
-     <exports symbol='xmlUCSIsTibetan' type='function'/>
-     <exports symbol='xmlUCSIsYiRadicals' type='function'/>
-     <exports symbol='xmlUCSIsCombiningMarksforSymbols' type='function'/>
-     <exports symbol='xmlUCSIsHangulSyllables' type='function'/>
-     <exports symbol='xmlUCSIsBasicLatin' type='function'/>
-     <exports symbol='xmlUCSIsCatSc' type='function'/>
-     <exports symbol='xmlUCSIsCatSo' type='function'/>
-     <exports symbol='xmlUCSIsLimbu' type='function'/>
-     <exports symbol='xmlUCSIsCatSm' type='function'/>
-     <exports symbol='xmlUCSIsCatSk' type='function'/>
-     <exports symbol='xmlUCSIsKhmerSymbols' type='function'/>
-     <exports symbol='xmlUCSIsMongolian' type='function'/>
-     <exports symbol='xmlUCSIsMalayalam' type='function'/>
-     <exports symbol='xmlUCSIsMathematicalAlphanumericSymbols' type='function'/>
-     <exports symbol='xmlUCSIsThaana' type='function'/>
-     <exports symbol='xmlUCSIsMyanmar' type='function'/>
-     <exports symbol='xmlUCSIsTags' type='function'/>
-     <exports symbol='xmlUCSIsCJKCompatibilityIdeographs' type='function'/>
-     <exports symbol='xmlUCSIsTelugu' type='function'/>
-     <exports symbol='xmlUCSIsLowSurrogates' type='function'/>
-     <exports symbol='xmlUCSIsOsmanya' type='function'/>
-     <exports symbol='xmlUCSIsSyriac' type='function'/>
-     <exports symbol='xmlUCSIsEthiopic' type='function'/>
+     <exports symbol='xmlUCSIsBopomofoExtended' type='function'/>
      <exports symbol='xmlUCSIsBoxDrawing' type='function'/>
@@ -3216,5 +3201,4 @@
      <exports symbol='xmlUCSIsBoxDrawing' type='function'/>
-     <exports symbol='xmlUCSIsGreekExtended' type='function'/>
-     <exports symbol='xmlUCSIsGreekandCoptic' type='function'/>
-     <exports symbol='xmlUCSIsKannada' type='function'/>
+     <exports symbol='xmlUCSIsBraillePatterns' type='function'/>
+     <exports symbol='xmlUCSIsBuhid' type='function'/>
      <exports symbol='xmlUCSIsByzantineMusicalSymbols' type='function'/>
@@ -3220,3 +3204,3 @@
      <exports symbol='xmlUCSIsByzantineMusicalSymbols' type='function'/>
-     <exports symbol='xmlUCSIsEnclosedCJKLettersandMonths' type='function'/>
+     <exports symbol='xmlUCSIsCJKCompatibility' type='function'/>
      <exports symbol='xmlUCSIsCJKCompatibilityForms' type='function'/>
@@ -3222,3 +3206,4 @@
      <exports symbol='xmlUCSIsCJKCompatibilityForms' type='function'/>
-     <exports symbol='xmlUCSIsCatCs' type='function'/>
+     <exports symbol='xmlUCSIsCJKCompatibilityIdeographs' type='function'/>
+     <exports symbol='xmlUCSIsCJKCompatibilityIdeographsSupplement' type='function'/>
      <exports symbol='xmlUCSIsCJKRadicalsSupplement' type='function'/>
@@ -3224,2 +3209,9 @@
      <exports symbol='xmlUCSIsCJKRadicalsSupplement' type='function'/>
+     <exports symbol='xmlUCSIsCJKSymbolsandPunctuation' type='function'/>
+     <exports symbol='xmlUCSIsCJKUnifiedIdeographs' type='function'/>
+     <exports symbol='xmlUCSIsCJKUnifiedIdeographsExtensionA' type='function'/>
+     <exports symbol='xmlUCSIsCJKUnifiedIdeographsExtensionB' type='function'/>
+     <exports symbol='xmlUCSIsCat' type='function'/>
+     <exports symbol='xmlUCSIsCatC' type='function'/>
+     <exports symbol='xmlUCSIsCatCc' type='function'/>
      <exports symbol='xmlUCSIsCatCf' type='function'/>
@@ -3225,5 +3217,2 @@
      <exports symbol='xmlUCSIsCatCf' type='function'/>
-     <exports symbol='xmlUCSIsSmallFormVariants' type='function'/>
-     <exports symbol='xmlUCSIsHangulCompatibilityJamo' type='function'/>
-     <exports symbol='xmlUCSIsCatCc' type='function'/>
      <exports symbol='xmlUCSIsCatCo' type='function'/>
@@ -3229,19 +3218,16 @@
      <exports symbol='xmlUCSIsCatCo' type='function'/>
-     <exports symbol='xmlUCSIsCherokee' type='function'/>
-     <exports symbol='xmlUCSIsGothic' type='function'/>
-     <exports symbol='xmlUCSIsKhmer' type='function'/>
-     <exports symbol='xmlUCSIsCombiningDiacriticalMarksforSymbols' type='function'/>
-     <exports symbol='xmlUCSIsOgham' type='function'/>
-     <exports symbol='xmlUCSIsOriya' type='function'/>
-     <exports symbol='xmlUCSIsLinearBIdeograms' type='function'/>
-     <exports symbol='xmlUCSIsBlock' type='function'/>
-     <exports symbol='xmlUCSIsBopomofoExtended' type='function'/>
-     <exports symbol='xmlUCSIsHangulJamo' type='function'/>
-     <exports symbol='xmlUCSIsTagbanwa' type='function'/>
-     <exports symbol='xmlUCSIsGeneralPunctuation' type='function'/>
-     <exports symbol='xmlUCSIsCyrillic' type='function'/>
-     <exports symbol='xmlUCSIsArrows' type='function'/>
-     <exports symbol='xmlUCSIsControlPictures' type='function'/>
-     <exports symbol='xmlUCSIsCJKUnifiedIdeographs' type='function'/>
+     <exports symbol='xmlUCSIsCatCs' type='function'/>
+     <exports symbol='xmlUCSIsCatL' type='function'/>
+     <exports symbol='xmlUCSIsCatLl' type='function'/>
+     <exports symbol='xmlUCSIsCatLm' type='function'/>
+     <exports symbol='xmlUCSIsCatLo' type='function'/>
+     <exports symbol='xmlUCSIsCatLt' type='function'/>
+     <exports symbol='xmlUCSIsCatLu' type='function'/>
+     <exports symbol='xmlUCSIsCatM' type='function'/>
+     <exports symbol='xmlUCSIsCatMc' type='function'/>
+     <exports symbol='xmlUCSIsCatMe' type='function'/>
+     <exports symbol='xmlUCSIsCatMn' type='function'/>
+     <exports symbol='xmlUCSIsCatN' type='function'/>
+     <exports symbol='xmlUCSIsCatNd' type='function'/>
      <exports symbol='xmlUCSIsCatNl' type='function'/>
      <exports symbol='xmlUCSIsCatNo' type='function'/>
@@ -3246,17 +3232,4 @@
      <exports symbol='xmlUCSIsCatNl' type='function'/>
      <exports symbol='xmlUCSIsCatNo' type='function'/>
-     <exports symbol='xmlUCSIsYijingHexagramSymbols' type='function'/>
-     <exports symbol='xmlUCSIsVariationSelectorsSupplement' type='function'/>
-     <exports symbol='xmlUCSIsBengali' type='function'/>
-     <exports symbol='xmlUCSIsPrivateUse' type='function'/>
-     <exports symbol='xmlUCSIsMusicalSymbols' type='function'/>
-     <exports symbol='xmlUCSIsMiscellaneousSymbols' type='function'/>
-     <exports symbol='xmlUCSIsCJKCompatibility' type='function'/>
-     <exports symbol='xmlUCSIsAegeanNumbers' type='function'/>
-     <exports symbol='xmlUCSIsDevanagari' type='function'/>
-     <exports symbol='xmlUCSIsSupplementalArrowsA' type='function'/>
-     <exports symbol='xmlUCSIsSupplementalArrowsB' type='function'/>
-     <exports symbol='xmlUCSIsNumberForms' type='function'/>
-     <exports symbol='xmlUCSIsSpacingModifierLetters' type='function'/>
-     <exports symbol='xmlUCSIsOpticalCharacterRecognition' type='function'/>
+     <exports symbol='xmlUCSIsCatP' type='function'/>
      <exports symbol='xmlUCSIsCatPc' type='function'/>
@@ -3262,2 +3235,4 @@
      <exports symbol='xmlUCSIsCatPc' type='function'/>
+     <exports symbol='xmlUCSIsCatPd' type='function'/>
+     <exports symbol='xmlUCSIsCatPe' type='function'/>
      <exports symbol='xmlUCSIsCatPf' type='function'/>
@@ -3263,5 +3238,3 @@
      <exports symbol='xmlUCSIsCatPf' type='function'/>
-     <exports symbol='xmlUCSIsCyrillicSupplement' type='function'/>
-     <exports symbol='xmlUCSIsCatPd' type='function'/>
      <exports symbol='xmlUCSIsCatPi' type='function'/>
      <exports symbol='xmlUCSIsCatPo' type='function'/>
@@ -3266,5 +3239,3 @@
      <exports symbol='xmlUCSIsCatPi' type='function'/>
      <exports symbol='xmlUCSIsCatPo' type='function'/>
-     <exports symbol='xmlUCSIsHighPrivateUseSurrogates' type='function'/>
-     <exports symbol='xmlUCSIsLatinExtendedAdditional' type='function'/>
      <exports symbol='xmlUCSIsCatPs' type='function'/>
@@ -3270,28 +3241,2 @@
      <exports symbol='xmlUCSIsCatPs' type='function'/>
-     <exports symbol='xmlUCSIsHighSurrogates' type='function'/>
-     <exports symbol='xmlUCSIsLao' type='function'/>
-     <exports symbol='xmlUCSIsBraillePatterns' type='function'/>
-     <exports symbol='xmlUCSIsDeseret' type='function'/>
-     <exports symbol='xmlUCSIsEnclosedAlphanumerics' type='function'/>
-     <exports symbol='xmlUCSIsCombiningDiacriticalMarks' type='function'/>
-     <exports symbol='xmlUCSIsIdeographicDescriptionCharacters' type='function'/>
-     <exports symbol='xmlUCSIsPrivateUseArea' type='function'/>
-     <exports symbol='xmlUCSIsCat' type='function'/>
-     <exports symbol='xmlUCSIsCatLu' type='function'/>
-     <exports symbol='xmlUCSIsCatLt' type='function'/>
-     <exports symbol='xmlUCSIsYiSyllables' type='function'/>
-     <exports symbol='xmlUCSIsShavian' type='function'/>
-     <exports symbol='xmlUCSIsCatLo' type='function'/>
-     <exports symbol='xmlUCSIsCatLm' type='function'/>
-     <exports symbol='xmlUCSIsCatLl' type='function'/>
-     <exports symbol='xmlUCSIsMiscellaneousTechnical' type='function'/>
-     <exports symbol='xmlUCSIsUgaritic' type='function'/>
-     <exports symbol='xmlUCSIsCJKCompatibilityIdeographsSupplement' type='function'/>
-     <exports symbol='xmlUCSIsCypriotSyllabary' type='function'/>
-     <exports symbol='xmlUCSIsTamil' type='function'/>
-     <exports symbol='xmlUCSIsCatC' type='function'/>
-     <exports symbol='xmlUCSIsCatN' type='function'/>
-     <exports symbol='xmlUCSIsCatL' type='function'/>
-     <exports symbol='xmlUCSIsCatM' type='function'/>
-     <exports symbol='xmlUCSIsUnifiedCanadianAboriginalSyllabics' type='function'/>
      <exports symbol='xmlUCSIsCatS' type='function'/>
@@ -3297,5 +3242,6 @@
      <exports symbol='xmlUCSIsCatS' type='function'/>
-     <exports symbol='xmlUCSIsCatP' type='function'/>
-     <exports symbol='xmlUCSIsSinhala' type='function'/>
-     <exports symbol='xmlUCSIsGeorgian' type='function'/>
+     <exports symbol='xmlUCSIsCatSc' type='function'/>
+     <exports symbol='xmlUCSIsCatSk' type='function'/>
+     <exports symbol='xmlUCSIsCatSm' type='function'/>
+     <exports symbol='xmlUCSIsCatSo' type='function'/>
      <exports symbol='xmlUCSIsCatZ' type='function'/>
@@ -3301,18 +3247,4 @@
      <exports symbol='xmlUCSIsCatZ' type='function'/>
-     <exports symbol='xmlUCSIsIPAExtensions' type='function'/>
-     <exports symbol='xmlUCSIsKangxiRadicals' type='function'/>
-     <exports symbol='xmlUCSIsGreek' type='function'/>
-     <exports symbol='xmlUCSIsCatPe' type='function'/>
-     <exports symbol='xmlUCSIsHanunoo' type='function'/>
-     <exports symbol='xmlUCSIsArmenian' type='function'/>
-     <exports symbol='xmlUCSIsSupplementaryPrivateUseAreaB' type='function'/>
-     <exports symbol='xmlUCSIsSupplementaryPrivateUseAreaA' type='function'/>
-     <exports symbol='xmlUCSIsKatakanaPhoneticExtensions' type='function'/>
-     <exports symbol='xmlUCSIsLetterlikeSymbols' type='function'/>
-     <exports symbol='xmlUCSIsPhoneticExtensions' type='function'/>
-     <exports symbol='xmlUCSIsArabic' type='function'/>
-     <exports symbol='xmlUCSIsHebrew' type='function'/>
-     <exports symbol='xmlUCSIsOldItalic' type='function'/>
-     <exports symbol='xmlUCSIsArabicPresentationFormsA' type='function'/>
+     <exports symbol='xmlUCSIsCatZl' type='function'/>
      <exports symbol='xmlUCSIsCatZp' type='function'/>
      <exports symbol='xmlUCSIsCatZs' type='function'/>
@@ -3317,4 +3249,20 @@
      <exports symbol='xmlUCSIsCatZp' type='function'/>
      <exports symbol='xmlUCSIsCatZs' type='function'/>
-     <exports symbol='xmlUCSIsArabicPresentationFormsB' type='function'/>
+     <exports symbol='xmlUCSIsCherokee' type='function'/>
+     <exports symbol='xmlUCSIsCombiningDiacriticalMarks' type='function'/>
+     <exports symbol='xmlUCSIsCombiningDiacriticalMarksforSymbols' type='function'/>
+     <exports symbol='xmlUCSIsCombiningHalfMarks' type='function'/>
+     <exports symbol='xmlUCSIsCombiningMarksforSymbols' type='function'/>
+     <exports symbol='xmlUCSIsControlPictures' type='function'/>
+     <exports symbol='xmlUCSIsCurrencySymbols' type='function'/>
+     <exports symbol='xmlUCSIsCypriotSyllabary' type='function'/>
+     <exports symbol='xmlUCSIsCyrillic' type='function'/>
+     <exports symbol='xmlUCSIsCyrillicSupplement' type='function'/>
+     <exports symbol='xmlUCSIsDeseret' type='function'/>
+     <exports symbol='xmlUCSIsDevanagari' type='function'/>
+     <exports symbol='xmlUCSIsDingbats' type='function'/>
+     <exports symbol='xmlUCSIsEnclosedAlphanumerics' type='function'/>
+     <exports symbol='xmlUCSIsEnclosedCJKLettersandMonths' type='function'/>
+     <exports symbol='xmlUCSIsEthiopic' type='function'/>
+     <exports symbol='xmlUCSIsGeneralPunctuation' type='function'/>
      <exports symbol='xmlUCSIsGeometricShapes' type='function'/>
@@ -3320,5 +3268,7 @@
      <exports symbol='xmlUCSIsGeometricShapes' type='function'/>
-     <exports symbol='xmlUCSIsCatZl' type='function'/>
-     <exports symbol='xmlUCSIsTagalog' type='function'/>
-     <exports symbol='xmlUCSIsSpecials' type='function'/>
+     <exports symbol='xmlUCSIsGeorgian' type='function'/>
+     <exports symbol='xmlUCSIsGothic' type='function'/>
+     <exports symbol='xmlUCSIsGreek' type='function'/>
+     <exports symbol='xmlUCSIsGreekExtended' type='function'/>
+     <exports symbol='xmlUCSIsGreekandCoptic' type='function'/>
      <exports symbol='xmlUCSIsGujarati' type='function'/>
@@ -3324,3 +3274,3 @@
      <exports symbol='xmlUCSIsGujarati' type='function'/>
-     <exports symbol='xmlUCSIsKatakana' type='function'/>
+     <exports symbol='xmlUCSIsGurmukhi' type='function'/>
      <exports symbol='xmlUCSIsHalfwidthandFullwidthForms' type='function'/>
@@ -3326,3 +3276,21 @@
      <exports symbol='xmlUCSIsHalfwidthandFullwidthForms' type='function'/>
-     <exports symbol='xmlUCSIsLatinExtendedB' type='function'/>
+     <exports symbol='xmlUCSIsHangulCompatibilityJamo' type='function'/>
+     <exports symbol='xmlUCSIsHangulJamo' type='function'/>
+     <exports symbol='xmlUCSIsHangulSyllables' type='function'/>
+     <exports symbol='xmlUCSIsHanunoo' type='function'/>
+     <exports symbol='xmlUCSIsHebrew' type='function'/>
+     <exports symbol='xmlUCSIsHighPrivateUseSurrogates' type='function'/>
+     <exports symbol='xmlUCSIsHighSurrogates' type='function'/>
+     <exports symbol='xmlUCSIsHiragana' type='function'/>
+     <exports symbol='xmlUCSIsIPAExtensions' type='function'/>
+     <exports symbol='xmlUCSIsIdeographicDescriptionCharacters' type='function'/>
+     <exports symbol='xmlUCSIsKanbun' type='function'/>
+     <exports symbol='xmlUCSIsKangxiRadicals' type='function'/>
+     <exports symbol='xmlUCSIsKannada' type='function'/>
+     <exports symbol='xmlUCSIsKatakana' type='function'/>
+     <exports symbol='xmlUCSIsKatakanaPhoneticExtensions' type='function'/>
+     <exports symbol='xmlUCSIsKhmer' type='function'/>
+     <exports symbol='xmlUCSIsKhmerSymbols' type='function'/>
+     <exports symbol='xmlUCSIsLao' type='function'/>
+     <exports symbol='xmlUCSIsLatin1Supplement' type='function'/>
      <exports symbol='xmlUCSIsLatinExtendedA' type='function'/>
@@ -3328,8 +3296,11 @@
      <exports symbol='xmlUCSIsLatinExtendedA' type='function'/>
-     <exports symbol='xmlUCSIsBuhid' type='function'/>
-     <exports symbol='xmlUCSIsMiscellaneousSymbolsandArrows' type='function'/>
-     <exports symbol='xmlUCSIsTaiLe' type='function'/>
-     <exports symbol='xmlUCSIsCJKSymbolsandPunctuation' type='function'/>
-     <exports symbol='xmlUCSIsTaiXuanJingSymbols' type='function'/>
-     <exports symbol='xmlUCSIsGurmukhi' type='function'/>
+     <exports symbol='xmlUCSIsLatinExtendedAdditional' type='function'/>
+     <exports symbol='xmlUCSIsLatinExtendedB' type='function'/>
+     <exports symbol='xmlUCSIsLetterlikeSymbols' type='function'/>
+     <exports symbol='xmlUCSIsLimbu' type='function'/>
+     <exports symbol='xmlUCSIsLinearBIdeograms' type='function'/>
+     <exports symbol='xmlUCSIsLinearBSyllabary' type='function'/>
+     <exports symbol='xmlUCSIsLowSurrogates' type='function'/>
+     <exports symbol='xmlUCSIsMalayalam' type='function'/>
+     <exports symbol='xmlUCSIsMathematicalAlphanumericSymbols' type='function'/>
      <exports symbol='xmlUCSIsMathematicalOperators' type='function'/>
@@ -3335,9 +3306,19 @@
      <exports symbol='xmlUCSIsMathematicalOperators' type='function'/>
-     <exports symbol='xmlUCSIsAlphabeticPresentationForms' type='function'/>
-     <exports symbol='xmlUCSIsCurrencySymbols' type='function'/>
-     <exports symbol='xmlUCSIsSupplementalMathematicalOperators' type='function'/>
-     <exports symbol='xmlUCSIsCJKUnifiedIdeographsExtensionA' type='function'/>
-     <exports symbol='xmlUCSIsKanbun' type='function'/>
-     <exports symbol='xmlUCSIsCJKUnifiedIdeographsExtensionB' type='function'/>
-     <exports symbol='xmlUCSIsThai' type='function'/>
+     <exports symbol='xmlUCSIsMiscellaneousMathematicalSymbolsA' type='function'/>
+     <exports symbol='xmlUCSIsMiscellaneousMathematicalSymbolsB' type='function'/>
+     <exports symbol='xmlUCSIsMiscellaneousSymbols' type='function'/>
+     <exports symbol='xmlUCSIsMiscellaneousSymbolsandArrows' type='function'/>
+     <exports symbol='xmlUCSIsMiscellaneousTechnical' type='function'/>
+     <exports symbol='xmlUCSIsMongolian' type='function'/>
+     <exports symbol='xmlUCSIsMusicalSymbols' type='function'/>
+     <exports symbol='xmlUCSIsMyanmar' type='function'/>
+     <exports symbol='xmlUCSIsNumberForms' type='function'/>
+     <exports symbol='xmlUCSIsOgham' type='function'/>
+     <exports symbol='xmlUCSIsOldItalic' type='function'/>
+     <exports symbol='xmlUCSIsOpticalCharacterRecognition' type='function'/>
+     <exports symbol='xmlUCSIsOriya' type='function'/>
+     <exports symbol='xmlUCSIsOsmanya' type='function'/>
+     <exports symbol='xmlUCSIsPhoneticExtensions' type='function'/>
+     <exports symbol='xmlUCSIsPrivateUse' type='function'/>
+     <exports symbol='xmlUCSIsPrivateUseArea' type='function'/>
      <exports symbol='xmlUCSIsRunic' type='function'/>
@@ -3343,9 +3324,26 @@
      <exports symbol='xmlUCSIsRunic' type='function'/>
-     <exports symbol='xmlUCSIsCatNd' type='function'/>
-     <exports symbol='xmlUCSIsLatin1Supplement' type='function'/>
-     <exports symbol='xmlUCSIsLinearBSyllabary' type='function'/>
-     <exports symbol='xmlUCSIsHiragana' type='function'/>
-     <exports symbol='xmlUCSIsMiscellaneousMathematicalSymbolsB' type='function'/>
-     <exports symbol='xmlUCSIsMiscellaneousMathematicalSymbolsA' type='function'/>
-     <exports symbol='xmlUCSIsCatMn' type='function'/>
+     <exports symbol='xmlUCSIsShavian' type='function'/>
+     <exports symbol='xmlUCSIsSinhala' type='function'/>
+     <exports symbol='xmlUCSIsSmallFormVariants' type='function'/>
+     <exports symbol='xmlUCSIsSpacingModifierLetters' type='function'/>
+     <exports symbol='xmlUCSIsSpecials' type='function'/>
+     <exports symbol='xmlUCSIsSuperscriptsandSubscripts' type='function'/>
+     <exports symbol='xmlUCSIsSupplementalArrowsA' type='function'/>
+     <exports symbol='xmlUCSIsSupplementalArrowsB' type='function'/>
+     <exports symbol='xmlUCSIsSupplementalMathematicalOperators' type='function'/>
+     <exports symbol='xmlUCSIsSupplementaryPrivateUseAreaA' type='function'/>
+     <exports symbol='xmlUCSIsSupplementaryPrivateUseAreaB' type='function'/>
+     <exports symbol='xmlUCSIsSyriac' type='function'/>
+     <exports symbol='xmlUCSIsTagalog' type='function'/>
+     <exports symbol='xmlUCSIsTagbanwa' type='function'/>
+     <exports symbol='xmlUCSIsTags' type='function'/>
+     <exports symbol='xmlUCSIsTaiLe' type='function'/>
+     <exports symbol='xmlUCSIsTaiXuanJingSymbols' type='function'/>
+     <exports symbol='xmlUCSIsTamil' type='function'/>
+     <exports symbol='xmlUCSIsTelugu' type='function'/>
+     <exports symbol='xmlUCSIsThaana' type='function'/>
+     <exports symbol='xmlUCSIsThai' type='function'/>
+     <exports symbol='xmlUCSIsTibetan' type='function'/>
+     <exports symbol='xmlUCSIsUgaritic' type='function'/>
+     <exports symbol='xmlUCSIsUnifiedCanadianAboriginalSyllabics' type='function'/>
      <exports symbol='xmlUCSIsVariationSelectors' type='function'/>
@@ -3351,8 +3349,10 @@
      <exports symbol='xmlUCSIsVariationSelectors' type='function'/>
-     <exports symbol='xmlUCSIsCatMc' type='function'/>
-     <exports symbol='xmlUCSIsCatMe' type='function'/>
+     <exports symbol='xmlUCSIsVariationSelectorsSupplement' type='function'/>
+     <exports symbol='xmlUCSIsYiRadicals' type='function'/>
+     <exports symbol='xmlUCSIsYiSyllables' type='function'/>
+     <exports symbol='xmlUCSIsYijingHexagramSymbols' type='function'/>
     </file>
     <file name='xmlversion'>
      <summary>compile-time version information</summary>
      <description>compile-time version information for the XML library </description>
      <author>Daniel Veillard </author>
@@ -3354,9 +3354,24 @@
     </file>
     <file name='xmlversion'>
      <summary>compile-time version information</summary>
      <description>compile-time version information for the XML library </description>
      <author>Daniel Veillard </author>
-     <exports symbol='LIBXML_VERSION_EXTRA' type='macro'/>
-     <exports symbol='LIBXML_MODULES_ENABLED' type='macro'/>
+     <exports symbol='ATTRIBUTE_UNUSED' type='macro'/>
+     <exports symbol='DEBUG_MEMORY_LOCATION' type='macro'/>
+     <exports symbol='LIBXML_ATTR_ALLOC_SIZE' type='macro'/>
+     <exports symbol='LIBXML_ATTR_FORMAT' type='macro'/>
+     <exports symbol='LIBXML_AUTOMATA_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_C14N_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_CATALOG_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_DEBUG_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_DEBUG_RUNTIME' type='macro'/>
+     <exports symbol='LIBXML_DOTTED_VERSION' type='macro'/>
+     <exports symbol='LIBXML_EXPR_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_FTP_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_HTML_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_HTTP_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_ICONV_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_ICU_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_ISO8859X_ENABLED' type='macro'/>
      <exports symbol='LIBXML_LEGACY_ENABLED' type='macro'/>
      <exports symbol='LIBXML_LZMA_ENABLED' type='macro'/>
@@ -3361,17 +3376,5 @@
      <exports symbol='LIBXML_LEGACY_ENABLED' type='macro'/>
      <exports symbol='LIBXML_LZMA_ENABLED' type='macro'/>
-     <exports symbol='XML_DEPRECATED' type='macro'/>
-     <exports symbol='LIBXML_READER_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_THREAD_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_DOTTED_VERSION' type='macro'/>
-     <exports symbol='LIBXML_ISO8859X_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_DEBUG_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_XINCLUDE_ENABLED' type='macro'/>
-     <exports symbol='ATTRIBUTE_UNUSED' type='macro'/>
-     <exports symbol='LIBXML_XPTR_LOCS_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_PUSH_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_SAX1_ENABLED' type='macro'/>
-     <exports symbol='WITHOUT_TRIO' type='macro'/>
-     <exports symbol='LIBXML_SCHEMATRON_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_HTTP_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_MODULES_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_MODULE_EXTENSION' type='macro'/>
      <exports symbol='LIBXML_OUTPUT_ENABLED' type='macro'/>
@@ -3377,9 +3380,5 @@
      <exports symbol='LIBXML_OUTPUT_ENABLED' type='macro'/>
-     <exports symbol='WITH_TRIO' type='macro'/>
-     <exports symbol='LIBXML_DEBUG_RUNTIME' type='macro'/>
-     <exports symbol='LIBXML_VERSION' type='macro'/>
-     <exports symbol='LIBXML_XPTR_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_VERSION_STRING' type='macro'/>
-     <exports symbol='LIBXML_CATALOG_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_ATTR_ALLOC_SIZE' type='macro'/>
+     <exports symbol='LIBXML_PATTERN_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_PUSH_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_READER_ENABLED' type='macro'/>
      <exports symbol='LIBXML_REGEXP_ENABLED' type='macro'/>
@@ -3385,12 +3384,3 @@
      <exports symbol='LIBXML_REGEXP_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_ICU_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_MODULE_EXTENSION' type='macro'/>
-     <exports symbol='LIBXML_ICONV_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_HTML_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_UNICODE_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_FTP_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_AUTOMATA_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_ZLIB_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_WRITER_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_C14N_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_SAX1_ENABLED' type='macro'/>
      <exports symbol='LIBXML_SCHEMAS_ENABLED' type='macro'/>
@@ -3396,5 +3386,4 @@
      <exports symbol='LIBXML_SCHEMAS_ENABLED' type='macro'/>
-     <exports symbol='DEBUG_MEMORY_LOCATION' type='macro'/>
-     <exports symbol='LIBXML_ATTR_FORMAT' type='macro'/>
+     <exports symbol='LIBXML_SCHEMATRON_ENABLED' type='macro'/>
      <exports symbol='LIBXML_TEST_VERSION' type='macro'/>
      <exports symbol='LIBXML_THREAD_ALLOC_ENABLED' type='macro'/>
@@ -3399,5 +3388,6 @@
      <exports symbol='LIBXML_TEST_VERSION' type='macro'/>
      <exports symbol='LIBXML_THREAD_ALLOC_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_XPATH_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_PATTERN_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_THREAD_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_TREE_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_UNICODE_ENABLED' type='macro'/>
      <exports symbol='LIBXML_VALID_ENABLED' type='macro'/>
@@ -3403,9 +3393,19 @@
      <exports symbol='LIBXML_VALID_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_TREE_ENABLED' type='macro'/>
-     <exports symbol='LIBXML_EXPR_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_VERSION' type='macro'/>
+     <exports symbol='LIBXML_VERSION_EXTRA' type='macro'/>
+     <exports symbol='LIBXML_VERSION_STRING' type='macro'/>
+     <exports symbol='LIBXML_WRITER_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_XINCLUDE_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_XPATH_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_XPTR_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_XPTR_LOCS_ENABLED' type='macro'/>
+     <exports symbol='LIBXML_ZLIB_ENABLED' type='macro'/>
+     <exports symbol='WITHOUT_TRIO' type='macro'/>
+     <exports symbol='WITH_TRIO' type='macro'/>
+     <exports symbol='XML_DEPRECATED' type='macro'/>
      <exports symbol='xmlCheckVersion' type='function'/>
     </file>
     <file name='xmlwriter'>
      <summary>text writing API for XML</summary>
      <description>text writing API for XML </description>
      <author>Alfred Mickautsch &lt;alfred@mickautsch.de&gt; </author>
@@ -3406,7 +3406,8 @@
      <exports symbol='xmlCheckVersion' type='function'/>
     </file>
     <file name='xmlwriter'>
      <summary>text writing API for XML</summary>
      <description>text writing API for XML </description>
      <author>Alfred Mickautsch &lt;alfred@mickautsch.de&gt; </author>
+     <exports symbol='xmlTextWriterWriteDocType' type='macro'/>
      <exports symbol='xmlTextWriterWriteProcessingInstruction' type='macro'/>
@@ -3412,4 +3413,3 @@
      <exports symbol='xmlTextWriterWriteProcessingInstruction' type='macro'/>
-     <exports symbol='xmlTextWriterWriteDocType' type='macro'/>
      <exports symbol='xmlTextWriter' type='typedef'/>
      <exports symbol='xmlTextWriterPtr' type='typedef'/>
@@ -3414,13 +3414,8 @@
      <exports symbol='xmlTextWriter' type='typedef'/>
      <exports symbol='xmlTextWriterPtr' type='typedef'/>
-     <exports symbol='xmlTextWriterStartDocument' type='function'/>
-     <exports symbol='xmlTextWriterEndPI' type='function'/>
-     <exports symbol='xmlTextWriterWriteBase64' type='function'/>
-     <exports symbol='xmlTextWriterSetIndentString' type='function'/>
-     <exports symbol='xmlTextWriterStartAttribute' type='function'/>
-     <exports symbol='xmlTextWriterEndComment' type='function'/>
-     <exports symbol='xmlTextWriterWriteRawLen' type='function'/>
-     <exports symbol='xmlTextWriterWriteDTDExternalEntityContents' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatCDATA' type='function'/>
-     <exports symbol='xmlTextWriterStartAttributeNS' type='function'/>
+     <exports symbol='xmlFreeTextWriter' type='function'/>
+     <exports symbol='xmlNewTextWriter' type='function'/>
+     <exports symbol='xmlNewTextWriterDoc' type='function'/>
+     <exports symbol='xmlNewTextWriterFilename' type='function'/>
+     <exports symbol='xmlNewTextWriterMemory' type='function'/>
      <exports symbol='xmlNewTextWriterPushParser' type='function'/>
@@ -3426,6 +3421,3 @@
      <exports symbol='xmlNewTextWriterPushParser' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatAttributeNS' type='function'/>
-     <exports symbol='xmlTextWriterWriteDTDEntity' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatPI' type='function'/>
-     <exports symbol='xmlTextWriterWriteBinHex' type='function'/>
+     <exports symbol='xmlNewTextWriterTree' type='function'/>
      <exports symbol='xmlTextWriterEndAttribute' type='function'/>
@@ -3431,4 +3423,8 @@
      <exports symbol='xmlTextWriterEndAttribute' type='function'/>
-     <exports symbol='xmlTextWriterSetIndent' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatPI' type='function'/>
+     <exports symbol='xmlTextWriterEndCDATA' type='function'/>
+     <exports symbol='xmlTextWriterEndComment' type='function'/>
+     <exports symbol='xmlTextWriterEndDTD' type='function'/>
+     <exports symbol='xmlTextWriterEndDTDAttlist' type='function'/>
+     <exports symbol='xmlTextWriterEndDTDElement' type='function'/>
+     <exports symbol='xmlTextWriterEndDTDEntity' type='function'/>
      <exports symbol='xmlTextWriterEndDocument' type='function'/>
@@ -3434,3 +3430,12 @@
      <exports symbol='xmlTextWriterEndDocument' type='function'/>
-     <exports symbol='xmlTextWriterWriteDTDAttlist' type='function'/>
+     <exports symbol='xmlTextWriterEndElement' type='function'/>
+     <exports symbol='xmlTextWriterEndPI' type='function'/>
+     <exports symbol='xmlTextWriterFlush' type='function'/>
+     <exports symbol='xmlTextWriterFullEndElement' type='function'/>
+     <exports symbol='xmlTextWriterSetIndent' type='function'/>
+     <exports symbol='xmlTextWriterSetIndentString' type='function'/>
+     <exports symbol='xmlTextWriterSetQuoteChar' type='function'/>
+     <exports symbol='xmlTextWriterStartAttribute' type='function'/>
+     <exports symbol='xmlTextWriterStartAttributeNS' type='function'/>
+     <exports symbol='xmlTextWriterStartCDATA' type='function'/>
      <exports symbol='xmlTextWriterStartComment' type='function'/>
@@ -3436,4 +3441,8 @@
      <exports symbol='xmlTextWriterStartComment' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatDTD' type='function'/>
-     <exports symbol='xmlTextWriterEndCDATA' type='function'/>
+     <exports symbol='xmlTextWriterStartDTD' type='function'/>
+     <exports symbol='xmlTextWriterStartDTDAttlist' type='function'/>
+     <exports symbol='xmlTextWriterStartDTDElement' type='function'/>
+     <exports symbol='xmlTextWriterStartDTDEntity' type='function'/>
+     <exports symbol='xmlTextWriterStartDocument' type='function'/>
+     <exports symbol='xmlTextWriterStartElement' type='function'/>
      <exports symbol='xmlTextWriterStartElementNS' type='function'/>
@@ -3439,6 +3448,2 @@
      <exports symbol='xmlTextWriterStartElementNS' type='function'/>
-     <exports symbol='xmlTextWriterEndDTDEntity' type='function'/>
-     <exports symbol='xmlNewTextWriter' type='function'/>
-     <exports symbol='xmlFreeTextWriter' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatDTDAttlist' type='function'/>
      <exports symbol='xmlTextWriterStartPI' type='function'/>
@@ -3444,5 +3449,6 @@
      <exports symbol='xmlTextWriterStartPI' type='function'/>
-     <exports symbol='xmlTextWriterStartElement' type='function'/>
-     <exports symbol='xmlTextWriterWriteDTDExternalEntity' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatRaw' type='function'/>
+     <exports symbol='xmlTextWriterWriteAttribute' type='function'/>
+     <exports symbol='xmlTextWriterWriteAttributeNS' type='function'/>
+     <exports symbol='xmlTextWriterWriteBase64' type='function'/>
+     <exports symbol='xmlTextWriterWriteBinHex' type='function'/>
      <exports symbol='xmlTextWriterWriteCDATA' type='function'/>
@@ -3448,17 +3454,9 @@
      <exports symbol='xmlTextWriterWriteCDATA' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatDTDInternalEntity' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatAttribute' type='function'/>
-     <exports symbol='xmlTextWriterEndDTDElement' type='function'/>
-     <exports symbol='xmlTextWriterEndDTD' type='function'/>
-     <exports symbol='xmlTextWriterWriteElement' type='function'/>
-     <exports symbol='xmlTextWriterEndElement' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatComment' type='function'/>
-     <exports symbol='xmlTextWriterStartCDATA' type='function'/>
-     <exports symbol='xmlNewTextWriterFilename' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatElement' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatComment' type='function'/>
-     <exports symbol='xmlTextWriterWriteAttributeNS' type='function'/>
-     <exports symbol='xmlTextWriterWritePI' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatDTDInternalEntity' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatString' type='function'/>
+     <exports symbol='xmlTextWriterWriteComment' type='function'/>
+     <exports symbol='xmlTextWriterWriteDTD' type='function'/>
+     <exports symbol='xmlTextWriterWriteDTDAttlist' type='function'/>
+     <exports symbol='xmlTextWriterWriteDTDElement' type='function'/>
+     <exports symbol='xmlTextWriterWriteDTDEntity' type='function'/>
+     <exports symbol='xmlTextWriterWriteDTDExternalEntity' type='function'/>
+     <exports symbol='xmlTextWriterWriteDTDExternalEntityContents' type='function'/>
      <exports symbol='xmlTextWriterWriteDTDInternalEntity' type='function'/>
@@ -3464,3 +3462,2 @@
      <exports symbol='xmlTextWriterWriteDTDInternalEntity' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatElementNS' type='function'/>
      <exports symbol='xmlTextWriterWriteDTDNotation' type='function'/>
@@ -3466,5 +3463,3 @@
      <exports symbol='xmlTextWriterWriteDTDNotation' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatElement' type='function'/>
-     <exports symbol='xmlTextWriterSetQuoteChar' type='function'/>
-     <exports symbol='xmlTextWriterWriteString' type='function'/>
+     <exports symbol='xmlTextWriterWriteElement' type='function'/>
      <exports symbol='xmlTextWriterWriteElementNS' type='function'/>
@@ -3470,12 +3465,4 @@
      <exports symbol='xmlTextWriterWriteElementNS' type='function'/>
-     <exports symbol='xmlTextWriterFullEndElement' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatAttributeNS' type='function'/>
-     <exports symbol='xmlTextWriterFlush' type='function'/>
-     <exports symbol='xmlTextWriterStartDTD' type='function'/>
-     <exports symbol='xmlTextWriterWriteAttribute' type='function'/>
-     <exports symbol='xmlNewTextWriterDoc' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatDTDElement' type='function'/>
-     <exports symbol='xmlTextWriterEndDTDAttlist' type='function'/>
-     <exports symbol='xmlNewTextWriterTree' type='function'/>
-     <exports symbol='xmlNewTextWriterMemory' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatAttribute' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatAttributeNS' type='function'/>
      <exports symbol='xmlTextWriterWriteFormatCDATA' type='function'/>
@@ -3481,7 +3468,4 @@
      <exports symbol='xmlTextWriterWriteFormatCDATA' type='function'/>
-     <exports symbol='xmlTextWriterStartDTDAttlist' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatString' type='function'/>
-     <exports symbol='xmlTextWriterWriteComment' type='function'/>
-     <exports symbol='xmlTextWriterWriteVFormatRaw' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatComment' type='function'/>
      <exports symbol='xmlTextWriterWriteFormatDTD' type='function'/>
      <exports symbol='xmlTextWriterWriteFormatDTDAttlist' type='function'/>
@@ -3486,3 +3470,11 @@
      <exports symbol='xmlTextWriterWriteFormatDTD' type='function'/>
      <exports symbol='xmlTextWriterWriteFormatDTDAttlist' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatDTDElement' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatDTDInternalEntity' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatElement' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatElementNS' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatPI' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatRaw' type='function'/>
+     <exports symbol='xmlTextWriterWriteFormatString' type='function'/>
+     <exports symbol='xmlTextWriterWritePI' type='function'/>
      <exports symbol='xmlTextWriterWriteRaw' type='function'/>
@@ -3488,6 +3480,10 @@
      <exports symbol='xmlTextWriterWriteRaw' type='function'/>
-     <exports symbol='xmlTextWriterWriteDTDElement' type='function'/>
-     <exports symbol='xmlTextWriterWriteDTD' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatAttribute' type='function'/>
-     <exports symbol='xmlTextWriterStartDTDEntity' type='function'/>
+     <exports symbol='xmlTextWriterWriteRawLen' type='function'/>
+     <exports symbol='xmlTextWriterWriteString' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatAttribute' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatAttributeNS' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatCDATA' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatComment' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatDTD' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatDTDAttlist' type='function'/>
      <exports symbol='xmlTextWriterWriteVFormatDTDElement' type='function'/>
@@ -3493,8 +3489,12 @@
      <exports symbol='xmlTextWriterWriteVFormatDTDElement' type='function'/>
-     <exports symbol='xmlTextWriterStartDTDElement' type='function'/>
-     <exports symbol='xmlTextWriterWriteFormatElementNS' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatDTDInternalEntity' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatElement' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatElementNS' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatPI' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatRaw' type='function'/>
+     <exports symbol='xmlTextWriterWriteVFormatString' type='function'/>
     </file>
     <file name='xpath'>
      <summary>XML Path Language implementation</summary>
      <description>API for the XML Path Language implementation  XML Path Language implementation XPath is a language for addressing parts of an XML document, designed to be used by both XSLT and XPointer</description>
      <author>Daniel Veillard </author>
@@ -3496,7 +3496,10 @@
     </file>
     <file name='xpath'>
      <summary>XML Path Language implementation</summary>
      <description>API for the XML Path Language implementation  XML Path Language implementation XPath is a language for addressing parts of an XML document, designed to be used by both XSLT and XPointer</description>
      <author>Daniel Veillard </author>
+     <exports symbol='XML_XPATH_CHECKNS' type='macro'/>
+     <exports symbol='XML_XPATH_NOVAR' type='macro'/>
+     <exports symbol='xmlXPathNodeSetGetLength' type='macro'/>
      <exports symbol='xmlXPathNodeSetIsEmpty' type='macro'/>
      <exports symbol='xmlXPathNodeSetItem' type='macro'/>
@@ -3501,7 +3504,3 @@
      <exports symbol='xmlXPathNodeSetIsEmpty' type='macro'/>
      <exports symbol='xmlXPathNodeSetItem' type='macro'/>
-     <exports symbol='XML_XPATH_CHECKNS' type='macro'/>
-     <exports symbol='xmlXPathNodeSetGetLength' type='macro'/>
-     <exports symbol='XML_XPATH_NOVAR' type='macro'/>
-     <exports symbol='XPATH_NUMBER_ERROR' type='enum'/>
      <exports symbol='XPATH_BOOLEAN' type='enum'/>
@@ -3507,10 +3506,2 @@
      <exports symbol='XPATH_BOOLEAN' type='enum'/>
-     <exports symbol='XPATH_START_LITERAL_ERROR' type='enum'/>
-     <exports symbol='XPATH_UNCLOSED_ERROR' type='enum'/>
-     <exports symbol='XPATH_INVALID_CHAR_ERROR' type='enum'/>
-     <exports symbol='XPATH_UNDEF_VARIABLE_ERROR' type='enum'/>
-     <exports symbol='XPATH_EXPRESSION_OK' type='enum'/>
-     <exports symbol='XPATH_NODESET' type='enum'/>
-     <exports symbol='XPATH_OP_LIMIT_EXCEEDED' type='enum'/>
-     <exports symbol='XPATH_VARIABLE_REF_ERROR' type='enum'/>
      <exports symbol='XPATH_ENCODING_ERROR' type='enum'/>
@@ -3516,20 +3507,4 @@
      <exports symbol='XPATH_ENCODING_ERROR' type='enum'/>
-     <exports symbol='XPTR_RESOURCE_ERROR' type='enum'/>
-     <exports symbol='XPATH_NUMBER' type='enum'/>
-     <exports symbol='XPATH_POINT' type='enum'/>
-     <exports symbol='XPATH_USERS' type='enum'/>
-     <exports symbol='XPATH_UNDEF_PREFIX_ERROR' type='enum'/>
-     <exports symbol='XPATH_UNKNOWN_FUNC_ERROR' type='enum'/>
-     <exports symbol='XPATH_INVALID_CTXT_SIZE' type='enum'/>
-     <exports symbol='XPATH_RANGE' type='enum'/>
-     <exports symbol='XPTR_SYNTAX_ERROR' type='enum'/>
-     <exports symbol='XPATH_LOCATIONSET' type='enum'/>
-     <exports symbol='XPATH_INVALID_CTXT' type='enum'/>
-     <exports symbol='XPATH_INVALID_ARITY' type='enum'/>
-     <exports symbol='XPTR_SUB_RESOURCE_ERROR' type='enum'/>
-     <exports symbol='XPATH_STRING' type='enum'/>
-     <exports symbol='XPATH_INVALID_PREDICATE_ERROR' type='enum'/>
-     <exports symbol='XPATH_RECURSION_LIMIT_EXCEEDED' type='enum'/>
-     <exports symbol='XPATH_XSLT_TREE' type='enum'/>
+     <exports symbol='XPATH_EXPRESSION_OK' type='enum'/>
      <exports symbol='XPATH_EXPR_ERROR' type='enum'/>
      <exports symbol='XPATH_FORBID_VARIABLE_ERROR' type='enum'/>
@@ -3534,4 +3509,6 @@
      <exports symbol='XPATH_EXPR_ERROR' type='enum'/>
      <exports symbol='XPATH_FORBID_VARIABLE_ERROR' type='enum'/>
-     <exports symbol='XPATH_INVALID_TYPE' type='enum'/>
+     <exports symbol='XPATH_INVALID_ARITY' type='enum'/>
+     <exports symbol='XPATH_INVALID_CHAR_ERROR' type='enum'/>
+     <exports symbol='XPATH_INVALID_CTXT' type='enum'/>
      <exports symbol='XPATH_INVALID_CTXT_POSITION' type='enum'/>
@@ -3537,6 +3514,3 @@
      <exports symbol='XPATH_INVALID_CTXT_POSITION' type='enum'/>
-     <exports symbol='XPATH_UNDEFINED' type='enum'/>
-     <exports symbol='XPATH_MEMORY_ERROR' type='enum'/>
-     <exports symbol='XPATH_UNFINISHED_LITERAL_ERROR' type='enum'/>
-     <exports symbol='XPATH_STACK_ERROR' type='enum'/>
+     <exports symbol='XPATH_INVALID_CTXT_SIZE' type='enum'/>
      <exports symbol='XPATH_INVALID_OPERAND' type='enum'/>
@@ -3542,9 +3516,29 @@
      <exports symbol='XPATH_INVALID_OPERAND' type='enum'/>
-     <exports symbol='xmlXPathObjectType' type='typedef'/>
-     <exports symbol='xmlXPathVariablePtr' type='typedef'/>
-     <exports symbol='xmlXPathContext' type='typedef'/>
-     <exports symbol='xmlXPathError' type='typedef'/>
-     <exports symbol='xmlXPathFunct' type='typedef'/>
-     <exports symbol='xmlXPathTypePtr' type='typedef'/>
-     <exports symbol='xmlXPathType' type='typedef'/>
+     <exports symbol='XPATH_INVALID_PREDICATE_ERROR' type='enum'/>
+     <exports symbol='XPATH_INVALID_TYPE' type='enum'/>
+     <exports symbol='XPATH_LOCATIONSET' type='enum'/>
+     <exports symbol='XPATH_MEMORY_ERROR' type='enum'/>
+     <exports symbol='XPATH_NODESET' type='enum'/>
+     <exports symbol='XPATH_NUMBER' type='enum'/>
+     <exports symbol='XPATH_NUMBER_ERROR' type='enum'/>
+     <exports symbol='XPATH_OP_LIMIT_EXCEEDED' type='enum'/>
+     <exports symbol='XPATH_POINT' type='enum'/>
+     <exports symbol='XPATH_RANGE' type='enum'/>
+     <exports symbol='XPATH_RECURSION_LIMIT_EXCEEDED' type='enum'/>
+     <exports symbol='XPATH_STACK_ERROR' type='enum'/>
+     <exports symbol='XPATH_START_LITERAL_ERROR' type='enum'/>
+     <exports symbol='XPATH_STRING' type='enum'/>
+     <exports symbol='XPATH_UNCLOSED_ERROR' type='enum'/>
+     <exports symbol='XPATH_UNDEFINED' type='enum'/>
+     <exports symbol='XPATH_UNDEF_PREFIX_ERROR' type='enum'/>
+     <exports symbol='XPATH_UNDEF_VARIABLE_ERROR' type='enum'/>
+     <exports symbol='XPATH_UNFINISHED_LITERAL_ERROR' type='enum'/>
+     <exports symbol='XPATH_UNKNOWN_FUNC_ERROR' type='enum'/>
+     <exports symbol='XPATH_USERS' type='enum'/>
+     <exports symbol='XPATH_VARIABLE_REF_ERROR' type='enum'/>
+     <exports symbol='XPATH_XSLT_TREE' type='enum'/>
+     <exports symbol='XPTR_RESOURCE_ERROR' type='enum'/>
+     <exports symbol='XPTR_SUB_RESOURCE_ERROR' type='enum'/>
+     <exports symbol='XPTR_SYNTAX_ERROR' type='enum'/>
+     <exports symbol='xmlNodeSet' type='typedef'/>
      <exports symbol='xmlNodeSetPtr' type='typedef'/>
@@ -3550,12 +3544,3 @@
      <exports symbol='xmlNodeSetPtr' type='typedef'/>
-     <exports symbol='xmlXPathFuncPtr' type='typedef'/>
-     <exports symbol='xmlXPathCompExprPtr' type='typedef'/>
-     <exports symbol='xmlXPathObject' type='typedef'/>
-     <exports symbol='xmlXPathCompExpr' type='typedef'/>
-     <exports symbol='xmlXPathContextPtr' type='typedef'/>
-     <exports symbol='xmlXPathParserContextPtr' type='typedef'/>
-     <exports symbol='xmlNodeSet' type='typedef'/>
-     <exports symbol='xmlXPathVariable' type='typedef'/>
-     <exports symbol='xmlXPathObjectPtr' type='typedef'/>
      <exports symbol='xmlXPathAxis' type='typedef'/>
      <exports symbol='xmlXPathAxisPtr' type='typedef'/>
@@ -3560,3 +3545,13 @@
      <exports symbol='xmlXPathAxis' type='typedef'/>
      <exports symbol='xmlXPathAxisPtr' type='typedef'/>
+     <exports symbol='xmlXPathCompExpr' type='typedef'/>
+     <exports symbol='xmlXPathCompExprPtr' type='typedef'/>
+     <exports symbol='xmlXPathContext' type='typedef'/>
+     <exports symbol='xmlXPathContextPtr' type='typedef'/>
+     <exports symbol='xmlXPathError' type='typedef'/>
+     <exports symbol='xmlXPathFuncPtr' type='typedef'/>
+     <exports symbol='xmlXPathFunct' type='typedef'/>
+     <exports symbol='xmlXPathObject' type='typedef'/>
+     <exports symbol='xmlXPathObjectPtr' type='typedef'/>
+     <exports symbol='xmlXPathObjectType' type='typedef'/>
      <exports symbol='xmlXPathParserContext' type='typedef'/>
@@ -3562,2 +3557,10 @@
      <exports symbol='xmlXPathParserContext' type='typedef'/>
+     <exports symbol='xmlXPathParserContextPtr' type='typedef'/>
+     <exports symbol='xmlXPathType' type='typedef'/>
+     <exports symbol='xmlXPathTypePtr' type='typedef'/>
+     <exports symbol='xmlXPathVariable' type='typedef'/>
+     <exports symbol='xmlXPathVariablePtr' type='typedef'/>
+     <exports symbol='_xmlNodeSet' type='struct'/>
+     <exports symbol='_xmlXPathAxis' type='struct'/>
+     <exports symbol='_xmlXPathContext' type='struct'/>
      <exports symbol='_xmlXPathFunct' type='struct'/>
@@ -3563,4 +3566,4 @@
      <exports symbol='_xmlXPathFunct' type='struct'/>
-     <exports symbol='_xmlXPathVariable' type='struct'/>
+     <exports symbol='_xmlXPathObject' type='struct'/>
      <exports symbol='_xmlXPathParserContext' type='struct'/>
      <exports symbol='_xmlXPathType' type='struct'/>
@@ -3565,7 +3568,4 @@
      <exports symbol='_xmlXPathParserContext' type='struct'/>
      <exports symbol='_xmlXPathType' type='struct'/>
-     <exports symbol='_xmlXPathObject' type='struct'/>
-     <exports symbol='_xmlXPathContext' type='struct'/>
-     <exports symbol='_xmlXPathAxis' type='struct'/>
-     <exports symbol='_xmlNodeSet' type='struct'/>
+     <exports symbol='_xmlXPathVariable' type='struct'/>
      <exports symbol='xmlXPathNAN' type='variable'/>
@@ -3571,3 +3571,2 @@
      <exports symbol='xmlXPathNAN' type='variable'/>
-     <exports symbol='xmlXPathPINF' type='variable'/>
      <exports symbol='xmlXPathNINF' type='variable'/>
@@ -3573,2 +3572,6 @@
      <exports symbol='xmlXPathNINF' type='variable'/>
+     <exports symbol='xmlXPathPINF' type='variable'/>
+     <exports symbol='xmlXPathAxisFunc' type='function'/>
+     <exports symbol='xmlXPathCastBooleanToNumber' type='function'/>
+     <exports symbol='xmlXPathCastBooleanToString' type='function'/>
      <exports symbol='xmlXPathCastNodeSetToBoolean' type='function'/>
@@ -3574,4 +3577,5 @@
      <exports symbol='xmlXPathCastNodeSetToBoolean' type='function'/>
-     <exports symbol='xmlXPathFuncLookupFunc' type='function'/>
-     <exports symbol='xmlXPathNodeEval' type='function'/>
+     <exports symbol='xmlXPathCastNodeSetToNumber' type='function'/>
+     <exports symbol='xmlXPathCastNodeSetToString' type='function'/>
+     <exports symbol='xmlXPathCastNodeToNumber' type='function'/>
      <exports symbol='xmlXPathCastNodeToString' type='function'/>
@@ -3577,5 +3581,12 @@
      <exports symbol='xmlXPathCastNodeToString' type='function'/>
-     <exports symbol='xmlXPathIsNaN' type='function'/>
-     <exports symbol='xmlXPathContextSetCache' type='function'/>
-     <exports symbol='xmlXPathConvertString' type='function'/>
+     <exports symbol='xmlXPathCastNumberToBoolean' type='function'/>
+     <exports symbol='xmlXPathCastNumberToString' type='function'/>
+     <exports symbol='xmlXPathCastStringToBoolean' type='function'/>
+     <exports symbol='xmlXPathCastStringToNumber' type='function'/>
+     <exports symbol='xmlXPathCastToBoolean' type='function'/>
+     <exports symbol='xmlXPathCastToNumber' type='function'/>
+     <exports symbol='xmlXPathCastToString' type='function'/>
+     <exports symbol='xmlXPathCmpNodes' type='function'/>
+     <exports symbol='xmlXPathCompile' type='function'/>
+     <exports symbol='xmlXPathCompiledEval' type='function'/>
      <exports symbol='xmlXPathCompiledEvalToBoolean' type='function'/>
@@ -3581,24 +3592,4 @@
      <exports symbol='xmlXPathCompiledEvalToBoolean' type='function'/>
-     <exports symbol='xmlXPathIsInf' type='function'/>
-     <exports symbol='xmlXPathOrderDocElems' type='function'/>
-     <exports symbol='xmlXPathNodeSetCreate' type='function'/>
-     <exports symbol='xmlXPathCastBooleanToNumber' type='function'/>
-     <exports symbol='xmlXPathCastNodeToNumber' type='function'/>
-     <exports symbol='xmlXPathCastStringToNumber' type='function'/>
-     <exports symbol='xmlXPathAxisFunc' type='function'/>
-     <exports symbol='xmlXPathCastToNumber' type='function'/>
-     <exports symbol='xmlXPathCastStringToBoolean' type='function'/>
-     <exports symbol='xmlXPathCastNumberToString' type='function'/>
-     <exports symbol='xmlXPathVariableLookupFunc' type='function'/>
-     <exports symbol='xmlXPathFreeObject' type='function'/>
-     <exports symbol='xmlXPathEvalPredicate' type='function'/>
-     <exports symbol='xmlXPathFreeContext' type='function'/>
-     <exports symbol='xmlXPathObjectCopy' type='function'/>
-     <exports symbol='xmlXPathFreeNodeSetList' type='function'/>
-     <exports symbol='xmlXPathEval' type='function'/>
-     <exports symbol='xmlXPathCastNodeSetToString' type='function'/>
-     <exports symbol='xmlXPathCompiledEval' type='function'/>
-     <exports symbol='xmlXPathEvalExpression' type='function'/>
-     <exports symbol='xmlXPathInit' type='function'/>
+     <exports symbol='xmlXPathContextSetCache' type='function'/>
      <exports symbol='xmlXPathConvertBoolean' type='function'/>
      <exports symbol='xmlXPathConvertFunc' type='function'/>
@@ -3603,3 +3594,16 @@
      <exports symbol='xmlXPathConvertBoolean' type='function'/>
      <exports symbol='xmlXPathConvertFunc' type='function'/>
+     <exports symbol='xmlXPathConvertNumber' type='function'/>
+     <exports symbol='xmlXPathConvertString' type='function'/>
+     <exports symbol='xmlXPathCtxtCompile' type='function'/>
+     <exports symbol='xmlXPathEval' type='function'/>
+     <exports symbol='xmlXPathEvalExpression' type='function'/>
+     <exports symbol='xmlXPathEvalFunc' type='function'/>
+     <exports symbol='xmlXPathEvalPredicate' type='function'/>
+     <exports symbol='xmlXPathFreeCompExpr' type='function'/>
+     <exports symbol='xmlXPathFreeContext' type='function'/>
+     <exports symbol='xmlXPathFreeNodeSet' type='function'/>
+     <exports symbol='xmlXPathFreeNodeSetList' type='function'/>
+     <exports symbol='xmlXPathFreeObject' type='function'/>
+     <exports symbol='xmlXPathFuncLookupFunc' type='function'/>
      <exports symbol='xmlXPathFunction' type='function'/>
@@ -3605,7 +3609,10 @@
      <exports symbol='xmlXPathFunction' type='function'/>
-     <exports symbol='xmlXPathCmpNodes' type='function'/>
-     <exports symbol='xmlXPathCastToString' type='function'/>
-     <exports symbol='xmlXPathCtxtCompile' type='function'/>
-     <exports symbol='xmlXPathEvalFunc' type='function'/>
-     <exports symbol='xmlXPathCastBooleanToString' type='function'/>
+     <exports symbol='xmlXPathInit' type='function'/>
+     <exports symbol='xmlXPathIsInf' type='function'/>
+     <exports symbol='xmlXPathIsNaN' type='function'/>
+     <exports symbol='xmlXPathNewContext' type='function'/>
+     <exports symbol='xmlXPathNodeEval' type='function'/>
+     <exports symbol='xmlXPathNodeSetCreate' type='function'/>
+     <exports symbol='xmlXPathObjectCopy' type='function'/>
+     <exports symbol='xmlXPathOrderDocElems' type='function'/>
      <exports symbol='xmlXPathSetContextNode' type='function'/>
@@ -3611,14 +3618,7 @@
      <exports symbol='xmlXPathSetContextNode' type='function'/>
-     <exports symbol='xmlXPathCastNumberToBoolean' type='function'/>
-     <exports symbol='xmlXPathFreeNodeSet' type='function'/>
-     <exports symbol='xmlXPathFreeCompExpr' type='function'/>
-     <exports symbol='xmlXPathNewContext' type='function'/>
-     <exports symbol='xmlXPathConvertNumber' type='function'/>
-     <exports symbol='xmlXPathCompile' type='function'/>
-     <exports symbol='xmlXPathCastNodeSetToNumber' type='function'/>
-     <exports symbol='xmlXPathCastToBoolean' type='function'/>
+     <exports symbol='xmlXPathVariableLookupFunc' type='function'/>
     </file>
     <file name='xpathInternals'>
      <summary>internal interfaces for XML Path Language implementation</summary>
      <description>internal interfaces for XML Path Language implementation used to build new modules on top of XPath like XPointer and XSLT </description>
      <author>Daniel Veillard </author>
@@ -3620,14 +3620,7 @@
     </file>
     <file name='xpathInternals'>
      <summary>internal interfaces for XML Path Language implementation</summary>
      <description>internal interfaces for XML Path Language implementation used to build new modules on top of XPath like XPointer and XSLT </description>
      <author>Daniel Veillard </author>
-     <exports symbol='xmlXPathStackIsExternal' type='macro'/>
-     <exports symbol='xmlXPathReturnEmptyString' type='macro'/>
-     <exports symbol='XP_ERROR0' type='macro'/>
-     <exports symbol='xmlXPathSetTypeError' type='macro'/>
-     <exports symbol='xmlXPathReturnEmptyNodeSet' type='macro'/>
-     <exports symbol='xmlXPathReturnTrue' type='macro'/>
-     <exports symbol='xmlXPathReturnBoolean' type='macro'/>
-     <exports symbol='xmlXPathGetContextNode' type='macro'/>
+     <exports symbol='CAST_TO_BOOLEAN' type='macro'/>
      <exports symbol='CAST_TO_NUMBER' type='macro'/>
@@ -3633,4 +3626,2 @@
      <exports symbol='CAST_TO_NUMBER' type='macro'/>
-     <exports symbol='CHECK_ARITY' type='macro'/>
-     <exports symbol='CHECK_TYPE0' type='macro'/>
      <exports symbol='CAST_TO_STRING' type='macro'/>
@@ -3636,6 +3627,3 @@
      <exports symbol='CAST_TO_STRING' type='macro'/>
-     <exports symbol='xmlXPathReturnExternal' type='macro'/>
-     <exports symbol='xmlXPathStackIsNodeSet' type='macro'/>
-     <exports symbol='xmlXPathCheckError' type='macro'/>
-     <exports symbol='xmlXPathSetError' type='macro'/>
+     <exports symbol='CHECK_ARITY' type='macro'/>
      <exports symbol='CHECK_ERROR' type='macro'/>
@@ -3641,5 +3629,3 @@
      <exports symbol='CHECK_ERROR' type='macro'/>
-     <exports symbol='xmlXPathReturnString' type='macro'/>
-     <exports symbol='CAST_TO_BOOLEAN' type='macro'/>
-     <exports symbol='xmlXPathSetArityError' type='macro'/>
+     <exports symbol='CHECK_ERROR0' type='macro'/>
      <exports symbol='CHECK_TYPE' type='macro'/>
@@ -3645,6 +3631,9 @@
      <exports symbol='CHECK_TYPE' type='macro'/>
-     <exports symbol='xmlXPathReturnFalse' type='macro'/>
-     <exports symbol='xmlXPathReturnNumber' type='macro'/>
-     <exports symbol='CHECK_ERROR0' type='macro'/>
+     <exports symbol='CHECK_TYPE0' type='macro'/>
+     <exports symbol='XP_ERROR' type='macro'/>
+     <exports symbol='XP_ERROR0' type='macro'/>
+     <exports symbol='xmlXPathCheckError' type='macro'/>
+     <exports symbol='xmlXPathEmptyNodeSet' type='macro'/>
+     <exports symbol='xmlXPathGetContextNode' type='macro'/>
      <exports symbol='xmlXPathGetDocument' type='macro'/>
      <exports symbol='xmlXPathGetError' type='macro'/>
@@ -3649,5 +3638,8 @@
      <exports symbol='xmlXPathGetDocument' type='macro'/>
      <exports symbol='xmlXPathGetError' type='macro'/>
-     <exports symbol='XP_ERROR' type='macro'/>
-     <exports symbol='xmlXPathEmptyNodeSet' type='macro'/>
+     <exports symbol='xmlXPathReturnBoolean' type='macro'/>
+     <exports symbol='xmlXPathReturnEmptyNodeSet' type='macro'/>
+     <exports symbol='xmlXPathReturnEmptyString' type='macro'/>
+     <exports symbol='xmlXPathReturnExternal' type='macro'/>
+     <exports symbol='xmlXPathReturnFalse' type='macro'/>
      <exports symbol='xmlXPathReturnNodeSet' type='macro'/>
@@ -3653,17 +3645,16 @@
      <exports symbol='xmlXPathReturnNodeSet' type='macro'/>
-     <exports symbol='xmlXPathNodeSetMerge' type='function'/>
-     <exports symbol='xmlXPathNumberFunction' type='function'/>
-     <exports symbol='xmlXPathNsLookup' type='function'/>
-     <exports symbol='xmlXPathNewNodeSet' type='function'/>
-     <exports symbol='xmlXPathNextAncestorOrSelf' type='function'/>
-     <exports symbol='xmlXPathNodeSetRemove' type='function'/>
-     <exports symbol='xmlXPathNewNodeSetList' type='function'/>
-     <exports symbol='xmlXPathPopBoolean' type='function'/>
-     <exports symbol='xmlXPathNewString' type='function'/>
-     <exports symbol='xmlXPathNodeLeadingSorted' type='function'/>
-     <exports symbol='xmlXPathNextChild' type='function'/>
-     <exports symbol='xmlXPathNextFollowingSibling' type='function'/>
-     <exports symbol='xmlXPathPopString' type='function'/>
-     <exports symbol='xmlXPathNamespaceURIFunction' type='function'/>
+     <exports symbol='xmlXPathReturnNumber' type='macro'/>
+     <exports symbol='xmlXPathReturnString' type='macro'/>
+     <exports symbol='xmlXPathReturnTrue' type='macro'/>
+     <exports symbol='xmlXPathSetArityError' type='macro'/>
+     <exports symbol='xmlXPathSetError' type='macro'/>
+     <exports symbol='xmlXPathSetTypeError' type='macro'/>
+     <exports symbol='xmlXPathStackIsExternal' type='macro'/>
+     <exports symbol='xmlXPathStackIsNodeSet' type='macro'/>
+     <exports symbol='valuePop' type='function'/>
+     <exports symbol='valuePush' type='function'/>
+     <exports symbol='xmlXPathAddValues' type='function'/>
+     <exports symbol='xmlXPathBooleanFunction' type='function'/>
+     <exports symbol='xmlXPathCeilingFunction' type='function'/>
      <exports symbol='xmlXPathCompareValues' type='function'/>
      <exports symbol='xmlXPathConcatFunction' type='function'/>
@@ -3668,9 +3659,23 @@
      <exports symbol='xmlXPathCompareValues' type='function'/>
      <exports symbol='xmlXPathConcatFunction' type='function'/>
-     <exports symbol='xmlXPathNodeSetContains' type='function'/>
-     <exports symbol='xmlXPatherror' type='function'/>
-     <exports symbol='xmlXPathNextAncestor' type='function'/>
-     <exports symbol='xmlXPathBooleanFunction' type='function'/>
-     <exports symbol='xmlXPathRoot' type='function'/>
-     <exports symbol='xmlXPathRegisteredNsCleanup' type='function'/>
+     <exports symbol='xmlXPathContainsFunction' type='function'/>
+     <exports symbol='xmlXPathCountFunction' type='function'/>
+     <exports symbol='xmlXPathDebugDumpCompExpr' type='function'/>
+     <exports symbol='xmlXPathDebugDumpObject' type='function'/>
+     <exports symbol='xmlXPathDifference' type='function'/>
+     <exports symbol='xmlXPathDistinct' type='function'/>
+     <exports symbol='xmlXPathDistinctSorted' type='function'/>
+     <exports symbol='xmlXPathDivValues' type='function'/>
+     <exports symbol='xmlXPathEqualValues' type='function'/>
+     <exports symbol='xmlXPathErr' type='function'/>
+     <exports symbol='xmlXPathEvalExpr' type='function'/>
+     <exports symbol='xmlXPathEvaluatePredicateResult' type='function'/>
+     <exports symbol='xmlXPathFalseFunction' type='function'/>
+     <exports symbol='xmlXPathFloorFunction' type='function'/>
+     <exports symbol='xmlXPathFreeParserContext' type='function'/>
+     <exports symbol='xmlXPathFunctionLookup' type='function'/>
+     <exports symbol='xmlXPathFunctionLookupNS' type='function'/>
+     <exports symbol='xmlXPathHasSameNodes' type='function'/>
+     <exports symbol='xmlXPathIdFunction' type='function'/>
+     <exports symbol='xmlXPathIntersection' type='function'/>
      <exports symbol='xmlXPathIsNodeType' type='function'/>
@@ -3676,2 +3681,24 @@
      <exports symbol='xmlXPathIsNodeType' type='function'/>
+     <exports symbol='xmlXPathLangFunction' type='function'/>
+     <exports symbol='xmlXPathLastFunction' type='function'/>
+     <exports symbol='xmlXPathLeading' type='function'/>
+     <exports symbol='xmlXPathLeadingSorted' type='function'/>
+     <exports symbol='xmlXPathLocalNameFunction' type='function'/>
+     <exports symbol='xmlXPathModValues' type='function'/>
+     <exports symbol='xmlXPathMultValues' type='function'/>
+     <exports symbol='xmlXPathNamespaceURIFunction' type='function'/>
+     <exports symbol='xmlXPathNewBoolean' type='function'/>
+     <exports symbol='xmlXPathNewCString' type='function'/>
+     <exports symbol='xmlXPathNewFloat' type='function'/>
+     <exports symbol='xmlXPathNewNodeSet' type='function'/>
+     <exports symbol='xmlXPathNewNodeSetList' type='function'/>
+     <exports symbol='xmlXPathNewParserContext' type='function'/>
+     <exports symbol='xmlXPathNewString' type='function'/>
+     <exports symbol='xmlXPathNewValueTree' type='function'/>
+     <exports symbol='xmlXPathNextAncestor' type='function'/>
+     <exports symbol='xmlXPathNextAncestorOrSelf' type='function'/>
+     <exports symbol='xmlXPathNextAttribute' type='function'/>
+     <exports symbol='xmlXPathNextChild' type='function'/>
+     <exports symbol='xmlXPathNextDescendant' type='function'/>
+     <exports symbol='xmlXPathNextDescendantOrSelf' type='function'/>
      <exports symbol='xmlXPathNextFollowing' type='function'/>
@@ -3677,8 +3704,18 @@
      <exports symbol='xmlXPathNextFollowing' type='function'/>
-     <exports symbol='xmlXPathAddValues' type='function'/>
-     <exports symbol='xmlXPathRegisterVariable' type='function'/>
-     <exports symbol='valuePop' type='function'/>
-     <exports symbol='xmlXPathCeilingFunction' type='function'/>
-     <exports symbol='xmlXPathIntersection' type='function'/>
-     <exports symbol='xmlXPathContainsFunction' type='function'/>
+     <exports symbol='xmlXPathNextFollowingSibling' type='function'/>
+     <exports symbol='xmlXPathNextNamespace' type='function'/>
+     <exports symbol='xmlXPathNextParent' type='function'/>
+     <exports symbol='xmlXPathNextPreceding' type='function'/>
+     <exports symbol='xmlXPathNextPrecedingSibling' type='function'/>
+     <exports symbol='xmlXPathNextSelf' type='function'/>
+     <exports symbol='xmlXPathNodeLeading' type='function'/>
+     <exports symbol='xmlXPathNodeLeadingSorted' type='function'/>
+     <exports symbol='xmlXPathNodeSetAdd' type='function'/>
+     <exports symbol='xmlXPathNodeSetAddNs' type='function'/>
+     <exports symbol='xmlXPathNodeSetAddUnique' type='function'/>
+     <exports symbol='xmlXPathNodeSetContains' type='function'/>
+     <exports symbol='xmlXPathNodeSetDel' type='function'/>
+     <exports symbol='xmlXPathNodeSetFreeNs' type='function'/>
+     <exports symbol='xmlXPathNodeSetMerge' type='function'/>
+     <exports symbol='xmlXPathNodeSetRemove' type='function'/>
      <exports symbol='xmlXPathNodeSetSort' type='function'/>
@@ -3684,5 +3721,5 @@
      <exports symbol='xmlXPathNodeSetSort' type='function'/>
-     <exports symbol='xmlXPathStartsWithFunction' type='function'/>
-     <exports symbol='xmlXPathNodeLeading' type='function'/>
-     <exports symbol='xmlXPathSumFunction' type='function'/>
+     <exports symbol='xmlXPathNodeTrailing' type='function'/>
+     <exports symbol='xmlXPathNodeTrailingSorted' type='function'/>
+     <exports symbol='xmlXPathNormalizeFunction' type='function'/>
      <exports symbol='xmlXPathNotEqualValues' type='function'/>
@@ -3688,7 +3725,13 @@
      <exports symbol='xmlXPathNotEqualValues' type='function'/>
-     <exports symbol='xmlXPathEvaluatePredicateResult' type='function'/>
-     <exports symbol='xmlXPathErr' type='function'/>
-     <exports symbol='xmlXPathNextPreceding' type='function'/>
-     <exports symbol='xmlXPathFunctionLookupNS' type='function'/>
-     <exports symbol='xmlXPathRegisteredFuncsCleanup' type='function'/>
+     <exports symbol='xmlXPathNotFunction' type='function'/>
+     <exports symbol='xmlXPathNsLookup' type='function'/>
+     <exports symbol='xmlXPathNumberFunction' type='function'/>
+     <exports symbol='xmlXPathParseNCName' type='function'/>
+     <exports symbol='xmlXPathParseName' type='function'/>
+     <exports symbol='xmlXPathPopBoolean' type='function'/>
+     <exports symbol='xmlXPathPopExternal' type='function'/>
+     <exports symbol='xmlXPathPopNodeSet' type='function'/>
+     <exports symbol='xmlXPathPopNumber' type='function'/>
+     <exports symbol='xmlXPathPopString' type='function'/>
+     <exports symbol='xmlXPathPositionFunction' type='function'/>
      <exports symbol='xmlXPathRegisterAllFunctions' type='function'/>
@@ -3694,7 +3737,5 @@
      <exports symbol='xmlXPathRegisterAllFunctions' type='function'/>
-     <exports symbol='xmlXPathFunctionLookup' type='function'/>
-     <exports symbol='xmlXPathPositionFunction' type='function'/>
-     <exports symbol='xmlXPathSubstringBeforeFunction' type='function'/>
-     <exports symbol='xmlXPathRegisteredVariablesCleanup' type='function'/>
-     <exports symbol='xmlXPathNewFloat' type='function'/>
+     <exports symbol='xmlXPathRegisterFunc' type='function'/>
+     <exports symbol='xmlXPathRegisterFuncLookup' type='function'/>
+     <exports symbol='xmlXPathRegisterFuncNS' type='function'/>
      <exports symbol='xmlXPathRegisterNs' type='function'/>
@@ -3700,8 +3741,12 @@
      <exports symbol='xmlXPathRegisterNs' type='function'/>
-     <exports symbol='xmlXPathNextParent' type='function'/>
-     <exports symbol='xmlXPathNodeSetFreeNs' type='function'/>
-     <exports symbol='xmlXPathHasSameNodes' type='function'/>
-     <exports symbol='xmlXPathDistinctSorted' type='function'/>
-     <exports symbol='valuePush' type='function'/>
-     <exports symbol='xmlXPathSubstringFunction' type='function'/>
+     <exports symbol='xmlXPathRegisterVariable' type='function'/>
+     <exports symbol='xmlXPathRegisterVariableLookup' type='function'/>
+     <exports symbol='xmlXPathRegisterVariableNS' type='function'/>
+     <exports symbol='xmlXPathRegisteredFuncsCleanup' type='function'/>
+     <exports symbol='xmlXPathRegisteredNsCleanup' type='function'/>
+     <exports symbol='xmlXPathRegisteredVariablesCleanup' type='function'/>
+     <exports symbol='xmlXPathRoot' type='function'/>
+     <exports symbol='xmlXPathRoundFunction' type='function'/>
+     <exports symbol='xmlXPathStartsWithFunction' type='function'/>
+     <exports symbol='xmlXPathStringEvalNumber' type='function'/>
      <exports symbol='xmlXPathStringFunction' type='function'/>
@@ -3707,5 +3752,2 @@
      <exports symbol='xmlXPathStringFunction' type='function'/>
-     <exports symbol='xmlXPathFloorFunction' type='function'/>
-     <exports symbol='xmlXPathIdFunction' type='function'/>
-     <exports symbol='xmlXPathLastFunction' type='function'/>
      <exports symbol='xmlXPathStringLengthFunction' type='function'/>
@@ -3711,5 +3753,11 @@
      <exports symbol='xmlXPathStringLengthFunction' type='function'/>
-     <exports symbol='xmlXPathNextSelf' type='function'/>
-     <exports symbol='xmlXPathDebugDumpCompExpr' type='function'/>
-     <exports symbol='xmlXPathFalseFunction' type='function'/>
+     <exports symbol='xmlXPathSubValues' type='function'/>
+     <exports symbol='xmlXPathSubstringAfterFunction' type='function'/>
+     <exports symbol='xmlXPathSubstringBeforeFunction' type='function'/>
+     <exports symbol='xmlXPathSubstringFunction' type='function'/>
+     <exports symbol='xmlXPathSumFunction' type='function'/>
+     <exports symbol='xmlXPathTrailing' type='function'/>
+     <exports symbol='xmlXPathTrailingSorted' type='function'/>
+     <exports symbol='xmlXPathTranslateFunction' type='function'/>
+     <exports symbol='xmlXPathTrueFunction' type='function'/>
      <exports symbol='xmlXPathValueFlipSign' type='function'/>
@@ -3715,18 +3763,7 @@
      <exports symbol='xmlXPathValueFlipSign' type='function'/>
-     <exports symbol='xmlXPathTranslateFunction' type='function'/>
-     <exports symbol='xmlXPathRegisterFuncLookup' type='function'/>
-     <exports symbol='xmlXPathPopNumber' type='function'/>
-     <exports symbol='xmlXPathRoundFunction' type='function'/>
-     <exports symbol='xmlXPathPopNodeSet' type='function'/>
-     <exports symbol='xmlXPathCountFunction' type='function'/>
-     <exports symbol='xmlXPathParseNCName' type='function'/>
-     <exports symbol='xmlXPathTrueFunction' type='function'/>
-     <exports symbol='xmlXPathNewBoolean' type='function'/>
-     <exports symbol='xmlXPathSubValues' type='function'/>
-     <exports symbol='xmlXPathEqualValues' type='function'/>
-     <exports symbol='xmlXPathTrailingSorted' type='function'/>
-     <exports symbol='xmlXPathMultValues' type='function'/>
-     <exports symbol='xmlXPathModValues' type='function'/>
-     <exports symbol='xmlXPathNewParserContext' type='function'/>
+     <exports symbol='xmlXPathVariableLookup' type='function'/>
+     <exports symbol='xmlXPathVariableLookupNS' type='function'/>
+     <exports symbol='xmlXPathWrapCString' type='function'/>
+     <exports symbol='xmlXPathWrapExternal' type='function'/>
      <exports symbol='xmlXPathWrapNodeSet' type='function'/>
      <exports symbol='xmlXPathWrapString' type='function'/>
@@ -3731,43 +3768,6 @@
      <exports symbol='xmlXPathWrapNodeSet' type='function'/>
      <exports symbol='xmlXPathWrapString' type='function'/>
-     <exports symbol='xmlXPathLangFunction' type='function'/>
-     <exports symbol='xmlXPathRegisterFuncNS' type='function'/>
-     <exports symbol='xmlXPathNodeSetAddNs' type='function'/>
-     <exports symbol='xmlXPathLocalNameFunction' type='function'/>
-     <exports symbol='xmlXPathDifference' type='function'/>
-     <exports symbol='xmlXPathLeadingSorted' type='function'/>
-     <exports symbol='xmlXPathNextPrecedingSibling' type='function'/>
-     <exports symbol='xmlXPathPopExternal' type='function'/>
-     <exports symbol='xmlXPathNormalizeFunction' type='function'/>
-     <exports symbol='xmlXPathRegisterVariableLookup' type='function'/>
-     <exports symbol='xmlXPathNodeSetDel' type='function'/>
-     <exports symbol='xmlXPathNodeTrailingSorted' type='function'/>
-     <exports symbol='xmlXPathNewCString' type='function'/>
-     <exports symbol='xmlXPathRegisterFunc' type='function'/>
-     <exports symbol='xmlXPathSubstringAfterFunction' type='function'/>
-     <exports symbol='xmlXPathNextDescendant' type='function'/>
-     <exports symbol='xmlXPathNextNamespace' type='function'/>
-     <exports symbol='xmlXPathWrapCString' type='function'/>
-     <exports symbol='xmlXPathFreeParserContext' type='function'/>
-     <exports symbol='xmlXPathNodeTrailing' type='function'/>
-     <exports symbol='xmlXPathNodeSetAdd' type='function'/>
-     <exports symbol='xmlXPathNodeSetAddUnique' type='function'/>
-     <exports symbol='xmlXPathNewValueTree' type='function'/>
-     <exports symbol='xmlXPathDistinct' type='function'/>
-     <exports symbol='xmlXPathVariableLookup' type='function'/>
-     <exports symbol='xmlXPathNotFunction' type='function'/>
-     <exports symbol='xmlXPathStringEvalNumber' type='function'/>
-     <exports symbol='xmlXPathNextDescendantOrSelf' type='function'/>
-     <exports symbol='xmlXPathWrapExternal' type='function'/>
-     <exports symbol='xmlXPathNextAttribute' type='function'/>
-     <exports symbol='xmlXPathDivValues' type='function'/>
-     <exports symbol='xmlXPathVariableLookupNS' type='function'/>
-     <exports symbol='xmlXPathRegisterVariableNS' type='function'/>
-     <exports symbol='xmlXPathTrailing' type='function'/>
-     <exports symbol='xmlXPathEvalExpr' type='function'/>
-     <exports symbol='xmlXPathDebugDumpObject' type='function'/>
-     <exports symbol='xmlXPathLeading' type='function'/>
-     <exports symbol='xmlXPathParseName' type='function'/>
+     <exports symbol='xmlXPatherror' type='function'/>
     </file>
     <file name='xpointer'>
      <summary>API to handle XML Pointers</summary>
@@ -3776,8 +3776,5 @@
      <exports symbol='xmlLocationSet' type='typedef'/>
      <exports symbol='xmlLocationSetPtr' type='typedef'/>
      <exports symbol='_xmlLocationSet' type='struct'/>
-     <exports symbol='xmlXPtrNewRange' type='function'/>
-     <exports symbol='xmlXPtrFreeLocationSet' type='function'/>
-     <exports symbol='xmlXPtrWrapLocationSet' type='function'/>
      <exports symbol='xmlXPtrBuildNodeList' type='function'/>
      <exports symbol='xmlXPtrEval' type='function'/>
@@ -3782,4 +3779,5 @@
      <exports symbol='xmlXPtrBuildNodeList' type='function'/>
      <exports symbol='xmlXPtrEval' type='function'/>
-     <exports symbol='xmlXPtrNewRangeNodes' type='function'/>
+     <exports symbol='xmlXPtrEvalRangePredicate' type='function'/>
+     <exports symbol='xmlXPtrFreeLocationSet' type='function'/>
      <exports symbol='xmlXPtrLocationSetAdd' type='function'/>
@@ -3785,7 +3783,2 @@
      <exports symbol='xmlXPtrLocationSetAdd' type='function'/>
-     <exports symbol='xmlXPtrRangeToFunction' type='function'/>
-     <exports symbol='xmlXPtrNewCollapsedRange' type='function'/>
-     <exports symbol='xmlXPtrNewRangePoints' type='function'/>
-     <exports symbol='xmlXPtrNewLocationSetNodeSet' type='function'/>
-     <exports symbol='xmlXPtrNewRangePointNode' type='function'/>
      <exports symbol='xmlXPtrLocationSetCreate' type='function'/>
@@ -3791,7 +3784,3 @@
      <exports symbol='xmlXPtrLocationSetCreate' type='function'/>
-     <exports symbol='xmlXPtrNewRangeNodeObject' type='function'/>
-     <exports symbol='xmlXPtrNewContext' type='function'/>
-     <exports symbol='xmlXPtrLocationSetRemove' type='function'/>
-     <exports symbol='xmlXPtrNewRangeNodePoint' type='function'/>
      <exports symbol='xmlXPtrLocationSetDel' type='function'/>
      <exports symbol='xmlXPtrLocationSetMerge' type='function'/>
@@ -3796,4 +3785,7 @@
      <exports symbol='xmlXPtrLocationSetDel' type='function'/>
      <exports symbol='xmlXPtrLocationSetMerge' type='function'/>
-     <exports symbol='xmlXPtrEvalRangePredicate' type='function'/>
+     <exports symbol='xmlXPtrLocationSetRemove' type='function'/>
+     <exports symbol='xmlXPtrNewCollapsedRange' type='function'/>
+     <exports symbol='xmlXPtrNewContext' type='function'/>
+     <exports symbol='xmlXPtrNewLocationSetNodeSet' type='function'/>
      <exports symbol='xmlXPtrNewLocationSetNodes' type='function'/>
@@ -3799,4 +3791,12 @@
      <exports symbol='xmlXPtrNewLocationSetNodes' type='function'/>
+     <exports symbol='xmlXPtrNewRange' type='function'/>
+     <exports symbol='xmlXPtrNewRangeNodeObject' type='function'/>
+     <exports symbol='xmlXPtrNewRangeNodePoint' type='function'/>
+     <exports symbol='xmlXPtrNewRangeNodes' type='function'/>
+     <exports symbol='xmlXPtrNewRangePointNode' type='function'/>
+     <exports symbol='xmlXPtrNewRangePoints' type='function'/>
+     <exports symbol='xmlXPtrRangeToFunction' type='function'/>
+     <exports symbol='xmlXPtrWrapLocationSet' type='function'/>
     </file>
   </files>
   <symbols>