uri: library of generic URI related routines

@@ -640,6 +645,7 @@ void xmlFreeNsList (xmlChar * href : URL for the namespace const xmlChar * prefix : prefix for the namespace void * _private : application data + struct _xmlDoc * context : normally an xmlDoc } xmlNs;

Typedef xmlSAXLocatorPtr

Function type xmlDOMWrapAcquireNsFunction

xmlNsPtr	xmlDOMWrapAcquireNsFunction	(xmlDOMWrapCtxtPtr ctxt, 
						 xmlNodePtr node, 
						 const xmlChar * nsName, 
						 const xmlChar * nsPrefix)

+

A function called to acquire namespaces (xmlNs) from the wrapper.

`ctxt`:	a DOM wrapper context
`node`:	the context node (element or attribute)
`nsName`:	the requested namespace name
`nsPrefix`:	the requested namespace prefix
`Returns`:	an xmlNsPtr or NULL in case of an error.

xmlAddChild ()

xmlNodePtr	xmlAddChild		(xmlNodePtr parent, 
					 xmlNodePtr cur)

Add a new node to @parent, at the end of the child (or property) list merging adjacent TEXT nodes (in which case @cur is freed) If the new node is ATTRIBUTE, it is added into properties instead of children. If there is an attribute with equal name, it is first destroyed.

@@ -1010,11 +1020,11 @@ void xmlFreeNsList (

`doc`:	the document pointer
`name`:	the DTD name
`ExternalID`:	the external (PUBLIC) ID
`SystemID`:	the system ID
`Returns`:	a pointer to the new DTD structure

xmlDOMWrapAdoptNode ()

int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)

-

References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.

`ctxt`:	the optional context for custom processing
`sourceDoc`:	the optional sourceDoc
`node`:	the node to start with
`destDoc`:	the destination doc
`destParent`:	the optional new parent of @node in @destDoc
`options`:	option flags
`Returns`:	0 if the operation succeeded, 1 if a node of unsupported type was given, 2 if a node of not yet supported type was given and -1 on API/internal errors.

xmlDOMWrapCloneNode ()

int	xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlNodePtr * resNode, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int deep, 
					 int options)

-

References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used. This is the case when you don't know already where the cloned branch will be added to. If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) What to do with XInclude? Currently this returns an error for XInclude.

`ctxt`:	the optional context for custom processing
`sourceDoc`:	the optional sourceDoc
`node`:	the node to start with
`resNode`:	the clone of the given @node
`destDoc`:	the destination doc
`destParent`:	the optional new parent of @node in @destDoc
`deep`:	descend into child if set
`options`:	option flags
`Returns`:	0 if the operation succeeded, 1 if a node of unsupported (or not yet supported) type was given, -1 on API/internal errors.

xmlDOMWrapFreeCtxt ()

void	xmlDOMWrapFreeCtxt		(xmlDOMWrapCtxtPtr ctxt)

@@ -1026,11 +1036,11 @@ void	xmlFreeNsList			(Returns: the xmlDOMWrapCtxtPtr or NULL in case of an internal errror.

xmlDOMWrapReconcileNamespaces ()

int	xmlDOMWrapReconcileNamespaces	(xmlDOMWrapCtxtPtr ctxt, 
					 xmlNodePtr elem, 
					 int options)

-

Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.

`ctxt`:	DOM wrapper context, unused at the moment
`elem`:	the element-node
`options`:	option flags
`Returns`:	0 if succeeded, -1 otherwise and on API/internal errors.

xmlDOMWrapRemoveNode ()

int	xmlDOMWrapRemoveNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr node, 
					 int options)

-

Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references. WARNING: This function is in a experimental state.

`ctxt`:	a DOM wrapper context
`doc`:	the doc
`node`:	the node to be removed.
`options`:	set of options, unused at the moment
`Returns`:	0 on success, 1 if the node is not supported, -1 on API and internal errors.

xmlDocCopyNode ()

xmlNodePtr	xmlDocCopyNode		(const xmlNodePtr node, 
					 xmlDocPtr doc, 
					 int extended)

@@ -1071,7 +1081,7 @@ void	xmlFreeNsList			(xmlDocSetRootElement ()
xmlNodePtr	xmlDocSetRootElement	(xmlDocPtr doc, 
					 xmlNodePtr root)

 
Set the root element of the document (doc->children is a list containing possibly comments, PIs, etc ...).
-doc: the document
root: the new document root element
Returns: the old root element if any was found

xmlElemDump ()

void	xmlElemDump			(FILE * f, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur)

Dump an XML/HTML node, recursive behaviour, children are printed too.

diff --git a/doc/devhelp/libxml2-uri.html b/doc/devhelp/libxml2-uri.html index 22f724e..33f32fa 100644 --- a/doc/devhelp/libxml2-uri.html +++ b/doc/devhelp/libxml2-uri.html @@ -52,6 +52,7 @@ char * xmlURIUnescapeString (const char * s xmlURIPtr xmlParseURI (const char * str); xmlURIPtr xmlCreateURI (void); xmlChar * xmlURIEscapeStr (const xmlChar * str,
const xmlChar * list); +xmlChar * xmlPathToURI (const xmlChar * path); xmlChar * xmlCanonicPath (const xmlChar * path); void xmlFreeURI (xmlURIPtr uri); int xmlParseURIReference (xmlURIPtr uri,
const char * str); @@ -121,6 +122,10 @@ int xmlParseURIReference (

xmlParseURIReference ()

int	xmlParseURIReference		(xmlURIPtr uri, 
					 const char * str)

Parse an URI reference string and fills in the appropriate fields of the @uri structure URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]

`uri`:	pointer to an URI structure
`str`:	the string to analyze
`Returns`:	0 or the error code

xmlPathToURI ()

xmlChar *	xmlPathToURI		(const xmlChar * path)

+

Constructs an URI expressing the existing path

`path`:	the resource locator in a filesystem notation
`Returns`:	a new URI, or a duplicate of the path parameter if the construction fails. The caller is responsible for freeing the memory occupied by the returned string. If there is insufficient memory available, or the argument is NULL, the function returns NULL.

xmlPrintURI ()

void	xmlPrintURI			(FILE * stream, 
					 xmlURIPtr uri)

Prints the URI in the stream @stream.

diff --git a/doc/devhelp/libxml2-xinclude.html b/doc/devhelp/libxml2-xinclude.html index 6ffcd5a..31df927 100644 --- a/doc/devhelp/libxml2-xinclude.html +++ b/doc/devhelp/libxml2-xinclude.html @@ -55,6 +55,7 @@ #define XINCLUDE_OLD_NS; typedef struct _xmlXIncludeCtxt xmlXIncludeCtxt; typedef xmlXIncludeCtxt * xmlXIncludeCtxtPtr; +int xmlXIncludeProcessFlagsData (xmlDocPtr doc,
int flags,
void * data); int xmlXIncludeProcessFlags (xmlDocPtr doc,
int flags); int xmlXIncludeProcessTree (xmlNodePtr tree); int xmlXIncludeProcessNode (xmlXIncludeCtxtPtr ctxt,
xmlNodePtr node); @@ -136,6 +137,10 @@ The content of this structure is not made public by the API.

xmlXIncludeProcessFlags ()

int	xmlXIncludeProcessFlags		(xmlDocPtr doc, 
					 int flags)

Implement the XInclude substitution on the XML document @doc

`doc`:	an XML document
`flags`:	a set of xmlParserOption used for parsing XML includes
`Returns`:	0 if no substitution were done, -1 if some processing failed or the number of substitutions done.

xmlXIncludeProcessFlagsData ()

int	xmlXIncludeProcessFlagsData	(xmlDocPtr doc, 
					 int flags, 
					 void * data)

+

Implement the XInclude substitution on the XML document @doc

`doc`:	an XML document
`flags`:	a set of xmlParserOption used for parsing XML includes
`data`:	application data that will be passed to the parser context in the _private field of the parser context(s)
`Returns`:	0 if no substitution were done, -1 if some processing failed or the number of substitutions done.

xmlXIncludeProcessNode ()

int	xmlXIncludeProcessNode		(xmlXIncludeCtxtPtr ctxt, 
					 xmlNodePtr node)

Implement the XInclude substitution for the given subtree reusing the informations and data coming from the given context.

diff --git a/doc/devhelp/libxml2-xmlsave.html b/doc/devhelp/libxml2-xmlsave.html index 910a1df..cbe12bb 100644 --- a/doc/devhelp/libxml2-xmlsave.html +++ b/doc/devhelp/libxml2-xmlsave.html @@ -121,7 +121,7 @@ The content of this structure is not made public by the API.

xmlSaveTree ()

long	xmlSaveTree			(xmlSaveCtxtPtr ctxt, 
					 xmlNodePtr node)

Save a subtree starting at the node parameter to a saving context TODO: The function is not fully implemented yet as it does not return the byte count but 0 instead

`ctxt`:	a document saving context
`node`:	a document
`Returns`:	the number of byte written or -1 in case of error

`ctxt`:	a document saving context
`node`:	the top node of the subtree to save
`Returns`:	the number of byte written or -1 in case of error

Macro LIBXML_VERSION

#define LIBXML_VERSION;
-

the version number: 1.2.3 value is 1002003

the version number: 1.2.3 value is 10203

Macro LIBXML_VERSION_EXTRA

#define LIBXML_VERSION_EXTRA;
@@ -225,7 +226,7 @@ void	xmlCheckVersion			(int version);

Macro LIBXML_VERSION_STRING

#define LIBXML_VERSION_STRING;
-

the version number string, 1.2.3 value is "1002003"

the version number string, 1.2.3 value is "10203"

Macro LIBXML_WRITER_ENABLED

#define LIBXML_WRITER_ENABLED;
@@ -242,6 +243,10 @@ void	xmlCheckVersion			(int version);
         
         Macro LIBXML_XPTR_ENABLED
#define LIBXML_XPTR_ENABLED;
 
Whether XPointer is configured in
+
+        
+        Macro LIBXML_ZLIB_ENABLED
#define LIBXML_ZLIB_ENABLED;
+
Whether the Zlib support is compiled in
 
         
         Macro WITHOUT_TRIO
#define WITHOUT_TRIO;
diff --git a/doc/devhelp/libxml2-xpath.html b/doc/devhelp/libxml2-xpath.html
index f3fe7a6..86b0cc2 100644
--- a/doc/devhelp/libxml2-xpath.html
+++ b/doc/devhelp/libxml2-xpath.html
@@ -74,7 +74,7 @@ typedef xmlXPathFunction xmlXPathIsNaN			(double val);
 int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options);
 xmlXPathObjectPtr	xmlXPathConvertString	(xmlXPathObjectPtr val);
-xmlXPathObjectPtr	xmlXPathConvertBoolean	(xmlXPathObjectPtr val);
+int	xmlXPathCompiledEvalToBoolean	(xmlXPathCompExprPtr comp, 
					 xmlXPathContextPtr ctxt);
 int	xmlXPathIsInf			(double val);
 long	xmlXPathOrderDocElems		(xmlDocPtr doc);
 xmlNodeSetPtr	xmlXPathNodeSetCreate	(xmlNodePtr val);
@@ -96,11 +96,12 @@ void	xmlXPathFreeNodeSetList		(xmlXPathObjectPtr	xmlXPathCompiledEval	(xmlXPathCompExprPtr comp, 
						 xmlXPathContextPtr ctx);
 xmlXPathObjectPtr	xmlXPathEvalExpression	(const xmlChar * str, 
						 xmlXPathContextPtr ctxt);
 void	xmlXPathInit			(void);
-xmlXPathCompExprPtr	xmlXPathCtxtCompile	(xmlXPathContextPtr ctxt, 
						 const xmlChar * str);
+xmlXPathObjectPtr	xmlXPathConvertBoolean	(xmlXPathObjectPtr val);
 typedef int xmlXPathConvertFunc		(xmlXPathObjectPtr obj, 
					 int type);
 typedef void xmlXPathFunction		(xmlXPathParserContextPtr ctxt, 
					 int nargs);
 int	xmlXPathCmpNodes		(xmlNodePtr node1, 
					 xmlNodePtr node2);
 xmlChar *	xmlXPathCastToString	(xmlXPathObjectPtr val);
+xmlXPathCompExprPtr	xmlXPathCtxtCompile	(xmlXPathContextPtr ctxt, 
						 const xmlChar * str);
 typedef void xmlXPathEvalFunc		(xmlXPathParserContextPtr ctxt, 
					 int nargs);
 xmlChar *	xmlXPathCastBooleanToString	(int val);
 int	xmlXPathCastNumberToBoolean	(double val);
@@ -424,7 +425,7 @@ The content of this structure is not made public by the API.
         
         xmlXPathCastToString ()
xmlChar *	xmlXPathCastToString	(xmlXPathObjectPtr val)

 
Converts an existing object to its string() equivalent
-val: an XPath object
Returns: the string value of the object, NULL in case of error. A new string is allocated only if needed (@val isn't a string object).
+val: an XPath object
Returns: the allocated string value of the object, NULL in case of error. It's up to the caller to free the string memory with xmlFree().
         
         xmlXPathCmpNodes ()
int	xmlXPathCmpNodes		(xmlNodePtr node1, 
					 xmlNodePtr node2)

 
Compare two nodes w.r.t document order
@@ -437,6 +438,10 @@ The content of this structure is not made public by the API.
         xmlXPathCompiledEval ()
xmlXPathObjectPtr	xmlXPathCompiledEval	(xmlXPathCompExprPtr comp, 
						 xmlXPathContextPtr ctx)

 
Evaluate the Precompiled XPath expression in the given context.
 comp: the compiled XPath expression
ctx: the XPath context
Returns: the xmlXPathObjectPtr resulting from the evaluation or NULL. the caller has to free the object.
+        
+        xmlXPathCompiledEvalToBoolean ()
int	xmlXPathCompiledEvalToBoolean	(xmlXPathCompExprPtr comp, 
					 xmlXPathContextPtr ctxt)

+
Applies the XPath boolean() function on the result of the given compiled expression.
+comp: the compiled XPath expression
ctxt: the XPath context
Returns: 1 if the expression evaluated to true, 0 if to false and -1 in API and internal errors.
         
         xmlXPathContextSetCache ()
int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options)

 
Creates/frees an object cache on the XPath context. If activates XPath objects (xmlXPathObject) will be cached internally to be reused. @options: 0: This will set the XPath object caching: @value: This will set the maximum number of XPath objects to be cached per slot There are 5 slots for: node-set, string, number, boolean, and misc objects. Use <0 for the default number (100). Other values for @options have currently no effect.
diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp
index e0af836..d789934 100644
--- a/doc/devhelp/libxml2.devhelp
+++ b/doc/devhelp/libxml2.devhelp
@@ -127,6 +127,7 @@
     
     
     
+    
     
     
     
@@ -1413,6 +1414,7 @@
     
     
     
+    
     
     
     
@@ -1788,6 +1790,7 @@
     
     
     
+    
     
     
     
@@ -1948,6 +1951,7 @@
     
     
     
+    
     
     
     
@@ -2633,6 +2637,7 @@
     
     
     
+    
     
     
     
@@ -3294,6 +3299,7 @@
     
     
     
+    
     
     
     
@@ -3319,6 +3325,7 @@
     
     
     
+    
     
     
     
diff --git a/doc/docs.html b/doc/docs.html
index fa30ac2..4c5fe55 100644
--- a/doc/docs.html
+++ b/doc/docs.html
@@ -7,22 +7,27 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Developer Menu The XML C parser and toolkit of Gnome
Developer Menu
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker There are several on-line resources related to using libxml:
Use the search engineto lookupinformation.
+Developer Menu The XML C parser and toolkit of Gnome
Developer Menu
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker There are several on-line resources related to using libxml:
Use the search engine to look up
+  information.
   Check the FAQ.
-  Check the extensivedocumentationautomaticallyextracted
-    from code comments.
-  Look at the documentation about libxmlinternationalization support.
-  This page provides a global overview and someexampleson how to use libxml.
+  Check the extensive
+    documentation automatically extracted from code comments.
+  Look at the documentation about libxml
+    internationalization support.
+  This page provides a global overview and some
+    examples on how to use libxml.
   Code examples
-  John Fleck's libxml2 tutorial: htmlorpdf.
-  If you need to parse large files, check the xmlReaderAPI tutorial
-  James Henstridgewrote somenicedocumentationexplaining
-    how to use the libxml SAX interface.
-  George Lebl wrote anarticlefor
-    IBM developerWorksabout using libxml.
-  Check theTODOfile.
-  Read the 1.x to 2.x upgrade
-    pathdescription.If you are starting a new project using libxml you
-    shouldreally use the2.x version.
+  John Fleck's libxml2 tutorial: html
+    or pdf.
+  If you need to parse large files, check the xmlReader API tutorial
+  James Henstridge wrote some nice
+    documentation explaining how to use the libxml SAX interface.
+  George Lebl wrote an article
+    for IBM developerWorks about using libxml.
+  Check the TODO
+    file.
+  Read the 1.x to 2.x upgrade path
+    description. If you are starting a new project using libxml you should
+    really use the 2.x version.
   And don't forget to look at the mailing-list archive.
 
Daniel Veillard
diff --git a/doc/downloads.html b/doc/downloads.html
index 71ce9a6..e49f483 100644
--- a/doc/downloads.html
+++ b/doc/downloads.html
@@ -7,28 +7,30 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Downloads The XML C parser and toolkit of Gnome
Downloads
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker The latest versions of libxml2 can be found on the xmlsoft.orgserver ( HTTP, FTPand rsync are available), there
-isalsomirrors (Australia(Web), France) or on the Gnome FTP serveras source
-archive,Antonin Sprinzl also provide amirror in Austria. (NOTE
-thatyou need both the libxml(2)and libxml(2)-develpackagesinstalled
-to compile applications using libxml.)
You can find all the history of libxml(2) and libxslt releases in the olddirectory.
-TheprecompiledWindows binaries made by Igor Zlatovic are available in the win32directory.
Binary ports:
Red Hat RPMs for i386 are available directly on xmlsoft.org, the source RPM
-    willcompile onany architecture supported by Red Hat.
-  Igor Zlatkovicis
-    nowthemaintainer of the Windows port, heprovidesbinaries.
-  Blastwave provides Solarisbinaries.
-  Steve Ballprovides Mac
-  OsXbinaries.
+Downloads The XML C parser and toolkit of Gnome
Downloads
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker The latest versions of libxml2 can be found on the xmlsoft.org server ( HTTP, FTP and rsync are available), there is also
+mirrors (Australia( Web), France) or on the Gnome FTP server as source archive
+, Antonin Sprinzl also provide a
+mirror in Austria. (NOTE that you need both the libxml(2) and libxml(2)-devel
+packages installed to compile applications using libxml.)
You can find all the history of libxml(2) and libxslt releases in the old directory. The precompiled
+Windows binaries made by Igor Zlatovic are available in the win32 directory.
Binary ports:
Red Hat RPMs for i386 are available directly on xmlsoft.org, the source RPM will compile on
+    any architecture supported by Red Hat.
+  Igor Zlatkovic is now the
+    maintainer of the Windows port, he provides
+    binaries.
+  Blastwave provides Solaris
+  binaries.
+  Steve Ball provides Mac Os X
+    binaries.
   The HP-UX porting center provides HP-UX binaries
-  Bull provides precompiled RPMs forAIXaspatr
-    of their GNOME packages
+  Bull provides precompiled RPMs for AIX as
+    patr of their GNOME packages
 
If you know other supported binary ports, please contact me.
Snapshot:
Code from the W3C cvs base libxml2 module, updated hourly libxml2-cvs-snapshot.tar.gz.
   Docs, content of the web site, the list archive included libxml-docs.tar.gz.
-
Contributions:
I do accept external contributions, especially if compiling
-onanotherplatform,  get in touch with the list to upload the package,
-wrappersforvarious languages have been provided, and can be found in the bindings section
Libxml2 is also available from CVS:
The GnomeCVSbase. Check the
-    Gnome CVS
-    Toolspage;the CVS module is libxml2.
+
Contributions:
I do accept external contributions, especially if compiling on another
+platform,  get in touch with the list to upload the package, wrappers for
+various languages have been provided, and can be found in the bindings section
Libxml2 is also available from CVS:
The Gnome CVS
+    base. Check the Gnome CVS Tools
+    page; the CVS module is libxml2.
   
-  The libxsltmodule is also present there
+  The libxslt module is also present there
 
Daniel Veillard
diff --git a/doc/encoding.html b/doc/encoding.html
index 8db787e..1f4558d 100644
--- a/doc/encoding.html
+++ b/doc/encoding.html
@@ -7,44 +7,44 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Encodings support The XML C parser and toolkit of Gnome
Encodings support
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker If you are not really familiar with Internationalization (usual
-shortcutisI18N) , Unicode, characters and glyphs, I suggest you read a presentationbyTim
-Bray on Unicode and why you should care about it.
If you don't understand why it does not make sense to have
-astringwithout knowing what encoding it uses, then as Joel Spolsky said
-please do
-notwriteanother line of code until you finish reading that article.. It
-isaprerequisite to understand this page, and avoid a lot of
-problemswithlibxml2, XML or text processing in general.
Table of Content:
What does internationalization
-    supportmean?
-  The internal encoding,
-  howandwhy
+Encodings support The XML C parser and toolkit of Gnome
Encodings support
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker If you are not really familiar with Internationalization (usual shortcut
+is I18N) , Unicode, characters and glyphs, I suggest you read a presentation
+by Tim Bray on Unicode and why you should care about it.
If you don't understand why it does not make sense to have a string
+without knowing what encoding it uses, then as Joel Spolsky said please do not
+write another line of code until you finish reading that article.. It is
+a prerequisite to understand this page, and avoid a lot of problems with
+libxml2, XML or text processing in general.
Table of Content:
What does internationalization support
+    mean ?
+  The internal encoding, how and
+  why
   How is it implemented ?
   Default supported encodings
-  How to extend theexistingsupport
-
What does internationalization support mean ?
XML was designed from the start to allow the support of any charactersetby
-using Unicode. Any conformant XML parser has to support the UTF-8andUTF-16
-default encodings which can both express the full unicode ranges.UTF8is a
-variable length encoding whose greatest points are to reuse thesameencoding
-for ASCII and to save space for Western encodings, but it is abitmore complex
-to handle in practice. UTF-16 use 2 bytes per character(andsometimes combines
-two pairs), it makes implementation easier, but looksabit overkill for
-Western languages encoding. Moreover the XMLspecificationallows the document
-to be encoded in other encodings at thecondition thatthey are clearly labeled
-as such. For example the following isa wellformedXML document encoded in
-ISO-8859-1 and using accentuated lettersthat weFrench like for both markup
-and content:
<?xml version="1.0" encoding="ISO-8859-1"?>
+  How to extend the existing
+  support
+What does internationalization support mean ?
XML was designed from the start to allow the support of any character set
+by using Unicode. Any conformant XML parser has to support the UTF-8 and
+UTF-16 default encodings which can both express the full unicode ranges. UTF8
+is a variable length encoding whose greatest points are to reuse the same
+encoding for ASCII and to save space for Western encodings, but it is a bit
+more complex to handle in practice. UTF-16 use 2 bytes per character (and
+sometimes combines two pairs), it makes implementation easier, but looks a
+bit overkill for Western languages encoding. Moreover the XML specification
+allows the document to be encoded in other encodings at the condition that
+they are clearly labeled as such. For example the following is a wellformed
+XML document encoded in ISO-8859-1 and using accentuated letters that we
+French like for both markup and content:
<?xml version="1.0" encoding="ISO-8859-1"?>
 <tr�s>l�</tr�s>
Having internationalization support in libxml2 means the following:
the document is properly parsed
   informations about it's encoding are saved
   it can be modified
   it can be saved in its original encoding
-  it can also be saved in another encoding supported by
-    libxml2(forexample straight UTF8 or even an ASCII form)
-
Another very important point is that the whole libxml2 API,
-withtheexception of a few routines to read with a specific encoding or save
-toaspecific encoding, is completely agnostic about the original encoding
-ofthedocument.
It should be noted too that the HTML parser embedded in libxml2 nowobeythe
-same rules too, the following document will be (as of 2.2.2) handledinan
-internationalized fashion by libxml2 too:
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+  it can also be saved in another encoding supported by libxml2 (for
+    example straight UTF8 or even an ASCII form)
+Another very important point is that the whole libxml2 API, with the
+exception of a few routines to read with a specific encoding or save to a
+specific encoding, is completely agnostic about the original encoding of the
+document.
It should be noted too that the HTML parser embedded in libxml2 now obey
+the same rules too, the following document will be (as of 2.2.2) handled  in
+an internationalized fashion by libxml2 too:
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
                       "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html lang="fr">
 <head>
@@ -52,60 +52,59 @@ internationalized fashion by libxml2 too:
<!DOCTYPE HTML PUBLIC "-//W
 </head>
 <body>
 <p>W3C cr�e des standards pour le Web.</body>
-</html>
The internal encoding, how and why
One of the core decisions was to force all documents to be converted
-toadefault internal encoding, and that encoding to be UTF-8, here
-aretherationales for those choices:
keeping the native encoding in the internal form would force
-    thelibxmlusers (or the code associated) to be fully aware of the encoding
-    oftheoriginal document, for examples when adding a text node to
-    adocument,the content would have to be provided in the document
-    encoding,i.e. theclient code would have to check it before hand, make
-    sure it'sconformantto the encoding, etc ... Very hard in practice, though
-    in somespecificcases this may make sense.
-  the second decision was which encoding. From the XML spec only
-    UTF8andUTF16 really makes sense as being the two only encodings for
-    whichthereis mandatory support. UCS-4 (32 bits fixed size encoding)
-    couldbeconsidered an intelligent choice too since it's a direct
-    Unicodemappingsupport. I selected UTF-8 on the basis of efficiency
-    andcompatibilitywith surrounding software:
-    UTF-8 while a bit more complex to convert from/to (i.e.slightlymore
-        costly to import and export CPU wise) is also far morecompactthan
-        UTF-16 (and UCS-4) for a majority of the documents I seeit usedfor
-        right now (RPM RDF catalogs, advogato data, variousconfigurationfile
-        formats, etc.) and the key point for today'scomputerarchitecture is
-        efficient uses of caches. If one nearlydouble thememory requirement
-        to store the same amount of data, thiswill trashcaches (main
-        memory/external caches/internal caches) and mytake isthat this harms
-        the system far more than the CPU requirementsneededfor the conversion
-        to UTF-8
-      Most of libxml2 version 1 users were using it with
-        straightASCIImost of the time, doing the conversion with an
-        internalencodingrequiring all their code to be rewritten was a
-        seriousshow-stopperfor using UTF-16 or UCS-4.
-      UTF-8 is being used as the de-facto internal encoding
-        standardforrelated code like the pangoupcoming Gnome text widget,
-        anda lot of Unix code (yet another placewhere Unix programmer base
-        takesa different approach from Microsoft- they are using UTF-16)
+</html>
The internal encoding, how and why
One of the core decisions was to force all documents to be converted to a
+default internal encoding, and that encoding to be UTF-8, here are the
+rationales for those choices:
keeping the native encoding in the internal form would force the libxml
+    users (or the code associated) to be fully aware of the encoding of the
+    original document, for examples when adding a text node to a document,
+    the content would have to be provided in the document encoding, i.e. the
+    client code would have to check it before hand, make sure it's conformant
+    to the encoding, etc ... Very hard in practice, though in some specific
+    cases this may make sense.
+  the second decision was which encoding. From the XML spec only UTF8 and
+    UTF16 really makes sense as being the two only encodings for which there
+    is mandatory support. UCS-4 (32 bits fixed size encoding) could be
+    considered an intelligent choice too since it's a direct Unicode mapping
+    support. I selected UTF-8 on the basis of efficiency and compatibility
+    with surrounding software:
+    UTF-8 while a bit more complex to convert from/to (i.e. slightly
+        more costly to import and export CPU wise) is also far more compact
+        than UTF-16 (and UCS-4) for a majority of the documents I see it used
+        for right now (RPM RDF catalogs, advogato data, various configuration
+        file formats, etc.) and the key point for today's computer
+        architecture is efficient uses of caches. If one nearly double the
+        memory requirement to store the same amount of data, this will trash
+        caches (main memory/external caches/internal caches) and my take is
+        that this harms the system far more than the CPU requirements needed
+        for the conversion to UTF-8
+      Most of libxml2 version 1 users were using it with straight ASCII
+        most of the time, doing the conversion with an internal encoding
+        requiring all their code to be rewritten was a serious show-stopper
+        for using UTF-16 or UCS-4.
+      UTF-8 is being used as the de-facto internal encoding standard for
+        related code like the pango
+        upcoming Gnome text widget, and a lot of Unix code (yet another place
+        where Unix programmer base takes a different approach from Microsoft
+        - they are using UTF-16)
     
-
What does this mean in practice for the libxml2 user:
xmlChar, the libxml2 data type is a byte, those bytes must
-    beassembledas UTF-8 valid strings. The proper way to terminate an xmlChar
-    *stringis simply to append 0 byte, as usual.
-  One just need to make sure that when using chars outside the
-    ASCIIset,the values has been properly converted to UTF-8
-
How is it implemented ?
Let's describe how all this works within libxml, basically
-theI18N(internationalization) support get triggered only during I/O
-operation,i.e.when reading a document or saving one. Let's look first at
-thereadingsequence:
when a document is processed, we usually don't know the
-    encoding,asimple heuristic allows to detect UTF-16 and UCS-4 from
-    encodingswherethe ASCII range (0-0x7F) maps with ASCII
-  the xml declaration if available is parsed, including
-    theencodingdeclaration. At that point, if the autodetected encoding
-    isdifferentfrom the one declared a call to xmlSwitchEncoding()
-  isissued.
-  If there is no encoding declaration, then the input has to be
-    ineitherUTF-8 or UTF-16, if it is not then at some point when
-    processingtheinput, the converter/checker of UTF-8 form will raise an
-    encodingerror.You may end-up with a garbled document, or no document at
-    all !Example:
+What does this mean in practice for the libxml2 user:
xmlChar, the libxml2 data type is a byte, those bytes must be assembled
+    as UTF-8 valid strings. The proper way to terminate an xmlChar * string
+    is simply to append 0 byte, as usual.
+  One just need to make sure that when using chars outside the ASCII set,
+    the values has been properly converted to UTF-8
+
How is it implemented ?
Let's describe how all this works within libxml, basically the I18N
+(internationalization) support get triggered only during I/O operation, i.e.
+when reading a document or saving one. Let's look first at the reading
+sequence:
when a document is processed, we usually don't know the encoding, a
+    simple heuristic allows to detect UTF-16 and UCS-4 from encodings where
+    the ASCII range (0-0x7F) maps with ASCII
+  the xml declaration if available is parsed, including the encoding
+    declaration. At that point, if the autodetected encoding is different
+    from the one declared a call to xmlSwitchEncoding() is issued.
+  If there is no encoding declaration, then the input has to be in either
+    UTF-8 or UTF-16, if it is not then at some point when processing the
+    input, the converter/checker of UTF-8 form will raise an encoding error.
+    You may end-up with a garbled document, or no document at all ! Example:
     ~/XML -> ./xmllint err.xml 
 err.xml:1: error: Input is not proper UTF-8, indicate encoding !
 <tr�s>l�</tr�s>
@@ -114,93 +113,94 @@ err.xml:1: error: Bytes: 0xE8 0x73 0x3E 0x6C
 <tr�s>l�</tr�s>
    ^
   
-  xmlSwitchEncoding() does an encoding name lookup, canonicalize
-    it,andthen search the default registered encoding converters for
-    thatencoding.If it's not within the default set and iconv() support has
-    beencompiledit, it will ask iconv for such an encoder. If this fails then
-    theparserwill report an error and stops processing:
+  
xmlSwitchEncoding() does an encoding name lookup, canonicalize it, and
+    then search the default registered encoding converters for that encoding.
+    If it's not within the default set and iconv() support has been compiled
+    it, it will ask iconv for such an encoder. If this fails then the parser
+    will report an error and stops processing:
     ~/XML -> ./xmllint err2.xml 
 err2.xml:1: error: Unsupported encoding UnsupportedEnc
 <?xml version="1.0" encoding="UnsupportedEnc"?>
                                              ^
   
-  From that point the encoder processes progressively the input
-    (itisplugged as a front-end to the I/O module) for that entity.
-    Itcapturesand converts on-the-fly the document to be parsed to UTF-8.
-    Theparseritself just does UTF-8 checking of this input and
-    processittransparently. The only difference is that the encoding
-    informationhasbeen added to the parsing context (more precisely to
-    theinputcorresponding to this entity).
-  The result (when using DOM) is an internal form completely in
-    UTF-8withjust an encoding information on the document node.
-
Ok then what happens when saving the document (assuming
-youcollected/builtan xmlDoc DOM like structure) ? It depends on the
-functioncalled,xmlSaveFile() will just try to save in the original
-encoding,whilexmlSaveFileTo() and xmlSaveFileEnc() can optionally save to
-agivenencoding:
if no encoding is given, libxml2 will look for an
-    encodingvalueassociated to the document and if it exists will try to save
-    tothatencoding,
+  
From that point the encoder processes progressively the input (it is
+    plugged as a front-end to the I/O module) for that entity. It captures
+    and converts on-the-fly the document to be parsed to UTF-8. The parser
+    itself just does UTF-8 checking of this input and process it
+    transparently. The only difference is that the encoding information has
+    been added to the parsing context (more precisely to the input
+    corresponding to this entity).
+  The result (when using DOM) is an internal form completely in UTF-8
+    with just an encoding information on the document node.
+
Ok then what happens when saving the document (assuming you
+collected/built an xmlDoc DOM like structure) ? It depends on the function
+called, xmlSaveFile() will just try to save in the original encoding, while
+xmlSaveFileTo() and xmlSaveFileEnc() can optionally save to a given
+encoding:
if no encoding is given, libxml2 will look for an encoding value
+    associated to the document and if it exists will try to save to that
+    encoding,
     otherwise everything is written in the internal form, i.e. UTF-8
   
-  so if an encoding was specified, either at the API level or
-    onthedocument, libxml2 will again canonicalize the encoding name,
-    lookupfor aconverter in the registered set or through iconv. If not
-    foundthefunction will return an error code
-  the converter is placed before the I/O buffer layer, as another
-    kindofbuffer, then libxml2 will simply push the UTF-8 serialization
-    tothroughthat buffer, which will then progressively be converted and
-    pushedontothe I/O layer.
-  It is possible that the converter code fails on some input,
-    forexampletrying to push an UTF-8 encoded Chinese character through
-    theUTF-8 toISO-8859-1 converter won't work. Since the encoders
-    areprogressive theywill just report the error and the number of
-    bytesconverted, at thatpoint libxml2 will decode the offending
-    character,remove it from thebuffer and replace it with the associated
-    charRefencoding &#123; andresume the conversion. This guarantees that
-    anydocument will be savedwithout losses (except for markup names where
-    thisis not legal, this isa problem in the current version, in practice
-    avoidusing non-asciicharacters for tag or attribute names). A special
-    "ascii"encoding nameis used to save documents to a pure ascii form can be
-    usedwhenportability is really crucial
+  so if an encoding was specified, either at the API level or on the
+    document, libxml2 will again canonicalize the encoding name, lookup for a
+    converter in the registered set or through iconv. If not found the
+    function will return an error code
+  the converter is placed before the I/O buffer layer, as another kind of
+    buffer, then libxml2 will simply push the UTF-8 serialization to through
+    that buffer, which will then progressively be converted and pushed onto
+    the I/O layer.
+  It is possible that the converter code fails on some input, for example
+    trying to push an UTF-8 encoded Chinese character through the UTF-8 to
+    ISO-8859-1 converter won't work. Since the encoders are progressive they
+    will just report the error and the number of bytes converted, at that
+    point libxml2 will decode the offending character, remove it from the
+    buffer and replace it with the associated charRef encoding &#123; and
+    resume the conversion. This guarantees that any document will be saved
+    without losses (except for markup names where this is not legal, this is
+    a problem in the current version, in practice avoid using non-ascii
+    characters for tag or attribute names). A special "ascii" encoding name
+    is used to save documents to a pure ascii form can be used when
+    portability is really crucial
 
Here are a few examples based on the same test document:
~/XML -> ./xmllint isolat1 
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <tr�s>l�</tr�s>
 ~/XML -> ./xmllint --encode UTF-8 isolat1 
 <?xml version="1.0" encoding="UTF-8"?>
 <très>l� �</très>
-~/XML -> 
The same processing is applied (and reuse most of the code) for
-HTMLI18Nprocessing. Looking up and modifying the content encoding is a
-bitmoredifficult since it is located in a <meta> tag under
-the<head>,so a couple of functions htmlGetMetaEncoding()
-andhtmlSetMetaEncoding() havebeen provided. The parser also attempts to
-switchencoding on the fly whendetecting such a tag on input. Except for that
-theprocessing is the same(and again reuses the same code).
Default supported encodings
libxml2 has a set of default converters for the followingencodings(located
-in encoding.c):
UTF-8 is supported by default (null handlers)
+~/XML -> 
The same processing is applied (and reuse most of the code) for HTML I18N
+processing. Looking up and modifying the content encoding is a bit more
+difficult since it is located in a <meta> tag under the <head>,
+so a couple of functions htmlGetMetaEncoding() and htmlSetMetaEncoding() have
+been provided. The parser also attempts to switch encoding on the fly when
+detecting such a tag on input. Except for that the processing is the same
+(and again reuses the same code).
Default supported encodings
libxml2 has a set of default converters for the following encodings
+(located in encoding.c):
UTF-8 is supported by default (null handlers)
   UTF-16, both little and big endian
   ISO-Latin-1 (ISO-8859-1) covering most western languages
   ASCII, useful mostly for saving
-  HTML, a specific handler for the conversion of UTF-8 to ASCII
-    withHTMLpredefined entities like &copy; for the Copyright sign.
-
More over when compiled on an Unix platform with iconv support the
-fullsetof encodings supported by iconv can be instantly be used by libxml. On
-alinuxmachine with glibc-2.1 the list of supported encodings and aliases
-fill3 fullpages, and include UCS-4, the full set of ISO-Latin encodings, and
-thevariousJapanese ones.
To convert from the UTF-8 values returned from the API to
-anotherencodingthen it is possible to use the function provided from the encoding modulelike UTF8Toisolat1, or
-usethePOSIX iconv()APIdirectly.
Encoding aliases
From 2.2.3, libxml2 has support to register encoding names aliases.Thegoal
-is to be able to parse document whose encoding is supported butwherethe name
-differs (for example from the default set of names acceptedbyiconv). The
-following functions allow to register and handle new aliasesforexisting
-encodings. Once registered libxml2 will automatically lookupthealiases when
-handling a document:
int xmlAddEncodingAlias(const char *name, const char *alias);
+  HTML, a specific handler for the conversion of UTF-8 to ASCII with HTML
+    predefined entities like &copy; for the Copyright sign.
+More over when compiled on an Unix platform with iconv support the full
+set of encodings supported by iconv can be instantly be used by libxml. On a
+linux machine with glibc-2.1 the list of supported encodings and aliases fill
+3 full pages, and include UCS-4, the full set of ISO-Latin encodings, and the
+various Japanese ones.
To convert from the UTF-8 values returned from the API to another encoding
+then it is possible to use the function provided from the encoding module like UTF8Toisolat1, or use the
+POSIX iconv()
+API directly.
Encoding aliases
From 2.2.3, libxml2 has support to register encoding names aliases. The
+goal is to be able to parse document whose encoding is supported but where
+the name differs (for example from the default set of names accepted by
+iconv). The following functions allow to register and handle new aliases for
+existing encodings. Once registered libxml2 will automatically lookup the
+aliases when handling a document:
int xmlAddEncodingAlias(const char *name, const char *alias);
   int xmlDelEncodingAlias(const char *alias);
   const char * xmlGetEncodingAlias(const char *alias);
   void xmlCleanupEncodingAliases(void);
-
How to extend the existing support
Well adding support for new encoding, or overriding one of
-theencoders(assuming it is buggy) should not be hard, just write input
-andoutputconversion routines to/from UTF-8, and register
-themusingxmlNewCharEncodingHandler(name, xxxToUTF8, UTF8Toxxx),  and they
-willbecalled automatically if the parser(s) encounter such an
-encodingname(register it uppercase, this will help). The description of
-theencoders,their arguments and expected return values are described in
-theencoding.hheader.
Daniel Veillard
+How to extend the existing support
Well adding support for new encoding, or overriding one of the encoders
+(assuming it is buggy) should not be hard, just write input and output
+conversion routines to/from UTF-8, and register them using
+xmlNewCharEncodingHandler(name, xxxToUTF8, UTF8Toxxx),  and they will be
+called automatically if the parser(s) encounter such an encoding name
+(register it uppercase, this will help). The description of the encoders,
+their arguments and expected return values are described in the encoding.h
+header.
Daniel Veillard
diff --git a/doc/entities.html b/doc/entities.html
index 732562a..c234b41 100644
--- a/doc/entities.html
+++ b/doc/entities.html
@@ -7,35 +7,34 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Entities or no entities The XML C parser and toolkit of Gnome
Entities or no entities
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Entities in principle are similar to simple C macros. An entity
-definesanabbreviation for a given string that you can reuse many times
-throughoutthecontent of your document. Entities are especially useful when a
-givenstringmay occur frequently within a document, or to confine the change
-neededto adocument to a restricted area in the internal subset of the
-document (atthebeginning). Example:
1 <?xml version="1.0"?>
+Entities or no entities The XML C parser and toolkit of Gnome
Entities or no entities
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Entities in principle are similar to simple C macros. An entity defines an
+abbreviation for a given string that you can reuse many times throughout the
+content of your document. Entities are especially useful when a given string
+may occur frequently within a document, or to confine the change needed to a
+document to a restricted area in the internal subset of the document (at the
+beginning). Example:
1 <?xml version="1.0"?>
 2 <!DOCTYPE EXAMPLE SYSTEM "example.dtd" [
 3 <!ENTITY xml "Extensible Markup Language">
 4 ]>
 5 <EXAMPLE>
 6    &xml;
-7 </EXAMPLE>
Line 3 declares the xml entity. Line 6 uses the xml entity, byprefixingits
-name with '&' and following it by ';' without any spacesadded. Thereare 5
-predefined entities in libxml2 allowing you to escapecharacters
-withpredefined meaning in some parts of the xml
-documentcontent:&lt;for the character
-'<',&gt;for the character
-'>',&apos;for the
-character''',&quot;for the character
-'"',and&amp;for the character '&'.
One of the problems related to entities is that you may want the
-parsertosubstitute an entity's content so that you can see the replacement
-textinyour application. Or you may prefer to keep entity references as such
-inthecontent to be able to save the document back without losing
-thisusuallyprecious information (if the user went through the pain
-ofexplicitlydefining entities, he may have a a rather negative attitude if
-youblindlysubstitute them as saving time). The xmlSubstituteEntitiesDefault()functionallows
-you to check and change the behaviour, which is to notsubstituteentities by
-default.
Here is the DOM tree built by libxml2 for the previous document
-inthedefault case:
/gnome/src/gnome-xml -> ./xmllint --debug test/ent1
+7 </EXAMPLE>
Line 3 declares the xml entity. Line 6 uses the xml entity, by prefixing
+its name with '&' and following it by ';' without any spaces added. There
+are 5 predefined entities in libxml2 allowing you to escape characters with
+predefined meaning in some parts of the xml document content:
+&lt; for the character '<', &gt;
+for the character '>',  &apos; for the character ''',
+&quot; for the character '"', and
+&amp; for the character '&'.
One of the problems related to entities is that you may want the parser to
+substitute an entity's content so that you can see the replacement text in
+your application. Or you may prefer to keep entity references as such in the
+content to be able to save the document back without losing this usually
+precious information (if the user went through the pain of explicitly
+defining entities, he may have a a rather negative attitude if you blindly
+substitute them as saving time). The xmlSubstituteEntitiesDefault()
+function allows you to check and change the behaviour, which is to not
+substitute entities by default.
Here is the DOM tree built by libxml2 for the previous document in the
+default case:
/gnome/src/gnome-xml -> ./xmllint --debug test/ent1
 DOCUMENT
 version=1.0
    ELEMENT EXAMPLE
@@ -50,17 +49,16 @@ DOCUMENT
 version=1.0
    ELEMENT EXAMPLE
      TEXT
-     content=     Extensible Markup Language
So, entities or no entities? Basically, it depends on your use
-case.Isuggest that you keep the non-substituting default behaviour and
-avoidusingentities in your XML document or data if you are not willing to
-handletheentity references elements in the DOM tree.
Note that at save time libxml2 enforces the conversion of
-thepredefinedentities where necessary to prevent well-formedness problems,
-andwill alsotransparently replace those with chars (i.e. it will not
-generateentityreference elements in the DOM tree or call the reference() SAX
-callbackwhenfinding them in the input).
WARNING: handlingentitieson
-top of the libxml2 SAX interface is difficult!!! If you plan
-tousenon-predefined entities in your documents, then the learning curve
-tohandlethen using the SAX API may be long. If you plan to use
-complexdocuments, Istrongly suggest you consider using the DOM interface
-instead andlet libxmldeal with the complexity rather than trying to do it
-yourself.
Daniel Veillard
+     content=     Extensible Markup Language
So, entities or no entities? Basically, it depends on your use case. I
+suggest that you keep the non-substituting default behaviour and avoid using
+entities in your XML document or data if you are not willing to handle the
+entity references elements in the DOM tree.
Note that at save time libxml2 enforces the conversion of the predefined
+entities where necessary to prevent well-formedness problems, and will also
+transparently replace those with chars (i.e. it will not generate entity
+reference elements in the DOM tree or call the reference() SAX callback when
+finding them in the input).
WARNING: handling entities
+on top of the libxml2 SAX interface is difficult!!! If you plan to use
+non-predefined entities in your documents, then the learning curve to handle
+then using the SAX API may be long. If you plan to use complex documents, I
+strongly suggest you consider using the DOM interface instead and let libxml
+deal with the complexity rather than trying to do it yourself.
Daniel Veillard
diff --git a/doc/example.html b/doc/example.html
index 194f619..894f03a 100644
--- a/doc/example.html
+++ b/doc/example.html
@@ -7,11 +7,11 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-A real example The XML C parser and toolkit of Gnome
A real example
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Here is a real size example, where the actual content of
-theapplicationdata is not kept in the DOM tree but uses internal structures.
-Itis based ona proposal to keep a database of jobs related to Gnome, with
-anXML basedstorage structure. Here is an XML
-encodedjobsbase:
<?xml version="1.0"?>
+A real example The XML C parser and toolkit of Gnome
A real example
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Here is a real size example, where the actual content of the application
+data is not kept in the DOM tree but uses internal structures. It is based on
+a proposal to keep a database of jobs related to Gnome, with an XML based
+storage structure. Here is an XML encoded jobs
+base:
<?xml version="1.0"?>
 <gjob:Helping xmlns:gjob="http://www.gnome.org/some-location">
   <gjob:Jobs>
 
@@ -66,14 +66,13 @@ encodedjobsbase:
<?xml version="1.0"?>
     </gjob:Job>
 
   </gjob:Jobs>
-</gjob:Helping>
While loading the XML file into an internal DOM tree is a matter
-ofcallingonly a couple of functions, browsing the tree to gather the data
-andgeneratethe internal structures is harder, and more error prone.
The suggested principle is to be tolerant with respect to
-theinputstructure. For example, the ordering of the attributes is
-notsignificant,the XML specification is clear about it. It's also usually a
-goodidea not todepend on the order of the children of a given node, unless
-itreally makesthings harder. Here is some code to parse the information for
-aperson:
/*
+</gjob:Helping>
While loading the XML file into an internal DOM tree is a matter of
+calling only a couple of functions, browsing the tree to gather the data and
+generate the internal structures is harder, and more error prone.
The suggested principle is to be tolerant with respect to the input
+structure. For example, the ordering of the attributes is not significant,
+the XML specification is clear about it. It's also usually a good idea not to
+depend on the order of the children of a given node, unless it really makes
+things harder. Here is some code to parse the information for a person:
/*
  * A person record
  */
 typedef struct person {
@@ -114,22 +113,21 @@ DEBUG("parsePerson\n");
     }
 
     return(ret);
-}
Here are a couple of things to notice:
Usually a recursive parsing style is the more convenient one: XMLdatais
-    by nature subject to repetitive constructs and usually
-    exhibitshighlystructured patterns.
-  The two arguments of type xmlDocPtrand
-    xmlNsPtr,i.e.the pointer to the global XML document and the
-    namespace reserved totheapplication. Document wide information are needed
-    for example todecodeentities and it's a good coding practice to define a
-    namespace foryourapplication set of data and test that the element and
-    attributesyou'reanalyzing actually pertains to your application space.
-    This isdone by asimple equality test (cur->ns == ns).
-  To retrieve text and attributes value, you can use
-    thefunctionxmlNodeListGetStringto gather all the text and
-    entityreferencenodes generated by the DOM output and produce an single
-    textstring.
-
Here is another piece of code used to parse another level
-ofthestructure:
#include <libxml/tree.h>
+}
Here are a couple of things to notice:
Usually a recursive parsing style is the more convenient one: XML data
+    is by nature subject to repetitive constructs and usually exhibits highly
+    structured patterns.
+  The two arguments of type xmlDocPtr and xmlNsPtr,
+    i.e. the pointer to the global XML document and the namespace reserved to
+    the application. Document wide information are needed for example to
+    decode entities and it's a good coding practice to define a namespace for
+    your application set of data and test that the element and attributes
+    you're analyzing actually pertains to your application space. This is
+    done by a simple equality test (cur->ns == ns).
+  To retrieve text and attributes value, you can use the function
+    xmlNodeListGetString to gather all the text and entity reference
+    nodes generated by the DOM output and produce an single text string.
+
Here is another piece of code used to parse another level of the
+structure:
#include <libxml/tree.h>
 /*
  * a Description for a Job
  */
@@ -179,10 +177,10 @@ DEBUG("parseJob\n");
     }
 
     return(ret);
-}
Once you are used to it, writing this kind of code is quite
-simple,butboring. Ultimately, it could be possible to write stubbers taking
-eitherCdata structure definitions, a set of XML examples or an XML DTD
-andproducethe code needed to import and export the content between C data
-andXMLstorage. This is left as an exercise to the reader :-)
Feel free to use the code for the
-fullCparsing exampleas a template, it is also available with Makefile
-intheGnome CVS base under gnome-xml/example
Daniel Veillard
+}
Once you are used to it, writing this kind of code is quite simple, but
+boring. Ultimately, it could be possible to write stubbers taking either C
+data structure definitions, a set of XML examples or an XML DTD and produce
+the code needed to import and export the content between C data and XML
+storage. This is left as an exercise to the reader :-)
Feel free to use the code for the full C
+parsing example as a template, it is also available with Makefile in the
+Gnome CVS base under gnome-xml/example
Daniel Veillard
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 55a674d..cd9f4ef 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -9,6 +9,7 @@ examples.xml: index.py *.c
 	-@($(srcdir)/index.py)
 
 index.html: examples.xml examples.xsl
+	-@(touch index.html)
 	-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" && xmllint --valid --noout index.html)
 
 install-data-local: 
diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in
index b0b4d33..f8af861 100644
--- a/doc/examples/Makefile.in
+++ b/doc/examples/Makefile.in
@@ -196,6 +196,7 @@ RDL_LIBS = @RDL_LIBS@
 READER_TEST = @READER_TEST@
 RELDATE = @RELDATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STATIC_BINARIES = @STATIC_BINARIES@
@@ -224,6 +225,7 @@ THREAD_CFLAGS = @THREAD_CFLAGS@
 THREAD_LIBS = @THREAD_LIBS@
 U = @U@
 VERSION = @VERSION@
+WGET = @WGET@
 WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@
 WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@
 WITH_C14N = @WITH_C14N@
@@ -259,6 +261,7 @@ WITH_WRITER = @WITH_WRITER@
 WITH_XINCLUDE = @WITH_XINCLUDE@
 WITH_XPATH = @WITH_XPATH@
 WITH_XPTR = @WITH_XPTR@
+WITH_ZLIB = @WITH_ZLIB@
 XINCLUDE_OBJ = @XINCLUDE_OBJ@
 XMLLINT = @XMLLINT@
 XML_CFLAGS = @XML_CFLAGS@
@@ -696,6 +699,7 @@ examples.xml: index.py *.c
 	-@($(srcdir)/index.py)
 
 index.html: examples.xml examples.xsl
+	-@(touch index.html)
 	-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" && xmllint --valid --noout index.html)
 
 install-data-local: 
diff --git a/doc/help.html b/doc/help.html
index a660a87..5559007 100644
--- a/doc/help.html
+++ b/doc/help.html
@@ -7,17 +7,19 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-How to help The XML C parser and toolkit of Gnome
How to help
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker You can help the project in various ways, the best thing to do first
-istosubscribe to the mailing-list as explained before, check the archives and the Gnomebugdatabase:
Provide patches when you find problems.
-  Provide the diffs when you port libxml2 to a new platform. They
-    maynotbe integrated in all cases but help pinpointing
-    portabilityproblemsand
-  Provide documentation fixes (either as patches to the code commentsoras
-    HTML diffs).
-  Provide new documentations pieces (translations, examples, etc...).
+How to help The XML C parser and toolkit of Gnome
How to help
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker You can help the project in various ways, the best thing to do first is to
+subscribe to the mailing-list as explained before, check the archives and the Gnome bug
+database:
Provide patches when you find problems.
+  Provide the diffs when you port libxml2 to a new platform. They may not
+    be integrated in all cases but help pinpointing portability problems
+  and
+  Provide documentation fixes (either as patches to the code comments or
+    as HTML diffs).
+  Provide new documentations pieces (translations, examples, etc
+  ...).
   Check the TODO file and try to close one of the items.
-  Take one of the points raised in the archive or the bug
-    databaseandprovide a fix. Get in
-    touch withmebefore to avoid synchronization problems and check that
-    thesuggestedfix will fit in nicely :-)
+  Take one of the points raised in the archive or the bug database and
+    provide a fix. Get in touch with me
+    before to avoid synchronization problems and check that the suggested
+    fix will fit in nicely :-)
 
Daniel Veillard
diff --git a/doc/html/index.html b/doc/html/index.html
deleted file mode 100644
index 4a4962a..0000000
--- a/doc/html/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-Reference Manual for libxml2 
Reference Manual for libxml2
API Menu
Main Menu
Developer Menu
Code Examples
API Menu
Parser API
Tree API
Reader API
XML Guidelines
ChangeLog
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Table of Contents
DOCBparser: old DocBook SGML parser
HTMLparser: interface for an HTML 4.0 non-verifying parser
HTMLtree: specific APIs to process HTML tree, especially serialization
SAX: Old SAX version 1 handler, deprecated
SAX2: SAX2 parser interface used to build the DOM tree
c14n: Provide Canonical XML and Exclusive XML Canonicalization
catalog: interfaces to the Catalog handling system
chvalid: Unicode character range checking
debugXML: Tree debugging APIs
dict: string dictionnary
encoding: interface for the encoding conversion functions
entities: interface for the XML entities handling
globals: interface for all global variables of the library
hash: Chained hash tables
list: lists interfaces
nanoftp: minimal FTP implementation
nanohttp: minimal HTTP implementation
parser: the core parser module
parserInternals: internals routines exported by the parser.
pattern: pattern expression handling
relaxng: implementation of the Relax-NG validation
schemasInternals: internal interfaces for XML Schemas
schematron: XML Schemastron implementation
threads: interfaces for thread handling
tree: interfaces for tree manipulation
uri: library of generic URI related routines
valid: The DTD validation
xinclude: implementation of XInclude
xlink: unfinished XLink detection module
xmlIO: interface for the I/O interfaces used by the parser
xmlautomata: API to build regexp automata
xmlerror: error handling
xmlexports: macros for marking symbols as exportable/importable.
xmlmemory: interface for the memory allocator
xmlmodule: dynamic module loading
xmlreader: the XMLReader implementation
xmlregexp: regular expressions handling
xmlsave: the XML document serializer
xmlschemas: incomplete XML Schemas structure implementation
xmlschemastypes: implementation of XML Schema Datatypes
xmlstring: set of routines to process strings
xmlunicode: Unicode character APIs
xmlversion: compile-time version informations
xmlwriter: text writing API for XML
xpath: XML Path Language implementation
xpathInternals: internal interfaces for XML Path Language implementation
xpointer: API to handle XML Pointers
Daniel Veillard
diff --git a/doc/html/libxml-HTMLparser.html b/doc/html/libxml-HTMLparser.html
index adc6875..694a08f 100644
--- a/doc/html/libxml-HTMLparser.html
+++ b/doc/html/libxml-HTMLparser.html
@@ -46,6 +46,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 int	htmlHandleOmittedElem		(int val)
 int	htmlIsAutoClosed		(htmlDocPtr doc, 
					 htmlNodePtr elem)
 int	htmlIsScriptAttribute		(const xmlChar * name)
+htmlParserCtxtPtr	htmlNewParserCtxt	(void)
 htmlStatus	htmlNodeStatus		(const htmlNodePtr node, 
					 int legacy)
 int	htmlParseCharRef		(htmlParserCtxtPtr ctxt)
 int	htmlParseChunk			(htmlParserCtxtPtr ctxt, 
					 const char * chunk, 
					 int size, 
					 int terminate)
@@ -143,7 +144,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if a tag is autoclosed by one of it's child
 doc: the HTML document
elem: the HTML element
Returns: 1 if autoclosed, 0 otherwise
Function: htmlIsScriptAttribute
int	htmlIsScriptAttribute		(const xmlChar * name)

 
Check if an attribute is of content type Script
-name: an attribute name
Returns: 1 is the attribute is a script 0 otherwise
Function: htmlNodeStatus
htmlStatus	htmlNodeStatus		(const htmlNodePtr node, 
					 int legacy)

+name: an attribute name
Returns: 1 is the attribute is a script 0 otherwise
Function: htmlNewParserCtxt
htmlParserCtxtPtr	htmlNewParserCtxt	(void)

+
Allocate and initialize a new parser context.
+Returns: the htmlParserCtxtPtr or NULL in case of allocation error
Function: htmlNodeStatus
htmlStatus	htmlNodeStatus		(const htmlNodePtr node, 
					 int legacy)

 
Checks whether the tree node is valid. Experimental (the author only uses the HTML enhancements in a SAX parser)
 node: an htmlNodePtr in a tree
legacy: whether to allow deprecated elements (YES is faster here for Element nodes)
Returns: for Element nodes, a return from htmlElementAllowedHere (if legacy allowed) or htmlElementStatusHere (otherwise). for Attribute nodes, a return from htmlAttrAllowed for other nodes, HTML_NA (no checks performed)
Function: htmlParseCharRef
int	htmlParseCharRef		(htmlParserCtxtPtr ctxt)

 
parse Reference declarations [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 438500b..b0849cf 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -223,6 +223,7 @@ void	xmlParserInputDeallocate	(XML_WITH_DEBUG = 28
     XML_WITH_DEBUG_MEM = 29
     XML_WITH_DEBUG_RUN = 30
+    XML_WITH_ZLIB = 31
     XML_WITH_NONE = 99999 : just to be sure of allocation size
 }
 
Enum xmlParserInputState
Enum xmlParserInputState {
@@ -280,7 +281,7 @@ void	xmlParserInputDeallocate	(XML_PARSE_NSCLEAN = 8192 : remove redundant namespaces declarations
     XML_PARSE_NOCDATA = 16384 : merge CDATA as text nodes
     XML_PARSE_NOXINCNODE = 32768 : do not generate XINCLUDE START/END nodes
-    XML_PARSE_COMPACT = 65536 : compact small text nodes
+    XML_PARSE_COMPACT = 65536 : compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
 }
 
Structure xmlSAXHandlerV1
Structure xmlSAXHandlerV1
struct _xmlSAXHandlerV1 {
     internalSubsetSAXFunc	internalSubset
@@ -446,7 +447,7 @@ void	warningSAXFunc			(void * ctx, 
					 const char * msg, 
					 ...
 
Examines if the library has been compiled with a given feature.
 feature: the feature to be examined
Returns: a non-zero value if the feature exist, otherwise zero. Returns zero (0) if the feature does not exist or an unknown unknown feature is requested, non-zero otherwise.
Function: xmlIOParseDTD
xmlDtdPtr	xmlIOParseDTD		(xmlSAXHandlerPtr sax, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc)

 
Load and parse a DTD
-sax: the SAX handler block or NULL
input: an Input Buffer
enc: the charset encoding if known
Returns: the resulting xmlDtdPtr or NULL in case of error. @input will be freed at parsing end.
Function: xmlInitNodeInfoSeq
void	xmlInitNodeInfoSeq		(xmlParserNodeInfoSeqPtr seq)

+sax: the SAX handler block or NULL
input: an Input Buffer
enc: the charset encoding if known
Returns: the resulting xmlDtdPtr or NULL in case of error. @input will be freed by the function in any case.
Function: xmlInitNodeInfoSeq
void	xmlInitNodeInfoSeq		(xmlParserNodeInfoSeqPtr seq)

 
-- Initialize (set to initial state) node info sequence
 seq: a node info sequence pointer
Function: xmlInitParser
void	xmlInitParser			(void)

 
Initialization function for the XML parser. This is not reentrant. Call once before processing in case of use in multithreaded programs.
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 9e45be1..26ec73b 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -95,6 +95,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlAttrPtr	xmlCopyProp		(xmlNodePtr target, 
					 xmlAttrPtr cur)
 xmlAttrPtr	xmlCopyPropList		(xmlNodePtr target, 
					 xmlAttrPtr cur)
 xmlDtdPtr	xmlCreateIntSubset	(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)
+Function type: xmlDOMWrapAcquireNsFunction
+xmlNsPtr	xmlDOMWrapAcquireNsFunction	(xmlDOMWrapCtxtPtr ctxt, 
						 xmlNodePtr node, 
						 const xmlChar * nsName, 
						 const xmlChar * nsPrefix)
+
 int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)
 int	xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlNodePtr * resNode, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int deep, 
					 int options)
 void	xmlDOMWrapFreeCtxt		(xmlDOMWrapCtxtPtr ctxt)
@@ -280,7 +283,10 @@ A:link, A:visited, A:active { text-decoration: underline }
     XML_BUFFER_ALLOC_IMMUTABLE = 3
 }
 
Structure xmlDOMWrapCtxt
Structure xmlDOMWrapCtxt
struct _xmlDOMWrapCtxt {
-    void *	_private
+    void *	_private	: * The type of this context, just in case
+    int	type	: * Internal namespace map used for variou
+    void *	namespaceMap	: * Use this one to acquire an xmlNsPtr in
+    xmlDOMWrapAcquireNsFunction	getNsForNodeFunc
 }
Structure xmlDoc
Structure xmlDoc
struct _xmlDoc {
     void *	_private	: application data
     xmlElementType	type	: XML_DOCUMENT_NODE, must be second !
@@ -406,6 +412,7 @@ A:link, A:visited, A:active { text-decoration: underline }
     struct _xmlEntity *	nexte	: unused
     const xmlChar *	URI	: the full URI as computed
     int	owner	: does the entity own the childrens
+    int	checked	: was the entity content checked
 }
Structure xmlEnumeration
Structure xmlEnumeration
struct _xmlEnumeration {
     struct _xmlEnumeration *	next	: next one
     const xmlChar *	name	: Enumeration name
@@ -443,6 +450,7 @@ A:link, A:visited, A:active { text-decoration: underline }
     const xmlChar *	href	: URL for the namespace
     const xmlChar *	prefix	: prefix for the namespace
     void *	_private	: application data
+    struct _xmlDoc *	context	: normally an xmlDoc
 }
Structure xmlOutputBuffer
Structure xmlOutputBuffer
struct _xmlOutputBuffer {
     void *	context
     xmlOutputWriteCallback	writecallback
@@ -674,18 +682,21 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Do a copy of an attribute list.
 target: the element where the attributes will be grafted
cur: the first attribute
Returns: a new #xmlAttrPtr, or NULL in case of error.
Function: xmlCreateIntSubset
xmlDtdPtr	xmlCreateIntSubset	(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)

 
Create the internal subset of a document
-doc: the document pointer
name: the DTD name
ExternalID: the external (PUBLIC) ID
SystemID: the system ID
Returns: a pointer to the new DTD structure
Function: xmlDOMWrapAdoptNode
int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)

-
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.
+doc: the document pointer
name: the DTD name
ExternalID: the external (PUBLIC) ID
SystemID: the system ID
Returns: a pointer to the new DTD structure
Function type: xmlDOMWrapAcquireNsFunction
Function type: xmlDOMWrapAcquireNsFunction
+xmlNsPtr	xmlDOMWrapAcquireNsFunction	(xmlDOMWrapCtxtPtr ctxt, 
						 xmlNodePtr node, 
						 const xmlChar * nsName, 
						 const xmlChar * nsPrefix)
+
A function called to acquire namespaces (xmlNs) from the wrapper.
ctxt: a DOM wrapper context
node: the context node (element or attribute)
nsName: the requested namespace name
nsPrefix: the requested namespace prefix
Returns: an xmlNsPtr or NULL in case of an error.


+Function: xmlDOMWrapAdoptNode
int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)

+
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.
 ctxt: the optional context for custom processing
sourceDoc: the optional sourceDoc
node: the node to start with
destDoc: the destination doc
destParent: the optional new parent of @node in @destDoc
options: option flags
Returns: 0 if the operation succeeded, 1 if a node of unsupported type was given, 2 if a node of not yet supported type was given and -1 on API/internal errors.
Function: xmlDOMWrapCloneNode
int	xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlNodePtr * resNode, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int deep, 
					 int options)

-
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) Support dicts Optimize string adoption for equal or none dicts. 2) XInclude WARNING: This function is in a experimental state and should only be currently only be used to test it.
+References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used. This is the case when you don't know already where the cloned branch will be added to. If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) What to do with XInclude? Currently this returns an error for XInclude.
 ctxt: the optional context for custom processing
sourceDoc: the optional sourceDoc
node: the node to start with
resNode: the clone of the given @node
destDoc: the destination doc
destParent: the optional new parent of @node in @destDoc
deep: descend into child if set
options: option flags
Returns: 0 if the operation succeeded, 1 if a node of unsupported (or not yet supported) type was given, -1 on API/internal errors.
Function: xmlDOMWrapFreeCtxt
void	xmlDOMWrapFreeCtxt		(xmlDOMWrapCtxtPtr ctxt)

 
Frees the DOM-wrapper context.
 ctxt: the DOM-wrapper context
Function: xmlDOMWrapNewCtxt
xmlDOMWrapCtxtPtr	xmlDOMWrapNewCtxt	(void)

 
Allocates and initializes a new DOM-wrapper context.
 Returns: the xmlDOMWrapCtxtPtr or NULL in case of an internal errror.
Function: xmlDOMWrapReconcileNamespaces
int	xmlDOMWrapReconcileNamespaces	(xmlDOMWrapCtxtPtr ctxt, 
					 xmlNodePtr elem, 
					 int options)

-
Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.
+Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.
 ctxt: DOM wrapper context, unused at the moment
elem: the element-node
options: option flags
Returns: 0 if succeeded, -1 otherwise and on API/internal errors.
Function: xmlDOMWrapRemoveNode
int	xmlDOMWrapRemoveNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr node, 
					 int options)

-
Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references. WARNING: This function is in a experimental state.
+Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references. NOTE: This function was not intensively tested.
 ctxt: a DOM wrapper context
doc: the doc
node: the node to be removed.
options: set of options, unused at the moment
Returns: 0 on success, 1 if the node is not supported, -1 on API and internal errors.
Function: xmlDocCopyNode
xmlNodePtr	xmlDocCopyNode		(const xmlNodePtr node, 
					 xmlDocPtr doc, 
					 int extended)

 
Do a copy of the node to a given document.
 node: the node
doc: the document
extended: if 1 do a recursive copy (properties, namespaces and children when applicable) if 2 copy properties and namespaces (when applicable)
Returns: a new #xmlNodePtr, or NULL in case of error.
Function: xmlDocCopyNodeList
xmlNodePtr	xmlDocCopyNodeList	(xmlDocPtr doc, 
					 const xmlNodePtr node)

@@ -706,7 +717,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Get the root element of the document (doc->children is a list containing possibly comments, PIs, etc ...).
 doc: the document
Returns: the #xmlNodePtr for the root or NULL
Function: xmlDocSetRootElement
xmlNodePtr	xmlDocSetRootElement	(xmlDocPtr doc, 
					 xmlNodePtr root)

 
Set the root element of the document (doc->children is a list containing possibly comments, PIs, etc ...).
-doc: the document
root: the new document root element
Returns: the old root element if any was found
Function: xmlElemDump
void	xmlElemDump			(FILE * f, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur)

+doc: the document
root: the new document root element, if root is NULL no action is taken, to remove a node from a document use xmlUnlinkNode(root) instead.
Returns: the old root element if any was found, NULL if root was NULL
Function: xmlElemDump
void	xmlElemDump			(FILE * f, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur)

 
Dump an XML/HTML node, recursive behaviour, children are printed too.
 f: the FILE * for the output
doc: the document
cur: the current node
Function: xmlFreeDoc
void	xmlFreeDoc			(xmlDocPtr cur)

 
Free up all the structures used by a document, tree included.
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index cb2a419..fa7ee19 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -21,6 +21,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlURIPtr	xmlParseURI		(const char * str)
 xmlURIPtr	xmlParseURIRaw		(const char * str, 
					 int raw)
 int	xmlParseURIReference		(xmlURIPtr uri, 
					 const char * str)
+xmlChar *	xmlPathToURI		(const xmlChar * path)
 void	xmlPrintURI			(FILE * stream, 
					 xmlURIPtr uri)
 xmlChar *	xmlSaveUri		(xmlURIPtr uri)
 xmlChar *	xmlURIEscape		(const xmlChar * str)
@@ -56,7 +57,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Parse an URI but allows to keep intact the original fragments. URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
 str: the URI string to analyze
raw: if 1 unescaping of URI pieces are disabled
Returns: a newly built xmlURIPtr or NULL in case of error
Function: xmlParseURIReference
int	xmlParseURIReference		(xmlURIPtr uri, 
					 const char * str)

 
Parse an URI reference string and fills in the appropriate fields of the @uri structure URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
-uri: pointer to an URI structure
str: the string to analyze
Returns: 0 or the error code
Function: xmlPrintURI
void	xmlPrintURI			(FILE * stream, 
					 xmlURIPtr uri)

+uri: pointer to an URI structure
str: the string to analyze
Returns: 0 or the error code
Function: xmlPathToURI
xmlChar *	xmlPathToURI		(const xmlChar * path)

+
Constructs an URI expressing the existing path
+path: the resource locator in a filesystem notation
Returns: a new URI, or a duplicate of the path parameter if the construction fails. The caller is responsible for freeing the memory occupied by the returned string. If there is insufficient memory available, or the argument is NULL, the function returns NULL.
Function: xmlPrintURI
void	xmlPrintURI			(FILE * stream, 
					 xmlURIPtr uri)

 
Prints the URI in the stream @stream.
 stream: a FILE* for the output
uri: pointer to an xmlURI
Function: xmlSaveUri
xmlChar *	xmlSaveUri		(xmlURIPtr uri)

 
Save the URI as an escaped string
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index 44771b9..58c1c19 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -17,6 +17,7 @@ The content of this structure is not made public by the API.
 xmlXIncludeCtxtPtr	xmlXIncludeNewContext	(xmlDocPtr doc)
 int	xmlXIncludeProcess		(xmlDocPtr doc)
 int	xmlXIncludeProcessFlags		(xmlDocPtr doc, 
					 int flags)
+int	xmlXIncludeProcessFlagsData	(xmlDocPtr doc, 
					 int flags, 
					 void * data)
 int	xmlXIncludeProcessNode		(xmlXIncludeCtxtPtr ctxt, 
					 xmlNodePtr node)
 int	xmlXIncludeProcessTree		(xmlNodePtr tree)
 int	xmlXIncludeProcessTreeFlags	(xmlNodePtr tree, 
					 int flags)
@@ -42,7 +43,9 @@ The content of this structure is not made public by the API.
 
Implement the XInclude substitution on the XML document @doc
 doc: an XML document
Returns: 0 if no substitution were done, -1 if some processing failed or the number of substitutions done.
Function: xmlXIncludeProcessFlags
int	xmlXIncludeProcessFlags		(xmlDocPtr doc, 
					 int flags)

 
Implement the XInclude substitution on the XML document @doc
-doc: an XML document
flags: a set of xmlParserOption used for parsing XML includes
Returns: 0 if no substitution were done, -1 if some processing failed or the number of substitutions done.
Function: xmlXIncludeProcessNode
int	xmlXIncludeProcessNode		(xmlXIncludeCtxtPtr ctxt, 
					 xmlNodePtr node)

+doc: an XML document
flags: a set of xmlParserOption used for parsing XML includes
Returns: 0 if no substitution were done, -1 if some processing failed or the number of substitutions done.
Function: xmlXIncludeProcessFlagsData
int	xmlXIncludeProcessFlagsData	(xmlDocPtr doc, 
					 int flags, 
					 void * data)

+
Implement the XInclude substitution on the XML document @doc
+doc: an XML document
flags: a set of xmlParserOption used for parsing XML includes
data: application data that will be passed to the parser context in the _private field of the parser context(s)
Returns: 0 if no substitution were done, -1 if some processing failed or the number of substitutions done.
Function: xmlXIncludeProcessNode
int	xmlXIncludeProcessNode		(xmlXIncludeCtxtPtr ctxt, 
					 xmlNodePtr node)

 
Implement the XInclude substitution for the given subtree reusing the informations and data coming from the given context.
 ctxt: an existing XInclude context
node: a node in an XML document
Returns: 0 if no substitution were done, -1 if some processing failed or the number of substitutions done.
Function: xmlXIncludeProcessTree
int	xmlXIncludeProcessTree		(xmlNodePtr tree)

 
Implement the XInclude substitution for the given subtree
diff --git a/doc/html/libxml-xmlsave.html b/doc/html/libxml-xmlsave.html
index 664c6ef..d649ef7 100644
--- a/doc/html/libxml-xmlsave.html
+++ b/doc/html/libxml-xmlsave.html
@@ -53,4 +53,4 @@ The content of this structure is not made public by the API.
 
Create a document saving context serializing to a file descriptor with the encoding and the options given
 iowrite: an I/O write function
ioclose: an I/O close function
ioctx: an I/O handler
encoding: the encoding name to use or NULL
options: a set of xmlSaveOptions
Returns: a new serialization context or NULL in case of error.
Function: xmlSaveTree
long	xmlSaveTree			(xmlSaveCtxtPtr ctxt, 
					 xmlNodePtr node)

 
Save a subtree starting at the node parameter to a saving context TODO: The function is not fully implemented yet as it does not return the byte count but 0 instead
-ctxt: a document saving context
node: a document
Returns: the number of byte written or -1 in case of error
Daniel Veillard
+ctxt: a document saving context
node: the top node of the subtree to save
Returns: the number of byte written or -1 in case of error
Daniel Veillard
diff --git a/doc/html/libxml-xmlversion.html b/doc/html/libxml-xmlversion.html
index c27b701..3e9d50a 100644
--- a/doc/html/libxml-xmlversion.html
+++ b/doc/html/libxml-xmlversion.html
@@ -10,7 +10,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 Module xmlversion from libxml2 
Module xmlversion from libxml2
API Menu
Main Menu
Developer Menu
Code Examples
API Menu
Parser API
Tree API
Reader API
XML Guidelines
ChangeLog
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker xmlunicode API documentation The XML C parser and toolkit of Gnome xmlwriter 
compile-time version informations for the XML library 
Table of Contents
#define ATTRIBUTE_UNUSED
#define DEBUG_MEMORY_LOCATION
#define LIBXML_AUTOMATA_ENABLED
#define LIBXML_C14N_ENABLED
#define LIBXML_CATALOG_ENABLED
#define LIBXML_DEBUG_ENABLED
#define LIBXML_DEBUG_RUNTIME
#define LIBXML_DOCB_ENABLED
#define LIBXML_DOTTED_VERSION
#define LIBXML_EXPR_ENABLED
#define LIBXML_FTP_ENABLED
#define LIBXML_HTML_ENABLED
#define LIBXML_HTTP_ENABLED
#define LIBXML_ICONV_ENABLED
#define LIBXML_ISO8859X_ENABLED
#define LIBXML_LEGACY_ENABLED
#define LIBXML_MODULES_ENABLED
#define LIBXML_MODULE_EXTENSION
#define LIBXML_OUTPUT_ENABLED
#define LIBXML_PATTERN_ENABLED
#define LIBXML_PUSH_ENABLED
#define LIBXML_READER_ENABLED
#define LIBXML_REGEXP_ENABLED
#define LIBXML_SAX1_ENABLED
#define LIBXML_SCHEMAS_ENABLED
#define LIBXML_SCHEMATRON_ENABLED
#define LIBXML_TEST_VERSION
#define LIBXML_THREAD_ENABLED
#define LIBXML_TREE_ENABLED
#define LIBXML_UNICODE_ENABLED
#define LIBXML_VALID_ENABLED
#define LIBXML_VERSION
#define LIBXML_VERSION_EXTRA
#define LIBXML_VERSION_STRING
#define LIBXML_WRITER_ENABLED
#define LIBXML_XINCLUDE_ENABLED
#define LIBXML_XPATH_ENABLED
#define LIBXML_XPTR_ENABLED
#define WITHOUT_TRIO
#define WITH_TRIO
void	xmlCheckVersion			(int version)
+    Module xmlversion from libxml2 
Module xmlversion from libxml2
API Menu
Main Menu
Developer Menu
Code Examples
API Menu
Parser API
Tree API
Reader API
XML Guidelines
ChangeLog
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker xmlunicode API documentation The XML C parser and toolkit of Gnome xmlwriter 
compile-time version informations for the XML library 
Table of Contents
#define ATTRIBUTE_UNUSED
#define DEBUG_MEMORY_LOCATION
#define LIBXML_AUTOMATA_ENABLED
#define LIBXML_C14N_ENABLED
#define LIBXML_CATALOG_ENABLED
#define LIBXML_DEBUG_ENABLED
#define LIBXML_DEBUG_RUNTIME
#define LIBXML_DOCB_ENABLED
#define LIBXML_DOTTED_VERSION
#define LIBXML_EXPR_ENABLED
#define LIBXML_FTP_ENABLED
#define LIBXML_HTML_ENABLED
#define LIBXML_HTTP_ENABLED
#define LIBXML_ICONV_ENABLED
#define LIBXML_ISO8859X_ENABLED
#define LIBXML_LEGACY_ENABLED
#define LIBXML_MODULES_ENABLED
#define LIBXML_MODULE_EXTENSION
#define LIBXML_OUTPUT_ENABLED
#define LIBXML_PATTERN_ENABLED
#define LIBXML_PUSH_ENABLED
#define LIBXML_READER_ENABLED
#define LIBXML_REGEXP_ENABLED
#define LIBXML_SAX1_ENABLED
#define LIBXML_SCHEMAS_ENABLED
#define LIBXML_SCHEMATRON_ENABLED
#define LIBXML_TEST_VERSION
#define LIBXML_THREAD_ENABLED
#define LIBXML_TREE_ENABLED
#define LIBXML_UNICODE_ENABLED
#define LIBXML_VALID_ENABLED
#define LIBXML_VERSION
#define LIBXML_VERSION_EXTRA
#define LIBXML_VERSION_STRING
#define LIBXML_WRITER_ENABLED
#define LIBXML_XINCLUDE_ENABLED
#define LIBXML_XPATH_ENABLED
#define LIBXML_XPTR_ENABLED
#define LIBXML_ZLIB_ENABLED
#define WITHOUT_TRIO
#define WITH_TRIO
void	xmlCheckVersion			(int version)
 Description
 Macro: ATTRIBUTE_UNUSED
#define ATTRIBUTE_UNUSED
Macro used to signal to GCC unused function parameters
 Macro: DEBUG_MEMORY_LOCATION
#define DEBUG_MEMORY_LOCATION
Whether the memory debugging is configured in
@@ -43,13 +43,14 @@ A:link, A:visited, A:active { text-decoration: underline }
 Macro: LIBXML_TREE_ENABLED
#define LIBXML_TREE_ENABLED
Whether the DOM like tree manipulation API support is configured in
 Macro: LIBXML_UNICODE_ENABLED
#define LIBXML_UNICODE_ENABLED
Whether the Unicode related interfaces are compiled in
 Macro: LIBXML_VALID_ENABLED
#define LIBXML_VALID_ENABLED
Whether the DTD validation support is configured in
-Macro: LIBXML_VERSION
#define LIBXML_VERSION
the version number: 1.2.3 value is 1002003
+Macro: LIBXML_VERSION
#define LIBXML_VERSION
the version number: 1.2.3 value is 10203
 Macro: LIBXML_VERSION_EXTRA
#define LIBXML_VERSION_EXTRA
extra version information, used to show a CVS compilation
-Macro: LIBXML_VERSION_STRING
#define LIBXML_VERSION_STRING
the version number string, 1.2.3 value is "1002003"
+Macro: LIBXML_VERSION_STRING
#define LIBXML_VERSION_STRING
the version number string, 1.2.3 value is "10203"
 Macro: LIBXML_WRITER_ENABLED
#define LIBXML_WRITER_ENABLED
Whether the xmlWriter saving interface is configured in
 Macro: LIBXML_XINCLUDE_ENABLED
#define LIBXML_XINCLUDE_ENABLED
Whether XInclude is configured in
 Macro: LIBXML_XPATH_ENABLED
#define LIBXML_XPATH_ENABLED
Whether XPath is configured in
 Macro: LIBXML_XPTR_ENABLED
#define LIBXML_XPTR_ENABLED
Whether XPointer is configured in
+Macro: LIBXML_ZLIB_ENABLED
#define LIBXML_ZLIB_ENABLED
Whether the Zlib support is compiled in
 Macro: WITHOUT_TRIO
#define WITHOUT_TRIO
defined if the trio support should not be configured in
 Macro: WITH_TRIO
#define WITH_TRIO
defined if the trio support need to be configured in
 Function: xmlCheckVersion
void	xmlCheckVersion			(int version)

diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index a0d9ba7..6aca3c3 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -51,6 +51,7 @@ The content of this structure is not made public by the API.
 int	xmlXPathCmpNodes		(xmlNodePtr node1, 
					 xmlNodePtr node2)
 xmlXPathCompExprPtr	xmlXPathCompile	(const xmlChar * str)
 xmlXPathObjectPtr	xmlXPathCompiledEval	(xmlXPathCompExprPtr comp, 
						 xmlXPathContextPtr ctx)
+int	xmlXPathCompiledEvalToBoolean	(xmlXPathCompExprPtr comp, 
					 xmlXPathContextPtr ctxt)
 int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options)
 xmlXPathObjectPtr	xmlXPathConvertBoolean	(xmlXPathObjectPtr val)
 Function type: xmlXPathConvertFunc
@@ -240,13 +241,15 @@ The content of this structure is not made public by the API.
 
Converts an XPath object to its number value
 val: an XPath object
Returns: the number value
Function: xmlXPathCastToString
xmlChar *	xmlXPathCastToString	(xmlXPathObjectPtr val)

 
Converts an existing object to its string() equivalent
-val: an XPath object
Returns: the string value of the object, NULL in case of error. A new string is allocated only if needed (@val isn't a string object).
Function: xmlXPathCmpNodes
int	xmlXPathCmpNodes		(xmlNodePtr node1, 
					 xmlNodePtr node2)

+val: an XPath object
Returns: the allocated string value of the object, NULL in case of error. It's up to the caller to free the string memory with xmlFree().
Function: xmlXPathCmpNodes
int	xmlXPathCmpNodes		(xmlNodePtr node1, 
					 xmlNodePtr node2)

 
Compare two nodes w.r.t document order
 node1: the first node
node2: the second node
Returns: -2 in case of error 1 if first point < second point, 0 if it's the same node, -1 otherwise
Function: xmlXPathCompile
xmlXPathCompExprPtr	xmlXPathCompile	(const xmlChar * str)

 
Compile an XPath expression
 str: the XPath expression
Returns: the xmlXPathCompExprPtr resulting from the compilation or NULL. the caller has to free the object.
Function: xmlXPathCompiledEval
xmlXPathObjectPtr	xmlXPathCompiledEval	(xmlXPathCompExprPtr comp, 
						 xmlXPathContextPtr ctx)

 
Evaluate the Precompiled XPath expression in the given context.
-comp: the compiled XPath expression
ctx: the XPath context
Returns: the xmlXPathObjectPtr resulting from the evaluation or NULL. the caller has to free the object.
Function: xmlXPathContextSetCache
int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options)

+comp: the compiled XPath expression
ctx: the XPath context
Returns: the xmlXPathObjectPtr resulting from the evaluation or NULL. the caller has to free the object.
Function: xmlXPathCompiledEvalToBoolean
int	xmlXPathCompiledEvalToBoolean	(xmlXPathCompExprPtr comp, 
					 xmlXPathContextPtr ctxt)

+
Applies the XPath boolean() function on the result of the given compiled expression.
+comp: the compiled XPath expression
ctxt: the XPath context
Returns: 1 if the expression evaluated to true, 0 if to false and -1 in API and internal errors.
Function: xmlXPathContextSetCache
int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options)

 
Creates/frees an object cache on the XPath context. If activates XPath objects (xmlXPathObject) will be cached internally to be reused. @options: 0: This will set the XPath object caching: @value: This will set the maximum number of XPath objects to be cached per slot There are 5 slots for: node-set, string, number, boolean, and misc objects. Use <0 for the default number (100). Other values for @options have currently no effect.
 ctxt: the XPath context
active: enables/disables (creates/frees) the cache
value: a value with semantics dependant on @options
options: options (currently only the value 0 is used)
Returns: 0 if the setting succeeded, and -1 on API or internal errors.
Function: xmlXPathConvertBoolean
xmlXPathObjectPtr	xmlXPathConvertBoolean	(xmlXPathObjectPtr val)

 
Converts an existing object to its boolean() equivalent
diff --git a/doc/index.html b/doc/index.html
index 22f013b..21d61eb 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -216,73 +216,74 @@ A:link, A:visited, A:active { text-decoration: underline }
                               

                                 
                                   
-                                  "Programmingwithlibxml2
-is like the thrilling embrace of an exotic stranger." MarkPilgrim
-                                  Libxml2 is the XML C parser and toolkit developed for the Gnomeproject(but
-usable outside of the Gnome platform), it is free softwareavailableunder the
-MITLicense.XML
-itself is a metalanguage to design markup languages, i.e.text languagewhere
-semantic and structure are added to the content usingextra
-"markup"information enclosed between angle brackets. HTML is the
-mostwell-knownmarkup language. Though the library is written in C avariety of language bindingsmake it available inother
-environments.
-                                  Libxml2 is known to be very portable, the library should build
-andworkwithout serious troubles on a variety of systems (Linux,
-Unix,Windows,CygWin, MacOS, MacOS X, RISC Os, OS/2, VMS, QNX, MVS, ...)
-                                  Libxml2 implements a number of existing standards related
-tomarkuplanguages:
+                                  "Programming
+with libxml2 is like the thrilling embrace of an exotic stranger." Mark
+Pilgrim
+                                  Libxml2 is the XML C parser and toolkit developed for the Gnome project
+(but usable outside of the Gnome platform), it is free software available
+under the MIT
+License. XML itself is a metalanguage to design markup languages, i.e.
+text language where semantic and structure are added to the content using
+extra "markup" information enclosed between angle brackets. HTML is the most
+well-known markup language. Though the library is written in C a variety of language bindings make it available in
+other environments.
+                                  Libxml2 is known to be very portable, the library should build and work
+without serious troubles on a variety of systems (Linux, Unix, Windows,
+CygWin, MacOS, MacOS X, RISC Os, OS/2, VMS, QNX, MVS, ...)
+                                  Libxml2 implements a number of existing standards related to markup
+languages:
                                   the XML standard: http://www.w3.org/TR/REC-xml
   Namespaces in XML: http://www.w3.org/TR/REC-xml-names/
   XML Base: http://www.w3.org/TR/xmlbase/
-  RFC2396:Uniform
-    Resource Identifiers http://www.ietf.org/rfc/rfc2396.txt
+  RFC 2396 :
+    Uniform Resource Identifiers http://www.ietf.org/rfc/rfc2396.txt
   XML Path Language (XPath) 1.0: http://www.w3.org/TR/xpath
   HTML4 parser: http://www.w3.org/TR/html401/
   XML Pointer Language (XPointer) Version 1.0: http://www.w3.org/TR/xptr
   XML Inclusions (XInclude) Version 1.0: http://www.w3.org/TR/xinclude/
-  ISO-8859-x encodings, as well as rfc2044[UTF-8]andrfc2781[UTF-16]Unicode
-    encodings, and more if using iconv support
+  ISO-8859-x encodings, as well as rfc2044 [UTF-8]
+    and rfc2781
+    [UTF-16] Unicode encodings, and more if using iconv support
   part of SGML Open Technical Resolution TR9401:1997
   XML Catalogs Working Draft 06 August 2001: http://www.oasis-open.org/committees/entity/spec-2001-08-06.html
-  Canonical XML Version 1.0: http://www.w3.org/TR/xml-c14nandthe
-    Exclusive XML Canonicalization CR draft http://www.w3.org/TR/xml-exc-c14n
+  Canonical XML Version 1.0: http://www.w3.org/TR/xml-c14n
+    and the Exclusive XML Canonicalization CR draft http://www.w3.org/TR/xml-exc-c14n
   Relax NG, ISO/IEC 19757-2:2003, http://www.oasis-open.org/committees/relax-ng/spec-20011203.html
-  W3C XML Schemas Part 2: Datatypes REC
-    02May2001
-  W3C xml:idWorking
-    Draft7April 2004
+  W3C XML Schemas Part 2: Datatypes REC 02 May
+    2001
+  W3C xml:id Working Draft 7
+    April 2004
 
-                                  In most cases libxml2 tries to implement the specifications in
-arelativelystrictly compliant way. As of release 2.4.16, libxml2 passed
-all1800+ testsfrom the OASIS
-XMLTestsSuite.
-                                  To some extent libxml2 provides support for the
-followingadditionalspecifications but doesn't claim to implement them
-completely:
-                                  Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/thedocument
-    model, but it doesn't implement the API itself, gdome2 doesthison top of
-    libxml2
-  RFC959:libxml2
-    implements a basic FTP client code
-  RFC1945:HTTP/1.0,
-    again a basic HTTP client code
-  SAX: a SAX2 like interface and a minimal SAX1
-    implementationcompatiblewith early expat versions
+                                  In most cases libxml2 tries to implement the specifications in a
+relatively strictly compliant way. As of release 2.4.16, libxml2 passed all
+1800+ tests from the OASIS XML Tests
+Suite.
+                                  To some extent libxml2 provides support for the following additional
+specifications but doesn't claim to implement them completely:
+                                  Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/
+    the document model, but it doesn't implement the API itself, gdome2 does
+    this on top of libxml2
+  RFC 959 :
+    libxml2 implements a basic FTP client code
+  RFC 1945 :
+    HTTP/1.0, again a basic HTTP client code
+  SAX: a SAX2 like interface and a minimal SAX1 implementation compatible
+    with early expat versions
 
-                                  A partial implementation of XML Schemas
-Part1:Structureis being worked on but it would be far too early to
-makeanyconformance statement about it at the moment.
+                                  A partial implementation of XML Schemas Part
+1: Structure is being worked on but it would be far too early to make any
+conformance statement about it at the moment.
                                   Separate documents:
-                                  the libxslt
-    pageprovidinganimplementation of XSLT 1.0 and common extensions like
-    EXSLTforlibxml2
-  the gdome2
-    page:a standard DOM2 implementation for libxml2
-  the XMLSec
-    page:animplementation of W3CXMLDigital Signaturefor
-    libxml2
-  also check the related links section below for more related
-    andactiveprojects.
+                                  the libxslt page providing an
+    implementation of XSLT 1.0 and common extensions like EXSLT for
+  libxml2
+  the gdome2 page
+    : a standard DOM2 implementation for libxml2
+  the XMLSec page: an
+    implementation of W3C XML
+    Digital Signature for libxml2
+  also check the related links section below for more related and active
+    projects.
 
                                   Logo designed by Marc Liyanage.
                                   
diff --git a/doc/interface.html b/doc/interface.html
index 88ec0d8..8163c41 100644
--- a/doc/interface.html
+++ b/doc/interface.html
@@ -7,18 +7,19 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-The SAX interface The XML C parser and toolkit of Gnome
The SAX interface
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Sometimes the DOM tree output is just too large to fit
-reasonablyintomemory. In that case (and if you don't expect to save back the
-XMLdocumentloaded using libxml), it's better to use the SAX interface of
-libxml.SAX isa callback-based interfaceto the parser.
-Beforeparsing,the application layer registers a customized set of callbacks
-whicharecalled by the library as it progresses through the XML input.
To get more detailed step-by-step guidance on using the SAX
-interfaceoflibxml, see the nicedocumentation.writtenby
-JamesHenstridge.
You can debug the SAX behaviour by using
-thetestSAXprogram located in the gnome-xml module (it's
-usuallynot shipped in thebinary packages of libxml, but you can find it in
-the tarsourcedistribution). Here is the sequence of callbacks that would be
-reportedbytestSAX when parsing the example XML document shown earlier:
SAX.setDocumentLocator()
+The SAX interface The XML C parser and toolkit of Gnome
The SAX interface
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Sometimes the DOM tree output is just too large to fit reasonably into
+memory. In that case (and if you don't expect to save back the XML document
+loaded using libxml), it's better to use the SAX interface of libxml. SAX is
+a callback-based interface to the parser. Before parsing,
+the application layer registers a customized set of callbacks which are
+called by the library as it progresses through the XML input.
To get more detailed step-by-step guidance on using the SAX interface of
+libxml, see the nice
+documentation.written by James
+Henstridge.
You can debug the SAX behaviour by using the testSAX
+program located in the gnome-xml module (it's usually not shipped in the
+binary packages of libxml, but you can find it in the tar source
+distribution). Here is the sequence of callbacks that would be reported by
+testSAX when parsing the example XML document shown earlier:
SAX.setDocumentLocator()
 SAX.startDocument()
 SAX.getEntity(amp)
 SAX.startElement(EXAMPLE, prop1='gnome is great', prop2='&amp; linux too')
@@ -51,8 +52,8 @@ SAX.characters(   , 3)
 SAX.endElement(chapter)
 SAX.characters( , 1)
 SAX.endElement(EXAMPLE)
-SAX.endDocument()
Most of the other interfaces of libxml2 are based on the
-DOMtree-buildingfacility, so nearly everything up to the end of this
-documentpresupposes theuse of the standard DOM tree build. Note that the DOM
-treeitself is built bya set of registered default callbacks, without
-internalspecificinterface.
Daniel Veillard
+SAX.endDocument()
Most of the other interfaces of libxml2 are based on the DOM tree-building
+facility, so nearly everything up to the end of this document presupposes the
+use of the standard DOM tree build. Note that the DOM tree itself is built by
+a set of registered default callbacks, without internal specific
+interface.
Daniel Veillard
diff --git a/doc/intro.html b/doc/intro.html
index 1ae322f..650eccb 100644
--- a/doc/intro.html
+++ b/doc/intro.html
@@ -7,23 +7,25 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Introduction The XML C parser and toolkit of Gnome
Introduction
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker This document describes libxml, the XMLC parser and toolkit developed for theGnomeproject. XML is a standardfor
-buildingtag-basedstructured documents/data.
Here are some key points about libxml:
Libxml2 exports Push (progressive) and Pull (blocking)
-    typeparserinterfaces for both XML and HTML.
-  Libxml2 can do DTD validation at parse time, using a
-    parseddocumentinstance, or with an arbitrary DTD.
-  Libxml2 includes complete XPath, XPointerand XIncludeimplementations.
-  It is written in plain C, making as few assumptions as
-    possible,andsticking closely to ANSI C/POSIX for easy embedding.
-    WorksonLinux/Unix/Windows, ported to a number of other platforms.
-  Basic support for HTTP and FTP client allowing applications
-    tofetchremote resources.
+Introduction The XML C parser and toolkit of Gnome
Introduction
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker This document describes libxml, the XML C parser and toolkit developed for the
+Gnome project. XML is a standard for building tag-based
+structured documents/data.
Here are some key points about libxml:
Libxml2 exports Push (progressive) and Pull (blocking) type parser
+    interfaces for both XML and HTML.
+  Libxml2 can do DTD validation at parse time, using a parsed document
+    instance, or with an arbitrary DTD.
+  Libxml2 includes complete XPath, XPointer and XInclude implementations.
+  It is written in plain C, making as few assumptions as possible, and
+    sticking closely to ANSI C/POSIX for easy embedding. Works on
+    Linux/Unix/Windows, ported to a number of other platforms.
+  Basic support for HTTP and FTP client allowing applications to fetch
+    remote resources.
   The design is modular, most of the extensions can be compiled out.
-  The internal document representation is as close as possible to the DOMinterfaces.
-  Libxml2 also has a SAX like
-    interface;theinterface is designed to be compatible with Expat.
-  This library is released under the MITLicense.See
-    the Copyright file in the distribution for the precisewording.
-
Warning: unless you are forced to because your application links
-withaGnome-1.X library requiring it,  Do Not Use
-libxml1,uselibxml2
Daniel Veillard
+  The internal document representation is as close as possible to the DOM interfaces.
+  Libxml2 also has a SAX like interface;
+    the interface is designed to be compatible with Expat.
+  This library is released under the MIT
+    License. See the Copyright file in the distribution for the precise
+    wording.
+
Warning: unless you are forced to because your application links with a
+Gnome-1.X library requiring it,  Do Not Use libxml1, use
+libxml2
Daniel Veillard
diff --git a/doc/library.html b/doc/library.html
index afe4d77..b5faade 100644
--- a/doc/library.html
+++ b/doc/library.html
@@ -7,25 +7,27 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-The parser interfaces The XML C parser and toolkit of Gnome
The parser interfaces
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker This section is directly intended to help programmers
-gettingbootstrappedusing the XML tollkit from the C language. It is not
-intended tobeextensive. I hope the automatically generated documents will
-providethecompleteness required, but as a separate set of documents. The
-interfacesofthe XML parser are by principle low level, Those interested in a
-higherlevelAPI should look at DOM.
The parser interfaces
-forXMLareseparated from the HTMLparserinterfaces.  Let's have a
-look at how the XML parser can becalled:
Invoking the parser : the pull method
Usually, the first thing to do is to read an XML input. The
-parseracceptsdocuments either from in-memory strings or from files.  The
-functionsaredefined in "parser.h":
xmlDocPtr xmlParseMemory(char *buffer, int size);
+The parser interfaces The XML C parser and toolkit of Gnome
The parser interfaces
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker This section is directly intended to help programmers getting bootstrapped
+using the XML tollkit from the C language. It is not intended to be
+extensive. I hope the automatically generated documents will provide the
+completeness required, but as a separate set of documents. The interfaces of
+the XML parser are by principle low level, Those interested in a higher level
+API should look at DOM.
The parser interfaces for XML are
+separated from the HTML parser
+interfaces.  Let's have a look at how the XML parser can be called:
Invoking the parser : the pull method
Usually, the first thing to do is to read an XML input. The parser accepts
+documents either from in-memory strings or from files.  The functions are
+defined in "parser.h":
xmlDocPtr xmlParseMemory(char *buffer, int size);
     Parse a null-terminated string containing the document.
     
 
xmlDocPtr xmlParseFile(const char *filename);
-    Parse an XML document contained in a (possibly compressed)file.
+    
Parse an XML document contained in a (possibly compressed)
+      file.
     
-
The parser returns a pointer to the document structure (or NULL in
-caseoffailure).
Invoking the parser: the push method
In order for the application to keep the control when the document
-isbeingfetched (which is common for GUI based programs) libxml2 provides
-apushinterface, too, as of version 1.8.3. Here are the interfacefunctions:
xmlParserCtxtPtr xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax,
+The parser returns a pointer to the document structure (or NULL in case of
+failure).
Invoking the parser: the push method
In order for the application to keep the control when the document is
+being fetched (which is common for GUI based programs) libxml2 provides a
+push interface, too, as of version 1.8.3. Here are the interface
+functions:
xmlParserCtxtPtr xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax,
                                          void *user_data,
                                          const char *chunk,
                                          int size,
@@ -52,17 +54,17 @@ int              xmlParseChunk          (xmlParserCtxtPtr ctxt,
                     doc = ctxt->myDoc;
                     xmlFreeParserCtxt(ctxt);
                 }
-            }
The HTML parser embedded into libxml2 also has a push
-interface;thefunctions are just prefixed by "html" rather than "xml".
Invoking the parser: the SAX interface
The tree-building interface makes the parser memory-hungry,
-firstloadingthe document in memory and then building the tree itself. Reading
-adocumentwithout building the tree is possible using the SAX interfaces
-(seeSAX.h andJamesHenstridge'sdocumentation).
-Note also that the push interface can belimited to SAX:just use the two first
-arguments ofxmlCreatePushParserCtxt().
Building a tree from scratch
The other way to get an XML tree in memory is by building
-it.Basicallythere is a set of functions dedicated to building new
-elements.(These arealso described in <libxml/tree.h>.) For example,
-here is apiece ofcode that produces the XML document used in the previous
-examples:
    #include <libxml/tree.h>
+            }
The HTML parser embedded into libxml2 also has a push interface; the
+functions are just prefixed by "html" rather than "xml".
Invoking the parser: the SAX interface
The tree-building interface makes the parser memory-hungry, first loading
+the document in memory and then building the tree itself. Reading a document
+without building the tree is possible using the SAX interfaces (see SAX.h and
+James
+Henstridge's documentation). Note also that the push interface can be
+limited to SAX: just use the two first arguments of
+xmlCreatePushParserCtxt().
Building a tree from scratch
The other way to get an XML tree in memory is by building it. Basically
+there is a set of functions dedicated to building new elements. (These are
+also described in <libxml/tree.h>.) For example, here is a piece of
+code that produces the XML document used in the previous examples:
    #include <libxml/tree.h>
     xmlDocPtr doc;
     xmlNodePtr tree, subtree;
 
@@ -76,58 +78,59 @@ examples:
    #include <libxml/tree.h>
     subtree = xmlNewChild(tree, NULL, "title", "The Linux adventure");
     subtree = xmlNewChild(tree, NULL, "p", "bla bla bla ...");
     subtree = xmlNewChild(tree, NULL, "image", NULL);
-    xmlSetProp(subtree, "href", "linus.gif");
Not really rocket science ...
Traversing the tree
Basically by including"tree.h"yourcode
-has access to the internal structure of all the elementsof the tree.The names
-should be somewhat simple
-likeparent,children,
-next,prev,properties,
-etc... For example, stillwith the previousexample:
doc->children->children->children
points to the title element,
doc->children->children->next->children->children
points to the text node containing the chapter title
-"TheLinuxadventure".
NOTE: XML allows PIs and
-commentstobepresent before the document root, so
-doc->childrenmaypointto an element which is not the document
-Root Element; afunctionxmlDocGetRootElement()was added for this
-purpose.
Modifying the tree
Functions are provided for reading and writing the document content.Hereis
-an excerpt from the tree API:
xmlAttrPtr xmlSetProp(xmlNodePtr node, const xmlChar
-  *name,constxmlChar *value);
-    This sets (or changes) an attribute carried by an ELEMENT
-      node.Thevalue can be NULL.
+    xmlSetProp(subtree, "href", "linus.gif");
Not really rocket science ...
Traversing the tree
Basically by including "tree.h" your
+code has access to the internal structure of all the elements of the tree.
+The names should be somewhat simple like parent,
+children, next, prev,
+properties, etc... For example, still with the previous
+example:
doc->children->children->children
points to the title element,
doc->children->children->next->children->children
points to the text node containing the chapter title "The Linux
+adventure".
NOTE: XML allows PIs and comments to be
+present before the document root, so doc->children may point
+to an element which is not the document Root Element; a function
+xmlDocGetRootElement() was added for this purpose.
Modifying the tree
Functions are provided for reading and writing the document content. Here
+is an excerpt from the tree API:
xmlAttrPtr xmlSetProp(xmlNodePtr node, const xmlChar *name, const
+  xmlChar *value);
+    This sets (or changes) an attribute carried by an ELEMENT node.
+      The value can be NULL.
     
-
const xmlChar *xmlGetProp(xmlNodePtr node,
-  constxmlChar*name);
-    This function returns a pointer to new copy of thepropertycontent.
-      Note that the user must deallocate the result.
+
const xmlChar *xmlGetProp(xmlNodePtr node, const xmlChar
+  *name);
+    This function returns a pointer to new copy of the property
+      content. Note that the user must deallocate the result.
     
-
Two functions are provided for reading and writing the text
-associatedwithelements:
xmlNodePtr xmlStringGetNodeList(xmlDocPtr doc,
-  constxmlChar*value);
-    This function takes an "external" string and converts it toonetext
-      node or possibly to a list of entity and text nodes.Allnon-predefined
-      entity references like &Gnome; will bestoredinternally as entity
-      nodes, hence the result of the function maynot bea single node.
+
Two functions are provided for reading and writing the text associated
+with elements:
xmlNodePtr xmlStringGetNodeList(xmlDocPtr doc, const xmlChar
+  *value);
+    This function takes an "external" string and converts it to one
+      text node or possibly to a list of entity and text nodes. All
+      non-predefined entity references like &Gnome; will be stored
+      internally as entity nodes, hence the result of the function may not be
+      a single node.
     
-
xmlChar *xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr
-  list,intinLine);
-    This function is the inverseofxmlStringGetNodeList().
-      It generates a newstringcontaining the content of the text and entity
-      nodes. Note theextraargument inLine. If this argument is set to 1, the
-      function willexpandentity references.  For example, instead of
-      returning the&Gnome;XML encoding in the string, it will substitute
-      it with itsvalue (say,"GNU Network Object Model Environment").
+
xmlChar *xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr list, int
+  inLine);
+    This function is the inverse of
+      xmlStringGetNodeList(). It generates a new string
+      containing the content of the text and entity nodes. Note the extra
+      argument inLine. If this argument is set to 1, the function will expand
+      entity references.  For example, instead of returning the &Gnome;
+      XML encoding in the string, it will substitute it with its value (say,
+      "GNU Network Object Model Environment").
     
-
Saving a tree
Basically 3 options are possible:
void xmlDocDumpMemory(xmlDocPtr cur,
-  xmlChar**mem,int*size);
+
Saving a tree
Basically 3 options are possible:
void xmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int
+  *size);
     Returns a buffer into which the document has been saved.
     
 
extern void xmlDocDump(FILE *f, xmlDocPtr doc);
     Dumps a document to an open file descriptor.
     
 
int xmlSaveFile(const char *filename, xmlDocPtr cur);
-    Saves the document to a file. In this case,
-      thecompressioninterface is triggered if it has been turned on.
+    
Saves the document to a file. In this case, the compression
+      interface is triggered if it has been turned on.
     
-
Compression
The library transparently handles compression when
-doingfile-basedaccesses. The level of compression on saves can be turned on
-eithergloballyor individually for one file:
int  xmlGetDocCompressMode (xmlDocPtr doc);
+
Compression
The library transparently handles compression when doing file-based
+accesses. The level of compression on saves can be turned on either globally
+or individually for one file:
int  xmlGetDocCompressMode (xmlDocPtr doc);
     Gets the document compression ratio (0-9).
     
 
void xmlSetDocCompressMode (xmlDocPtr doc, int mode);
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 2dbf900..dd49a2b 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -94,6 +94,7 @@
      
      
      
+     
      
      
      
@@ -722,6 +723,7 @@
      
      
      
+     
      
      
      
@@ -1587,6 +1589,7 @@
      
      
      
+     
      
      
      
@@ -1668,6 +1671,7 @@
      
      
      
+     
      
      
      
@@ -1786,6 +1790,7 @@
      
      
      
+     
      
      
      
@@ -3322,6 +3327,7 @@
      
      
      
+     
      
      
      
@@ -3501,7 +3507,7 @@
      
      
      
-     
+     
      
      
      
@@ -3523,11 +3529,12 @@
      
      
      
-     
+     
      
      
      
      
+     
      
      
      
@@ -3947,13 +3954,13 @@
       Whether the DTD validation support is configured in
     
     
-      the version number: 1.2.3 value is 1002003
+      the version number: 1.2.3 value is 10203
     
     
       extra version information, used to show a CVS compilation
     
     
-      the version number string, 1.2.3 value is "1002003"
+      the version number string, 1.2.3 value is "10203"
     
     
       Whether the xmlWriter saving interface is configured in
@@ -3967,6 +3974,9 @@
     
       Whether XPointer is configured in
     
+    
+      Whether the Zlib support is compiled in
+    
     
       Skips to the next '>' char.
       
@@ -4964,7 +4974,9 @@
     
     
     
-    
+    
     
     
     
@@ -5641,6 +5653,7 @@
     
     
     
+    
     
     
     
@@ -5872,7 +5885,15 @@ if necessary or NULL'/>
     
     
     
-      
+      
+      
+      
+      
     
     
     
@@ -5977,6 +5998,7 @@ actually an xmlCharEncoding'/>
       
       
       
+      
     
     
     
@@ -6113,6 +6135,7 @@ actually an xmlCharEncoding'/>
       
       
       
+      
     
     
     
@@ -7432,6 +7455,11 @@ Could we use @subtypes for this?'/>
       
       
     
+    
+      defined(LIBXML_HTML_ENABLED)
+      Allocate and initialize a new parser context.
+      
+    
     
       defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
       Dump an HTML node, recursive behaviour,children are printed too, and formatting returns are added.
@@ -9038,8 +9066,16 @@ Could we use @subtypes for this?'/>
       
       
     
+    
+      A function called to acquire namespaces (xmlNs) from the wrapper.
+      
+      
+      
+      
+      
+    
     
-      References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of  If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.
+      References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of  If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.
       
       
       
@@ -9049,7 +9085,7 @@ Could we use @subtypes for this?'/>
       
     
     
-      References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of  If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) Support dicts Optimize string adoption for equal or none dicts. 2) XInclude WARNING: This function is in a experimental state and should only be currently only be used to test it.
+      References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used. This is the case when you don't know already where the cloned branch will be added to.  If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) What to do with XInclude? Currently this returns an error for XInclude.
       
       
       
@@ -9070,14 +9106,14 @@ Could we use @subtypes for this?'/>
       
     
     
-      Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.
+      Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content.  NOTE: This function was not intensively tested.
       
       
       
       
     
     
-      Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references. WARNING: This function is in a experimental state.
+      Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references.  NOTE: This function was not intensively tested.
       
       
       
@@ -9329,9 +9365,9 @@ Could we use @subtypes for this?'/>
     
       defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
       Set the root element of the document (doc->children is a list containing possibly comments, PIs, etc ...).
-      
+      
       
-      
+      
     
     
       defined(LIBXML_OUTPUT_ENABLED)
@@ -9933,7 +9969,7 @@ Could we use @subtypes for this?'/>
       
     
     
-      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED)
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
       Search all the namespace applying to a given element.
       
       
@@ -10279,7 +10315,7 @@ Could we use @subtypes for this?'/>
     
       defined(LIBXML_VALID_ENABLED)
       Load and parse a DTD
-      
+      
       
       
       
@@ -12180,6 +12216,11 @@ Could we use @subtypes for this?'/>
       
       
     
+    
+      Constructs an URI expressing the existing path
+      
+      
+    
     
       defined(LIBXML_PATTERN_ENABLED)
       Check if the pattern must be looked at from the root.
@@ -13250,7 +13291,7 @@ Could we use @subtypes for this?'/>
       Save a subtree starting at the node parameter to a saving context TODO: The function is not fully implemented yet as it does not return the byte count but 0 instead
       
       
-      
+      
     
     
       Save the URI as an escaped string
@@ -16636,7 +16677,7 @@ Could we use @subtypes for this?'/>
       
     
     
-      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED)
+      defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED)
       Check that a value conforms to the lexical space of NCName
       
       
@@ -16804,6 +16845,14 @@ Could we use @subtypes for this?'/>
       
       
     
+    
+      defined(LIBXML_XINCLUDE_ENABLED)
+      Implement the XInclude substitution on the XML document @doc
+      
+      
+      
+      
+    
     
       defined(LIBXML_XINCLUDE_ENABLED)
       Implement the XInclude substitution for the given subtree reusing the informations and data coming from the given context.
@@ -16932,7 +16981,7 @@ Could we use @subtypes for this?'/>
     
       defined(LIBXML_XPATH_ENABLED)
       Converts an existing object to its string() equivalent
-      
+      
       
     
     
@@ -16970,6 +17019,13 @@ Could we use @subtypes for this?'/>
       
       
     
+    
+      defined(LIBXML_XPATH_ENABLED)
+      Applies the XPath boolean() function on the result of the given compiled expression.
+      
+      
+      
+    
     
       defined(LIBXML_XPATH_ENABLED)
       Implement the concat() XPath function string concat(string, string, string*) The concat function returns the concatenation of its arguments.
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index 0cfdca5..341e126 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,9 +8,20 @@
   
   
     libxml2
-    2.6.25
-     Jun 6 2006:
+    2.6.26
+     Jun 6 2006
     http://xmlsoft.org/
-    Do not use or package 2.6.25
+       - portability fixes: Python detection (Joseph Sacco), compilation
+    error(William Brack and Graham Bennett), LynxOS patch (Olli Savia)
+   - bug fixes: encoding buffer problem, mix of code and data in
+    xmlIO.c(Kjartan Maraas), entities in XSD validation (Kasimier Buchcik),
+    variousXSD validation fixes (Kasimier), memory leak in pattern (Rob
+    Richards andKasimier), attribute with colon in name (Rob Richards), XPath
+    leak inerror reporting (Aleksey Sanin), XInclude text include of
+    selfdocument.
+   - improvements: Xpath optimizations (Kasimier), XPath object
+    cache(Kasimier)
+
+
   
 
diff --git a/doc/namespaces.html b/doc/namespaces.html
index a4d6ace..32c7787 100644
--- a/doc/namespaces.html
+++ b/doc/namespaces.html
@@ -7,44 +7,44 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Namespaces The XML C parser and toolkit of Gnome
Namespaces
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker The libxml2 library implements XML
-namespacessupportbyrecognizing namespace constructs in the input, and
-does namespacelookupautomatically when building the DOM tree. A namespace
-declarationisassociated with an in-memory structure and all elements or
-attributeswithinthat namespace point to it. Hence testing the namespace is a
-simple andfastequality operation at the user level.
I suggest that people using libxml2 use a namespace, and declare it
-intheroot element of their document as the default namespace. Then they
-don'tneedto use the prefix in the content but we will have a basis for
-futuresemanticrefinement and  merging of data from different sources. This
-doesn'tincreasethe size of the XML output significantly, but significantly
-increasesitsvalue in the long-term. Example:
<mydoc xmlns="http://mydoc.example.org/schemas/">
+Namespaces The XML C parser and toolkit of Gnome
Namespaces
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker The libxml2 library implements XML namespaces support by
+recognizing namespace constructs in the input, and does namespace lookup
+automatically when building the DOM tree. A namespace declaration is
+associated with an in-memory structure and all elements or attributes within
+that namespace point to it. Hence testing the namespace is a simple and fast
+equality operation at the user level.
I suggest that people using libxml2 use a namespace, and declare it in the
+root element of their document as the default namespace. Then they don't need
+to use the prefix in the content but we will have a basis for future semantic
+refinement and  merging of data from different sources. This doesn't increase
+the size of the XML output significantly, but significantly increases its
+value in the long-term. Example:
<mydoc xmlns="http://mydoc.example.org/schemas/">
    <elem1>...</elem1>
    <elem2>...</elem2>
-</mydoc>
The namespace value has to be an absolute URL, but the URL doesn't
-havetopoint to any existing resource on the Web. It will bind all the
-elementandattributes with that URL. I suggest to use an URL within a
-domainyoucontrol, and that the URL should contain some kind of version
-informationifpossible. For example,
-"http://www.gnome.org/gnumeric/1.0/"isagood namespace scheme.
Then when you load a file, make sure that a namespace
-carryingtheversion-independent prefix is installed on the root element of
-yourdocument,and if the version information don't match something you know,
-warnthe userand be liberal in what you accept as the input. Also do *not* try
-tobasenamespace checking on the prefix value. <foo:text> may be
-exactlythesame as <bar:text> in another document. What really matters
-is theURIassociated with the element or the attribute, not the prefix string
-(whichisjust a shortcut for the full URI). In libxml, element and attributes
-haveannsfield pointing to an xmlNs structure detailing
-thenamespaceprefix and its URI.
@@Interfaces@@
xmlNodePtr node;
+</mydoc>
The namespace value has to be an absolute URL, but the URL doesn't have to
+point to any existing resource on the Web. It will bind all the element and
+attributes with that URL. I suggest to use an URL within a domain you
+control, and that the URL should contain some kind of version information if
+possible. For example, "http://www.gnome.org/gnumeric/1.0/" is a
+good namespace scheme.
Then when you load a file, make sure that a namespace carrying the
+version-independent prefix is installed on the root element of your document,
+and if the version information don't match something you know, warn the user
+and be liberal in what you accept as the input. Also do *not* try to base
+namespace checking on the prefix value. <foo:text> may be exactly the
+same as <bar:text> in another document. What really matters is the URI
+associated with the element or the attribute, not the prefix string (which is
+just a shortcut for the full URI). In libxml, element and attributes have an
+ns field pointing to an xmlNs structure detailing the namespace
+prefix and its URI.
@@Interfaces@@
xmlNodePtr node;
 if(!strncmp(node->name,"mytag",5)
   && node->ns
   && !strcmp(node->ns->href,"http://www.mysite.com/myns/1.0")) {
   ...
-}
Usually people object to using namespaces together with validitychecking.I
-will try to make sure that using namespaces won't break validitychecking,so
-even if you plan to use or currently are using validation Istronglysuggest
-adding namespaces to your document. A default
-namespaceschemexmlns="http://...."should not break validity even
-onlessflexible parsers. Using namespaces to mix and differentiate
-contentcomingfrom multiple DTDs will certainly break current validation
-schemes. Tochecksuch documents one needs to use schema-validation, which is
-supportedinlibxml2 as well. See relagx-ngand w3c-schema.
Daniel Veillard
+}
Usually people object to using namespaces together with validity checking.
+I will try to make sure that using namespaces won't break validity checking,
+so even if you plan to use or currently are using validation I strongly
+suggest adding namespaces to your document. A default namespace scheme
+xmlns="http://...." should not break validity even on less
+flexible parsers. Using namespaces to mix and differentiate content coming
+from multiple DTDs will certainly break current validation schemes. To check
+such documents one needs to use schema-validation, which is supported in
+libxml2 as well. See relagx-ng and w3c-schema.
Daniel Veillard
diff --git a/doc/news.html b/doc/news.html
index b67feaa..79a89d6 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -7,12 +7,62 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Releases The XML C parser and toolkit of Gnome
Releases
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Items not finished and worked on, get in touch with the list if you
-wanttohelp those
More testing on RelaxNG
-  Finishing up XMLSchemas
-
The change logdescribes the recents
-commitstothe CVScode
-base.
There is the list of public releases:
2.6.26: Jun 6 2006
portability fixes: Python detection (Joseph Sacco), compilation
+Releases The XML C parser and toolkit of Gnome
Releases
Main Menu
Home
Reference Manual
Introduction
FAQ
Developer Menu
Reporting bugs and getting help
How to help
Downloads
Releases
XML
XSLT
Validation & DTDs
Encodings support
Catalog support
Namespaces
Contributions
Code Examples
API Menu
XML Guidelines
Recent Changes
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Items not finished and worked on, get in touch with the list if you want
+to help those
More testing on RelaxNG
+  Finishing up XML
+  Schemas
+
The change log describes the recents commits
+to the CVS code base.
There is the list of public releases:
2.6.27: Oct 25 2006
Portability fixes: file names on windows (Roland Schwingel, 
+      Emelyanov Alexey), windows compile fixup (Rob Richards), 
+      AIX iconv() is apparently case sensitive
+  improvements: Python XPath types mapping (Nic Ferrier), XPath optimization
+      (Kasimier), add xmlXPathCompiledEvalToBoolean (Kasimier), Python node
+      equality and comparison (Andreas Pakulat), xmlXPathCollectAndTest
+      improvememt (Kasimier), expose if library was compiled with zlib 
+      support (Andrew Nosenko), cache for xmlSchemaIDCMatcher structs
+      (Kasimier), xmlTextConcat should work with comments and PIs (Rob
+      Richards), export htmlNewParserCtxt needed by Michael Day, refactoring
+      of catalog entity loaders (Michael Day), add XPointer support to 
+      python bindings (Ross Reedstrom, Brian West and Stefan Anca), 
+      try to sort out most file path to URI conversions and xmlPathToUri,
+      add --html --memory case to xmllint
+  building fix: fix --with-minimum (Felipe Contreras), VMS fix, 
+      const'ification of HTML parser structures (Matthias Clasen),
+      portability fix (Emelyanov Alexey), wget autodetection (Peter
+      Breitenlohner),  remove the build path recorded in the python
+      shared module, separate library flags for shared and static builds
+      (Mikhail Zabaluev), fix --with-minimum --with-sax1 builds, fix
+      --with-minimum --with-schemas builds
+  bug fix: xmlGetNodePath fix (Kasimier), xmlDOMWrapAdoptNode and
+      attribute (Kasimier), crash when using the recover mode, 
+      xmlXPathEvalExpr problem (Kasimier), xmlXPathCompExprAdd bug (Kasimier),
+      missing destry in xmlFreeRMutex (Andrew Nosenko), XML Schemas fixes
+      (Kasimier), warning on entities processing, XHTML script and style
+      serialization (Kasimier), python generator for long types, bug in
+      xmlSchemaClearValidCtxt (Bertrand Fritsch), xmlSchemaXPathEvaluate
+      allocation bug (Marton Illes), error message end of line (Rob Richards),
+      fix attribute serialization in writer (Rob Richards), PHP4 DTD validation
+      crasher, parser safety patch (Ben Darnell), _private context propagation
+      when parsing entities (with Michael Day), fix entities behaviour when 
+      using SAX, URI to file path fix (Mikhail Zabaluev), disapearing validity
+      context, arg error in SAX callback (Mike Hommey), fix mixed-content
+      autodetect when using --noblanks, fix xmlIOParseDTD error handling,
+      fix bug in xmlSplitQName on special Names, fix Relax-NG element content
+      validation bug, fix xmlReconciliateNs bug, fix potential attribute 
+      XML parsing bug, fix line/column accounting in XML parser, chunking bug
+      in the HTML parser on script, try to detect obviously buggy HTML
+      meta encoding indications, bugs with encoding BOM and xmlSaveDoc, 
+      HTML entities in attributes parsing, HTML minimized attribute values,
+      htmlReadDoc and htmlReadIO were broken, error handling bug in
+      xmlXPathEvalExpression (Olaf Walkowiak), fix a problem in
+      htmlCtxtUseOptions, xmlNewInputFromFile could leak (Marius Konitzer),
+      bug on misformed SSD regexps (Christopher Boumenot)
+      
+  documentation: warning about XML_PARSE_COMPACT (Kasimier Buchcik),
+      fix xmlXPathCastToString documentation, improve man pages for
+      xmllitn and xmlcatalog (Daniel Leidert), fixed comments of a few
+      functions
+
2.6.26: Jun 6 2006
portability fixes: Python detection (Joseph Sacco), compilation
     error(William Brack and Graham Bennett), LynxOS patch (Olli Savia)
   bug fixes: encoding buffer problem, mix of code and data in
     xmlIO.c(Kjartan Maraas), entities in XSD validation (Kasimier Buchcik),
@@ -22,474 +72,465 @@ base.
There is the list of public releases:
2.6.26: Jun 6 2006
     selfdocument.
   improvements: Xpath optimizations (Kasimier), XPath object
     cache(Kasimier)
-
2.6.25: Jun 6 2006:
Do not use or package 2.6.25
2.6.24: Apr 28 2006
Portability fixes: configure on Windows, testapi compile
-    onwindows(Kasimier Buchcik, venkat naidu), Borland C++ 6 compile
-    (EricZurcher),HP-UX compiler workaround (Rick Jones), xml2-config
-    bugfix,gcc-4.1cleanups, Python detection scheme (Joseph Sacco), UTF-8
-    file pathsonWindows (Roland Schwingel).
-  Improvements: xmlDOMWrapReconcileNamespaces
-    xmlDOMWrapCloneNode(KasimierBuchcik), XML catalog debugging (Rick Jones),
-    update to Unicode4.01.
-  Bug fixes: xmlParseChunk() problem in 2.6.23,
-    xmlParseInNodeContext()onHTML docs, URI behaviour on Windows (Rob
-    Richards), comment streamingbug,xmlParseComment (with William Brack),
-    regexp bug fixes (DV &YouriGolovanov), xmlGetNodePath on text/CDATA
-    (Kasimier),one Relax-NGinterleave bug, xmllint --path and --valid,XSD
-    bugfixes (Kasimier),remove debugleft in Python bindings (Nic Ferrier),
-    xmlCatalogAdd bug(Martin Cole),xmlSetProp fixes (Rob Richards), HTML
-    IDness (RobRichards), a largenumber of cleanups and small fixes based on
-    Coverityreports, bugin character ranges, Unicode tables const (Aivars
-    Kalvans),schemasfix (Stefan Kost), xmlRelaxNGParse
-    errordeallocation,xmlSchemaAddSchemaDoc error deallocation, error
-    handling onunallowedcode point, ixmllint --nonet to never reach the net
-    (GaryCoady),line break in writer after end PI (Jason Viers).
+
2.6.25: Jun 6 2006:
Do not use or package 2.6.25
2.6.24: Apr 28 2006
Portability fixes: configure on Windows, testapi compile on windows
+      (Kasimier Buchcik, venkat naidu), Borland C++ 6 compile (Eric Zurcher),
+      HP-UX compiler workaround (Rick Jones), xml2-config bugfix, gcc-4.1
+      cleanups, Python detection scheme (Joseph Sacco), UTF-8 file paths on
+      Windows (Roland Schwingel).
+      
+  Improvements: xmlDOMWrapReconcileNamespaces xmlDOMWrapCloneNode (Kasimier
+      Buchcik), XML catalog debugging (Rick Jones), update to Unicode 4.01.
+  Bug fixes: xmlParseChunk() problem in 2.6.23, xmlParseInNodeContext()
+      on HTML docs, URI behaviour on Windows (Rob Richards), comment streaming
+      bug, xmlParseComment (with William Brack), regexp bug fixes (DV &
+      Youri Golovanov), xmlGetNodePath on text/CDATA (Kasimier),
+      one Relax-NG interleave bug, xmllint --path and --valid,
+      XSD bugfixes (Kasimier), remove debug
+      left in Python bindings (Nic Ferrier), xmlCatalogAdd bug (Martin Cole),
+      xmlSetProp fixes (Rob Richards), HTML IDness (Rob Richards), a large
+      number of cleanups and small fixes based on Coverity reports, bug
+      in character ranges, Unicode tables const (Aivars Kalvans), schemas
+      fix (Stefan Kost), xmlRelaxNGParse error deallocation, 
+      xmlSchemaAddSchemaDoc error deallocation, error handling on unallowed
+      code point, ixmllint --nonet to never reach the net (Gary Coady),
+      line break in writer after end PI (Jason Viers). 
   Documentation: man pages updates and cleanups (Daniel Leidert).
   New features: Relax NG structure error handlers.
-
2.6.23: Jan 5 2006
portability fixes: Windows (Rob Richards), getaddrinfo on
-    Windows(KoljaNowak, Rob Richards), icc warnings (Kjartan
-    Maraas),--with-minimumcompilation fixes (William Brack), error case
-    handling fixon Solaris(Albert Chin), don't use 'list' as parameter name
-    reported bySamuel DiazGarcia, more old Unices portability fixes (Albert
-    Chin),MinGW compilation(Mark Junker), HP-UX compiler warnings
-  (RickJones),
-  code cleanup: xmlReportError (Adrian Mouat), removexmlBufferClose(Geert
-    Jansen), unreachable code (Oleksandr Kononenko),refactoringparsing code
-    (Bjorn Reese)
-  bug fixes: xmlBuildRelativeURI and empty path
-    (WilliamBrack),combinatory explosion and performances in regexp code,
-    leakinxmlTextReaderReadString(), xmlStringLenDecodeEntities
-    problem(MassimoMorara), Identity Constraints bugs and a segfault
-    (KasimierBuchcik),XPath pattern based evaluation bugs (DV
-    &Kasimier),xmlSchemaContentModelDump() memory leak (Kasimier),
-    potentialleak inxmlSchemaCheckCSelectorXPath(), xmlTextWriterVSprintf()
-    misuseofvsnprintf (William Brack), XHTML serialization fix (Rob
-    Richards),CRLFsplit problem (William), issues with non-namespaced
-    attributesinxmlAddChild() xmlAddNextSibling() and xmlAddPrevSibling()
-    (RobRichards),HTML parsing of script, Python must not output to stdout
-    (NicFerrier),exclusive C14N namespace visibility (Aleksey Sanin),
-    XSDdataypetotalDigits bug (Kasimier Buchcik), error handling when writing
-    toanxmlBuffer (Rob Richards), runtest schemas error not
-    reported(HisashiFujinaka), signed/unsigned problem in date/time code
-    (AlbertChin), fixXSI driven XSD validation (Kasimier), parsing of
-    xs:decimal(Kasimier),fix DTD writer output (Rob Richards), leak
-    inxmlTextReaderReadInnerXml(Gary Coady), regexp bug affecting
-    schemas(Kasimier), configuration ofruntime debugging
-    (Kasimier),xmlNodeBufGetContent bug on entity refs(Oleksandr
-    Kononenko),xmlRegExecPushString2 bug (Sreeni Nair),compilation and build
-    fixes(Michael Day), removed dependancies onxmlSchemaValidError
-    (Kasimier), bugwith <xml:foo/>, more XPathpattern based evaluation
-    fixes(Kasimier)
-  improvements: XSD Schemas redefinitions/restrictions
-    (KasimierBuchcik),node copy checks and fix for attribute (Rob Richards),
-    countedtransitionbug in regexps, ctxt->standalone = -2 to indicate
-    nostandaloneattribute was found, add
-    xmlSchemaSetParserStructuredErrors()(KasimierBuchcik), add
-    xmlTextReaderSchemaValidateCtxt() to API(Kasimier), handlegzipped HTTP
-    resources (Gary Coady), addhtmlDocDumpMemoryFormat. (RobRichards),
-  documentation: typo (Michael Day), libxml man page (Albert
-    Chin),savefunction to XML buffer (Geert Jansen), small doc fix
-    (AronStansvik),
+
2.6.23: Jan 5 2006
portability fixes: Windows (Rob Richards), getaddrinfo on Windows
+    (Kolja Nowak, Rob Richards), icc warnings (Kjartan Maraas),
+    --with-minimum compilation fixes (William Brack), error case handling fix
+    on Solaris (Albert Chin), don't use 'list' as parameter name reported by
+    Samuel Diaz Garcia, more old Unices portability fixes (Albert Chin),
+    MinGW compilation (Mark Junker), HP-UX compiler warnings (Rick
+  Jones),
+  code cleanup: xmlReportError (Adrian Mouat), remove xmlBufferClose
+    (Geert Jansen), unreachable code (Oleksandr Kononenko), refactoring
+    parsing code (Bjorn Reese)
+  bug fixes: xmlBuildRelativeURI and empty path (William Brack),
+    combinatory explosion and performances in regexp code, leak in
+    xmlTextReaderReadString(), xmlStringLenDecodeEntities problem (Massimo
+    Morara), Identity Constraints bugs and a segfault (Kasimier Buchcik),
+    XPath pattern based evaluation bugs (DV & Kasimier),
+    xmlSchemaContentModelDump() memory leak (Kasimier), potential leak in
+    xmlSchemaCheckCSelectorXPath(), xmlTextWriterVSprintf() misuse of
+    vsnprintf (William Brack), XHTML serialization fix (Rob Richards), CRLF
+    split problem (William), issues with non-namespaced attributes in
+    xmlAddChild() xmlAddNextSibling() and xmlAddPrevSibling() (Rob Richards),
+    HTML parsing of script, Python must not output to stdout (Nic Ferrier),
+    exclusive C14N namespace visibility (Aleksey Sanin), XSD dataype
+    totalDigits bug (Kasimier Buchcik), error handling when writing to an
+    xmlBuffer (Rob Richards), runtest schemas error not reported (Hisashi
+    Fujinaka), signed/unsigned problem in date/time code (Albert Chin), fix
+    XSI driven XSD validation (Kasimier), parsing of xs:decimal (Kasimier),
+    fix DTD writer output (Rob Richards), leak in xmlTextReaderReadInnerXml
+    (Gary Coady), regexp bug affecting schemas (Kasimier), configuration of
+    runtime debugging (Kasimier), xmlNodeBufGetContent bug on entity refs
+    (Oleksandr Kononenko), xmlRegExecPushString2 bug (Sreeni Nair),
+    compilation and build fixes (Michael Day), removed dependancies on
+    xmlSchemaValidError (Kasimier), bug with <xml:foo/>, more XPath
+    pattern based evaluation fixes (Kasimier)
+  improvements: XSD Schemas redefinitions/restrictions (Kasimier
+    Buchcik), node copy checks and fix for attribute (Rob Richards), counted
+    transition bug in regexps, ctxt->standalone = -2 to indicate no
+    standalone attribute was found, add xmlSchemaSetParserStructuredErrors()
+    (Kasimier Buchcik), add xmlTextReaderSchemaValidateCtxt() to API
+    (Kasimier), handle gzipped HTTP resources (Gary Coady), add
+    htmlDocDumpMemoryFormat. (Rob Richards),
+  documentation: typo (Michael Day), libxml man page (Albert Chin), save
+    function to XML buffer (Geert Jansen), small doc fix (Aron Stansvik),
 
2.6.22: Sep 12 2005
build fixes: compile without schematron (St�phane Bidoul)
-  bug fixes: xmlDebugDumpNode on namespace node (Oleg
-    Paraschenko)i,CDATApush parser bug, xmlElemDump problem with XHTML1
-    doc,XML_FEATURE_xxxclash with expat headers renamed XML_WITH_xxx, fix
-    someoutput formattingfor meta element (Rob Richards), script and
-    styleXHTML1 serialization(David Madore), Attribute derivation fixups in
-    XSD(Kasimier Buchcik),better IDC error reports (Kasimier Buchcik)
-  improvements: add XML_SAVE_NO_EMPTY xmlSaveOption (Rob
-    Richards),addXML_SAVE_NO_XHTML xmlSaveOption, XML Schemas improvements
-    preparingforderive (Kasimier Buchcik).
-  documentation: generation of gtk-doc like docs,
-  integrationwithdevhelp.
-
2.6.21: Sep 4 2005
build fixes: Cygwin portability fixes (Gerrit P.
-    Haase),callingconvention problems on Windows (Marcus Boerger), cleanups
-    based onLinus'sparse tool, update of win32/configure.js (Rob Richards),
-    removewarningson Windows(Marcus Boerger), compilation without SAX1,
-    detectionof thePython binary, use $GCC inestad of $CC = 'gcc' (Andrew
-    W.Nosenko),compilation/link with threads and old gcc, compile problem
-    byC370 onZ/OS,
-  bug fixes: http_proxy environments (Peter Breitenlohner), HTML
-    UTF-8bug(Jiri Netolicky), XPath NaN compare bug (William
-    Brack),htmlParseScriptpotential bug, Schemas regexp handling of spaces,
-    Base64Schemascomparisons NIST passes, automata build error
-    xsd:all,xmlGetNodePath fornamespaced attributes (Alexander Pohoyda),
-    xmlSchemasforeign namespaceshandling, XML Schemas facet comparison
-    (KupriyanovAnatolij),xmlSchemaPSimpleTypeErr error report (Kasimier
-    Buchcik), xml:namespaceahndling in Schemas (Kasimier), empty model group
-    in Schemas(Kasimier),wilcard in Schemas (Kasimier), URI composition
-    (William),xs:anyType inSchemas (Kasimier), Python resolver emmitting
-    errormessages directly,Python xmlAttr.parent (Jakub Piotr Clapa), trying
-    tofix the file path/URIconversion, xmlTextReaderGetAttribute fix
-    (RobRichards),xmlSchemaFreeAnnot memleak (Kasimier), HTML
-    UTF-8serialization, streamingXPath, Schemas determinism detection
-    problem,XInclude bug, Schemascontext type (Dean Hill), validation fix
-    (DerekPoon),xmlTextReaderGetAttribute[Ns] namespaces (Rob Richards),
-    Schemastype fix(Kuba Nowakowski), UTF-8 parser bug, error in
-    encodinghandling,xmlGetLineNo fixes, bug on entities handling, entity
-    nameextraction inerror handling with XInclude, text nodes in HTML body
-    tags(Gary Coady),xml:id and IDness at the treee level fixes, XPath
-    streamingpatternsbugs.
-  improvements: structured interfaces for schemas and RNG
-    errorreports(Marcus Boerger), optimization of the char data inner
-    loopparsing(thanks to Behdad Esfahbod for the idea), schematron
-    validationthoughnot finished yet, xmlSaveOption to omit XML declaration,
-    keyrefmatcherror reports (Kasimier), formal expression handling code
-    notpluggedyet, more lax mode for the HTML parser, parser
-    XML_PARSE_COMPACToptionfor text nodes allocation.
+  bug fixes: xmlDebugDumpNode on namespace node (Oleg Paraschenko)i,
+    CDATA push parser bug, xmlElemDump problem with XHTML1 doc,
+    XML_FEATURE_xxx clash with expat headers renamed XML_WITH_xxx, fix some
+    output formatting for meta element (Rob Richards), script and style
+    XHTML1 serialization (David Madore), Attribute derivation fixups in XSD
+    (Kasimier Buchcik), better IDC error reports (Kasimier Buchcik)
+  improvements: add XML_SAVE_NO_EMPTY xmlSaveOption (Rob Richards), add
+    XML_SAVE_NO_XHTML xmlSaveOption, XML Schemas improvements preparing for
+    derive (Kasimier Buchcik).
+  documentation: generation of gtk-doc like docs, integration with
+    devhelp.
+
2.6.21: Sep 4 2005
build fixes: Cygwin portability fixes (Gerrit P. Haase), calling
+    convention problems on Windows (Marcus Boerger), cleanups based on Linus'
+    sparse tool, update of win32/configure.js (Rob Richards), remove warnings
+    on Windows(Marcus Boerger), compilation without SAX1, detection of the
+    Python binary, use $GCC inestad of $CC = 'gcc' (Andrew W. Nosenko),
+    compilation/link with threads and old gcc, compile problem by C370 on
+    Z/OS,
+  bug fixes: http_proxy environments (Peter Breitenlohner), HTML UTF-8
+    bug (Jiri Netolicky), XPath NaN compare bug (William Brack),
+    htmlParseScript potential bug, Schemas regexp handling of spaces, Base64
+    Schemas comparisons NIST passes, automata build error xsd:all,
+    xmlGetNodePath for namespaced attributes (Alexander Pohoyda), xmlSchemas
+    foreign namespaces handling, XML Schemas facet comparison (Kupriyanov
+    Anatolij), xmlSchemaPSimpleTypeErr error report (Kasimier Buchcik), xml:
+    namespace ahndling in Schemas (Kasimier), empty model group in Schemas
+    (Kasimier), wilcard in Schemas (Kasimier), URI composition (William),
+    xs:anyType in Schemas (Kasimier), Python resolver emmitting error
+    messages directly, Python xmlAttr.parent (Jakub Piotr Clapa), trying to
+    fix the file path/URI conversion, xmlTextReaderGetAttribute fix (Rob
+    Richards), xmlSchemaFreeAnnot memleak (Kasimier), HTML UTF-8
+    serialization, streaming XPath, Schemas determinism detection problem,
+    XInclude bug, Schemas context type (Dean Hill), validation fix (Derek
+    Poon), xmlTextReaderGetAttribute[Ns] namespaces (Rob Richards), Schemas
+    type fix (Kuba Nowakowski), UTF-8 parser bug, error in encoding handling,
+    xmlGetLineNo fixes, bug on entities handling, entity name extraction in
+    error handling with XInclude, text nodes in HTML body tags (Gary Coady),
+    xml:id and IDness at the treee level fixes, XPath streaming patterns
+  bugs.
+  improvements: structured interfaces for schemas and RNG error reports
+    (Marcus Boerger), optimization of the char data inner loop parsing
+    (thanks to Behdad Esfahbod for the idea), schematron validation though
+    not finished yet, xmlSaveOption to omit XML declaration, keyref match
+    error reports (Kasimier), formal expression handling code not plugged
+    yet, more lax mode for the HTML parser, parser XML_PARSE_COMPACT option
+    for text nodes allocation.
   documentation: xmllint man page had --nonet duplicated
-
2.6.20: Jul 10 2005
build fixes: Windows build (Rob Richards), Mingw
-    compilation(IgorZlatkovic), Windows Makefile (Igor), gcc warnings
-    (Kasimierandandriy@google.com), use gcc weak references to pthread to
-    avoidthepthread dependancy on Linux, compilation problem (Steve
-    Nairn),compilingof subset (Morten Welinder), IPv6/ss_family compilation
-    (WilliamBrack),compilation when disabling parts of the library,
-    standalonetestdistribution.
-  bug fixes: bug in lang(), memory cleanup on errors (William
-    Brack),HTTPquery strings (Aron Stansvik), memory leak in DTD
-    (William),integeroverflow in XPath (William), nanoftp buffer size,
-    pattern "." apthfixup(Kasimier), leak in tree reported by Malcolm Rowe,
-    replaceNodepatch(Brent Hendricks), CDATA with NULL content (Mark Vakoc),
-    xml:basefixupon XInclude (William), pattern fixes (William), attribute
-    buginexclusive c14n (Aleksey Sanin), xml:space and xml:lang with
-    SAX2(RobRichards), namespace trouble in complex parsing (Malcolm Rowe),
-    XSDtypeQNames fixes (Kasimier), XPath streaming fixups (William),
-    RelaxNGbug(Rob Richards), Schemas for Schemas fixes (Kasimier), removal
-    of ID(RobRichards), a small RelaxNG leak, HTML parsing in push mode
-    bug(JamesBursa), failure to detect UTF-8 parsing bugs in
-    CDATAsections,areBlanks() heuristic failure, duplicate attributes in
-    DTDbug(William).
-  improvements: lot of work on Schemas by Kasimier Buchcik
-    bothonconformance and streaming, Schemas validation messages
-    (KasimierBuchcik,Matthew Burgess), namespace removal at the python
-    level(BrentHendricks), Update to new Schemas regression tests
-    fromW3C/Nist(Kasimier), xmlSchemaValidateFile() (Kasimier),
-    implementationofxmlTextReaderReadInnerXml and xmlTextReaderReadOuterXml
-    (JamesWert),standalone test framework and programs, new DOM
-    importAPIsxmlDOMWrapReconcileNamespaces()
-    xmlDOMWrapAdoptNode()andxmlDOMWrapRemoveNode(), extension of xmllint
-    capabilities for SAXandSchemas regression tests, xmlStopParser()
-    available in pull modetoo,ienhancement to xmllint --shell namespaces
-    support, Windows port ofthestandalone testing tools (Kasimier
-    andWilliam),xmlSchemaValidateStream() xmlSchemaSAXPlug()
-    andxmlSchemaSAXUnplug() SAXSchemas APIs, Schemas xmlReader support.
-
2.6.19: Apr 02 2005
build fixes: drop .la from RPMs, --with-minimum build
-    fix(WilliamBrack), use XML_SOCKLEN_T instead of SOCKLEN_T because it
-    breakswith AIX5.3 compiler, fixed elfgcchack.h generation and PLT
-    reductioncode onLinux/ELF/gcc4
-  bug fixes: schemas type decimal fixups (William Brack),
-    xmmlintreturncode (Gerry Murphy), small schemas fixes (Matthew Burgess
-    andGUYFabrice), workaround "DAV:" namespace brokeness in c14n
-    (AlekseySanin),segfault in Schemas (Kasimier Buchcik), Schemas
-    attributevalidation(Kasimier), Prop related functions and
-    xmlNewNodeEatName (RobRichards),HTML serialization of name attribute on a
-    elements, Pythonerror handlersleaks and improvement (Brent Hendricks),
-    uninitializedvariable inencoding code, Relax-NG validation bug, potential
-    crashifgnorableWhitespace is NULL, xmlSAXParseDoc and
-    xmlParseDocsignatures,switched back to assuming UTF-8 in case no encoding
-    is givenatserialization time
-  improvements: lot of work on Schemas by Kasimier Buchcik
-    onfacetschecking and also mixed handling.
+
2.6.20: Jul 10 2005
build fixes: Windows build (Rob Richards), Mingw compilation (Igor
+    Zlatkovic), Windows Makefile (Igor), gcc warnings (Kasimier and
+    andriy@google.com), use gcc weak references to pthread to avoid the
+    pthread dependancy on Linux, compilation problem (Steve Nairn), compiling
+    of subset (Morten Welinder), IPv6/ss_family compilation (William Brack),
+    compilation when disabling parts of the library, standalone test
+    distribution.
+  bug fixes: bug in lang(), memory cleanup on errors (William Brack),
+    HTTP query strings (Aron Stansvik), memory leak in DTD (William), integer
+    overflow in XPath (William), nanoftp buffer size, pattern "." apth fixup
+    (Kasimier), leak in tree reported by Malcolm Rowe, replaceNode patch
+    (Brent Hendricks), CDATA with NULL content (Mark Vakoc), xml:base fixup
+    on XInclude (William), pattern fixes (William), attribute bug in
+    exclusive c14n (Aleksey Sanin), xml:space and xml:lang with SAX2 (Rob
+    Richards), namespace trouble in complex parsing (Malcolm Rowe), XSD type
+    QNames fixes (Kasimier), XPath streaming fixups (William), RelaxNG bug
+    (Rob Richards), Schemas for Schemas fixes (Kasimier), removal of ID (Rob
+    Richards), a small RelaxNG leak, HTML parsing in push mode bug (James
+    Bursa), failure to detect UTF-8 parsing bugs in CDATA sections,
+    areBlanks() heuristic failure, duplicate attributes in DTD bug
+  (William).
+  improvements: lot of work on Schemas by Kasimier Buchcik both on
+    conformance and streaming, Schemas validation messages (Kasimier Buchcik,
+    Matthew Burgess), namespace removal at the python level (Brent
+    Hendricks), Update to new Schemas regression tests from W3C/Nist
+    (Kasimier), xmlSchemaValidateFile() (Kasimier), implementation of
+    xmlTextReaderReadInnerXml and xmlTextReaderReadOuterXml (James Wert),
+    standalone test framework and programs, new DOM import APIs
+    xmlDOMWrapReconcileNamespaces() xmlDOMWrapAdoptNode() and
+    xmlDOMWrapRemoveNode(), extension of xmllint capabilities for SAX and
+    Schemas regression tests, xmlStopParser() available in pull mode too,
+    ienhancement to xmllint --shell namespaces support, Windows port of the
+    standalone testing tools (Kasimier and William),
+    xmlSchemaValidateStream() xmlSchemaSAXPlug() and xmlSchemaSAXUnplug() SAX
+    Schemas APIs, Schemas xmlReader support.
+
2.6.19: Apr 02 2005
build fixes: drop .la from RPMs, --with-minimum build fix (William
+    Brack), use XML_SOCKLEN_T instead of SOCKLEN_T because it breaks with AIX
+    5.3 compiler, fixed elfgcchack.h generation and PLT reduction code on
+    Linux/ELF/gcc4
+  bug fixes: schemas type decimal fixups (William Brack), xmmlint return
+    code (Gerry Murphy), small schemas fixes (Matthew Burgess and GUY
+    Fabrice), workaround "DAV:" namespace brokeness in c14n (Aleksey Sanin),
+    segfault in Schemas (Kasimier Buchcik), Schemas attribute validation
+    (Kasimier), Prop related functions and xmlNewNodeEatName (Rob Richards),
+    HTML serialization of name attribute on a elements, Python error handlers
+    leaks and improvement (Brent Hendricks), uninitialized variable in
+    encoding code, Relax-NG validation bug, potential crash if
+    gnorableWhitespace is NULL, xmlSAXParseDoc and xmlParseDoc signatures,
+    switched back to assuming UTF-8 in case no encoding is given at
+    serialization time
+  improvements: lot of work on Schemas by Kasimier Buchcik on facets
+    checking and also mixed handling.
   
-
2.6.18: Mar 13 2005
build fixes: warnings (Peter Breitenlohner),
-    testapi.cgeneration,Bakefile support (Francesco Montorsi), Windows
-    compilation(Joel Reed),some gcc4 fixes, HP-UX portability fixes (Rick
-    Jones).
-  bug fixes: xmlSchemaElementDump namespace (Kasimier Buchcik),
-    pushandxmlreader stopping on non-fatal errors, thread support
-    fordictionnariesreference counting (Gary Coady), internal subset and
-    pushproblem, URLsaved in xmlCopyDoc, various schemas bug fixes
-    (Kasimier),Python pathsfixup (Stephane Bidoul), xmlGetNodePath and
-    namespaces,xmlSetNsProp fix(Mike Hommey), warning should not count as
-    error (WilliamBrack),xmlCreatePushParser empty chunk, XInclude parser
-    flags (William),cleanupFTP and HTTP code to reuse the uri parsing and
-    IPv6(William),xmlTextWriterStartAttributeNS fix (Rob
-    Richards),XMLLINT_INDENT beingempty (William), xmlWriter bugs (Rob
-    Richards),multithreading on Windows(Rich Salz), xmlSearchNsByHref fix
-    (Kasimier),Python binding leak (BrentHendricks), aliasing bug exposed by
-    gcc4 ons390, xmlTextReaderNext bug(Rob Richards), Schemas decimal type
-    fixes(William Brack),xmlByteConsumed static buffer (Ben Maurer).
-  improvement: speedup parsing comments and DTDs, dictionnary
-    supportforhash tables, Schemas Identity constraints (Kasimier),
-    streamingXPathsubset, xmlTextReaderReadString added (Bjorn Reese),
-    Schemascanonicalvalues handling (Kasimier), add
-    xmlTextReaderByteConsumed(AronStansvik),
+
2.6.18: Mar 13 2005
build fixes: warnings (Peter Breitenlohner), testapi.c generation,
+    Bakefile support (Francesco Montorsi), Windows compilation (Joel Reed),
+    some gcc4 fixes, HP-UX portability fixes (Rick Jones).
+  bug fixes: xmlSchemaElementDump namespace (Kasimier Buchcik), push and
+    xmlreader stopping on non-fatal errors, thread support for dictionnaries
+    reference counting (Gary Coady), internal subset and push problem, URL
+    saved in xmlCopyDoc, various schemas bug fixes (Kasimier), Python paths
+    fixup (Stephane Bidoul), xmlGetNodePath and namespaces, xmlSetNsProp fix
+    (Mike Hommey), warning should not count as error (William Brack),
+    xmlCreatePushParser empty chunk, XInclude parser flags (William), cleanup
+    FTP and HTTP code to reuse the uri parsing and IPv6 (William),
+    xmlTextWriterStartAttributeNS fix (Rob Richards), XMLLINT_INDENT being
+    empty (William), xmlWriter bugs (Rob Richards), multithreading on Windows
+    (Rich Salz), xmlSearchNsByHref fix (Kasimier), Python binding leak (Brent
+    Hendricks), aliasing bug exposed by gcc4 on s390, xmlTextReaderNext bug
+    (Rob Richards), Schemas decimal type fixes (William Brack),
+    xmlByteConsumed static buffer (Ben Maurer).
+  improvement: speedup parsing comments and DTDs, dictionnary support for
+    hash tables, Schemas Identity constraints (Kasimier), streaming XPath
+    subset, xmlTextReaderReadString added (Bjorn Reese), Schemas canonical
+    values handling (Kasimier), add xmlTextReaderByteConsumed (Aron
+  Stansvik),
   Documentation: Wiki support (Joel Reed)
-
2.6.17: Jan 16 2005
build fixes: Windows, warnings removal (William
-    Brack),maintainer-cleandependency(William), build in a different
-    directory(William), fixing--with-minimum configure build (William), BeOS
-    build(Marcin Konicki),Python-2.4 detection (William), compilation on AIX
-    (DanMcNichol)
-  bug fixes: xmlTextReaderHasAttributes (Rob
-    Richards),xmlCtxtReadFile()to use the catalog(s), loop on output (William
-    Brack),XPath memory leak,ID deallocation problem (Steve Shepard),
-    debugDumpNodecrash (William),warning not using error callback (William),
-    xmlStopParserbug (William),UTF-16 with BOM on DTDs (William), namespace
-    bug on emptyelements inpush mode (Rob Richards), line and col
-    computations fixups(AlekseySanin), xmlURIEscape fix (William),
-    xmlXPathErr on bad range(William),patterns with too many steps, bug in
-    RNG choice optimization,line numbersometimes missing.
-  improvements: XSD Schemas (Kasimier Buchcik), pythongenerator(William),
-    xmlUTF8Strpos speedup (William), unicode Pythonstrings(William), XSD
-    error reports (Kasimier Buchcik), Python __str__callserialize().
-  new APIs: added xmlDictExists(), GetLineNumber and
-    GetColumnNumberforthe xmlReader (Aleksey Sanin), Dynamic Shared Libraries
-    APIs (mostlyJoelReed), error extraction API from regexps, new XMLSave
-    option forformat(Phil Shafer)
-  documentation: site improvement (John Fleck), FAQ entries(William).
-
2.6.16: Nov 10 2004
general hardening and bug fixing crossing all the API based
-    onnewautomated regression testing
+
2.6.17: Jan 16 2005
build fixes: Windows, warnings removal (William Brack),
+    maintainer-clean dependency(William), build in a different directory
+    (William), fixing --with-minimum configure build (William), BeOS build
+    (Marcin Konicki), Python-2.4 detection (William), compilation on AIX (Dan
+    McNichol)
+  bug fixes: xmlTextReaderHasAttributes (Rob Richards), xmlCtxtReadFile()
+    to use the catalog(s), loop on output (William Brack), XPath memory leak,
+    ID deallocation problem (Steve Shepard), debugDumpNode crash (William),
+    warning not using error callback (William), xmlStopParser bug (William),
+    UTF-16 with BOM on DTDs (William), namespace bug on empty elements in
+    push mode (Rob Richards), line and col computations fixups (Aleksey
+    Sanin), xmlURIEscape fix (William), xmlXPathErr on bad range (William),
+    patterns with too many steps, bug in RNG choice optimization, line number
+    sometimes missing.
+  improvements: XSD Schemas (Kasimier Buchcik), python generator
+    (William), xmlUTF8Strpos speedup (William), unicode Python strings
+    (William), XSD error reports (Kasimier Buchcik), Python __str__ call
+    serialize().
+  new APIs: added xmlDictExists(), GetLineNumber and GetColumnNumber for
+    the xmlReader (Aleksey Sanin), Dynamic Shared Libraries APIs (mostly Joel
+    Reed), error extraction API from regexps, new XMLSave option for format
+    (Phil Shafer)
+  documentation: site improvement (John Fleck), FAQ entries
+  (William).
+
2.6.16: Nov 10 2004
general hardening and bug fixing crossing all the API based on new
+    automated regression testing
   build fix: IPv6 build and test on AIX (Dodji Seketeli)
-  bug fixes: problem with XML::Libxml reported by Petr
-    Pajas,encodingconversion functions return values, UTF-8 bug affecting
-    XPathreported byMarkus Bertheau, catalog problem with NULL entries
-    (WilliamBrack)
-  documentation: fix to xmllint man page, some API
-    functiondescritpionwere updated.
-  improvements: DTD validation APIs provided at the Python
-    level(BrentHendricks)
+  bug fixes: problem with XML::Libxml reported by Petr Pajas,  encoding
+    conversion functions return values, UTF-8 bug affecting XPath reported by
+    Markus Bertheau, catalog problem with NULL entries (William Brack)
+  documentation: fix to xmllint man page, some API function descritpion
+    were updated.
+  improvements: DTD validation APIs provided at the Python level (Brent
+    Hendricks)
 
2.6.15: Oct 27 2004
security fixes on the nanoftp and nanohttp modules
-  build fixes: xmllint detection bug in configure, building
-    outsidethesource tree (Thomas Fitzsimmons)
-  bug fixes: HTML parser on broken ASCII chars in names
-    (William),Pythonpaths (Malcolm Tredinnick), xmlHasNsProp and default
-    namespace(William),saving to python file objects (Malcolm Tredinnick),
-    DTD lookupfix(Malcolm), save back <group> in catalogs (William),
-    treebuildfixes (DV and Rob Richards), Schemas memory bug, structured
-    errorhandleron Python 64bits, thread local memory deallocation, memory
-    leakreportedby Volker Roth, xmlValidateDtd in the presence of an
-    internalsubset,entities and _private problem (William),
-    xmlBuildRelativeURIerror(William).
-  improvements: better XInclude error reports (William),
-    treedebuggingmodule and tests, convenience functions at the Reader
-    API(GrahamBennett), add support for PI in the HTML parser.
-
2.6.14: Sep 29 2004
build fixes: configure paths for xmllint and
-    xsltproc,compilationwithout HTML parser, compilation warning cleanups
-    (WilliamBrack &Malcolm Tredinnick), VMS makefile update (Craig
-  Berry),
-  bug fixes: xmlGetUTF8Char (William Brack), QName
-    properties(KasimierBuchcik), XInclude testing, Notation
-    serialization,UTF8ToISO8859xtranscoding (Mark Itzcovitz), lots of XML
-    Schemas cleanupand fixes(Kasimier), ChangeLog cleanup (Stepan Kasal),
-    memory fixes (MarkVakoc),handling of failed realloc(), out of bound array
-    adressing inSchemasdate handling, Python space/tabs cleanups (Malcolm
-    Tredinnick),NMTOKENSE20 validation fix (Malcolm),
-  improvements: added W3C XML Schemas testsuite (Kasimier
-    Buchcik),addxmlSchemaValidateOneElement (Kasimier), Python
-    exceptionhierearchy(Malcolm Tredinnick), Python libxml2 driver
-    improvement(MalcolmTredinnick), Schemas support
-    forxsi:schemaLocation,xsi:noNamespaceSchemaLocation, xsi:type
-    (KasimierBuchcik)
-
2.6.13: Aug 31 2004
build fixes: Windows and zlib (Igor Zlatkovic), -O flag withgcc,Solaris
-    compiler warning, fixing RPM BuildRequires,
-  fixes: DTD loading on Windows (Igor), Schemas error
-    reportsAPIs(Kasimier Buchcik), Schemas validation crash, xmlCheckUTF8
-    (WilliamBrackand Julius Mittenzwei), Schemas facet check (Kasimier),
-    defaultnamespaceproblem (William), Schemas hexbinary empty values,
-    encodingerror couldgenrate a serialization loop.
-  Improvements: Schemas validity improvements (Kasimier), added
-    --pathand--load-trace options to xmllint
+  build fixes: xmllint detection bug in configure, building outside the
+    source tree (Thomas Fitzsimmons)
+  bug fixes: HTML parser on broken ASCII chars in names (William), Python
+    paths (Malcolm Tredinnick), xmlHasNsProp and default namespace (William),
+    saving to python file objects (Malcolm Tredinnick), DTD lookup fix
+    (Malcolm), save back <group> in catalogs (William), tree build
+    fixes (DV and Rob Richards), Schemas memory bug, structured error handler
+    on Python 64bits, thread local memory deallocation, memory leak reported
+    by Volker Roth, xmlValidateDtd in the presence of an internal subset,
+    entities and _private problem (William), xmlBuildRelativeURI error
+    (William).
+  improvements: better XInclude error reports (William), tree debugging
+    module and tests, convenience functions at the Reader API (Graham
+    Bennett), add support for PI in the HTML parser.
+
2.6.14: Sep 29 2004
build fixes: configure paths for xmllint and xsltproc, compilation
+    without HTML parser, compilation warning cleanups (William Brack &
+    Malcolm Tredinnick), VMS makefile update (Craig Berry),
+  bug fixes: xmlGetUTF8Char (William Brack), QName properties (Kasimier
+    Buchcik), XInclude testing, Notation serialization, UTF8ToISO8859x
+    transcoding (Mark Itzcovitz), lots of XML Schemas cleanup and fixes
+    (Kasimier), ChangeLog cleanup (Stepan Kasal), memory fixes (Mark Vakoc),
+    handling of failed realloc(), out of bound array adressing in Schemas
+    date handling, Python space/tabs cleanups (Malcolm Tredinnick), NMTOKENS
+    E20 validation fix (Malcolm),
+  improvements: added W3C XML Schemas testsuite (Kasimier Buchcik), add
+    xmlSchemaValidateOneElement (Kasimier), Python exception hierearchy
+    (Malcolm Tredinnick), Python libxml2 driver improvement (Malcolm
+    Tredinnick), Schemas support for xsi:schemaLocation,
+    xsi:noNamespaceSchemaLocation, xsi:type (Kasimier Buchcik)
+
2.6.13: Aug 31 2004
build fixes: Windows and zlib (Igor Zlatkovic), -O flag with gcc,
+    Solaris compiler warning, fixing RPM BuildRequires,
+  fixes: DTD loading on Windows (Igor), Schemas error reports APIs
+    (Kasimier Buchcik), Schemas validation crash, xmlCheckUTF8 (William Brack
+    and Julius Mittenzwei), Schemas facet check (Kasimier), default namespace
+    problem (William), Schemas hexbinary empty values, encoding error could
+    genrate a serialization loop.
+  Improvements: Schemas validity improvements (Kasimier), added --path
+    and --load-trace options to xmllint
   documentation: tutorial update (John Fleck)
-
2.6.12: Aug 22 2004
build fixes: fix --with-minimum, elfgcchack.h
-    fixes(PeterBreitenlohner), perl path lookup (William), diff on
-    Solaris(AlbertChin), some 64bits cleanups.
-  Python: avoid a warning with 2.3 (William Brack), tab and
-    spacemixes(William), wrapper generator fixes (William), Cygwin support
-    (GerritP.Haase), node wrapper fix (Marc-Antoine Parent), XML
-    Schemassupport(Torkel Lyng)
+
2.6.12: Aug 22 2004
build fixes: fix --with-minimum, elfgcchack.h fixes (Peter
+    Breitenlohner), perl path lookup (William), diff on Solaris (Albert
+    Chin), some 64bits cleanups.
+  Python: avoid a warning with 2.3 (William Brack), tab and space mixes
+    (William), wrapper generator fixes (William), Cygwin support (Gerrit P.
+    Haase), node wrapper fix (Marc-Antoine Parent), XML Schemas support
+    (Torkel Lyng)
   Schemas: a lot of bug fixes and improvements from Kasimier Buchcik
-  fixes: RVT fixes (William), XPath context resets bug
-    (William),memorydebug (Steve Hay), catalog white space handling
-    (PeterBreitenlohner),xmlReader state after attribute reading
-    (William),structured errorhandler (William), XInclude generated xml:base
-    fixup(William), Windowsmemory reallocation problem (Steve Hay), Out of
-    Memoryconditionshandling (William and Olivier Andrieu), htmlNewDoc()
-    charsetbug,htmlReadMemory init (William), a posteriori validation
-    DTDbase(William), notations serialization missing,
-    xmlGetNodePath(Dodji),xmlCheckUTF8 (Diego Tartara), missing line numbers
-    onentity(William)
-  improvements: DocBook catalog build scrip (William),
-    xmlcatalogtool(Albert Chin), xmllint --c14n option, no_proxy environment
-    (MikeHommey),xmlParseInNodeContext() addition, extend xmllint --shell,
-    allowXIncludeto not generate start/end nodes, extend xmllint --version
-    toinclude CVStag (William)
-  documentation: web pages fixes, validity API docs fixes(William)schemas
-    API fix (Eric Haszlakiewicz), xmllint man page (JohnFleck)
-
2.6.11: July 5 2004
Schemas: a lot of changes and improvements by Kasimier
-    Buchcikforattributes, namespaces and simple types.
-  build fixes: --with-minimum (William Brack),  some gcccleanup(William),
-    --with-thread-alloc (William)
-  portability: Windows binary package change (Igor Zlatkovic),Catalogpath
-    on Windows
-  documentation: update to the tutorial (John Fleck), xmllint
-    returncode(John Fleck), man pages (Ville Skytta),
-  bug fixes: C14N bug serializing namespaces (Aleksey
-    Sanin),testSAXproperly initialize the library (William), empty node set
-    inXPath(William), xmlSchemas errors (William), invalid charref
-    problempointedby Morus Walter, XInclude xml:base generation (William),
-    Relax-NGbugwith div processing (William), XPointer and
-    xml:baseproblem(William),Reader and entities, xmllint return code for
-    schemas(William), readerstreaming problem (Steve Ball), DTD
-    serializationproblem (William),libxml.m4 fixes (Mike Hommey), do not
-    providedestructors as methods onPython classes, xmlReader buffer bug,
-    Pythonbindings memory interfacesimprovement (with St�phane Bidoul), Fixed
-    thepush parser to be back tosynchronous behaviour.
-  improvement: custom per-thread I/O enhancement (Rob
-    Richards),registernamespace in debug shell (Stefano Debenedetti), Python
-    basedregressiontest for non-Unix users (William), dynamically increase
-    thenumber ofXPath extension functions in Python and fix a memory
-    leak(Marc-AntoineParent and William)
-  performance: hack done with Arjan van de Ven to reduce ELF
-    footprintandgenerated code on Linux, plus use gcc runtime profiling to
-    optimizethecode generated in the RPM packages.
+  fixes: RVT fixes (William), XPath context resets bug (William), memory
+    debug (Steve Hay), catalog white space handling (Peter Breitenlohner),
+    xmlReader state after attribute reading (William), structured error
+    handler (William), XInclude generated xml:base fixup (William), Windows
+    memory reallocation problem (Steve Hay), Out of Memory conditions
+    handling (William and Olivier Andrieu), htmlNewDoc() charset bug,
+    htmlReadMemory init (William), a posteriori validation DTD base
+    (William), notations serialization missing, xmlGetNodePath (Dodji),
+    xmlCheckUTF8 (Diego Tartara), missing line numbers on entity
+  (William)
+  improvements: DocBook catalog build scrip (William), xmlcatalog tool
+    (Albert Chin), xmllint --c14n option, no_proxy environment (Mike Hommey),
+    xmlParseInNodeContext() addition, extend xmllint --shell, allow XInclude
+    to not generate start/end nodes, extend xmllint --version to include CVS
+    tag (William)
+  documentation: web pages fixes, validity API docs fixes (William)
+    schemas API fix (Eric Haszlakiewicz), xmllint man page (John Fleck)
+
2.6.11: July 5 2004
Schemas: a lot of changes and improvements by Kasimier Buchcik for
+    attributes, namespaces and simple types.
+  build fixes: --with-minimum (William Brack),  some gcc cleanup
+    (William), --with-thread-alloc (William)
+  portability: Windows binary package change (Igor Zlatkovic), Catalog
+    path on Windows
+  documentation: update to the tutorial (John Fleck), xmllint return code
+    (John Fleck), man pages (Ville Skytta),
+  bug fixes: C14N bug serializing namespaces (Aleksey Sanin), testSAX
+    properly initialize the library (William), empty node set in XPath
+    (William), xmlSchemas errors (William), invalid charref problem pointed
+    by Morus Walter, XInclude xml:base generation (William), Relax-NG bug
+    with div processing (William), XPointer and xml:base problem(William),
+    Reader and entities, xmllint return code for schemas (William), reader
+    streaming problem (Steve Ball), DTD serialization problem (William),
+    libxml.m4 fixes (Mike Hommey), do not provide destructors as methods on
+    Python classes, xmlReader buffer bug, Python bindings memory interfaces
+    improvement (with St�phane Bidoul), Fixed the push parser to be back to
+    synchronous behaviour.
+  improvement: custom per-thread I/O enhancement (Rob Richards), register
+    namespace in debug shell (Stefano Debenedetti), Python based regression
+    test for non-Unix users (William), dynamically increase the number of
+    XPath extension functions in Python and fix a memory leak (Marc-Antoine
+    Parent and William)
+  performance: hack done with Arjan van de Ven to reduce ELF footprint
+    and generated code on Linux, plus use gcc runtime profiling to optimize
+    the code generated in the RPM packages.
 
2.6.10: May 17 2004
Web page generated for ChangeLog
   build fixes: --without-html problems, make check without make all
-  portability: problem with xpath.c on Windows (MSC and
-    Borland),memcmpvs. strncmp on Solaris, XPath tests on Windows (Mark
-    Vakoc), C++ donotuse "list" as parameter name, make tests work with
-    Python 1.5(EdDavis),
-  improvements: made xmlTextReaderMode public, small
-    buffersresizing(Morten Welinder), add --maxmem option to
-    xmllint,addxmlPopInputCallback() for Matt Sergeant, refactoring
-    ofserializationescaping, added escaping customization
-  bugfixes: xsd:extension (Taihei Goi), assorted regexp
-    bugs(WilliamBrack), xmlReader end of stream problem, node deregistration
-    withreader,URI escaping and filemanes,  XHTML1 formatting (Nick
-    Wellnhofer),regexptransition reduction (William), various XSD Schemas
-    fixes(KasimierBuchcik), XInclude fallback problem (William), weird
-    problemswith DTD(William), structured error handler callback context
-    (William),reversexmlEncodeSpecialChars() behaviour back to escaping
-  '"'
+  portability: problem with xpath.c on Windows (MSC and Borland), memcmp
+    vs. strncmp on Solaris, XPath tests on Windows (Mark Vakoc), C++ do not
+    use "list" as parameter name, make tests work with Python 1.5 (Ed
+  Davis),
+  improvements: made xmlTextReaderMode public, small buffers resizing
+    (Morten Welinder), add --maxmem option to xmllint, add
+    xmlPopInputCallback() for Matt Sergeant, refactoring of serialization
+    escaping, added escaping customization
+  bugfixes: xsd:extension (Taihei Goi), assorted regexp bugs (William
+    Brack), xmlReader end of stream problem, node deregistration with reader,
+    URI escaping and filemanes,  XHTML1 formatting (Nick Wellnhofer), regexp
+    transition reduction (William), various XSD Schemas fixes (Kasimier
+    Buchcik), XInclude fallback problem (William), weird problems with DTD
+    (William), structured error handler callback context (William), reverse
+    xmlEncodeSpecialChars() behaviour back to escaping '"'
 
2.6.9: Apr 18 2004
implement xml:id Working Draft, relaxed XPath id() checking
-  bugfixes: xmlCtxtReset (Brent Hendricks), line number and
-    CDATA(DaveBeckett), Relax-NG compilation (William Brack), Regexp
-    patches(withWilliam), xmlUriEscape (Mark Vakoc), a Relax-NG notAllowed
-    problem(withWilliam), Relax-NG name classes compares (William),
-    XIncludeduplicatefallback (William), external DTD encoding detection
-    (William), aDTDvalidation bug (William), xmlReader Close() fix,
-    recusiveextentionschemas
-  improvements: use xmlRead* APIs in test tools (Mark
-    Vakoc),indentingsave optimization, better handle IIS broken HTTP
-    redirectbehaviour (IanHummel), HTML parser frameset (James Bursa),
-    libxml2-pythonRPMdependancy, XML Schemas union support (Kasimier
-    Buchcik), warningremovalclanup (William), keep ChangeLog compressed when
-    installing fromRPMs
-  documentation: examples and xmlDocDumpMemory docs (John
-    Fleck),newexample (load, xpath, modify, save), xmlCatalogDump()
-  comments,
-  Windows: Borland C++ builder (Eric Zurcher), work
-    aroundMicrosoftcompiler NaN handling bug (Mark Vakoc)
+  bugfixes: xmlCtxtReset (Brent Hendricks), line number and CDATA (Dave
+    Beckett), Relax-NG compilation (William Brack), Regexp patches (with
+    William), xmlUriEscape (Mark Vakoc), a Relax-NG notAllowed problem (with
+    William), Relax-NG name classes compares (William), XInclude duplicate
+    fallback (William), external DTD encoding detection (William), a DTD
+    validation bug (William), xmlReader Close() fix, recusive extention
+    schemas
+  improvements: use xmlRead* APIs in test tools (Mark Vakoc), indenting
+    save optimization, better handle IIS broken HTTP redirect  behaviour (Ian
+    Hummel), HTML parser frameset (James Bursa), libxml2-python RPM
+    dependancy, XML Schemas union support (Kasimier Buchcik), warning removal
+    clanup (William), keep ChangeLog compressed when installing from RPMs
+  documentation: examples and xmlDocDumpMemory docs (John Fleck), new
+    example (load, xpath, modify, save), xmlCatalogDump() comments,
+  Windows: Borland C++ builder (Eric Zurcher), work around Microsoft
+    compiler NaN handling bug (Mark Vakoc)
 
2.6.8: Mar 23 2004
First step of the cleanup of the serialization code and APIs
-  XML Schemas: mixed content (Adam Dickmeiss), QName handling
-    fixes(AdamDickmeiss), anyURI for "" (John Belmonte)
+  XML Schemas: mixed content (Adam Dickmeiss), QName handling fixes (Adam
+    Dickmeiss), anyURI for "" (John Belmonte)
   Python: Canonicalization C14N support added (Anthony Carrico)
   xmlDocCopyNode() extension (William)
-  Relax-NG: fix when processing XInclude results
-    (William),externalreference in interleave (William), missing error
-    on<choice>failure (William), memory leak in schemas
-  datatypefacets.
+  Relax-NG: fix when processing XInclude results (William), external
+    reference in interleave (William), missing error on <choice>
+    failure (William), memory leak in schemas datatype facets.
   xmlWriter: patch for better DTD support (Alfred Mickautsch)
-  bug fixes: xmlXPathLangFunction memory leak (Mike Hommey
-    andWilliamBrack), no ID errors if using HTML_PARSE_NOERROR,
-    xmlcatalogfallbacks toURI on SYSTEM lookup failure, XInclude parse
-    flagsinheritance (William),XInclude and XPointer fixes for entities
-    (William),XML parser bugreported by Holger Rauch, nanohttp fd leak
-    (William),regexps chargroups '-' handling (William), dictionnary
-    reference countingproblems,do not close stderr.
+  bug fixes: xmlXPathLangFunction memory leak (Mike Hommey and William
+    Brack), no ID errors if using HTML_PARSE_NOERROR, xmlcatalog fallbacks to
+    URI on SYSTEM lookup failure, XInclude parse flags inheritance (William),
+    XInclude and XPointer fixes for entities (William), XML parser bug
+    reported by Holger Rauch, nanohttp fd leak (William),  regexps char
+    groups '-' handling (William), dictionnary reference counting problems,
+    do not close stderr.
   performance patches from Petr Pajas
   Documentation fixes: XML_CATALOG_FILES in man pages (Mike Hommey)
-  compilation and portability fixes: --without-valid,
-    catalogcleanups(Peter Breitenlohner), MingW patch (Roland
-    Schwingel),cross-compilationto Windows (Christophe de Vienne), 
-    --with-html-dirfixup (Julio MerinoVidal), Windows build (Eric
-  Zurcher)
+  compilation and portability fixes: --without-valid, catalog cleanups
+    (Peter Breitenlohner), MingW patch (Roland Schwingel), cross-compilation
+    to Windows (Christophe de Vienne),  --with-html-dir fixup (Julio Merino
+    Vidal), Windows build (Eric Zurcher)
 
2.6.7: Feb 23 2004
documentation: tutorial updates (John Fleck), benchmark results
   xmlWriter: updates and fixes (Alfred Mickautsch, Lucas Brasilino)
   XPath optimization (Petr Pajas)
   DTD ID handling optimization
-  bugfixes: xpath number with  > 19 fractional (William
-    Brack),pushmode with unescaped '>' characters, fix xmllint --stream
-    --timing,fixxmllint --memory --stream memory
-    usage,xmlAttrSerializeTxtContenthandling NULL, trying to fix
-    Relax-NG/Perlinterface.
+  bugfixes: xpath number with  > 19 fractional (William Brack), push
+    mode with unescaped '>' characters, fix xmllint --stream --timing, fix
+    xmllint --memory --stream memory usage, xmlAttrSerializeTxtContent
+    handling NULL, trying to fix Relax-NG/Perl interface.
   python: 2.3 compatibility, whitespace fixes (Malcolm Tredinnick)
   Added relaxng option to xmllint --shell
-
2.6.6: Feb 12 2004
nanohttp and nanoftp: buffer overflow error on URI parsing
-    (IgorandWilliam) reported by Yuuichi Teranishi
-  bugfixes: make test and path issues, xmlWriter
-    attributeserialization(William Brack), xmlWriter indentation (William),
-    schemasvalidation(Eric Haszlakiewicz), XInclude dictionnaries issues
-    (Williamand OlegParaschenko), XInclude empty fallback (William), HTML
-    warnings(William),XPointer in XInclude (William), Python
-    namespaceserialization,isolat1ToUTF8 bound error (Alfred Mickautsch),
-    output ofparameterentities in internal subset (William), internal subset
-    bug inpush mode,<xs:all> fix (Alexey Sarytchev)
-  Build: fix for automake-1.8 (Alexander Winston), warningsremoval(Philip
-    Ludlam), SOCKLEN_T detection fixes (Daniel Richard),fix--with-minimum
-    configuration.
+
2.6.6: Feb 12 2004
nanohttp and nanoftp: buffer overflow error on URI parsing (Igor and
+    William) reported by Yuuichi Teranishi
+  bugfixes: make test and path issues, xmlWriter attribute serialization
+    (William Brack), xmlWriter indentation (William), schemas validation
+    (Eric Haszlakiewicz), XInclude dictionnaries issues (William and Oleg
+    Paraschenko), XInclude empty fallback (William), HTML warnings (William),
+    XPointer in XInclude (William), Python namespace serialization,
+    isolat1ToUTF8 bound error (Alfred Mickautsch), output of parameter
+    entities in internal subset (William), internal subset bug in push mode,
+    <xs:all> fix (Alexey Sarytchev)
+  Build: fix for automake-1.8 (Alexander Winston), warnings removal
+    (Philip Ludlam), SOCKLEN_T detection fixes (Daniel Richard), fix
+    --with-minimum configuration.
   XInclude: allow the 2001 namespace without warning.
-  Documentation: missing example/index.html (John
-    Fleck),versiondependancies (John Fleck)
+  Documentation: missing example/index.html (John Fleck), version
+    dependancies (John Fleck)
   reader API: structured error reporting (Steve Ball)
-  Windows compilation: mingw, msys (Mikhail
-    Grushinskiy),functionprototype (Cameron Johnson), MSVC6 compiler
-    warnings,_WINSOCKAPI_patch
-  Parsers: added xmlByteConsumed(ctxt) API to get the byte
-  offestininput.
-
2.6.5: Jan 25 2004
Bugfixes: dictionnaries for schemas (William Brack),
-    regexpsegfault(William), xs:all problem (William), a number of
-    XPointerbugfixes(William), xmllint error go to stderr, DTD validation
-    problemwithnamespace, memory leak (William), SAX1 cleanup and minimal
-    optionsfixes(Mark Vadoc), parser context reset on error (Shaun McCance),
-    XPathunionevaluation problem (William) , xmlReallocLoc with NULL
-    (AlekseySanin),XML Schemas double free (Steve Ball), XInclude with no
-    href,argumentcallbacks order for XPath callbacks (Frederic Peters)
-  Documentation: python scripts (William Brack), xslt
-    stylesheets(JohnFleck), doc (Sven Zimmerman), I/O example.
-  Python bindings: fixes (William), enum support
-    (St�phaneBidoul),structured error reporting (St�phane Bidoul)
-  XInclude: various fixes for conformance, problem related
-    todictionnaryreferences (William & me), recursion (William)
-  xmlWriter: indentation (Lucas Brasilino), memory
-    leaks(AlfredMickautsch),
+  Windows compilation: mingw, msys (Mikhail Grushinskiy), function
+    prototype (Cameron Johnson), MSVC6 compiler warnings, _WINSOCKAPI_
+  patch
+  Parsers: added xmlByteConsumed(ctxt) API to get the byte offest in
+    input.
+
2.6.5: Jan 25 2004
Bugfixes: dictionnaries for schemas (William Brack), regexp segfault
+    (William), xs:all problem (William), a number of XPointer bugfixes
+    (William), xmllint error go to stderr, DTD validation problem with
+    namespace, memory leak (William), SAX1 cleanup and minimal options fixes
+    (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union
+    evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin),
+    XML Schemas double free (Steve Ball), XInclude with no href, argument
+    callbacks order for XPath callbacks (Frederic Peters)
+  Documentation: python scripts (William Brack), xslt stylesheets (John
+    Fleck), doc (Sven Zimmerman), I/O example.
+  Python bindings: fixes (William), enum support (St�phane Bidoul),
+    structured error reporting (St�phane Bidoul)
+  XInclude: various fixes for conformance, problem related to dictionnary
+    references (William & me), recursion (William)
+  xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
+    Mickautsch),
   xmlSchemas: normalizedString datatype (John Belmonte)
   code cleanup for strings functions (William)
   Windows: compiler patches (Mark Vakoc)
-  Parser optimizations, a few new XPath and dictionnary APIs
-    forfutureXSLT optimizations.
+  Parser optimizations, a few new XPath and dictionnary APIs for future
+    XSLT optimizations.
 
2.6.4: Dec 24 2003
Windows build fixes (Igor Zlatkovic)
   Some serious XInclude problems reported by Oleg Paraschenko and
   Unix and Makefile packaging fixes (me, William Brack,
-  Documentation improvements (John Fleck, William Brack),
-    examplefix(Lucas Brasilino)
-  bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath
-    handlingofNULL strings (William Brack) , API building reader or
-    parserfromfiledescriptor should not close it, changed XPath sorting to
-    bestableagain (William Brack), xmlGetNodePath() generating
-    '(null)'(WilliamBrack), DTD validation and namespace bug (William Brack),
-    XMLSchemasdouble inclusion behaviour
+  Documentation improvements (John Fleck, William Brack), example fix
+    (Lucas Brasilino)
+  bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
+    NULL strings (William Brack) , API building reader or parser from
+    filedescriptor should not close it, changed XPath sorting to be stable
+    again (William Brack), xmlGetNodePath() generating '(null)' (William
+    Brack), DTD validation and namespace bug (William Brack), XML Schemas
+    double inclusion behaviour
 
2.6.3: Dec 10 2003
documentation updates and cleanup (DV, William Brack, John Fleck)
-  added a repository of examples, examples from Aleksey
-    Sanin,DodjiSeketeli, Alfred Mickautsch
-  Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher,Mingw(Kenneth
-    Haley)
+  added a repository of examples, examples from Aleksey Sanin, Dodji
+    Seketeli, Alfred Mickautsch
+  Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher, Mingw
+    (Kenneth Haley)
   Unicode range checking (William Brack)
   code cleanup (William Brack)
   Python bindings: doc (John Fleck),  bug fixes
   UTF-16 cleanup and BOM issues (William Brack)
-  bug fixes: ID and xmlReader validation, XPath (William
-    Brack),xmlWriter(Alfred Mickautsch), hash.h inclusion problem, HTML
-    parser(James Bursa),attribute defaulting and validation, some
-    serializationcleanups,XML_GET_LINE macro, memory debug when using threads
-    (WilliamBrack),serialization of attributes and entities content,
-    xmlWriter(DanielSchulman)
-  XInclude bugfix, new APIs and update to the last version
-    includingthenamespace change.
-  XML Schemas improvements: include (Robert Stepanek), importandnamespace
-    handling, fixed the regression tests troubles, addedexamplesbased on Eric
-    van der Vlist book, regexp fixes
-  preliminary pattern support for streaming (needed
-    forschemasconstraints), added xmlTextReaderPreservePattern() to
-    collectsubdocumentwhen streaming.
+  bug fixes: ID and xmlReader validation, XPath (William Brack),
+    xmlWriter (Alfred Mickautsch), hash.h inclusion problem, HTML parser
+    (James Bursa), attribute defaulting and validation, some serialization
+    cleanups, XML_GET_LINE macro, memory debug when using threads (William
+    Brack), serialization of attributes and entities content, xmlWriter
+    (Daniel Schulman)
+  XInclude bugfix, new APIs and update to the last version including the
+    namespace change.
+  XML Schemas improvements: include (Robert Stepanek), import and
+    namespace handling, fixed the regression tests troubles, added examples
+    based on Eric van der Vlist book, regexp fixes
+  preliminary pattern support for streaming (needed for schemas
+    constraints), added xmlTextReaderPreservePattern() to collect subdocument
+    when streaming.
   various fixes in the structured error handling
 
2.6.2: Nov 4 2003
XPath context unregistration fixes
   text node coalescing fixes (Mark Lilback)
@@ -501,118 +542,117 @@ base.
There is the list of public releases:
2.6.26: Jun 6 2006
   a posteriori DTD validation fixes
   xmlReader bug fixes: Walker fixes, python bindings
   fixed xmlStopParser() to really stop the parser and errors
-  always generate line numbers when using the new xmlReadxxxfunctions
+  always generate line numbers when using the new xmlReadxxx
+  functions
   added XInclude support to the xmlReader interface
   implemented XML_PARSE_NONET parser option
   DocBook XSLT processing bug fixed
   HTML serialization for <p> elements (William Brack and me)
   XPointer failure in XInclude are now handled as resource errors
-  fixed xmllint --html to use the HTML serializer on output(added--xmlout
-    to implement the previous behaviour of saving it using
-  theXMLserializer)
+  fixed xmllint --html to use the HTML serializer on output (added
+    --xmlout to implement the previous behaviour of saving it using the XML
+    serializer)
 
2.6.1: Oct 28 2003
Mostly bugfixes after the big 2.6.0 changes
-  Unix compilation patches: libxml.m4 (Patrick Welche),
-    warningscleanup(William Brack)
-  Windows compilation patches (Joachim Bauch, Stephane
-    Bidoul,IgorZlatkovic)
+  Unix compilation patches: libxml.m4 (Patrick Welche), warnings cleanup
+    (William Brack)
+  Windows compilation patches (Joachim Bauch, Stephane Bidoul, Igor
+    Zlatkovic)
   xmlWriter bugfix (Alfred Mickautsch)
   chvalid.[ch]: couple of fixes from Stephane Bidoul
-  context reset: error state reset, push parser reset (GrahamBennett)
+  context reset: error state reset, push parser reset (Graham
+  Bennett)
   context reuse: generate errors if file is not readable
-  defaulted attributes for element coming from internal
-    entities(StephaneBidoul)
+  defaulted attributes for element coming from internal entities
+    (Stephane Bidoul)
   Python: tab and spaces mix (William Brack)
   Error handler could crash in DTD validation in 2.6.0
   xmlReader: do not use the document or element _private field
   testSAX.c: avoid a problem with some PIs (Massimo Morara)
-  general bug fixes: mandatory encoding in text decl,
-    serializingDocumentFragment nodes, xmlSearchNs 2.6.0 problem (Kasimier
-    Buchcik),XPath errorsnot reported,  slow HTML parsing of large
-  documents.
-
2.6.0: Oct 20 2003
Major revision release: should be API and ABI compatible but got alotof
-    change
-  Increased the library modularity, far more options can be strippedout,a
-    --with-minimum configuration will weight around 160KBytes
-  Use per parser and per document dictionnary, allocate names
-    andsmalltext nodes from the dictionnary
-  Switch to a SAX2 like parser rewrote most of the XML
-    parsercore,provides namespace resolution and defaulted attributes,
-    minimizememoryallocations and copies, namespace checking and specific
-    errorhandling,immutable buffers, make predefined entities static
-    structures,etc...
-  rewrote all the error handling in the library, all errors
-    canbeintercepted at a structured level, with
-  preciseinformationavailable.
-  New simpler and more generic XML and HTML parser APIs,
-    allowingtoeasilly modify the parsing options and reuse parser context
-    formultipleconsecutive documents.
-  Similar new APIs for the xmlReader, for options and reuse,
-    providednewfunctions to access content as const strings, use them
-    forPythonbindings
-  a  lot of other smaller API improvements: xmlStrPrintf
-    (AlekseySanin),Walker i.e. reader on a document tree based on Alfred
-    Mickautschcode,make room in nodes for line numbers, reference counting
-    and futurePSVIextensions, generation of character ranges to be checked
-    withfasteralgorithm (William),  xmlParserMaxDepth (Crutcher
-    Dunnavant),bufferaccess
+  general bug fixes: mandatory encoding in text decl, serializing
+    Document Fragment nodes, xmlSearchNs 2.6.0 problem (Kasimier Buchcik),
+    XPath errors not reported,  slow HTML parsing of large documents.
+
2.6.0: Oct 20 2003
Major revision release: should be API and ABI compatible but got a lot
+    of change
+  Increased the library modularity, far more options can be stripped out,
+    a --with-minimum configuration will weight around 160KBytes
+  Use per parser and per document dictionnary, allocate names and small
+    text nodes from the dictionnary
+  Switch to a SAX2 like parser rewrote most of the XML parser core,
+    provides namespace resolution and defaulted attributes, minimize memory
+    allocations and copies, namespace checking and specific error handling,
+    immutable buffers, make predefined entities static structures, etc...
+  rewrote all the error handling in the library, all errors can be
+    intercepted at a structured level, with precise information
+  available.
+  New simpler and more generic XML and HTML parser APIs, allowing to
+    easilly modify the parsing options and reuse parser context for multiple
+    consecutive documents.
+  Similar new APIs for the xmlReader, for options and reuse, provided new
+    functions to access content as const strings, use them for Python
+  bindings
+  a  lot of other smaller API improvements: xmlStrPrintf (Aleksey Sanin),
+    Walker i.e. reader on a document tree based on Alfred Mickautsch code,
+    make room in nodes for line numbers, reference counting and future PSVI
+    extensions, generation of character ranges to be checked with faster
+    algorithm (William),  xmlParserMaxDepth (Crutcher Dunnavant), buffer
+    access
   New xmlWriter API provided by Alfred Mickautsch
   Schemas: base64 support by Anthony Carrico
-  Parser<->HTTP integration fix, proper processing of
-    theMime-Typeand charset informations if available.
-  Relax-NG: bug fixes including the one reported by Martijn
-    FaassenandzeroOrMore, better error reporting.
-  Python bindings (St�phane Bidoul), never use stdout forerrorsoutput
-  Portability: all the headers have macros for export
-    andcallingconvention definitions (Igor Zlatkovic), VMS update (Craig
-    A.Berry),Windows: threads (Jesse Pelton), Borland compiler (Eric
-    Zurcher,Igor),Mingw (Igor), typos (Mark Vakoc),  beta version
-    (StephaneBidoul),warning cleanups on AIX and MIPS compilers (William
-    Brack), BeOS(Marcin'Shard' Konicki)
-  Documentation fixes and README (William Brack), search
-    fix(William),tutorial updates (John Fleck), namespace docs (Stefan
-  Kost)
-  Bug fixes: xmlCleanupParser (Dave Beckett),
-    threadinguninitializedmutexes, HTML doctype lowercase,  SAX/IO
-    (William),compression detectionand restore (William), attribute
-    declaration in DTDs(William), namespaceon attribute in HTML output
-    (William), input filename(Rob Richards),namespace DTD validation,
-    xmlReplaceNode (Chris Ryland),I/O callbacks(Markus Keim), CDATA
-    serialization (Shaun McCance),xmlReader (PeterDerr), high codepoint
-    charref like &#x10FFFF;, bufferaccess in pushmode (Justin Fletcher),
-    TLS threads on Windows (JessePelton), XPath bug(William),
-    xmlCleanupParser (Marc Liyanage), CDATAoutput (William), HTTPerror
-    handling.
-  xmllint options: --dtdvalidfpi for Tobias Reif, --sax1
-    forcompattesting,  --nodict for building without tree dictionnary,
-    --nocdatatoreplace CDATA by text, --nsclean to remove
-    surperfluousnamespacedeclarations
+  Parser<->HTTP integration fix, proper processing of the Mime-Type
+    and charset informations if available.
+  Relax-NG: bug fixes including the one reported by Martijn Faassen and
+    zeroOrMore, better error reporting.
+  Python bindings (St�phane Bidoul), never use stdout for errors
+  output
+  Portability: all the headers have macros for export and calling
+    convention definitions (Igor Zlatkovic), VMS update (Craig A. Berry),
+    Windows: threads (Jesse Pelton), Borland compiler (Eric Zurcher,  Igor),
+    Mingw (Igor), typos (Mark Vakoc),  beta version (Stephane Bidoul),
+    warning cleanups on AIX and MIPS compilers (William Brack), BeOS (Marcin
+    'Shard' Konicki)
+  Documentation fixes and README (William Brack), search fix (William),
+    tutorial updates (John Fleck), namespace docs (Stefan Kost)
+  Bug fixes: xmlCleanupParser (Dave Beckett), threading uninitialized
+    mutexes, HTML doctype lowercase,  SAX/IO (William), compression detection
+    and restore (William), attribute declaration in DTDs (William), namespace
+    on attribute in HTML output (William), input filename (Rob Richards),
+    namespace DTD validation, xmlReplaceNode (Chris Ryland), I/O callbacks
+    (Markus Keim), CDATA serialization (Shaun McCance), xmlReader (Peter
+    Derr), high codepoint charref like &#x10FFFF;, buffer access in push
+    mode (Justin Fletcher), TLS threads on Windows (Jesse Pelton), XPath bug
+    (William), xmlCleanupParser (Marc Liyanage), CDATA output (William), HTTP
+    error handling.
+  xmllint options: --dtdvalidfpi for Tobias Reif, --sax1 for compat
+    testing,  --nodict for building without tree dictionnary, --nocdata to
+    replace CDATA by text, --nsclean to remove surperfluous  namespace
+    declarations
   added xml2-config --libtool-libs option from Kevin P. Fleming
-  a lot of profiling and tuning of the code, speedup
-    patchforxmlSearchNs() by Luca Padovani. The xmlReader should do
-    farlessallocation and it speed should get closer to SAX. Chris
-    Andersonworkedon speeding and cleaning up repetitive checking code.
+  a lot of profiling and tuning of the code, speedup patch for
+    xmlSearchNs() by Luca Padovani. The xmlReader should do far less
+    allocation and it speed should get closer to SAX. Chris Anderson worked
+    on speeding and cleaning up repetitive checking code.
   cleanup of "make tests"
   libxml-2.0-uninstalled.pc from Malcolm Tredinnick
-  deactivated the broken docBook SGML parser code and plugged
-    theXMLparser instead.
+  deactivated the broken docBook SGML parser code and plugged the XML
+    parser instead.
 
2.5.11: Sep 9 2003
A bugfix only release:
risk of crash in Relax-NG
   risk of crash when using multithreaded programs
 
2.5.10: Aug 15 2003
A bugfixes only release
Windows Makefiles (William Brack)
   UTF-16 support fixes (Mark Itzcovitz)
-  Makefile and portability (William Brack) automake, Linux alpha,
-    MingwonWindows (Mikhail Grushinskiy)
+  Makefile and portability (William Brack) automake, Linux alpha, Mingw
+    on Windows (Mikhail Grushinskiy)
   HTML parser (Oliver Stoeneberg)
   XInclude performance problem reported by Kevin Ruscoe
   XML parser performance problem reported by Grant Goodale
   xmlSAXParseDTD() bug fix from Malcolm Tredinnick
   and a couple other cleanup
-
2.5.9: Aug 9 2003
bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim),
-    Windowsbuild(Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter
-    Sobisch),threading(Rob Richards), hexBinary type (), UTF-16 BOM
-    (DodjiSeketeli),xmlReader, Relax-NG schemas compilation, namespace
-    handling,EXSLT (SeanGriffin), HTML parsing problem (William Brack), DTD
-    validationfor mixedcontent + namespaces, HTML serialization,
-    libraryinitialization,progressive HTML parser
+
2.5.9: Aug 9 2003
bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), Windows build
+    (Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter Sobisch), threading
+    (Rob Richards), hexBinary type (), UTF-16 BOM (Dodji Seketeli),
+    xmlReader, Relax-NG schemas compilation, namespace handling,  EXSLT (Sean
+    Griffin), HTML parsing problem (William Brack), DTD validation for mixed
+    content + namespaces, HTML serialization, library initialization,
+    progressive HTML parser
   better interfaces for Relax-NG error handling (Joachim Bauch, )
   adding xmlXIncludeProcessTree() for XInclud'ing in a subtree
   doc fixes and improvements (John Fleck)
@@ -620,121 +660,122 @@ base.
There is the list of public releases:
2.6.26: Jun 6 2006
   couple of new UTF-8 helper functions (William Brack)
   general encoding cleanup + ISO-8859-x without iconv (Peter Jacobi)
   xmlTextReader cleanup + enum for node types (Bjorn Reese)
-  general compilation/warning cleanup Solaris/HP-UX/...(WilliamBrack)
-
2.5.8: Jul 6 2003
bugfixes: XPath, XInclude, file/URI mapping, UTF-16
-    save(MarkItzcovitz), UTF-8 checking, URI saving, error printing
-    (WilliamBrack),PI related memleak, compilation without schemas or without
-    xpath(JoergSchmitz-Linneweber/Garry Pennington), xmlUnlinkNode problem
-    withDTDs,rpm problem on , i86_64, removed a few compilation problems
-    from2.5.7,xmlIOParseDTD, and xmlSAXParseDTD (Malcolm Tredinnick)
+  general compilation/warning cleanup Solaris/HP-UX/... (William
+  Brack)
+
2.5.8: Jul 6 2003
bugfixes: XPath, XInclude, file/URI mapping, UTF-16 save (Mark
+    Itzcovitz), UTF-8 checking, URI saving, error printing (William Brack),
+    PI related memleak, compilation without schemas or without xpath (Joerg
+    Schmitz-Linneweber/Garry Pennington), xmlUnlinkNode problem with DTDs,
+    rpm problem on , i86_64, removed a few compilation problems from 2.5.7,
+    xmlIOParseDTD, and xmlSAXParseDTD (Malcolm Tredinnick)
   portability: DJGPP (MsDos) , OpenVMS (Craig A. Berry)
   William Brack fixed multithreading lock problems
   IPv6 patch for FTP and HTTP accesses (Archana Shah/Wipro)
-  Windows fixes (Igor Zlatkovic,  Eric Zurcher),
-  threading(St�phaneBidoul)
+  Windows fixes (Igor Zlatkovic,  Eric Zurcher), threading (St�phane
+    Bidoul)
   A few W3C Schemas Structure improvements
   W3C Schemas Datatype improvements (Charlie Bozeman)
-  Python bindings for thread globals (St�phane Bidoul),
-    andmethod/classgenerator
+  Python bindings for thread globals (St�phane Bidoul), and method/class
+    generator
   added --nonet option to xmllint
   documentation improvements (John Fleck)
-
2.5.7: Apr 25 2003
Relax-NG: Compiling to regexp and streaming validation on top
-    ofthexmlReader interface, added to xmllint --stream
+
2.5.7: Apr 25 2003
Relax-NG: Compiling to regexp and streaming validation on top of the
+    xmlReader interface, added to xmllint --stream
   xmlReader: Expand(), Next() and DOM access glue, bug fixes
   Support for large files: RGN validated a 4.5GB instance
   Thread support is now configured in by default
-  Fixes: update of the Trio code (Bjorn), WXS Date and
-    Durationfixes(Charles Bozeman), DTD and namespaces (Brent Hendricks),
-    HTML pushparserand zero bytes handling, some missing Windows file
-    pathconversions,behaviour of the parser and validator in the presence of
-    "outof memory"error conditions
-  extended the API to be able to plug a garbage
-    collectingmemoryallocator, added xmlMallocAtomic() and modified
-    theallocationsaccordingly.
-  Performances: removed excessive malloc() calls, speedup of the
-    pushandxmlReader interfaces, removed excessive thread locking
+  Fixes: update of the Trio code (Bjorn), WXS Date and Duration fixes
+    (Charles Bozeman), DTD and namespaces (Brent Hendricks), HTML push parser
+    and zero bytes handling, some missing Windows file path conversions,
+    behaviour of the parser and validator in the presence of "out of memory"
+    error conditions
+  extended the API to be able to plug a garbage collecting memory
+    allocator, added xmlMallocAtomic() and modified the allocations
+    accordingly.
+  Performances: removed excessive malloc() calls, speedup of the push and
+    xmlReader interfaces, removed excessive thread locking
   Documentation: man page (John Fleck), xmlReader documentation
   Python: adding binding for xmlCatalogAddLocal (Brent M Hendricks)
-
2.5.6: Apr 1 2003
Fixed W3C XML Schemas datatype, should be compliant now exceptforbinHex
-    and base64 which are not supported yet.
-  bug fixes: non-ASCII IDs, HTML output, XInclude on large
-    docsandXInclude entities handling, encoding detection on external
-    subsets,XMLSchemas bugs and memory leaks, HTML parser (James Bursa)
+
2.5.6: Apr 1 2003
Fixed W3C XML Schemas datatype, should be compliant now except for
+    binHex and base64 which are not supported yet.
+  bug fixes: non-ASCII IDs, HTML output, XInclude on large docs and
+    XInclude entities handling, encoding detection on external subsets, XML
+    Schemas bugs and memory leaks, HTML parser (James Bursa)
   portability: python/trio (Albert Chin), Sun compiler warnings
   documentation: added --relaxng option to xmllint man page (John)
-  improved error reporting: xml:space, start/end tag mismatches,
-    RelaxNGerrors
-
2.5.5: Mar 24 2003
Lot of fixes on the Relax NG implementation. More
-    testingincludingDocBook and TEI examples.
+  improved error reporting: xml:space, start/end tag mismatches, Relax NG
+    errors
+
2.5.5: Mar 24 2003
Lot of fixes on the Relax NG implementation. More testing including
+    DocBook and TEI examples.
   Increased the support for W3C XML Schemas datatype
   Several bug fixes in the URI handling layer
-  Bug fixes: HTML parser, xmlReader, DTD validation,
-    XPath,encodingconversion, line counting in the parser.
+  Bug fixes: HTML parser, xmlReader, DTD validation, XPath, encoding
+    conversion, line counting in the parser.
   Added support for $XMLLINT_INDENT environment variable, FTP delete
   Fixed the RPM spec file name
-
2.5.4: Feb 20 2003
Conformance testing and lot of fixes on Relax NG
-    andXIncludeimplementation
+
2.5.4: Feb 20 2003
Conformance testing and lot of fixes on Relax NG and XInclude
+    implementation
   Implementation of XPointer element() scheme
-  Bug fixes: XML parser, XInclude entities merge, validity
-    checkingonnamespaces,
-    2 serialization bugs, node info generation problems, a
-    DTDregexpgeneration problem.
+  
Bug fixes: XML parser, XInclude entities merge, validity checking on
+    namespaces,
+    2 serialization bugs, node info generation problems, a DTD regexp
+    generation problem.
   
   Portability: windows updates and path canonicalization (Igor)
   A few typo fixes (Kjartan Maraas)
   Python bindings generator fixes (Stephane Bidoul)
-
2.5.3: Feb 10 2003
RelaxNG and XML Schemas datatypes improvements, and added afirstversion
-    of RelaxNG Python bindings
-  Fixes: XLink (Sean Chittenden), XInclude (Sean Chittenden), API
-    fixforserializing namespace nodes, encoding conversion
-    bug,XHTML1serialization
+
2.5.3: Feb 10 2003
RelaxNG and XML Schemas datatypes improvements, and added a first
+    version of RelaxNG Python bindings
+  Fixes: XLink (Sean Chittenden), XInclude (Sean Chittenden), API fix for
+    serializing namespace nodes, encoding conversion bug, XHTML1
+  serialization
   Portability fixes: Windows (Igor), AMD 64bits RPM spec file
 
2.5.2: Feb 5 2003
First implementation of RelaxNG, added --relaxng flag to xmllint
   Schemas support now compiled in by default.
-  Bug fixes: DTD validation, namespace checking, XInclude
-    andentities,delegateURI in XML Catalogs, HTML parser, XML reader
-    (St�phaneBidoul),XPath parser and evaluation,  UTF8ToUTF8 serialization,
-    XMLreader memoryconsumption, HTML parser, HTML serialization in the
-    presenceofnamespaces
+  Bug fixes: DTD validation, namespace checking, XInclude and entities,
+    delegateURI in XML Catalogs, HTML parser, XML reader (St�phane Bidoul),
+    XPath parser and evaluation,  UTF8ToUTF8 serialization, XML reader memory
+    consumption, HTML parser, HTML serialization in the presence of
+  namespaces
   added an HTML API to check elements and attributes.
-  Documentation improvement, PDF for the tutorial (John Fleck),docpatches
-    (Stefan Kost)
+  Documentation improvement, PDF for the tutorial (John Fleck), doc
+    patches (Stefan Kost)
   Portability fixes: NetBSD (Julio Merino), Windows (Igor Zlatkovic)
-  Added python bindings for XPointer, contextual error
-    reporting(St�phaneBidoul)
+  Added python bindings for XPointer, contextual error reporting
+    (St�phane Bidoul)
   URI/file escaping problems (Stefano Zacchiroli)
 
2.5.1: Jan 8 2003
Fixes a memory leak and configuration/compilation problems in 2.5.0
   documentation updates (John)
   a couple of XmlTextReader fixes
-
2.5.0: Jan 6 2003
New XmltextReader interfacebased on
-    C#API(with help of St�phane Bidoul)
+
2.5.0: Jan 6 2003
New XmltextReader interface based on C#
+    API (with help of St�phane Bidoul)
   Windows: more exports, including the new API (Igor)
   XInclude fallback fix
-  Python: bindings for the new API, packaging
-    (St�phaneBidoul),drv_libxml2.py Python xml.sax driver (St�phane Bidoul),
-    fixes,speedupand iterators for Python-2.2 (Hannu Krosing)
-  Tutorial fixes (john Fleck and Niraj Tolia) xmllint manupdate(John)
+  Python: bindings for the new API, packaging (St�phane Bidoul),
+    drv_libxml2.py Python xml.sax driver (St�phane Bidoul), fixes, speedup
+    and iterators for Python-2.2 (Hannu Krosing)
+  Tutorial fixes (john Fleck and Niraj Tolia) xmllint man update
+  (John)
   Fix an XML parser bug raised by Vyacheslav Pindyura
   Fix for VMS serialization (Nigel Hall) and config (Craig A. Berry)
   Entities handling fixes
-  new API to optionally track node creation and
-  deletion(LukasSchroeder)
+  new API to optionally track node creation and deletion (Lukas
+  Schroeder)
   Added documentation for the XmltextReader interface and some XML guidelines
 
2.4.30: Dec 12 2002
2.4.29 broke the python bindings, rereleasing
-  Improvement/fixes of the XML API generator, and couple of
-    minorcodefixes.
-
2.4.29: Dec 11 2002
Windows fixes (Igor): Windows CE port, pthread linking,
-    pythonbindings(St�phane Bidoul), Mingw (Magnus Henoch), and export
-    listupdates
+  Improvement/fixes of the XML API generator, and couple of minor code
+    fixes.
+
2.4.29: Dec 11 2002
Windows fixes (Igor): Windows CE port, pthread linking, python bindings
+    (St�phane Bidoul), Mingw (Magnus Henoch), and export list updates
   Fix for prev in python bindings (ERDI Gergo)
   Fix for entities handling (Marcus Clarke)
-  Refactored the XML and HTML dumps to a single code path,
-  fixedXHTML1dump
+  Refactored the XML and HTML dumps to a single code path, fixed XHTML1
+    dump
   Fix for URI parsing when handling URNs with fragment identifiers
   Fix for HTTP URL escaping problem
   added an TextXmlReader (C#) like API (work in progress)
-  Rewrote the API in XML generation script, includes a C parser
-    andsavesmore informations needed for C# bindings
+  Rewrote the API in XML generation script, includes a C parser and saves
+    more informations needed for C# bindings
 
2.4.28: Nov 22 2002
a couple of python binding fixes
   2 bug fixes in the XML push parser
   potential memory leak removed (Martin Stoilov)
@@ -743,41 +784,41 @@ base.
There is the list of public releases:
2.6.26: Jun 6 2006
   autodetection of XHTML1 and specific serialization rules added
   nasty threading bug fixed (William Brack)
 
2.4.27: Nov 17 2002
fixes for the Python bindings
-  a number of bug fixes: SGML catalogs,xmlParseBalancedChunkMemory(),HTML
-    parser,  Schemas (Charles Bozeman),document fragment support(Christian
-    Glahn), xmlReconciliateNs (BrianStafford), XPointer,xmlFreeNode(),
-    xmlSAXParseMemory (Peter Jones),xmlGetNodePath (PetrPajas), entities
-    processing
+  a number of bug fixes: SGML catalogs, xmlParseBalancedChunkMemory(),
+    HTML parser,  Schemas (Charles Bozeman), document fragment support
+    (Christian Glahn), xmlReconciliateNs (Brian Stafford), XPointer,
+    xmlFreeNode(), xmlSAXParseMemory (Peter Jones), xmlGetNodePath (Petr
+    Pajas), entities processing
   added grep to xmllint --shell
   VMS update patch from Craig A. Berry
-  cleanup of the Windows build with support for more
-    compilers(Igor),better thread support on Windows
+  cleanup of the Windows build with support for more compilers (Igor),
+    better thread support on Windows
   cleanup of Unix Makefiles and spec file
   Improvements to the documentation (John Fleck)
 
2.4.26: Oct 18 2002
Patches for Windows CE port, improvements on Windows paths handling
-  Fixes to the validation  code (DTD and Schemas), xmlNodeGetPath()
-    ,HTMLserialization, Namespace compliance,  and a number of
-  smallproblems
-
2.4.25: Sep 26 2002
A number of bug fixes: XPath, validation, Python bindings, DOM
-    andtree,xmlI/O,  Html
+  Fixes to the validation  code (DTD and Schemas), xmlNodeGetPath() ,
+    HTML serialization, Namespace compliance,  and a number of small
+  problems
+
2.4.25: Sep 26 2002
A number of bug fixes: XPath, validation, Python bindings, DOM and
+    tree, xmlI/O,  Html
   Serious rewrite of XInclude
-  Made XML Schemas regexp part of the default build and APIs, smallfixand
-    improvement of the regexp core
+  Made XML Schemas regexp part of the default build and APIs, small fix
+    and improvement of the regexp core
   Changed the validation code to reuse XML Schemas regexp APIs
-  Better handling of Windows file paths, improvement of
-    Makefiles(Igor,Daniel Gehriger, Mark Vakoc)
-  Improved the python I/O bindings, the tests, added resolver
-    andregexpAPIs
+  Better handling of Windows file paths, improvement of Makefiles (Igor,
+    Daniel Gehriger, Mark Vakoc)
+  Improved the python I/O bindings, the tests, added resolver and regexp
+    APIs
   New logos from Marc Liyanage
   Tutorial improvements: John Fleck, Christopher Harris
-  Makefile: Fixes for AMD x86_64 (Mandrake),
-  DESTDIR(ChristopheMerlet)
+  Makefile: Fixes for AMD x86_64 (Mandrake), DESTDIR (Christophe
+  Merlet)
   removal of all stderr/perror use for error reporting
   Better error reporting: XPath and DTD validation
   update of the trio portability layer (Bjorn Reese)
 
2.4.24: Aug 22 2002
XPath fixes (William), xf:escape-uri() (Wesley Terpstra)
-  Python binding fixes: makefiles (William), generator, rpm
-    build,x86-64(fcrozat)
+  Python binding fixes: makefiles (William), generator, rpm build, x86-64
+    (fcrozat)
   HTML <style> and boolean attributes serializer fixes
   C14N improvements by Aleksey
   doc cleanups: Rick Jones
@@ -787,98 +828,96 @@ base.
There is the list of public releases:
2.6.26: Jun 6 2006
   c14n fixes, testsuite and performances: Aleksey Sanin
   added xmlDocFormatDump: Chema Celorio
   new tutorial: John Fleck
-  new hash functions and performances: Sander Vesik, portability
-    fixfromPeter Jacobi
-  a number of bug fixes: XPath (William Brack, Richard Jinks), XMLandHTML
-    parsers, ID lookup function
+  new hash functions and performances: Sander Vesik, portability fix from
+    Peter Jacobi
+  a number of bug fixes: XPath (William Brack, Richard Jinks), XML and
+    HTML parsers, ID lookup function
   removal of all remaining sprintf: Aleksey Sanin
-
2.4.22: May 27 2002
a number of bug fixes: configure scripts, base handling,
-    parser,memoryusage, HTML parser, XPath, documentation
-    (ChristianCornelssen),indentation, URI parsing
-  Optimizations for XMLSec, fixing and making public some of
-    thenetworkprotocol handlers (Aleksey)
+
2.4.22: May 27 2002
a number of bug fixes: configure scripts, base handling, parser, memory
+    usage, HTML parser, XPath, documentation (Christian Cornelssen),
+    indentation, URI parsing
+  Optimizations for XMLSec, fixing and making public some of the network
+    protocol handlers (Aleksey)
   performance patch from Gary Pennington
-  Charles Bozeman provided date and time support for
-  XMLSchemasdatatypes
-
2.4.21: Apr 29 2002
This release is both a bug fix release and also contains the
-earlyXMLSchemas structuresand
-datatypescode,
-beware,allinterfaces are likely to change, there is huge holes, it is clearly
-a workinprogress and don't even think of putting this code in a
-productionsystem,it's actually not compiled in by default. The real fixes
-are:
a couple of bugs or limitations introduced in 2.4.20
+  Charles Bozeman provided date and time support for XML Schemas
+  datatypes
+
2.4.21: Apr 29 2002
This release is both a bug fix release and also contains the early XML
+Schemas structures and datatypes code, beware, all
+interfaces are likely to change, there is huge holes, it is clearly a work in
+progress and don't even think of putting this code in a production system,
+it's actually not compiled in by default. The real fixes are:
a couple of bugs or limitations introduced in 2.4.20
   patches for Borland C++ and MSC by Igor
-  some fixes on XPath strings and conformance patches by RichardJinks
+  some fixes on XPath strings and conformance patches by Richard
+  Jinks
   patch from Aleksey for the ExcC14N specification
   OSF/1 bug fix by Bjorn
 
2.4.20: Apr 15 2002
bug fixes: file descriptor leak, XPath, HTML output, DTD validation
   XPath conformance testing by Richard Jinks
-  Portability fixes: Solaris, MPE/iX, Windows, OSF/1,
-    pythonbindings,libxml.m4
-
2.4.19: Mar 25 2002
bug fixes: half a dozen XPath bugs, Validation, ISO-Latin
-  toUTF8encoder
+  Portability fixes: Solaris, MPE/iX, Windows, OSF/1, python bindings,
+    libxml.m4
+
2.4.19: Mar 25 2002
bug fixes: half a dozen XPath bugs, Validation, ISO-Latin to UTF8
+    encoder
   portability fixes in the HTTP code
   memory allocation checks using valgrind, and profiling tests
   revamp of the Windows build and Makefiles
-
2.4.18: Mar 18 2002
bug fixes: tree, SAX, canonicalization,
-  validation,portability,XPath
+
2.4.18: Mar 18 2002
bug fixes: tree, SAX, canonicalization, validation, portability,
+  XPath
   removed the --with-buffer option it was becoming unmaintainable
   serious cleanup of the Python makefiles
   speedup patch to XPath very effective for DocBook stylesheets
   Fixes for Windows build, cleanup of the documentation
-
2.4.17: Mar 8 2002
a lot of bug fixes, including "namespace nodes have no
-  parentsinXPath"
-  fixed/improved the Python wrappers, added more examples
-    andmoreregression tests, XPath extension functions can now
-  returnnode-sets
+
2.4.17: Mar 8 2002
a lot of bug fixes, including "namespace nodes have no parents in
+  XPath"
+  fixed/improved the Python wrappers, added more examples and more
+    regression tests, XPath extension functions can now return node-sets
   added the XML Canonicalization support from Aleksey Sanin
-
2.4.16: Feb 20 2002
a lot of bug fixes, most of them were triggered by the XMLTestsuitefrom
-    OASIS and W3C. Compliance has been significantlyimproved.
+
2.4.16: Feb 20 2002
a lot of bug fixes, most of them were triggered by the XML Testsuite
+    from OASIS and W3C. Compliance has been significantly improved.
   a couple of portability fixes too.
 
2.4.15: Feb 11 2002
Fixed the Makefiles, especially the python module ones
   A few bug fixes and cleanup
   Includes cleanup
-
2.4.14: Feb 8 2002
Change of License to the MITLicensebasicallyfor
-    integration in XFree86 codebase, and removingconfusion around theprevious
-    dual-licensing
-  added Python bindings, beta software but should already
-  bequitecomplete
-  a large number of fixes and cleanups, especially for
-    alltreemanipulations
-  cleanup of the headers, generation of a reference API
-  definitioninXML
+
2.4.14: Feb 8 2002
Change of License to the MIT
+    License basically for integration in XFree86 codebase, and removing
+    confusion around the previous dual-licensing
+  added Python bindings, beta software but should already be quite
+    complete
+  a large number of fixes and cleanups, especially for all tree
+    manipulations
+  cleanup of the headers, generation of a reference API definition in
+  XML
 
2.4.13: Jan 14 2002
update of the documentation: John Fleck and Charlie Bozeman
   cleanup of timing code from Justin Fletcher
-  fixes for Windows and initial thread support on Win32: Igor
-    andSergueiNarojnyi
+  fixes for Windows and initial thread support on Win32: Igor and Serguei
+    Narojnyi
   Cygwin patch from Robert Collins
   added xmlSetEntityReferenceFunc() for Keith Isdale work on xsldbg
-
2.4.12: Dec 7 2001
a few bug fixes: thread (Gary Pennington), xmllint
-    (GeertKloosterman),XML parser (Robin Berjon), XPointer (Danny Jamshy),
-    I/Ocleanups(robert)
+
2.4.12: Dec 7 2001
a few bug fixes: thread (Gary Pennington), xmllint (Geert Kloosterman),
+    XML parser (Robin Berjon), XPointer (Danny Jamshy), I/O cleanups
+  (robert)
   Eric Lavigne contributed project files for MacOS
   some makefiles cleanups
-
2.4.11: Nov 26 2001
fixed a couple of errors in the includes, fixed a few bugs,
-    somecodecleanups
+
2.4.11: Nov 26 2001
fixed a couple of errors in the includes, fixed a few bugs, some code
+    cleanups
   xmllint man pages improvement by Heiko Rupp
   updated VMS build instructions from John A Fotheringham
   Windows Makefiles updates from Igor
 
2.4.10: Nov 10 2001
URI escaping fix (Joel Young)
   added xmlGetNodePath() (for paths or XPointers generation)
   Fixes namespace handling problems when using DTD and validation
-  improvements on xmllint: Morus Walter patches for --format
-    and--encode,Stefan Kost and Heiko Rupp improvements on the --shell
+  improvements on xmllint: Morus Walter patches for --format and
+    --encode, Stefan Kost and Heiko Rupp improvements on the --shell
   fixes for xmlcatalog linking pointed by Weiqi Gao
   fixes to the HTML parser
 
2.4.9: Nov 6 2001
fixes more catalog bugs
   avoid a compilation problem, improve xmlGetLineNo()
-
2.4.8: Nov 4 2001
fixed SGML catalogs broken in previous release,
-  updatedxmlcatalogtool
+
2.4.8: Nov 4 2001
fixed SGML catalogs broken in previous release, updated xmlcatalog
+  tool
   fixed a compile errors and some includes troubles.
 
2.4.7: Oct 30 2001
exported some debugging interfaces
   serious rewrite of the catalog code
-  integrated Gary Pennington thread safety patch, added
-    configureoptionand regression tests
+  integrated Gary Pennington thread safety patch, added configure option
+    and regression tests
   removed an HTML parser bug
   fixed a couple of potentially serious validation bugs
   integrated the SGML DocBook support in xmllint
@@ -894,11 +933,12 @@ are:
a couple of bugs or limitations introduced in 2.4.20
   fixed half a dozen bugs reported for libxml or libxslt
   updated xmlcatalog to be able to modify SGML super catalogs
 
2.4.5: Sep 14 2001
Remove a few annoying bugs in 2.4.4
-  forces the HTML serializer to output decimal charrefs since
-    someversionof Netscape can't handle hexadecimal ones
-
1.8.16: Sep 14 2001
maintenance release of the old libxml1 branch, couple of
-    bugandportability fixes
-
2.4.4: Sep 12 2001
added --convert to xmlcatalog, bug fixes and cleanups of XMLCatalog
+  forces the HTML serializer to output decimal charrefs since some
+    version of Netscape can't handle hexadecimal ones
+
1.8.16: Sep 14 2001
maintenance release of the old libxml1 branch, couple of bug and
+    portability fixes
+
2.4.4: Sep 12 2001
added --convert to xmlcatalog, bug fixes and cleanups of XML
+  Catalog
   a few bug fixes and some portability changes
   some documentation cleanups
 
2.4.3:  Aug 23 2001
XML Catalog support see the doc
@@ -916,13 +956,13 @@ are:
a couple of bugs or limitations introduced in 2.4.20
   cleanup for alpha and ia64 targets
   patch to allow saving through HTTP PUT or POST
 
2.4.0: July 10 2001
Fixed a few bugs in XPath, validation, and tree handling.
-  Fixed XML Base implementation, added a couple of examples
-    totheregression tests
+  Fixed XML Base implementation, added a couple of examples to the
+    regression tests
   A bit of cleanup
-
2.3.14: July 5 2001
fixed some entities problems and reduce memory
-    requirementwhensubstituting them
-  lots of improvements in the XPath queries interpreter
-    canbesubstantially faster
+
2.3.14: July 5 2001
fixed some entities problems and reduce memory requirement when
+    substituting them
+  lots of improvements in the XPath queries interpreter can be
+    substantially faster
   Makefiles and configure cleanups
   Fixes to XPath variable eval, and compare on empty node set
   HTML tag closing bug fixed
@@ -936,38 +976,37 @@ are:
a couple of bugs or limitations introduced in 2.4.20
   fixed line number counting
   fixed serious problems in the XInclude processing
   added support for UTF8 BOM at beginning of entities
-  fixed a strange gcc optimizer bugs in xpath handling of
-    float,gcc-3.0miscompile uri.c (William), Thomas Leitner provided a fix
-    fortheoptimizer on Tru64
-  incorporated Yon Derek and Igor Zlatkovic  fixes and
-    improvementsforcompilation on Windows MSC
+  fixed a strange gcc optimizer bugs in xpath handling of float, gcc-3.0
+    miscompile uri.c (William), Thomas Leitner provided a fix for the
+    optimizer on Tru64
+  incorporated Yon Derek and Igor Zlatkovic  fixes and improvements for
+    compilation on Windows MSC
   update of libxml-doc.el (Felix Natter)
   fixed 2 bugs in URI normalization code
-
2.3.11: June 17 2001
updates to trio, Makefiles and configure should fix
-    someportabilityproblems (alpha)
-  fixed some HTML serialization problems (pre, script,
-    andblock/inlinehandling), added encoding aware APIs, cleanup of
-  thiscode
+
2.3.11: June 17 2001
updates to trio, Makefiles and configure should fix some portability
+    problems (alpha)
+  fixed some HTML serialization problems (pre, script, and block/inline
+    handling), added encoding aware APIs, cleanup of this code
   added xmlHasNsProp()
-  implemented a specific PI for encoding support in the
-  DocBookSGMLparser
-  some XPath fixes (-Infinity, / as a function parameter
-    andnamespacesnode selection)
+  implemented a specific PI for encoding support in the DocBook SGML
+    parser
+  some XPath fixes (-Infinity, / as a function parameter and namespaces
+    node selection)
   fixed a performance problem and an error in the validation code
   fixed XInclude routine to implement the recursive behaviour
   fixed xmlFreeNode problem when libxml is included statically twice
   added --version to xmllint for bug reports
 
2.3.10: June 1 2001
fixed the SGML catalog support
-  a number of reported bugs got fixed, in XPath, iconv
-    detection,XIncludeprocessing
+  a number of reported bugs got fixed, in XPath, iconv detection,
+    XInclude processing
   XPath string function should now handle unicode correctly
 
2.3.9: May 19 2001
Lots of bugfixes, and added a basic SGML catalog support:
HTML push bugfix #54891 and another patch from Jonas Borgstr�m
   some serious speed optimization again
   some documentation cleanups
   trying to get better linking on Solaris (-R)
   XPath API cleanup from Thomas Broyer
-  Validation bug fixed #54631, added a patch from Gary
-    Pennington,fixedxmlValidGetValidElements()
+  Validation bug fixed #54631, added a patch from Gary Pennington, fixed
+    xmlValidGetValidElements()
   Added an INSTALL file
   Attribute removal added to API: #54433
   added a basic support for SGML catalogs
@@ -978,10 +1017,10 @@ are:
a couple of bugs or limitations introduced in 2.4.20
 
1.8.13: May 14 2001
bugfixes release of the old libxml1 branch used by Gnome
 
2.3.8: May 3 2001
Integrated an SGML DocBook parser for the Gnome project
   Fixed a few things in the HTML parser
-  Fixed some XPath bugs raised by XSLT use, tried to fix thefloatingpoint
-    portability issue
-  Speed improvement (8M/s for SAX, 3M/s for DOM, 1.5M/s
-    forDOM+validationusing the XML REC as input and a 700MHz celeron).
+  Fixed some XPath bugs raised by XSLT use, tried to fix the floating
+    point portability issue
+  Speed improvement (8M/s for SAX, 3M/s for DOM, 1.5M/s for
+    DOM+validation using the XML REC as input and a 700MHz celeron).
   incorporated more Windows cleanup
   added xmlSaveFormatFile()
   fixed problems in copying nodes with entities references (gdome)
@@ -996,33 +1035,32 @@ are:
a couple of bugs or limitations introduced in 2.4.20
   Improved validation speed sensible for DocBook
   fixed a big bug with ID declared in external parsed entities
   portability fixes, update of Trio from Bjorn Reese
-
2.3.6: April 8 2001
Code cleanup using extreme gcc compiler warning options,
-    foundandcleared half a dozen potential problem
+
2.3.6: April 8 2001
Code cleanup using extreme gcc compiler warning options, found and
+    cleared half a dozen potential problem
   the Eazel team found an XML parser bug
-  cleaned up the user of some of the string formatting function.
-    usedthetrio library code to provide the one needed when the platform
-    ismissingthem
-  xpath: removed a memory leak and fixed the predicate
-    evaluationproblem,extended the testsuite and cleaned up the result.
-    XPointer seemsbroken...
-
2.3.5: Mar 23 2001
Biggest change is separate parsing and evaluation of
-    XPathexpressions,there is some new APIs for this too
-  included a number of bug fixes(XML push parser,
-  51876,notations,52299)
+  cleaned up the user of some of the string formatting function. used the
+    trio library code to provide the one needed when the platform is missing
+    them
+  xpath: removed a memory leak and fixed the predicate evaluation
+    problem, extended the testsuite and cleaned up the result. XPointer seems
+    broken ...
+
2.3.5: Mar 23 2001
Biggest change is separate parsing and evaluation of XPath expressions,
+    there is some new APIs for this too
+  included a number of bug fixes(XML push parser, 51876, notations,
+  52299)
   Fixed some portability issues
 
2.3.4: Mar 10 2001
Fixed bugs #51860 and #51861
-  Added a global variable xmlDefaultBufferSize to allow defaultbuffersize
-    to be application tunable.
-  Some cleanup in the validation code, still a bug left and
-    thispartshould probably be rewritten to support ambiguous content
-  model:-\
-  Fix a couple of serious bugs introduced or raised by changes
-    in2.3.3parser
+  Added a global variable xmlDefaultBufferSize to allow default buffer
+    size to be application tunable.
+  Some cleanup in the validation code, still a bug left and this part
+    should probably be rewritten to support ambiguous content model :-\
+  Fix a couple of serious bugs introduced or raised by changes in 2.3.3
+    parser
   Fixed another bug in xmlNodeGetContent()
   Bjorn fixed XPath node collection and Number formatting
   Fixed a loop reported in the HTML parsing
-  blank space are reported even if the Dtd content model proves
-    thattheyare formatting spaces, this is for XML conformance
+  blank space are reported even if the Dtd content model proves that they
+    are formatting spaces, this is for XML conformance
 
2.3.3: Mar 1 2001
small change in XPath for XSLT
   documentation cleanups
   fix in validation by Gary Pennington
@@ -1032,17 +1070,18 @@ are:
a couple of bugs or limitations introduced in 2.4.20
   fixed a bug in xmlNodeGetContent
   ID/IDREF support partly rewritten by Gary Pennington
 
2.3.1: Feb 15 2001
some XPath and HTML bug fixes for XSLT
-  small extension of the hash table interfaces for
-  DOMgdome2implementation
+  small extension of the hash table interfaces for DOM gdome2
+    implementation
   A few bug fixes
 
2.3.0: Feb 8 2001 (2.2.12 was on 25 Jan but I didn't kept track)
Lots of XPath bug fixes
-  Add a mode with Dtd lookup but without validation error
-  reportingforXSLT
+  Add a mode with Dtd lookup but without validation error reporting for
+    XSLT
   Add support for text node without escaping (XSLT)
   bug fixes for xmlCheckFilename
   validation code bug fixes from Gary Pennington
   Patch from Paul D. Smith correcting URI path normalization
-  Patch to allow simultaneous install of libxml-develandlibxml2-devel
+  Patch to allow simultaneous install of libxml-devel and
+  libxml2-devel
   the example Makefile is now fixed
   added HTML to the RPM packages
   tree copying bugfixes
@@ -1059,7 +1098,8 @@ are:
a couple of bugs or limitations introduced in 2.4.20
   Improved the XPointer implementation
   integrate a number of provided patches
 
2.2.9: Nov 25 2000
erroneous release :-(
-
2.2.8: Nov 13 2000
First version of XIncludesupport
+
2.2.8: Nov 13 2000
First version of XInclude
+    support
   Patch in conditional section handling
   updated MS compiler project
   fixed some XPath problems
@@ -1070,19 +1110,19 @@ are:
a couple of bugs or limitations introduced in 2.4.20
   xmlIOParseDTD() added
   various small fixes in the HTML, URI, HTTP and XPointer support
   some cleanup of the Makefile, autoconf and the distribution content
-
2.2.6: Oct 25 2000:
Added an hash table module, migrated a number of internal
-    structuretothose
+
2.2.6: Oct 25 2000:
Added an hash table module, migrated a number of internal structure to
+    those
   Fixed a posteriori validation problems
   HTTP module cleanups
-  HTML parser improvements (tag errors, script/style
-    handling,attributenormalization)
+  HTML parser improvements (tag errors, script/style handling, attribute
+    normalization)
   coalescing of adjacent text nodes
   couple of XPath bug fixes, exported the internal API
 
2.2.5: Oct 15 2000:
XPointer implementation and testsuite
-  Lot of XPath fixes, added variable and functions
-  registration,moretests
-  Portability fixes, lots of enhancements toward an easy Windows
-    buildandrelease
+  Lot of XPath fixes, added variable and functions registration, more
+    tests
+  Portability fixes, lots of enhancements toward an easy Windows build
+    and release
   Late validation fixes
   Integrated a lot of contributed patches
   added memory management docs
@@ -1092,113 +1132,115 @@ are:
a couple of bugs or limitations introduced in 2.4.20
   Serious bug fixes on the URI and HTML code
 
2.2.3: Sep 17 2000
bug fixes
   cleanup of entity handling code
-  overall review of all loops in the parsers, all sprintf usage
-    hasbeenchecked too
-  Far better handling of larges Dtd. Validating against DocBook
-    XMLDtdworks smoothly now.
+  overall review of all loops in the parsers, all sprintf usage has been
+    checked too
+  Far better handling of larges Dtd. Validating against DocBook XML Dtd
+    works smoothly now.
 
1.8.10: Sep 6 2000
bug fix release for some Gnome projects
 
2.2.2: August 12 2000
mostly bug fixes
   started adding routines to access xml parser context options
 
2.2.1: July 21 2000
a purely bug fixes release
   fixed an encoding support problem when parsing from a memory block
   fixed a DOCTYPE parsing problem
-  removed a bug in the function allowing to override the
-    memoryallocationroutines
+  removed a bug in the function allowing to override the memory
+    allocation routines
 
2.2.0: July 14 2000
applied a lot of portability fixes
-  better encoding support/cleanup and saving (content is nowalwaysencoded
-    in UTF-8)
+  better encoding support/cleanup and saving (content is now always
+    encoded in UTF-8)
   the HTML parser now correctly handles encodings
   added xmlHasProp()
   fixed a serious problem with &#38;
   propagated the fix to FTP client
   cleanup, bugfixes, etc ...
-  Added a page about libxmlInternationalizationsupport
+  Added a page about libxml Internationalization
+    support
 
1.8.9:  July 9 2000
fixed the spec the RPMs should be better
-  fixed a serious bug in the FTP implementation, released 1.8.9
-    tosolverpmfind users problem
+  fixed a serious bug in the FTP implementation, released 1.8.9 to solve
+    rpmfind users problem
 
2.1.1: July 1 2000
fixes a couple of bugs in the 2.1.0 packaging
   improvements on the HTML parser
-
2.1.0 and 1.8.8: June 29 2000
1.8.8 is mostly a commodity package for upgrading to libxml2accordingto
-    new instructions. It fixes a nastyproblemabout
-    &#38; charref parsing
-  2.1.0 also ease the upgrade from libxml v1 to the recent version.italso
-    contains numerous fixes and enhancements:
+
2.1.0 and 1.8.8: June 29 2000
1.8.8 is mostly a commodity package for upgrading to libxml2 according
+    to new instructions. It fixes a nasty problem
+    about &#38; charref parsing
+  2.1.0 also ease the upgrade from libxml v1 to the recent version. it
+    also contains numerous fixes and enhancements:
     added xmlStopParser() to stop parsing
       improved a lot parsing speed when there is large CDATA blocs
       includes XPath patches provided by Picdar Technology
-      tried to fix as much as possible DTD validation andnamespacerelated
-        problems
+      tried to fix as much as possible DTD validation and namespace
+        related problems
       output to a given encoding has been added/tested
       lot of various fixes
     
-
2.0.0: Apr 12 2000
First public release of libxml2. If you are using libxml, it's
-    agoodidea to check the 1.x to 2.x upgrade instructions. NOTE:
-    whileinitiallyscheduled for Apr 3 the release occurred only on Apr 12 due
-    tomassiveworkload.
-  The include are now located under $prefix/include/libxml
-    (insteadof$prefix/include/gnome-xml), they also are referenced by
+
2.0.0: Apr 12 2000
First public release of libxml2. If you are using libxml, it's a good
+    idea to check the 1.x to 2.x upgrade instructions. NOTE: while initially
+    scheduled for Apr 3 the release occurred only on Apr 12 due to massive
+    workload.
+  The include are now located under $prefix/include/libxml (instead of
+    $prefix/include/gnome-xml), they also are referenced by
     #include <libxml/xxx.h>
     instead of
     #include "xxx.h"
   
   a new URI module for parsing URIs and following strictly RFC 2396
-  the memory allocation routines used by libxml can now
-    beoverloadeddynamically by using xmlMemSetup()
-  The previously CVS only tool tester has
-    beenrenamedxmllintand is now installed as part of
-    thelibxml2package
-  The I/O interface has been revamped. There is now ways to
-    pluginspecific I/O modules, either at the URI scheme detection
-    levelusingxmlRegisterInputCallbacks()  or by passing I/O functions
-    whencreating aparser context using xmlCreateIOParserCtxt()
-  there is a C preprocessor macro LIBXML_VERSION providing
-    theversionnumber of the libxml module in use
-  a number of optional features of libxml can now be excluded
-    atconfiguretime (FTP/HTTP/HTML/XPath/Debug)
+  the memory allocation routines used by libxml can now be overloaded
+    dynamically by using xmlMemSetup()
+  The previously CVS only tool tester has been renamed
+    xmllint and is now installed as part of the libxml2
+    package
+  The I/O interface has been revamped. There is now ways to plug in
+    specific I/O modules, either at the URI scheme detection level using
+    xmlRegisterInputCallbacks()  or by passing I/O functions when creating a
+    parser context using xmlCreateIOParserCtxt()
+  there is a C preprocessor macro LIBXML_VERSION providing the version
+    number of the libxml module in use
+  a number of optional features of libxml can now be excluded at
+    configure time (FTP/HTTP/HTML/XPath/Debug)
 
2.0.0beta: Mar 14 2000
This is a first Beta release of libxml version 2
-  It's available only fromxmlsoft.orgFTP, it's packaged
-    aslibxml2-2.0.0beta and available as tar andRPMs
-  This version is now the head in the Gnome CVS base, the old
-    oneisavailable under the tag LIB_XML_1_X
-  This includes a very large set of changes. From a  programmatic
-    pointofview applications should not have to be modified too much, check
-    theupgrade page
+  It's available only fromxmlsoft.org
+    FTP, it's packaged as libxml2-2.0.0beta and available as tar and
+  RPMs
+  This version is now the head in the Gnome CVS base, the old one is
+    available under the tag LIB_XML_1_X
+  This includes a very large set of changes. From a  programmatic point
+    of view applications should not have to be modified too much, check the
+    upgrade page
   Some interfaces may changes (especially a bit about encoding).
   the updates includes:
-    fix I18N support. ISO-Latin-x/UTF-8/UTF-16 (nearly)
-        seemscorrectlyhandled now
-      Better handling of entities, especially well-formedness
-        checkingandproper PEref extensions in external subsets
+    fix I18N support. ISO-Latin-x/UTF-8/UTF-16 (nearly) seems correctly
+        handled now
+      Better handling of entities, especially well-formedness checking
+        and proper PEref extensions in external subsets
       DTD conditional sections
       Validation now correctly handle entities content
-      changestructuresto
-        accommodate DOM
+      change
+        structures to accommodate DOM
     
-  Serious progress were made toward compliance, here are the result of the
-    testagainsttheOASIS testsuite (except the Japanese tests since I
-    don't supportthatencoding yet). This URL is rebuilt every couple of hours
-    using theCVShead version.
+  Serious progress were made toward compliance, here are the result of the test against the
+    OASIS testsuite (except the Japanese tests since I don't support that
+    encoding yet). This URL is rebuilt every couple of hours using the CVS
+    head version.
 
1.8.7: Mar 6 2000
This is a bug fix release:
-  It is possible to disable the ignorable blanks heuristic
-    usedbylibxml-1.x, a new function  xmlKeepBlanksDefault(0) will allow
-    this.Notethat for adherence to XML spec, this behaviour will be
-    disabledbydefault in 2.x . The same function will allow to keep
-    compatibilityforold code.
-  Blanks in <a>  </a> constructs are not
-    ignoredanymore,avoiding heuristic is really the Right Way :-\
-  The unchecked use of snprintf which was breakinglibxml-1.8.6compilation
-    on some platforms has been fixed
-  nanoftp.c nanohttp.c: Fixed '#' and '?' stripping
-  whenprocessingURIs
-
1.8.6: Jan 31 2000
added a nanoFTP transport module, debugged until the new version of rpmfindcanuseit
-    without troubles
-
1.8.5: Jan 21 2000
adding APIs to parse a well balanced chunk of XML (production [43] contentof
-    theXMLspec)
+  It is possible to disable the ignorable blanks heuristic used by
+    libxml-1.x, a new function  xmlKeepBlanksDefault(0) will allow this. Note
+    that for adherence to XML spec, this behaviour will be disabled by
+    default in 2.x . The same function will allow to keep compatibility for
+    old code.
+  Blanks in <a>  </a> constructs are not ignored anymore,
+    avoiding heuristic is really the Right Way :-\
+  The unchecked use of snprintf which was breaking libxml-1.8.6
+    compilation on some platforms has been fixed
+  nanoftp.c nanohttp.c: Fixed '#' and '?' stripping when processing
+  URIs
+
1.8.6: Jan 31 2000
added a nanoFTP transport module, debugged until the new version of rpmfind can use
+    it without troubles
+
1.8.5: Jan 21 2000
adding APIs to parse a well balanced chunk of XML (production [43] content of the
+    XML spec)
   fixed a hideous bug in xmlGetProp pointed by Rune.Djurhuus@fast.no
-  Jody Goldberg <jgoldberg@home.com> provided another patchtryingto
-    solve the zlib checks problems
-  The current state in gnome CVS base is expected to ship as
-    1.8.5withgnumeric soon
+  Jody Goldberg <jgoldberg@home.com> provided another patch trying
+    to solve the zlib checks problems
+  The current state in gnome CVS base is expected to ship as 1.8.5 with
+    gnumeric soon
 
1.8.4: Jan 13 2000
bug fixes, reintroduced xmlNewGlobalNs(), fixed xmlNewNs()
   all exit() call should have been removed from libxml
   fixed a problem with INCLUDE_WINSOCK on WIN32 platform
@@ -1209,52 +1251,52 @@ are:
a couple of bugs or limitations introduced in 2.4.20
   fixed the DTD parsing code to work with the xhtml DTD
   added xmlRemoveProp(), xmlRemoveID() and xmlRemoveRef()
   Fixed bugs in xmlNewNs()
-  External entity loading code has been revamped, now
-    itusesxmlLoadExternalEntity(), some fix on entities processing
-  wereadded
+  External entity loading code has been revamped, now it uses
+    xmlLoadExternalEntity(), some fix on entities processing were added
   cleaned up WIN32 includes of socket stuff
-
1.8.2: Dec 21 1999
I got another problem with includes and C++, I hope this issue
-    isfixedfor good this time
-  Added a few tree modification
-    functions:xmlReplaceNode,xmlAddPrevSibling, xmlAddNextSibling,
-    xmlNodeSetNameandxmlDocSetRootElement
+
1.8.2: Dec 21 1999
I got another problem with includes and C++, I hope this issue is fixed
+    for good this time
+  Added a few tree modification functions: xmlReplaceNode,
+    xmlAddPrevSibling, xmlAddNextSibling, xmlNodeSetName and
+    xmlDocSetRootElement
   Tried to improve the HTML output with help from Chris Lahey
-
1.8.1: Dec 18 1999
various patches to avoid troubles when using libxml with
-    C++compilersthe "namespace" keyword and C escaping in include files
+
1.8.1: Dec 18 1999
various patches to avoid troubles when using libxml with C++ compilers
+    the "namespace" keyword and C escaping in include files
   a problem in one of the core macros IS_CHAR was corrected
-  fixed a bug introduced in 1.8.0 breaking default
-    namespaceprocessing,and more specifically the Dia application
-  fixed a posteriori validation (validation after parsing, or by
-    usingaDtd not specified in the original document)
+  fixed a bug introduced in 1.8.0 breaking default namespace processing,
+    and more specifically the Dia application
+  fixed a posteriori validation (validation after parsing, or by using a
+    Dtd not specified in the original document)
   fixed a bug in
 
1.8.0: Dec 12 1999
cleanup, especially memory wise
-  the parser should be more reliable, especially the HTML one,
-    itshouldnot crash, whatever the input !
-  Integrated various patches, especially a speedup improvement
-    forlargedataset from CarlNygard,configure with
-    --with-buffers to enable them.
+  the parser should be more reliable, especially the HTML one, it should
+    not crash, whatever the input !
+  Integrated various patches, especially a speedup improvement for large
+    dataset from Carl Nygard,
+    configure with --with-buffers to enable them.
   attribute normalization, oops should have been added long ago !
-  attributes defaulted from DTDs should be available, xmlSetProp()nowdoes
-    entities escaping by default.
+  attributes defaulted from DTDs should be available, xmlSetProp() now
+    does entities escaping by default.
 
1.7.4: Oct 25 1999
Lots of HTML improvement
   Fixed some errors when saving both XML and HTML
   More examples, the regression tests should now look clean
   Fixed a bug with contiguous charref
 
1.7.3: Sep 29 1999
portability problems fixed
-  snprintf was used unconditionally, leading to link problems
-    onsystemwere it's not available, fixed
-
1.7.1: Sep 24 1999
The basic type for strings manipulated by libxml has been
-    renamedin1.7.1 from CHARto xmlChar.
-    Thereasonis that CHAR was conflicting with a predefined type on
-    Windows.Howeveron non WIN32 environment, compatibility is provided by the
-    way ofa#define .
-  Changed another error : the use of a structure field called
-    errno,andleading to troubles on platforms where it's a macro
-
1.7.0: Sep 23 1999
Added the ability to fetch remote DTD or parsed entities, see the nanohttpmodule.
-  Added an errno to report errors by another mean than a simpleprintflike
-    callback
+  snprintf was used unconditionally, leading to link problems on system
+    were it's not available, fixed
+
1.7.1: Sep 24 1999
The basic type for strings manipulated by libxml has been renamed in
+    1.7.1 from CHAR to xmlChar. The reason
+    is that CHAR was conflicting with a predefined type on Windows. However
+    on non WIN32 environment, compatibility is provided by the way of  a
+    #define .
+  Changed another error : the use of a structure field called errno, and
+    leading to troubles on platforms where it's a macro
+
1.7.0: Sep 23 1999
Added the ability to fetch remote DTD or parsed entities, see the nanohttp module.
+  Added an errno to report errors by another mean than a simple printf
+    like callback
   Finished ID/IDREF support and checking when validation
-  Serious memory leaks fixed (there is now a memory wrappermodule)
-  Improvement of XPathimplementation
+  Serious memory leaks fixed (there is now a memory wrapper module)
+  Improvement of XPath
+    implementation
   Added an HTML parser front-end
 
Daniel Veillard
diff --git a/doc/python.html b/doc/python.html
index adb3d36..5910766 100644
--- a/doc/python.html
+++ b/doc/python.html
@@ -7,66 +7,73 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Python and bindings The XML C parser and toolkit of Gnome
Python and bindings
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker There are a number of language bindings and wrappers available
-forlibxml2,the list below is not exhaustive. Please contact the xml-bindings@gnome.org(archives) inorder
-toget updates to this list or to discuss the specific topic of
-libxml2orlibxslt wrappers or bindings:
Libxml++seemsthemost
-    up-to-date C++ bindings for libxml2, check the documentationandthe
-    examples.
-  There is another C++wrapperbased on the gdome2
-    bindingsmaintained by Tobias Peters.
+Python and bindings The XML C parser and toolkit of Gnome
Python and bindings
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker There are a number of language bindings and wrappers available for
+libxml2, the list below is not exhaustive. Please contact the xml-bindings@gnome.org
+(archives) in
+order to get updates to this list or to discuss the specific topic of libxml2
+or libxslt wrappers or bindings:
Libxml++ seems the
+    most up-to-date C++ bindings for libxml2, check the documentation
+    and the examples.
+  There is another C++ wrapper
+    based on the gdome2 bindings maintained by Tobias Peters.
   and a third C++ wrapper by Peter Jones <pjones@pmade.org>
     Website: http://pmade.org/pjones/software/xmlwrapp/
   
-  MattSergeantdevelopedXML::LibXSLT, a Perl
-    wrapperforlibxml2/libxslt as part of the AxKitXMLapplication server.
-  If you're interested into scripting XML processing, have a look at XSHan XML editing shell
-    basedonLibxml2 Perl bindings.
-  Dave
-    Kuhlmanprovidesanearlier version of the libxml/libxslt wrappers for Python.
-  Gopal.V and Peter Minten develop libxml#, a
-    setofC# libxml2 bindings.
-  Petr Kozelka provides Pascal units
-    togluelibxml2with Kylix, Delphi and other Pascal compilers.
-  Uwe Fechner also provides idom2,
-    aDOM2implementation for Kylix2/D5/D6 from Borland.
-  There is bindings forRubyand
-    libxml2 bindings are also available in Ruby through the libgdome-rubymodulemaintainedby
-    Tobias Peters.
-  Steve Ball and contributors maintains libxml2 and libxslt
-    bindingsforTcl.
+  Matt
+    Sergeant developed XML::LibXSLT, a Perl wrapper for
+    libxml2/libxslt as part of the AxKit XML
+    application server.
+  If you're interested into scripting XML processing, have a look at XSH an XML editing shell based on
+    Libxml2 Perl bindings.
+  Dave Kuhlman provides an
+    earlier version of the libxml/libxslt wrappers for Python.
+  Gopal.V and Peter Minten develop libxml#, a set of
+    C# libxml2 bindings.
+  Petr Kozelka provides Pascal units to glue
+    libxml2 with Kylix, Delphi and other Pascal compilers.
+  Uwe Fechner also provides idom2, a DOM2
+    implementation for Kylix2/D5/D6 from Borland.
+  There is bindings for Ruby 
+    and libxml2 bindings are also available in Ruby through the libgdome-ruby module
+    maintained by Tobias Peters.
+  Steve Ball and contributors maintains libxml2 and libxslt bindings for
+    Tcl.
   libxml2 and libxslt is the default XML library for PHP5.
-  LibxmlJisaneffort
-    to create a 100% JAXP-compatible Java wrapper for libxml2andlibxslt as
-    part of GNU ClasspathX project.
-  Patrick McPhee provides Rexx bindings fof libxml2 and libxslt,
-    lookforRexxXML.
-  SatimageprovidesXMLLibosax.This
-    is an osax for Mac OS X with a set of commands toimplement inAppleScript
-    the XML DOM, XPATH and XSLT. Also includescommands forProperty-lists
-    (Apple's fast lookup table XML format.)
-  Francesco Montorsi developped wxXml2wrappersthat
-    interface libxml2, allowing wxWidgets applications toload/save/editXML
-    instances.
-
The distribution includes a set of Python bindings, which are
-guaranteedtobe maintained as part of the library in the future, though
-thePythoninterface have not yet reached the completeness of the C API.
Note that some of the Python purist dislike the default set
-ofPythonbindings, rather than complaining I suggest they have a look at lxml the more pythonic bindings
-forlibxml2and libxsltand helpMartijnFaassencomplete
-those.
St�phaneBidoulmaintains aWindows portof the Python
-bindings.
Note to people interested in building bindings, the API is formalized asan XML API description filewhich allows
-toautomatea large part of the Python bindings, this includes
-functiondescriptions,enums, structures, typedefs, etc... The Python script
-used tobuild thebindings is python/generator.py in the source
-distribution.
To install the Python bindings there are 2 options:
If you use an RPM based distribution, simply install the libxml2-pythonRPM(andif
-    needed the libxslt-pythonRPM).
-  Otherwise use the libxml2-pythonmoduledistributioncorresponding
-    to your installed version oflibxml2 andlibxslt. Note that to install it
-    you will need both libxml2and libxsltinstalled and run "python setup.py
-    build install" in themodule tree.
-
The distribution includes a set of examples and regression tests
-forthepython bindings in the python/testsdirectory. Here
-aresomeexcerpts from those tests:
tst.py:
This is a basic test of the file interface and DOM navigation:
import libxml2, sys
+  LibxmlJ is
+    an effort to create a 100% JAXP-compatible Java wrapper for libxml2 and
+    libxslt as part of GNU ClasspathX project.
+  Patrick McPhee provides Rexx bindings fof libxml2 and libxslt, look for
+    RexxXML.
+  Satimage
+    provides XMLLib
+    osax. This is an osax for Mac OS X with a set of commands to
+    implement in AppleScript the XML DOM, XPATH and XSLT. Also includes
+    commands for Property-lists (Apple's fast lookup table XML format.)
+  Francesco Montorsi developped wxXml2
+    wrappers that interface libxml2, allowing wxWidgets applications to
+    load/save/edit XML instances.
+The distribution includes a set of Python bindings, which are guaranteed
+to be maintained as part of the library in the future, though the Python
+interface have not yet reached the completeness of the C API.
Note that some of the Python purist dislike the default set of Python
+bindings, rather than complaining I suggest they have a look at lxml the more pythonic bindings for libxml2
+and libxslt and help Martijn
+Faassen complete those.
St�phane Bidoul
+maintains a Windows port
+of the Python bindings.
Note to people interested in building bindings, the API is formalized as
+an XML API description file which allows to
+automate a large part of the Python bindings, this includes function
+descriptions, enums, structures, typedefs, etc... The Python script used to
+build the bindings is python/generator.py in the source distribution.
To install the Python bindings there are 2 options:
If you use an RPM based distribution, simply install the libxml2-python
+    RPM (and if needed the libxslt-python
+    RPM).
+  Otherwise use the libxml2-python
+    module distribution corresponding to your installed version of
+    libxml2 and libxslt. Note that to install it you will need both libxml2
+    and libxslt installed and run "python setup.py build install" in the
+    module tree.
+
The distribution includes a set of examples and regression tests for the
+python bindings in the python/tests directory. Here are some
+excerpts from those tests:
tst.py:
This is a basic test of the file interface and DOM navigation:
import libxml2, sys
 
 doc = libxml2.parseFile("tst.xml")
 if doc.name != "tst.xml":
@@ -80,25 +87,24 @@ child = root.children
 if child.name != "foo":
     print "child.name failed"
     sys.exit(1)
-doc.freeDoc()
The Python module is called libxml2; parseFile is the
-equivalentofxmlParseFile (most of the bindings are automatically generated,
-and thexmlprefix is removed and the casing convention are kept). All node
-seen atthebinding level share the same subset of accessors:
name: returns the node name
-  type: returns a string indicating the node type
-  content: returns the content of the node, it is
-    basedonxmlNodeGetContent() and hence is recursive.
-  parent,
-    children,last,next,
-    prev,doc,properties: pointing to
-    the associatedelement in the tree,those may return None in case no such
-    linkexists.
-
Also note the need to explicitly deallocate documents with
-freeDoc().Reference counting for libxml2 trees would need quite a lot of
-worktofunction properly, and rather than risk memory leaks if
-notimplementedcorrectly it sounds safer to have an explicit function to free
-atree. Thewrapper python objects like doc, root or child are
-themautomatically garbagecollected.
validate.py:
This test check the validation interfaces and redirection
-oferrormessages:
import libxml2
+doc.freeDoc()
The Python module is called libxml2; parseFile is the equivalent of
+xmlParseFile (most of the bindings are automatically generated, and the xml
+prefix is removed and the casing convention are kept). All node seen at the
+binding level share the same subset of accessors:
name : returns the node name
+  type : returns a string indicating the node type
+  content : returns the content of the node, it is based on
+    xmlNodeGetContent() and hence is recursive.
+  parent , children, last,
+    next, prev, doc,
+    properties: pointing to the associated element in the tree,
+    those may return None in case no such link exists.
+
Also note the need to explicitly deallocate documents with freeDoc() .
+Reference counting for libxml2 trees would need quite a lot of work to
+function properly, and rather than risk memory leaks if not implemented
+correctly it sounds safer to have an explicit function to free a tree. The
+wrapper python objects like doc, root or child are them automatically garbage
+collected.
validate.py:
This test check the validation interfaces and redirection of error
+messages:
import libxml2
 
 #deactivate error messages from the validation
 def noerr(ctx, str):
@@ -113,29 +119,27 @@ doc = ctxt.doc()
 valid = ctxt.isValid()
 doc.freeDoc()
 if valid != 0:
-    print "validity check failed"
The first thing to notice is the call to registerErrorHandler(),
-itdefinesa new error handler global to the library. It is used to avoid
-seeingtheerror messages when trying to validate the invalid document.
The main interest of that test is the creation of a parser
-contextwithcreateFileParserCtxt() and how the behaviour can be changed
-beforecallingparseDocument() . Similarly the informations resulting from
-theparsing phaseare also available using context methods.
Contexts like nodes are defined as class and the libxml2 wrappers mapstheC
-function interfaces in terms of objects method as much as possible.Thebest to
-get a complete view of what methods are supported is to look atthelibxml2.py
-module containing all the wrappers.
push.py:
This test show how to activate the push parser interface:
import libxml2
+    print "validity check failed"
The first thing to notice is the call to registerErrorHandler(), it
+defines a new error handler global to the library. It is used to avoid seeing
+the error messages when trying to validate the invalid document.
The main interest of that test is the creation of a parser context with
+createFileParserCtxt() and how the behaviour can be changed before calling
+parseDocument() . Similarly the informations resulting from the parsing phase
+are also available using context methods.
Contexts like nodes are defined as class and the libxml2 wrappers maps the
+C function interfaces in terms of objects method as much as possible. The
+best to get a complete view of what methods are supported is to look at the
+libxml2.py module containing all the wrappers.
push.py:
This test show how to activate the push parser interface:
import libxml2
 
 ctxt = libxml2.createPushParser(None, "<foo", 4, "test.xml")
 ctxt.parseChunk("/>", 2, 1)
 doc = ctxt.doc()
 
-doc.freeDoc()
The context is created with a special call based
-onthexmlCreatePushParser() from the C library. The first argument is
-anoptionalSAX callback object, then the initial set of data, the length and
-thename ofthe resource in case URI-References need to be computed by
-theparser.
Then the data are pushed using the parseChunk() method, the
-lastcallsetting the third argument terminate to 1.
pushSAX.py:
this test show the use of the event based parsing interfaces. In
-thiscasethe parser does not build a document, but provides callback
-informationasthe parser makes progresses analyzing the data being
-provided:
import libxml2
+doc.freeDoc()
The context is created with a special call based on the
+xmlCreatePushParser() from the C library. The first argument is an optional
+SAX callback object, then the initial set of data, the length and the name of
+the resource in case URI-References need to be computed by the parser.
Then the data are pushed using the parseChunk() method, the last call
+setting the third argument terminate to 1.
pushSAX.py:
this test show the use of the event based parsing interfaces. In this case
+the parser does not build a document, but provides callback information as
+the parser makes progresses analyzing the data being provided:
import libxml2
 log = ""
 
 class callback:
@@ -183,16 +187,15 @@ reference = "startDocument:startElement foo {'url': 'tst'}:" + \
             "characters: bar:endElement foo:endDocument:"
 if log != reference:
     print "Error got: %s" % log
-    print "Expected: %s" % reference
The key object in that test is the handler, it provides a number
-ofentrypoints which can be called by the parser as it makes progresses
-toindicatethe information set obtained. The full set of callback is larger
-thanwhatthe callback class in that specific example implements (see
-theSAXdefinition for a complete list). The wrapper will only call those
-suppliedbythe object when activated. The startElement receives the names of
-theelementand a dictionary containing the attributes carried by this
-element.
Also note that the reference string generated from the callback
-showsasingle character call even though the string "bar" is passed to
-theparserfrom 2 different call to parseChunk()
xpath.py:
This is a basic test of XPath wrappers support
import libxml2
+    print "Expected: %s" % reference
The key object in that test is the handler, it provides a number of entry
+points which can be called by the parser as it makes progresses to indicate
+the information set obtained. The full set of callback is larger than what
+the callback class in that specific example implements (see the SAX
+definition for a complete list). The wrapper will only call those supplied by
+the object when activated. The startElement receives the names of the element
+and a dictionary containing the attributes carried by this element.
Also note that the reference string generated from the callback shows a
+single character call even though the string "bar" is passed to the parser
+from 2 different call to parseChunk()
xpath.py:
This is a basic test of XPath wrappers support
import libxml2
 
 doc = libxml2.parseFile("tst.xml")
 ctxt = doc.xpathNewContext()
@@ -204,15 +207,14 @@ if res[0].name != "doc" or res[1].name != "foo":
     print "xpath query: wrong node set value"
     sys.exit(1)
 doc.freeDoc()
-ctxt.xpathFreeContext()
This test parses a file, then create an XPath context to
-evaluateXPathexpression on it. The xpathEval() method execute an XPath query
-andreturnsthe result mapped in a Python way. String and numbers are
-nativelyconverted,and node sets are returned as a tuple of libxml2 Python
-nodeswrappers. Likethe document, the XPath context need to be freed
-explicitly,also not thatthe result of the XPath query may point back to the
-documenttree and hencethe document must be freed after the result of the
-query isused.
xpathext.py:
This test shows how to extend the XPath engine with functions
-writteninpython:
import libxml2
+ctxt.xpathFreeContext()
This test parses a file, then create an XPath context to evaluate XPath
+expression on it. The xpathEval() method execute an XPath query and returns
+the result mapped in a Python way. String and numbers are natively converted,
+and node sets are returned as a tuple of libxml2 Python nodes wrappers. Like
+the document, the XPath context need to be freed explicitly, also not that
+the result of the XPath query may point back to the document tree and hence
+the document must be freed after the result of the query is used.
xpathext.py:
This test shows how to extend the XPath engine with functions written in
+python:
import libxml2
 
 def foo(ctx, x):
     return x + 1
@@ -224,10 +226,9 @@ res = ctxt.xpathEval("foo(1)")
 if res != 2:
     print "xpath extension failure"
 doc.freeDoc()
-ctxt.xpathFreeContext()
Note how the extension function is registered with the context
-(butthatpart is not yet finalized, this may change slightly in the
-future).
tstxpath.py:
This test is similar to the previous one but shows how
-theextensionfunction can access the XPath evaluation context:
def foo(ctx, x):
+ctxt.xpathFreeContext()
Note how the extension function is registered with the context (but that
+part is not yet finalized, this may change slightly in the future).
tstxpath.py:
This test is similar to the previous one but shows how the extension
+function can access the XPath evaluation context:
def foo(ctx, x):
     global called
 
     #
@@ -236,16 +237,16 @@ theextensionfunction can access the XPath evaluation context:
def foo(ct
     pctxt = libxml2.xpathParserContext(_obj=ctx)
     ctxt = pctxt.context()
     called = ctxt.function()
-    return x + 1
All the interfaces around the XPath parser(or rather evaluation)contextare
-not finalized, but it should be sufficient to do contextual workat
-theevaluation point.
Memory debugging:
last but not least, all tests starts with the following prologue:
#memory debug specific
+    return x + 1
All the interfaces around the XPath parser(or rather evaluation) context
+are not finalized, but it should be sufficient to do contextual work at the
+evaluation point.
Memory debugging:
last but not least, all tests starts with the following prologue:
#memory debug specific
 libxml2.debugMemory(1)
and ends with the following epilogue:
#memory debug specific
 libxml2.cleanupParser()
 if libxml2.debugMemory(1) == 0:
     print "OK"
 else:
     print "Memory leak %d bytes" % (libxml2.debugMemory(1))
-    libxml2.dumpMemory()
Those activate the memory debugging interface of libxml2 whereallallocated
-block in the library are tracked. The prologue then cleans upthelibrary state
-and checks that all allocated memory has been freed. If notitcalls
-dumpMemory() which saves that list in a .memdumpfile.
Daniel Veillard
+    libxml2.dumpMemory()Those activate the memory debugging interface of libxml2 where all
+allocated block in the library are tracked. The prologue then cleans up the
+library state and checks that all allocated memory has been freed. If not it
+calls dumpMemory() which saves that list in a .memdump file.
Daniel Veillard
diff --git a/doc/threads.html b/doc/threads.html
index e6fe497..8082dbd 100644
--- a/doc/threads.html
+++ b/doc/threads.html
@@ -7,16 +7,15 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Thread safety The XML C parser and toolkit of Gnome
Thread safety
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Starting with 2.4.7, libxml2 makes provisions to ensure
-thatconcurrentthreads can safely work in parallel parsing different
-documents.There ishowever a couple of things to do to ensure it:
configure the library accordingly using the --with-threads options
-  call xmlInitParser() in the "main" thread before using any ofthelibxml2
-    API (except possibly selecting a different memoryallocator)
-
Note that the thread safety cannot be ensured for multiple
-threadssharingthe same document, the locking must be done at the application
-level,libxmlexports a basic mutex and reentrant mutexes API
-in<libxml/threads.h>.The parts of the library checked for thread
-safetyare:
concurrent loading
+Thread safety The XML C parser and toolkit of Gnome
Thread safety
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Starting with 2.4.7, libxml2 makes provisions to ensure that concurrent
+threads can safely work in parallel parsing different documents. There is
+however a couple of things to do to ensure it:
configure the library accordingly using the --with-threads options
+  call xmlInitParser() in the "main" thread before using any of the
+    libxml2 API (except possibly selecting a different memory allocator)
+
Note that the thread safety cannot be ensured for multiple threads sharing
+the same document, the locking must be done at the application level, libxml
+exports a basic mutex and reentrant mutexes API in <libxml/threads.h>.
+The parts of the library checked for thread safety are:
concurrent loading
   file access resolution
   catalog access
   catalog building
@@ -24,5 +23,5 @@ safetyare:
concurrent loading
   validation
   global variables per-thread override
   memory handling
-
XPath is supposed to be thread safe now, but this
-wasn'ttestedseriously.
Daniel Veillard
+
XPath is supposed to be thread safe now, but this wasn't tested
+seriously.
Daniel Veillard
diff --git a/doc/tree.html b/doc/tree.html
index 238cd6d..6556637 100644
--- a/doc/tree.html
+++ b/doc/tree.html
@@ -7,22 +7,22 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-The tree output The XML C parser and toolkit of Gnome
The tree output
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker The parser returns a tree built during the document analysis.
-Thevaluereturned is an xmlDocPtr(i.e., a pointer
-toanxmlDocstructure). This structure contains
-informationsuchas the file name, the document type, and
-achildrenpointerwhich is the root of the document (or
-moreexactly the first child under theroot which is the document). The tree
-ismade of xmlNodes,chained in double-linked lists of
-siblingsand with a children<->parentrelationship. An xmlNode can also
-carryproperties (a chain of xmlAttrstructures). An attribute may have a
-valuewhich is a list of TEXT orENTITY_REF nodes.
Here is an example (erroneous with respect to the XML spec
-sincethereshould be only one ELEMENT under the root):
In the source package there is a small program (not installed
-bydefault)called xmllintwhich parses XML files given
-asargument andprints them back as parsed. This is useful for detecting
-errorsboth in XMLcode and in the XML parser itself. It has an
-option--debugwhich prints the actual in-memory structure of
-thedocument; here is theresult with the examplegivenbefore:
DOCUMENT
+The tree output The XML C parser and toolkit of Gnome
The tree output
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker The parser returns a tree built during the document analysis. The value
+returned is an xmlDocPtr (i.e., a pointer to an
+xmlDoc structure). This structure contains information such
+as the file name, the document type, and a children pointer
+which is the root of the document (or more exactly the first child under the
+root which is the document). The tree is made of xmlNodes,
+chained in double-linked lists of siblings and with a children<->parent
+relationship. An xmlNode can also carry properties (a chain of xmlAttr
+structures). An attribute may have a value which is a list of TEXT or
+ENTITY_REF nodes.
Here is an example (erroneous with respect to the XML spec since there
+should be only one ELEMENT under the root):
In the source package there is a small program (not installed by default)
+called xmllint which parses XML files given as argument and
+prints them back as parsed. This is useful for detecting errors both in XML
+code and in the XML parser itself. It has an option --debug
+which prints the actual in-memory structure of the document; here is the
+result with the example given before:
DOCUMENT
 version=1.0
 standalone=true
   ELEMENT EXAMPLE
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 590b8a4..59815ba 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -7,102 +7,100 @@ H1 {font-family: Verdana,Arial,Helvetica}
 H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
-Upgrading 1.x code The XML C parser and toolkit of Gnome
Upgrading 1.x code
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Incompatible changes:
Version 2 of libxml2 is the first version introducing
-seriousbackwardincompatible changes. The main goals were:
a general cleanup. A number of mistakes inherited from the
-    veryearlyversions couldn't be changed due to compatibility
-    constraints.Examplethe "childs" element in the nodes.
-  Uniformization of the various nodes, at least for their header
-    andlinkparts (doc, parent, children, prev, next), the goal is
-    asimplerprogramming model and simplifying the task of the
-  DOMimplementors.
-  better conformances to the XML specification, for example version1.xhad
-    an heuristic to try to detect ignorable white spaces. As a resulttheSAX
-    event generated were ignorableWhitespace() while the
-    specrequirescharacter() in that case. This also mean that a number of
-    DOMnodecontaining blank text may populate the DOM tree which were
-    notpresentbefore.
-
How to fix libxml-1.x code:
So client code of libxml designed to run with version 1.x may have
-tobechanged to compile against version 2.x of libxml. Here is a list
-ofchangesthat I have collected, they may not be sufficient, so in case you
-findotherchange which are required, dropme amail:
The package name have changed from libxml to libxml2, the librarynameis
-    now -lxml2 . There is a new xml2-config script which should beused
-    toselect the right parameters libxml2
-  Node childsfield has
-    beenrenamedchildrenso s/childs/children/g should
-    beapplied(probability of having "childs" anywhere else is close to 0+
-  The document don't have anymore a rootelement
-    ithasbeen replaced by childrenand usually you will
-    getalist of element here. For example a Dtd element for the
-    internalsubsetand it's declaration may be found in that list, as well
-    asprocessinginstructions or comments found before or after the
-    documentroot element.Use xmlDocGetRootElement(doc)to get
-    theroot element ofa document. Alternatively if you are sure to not
-    referenceDTDs nor havePIs or comments before or after the
-    rootelements/->root/->children/g will probably do it.
-  The white space issue, this one is more complex, unless special
-    caseofvalidating parsing, the line breaks and spaces usually used
-    forindentingand formatting the document content becomes significant. So
-    theyarereported by SAX and if your using the DOM tree, corresponding
-    nodesaregenerated. Too approach can be taken:
-    lazy one, use the
-        compatibilitycallxmlKeepBlanksDefault(0)but be aware
-        that youarerelying on a special (and possibly broken) set of
-        heuristicsoflibxml to detect ignorable blanks. Don't complain if it
-        breaksormake your application not 100% clean w.r.t. to it's
-      input.
-      the Right Way: change you code to accept
-        possiblyinsignificantblanks characters, or have your tree populated
-        withweird blank textnodes. You can spot them using the
-        commodityfunctionxmlIsBlankNode(node)returning 1 for
-        suchblanknodes.
-    
Note also that with the new default the output functions don't
-    addanyextra indentation when saving a tree in order to be able to
-    roundtrip(read and save) without inflating the document with
-    extraformattingchars.
+Upgrading 1.x code The XML C parser and toolkit of Gnome
Upgrading 1.x code
Developer Menu
Main Menu
Reference Manual
Code Examples
XML Guidelines
Tutorial
The Reader Interface
ChangeLog
XSLT
Python and bindings
libxml2 architecture
The tree output
The SAX interface
Memory Management
I/O Interfaces
The parser interfaces
Entities or no entities
Namespaces
Upgrading 1.x code
Thread safety
DOM Principles
A real example
flat page, stylesheet
API Indexes
Alphabetic
Constructors
Functions/Types
Modules
Symbols
Related links
Mail archive
XSLT libxslt
DOM gdome2
XML-DSig xmlsec
FTP
Windows binaries
Solaris binaries
MacOsX binaries
C++ bindings
PHP bindings
Pascal bindings
Ruby bindings
Tcl bindings
Bug Tracker Incompatible changes:
Version 2 of libxml2 is the first version introducing serious backward
+incompatible changes. The main goals were:
a general cleanup. A number of mistakes inherited from the very early
+    versions couldn't be changed due to compatibility constraints. Example
+    the "childs" element in the nodes.
+  Uniformization of the various nodes, at least for their header and link
+    parts (doc, parent, children, prev, next), the goal is a simpler
+    programming model and simplifying the task of the DOM implementors.
+  better conformances to the XML specification, for example version 1.x
+    had an heuristic to try to detect ignorable white spaces. As a result the
+    SAX event generated were ignorableWhitespace() while the spec requires
+    character() in that case. This also mean that a number of DOM node
+    containing blank text may populate the DOM tree which were not present
+    before.
+
How to fix libxml-1.x code:
So client code of libxml designed to run with version 1.x may have to be
+changed to compile against version 2.x of libxml. Here is a list of changes
+that I have collected, they may not be sufficient, so in case you find other
+change which are required, drop me a
+mail:
The package name have changed from libxml to libxml2, the library name
+    is now -lxml2 . There is a new xml2-config script which should be used to
+    select the right parameters libxml2
+  Node childs field has been renamed
+    children so s/childs/children/g should be  applied
+    (probability of having "childs" anywhere else is close to 0+
+  The document don't have anymore a root element it has
+    been replaced by children and usually you will get a
+    list of element here. For example a Dtd element for the internal subset
+    and it's declaration may be found in that list, as well as processing
+    instructions or comments found before or after the document root element.
+    Use xmlDocGetRootElement(doc) to get the root element of
+    a document. Alternatively if you are sure to not reference DTDs nor have
+    PIs or comments before or after the root element
+    s/->root/->children/g will probably do it.
+  The white space issue, this one is more complex, unless special case of
+    validating parsing, the line breaks and spaces usually used for indenting
+    and formatting the document content becomes significant. So they are
+    reported by SAX and if your using the DOM tree, corresponding nodes are
+    generated. Too approach can be taken:
+    lazy one, use the compatibility call
+        xmlKeepBlanksDefault(0) but be aware that you are
+        relying on a special (and possibly broken) set of heuristics of
+        libxml to detect ignorable blanks. Don't complain if it breaks or
+        make your application not 100% clean w.r.t. to it's input.
+      the Right Way: change you code to accept possibly insignificant
+        blanks characters, or have your tree populated with weird blank text
+        nodes. You can spot them using the commodity function
+        xmlIsBlankNode(node) returning 1 for such blank
+        nodes.
+    
Note also that with the new default the output functions don't add any
+    extra indentation when saving a tree in order to be able to round trip
+    (read and save) without inflating the document with extra formatting
+    chars.
   
-  The include path has changed to $prefix/libxml/ and
-    theincludesthemselves uses this new prefix in includes instructions...
-    Ifyou areusing (as expected) the
+  
The include path has changed to $prefix/libxml/ and the includes
+    themselves uses this new prefix in includes instructions... If you are
+    using (as expected) the
     xml2-config --cflags
-    output to generate you compile commands this will probably work
-    outofthe box
+    output to generate you compile commands this will probably work out of
+    the box
   
-  xmlDetectCharEncoding takes an extra argument indicating the
-    lengthinbyte of the head of the document available for character
-    detection.
-
Ensuring both libxml-1.x and libxml-2.x compatibility
Two new version of libxml (1.8.11) and libxml2 (2.3.4) have beenreleasedto
-allow smooth upgrade of existing libxml v1code whileretainingcompatibility.
-They offers the following:
similar include naming, one
-    shoulduse#include<libxml/...>in both cases.
-  similar identifiers defined via macros for the child and
-    rootfields:respectivelyxmlChildrenNodeandxmlRootNode
-  a new macro LIBXML_TEST_VERSIONwhich should
-    beinsertedonce in the client code
-
So the roadmap to upgrade your existing libxml applications
-isthefollowing:
install the  libxml-1.8.8 (and libxml-devel-1.8.8) packages
-  find all occurrences where the xmlDoc rootfield
-    isusedand change it to xmlRootNode
-  similarly find all occurrences where
-    thexmlNodechildsfield is used and change
-    ittoxmlChildrenNode
-  add a LIBXML_TEST_VERSIONmacro somewhere
-    inyourmain()or in the library init entry point
+  xmlDetectCharEncoding takes an extra argument indicating the length in
+    byte of the head of the document available for character detection.
+
Ensuring both libxml-1.x and libxml-2.x compatibility
Two new version of libxml (1.8.11) and libxml2 (2.3.4) have been released
+to allow smooth upgrade of existing libxml v1code while retaining
+compatibility. They offers the following:
similar include naming, one should use
+    #include<libxml/...> in both cases.
+  similar identifiers defined via macros for the child and root fields:
+    respectively xmlChildrenNode and
+    xmlRootNode
+  a new macro LIBXML_TEST_VERSION which should be
+    inserted once in the client code
+
So the roadmap to upgrade your existing libxml applications is the
+following:
install the  libxml-1.8.8 (and libxml-devel-1.8.8) packages
+  find all occurrences where the xmlDoc root field is
+    used and change it to xmlRootNode
+  similarly find all occurrences where the xmlNode
+    childs field is used and change it to
+    xmlChildrenNode
+  add a LIBXML_TEST_VERSION macro somewhere in your
+    main() or in the library init entry point
   Recompile, check compatibility, it should still work
-  Change your configure script to look first for xml2-config and
-    fallbackusing xml-config . Use the --cflags and --libs output of the
-    commandasthe Include and Linking parameters needed to use libxml.
-  install libxml2-2.3.x and  libxml2-devel-2.3.x
-    (libxml-1.8.yandlibxml-devel-1.8.y can be kept simultaneously)
-  remove your config.cache, relaunch your configuration
-    mechanism,andrecompile, if steps 2 and 3 were done right it should
-    compileas-is
-  Test that your application is still running correctly, if not thismaybe
-    due to extra empty nodes due to formating spaces being kept
-    inlibxml2contrary to libxml1, in that case insert
-    xmlKeepBlanksDefault(1)in yourcode before calling the parser
-    (nexttoLIBXML_TEST_VERSIONis a fine place).
-
Following those steps should work. It worked for some of my own code.
Let me put some emphasis on the fact that there is far more
-changesfromlibxml 1.x to 2.x than the ones you may have to patch for. The
-overallcodehas been considerably cleaned up and the conformance to the
-XMLspecificationhas been drastically improved too. Don't take those changes
-asan excuse tonot upgrade, it may cost a lot on the long term ...
Daniel Veillard
+  
Change your configure script to look first for xml2-config and fall
+    back using xml-config . Use the --cflags and --libs output of the command
+    as the Include and Linking parameters needed to use libxml.
+  install libxml2-2.3.x and  libxml2-devel-2.3.x (libxml-1.8.y and
+    libxml-devel-1.8.y can be kept simultaneously)
+  remove your config.cache, relaunch your configuration mechanism, and
+    recompile, if steps 2 and 3 were done right it should compile as-is
+  Test that your application is still running correctly, if not this may
+    be due to extra empty nodes due to formating spaces being kept in libxml2
+    contrary to libxml1, in that case insert xmlKeepBlanksDefault(1) in your
+    code before calling the parser (next to
+    LIBXML_TEST_VERSION is a fine place).
+
Following those steps should work. It worked for some of my own code.
Let me put some emphasis on the fact that there is far more changes from
+libxml 1.x to 2.x than the ones you may have to patch for. The overall code
+has been considerably cleaned up and the conformance to the XML specification
+has been drastically improved too. Don't take those changes as an excuse to
+not upgrade, it may cost a lot on the long term ...
Daniel Veillard
diff --git a/doc/xml.html b/doc/xml.html
index 72a0a9c..a25b8d0 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -3,42 +3,42 @@
 
 
   The XML C parser and toolkit of Gnome
-  
-  
+  
+  
 
 
 
 The XML C parser and toolkit of Gnome
 
-Note: this is the flat content of the website
+Note: this is the flat content of the web
+site
 
 libxml, a.k.a. gnome-xml
 
 
 
 "Programmingwithlibxml2
-is like the thrilling embrace of an exotic stranger." MarkPilgrim
-
-Libxml2 is the XML C parser and toolkit developed for the Gnomeproject(but
-usable outside of the Gnome platform), it is free softwareavailableunder the
-MITLicense.XML
-itself is a metalanguage to design markup languages, i.e.text languagewhere
-semantic and structure are added to the content usingextra
-"markup"information enclosed between angle brackets. HTML is the
-mostwell-knownmarkup language. Though the library is written in C avariety of language bindingsmake it available inother
-environments.
-
-Libxml2 is known to be very portable, the library should build
-andworkwithout serious troubles on a variety of systems (Linux,
-Unix,Windows,CygWin, MacOS, MacOS X, RISC Os, OS/2, VMS, QNX, MVS, ...)
-
-Libxml2 implements a number of existing standards related
-tomarkuplanguages:
+style="text-align: right; font-style: italic; font-size: 10pt">"Programming
+with libxml2 is like the thrilling embrace of an exotic stranger." Mark
+Pilgrim
+
+Libxml2 is the XML C parser and toolkit developed for the Gnome project
+(but usable outside of the Gnome platform), it is free software available
+under the MIT
+License. XML itself is a metalanguage to design markup languages, i.e.
+text language where semantic and structure are added to the content using
+extra "markup" information enclosed between angle brackets. HTML is the most
+well-known markup language. Though the library is written in C a variety of language bindings make it available in
+other environments.
+
+Libxml2 is known to be very portable, the library should build and work
+without serious troubles on a variety of systems (Linux, Unix, Windows,
+CygWin, MacOS, MacOS X, RISC Os, OS/2, VMS, QNX, MVS, ...)
+
+Libxml2 implements a number of existing standards related to markup
+languages:
 
   the XML standard: http://www.w3.org/TR/REC-xml
@@ -46,9 +46,8 @@ tomarkuplanguages:
     href="http://www.w3.org/TR/REC-xml-names/">http://www.w3.org/TR/REC-xml-names/
   XML Base: http://www.w3.org/TR/xmlbase/
-  RFC2396:Uniform
-    Resource Identifiers RFC 2396 :
+    Uniform Resource Identifiers http://www.ietf.org/rfc/rfc2396.txt
   XML Path Language (XPath) 1.0: http://www.w3.org/TR/xpath
@@ -59,67 +58,63 @@ tomarkuplanguages:
   XML Inclusions (XInclude) Version 1.0: http://www.w3.org/TR/xinclude/
   ISO-8859-x encodings, as well as rfc2044[UTF-8]andrfc2781[UTF-16]Unicode
-    encodings, and more if using iconv support
+    href="http://www.cis.ohio-state.edu/rfc/rfc2044.txt">rfc2044 [UTF-8]
+    and rfc2781
+    [UTF-16] Unicode encodings, and more if using iconv support
   part of SGML Open Technical Resolution TR9401:1997
   XML Catalogs Working Draft 06 August 2001: http://www.oasis-open.org/committees/entity/spec-2001-08-06.html
   Canonical XML Version 1.0: http://www.w3.org/TR/xml-c14nandthe
-    Exclusive XML Canonicalization CR draft http://www.w3.org/TR/xml-c14n
+    and the Exclusive XML Canonicalization CR draft http://www.w3.org/TR/xml-exc-c14n
   Relax NG, ISO/IEC 19757-2:2003, http://www.oasis-open.org/committees/relax-ng/spec-20011203.html
   W3C XML Schemas Part 2: Datatypes REC
-    02May2001
-  W3C xml:idWorking
-    Draft7April 2004
+    href="http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/">REC 02 May
+    2001
+  W3C xml:id Working Draft 7
+    April 2004
 
 
-In most cases libxml2 tries to implement the specifications in
-arelativelystrictly compliant way. As of release 2.4.16, libxml2 passed
-all1800+ testsfrom the OASIS
-XMLTestsSuite.
+In most cases libxml2 tries to implement the specifications in a
+relatively strictly compliant way. As of release 2.4.16, libxml2 passed all
+1800+ tests from the OASIS XML Tests
+Suite.
 
-To some extent libxml2 provides support for the
-followingadditionalspecifications but doesn't claim to implement them
-completely:
+To some extent libxml2 provides support for the following additional
+specifications but doesn't claim to implement them completely:
 
   Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/thedocument
-    model, but it doesn't implement the API itself, gdome2 doesthison top of
-    libxml2
-  RFC959:libxml2
-    implements a basic FTP client code
-  RFC1945:HTTP/1.0,
-    again a basic HTTP client code
-  SAX: a SAX2 like interface and a minimal SAX1
-    implementationcompatiblewith early expat versions
+    href="http://www.w3.org/TR/DOM-Level-2-Core/">http://www.w3.org/TR/DOM-Level-2-Core/
+    the document model, but it doesn't implement the API itself, gdome2 does
+    this on top of libxml2
+  RFC 959 :
+    libxml2 implements a basic FTP client code
+  RFC 1945 :
+    HTTP/1.0, again a basic HTTP client code
+  SAX: a SAX2 like interface and a minimal SAX1 implementation compatible
+    with early expat versions
 
 
 A partial implementation of XML Schemas
-Part1:Structureis being worked on but it would be far too early to
-makeanyconformance statement about it at the moment.
+href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schemas Part
+1: Structure is being worked on but it would be far too early to make any
+conformance statement about it at the moment.
 
 Separate documents:
 
-  the libxslt
-    pageprovidinganimplementation of XSLT 1.0 and common extensions like
-    EXSLTforlibxml2
-  the gdome2
-    page:a standard DOM2 implementation for libxml2
-  the XMLSec
-    page:animplementation of W3CXMLDigital Signaturefor
-    libxml2
-  also check the related links section below for more related
-    andactiveprojects.
+  the libxslt page providing an
+    implementation of XSLT 1.0 and common extensions like EXSLT for
+  libxml2
+  the gdome2 page
+    : a standard DOM2 implementation for libxml2
+  the XMLSec page: an
+    implementation of W3C XML
+    Digital Signature for libxml2
+  also check the related links section below for more related and active
+    projects.
 
 
-	2006-03-05
+	$Date: 2006/08/21 08:34:11 $
 	
 	
 	
@@ -94,35 +94,6 @@
 		or it can perform multiple functions in interactive mode. It can operate
 		on both XML and SGML files.
 	
-	More information can be found at
-		
-			
-				
-						libxml
-						3
-					 web page 
-				
-			
-			
-				
-						libxml
-						3
-					 catalog support web page
-					at 
-				
-			
-			
-				James Clark's SGML catalog
-					page 
-				
-			
-			
-				OASIS XML catalog specification
-					
-				
-			
-		
-	
 
 
 
@@ -340,7 +311,7 @@
 	
 	
 		
-			Execute a public identifier lookup of the catalog entry
+			Execute a Formal Public Identifier look-up of the catalog entry
 			for PUBLIC-ID. The corresponding entry will be
 			output to the command line.
 		
@@ -358,7 +329,7 @@
 	
 	
 		
-			Execute a public identifier lookup of the catalog entry
+			Execute a Formal Public Identifier look-up of the catalog entry
 			for SYSTEM-ID. The corresponding entry will be
 			output to the command line.
 		
@@ -375,12 +346,11 @@
 		
 	XML_CATALOG_FILES
 	
-		
-			Catalog behavior can be changed by redirecting queries to the user's
-			own set of catalogs. This can be done by setting
+		XML catalog behavior can be changed by redirecting
+			queries to the user's own set of catalogs. This can be done by setting
 			the XML_CATALOG_FILES environment variable to a list
 			of catalogs. An empty one should deactivate loading the
-			default /etc/xml/catalog default catalog.
+			default /etc/xml/catalog catalog.
 		
 	
 		
@@ -391,7 +361,7 @@
 
 	DIAGNOSTICS
 	
-		&xmlcatalog;'s return codes provide information that can be used when
+		&xmlcatalog; return codes provide information that can be used when
 		calling it from scripts.
 	
 	
@@ -427,7 +397,7 @@
 		
 	4
 	
-		Failed to lookup an entry in the catalog
+		Failed to look up an entry in the catalog
 	
 		
 
@@ -436,12 +406,41 @@
 
 
 	SEE ALSO
-	
-		
+	
 			libxml
 			3
 		
 	
+	
+		More information can be found at
+		
+			
+				
+						libxml
+						3
+					 web page 
+				
+			
+			
+				
+						libxml
+						3
+					 catalog support web page
+					at 
+				
+			
+			
+				James Clark's SGML catalog
+					page 
+				
+			
+			
+				OASIS XML catalog specification
+					
+				
+			
+		
+	
 
 
 
diff --git a/doc/xmldtd.html b/doc/xmldtd.html
index 3f5a797..c5541d6 100644
--- a/doc/xmldtd.html
+++ b/doc/xmldtd.html
@@ -17,84 +17,84 @@ A:link, A:visited, A:active { text-decoration: underline }
   Some examples
   How to validate
   Other resources
-General overview
Well what is validation and what is a DTD ?
DTD is the acronym for Document Type Definition. This is a
-descriptionofthe content for a family of XML files. This is part of the
-XML1.0specification, and allows one to describe and verify that a
-givendocumentinstance conforms to the set of rules detailing its structure
-andcontent.
Validation is the process of checking a document against a
-DTD(moregenerally against a set of construction rules).
The validation process and building DTDs are the two most difficultpartsof
-the XML life cycle. Briefly a DTD defines all the possible elementsto befound
-within your document, what is the formal shape of your documenttree(by
-defining the allowed content of an element; either text, aregularexpression
-for the allowed list of children, or mixed content i.e.both textand
-children). The DTD also defines the valid attributes for allelements andthe
-types of those attributes.
The definition
The W3C XML Recommendation(Tim Bray's annotated
-versionofRev1):
Declaringelements
-  Declaringattributes
-
(unfortunately) all this is inherited from the SGML world, the
-syntaxisancient...
Simple rules
Writing DTDs can be done in many ways. The rules to build them if
-youneedsomething permanent or something which can evolve over time can
-beradicallydifferent. Really complex DTDs like DocBook ones are flexible
-butquiteharder to design. I will just focus on DTDs for a formats with a
-fixedsimplestructure. It is just a set of basic rules, and definitely
-notexhaustive norusable for complex DTD design.
How to reference a DTD from a document:
Assuming the top element of the document is specand the
-dtdisplaced in the file mydtdin the
-subdirectorydtdsofthe directory from where the document were
-loaded:
<!DOCTYPE spec SYSTEM "dtds/mydtd">
Notes:
The system string is actually an URI-Reference (as defined in RFC 2396) so you can
-    useafull URL string indicating the location of your DTD on the Web. This
-    isareally good thing to do if you want others to validate
-  yourdocument.
-  It is also possible to associate a PUBLICidentifier(amagic
-    string) so that the DTD is looked up in catalogs on the clientsidewithout
-    having to locate it on the web.
-  A DTD contains a set of element and attribute declarations,
-    buttheydon't define what the root of the document should be. This
-    isexplicitlytold to the parser/validator as the first element
-    oftheDOCTYPEdeclaration.
-
Declaring elements:
The following declares an element spec:
<!ELEMENT spec (front, body, back?)>
It also expresses that the spec element contains onefront,one
-bodyand one optionalbackchildren elements inthis
-order. The declaration of oneelement of the structure and its contentare done
-in a single declaration.Similarly the following
-declaresdiv1elements:
<!ELEMENT div1 (head, (p | list | note)*, div2?)>
which means div1 contains one headthen a series
-ofoptionalp, lists and notes and
-thenanoptional div2. And last but not least an element
-cancontaintext:
<!ELEMENT b (#PCDATA)>
bcontains text or being of mixed content (text and
-elementsinno particular order):
<!ELEMENT p (#PCDATA|a|ul|b|i|em)*>
p can contain text or
-a,ul,b, i or
-emelements inno particularorder.
Declaring attributes:
Again the attributes declaration includes their content definition:
<!ATTLIST termdef name CDATA #IMPLIED>
means that the element termdefcan have
-anameattribute containing text (CDATA) and which
-isoptional(#IMPLIED). The attribute value can also be
-definedwithin aset:
<!ATTLIST list
-type(bullets|ordered|glossary)"ordered">
means listelement have a typeattribute
-with3allowed values "bullets", "ordered" or "glossary" and which
-defaultto"ordered" if the attribute is not explicitly specified.
The content type of an attribute can be
-text(CDATA),anchor/reference/references(ID/IDREF/IDREFS),entity(ies)(ENTITY/ENTITIES)
-orname(s)(NMTOKEN/NMTOKENS). The following
-definesthat achapterelement can have an
-optionalidattributeof type ID, usable for reference
-fromattribute of typeIDREF:
<!ATTLIST chapter id ID #IMPLIED>
The last value of an attribute definition can
-be#REQUIREDmeaning that the attribute has to be
-given,#IMPLIEDmeaning that it is optional, or the default
-value(possibly prefixed by#FIXEDif it is the only allowed).
Notes:
Usually the attributes pertaining to a given element are declared
-    inasingle expression, but it is just a convention adopted by a lot
-    ofDTDwriters:
+General overview
Well what is validation and what is a DTD ?
DTD is the acronym for Document Type Definition. This is a description of
+the content for a family of XML files. This is part of the XML 1.0
+specification, and allows one to describe and verify that a given document
+instance conforms to the set of rules detailing its structure and content.
Validation is the process of checking a document against a DTD (more
+generally against a set of construction rules).
The validation process and building DTDs are the two most difficult parts
+of the XML life cycle. Briefly a DTD defines all the possible elements to be
+found within your document, what is the formal shape of your document tree
+(by defining the allowed content of an element; either text, a regular
+expression for the allowed list of children, or mixed content i.e. both text
+and children). The DTD also defines the valid attributes for all elements and
+the types of those attributes.
The definition
The W3C XML Recommendation (Tim Bray's annotated version of
+Rev1):
Declaring
+  elements
+  Declaring
+  attributes
+
(unfortunately) all this is inherited from the SGML world, the syntax is
+ancient...
Simple rules
Writing DTDs can be done in many ways. The rules to build them if you need
+something permanent or something which can evolve over time can be radically
+different. Really complex DTDs like DocBook ones are flexible but quite
+harder to design. I will just focus on DTDs for a formats with a fixed simple
+structure. It is just a set of basic rules, and definitely not exhaustive nor
+usable for complex DTD design.
How to reference a DTD from a document:
Assuming the top element of the document is spec and the dtd
+is placed in the file mydtd in the subdirectory
+dtds of the directory from where the document were loaded:
<!DOCTYPE spec SYSTEM "dtds/mydtd">
Notes:
The system string is actually an URI-Reference (as defined in RFC 2396) so you can use a
+    full URL string indicating the location of your DTD on the Web. This is a
+    really good thing to do if you want others to validate your document.
+  It is also possible to associate a PUBLIC identifier (a
+    magic string) so that the DTD is looked up in catalogs on the client side
+    without having to locate it on the web.
+  A DTD contains a set of element and attribute declarations, but they
+    don't define what the root of the document should be. This is explicitly
+    told to the parser/validator as the first element of the
+    DOCTYPE declaration.
+
Declaring elements:
The following declares an element spec:
<!ELEMENT spec (front, body, back?)>
It also expresses that the spec element contains one front,
+one body and one optional back children elements in
+this order. The declaration of one element of the structure and its content
+are done in a single declaration. Similarly the following declares
+div1 elements:
<!ELEMENT div1 (head, (p | list | note)*, div2?)>
which means div1 contains one head then a series of optional
+p, lists and notes and then an
+optional div2. And last but not least an element can contain
+text:
<!ELEMENT b (#PCDATA)>
b contains text or being of mixed content (text and elements
+in no particular order):
<!ELEMENT p (#PCDATA|a|ul|b|i|em)*>
p can contain text or a, ul,
+b, i or em elements in no particular
+order.
Declaring attributes:
Again the attributes declaration includes their content definition:
<!ATTLIST termdef name CDATA #IMPLIED>
means that the element termdef can have a name
+attribute containing text (CDATA) and which is optional
+(#IMPLIED). The attribute value can also be defined within a
+set:
<!ATTLIST list type (bullets|ordered|glossary)
+"ordered">
means list element have a type attribute with 3
+allowed values "bullets", "ordered" or "glossary" and which default to
+"ordered" if the attribute is not explicitly specified.
The content type of an attribute can be text (CDATA),
+anchor/reference/references
+(ID/IDREF/IDREFS), entity(ies)
+(ENTITY/ENTITIES) or name(s)
+(NMTOKEN/NMTOKENS). The following defines that a
+chapter element can have an optional id attribute
+of type ID, usable for reference from attribute of type
+IDREF:
<!ATTLIST chapter id ID #IMPLIED>
The last value of an attribute definition can be #REQUIRED
+meaning that the attribute has to be given, #IMPLIED
+meaning that it is optional, or the default value (possibly prefixed by
+#FIXED if it is the only allowed).
Notes:
Usually the attributes pertaining to a given element are declared in a
+    single expression, but it is just a convention adopted by a lot of DTD
+    writers:
     <!ATTLIST termdef
           id      ID      #REQUIRED
           name    CDATA   #IMPLIED>
-    The previous construct defines
-    bothidandnameattributes for the
-    elementtermdef.
+    The previous construct defines both id and
+    name attributes for the element termdef.
   
-
Some examples
The directory test/valid/dtds/in the
-libxml2distributioncontains some complex DTD examples. The example in
-thefiletest/valid/dia.xmlshows an XML file where the simple
-DTDisdirectly included within the document.
How to validate
The simplest way is to use the xmllint program included with
-libxml.The--validoption turns-on validation of the files given
-asinput.For example the following validates a copy of the first revision of
-theXML1.0 specification:
xmllint --valid --noout test/valid/REC-xml-19980210.xml
the -- noout is used to disable output of the resulting tree.
The --dtdvalid dtdallows validation of the
-document(s)againsta given DTD.
Libxml2 exports an API to handle DTDs and validation, check the associateddescription.
Other resources
DTDs are as old as SGML. So there may be a number of examples
-on-line,Iwill just list one for now, others pointers welcome:
XML-101 DTD
-
I suggest looking at the examples found under test/valid/dtd and any
-ofthelarge number of books available on XML. The dia example in
-test/validshouldbe both simple and complete enough to allow you to build your
-own.
Daniel Veillard
+Some examples
The directory test/valid/dtds/ in the libxml2 distribution
+contains some complex DTD examples. The example in the file
+test/valid/dia.xml shows an XML file where the simple DTD is
+directly included within the document.
How to validate
The simplest way is to use the xmllint program included with libxml. The
+--valid option turns-on validation of the files given as input.
+For example the following validates a copy of the first revision of the XML
+1.0 specification:
xmllint --valid --noout test/valid/REC-xml-19980210.xml
the -- noout is used to disable output of the resulting tree.
The --dtdvalid dtd allows validation of the document(s)
+against a given DTD.
Libxml2 exports an API to handle DTDs and validation, check the associated
+description.
Other resources
DTDs are as old as SGML. So there may be a number of examples on-line, I
+will just list one for now, others pointers welcome:
XML-101 DTD
+
I suggest looking at the examples found under test/valid/dtd and any of
+the large number of books available on XML. The dia example in test/valid
+should be both simple and complete enough to allow you to build your own.
Daniel Veillard
diff --git a/doc/xmlio.html b/doc/xmlio.html
index ae71ba1..60188df 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -13,64 +13,64 @@ A:link, A:visited, A:active { text-decoration: underline }
   
Output I/O handlers
   The entities loader
   Example of customized I/O
-General overview
The module xmlIO.hprovidestheinterfaces
-to the libxml2 I/O system. This consists of 4 main parts:
Entities loader, this is a routine which tries to fetch
-    theentities(files) based on their PUBLIC and SYSTEM identifiers. The
-    defaultloaderdon't look at the public identifier since libxml2 do not
-    maintainacatalog. You can redefine you own entity loader
-    byusingxmlGetExternalEntityLoader()andxmlSetExternalEntityLoader().Check theexample.
-  Input I/O buffers which are a commodity structure used by
-    theparser(s)input layer to handle fetching the informations to feed
-    theparser. Thisprovides buffering and is also a placeholder where
-    theencodingconverters to UTF8 are piggy-backed.
-  Output I/O buffers are similar to the Input ones and fulfillsimilartask
-    but when generating a serialization from a tree.
-  A mechanism to register sets of I/O callbacks and associate
-    themwithspecific naming schemes like the protocol part of the URIs.
-    This affect the default I/O operations and allows to use
-    specificI/Ohandlers for certain names.
+General overview
The module xmlIO.h provides
+the interfaces to the libxml2 I/O system. This consists of 4 main parts:
Entities loader, this is a routine which tries to fetch the entities
+    (files) based on their PUBLIC and SYSTEM identifiers. The default loader
+    don't look at the public identifier since libxml2 do not maintain a
+    catalog. You can redefine you own entity loader by using
+    xmlGetExternalEntityLoader() and
+    xmlSetExternalEntityLoader(). Check the
+    example.
+  Input I/O buffers which are a commodity structure used by the parser(s)
+    input layer to handle fetching the informations to feed the parser. This
+    provides buffering and is also a placeholder where the encoding
+    converters to UTF8 are piggy-backed.
+  Output I/O buffers are similar to the Input ones and fulfill similar
+    task but when generating a serialization from a tree.
+  A mechanism to register sets of I/O callbacks and associate them with
+    specific naming schemes like the protocol part of the URIs.
+    This affect the default I/O operations and allows to use specific I/O
+    handlers for certain names.
   
-
The general mechanism used when loading
-http://rpmfind.net/xml.htmlforexample in the HTML parser is the following:
The default entity loader
-    callsxmlNewInputFromFile()withthe parsing context and the
-    URIstring.
-  the URI string is checked against the existing registered
-    handlersusingtheir match() callback function, if the HTTP module was
-    compiledin, it isregistered and its match() function will succeeds
-  the open() function of the handler is called and if
-    successfulwillreturn an I/O Input buffer
-  the parser will the start reading from this buffer
-    andprogressivelyfetch information from the resource, calling the
-    read()function of thehandler until the resource is exhausted
-  if an encoding change is detected it will be installed on
-    theinputbuffer, providing buffering and efficient use of
-    theconversionroutines
-  once the parser has finished, the close() function of the
-    handleriscalled once and the Input buffer and associated
-    resourcesaredeallocated.
-
The user defined callbacks are checked first to allow overriding
-ofthedefault libxml2 I/O routines.
The basic buffer type
All the buffer manipulation handling is done
-usingthexmlBuffertype define in tree.hwhich
-isaresizable memory buffer. The buffer allocation strategy can be selected
-tobeeither best-fit or use an exponential doubling one (CPU vs.
-memoryusetrade-off). The values
-areXML_BUFFER_ALLOC_EXACTandXML_BUFFER_ALLOC_DOUBLEIT,and
-can be set individually or on asystem wide basis
-usingxmlBufferSetAllocationScheme(). A numberof functions allows
-tomanipulate buffers with names starting
-withthexmlBuffer...prefix.
Input I/O handlers
An Input I/O handler is a
-simplestructurexmlParserInputBuffercontaining a context
-associated totheresource (file descriptor, or pointer to a protocol handler),
-the read()andclose() callbacks to use and an xmlBuffer. And extra xmlBuffer
-and acharsetencoding handler are also present to support charset
-conversionwhenneeded.
Output I/O handlers
An Output handler xmlOutputBufferis completely similar
-toanInput one except the callbacks are write() and close().
The entities loader
The entity loader resolves requests for new entities and create
-inputsforthe parser. Creating an input from a filename or an URI string
-isdonethrough the xmlNewInputFromFile() routine.  The default entity loader
-donothandle the PUBLIC identifier associated with an entity (if any). So
-itjustcalls xmlNewInputFromFile() with the SYSTEM identifier (which
-ismandatory inXML).
If you want to hook up a catalog mechanism then you simply need
-tooverridethe default entity loader, here is an example:
#include <libxml/xmlIO.h>
+
The general mechanism used when loading http://rpmfind.net/xml.html for
+example in the HTML parser is the following:
The default entity loader calls xmlNewInputFromFile() with
+    the parsing context and the URI string.
+  the URI string is checked against the existing registered handlers
+    using their match() callback function, if the HTTP module was compiled
+    in, it is registered and its match() function will succeeds
+  the open() function of the handler is called and if successful will
+    return an I/O Input buffer
+  the parser will the start reading from this buffer and progressively
+    fetch information from the resource, calling the read() function of the
+    handler until the resource is exhausted
+  if an encoding change is detected it will be installed on the input
+    buffer, providing buffering and efficient use of the conversion
+  routines
+  once the parser has finished, the close() function of the handler is
+    called once and the Input buffer and associated resources are
+  deallocated.
+
The user defined callbacks are checked first to allow overriding of the
+default libxml2 I/O routines.
The basic buffer type
All the buffer manipulation handling is done using the
+xmlBuffer type define in tree.h which is a
+resizable memory buffer. The buffer allocation strategy can be selected to be
+either best-fit or use an exponential doubling one (CPU vs. memory use
+trade-off). The values are XML_BUFFER_ALLOC_EXACT and
+XML_BUFFER_ALLOC_DOUBLEIT, and can be set individually or on a
+system wide basis using xmlBufferSetAllocationScheme(). A number
+of functions allows to manipulate buffers with names starting with the
+xmlBuffer... prefix.
Input I/O handlers
An Input I/O handler is a simple structure
+xmlParserInputBuffer containing a context associated to the
+resource (file descriptor, or pointer to a protocol handler), the read() and
+close() callbacks to use and an xmlBuffer. And extra xmlBuffer and a charset
+encoding handler are also present to support charset conversion when
+needed.
Output I/O handlers
An Output handler xmlOutputBuffer is completely similar to an
+Input one except the callbacks are write() and close().
The entities loader
The entity loader resolves requests for new entities and create inputs for
+the parser. Creating an input from a filename or an URI string is done
+through the xmlNewInputFromFile() routine.  The default entity loader do not
+handle the PUBLIC identifier associated with an entity (if any). So it just
+calls xmlNewInputFromFile() with the SYSTEM identifier (which is mandatory in
+XML).
If you want to hook up a catalog mechanism then you simply need to
+override the default entity loader, here is an example:
#include <libxml/xmlIO.h>
 
 xmlExternalEntityLoader defaultLoader = NULL;
 
@@ -99,10 +99,11 @@ int main(..) {
     xmlSetExternalEntityLoader(xmlMyExternalEntityLoader);
 
     ...
-}
Example of customized I/O
This example come from areal use case,xmlDocDump()
-closes the FILE * passed by the applicationand this was aproblem. The solutionwasto redefine anew
-output handler with the closing call deactivated:
First define a new I/O output allocator where the output don't
-    closethefile:
+}Example of customized I/O
This example come from a
+real use case,  xmlDocDump() closes the FILE * passed by the application
+and this was a problem. The solution was to redefine a
+new output handler with the closing call deactivated:
First define a new I/O output allocator where the output don't close
+    the file:
     xmlOutputBufferPtr
 xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) {
 ����xmlOutputBufferPtr ret;
diff --git a/doc/xmllint.1 b/doc/xmllint.1
index 13e38f5..18ef917 100644
--- a/doc/xmllint.1
+++ b/doc/xmllint.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "XMLLINT" "1" "2006\-03\-05" "libxml2" ""
+.TH "XMLLINT" "1" "$Date: 2006/08/21 08:34:11 $" "libxml2" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -18,7 +18,9 @@ xmllint \- command line XML tool
 .PP
 The
 \fBxmllint\fR
-program parses one or more XML files, specified on the command line as
+program parses one or more
+XML
+files, specified on the command line as
 \fIXML\-FILE\fR
 (or the standard input if the filename provided is
 \fB\-\fR
@@ -31,19 +33,6 @@ parser itself.
 \fBxmllint\fR
 is included in
 \fBlibxml\fR(3).
-.PP
-More information can be found at
-.TP 3
-\(bu
-\fBlibxml\fR(3)
-web page
-\fI\%http://www.xmlsoft.org/\fR
-.TP
-\(bu
-W3C
-XSLT
-page
-\fI\%http://www.w3.org/TR/xslt\fR
 .SH "OPTIONS"
 .PP
 \fBxmllint\fR
@@ -53,10 +42,14 @@ accepts the following options (in alphabetical order):
 Generate a small document for testing purposes.
 .TP
 \fB\-\-catalogs\fR
-Use the catalogs from
+Use the
+SGML
+catalog(s) from
 \fBSGML_CATALOG_FILES\fR. Otherwise
+XML
+catalogs starting from
 \fI/etc/xml/catalog\fR
-is used by default.
+are used by default.
 .TP
 \fB\-\-chkregister\fR
 Turn on node registration. Useful for developers testing
@@ -65,14 +58,16 @@ node tracking code.
 .TP
 \fB\-\-compress\fR
 Turn on
-gzip
+\fBgzip\fR(1)
 compression of output.
 .TP
 \fB\-\-copy\fR
 Test the internal copy implementation.
 .TP
 \fB\-\-c14n\fR
-Use the W3C XML Canonicalisation (C14N) to serialize the result of parsing to
+Use the W3C
+XML
+Canonicalisation (C14N) to serialize the result of parsing to
 \fIstdout\fR. It keeps comments in the result.
 .TP
 \fB\-\-dtdvalid \fR\fB\fIURL\fR\fR
@@ -85,9 +80,9 @@ for validation.
 \fB\-\-dtdvalidfpi \fR\fB\fIFPI\fR\fR
 Use the
 DTD
-specified by a Public Identifier
+specified by a Formal Public Identifier
 \fIFPI\fR
-for validation, note that this will require a Catalog exporting that Public Identifier to work.
+for validation, note that this will require a catalog exporting that Formal Public Identifier to work.
 .TP
 \fB\-\-debug\fR
 Parse a file and output an annotated tree of the in\-memory version of the document.
@@ -111,7 +106,7 @@ Output in the given encoding.
 \fB\-\-format\fR
 Reformat and reindent the output. The
 \fBXMLLINT_INDENT\fR
-environment variable controls the indentation (default value is two spaces " ").
+environment variable controls the indentation. The default value is two spaces " ").
 .TP
 \fB\-\-help\fR
 Print out a short usage summary for
@@ -135,7 +130,7 @@ tags surrounding the result tree output so the results can be displayed/viewed i
 Test for valid insertions.
 .TP
 \fB\-\-loaddtd\fR
-Fetch external
+Fetch an external
 DTD.
 .TP
 \fB\-\-load\-trace\fR
@@ -207,7 +202,7 @@ DTDs or entities. Enclose space\-separated lists by quotation marks.
 Used to exercise the pattern recognition engine, which can be used with the reader interface to the parser. It allows to select some nodes in the document based on an XPath (subset) expression. Used for debugging.
 .TP
 \fB\-\-postvalid\fR
-Validate after parsing is completed.
+Validate after parsing has completed.
 .TP
 \fB\-\-push\fR
 Use the push mode of the parser.
@@ -224,7 +219,9 @@ for validation.
 Repeat 100 times, for timing or profiling.
 .TP
 \fB\-\-schema \fR\fB\fISCHEMA\fR\fR
-Use a W3C XML Schema file named
+Use a W3C
+XML
+Schema file named
 \fISCHEMA\fR
 for validation.
 .TP
@@ -233,7 +230,9 @@ Run a navigating shell. Details on available commands in shell mode are below (s
 the section called \(lqSHELL COMMANDS\(rq).
 .TP
 \fB\-\-stream\fR
-Use streaming API \- useful when used in combination with
+Use streaming
+API
+\- useful when used in combination with
 \fB\-\-relaxng\fR
 or
 \fB\-\-valid\fR
@@ -264,7 +263,7 @@ used.
 \fB\-\-walker\fR
 Test the walker module, which is a reader interface but for a document tree, instead of using the reader
 API
-on an unparsed document it works on a existing in\-memory tree. Used in debugging.
+on an unparsed document it works on an existing in\-memory tree. Used for debugging.
 .TP
 \fB\-\-xinclude\fR
 Do XInclude processing.
@@ -275,7 +274,7 @@ Used in conjunction with
 HTML
 is parsed the document is saved with the
 HTML
-serializer, but with this option the resulting document is saved with the
+serializer. But with this option the resulting document is saved with the
 XML
 serializer. This is primarily used to generate
 XHTML
@@ -341,29 +340,38 @@ Write the current node to the given filename.
 .SH "ENVIRONMENT"
 .TP
 \fBSGML_CATALOG_FILES\fR
-to be written ...
+SGML
+catalog behavior can be changed by redirecting queries to the user's own set of catalogs. This can be done by setting the
+\fBSGML_CATALOG_FILES\fR
+environment variable to a list of catalogs. An empty one should deactivate loading the default
+\fI/etc/sgml/catalog\fR
+catalog.
 .TP
 \fBXML_CATALOG_FILES\fR
-Catalog behavior can be changed by redirecting queries to the user's own set of catalogs. This can be done by setting the
+XML
+catalog behavior can be changed by redirecting queries to the user's own set of catalogs. This can be done by setting the
 \fBXML_CATALOG_FILES\fR
 environment variable to a list of catalogs. An empty one should deactivate loading the default
 \fI/etc/xml/catalog\fR
-default catalog.
+catalog.
 .TP
 \fBXML_DEBUG_CATALOG\fR
 Setting the environment variable
 \fBXML_DEBUG_CATALOG\fR
+to
+\fInon\-zero\fR
 using the
 \fBexport\fR
 command outputs debugging information related to catalog operations.
 .TP
 \fBXMLLINT_INDENT\fR
-to be written ...
+Setting the environment variable
+\fBXMLLINT_INDENT\fR
+controls the indentation. The default value is two spaces " ".
 .SH "DIAGNOSTICS"
 .PP
-On the completion of execution,
 \fBxmllint\fR
-returns the following error codes:
+return codes provide information that can be used when calling it from scripts.
 .TP
 \fB0\fR
 No error
@@ -402,5 +410,18 @@ Out of memory error
 .SH "SEE ALSO"
 .PP
 \fBlibxml\fR(3)
+.PP
+More information can be found at
+.TP 3
+\(bu
+\fBlibxml\fR(3)
+web page
+\fI\%http://www.xmlsoft.org/\fR
+.TP
+\(bu
+W3C
+XSLT
+page
+\fI\%http://www.w3.org/TR/xslt\fR
 .SH "AUTHOR"
 John Fleck , Ziying Sherwin , Heiko Rupp . 
diff --git a/doc/xmllint.xml b/doc/xmllint.xml
index 904e706..9757675 100644
--- a/doc/xmllint.xml
+++ b/doc/xmllint.xml
@@ -46,7 +46,7 @@
 		
 	
 	
-	2006-03-05
+	$Date: 2006/08/21 08:34:11 $
 	
 	
 	
@@ -130,34 +130,18 @@
 
 	DESCRIPTION
 	
-		The &xmllint; program parses one or more XML files, specified on the
-		command line as XML-FILE (or the standard
-		input if the filename provided is - ).
-		It prints various types of output, depending upon the options selected.
-		It is useful for detecting errors both
-		in XML code and in the XML parser
-		itself.
+		The &xmllint; program parses one or more XML files,
+		specified on the command line as XML-FILE
+		(or the standard input if the filename provided
+		is - ). It prints various types of
+		output, depending upon the options selected. It is useful for detecting
+		errors both in XML code and in
+		the XML parser itself.
 	
 	&xmllint; is included in 
 		libxml
 		3
 	.
-	More information can be found at
-		
-			
-				
-						libxml
-						3
-					 web page 
-				
-			
-			
-				
-					W3C XSLT page 
-				
-			
-		
-	
 
 
 
@@ -179,8 +163,9 @@
 	
 	
 		
-			Use the catalogs from SGML_CATALOG_FILES.
-			Otherwise /etc/xml/catalog is used by default.
+			Use the SGML catalog(s) from SGML_CATALOG_FILES.
+			Otherwise XML catalogs starting
+			from /etc/xml/catalog are used by default.
 		
 	
 		
@@ -201,7 +186,10 @@
 	
 	
 		
-			Turn on gzip compression of output.
+			Turn on 
+		gzip
+		1
+	 compression of output.
 		
 	
 		
@@ -217,8 +205,8 @@
 	
 	
 		
-			Use the W3C XML Canonicalisation (C14N) to serialize
-			the result of parsing to stdout.
+			Use the W3C XML Canonicalisation (C14N) to
+			serialize the result of parsing to stdout.
 			It keeps comments in the result.
 		
 	
@@ -238,9 +226,9 @@
 	
 	
 		
-			Use the DTD specified by a Public
+			Use the DTD specified by a Formal Public
 			Identifier FPI for validation, note that this
-			will require a Catalog exporting that Public Identifier to work.
+			will require a catalog exporting that Formal Public Identifier to work.
 		
 	
 		
@@ -291,7 +279,7 @@
 	
 		
 			Reformat and reindent the output. The XMLLINT_INDENT
-			environment variable controls the indentation (default value is two
+			environment variable controls the indentation. The default value is two
 			spaces "  ").
 		
 	
@@ -333,7 +321,7 @@
 		
 	
 	
-		Fetch external DTD.
+		Fetch an external DTD.
 	
 		
 
@@ -484,7 +472,7 @@
 		
 	
 	
-		Validate after parsing is completed.
+		Validate after parsing has completed.
 	
 		
 
@@ -523,8 +511,8 @@
 	
 	
 		
-			Use a W3C XML Schema file named SCHEMA
-			for validation.
+			Use a W3C XML Schema file
+			named SCHEMA for validation.
 		
 	
 		
@@ -543,7 +531,7 @@
 	
 	
 		
-			Use streaming API - useful when  used  in combination
+			Use streaming API - useful when used in combination
 			with  or  options
 			for validation of files that are too large to be held in memory.
 		
@@ -599,7 +587,7 @@
 		
 			Test the walker module, which is a reader interface but for a
 			document tree, instead of using the reader API on
-			an unparsed document it works on a existing in-memory tree. Used in
+			an unparsed document it works on an existing in-memory tree. Used for
 			debugging.
 		
 	
@@ -618,11 +606,10 @@
 		
 			Used in conjunction with . Usually
 			when HTML is parsed the document is saved with
-			the HTML serializer, but with this option the
+			the HTML serializer. But with this option the
 			resulting document is saved with the XML
 			serializer. This is primarily used to
-			generate XHTML
-			from HTML input.
+			generate XHTML from HTML input.
 		
 	
 		
@@ -770,19 +757,23 @@
 		
 	SGML_CATALOG_FILES
 	
-		to be written ...
+		SGML catalog behavior can be changed by redirecting
+			queries to the user's own set of catalogs. This can be done by setting
+			the SGML_CATALOG_FILES environment variable to a list
+			of catalogs. An empty one should deactivate loading the
+			default /etc/sgml/catalog catalog.
+		
 	
 		
 
 		
 	XML_CATALOG_FILES
 	
-		
-			Catalog behavior can be changed by redirecting queries to the user's
-			own set of catalogs. This can be done by setting
+		XML catalog behavior can be changed by redirecting
+			queries to the user's own set of catalogs. This can be done by setting
 			the XML_CATALOG_FILES environment variable to a list
 			of catalogs. An empty one should deactivate loading the
-			default /etc/xml/catalog default catalog.
+			default /etc/xml/catalog catalog.
 		
 	
 		
@@ -790,10 +781,9 @@
 		
 	XML_DEBUG_CATALOG
 	
-		
-			Setting the environment variable XML_DEBUG_CATALOG
-			using the export command outputs debugging information
-			related to catalog operations.
+		Setting the environment variable XML_DEBUG_CATALOG
+			to non-zero using the export
+			command outputs debugging information related to catalog operations.
 		
 	
 		
@@ -801,7 +791,9 @@
 		
 	XMLLINT_INDENT
 	
-		to be written ...
+		Setting the environment variable XMLLINT_INDENT
+			controls the indentation. The default value is two spaces "  ".
+		
 	
 		
 		
@@ -811,7 +803,8 @@
 
 	DIAGNOSTICS
 	
-		On the completion of execution, &xmllint; returns the following error codes:
+		&xmllint; return codes provide information that can be used when
+		calling it from scripts.
 	
 	
@@ -897,12 +890,27 @@
 
 
 	SEE ALSO
-	
-		
+	
 			libxml
 			3
 		
 	
+	
+		More information can be found at
+		
+			
+				
+						libxml
+						3
+					 web page 
+				
+			
+			
+				W3C XSLT page 
+				
+			
+		
+	
 
 
 
diff --git a/doc/xmlmem.html b/doc/xmlmem.html
index 40dc4cb..58c2987 100644
--- a/doc/xmlmem.html
+++ b/doc/xmlmem.html
@@ -12,91 +12,91 @@ A:link, A:visited, A:active { text-decoration: underline }
   Cleaning up after parsing
   Debugging routines
   General memory requirements
-
General overview
The module xmlmemory.hprovidesthe
-interfaces to the libxml2 memory system:
libxml2 does not use the libc memory allocator directly
-    butxmlFree(),xmlMalloc() and xmlRealloc()
-  those routines can be reallocated to a specific set of
-    routine,bydefault the libc ones i.e. free(), malloc() and realloc()
+
General overview
The module xmlmemory.h
+provides the interfaces to the libxml2 memory system:
libxml2 does not use the libc memory allocator directly but xmlFree(),
+    xmlMalloc() and xmlRealloc()
+  those routines can be reallocated to a specific set of routine, by
+    default the libc ones i.e. free(), malloc() and realloc()
   the xmlmemory.c module includes a set of debugging routine
-
Setting libxml2 set of memory routines
It is sometimes useful to not use the default memory allocator,
-eitherfordebugging, analysis or to implement a specific behaviour on
-memorymanagement(like on embedded systems). Two function calls are available
-to doso:
xmlMemGet()whichreturn
-    the current set of functions in use by the parser
-  xmlMemSetup()whichallow
-    to set up a new set of memory allocation functions
-
Of course a call to xmlMemSetup() should probably be done beforecallingany
-other libxml2 routines (unless you are sure your allocationsroutines
-arecompatibles).
Cleaning up after parsing
Libxml2 is not stateless, there is a few set of memory
-structuresneedingallocation before the parser is fully functional (some
-encodingstructuresfor example). This also mean that once parsing is finished
-there isa tinyamount of memory (a few hundred bytes) which can be recollected
-if youdon'treuse the parser immediately:
xmlCleanupParser()isa
-    centralized routine to free the parsing states. Note that
-    itwon'tdeallocate any produced tree if any (use the xmlFreeDoc()
-    andrelatedroutines for this).
-  xmlInitParser()isthe
-    dual routine allowing to preallocate the parsing statewhich can beuseful
-    for example to avoid initialization reentrancyproblems when usinglibxml2
-    in multithreaded applications
-
Generally xmlCleanupParser() is safe, if needed the state will berebuildat
-the next invocation of parser routines, but be careful of theconsequencesin
-multithreaded applications.
Debugging routines
When configured using --with-mem-debug flag (off by default), libxml2usesa
-set of memory allocation debugging routines keeping track of
-allallocatedblocks and the location in the code where the routine was called.
-Acouple ofother debugging routines allow to dump the memory allocated infos
-toa fileor call a specific routine when a given block number is allocated:
xmlMallocLoc()xmlReallocLoc()andxmlMemStrdupLoc()arethe
-    memory debugging replacement allocation routines
-  xmlMemoryDump()dumpsall
-    the informations about the allocated memory block leftsin
-    the.memdumpfile
-
When developing libxml2 memory debug is enabled, the tests
-programscallxmlMemoryDump () and the "make test" regression tests will check
-foranymemory leak during the full regression test sequence, this helps
-alotensuring that libxml2  does not leak memory and bullet
-proofmemoryallocations use (some libc implementations are known to be far
-toopermissiveresulting in major portability problems!).
If the .memdump reports a leak, it displays the allocation functionandalso
-tries to give some informations about the content and structure
-oftheallocated blocks left. This is sufficient in most cases to find
-theculprit,but not always. Assuming the allocation problem is reproducible,
-itispossible to find more easily:
write down the block number xxxx not allocated
-  export the environment variable XML_MEM_BREAKPOINT=xxxx ,
-    theeasiestwhen using GDB is to simply give the command
+
Setting libxml2 set of memory routines
It is sometimes useful to not use the default memory allocator, either for
+debugging, analysis or to implement a specific behaviour on memory management
+(like on embedded systems). Two function calls are available to do so:
xmlMemGet
+    () which return the current set of functions in use by the parser
+  xmlMemSetup()
+    which allow to set up a new set of memory allocation functions
+
Of course a call to xmlMemSetup() should probably be done before calling
+any other libxml2 routines (unless you are sure your allocations routines are
+compatibles).
Cleaning up after parsing
Libxml2 is not stateless, there is a few set of memory structures needing
+allocation before the parser is fully functional (some encoding structures
+for example). This also mean that once parsing is finished there is a tiny
+amount of memory (a few hundred bytes) which can be recollected if you don't
+reuse the parser immediately:
xmlCleanupParser
+    () is a centralized routine to free the parsing states. Note that it
+    won't deallocate any produced tree if any (use the xmlFreeDoc() and
+    related routines for this).
+  xmlInitParser
+    () is the dual routine allowing to preallocate the parsing state
+    which can be useful for example to avoid initialization reentrancy
+    problems when using libxml2 in multithreaded applications
+
Generally xmlCleanupParser() is safe, if needed the state will be rebuild
+at the next invocation of parser routines, but be careful of the consequences
+in multithreaded applications.
Debugging routines
When configured using --with-mem-debug flag (off by default), libxml2 uses
+a set of memory allocation debugging routines keeping track of all allocated
+blocks and the location in the code where the routine was called. A couple of
+other debugging routines allow to dump the memory allocated infos to a file
+or call a specific routine when a given block number is allocated:
xmlMallocLoc()
+    xmlReallocLoc()
+    and xmlMemStrdupLoc()
+    are the memory debugging replacement allocation routines
+  xmlMemoryDump
+    () dumps all the informations about the allocated memory block lefts
+    in the .memdump file
+
When developing libxml2 memory debug is enabled, the tests programs call
+xmlMemoryDump () and the "make test" regression tests will check for any
+memory leak during the full regression test sequence, this helps a lot
+ensuring that libxml2  does not leak memory and bullet proof memory
+allocations use (some libc implementations are known to be far too permissive
+resulting in major portability problems!).
If the .memdump reports a leak, it displays the allocation function and
+also tries to give some informations about the content and structure of the
+allocated blocks left. This is sufficient in most cases to find the culprit,
+but not always. Assuming the allocation problem is reproducible, it is
+possible to find more easily:
write down the block number xxxx not allocated
+  export the environment variable XML_MEM_BREAKPOINT=xxxx , the easiest
+    when using GDB is to simply give the command
     set environment XML_MEM_BREAKPOINT xxxx
     before running the program.
   
-  run the program under a debugger and set a
-    breakpointonxmlMallocBreakpoint() a specific function called when this
-    preciseblockis allocated
-  when the breakpoint is reached you can then do a fine analysis
-    oftheallocation an step  to see the condition resulting in
-    themissingdeallocation.
-
I used to use a commercial tool to debug libxml2 memory problems
-butafternoticing that it was not detecting memory leaks that simple
-mechanismwasused and proved extremely efficient until now. Lately I have also
-used valgrindwith quite
-somesuccess,it is tied to the i386 architecture since it works by emulating
-theprocessorand instruction set, it is slow but  extremely efficient, i.e.
-itspot memoryusage errors in a very precise way.
General memory requirements
How much libxml2 memory require ? It's hard to tell in average itdependsof
-a number of things:
the parser itself should work  in a fixed amount of memory,
-    exceptforinformation maintained about the stacks of names and 
-    entitieslocations.The I/O and encoding handlers will probably account for
-    a fewKBytes.This is true for both the XML and HTML parser (though the
-    HTMLparserneed more state).
-  If you are generating the DOM tree then memory requirements
-    willgrownearly linear with the size of the data. In general for
-    abalancedtextual document the internal memory requirement is about 4
-    timesthesize of the UTF8 serialization of this document (example
-    theXML-1.0recommendation is a bit more of 150KBytes and takes 650KBytes
-    ofmainmemory when parsed). Validation will add a amount of memory
-    requiredformaintaining the external Dtd state which should be linear
-    withthecomplexity of the content model defined by the Dtd
-  If you need to work with fixed memory requirements or don't needthefull
-    DOM tree then using the xmlReaderinterfaceis
-    probably the best way toproceed, it still allows tovalidate or operate on
-    subset of the tree ifneeded.
-  If you don't care about the advanced features of libxml2likevalidation,
-    DOM, XPath or XPointer, don't use entities, need to workwithfixed memory
-    requirements, and try to get the fastest parsingpossiblethen the SAX
-    interface should be used, but it has knownrestrictions.
+  run the program under a debugger and set a breakpoint on
+    xmlMallocBreakpoint() a specific function called when this precise block
+    is allocated
+  when the breakpoint is reached you can then do a fine analysis of the
+    allocation an step  to see the condition resulting in the missing
+    deallocation.
+I used to use a commercial tool to debug libxml2 memory problems but after
+noticing that it was not detecting memory leaks that simple mechanism was
+used and proved extremely efficient until now. Lately I have also used valgrind with quite some
+success, it is tied to the i386 architecture since it works by emulating the
+processor and instruction set, it is slow but  extremely efficient, i.e. it
+spot memory usage errors in a very precise way.
General memory requirements
How much libxml2 memory require ? It's hard to tell in average it depends
+of a number of things:
the parser itself should work  in a fixed amount of memory, except for
+    information maintained about the stacks of names and  entities locations.
+    The I/O and encoding handlers will probably account for a few KBytes.
+    This is true for both the XML and HTML parser (though the HTML parser
+    need more state).
+  If you are generating the DOM tree then memory requirements will grow
+    nearly linear with the size of the data. In general for a balanced
+    textual document the internal memory requirement is about 4 times the
+    size of the UTF8 serialization of this document (example the XML-1.0
+    recommendation is a bit more of 150KBytes and takes 650KBytes of main
+    memory when parsed). Validation will add a amount of memory required for
+    maintaining the external Dtd state which should be linear with the
+    complexity of the content model defined by the Dtd
+  If you need to work with fixed memory requirements or don't need the
+    full DOM tree then using the xmlReader
+    interface is probably the best way to proceed, it still allows to
+    validate or operate on subset of the tree if needed.
+  If you don't care about the advanced features of libxml2 like
+    validation, DOM, XPath or XPointer, don't use entities, need to work with
+    fixed memory requirements, and try to get the fastest parsing possible
+    then the SAX interface should be used, but it has known restrictions.
 
Daniel Veillard
diff --git a/encoding.c b/encoding.c
index 6dee212..ee33df1 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1613,6 +1613,12 @@ xmlFindCharEncodingHandler(const char *name) {
     /* check whether iconv can handle this */
     icv_in = iconv_open("UTF-8", name);
     icv_out = iconv_open(name, "UTF-8");
+    if (icv_in == (iconv_t) -1) {
+        icv_in = iconv_open("UTF-8", upper);
+    }
+    if (icv_out == (iconv_t) -1) {
+	icv_out = iconv_open(upper, "UTF-8");
+    }
     if ((icv_in != (iconv_t) -1) && (icv_out != (iconv_t) -1)) {
 	    enc = (xmlCharEncodingHandlerPtr)
 	          xmlMalloc(sizeof(xmlCharEncodingHandler));
diff --git a/entities.c b/entities.c
index 6a0e38d..91a3978 100644
--- a/entities.c
+++ b/entities.c
@@ -31,35 +31,35 @@ static xmlEntity xmlEntityLt = {
     NULL, NULL, NULL, NULL, NULL, NULL, 
     BAD_CAST "<", BAD_CAST "<", 1,
     XML_INTERNAL_PREDEFINED_ENTITY,
-    NULL, NULL, NULL, NULL, 0
+    NULL, NULL, NULL, NULL, 0, 1
 };
 static xmlEntity xmlEntityGt = {
     NULL, XML_ENTITY_DECL, BAD_CAST "gt",
     NULL, NULL, NULL, NULL, NULL, NULL, 
     BAD_CAST ">", BAD_CAST ">", 1,
     XML_INTERNAL_PREDEFINED_ENTITY,
-    NULL, NULL, NULL, NULL, 0
+    NULL, NULL, NULL, NULL, 0, 1
 };
 static xmlEntity xmlEntityAmp = {
     NULL, XML_ENTITY_DECL, BAD_CAST "amp",
     NULL, NULL, NULL, NULL, NULL, NULL, 
     BAD_CAST "&", BAD_CAST "&", 1,
     XML_INTERNAL_PREDEFINED_ENTITY,
-    NULL, NULL, NULL, NULL, 0
+    NULL, NULL, NULL, NULL, 0, 1
 };
 static xmlEntity xmlEntityQuot = {
     NULL, XML_ENTITY_DECL, BAD_CAST "quot",
     NULL, NULL, NULL, NULL, NULL, NULL, 
     BAD_CAST "\"", BAD_CAST "\"", 1,
     XML_INTERNAL_PREDEFINED_ENTITY,
-    NULL, NULL, NULL, NULL, 0
+    NULL, NULL, NULL, NULL, 0, 1
 };
 static xmlEntity xmlEntityApos = {
     NULL, XML_ENTITY_DECL, BAD_CAST "apos",
     NULL, NULL, NULL, NULL, NULL, NULL, 
     BAD_CAST "'", BAD_CAST "'", 1,
     XML_INTERNAL_PREDEFINED_ENTITY,
-    NULL, NULL, NULL, NULL, 0
+    NULL, NULL, NULL, NULL, 0, 1
 };
 
 /**
@@ -182,6 +182,7 @@ xmlAddEntity(xmlDtdPtr dtd, const xmlChar *name, int type,
     }
     memset(ret, 0, sizeof(xmlEntity));
     ret->type = XML_ENTITY_DECL;
+    ret->checked = 0;
 
     /*
      * fill the structure.
diff --git a/example/Makefile.in b/example/Makefile.in
index d1ac9ef..42681b2 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -156,6 +156,7 @@ RDL_LIBS = @RDL_LIBS@
 READER_TEST = @READER_TEST@
 RELDATE = @RELDATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STATIC_BINARIES = @STATIC_BINARIES@
@@ -184,6 +185,7 @@ THREAD_CFLAGS = @THREAD_CFLAGS@
 THREAD_LIBS = @THREAD_LIBS@
 U = @U@
 VERSION = @VERSION@
+WGET = @WGET@
 WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@
 WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@
 WITH_C14N = @WITH_C14N@
@@ -219,6 +221,7 @@ WITH_WRITER = @WITH_WRITER@
 WITH_XINCLUDE = @WITH_XINCLUDE@
 WITH_XPATH = @WITH_XPATH@
 WITH_XPTR = @WITH_XPTR@
+WITH_ZLIB = @WITH_ZLIB@
 XINCLUDE_OBJ = @XINCLUDE_OBJ@
 XMLLINT = @XMLLINT@
 XML_CFLAGS = @XML_CFLAGS@
diff --git a/include/Makefile.in b/include/Makefile.in
index e4897bc..1ed9f8a 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -145,6 +145,7 @@ RDL_LIBS = @RDL_LIBS@
 READER_TEST = @READER_TEST@
 RELDATE = @RELDATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STATIC_BINARIES = @STATIC_BINARIES@
@@ -173,6 +174,7 @@ THREAD_CFLAGS = @THREAD_CFLAGS@
 THREAD_LIBS = @THREAD_LIBS@
 U = @U@
 VERSION = @VERSION@
+WGET = @WGET@
 WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@
 WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@
 WITH_C14N = @WITH_C14N@
@@ -208,6 +210,7 @@ WITH_WRITER = @WITH_WRITER@
 WITH_XINCLUDE = @WITH_XINCLUDE@
 WITH_XPATH = @WITH_XPATH@
 WITH_XPTR = @WITH_XPTR@
+WITH_ZLIB = @WITH_ZLIB@
 XINCLUDE_OBJ = @XINCLUDE_OBJ@
 XMLLINT = @XMLLINT@
 XML_CFLAGS = @XML_CFLAGS@
diff --git a/include/libxml/HTMLparser.h b/include/libxml/HTMLparser.h
index 8477efb..05905e4 100644
--- a/include/libxml/HTMLparser.h
+++ b/include/libxml/HTMLparser.h
@@ -105,6 +105,9 @@ XMLPUBFUN int XMLCALL
 XMLPUBFUN void XMLCALL			
 			htmlParseElement(htmlParserCtxtPtr ctxt);
 
+XMLPUBFUN htmlParserCtxtPtr XMLCALL	
+			htmlNewParserCtxt(void);
+
 XMLPUBFUN htmlParserCtxtPtr XMLCALL	
 			htmlCreateMemoryParserCtxt(const char *buffer,
 						   int size);
diff --git a/include/libxml/Makefile.in b/include/libxml/Makefile.in
index f273b82..a63f77f 100644
--- a/include/libxml/Makefile.in
+++ b/include/libxml/Makefile.in
@@ -149,6 +149,7 @@ RDL_LIBS = @RDL_LIBS@
 READER_TEST = @READER_TEST@
 RELDATE = @RELDATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STATIC_BINARIES = @STATIC_BINARIES@
@@ -177,6 +178,7 @@ THREAD_CFLAGS = @THREAD_CFLAGS@
 THREAD_LIBS = @THREAD_LIBS@
 U = @U@
 VERSION = @VERSION@
+WGET = @WGET@
 WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@
 WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@
 WITH_C14N = @WITH_C14N@
@@ -212,6 +214,7 @@ WITH_WRITER = @WITH_WRITER@
 WITH_XINCLUDE = @WITH_XINCLUDE@
 WITH_XPATH = @WITH_XPATH@
 WITH_XPTR = @WITH_XPTR@
+WITH_ZLIB = @WITH_ZLIB@
 XINCLUDE_OBJ = @XINCLUDE_OBJ@
 XMLLINT = @XMLLINT@
 XML_CFLAGS = @XML_CFLAGS@
diff --git a/include/libxml/entities.h b/include/libxml/entities.h
index 0bb28a0..fdd7222 100644
--- a/include/libxml/entities.h
+++ b/include/libxml/entities.h
@@ -56,6 +56,7 @@ struct _xmlEntity {
     struct _xmlEntity     *nexte;	/* unused */
     const xmlChar           *URI;	/* the full URI as computed */
     int                    owner;	/* does the entity own the childrens */
+    int			 checked;	/* was the entity content checked */
 };
 
 /*
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 46377ff..fe63bda 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -1089,7 +1089,9 @@ typedef enum {
     XML_PARSE_NSCLEAN	= 1<<13,/* remove redundant namespaces declarations */
     XML_PARSE_NOCDATA	= 1<<14,/* merge CDATA as text nodes */
     XML_PARSE_NOXINCNODE= 1<<15,/* do not generate XINCLUDE START/END nodes */
-    XML_PARSE_COMPACT   = 1<<16 /* compact small text nodes */
+    XML_PARSE_COMPACT   = 1<<16 /* compact small text nodes; no modification of
+                                   the tree allowed afterwards (will possibly
+				   crash if you try to modify the tree) */
 } xmlParserOption;
 
 XMLPUBFUN void XMLCALL
@@ -1204,6 +1206,7 @@ typedef enum {
     XML_WITH_DEBUG = 28,
     XML_WITH_DEBUG_MEM = 29,
     XML_WITH_DEBUG_RUN = 30,
+    XML_WITH_ZLIB = 31,
     XML_WITH_NONE = 99999 /* just to be sure of allocation size */
 } xmlFeature;
 
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index b162574..321280e 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -54,6 +54,15 @@ typedef xmlEntity *xmlEntityPtr;
  */
 #define BASE_BUFFER_SIZE 4096
 
+/**
+ * LIBXML_NAMESPACE_DICT:
+ *
+ * Defines experimental behaviour:
+ * 1) xmlNs gets an additional field @context (a xmlDoc)
+ * 2) when creating a tree, xmlNs->href is stored in the dict of xmlDoc.
+ */
+/* #define LIBXML_NAMESPACE_DICT */
+
 /**
  * xmlBufferAllocationScheme:
  *
@@ -342,6 +351,7 @@ struct _xmlNs {
     const xmlChar *href;	/* URL for the namespace */
     const xmlChar *prefix;	/* prefix for the namespace */
     void           *_private;   /* application data */
+    struct _xmlDoc *context;		/* normally an xmlDoc */
 };
 
 /**
@@ -508,10 +518,47 @@ struct _xmlDoc {
     void           *psvi;	/* for type/PSVI informations */
 };
 
+
 typedef struct _xmlDOMWrapCtxt xmlDOMWrapCtxt;
 typedef xmlDOMWrapCtxt *xmlDOMWrapCtxtPtr;
+
+/**
+ * xmlDOMWrapAcquireNsFunction:
+ * @ctxt:  a DOM wrapper context
+ * @node:  the context node (element or attribute) 
+ * @nsName:  the requested namespace name
+ * @nsPrefix:  the requested namespace prefix 
+ *
+ * A function called to acquire namespaces (xmlNs) from the wrapper.
+ *
+ * Returns an xmlNsPtr or NULL in case of an error.
+ */
+typedef xmlNsPtr (*xmlDOMWrapAcquireNsFunction) (xmlDOMWrapCtxtPtr ctxt,
+						 xmlNodePtr node,
+						 const xmlChar *nsName,
+						 const xmlChar *nsPrefix);
+
+/**
+ * xmlDOMWrapCtxt:
+ *
+ * Context for DOM wrapper-operations.
+ */
 struct _xmlDOMWrapCtxt {
     void * _private;
+    /*
+    * The type of this context, just in case we need specialized
+    * contexts in the future.
+    */
+    int type;
+    /*
+    * Internal namespace map used for various operations.
+    */
+    void * namespaceMap;
+    /*
+    * Use this one to acquire an xmlNsPtr intended for node->ns.
+    * (Note that this is not intended for elem->nsDef).
+    */
+    xmlDOMWrapAcquireNsFunction getNsForNodeFunc;
 };
 
 /**
@@ -541,7 +588,7 @@ struct _xmlDOMWrapCtxt {
 /*
  * Some helper functions
  */
-#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED)
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED)
 XMLPUBFUN int XMLCALL
 		xmlValidateNCName	(const xmlChar *value,
 					 int space);
@@ -871,7 +918,7 @@ XMLPUBFUN xmlNsPtr XMLCALL
 		xmlSearchNsByHref	(xmlDocPtr doc,
 					 xmlNodePtr node,
 					 const xmlChar *href);
-#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED)
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 XMLPUBFUN xmlNsPtr * XMLCALL	
 		xmlGetNsList		(xmlDocPtr doc,
 					 xmlNodePtr node);
diff --git a/include/libxml/uri.h b/include/libxml/uri.h
index 89e3653..5e29671 100644
--- a/include/libxml/uri.h
+++ b/include/libxml/uri.h
@@ -80,6 +80,8 @@ XMLPUBFUN void XMLCALL
 		xmlFreeURI		(xmlURIPtr uri);
 XMLPUBFUN xmlChar* XMLCALL	
 		xmlCanonicPath		(const xmlChar *path);
+XMLPUBFUN xmlChar* XMLCALL	
+		xmlPathToURI		(const xmlChar *path);
 
 #ifdef __cplusplus
 }
diff --git a/include/libxml/xinclude.h b/include/libxml/xinclude.h
index 4bb0aab..ba9c9b5 100644
--- a/include/libxml/xinclude.h
+++ b/include/libxml/xinclude.h
@@ -94,6 +94,10 @@ XMLPUBFUN int XMLCALL
 XMLPUBFUN int XMLCALL	
 		xmlXIncludeProcessFlags	(xmlDocPtr doc,
 					 int flags);
+XMLPUBFUN int XMLCALL	
+		xmlXIncludeProcessFlagsData(xmlDocPtr doc,
+					 int flags,
+					 void *data);
 XMLPUBFUN int XMLCALL	
 		xmlXIncludeProcessTree	(xmlNodePtr tree);
 XMLPUBFUN int XMLCALL	
diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h
index cc75dc0..bacbe1d 100644
--- a/include/libxml/xmlversion.h
+++ b/include/libxml/xmlversion.h
@@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.6.26"
+#define LIBXML_DOTTED_VERSION "2.6.27"
 
 /**
  * LIBXML_VERSION:
  *
- * the version number: 1.2.3 value is 1002003
+ * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20626
+#define LIBXML_VERSION 20627
 
 /**
  * LIBXML_VERSION_STRING:
  *
- * the version number string, 1.2.3 value is "1002003"
+ * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20626"
+#define LIBXML_VERSION_STRING "20627"
 
 /**
  * LIBXML_VERSION_EXTRA:
  *
  * extra version information, used to show a CVS compilation
  */
-#define LIBXML_VERSION_EXTRA "-CVS2798"
+#define LIBXML_VERSION_EXTRA "-CVS2872"
 
 /**
  * LIBXML_TEST_VERSION:
@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20626);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20627);
 
 #ifndef VMS
 #if 0
@@ -372,6 +372,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_MODULE_EXTENSION ".so" 
 #endif
 
+/**
+ * LIBXML_ZLIB_ENABLED:
+ *
+ * Whether the Zlib support is compiled in
+ */
+#if 1
+#define LIBXML_ZLIB_ENABLED
+#endif
+
 /**
  * ATTRIBUTE_UNUSED:
  *
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index cf547dd..0967913 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -34,14 +34,14 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 /**
  * LIBXML_VERSION:
  *
- * the version number: 1.2.3 value is 1002003
+ * the version number: 1.2.3 value is 10203
  */
 #define LIBXML_VERSION @LIBXML_VERSION_NUMBER@
 
 /**
  * LIBXML_VERSION_STRING:
  *
- * the version number string, 1.2.3 value is "1002003"
+ * the version number string, 1.2.3 value is "10203"
  */
 #define LIBXML_VERSION_STRING "@LIBXML_VERSION_NUMBER@"
 
@@ -372,6 +372,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_MODULE_EXTENSION "@MODULE_EXTENSION@" 
 #endif
 
+/**
+ * LIBXML_ZLIB_ENABLED:
+ *
+ * Whether the Zlib support is compiled in
+ */
+#if @WITH_ZLIB@
+#define LIBXML_ZLIB_ENABLED
+#endif
+
 /**
  * ATTRIBUTE_UNUSED:
  *
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index febbf78..89008fc 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -343,7 +343,8 @@ struct _xmlXPathContext {
     /* dictionnary */
     xmlDictPtr dict;			/* dictionnary if any */
 
-    int flags;				/* flags to control compilation */
+    int flags;				/* flags to control compilation */
+
     /* Cache for reusal of XPath objects */
     void *cache;
 };
@@ -520,6 +521,9 @@ XMLPUBFUN xmlXPathCompExprPtr XMLCALL
 XMLPUBFUN xmlXPathObjectPtr XMLCALL   
 		    xmlXPathCompiledEval	(xmlXPathCompExprPtr comp,
 						 xmlXPathContextPtr ctx);
+XMLPUBFUN int XMLCALL   
+		    xmlXPathCompiledEvalToBoolean(xmlXPathCompExprPtr comp,
+						 xmlXPathContextPtr ctxt);
 XMLPUBFUN void XMLCALL                
 		    xmlXPathFreeCompExpr	(xmlXPathCompExprPtr comp);
 #endif /* LIBXML_XPATH_ENABLED */
diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in
index c66f82b..075848c 100644
--- a/libxml-2.0.pc.in
+++ b/libxml-2.0.pc.in
@@ -8,5 +8,6 @@ Name: libXML
 Version: @VERSION@
 Description: libXML library version2.
 Requires:
-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+Libs: -L${libdir} -lxml2
+Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
 Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
diff --git a/libxml2.spec b/libxml2.spec
index 5604bb9..9cf0f73 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -1,6 +1,6 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.26
+Version: 2.6.27
 Release: 1
 License: MIT
 Group: Development/Libraries
@@ -128,6 +128,6 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
-* Tue Jun  6 2006 Daniel Veillard 
-- upstream release 2.6.26 see http://xmlsoft.org/news.html
+* Wed Oct 25 2006 Daniel Veillard 
+- upstream release 2.6.27 see http://xmlsoft.org/news.html
 
diff --git a/ltmain.sh b/ltmain.sh
index 06823e0..0223495 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -46,10 +46,16 @@ PACKAGE=libtool
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -105,12 +111,14 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+         save_$lt_var=\$$lt_var
+         $lt_var=C
+         export $lt_var
+       fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +144,8 @@ duplicate_deps=no
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -327,7 +337,17 @@ func_extract_archives ()
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         extracted_serial=`expr $extracted_serial + 1`
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@ if test -z "$show_help"; then
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@ EOF
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+    case $arg in
+    -all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1169,20 @@ EOF
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+    -static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+    -static-libtool-libs)
+      if test -z "$pic_flag" && test -n "$link_static_flag"; then
+        dlopen_self=$dlopen_self_static
+      fi
+      prefer_static_libs=yes
+      ;;
+    esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1712,7 +1742,7 @@ EOF
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@ EOF
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+         { { test "$prefer_static_libs" = no ||
+             test "$prefer_static_libs,$installed" = "built,yes"; } ||
+           test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@ EOF
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3410,11 +3442,11 @@ EOF
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+#      for path in $notinst_path; do
+#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+#      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@ EOF
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3591,7 @@ EOF
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@ EOF
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4239,12 +4268,14 @@ EOF
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4723,16 @@ static const void *lt_preloaded_setup() {
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4747,13 @@ static const void *lt_preloaded_setup() {
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@ static const void *lt_preloaded_setup() {
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4877,7 @@ static const void *lt_preloaded_setup() {
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5284,18 @@ EOF
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@ else
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5624,7 @@ fi\
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +5969,9 @@ relink_command=\"$relink_command\""
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@ relink_command=\"$relink_command\""
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+               $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
+
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@ The following components of LINK-COMMAND are treated specially:
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6837,11 @@ The following components of LINK-COMMAND are treated specially:
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
diff --git a/parser.c b/parser.c
index 12b2d7f..bd44585 100644
--- a/parser.c
+++ b/parser.c
@@ -807,6 +807,12 @@ xmlHasFeature(xmlFeature feature)
 #else
             return(0);
 #endif 
+        case XML_WITH_ZLIB:
+#ifdef LIBXML_ZLIB_ENABLED
+            return(1);
+#else
+            return(0);
+#endif
         default:
 	    break;
      }
@@ -1442,7 +1448,7 @@ static int spacePop(xmlParserCtxtPtr ctxt) {
     if (ctxt->spaceNr > 0)
 	ctxt->space = &ctxt->spaceTab[ctxt->spaceNr - 1];
     else
-        ctxt->space = NULL;
+        ctxt->space = &ctxt->spaceTab[0];
     ret = ctxt->spaceTab[ctxt->spaceNr];
     ctxt->spaceTab[ctxt->spaceNr] = -1;
     return(ret);
@@ -2356,7 +2362,8 @@ static int areBlanks(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
     /*
      * Check for xml:space value.
      */
-    if (*(ctxt->space) == 1)
+    if ((ctxt->space == NULL) || (*(ctxt->space) == 1) ||
+        (*(ctxt->space) == -2))
 	return(0);
 
     /*
@@ -2485,10 +2492,12 @@ xmlSplitQName(xmlParserCtxtPtr ctxt, const xmlChar *name, xmlChar **prefix) {
 	buffer[len] = 0;
     }
     
-    /* nasty but well=formed
     if ((c == ':') && (*cur == 0)) {
+        if (buffer != NULL)
+	    xmlFree(buffer);
+	*prefix = NULL;
 	return(xmlStrdup(name));
-    } */
+    }
 
     if (buffer == NULL)
 	ret = xmlStrndup(buf, len);
@@ -3500,9 +3509,13 @@ get_more_space:
 			    if (ctxt->sax->ignorableWhitespace != NULL)
 				ctxt->sax->ignorableWhitespace(ctxt->userData,
 						       tmp, nbchar);
-			} else if (ctxt->sax->characters != NULL)
-			    ctxt->sax->characters(ctxt->userData,
-						  tmp, nbchar);
+			} else {
+			    if (ctxt->sax->characters != NULL)
+				ctxt->sax->characters(ctxt->userData,
+						      tmp, nbchar);
+			    if (*ctxt->space == -1)
+			        *ctxt->space = -2;
+			}
 		    } else if ((ctxt->sax != NULL) &&
 		               (ctxt->sax->characters != NULL)) {
 			ctxt->sax->characters(ctxt->userData,
@@ -3549,9 +3562,13 @@ get_more:
 		        if (ctxt->sax->ignorableWhitespace != NULL)
 			    ctxt->sax->ignorableWhitespace(ctxt->userData,
 							   tmp, nbchar);
-		    } else if (ctxt->sax->characters != NULL)
-			ctxt->sax->characters(ctxt->userData,
-					      tmp, nbchar);
+		    } else {
+		        if (ctxt->sax->characters != NULL)
+			    ctxt->sax->characters(ctxt->userData,
+						  tmp, nbchar);
+			if (*ctxt->space == -1)
+			    *ctxt->space = -2;
+		    }
                     line = ctxt->input->line;
                     col = ctxt->input->col;
 		} else if (ctxt->sax != NULL) {
@@ -3634,6 +3651,10 @@ xmlParseCharDataComplex(xmlParserCtxtPtr ctxt, int cdata) {
 		} else {
 		    if (ctxt->sax->characters != NULL)
 			ctxt->sax->characters(ctxt->userData, buf, nbchar);
+		    if ((ctxt->sax->characters !=
+		         ctxt->sax->ignorableWhitespace) &&
+			(*ctxt->space == -1))
+			*ctxt->space = -2;
 		}
 	    }
 	    nbchar = 0;
@@ -3658,6 +3679,9 @@ xmlParseCharDataComplex(xmlParserCtxtPtr ctxt, int cdata) {
 	    } else {
 		if (ctxt->sax->characters != NULL)
 		    ctxt->sax->characters(ctxt->userData, buf, nbchar);
+		if ((ctxt->sax->characters != ctxt->sax->ignorableWhitespace) &&
+		    (*ctxt->space == -1))
+		    *ctxt->space = -2;
 	    }
 	}
     }
@@ -5923,10 +5947,13 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
 		ctxt->sax->characters(ctxt->userData, out, i);
 	}
     } else {
+        int was_checked;
+
 	ent = xmlParseEntityRef(ctxt);
 	if (ent == NULL) return;
 	if (!ctxt->wellFormed)
 	    return;
+	was_checked = ent->checked;
 	if ((ent->name != NULL) && 
 	    (ent->etype != XML_INTERNAL_PREDEFINED_ENTITY)) {
 	    xmlNodePtr list = NULL;
@@ -5938,8 +5965,9 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
 	     * where the ent->children is filled with the result from
 	     * the parsing.
 	     */
-	    if (ent->children == NULL) {
+	    if (ent->checked == 0) {
 		xmlChar *value;
+
 		value = ent->content;
 
 		/*
@@ -6074,15 +6102,69 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
 			list = NULL;
 		    }
 		}
+		ent->checked = 1;
+	    }
+
+            if (ent->children == NULL) {
+		/*
+		 * Probably running in SAX mode and the callbacks don't
+		 * build the entity content. So unless we already went
+		 * though parsing for first checking go though the entity
+		 * content to generate callbacks associated to the entity
+		 */
+		if (was_checked == 1) {
+		    void *user_data;
+		    /*
+		     * This is a bit hackish but this seems the best
+		     * way to make sure both SAX and DOM entity support
+		     * behaves okay.
+		     */
+		    if (ctxt->userData == ctxt)
+			user_data = NULL;
+		    else
+			user_data = ctxt->userData;
+
+		    if (ent->etype == XML_INTERNAL_GENERAL_ENTITY) {
+			ctxt->depth++;
+			ret = xmlParseBalancedChunkMemoryInternal(ctxt,
+					   ent->content, user_data, NULL);
+			ctxt->depth--;
+		    } else if (ent->etype ==
+			       XML_EXTERNAL_GENERAL_PARSED_ENTITY) {
+			ctxt->depth++;
+			ret = xmlParseExternalEntityPrivate(ctxt->myDoc, ctxt,
+				   ctxt->sax, user_data, ctxt->depth,
+				   ent->URI, ent->ExternalID, NULL);
+			ctxt->depth--;
+		    } else {
+			ret = XML_ERR_ENTITY_PE_INTERNAL;
+			xmlErrMsgStr(ctxt, XML_ERR_INTERNAL_ERROR,
+				     "invalid entity type found\n", NULL);
+		    }
+		    if (ret == XML_ERR_ENTITY_LOOP) {
+			xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
+			return;
+		    }
+		}
+		if ((ctxt->sax != NULL) && (ctxt->sax->reference != NULL) &&
+		    (ctxt->replaceEntities == 0) && (!ctxt->disableSAX)) {
+		    /*
+		     * Entity reference callback comes second, it's somewhat
+		     * superfluous but a compatibility to historical behaviour
+		     */
+		    ctxt->sax->reference(ctxt->userData, ent->name);
+		}
+		return;
 	    }
 	    if ((ctxt->sax != NULL) && (ctxt->sax->reference != NULL) &&
-		(ctxt->replaceEntities == 0) && (!ctxt->disableSAX)) {
+	        (ctxt->replaceEntities == 0) && (!ctxt->disableSAX)) {
 		/*
 		 * Create a node.
 		 */
 		ctxt->sax->reference(ctxt->userData, ent->name);
 		return;
-	    } else if (ctxt->replaceEntities) {
+	    }
+	    if ((ctxt->replaceEntities) || (ent->children == NULL))  {
 		/*
 		 * There is a problem on the handling of _private for entities
 		 * (bug 155816): Should we copy the content of the field from
@@ -6206,31 +6288,6 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
 		    ctxt->nodemem = 0;
 		    ctxt->nodelen = 0;
 		    return;
-		} else {
-		    /*
-		     * Probably running in SAX mode
-		     */
-		    xmlParserInputPtr input;
-
-		    input = xmlNewEntityInputStream(ctxt, ent);
-		    xmlPushInput(ctxt, input);
-		    if ((ent->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY) &&
-			(CMP5(CUR_PTR, '<', '?', 'x', 'm', 'l')) &&
-			(IS_BLANK_CH(NXT(5)))) {
-			xmlParseTextDecl(ctxt);
-			if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) {
-			    /*
-			     * The XML REC instructs us to stop parsing right here
-			     */
-			    ctxt->instate = XML_PARSER_EOF;
-			    return;
-			}
-			if (input->standalone == 1) {
-			    xmlFatalErr(ctxt, XML_ERR_EXT_ENTITY_STANDALONE,
-			                NULL);
-			}
-		    }
-		    return;
 		}
 	    }
 	} else {
@@ -6337,7 +6394,7 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) {
 			if ((ctxt->inSubset == 0) &&
 		            (ctxt->sax != NULL) &&
 		            (ctxt->sax->reference != NULL)) {
-			    ctxt->sax->reference(ctxt, name);
+			    ctxt->sax->reference(ctxt->userData, name);
 			}
 		    }
 		    ctxt->valid = 0;
@@ -7808,7 +7865,7 @@ xmlParseStartTag2(xmlParserCtxtPtr ctxt, const xmlChar **pref,
     const xmlChar **atts = ctxt->atts;
     int maxatts = ctxt->maxatts;
     int nratts, nbatts, nbdef;
-    int i, j, nbNs, attval;
+    int i, j, nbNs, attval, oldline, oldcol;
     const xmlChar *base;
     unsigned long cur;
     int nsNr = ctxt->nsNr;
@@ -7827,6 +7884,8 @@ reparse:
     SHRINK;
     base = ctxt->input->base;
     cur = ctxt->input->cur - ctxt->input->base;
+    oldline = ctxt->input->line;
+    oldcol = ctxt->input->col;
     nbatts = 0;
     nratts = 0;
     nbdef = 0;
@@ -7861,6 +7920,12 @@ reparse:
 
 	attname = xmlParseAttribute2(ctxt, prefix, localname,
 	                             &aprefix, &attvalue, &len, &alloc);
+	if (ctxt->input->base != base) {
+	    if ((attvalue != NULL) && (alloc != 0))
+	        xmlFree(attvalue);
+	    attvalue = NULL;
+	    goto base_changed;
+	}
         if ((attname != NULL) && (attvalue != NULL)) {
 	    if (len < 0) len = xmlStrlen(attvalue);
             if ((attname == ctxt->str_xmlns) && (aprefix == NULL)) {
@@ -8152,6 +8217,8 @@ base_changed:
 	        xmlFree((xmlChar *) atts[i]);
     }
     ctxt->input->cur = ctxt->input->base + cur;
+    ctxt->input->line = oldline;
+    ctxt->input->col = oldcol;
     if (ctxt->wellFormed == 1) {
 	goto reparse;
     }
@@ -8349,7 +8416,8 @@ void
 xmlParseContent(xmlParserCtxtPtr ctxt) {
     GROW;
     while ((RAW != 0) &&
-	   ((RAW != '<') || (NXT(1) != '/'))) {
+	   ((RAW != '<') || (NXT(1) != '/')) &&
+	   (ctxt->instate != XML_PARSER_EOF)) {
 	const xmlChar *test = CUR_PTR;
 	unsigned int cons = ctxt->input->consumed;
 	const xmlChar *cur = ctxt->input->cur;
@@ -8442,6 +8510,14 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
     xmlNodePtr ret;
     int nsNr = ctxt->nsNr;
 
+    if ((unsigned int) ctxt->nameNr > xmlParserMaxDepth) {
+        xmlFatalErrMsgInt(ctxt, XML_ERR_INTERNAL_ERROR,
+	      "Excessive depth in document: change xmlParserMaxDepth = %d\n",
+	                  xmlParserMaxDepth);
+	ctxt->instate = XML_PARSER_EOF;
+	return;
+    }
+
     /* Capture start position */
     if (ctxt->record_info) {
         node_info.begin_pos = ctxt->input->consumed +
@@ -8451,6 +8527,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
 
     if (ctxt->spaceNr == 0)
 	spacePush(ctxt, -1);
+    else if (*ctxt->space == -2)
+	spacePush(ctxt, -1);
     else
 	spacePush(ctxt, *ctxt->space);
 
@@ -9767,6 +9845,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
 		}
 		if (ctxt->spaceNr == 0)
 		    spacePush(ctxt, -1);
+		else if (*ctxt->space == -2)
+		    spacePush(ctxt, -1);
 		else
 		    spacePush(ctxt, *ctxt->space);
 #ifdef LIBXML_SAX1_ENABLED
@@ -10759,7 +10839,7 @@ xmlCreateIOParserCtxt(xmlSAXHandlerPtr sax, void *user_data,
  * Load and parse a DTD
  * 
  * Returns the resulting xmlDtdPtr or NULL in case of error.
- * @input will be freed at parsing end.
+ * @input will be freed by the function in any case.
  */
 
 xmlDtdPtr
@@ -10775,6 +10855,7 @@ xmlIOParseDTD(xmlSAXHandlerPtr sax, xmlParserInputBufferPtr input,
 
     ctxt = xmlNewParserCtxt();
     if (ctxt == NULL) {
+        xmlFreeParserInputBuffer(input);
 	return(NULL);
     }
 
@@ -10796,6 +10877,7 @@ xmlIOParseDTD(xmlSAXHandlerPtr sax, xmlParserInputBufferPtr input,
     pinput = xmlNewIOInputStream(ctxt, input, XML_CHAR_ENCODING_NONE);
     if (pinput == NULL) {
         if (sax != NULL) ctxt->sax = NULL;
+        xmlFreeParserInputBuffer(input);
 	xmlFreeParserCtxt(ctxt);
 	return(NULL);
     }
@@ -10919,7 +11001,8 @@ xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar *ExternalID,
      */
 
     if ((ctxt->sax != NULL) && (ctxt->sax->resolveEntity != NULL))
-	input = ctxt->sax->resolveEntity(ctxt, ExternalID, systemIdCanonic);
+	input = ctxt->sax->resolveEntity(ctxt->userData, ExternalID,
+	                                 systemIdCanonic);
     if (input == NULL) {
         if (sax != NULL) ctxt->sax = NULL;
 	xmlFreeParserCtxt(ctxt);
@@ -11032,6 +11115,8 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
     int ret = 0;
     xmlChar start[4];
     xmlCharEncoding enc;
+    xmlParserInputPtr inputStream;
+    char *directory = NULL;
 
     if (ctx == NULL) return(-1);
 
@@ -11046,11 +11131,27 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
     if (ctx->myDoc == NULL) /* @@ relax but check for dereferences */
 	return(-1);
 
-
-    ctxt = xmlCreateEntityParserCtxt(URL, ID, NULL);
-    if (ctxt == NULL) return(-1);
+    ctxt = xmlNewParserCtxt();
+    if (ctxt == NULL) {
+	return(-1);
+    }
+    
     ctxt->userData = ctxt;
     ctxt->_private = ctx->_private;
+    
+    inputStream = xmlLoadExternalEntity((char *)URL, (char *)ID, ctxt);
+    if (inputStream == NULL) {
+	xmlFreeParserCtxt(ctxt);
+	return(-1);
+    }
+
+    inputPush(ctxt, inputStream);
+
+    if ((ctxt->directory == NULL) && (directory == NULL))
+	directory = xmlParserGetDirectory((char *)URL);
+    if ((ctxt->directory == NULL) && (directory != NULL))
+	ctxt->directory = directory;
+    
     oldsax = ctxt->sax;
     ctxt->sax = ctx->sax;
     xmlDetectSAX2(ctxt);
@@ -11897,6 +11998,9 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax,
     } else {
 	ctxt->myDoc = newDoc;
 	newDoc->children->doc = doc;
+	/* Ensure that doc has XML spec namespace */
+	xmlSearchNsByHref(doc, (xmlNodePtr)doc, XML_XML_NAMESPACE);
+	newDoc->oldNs = doc->oldNs;
     }
     ctxt->instate = XML_PARSER_CONTENT;
     ctxt->depth = depth;
@@ -11957,6 +12061,7 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax,
     xmlFreeParserCtxt(ctxt);
     newDoc->intSubset = NULL;
     newDoc->extSubset = NULL;
+    newDoc->oldNs = NULL;
     xmlFreeDoc(newDoc);
     
     return(ret);
diff --git a/parserInternals.c b/parserInternals.c
index 5706299..f4da58d 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -1473,6 +1473,7 @@ xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) {
     else
 	URI = xmlStrdup((xmlChar *) inputStream->filename);
     directory = xmlParserGetDirectory((const char *) URI);
+    if (inputStream->filename != NULL) xmlFree((char *)inputStream->filename);
     inputStream->filename = (char *) xmlCanonicPath((const xmlChar *) URI);
     if (URI != NULL) xmlFree((char *) URI);
     inputStream->directory = directory;
diff --git a/python/Makefile.am b/python/Makefile.am
index c37c0c2..6c0bffa 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = 			\
 	libxml2-python-api.xml	\
 	$(DOCS)
 
-libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version -L$(top_builddir)/.libs
+libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version 
 
 if WITH_PYTHON
 mylibs = \
diff --git a/python/Makefile.in b/python/Makefile.in
index 9451aaf..9f3a13e 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -174,6 +174,7 @@ RDL_LIBS = @RDL_LIBS@
 READER_TEST = @READER_TEST@
 RELDATE = @RELDATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STATIC_BINARIES = @STATIC_BINARIES@
@@ -202,6 +203,7 @@ THREAD_CFLAGS = @THREAD_CFLAGS@
 THREAD_LIBS = @THREAD_LIBS@
 U = @U@
 VERSION = @VERSION@
+WGET = @WGET@
 WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@
 WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@
 WITH_C14N = @WITH_C14N@
@@ -237,6 +239,7 @@ WITH_WRITER = @WITH_WRITER@
 WITH_XINCLUDE = @WITH_XINCLUDE@
 WITH_XPATH = @WITH_XPATH@
 WITH_XPTR = @WITH_XPTR@
+WITH_ZLIB = @WITH_ZLIB@
 XINCLUDE_OBJ = @XINCLUDE_OBJ@
 XMLLINT = @XMLLINT@
 XML_CFLAGS = @XML_CFLAGS@
@@ -321,7 +324,7 @@ EXTRA_DIST = \
 	libxml2-python-api.xml	\
 	$(DOCS)
 
-libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version -L$(top_builddir)/.libs
+libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version 
 @WITH_PYTHON_TRUE@mylibs = \
 @WITH_PYTHON_TRUE@	$(top_builddir)/libxml2.la
 
diff --git a/python/generator.py b/python/generator.py
index 642b8d1..f116f8a 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -231,7 +231,7 @@ skipped_types = {
 py_types = {
     'void': (None, None, None, None),
     'int':  ('i', None, "int", "int"),
-    'long':  ('i', None, "int", "int"),
+    'long':  ('l', None, "long", "long"),
     'double':  ('d', None, "double", "double"),
     'unsigned int':  ('i', None, "int", "int"),
     'xmlChar':  ('c', None, "int", "int"),
diff --git a/python/libxml.c b/python/libxml.c
index 88b29cf..6e9a78e 100644
--- a/python/libxml.c
+++ b/python/libxml.c
@@ -3677,6 +3677,40 @@ libxml_getObjDesc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return Py_BuildValue((char *)"s", str);
 }
 
+static PyObject *
+libxml_compareNodesEqual(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    
+    PyObject *py_node1, *py_node2;
+    xmlNodePtr node1, node2;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:compareNodesEqual",
+		&py_node1, &py_node2))
+        return NULL;
+    /* To compare two node objects, we compare their pointer addresses */
+    node1 = PyxmlNode_Get(py_node1);
+    node2 = PyxmlNode_Get(py_node2);
+    if ( node1 == node2 )
+        return Py_BuildValue((char *)"i", 1);
+    else
+        return Py_BuildValue((char *)"i", 0);
+    
+}
+
+static PyObject *
+libxml_nodeHash(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+
+    PyObject *py_node1;
+    xmlNodePtr node1;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:nodeHash", &py_node1))
+	    return NULL;
+    /* For simplicity, we use the node pointer address as a hash value */
+    node1 = PyxmlNode_Get(py_node1);
+
+    return PyLong_FromVoidPtr(node1);
+
+}
+
 /************************************************************************
  *									*
  *			The registration stuff				*
@@ -3730,6 +3764,8 @@ static PyMethodDef libxmlMethods[] = {
 #endif
 #endif
     {(char *) "getObjDesc", libxml_getObjDesc, METH_VARARGS, NULL},
+    {(char *) "compareNodesEqual", libxml_compareNodesEqual, METH_VARARGS, NULL},
+    {(char *) "nodeHash", libxml_nodeHash, METH_VARARGS, NULL},
     {NULL, NULL, 0, NULL}
 };
 
diff --git a/python/libxml.py b/python/libxml.py
index 997e15f..4c9fe92 100644
--- a/python/libxml.py
+++ b/python/libxml.py
@@ -232,6 +232,23 @@ class xmlCore:
             self._o = _obj;
             return
         self._o = None
+
+    def __eq__(self, other):
+        if other == None:
+	    return False
+        ret = libxml2mod.compareNodesEqual(self._o, other._o)
+	if ret == None:
+	    return False
+	return ret == True
+    def __ne__(self, other):
+        if other == None:
+	    return True
+        ret = libxml2mod.compareNodesEqual(self._o, other._o)
+	return not ret
+    def __hash__(self):
+    	ret = libxml2mod.nodeHash(self._o)
+	return ret
+
     def __str__(self):
         return self.serialize()
     def get_parent(self):
@@ -535,10 +552,17 @@ def nodeWrap(o):
     return xmlNode(_obj=o)
 
 def xpathObjectRet(o):
-    if type(o) == type([]) or type(o) == type(()):
-        ret = map(lambda x: nodeWrap(x), o)
+    otype = type(o)
+    if otype == type([]):
+        ret = map(xpathObjectRet, o)
         return ret
-    return o
+    elif otype == type(()):
+        ret = map(xpathObjectRet, o)
+        return tuple(ret)
+    elif otype == type('') or otype == type(0) or otype == type(0.0):
+        return o
+    else:
+        return nodeWrap(o)
 
 #
 # register an XPath function
diff --git a/python/libxml2-py.c b/python/libxml2-py.c
index e0559a0..853a894 100644
--- a/python/libxml2-py.c
+++ b/python/libxml2-py.c
@@ -2411,6 +2411,20 @@ libxml_xmlSaveFormatFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 #endif /* defined(LIBXML_OUTPUT_ENABLED) */
+PyObject *
+libxml_xmlPathToURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlChar * path;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlPathToURI", &path))
+        return(NULL);
+
+    c_retval = xmlPathToURI(path);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
 PyObject *
 libxml_xmlParseXMLDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
@@ -2535,7 +2549,7 @@ libxml_xmlXPathOrderDocElems(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
     c_retval = xmlXPathOrderDocElems(doc);
-    py_retval = libxml_intWrap((int) c_retval);
+    py_retval = libxml_longWrap((long) c_retval);
     return(py_retval);
 }
 
@@ -4253,7 +4267,7 @@ libxml_xmlByteConsumed(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
     c_retval = xmlByteConsumed(ctxt);
-    py_retval = libxml_intWrap((int) c_retval);
+    py_retval = libxml_longWrap((long) c_retval);
     return(py_retval);
 }
 
@@ -7001,7 +7015,7 @@ libxml_xmlClearParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(Py_None);
 }
 
-#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED)
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED)
 PyObject *
 libxml_xmlValidateNCName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -7017,7 +7031,7 @@ libxml_xmlValidateNCName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED) */
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) */
 PyObject *
 libxml_xmlStrlen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -7365,7 +7379,7 @@ libxml_xmlTextReaderByteConsumed(PyObject *self ATTRIBUTE_UNUSED, PyObject *args
     reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
     c_retval = xmlTextReaderByteConsumed(reader);
-    py_retval = libxml_intWrap((int) c_retval);
+    py_retval = libxml_longWrap((long) c_retval);
     return(py_retval);
 }
 
@@ -10291,6 +10305,18 @@ libxml_xmlXPtrNewRangeNodes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 #endif /* defined(LIBXML_XPTR_ENABLED) */
+#if defined(LIBXML_HTML_ENABLED)
+PyObject *
+libxml_htmlNewParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+    PyObject *py_retval;
+    htmlParserCtxtPtr c_retval;
+
+    c_retval = htmlNewParserCtxt();
+    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* defined(LIBXML_HTML_ENABLED) */
 PyObject *
 libxml_xmlStringDecodeEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -14082,7 +14108,7 @@ libxml_xmlGetLineNo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
     c_retval = xmlGetLineNo(node);
-    py_retval = libxml_intWrap((int) c_retval);
+    py_retval = libxml_longWrap((long) c_retval);
     return(py_retval);
 }
 
diff --git a/python/setup.py b/python/setup.py
index 99def88..9e3300b 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -226,7 +226,7 @@ else:
 setup (name = "libxml2-python",
        # On *nix, the version number is created from setup.py.in
        # On windows, it is set by configure.js
-       version = "2.6.26",
+       version = "2.6.27",
        description = descr,
        author = "Daniel Veillard",
        author_email = "veillard@redhat.com",
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
index 3571abf..39950f6 100644
--- a/python/tests/Makefile.am
+++ b/python/tests/Makefile.am
@@ -43,7 +43,8 @@ PYTESTS=	\
     tstmem.py	\
     validDTD.py	\
     validSchemas.py \
-    validRNG.py
+    validRNG.py \
+    compareNodes.py
 
 XMLS=		\
     tst.xml	\
diff --git a/python/tests/Makefile.in b/python/tests/Makefile.in
index 5b84cc2..bd49790 100644
--- a/python/tests/Makefile.in
+++ b/python/tests/Makefile.in
@@ -136,6 +136,7 @@ RDL_LIBS = @RDL_LIBS@
 READER_TEST = @READER_TEST@
 RELDATE = @RELDATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STATIC_BINARIES = @STATIC_BINARIES@
@@ -164,6 +165,7 @@ THREAD_CFLAGS = @THREAD_CFLAGS@
 THREAD_LIBS = @THREAD_LIBS@
 U = @U@
 VERSION = @VERSION@
+WGET = @WGET@
 WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@
 WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@
 WITH_C14N = @WITH_C14N@
@@ -199,6 +201,7 @@ WITH_WRITER = @WITH_WRITER@
 WITH_XINCLUDE = @WITH_XINCLUDE@
 WITH_XPATH = @WITH_XPATH@
 WITH_XPTR = @WITH_XPTR@
+WITH_ZLIB = @WITH_ZLIB@
 XINCLUDE_OBJ = @XINCLUDE_OBJ@
 XMLLINT = @XMLLINT@
 XML_CFLAGS = @XML_CFLAGS@
@@ -302,7 +305,8 @@ PYTESTS = \
     tstmem.py	\
     validDTD.py	\
     validSchemas.py \
-    validRNG.py
+    validRNG.py \
+    compareNodes.py
 
 XMLS = \
     tst.xml	\
diff --git a/python/tests/compareNodes.py b/python/tests/compareNodes.py
new file mode 100755
index 0000000..ec04323
--- /dev/null
+++ b/python/tests/compareNodes.py
@@ -0,0 +1,50 @@
+#!/usr/bin/python -u
+import sys
+import libxml2
+
+# Memory debug specific
+libxml2.debugMemory(1)
+
+#
+# Testing XML Node comparison and Node hash-value
+#
+doc = libxml2.parseDoc("""""")
+root = doc.getRootElement()
+
+# Create two different objects which point to foo
+foonode1 = root.children
+foonode2 = root.children
+
+# Now check that [in]equality tests work ok
+if not ( foonode1 == foonode2 ):
+    print "Error comparing nodes with ==, nodes should be equal but are unequal"
+    sys.exit(1)
+if not ( foonode1 != root ):
+    print "Error comparing nodes with ==, nodes should not be equal but are equal"
+    sys.exit(1)
+if not ( foonode1 != root ):
+    print "Error comparing nodes with !=, nodes should not be equal but are equal"
+if ( foonode1 != foonode2 ):
+    print "Error comparing nodes with !=, nodes should be equal but are unequal"
+
+# Next check that the hash function for the objects also works ok
+if not (hash(foonode1) == hash(foonode2)):
+    print "Error hash values for two equal nodes are different"
+    sys.exit(1)
+if not (hash(foonode1) != hash(root)):
+    print "Error hash values for two unequal nodes are not different"
+    sys.exit(1)
+if hash(foonode1) == hash(root):
+    print "Error hash values for two unequal nodes are equal"
+    sys.exit(1)
+
+# Basic tests successful
+doc.freeDoc()
+
+# Memory debug specific
+libxml2.cleanupParser()
+if libxml2.debugMemory(1) == 0:
+    print "OK"
+else:
+    print "Memory leak %d bytes" % (libxml2.debugMemory(1))
+    libxml2.dumpMemory()
diff --git a/python/types.c b/python/types.c
index 8a6a9a0..5c5dcca 100644
--- a/python/types.c
+++ b/python/types.c
@@ -395,8 +395,106 @@ libxml_xmlXPathObjectPtrWrap(xmlXPathObjectPtr obj)
             ret = PyString_FromString((char *) obj->stringval);
             break;
         case XPATH_POINT:
+        {
+            PyObject *node;
+            PyObject *indexIntoNode;
+            PyObject *tuple;
+
+            node = libxml_xmlNodePtrWrap(obj->user);
+            indexIntoNode = PyInt_FromLong((long) obj->index);
+
+            tuple = PyTuple_New(2);
+            PyTuple_SetItem(tuple, 0, node);
+            PyTuple_SetItem(tuple, 1, indexIntoNode);
+
+            ret = tuple;
+            break;
+        }
         case XPATH_RANGE:
+        {
+            unsigned short bCollapsedRange;
+
+            bCollapsedRange = ( (obj->user2 == NULL) ||
+		                ((obj->user2 == obj->user) && (obj->index == obj->index2)) );
+            if ( bCollapsedRange ) {
+                PyObject *node;
+                PyObject *indexIntoNode;
+                PyObject *tuple;
+                PyObject *list;
+
+                list = PyList_New(1);
+
+                node = libxml_xmlNodePtrWrap(obj->user);
+                indexIntoNode = PyInt_FromLong((long) obj->index);
+
+                tuple = PyTuple_New(2);
+                PyTuple_SetItem(tuple, 0, node);
+                PyTuple_SetItem(tuple, 1, indexIntoNode);
+
+                PyList_SetItem(list, 0, tuple);
+
+                ret = list;
+            } else {
+                PyObject *node;
+                PyObject *indexIntoNode;
+                PyObject *tuple;
+                PyObject *list;
+
+                list = PyList_New(2);
+
+                node = libxml_xmlNodePtrWrap(obj->user);
+                indexIntoNode = PyInt_FromLong((long) obj->index);
+
+                tuple = PyTuple_New(2);
+                PyTuple_SetItem(tuple, 0, node);
+                PyTuple_SetItem(tuple, 1, indexIntoNode);
+
+                PyList_SetItem(list, 0, tuple);
+
+                node = libxml_xmlNodePtrWrap(obj->user2);
+                indexIntoNode = PyInt_FromLong((long) obj->index2);
+
+                tuple = PyTuple_New(2);
+                PyTuple_SetItem(tuple, 0, node);
+                PyTuple_SetItem(tuple, 1, indexIntoNode);
+
+                PyList_SetItem(list, 1, tuple);
+
+                ret = list;
+            }
+            break;
+        }
         case XPATH_LOCATIONSET:
+        {
+            xmlLocationSetPtr set;
+
+            set = obj->user;
+            if ( set && set->locNr > 0 ) {
+                int i;
+                PyObject *list;
+
+                list = PyList_New(set->locNr);
+
+                for (i=0; ilocNr; i++) {
+                    xmlXPathObjectPtr setobj;
+                    PyObject *pyobj;
+
+                    setobj = set->locTab[i]; /*xmlXPathObjectPtr setobj*/
+
+                    pyobj = libxml_xmlXPathObjectPtrWrap(setobj);
+                    /* xmlXPathFreeObject(setobj) is called */
+                    set->locTab[i] = NULL;
+
+                    PyList_SetItem(list, i, pyobj);
+                }
+                set->locNr = 0;
+                ret = list;
+            } else {
+                Py_INCREF(Py_None);
+                ret = Py_None;
+            }
+            break;
+        }
         default:
 #ifdef DEBUG
             printf("Unable to convert XPath object type %d\n", obj->type);
@@ -422,6 +520,20 @@ libxml_xmlXPathObjectPtrConvert(PyObject * obj)
     if PyFloat_Check
         (obj) {
         ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
+
+    } else if PyInt_Check(obj) {
+
+        ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
+
+    } else if PyBool_Check (obj) {
+
+        if (obj == Py_True) {
+          ret = xmlXPathNewBoolean(1);
+        }
+        else {
+          ret = xmlXPathNewBoolean(0);
+        }
+
     } else if PyString_Check
         (obj) {
         xmlChar *str;
diff --git a/relaxng.c b/relaxng.c
index dd8b6cd..16527cc 100644
--- a/relaxng.c
+++ b/relaxng.c
@@ -9899,8 +9899,10 @@ xmlRelaxNGValidateState(xmlRelaxNGValidCtxtPtr ctxt,
                 if ((ctxt->flags & FLAGS_IGNORABLE) == 0) {
                     xmlRelaxNGDumpValidError(ctxt);
                     ret = 0;
+#if 0
                 } else {
                     ret = -2;
+#endif
                 }
             } else {
                 if (ctxt->errNr > errNr)
diff --git a/runtest.c b/runtest.c
index cf0fb63..b694d56 100644
--- a/runtest.c
+++ b/runtest.c
@@ -565,6 +565,7 @@ static char *resultFilename(const char *filename, const char *out,
                             const char *suffix) {
     const char *base;
     char res[500];
+    char suffixbuff[500];
 
 /*************
     if ((filename[0] == 't') && (filename[1] == 'e') &&
@@ -578,7 +579,14 @@ static char *resultFilename(const char *filename, const char *out,
         suffix = ".tmp";
     if (out == NULL)
         out = "";
-    snprintf(res, 499, "%s%s%s", out, base, suffix);
+
+    strncpy(suffixbuff,suffix,499);
+#ifdef VMS
+    if(strstr(base,".") && suffixbuff[0]=='.')
+      suffixbuff[0]='_';
+#endif
+
+    snprintf(res, 499, "%s%s%s", out, base, suffixbuff);
     res[499] = 0;
     return(strdup(res));
 }
@@ -2881,6 +2889,7 @@ schemasOneTest(const char *sch,
     xmlDocPtr doc;
     xmlSchemaValidCtxtPtr ctxt;
     int ret = 0;
+    int validResult = 0;
     char *temp;
     FILE *schemasOutput;
 
@@ -2908,10 +2917,10 @@ schemasOneTest(const char *sch,
          (xmlSchemaValidityErrorFunc) testErrorHandler,
          (xmlSchemaValidityWarningFunc) testErrorHandler,
 	 ctxt);
-    ret = xmlSchemaValidateDoc(ctxt, doc);
-    if (ret == 0) {
+    validResult = xmlSchemaValidateDoc(ctxt, doc);
+    if (validResult == 0) {
 	fprintf(schemasOutput, "%s validates\n", filename);
-    } else if (ret > 0) {
+    } else if (validResult > 0) {
 	fprintf(schemasOutput, "%s fails to validate\n", filename);
     } else {
 	fprintf(schemasOutput, "%s validation generated an internal error\n",
@@ -2927,12 +2936,10 @@ schemasOneTest(const char *sch,
     unlink(temp);
     free(temp);
 
-    if ((ret != 0) && (err != NULL)) {
+    if ((validResult != 0) && (err != NULL)) {
 	if (compareFileMem(err, testErrors, testErrorsSize)) {
 	    fprintf(stderr, "Error for %s on %s failed\n", filename, sch);
 	    ret = 1;
-	} else {
-	    ret = 0;
 	}
     }
 
diff --git a/testapi.c b/testapi.c
index 4629bc2..01a4184 100644
--- a/testapi.c
+++ b/testapi.c
@@ -14,6 +14,7 @@
 #include 
 #endif
 
+#include  /* for putenv() */
 #include 
 #include 
 #include 
@@ -126,6 +127,9 @@ int main(int argc, char **argv) {
     int ret;
     int blocks, mem;
 
+    /* access to the proxy can slow up regression tests a lot */
+    putenv("http_proxy=");
+
     memset(chartab, 0, sizeof(chartab));
     strncpy((char *) chartab, "  chartab\n", 20);
     memset(inttab, 0, sizeof(inttab));
@@ -2124,6 +2128,33 @@ test_htmlIsScriptAttribute(void) {
 }
 
 
+static int
+test_htmlNewParserCtxt(void) {
+    int test_ret = 0;
+
+#if defined(LIBXML_HTML_ENABLED)
+    int mem_base;
+    htmlParserCtxtPtr ret_val;
+
+        mem_base = xmlMemBlocks();
+
+        ret_val = htmlNewParserCtxt();
+        desret_htmlParserCtxtPtr(ret_val);
+        call_tests++;
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in htmlNewParserCtxt",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf("\n");
+        }
+    function_tests++;
+#endif
+
+    return(test_ret);
+}
+
+
 static int
 test_htmlNodeStatus(void) {
     int test_ret = 0;
@@ -2723,7 +2754,7 @@ static int
 test_HTMLparser(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing HTMLparser : 31 of 37 functions ...\n");
+    if (quiet == 0) printf("Testing HTMLparser : 32 of 38 functions ...\n");
     test_ret += test_UTF8ToHtml();
     test_ret += test_htmlAttrAllowed();
     test_ret += test_htmlAutoCloseTag();
@@ -2742,6 +2773,7 @@ test_HTMLparser(void) {
     test_ret += test_htmlHandleOmittedElem();
     test_ret += test_htmlIsAutoClosed();
     test_ret += test_htmlIsScriptAttribute();
+    test_ret += test_htmlNewParserCtxt();
     test_ret += test_htmlNodeStatus();
     test_ret += test_htmlParseCharRef();
     test_ret += test_htmlParseChunk();
@@ -19978,7 +20010,7 @@ test_xmlDocSetRootElement(void) {
     xmlNodePtr ret_val;
     xmlDocPtr doc; /* the document */
     int n_doc;
-    xmlNodePtr root; /* the new document root element */
+    xmlNodePtr root; /* the new document root element, if root is NULL no action is taken, to remove a node from a document use xmlUnlinkNode(root) instead. */
     int n_root;
 
     for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) {
@@ -23561,7 +23593,7 @@ static int
 test_xmlValidateNCName(void) {
     int test_ret = 0;
 
-#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED)
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED)
 #ifdef LIBXML_TREE_ENABLED
     int mem_base;
     int ret_val;
@@ -24094,6 +24126,38 @@ test_xmlParseURIReference(void) {
 }
 
 
+static int
+test_xmlPathToURI(void) {
+    int test_ret = 0;
+
+    int mem_base;
+    xmlChar * ret_val;
+    xmlChar * path; /* the resource locator in a filesystem notation */
+    int n_path;
+
+    for (n_path = 0;n_path < gen_nb_const_xmlChar_ptr;n_path++) {
+        mem_base = xmlMemBlocks();
+        path = gen_const_xmlChar_ptr(n_path, 0);
+
+        ret_val = xmlPathToURI((const xmlChar *)path);
+        desret_xmlChar_ptr(ret_val);
+        call_tests++;
+        des_const_xmlChar_ptr(n_path, (const xmlChar *)path, 0);
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in xmlPathToURI",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf(" %d", n_path);
+            printf("\n");
+        }
+    }
+    function_tests++;
+
+    return(test_ret);
+}
+
+
 static int
 test_xmlPrintURI(void) {
     int test_ret = 0;
@@ -24247,7 +24311,7 @@ static int
 test_uri(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing uri : 9 of 14 functions ...\n");
+    if (quiet == 0) printf("Testing uri : 10 of 15 functions ...\n");
     test_ret += test_xmlBuildRelativeURI();
     test_ret += test_xmlBuildURI();
     test_ret += test_xmlCanonicPath();
@@ -24256,6 +24320,7 @@ test_uri(void) {
     test_ret += test_xmlParseURI();
     test_ret += test_xmlParseURIRaw();
     test_ret += test_xmlParseURIReference();
+    test_ret += test_xmlPathToURI();
     test_ret += test_xmlPrintURI();
     test_ret += test_xmlSaveUri();
     test_ret += test_xmlURIEscape();
@@ -26889,6 +26954,54 @@ test_xmlXIncludeProcessFlags(void) {
     return(test_ret);
 }
 
+
+static int
+test_xmlXIncludeProcessFlagsData(void) {
+    int test_ret = 0;
+
+#if defined(LIBXML_XINCLUDE_ENABLED)
+    int mem_base;
+    int ret_val;
+    xmlDocPtr doc; /* an XML document */
+    int n_doc;
+    int flags; /* a set of xmlParserOption used for parsing XML includes */
+    int n_flags;
+    void * data; /* application data that will be passed to the parser context in the _private field of the parser context(s) */
+    int n_data;
+
+    for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) {
+    for (n_flags = 0;n_flags < gen_nb_int;n_flags++) {
+    for (n_data = 0;n_data < gen_nb_userdata;n_data++) {
+        mem_base = xmlMemBlocks();
+        doc = gen_xmlDocPtr(n_doc, 0);
+        flags = gen_int(n_flags, 1);
+        data = gen_userdata(n_data, 2);
+
+        ret_val = xmlXIncludeProcessFlagsData(doc, flags, data);
+        desret_int(ret_val);
+        call_tests++;
+        des_xmlDocPtr(n_doc, doc, 0);
+        des_int(n_flags, flags, 1);
+        des_userdata(n_data, data, 2);
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in xmlXIncludeProcessFlagsData",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf(" %d", n_doc);
+            printf(" %d", n_flags);
+            printf(" %d", n_data);
+            printf("\n");
+        }
+    }
+    }
+    }
+    function_tests++;
+#endif
+
+    return(test_ret);
+}
+
 #ifdef LIBXML_XINCLUDE_ENABLED
 
 #define gen_nb_xmlXIncludeCtxtPtr 1
@@ -27060,10 +27173,11 @@ static int
 test_xinclude(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing xinclude : 6 of 8 functions ...\n");
+    if (quiet == 0) printf("Testing xinclude : 7 of 9 functions ...\n");
     test_ret += test_xmlXIncludeNewContext();
     test_ret += test_xmlXIncludeProcess();
     test_ret += test_xmlXIncludeProcessFlags();
+    test_ret += test_xmlXIncludeProcessFlagsData();
     test_ret += test_xmlXIncludeProcessNode();
     test_ret += test_xmlXIncludeProcessTree();
     test_ret += test_xmlXIncludeProcessTreeFlags();
@@ -33356,7 +33470,7 @@ test_xmlSaveTree(void) {
     long ret_val;
     xmlSaveCtxtPtr ctxt; /* a document saving context */
     int n_ctxt;
-    xmlNodePtr node; /* a document */
+    xmlNodePtr node; /* the top node of the subtree to save */
     int n_node;
 
     for (n_ctxt = 0;n_ctxt < gen_nb_xmlSaveCtxtPtr;n_ctxt++) {
@@ -45558,6 +45672,47 @@ test_xmlXPathCompiledEval(void) {
 }
 
 
+static int
+test_xmlXPathCompiledEvalToBoolean(void) {
+    int test_ret = 0;
+
+#if defined(LIBXML_XPATH_ENABLED)
+    int mem_base;
+    int ret_val;
+    xmlXPathCompExprPtr comp; /* the compiled XPath expression */
+    int n_comp;
+    xmlXPathContextPtr ctxt; /* the XPath context */
+    int n_ctxt;
+
+    for (n_comp = 0;n_comp < gen_nb_xmlXPathCompExprPtr;n_comp++) {
+    for (n_ctxt = 0;n_ctxt < gen_nb_xmlXPathContextPtr;n_ctxt++) {
+        mem_base = xmlMemBlocks();
+        comp = gen_xmlXPathCompExprPtr(n_comp, 0);
+        ctxt = gen_xmlXPathContextPtr(n_ctxt, 1);
+
+        ret_val = xmlXPathCompiledEvalToBoolean(comp, ctxt);
+        desret_int(ret_val);
+        call_tests++;
+        des_xmlXPathCompExprPtr(n_comp, comp, 0);
+        des_xmlXPathContextPtr(n_ctxt, ctxt, 1);
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in xmlXPathCompiledEvalToBoolean",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf(" %d", n_comp);
+            printf(" %d", n_ctxt);
+            printf("\n");
+        }
+    }
+    }
+    function_tests++;
+#endif
+
+    return(test_ret);
+}
+
+
 static int
 test_xmlXPathContextSetCache(void) {
     int test_ret = 0;
@@ -46059,7 +46214,7 @@ static int
 test_xpath(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing xpath : 29 of 37 functions ...\n");
+    if (quiet == 0) printf("Testing xpath : 30 of 38 functions ...\n");
     test_ret += test_xmlXPathCastBooleanToNumber();
     test_ret += test_xmlXPathCastBooleanToString();
     test_ret += test_xmlXPathCastNodeSetToBoolean();
@@ -46077,6 +46232,7 @@ test_xpath(void) {
     test_ret += test_xmlXPathCmpNodes();
     test_ret += test_xmlXPathCompile();
     test_ret += test_xmlXPathCompiledEval();
+    test_ret += test_xmlXPathCompiledEvalToBoolean();
     test_ret += test_xmlXPathContextSetCache();
     test_ret += test_xmlXPathConvertBoolean();
     test_ret += test_xmlXPathConvertNumber();
diff --git a/threads.c b/threads.c
index 90a461a..7124bca 100644
--- a/threads.c
+++ b/threads.c
@@ -319,8 +319,10 @@ xmlFreeRMutex(xmlRMutexPtr tok ATTRIBUTE_UNUSED)
     if (tok == NULL)
         return;
 #ifdef HAVE_PTHREAD_H
-    if (libxml_is_threaded != 0)
+    if (libxml_is_threaded != 0) {
 	pthread_mutex_destroy(&tok->lock);
+	pthread_cond_destroy(&tok->cv);
+    }
 #elif defined HAVE_WIN32_THREADS
     DeleteCriticalSection(&tok->cs);
 #elif defined HAVE_BEOS_THREADS
diff --git a/tree.c b/tree.c
index d382e29..d5b9fec 100644
--- a/tree.c
+++ b/tree.c
@@ -43,8 +43,16 @@
 
 int __xmlRegisterCallbacks = 0;
 
+/************************************************************************
+ *									*
+ * 		Forward declarations					*
+ *									*
+ ************************************************************************/
+
 xmlNsPtr xmlNewReconciliedNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns);
 
+static xmlChar* xmlGetPropNodeValueInternal(xmlAttrPtr prop);
+
 /************************************************************************
  *									*
  * 		Tree memory error handler				*
@@ -337,7 +345,7 @@ xmlSplitQName3(const xmlChar *name, int *len) {
  
 #define CUR_SCHAR(s, l) xmlStringCurrentChar(NULL, s, &l)
 
-#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED)
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED)
 /**
  * xmlValidateNCName:
  * @value: the value to check
@@ -1015,6 +1023,42 @@ xmlCreateIntSubset(xmlDocPtr doc, const xmlChar *name,
 	    (xmlDictOwns(dict, (const xmlChar *)(str)) == 0)))	\
 	    xmlFree((char *)(str));
 
+
+/**
+ * DICT_COPY:
+ * @str:  a string
+ *
+ * Copy a string using a "dict" dictionnary in the current scope,
+ * if availabe.
+ */
+#define DICT_COPY(str, cpy) \
+    if (str) { \
+	if (dict) { \
+	    if (xmlDictOwns(dict, (const xmlChar *)(str))) \
+		cpy = (xmlChar *) (str); \
+	    else \
+		cpy = (xmlChar *) xmlDictLookup((dict), (const xmlChar *)(str), -1); \
+	} else \
+	    cpy = xmlStrdup((const xmlChar *)(str)); }
+
+/**
+ * DICT_CONST_COPY:
+ * @str:  a string
+ *
+ * Copy a string using a "dict" dictionnary in the current scope,
+ * if availabe.
+ */
+#define DICT_CONST_COPY(str, cpy) \
+    if (str) { \
+	if (dict) { \
+	    if (xmlDictOwns(dict, (const xmlChar *)(str))) \
+		cpy = (const xmlChar *) (str); \
+	    else \
+		cpy = xmlDictLookup((dict), (const xmlChar *)(str), -1); \
+	} else \
+	    cpy = (const xmlChar *) xmlStrdup((const xmlChar *)(str)); }
+
+
 /**
  * xmlFreeDtd:
  * @cur:  the DTD structure to free up
@@ -4236,7 +4280,7 @@ xmlGetNodePath(xmlNodePtr node)
     const char *sep;
     const char *name;
     char nametemp[100];
-    int occur = 0;
+    int occur = 0, generic;
 
     if (node == NULL)
         return (NULL);
@@ -4267,17 +4311,23 @@ xmlGetNodePath(xmlNodePtr node)
             sep = "/";
             next = NULL;
         } else if (cur->type == XML_ELEMENT_NODE) {
+	    generic = 0;
             sep = "/";
             name = (const char *) cur->name;
             if (cur->ns) {
-	        if (cur->ns->prefix != NULL)
+		if (cur->ns->prefix != NULL) {
                     snprintf(nametemp, sizeof(nametemp) - 1, "%s:%s",
 		    	(char *)cur->ns->prefix, (char *)cur->name);
-		else
-		    snprintf(nametemp, sizeof(nametemp) - 1, "%s",
-		    	(char *)cur->name);
-                nametemp[sizeof(nametemp) - 1] = 0;
-                name = nametemp;
+		    nametemp[sizeof(nametemp) - 1] = 0;
+		    name = nametemp;
+		} else {
+		    /*
+		    * We cannot express named elements in the default
+		    * namespace, so use "*".
+		    */
+		    generic = 1;
+		    name = "*";
+		}                
             }
             next = cur->parent;
 
@@ -4288,10 +4338,11 @@ xmlGetNodePath(xmlNodePtr node)
             tmp = cur->prev;
             while (tmp != NULL) {
                 if ((tmp->type == XML_ELEMENT_NODE) &&
-		    (xmlStrEqual(cur->name, tmp->name)) &&
-		    ((tmp->ns == cur->ns) ||
-		     ((tmp->ns != NULL) && (cur->ns != NULL) &&
-		      (xmlStrEqual(cur->ns->prefix, tmp->ns->prefix)))))
+		    (generic ||
+		     (xmlStrEqual(cur->name, tmp->name) &&
+		     ((tmp->ns == cur->ns) ||
+		      ((tmp->ns != NULL) && (cur->ns != NULL) &&
+		       (xmlStrEqual(cur->ns->prefix, tmp->ns->prefix)))))))
                     occur++;
                 tmp = tmp->prev;
             }
@@ -4299,10 +4350,11 @@ xmlGetNodePath(xmlNodePtr node)
                 tmp = cur->next;
                 while (tmp != NULL && occur == 0) {
                     if ((tmp->type == XML_ELEMENT_NODE) &&
-			(xmlStrEqual(cur->name, tmp->name)) &&
-			((tmp->ns == cur->ns) ||
-			 ((tmp->ns != NULL) && (cur->ns != NULL) &&
-			  (xmlStrEqual(cur->ns->prefix, tmp->ns->prefix)))))
+			(generic ||
+			 (xmlStrEqual(cur->name, tmp->name) &&
+			 ((tmp->ns == cur->ns) ||
+			  ((tmp->ns != NULL) && (cur->ns != NULL) &&
+			   (xmlStrEqual(cur->ns->prefix, tmp->ns->prefix)))))))
                         occur++;
                     tmp = tmp->next;
                 }
@@ -4482,12 +4534,13 @@ xmlDocGetRootElement(xmlDocPtr doc) {
 /**
  * xmlDocSetRootElement:
  * @doc:  the document
- * @root:  the new document root element
+ * @root:  the new document root element, if root is NULL no action is taken,
+ *         to remove a node from a document use xmlUnlinkNode(root) instead.
  *
  * Set the root element of the document (doc->children is a list
  * containing possibly comments, PIs, etc ...).
  *
- * Returns the old root element if any was found
+ * Returns the old root element if any was found, NULL if root was NULL
  */
 xmlNodePtr
 xmlDocSetRootElement(xmlDocPtr doc, xmlNodePtr root) {
@@ -4748,6 +4801,7 @@ xmlNodeSetName(xmlNodePtr cur, const xmlChar *name) {
 void
 xmlNodeSetBase(xmlNodePtr cur, const xmlChar* uri) {
     xmlNsPtr ns;
+    const xmlChar* fixed;
 
     if (cur == NULL) return;
     switch(cur->type) {
@@ -4783,7 +4837,7 @@ xmlNodeSetBase(xmlNodePtr cur, const xmlChar* uri) {
 	    if (uri == NULL)
 		doc->URL = NULL;
 	    else
-		doc->URL = xmlStrdup(uri);
+		doc->URL = xmlPathToURI(uri);
 	    return;
 	}
     }
@@ -4791,7 +4845,13 @@ xmlNodeSetBase(xmlNodePtr cur, const xmlChar* uri) {
     ns = xmlSearchNsByHref(cur->doc, cur, XML_XML_NAMESPACE);
     if (ns == NULL)
 	return;
-    xmlSetNsProp(cur, ns, BAD_CAST "base", uri);
+    fixed = xmlPathToURI(uri);
+    if (fixed != NULL) {
+	xmlSetNsProp(cur, ns, BAD_CAST "base", fixed);
+	xmlFree(fixed);
+    } else {
+	xmlSetNsProp(cur, ns, BAD_CAST "base", uri);
+    }
 }
 #endif /* LIBXML_TREE_ENABLED */
 
@@ -5055,16 +5115,8 @@ xmlNodeGetContent(xmlNodePtr cur)
                 xmlBufferFree(buffer);
                 return (ret);
             }
-        case XML_ATTRIBUTE_NODE:{
-                xmlAttrPtr attr = (xmlAttrPtr) cur;
-
-                if (attr->parent != NULL)
-                    return (xmlNodeListGetString
-                            (attr->parent->doc, attr->children, 1));
-                else
-                    return (xmlNodeListGetString(NULL, attr->children, 1));
-                break;
-            }
+        case XML_ATTRIBUTE_NODE:
+	    return(xmlGetPropNodeValueInternal((xmlAttrPtr) cur));
         case XML_COMMENT_NODE:
         case XML_PI_NODE:
             if (cur->content != NULL)
@@ -5403,7 +5455,7 @@ xmlTextMerge(xmlNodePtr first, xmlNodePtr second) {
     return(first);
 }
 
-#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED)
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 /**
  * xmlGetNsList:
  * @doc:  the document
@@ -5467,6 +5519,38 @@ xmlGetNsList(xmlDocPtr doc ATTRIBUTE_UNUSED, xmlNodePtr node)
 }
 #endif /* LIBXML_TREE_ENABLED */
 
+/*
+* xmlTreeEnsureXMLDecl:
+* @doc: the doc
+* 
+* Ensures that there is an XML namespace declaration on the doc.
+* 
+* Returns the XML ns-struct or NULL on API and internal errors.
+*/
+static xmlNsPtr
+xmlTreeEnsureXMLDecl(xmlDocPtr doc)
+{
+    if (doc == NULL)
+	return (NULL);
+    if (doc->oldNs != NULL)
+	return (doc->oldNs);
+    {
+	xmlNsPtr ns;
+	ns = (xmlNsPtr) xmlMalloc(sizeof(xmlNs));
+	if (ns == NULL) {
+	    xmlTreeErrMemory(
+		"allocating the XML namespace");
+	    return (NULL);
+	}
+	memset(ns, 0, sizeof(xmlNs));
+	ns->type = XML_LOCAL_NAMESPACE;
+	ns->href = xmlStrdup(XML_XML_NAMESPACE); 
+	ns->prefix = xmlStrdup((const xmlChar *)"xml");
+	doc->oldNs = ns;
+	return (ns);
+    }
+}
+
 /**
  * xmlSearchNs:
  * @doc:  the document
@@ -5516,22 +5600,13 @@ xmlSearchNs(xmlDocPtr doc, xmlNodePtr node, const xmlChar *nameSpace) {
 	    if (doc == NULL)
 		return(NULL);
 	}
-	if (doc->oldNs == NULL) {
-	    /*
-	     * Allocate a new Namespace and fill the fields.
-	     */
-	    doc->oldNs = (xmlNsPtr) xmlMalloc(sizeof(xmlNs));
-	    if (doc->oldNs == NULL) {
-		xmlTreeErrMemory("searching namespace");
-		return(NULL);
-	    }
-	    memset(doc->oldNs, 0, sizeof(xmlNs));
-	    doc->oldNs->type = XML_LOCAL_NAMESPACE;
-
-	    doc->oldNs->href = xmlStrdup(XML_XML_NAMESPACE); 
-	    doc->oldNs->prefix = xmlStrdup((const xmlChar *)"xml"); 
-	}
-	return(doc->oldNs);
+	/*
+	* Return the XML namespace declaration held by the doc.
+	*/
+	if (doc->oldNs == NULL)
+	    return(xmlTreeEnsureXMLDecl(doc));
+	else
+	    return(doc->oldNs);
     }
     while (node != NULL) {
 	if ((node->type == XML_ENTITY_REF_NODE) ||
@@ -5658,22 +5733,13 @@ xmlSearchNsByHref(xmlDocPtr doc, xmlNodePtr node, const xmlChar * href)
 	    if (doc == NULL)
 		return(NULL);
 	}
-        if (doc->oldNs == NULL) {
-            /*
-             * Allocate a new Namespace and fill the fields.
-             */
-            doc->oldNs = (xmlNsPtr) xmlMalloc(sizeof(xmlNs));
-            if (doc->oldNs == NULL) {
-		xmlTreeErrMemory("searching namespace");
-                return (NULL);
-            }
-            memset(doc->oldNs, 0, sizeof(xmlNs));
-            doc->oldNs->type = XML_LOCAL_NAMESPACE;
-
-            doc->oldNs->href = xmlStrdup(XML_XML_NAMESPACE);
-            doc->oldNs->prefix = xmlStrdup((const xmlChar *) "xml");
-        }
-        return (doc->oldNs);
+	/*
+	* Return the XML namespace declaration held by the doc.
+	*/
+	if (doc->oldNs == NULL)
+	    return(xmlTreeEnsureXMLDecl(doc));
+	else
+	    return(doc->oldNs);        
     }
     is_attr = (node->type == XML_ATTRIBUTE_NODE);
     while (node != NULL) {
@@ -5871,73 +5937,75 @@ xmlReconciliateNs(xmlDocPtr doc, xmlNodePtr tree) {
 	/*
 	 * now check for namespace hold by attributes on the node.
 	 */
-	attr = node->properties;
-	while (attr != NULL) {
-	    if (attr->ns != NULL) {
-		/*
-		 * initialize the cache if needed
-		 */
-		if (sizeCache == 0) {
-		    sizeCache = 10;
-		    oldNs = (xmlNsPtr *) xmlMalloc(sizeCache *
-						   sizeof(xmlNsPtr));
-		    if (oldNs == NULL) {
-			xmlTreeErrMemory("fixing namespaces");
-			return(-1);
-		    }
-		    newNs = (xmlNsPtr *) xmlMalloc(sizeCache *
-						   sizeof(xmlNsPtr));
-		    if (newNs == NULL) {
-			xmlTreeErrMemory("fixing namespaces");
-			xmlFree(oldNs);
-			return(-1);
-		    }
-		}
-		for (i = 0;i < nbCache;i++) {
-		    if (oldNs[i] == attr->ns) {
-			attr->ns = newNs[i];
-			break;
-		    }
-		}
-		if (i == nbCache) {
+	if (node->type == XML_ELEMENT_NODE) {
+	    attr = node->properties;
+	    while (attr != NULL) {
+		if (attr->ns != NULL) {
 		    /*
-		     * OK we need to recreate a new namespace definition
+		     * initialize the cache if needed
 		     */
-		    n = xmlNewReconciliedNs(doc, tree, attr->ns);
-		    if (n != NULL) { /* :-( what if else ??? */
+		    if (sizeCache == 0) {
+			sizeCache = 10;
+			oldNs = (xmlNsPtr *) xmlMalloc(sizeCache *
+						       sizeof(xmlNsPtr));
+			if (oldNs == NULL) {
+			    xmlTreeErrMemory("fixing namespaces");
+			    return(-1);
+			}
+			newNs = (xmlNsPtr *) xmlMalloc(sizeCache *
+						       sizeof(xmlNsPtr));
+			if (newNs == NULL) {
+			    xmlTreeErrMemory("fixing namespaces");
+			    xmlFree(oldNs);
+			    return(-1);
+			}
+		    }
+		    for (i = 0;i < nbCache;i++) {
+			if (oldNs[i] == attr->ns) {
+			    attr->ns = newNs[i];
+			    break;
+			}
+		    }
+		    if (i == nbCache) {
 			/*
-			 * check if we need to grow the cache buffers.
+			 * OK we need to recreate a new namespace definition
 			 */
-			if (sizeCache <= nbCache) {
-			    sizeCache *= 2;
-			    oldNs = (xmlNsPtr *) xmlRealloc(oldNs, sizeCache *
-							   sizeof(xmlNsPtr));
-			    if (oldNs == NULL) {
-				xmlTreeErrMemory("fixing namespaces");
-				xmlFree(newNs);
-				return(-1);
-			    }
-			    newNs = (xmlNsPtr *) xmlRealloc(newNs, sizeCache *
-							   sizeof(xmlNsPtr));
-			    if (newNs == NULL) {
-				xmlTreeErrMemory("fixing namespaces");
-				xmlFree(oldNs);
-				return(-1);
+			n = xmlNewReconciliedNs(doc, tree, attr->ns);
+			if (n != NULL) { /* :-( what if else ??? */
+			    /*
+			     * check if we need to grow the cache buffers.
+			     */
+			    if (sizeCache <= nbCache) {
+				sizeCache *= 2;
+				oldNs = (xmlNsPtr *) xmlRealloc(oldNs,
+				           sizeCache * sizeof(xmlNsPtr));
+				if (oldNs == NULL) {
+				    xmlTreeErrMemory("fixing namespaces");
+				    xmlFree(newNs);
+				    return(-1);
+				}
+				newNs = (xmlNsPtr *) xmlRealloc(newNs,
+				           sizeCache * sizeof(xmlNsPtr));
+				if (newNs == NULL) {
+				    xmlTreeErrMemory("fixing namespaces");
+				    xmlFree(oldNs);
+				    return(-1);
+				}
 			    }
+			    newNs[nbCache] = n;
+			    oldNs[nbCache++] = attr->ns;
+			    attr->ns = n;
 			}
-			newNs[nbCache] = n;
-			oldNs[nbCache++] = attr->ns;
-			attr->ns = n;
 		    }
 		}
+		attr = attr->next;
 	    }
-	    attr = attr->next;
 	}
 
 	/*
 	 * Browse the full subtree, deep first
 	 */
-        if (node->children != NULL && node->type != XML_ENTITY_REF_NODE) {
+        if ((node->children != NULL) && (node->type != XML_ENTITY_REF_NODE)) {
 	    /* deep first */
 	    node = node->children;
 	} else if ((node != tree) && (node->next != NULL)) {
@@ -6096,7 +6164,7 @@ xmlGetPropNodeValueInternal(xmlAttrPtr prop)
 	*   TODO: Do we really always want that?
 	*/
 	if (prop->children != NULL) {
-	    if ((prop->children == prop->last) &&
+	    if ((prop->children->next == NULL) &&
 		((prop->children->type == XML_TEXT_NODE) ||
 		(prop->children->type == XML_CDATA_SECTION_NODE)))
 	    {
@@ -6471,7 +6539,9 @@ xmlTextConcat(xmlNodePtr node, const xmlChar *content, int len) {
     if (node == NULL) return(-1);
 
     if ((node->type != XML_TEXT_NODE) &&
-        (node->type != XML_CDATA_SECTION_NODE)) {
+        (node->type != XML_CDATA_SECTION_NODE) &&
+	(node->type != XML_COMMENT_NODE) &&
+	(node->type != XML_PI_NODE)) {
 #ifdef DEBUG_TREE
 	xmlGenericError(xmlGenericErrorContext,
 		"xmlTextConcat: node is not text nor CDATA\n");
@@ -7153,41 +7223,6 @@ xmlSetCompressMode(int mode) {
     else xmlCompressMode = mode;
 }
 
-/*
-* xmlDOMWrapNewCtxt:
-*
-* Allocates and initializes a new DOM-wrapper context.
-*
-* Returns the xmlDOMWrapCtxtPtr or NULL in case of an internal errror. 
-*/
-xmlDOMWrapCtxtPtr
-xmlDOMWrapNewCtxt(void)
-{
-    xmlDOMWrapCtxtPtr ret;
-
-    ret = xmlMalloc(sizeof(xmlDOMWrapCtxt));
-    if (ret == NULL) {
-	xmlTreeErrMemory("allocating DOM-wrapper context");
-	return (NULL);
-    }
-    memset(ret, 0, sizeof(xmlDOMWrapCtxt));
-    return (ret);
-}
-
-/*
-* xmlDOMWrapFreeCtxt:
-* @ctxt: the DOM-wrapper context
-*
-* Frees the DOM-wrapper context.
-*/
-void
-xmlDOMWrapFreeCtxt(xmlDOMWrapCtxtPtr ctxt)
-{
-    if (ctxt == NULL)
-	return;
-    xmlFree(ctxt);
-}
-
 #define XML_TREE_NSMAP_PARENT -1
 #define XML_TREE_NSMAP_XML -2
 #define XML_TREE_NSMAP_DOC -3
@@ -7261,7 +7296,6 @@ xmlDOMWrapNsMapFree(xmlNsMapPtr nsmap)
 /*
 * xmlDOMWrapNsMapAddItem:
 * @map: the ns-map
-* @cur: the current map entry to append a new entry to
 * @oldNs: the old ns-struct
 * @newNs: the new ns-struct
 * @depth: depth and ns-kind information
@@ -7269,7 +7303,7 @@ xmlDOMWrapNsMapFree(xmlNsMapPtr nsmap)
 * Adds an ns-mapping item.
 */
 static xmlNsMapItemPtr
-xmlDOMWrapNsMapAddItem(xmlNsMapPtr *nsmap, int position, /* xmlNsMapItemPtr *cur, */
+xmlDOMWrapNsMapAddItem(xmlNsMapPtr *nsmap, int position,
 		       xmlNsPtr oldNs, xmlNsPtr newNs, int depth)
 {
     xmlNsMapItemPtr ret;
@@ -7343,38 +7377,6 @@ xmlDOMWrapNsMapAddItem(xmlNsMapPtr *nsmap, int position, /* xmlNsMapItemPtr *cur
     return (ret);
 }
 
-/*
-* xmlTreeEnsureXMLDecl:
-* @doc: the doc
-* 
-* Ensures that there is an XML namespace declaration on the doc.
-* 
-* Returns the XML ns-struct or NULL on API and internal errors.
-*/
-static xmlNsPtr
-xmlTreeEnsureXMLDecl(xmlDocPtr doc)
-{
-    if (doc == NULL)
-	return (NULL);
-    if (doc->oldNs != NULL)
-	return (doc->oldNs);
-    {
-	xmlNsPtr ns;
-	ns = (xmlNsPtr) xmlMalloc(sizeof(xmlNs));
-	if (ns == NULL) {
-	    xmlTreeErrMemory(
-		"allocating the XML namespace");
-	    return (NULL);
-	}
-	memset(ns, 0, sizeof(xmlNs));
-	ns->type = XML_LOCAL_NAMESPACE;
-	ns->href = xmlStrdup(XML_XML_NAMESPACE); 
-	ns->prefix = xmlStrdup((const xmlChar *)"xml");
-	doc->oldNs = ns;
-	return (ns);
-    }
-}
-
 /*
 * xmlDOMWrapStoreNs:
 * @doc: the doc
@@ -7418,6 +7420,46 @@ xmlDOMWrapStoreNs(xmlDocPtr doc,
     return (ns->next);
 }
 
+/*
+* xmlDOMWrapNewCtxt:
+*
+* Allocates and initializes a new DOM-wrapper context.
+*
+* Returns the xmlDOMWrapCtxtPtr or NULL in case of an internal errror. 
+*/
+xmlDOMWrapCtxtPtr
+xmlDOMWrapNewCtxt(void)
+{
+    xmlDOMWrapCtxtPtr ret;
+
+    ret = xmlMalloc(sizeof(xmlDOMWrapCtxt));
+    if (ret == NULL) {
+	xmlTreeErrMemory("allocating DOM-wrapper context");
+	return (NULL);
+    }
+    memset(ret, 0, sizeof(xmlDOMWrapCtxt));
+    return (ret);
+}
+
+/*
+* xmlDOMWrapFreeCtxt:
+* @ctxt: the DOM-wrapper context
+*
+* Frees the DOM-wrapper context.
+*/
+void
+xmlDOMWrapFreeCtxt(xmlDOMWrapCtxtPtr ctxt)
+{
+    if (ctxt == NULL)
+	return;
+    if (ctxt->namespaceMap != NULL)
+	xmlDOMWrapNsMapFree((xmlNsMapPtr) ctxt->namespaceMap);
+    /*
+    * TODO: Store the namespace map in the context.
+    */
+    xmlFree(ctxt);
+}
+
 /*
 * xmlTreeLookupNsListByPrefix:
 * @nsList: a list of ns-structs
@@ -7586,7 +7628,8 @@ xmlDOMWrapNSNormAddNsMapItem2(xmlNsPtr **list, int *size, int *number,
 * This will substitute ns-references to node->nsDef for
 * ns-references to doc->oldNs, thus ensuring the removed
 * branch to be autark wrt ns-references.
-* WARNING: This function is in a experimental state.
+*
+* NOTE: This function was not intensively tested.
 *
 * Returns 0 on success, 1 if the node is not supported,
 *         -1 on API and internal errors. 
@@ -7817,7 +7860,6 @@ xmlSearchNsByNamespaceStrict(xmlDocPtr doc, xmlNodePtr node,
 * @node: the start node
 * @prefix: the searched namespace prefix
 * @retNs: the resulting ns-decl
-* @prefixed: if the found ns-decl must have a prefix (for attributes)
 *
 * Dynamically searches for a ns-declaration which matches
 * the given @nsName in the ancestor-or-self axis of @node.
@@ -7939,10 +7981,10 @@ ns_next_prefix:
 	    return (NULL);
 	if (prefix == NULL) {
 	    snprintf((char *) buf, sizeof(buf),
-		"default%d", counter);
+		"ns_%d", counter);
 	} else
 	    snprintf((char *) buf, sizeof(buf),
-	    "%.30s%d", (char *)prefix, counter);
+	    "%.30s_%d", (char *)prefix, counter);
 	pref = BAD_CAST buf;
     }
 }
@@ -7954,7 +7996,6 @@ ns_next_prefix:
 * @ns: the ns-struct to use for the search
 * @retNs: the found/created ns-struct
 * @nsMap: the ns-map
-* @topmi: the last ns-map entry
 * @depth: the current tree depth
 * @ancestorsOnly: search in ancestor ns-decls only
 * @prefixed: if the searched ns-decl must have a prefix (for attributes)
@@ -8001,7 +8042,8 @@ xmlDOMWrapNSNormAquireNormalizedNs(xmlDocPtr doc,
     * If the search should be done in ancestors only and no
     * @elem (the first ancestor) was specified, then skip the search.
     */
-    if ((! (ancestorsOnly && (elem == NULL))) && (XML_NSMAP_NOTEMPTY(*nsMap)))
+    if ((XML_NSMAP_NOTEMPTY(*nsMap)) &&
+	(! (ancestorsOnly && (elem == NULL))))
     {	
 	/*
 	* Try to find an equal ns-name in in-scope ns-decls.
@@ -8102,7 +8144,8 @@ typedef enum {
 * ns-decls where needed. Note that, since prefixes of already existent
 * ns-decls can be shadowed by this process, it could break QNames in
 * attribute values or element content.
-* WARNING: This function is in a experimental state.
+*
+* NOTE: This function was not intensively tested.
 *
 * Returns 0 if succeeded, -1 otherwise and on API/internal errors.
 */   
@@ -8120,7 +8163,7 @@ xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED,
     xmlNsMapItemPtr /* topmi = NULL, */ mi;
     /* @ancestorsOnly should be set by an option flag. */
     int ancestorsOnly = 0;
-    int optRemoveDedundantNS = 
+    int optRemoveRedundantNS = 
 	((xmlDOMReconcileNSOptions) options & XML_DOM_RECONNS_REMOVEREDUND) ? 1 : 0;
     xmlNsPtr *listRedund = NULL;
     int sizeRedund = 0, nbRedund = 0, ret, i, j;
@@ -8160,7 +8203,7 @@ xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED,
 			/*
 			* Lookup the ns ancestor-axis for equal ns-decls in scope.
 			*/
-			if (optRemoveDedundantNS && XML_NSMAP_NOTEMPTY(nsMap)) {
+			if (optRemoveRedundantNS && XML_NSMAP_NOTEMPTY(nsMap)) {
 			    XML_NSMAP_FOREACH(nsMap, mi) {
 				if ((mi->depth >= XML_TREE_NSMAP_PARENT) &&
 				    (mi->shadowDepth == -1) &&
@@ -8366,6 +8409,8 @@ exit:
 * shadowed by this process, it could break QNames in attribute
 * values or element content.
 *
+* NOTE: This function was not intensively tested.
+*
 * Returns 0 if succeeded, -1 otherwise and on API/internal errors.
 */
 static int
@@ -8383,7 +8428,7 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
     xmlNsPtr ns = NULL;
     int depth = -1, adoptStr = 1;
     /* gather @parent's ns-decls. */
-    int parnsdone = 0;
+    int parnsdone;
     /* @ancestorsOnly should be set per option. */
     int ancestorsOnly = 0;
     
@@ -8396,8 +8441,29 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
     else
 	adoptStr = 1;
 
+    /*
+    * Get the ns-map from the context if available.
+    */
+    if (ctxt)
+	nsMap = (xmlNsMapPtr) ctxt->namespaceMap;
+    /*
+    * Disable search for ns-decls in the parent-axis of the
+    * desination element, if:
+    * 1) there's no destination parent
+    * 2) custom ns-reference handling is used
+    */
+    if ((destParent == NULL) ||
+	(ctxt && ctxt->getNsForNodeFunc))
+    {
+	parnsdone = 1;
+    } else
+	parnsdone = 0;
+
     cur = node;
     while (cur != NULL) {
+	/*
+	* Paranoid source-doc sanity check.
+	*/
 	if (cur->doc != sourceDoc) {
 	    /*
 	    * We'll assume XIncluded nodes if the doc differs.
@@ -8429,23 +8495,28 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
 		curElem = cur;
 		depth++;
 		/*
-		* Namespace declarations.
+		* Namespace declarations.		
+		* - ns->href and ns->prefix are never in the dict, so
+		*   we need not move the values over to the destination dict.
+		* - Note that for custom handling of ns-references,
+		*   the ns-decls need not be stored in the ns-map,
+		*   since they won't be referenced by node->ns.
 		*/
-		if ((ctxt == NULL) && (cur->nsDef != NULL)) {
+		if ((cur->nsDef) &&
+		    ((ctxt == NULL) || (ctxt->getNsForNodeFunc == NULL)))
+		{
 		    if (! parnsdone) {
-			if (destParent && (ctxt == NULL)) {
-			    /*
-			    * Gather @parent's in-scope ns-decls.
-			    */
-			    if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap,
-				destParent) == -1)
-				goto internal_error;			    
-			}
+			/*
+			* Gather @parent's in-scope ns-decls.
+			*/
+			if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap,
+			    destParent) == -1)
+			    goto internal_error;
 			parnsdone = 1;
 		    }
 		    for (ns = cur->nsDef; ns != NULL; ns = ns->next) {
 			/*
-			* ns->prefix and ns->href seem not to be in the dict.
+			* NOTE: ns->prefix and ns->href are never in the dict.
 			* XML_TREE_ADOPT_STR(ns->prefix)
 			* XML_TREE_ADOPT_STR(ns->href)
 			*/			
@@ -8453,7 +8524,7 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
 			* Does it shadow any ns-decl?
 			*/			
 			if (XML_NSMAP_NOTEMPTY(nsMap)) {
-			    XML_NSMAP_FOREACH(nsMap, mi) {			    
+			    XML_NSMAP_FOREACH(nsMap, mi) {
 				if ((mi->depth >= XML_TREE_NSMAP_PARENT) &&
 				    (mi->shadowDepth == -1) &&
 				    ((ns->prefix == mi->newNs->prefix) ||
@@ -8472,27 +8543,26 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
 			    goto internal_error;
 		    }
 		}
-		/* No break on purpose. */	    
+		/* No break on purpose. */
 	    case XML_ATTRIBUTE_NODE:
-		
+		/* No namespace, no fun. */
 		if (cur->ns == NULL)
 		    goto ns_end;
+
 		if (! parnsdone) {
-		    if (destParent && (ctxt == NULL)) {
-			if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap,
-			    destParent) == -1)
-			    goto internal_error;			
-		    }
+		    if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap,
+			destParent) == -1)
+			goto internal_error;
 		    parnsdone = 1;
 		}
 		/*
 		* Adopt ns-references.
 		*/
-		if (XML_NSMAP_NOTEMPTY(nsMap)) {			    		
+		if (XML_NSMAP_NOTEMPTY(nsMap)) {
 		    /*
 		    * Search for a mapping.
 		    */
-		    XML_NSMAP_FOREACH(nsMap, mi) {		    
+		    XML_NSMAP_FOREACH(nsMap, mi) {
 			if ((mi->shadowDepth == -1) &&
 			    (cur->ns == mi->oldNs)) {
 
@@ -8502,21 +8572,20 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
 		    }
 		}
 		/*
-		* Start searching for an in-scope ns-decl.
-		*/		
-		if (ctxt != NULL) {
+		* No matching namespace in scope. We need a new one.
+		*/
+		if ((ctxt) && (ctxt->getNsForNodeFunc)) {
 		    /*
 		    * User-defined behaviour.
 		    */
-#if 0
-		    ctxt->aquireNsDecl(ctxt, cur->ns, &ns);
-#endif		    
+		    ns = ctxt->getNsForNodeFunc(ctxt, cur,
+			cur->ns->href, cur->ns->prefix);
 		    /*
 		    * Insert mapping if ns is available; it's the users fault
 		    * if not.
 		    */
 		    if (xmlDOMWrapNsMapAddItem(&nsMap, -1,
-			    ns, ns, XML_TREE_NSMAP_CUSTOM) == NULL)
+			    cur->ns, ns, XML_TREE_NSMAP_CUSTOM) == NULL)
 			goto internal_error;
 		    cur->ns = ns;
 		} else {
@@ -8560,7 +8629,9 @@ ns_end:
 		    */
 		    if ((sourceDoc != NULL) &&
 			(((xmlAttrPtr) cur)->atype == XML_ATTRIBUTE_ID))
+		    {			
 			xmlRemoveID(sourceDoc, (xmlAttrPtr) cur);
+		    }
 		    ((xmlAttrPtr) cur)->atype = 0;
 		    ((xmlAttrPtr) cur)->psvi = NULL;
 		}
@@ -8615,7 +8686,8 @@ leave_node:
 	    break;
 	if ((cur->type == XML_ELEMENT_NODE) ||
 	    (cur->type == XML_XINCLUDE_START) ||
-	    (cur->type == XML_XINCLUDE_END)) {
+	    (cur->type == XML_XINCLUDE_END))
+	{
 	    /*
 	    * TODO: Do we expect nsDefs on XML_XINCLUDE_START?
 	    */
@@ -8640,7 +8712,11 @@ leave_node:
 	}
 	if (cur->next != NULL)
 	    cur = cur->next;
-	else {
+	else if ((cur->type == XML_ATTRIBUTE_NODE) &&
+	    (cur->parent->children != NULL))
+	{
+	    cur = cur->parent->children;
+	} else {
 	    cur = cur->parent;
 	    goto leave_node;
 	}
@@ -8655,8 +8731,20 @@ exit:
     /*
     * Cleanup.
     */
-    if (nsMap != NULL)
-	xmlDOMWrapNsMapFree(nsMap);
+    if (nsMap != NULL) {
+	if ((ctxt) && (ctxt->namespaceMap == nsMap)) {
+	    /*
+	    * Just cleanup the map but don't free.
+	    */
+	    if (nsMap->first) {
+		if (nsMap->pool)
+		    nsMap->last->next = nsMap->pool;
+		nsMap->pool = nsMap->first;
+		nsMap->first = NULL;
+	    }
+	} else    
+	    xmlDOMWrapNsMapFree(nsMap);
+    }
     return(ret);
 }
 
@@ -8673,9 +8761,9 @@ exit:
 *
 * References of out-of scope ns-decls are remapped to point to @destDoc:
 * 1) If @destParent is given, then nsDef entries on element-nodes are used
-* 2) If *no* @destParent is given, then @destDoc->oldNs entries are used
-*    This is the case when you have an unliked node and just want to move it
-*    to the context of 
+* 2) If *no* @destParent is given, then @destDoc->oldNs entries are used.
+*    This is the case when you don't know already where the cloned branch
+*    will be added to.
 * 
 * If @destParent is given, it ensures that the tree is namespace
 * wellformed by creating additional ns-decls where needed.
@@ -8683,11 +8771,7 @@ exit:
 * shadowed by this process, it could break QNames in attribute
 * values or element content.
 * TODO:
-*   1) Support dicts
-*      Optimize string adoption for equal or none dicts.
-*   2) XInclude
-* WARNING: This function is in a experimental state and should only be currently
-*    only be used to test it.
+*   1) What to do with XInclude? Currently this returns an error for XInclude.
 *
 * Returns 0 if the operation succeeded,
 *         1 if a node of unsupported (or not yet supported) type was given,
@@ -8713,10 +8797,15 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
     /* int adoptStr = 1; */
     /* gather @parent's ns-decls. */
     int parnsdone = 0;
-    /* @ancestorsOnly should be set per option. */
+    /*
+    * @ancestorsOnly: 
+    * TODO: @ancestorsOnly should be set per option.
+    *
+    */
     int ancestorsOnly = 0;
     xmlNodePtr resultClone = NULL, clone = NULL, parentClone = NULL, prevClone = NULL;
-    xmlNsPtr cloneNs = NULL, *cloneNsDefSlot = NULL;    
+    xmlNsPtr cloneNs = NULL, *cloneNsDefSlot = NULL;
+    xmlDictPtr dict; /* The destination dict */
 
     if ((node == NULL) || (resNode == NULL) || (destDoc == NULL))
 	return(-1);
@@ -8740,6 +8829,13 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
     if (sourceDoc == NULL)
         return (-1);
 
+    dict = destDoc->dict;
+    /*
+    * Reuse the namespace map of the context.
+    */
+    if (ctxt)
+	nsMap = (xmlNsMapPtr) ctxt->namespaceMap;
+
     *resNode = NULL;
    
     cur = node;
@@ -8758,23 +8854,25 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
 	switch (cur->type) {
 	    case XML_XINCLUDE_START:
 	    case XML_XINCLUDE_END:
-		/* TODO: What to do with XInclude? */
+		/*
+		* TODO: What to do with XInclude?
+		*/
 		goto internal_error;
 		break;
-	    case XML_TEXT_NODE:
-	    case XML_CDATA_SECTION_NODE:
 	    case XML_ELEMENT_NODE:
+	    case XML_TEXT_NODE:
+	    case XML_CDATA_SECTION_NODE:	    
+	    case XML_COMMENT_NODE:
+	    case XML_PI_NODE:	    
 	    case XML_DOCUMENT_FRAG_NODE:
 	    case XML_ENTITY_REF_NODE:
 	    case XML_ENTITY_NODE:
-	    case XML_PI_NODE:
-	    case XML_COMMENT_NODE:
 		/*
 		* Nodes of xmlNode structure.
 		*/
 		clone = (xmlNodePtr) xmlMalloc(sizeof(xmlNode));
 		if (clone == NULL) {
-		    xmlTreeErrMemory("xmlDOMWrapCloneBranch(): allocating a node");
+		    xmlTreeErrMemory("xmlDOMWrapCloneNode(): allocating a node");
 		    goto internal_error;
 		}
 		memset(clone, 0, sizeof(xmlNode));		
@@ -8798,12 +8896,13 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
 		*/
 		clone = (xmlNodePtr) xmlMalloc(sizeof(xmlAttr));
 		if (clone == NULL) {
-		    xmlTreeErrMemory("xmlDOMWrapCloneBranch(): allocating an attr-node");
+		    xmlTreeErrMemory("xmlDOMWrapCloneNode(): allocating an attr-node");
 		    goto internal_error;
 		}
 		memset(clone, 0, sizeof(xmlAttr));		
 		/*
 		* Set hierachical links.
+		* TODO: Change this to add to the end of attributes.
 		*/
 		if (resultClone != NULL) {
 		    clone->parent = parentClone;
@@ -8816,28 +8915,31 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
 		    resultClone = clone;
 		break;
 	    default:
-		/* TODO */
+		/*
+		* TODO QUESTION: Any other nodes expected?
+		*/
 		goto internal_error;
 	}
 
 	clone->type = cur->type;
 	clone->doc = destDoc;	
-			
+		
+	/*
+	* Clone the name of the node if any.
+	*/
 	if (cur->name == xmlStringText)
 	    clone->name = xmlStringText;
 	else if (cur->name == xmlStringTextNoenc)
 	    /*
-	    * TODO: xmlStringTextNoenc is never assigned to a node
-	    * in tree.c.
+	    * NOTE: Although xmlStringTextNoenc is never assigned to a node
+	    *   in tree.c, it might be set in Libxslt via
+	    *   "xsl:disable-output-escaping".	   
 	    */
 	    clone->name = xmlStringTextNoenc;
 	else if (cur->name == xmlStringComment)
 	    clone->name = xmlStringComment;
 	else if (cur->name != NULL) {
-	    if ((destDoc != NULL) && (destDoc->dict != NULL))
-		clone->name = xmlDictLookup(destDoc->dict, cur->name, -1);
-	    else
-		clone->name = xmlStrdup(cur->name);
+	    DICT_CONST_COPY(cur->name, clone->name);
 	}				    
 
 	switch (cur->type) {
@@ -8875,7 +8977,7 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
 			*/
 			cloneNs = (xmlNsPtr) xmlMalloc(sizeof(xmlNs));
 			if (cloneNs == NULL) {
-			    xmlTreeErrMemory("xmlDOMWrapCloneBranch(): "
+			    xmlTreeErrMemory("xmlDOMWrapCloneNode(): "
 				"allocating namespace");
 			    return(-1);
 			}
@@ -8890,7 +8992,14 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
 			*cloneNsDefSlot = cloneNs;
 			cloneNsDefSlot = &(cloneNs->next);
 
-			if (ctxt == NULL) {
+			/*
+			* Note that for custom handling of ns-references,
+			* the ns-decls need not be stored in the ns-map,
+			* since they won't be referenced by node->ns.
+			*/
+			if ((ctxt == NULL) ||
+			    (ctxt->getNsForNodeFunc == NULL))
+			{
 			    /*
 			    * Does it shadow any ns-decl?
 			    */
@@ -8926,8 +9035,10 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
 		break;
 	    case XML_TEXT_NODE:
 	    case XML_CDATA_SECTION_NODE:
-		if (cur->content)
-		    clone->content = xmlStrdup(cur->content);
+		/*
+		* Note that this will also cover the values of attributes.
+		*/
+		DICT_COPY(cur->content, clone->content);		
 		goto leave_node;
 	    case XML_ENTITY_NODE:
 		/* TODO: What to do here? */
@@ -8954,15 +9065,13 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
 		    clone->content = cur->content;
 		    clone->children = cur->children;
 		    clone->last = cur->last;
-		}		
+		}
 		goto leave_node;
 	    case XML_PI_NODE:
-		if (cur->content)
-		    clone->content = xmlStrdup(cur->content);
+		DICT_COPY(cur->content, clone->content);
 		goto leave_node;
 	    case XML_COMMENT_NODE:
-		if (cur->content)
-		    clone->content = xmlStrdup(cur->content);
+		DICT_COPY(cur->content, clone->content);
 		goto leave_node;
 	    default:
 		goto internal_error;
@@ -9003,15 +9112,14 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
 	    }
 	}
 	/*
-	* Start searching for an in-scope ns-decl.
+	* No matching namespace in scope. We need a new one.
 	*/
-	if (ctxt != NULL) {
+	if ((ctxt != NULL) && (ctxt->getNsForNodeFunc != NULL)) {
 	    /*
 	    * User-defined behaviour.
 	    */
-#if 0
-	    ctxt->aquireNsDecl(ctxt, cur->ns, &ns);
-#endif
+	    ns = ctxt->getNsForNodeFunc(ctxt, cur,
+		cur->ns->href, cur->ns->prefix);
 	    /*
 	    * Add user's mapping.
 	    */
@@ -9028,6 +9136,7 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt,
 		destParent ? curElem : NULL,
 		cur->ns, &ns,
 		&nsMap, depth,
+		/* if we need to search only in the ancestor-axis */
 		ancestorsOnly,
 		/* ns-decls must be prefixed for attributes. */
 		(cur->type == XML_ATTRIBUTE_NODE) ? 1 : 0) == -1)
@@ -9043,7 +9152,8 @@ end_ns_reference:
 	* Handle ID attributes.
 	*/
 	if ((clone->type == XML_ATTRIBUTE_NODE) &&
-	    (clone->parent != NULL)) {
+	    (clone->parent != NULL))
+	{
 	    if (xmlIsID(destDoc, clone->parent, (xmlAttrPtr) clone)) {
 	   
 		xmlChar *idVal;
@@ -9061,7 +9171,7 @@ end_ns_reference:
 	}
 	/*
 	**
-	** The following will traversing the tree ************************
+	** The following will traverse the tree **************************
 	**
 	*	
 	* Walk the element's attributes before descending into child-nodes.
@@ -9153,8 +9263,20 @@ exit:
     /*
     * Cleanup.
     */
-    if (nsMap != NULL)
-	xmlDOMWrapNsMapFree(nsMap);
+    if (nsMap != NULL) {
+	if ((ctxt) && (ctxt->namespaceMap == nsMap)) {
+	    /*
+	    * Just cleanup the map but don't free.
+	    */
+	    if (nsMap->first) {
+		if (nsMap->pool)
+		    nsMap->last->next = nsMap->pool;
+		nsMap->pool = nsMap->first;
+		nsMap->first = NULL;
+	    }
+	} else    
+	    xmlDOMWrapNsMapFree(nsMap);
+    }
     /*
     * TODO: Should we try a cleanup of the cloned node in case of a
     * fatal error?
@@ -9303,7 +9425,7 @@ internal_error:
 * Note that, since prefixes of already existent ns-decls can be
 * shadowed by this process, it could break QNames in attribute
 * values or element content.
-* WARNING: This function is in a experimental state.
+* NOTE: This function was not intensively tested.
 *
 * Returns 0 if the operation succeeded,
 *         1 if a node of unsupported type was given,
diff --git a/uri.c b/uri.c
index 7d60ffe..1e29223 100644
--- a/uri.c
+++ b/uri.c
@@ -2343,7 +2343,7 @@ done:
 	 (((p[0] >= 'a') && (p[0] <= 'z')) ||			\
 	  ((p[0] >= 'A') && (p[0] <= 'Z'))) &&			\
 	 (p[1] == ':') && ((p[2] == '/') || (p[2] == '\\')))
-xmlChar*
+xmlChar *
 xmlCanonicPath(const xmlChar *path)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)    
@@ -2406,12 +2406,20 @@ path_processing:
     len = xmlStrlen(path);
     if ((len > 2) && IS_WINDOWS_PATH(path)) {
 	uri->scheme = xmlStrdup(BAD_CAST "file");
-	uri->path = xmlMallocAtomic(len + 2);	/* FIXME - check alloc! */
+	uri->path = xmlMallocAtomic(len + 2);
+	if (uri->path == NULL) {
+	    xmlFreeURI(uri);
+	    return(NULL);
+	}
 	uri->path[0] = '/';
 	p = uri->path + 1;
 	strncpy(p, path, len + 1);
     } else {
-	uri->path = xmlStrdup(path);		/* FIXME - check alloc! */
+	uri->path = xmlStrdup(path);
+	if (uri->path == NULL) {
+	    xmlFreeURI(uri);
+	    return(NULL);
+	}
 	p = uri->path;
     }
     while (*p != '\0') {
@@ -2424,11 +2432,11 @@ path_processing:
         return(NULL);
     }
 
-	if (uri->scheme == NULL) {
-		ret = xmlStrdup((const xmlChar *) path);
-	} else {
-		ret = xmlSaveUri(uri);
-	}
+    if (uri->scheme == NULL) {
+	ret = xmlStrdup((const xmlChar *) path);
+    } else {
+	ret = xmlSaveUri(uri);
+    }
 
     xmlFreeURI(uri);
 #else
@@ -2437,5 +2445,39 @@ path_processing:
     return(ret);
 }
 
+/**
+ * xmlPathToURI:
+ * @path:  the resource locator in a filesystem notation
+ *
+ * Constructs an URI expressing the existing path
+ *
+ * Returns a new URI, or a duplicate of the path parameter if the 
+ * construction fails. The caller is responsible for freeing the memory
+ * occupied by the returned string. If there is insufficient memory available,
+ * or the argument is NULL, the function returns NULL.
+ */
+xmlChar *
+xmlPathToURI(const xmlChar *path)
+{
+    xmlURIPtr uri;
+    xmlURI temp;
+    xmlChar *ret, *cal;
+
+    if (path == NULL)
+        return(NULL);
+
+    if ((uri = xmlParseURI((const char *) path)) != NULL) {
+	xmlFreeURI(uri);
+	return xmlStrdup(path);
+    }
+    cal = xmlCanonicPath(path);
+    if (cal == NULL)
+        return(NULL);
+    memset(&temp, 0, sizeof(temp));
+    temp.path = (char *) cal;
+    ret = xmlSaveUri(&temp);
+    xmlFree(cal);
+    return(ret);
+}
 #define bottom_uri
 #include "elfgcchack.h"
diff --git a/valid.c b/valid.c
index edf5426..a239e68 100644
--- a/valid.c
+++ b/valid.c
@@ -63,7 +63,9 @@ xmlVErrMemory(xmlValidCtxtPtr ctxt, const char *extra)
 	   context */
 	if ((ctxt->finishDtd == XML_CTXT_FINISH_DTD_0) ||
 	    (ctxt->finishDtd == XML_CTXT_FINISH_DTD_1)) {
-	    pctxt = ctxt->userData;
+	    long delta = (char *) ctxt - (char *) ctxt->userData;
+	    if ((delta > 0) && (delta < 250))
+		pctxt = ctxt->userData;
 	}
     }
     if (extra)
@@ -101,7 +103,9 @@ xmlErrValid(xmlValidCtxtPtr ctxt, xmlParserErrors error,
 	   context */
 	if ((ctxt->finishDtd == XML_CTXT_FINISH_DTD_0) ||
 	    (ctxt->finishDtd == XML_CTXT_FINISH_DTD_1)) {
-	    pctxt = ctxt->userData;
+	    long delta = (char *) ctxt - (char *) ctxt->userData;
+	    if ((delta > 0) && (delta < 250))
+		pctxt = ctxt->userData;
 	}
     }
     if (extra)
@@ -146,7 +150,9 @@ xmlErrValidNode(xmlValidCtxtPtr ctxt,
 	   context */
 	if ((ctxt->finishDtd == XML_CTXT_FINISH_DTD_0) ||
 	    (ctxt->finishDtd == XML_CTXT_FINISH_DTD_1)) {
-	    pctxt = ctxt->userData;
+	    long delta = (char *) ctxt - (char *) ctxt->userData;
+	    if ((delta > 0) && (delta < 250))
+		pctxt = ctxt->userData;
 	}
     }
     __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
@@ -187,7 +193,9 @@ xmlErrValidNodeNr(xmlValidCtxtPtr ctxt,
 	   context */
 	if ((ctxt->finishDtd == XML_CTXT_FINISH_DTD_0) ||
 	    (ctxt->finishDtd == XML_CTXT_FINISH_DTD_1)) {
-	    pctxt = ctxt->userData;
+	    long delta = (char *) ctxt - (char *) ctxt->userData;
+	    if ((delta > 0) && (delta < 250))
+		pctxt = ctxt->userData;
 	}
     }
     __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
@@ -226,7 +234,9 @@ xmlErrValidWarning(xmlValidCtxtPtr ctxt,
 	   context */
 	if ((ctxt->finishDtd == XML_CTXT_FINISH_DTD_0) ||
 	    (ctxt->finishDtd == XML_CTXT_FINISH_DTD_1)) {
-	    pctxt = ctxt->userData;
+	    long delta = (char *) ctxt - (char *) ctxt->userData;
+	    if ((delta > 0) && (delta < 250))
+		pctxt = ctxt->userData;
 	}
     }
     __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
@@ -5340,7 +5350,7 @@ fail:
     }
 #endif /* LIBXML_REGEXP_ENABLED */
     if ((warn) && ((ret != 1) && (ret != -3))) {
-	if ((ctxt != NULL) && (ctxt->warning != NULL)) {
+	if (ctxt != NULL) {
 	    char expr[5000];
 	    char list[5000];
 
diff --git a/xinclude.c b/xinclude.c
index d5bba6e..c58bbcf 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -82,6 +82,8 @@ struct _xmlXIncludeCtxt {
     int                legacy; /* using XINCLUDE_OLD_NS */
     int            parseFlags; /* the flags used for parsing XML documents */
     xmlChar *		 base; /* the current xml:base */
+
+    void            *_private; /* application data */
 };
 
 static int
@@ -427,6 +429,12 @@ xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt, const char *URL) {
 	xmlXIncludeErrMemory(ctxt, NULL, "cannot allocate parser context");
 	return(NULL);
     }
+
+    /*
+     * pass in the application data to the parser context.
+     */
+    pctxt->_private = ctxt->_private;
+    
     /*
      * try to ensure that new documents included are actually
      * built with the same dictionary as the including document.
@@ -2409,9 +2417,11 @@ xmlXIncludeSetFlags(xmlXIncludeCtxtPtr ctxt, int flags) {
 }
  
 /**
- * xmlXIncludeProcessFlags:
+ * xmlXIncludeProcessFlagsData:
  * @doc: an XML document
  * @flags: a set of xmlParserOption used for parsing XML includes
+ * @data: application data that will be passed to the parser context
+ *        in the _private field of the parser context(s)
  *
  * Implement the XInclude substitution on the XML document @doc
  *
@@ -2419,7 +2429,7 @@ xmlXIncludeSetFlags(xmlXIncludeCtxtPtr ctxt, int flags) {
  *    or the number of substitutions done.
  */
 int
-xmlXIncludeProcessFlags(xmlDocPtr doc, int flags) {
+xmlXIncludeProcessFlagsData(xmlDocPtr doc, int flags, void *data) {
     xmlXIncludeCtxtPtr ctxt;
     xmlNodePtr tree;
     int ret = 0;
@@ -2432,6 +2442,7 @@ xmlXIncludeProcessFlags(xmlDocPtr doc, int flags) {
     ctxt = xmlXIncludeNewContext(doc);
     if (ctxt == NULL)
 	return(-1);
+    ctxt->_private = data;
     ctxt->base = xmlStrdup((xmlChar *)doc->URL);
     xmlXIncludeSetFlags(ctxt, flags);
     ret = xmlXIncludeDoProcess(ctxt, doc, tree);
@@ -2442,6 +2453,21 @@ xmlXIncludeProcessFlags(xmlDocPtr doc, int flags) {
     return(ret);
 }
 
+/**
+ * xmlXIncludeProcessFlags:
+ * @doc: an XML document
+ * @flags: a set of xmlParserOption used for parsing XML includes
+ *
+ * Implement the XInclude substitution on the XML document @doc
+ *
+ * Returns 0 if no substitution were done, -1 if some processing failed
+ *    or the number of substitutions done.
+ */
+int
+xmlXIncludeProcessFlags(xmlDocPtr doc, int flags) {
+    return xmlXIncludeProcessFlagsData(doc, flags, NULL);
+}
+
 /**
  * xmlXIncludeProcess:
  * @doc: an XML document
diff --git a/xmlIO.c b/xmlIO.c
index 60e0a50..90db848 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -50,6 +50,12 @@
 #    endif
 #    define HAVE_STAT
 #  endif
+#else
+#  ifdef HAVE__STAT
+#    if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#      define stat _stat
+#    endif
+#  endif
 #endif
 #ifdef HAVE_STAT
 #  ifndef S_ISDIR
@@ -193,7 +199,7 @@ static const char *IOerr[] = {
     "unknown address familly",	/* EAFNOSUPPORT */
 };
 
-#if defined(WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
 /**
  * __xmlIOWin32UTF8ToWChar:
  * @u8String:  uft-8 string
@@ -203,26 +209,25 @@ static const char *IOerr[] = {
 static wchar_t *
 __xmlIOWin32UTF8ToWChar(const char *u8String)
 {
-	wchar_t *wString = NULL;
+    wchar_t *wString = NULL;
+
+    if (u8String) {
+        int wLen =
+            MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, u8String,
+                                -1, NULL, 0);
+        if (wLen) {
+            wString = xmlMalloc(wLen * sizeof(wchar_t));
+            if (wString) {
+                if (MultiByteToWideChar
+                    (CP_UTF8, 0, u8String, -1, wString, wLen) == 0) {
+                    xmlFree(wString);
+                    wString = NULL;
+                }
+            }
+        }
+    }
 
-	if (u8String)
-	{
-		int wLen = MultiByteToWideChar(CP_UTF8,0,u8String,-1,NULL,0);
-		if (wLen)
-		{
-			wString = malloc((wLen+1) * sizeof(wchar_t));
-			if (wString)
-			{
-				if (MultiByteToWideChar(CP_UTF8,0,u8String,-1,wString,wLen+1) == 0)
-				{
-					free(wString);
-					wString = NULL;
-				}
-			}
-		}
-	}
-	
-	return wString;
+    return wString;
 }
 #endif
 
@@ -572,6 +577,132 @@ xmlCleanupOutputCallbacks(void)
  *									*
  ************************************************************************/
 
+#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+
+/**
+ *  xmlWrapOpenUtf8:
+ * @path:  the path in utf-8 encoding
+ * @mode:  type of access (0 - read, 1 - write)
+ *
+ * function opens the file specified by @path
+ *
+ */
+static FILE*
+xmlWrapOpenUtf8(const char *path,int mode)
+{
+    FILE *fd = NULL;
+    wchar_t *wPath;
+
+    wPath = __xmlIOWin32UTF8ToWChar(path);
+    if(wPath)
+    {
+       fd = _wfopen(wPath, mode ? L"wb" : L"rb");
+       xmlFree(wPath);
+    }
+    /* maybe path in native encoding */
+    if(fd == NULL)
+       fd = fopen(path, mode ? "wb" : "rb");
+
+    return fd;
+}
+
+/**
+ *  xmlWrapStatUtf8:
+ * @path:  the path in utf-8 encoding
+ * @info:  structure that stores results
+ *
+ * function obtains information about the file or directory
+ *
+ */
+static int
+xmlWrapStatUtf8(const char *path,struct stat *info)
+{
+#ifdef HAVE_STAT
+    int retval = -1;
+    wchar_t *wPath;
+
+    wPath = __xmlIOWin32UTF8ToWChar(path);
+    if (wPath)
+    {
+       retval = _wstat(wPath,info);
+       xmlFree(wPath);
+    }
+    /* maybe path in native encoding */
+    if(retval < 0)
+       retval = stat(path,info);
+    return retval;
+#else
+    return -1;
+#endif
+}
+
+/**
+ *  xmlWrapOpenNative:
+ * @path:  the path
+ * @mode:  type of access (0 - read, 1 - write)
+ *
+ * function opens the file specified by @path
+ *
+ */
+static FILE*
+xmlWrapOpenNative(const char *path,int mode)
+{
+    return fopen(path,mode ? "wb" : "rb");
+}
+
+/**
+ *  xmlWrapStatNative:
+ * @path:  the path
+ * @info:  structure that stores results
+ *
+ * function obtains information about the file or directory
+ *
+ */
+static int
+xmlWrapStatNative(const char *path,struct stat *info)
+{
+#ifdef HAVE_STAT
+    return stat(path,info);
+#else
+    return -1;
+#endif
+}
+
+typedef int (* xmlWrapStatFunc) (const char *f, struct stat *s);
+static xmlWrapStatFunc xmlWrapStat = xmlWrapStatNative;
+typedef FILE* (* xmlWrapOpenFunc)(const char *f,int mode);
+static xmlWrapOpenFunc xmlWrapOpen = xmlWrapOpenNative;
+
+/**
+ * xmlInitPlatformSpecificIo:
+ *
+ * Initialize platform specific features.
+ */
+static void
+xmlInitPlatformSpecificIo(void)
+{
+    static int xmlPlatformIoInitialized = 0;
+    OSVERSIONINFO osvi;
+
+    if(xmlPlatformIoInitialized)
+      return;
+
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+
+    if(GetVersionEx(&osvi) && (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)) {
+      xmlWrapStat = xmlWrapStatUtf8;
+      xmlWrapOpen = xmlWrapOpenUtf8;
+    } else {
+      xmlWrapStat = xmlWrapStatNative;
+      xmlWrapOpen = xmlWrapOpenNative;
+    }
+
+    xmlPlatformIoInitialized = 1;
+    return;
+}
+
+#endif
+
 /**
  * xmlCheckFilename:
  * @path:  the path to check
@@ -594,41 +725,20 @@ xmlCheckFilename (const char *path)
 #endif
 	if (path == NULL)
 		return(0);
-  
-#if defined(WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
-	{
-		int retval = 0;
-	
-		wchar_t *wPath = __xmlIOWin32UTF8ToWChar(path);
-		if (wPath)
-		{
-			struct _stat stat_buffer;
-			
-			if (_wstat(wPath,&stat_buffer) == 0)
-			{
-				retval = 1;
-				
-				if (((stat_buffer.st_mode & S_IFDIR) == S_IFDIR))
-					retval = 2;
-			}
-	
-			free(wPath);
-		}
 
-		return retval;
-	}
-#else
 #ifdef HAVE_STAT
+#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+    if (xmlWrapStat(path, &stat_buffer) == -1)
+        return 0;
+#else
     if (stat(path, &stat_buffer) == -1)
         return 0;
-
+#endif
 #ifdef S_ISDIR
     if (S_ISDIR(stat_buffer.st_mode))
         return 2;
-#endif /* S_ISDIR */
+#endif
 #endif /* HAVE_STAT */
-#endif /* WIN32 */
-
     return 1;
 }
 
@@ -750,19 +860,8 @@ xmlFileOpen_real (const char *filename) {
     if (!xmlCheckFilename(path))
         return(NULL);
 
-#if defined(WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
-	{
-		wchar_t *wPath = __xmlIOWin32UTF8ToWChar(path);
-		if (wPath)
-		{
-			fd = _wfopen(wPath, L"rb");
-			free(wPath);
-   	}
-   	else
-   	{
-   	   fd = fopen(path, "rb");
-	   }
-	}	
+#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+    fd = xmlWrapOpen(path, 0);
 #else
     fd = fopen(path, "r");
 #endif /* WIN32 */
@@ -832,19 +931,8 @@ xmlFileOpenW (const char *filename) {
     if (path == NULL)
 	return(NULL);
 
-#if defined(WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
-	{
-		wchar_t *wPath = __xmlIOWin32UTF8ToWChar(path);
-		if (wPath)
-		{
-			fd = _wfopen(wPath, L"wb");
-			free(wPath);
-   	}
-   	else
-   	{
-	  	   fd = fopen(path, "wb");
-	  	}
-	}
+#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+    fd = xmlWrapOpen(path, 1);
 #else
   	   fd = fopen(path, "wb");
 #endif /* WIN32 */
@@ -2018,11 +2106,14 @@ xmlRegisterOutputCallbacks(xmlOutputMatchCallback matchFunc,
  * Registers the default compiled-in I/O handlers.
  */
 void
-xmlRegisterDefaultInputCallbacks
-(void) {
+xmlRegisterDefaultInputCallbacks(void) {
     if (xmlInputCallbackInitialized)
 	return;
 
+#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+    xmlInitPlatformSpecificIo();
+#endif
+
     xmlRegisterInputCallbacks(xmlFileMatch, xmlFileOpen,
 	                      xmlFileRead, xmlFileClose);
 #ifdef HAVE_ZLIB_H
@@ -2049,11 +2140,14 @@ xmlRegisterDefaultInputCallbacks
  * Registers the default compiled-in I/O handlers.
  */
 void
-xmlRegisterDefaultOutputCallbacks
-(void) {
+xmlRegisterDefaultOutputCallbacks (void) {
     if (xmlOutputCallbackInitialized)
 	return;
 
+#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+    xmlInitPlatformSpecificIo();
+#endif
+
     xmlRegisterOutputCallbacks(xmlFileMatch, xmlFileOpenW,
 	                      xmlFileWrite, xmlFileClose);
 
@@ -2368,7 +2462,8 @@ __xmlOutputBufferCreateFilename(const char *URI,
 	/*
 	 * try to limit the damages of the URI unescaping code.
 	 */
-	if (puri->scheme != NULL)
+	if ((puri->scheme == NULL) ||
+	    (xmlStrEqual(BAD_CAST puri->scheme, BAD_CAST "file")))
 	    unescaped = xmlURIUnescapeString(URI, 0, NULL);
 	xmlFreeURI(puri);
     }
@@ -3499,10 +3594,7 @@ xmlCheckHTTPInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr ret) {
     return(ret);
 }
 
-static int xmlSysIDExists(const char *URL) {
-#ifdef HAVE_STAT
-    int ret;
-    struct stat info;
+static int xmlNoNetExists(const char *URL) {
     const char *path;
 
     if (URL == NULL)
@@ -3522,13 +3614,88 @@ static int xmlSysIDExists(const char *URL) {
 #endif
     } else 
 	path = URL;
-    ret = stat(path, &info);
-    if (ret == 0)
-	return(1);
-#endif
-    return(0);
+	
+    return xmlCheckFilename(path);
 }
 
+#ifdef LIBXML_CATALOG_ENABLED
+
+/**
+ * xmlResolveResourceFromCatalog:
+ * @URL:  the URL for the entity to load
+ * @ID:  the System ID for the entity to load
+ * @ctxt:  the context in which the entity is called or NULL
+ *
+ * Resolves the URL and ID against the appropriate catalog.
+ * This function is used by xmlDefaultExternalEntityLoader and
+ * xmlNoNetExternalEntityLoader.
+ *
+ * Returns a new allocated URL, or NULL.
+ */
+xmlChar *
+xmlResolveResourceFromCatalog(const char *URL, const char *ID,
+                              xmlParserCtxtPtr ctxt) {
+    xmlChar *resource = NULL;
+    xmlCatalogAllow pref;
+
+    /*
+     * If the resource doesn't exists as a file,
+     * try to load it from the resource pointed in the catalogs
+     */
+    pref = xmlCatalogGetDefaults();
+
+    if ((pref != XML_CATA_ALLOW_NONE) && (!xmlNoNetExists(URL))) {
+	/*
+	 * Do a local lookup
+	 */
+	if ((ctxt != NULL) && (ctxt->catalogs != NULL) &&
+	    ((pref == XML_CATA_ALLOW_ALL) ||
+	     (pref == XML_CATA_ALLOW_DOCUMENT))) {
+	    resource = xmlCatalogLocalResolve(ctxt->catalogs,
+					      (const xmlChar *)ID,
+					      (const xmlChar *)URL);
+        }
+	/*
+	 * Try a global lookup
+	 */
+	if ((resource == NULL) &&
+	    ((pref == XML_CATA_ALLOW_ALL) ||
+	     (pref == XML_CATA_ALLOW_GLOBAL))) {
+	    resource = xmlCatalogResolve((const xmlChar *)ID,
+					 (const xmlChar *)URL);
+	}
+	if ((resource == NULL) && (URL != NULL))
+	    resource = xmlStrdup((const xmlChar *) URL);
+
+	/*
+	 * TODO: do an URI lookup on the reference
+	 */
+	if ((resource != NULL) && (!xmlNoNetExists((const char *)resource))) {
+	    xmlChar *tmp = NULL;
+
+	    if ((ctxt != NULL) && (ctxt->catalogs != NULL) &&
+		((pref == XML_CATA_ALLOW_ALL) ||
+		 (pref == XML_CATA_ALLOW_DOCUMENT))) {
+		tmp = xmlCatalogLocalResolveURI(ctxt->catalogs, resource);
+	    }
+	    if ((tmp == NULL) &&
+		((pref == XML_CATA_ALLOW_ALL) ||
+	         (pref == XML_CATA_ALLOW_GLOBAL))) {
+		tmp = xmlCatalogResolveURI(resource);
+	    }
+
+	    if (tmp != NULL) {
+		xmlFree(resource);
+		resource = tmp;
+	    }
+	}
+    }
+
+    return resource;
+}
+
+#endif
+
 /**
  * xmlDefaultExternalEntityLoader:
  * @URL:  the URL for the entity to load
@@ -3546,15 +3713,10 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
     xmlParserInputPtr ret = NULL;
     xmlChar *resource = NULL;
 
-#ifdef LIBXML_CATALOG_ENABLED
-    xmlCatalogAllow pref;
-#endif
-
 #ifdef DEBUG_EXTERNAL_ENTITIES
     xmlGenericError(xmlGenericErrorContext,
                     "xmlDefaultExternalEntityLoader(%s, xxx)\n", URL);
 #endif
-#ifdef LIBXML_CATALOG_ENABLED
     if ((ctxt != NULL) && (ctxt->options & XML_PARSE_NONET)) {
         int options = ctxt->options;
 
@@ -3563,60 +3725,8 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
 	ctxt->options = options;
 	return(ret);
     }
-
-    /*
-     * If the resource doesn't exists as a file,
-     * try to load it from the resource pointed in the catalogs
-     */
-    pref = xmlCatalogGetDefaults();
-
-    if ((pref != XML_CATA_ALLOW_NONE) && (!xmlSysIDExists(URL))) {
-        /*
-         * Do a local lookup
-         */
-        if ((ctxt != NULL) && (ctxt->catalogs != NULL) &&
-            ((pref == XML_CATA_ALLOW_ALL) ||
-             (pref == XML_CATA_ALLOW_DOCUMENT))) {
-            resource = xmlCatalogLocalResolve(ctxt->catalogs,
-                                              (const xmlChar *) ID,
-                                              (const xmlChar *) URL);
-        }
-        /*
-         * Try a global lookup
-         */
-        if ((resource == NULL) &&
-            ((pref == XML_CATA_ALLOW_ALL) ||
-             (pref == XML_CATA_ALLOW_GLOBAL))) {
-            resource = xmlCatalogResolve((const xmlChar *) ID,
-                                         (const xmlChar *) URL);
-        }
-        if ((resource == NULL) && (URL != NULL))
-            resource = xmlStrdup((const xmlChar *) URL);
-
-        /*
-         * TODO: do an URI lookup on the reference
-         */
-        if ((resource != NULL)
-            && (!xmlSysIDExists((const char *) resource))) {
-            xmlChar *tmp = NULL;
-
-            if ((ctxt != NULL) && (ctxt->catalogs != NULL) &&
-                ((pref == XML_CATA_ALLOW_ALL) ||
-                 (pref == XML_CATA_ALLOW_DOCUMENT))) {
-                tmp = xmlCatalogLocalResolveURI(ctxt->catalogs, resource);
-            }
-            if ((tmp == NULL) &&
-                ((pref == XML_CATA_ALLOW_ALL) ||
-                 (pref == XML_CATA_ALLOW_GLOBAL))) {
-                tmp = xmlCatalogResolveURI(resource);
-            }
-
-            if (tmp != NULL) {
-                xmlFree(resource);
-                resource = tmp;
-            }
-        }
-    }
+#ifdef LIBXML_CATALOG_ENABLED
+    resource = xmlResolveResourceFromCatalog(URL, ID, ctxt);
 #endif
 
     if (resource == NULL)
@@ -3674,7 +3784,7 @@ xmlGetExternalEntityLoader(void) {
 xmlParserInputPtr
 xmlLoadExternalEntity(const char *URL, const char *ID,
                       xmlParserCtxtPtr ctxt) {
-    if ((URL != NULL) && (xmlSysIDExists(URL) == 0)) {
+    if ((URL != NULL) && (xmlNoNetExists(URL) == 0)) {
 	char *canonicFilename;
 	xmlParserInputPtr ret;
 
@@ -3697,40 +3807,6 @@ xmlLoadExternalEntity(const char *URL, const char *ID,
  * 									*
  ************************************************************************/
 
-#ifdef LIBXML_CATALOG_ENABLED
-static int
-xmlNoNetExists(const char *URL)
-{
-#ifdef HAVE_STAT
-    int ret;
-    struct stat info;
-    const char *path;
-
-    if (URL == NULL)
-        return (0);
-
-    if (!xmlStrncasecmp(BAD_CAST URL, BAD_CAST "file://localhost/", 17))
-#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__)
-	path = &URL[17];
-#else
-	path = &URL[16];
-#endif
-    else if (!xmlStrncasecmp(BAD_CAST URL, BAD_CAST "file:///", 8)) {
-#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__)
-        path = &URL[8];
-#else
-        path = &URL[7];
-#endif
-    } else
-        path = URL;
-    ret = stat(path, &info);
-    if (ret == 0)
-        return (1);
-#endif
-    return (0);
-}
-#endif
-
 /**
  * xmlNoNetExternalEntityLoader:
  * @URL:  the URL for the entity to load
@@ -3749,61 +3825,9 @@ xmlNoNetExternalEntityLoader(const char *URL, const char *ID,
     xmlChar *resource = NULL;
 
 #ifdef LIBXML_CATALOG_ENABLED
-    xmlCatalogAllow pref;
-
-    /*
-     * If the resource doesn't exists as a file,
-     * try to load it from the resource pointed in the catalogs
-     */
-    pref = xmlCatalogGetDefaults();
-
-    if ((pref != XML_CATA_ALLOW_NONE) && (!xmlNoNetExists(URL))) {
-	/*
-	 * Do a local lookup
-	 */
-	if ((ctxt != NULL) && (ctxt->catalogs != NULL) &&
-	    ((pref == XML_CATA_ALLOW_ALL) ||
-	     (pref == XML_CATA_ALLOW_DOCUMENT))) {
-	    resource = xmlCatalogLocalResolve(ctxt->catalogs,
-					      (const xmlChar *)ID,
-					      (const xmlChar *)URL);
-        }
-	/*
-	 * Try a global lookup
-	 */
-	if ((resource == NULL) &&
-	    ((pref == XML_CATA_ALLOW_ALL) ||
-	     (pref == XML_CATA_ALLOW_GLOBAL))) {
-	    resource = xmlCatalogResolve((const xmlChar *)ID,
-					 (const xmlChar *)URL);
-	}
-	if ((resource == NULL) && (URL != NULL))
-	    resource = xmlStrdup((const xmlChar *) URL);
-
-	/*
-	 * TODO: do an URI lookup on the reference
-	 */
-	if ((resource != NULL) && (!xmlNoNetExists((const char *)resource))) {
-	    xmlChar *tmp = NULL;
-
-	    if ((ctxt != NULL) && (ctxt->catalogs != NULL) &&
-		((pref == XML_CATA_ALLOW_ALL) ||
-		 (pref == XML_CATA_ALLOW_DOCUMENT))) {
-		tmp = xmlCatalogLocalResolveURI(ctxt->catalogs, resource);
-	    }
-	    if ((tmp == NULL) &&
-		((pref == XML_CATA_ALLOW_ALL) ||
-	         (pref == XML_CATA_ALLOW_GLOBAL))) {
-		tmp = xmlCatalogResolveURI(resource);
-	    }
-
-	    if (tmp != NULL) {
-		xmlFree(resource);
-		resource = tmp;
-	    }
-	}
-    }
+    resource = xmlResolveResourceFromCatalog(URL, ID, ctxt);
 #endif
+
     if (resource == NULL)
 	resource = (xmlChar *) URL;
 
diff --git a/xmllint.c b/xmllint.c
index 79025f1..5e1bfd7 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -98,6 +98,9 @@
 #ifdef LIBXML_C14N_ENABLED
 #include 
 #endif
+#ifdef LIBXML_OUTPUT_ENABLED
+#include 
+#endif
 
 #ifndef XML_XML_DEFAULT_CATALOG
 #define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
@@ -133,6 +136,7 @@ static int nowrap = 0;
 static int format = 0;
 static const char *output = NULL;
 static int compress = 0;
+static int oldout = 0;
 #endif /* LIBXML_OUTPUT_ENABLED */
 #ifdef LIBXML_VALID_ENABLED
 static int valid = 0;
@@ -2089,6 +2093,26 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
         }
     }
 #endif /* LIBXML_PUSH_ENABLED */
+#ifdef HAVE_SYS_MMAN_H
+    else if ((html) && (memory)) {
+	int fd;
+	struct stat info;
+	const char *base;
+	if (stat(filename, &info) < 0) 
+	    return;
+	if ((fd = open(filename, O_RDONLY)) < 0)
+	    return;
+	base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ;
+	if (base == (void *) MAP_FAILED)
+	    return;
+
+	doc = htmlReadMemory((char *) base, info.st_size, filename,
+	                     NULL, options);
+	    
+	munmap((char *) base, info.st_size);
+	close(fd);
+    }
+#endif
     else if (html) {
 	doc = htmlReadFile(filename, NULL, options);
     }
@@ -2203,6 +2227,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
 			                filename, NULL, options);
 	        
 	    munmap((char *) base, info.st_size);
+	    close(fd);
 #endif
 #ifdef LIBXML_VALID_ENABLED
 	} else if (valid) {
@@ -2280,8 +2305,10 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
     /*
      * shell interaction
      */
-    if (shell)  
+    if (shell) {
+        xmlXPathOrderDocElems(doc);
         xmlShell(doc, filename, xmlShellReadline, stdout);
+    }
 #endif
 #endif
 
@@ -2443,48 +2470,71 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
 		    write(1, result, len);
 		    xmlFree(result);
 		}
+
 	    } else
 #endif /* HAVE_SYS_MMAN_H */
 	    if (compress) {
 		xmlSaveFile(output ? output : "-", doc);
-	    }
-	    else if (encoding != NULL) {
-	        if ( format ) {
-		    ret = xmlSaveFormatFileEnc(output ? output : "-", doc,
-		                               encoding, 1);
-		}
-		else {
-		    ret = xmlSaveFileEnc(output ? output : "-", doc, encoding);
-		}
-		if (ret < 0) {
-		    fprintf(stderr, "failed save to %s\n",
-		            output ? output : "-");
-		    progresult = XMLLINT_ERR_OUT;
-		}
-	    }
-	    else if (format) {
-		ret = xmlSaveFormatFile(output ? output : "-", doc, 1);
-		if (ret < 0) {
-		    fprintf(stderr, "failed save to %s\n",
-		            output ? output : "-");
-		    progresult = XMLLINT_ERR_OUT;
+	    } else if (oldout) {
+	        if (encoding != NULL) {
+		    if ( format ) {
+			ret = xmlSaveFormatFileEnc(output ? output : "-", doc,
+						   encoding, 1);
+		    }
+		    else {
+			ret = xmlSaveFileEnc(output ? output : "-", doc,
+			                     encoding);
+		    }
+		    if (ret < 0) {
+			fprintf(stderr, "failed save to %s\n",
+				output ? output : "-");
+			progresult = XMLLINT_ERR_OUT;
+		    }
+		} else if (format) {
+		    ret = xmlSaveFormatFile(output ? output : "-", doc, 1);
+		    if (ret < 0) {
+			fprintf(stderr, "failed save to %s\n",
+				output ? output : "-");
+			progresult = XMLLINT_ERR_OUT;
+		    }
+		} else {
+		    FILE *out;
+		    if (output == NULL)
+			out = stdout;
+		    else {
+			out = fopen(output,"wb");
+		    }
+		    if (out != NULL) {
+			if (xmlDocDump(out, doc) < 0)
+			    progresult = XMLLINT_ERR_OUT;
+
+			if (output != NULL)
+			    fclose(out);
+		    } else {
+			fprintf(stderr, "failed to open %s\n", output);
+			progresult = XMLLINT_ERR_OUT;
+		    }
 		}
-	    }
-	    else {
-		FILE *out;
+	    } else {
+	        xmlSaveCtxtPtr ctxt;
+		int saveOpts = 0;
+
+                if (format)
+		    saveOpts |= XML_SAVE_FORMAT;
+
 		if (output == NULL)
-		    out = stdout;
-		else {
-		    out = fopen(output,"wb");
-		}
-		if (out != NULL) {
-		    if (xmlDocDump(out, doc) < 0)
-		        progresult = XMLLINT_ERR_OUT;
+		    ctxt = xmlSaveToFd(1, encoding, saveOpts);
+		else
+		    ctxt = xmlSaveToFilename(output, encoding, saveOpts);
 
-		    if (output != NULL)
-			fclose(out);
+		if (ctxt != NULL) {
+		    if (xmlSaveDoc(ctxt, doc) < 0) {
+			fprintf(stderr, "failed save to %s\n",
+				output ? output : "-");
+			progresult = XMLLINT_ERR_OUT;
+		    }
+		    xmlSaveClose(ctxt);
 		} else {
-		    fprintf(stderr, "failed to open %s\n", output);
 		    progresult = XMLLINT_ERR_OUT;
 		}
 	    }
@@ -2752,6 +2802,7 @@ static void showVersion(const char *name) {
     if (xmlHasFeature(XML_WITH_DEBUG)) fprintf(stderr, "Debug "); 
     if (xmlHasFeature(XML_WITH_DEBUG_MEM)) fprintf(stderr, "MemDebug "); 
     if (xmlHasFeature(XML_WITH_DEBUG_RUN)) fprintf(stderr, "RunDebug "); 
+    if (xmlHasFeature(XML_WITH_ZLIB)) fprintf(stderr, "Zlib ");
     fprintf(stderr, "\n");
 }
 
diff --git a/xmlmemory.c b/xmlmemory.c
index 18e0ff1..362a0b0 100644
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -577,7 +577,7 @@ xmlMemBlocks(void) {
 static void
 xmlMemContentShow(FILE *fp, MEMHDR *p)
 {
-    int i,j,len = p->mh_size;
+    int i,j,k,len = p->mh_size;
     const char *buf = (const char *) HDR_2_CLIENT(p);
 
     if (p == NULL) {
@@ -594,13 +594,15 @@ xmlMemContentShow(FILE *fp, MEMHDR *p)
 	    MEMHDR *q;
 	    void *cur;
 
-            for (j = 0;j < len -3;j += 4) {
+            for (j = 0;(j < len -3) && (j < 40);j += 4) {
 		cur = *((void **) &buf[j]);
 		q = CLIENT_2_HDR(cur);
 		p = memlist;
+		k = 0;
 		while (p != NULL) {
 		    if (p == q) break;
 		    p = p->mh_next;
+		    if (k++ > 100) break;
 		}
 		if ((p != NULL) && (p == q)) {
 		    fprintf(fp, " pointer to #%lu at index %d",
diff --git a/xmlregexp.c b/xmlregexp.c
index 58f480d..e7d519e 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -4807,6 +4807,11 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) {
     int start = -1;
     int end = -1;
 
+    if (CUR == '\0') {
+        ERROR("Expecting ']'");
+	return;
+    }
+
     if ((CUR == '&') && (NXT(1) == '#')) {
 	end = start = xmlFAParseCharRef(ctxt);
         xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg,
@@ -4897,7 +4902,7 @@ xmlFAParsePosCharGroup(xmlRegParserCtxtPtr ctxt) {
 	    xmlFAParseCharRange(ctxt);
 	}
     } while ((CUR != ']') && (CUR != '^') && (CUR != '-') &&
-	     (ctxt->error == 0));
+             (CUR != 0) && (ctxt->error == 0));
 }
 
 /**
diff --git a/xmlsave.c b/xmlsave.c
index ba35f32..6963e7b 100644
--- a/xmlsave.c
+++ b/xmlsave.c
@@ -122,19 +122,19 @@ xmlSaveErr(int code, xmlNodePtr node, const char *extra)
 
     switch(code) {
         case XML_SAVE_NOT_UTF8:
-	    msg = "string is not in UTF-8";
+	    msg = "string is not in UTF-8\n";
 	    break;
 	case XML_SAVE_CHAR_INVALID:
-	    msg = "invalid character value";
+	    msg = "invalid character value\n";
 	    break;
 	case XML_SAVE_UNKNOWN_ENCODING:
-	    msg = "unknown encoding %s";
+	    msg = "unknown encoding %s\n";
 	    break;
 	case XML_SAVE_NO_DOCTYPE:
-	    msg = "document has no DOCTYPE";
+	    msg = "document has no DOCTYPE\n";
 	    break;
 	default:
-	    msg = "unexpected error number";
+	    msg = "unexpected error number\n";
     }
     __xmlSimpleError(XML_FROM_OUTPUT, code, node, msg, extra);
 }
@@ -392,7 +392,7 @@ xmlNewSaveCtxt(const char *encoding, int options)
 	    return(NULL);
 	}
         ret->encoding = xmlStrdup((const xmlChar *)encoding);
-	ret->escape = xmlEscapeEntities;
+	ret->escape = NULL;
     }
     xmlSaveCtxtInit(ret);
 
@@ -464,7 +464,7 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur);
 static void xmlNodeListDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur);
 static void xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur);
 void xmlNsListDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur);
-static void xmlDocContentDumpOutput(xmlSaveCtxtPtr ctxt, xmlDocPtr cur);
+static int xmlDocContentDumpOutput(xmlSaveCtxtPtr ctxt, xmlDocPtr cur);
 
 /**
  * xmlNsDumpOutput:
@@ -820,35 +820,77 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
  *
  * Dump an XML document.
  */
-static void
+static int
 xmlDocContentDumpOutput(xmlSaveCtxtPtr ctxt, xmlDocPtr cur) {
 #ifdef LIBXML_HTML_ENABLED
     xmlDtdPtr dtd;
     int is_xhtml = 0;
 #endif
     const xmlChar *oldenc = cur->encoding;
+    const xmlChar *oldctxtenc = ctxt->encoding;
     const xmlChar *encoding = ctxt->encoding;
-    xmlOutputBufferPtr buf;
+    xmlCharEncodingOutputFunc oldescape = ctxt->escape;
+    xmlCharEncodingOutputFunc oldescapeAttr = ctxt->escapeAttr;
+    xmlOutputBufferPtr buf = ctxt->buf;
+    xmlCharEncodingHandlerPtr handler = NULL;
+    xmlCharEncoding enc;
 
     xmlInitParser();
 
-    if (ctxt->encoding != NULL)
+    if (ctxt->encoding != NULL) {
         cur->encoding = BAD_CAST ctxt->encoding;
+    } else if (cur->encoding != NULL) {
+	encoding = cur->encoding;
+    } else if (cur->charset != XML_CHAR_ENCODING_UTF8) {
+	encoding = (const xmlChar *)
+		     xmlGetCharEncodingName((xmlCharEncoding) cur->charset);
+    }
 
-    buf = ctxt->buf;
+    enc = xmlParseCharEncoding((const char*) encoding);
+    if ((encoding != NULL) && (oldctxtenc == NULL) &&
+        (buf->encoder == NULL) && (buf->conv == NULL) &&
+	((ctxt->options & XML_SAVE_NO_DECL) == 0)) {
+	if ((enc != XML_CHAR_ENCODING_UTF8) &&
+	    (enc != XML_CHAR_ENCODING_NONE) &&
+	    (enc != XML_CHAR_ENCODING_ASCII)) {
+	    /*
+	     * we need to switch to this encoding but just for this document
+	     * since we output the XMLDecl the conversion must be done to not
+	     * generate not well formed documents.
+	     */
+	    buf->encoder = xmlFindCharEncodingHandler((const char *)encoding);
+	    if (buf->encoder == NULL) {
+		xmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL,
+		           (const char *)encoding);
+		return(-1);
+	    }
+	    buf->conv = xmlBufferCreate();
+	    if (buf->conv == NULL) {
+		xmlCharEncCloseFunc(buf->encoder);
+		xmlSaveErrMemory("creating encoding buffer");
+		return(-1);
+	    }
+	    /*
+	     * initialize the state, e.g. if outputting a BOM
+	     */
+	    xmlCharEncOutFunc(buf->encoder, buf->conv, NULL);
+	}
+	if (ctxt->escape == xmlEscapeEntities)
+	    ctxt->escape = NULL;
+	if (ctxt->escapeAttr == xmlEscapeEntities)
+	    ctxt->escapeAttr = NULL;
+    }
+
+
+    /*
+     * Save the XML declaration
+     */
     if ((ctxt->options & XML_SAVE_NO_DECL) == 0) {
 	xmlOutputBufferWrite(buf, 14, "version != NULL) 
 	    xmlBufferWriteQuotedString(buf->buffer, cur->version);
 	else
 	    xmlOutputBufferWrite(buf, 5, "\"1.0\"");
-	if (ctxt->encoding == NULL) {
-	    if (cur->encoding != NULL)
-		encoding = cur->encoding;
-	    else if (cur->charset != XML_CHAR_ENCODING_UTF8)
-		encoding = (const xmlChar *)
-		     xmlGetCharEncodingName((xmlCharEncoding) cur->charset);
-	}
 	if (encoding != NULL) {
 	    xmlOutputBufferWrite(buf, 10, " encoding=");
 	    xmlBufferWriteQuotedString(buf->buffer, (xmlChar *) encoding);
@@ -890,6 +932,25 @@ xmlDocContentDumpOutput(xmlSaveCtxtPtr ctxt, xmlDocPtr cur) {
     }
     if (ctxt->encoding != NULL)
         cur->encoding = oldenc;
+    
+    /*
+     * Restore the state of the saving context at the end of the document
+     */
+    if ((encoding != NULL) && (oldctxtenc == NULL) &&
+	((ctxt->options & XML_SAVE_NO_DECL) == 0)) {
+	if ((enc != XML_CHAR_ENCODING_UTF8) &&
+	    (enc != XML_CHAR_ENCODING_NONE) &&
+	    (enc != XML_CHAR_ENCODING_ASCII)) {
+	    xmlOutputBufferFlush(buf);
+	    xmlCharEncCloseFunc(buf->encoder);
+	    xmlBufferFree(buf->conv);
+	    buf->encoder = NULL;
+	    buf->conv = NULL;
+	}
+	ctxt->escape = oldescape;
+	ctxt->escapeAttr = oldescapeAttr;
+    }
+    return(0);
 }
 
 #ifdef LIBXML_HTML_ENABLED
@@ -1316,6 +1377,11 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
 	xmlOutputBufferWriteEscape(buf, cur->content, ctxt->escape);
     }
 
+#if 0
+    /*
+    * This was removed due to problems with HTML processors.
+    * See bug #345147.
+    */
     /*
      * 4.8. Script and Style elements
      */
@@ -1380,7 +1446,10 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
 	    }
 	    child = child->next;
 	}
-    } else if (cur->children != NULL) {
+    }
+#endif
+
+    if (cur->children != NULL) {
 	int indent = ctxt->format;
 	
 	if (format) xmlOutputBufferWrite(buf, 1, "\n");
@@ -1555,14 +1624,15 @@ xmlSaveDoc(xmlSaveCtxtPtr ctxt, xmlDocPtr doc)
     long ret = 0;
 
     if ((ctxt == NULL) || (doc == NULL)) return(-1);
-    xmlDocContentDumpOutput(ctxt, doc);
+    if (xmlDocContentDumpOutput(ctxt, doc) < 0)
+        return(-1);
     return(ret);
 }
 
 /**
  * xmlSaveTree:
  * @ctxt:  a document saving context
- * @node:  a document
+ * @node:  the top node of the subtree to save
  *
  * Save a subtree starting at the node parameter to a saving context
  * TODO: The function is not fully implemented yet as it does not return the
diff --git a/xmlschemas.c b/xmlschemas.c
index ff89e2c..11e3eac 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -84,6 +84,8 @@
 
 /* #define DEBUG_IDC_NODE_TABLE */
 
+/* #define WXS_ELEM_DECL_CONS_ENABLED */
+
 #ifdef DEBUG_IDC
  #ifndef DEBUG_IDC_NODE_TABLE
   #define DEBUG_IDC_NODE_TABLE
@@ -183,6 +185,8 @@ static const xmlChar *xmlNamespaceNs = (const xmlChar *)
 
 #define WXS_PARTICLE_TERM(p) (WXS_PARTICLE(p))->children
 
+#define WXS_PARTICLE_TERM_AS_ELEM(p) (WXS_ELEM_CAST WXS_PARTICLE_TERM(p))
+
 #define WXS_PARTICLE_MODEL(p) WXS_MODEL_GROUP_CAST WXS_PARTICLE(p)->children
 /*
 * Macros for model groups definitions.
@@ -242,6 +246,10 @@ static const xmlChar *xmlNamespaceNs = (const xmlChar *)
 #define WXS_IS_TYPE_NOT_FIXED_1(item) \
     (((item)->type != XML_SCHEMA_TYPE_BASIC) && \
      (((item)->flags & XML_SCHEMAS_TYPE_FIXUP_1) == 0))
+
+#define WXS_TYPE_IS_GLOBAL(t) ((t)->flags & XML_SCHEMAS_TYPE_GLOBAL)
+
+#define WXS_TYPE_IS_LOCAL(t) (((t)->flags & XML_SCHEMAS_TYPE_GLOBAL) == 0)
 /*
 * Macros for exclusively for complex types.
 */
@@ -836,12 +844,12 @@ struct _xmlSchemaIDCMatcher {
     int type;
     int depth; /* the tree depth at creation time */
     xmlSchemaIDCMatcherPtr next; /* next in the list */
+    xmlSchemaIDCMatcherPtr nextCached; /* next in the cache list */
     xmlSchemaIDCAugPtr aidc; /* the augmented IDC item */
     int idcType;
     xmlSchemaPSVIIDCKeyPtr **keySeqs; /* the key-sequences of the target
                                          elements */
     int sizeKeySeqs;
-    int targetDepth;
     xmlSchemaItemListPtr targets; /* list of target-node
                                      (xmlSchemaPSVIIDCNodePtr) entries */
 };
@@ -993,6 +1001,7 @@ struct _xmlSchemaValidCtxt {
 
     xmlSchemaIDCStateObjPtr xpathStates; /* first active state object. */
     xmlSchemaIDCStateObjPtr xpathStatePool; /* first stored state object. */
+    xmlSchemaIDCMatcherPtr idcMatcherCache; /* Cache for IDC matcher objects. */
 
     xmlSchemaPSVIIDCNodePtr *idcNodes; /* list of all IDC node-table entries*/
     int nbIdcNodes;
@@ -18287,10 +18296,18 @@ xmlSchemaFixupComplexType(xmlSchemaParserCtxtPtr pctxt,
 	    if (type->contentType == XML_SCHEMA_CONTENT_EMPTY) {
 		/*
 		* SPEC (3.2.1)
+		* "If the �effective content� is empty, then the
+		*  {content type} of the [...] base ..."
 		*/
 		type->contentType = baseType->contentType;
 		type->subtypes = baseType->subtypes;
 		/*
+		* Fixes bug #347316:
+		* This is the case when the base type has a simple
+		* type definition as content.
+		*/
+		type->contentTypeDef = baseType->contentTypeDef;
+		/*
 		* NOTE that the effective mixed is ignored here.
 		*/
 	    } else if (baseType->contentType == XML_SCHEMA_CONTENT_EMPTY) {
@@ -19736,6 +19753,123 @@ add_member:
     }
 }
 
+#ifdef WXS_ELEM_DECL_CONS_ENABLED /* enable when finished */
+/**
+ * xmlSchemaCheckElementDeclComponent
+ * @pctxt: the schema parser context
+ * @ctxtComponent: the context component (an element declaration)
+ * @ctxtParticle: the first particle of the context component
+ * @searchParticle: the element declaration particle to be analysed
+ *
+ * Schema Component Constraint: Element Declarations Consistent 
+ */
+static int
+xmlSchemaCheckElementDeclConsistent(xmlSchemaParserCtxtPtr pctxt,
+				    xmlSchemaBasicItemPtr ctxtComponent,
+				    xmlSchemaParticlePtr ctxtParticle,				    
+				    xmlSchemaParticlePtr searchParticle,
+				    xmlSchemaParticlePtr curParticle,
+				    int search)
+{
+    return(0);
+
+    int ret = 0;
+    xmlSchemaParticlePtr cur = curParticle;
+    if (curParticle == NULL) {	
+	return(0);
+    }
+    if (WXS_PARTICLE_TERM(curParticle) == NULL) {
+	/*
+	* Just return in this case. A missing "term" of the particle
+	* might arise due to an invalid "term" component.
+	*/
+	return(0);
+    }    
+    while (cur != NULL) {
+	switch (WXS_PARTICLE_TERM(cur)->type) {
+	    case XML_SCHEMA_TYPE_ANY:
+		break;
+	    case XML_SCHEMA_TYPE_ELEMENT:
+		if (search == 0) {
+		    ret = xmlSchemaCheckElementDeclConsistent(pctxt,
+			ctxtComponent, ctxtParticle, cur, ctxtParticle, 1);
+		    if (ret != 0)
+			return(ret);		    
+		} else {
+		    xmlSchemaElementPtr elem =
+			WXS_ELEM_CAST(WXS_PARTICLE_TERM(cur));
+		    /*
+		    * SPEC Element Declarations Consistent:
+		    * "If the {particles} contains, either directly,
+		    * indirectly (that is, within the {particles} of a
+		    * contained model group, recursively) or �implicitly�
+		    * two or more element declaration particles with
+		    * the same {name} and {target namespace}, then
+		    * all their type definitions must be the same
+		    * top-level definition [...]"
+		    */
+		    if (xmlStrEqual(WXS_PARTICLE_TERM_AS_ELEM(cur)->name,
+			    WXS_PARTICLE_TERM_AS_ELEM(searchParticle)->name) &&
+			xmlStrEqual(WXS_PARTICLE_TERM_AS_ELEM(cur)->targetNamespace,
+			    WXS_PARTICLE_TERM_AS_ELEM(searchParticle)->targetNamespace))
+		    {
+			xmlChar *strA = NULL, *strB = NULL;
+			
+			xmlSchemaCustomErr(ACTXT_CAST pctxt,
+			    /* TODO: error code */
+			    XML_SCHEMAP_COS_NONAMBIG,
+			    WXS_ITEM_NODE(cur), NULL,
+			    "In the content model of %s, there are multiple "
+			    "element declarations for '%s' with different "
+			    "type definitions",
+			    xmlSchemaGetComponentDesignation(&strA,
+				ctxtComponent),
+			    xmlSchemaFormatQName(&strB,
+				WXS_PARTICLE_TERM_AS_ELEM(cur)->targetNamespace,
+				WXS_PARTICLE_TERM_AS_ELEM(cur)->name));
+			FREE_AND_NULL(strA);
+			FREE_AND_NULL(strB);
+			return(XML_SCHEMAP_COS_NONAMBIG);
+		    }
+		}	    
+		break;
+	    case XML_SCHEMA_TYPE_SEQUENCE: {		
+		break;
+		}
+	    case XML_SCHEMA_TYPE_CHOICE:{
+		/*
+		xmlSchemaTreeItemPtr sub;
+		
+		sub = WXS_PARTICLE_TERM(particle)->children;  (xmlSchemaParticlePtr) 
+		while (sub != NULL) {
+		    ret = xmlSchemaCheckElementDeclConsistent(pctxt, ctxtComponent,
+			ctxtParticle, ctxtElem);
+		    if (ret != 0)
+			return(ret);
+		    sub = sub->next;
+		}
+		*/
+		break;
+		}
+	    case XML_SCHEMA_TYPE_ALL:
+		break;
+	    case XML_SCHEMA_TYPE_GROUP:
+		break;
+	    default:
+		xmlSchemaInternalErr2(ACTXT_CAST pctxt,
+		    "xmlSchemaCheckElementDeclConsistent",
+		    "found unexpected term of type '%s' in content model",
+		    WXS_ITEM_TYPE_NAME(WXS_PARTICLE_TERM(cur)), NULL);
+		return(-1);
+	}
+	cur = (xmlSchemaParticlePtr) cur->next;
+    }
+
+exit:
+    return(ret);
+}
+#endif
+
 /**
  * xmlSchemaCheckElementDeclComponent
  * @item:  an schema element declaration/particle
@@ -19743,8 +19877,7 @@ add_member:
  * @name:  the name of the attribute
  *
  * Validates the value constraints of an element declaration.
- *
- * Fixes finish doing the computations on the element declarations.
+ * Adds substitution group members. 
  */
 static void
 xmlSchemaCheckElementDeclComponent(xmlSchemaElementPtr elemDecl,
@@ -19755,8 +19888,12 @@ xmlSchemaCheckElementDeclComponent(xmlSchemaElementPtr elemDecl,
     if (elemDecl->flags & XML_SCHEMAS_ELEM_INTERNAL_CHECKED)
 	return;
     elemDecl->flags |= XML_SCHEMAS_ELEM_INTERNAL_CHECKED;
-    if (xmlSchemaCheckElemPropsCorrect(ctxt, elemDecl) == 0)
-	xmlSchemaCheckElemSubstGroup(ctxt, elemDecl);
+    if (xmlSchemaCheckElemPropsCorrect(ctxt, elemDecl) == 0) {
+	/*
+	* Adds substitution group members.
+	*/
+	xmlSchemaCheckElemSubstGroup(ctxt, elemDecl);	
+    }
 }
 
 /**
@@ -20579,6 +20716,7 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
     xmlSchemaTreeItemPtr item, *items;
     int nbItems, i, ret = 0;
     xmlSchemaBucketPtr oldbucket = con->bucket;
+    xmlSchemaElementPtr elemDecl;
 
 #define FIXHFAILURE if (pctxt->err == XML_SCHEMAP_INTERNAL) goto exit_failure;
 
@@ -20852,7 +20990,7 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
     if (pctxt->nberrors != 0)
 	goto exit_error;
     /*
-    * At this point we need all simple types to be builded and checked.
+    * At this point we need build and check all simple types.
     */
     /*
     * Apply contraints for attribute declarations.
@@ -20919,8 +21057,8 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
     if (pctxt->nberrors != 0)
 	goto exit_error;
 
-    /*
-    * Fixup complex types.
+    /*    
+    * Complex types are builded and checked.
     */
     for (i = 0; i < nbItems; i++) {
 	item = con->pending->items[i];
@@ -20943,11 +21081,8 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
     * will create particles and model groups in some cases.
     */
     items = (xmlSchemaTreeItemPtr *) con->pending->items;
-    nbItems = con->pending->nbItems;
-
-    /*
-    * At this point all complex types need to be builded and checked.
-    */
+    nbItems = con->pending->nbItems;    
+    
     /*
     * Apply some constraints for element declarations.
     */
@@ -20955,13 +21090,30 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
 	item = items[i];
 	switch (item->type) {
 	    case XML_SCHEMA_TYPE_ELEMENT:
+		elemDecl = (xmlSchemaElementPtr) item;
 		
-		if ((((xmlSchemaElementPtr) item)->flags & 
-		    XML_SCHEMAS_ELEM_INTERNAL_CHECKED) == 0) {
+		if ((elemDecl->flags & XML_SCHEMAS_ELEM_INTERNAL_CHECKED) == 0)
+		{
 		    xmlSchemaCheckElementDeclComponent(
-			(xmlSchemaElementPtr) item, pctxt);
+			(xmlSchemaElementPtr) elemDecl, pctxt);
 		    FIXHFAILURE;
 		}
+
+#ifdef WXS_ELEM_DECL_CONS_ENABLED
+		/*
+		* Schema Component Constraint: Element Declarations Consistent
+		* Apply this constraint to local types of element declarations.
+		*/
+		if ((WXS_ELEM_TYPEDEF(elemDecl) != NULL) &&
+		    (WXS_IS_COMPLEX(WXS_ELEM_TYPEDEF(elemDecl))) &&
+		    (WXS_TYPE_IS_LOCAL(WXS_ELEM_TYPEDEF(elemDecl))))
+		{
+		    xmlSchemaCheckElementDeclConsistent(pctxt,
+			WXS_BASIC_CAST elemDecl,
+			WXS_TYPE_PARTICLE(WXS_ELEM_TYPEDEF(elemDecl)),
+			NULL, NULL, 0);
+		}
+#endif
 		break;
 	    default:
 		break;
@@ -20969,6 +21121,7 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
     }
     if (pctxt->nberrors != 0)
 	goto exit_error;
+ 
     /*
     * Finally we can build the automaton from the content model of
     * complex types.
@@ -22005,7 +22158,7 @@ xmlSchemaIDCFreeMatcherList(xmlSchemaIDCMatcherPtr matcher)
 
     while (matcher != NULL) {
 	next = matcher->next;
-	if (matcher->keySeqs != NULL) {
+	if (matcher->keySeqs != NULL) {	    
 	    int i;
 	    for (i = 0; i < matcher->sizeKeySeqs; i++)
 		if (matcher->keySeqs[i] != NULL)
@@ -22035,6 +22188,63 @@ xmlSchemaIDCFreeMatcherList(xmlSchemaIDCMatcherPtr matcher)
     }
 }
 
+/**
+ * xmlSchemaIDCReleaseMatcherList:
+ * @vctxt: the WXS validation context
+ * @matcher: the first IDC matcher in the list
+ *
+ * Caches a list of IDC matchers for reuse.
+ */
+static void
+xmlSchemaIDCReleaseMatcherList(xmlSchemaValidCtxtPtr vctxt,
+			       xmlSchemaIDCMatcherPtr matcher)
+{
+    xmlSchemaIDCMatcherPtr next;
+
+    while (matcher != NULL) {
+	next = matcher->next;
+	if (matcher->keySeqs != NULL) {	    
+	    int i;
+	    /*
+	    * Don't free the array, but only the content.
+	    */
+	    for (i = 0; i < matcher->sizeKeySeqs; i++)
+		if (matcher->keySeqs[i] != NULL) {
+		    xmlFree(matcher->keySeqs[i]);
+		    matcher->keySeqs[i] = NULL;
+		}
+	}
+	if (matcher->targets) {
+	    if (matcher->idcType == XML_SCHEMA_TYPE_IDC_KEYREF) {
+		int i;
+		xmlSchemaPSVIIDCNodePtr idcNode;
+		/*
+		* Node-table items for keyrefs are not stored globally
+		* to the validation context, since they are not bubbled.
+		* We need to free them here.
+		*/
+		for (i = 0; i < matcher->targets->nbItems; i++) {
+		    idcNode =
+			(xmlSchemaPSVIIDCNodePtr) matcher->targets->items[i];
+		    xmlFree(idcNode->keys);
+		    xmlFree(idcNode);
+		}
+	    }
+	    xmlSchemaItemListFree(matcher->targets);
+	    matcher->targets = NULL;
+	}	
+	matcher->next = NULL;
+	/*
+	* Cache the matcher.
+	*/
+	if (vctxt->idcMatcherCache != NULL)
+	    matcher->nextCached = vctxt->idcMatcherCache;
+	vctxt->idcMatcherCache = matcher;
+
+	matcher = next;
+    }
+}
+
 /**
  * xmlSchemaIDCAddStateObject:
  * @vctxt: the WXS validation context
@@ -22189,7 +22399,7 @@ xmlSchemaXPathEvaluate(xmlSchemaValidCtxtPtr vctxt,
 		    "allocating the state object history", NULL);
 		return(-1);
 	    }
-	    sto->sizeHistory = 10;
+	    sto->sizeHistory = 5;
 	} else if (sto->sizeHistory <= sto->nbHistory) {
 	    sto->sizeHistory *= 2;
 	    sto->history = (int *) xmlRealloc(sto->history,
@@ -22815,7 +23025,7 @@ deregister_check:
 	    /*
 	    * Link it to the pool of reusable state objects.
 	    */
-	    vctxt->xpathStatePool = sto;	    
+	    vctxt->xpathStatePool = sto;
 	    sto = nextsto;
 	} else
 	    sto = sto->next;
@@ -22912,14 +23122,23 @@ xmlSchemaIDCRegisterMatchers(xmlSchemaValidCtxtPtr vctxt,
 	/*
 	* Create an IDC matcher for every IDC definition.
 	*/
-	matcher = (xmlSchemaIDCMatcherPtr) 
-	    xmlMalloc(sizeof(xmlSchemaIDCMatcher));
-	if (matcher == NULL) {
-	    xmlSchemaVErrMemory(vctxt, 
-		"allocating an IDC matcher", NULL);
-	    return (-1);
+	if (vctxt->idcMatcherCache != NULL) {
+	    /*
+	    * Reuse a cached matcher.
+	    */
+	    matcher = vctxt->idcMatcherCache;
+	    vctxt->idcMatcherCache = matcher->nextCached;
+	    matcher->nextCached = NULL;
+	} else {
+	    matcher = (xmlSchemaIDCMatcherPtr) 
+		xmlMalloc(sizeof(xmlSchemaIDCMatcher));
+	    if (matcher == NULL) {
+		xmlSchemaVErrMemory(vctxt, 
+		    "allocating an IDC matcher", NULL);
+		return (-1);
+	    }
+	    memset(matcher, 0, sizeof(xmlSchemaIDCMatcher));
 	}
-	memset(matcher, 0, sizeof(xmlSchemaIDCMatcher));
 	if (last == NULL)
 	    vctxt->inode->idcMatchers = matcher;
 	else
@@ -23665,8 +23884,14 @@ xmlSchemaValidatorPushAttribute(xmlSchemaValidCtxtPtr vctxt,
     return (0);
 }
 
+/**
+ * xmlSchemaClearElemInfo:
+ * @vctxt: the WXS validation context
+ * @ielem: the element information item
+ */
 static void
-xmlSchemaClearElemInfo(xmlSchemaNodeInfoPtr ielem)
+xmlSchemaClearElemInfo(xmlSchemaValidCtxtPtr vctxt,
+		       xmlSchemaNodeInfoPtr ielem)
 {
     ielem->hasKeyrefs = 0;
     ielem->appliedXPath = 0;
@@ -23692,9 +23917,13 @@ xmlSchemaClearElemInfo(xmlSchemaNodeInfoPtr ielem)
     }
     if (ielem->idcMatchers != NULL) {
 	/*
-	* URGENT OPTIMIZE TODO: Use a pool of IDC matchers.
+	* REVISIT OPTIMIZE TODO: Use a pool of IDC matchers.
+	*   Does it work?
 	*/
+	xmlSchemaIDCReleaseMatcherList(vctxt, ielem->idcMatchers);
+#if 0
 	xmlSchemaIDCFreeMatcherList(ielem->idcMatchers);
+#endif
 	ielem->idcMatchers = NULL;
     }
     if (ielem->idcTable != NULL) {
@@ -26060,7 +26289,7 @@ end_elem:
     * VAL TODO: Don't free the PSVI IDC tables if they are
     * requested for the PSVI.
     */
-    xmlSchemaClearElemInfo(inode);
+    xmlSchemaClearElemInfo(vctxt, inode);
     /*
     * Skip further processing if we are on the validation root.
     */
@@ -27160,6 +27389,18 @@ xmlSchemaClearValidCtxt(xmlSchemaValidCtxtPtr vctxt)
 	} while (cur != NULL);
 	vctxt->aidcs = NULL;
     }
+    if (vctxt->idcMatcherCache != NULL) {
+	xmlSchemaIDCMatcherPtr matcher = vctxt->idcMatcherCache, tmp;
+
+	while (matcher) {
+	    tmp = matcher;
+	    matcher = matcher->nextCached;
+	    xmlSchemaIDCFreeMatcherList(tmp);
+	}
+	vctxt->idcMatcherCache = NULL;
+    }
+
+
     if (vctxt->idcNodes != NULL) {
 	int i;
 	xmlSchemaPSVIIDCNodePtr item;
@@ -27171,6 +27412,8 @@ xmlSchemaClearValidCtxt(xmlSchemaValidCtxtPtr vctxt)
 	}
 	xmlFree(vctxt->idcNodes);
 	vctxt->idcNodes = NULL;
+	vctxt->nbIdcNodes = 0;
+	vctxt->sizeIdcNodes = 0;
     }
     /*
     * Note that we won't delete the XPath state pool here.
@@ -27196,7 +27439,7 @@ xmlSchemaClearValidCtxt(xmlSchemaValidCtxtPtr vctxt)
 	    ei = vctxt->elemInfos[i];
 	    if (ei == NULL)
 		break;
-	    xmlSchemaClearElemInfo(ei);
+	    xmlSchemaClearElemInfo(vctxt, ei);
 	}
     }    
     xmlSchemaItemListClear(vctxt->nodeQNames);
@@ -27242,10 +27485,14 @@ xmlSchemaFreeValidCtxt(xmlSchemaValidCtxtPtr ctxt)
 	xmlFree(ctxt->idcKeys);
     }
 
-    if (ctxt->xpathStates != NULL)
+    if (ctxt->xpathStates != NULL) {
 	xmlSchemaFreeIDCStateObjList(ctxt->xpathStates);
-    if (ctxt->xpathStatePool != NULL)
+	ctxt->xpathStates = NULL;
+    }
+    if (ctxt->xpathStatePool != NULL) {
 	xmlSchemaFreeIDCStateObjList(ctxt->xpathStatePool);
+	ctxt->xpathStatePool = NULL;
+    }
 
     /*
     * Augmented IDC information.
@@ -27279,7 +27526,7 @@ xmlSchemaFreeValidCtxt(xmlSchemaValidCtxtPtr ctxt)
 	    ei = ctxt->elemInfos[i];
 	    if (ei == NULL)
 		break;
-	    xmlSchemaClearElemInfo(ei);
+	    xmlSchemaClearElemInfo(ctxt, ei);
 	    xmlFree(ei);
 	}
 	xmlFree(ctxt->elemInfos);
diff --git a/xmlschemastypes.c b/xmlschemastypes.c
index 987f85f..a35c539 100644
--- a/xmlschemastypes.c
+++ b/xmlschemastypes.c
@@ -5715,6 +5715,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
 		if ((dec.frac == 0) || (dec.frac == dec.total))
 		    bufsize++;
 		buf = xmlMalloc(bufsize);
+		if (buf == NULL)
+		    return(-1);
 		offs = buf;
 		if (dec.sign)
 		    *offs++ = '-';
@@ -5788,6 +5790,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
 		if (dec.sign)
 		    bufsize++;
 		*retValue = xmlMalloc(bufsize);
+		if (*retValue == NULL)
+		    return(-1);
 		if (dec.hi != 0) {
 		    if (dec.sign)
 			snprintf((char *) *retValue, bufsize,
@@ -5863,7 +5867,9 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
 	case XML_SCHEMAS_GMONTH: {
 		/* TODO: Unclear in XML Schema 1.0 */
 		/* TODO: What to do with the timezone? */
-		*retValue = xmlMalloc(5);
+		*retValue = xmlMalloc(6);
+		if (*retValue == NULL)
+		    return(-1);
 		snprintf((char *) *retValue, 6, "--%02u",
 		    val->value.date.mon);
 	    }
@@ -5872,6 +5878,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
 		/* TODO: Unclear in XML Schema 1.0 */
 		/* TODO: What to do with the timezone? */
 		*retValue = xmlMalloc(6);
+		if (*retValue == NULL)
+		    return(-1);
 		snprintf((char *) *retValue, 6, "---%02u",
 		    val->value.date.day);
 	    }
@@ -5880,6 +5888,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
 		/* TODO: Unclear in XML Schema 1.0 */
 		/* TODO: What to do with the timezone? */
 		*retValue = xmlMalloc(8);
+		if (*retValue == NULL)
+		    return(-1);
 		snprintf((char *) *retValue, 8, "--%02u-%02u",
 		    val->value.date.mon, val->value.date.day);
 	    }
@@ -6024,6 +6034,8 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue)
 	    *retValue = BAD_CAST xmlStrdup(BAD_CAST "???");
 	    return (1);
     }
+    if (*retValue == NULL)
+	return(-1);
     return (0);
 }
 
diff --git a/xmlwriter.c b/xmlwriter.c
index 43934b3..74838e6 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -91,6 +91,7 @@ struct _xmlTextWriter {
     char qchar;                 /* character used for quoting attribute values */
     xmlParserCtxtPtr ctxt;
     int no_doc_free;
+    xmlDocPtr doc;
 };
 
 static void xmlFreeTextWriterStackEntry(xmlLinkPtr lk);
@@ -215,6 +216,9 @@ xmlNewTextWriter(xmlOutputBufferPtr out)
                         "xmlNewTextWriter : out of memory!\n");
         return NULL;
     }
+
+    ret->doc = xmlNewDoc(NULL);
+
     ret->no_doc_free = 0;
 
     return ret;
@@ -487,6 +491,9 @@ xmlFreeTextWriter(xmlTextWriterPtr writer)
         xmlFreeParserCtxt(writer->ctxt);
     }
 
+    if (writer->doc != NULL)
+        xmlFreeDoc(writer->doc);
+
     if (writer->ichar != NULL)
         xmlFree(writer->ichar);
     xmlFree(writer);
@@ -539,6 +546,8 @@ xmlTextWriterStartDocument(xmlTextWriterPtr writer, const char *version,
     if (encoder != NULL) {
         writer->out->conv = xmlBufferCreateSize(4000);
         xmlCharEncOutFunc(encoder, writer->out->conv, NULL);
+        if ((writer->doc != NULL) && (writer->doc->encoding == NULL))
+            writer->doc->encoding = xmlStrdup((xmlChar *)writer->out->encoder->name);
     } else
         writer->out->conv = NULL;
 
@@ -1425,7 +1434,7 @@ xmlTextWriterWriteString(xmlTextWriterPtr writer, const xmlChar * content)
                     break;
                 case XML_TEXTWRITER_ATTRIBUTE:
                     buf = NULL;
-                    xmlAttrSerializeTxtContent(writer->out->buffer, NULL,
+                    xmlAttrSerializeTxtContent(writer->out->buffer, writer->doc,
                                                NULL, content);
                     break;
 		default:
diff --git a/xpath.c b/xpath.c
index c6c2274..8964628 100644
--- a/xpath.c
+++ b/xpath.c
@@ -64,18 +64,6 @@
 	    "Unimplemented block at %s:%d\n",				\
             __FILE__, __LINE__);
 
-/*
-* XP_PATTERN_TO_ANY_NODE_ENABLED: when an XPath expression can be
-*   evaluated using the streaming mode (pattern.c) then this is used to
-*   enable resolution to nodes of type text-node, cdata-section-node,
-*   comment-node and pi-node. The only known scenario where this is
-*   needed is an expression like "foo//.", "//.", etc.; i.e. an expression
-*   where the final node to be selected can be of any type.
-*   Disabling this #define will result in an incorrect evaluation to
-*   only element-nodes and the document node.
-*/
-#define XP_PATTERN_TO_ANY_NODE_ENABLED
-
 /*
 * XP_OPTIMIZED_NON_ELEM_COMPARISON:
 * If defined, this will use xmlXPathCmpNodesExt() instead of
@@ -109,15 +97,6 @@
  */
 
 #if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
-/************************************************************************
- * 									*
- * 			Forward declarations				*
- * 									*
- ************************************************************************/
-static void
-xmlXPathFreeValueTree(xmlNodeSetPtr obj);
-static void
-xmlXPathReleaseObject(xmlXPathContextPtr ctxt, xmlXPathObjectPtr obj);
 
 /************************************************************************
  * 									*
@@ -606,6 +585,23 @@ struct _xmlXPathCompExpr {
 #endif
 };
 
+/************************************************************************
+ * 									*
+ * 			Forward declarations				*
+ * 									*
+ ************************************************************************/
+static void
+xmlXPathFreeValueTree(xmlNodeSetPtr obj);
+static void
+xmlXPathReleaseObject(xmlXPathContextPtr ctxt, xmlXPathObjectPtr obj);
+static int
+xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt,
+                        xmlXPathStepOpPtr op, xmlNodePtr *first);
+static int
+xmlXPathCompOpEvalToBoolean(xmlXPathParserContextPtr ctxt,
+			    xmlXPathStepOpPtr op,
+			    int isPredicate);
+
 /************************************************************************
  * 									*
  * 			Parser Type functions 				*
@@ -736,6 +732,7 @@ xmlXPathCompExprAdd(xmlXPathCompExprPtr comp, int ch1, int ch2,
 	comp->steps = real;
     }
     comp->last = comp->nbStep;
+    comp->steps[comp->nbStep].rewriteType = 0;
     comp->steps[comp->nbStep].ch1 = ch1;
     comp->steps[comp->nbStep].ch2 = ch2;
     comp->steps[comp->nbStep].op = op;
@@ -2327,22 +2324,20 @@ xmlXPathCacheObjectCopy(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val)
     if (val == NULL)
 	return(NULL);
 
-    switch (val->type) {
-	case XPATH_NODESET:
-	    if (XP_HAS_CACHE(ctxt))
+    if (XP_HAS_CACHE(ctxt)) {
+	switch (val->type) {
+	    case XPATH_NODESET:
 		return(xmlXPathCacheWrapNodeSet(ctxt,
 		    xmlXPathNodeSetMerge(NULL, val->nodesetval)));
-	case XPATH_STRING:
-	    if (XP_HAS_CACHE(ctxt))
+	    case XPATH_STRING:
 		return(xmlXPathCacheNewString(ctxt, val->stringval));
-	case XPATH_BOOLEAN:
-	    if (XP_HAS_CACHE(ctxt))
+	    case XPATH_BOOLEAN:
 		return(xmlXPathCacheNewBoolean(ctxt, val->boolval));
-	case XPATH_NUMBER:
-	    if (XP_HAS_CACHE(ctxt))
-		return(xmlXPathCacheNewFloat(ctxt, val->floatval));	
-	default:
-	    break;
+	    case XPATH_NUMBER:
+		return(xmlXPathCacheNewFloat(ctxt, val->floatval));
+	    default:
+		break;
+	}
     }
     return(xmlXPathObjectCopy(val));
 }
@@ -3399,6 +3394,37 @@ xmlXPathNodeSetCreate(xmlNodePtr val) {
     return(ret);
 }
 
+/**
+ * xmlXPathNodeSetCreateSize:
+ * @size:  the initial size of the set
+ *
+ * Create a new xmlNodeSetPtr of type double and of value @val
+ *
+ * Returns the newly created object.
+ */
+static xmlNodeSetPtr
+xmlXPathNodeSetCreateSize(int size) {
+    xmlNodeSetPtr ret;
+
+    ret = (xmlNodeSetPtr) xmlMalloc(sizeof(xmlNodeSet));
+    if (ret == NULL) {
+        xmlXPathErrMemory(NULL, "creating nodeset\n");
+	return(NULL);
+    }
+    memset(ret, 0 , (size_t) sizeof(xmlNodeSet));
+    if (size < XML_NODESET_DEFAULT)
+	size = XML_NODESET_DEFAULT;
+    ret->nodeTab = (xmlNodePtr *) xmlMalloc(size * sizeof(xmlNodePtr));
+    if (ret->nodeTab == NULL) {
+	xmlXPathErrMemory(NULL, "creating nodeset\n");
+	xmlFree(ret);
+	return(NULL);
+    }
+    memset(ret->nodeTab, 0 , size * (size_t) sizeof(xmlNodePtr));
+    ret->nodeMax = size;  
+    return(ret);
+}
+
 /**
  * xmlXPathNodeSetContains:
  * @cur:  the node-set
@@ -3717,6 +3743,7 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) {
     return(val1);
 }
 
+#if 0 /* xmlXPathNodeSetMergeUnique() is currently not used anymore */
 /**
  * xmlXPathNodeSetMergeUnique:
  * @val1:  the first NodeSet or NULL
@@ -3775,6 +3802,188 @@ xmlXPathNodeSetMergeUnique(xmlNodeSetPtr val1, xmlNodeSetPtr val2) {
 
     return(val1);
 }
+#endif /* xmlXPathNodeSetMergeUnique() is currently not used anymore */
+
+/**
+ * xmlXPathNodeSetMergeAndClear:
+ * @set1:  the first NodeSet or NULL
+ * @set2:  the second NodeSet
+ * @hasSet2NsNodes: 1 if set2 contains namespaces nodes
+ *
+ * Merges two nodesets, all nodes from @set2 are added to @set1
+ * if @set1 is NULL, a new set is created and copied from @set2.
+ * Checks for duplicate nodes. Clears set2.
+ *
+ * Returns @set1 once extended or NULL in case of error.
+ */
+static xmlNodeSetPtr
+xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
+			     int hasNullEntries)
+{
+    if ((set1 == NULL) && (hasNullEntries == 0)) {
+	/*
+	* Note that doing a memcpy of the list, namespace nodes are
+	* just assigned to set1, since set2 is cleared anyway.
+	*/
+	set1 = xmlXPathNodeSetCreateSize(set2->nodeNr);
+	if (set1 == NULL)
+	    return(NULL);
+	if (set2->nodeNr != 0) {
+	    memcpy(set1->nodeTab, set2->nodeTab,
+		set2->nodeNr * sizeof(xmlNodePtr));
+	    set1->nodeNr = set2->nodeNr;
+	}
+    } else {
+	int i, j, initNbSet1;
+	xmlNodePtr n1, n2;
+
+	if (set1 == NULL)
+	    	set1 = xmlXPathNodeSetCreate(NULL);
+
+	initNbSet1 = set1->nodeNr;        
+	for (i = 0;i < set2->nodeNr;i++) {
+	    n2 = set2->nodeTab[i];
+	    /*
+	    * Skip NULLed entries.
+	    */
+	    if (n2 == NULL)
+		continue;
+	    /*
+	    * Skip duplicates.
+	    */
+	    for (j = 0; j < initNbSet1; j++) {
+		n1 = set1->nodeTab[j];
+		if (n1 == n2) {		    
+		    goto skip_node;
+		} else if ((n1->type == XML_NAMESPACE_DECL) &&
+		    (n2->type == XML_NAMESPACE_DECL))
+		{		
+		    if ((((xmlNsPtr) n1)->next == ((xmlNsPtr) n2)->next) &&
+			(xmlStrEqual(((xmlNsPtr) n1)->prefix,
+			((xmlNsPtr) n2)->prefix)))
+		    {
+			/*
+			* Free the namespace node.
+			*/
+			set2->nodeTab[i] = NULL;
+			xmlXPathNodeSetFreeNs((xmlNsPtr) n2);
+			goto skip_node;
+		    }
+		}
+	    }
+	    /*
+	    * grow the nodeTab if needed
+	    */
+	    if (set1->nodeMax == 0) {
+		set1->nodeTab = (xmlNodePtr *) xmlMalloc(
+		    XML_NODESET_DEFAULT * sizeof(xmlNodePtr));
+		if (set1->nodeTab == NULL) {
+		    xmlXPathErrMemory(NULL, "merging nodeset\n");
+		    return(NULL);
+		}
+		memset(set1->nodeTab, 0,
+		    XML_NODESET_DEFAULT * (size_t) sizeof(xmlNodePtr));
+		set1->nodeMax = XML_NODESET_DEFAULT;
+	    } else if (set1->nodeNr >= set1->nodeMax) {
+		xmlNodePtr *temp;
+		
+		set1->nodeMax *= 2;
+		temp = (xmlNodePtr *) xmlRealloc(
+		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
+		if (temp == NULL) {
+		    xmlXPathErrMemory(NULL, "merging nodeset\n");
+		    return(NULL);
+		}
+		set1->nodeTab = temp;
+	    }
+	    if (n2->type == XML_NAMESPACE_DECL) {
+		xmlNsPtr ns = (xmlNsPtr) n2;
+		
+		set1->nodeTab[set1->nodeNr++] =
+		    xmlXPathNodeSetDupNs((xmlNodePtr) ns->next, ns);
+	    } else
+		set1->nodeTab[set1->nodeNr++] = n2;
+skip_node:
+	    {}
+	}
+    }
+    set2->nodeNr = 0;
+    return(set1);
+}
+
+/**
+ * xmlXPathNodeSetMergeAndClearNoDupls:
+ * @set1:  the first NodeSet or NULL
+ * @set2:  the second NodeSet
+ * @hasSet2NsNodes: 1 if set2 contains namespaces nodes
+ *
+ * Merges two nodesets, all nodes from @set2 are added to @set1
+ * if @set1 is NULL, a new set is created and copied from @set2.
+ * Doesn't chack for duplicate nodes. Clears set2.
+ *
+ * Returns @set1 once extended or NULL in case of error.
+ */
+static xmlNodeSetPtr
+xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
+				    int hasNullEntries)
+{    
+    if (set2 == NULL)
+	return(set1);
+    if ((set1 == NULL) && (hasNullEntries == 0)) {
+	/*
+	* Note that doing a memcpy of the list, namespace nodes are
+	* just assigned to set1, since set2 is cleared anyway.
+	*/
+	set1 = xmlXPathNodeSetCreateSize(set2->nodeNr);
+	if (set1 == NULL)
+	    return(NULL);
+	if (set2->nodeNr != 0) {
+	    memcpy(set1->nodeTab, set2->nodeTab,
+		set2->nodeNr * sizeof(xmlNodePtr));
+	    set1->nodeNr = set2->nodeNr;
+	}
+    } else {
+	int i;
+	xmlNodePtr n2;
+
+	if (set1 == NULL)
+	    set1 = xmlXPathNodeSetCreate(NULL);
+   
+	for (i = 0;i < set2->nodeNr;i++) {
+	    n2 = set2->nodeTab[i];
+	    /*
+	    * Skip NULLed entries.
+	    */
+	    if (n2 == NULL)
+		continue;	
+	    if (set1->nodeMax == 0) {
+		set1->nodeTab = (xmlNodePtr *) xmlMalloc(
+		    XML_NODESET_DEFAULT * sizeof(xmlNodePtr));
+		if (set1->nodeTab == NULL) {
+		    xmlXPathErrMemory(NULL, "merging nodeset\n");
+		    return(NULL);
+		}
+		memset(set1->nodeTab, 0,
+		    XML_NODESET_DEFAULT * (size_t) sizeof(xmlNodePtr));
+		set1->nodeMax = XML_NODESET_DEFAULT;
+	    } else if (set1->nodeNr >= set1->nodeMax) {
+		xmlNodePtr *temp;
+		
+		set1->nodeMax *= 2;
+		temp = (xmlNodePtr *) xmlRealloc(
+		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
+		if (temp == NULL) {
+		    xmlXPathErrMemory(NULL, "merging nodeset\n");
+		    return(NULL);
+		}
+		set1->nodeTab = temp;
+	    }
+	    set1->nodeTab[set1->nodeNr++] = n2;
+	}
+    }
+    set2->nodeNr = 0;
+    return(set1);
+}
 
 /**
  * xmlXPathNodeSetDel:
@@ -3857,32 +4066,59 @@ xmlXPathFreeNodeSet(xmlNodeSetPtr obj) {
 
 /**
  * xmlXPathNodeSetClear:
- * @set:  the xmlNodeSetPtr to free
+ * @set:  the node set to clear
  * 
  * Clears the list from all temporary XPath objects (e.g. namespace nodes
  * are feed), but does *not* free the list itself. Sets the length of the
  * list to 0.
  */
 static void
-xmlXPathNodeSetClear(xmlNodeSetPtr set)
-{    
-    int i;
-    xmlNodePtr node;
-
+xmlXPathNodeSetClear(xmlNodeSetPtr set, int hasNsNodes)
+{
     if ((set == NULL) || (set->nodeNr <= 0))
 	return;
-    
-    for (i = 0; i < set->nodeNr; i++) {
-	node = set->nodeTab[i];
-	if ((node != NULL) &&
-	    (node->type == XML_NAMESPACE_DECL))
-	{
-	    xmlXPathNodeSetFreeNs((xmlNsPtr) node);
-	}
+    else if (hasNsNodes) {
+	int i;
+	xmlNodePtr node;
+	
+	for (i = 0; i < set->nodeNr; i++) {
+	    node = set->nodeTab[i];
+	    if ((node != NULL) &&
+		(node->type == XML_NAMESPACE_DECL))
+		xmlXPathNodeSetFreeNs((xmlNsPtr) node);
+	}	
     }
     set->nodeNr = 0;
 }
 
+/**
+ * xmlXPathNodeSetClearFromPos:
+ * @set: the node set to be cleared
+ * @pos: the start position to clear from
+ * 
+ * Clears the list from temporary XPath objects (e.g. namespace nodes
+ * are feed) starting with the entry at @pos, but does *not* free the list
+ * itself. Sets the length of the list to @pos.
+ */
+static void
+xmlXPathNodeSetClearFromPos(xmlNodeSetPtr set, int pos, int hasNsNodes)
+{
+    if ((set == NULL) || (set->nodeNr <= 0) || (pos >= set->nodeNr))
+	return;
+    else if ((hasNsNodes)) {
+	int i;
+	xmlNodePtr node;
+	
+	for (i = pos; i < set->nodeNr; i++) {
+	    node = set->nodeTab[i];
+	    if ((node != NULL) &&
+		(node->type == XML_NAMESPACE_DECL))
+		xmlXPathNodeSetFreeNs((xmlNsPtr) node);
+	}	
+    }
+    set->nodeNr = pos;
+}
+
 /**
  * xmlXPathFreeValueTree:
  * @obj:  the xmlNodeSetPtr to free
@@ -5361,9 +5597,8 @@ xmlXPathCastNodeSetToString (xmlNodeSetPtr ns) {
  *
  * Converts an existing object to its string() equivalent
  *
- * Returns the string value of the object, NULL in case of error.
- *         A new string is allocated only if needed (@val isn't a
- *         string object).
+ * Returns the allocated string value of the object, NULL in case of error.
+ *         It's up to the caller to free the string memory with xmlFree(). 
  */
 xmlChar *
 xmlXPathCastToString(xmlXPathObjectPtr val) {
@@ -5795,6 +6030,17 @@ xmlXPathFreeContext(xmlXPathContextPtr ctxt) {
 	return(NULL);							\
     }									\
 
+#define CHECK_CTXT_NEG(ctxt)						\
+    if (ctxt == NULL) { 						\
+	__xmlRaiseError(NULL, NULL, NULL,				\
+		NULL, NULL, XML_FROM_XPATH,				\
+		XML_ERR_INTERNAL_ERROR, XML_ERR_FATAL,			\
+		__FILE__, __LINE__,					\
+		NULL, NULL, NULL, 0, 0,					\
+		"NULL context pointer\n");				\
+	return(-1);							\
+    }									\
+
 
 #define CHECK_CONTEXT(ctxt)						\
     if ((ctxt == NULL) || (ctxt->doc == NULL) ||			\
@@ -7221,6 +7467,13 @@ typedef xmlNodePtr (*xmlXPathTraversalFunction)
 typedef xmlNodePtr (*xmlXPathTraversalFunctionExt)
                     (xmlNodePtr cur, xmlNodePtr contextNode);
 
+/*
+ * xmlXPathNodeSetMergeFunction:
+ * Used for merging node sets in xmlXPathCollectAndTest().
+ */
+typedef xmlNodeSetPtr (*xmlXPathNodeSetMergeFunction)
+		    (xmlNodeSetPtr, xmlNodeSetPtr, int);
+
 
 /**
  * xmlXPathNextSelf:
@@ -10602,7 +10855,19 @@ xmlXPathCompPredicate(xmlXPathParserContextPtr ctxt, int filter) {
     SKIP_BLANKS;
 
     ctxt->comp->last = -1;
-    xmlXPathCompileExpr(ctxt, 1);
+    /*
+    * This call to xmlXPathCompileExpr() will deactivate sorting
+    * of the predicate result.
+    * TODO: Sorting is still activated for filters, since I'm not
+    *  sure if needed. Normally sorting should not be needed, since
+    *  a filter can only diminish the number of items in a sequence,
+    *  but won't change its order; so if the initial sequence is sorted,
+    *  subsequent sorting is not needed.
+    */
+    if (! filter)
+	xmlXPathCompileExpr(ctxt, 0);
+    else
+	xmlXPathCompileExpr(ctxt, 1);
     CHECK_ERROR;
 
     if (CUR != ']') {
@@ -11092,201 +11357,60 @@ xmlXPathCompLocationPath(xmlXPathParserContextPtr ctxt) {
 static int
 xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op);
 
-/**
- * xmlXPathNodeCollectAndTest:
- * @ctxt:  the XPath Parser context
- * @op:  the XPath precompiled step operation
- * @first:  pointer to the first element in document order
- * @last:  pointer to the last element in document order
- *
- * This is the function implementing a step: based on the current list
- * of nodes, it builds up a new list, looking at all nodes under that
- * axis and selecting them. It also does the predicate filtering
- *
- * Pushes the new NodeSet resulting from the search.
- *
- * Returns the number of nodes traversed
- */
-static int
-xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt,
-                           xmlXPathStepOpPtr op,
-			   xmlNodePtr * first, xmlNodePtr * last)
-{
-    xmlXPathAxisVal axis = (xmlXPathAxisVal) op->value;
-    xmlXPathTestVal test = (xmlXPathTestVal) op->value2;
-    xmlXPathTypeVal type = (xmlXPathTypeVal) op->value3;
-    const xmlChar *prefix = op->value4;
-    const xmlChar *name = op->value5;
-    const xmlChar *URI = NULL;
-
-#ifdef DEBUG_STEP
-    int nbMatches = 0;
-#endif
-    int inputIdx, total = 0, specialNodeInSet = 0;
-    xmlNodeSetPtr inputList, resultList, list;
-    xmlXPathTraversalFunction next = NULL;
-    xmlXPathTraversalFunctionExt compoundNext = NULL;
-    void (*addNode) (xmlNodeSetPtr, xmlNodePtr);
-    xmlNodeSetPtr (*mergeNodeSet) (xmlNodeSetPtr, xmlNodeSetPtr);
-    xmlNodePtr oldContextNode, contextNode, cur, compoundContextNode;
-    xmlXPathObjectPtr obj;
-    xmlXPathContextPtr xpctxt = ctxt->context;
-
-    CHECK_TYPE0(XPATH_NODESET);
-    obj = valuePop(ctxt);
-
-    /*
-    * Setup wrt namespaces.
-    */
-    if (prefix != NULL) {
-        URI = xmlXPathNsLookup(xpctxt, prefix);
-        if (URI == NULL) {
-	    xmlXPathFreeObject(obj);
-            XP_ERROR0(XPATH_UNDEF_PREFIX_ERROR);
-	}
-    }
-    
 #ifdef DEBUG_STEP
+static void
+xmlXPathDebugDumpStepAxis(xmlXPathAxisVal axis,
+			  xmlXPathTestVal test,
+			  int nbNodes)
+{
     xmlGenericError(xmlGenericErrorContext, "new step : ");
-#endif
-
-    /*
-    * Setup wrt the axis.
-    */
-    addNode = xmlXPathNodeSetAdd;
-    mergeNodeSet = xmlXPathNodeSetMerge;
     switch (axis) {
         case AXIS_ANCESTOR:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext, "axis 'ancestors' ");
-#endif
-            first = NULL;
-            next = xmlXPathNextAncestor;
             break;
         case AXIS_ANCESTOR_OR_SELF:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext,
                             "axis 'ancestors-or-self' ");
-#endif
-            first = NULL;
-            next = xmlXPathNextAncestorOrSelf;
             break;
         case AXIS_ATTRIBUTE:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext, "axis 'attributes' ");
-#endif
-            first = NULL;
-	    last = NULL;
-            next = xmlXPathNextAttribute;
-	    mergeNodeSet = xmlXPathNodeSetMergeUnique;
             break;
         case AXIS_CHILD:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext, "axis 'child' ");
-#endif
-	    last = NULL;
-	    if (op->rewriteType == XP_REWRITE_DOS_CHILD_ELEM) {
-		/*
-		* This iterator will give us only nodes which can
-		* hold element nodes.
-		*/
-		compoundNext = xmlXPathNextDescendantOrSelfElemParent;
-	    }
-	    if ((test == NODE_TEST_NAME) && (type == NODE_TYPE_NODE)) {
-		/*
-		* Optimization if an element node type is 'element'.
-		*/
-		next = xmlXPathNextChildElement;
-	    } else
-		next = xmlXPathNextChild;
-	    mergeNodeSet = xmlXPathNodeSetMergeUnique;
             break;
         case AXIS_DESCENDANT:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext, "axis 'descendant' ");
-#endif
-	    last = NULL;
-            next = xmlXPathNextDescendant;
             break;
         case AXIS_DESCENDANT_OR_SELF:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext,
                             "axis 'descendant-or-self' ");
-#endif
-	    last = NULL;
-            next = xmlXPathNextDescendantOrSelf;
             break;
         case AXIS_FOLLOWING:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext, "axis 'following' ");
-#endif
-	    last = NULL;
-            next = xmlXPathNextFollowing;
             break;
         case AXIS_FOLLOWING_SIBLING:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext,
                             "axis 'following-siblings' ");
-#endif
-	    last = NULL;
-            next = xmlXPathNextFollowingSibling;
             break;
         case AXIS_NAMESPACE:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext, "axis 'namespace' ");
-#endif
-            first = NULL;
-	    last = NULL;
-            next = (xmlXPathTraversalFunction) xmlXPathNextNamespace;
-	    mergeNodeSet = xmlXPathNodeSetMergeUnique;
             break;
         case AXIS_PARENT:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext, "axis 'parent' ");
-#endif
-            first = NULL;
-            next = xmlXPathNextParent;
             break;
         case AXIS_PRECEDING:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext, "axis 'preceding' ");
-#endif
-            first = NULL;
-            next = xmlXPathNextPrecedingInternal;
             break;
         case AXIS_PRECEDING_SIBLING:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext,
                             "axis 'preceding-sibling' ");
-#endif
-            first = NULL;
-            next = xmlXPathNextPrecedingSibling;
             break;
         case AXIS_SELF:
-#ifdef DEBUG_STEP
             xmlGenericError(xmlGenericErrorContext, "axis 'self' ");
-#endif
-            first = NULL;
-	    last = NULL;
-            next = xmlXPathNextSelf;
-	    mergeNodeSet = xmlXPathNodeSetMergeUnique;
             break;
     }
-    if (next == NULL) {
-	xmlXPathReleaseObject(xpctxt, obj); 
-        return(0);
-    }
-
-    inputList = obj->nodesetval;    
-    if ((inputList == NULL) || (inputList->nodeNr <= 0)) {
-	xmlXPathReleaseObject(xpctxt, obj);
-        valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, NULL));
-        return(0);
-    }    
-
-#ifdef DEBUG_STEP
     xmlGenericError(xmlGenericErrorContext,
-                    " context contains %d nodes\n", nodelist->nodeNr);
+	" context contains %d nodes\n", nbNodes);
     switch (test) {
         case NODE_TEST_NONE:
             xmlGenericError(xmlGenericErrorContext,
@@ -11318,561 +11442,638 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt,
             break;
     }
     xmlGenericError(xmlGenericErrorContext, "Testing : ");
-#endif
-    /*
-     * 2.3 Node Tests
-     *  - For the attribute axis, the principal node type is attribute. 
-     *  - For the namespace axis, the principal node type is namespace. 
-     *  - For other axes, the principal node type is element. 
-     *
-     * A node test * is true for any node of the
-     * principal node type. For example, child::* will
-     * select all element children of the context node
-     */
-    oldContextNode = xpctxt->node;
-    addNode = xmlXPathNodeSetAddUnique;
-    resultList = NULL;
-    list = NULL;
-    compoundContextNode = NULL;
-    contextNode = NULL;
-    inputIdx = 0;
+}
+#endif /* DEBUG_STEP */
 
-    while ((inputIdx < inputList->nodeNr) || (contextNode != NULL)) {
-	if (compoundNext != NULL) {
+static int
+xmlXPathCompOpEvalPredicate(xmlXPathParserContextPtr ctxt,
+			    xmlXPathStepOpPtr op,
+			    xmlNodeSetPtr set,
+			    int contextSize,
+			    int hasNsNodes)
+{
+    if (op->ch1 != -1) {
+	xmlXPathCompExprPtr comp = ctxt->comp;
+	/*
+	* Process inner predicates first.
+	*/
+	if (comp->steps[op->ch1].op != XPATH_OP_PREDICATE) {
 	    /*
-	    * This is a compound traversal.
+	    * TODO: raise an internal error.
 	    */
-	    if (contextNode == NULL) {
-		/*
-		* Set the context for the initial traversal.
-		*/
-		compoundContextNode = inputList->nodeTab[inputIdx++];
-		contextNode = compoundNext(NULL, compoundContextNode);
-	    } else
-		contextNode = compoundNext(contextNode, compoundContextNode);
-	    if (contextNode == NULL)
+	}
+	contextSize = xmlXPathCompOpEvalPredicate(ctxt,
+	    &comp->steps[op->ch1], set, contextSize, hasNsNodes);
+	CHECK_ERROR0;
+	if (contextSize <= 0)
+	    return(0);
+    }    
+    if (op->ch2 != -1) {
+	xmlXPathContextPtr xpctxt = ctxt->context;
+	xmlNodePtr contextNode, oldContextNode;
+	xmlDocPtr oldContextDoc;
+	int i, res, contextPos = 0, newContextSize;
+	xmlXPathStepOpPtr exprOp;
+	xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
+
+#ifdef LIBXML_XPTR_ENABLED
+	/*
+	* URGENT TODO: Check the following:
+	*  We don't expect location sets if evaluating prediates, right?
+	*  Only filters should expect location sets, right?
+	*/
+#endif
+	/*
+	* SPEC XPath 1.0:
+	*  "For each node in the node-set to be filtered, the
+	*  PredicateExpr is evaluated with that node as the
+	*  context node, with the number of nodes in the
+	*  node-set as the context size, and with the proximity
+	*  position of the node in the node-set with respect to
+	*  the axis as the context position;"
+	* @oldset is the node-set" to be filtered.
+	*
+	* SPEC XPath 1.0:
+	*  "only predicates change the context position and
+	*  context size (see [2.4 Predicates])."
+	* Example:
+	*   node-set  context pos
+	*    nA         1
+	*    nB         2
+	*    nC         3
+	*   After applying predicate [position() > 1] :
+	*   node-set  context pos
+	*    nB         1
+	*    nC         2
+	*/
+	oldContextNode = xpctxt->node;
+	oldContextDoc = xpctxt->doc;
+	/*
+	* Get the expression of this predicate.
+	*/
+	exprOp = &ctxt->comp->steps[op->ch2];	
+	newContextSize = 0;
+	for (i = 0; i < set->nodeNr; i++) {
+	    if (set->nodeTab[i] == NULL)
 		continue;
+
+	    contextNode = set->nodeTab[i];
+	    xpctxt->node = contextNode;
+	    xpctxt->contextSize = contextSize;
+	    xpctxt->proximityPosition = ++contextPos;
+	    
+	    /*	   
+	    * Also set the xpath document in case things like
+	    * key() are evaluated in the predicate.
+	    */
+	    if ((contextNode->type != XML_NAMESPACE_DECL) &&
+		(contextNode->doc != NULL))
+		xpctxt->doc = contextNode->doc;
 	    /*
-	    * Set the context for the main traversal.
+	    * Evaluate the predicate expression with 1 context node
+	    * at a time; this node is packaged into a node set; this
+	    * node set is handed over to the evaluation mechanism.
 	    */
-	    xpctxt->node = contextNode;
-	} else
-	    xpctxt->node = inputList->nodeTab[inputIdx++];	
-        
-	if (list == NULL) {
-	    list = xmlXPathNodeSetCreate(NULL);
-	    if (list == NULL) {
-		total = 0;
-		goto error;
-	    }
-	}
-	cur = NULL;
-	specialNodeInSet = 0;
-        do {
-            cur = next(ctxt, cur);
-            if (cur == NULL)
-                break;
+	    if (contextObj == NULL)
+		contextObj = xmlXPathCacheNewNodeSet(xpctxt, contextNode);
+	    else
+		xmlXPathNodeSetAddUnique(contextObj->nodesetval,
+		    contextNode);
 
-            if (first != NULL) {
-		if (*first == cur)
-		    break;
-		if ((*first != NULL) &&
-		    ((total % 256) == 0) &&	        
-#ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON
-		    (xmlXPathCmpNodesExt(*first, cur) >= 0))
-#else
-		    (xmlXPathCmpNodes(*first, cur) >= 0))		
-#endif
-		{
-		    break;
-		}
+	    valuePush(ctxt, contextObj);
+
+	    res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1);
+
+	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1))
+		goto evaluation_error;
+
+	    if (res != 0) {
+		newContextSize++;
+	    } else {
+		/*
+		* Remove the entry from the initial node set.
+		*/
+		set->nodeTab[i] = NULL;
+		if (contextNode->type == XML_NAMESPACE_DECL)
+		    xmlXPathNodeSetFreeNs((xmlNsPtr) contextNode);
 	    }
-	    if (last != NULL) {
-		if (*last == cur)
-		    break;
-		if ((*last != NULL) &&
-		    ((total % 256) == 0) &&		 
-#ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON
-		    (xmlXPathCmpNodesExt(cur, *last) >= 0))
-#else
-		    (xmlXPathCmpNodes(cur, *last) >= 0))
-#endif
-		{
-		    break;
-		}
+	    if (ctxt->value == contextObj) {
+		/*
+		* Don't free the temporary XPath object holding the
+		* context node, in order to avoid massive recreation
+		* inside this loop.
+		*/
+		valuePop(ctxt);
+		xmlXPathNodeSetClear(contextObj->nodesetval, hasNsNodes);
+	    } else {
+		/*
+		* TODO: The object was lost in the evaluation machinery.
+		*  Can this happen? Maybe in internal-error cases.
+		*/
+		contextObj = NULL;
 	    }
+	}
+	goto evaluation_exit;
 
-            total++;
-#ifdef DEBUG_STEP
-            xmlGenericError(xmlGenericErrorContext, " %s", cur->name);
-#endif
-            switch (test) {
-                case NODE_TEST_NONE:                   
-		    STRANGE
-		    goto error;                    
-                case NODE_TEST_TYPE:
-                    if ((cur->type == type) ||
-                        ((type == NODE_TYPE_NODE) &&
-                         ((cur->type == XML_DOCUMENT_NODE) ||
-                          (cur->type == XML_HTML_DOCUMENT_NODE) ||
-                          (cur->type == XML_ELEMENT_NODE) ||
-                          (cur->type == XML_NAMESPACE_DECL) ||
-                          (cur->type == XML_ATTRIBUTE_NODE) ||
-                          (cur->type == XML_PI_NODE) ||
-                          (cur->type == XML_COMMENT_NODE) ||
-                          (cur->type == XML_CDATA_SECTION_NODE) ||
-                          (cur->type == XML_TEXT_NODE))) ||
-			((type == NODE_TYPE_TEXT) &&
-			 (cur->type == XML_CDATA_SECTION_NODE)))
-		    {
-#ifdef DEBUG_STEP
-                        nbMatches++;
-#endif			
-			if (cur->type == XML_NAMESPACE_DECL)
-			    specialNodeInSet = 1;
-			/*
-			* TODO: Don't we need to use xmlXPathNodeSetAddNs()
-			* for namespace nodes here ?
-			*/
-                        addNode(list, cur);
-                    }
-                    break;
-                case NODE_TEST_PI:
-                    if ((cur->type == XML_PI_NODE) &&
-                        ((name == NULL) || xmlStrEqual(name, cur->name)))
-		    {
-#ifdef DEBUG_STEP
-                        nbMatches++;
-#endif
-                        addNode(list, cur);
-                    }
-                    break;
-                case NODE_TEST_ALL:
-                    if (axis == AXIS_ATTRIBUTE) {
-                        if (cur->type == XML_ATTRIBUTE_NODE) {
-#ifdef DEBUG_STEP
-                            nbMatches++;
-#endif
-                            addNode(list, cur);
-                        }
-                    } else if (axis == AXIS_NAMESPACE) {
-                        if (cur->type == XML_NAMESPACE_DECL) {
-#ifdef DEBUG_STEP
-                            nbMatches++;
-#endif			    
-			    specialNodeInSet = 1;
-                            xmlXPathNodeSetAddNs(list, xpctxt->node, 
-				(xmlNsPtr) cur);
-                        }
-                    } else {
-                        if (cur->type == XML_ELEMENT_NODE) {
-                            if (prefix == NULL) {
-#ifdef DEBUG_STEP
-                                nbMatches++;
-#endif
-                                addNode(list, cur);
-                            } else if ((cur->ns != NULL) &&
-                                       (xmlStrEqual(URI, cur->ns->href)))
-			    {
-#ifdef DEBUG_STEP
-                                nbMatches++;
-#endif
-                                addNode(list, cur);
-                            }
-                        }
-                    }
-                    break;
-                case NODE_TEST_NS:{
-                        TODO;
-                        break;
-                    }
-                case NODE_TEST_NAME:
-                    switch (cur->type) {
-                        case XML_ELEMENT_NODE:
-			    if (xmlStrEqual(name, cur->name)) {
-                                if (prefix == NULL) {
-                                    if (cur->ns == NULL) {
-#ifdef DEBUG_STEP
-                                        nbMatches++;
-#endif
-                                        addNode(list, cur);
-                                    }
-                                } else {
-                                    if ((cur->ns != NULL) &&
-                                        (xmlStrEqual(URI,
-                                                     cur->ns->href)))
-				    {
-#ifdef DEBUG_STEP
-                                        nbMatches++;
-#endif
-                                        addNode(list, cur);
-                                    }
-                                }
-                            }
-                            break;
-                        case XML_ATTRIBUTE_NODE:{
-                                xmlAttrPtr attr = (xmlAttrPtr) cur;
+evaluation_error:	
+	xmlXPathNodeSetClear(set, hasNsNodes);
+	newContextSize = 0;
 
-                                if (xmlStrEqual(name, attr->name)) {
-                                    if (prefix == NULL) {
-                                        if ((attr->ns == NULL) ||
-                                            (attr->ns->prefix == NULL)) {
-#ifdef DEBUG_STEP
-                                            nbMatches++;
-#endif
-                                            addNode(list,
-                                                    (xmlNodePtr) attr);
-                                        }
-                                    } else {
-                                        if ((attr->ns != NULL) &&
-                                            (xmlStrEqual(URI,
-                                                         attr->ns->
-                                                         href)))
-					{
-#ifdef DEBUG_STEP
-                                            nbMatches++;
-#endif
-                                            addNode(list,
-                                                    (xmlNodePtr) attr);
-                                        }
-                                    }
-                                }
-                                break;
-                            }
-                        case XML_NAMESPACE_DECL:
-                            if (cur->type == XML_NAMESPACE_DECL) {
-                                xmlNsPtr ns = (xmlNsPtr) cur;
+evaluation_exit:
+	if (contextObj != NULL) {
+	    if (ctxt->value == contextObj)
+		valuePop(ctxt);
+	    xmlXPathReleaseObject(xpctxt, contextObj);
+	}	
+	if (exprRes != NULL)
+	    xmlXPathReleaseObject(ctxt->context, exprRes);
+	/*
+	* Reset/invalidate the context.
+	*/
+	xpctxt->node = oldContextNode;
+	xpctxt->doc = oldContextDoc;
+	xpctxt->contextSize = -1;
+	xpctxt->proximityPosition = -1;
+	return(newContextSize);
+    }
+    return(contextSize);
+}
 
-                                if ((ns->prefix != NULL) && (name != NULL)
-                                    && (xmlStrEqual(ns->prefix, name)))
-				{
-#ifdef DEBUG_STEP
-                                    nbMatches++;
-#endif
-				    specialNodeInSet = 1;
-				    xmlXPathNodeSetAddNs(list,
-					xpctxt->node, (xmlNsPtr) cur);
-                                }
-                            }
-                            break;
-                        default:
-                            break;
-                    } /* switch (cur->type) */
-                    break; /*  case NODE_TEST_NAME: */                    
-            } /* switch (test) */
-        } while (cur != NULL);
+static int
+xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+				      xmlXPathStepOpPtr op,
+				      xmlNodeSetPtr set,
+				      int contextSize,
+				      int minPos,
+				      int maxPos,
+				      int hasNsNodes)
+{
+    if (op->ch1 != -1) {
+	xmlXPathCompExprPtr comp = ctxt->comp;
+	if (comp->steps[op->ch1].op != XPATH_OP_PREDICATE) {
+	    /*
+	    * TODO: raise an internal error.
+	    */
+	}
+	contextSize = xmlXPathCompOpEvalPredicate(ctxt,
+	    &comp->steps[op->ch1], set, contextSize, hasNsNodes);
+	CHECK_ERROR0;
+	if (contextSize <= 0)
+	    return(0);
+    }
+    /*
+    * Check if the node set contains a sufficient number of nodes for
+    * the requested range.
+    */
+    if (contextSize < minPos) {
+	xmlXPathNodeSetClear(set, hasNsNodes);
+	return(0);
+    }
+    if (op->ch2 == -1) {
+	/*
+	* TODO: Can this ever happen?
+	*/
+	return (contextSize);
+    } else {
+	xmlDocPtr oldContextDoc;
+	int i, pos = 0, newContextSize = 0, contextPos = 0, res;
+	xmlXPathStepOpPtr exprOp;
+	xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
+	xmlNodePtr oldContextNode, contextNode = NULL;
+	xmlXPathContextPtr xpctxt = ctxt->context;
 
-        /*
-         * If there is some predicate filtering do it now
-         */
-        if ((op->ch2 != -1) && (list != NULL) && (list->nodeNr > 0)) {
-            xmlXPathObjectPtr obj2;
+#ifdef LIBXML_XPTR_ENABLED
+	    /*
+	    * URGENT TODO: Check the following:
+	    *  We don't expect location sets if evaluating prediates, right?
+	    *  Only filters should expect location sets, right?
+	*/
+#endif /* LIBXML_XPTR_ENABLED */
 
-	    valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, list));
-            xmlXPathCompOpEval(ctxt, &ctxt->comp->steps[op->ch2]);
-            CHECK_TYPE0(XPATH_NODESET);
-            obj2 = valuePop(ctxt);
-            list = obj2->nodesetval;
-            obj2->nodesetval = NULL;
-	    xmlXPathReleaseObject(xpctxt, obj2);
+	/*
+	* Save old context.
+	*/
+	oldContextNode = xpctxt->node;
+	oldContextDoc = xpctxt->doc;
+	/*
+	* Get the expression of this predicate.
+	*/
+	exprOp = &ctxt->comp->steps[op->ch2];
+	for (i = 0; i < set->nodeNr; i++) {
+	    if (set->nodeTab[i] == NULL)
+		continue;
 
-	    if (ctxt->error != XPATH_EXPRESSION_OK) {
-		total = 0;
-		goto error;
-	    }
-        }
-        if (resultList == NULL) {
-            resultList = list;
-	    list = NULL;
-        } else if ((list != NULL) && (list->nodeNr > 0)) {
-            resultList = mergeNodeSet(resultList, list);
+	    contextNode = set->nodeTab[i];
+	    xpctxt->node = contextNode;
+	    xpctxt->contextSize = contextSize;
+	    xpctxt->proximityPosition = ++contextPos;
+	    
 	    /*
-	    * This is the list containing the current matching nodes.
-	    * Avoid massive creation/freeing and preserve it for the
-	    * next iterations.
+	    * Initialize the new set.
+	    * Also set the xpath document in case things like
+	    * key() evaluation are attempted on the predicate
 	    */
-	    /* If a namespace node was put it, then we need a more
-	    * time consuming cleanup.
+	    if ((contextNode->type != XML_NAMESPACE_DECL) &&
+		(contextNode->doc != NULL))
+		xpctxt->doc = contextNode->doc;
+	    /*
+	    * Evaluate the predicate expression with 1 context node
+	    * at a time; this node is packaged into a node set; this
+	    * node set is handed over to the evaluation mechanism.
 	    */
-	    if (specialNodeInSet)
-		xmlXPathNodeSetClear(list);
+	    if (contextObj == NULL)
+		contextObj = xmlXPathCacheNewNodeSet(xpctxt, contextNode);
 	    else
-		list->nodeNr = 0;
-        }
+		xmlXPathNodeSetAddUnique(contextObj->nodesetval,
+		    contextNode);
+
+	    valuePush(ctxt, contextObj);
+	    res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1);
+	    
+	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1))
+		goto evaluation_error;
+
+	    if (res)
+		pos++;
+
+	    if (res && (pos >= minPos) && (pos <= maxPos)) {
+		/*
+		* Fits in the requested range.
+		*/
+		newContextSize++;
+		if (minPos == maxPos) {
+		    /*
+		    * Only 1 node was requested.
+		    */
+		    if (contextNode->type == XML_NAMESPACE_DECL) {
+			/*
+			* As always: take care of those nasty
+			* namespace nodes.
+			*/
+			set->nodeTab[i] = NULL;
+		    }
+		    xmlXPathNodeSetClear(set, hasNsNodes);
+		    set->nodeNr = 1;
+		    set->nodeTab[0] = contextNode;		   
+		    goto evaluation_exit;
+		}		
+		if (pos == maxPos) {
+		    /*
+		    * We are done.
+		    */
+		    xmlXPathNodeSetClearFromPos(set, i +1, hasNsNodes);
+		    goto evaluation_exit;
+		}
+	    } else {
+		/*
+		* Remove the entry from the initial node set.
+		*/
+		set->nodeTab[i] = NULL;
+		if (contextNode->type == XML_NAMESPACE_DECL)
+		    xmlXPathNodeSetFreeNs((xmlNsPtr) contextNode);
+	    }
+	    if (exprRes != NULL) {
+		xmlXPathReleaseObject(ctxt->context, exprRes);
+		exprRes = NULL;
+	    }
+	    if (ctxt->value == contextObj) {
+		/*
+		* Don't free the temporary XPath object holding the
+		* context node, in order to avoid massive recreation
+		* inside this loop.
+		*/
+		valuePop(ctxt);
+		xmlXPathNodeSetClear(contextObj->nodesetval, hasNsNodes);
+	    } else {
+		/*
+		* The object was lost in the evaluation machinery.
+		* Can this happen? Maybe in case of internal-errors.
+		*/
+		contextObj = NULL;
+	    }
+	}
+	goto evaluation_exit;
+
+evaluation_error:
+	xmlXPathNodeSetClear(set, hasNsNodes);
+	newContextSize = 0;
+
+evaluation_exit:
+	if (contextObj != NULL) {
+	    if (ctxt->value == contextObj)
+		valuePop(ctxt);
+	    xmlXPathReleaseObject(xpctxt, contextObj);
+	}
+	if (exprRes != NULL)
+	    xmlXPathReleaseObject(ctxt->context, exprRes);
+	/*
+	* Reset/invalidate the context.
+	*/
+	xpctxt->node = oldContextNode;
+	xpctxt->doc = oldContextDoc;
+	xpctxt->contextSize = -1;
+	xpctxt->proximityPosition = -1;
+	return(newContextSize);
     }
+    return(contextSize);
+}
+
+static int
+xmlXPathIsPositionalPredicate(xmlXPathParserContextPtr ctxt,
+			    xmlXPathStepOpPtr op,			    
+			    int *maxPos)
+{
+
+    xmlXPathStepOpPtr exprOp;
 
-    xpctxt->node = oldContextNode;
     /*
-    * Cleanup the temporary list of current node-test matches.
+    * BIG NOTE: This is not intended for XPATH_OP_FILTER yet!
     */
-    if ((list != NULL) && (list != resultList)) {
-	 xmlXPathFreeNodeSet(list);
-	 list = NULL;
-    }
     
-#ifdef DEBUG_STEP
-    xmlGenericError(xmlGenericErrorContext,
-                    "\nExamined %d nodes, found %d nodes at that step\n",
-                    total, nbMatches);
-#endif
+    /*
+    * If not -1, then ch1 will point to:
+    * 1) For predicates (XPATH_OP_PREDICATE):
+    *    - an inner predicate operator
+    * 2) For filters (XPATH_OP_FILTER):
+    *    - an inner filter operater OR
+    *    - an expression selecting the node set.
+    *      E.g. "key('a', 'b')" or "(//foo | //bar)".
+    */    
+    if ((op->op != XPATH_OP_PREDICATE) && (op->op != XPATH_OP_FILTER))
+	return(0);
 
-    valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, resultList));
+    if (op->ch2 != -1) {
+	exprOp = &ctxt->comp->steps[op->ch2];
+    } else	
+	return(0);
 
-    if ((obj->boolval) && (obj->user != NULL)) {
+    if ((exprOp != NULL) &&
+	(exprOp->op == XPATH_OP_VALUE) &&
+	(exprOp->value4 != NULL) &&
+	(((xmlXPathObjectPtr) exprOp->value4)->type == XPATH_NUMBER))
+    {
 	/*
-	* QUESTION TODO: What does this do and why?
+	* We have a "[n]" predicate here.
+	* TODO: Unfortunately this simplistic test here is not
+	* able to detect a position() predicate in compound
+	* expressions like "[@attr = 'a" and position() = 1],
+	* and even not the usage of position() in
+	* "[position() = 1]"; thus - obviously - a position-range,
+	* like it "[position() < 5]", is also not detected.
+	* Maybe we could rewrite the AST to ease the optimization.
 	*/
-	ctxt->value->boolval = 1;
-	ctxt->value->user = obj->user;
-	obj->user = NULL;
-	obj->boolval = 0;
-    }
-    xmlXPathReleaseObject(xpctxt, obj);    
-    return(total);
-
-error:
-    xpctxt->node = oldContextNode;
-    xmlXPathReleaseObject(xpctxt, obj);
-    if ((list != NULL) && (list != resultList)) {
-	 xmlXPathFreeNodeSet(list);
+	*maxPos = (int) ((xmlXPathObjectPtr) exprOp->value4)->floatval;
+	
+	if (((xmlXPathObjectPtr) exprOp->value4)->floatval ==
+	    (float) *maxPos)
+	{	    
+	    return(1);
+	}
     }
-    if (resultList != NULL)
-	xmlXPathFreeNodeSet(resultList);    
-    return(total);
+    return(0);
 }
 
-/**
- * xmlXPathNodeCollectAndTestNth:
- * @ctxt:  the XPath Parser context
- * @op:  the XPath precompiled step operation
- * @reqpos:  the requested position wrt to the axis
- * @first:  pointer to the first element in document order
- * @last:  pointer to the last element in document order
- *
- * This is the function implementing a step: based on the current list
- * of nodes, it builds up a new list, looking at all nodes under that
- * axis and selecting them. It also does the predicate filtering
- *
- * Pushes the new NodeSet resulting from the search.
- * Returns the number of node traversed
- */
 static int
-xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt,
-                              xmlXPathStepOpPtr op, int reqpos,
-                              xmlNodePtr * first, xmlNodePtr * last)
+xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt,
+                           xmlXPathStepOpPtr op,
+			   xmlNodePtr * first, xmlNodePtr * last,
+			   int toBool)
 {
+
+#define XP_TEST_HIT \
+    if (hasAxisRange != 0) { \
+	if (++pos == maxPos) { \
+	    addNode(seq, cur); \
+	goto axis_range_end; } \
+    } else { \
+	addNode(seq, cur); \
+	if (breakOnFirstHit) goto first_hit; }
+
+#define XP_TEST_HIT_NS \
+    if (hasAxisRange != 0) { \
+	if (++pos == maxPos) { \
+	    hasNsNodes = 1; \
+	    xmlXPathNodeSetAddNs(seq, xpctxt->node, (xmlNsPtr) cur); \
+	goto axis_range_end; } \
+    } else { \
+	hasNsNodes = 1; \
+	xmlXPathNodeSetAddNs(seq, \
+	xpctxt->node, (xmlNsPtr) cur); \
+	if (breakOnFirstHit) goto first_hit; }
+
     xmlXPathAxisVal axis = (xmlXPathAxisVal) op->value;
     xmlXPathTestVal test = (xmlXPathTestVal) op->value2;
     xmlXPathTypeVal type = (xmlXPathTypeVal) op->value3;
     const xmlChar *prefix = op->value4;
     const xmlChar *name = op->value5;
     const xmlChar *URI = NULL;
-    int pos; /* The current context position */
 
-    int inputIdx, total = 0;
-    xmlNodeSetPtr inputList, list;
+#ifdef DEBUG_STEP
+    int nbMatches = 0, prevMatches = 0;
+#endif
+    int total = 0, hasNsNodes = 0;
+    /* The popped object holding the context nodes */
+    xmlXPathObjectPtr obj;
+    /* The set of context nodes for the node tests */
+    xmlNodeSetPtr contextSeq;
+    int contextIdx;
+    xmlNodePtr contextNode;
+    /* The context node for a compound traversal */
+    xmlNodePtr outerContextNode;
+    /* The final resulting node set wrt to all context nodes */
+    xmlNodeSetPtr outSeq;
+    /*
+    * The temporary resulting node set wrt 1 context node.
+    * Used to feed predicate evaluation.
+    */
+    xmlNodeSetPtr seq;
+    xmlNodePtr cur;    
+    /* First predicate operator */
+    xmlXPathStepOpPtr predOp;
+    int maxPos; /* The requested position() (when a "[n]" predicate) */
+    int hasPredicateRange, hasAxisRange, pos, size, newSize;
+    int breakOnFirstHit;
+
     xmlXPathTraversalFunction next = NULL;
-    xmlXPathTraversalFunctionExt compoundNext = NULL;
+    /* compound axis traversal */
+    xmlXPathTraversalFunctionExt outerNext = NULL;
     void (*addNode) (xmlNodeSetPtr, xmlNodePtr);
-    xmlNodePtr oldContextNode, contextNode, cur, compoundContextNode;
-    xmlXPathObjectPtr obj;
-    xmlXPathContextPtr xpctxt = ctxt->context;    
+    xmlXPathNodeSetMergeFunction mergeAndClear;
+    xmlNodePtr oldContextNode;    
+    xmlXPathContextPtr xpctxt = ctxt->context;
 
 
     CHECK_TYPE0(XPATH_NODESET);
     obj = valuePop(ctxt);
-    addNode = xmlXPathNodeSetAdd;
-
+    /*
+    * Setup namespaces.
+    */
     if (prefix != NULL) {
         URI = xmlXPathNsLookup(xpctxt, prefix);
         if (URI == NULL) {
-	    xmlXPathFreeObject(obj);
+	    xmlXPathReleaseObject(xpctxt, obj);
             XP_ERROR0(XPATH_UNDEF_PREFIX_ERROR);
 	}
-    }
-
-#ifdef DEBUG_STEP_NTH
-    xmlGenericError(xmlGenericErrorContext, "new step : ");
-    if (first != NULL) {
-	if (*first != NULL)
-	    xmlGenericError(xmlGenericErrorContext, "first = %s ",
-		    (*first)->name);
-	else
-	    xmlGenericError(xmlGenericErrorContext, "first = NULL ");
-    }
-    if (last != NULL) {
-	if (*last != NULL)
-	    xmlGenericError(xmlGenericErrorContext, "last = %s ",
-		    (*last)->name);
-	else
-	    xmlGenericError(xmlGenericErrorContext, "last = NULL ");
-    }
-#endif
+    }    
+    /*
+    * Setup axis.
+    *
+    * MAYBE FUTURE TODO: merging optimizations:
+    * - If the nodes to be traversed wrt to the initial nodes and
+    *   the current axis cannot overlap, then we could avoid searching
+    *   for duplicates during the merge.
+    *   But the question is how/when to evaluate if they cannot overlap.
+    *   Example: if we know that for two initial nodes, the one is
+    *   not in the ancestor-or-self axis of the other, then we could safely
+    *   avoid a duplicate-aware merge, if the axis to be traversed is e.g.
+    *   the descendant-or-self axis.
+    */
+    addNode = xmlXPathNodeSetAdd;
+    mergeAndClear = xmlXPathNodeSetMergeAndClear;
     switch (axis) {
         case AXIS_ANCESTOR:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext, "axis 'ancestors' ");
-#endif
             first = NULL;
             next = xmlXPathNextAncestor;
             break;
         case AXIS_ANCESTOR_OR_SELF:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext,
-                            "axis 'ancestors-or-self' ");
-#endif
             first = NULL;
             next = xmlXPathNextAncestorOrSelf;
             break;
         case AXIS_ATTRIBUTE:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext, "axis 'attributes' ");
-#endif
             first = NULL;
 	    last = NULL;
             next = xmlXPathNextAttribute;
+	    mergeAndClear = xmlXPathNodeSetMergeAndClearNoDupls;
             break;
         case AXIS_CHILD:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext, "axis 'child' ");
-#endif
 	    last = NULL;
 	    if (op->rewriteType == XP_REWRITE_DOS_CHILD_ELEM) {
 		/*
 		* This iterator will give us only nodes which can
 		* hold element nodes.
 		*/
-		compoundNext = xmlXPathNextDescendantOrSelfElemParent;
-	    }
-	    if ((test == NODE_TEST_NAME) && (type == NODE_TYPE_NODE)) {
+		outerNext = xmlXPathNextDescendantOrSelfElemParent;		
+	    }	    
+	    if (((test == NODE_TEST_NAME) || (test == NODE_TEST_ALL)) &&
+		(type == NODE_TYPE_NODE))
+	    {
 		/*
 		* Optimization if an element node type is 'element'.
 		*/
 		next = xmlXPathNextChildElement;
 	    } else
-		next = xmlXPathNextChild;            
+		next = xmlXPathNextChild;
+	    mergeAndClear = xmlXPathNodeSetMergeAndClearNoDupls;
             break;
         case AXIS_DESCENDANT:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext, "axis 'descendant' ");
-#endif
 	    last = NULL;
             next = xmlXPathNextDescendant;
             break;
         case AXIS_DESCENDANT_OR_SELF:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext,
-                            "axis 'descendant-or-self' ");
-#endif
 	    last = NULL;
             next = xmlXPathNextDescendantOrSelf;
             break;
         case AXIS_FOLLOWING:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext, "axis 'following' ");
-#endif
 	    last = NULL;
             next = xmlXPathNextFollowing;
             break;
         case AXIS_FOLLOWING_SIBLING:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext,
-                            "axis 'following-siblings' ");
-#endif
 	    last = NULL;
             next = xmlXPathNextFollowingSibling;
             break;
         case AXIS_NAMESPACE:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext, "axis 'namespace' ");
-#endif
-	    last = NULL;
             first = NULL;
+	    last = NULL;
             next = (xmlXPathTraversalFunction) xmlXPathNextNamespace;
+	    mergeAndClear = xmlXPathNodeSetMergeAndClearNoDupls;
             break;
         case AXIS_PARENT:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext, "axis 'parent' ");
-#endif
             first = NULL;
             next = xmlXPathNextParent;
             break;
         case AXIS_PRECEDING:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext, "axis 'preceding' ");
-#endif
             first = NULL;
             next = xmlXPathNextPrecedingInternal;
             break;
         case AXIS_PRECEDING_SIBLING:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext,
-                            "axis 'preceding-sibling' ");
-#endif
             first = NULL;
             next = xmlXPathNextPrecedingSibling;
             break;
         case AXIS_SELF:
-#ifdef DEBUG_STEP_NTH
-            xmlGenericError(xmlGenericErrorContext, "axis 'self' ");
-#endif
             first = NULL;
 	    last = NULL;
             next = xmlXPathNextSelf;
+	    mergeAndClear = xmlXPathNodeSetMergeAndClearNoDupls;
             break;
     }
+
+#ifdef DEBUG_STEP
+    xmlXPathDebugDumpStepAxis(axis, test,
+	(obj->nodesetval != NULL) ? obj->nodsetval->nodeNr : 0);
+#endif
+
     if (next == NULL) {
-	xmlXPathReleaseObject(xpctxt, obj);
+	xmlXPathReleaseObject(xpctxt, obj); 
         return(0);
-    }
-
-    inputList = obj->nodesetval;
-    if ((inputList == NULL) || (inputList->nodeNr <= 0)) {
-        xmlXPathReleaseObject(xpctxt, obj);
-	valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, NULL));
+    }    
+    contextSeq = obj->nodesetval;
+    if ((contextSeq == NULL) || (contextSeq->nodeNr <= 0)) {
+	xmlXPathReleaseObject(xpctxt, obj);
+        valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, NULL));
         return(0);
+    }   
+    /*
+    * Predicate optimization ---------------------------------------------
+    * If this step has a last predicate, which contains a position(),
+    * then we'll optimize (although not exactly "position()", but only
+    * the  short-hand form, i.e., "[n]".
+    *
+    * Example - expression "/foo[parent::bar][1]":
+    *  
+    * COLLECT 'child' 'name' 'node' foo    -- op (we are here)
+    *   ROOT                               -- op->ch1
+    *   PREDICATE                          -- op->ch2 (predOp)
+    *     PREDICATE                          -- predOp->ch1 = [parent::bar]
+    *       SORT
+    *         COLLECT  'parent' 'name' 'node' bar
+    *           NODE
+    *     ELEM Object is a number : 1        -- predOp->ch2 = [1]
+    *
+    */
+    maxPos = 0;
+    predOp = NULL;
+    hasPredicateRange = 0;
+    hasAxisRange = 0;
+    if (op->ch2 != -1) {
+	/*
+	* There's at least one predicate. 16 == XPATH_OP_PREDICATE
+	*/
+	predOp = &ctxt->comp->steps[op->ch2];
+	if (xmlXPathIsPositionalPredicate(ctxt, predOp, &maxPos)) {
+	    if (predOp->ch1 != -1) {
+		/*
+		* Use the next inner predicate operator.
+		*/
+		predOp = &ctxt->comp->steps[predOp->ch1];
+		hasPredicateRange = 1;
+	    } else {
+		/*
+		* There's no other predicate than the [n] predicate.
+		*/
+		predOp = NULL;
+		hasAxisRange = 1;
+	    }	    
+	}
     }
-
-#ifdef DEBUG_STEP_NTH
-    xmlGenericError(xmlGenericErrorContext,
-                    " context contains %d nodes\n", nodelist->nodeNr);
-    switch (test) {
-        case NODE_TEST_NONE:
-            xmlGenericError(xmlGenericErrorContext,
-                            "           searching for none !!!\n");
-            break;
-        case NODE_TEST_TYPE:
-            xmlGenericError(xmlGenericErrorContext,
-                            "           searching for type %d\n", type);
-            break;
-        case NODE_TEST_PI:
-            xmlGenericError(xmlGenericErrorContext,
-                            "           searching for PI !!!\n");
-            break;
-        case NODE_TEST_ALL:
-            xmlGenericError(xmlGenericErrorContext,
-                            "           searching for *\n");
-            break;
-        case NODE_TEST_NS:
-            xmlGenericError(xmlGenericErrorContext,
-                            "           searching for namespace %s\n",
-                            prefix);
-            break;
-        case NODE_TEST_NAME:
-            xmlGenericError(xmlGenericErrorContext,
-                            "           searching for name %s\n", name);
-            if (prefix != NULL)
-                xmlGenericError(xmlGenericErrorContext,
-                                "           with namespace %s\n", prefix);
-            break;
-    }
-    xmlGenericError(xmlGenericErrorContext, "Testing : ");
-#endif
+    breakOnFirstHit = ((toBool) && (predOp == NULL)) ? 1 : 0;
+    /*
+    * Axis traversal -----------------------------------------------------
+    */
     /*
      * 2.3 Node Tests
      *  - For the attribute axis, the principal node type is attribute. 
-     *  - For the namespace axis, the principal node type is namespace. 
-     *  - For other axes, the principal node type is element. 
+     *  - For the namespace axis, the principal node type is namespace.
+     *  - For other axes, the principal node type is element.
      *
      * A node test * is true for any node of the
      * principal node type. For example, child::* will
@@ -11880,25 +12081,26 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt,
      */
     oldContextNode = xpctxt->node;
     addNode = xmlXPathNodeSetAddUnique;
-    list = NULL;
-    compoundContextNode = NULL;
+    outSeq = NULL;
+    seq = NULL;
+    outerContextNode = NULL;
     contextNode = NULL;
-    inputIdx = 0;
-    list = xmlXPathNodeSetCreate(NULL);
+    contextIdx = 0;
+
 
-    while ((inputIdx < inputList->nodeNr) || (contextNode != NULL)) {
-	if (compoundNext != NULL) {
+    while ((contextIdx < contextSeq->nodeNr) || (contextNode != NULL)) {
+	if (outerNext != NULL) {
 	    /*
 	    * This is a compound traversal.
 	    */
 	    if (contextNode == NULL) {
 		/*
-		* Set the context for the initial traversal.
+		* Set the context for the outer traversal.
 		*/
-		compoundContextNode = inputList->nodeTab[inputIdx++];
-		contextNode = compoundNext(NULL, compoundContextNode);
+		outerContextNode = contextSeq->nodeTab[contextIdx++];
+		contextNode = outerNext(NULL, outerContextNode);
 	    } else
-		contextNode = compoundNext(contextNode, compoundContextNode);
+		contextNode = outerNext(contextNode, outerContextNode);
 	    if (contextNode == NULL)
 		continue;
 	    /*
@@ -11906,20 +12108,33 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt,
 	    */
 	    xpctxt->node = contextNode;
 	} else
-	    xpctxt->node = inputList->nodeTab[inputIdx++];
-
-        cur = NULL;
-        pos = 0;
+	    xpctxt->node = contextSeq->nodeTab[contextIdx++];	
+        
+	if (seq == NULL) {
+	    seq = xmlXPathNodeSetCreate(NULL);
+	    if (seq == NULL) {
+		total = 0;
+		goto error;
+	    }
+	}
+	/*
+	* Traverse the axis and test the nodes.
+	*/
+	pos = 0;
+	cur = NULL;
+	hasNsNodes = 0;
         do {
             cur = next(ctxt, cur);
             if (cur == NULL)
                 break;
 
-	    if (first != NULL) {
+	    /*
+	    * QUESTION TODO: What does the "first" and "last" stuff do?
+	    */
+            if ((first != NULL) && (*first != NULL)) {
 		if (*first == cur)
 		    break;
-		if ((*first != NULL) &&
-		    ((total % 256) == 0) &&
+		if (((total % 256) == 0) &&
 #ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON
 		    (xmlXPathCmpNodesExt(*first, cur) >= 0))
 #else
@@ -11929,11 +12144,10 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt,
 		    break;
 		}
 	    }
-	    if (last != NULL) {
+	    if ((last != NULL) && (*last != NULL)) {
 		if (*last == cur)
 		    break;
-		if ((*last != NULL) &&
-		    ((total % 256) == 0) &&
+		if (((total % 256) == 0) &&
 #ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON
 		    (xmlXPathCmpNodesExt(cur, *last) >= 0))
 #else
@@ -11945,63 +12159,79 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt,
 	    }
 
             total++;
-            switch (test) {
+
+#ifdef DEBUG_STEP
+            xmlGenericError(xmlGenericErrorContext, " %s", cur->name);
+#endif
+	    switch (test) {
                 case NODE_TEST_NONE:
 		    total = 0;
                     STRANGE
 		    goto error;
                 case NODE_TEST_TYPE:
-                    if ((cur->type == type) ||
-                        ((type == NODE_TYPE_NODE) &&
-                         ((cur->type == XML_DOCUMENT_NODE) ||
-                          (cur->type == XML_HTML_DOCUMENT_NODE) ||
-                          (cur->type == XML_ELEMENT_NODE) ||
-                          (cur->type == XML_PI_NODE) ||
-                          (cur->type == XML_COMMENT_NODE) ||
-                          (cur->type == XML_CDATA_SECTION_NODE) ||
-                          (cur->type == XML_TEXT_NODE))) ||
-			((type == NODE_TYPE_TEXT) &&
-			 (cur->type == XML_CDATA_SECTION_NODE))) {
-                        pos++;
-                        if (pos == reqpos)
-                            addNode(list, cur);
-                    }
-                    break;
+		    /*
+		    * TODO: Don't we need to use
+		    *  xmlXPathNodeSetAddNs() for namespace nodes here?
+		    *  Surprisingly, some c14n tests fail, if we do this.
+		    */
+		    if (type == NODE_TYPE_NODE) {
+			switch (cur->type) {
+			    case XML_DOCUMENT_NODE:
+			    case XML_HTML_DOCUMENT_NODE:
+#ifdef LIBXML_DOCB_ENABLED
+			    case XML_DOCB_DOCUMENT_NODE:
+#endif
+			    case XML_ELEMENT_NODE:			    
+			    case XML_ATTRIBUTE_NODE:
+			    case XML_PI_NODE:
+			    case XML_COMMENT_NODE:
+			    case XML_CDATA_SECTION_NODE:
+			    case XML_TEXT_NODE:
+			    case XML_NAMESPACE_DECL:
+				XP_TEST_HIT
+				break;
+			    default:
+				break;
+			}
+		    } else if (cur->type == type) {
+			if (type == XML_NAMESPACE_DECL)
+			    XP_TEST_HIT_NS
+			else
+			    XP_TEST_HIT
+		    } else if ((type == NODE_TYPE_TEXT) &&
+			 (cur->type == XML_CDATA_SECTION_NODE))
+		    {
+			XP_TEST_HIT
+		    }
+		    break;
                 case NODE_TEST_PI:
-                    if (cur->type == XML_PI_NODE) {
-                        if ((name != NULL) &&
-                            (!xmlStrEqual(name, cur->name)))
-                            break;
-                        pos++;
-                        if (pos == reqpos)
-                            addNode(list, cur);
+                    if ((cur->type == XML_PI_NODE) &&
+                        ((name == NULL) || xmlStrEqual(name, cur->name)))
+		    {
+			XP_TEST_HIT
                     }
                     break;
                 case NODE_TEST_ALL:
                     if (axis == AXIS_ATTRIBUTE) {
-                        if (cur->type == XML_ATTRIBUTE_NODE) {
-                            pos++;
-                            if (pos == reqpos)
-                                addNode(list, cur);
+                        if (cur->type == XML_ATTRIBUTE_NODE)
+			{
+			    XP_TEST_HIT
                         }
                     } else if (axis == AXIS_NAMESPACE) {
-                        if (cur->type == XML_NAMESPACE_DECL) {
-                            pos++;
-                            if (pos == reqpos)
-				xmlXPathNodeSetAddNs(list, xpctxt->node, 
-						     (xmlNsPtr) cur);
+                        if (cur->type == XML_NAMESPACE_DECL)
+			{
+			    XP_TEST_HIT_NS
                         }
                     } else {
                         if (cur->type == XML_ELEMENT_NODE) {
-                            if (prefix == NULL) {
-                                pos++;
-                                if (pos == reqpos)
-                                    addNode(list, cur);
+                            if (prefix == NULL)
+			    {
+				XP_TEST_HIT
+
                             } else if ((cur->ns != NULL) &&
-                                       (xmlStrEqual(URI, cur->ns->href))) {
-                                pos++;
-                                if (pos == reqpos)
-                                    addNode(list, cur);
+				(xmlStrEqual(URI, cur->ns->href)))
+			    {
+				XP_TEST_HIT
                             }
                         }
                     }
@@ -12015,19 +12245,15 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt,
                         case XML_ELEMENT_NODE:
                             if (xmlStrEqual(name, cur->name)) {
                                 if (prefix == NULL) {
-                                    if (cur->ns == NULL) {
-                                        pos++;
-                                        if (pos == reqpos)
-                                            addNode(list, cur);
+                                    if (cur->ns == NULL)
+				    {
+					XP_TEST_HIT
                                     }
                                 } else {
                                     if ((cur->ns != NULL) &&
-                                        (xmlStrEqual(URI,
-					    cur->ns->href)))
+                                        (xmlStrEqual(URI, cur->ns->href)))
 				    {
-                                        pos++;
-                                        if (pos == reqpos)
-                                            addNode(list, cur);
+					XP_TEST_HIT
                                     }
                                 }
                             }
@@ -12040,18 +12266,14 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt,
                                         if ((attr->ns == NULL) ||
                                             (attr->ns->prefix == NULL))
 					{
-                                            pos++;
-                                            if (pos == reqpos)
-                                                addNode(list, cur);
+					    XP_TEST_HIT
                                         }
                                     } else {
                                         if ((attr->ns != NULL) &&
                                             (xmlStrEqual(URI,
 					      attr->ns->href)))
 					{
-                                            pos++;
-                                            if (pos == reqpos)
-                                                addNode(list, cur);
+					    XP_TEST_HIT
                                         }
                                     }
                                 }
@@ -12062,11 +12284,9 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt,
                                 xmlNsPtr ns = (xmlNsPtr) cur;
 
                                 if ((ns->prefix != NULL) && (name != NULL)
-                                    && (xmlStrEqual(ns->prefix, name))) {
-                                    pos++;
-                                    if (pos == reqpos)
-					xmlXPathNodeSetAddNs(list,
-					   xpctxt->node, (xmlNsPtr) cur);
+                                    && (xmlStrEqual(ns->prefix, name)))
+				{
+				    XP_TEST_HIT_NS
                                 }
                             }
                             break;
@@ -12074,33 +12294,179 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt,
                             break;
                     }
                     break;
-            }
-        } while (pos < reqpos);
+	    } /* switch(test) */
+        } while (cur != NULL);
+
+	goto apply_predicates;
+
+axis_range_end: /* ----------------------------------------------------- */	
+	/*
+	* We have a "/foo[n]", and position() = n was reached.
+	* Note that we can have as well "/foo/::parent::foo[1]", so
+	* a duplicate-aware merge is still needed.
+	* Merge with the result.
+	*/
+	if (outSeq == NULL) {
+	    outSeq = seq;
+	    seq = NULL;
+	} else
+	    outSeq = mergeAndClear(outSeq, seq, 0);
+	/*
+	* Break if only a true/false result was requested.
+	*/
+	if (toBool)
+	    break;
+	continue;
+
+first_hit: /* ---------------------------------------------------------- */
+	/*
+	* Break if only a true/false result was requested and
+	* no predicates existed and a node test succeeded.
+	*/
+	if (outSeq == NULL) {
+	    outSeq = seq;
+	    seq = NULL;
+	} else
+	    outSeq = mergeAndClear(outSeq, seq, 0);
+	break;
+
+#ifdef DEBUG_STEP
+	if (seq != NULL)
+	    nbMatches += seq->nodeNr;
+#endif
+
+apply_predicates: /* --------------------------------------------------- */
+        /*
+	* Apply predicates.
+	*/	
+        if ((predOp != NULL) && (seq->nodeNr > 0)) {
+	    /*
+	    * E.g. when we have a "/foo[some expression][n]".
+	    */	    	    
+	    /*
+	    * QUESTION TODO: The old predicate evaluation took into
+	    *  account location-sets.
+	    *  (E.g. ctxt->value->type == XPATH_LOCATIONSET)
+	    *  Do we expect such a set here?
+	    *  All what I learned now from the evaluation semantics
+	    *  does not indicate that a location-set will be processed
+	    *  here, so this looks OK.
+	    */	    	    
+	    /*
+	    * Iterate over all predicates, starting with the outermost
+	    * predicate.
+	    * TODO: Problem: we cannot execute the inner predicates first
+	    *  since we cannot go back *up* the operator tree!
+	    *  Options we have:
+	    *  1) Use of recursive functions (like is it currently done
+	    *     via xmlXPathCompOpEval())
+	    *  2) Add a predicate evaluation information stack to the
+	    *     context struct
+	    *  3) Change the way the operators are linked; we need a
+	    *     "parent" field on xmlXPathStepOp
+	    *
+	    * For the moment, I'll try to solve this with a recursive
+	    * function: xmlXPathCompOpEvalPredicate().
+	    */	    
+	    size = seq->nodeNr;
+	    if (hasPredicateRange != 0)
+		newSize = xmlXPathCompOpEvalPositionalPredicate(ctxt,
+		    predOp, seq, size, maxPos, maxPos, hasNsNodes);
+	    else
+		newSize = xmlXPathCompOpEvalPredicate(ctxt,
+		    predOp, seq, size, hasNsNodes);
+
+	    if (ctxt->error != XPATH_EXPRESSION_OK) {
+		total = 0;
+		goto error;
+	    }
+	    /*
+	    * Add the filtered set of nodes to the result node set.
+	    */
+	    if (newSize == 0) {
+		/*
+		* The predicates filtered all nodes out.
+		*/
+		xmlXPathNodeSetClear(seq, hasNsNodes);
+	    } else if (seq->nodeNr > 0) {
+		/*
+		* Add to result set.
+		*/
+		if (outSeq == NULL) {
+		    if (size != newSize) {
+			/*
+			* We need to merge and clear here, since
+			* the sequence will contained NULLed entries.
+			*/
+			outSeq = mergeAndClear(NULL, seq, 1);
+		    } else {
+			outSeq = seq;
+			seq = NULL;
+		    }
+		} else
+		    outSeq = mergeAndClear(outSeq, seq,
+			(size != newSize) ? 1: 0);
+		/*
+		* Break if only a true/false result was requested.
+		*/
+		if (toBool)
+		    break;
+	    }
+        } else if (seq->nodeNr > 0) {
+	    /*
+	    * Add to result set.
+	    */
+	    if (outSeq == NULL) {
+		outSeq = seq;
+		seq = NULL;
+	    } else {
+		outSeq = mergeAndClear(outSeq, seq, 0);
+	    }
+	}	
     }
-    xpctxt->node = oldContextNode;
-
-#ifdef DEBUG_STEP_NTH
-    xmlGenericError(xmlGenericErrorContext,
-                    "\nExamined %d nodes, found %d nodes at that step\n",
-                    total, list->nodeNr);
-#endif
-
-    valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, list));
 
+error:
     if ((obj->boolval) && (obj->user != NULL)) {
+	/*
+	* QUESTION TODO: What does this do and why?
+	* TODO: Do we have to do this also for the "error"
+	* cleanup further down?
+	*/
 	ctxt->value->boolval = 1;
 	ctxt->value->user = obj->user;
 	obj->user = NULL;
 	obj->boolval = 0;
     }
     xmlXPathReleaseObject(xpctxt, obj);
-    return(total);
 
-error:
+    /*
+    * Ensure we return at least an emtpy set.
+    */
+    if (outSeq == NULL) {
+	if ((seq != NULL) && (seq->nodeNr == 0))
+	    outSeq = seq;
+	else
+	    outSeq = xmlXPathNodeSetCreate(NULL);
+    }
+    if ((seq != NULL) && (seq != outSeq)) {
+	 xmlXPathFreeNodeSet(seq);
+    }    
+    /*
+    * Hand over the result. Better to push the set also in
+    * case of errors.
+    */
+    valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, outSeq));
+    /*
+    * Reset the context node.
+    */
     xpctxt->node = oldContextNode;
-    xmlXPathReleaseObject(xpctxt, obj);
-    if (list != NULL)
-	 xmlXPathFreeNodeSet(list);
+
+#ifdef DEBUG_STEP
+    xmlGenericError(xmlGenericErrorContext,
+	"\nExamined %d nodes, found %d nodes at that step\n",
+	total, nbMatches);
+#endif
+
     return(total);
 }
 
@@ -12202,29 +12568,7 @@ xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt,
                 total = xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
 		CHECK_ERROR0;
 
-                /*
-                 * Optimization for [n] selection where n is a number
-                 */
-                if ((op->ch2 != -1) &&
-                    (comp->steps[op->ch2].op == XPATH_OP_PREDICATE) &&
-                    (comp->steps[op->ch2].ch1 == -1) &&
-                    (comp->steps[op->ch2].ch2 != -1) &&
-                    (comp->steps[comp->steps[op->ch2].ch2].op ==
-                     XPATH_OP_VALUE)) {
-                    xmlXPathObjectPtr val;
-
-                    val = comp->steps[comp->steps[op->ch2].ch2].value4;
-                    if ((val != NULL) && (val->type == XPATH_NUMBER)) {
-                        int indx = (int) val->floatval;
-
-                        if (val->floatval == (float) indx) {
-                            xmlXPathNodeCollectAndTestNth(ctxt, op, indx,
-                                                          first, NULL);
-                            return (total);
-                        }
-                    }
-                }
-                total += xmlXPathNodeCollectAndTest(ctxt, op, first, NULL);
+                total += xmlXPathNodeCollectAndTest(ctxt, op, first, NULL, 0);
                 return (total);
             }
         case XPATH_OP_VALUE:
@@ -12359,31 +12703,7 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op,
                 total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
 		CHECK_ERROR0;
 
-                /*
-                 * Optimization for [n] selection where n is a number
-                 */
-                if ((op->ch2 != -1) &&
-                    (comp->steps[op->ch2].op == XPATH_OP_PREDICATE) &&
-                    (comp->steps[op->ch2].ch1 == -1) &&
-                    (comp->steps[op->ch2].ch2 != -1) &&
-                    (comp->steps[comp->steps[op->ch2].ch2].op ==
-                     XPATH_OP_VALUE)) {
-                    xmlXPathObjectPtr val;
-
-                    val = comp->steps[comp->steps[op->ch2].ch2].value4;
-                    if ((val != NULL) && (val->type == XPATH_NUMBER)) {
-                        int indx = (int) val->floatval;
-
-                        if (val->floatval == (float) indx) {
-                            total +=
-                                xmlXPathNodeCollectAndTestNth(ctxt, op,
-                                                              indx, NULL,
-                                                              last);
-                            return (total);
-                        }
-                    }
-                }
-                total += xmlXPathNodeCollectAndTest(ctxt, op, NULL, last);
+                total += xmlXPathNodeCollectAndTest(ctxt, op, NULL, last, 0);
                 return (total);
             }
         case XPATH_OP_VALUE:
@@ -12551,7 +12871,7 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
 	    }
 	    if (ctxt->value == tmp) {
 		valuePop(ctxt);
-		xmlXPathNodeSetClear(tmp->nodesetval);		
+		xmlXPathNodeSetClear(tmp->nodesetval, 1);		
 		/*
 		* REVISIT TODO: Don't create a temporary nodeset
 		* for everly iteration.
@@ -12670,7 +12990,7 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
 		* in order to avoid massive recreation inside this
 		* loop.
 		*/
-		xmlXPathNodeSetClear(tmp->nodesetval);
+		xmlXPathNodeSetClear(tmp->nodesetval, 1);
 	    } else
 		tmp = NULL;
 	    ctxt->context->node = NULL;
@@ -12917,32 +13237,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
 
                 total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
 		CHECK_ERROR0;
-		
-		if ((op->ch2 != -1) &&
-                    (comp->steps[op->ch2].op == XPATH_OP_PREDICATE) &&
-                    (comp->steps[op->ch2].ch1 == -1) &&
-                    (comp->steps[op->ch2].ch2 != -1) &&
-                    (comp->steps[comp->steps[op->ch2].ch2].op ==
-                     XPATH_OP_VALUE))
-		{
-                    xmlXPathObjectPtr val;
-		    /*
-		    * Optimization for [n] selection where n is a number
-		    */
-                    val = comp->steps[comp->steps[op->ch2].ch2].value4;
-                    if ((val != NULL) && (val->type == XPATH_NUMBER)) {
-                        int indx = (int) val->floatval;
 
-                        if (val->floatval == (float) indx) {
-                            total +=
-                                xmlXPathNodeCollectAndTestNth(ctxt, op,
-                                                              indx, NULL,
-                                                              NULL);
-                            return (total);
-                        }
-                    }
-                }
-                total += xmlXPathNodeCollectAndTest(ctxt, op, NULL, NULL);
+                total += xmlXPathNodeCollectAndTest(ctxt, op, NULL, NULL, 0);
                 return (total);
             }
         case XPATH_OP_VALUE:
@@ -13391,7 +13687,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
 			}
                         if (ctxt->value == tmp) {
                             valuePop(ctxt);
-			    xmlXPathNodeSetClear(tmp->nodesetval);			    
+			    xmlXPathNodeSetClear(tmp->nodesetval, 1);			    
 			    /*
 			    * Don't free the temporary nodeset
 			    * in order to avoid massive recreation inside this
@@ -13599,6 +13895,95 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
     return (total);
 }
 
+/**
+ * xmlXPathCompOpEvalToBoolean:
+ * @ctxt:  the XPath parser context
+ *
+ * Evaluates if the expression evaluates to true.
+ *
+ * Returns 1 if true, 0 if false and -1 on API or internal errors.
+ */
+static int
+xmlXPathCompOpEvalToBoolean(xmlXPathParserContextPtr ctxt,
+			    xmlXPathStepOpPtr op,
+			    int isPredicate)
+{
+    xmlXPathObjectPtr resObj = NULL;
+
+start:
+    /* comp = ctxt->comp; */
+    switch (op->op) {
+        case XPATH_OP_END:
+            return (0);
+	case XPATH_OP_VALUE:
+	    resObj = (xmlXPathObjectPtr) op->value4;
+	    if (isPredicate)
+		return(xmlXPathEvaluatePredicateResult(ctxt, resObj));
+	    return(xmlXPathCastToBoolean(resObj));
+	case XPATH_OP_SORT:
+	    /*
+	    * We don't need sorting for boolean results. Skip this one.
+	    */
+            if (op->ch1 != -1) {
+		op = &ctxt->comp->steps[op->ch1];
+		goto start;
+	    }
+	    return(0);
+	case XPATH_OP_COLLECT:
+	    if (op->ch1 == -1)
+		return(0);
+
+            xmlXPathCompOpEval(ctxt, &ctxt->comp->steps[op->ch1]);
+	    if (ctxt->error != XPATH_EXPRESSION_OK)
+		return(-1);
+
+            xmlXPathNodeCollectAndTest(ctxt, op, NULL, NULL, 1);
+	    if (ctxt->error != XPATH_EXPRESSION_OK)
+		return(-1);
+
+	    resObj = valuePop(ctxt);
+	    if (resObj == NULL)
+		return(-1);
+	    break;
+	default:
+	    /*
+	    * Fallback to call xmlXPathCompOpEval().
+	    */
+	    xmlXPathCompOpEval(ctxt, op);
+	    if (ctxt->error != XPATH_EXPRESSION_OK)
+		return(-1);
+	    
+	    resObj = valuePop(ctxt);
+	    if (resObj == NULL)
+		return(-1);
+	    break;
+    }
+
+    if (resObj) {
+	int res;
+
+	if (resObj->type == XPATH_BOOLEAN) {
+	    res = resObj->boolval;
+	} else if (isPredicate) {
+	    /*
+	    * For predicates a result of type "number" is handled
+	    * differently:
+	    * SPEC XPath 1.0:
+	    * "If the result is a number, the result will be converted
+	    *  to true if the number is equal to the context position
+	    *  and will be converted to false otherwise;"
+	    */
+	    res = xmlXPathEvaluatePredicateResult(ctxt, resObj); 
+	} else {
+	    res = xmlXPathCastToBoolean(resObj);
+	}
+	xmlXPathReleaseObject(ctxt->context, resObj);
+	return(res);
+    }
+
+    return(0);
+}
+
 #ifdef XPATH_STREAMING
 /**
  * xmlXPathRunStreamEval:
@@ -13606,53 +13991,63 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
  *
  * Evaluate the Precompiled Streamable XPath expression in the given context.
  */
-static xmlXPathObjectPtr
-xmlXPathRunStreamEval(xmlXPathContextPtr ctxt, xmlPatternPtr comp) {
+static int
+xmlXPathRunStreamEval(xmlXPathContextPtr ctxt, xmlPatternPtr comp,
+		      xmlXPathObjectPtr *resultSeq, int toBool)
+{
     int max_depth, min_depth;
     int from_root;    
     int ret, depth;
-#ifdef XP_PATTERN_TO_ANY_NODE_ENABLED
     int eval_all_nodes;
-#endif
     xmlNodePtr cur = NULL, limit = NULL;
-    xmlXPathObjectPtr retval;
-    xmlStreamCtxtPtr patstream;
+    xmlStreamCtxtPtr patstream = NULL;
     
     int nb_nodes = 0;    
 
     if ((ctxt == NULL) || (comp == NULL))
-        return(NULL);
+        return(-1);
     max_depth = xmlPatternMaxDepth(comp);
     if (max_depth == -1)
-        return(NULL);
+        return(-1);
     if (max_depth == -2)
         max_depth = 10000;
     min_depth = xmlPatternMinDepth(comp);
     if (min_depth == -1)
-        return(NULL);
+        return(-1);
     from_root = xmlPatternFromRoot(comp);
     if (from_root < 0)
-        return(NULL);
+        return(-1);
 #if 0
     printf("stream eval: depth %d from root %d\n", max_depth, from_root);
 #endif
 
-    retval = xmlXPathCacheNewNodeSet(ctxt, NULL);
-    if (retval == NULL)
-        return(NULL);
+    if (! toBool) {
+	if (resultSeq == NULL)
+	    return(-1);
+	*resultSeq = xmlXPathCacheNewNodeSet(ctxt, NULL);
+	if (*resultSeq == NULL)
+	    return(-1);
+    }
     
     /*
-     * handle the special cases of / amd . being matched
+     * handle the special cases of "/" amd "." being matched
      */
     if (min_depth == 0) {
 	if (from_root) {
-	    xmlXPathNodeSetAddUnique(retval->nodesetval, (xmlNodePtr) ctxt->doc);
+	    /* Select "/" */
+	    if (toBool)
+		return(1);
+	    xmlXPathNodeSetAddUnique((*resultSeq)->nodesetval,
+		(xmlNodePtr) ctxt->doc);
 	} else {
-	    xmlXPathNodeSetAddUnique(retval->nodesetval, ctxt->node);
+	    /* Select "self::node()" */
+	    if (toBool)
+		return(1);
+	    xmlXPathNodeSetAddUnique((*resultSeq)->nodesetval, ctxt->node);
 	}
     }
     if (max_depth == 0) {
-	return(retval);
+	return(0);
     }
 
     if (from_root) {
@@ -13688,23 +14083,27 @@ xmlXPathRunStreamEval(xmlXPathContextPtr ctxt, xmlPatternPtr comp) {
 	}
 	limit = cur;
     }
-    if (cur == NULL)
-        return(retval);
+    if (cur == NULL) {
+        return(0);
+    }
 
     patstream = xmlPatternGetStreamCtxt(comp);
     if (patstream == NULL) {
-        return(retval);
+	/*
+	* QUESTION TODO: Is this an error?
+	*/
+	return(0);
     }
 
-#ifdef XP_PATTERN_TO_ANY_NODE_ENABLED
     eval_all_nodes = xmlStreamWantsAnyNode(patstream);
-#endif
 
     if (from_root) {
 	ret = xmlStreamPush(patstream, NULL, NULL);
 	if (ret < 0) {
 	} else if (ret == 1) {
-	    xmlXPathNodeSetAddUnique(retval->nodesetval, cur);
+	    if (toBool)
+		goto return_1;
+	    xmlXPathNodeSetAddUnique((*resultSeq)->nodesetval, cur);
 	}
     }
     depth = 0;
@@ -13715,27 +14114,24 @@ next_node:
 
 	switch (cur->type) {
 	    case XML_ELEMENT_NODE:
-#ifdef XP_PATTERN_TO_ANY_NODE_ENABLED
 	    case XML_TEXT_NODE:
 	    case XML_CDATA_SECTION_NODE:
 	    case XML_COMMENT_NODE:
-	    case XML_PI_NODE:		
-#endif	    
+	    case XML_PI_NODE:
 		if (cur->type == XML_ELEMENT_NODE) {
 		    ret = xmlStreamPush(patstream, cur->name,
 				(cur->ns ? cur->ns->href : NULL));
-		}
-#ifdef XP_PATTERN_TO_ANY_NODE_ENABLED
-		else if (eval_all_nodes)		    
+		} else if (eval_all_nodes)
 		    ret = xmlStreamPushNode(patstream, NULL, NULL, cur->type);
 		else
 		    break;
-#endif
 		
 		if (ret < 0) {
 		    /* NOP. */
 		} else if (ret == 1) {
-		    xmlXPathNodeSetAddUnique(retval->nodesetval, cur);
+		    if (toBool)
+			goto return_1;
+		    xmlXPathNodeSetAddUnique((*resultSeq)->nodesetval, cur);
 		}
 		if ((cur->children == NULL) || (depth >= max_depth)) {
 		    ret = xmlStreamPop(patstream);
@@ -13748,8 +14144,8 @@ next_node:
 		}
 	    default:
 		break;
-	}	    	
-        
+	}
+
 scan_children:
 	if ((cur->children != NULL) && (depth < max_depth)) {
 	    /*
@@ -13783,9 +14179,7 @@ scan_children:
 	        goto done;
 	    if (cur->type == XML_ELEMENT_NODE) {
 		ret = xmlStreamPop(patstream);
-	    }
-#ifdef XP_PATTERN_TO_ANY_NODE_ENABLED
-	    else if ((eval_all_nodes) &&
+	    } else if ((eval_all_nodes) &&
 		((cur->type == XML_TEXT_NODE) ||
 		 (cur->type == XML_CDATA_SECTION_NODE) ||
 		 (cur->type == XML_COMMENT_NODE) ||
@@ -13793,7 +14187,6 @@ scan_children:
 	    {
 		ret = xmlStreamPop(patstream);
 	    }
-#endif
 	    if (cur->next != NULL) {
 		cur = cur->next;
 		break;
@@ -13801,28 +14194,39 @@ scan_children:
 	} while (cur != NULL);
 
     } while ((cur != NULL) && (depth >= 0));
+
 done:
+
 #if 0
     printf("stream eval: checked %d nodes selected %d\n",
-           nb_nodes, retval->nodesetval->nodeNr);
+           nb_nodes, retObj->nodesetval->nodeNr);
 #endif
-    xmlFreeStreamCtxt(patstream);
-    return(retval);
+
+    if (patstream)
+	xmlFreeStreamCtxt(patstream);
+    return(0);
+
+return_1:
+    if (patstream)
+	xmlFreeStreamCtxt(patstream);
+    return(1);
 }
 #endif /* XPATH_STREAMING */
 
 /**
  * xmlXPathRunEval:
  * @ctxt:  the XPath parser context with the compiled expression
+ * @toBool:  evaluate to a boolean result
  *
  * Evaluate the Precompiled XPath expression in the given context.
  */
-static void
-xmlXPathRunEval(xmlXPathParserContextPtr ctxt) {
+static int
+xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool)
+{
     xmlXPathCompExprPtr comp;
 
     if ((ctxt == NULL) || (ctxt->comp == NULL))
-	return;
+	return(-1);
 
     if (ctxt->valueTab == NULL) {
 	/* Allocate the value stack */
@@ -13838,21 +14242,51 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt) {
     }
 #ifdef XPATH_STREAMING
     if (ctxt->comp->stream) {
-        xmlXPathObjectPtr ret;
-        ret = xmlXPathRunStreamEval(ctxt->context, ctxt->comp->stream);
-	if (ret != NULL) {
-	    valuePush(ctxt, ret);
-	    return;
+	int res;
+
+	if (toBool) {
+	    /*
+	    * Evaluation to boolean result.
+	    */
+	    res = xmlXPathRunStreamEval(ctxt->context,
+		ctxt->comp->stream, NULL, 1);
+	    if (res != -1)
+		return(res);
+	} else {
+	    xmlXPathObjectPtr resObj = NULL;	
+
+	    /*
+	    * Evaluation to a sequence.
+	    */
+	    res = xmlXPathRunStreamEval(ctxt->context,
+		ctxt->comp->stream, &resObj, 0);
+
+	    if ((res != -1) && (resObj != NULL)) {
+		valuePush(ctxt, resObj);
+		return(0);
+	    }
+	    if (resObj != NULL)
+		xmlXPathReleaseObject(ctxt->context, resObj);	
 	}
+	/*
+	* QUESTION TODO: This falls back to normal XPath evaluation
+	* if res == -1. Is this intended?
+	*/
     }
 #endif
     comp = ctxt->comp;
-    if(comp->last < 0) {
+    if (comp->last < 0) {
 	xmlGenericError(xmlGenericErrorContext,
 	    "xmlXPathRunEval: last is less than zero\n");
-	return;
+	return(-1);
     }
-    xmlXPathCompOpEval(ctxt, &comp->steps[comp->last]);
+    if (toBool)
+	return(xmlXPathCompOpEvalToBoolean(ctxt,
+	    &comp->steps[comp->last], 0));
+    else
+	xmlXPathCompOpEval(ctxt, &comp->steps[comp->last]);
+
+    return(0);
 }
 
 /************************************************************************
@@ -13935,8 +14369,7 @@ xmlXPathEvaluatePredicateResult(xmlXPathParserContextPtr ctxt,
 		return(0);
 	    return(res->nodesetval->nodeNr != 0);
         case XPATH_STRING:
-	    return((res->stringval != NULL) &&
-	           (xmlStrlen(res->stringval) != 0));
+	    return((res->stringval != NULL) && (res->stringval[0] != 0));
 #ifdef LIBXML_XPTR_ENABLED
 	case XPATH_LOCATIONSET:{
 	    xmlLocationSetPtr ptr = res->user;
@@ -14058,7 +14491,7 @@ xmlXPathRewriteDOSExpression(xmlXPathCompExprPtr comp, xmlXPathStepOpPtr op)
 	    ((xmlXPathTypeVal) op->value3 == NODE_TYPE_NODE /* 0 */))
 	{
 	    /*
-	    * This is an "foo"
+	    * This is a "child::foo"
 	    */
 	    xmlXPathStepOpPtr prevop = &comp->steps[op->ch1];	    
 
@@ -14072,7 +14505,7 @@ xmlXPathRewriteDOSExpression(xmlXPathCompExprPtr comp, xmlXPathStepOpPtr op)
 		(comp->steps[prevop->ch1].op == XPATH_OP_ROOT))
 	    {		
 		/*
-		* This is a "descendant-or-self::node()" without predicates.
+		* This is a "/descendant-or-self::node()" without predicates.
 		* Eliminate it.
 		*/
 		op->ch1 = prevop->ch1;
@@ -14132,17 +14565,20 @@ xmlXPathCtxtCompile(xmlXPathContextPtr ctxt, const xmlChar *str) {
 	pctxt->comp = NULL;
     }
     xmlXPathFreeParserContext(pctxt);
+
     if (comp != NULL) {
 	comp->expr = xmlStrdup(str);
 #ifdef DEBUG_EVAL_COUNTS
 	comp->string = xmlStrdup(str);
 	comp->nb = 0;
-#endif    
-	if ((comp->nbStep > 2) &&
+#endif  
+	if ((comp->expr != NULL) &&
+	    (comp->nbStep > 2) &&
+	    (comp->last >= 0) &&
 	    (xmlXPathCanRewriteDosExpression(comp->expr) == 1))
 	{
 	    xmlXPathRewriteDOSExpression(comp, &comp->steps[comp->last]);
-	}
+	}
     }
     return(comp);
 }
@@ -14162,28 +14598,34 @@ xmlXPathCompile(const xmlChar *str) {
 }
 
 /**
- * xmlXPathCompiledEval:
+ * xmlXPathCompiledEvalInternal:
  * @comp:  the compiled XPath expression
- * @ctx:  the XPath context
+ * @ctxt:  the XPath context
+ * @resObj: the resulting XPath object or NULL
+ * @toBool: 1 if only a boolean result is requested
  *
  * Evaluate the Precompiled XPath expression in the given context.
+ * The caller has to free @resObj.
  *
  * Returns the xmlXPathObjectPtr resulting from the evaluation or NULL.
  *         the caller has to free the object.
  */
-xmlXPathObjectPtr
-xmlXPathCompiledEval(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctx) {
-    xmlXPathParserContextPtr ctxt;
-    xmlXPathObjectPtr res, tmp, init = NULL;
-    int stack = 0;
+static int
+xmlXPathCompiledEvalInternal(xmlXPathCompExprPtr comp,
+			     xmlXPathContextPtr ctxt,
+			     xmlXPathObjectPtr *resObj,
+			     int toBool)
+{
+    xmlXPathParserContextPtr pctxt;    
 #ifndef LIBXML_THREAD_ENABLED
     static int reentance = 0;
 #endif
+    int res;
 
-    CHECK_CTXT(ctx)
+    CHECK_CTXT_NEG(ctxt)
 
     if (comp == NULL)
-	return(NULL);
+	return(-1);
     xmlXPathInit();
 
 #ifndef LIBXML_THREAD_ENABLED
@@ -14199,43 +14641,93 @@ xmlXPathCompiledEval(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctx) {
 	comp->nb = 0;
     }
 #endif
-    ctxt = xmlXPathCompParserContext(comp, ctx);
-    xmlXPathRunEval(ctxt);
+    pctxt = xmlXPathCompParserContext(comp, ctxt);
+    res = xmlXPathRunEval(pctxt, toBool);
 
-    if (ctxt->value == NULL) {
-	xmlGenericError(xmlGenericErrorContext,
+    if (resObj) {
+	if (pctxt->value == NULL) {	    
+	    xmlGenericError(xmlGenericErrorContext,
 		"xmlXPathCompiledEval: evaluation failed\n");
-	res = NULL;
-    } else {
-	res = valuePop(ctxt);
+	    *resObj = NULL;	    
+	} else {
+	    *resObj = valuePop(pctxt);
+	}
     }
-
     
-    do {
-        tmp = valuePop(ctxt);
-	if (tmp != NULL) {
-	    if (tmp != init)
-		stack++; 
-	    xmlXPathReleaseObject(ctx, tmp);
-        }
-    } while (tmp != NULL);
-    if ((stack != 0) && (res != NULL)) {
-	xmlGenericError(xmlGenericErrorContext,
-		"xmlXPathCompiledEval: %d object left on the stack\n",
-	        stack);
+    /*
+    * Pop all remaining objects from the stack.
+    */
+    if (pctxt->valueNr > 0) {
+	xmlXPathObjectPtr tmp;
+	int stack = 0;
+
+	do {
+	    tmp = valuePop(pctxt);
+	    if (tmp != NULL) {
+		if (tmp != NULL)
+		    stack++; 
+		xmlXPathReleaseObject(ctxt, tmp);
+	    }
+	} while (tmp != NULL);
+	if ((stack != 0) &&
+	    ((toBool) || ((resObj) && (*resObj))))
+	{
+	    xmlGenericError(xmlGenericErrorContext,
+		"xmlXPathCompiledEval: %d objects left on the stack.\n",
+		stack);
+	}
     }
-    if (ctxt->error != XPATH_EXPRESSION_OK) {
-	xmlXPathFreeObject(res);
-	res = NULL;
+    
+    if ((pctxt->error != XPATH_EXPRESSION_OK) && (resObj) && (*resObj)) {
+	xmlXPathFreeObject(*resObj);
+	*resObj = NULL;
     }        
-    ctxt->comp = NULL;
-    xmlXPathFreeParserContext(ctxt);
+    pctxt->comp = NULL;
+    xmlXPathFreeParserContext(pctxt);
 #ifndef LIBXML_THREAD_ENABLED
     reentance--;
 #endif
+
+    return(res);
+}
+
+/**
+ * xmlXPathCompiledEval:
+ * @comp:  the compiled XPath expression
+ * @ctx:  the XPath context
+ *
+ * Evaluate the Precompiled XPath expression in the given context.
+ *
+ * Returns the xmlXPathObjectPtr resulting from the evaluation or NULL.
+ *         the caller has to free the object.
+ */
+xmlXPathObjectPtr
+xmlXPathCompiledEval(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctx)
+{
+    xmlXPathObjectPtr res = NULL;
+
+    xmlXPathCompiledEvalInternal(comp, ctx, &res, 0);
     return(res);
 }
 
+/**
+ * xmlXPathCompiledEvalToBoolean:
+ * @comp:  the compiled XPath expression
+ * @ctxt:  the XPath context
+ *
+ * Applies the XPath boolean() function on the result of the given
+ * compiled expression.
+ *
+ * Returns 1 if the expression evaluated to true, 0 if to false and
+ *         -1 in API and internal errors.
+ */
+int
+xmlXPathCompiledEvalToBoolean(xmlXPathCompExprPtr comp,
+			      xmlXPathContextPtr ctxt)
+{
+    return(xmlXPathCompiledEvalInternal(comp, ctxt, NULL, 1));
+}
+
 /**
  * xmlXPathEvalExpr:
  * @ctxt:  the XPath Parser context
@@ -14263,16 +14755,22 @@ xmlXPathEvalExpr(xmlXPathParserContextPtr ctxt) {
 #endif
     {
 	xmlXPathCompileExpr(ctxt, 1);
-	if ((ctxt->comp != NULL) &&
+	/*
+	* In this scenario the expression string will sit in ctxt->base.
+	*/
+	if ((ctxt->error == XPATH_EXPRESSION_OK) &&
+	    (ctxt->comp != NULL) &&
+	    (ctxt->base != NULL) &&
 	    (ctxt->comp->nbStep > 2) &&
-	    (xmlXPathCanRewriteDosExpression(ctxt->comp->expr) == 1))
+	    (ctxt->comp->last >= 0) &&
+	    (xmlXPathCanRewriteDosExpression((xmlChar *) ctxt->base) == 1))
 	{
 	    xmlXPathRewriteDOSExpression(ctxt->comp,
-		&ctxt->comp->steps[comp->last]);
+		&ctxt->comp->steps[ctxt->comp->last]);
 	}
     }
     CHECK_ERROR;
-    xmlXPathRunEval(ctxt);    
+    xmlXPathRunEval(ctxt, 0);    
 }
 
 /**
@@ -14358,7 +14856,7 @@ xmlXPathEvalExpression(const xmlChar *str, xmlXPathContextPtr ctxt) {
     pctxt = xmlXPathNewParserContext(str, ctxt);
     xmlXPathEvalExpr(pctxt);
 
-    if (*pctxt->cur != 0) {
+    if ((*pctxt->cur != 0) || (pctxt->error != XPATH_EXPRESSION_OK)) {
 	xmlXPatherror(pctxt, __FILE__, __LINE__, XPATH_EXPR_ERROR);
 	res = NULL;
     } else {
diff --git a/xstc/Makefile.am b/xstc/Makefile.am
index 8b1d1f0..57e1a4a 100644
--- a/xstc/Makefile.am
+++ b/xstc/Makefile.am
@@ -33,20 +33,24 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Metadata/$(MSTTESTDEF) Tests/M
 	   mkdir Tests ; \
 	   fi)
 	-@(if [ ! -f $(TARBALL_2) ] ; then \
+	   if [ -f $(srcdir)/$(TARBALL_2) ] ; then \
+	   $(LN_S) $(srcdir)/$(TARBALL_2) $(TARBALL_2) ; else \
 	   echo "Missing the test suite description (2004-01-14), trying to fetch it" ;\
-	   if [ -x /usr/bin/wget ] ; then \
-	   wget $(TARBALLURL_2) ; \
-	   else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi)
+	   if [ -x "$(WGET)" ] ; then \
+	   $(WGET) $(TARBALLURL_2) ; \
+	   else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi)
 	-@(if [ -f $(TARBALL_2) ] ; then \
 	   echo -n "extracting test data (NIST)..." ; \
 	   $(TAR) -xzf $(TARBALL_2) '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \
 	   echo "done" ; \
 	   fi)
 	-@(if [ ! -f $(TARBALL) ] ; then \
+	   if [ -f $(srcdir)/$(TARBALL) ] ; then \
+	   $(LN_S) $(srcdir)/$(TARBALL) $(TARBALL) ; else \
 	   echo "Missing the test suite description (2002-01-16), trying to fetch it" ;\
-	   if [ -x /usr/bin/wget ] ; then \
-	   wget $(TARBALLURL) ; \
-	   else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi)
+	   if [ -x "$(WGET)" ] ; then \
+	   $(WGET) $(TARBALLURL) ; \
+	   else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi)
 	-@(if [ -f $(TARBALL) ] ; then \
 	   echo -n "extracting test data (Sun, Microsoft)..." ; \
 	   $(TAR) -C Tests -xzf $(TARBALL) '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
@@ -92,21 +96,21 @@ sun-test.py: Tests/Metadata/$(SUNTESTDEF) xstc-to-python.xsl
 pytests: $(PYSCRIPTS) $(TESTDIRS)
 	-@(if [ -x nist-test.py -a -d $(TESTDIR)/Datatypes ] ; then 		\
 	   echo "## Running XML Schema tests (NIST)";			\
-	   PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\
+	   PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\
 	   export PYTHONPATH;						\
 	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ;	\
 	   export LD_LIBRARY_PATH;					\
 	   $(CHECKER) $(PYTHON) nist-test.py -s -b $(srcdir) ; fi)
 	-@(if [ -x sun-test.py -a -d $(TESTDIR)/suntest ] ; then 			\
 	   echo "## Running Schema tests (Sun)";				\
-	   PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\
+	   PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\
 	   export PYTHONPATH;						\
 	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ;	\
 	   export LD_LIBRARY_PATH;					\
 	   $(CHECKER) $(PYTHON) sun-test.py -s -b $(srcdir) ; fi)
 	-@(if [ -x ms-test.py -a -d $(TESTDIR)/msxsdtest ] ; then 			\
 	   echo "## Running Schema tests (Microsoft)";			\
-	   PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\
+	   PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\
 	   export PYTHONPATH;						\
 	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ;	\
 	   export LD_LIBRARY_PATH;					\
diff --git a/xstc/Makefile.in b/xstc/Makefile.in
index ad49db7..f889d3f 100644
--- a/xstc/Makefile.in
+++ b/xstc/Makefile.in
@@ -136,6 +136,7 @@ RDL_LIBS = @RDL_LIBS@
 READER_TEST = @READER_TEST@
 RELDATE = @RELDATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STATIC_BINARIES = @STATIC_BINARIES@
@@ -164,6 +165,7 @@ THREAD_CFLAGS = @THREAD_CFLAGS@
 THREAD_LIBS = @THREAD_LIBS@
 U = @U@
 VERSION = @VERSION@
+WGET = @WGET@
 WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@
 WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@
 WITH_C14N = @WITH_C14N@
@@ -199,6 +201,7 @@ WITH_WRITER = @WITH_WRITER@
 WITH_XINCLUDE = @WITH_XINCLUDE@
 WITH_XPATH = @WITH_XPATH@
 WITH_XPTR = @WITH_XPTR@
+WITH_ZLIB = @WITH_ZLIB@
 XINCLUDE_OBJ = @XINCLUDE_OBJ@
 XMLLINT = @XMLLINT@
 XML_CFLAGS = @XML_CFLAGS@
@@ -450,20 +453,24 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Metadata/$(MSTTESTDEF) Tests/M
 	   mkdir Tests ; \
 	   fi)
 	-@(if [ ! -f $(TARBALL_2) ] ; then \
+	   if [ -f $(srcdir)/$(TARBALL_2) ] ; then \
+	   $(LN_S) $(srcdir)/$(TARBALL_2) $(TARBALL_2) ; else \
 	   echo "Missing the test suite description (2004-01-14), trying to fetch it" ;\
-	   if [ -x /usr/bin/wget ] ; then \
-	   wget $(TARBALLURL_2) ; \
-	   else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi)
+	   if [ -x "$(WGET)" ] ; then \
+	   $(WGET) $(TARBALLURL_2) ; \
+	   else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi)
 	-@(if [ -f $(TARBALL_2) ] ; then \
 	   echo -n "extracting test data (NIST)..." ; \
 	   $(TAR) -xzf $(TARBALL_2) '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \
 	   echo "done" ; \
 	   fi)
 	-@(if [ ! -f $(TARBALL) ] ; then \
+	   if [ -f $(srcdir)/$(TARBALL) ] ; then \
+	   $(LN_S) $(srcdir)/$(TARBALL) $(TARBALL) ; else \
 	   echo "Missing the test suite description (2002-01-16), trying to fetch it" ;\
-	   if [ -x /usr/bin/wget ] ; then \
-	   wget $(TARBALLURL) ; \
-	   else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi)
+	   if [ -x "$(WGET)" ] ; then \
+	   $(WGET) $(TARBALLURL) ; \
+	   else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi)
 	-@(if [ -f $(TARBALL) ] ; then \
 	   echo -n "extracting test data (Sun, Microsoft)..." ; \
 	   $(TAR) -C Tests -xzf $(TARBALL) '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
@@ -509,21 +516,21 @@ sun-test.py: Tests/Metadata/$(SUNTESTDEF) xstc-to-python.xsl
 pytests: $(PYSCRIPTS) $(TESTDIRS)
 	-@(if [ -x nist-test.py -a -d $(TESTDIR)/Datatypes ] ; then 		\
 	   echo "## Running XML Schema tests (NIST)";			\
-	   PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\
+	   PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\
 	   export PYTHONPATH;						\
 	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ;	\
 	   export LD_LIBRARY_PATH;					\
 	   $(CHECKER) $(PYTHON) nist-test.py -s -b $(srcdir) ; fi)
 	-@(if [ -x sun-test.py -a -d $(TESTDIR)/suntest ] ; then 			\
 	   echo "## Running Schema tests (Sun)";				\
-	   PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\
+	   PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\
 	   export PYTHONPATH;						\
 	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ;	\
 	   export LD_LIBRARY_PATH;					\
 	   $(CHECKER) $(PYTHON) sun-test.py -s -b $(srcdir) ; fi)
 	-@(if [ -x ms-test.py -a -d $(TESTDIR)/msxsdtest ] ; then 			\
 	   echo "## Running Schema tests (Microsoft)";			\
-	   PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\
+	   PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\
 	   export PYTHONPATH;						\
 	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ;	\
 	   export LD_LIBRARY_PATH;					\
-- 
cgit v1.2.3


From 58f9d16e3a77d5207d9ccc413b61e2cb45190018 Mon Sep 17 00:00:00 2001
From: Mike Hommey 
Date: Wed, 13 Jun 2007 20:47:19 +0200
Subject: Load /tmp/libxml2-2.6.29 into libxml2/branches/upstream/current.

---
 ChangeLog                        | 177 +++++++++++++++++++++++++
 HTMLparser.c                     |  23 +++-
 HTMLtree.c                       |   4 +
 Makefile.am                      |   2 +-
 Makefile.in                      |   2 +-
 NEWS                             |  26 ++++
 SAX2.c                           |  42 +++---
 catalog.c                        |  23 +++-
 configure                        |   8 +-
 configure.in                     |   8 +-
 doc/APIchunk10.html              |   3 +-
 doc/APIchunk12.html              |   2 +-
 doc/APIchunk13.html              |   1 +
 doc/APIchunk24.html              |   2 +
 doc/APIchunk26.html              |   1 -
 doc/APIchunk5.html               |   1 -
 doc/APIfiles.html                |   1 +
 doc/APIfunctions.html            |   2 +
 doc/APIsymbols.html              |   1 +
 doc/devhelp/libxml2-threads.html |  11 +-
 doc/devhelp/libxml2-uri.html     |   7 +-
 doc/devhelp/libxml2.devhelp      |   1 +
 doc/examples/Makefile.am         |   2 +-
 doc/examples/Makefile.in         |   2 +-
 doc/html/libxml-threads.html     |   5 +-
 doc/html/libxml-uri.html         |   7 +-
 doc/libxml2-api.xml              |  21 ++-
 doc/libxml2.xsa                  |  77 ++++-------
 doc/news.html                    |  25 +++-
 doc/xml.html                     |  27 ++++
 encoding.c                       |  13 +-
 include/libxml/threads.h         |   4 +
 include/libxml/uri.h             |   7 +-
 include/libxml/xmlversion.h      |  11 +-
 include/libxml/xmlversion.h.in   |   3 +-
 include/win32config.h            |   9 +-
 libxml.h                         |  17 ++-
 libxml2.spec                     |   6 +-
 list.c                           |   4 +-
 nanohttp.c                       |   9 +-
 parser.c                         |  24 +++-
 python/libxml2-py.c              |  32 +++++
 python/libxml2-python-api.xml    |  11 ++
 python/setup.py                  |   2 +-
 python/types.c                   |   3 +-
 relaxng.c                        |   3 +-
 schematron.c                     |   4 +
 testapi.c                        |   2 +-
 threads.c                        |   6 +-
 tree.c                           |   5 +-
 uri.c                            |  65 ++++++++--
 valid.c                          |  23 +++-
 win32/Makefile.msvc              |  81 +++++++++++-
 win32/configure.js               |  12 +-
 xmlIO.c                          |  13 +-
 xmlregexp.c                      |   6 +
 xmlsave.c                        |   1 -
 xmlwriter.c                      | 274 +++++++++++++++++++++++++--------------
 xpath.c                          |  50 ++++---
 xstc/Makefile.am                 |   6 +-
 xstc/Makefile.in                 |   6 +-
 61 files changed, 922 insertions(+), 304 deletions(-)

(limited to 'doc/devhelp/libxml2-uri.html')

diff --git a/ChangeLog b/ChangeLog
index b6a6855..5f5d9a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,180 @@
+Tue Jun 12 18:17:28 CEST 2007 Daniel Veillard 
+
+	* doc/* configure.in NEWS: release of libxml2 2.6.28
+	* valid.c: patch from Dagfinn I. Manns�ker for idness of name
+	  in HTML, c.f. bug #305885.
+
+Tue Jun 12 17:14:08 CEST 2007 Daniel Veillard 
+
+	* SAX2.c: fixing bug #319964, parsing of HTML attribute really
+	  should not have namespace processing.
+
+Tue Jun 12 16:42:14 CEST 2007 Daniel Veillard 
+
+	* parser.c: fixed the push mode when a big comment occurs before
+	  an internal subset, should close bug #438835
+	* test/comment6.xml result//comment6.xml*: added a special
+	  test in the regression suite
+
+Tue Jun 12 15:41:09 CEST 2007 Daniel Veillard 
+
+	* parser.c: fix bug #414846 where invalid characters in attributes
+	  would sometimes not be detected.
+	* test/errors/attr4.xml result/errors/attr4.xml*: added a specific
+	  test case to the regression tests
+
+Tue Jun 12 14:23:24 CEST 2007 Daniel Veillard 
+
+	* xstc/Makefile.am: apply patch from Ryan Hill to cope with changes
+	  in GNU tar, should fix #396751
+
+Tue Jun 12 12:03:36 CEST 2007 Daniel Veillard 
+
+	* python/types.c: try to allow compilation on old python version
+	  should fix #398125
+
+Tue Jun 12 11:48:15 CEST 2007 Daniel Veillard 
+
+	* HTMLtree.c: htmlNodeDumpFormatOutput didn't handle XML_ATTRIBUTE_NODe
+	  fixes bug #438390
+
+Tue Jun 12 11:37:55 CEST 2007 Daniel Veillard 
+
+	* xmlIO.c: workaround misgenerated file: URIs c.f. #437385
+
+Tue Jun 12 11:22:47 CEST 2007 Daniel Veillard 
+
+	* relaxng.c: fixed bug #407436 a crash in a specific case of
+	  Relax-NG validation
+
+Tue Jun 12 11:12:50 CEST 2007 Daniel Veillard 
+
+	* catalog.c: fixed bug #383687, some case of recursion on next
+	  were not caught in the catalog code.
+
+Tue Jun 12 10:37:42 CEST 2007 Daniel Veillard 
+
+	* HTMLparser.c: fixed bug #381877, avoid reading over the end
+	  of stream when generating an UTF-8 encoding error.
+
+Tue Jun 12 10:16:48 CEST 2007 Daniel Veillard 
+
+	* parser.c: fixed bug #366161, trivially added the check in
+	  xmlCtxtReset()
+
+Fri Jun  8 21:48:21 CEST 2007 Rob Richards 
+
+	* win32/configure.js win32/Makefile.msvc: add --vcmanifest flag (yes/no) 
+	  for VC8 build support to embed manifest within files. Under MS VC, build 
+	  libxml2_a_dll.lib by default (LIBXML_STATIC_FOR_DLL flag).
+
+Fri Jun  8 21:37:46 CEST 2007 Rob Richards 
+
+	* threads.c include/libxml/threads.h: use specified calling convention 
+	  for xmlDllMain. Old SDKs (VC6) only support InterlockedCompareExchange.
+	  add xmlDllMain to header for win32 when building for static dll
+
+Fri Jun  8 10:51:28 CEST 2007 Rob Richards 
+
+	* xmlwriter.c: fixed problem with namespace declaration being 
+	  written more than once per element start tag
+
+Wed Jun  6 10:18:28 PDT 2007 William Brack 
+
+	* xpath.c: fixed problem with xmlXPathNodeSetSort;
+	  fixed problem with xmlXPathNodeTrailingSorted (both bug#413451)
+
+Wed May 30 22:05:08 PDT 2007 William Brack 
+
+	* xpath.c: fixed problem with string value for PI node
+	  (bug #442275)
+
+Mon May 28 16:14:50 CEST 2007 Daniel Veillard 
+
+	* uri.c: fix bug reported by Fran�ois Delyon
+
+Tue May 22 08:59:48 PDT 2007 William Brack 
+
+	* encoding.c: Fixed typo in xmlCharEncFirstLine pointed out
+	  by Mark Rowe (bug #440159)
+	* include/libxml/xmlversion.h.in: Added check for definition of
+	  _POSIX_C_SOURCE to avoid warnings on Apple OS/X (patch from
+	  Wendy Doyle and Mark Rowe, bug #346675)
+	* schematron.c, testapi.c, tree.c, xmlIO.c, xmlsave.c: minor
+	  changes to fix compilation warnings - no change to logic.
+
+Tue May 15 22:18:08 PDT 2007 William Brack 
+
+	* nanohttp.c: small enhancement to last fix, pointed out
+	  by Alex Cornejo
+
+Tue May 15 12:38:38 PDT 2007 William Brack 
+
+	* nanohttp.c: fixed problem on gzip streams (bug #438045)
+	* xpath.c: fixed minor spot of redundant code - no logic change.
+
+Fri May 11 22:45:18 HKT 2007 William Brack 
+
+	* xpath.c: enhanced the coding for xmlXPathCastNumberToString
+	  in order to produce the required number of significant digits
+	  (bug #437179)
+
+Thu May 10 01:52:42 CEST 2007 Daniel Veillard 
+
+	* list.c: applied patch to fix xmlListAppend() from 
+	  Georges-Andr� SILBER
+	* valid.c: also fix the place wher it was called.
+
+Wed May  2 18:47:33 CEST 2007 Daniel Veillard 
+
+	* parser.c: tried to fix an error problem on entity content failure
+	  reported by Michael Day
+
+Wed May  2 18:23:35 CEST 2007 Daniel Veillard 
+
+	* configure.in: typo patch from Bjorn Reese
+
+Wed May  2 18:12:58 CEST 2007 Daniel Veillard 
+
+	* HTMLparser.c: applied patch from Michael Day to add support for
+	  
+
+Thu Apr 26 10:58:50 CEST 2007 Daniel Veillard 
+
+	* HTMLparser.c: Jean-Daniel Dupas pointed a couple of problems
+	  in htmlCreateDocParserCtxt.
+
+Thu Apr 26 10:36:26 CEST 2007 Daniel Veillard 
+
+	* uri.c include/libxml/uri.h: patch from Richard Jones to save
+	  the query part in raw form.
+	* libxml2-python-api.xml: also added accessor for the python bindings
+
+Wed Apr 25 15:57:32 CEST 2007 Daniel Veillard 
+
+	* xstc/Makefile.am doc/examples/Makefile.am Makefile.am: applied
+	  patch from Richard Jones to for the silent flag on valgrind
+	  when doing "make valgrind"
+	* xmlregexp.c: raise a regexp error when '\' is misused to escape
+	  a standard character.
+
+Tue Apr 24 20:15:14 CEST 2007 Daniel Veillard 
+
+	* tree.c: Richard Jones reported xmlBufferAdd (buf, "", -1), fixing it
+
+Tue Apr 24 10:59:28 CEST 2007 Daniel Veillard 
+
+	* uri.c: fix xmlURIUnescapeString comments which was confusing
+
+Wed Apr 18 09:52:25 CEST 2007 Daniel Veillard 
+
+	* include/win32config.h libxml.h: new patch from Andreas Stricke to
+	  better integrate support for Windows CE
+
+Tue Apr 17 16:50:12 CEST 2007 Daniel Veillard 
+
+	* doc/* configure.in NEWS: release of libxml2 2.6.28
+
 Tue Apr 17 14:47:42 CEST 2007 Daniel Veillard 
 
 	* catalog.c libxml.h win32/wince/wincecompat.h win32/wince/wincecompat.c
diff --git a/HTMLparser.c b/HTMLparser.c
index 8f2f776..91d54c7 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -401,9 +401,13 @@ encoding_error:
     {
         char buffer[150];
 
-	snprintf(buffer, 149, "Bytes: 0x%02X 0x%02X 0x%02X 0x%02X\n",
-			ctxt->input->cur[0], ctxt->input->cur[1],
-			ctxt->input->cur[2], ctxt->input->cur[3]);
+	if (ctxt->input->end - ctxt->input->cur >= 4) {
+	    snprintf(buffer, 149, "Bytes: 0x%02X 0x%02X 0x%02X 0x%02X\n",
+			    ctxt->input->cur[0], ctxt->input->cur[1],
+			    ctxt->input->cur[2], ctxt->input->cur[3]);
+	} else {
+	    snprintf(buffer, 149, "Bytes: 0x%02X\n", ctxt->input->cur[0]);
+	}
 	htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
 		     "Input is not proper UTF-8, indicate encoding !\n",
 		     BAD_CAST buffer, NULL);
@@ -472,8 +476,8 @@ htmlSkipBlankChars(xmlParserCtxtPtr ctxt) {
 #define NB_FONTSTYLE 8
 #define PHRASE "em", "strong", "dfn", "code", "samp", "kbd", "var", "cite", "abbr", "acronym"
 #define NB_PHRASE 10
-#define SPECIAL "a", "img", "applet", "object", "font", "basefont", "br", "script", "map", "q", "sub", "sup", "span", "bdo", "iframe"
-#define NB_SPECIAL 15
+#define SPECIAL "a", "img", "applet", "embed", "object", "font", "basefont", "br", "script", "map", "q", "sub", "sup", "span", "bdo", "iframe"
+#define NB_SPECIAL 16
 #define INLINE PCDATA FONTSTYLE PHRASE SPECIAL FORMCTRL
 #define NB_INLINE NB_PCDATA + NB_FONTSTYLE + NB_PHRASE + NB_SPECIAL + NB_FORMCTRL
 #define BLOCK HEADING, LIST "pre", "p", "dl", "div", "center", "noscript", "noframes", "blockquote", "form", "isindex", "hr", "table", "fieldset", "address"
@@ -572,6 +576,7 @@ static const char* const version_attr[] = { "version", NULL } ;
 static const char* const html_content[] = { "head", "body", "frameset", NULL } ;
 static const char* const iframe_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "scrolling", "align", "height", "width", NULL } ;
 static const char* const img_attrs[] = { ATTRS, "longdesc", "name", "height", "width", "usemap", "ismap", NULL } ;
+static const char* const embed_attrs[] = { COREATTRS, "align", "alt", "border", "code", "codebase", "frameborder", "height", "hidden", "hspace", "name", "palette", "pluginspace", "pluginurl", "src", "type", "units", "vspace", "width", NULL } ;
 static const char* const input_attrs[] = { ATTRS, "type", "name", "value", "checked", "disabled", "readonly", "size", "maxlength", "src", "alt", "usemap", "ismap", "tabindex", "accesskey", "onfocus", "onblur", "onselect", "onchange", "accept", NULL } ;
 static const char* const prompt_attrs[] = { COREATTRS, I18N, "prompt", NULL } ;
 static const char* const label_attrs[] = { ATTRS, "for", "accesskey", "onfocus", "onblur", NULL } ;
@@ -706,6 +711,9 @@ html40ElementTable[] = {
 { "em",		0, 3, 0, 0, 0, 0, 1, "emphasis",
 	DECL html_inline, NULL, DECL html_attrs, NULL, NULL
 },
+{ "embed",	0, 1, 2, 0, 1, 1, 1, "generic embedded object ",
+	EMPTY, NULL, DECL embed_attrs, NULL, NULL
+},
 { "fieldset",	0, 0, 0, 0, 0, 0, 0, "form control group ",
 	DECL fieldset_contents , NULL, DECL html_attrs, NULL, NULL
 },
@@ -4391,8 +4399,7 @@ htmlCreateMemoryParserCtxt(const char *buffer, int size) {
  * Returns the new parser context or NULL
  */
 static htmlParserCtxtPtr
-htmlCreateDocParserCtxt(const xmlChar *cur,
-                        const char *encoding ATTRIBUTE_UNUSED) {
+htmlCreateDocParserCtxt(const xmlChar *cur, const char *encoding) {
     int len;
     htmlParserCtxtPtr ctxt;
 
@@ -4400,6 +4407,8 @@ htmlCreateDocParserCtxt(const xmlChar *cur,
 	return(NULL);
     len = xmlStrlen(cur);
     ctxt = htmlCreateMemoryParserCtxt((char *)cur, len);
+    if (ctxt == NULL)
+	return(NULL);
 
     if (encoding != NULL) {
 	xmlCharEncoding enc;
diff --git a/HTMLtree.c b/HTMLtree.c
index c1e5a0a..e79d118 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -780,6 +780,10 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
 	htmlDocContentDumpOutput(buf, (xmlDocPtr) cur, encoding);
 	return;
     }
+    if (cur->type == XML_ATTRIBUTE_NODE) {
+        htmlAttrDumpOutput(buf, doc, (xmlAttrPtr) cur, encoding);
+	return;
+    }
     if (cur->type == HTML_TEXT_NODE) {
 	if (cur->content != NULL) {
 	    if (((cur->name == (const xmlChar *)xmlStringText) ||
diff --git a/Makefile.am b/Makefile.am
index 6676040..d1feb94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,7 +167,7 @@ tests: XMLtests XMLenttests NStests IDtests Errtests APItests @READER_TEST@ @TES
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
 	@echo '## Go get a cup of coffee it is gonna take a while ...'
-	$(MAKE) CHECKER='valgrind' tests
+	$(MAKE) CHECKER='valgrind -q' tests
 
 APItests: testapi$(EXEEXT)
 	@echo "## Running the API regression tests this may take a little while"
diff --git a/Makefile.in b/Makefile.in
index e49ced2..d2e51b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1438,7 +1438,7 @@ tests: XMLtests XMLenttests NStests IDtests Errtests APItests @READER_TEST@ @TES
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
 	@echo '## Go get a cup of coffee it is gonna take a while ...'
-	$(MAKE) CHECKER='valgrind' tests
+	$(MAKE) CHECKER='valgrind -q' tests
 
 APItests: testapi$(EXEEXT)
 	@echo "## Running the API regression tests this may take a little while"
diff --git a/NEWS b/NEWS
index fa7ae09..0bad177 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,32 @@ ChangeLog.html
 to the SVN at 
 http://svn.gnome.org/viewcvs/libxml2/trunk/
  code base.Here is the list of public releases:
+2.6.29: Jun 12 2007:
+   - Portability: patches from Andreas Stricke for WinCEi,
+      fix compilation warnings (William Brack), avoid warnings on Apple OS/X
+      (Wendy Doyle and Mark Rowe), Windows compilation and threading
+      improvements (Rob Richards), compilation against old Python versions,
+      new GNU tar changes (Ryan Hill)
+   - Documentation: xmlURIUnescapeString comment, 
+   - Bugfixes: xmlBufferAdd problem (Richard Jones), 'make valgrind'
+      flag fix (Richard Jones), regexp interpretation of \,
+      htmlCreateDocParserCtxt (Jean-Daniel Dupas), configure.in
+      typo (Bjorn Reese), entity content failure, xmlListAppend() fix
+      (Georges-Andr� Silber), XPath number serialization (William Brack),
+      nanohttp gzipped stream fix (William Brack and Alex Cornejo),
+      xmlCharEncFirstLine typo (Mark Rowe), uri bug (Fran�ois Delyon),
+      XPath string value of PI nodes (William Brack), XPath node set
+      sorting bugs (William Brack), avoid outputting namespace decl
+      dups in the writer (Rob Richards), xmlCtxtReset bug, UTF-8 encoding
+      error handling, recustion on next in catalogs, fix a Relax-NG crash,
+      workaround wrong file: URIs, htmlNodeDumpFormatOutput on attributes,
+      invalid character in attribute detection bug, big comments before 
+      internal subset streaming bug, HTML parsing of attributes with : in
+      the name 
+   - Improvement: keep URI query parts in raw form (Richard Jones),
+      embed tag support in HTML (Michael Day) 
+
+
 2.6.28: Apr 17 2007:
    - Documentation: comment fixes (Markus Keim), xpath comments fixes too
       (James Dennett)
diff --git a/SAX2.c b/SAX2.c
index 7d4ab64..9739831 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -1059,25 +1059,31 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname,
     xmlChar *nval;
     xmlNsPtr namespace;
 
-    /*
-     * Split the full name into a namespace prefix and the tag name
-     */
-    name = xmlSplitQName(ctxt, fullname, &ns);
-    if ((name != NULL) && (name[0] == 0)) {
-        if (xmlStrEqual(ns, BAD_CAST "xmlns")) {
-	    xmlNsErrMsg(ctxt, XML_ERR_NS_DECL_ERROR,
-			"invalid namespace declaration '%s'\n",
-		        fullname, NULL);
-	} else {
-	    xmlNsWarnMsg(ctxt, XML_WAR_NS_COLUMN,
-		         "Avoid attribute ending with ':' like '%s'\n",
-			 fullname, NULL);
-	}
-	if (ns != NULL)
-	    xmlFree(ns);
-	ns = NULL;
-	xmlFree(name);
+    if (ctxt->html) {
 	name = xmlStrdup(fullname);
+	ns = NULL;
+	namespace = NULL;
+    } else {
+	/*
+	 * Split the full name into a namespace prefix and the tag name
+	 */
+	name = xmlSplitQName(ctxt, fullname, &ns);
+	if ((name != NULL) && (name[0] == 0)) {
+	    if (xmlStrEqual(ns, BAD_CAST "xmlns")) {
+		xmlNsErrMsg(ctxt, XML_ERR_NS_DECL_ERROR,
+			    "invalid namespace declaration '%s'\n",
+			    fullname, NULL);
+	    } else {
+		xmlNsWarnMsg(ctxt, XML_WAR_NS_COLUMN,
+			     "Avoid attribute ending with ':' like '%s'\n",
+			     fullname, NULL);
+	    }
+	    if (ns != NULL)
+		xmlFree(ns);
+	    ns = NULL;
+	    xmlFree(name);
+	    name = xmlStrdup(fullname);
+	}
     }
     if (name == NULL) {
         xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElement");
diff --git a/catalog.c b/catalog.c
index 95ebee8..ee3f8f2 100644
--- a/catalog.c
+++ b/catalog.c
@@ -1828,6 +1828,8 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
 		    if (ret != NULL) {
 			catal->depth--;
 			return(ret);
+		    } else if (catal->depth > MAX_CATAL_DEPTH) {
+		        return(NULL);
 		    }
 		}
 	    }
@@ -1868,6 +1870,13 @@ xmlCatalogXMLResolveURI(xmlCatalogEntryPtr catal, const xmlChar *URI) {
     if (URI == NULL)
 	return(NULL);
 
+    if (catal->depth > MAX_CATAL_DEPTH) {
+	xmlCatalogErr(catal, NULL, XML_CATALOG_RECURSION,
+		      "Detected recursion in catalog %s\n",
+		      catal->name, NULL, NULL);
+	return(NULL);
+    }
+
     /*
      * First tries steps 2/ 3/ 4/ if a system ID is provided.
      */
@@ -2053,16 +2062,18 @@ xmlCatalogListXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
 	    if (catal->children != NULL) {
 		ret = xmlCatalogXMLResolve(catal->children, pubID, sysID);
 		if (ret != NULL) {
-                    if (normid != NULL)
-                        xmlFree(normid);
-		    return(ret);
-                }
+		    break;
+                } else if ((catal->children != NULL) &&
+		           (catal->children->depth > MAX_CATAL_DEPTH)) {
+	            ret = NULL;
+		    break;
+	        }
 	    }
 	}
 	catal = catal->next;
     }
-	if (normid != NULL)
-	    xmlFree(normid);
+    if (normid != NULL)
+	xmlFree(normid);
     return(ret);
 }
 
diff --git a/configure b/configure
index 19453ad..7fd6150 100755
--- a/configure
+++ b/configure
@@ -1618,7 +1618,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=28
+LIBXML_MICRO_VERSION=29
 LIBXML_MICRO_VERSION_SUFFIX=
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
@@ -19710,7 +19710,7 @@ fi;
 if test "$with_schemas" = "yes"
 then
     with_pattern=yes
-    with_regexp=yes
+    with_regexps=yes
 fi
 if test "$with_schematron" = "yes"
 then
@@ -19805,9 +19805,9 @@ then
     then
       with_readline=no
     fi
-    if test "$with_regexp" = ""
+    if test "$with_regexps" = ""
     then
-      with_regexp=no
+      with_regexps=no
     fi
     if test "$with_run_debug" = ""
     then
diff --git a/configure.in b/configure.in
index c355498..866df62 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=28
+LIBXML_MICRO_VERSION=29
 LIBXML_MICRO_VERSION_SUFFIX=
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
@@ -170,7 +170,7 @@ dnl
 if test "$with_schemas" = "yes"
 then
     with_pattern=yes
-    with_regexp=yes
+    with_regexps=yes
 fi
 if test "$with_schematron" = "yes"
 then
@@ -268,9 +268,9 @@ then
     then
       with_readline=no
     fi
-    if test "$with_regexp" = ""
+    if test "$with_regexps" = ""
     then
-      with_regexp=no
+      with_regexps=no
     fi
     if test "$with_run_debug" = ""
     then
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html
index c55e04a..38a6660 100644
--- a/doc/APIchunk10.html
+++ b/doc/APIchunk10.html
@@ -453,7 +453,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlParserHandlePEReference

 appearing
xmlValidatePopElement

 xmlValidatePushElement

-
appears
xmlExpGetStart

+
appears
_xmlURI

+xmlExpGetStart

 xmlParseCharData

 xmlParseElementChildrenContentDecl

 xmlParseEntityRef

diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html
index fb3ad79..daaf7ce 100644
--- a/doc/APIchunk12.html
+++ b/doc/APIchunk12.html
@@ -124,6 +124,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlLoadCatalogs

 
category
xmlUCSIsCat

 
cause
xmlShellPrintXPathError

+
caution
_xmlURI

 
cdata-section-
xmlStreamPushNode

 xmlStreamWantsAnyNode

 
ceiling
xmlXPathCeilingFunction

@@ -222,7 +223,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlParseElementMixedContentDecl

 xmlReconciliateNs

 xmlURIEscape

-xmlURIUnescapeString

 xmlValidateAttributeDecl

 xmlValidateDocument

 xmlValidateDocumentFinal

diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html
index 834cde1..c0be627 100644
--- a/doc/APIchunk13.html
+++ b/doc/APIchunk13.html
@@ -232,6 +232,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlXPathNotEqualValues

 
deprecated
LIBXML_LEGACY_ENABLED

 _htmlElemDesc

+_xmlURI

 htmlAttrAllowed

 htmlElementAllowedHere

 htmlElementStatusHere

diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html
index a965455..d853a75 100644
--- a/doc/APIchunk24.html
+++ b/doc/APIchunk24.html
@@ -56,6 +56,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlReplaceNode

 xmlStrEqual

 xmlStrncatNew

+xmlURIUnescapeString

 xmlXPathCmpNodes

 xmlXPathIdFunction

 xmlXPathLangFunction

@@ -393,6 +394,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSkipBlankChars

 
slot
xmlXPathContextSetCache

 
slots
xmlXPathContextSetCache

+
smaller
xmlURIUnescapeString

 
smallest
xmlXPathCeilingFunction

 
socket
xmlCheckFilename

 xmlNanoFTPGetSocket

diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html
index 5606555..e5b01d0 100644
--- a/doc/APIchunk26.html
+++ b/doc/APIchunk26.html
@@ -240,7 +240,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlParserValidityWarning

 xmlTextReaderIsValid

 xmlURIEscape

-xmlURIUnescapeString

 xmlValidGetValidElements

 xmlValidateDocumentFinal

 xmlValidateNotationDecl

diff --git a/doc/APIchunk5.html b/doc/APIchunk5.html
index 9a6b23f..8bd78ca 100644
--- a/doc/APIchunk5.html
+++ b/doc/APIchunk5.html
@@ -77,7 +77,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlOutputMatchCallback

 xmlOutputOpenCallback

 xmlOutputWriteCallback

-xmlURIUnescapeString

 
OutputBufferCreateFilenameFunc
xmlOutputBufferCreateFilenameDefault

 
Override
xmlGcMemSetup

 xmlMemSetup

diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index 8a3f6d7..208205f 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -1242,6 +1242,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSchematronValidityErrorFunc

 xmlSchematronValidityWarningFunc

 
Module threads:
xmlCleanupThreads

+xmlDllMain

 xmlFreeMutex

 xmlFreeRMutex

 xmlGetGlobalState

diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html
index bbfd181..8d12650 100644
--- a/doc/APIfunctions.html
+++ b/doc/APIfunctions.html
@@ -607,6 +607,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlIsIdeographic

 xmlIsPubidChar

 
Type unsigned long:
ftpListCallback

+xmlDllMain

 xmlSchemaValidateListSimpleTypeFacet

 
Type unsigned long *:
xmlSchemaValidateLengthFacet

 xmlSchemaValidateLengthFacetWhtsp

@@ -722,6 +723,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlCtxtGetLastError

 xmlCtxtReadIO

 xmlCtxtResetLastError

+xmlDllMain

 xmlFileClose

 xmlFileRead

 xmlFreeFunc

diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index 4cfeef8..2a64797 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -1891,6 +1891,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlDictQLookup

 xmlDictReference

 xmlDictSize

+xmlDllMain

 xmlDoValidityCheckingDefaultValue

 xmlDoc

 xmlDocCopyNode

diff --git a/doc/devhelp/libxml2-threads.html b/doc/devhelp/libxml2-threads.html
index 66e5ba4..3ce5f93 100644
--- a/doc/devhelp/libxml2-threads.html
+++ b/doc/devhelp/libxml2-threads.html
@@ -58,10 +58,11 @@ int	xmlIsMainThread			(void);
 void	xmlRMutexUnlock			(xmlRMutexPtr tok);
 xmlGlobalStatePtr	xmlGetGlobalState	(void);
 xmlMutexPtr	xmlNewMutex		(void);
-void	xmlRMutexLock			(xmlRMutexPtr tok);
-void	xmlInitThreads			(void);
-void	xmlUnlockLibrary		(void);
+int	xmlDllMain			(void * hinstDLL, 
					 unsigned long fdwReason, 
					 void * lpvReserved);
 void	xmlFreeMutex			(xmlMutexPtr tok);
+void	xmlUnlockLibrary		(void);
+void	xmlInitThreads			(void);
+void	xmlRMutexLock			(xmlRMutexPtr tok);
 
     
     
@@ -93,6 +94,10 @@ The content of this structure is not made public by the API.
         xmlCleanupThreads ()
void	xmlCleanupThreads		(void)

 
xmlCleanupThreads() is used to to cleanup all the thread related data of the libxml2 library once processing has ended.

 

+        
+        xmlDllMain ()
int	xmlDllMain			(void * hinstDLL, 
					 unsigned long fdwReason, 
					 void * lpvReserved)

+

+
hinstDLL: 
fdwReason: 
lpvReserved: 
Returns: 

         
         xmlFreeMutex ()
void	xmlFreeMutex			(xmlMutexPtr tok)

 
xmlFreeMutex() is used to reclaim resources associated with a libxml2 token struct.
diff --git a/doc/devhelp/libxml2-uri.html b/doc/devhelp/libxml2-uri.html
index 33f32fa..c67dacf 100644
--- a/doc/devhelp/libxml2-uri.html
+++ b/doc/devhelp/libxml2-uri.html
@@ -76,9 +76,10 @@ int	xmlParseURIReference		(xmlParseURIReference		(str: string to escape
list: exception list string of chars not to escape
Returns: a new escaped string or NULL in case of error.

         
         xmlURIUnescapeString ()
char *	xmlURIUnescapeString		(const char * str, 
					 int len, 
					 char * target)

-
Unescaping routine, does not do validity checks ! Output is direct unsigned char translation of %XX values (no encoding)

-str: the string to unescape
len: the length in bytes to unescape (or <= 0 to indicate full string)
target: optional destination buffer
Returns: an copy of the string, but unescaped

+Unescaping routine, but does not check that the string is an URI. The output is a direct unsigned char translation of %XX values (no encoding) Note that the length of the result can only be smaller or same size as the input string.
+str: the string to unescape
len: the length in bytes to unescape (or <= 0 to indicate full string)
target: optional destination buffer
Returns: a copy of the string, but unescaped, will return NULL only in case of error
         
       
     
diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp
index 6a3841c..a932cdf 100644
--- a/doc/devhelp/libxml2.devhelp
+++ b/doc/devhelp/libxml2.devhelp
@@ -2193,6 +2193,7 @@
     
     
     
+    
     
     
     
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index cd9f4ef..ea23621 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -96,7 +96,7 @@ xpath2_DEPENDENCIES= $(DEPS)
 xpath2_LDADD= @RDL_LIBS@ $(LDADDS)
 
 valgrind: 
-	$(MAKE) CHECKER='valgrind' tests
+	$(MAKE) CHECKER='valgrind -q' tests
 
 tests: $(noinst_PROGRAMS)
 	@(echo '## examples regression tests')
diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in
index f8af861..5fd6a3a 100644
--- a/doc/examples/Makefile.in
+++ b/doc/examples/Makefile.in
@@ -707,7 +707,7 @@ install-data-local:
 	-@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
 
 valgrind: 
-	$(MAKE) CHECKER='valgrind' tests
+	$(MAKE) CHECKER='valgrind -q' tests
 
 tests: $(noinst_PROGRAMS)
 	@(echo '## examples regression tests')
diff --git a/doc/html/libxml-threads.html b/doc/html/libxml-threads.html
index eebcf3c..8bb2cbf 100644
--- a/doc/html/libxml-threads.html
+++ b/doc/html/libxml-threads.html
@@ -17,6 +17,7 @@ The content of this structure is not made public by the API.
 The content of this structure is not made public by the API.
 Typedef xmlRMutex * xmlRMutexPtr
 
void	xmlCleanupThreads		(void)
+int	xmlDllMain			(void * hinstDLL, 
					 unsigned long fdwReason, 
					 void * lpvReserved)
 void	xmlFreeMutex			(xmlMutexPtr tok)
 void	xmlFreeRMutex			(xmlRMutexPtr tok)
 xmlGlobalStatePtr	xmlGetGlobalState	(void)
@@ -38,7 +39,9 @@ The content of this structure is not made public by the API.
 The content of this structure is not made public by the API.
 }Function: xmlCleanupThreads
void	xmlCleanupThreads		(void)

 
xmlCleanupThreads() is used to to cleanup all the thread related data of the libxml2 library once processing has ended.
-Function: xmlFreeMutex
void	xmlFreeMutex			(xmlMutexPtr tok)

+Function: xmlDllMain
int	xmlDllMain			(void * hinstDLL, 
					 unsigned long fdwReason, 
					 void * lpvReserved)

+

+hinstDLL: 
fdwReason: 
lpvReserved: 
Returns: 
Function: xmlFreeMutex
void	xmlFreeMutex			(xmlMutexPtr tok)

 
xmlFreeMutex() is used to reclaim resources associated with a libxml2 token struct.
 tok: the simple mutex
Function: xmlFreeRMutex
void	xmlFreeRMutex			(xmlRMutexPtr tok)

 
xmlRFreeMutex() is used to reclaim resources associated with a reentrant mutex.
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index fa7ee19..1c668e8 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -36,9 +36,10 @@ A:link, A:visited, A:active { text-decoration: underline }
     char *	user	: the user part
     int	port	: the port number
     char *	path	: the path string
-    char *	query	: the query string
+    char *	query	: the query string (deprecated - use with
     char *	fragment	: the fragment identifier
     int	cleanup	: parsing potentially unclean URI
+    char *	query_raw	: the query string (as it appears in the
 }
Function: xmlBuildRelativeURI
xmlChar *	xmlBuildRelativeURI	(const xmlChar * URI, 
					 const xmlChar * base)

 
Expresses the URI of the reference in terms relative to the base. Some examples of this operation include: base = "http://site1.com/docs/book1.html" URI input URI returned docs/pic1.gif pic1.gif docs/img/pic1.gif img/pic1.gif img/pic1.gif ../img/pic1.gif http://site1.com/docs/pic1.gif pic1.gif http://site2.com/docs/pic1.gif http://site2.com/docs/pic1.gif base = "docs/book1.html" URI input URI returned docs/pic1.gif pic1.gif docs/img/pic1.gif img/pic1.gif img/pic1.gif ../img/pic1.gif http://site1.com/docs/pic1.gif http://site1.com/docs/pic1.gif Note: if the URI reference is really wierd or complicated, it may be worthwhile to first convert it into a "nice" one by calling xmlBuildURI (using 'base') before calling this routine, since this routine (for reasonable efficiency) assumes URI has already been through some validation.
 URI: the URI reference under consideration
base: the base value
Returns: a new URI string (to be freed by the caller) or NULL in case error.
Function: xmlBuildURI
xmlChar *	xmlBuildURI		(const xmlChar * URI, 
					 const xmlChar * base)

@@ -68,5 +69,5 @@ A:link, A:visited, A:active { text-decoration: underline }
 str: the string of the URI to escape
Returns: an copy of the string, but escaped 25 May 2001 Uses xmlParseURI and xmlURIEscapeStr to try to escape correctly according to RFC2396. - Carl Douglas
Function: xmlURIEscapeStr
xmlChar *	xmlURIEscapeStr		(const xmlChar * str, 
					 const xmlChar * list)

 
This routine escapes a string to hex, ignoring reserved characters (a-z) and the characters in the exception list.
 str: string to escape
list: exception list string of chars not to escape
Returns: a new escaped string or NULL in case of error.
Function: xmlURIUnescapeString
char *	xmlURIUnescapeString		(const char * str, 
					 int len, 
					 char * target)

-
Unescaping routine, does not do validity checks ! Output is direct unsigned char translation of %XX values (no encoding)
-str: the string to unescape
len: the length in bytes to unescape (or <= 0 to indicate full string)
target: optional destination buffer
Returns: an copy of the string, but unescaped
Daniel Veillard
+Unescaping routine, but does not check that the string is an URI. The output is a direct unsigned char translation of %XX values (no encoding) Note that the length of the result can only be smaller or same size as the input string.
+str: the string to unescape
len: the length in bytes to unescape (or <= 0 to indicate full string)
target: optional destination buffer
Returns: a copy of the string, but unescaped, will return NULL only in case of error
Daniel Veillard
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index a7a8d56..4e031bc 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1371,10 +1371,11 @@
      
      
      
-     
-     
-     
+     
      
+     
+     
+     
     
     
      
interfaces for tree manipulation
@@ -6643,9 +6644,10 @@ Could we use @subtypes for this?'/>
       
       
       
-      
+      
       
       
+      
     
     
     
@@ -9299,6 +9301,13 @@ Could we use @subtypes for this?'/>
       
       
     
+    
+      
+      
+      
+      
+      
+    
     
       Do a copy of the node to a given document.
       
@@ -16511,8 +16520,8 @@ Could we use @subtypes for this?'/>
       
     
     
-      Unescaping routine, does not do validity checks ! Output is direct unsigned char translation of %XX values (no encoding)
-      
+      Unescaping routine, but does not check that the string is an URI. The output is a direct unsigned char translation of %XX values (no encoding) Note that the length of the result can only be smaller or same size as the input string.
+      
       
       
       
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index 45afec6..81db327 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,59 +8,32 @@
   
   
     libxml2
-    2.6.27
-     Oct 25 2006
+    2.6.28
+     Apr 17 2007
     http://xmlsoft.org/
-       - Portability fixes: file names on windows (Roland Schwingel, 
-      Emelyanov Alexey), windows compile fixup (Rob Richards), 
-      AIX iconv() is apparently case sensitive
-   - improvements: Python XPath types mapping (Nic Ferrier), XPath optimization
-      (Kasimier), add xmlXPathCompiledEvalToBoolean (Kasimier), Python node
-      equality and comparison (Andreas Pakulat), xmlXPathCollectAndTest
-      improvememt (Kasimier), expose if library was compiled with zlib 
-      support (Andrew Nosenko), cache for xmlSchemaIDCMatcher structs
-      (Kasimier), xmlTextConcat should work with comments and PIs (Rob
-      Richards), export htmlNewParserCtxt needed by Michael Day, refactoring
-      of catalog entity loaders (Michael Day), add XPointer support to 
-      python bindings (Ross Reedstrom, Brian West and Stefan Anca), 
-      try to sort out most file path to URI conversions and xmlPathToUri,
-      add --html --memory case to xmllint
-   - building fix: fix --with-minimum (Felipe Contreras), VMS fix, 
-      const'ification of HTML parser structures (Matthias Clasen),
-      portability fix (Emelyanov Alexey), wget autodetection (Peter
-      Breitenlohner),  remove the build path recorded in the python
-      shared module, separate library flags for shared and static builds
-      (Mikhail Zabaluev), fix --with-minimum --with-sax1 builds, fix
-      --with-minimum --with-schemas builds
-   - bug fix: xmlGetNodePath fix (Kasimier), xmlDOMWrapAdoptNode and
-      attribute (Kasimier), crash when using the recover mode, 
-      xmlXPathEvalExpr problem (Kasimier), xmlXPathCompExprAdd bug (Kasimier),
-      missing destry in xmlFreeRMutex (Andrew Nosenko), XML Schemas fixes
-      (Kasimier), warning on entities processing, XHTML script and style
-      serialization (Kasimier), python generator for long types, bug in
-      xmlSchemaClearValidCtxt (Bertrand Fritsch), xmlSchemaXPathEvaluate
-      allocation bug (Marton Illes), error message end of line (Rob Richards),
-      fix attribute serialization in writer (Rob Richards), PHP4 DTD validation
-      crasher, parser safety patch (Ben Darnell), _private context propagation
-      when parsing entities (with Michael Day), fix entities behaviour when 
-      using SAX, URI to file path fix (Mikhail Zabaluev), disapearing validity
-      context, arg error in SAX callback (Mike Hommey), fix mixed-content
-      autodetect when using --noblanks, fix xmlIOParseDTD error handling,
-      fix bug in xmlSplitQName on special Names, fix Relax-NG element content
-      validation bug, fix xmlReconciliateNs bug, fix potential attribute 
-      XML parsing bug, fix line/column accounting in XML parser, chunking bug
-      in the HTML parser on script, try to detect obviously buggy HTML
-      meta encoding indications, bugs with encoding BOM and xmlSaveDoc, 
-      HTML entities in attributes parsing, HTML minimized attribute values,
-      htmlReadDoc and htmlReadIO were broken, error handling bug in
-      xmlXPathEvalExpression (Olaf Walkowiak), fix a problem in
-      htmlCtxtUseOptions, xmlNewInputFromFile could leak (Marius Konitzer),
-      bug on misformed SSD regexps (Christopher Boumenot)
-      
-   - documentation: warning about XML_PARSE_COMPACT (Kasimier Buchcik),
-      fix xmlXPathCastToString documentation, improve man pages for
-      xmllitn and xmlcatalog (Daniel Leidert), fixed comments of a few
-      functions
+       - Documentation: comment fixes (Markus Keim), xpath comments fixes too
+      (James Dennett)
+   - Bug fixes: XPath bug (William Brack), HTML parser autoclose stack usage
+      (Usamah Malik), various regexp bug fixes (DV and William), path conversion
+      on Windows (Igor Zlatkovic), htmlCtxtReset fix (Michael Day), XPath
+      principal node of axis bug, HTML serialization of some codepoint
+      (Steven Rainwater), user data propagation in XInclude (Michael Day),
+      standalone and XML decl detection (Michael Day), Python id ouptut
+      for some id, fix the big python string memory leak, URI parsing fixes
+      (Stéphane Bidoul and William), long comments parsing bug (William),
+      concurrent threads initialization (Ted Phelps), invalid char
+      in text XInclude (William), XPath memory leak (William), tab in
+      python problems (Andreas Hanke), XPath node comparison error
+      (Oleg Paraschenko), cleanup patch for reader (Julien Reichel),
+      XML Schemas attribute group (William), HTML parsing problem (William),
+      fix char 0x2d in regexps (William), regexp quantifier range with
+      min occurs of 0 (William), HTML script/style parsing (Mike Day)
+   - Improvement: make xmlTextReaderSetup() public
+   - Compilation and postability: fix a missing include problem (William),
+      __ss_familly on AIX again (Björn Wiberg), compilation without zlib
+      (Michael Day), catalog patch for Win32 (Christian Ehrlicher),
+      Windows CE fixes (Andreas Stricke)
+   - Various CVS to SVN infrastructure changes
 
 
   
diff --git a/doc/news.html b/doc/news.html
index e05ab39..fae5b5a 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -12,7 +12,30 @@ to help those
More testing on RelaxNG
   Finishing up XML
   Schemas
 
The change log describes the recents commits
-to the SVN code base.
Here is the list of public releases:
2.6.28: Apr 17 2007
Documentation: comment fixes (Markus Keim), xpath comments fixes too
+to the SVN code base.
Here is the list of public releases:
2.6.29: Jun 12 2007
Portability: patches from Andreas Stricke for WinCEi,
+      fix compilation warnings (William Brack), avoid warnings on Apple OS/X
+      (Wendy Doyle and Mark Rowe), Windows compilation and threading
+      improvements (Rob Richards), compilation against old Python versions,
+      new GNU tar changes (Ryan Hill)
+  Documentation: xmlURIUnescapeString comment, 
+  Bugfixes: xmlBufferAdd problem (Richard Jones), 'make valgrind'
+      flag fix (Richard Jones), regexp interpretation of \,
+      htmlCreateDocParserCtxt (Jean-Daniel Dupas), configure.in
+      typo (Bjorn Reese), entity content failure, xmlListAppend() fix
+      (Georges-Andr� Silber), XPath number serialization (William Brack),
+      nanohttp gzipped stream fix (William Brack and Alex Cornejo),
+      xmlCharEncFirstLine typo (Mark Rowe), uri bug (Fran�ois Delyon),
+      XPath string value of PI nodes (William Brack), XPath node set
+      sorting bugs (William Brack), avoid outputting namespace decl
+      dups in the writer (Rob Richards), xmlCtxtReset bug, UTF-8 encoding
+      error handling, recustion on next in catalogs, fix a Relax-NG crash,
+      workaround wrong file: URIs, htmlNodeDumpFormatOutput on attributes,
+      invalid character in attribute detection bug, big comments before 
+      internal subset streaming bug, HTML parsing of attributes with : in
+      the name, IDness of name in HTML (Dagfinn I. Manns�ker) 
+  Improvement: keep URI query parts in raw form (Richard Jones),
+      embed tag support in HTML (Michael Day) 
+
2.6.28: Apr 17 2007
Documentation: comment fixes (Markus Keim), xpath comments fixes too
       (James Dennett)
   Bug fixes: XPath bug (William Brack), HTML parser autoclose stack usage
       (Usamah Malik), various regexp bug fixes (DV and William), path conversion
diff --git a/doc/xml.html b/doc/xml.html
index 4b01691..6db27c7 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -739,6 +739,33 @@ to the SVN code base.<
 
 Here is the list of public releases:
 
+2.6.29: Jun 12 2007
+
+  Portability: patches from Andreas Stricke for WinCEi,
+      fix compilation warnings (William Brack), avoid warnings on Apple OS/X
+      (Wendy Doyle and Mark Rowe), Windows compilation and threading
+      improvements (Rob Richards), compilation against old Python versions,
+      new GNU tar changes (Ryan Hill)
+  Documentation: xmlURIUnescapeString comment, 
+  Bugfixes: xmlBufferAdd problem (Richard Jones), 'make valgrind'
+      flag fix (Richard Jones), regexp interpretation of \,
+      htmlCreateDocParserCtxt (Jean-Daniel Dupas), configure.in
+      typo (Bjorn Reese), entity content failure, xmlListAppend() fix
+      (Georges-Andr� Silber), XPath number serialization (William Brack),
+      nanohttp gzipped stream fix (William Brack and Alex Cornejo),
+      xmlCharEncFirstLine typo (Mark Rowe), uri bug (Fran�ois Delyon),
+      XPath string value of PI nodes (William Brack), XPath node set
+      sorting bugs (William Brack), avoid outputting namespace decl
+      dups in the writer (Rob Richards), xmlCtxtReset bug, UTF-8 encoding
+      error handling, recustion on next in catalogs, fix a Relax-NG crash,
+      workaround wrong file: URIs, htmlNodeDumpFormatOutput on attributes,
+      invalid character in attribute detection bug, big comments before 
+      internal subset streaming bug, HTML parsing of attributes with : in
+      the name, IDness of name in HTML (Dagfinn I. Manns�ker) 
+  Improvement: keep URI query parts in raw form (Richard Jones),
+      embed tag support in HTML (Michael Day) 
+
+
 2.6.28: Apr 17 2007
 
   Documentation: comment fixes (Markus Keim), xpath comments fixes too
diff --git a/encoding.c b/encoding.c
index ee33df1..002eeba 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1761,19 +1761,20 @@ xmlCharEncFirstLine(xmlCharEncodingHandler *handler, xmlBufferPtr out,
     if (out == NULL) return(-1);
     if (in == NULL) return(-1);
 
+    /* calculate space available */
     written = out->size - out->use;
     toconv = in->use;
-    if (toconv * 2 >= written) {
-        xmlBufferGrow(out, toconv);
-	written = out->size - out->use - 1;
-    }
-
     /*
      * echo '' | wc -c => 38
      * 45 chars should be sufficient to reach the end of the encoding
      * declaration without going too far inside the document content.
      */
-    written = 45;
+    if (toconv > 45)
+	toconv  = 45;
+    if (toconv * 2 >= written) {
+        xmlBufferGrow(out, toconv);
+	written = out->size - out->use - 1;
+    }
 
     if (handler->input != NULL) {
 	ret = handler->input(&out->content[out->use], &written,
diff --git a/include/libxml/threads.h b/include/libxml/threads.h
index 4f7d10f..f81f982 100644
--- a/include/libxml/threads.h
+++ b/include/libxml/threads.h
@@ -72,6 +72,10 @@ XMLPUBFUN void XMLCALL
 XMLPUBFUN xmlGlobalStatePtr XMLCALL	
 			xmlGetGlobalState(void);
 
+#if defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && defined(LIBXML_STATIC_FOR_DLL)
+int XMLCALL xmlDllMain(void *hinstDLL, unsigned long fdwReason, void *lpvReserved);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/libxml/uri.h b/include/libxml/uri.h
index 5e29671..49ed105 100644
--- a/include/libxml/uri.h
+++ b/include/libxml/uri.h
@@ -23,6 +23,10 @@ extern "C" {
  *
  * A parsed URI reference. This is a struct containing the various fields
  * as described in RFC 2396 but separated for further processing.
+ *
+ * Note: query is a deprecated field which is incorrectly unescaped.
+ * query_raw takes precedence over query if the former is set.
+ * See: http://mail.gnome.org/archives/xml/2007-April/thread.html#00127
  */
 typedef struct _xmlURI xmlURI;
 typedef xmlURI *xmlURIPtr;
@@ -34,9 +38,10 @@ struct _xmlURI {
     char *user;		/* the user part */
     int port;		/* the port number */
     char *path;		/* the path string */
-    char *query;	/* the query string */
+    char *query;	/* the query string (deprecated - use with caution) */
     char *fragment;	/* the fragment identifier */
     int  cleanup;	/* parsing potentially unclean URI */
+    char *query_raw;	/* the query string (as it appears in the URI) */
 };
 
 /*
diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h
index 6eee895..78bad60 100644
--- a/include/libxml/xmlversion.h
+++ b/include/libxml/xmlversion.h
@@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.6.28"
+#define LIBXML_DOTTED_VERSION "2.6.29"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20628
+#define LIBXML_VERSION 20629
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20628"
+#define LIBXML_VERSION_STRING "20629"
 
 /**
  * LIBXML_VERSION_EXTRA:
@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20628);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20629);
 
 #ifndef VMS
 #if 0
@@ -91,7 +91,8 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Whether the thread support is configured in
  */
 #if 1
-#if defined(_REENTRANT) || defined(__MT__) || (_POSIX_C_SOURCE - 0 >= 199506L)
+#if defined(_REENTRANT) || defined(__MT__) || \
+    (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L))
 #define LIBXML_THREAD_ENABLED
 #endif
 #endif
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index 0967913..29cef74 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -91,7 +91,8 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Whether the thread support is configured in
  */
 #if @WITH_THREADS@
-#if defined(_REENTRANT) || defined(__MT__) || (_POSIX_C_SOURCE - 0 >= 199506L)
+#if defined(_REENTRANT) || defined(__MT__) || \
+    (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L))
 #define LIBXML_THREAD_ENABLED
 #endif
 #endif
diff --git a/include/win32config.h b/include/win32config.h
index c61dfa9..6e9b33b 100644
--- a/include/win32config.h
+++ b/include/win32config.h
@@ -6,7 +6,7 @@
 #define HAVE_MALLOC_H
 #define HAVE_ERRNO_H
 
-#ifdef _WIN32_WCE
+#if defined(_WIN32_WCE)
 #undef HAVE_ERRNO_H
 #include 
 #include "wincecompat.h"
@@ -27,6 +27,11 @@
 #include 
 #endif
 
+/*
+ * Windows platforms may define except 
+ */
+#undef except
+
 #define HAVE_ISINF
 #define HAVE_ISNAN
 #include 
@@ -95,7 +100,7 @@ static int isnan (double d) {
 /* Threading API to use should be specified here for compatibility reasons.
    This is however best specified on the compiler's command-line. */
 #if defined(LIBXML_THREAD_ENABLED)
-#if !defined(HAVE_PTHREAD_H) && !defined(HAVE_WIN32_THREADS)
+#if !defined(HAVE_PTHREAD_H) && !defined(HAVE_WIN32_THREADS) && !defined(_WIN32_WCE)
 #define HAVE_WIN32_THREADS
 #endif
 #endif
diff --git a/libxml.h b/libxml.h
index 478d3e3..f5c6394 100644
--- a/libxml.h
+++ b/libxml.h
@@ -20,6 +20,14 @@
 
 #if defined(macintosh)
 #include "config-mac.h"
+#elif defined(_WIN32_WCE)
+/*
+ * Windows CE compatibility definitions and functions
+ * This is needed to compile libxml2 for Windows CE.
+ * At least I tested it with WinCE 5.0 for Emulator and WinCE 4.2/SH4 target
+ */
+#include 
+#include 
 #else
 #include "config.h"
 #include 
@@ -32,15 +40,6 @@ int snprintf(char *, size_t, const char *, ...);
 int vfprintf(FILE *, const char *, va_list);
 #endif
 
-/*
- * Windows CE compatibility definitions and functions
- * This is needed to compile libxml2 for Windows CE.
- * At least I tested it with WinCE 4.2 for Emulator and SH4 target
- */
-#if defined(_WIN32_WCE)
-#include 
-#endif
-
 #ifndef WITH_TRIO
 #include 
 #else
diff --git a/libxml2.spec b/libxml2.spec
index 675eda1..da2e0e7 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -1,6 +1,6 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.28
+Version: 2.6.29
 Release: 1
 License: MIT
 Group: Development/Libraries
@@ -128,6 +128,6 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
-* Tue Apr 17 2007 Daniel Veillard 
-- upstream release 2.6.28 see http://xmlsoft.org/news.html
+* Tue Jun 12 2007 Daniel Veillard 
+- upstream release 2.6.29 see http://xmlsoft.org/news.html
 
diff --git a/list.c b/list.c
index 2dc6d96..5c01c83 100644
--- a/list.c
+++ b/list.c
@@ -314,14 +314,14 @@ int xmlListAppend(xmlListPtr l, void *data)
     if (lkNew == NULL) {
         xmlGenericError(xmlGenericErrorContext, 
 		        "Cannot initialize memory for new link");
-        return (0);
+        return (1);
     }
     lkNew->data = data;
     lkNew->next = lkPlace->next;
     (lkPlace->next)->prev = lkNew;
     lkPlace->next = lkNew;
     lkNew->prev = lkPlace;
-    return 1;
+    return 0;
 }
 
 /**
diff --git a/nanohttp.c b/nanohttp.c
index 26b5d7e..2406e7e 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -1203,16 +1203,19 @@ xmlNanoHTTPRead(void *ctx, void *dest, int len) {
  
         ctxt->strm->next_out = dest;
         ctxt->strm->avail_out = len;
+	ctxt->strm->avail_in = ctxt->inptr - ctxt->inrptr;
 
-        do {
-            orig_avail_in = ctxt->strm->avail_in = ctxt->inptr - ctxt->inrptr - bytes_read;
+        while (ctxt->strm->avail_out > 0 &&
+	       (ctxt->strm->avail_in > 0 || xmlNanoHTTPRecv(ctxt) > 0)) {
+            orig_avail_in = ctxt->strm->avail_in =
+			    ctxt->inptr - ctxt->inrptr - bytes_read;
             ctxt->strm->next_in = BAD_CAST (ctxt->inrptr + bytes_read);
 
             z_ret = inflate(ctxt->strm, Z_NO_FLUSH);
             bytes_read += orig_avail_in - ctxt->strm->avail_in;
 
             if (z_ret != Z_OK) break;
-        } while (ctxt->strm->avail_out > 0 && xmlNanoHTTPRecv(ctxt) > 0);
+	}
 
         ctxt->inrptr += bytes_read;
         return(len - ctxt->strm->avail_out);
diff --git a/parser.c b/parser.c
index b405164..6cc8277 100644
--- a/parser.c
+++ b/parser.c
@@ -3074,7 +3074,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
      */
     c = CUR_CHAR(l);
     while ((NXT(0) != limit) && /* checked */
-	   (c != '<')) {
+           (IS_CHAR(c)) && (c != '<')) {
 	if (c == 0) break;
 	if (c == '&') {
 	    in_space = 0;
@@ -3208,8 +3208,13 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
     if (RAW == '<') {
 	xmlFatalErr(ctxt, XML_ERR_LT_IN_ATTRIBUTE, NULL);
     } else if (RAW != limit) {
-        xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
-	               "AttValue: ' expected\n");
+	if ((c != 0) && (!IS_CHAR(c))) {
+	    xmlFatalErrMsg(ctxt, XML_ERR_INVALID_CHAR,
+			   "invalid character in attribute value\n");
+	} else {
+	    xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
+			   "AttValue: ' expected\n");
+        }
     } else
 	NEXT;
     if (attlen != NULL) *attlen = len;
@@ -6097,7 +6102,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
 			}
 		    } else if ((ret != XML_ERR_OK) &&
 		               (ret != XML_WAR_UNDECLARED_ENTITY)) {
-			xmlFatalErr(ctxt, ret, NULL);
+			xmlFatalErrMsgStr(ctxt, XML_ERR_UNDECLARED_ENTITY,
+				 "Entity '%s' failed to parse\n", ent->name);
 		    } else if (list != NULL) {
 			xmlFreeNodeList(list);
 			list = NULL;
@@ -10135,6 +10141,7 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
 			    "PP: Parsing PI\n");
 #endif
 		    xmlParsePI(ctxt);
+		    ctxt->checkIndex = 0;
 		} else if ((cur == '<') && (next == '!') &&
 		    (ctxt->input->cur[2] == '-') &&
 		    (ctxt->input->cur[3] == '-')) {
@@ -10147,6 +10154,7 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
 #endif
 		    xmlParseComment(ctxt);
 		    ctxt->instate = XML_PARSER_MISC;
+		    ctxt->checkIndex = 0;
 		} else if ((cur == '<') && (next == '!') &&
 		    (ctxt->input->cur[2] == 'D') &&
 		    (ctxt->input->cur[3] == 'O') &&
@@ -12953,8 +12961,12 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt)
     ctxt->input = NULL;
 
     ctxt->spaceNr = 0;
-    ctxt->spaceTab[0] = -1;
-    ctxt->space = &ctxt->spaceTab[0];
+    if (ctxt->spaceTab != NULL) {
+	ctxt->spaceTab[0] = -1;
+	ctxt->space = &ctxt->spaceTab[0];
+    } else {
+        ctxt->space = NULL;
+    }
 
 
     ctxt->nodeNr = 0;
diff --git a/python/libxml2-py.c b/python/libxml2-py.c
index c979a3a..0874a60 100644
--- a/python/libxml2-py.c
+++ b/python/libxml2-py.c
@@ -977,6 +977,22 @@ libxml_xmlParseMarkupDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(Py_None);
 }
 
+PyObject *
+libxml_xmlURISetQueryRaw(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+    char * query_raw;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetQueryRaw", &pyobj_URI, &query_raw))
+        return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+
+    if (URI->query_raw != NULL) xmlFree(URI->query_raw);
+    URI->query_raw = (char *)xmlStrdup((const xmlChar *)query_raw);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
 PyObject *
 libxml_xmlHasNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -14054,6 +14070,22 @@ libxml_xmlUCSIsOldItalic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 #endif /* defined(LIBXML_UNICODE_ENABLED) */
+PyObject *
+libxml_xmlURIGetQueryRaw(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    const char * c_retval;
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetQueryRaw", &pyobj_URI))
+        return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+
+    c_retval = URI->query_raw;
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    return(py_retval);
+}
+
 #if defined(LIBXML_XPATH_ENABLED)
 PyObject *
 libxml_xmlXPathPopNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
diff --git a/python/libxml2-python-api.xml b/python/libxml2-python-api.xml
index f77a237..42f661d 100644
--- a/python/libxml2-python-api.xml
+++ b/python/libxml2-python-api.xml
@@ -265,6 +265,17 @@
       
       
     
+    
+      Get the raw query part from an URI (i.e. the unescaped form).
+      
+      
+    
+    
+      Set the raw query part of an URI (i.e. the unescaped form).
+      
+      
+      
+    
     
       Get the fragment part from an URI
       
diff --git a/python/setup.py b/python/setup.py
index 5eab8dc..191c03d 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -226,7 +226,7 @@ else:
 setup (name = "libxml2-python",
        # On *nix, the version number is created from setup.py.in
        # On windows, it is set by configure.js
-       version = "2.6.28",
+       version = "2.6.29",
        description = descr,
        author = "Daniel Veillard",
        author_email = "veillard@redhat.com",
diff --git a/python/types.c b/python/types.c
index 5c5dcca..9a17749 100644
--- a/python/types.c
+++ b/python/types.c
@@ -525,6 +525,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject * obj)
 
         ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
 
+#ifdef PyBool_Check
     } else if PyBool_Check (obj) {
 
         if (obj == Py_True) {
@@ -533,7 +534,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject * obj)
         else {
           ret = xmlXPathNewBoolean(0);
         }
-
+#endif
     } else if PyString_Check
         (obj) {
         xmlChar *str;
diff --git a/relaxng.c b/relaxng.c
index 16527cc..60fdbab 100644
--- a/relaxng.c
+++ b/relaxng.c
@@ -9828,7 +9828,8 @@ xmlRelaxNGValidateState(xmlRelaxNGValidCtxtPtr ctxt,
                         ret = -1;
                 } else {
                     state = ctxt->state;
-                    ctxt->state->seq = nseq;
+		    if (ctxt->state != NULL)
+			ctxt->state->seq = nseq;
                     if (ret == 0)
                         ret = xmlRelaxNGValidateElementEnd(ctxt, 1);
                     xmlRelaxNGFreeValidState(ctxt, state);
diff --git a/schematron.c b/schematron.c
index 0a90ff8..a2eabcc 100644
--- a/schematron.c
+++ b/schematron.c
@@ -714,6 +714,7 @@ xmlSchematronFreeParserCtxt(xmlSchematronParserCtxtPtr ctxt)
     xmlFree(ctxt);
 }
 
+#if 0
 /**
  * xmlSchematronPushInclude:
  * @ctxt:  the schema parser context
@@ -782,6 +783,7 @@ xmlSchematronPopInclude(xmlSchematronParserCtxtPtr ctxt)
         return(xmlSchematronPopInclude(ctxt));
     return(ret);
 }
+#endif
 
 /**
  * xmlSchematronAddNamespace:
@@ -987,6 +989,7 @@ xmlSchematronParsePattern(xmlSchematronParserCtxtPtr ctxt, xmlNodePtr pat)
     }
 }
 
+#if 0
 /**
  * xmlSchematronLoadInclude:
  * @ctxt:  a schema validation context
@@ -1051,6 +1054,7 @@ done:
         xmlFree(URI);
     return(ret);
 }
+#endif
 
 /**
  * xmlSchematronParse:
diff --git a/testapi.c b/testapi.c
index 969fdd3..af71ac2 100644
--- a/testapi.c
+++ b/testapi.c
@@ -128,7 +128,7 @@ int main(int argc, char **argv) {
     int blocks, mem;
 
     /* access to the proxy can slow up regression tests a lot */
-    putenv("http_proxy=");
+    putenv((char *) "http_proxy=");
 
     memset(chartab, 0, sizeof(chartab));
     strncpy((char *) chartab, "  chartab\n", 20);
diff --git a/threads.c b/threads.c
index 87d0d36..0ab9e77 100644
--- a/threads.c
+++ b/threads.c
@@ -441,7 +441,11 @@ __xmlGlobalInitMutexLock(void)
 	InitializeCriticalSection(cs);
 
 	/* Swap it into the global_init_lock */
+#ifdef InterlockedCompareExchangePointer
 	InterlockedCompareExchangePointer(&global_init_lock, cs, NULL);
+#else  /* Use older void* version */
+    InterlockedCompareExchange((void **)&global_init_lock, (void *)cs, NULL);
+#endif /* InterlockedCompareExchangePointer */
 
 	/* If another thread successfully recorded its critical
 	 * section in the global_init_lock then discard the one
@@ -912,7 +916,7 @@ xmlOnceInit(void) {
  */
 #if defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
 #if defined(LIBXML_STATIC_FOR_DLL)
-BOOL WINAPI xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) 
+BOOL XMLCALL xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) 
 #else
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) 
 #endif
diff --git a/tree.c b/tree.c
index ffbcabd..432007e 100644
--- a/tree.c
+++ b/tree.c
@@ -4848,7 +4848,7 @@ xmlNodeSetBase(xmlNodePtr cur, const xmlChar* uri) {
     fixed = xmlPathToURI(uri);
     if (fixed != NULL) {
 	xmlSetNsProp(cur, ns, BAD_CAST "base", fixed);
-	xmlFree(fixed);
+	xmlFree((xmlChar *)fixed);
     } else {
 	xmlSetNsProp(cur, ns, BAD_CAST "base", uri);
     }
@@ -6968,7 +6968,8 @@ xmlBufferAdd(xmlBufferPtr buf, const xmlChar *str, int len) {
     if (len < 0)
         len = xmlStrlen(str);
 
-    if (len <= 0) return -1;
+    if (len < 0) return -1;
+    if (len == 0) return 0;
 
     needSize = buf->use + len + 2;
     if (needSize > buf->size){
diff --git a/uri.c b/uri.c
index 35cf98a..4f5e182 100644
--- a/uri.c
+++ b/uri.c
@@ -446,7 +446,33 @@ xmlSaveUri(xmlURIPtr uri) {
 		}
 	    }
 	}
-	if (uri->query != NULL) {
+	if (uri->query_raw != NULL) {
+	    if (len + 1 >= max) {
+		max *= 2;
+		ret = (xmlChar *) xmlRealloc(ret,
+			(max + 1) * sizeof(xmlChar));
+		if (ret == NULL) {
+		    xmlGenericError(xmlGenericErrorContext,
+			    "xmlSaveUri: out of memory\n");
+		    return(NULL);
+		}
+	    }
+	    ret[len++] = '?';
+	    p = uri->query_raw;
+	    while (*p != 0) {
+		if (len + 1 >= max) {
+		    max *= 2;
+		    ret = (xmlChar *) xmlRealloc(ret,
+			    (max + 1) * sizeof(xmlChar));
+		    if (ret == NULL) {
+			xmlGenericError(xmlGenericErrorContext,
+				"xmlSaveUri: out of memory\n");
+			return(NULL);
+		    }
+		}
+		ret[len++] = *p++;
+	    }
+	} else if (uri->query != NULL) {
 	    if (len + 3 >= max) {
 		max *= 2;
 		ret = (xmlChar *) xmlRealloc(ret,
@@ -574,6 +600,8 @@ xmlCleanURI(xmlURIPtr uri) {
     uri->authority = NULL;
     if (uri->query != NULL) xmlFree(uri->query);
     uri->query = NULL;
+    if (uri->query_raw != NULL) xmlFree(uri->query_raw);
+    uri->query_raw = NULL;
 }
 
 /**
@@ -594,6 +622,7 @@ xmlFreeURI(xmlURIPtr uri) {
     if (uri->opaque != NULL) xmlFree(uri->opaque);
     if (uri->authority != NULL) xmlFree(uri->authority);
     if (uri->query != NULL) xmlFree(uri->query);
+    if (uri->query_raw != NULL) xmlFree(uri->query_raw);
     xmlFree(uri);
 }
 
@@ -805,10 +834,13 @@ static int is_hex(char c) {
  * @len:   the length in bytes to unescape (or <= 0 to indicate full string)
  * @target:  optional destination buffer
  *
- * Unescaping routine, does not do validity checks !
- * Output is direct unsigned char translation of %XX values (no encoding)
+ * Unescaping routine, but does not check that the string is an URI. The
+ * output is a direct unsigned char translation of %XX values (no encoding)
+ * Note that the length of the result can only be smaller or same size as
+ * the input string.
  *
- * Returns an copy of the string, but unescaped
+ * Returns a copy of the string, but unescaped, will return NULL only in case
+ * of error
  */
 char *
 xmlURIUnescapeString(const char *str, int len, char *target) {
@@ -1027,7 +1059,11 @@ xmlURIEscape(const xmlChar * str)
         xmlFree(segment);
     }
 
-    if (uri->query) {
+    if (uri->query_raw) {
+        ret = xmlStrcat(ret, BAD_CAST "?");
+        ret = xmlStrcat(ret, BAD_CAST uri->query_raw);
+    }
+    else if (uri->query) {
         segment =
             xmlURIEscapeStr(BAD_CAST uri->query, BAD_CAST ";/?:@&=+,$");
         NULLCHK(segment)
@@ -1130,6 +1166,13 @@ xmlParseURIQuery(xmlURIPtr uri, const char **str)
 	    uri->query = STRNDUP(*str, cur - *str);
 	else
 	    uri->query = xmlURIUnescapeString(*str, cur - *str, NULL);
+
+	/* Save the raw bytes of the query as well.
+	 * See: http://mail.gnome.org/archives/xml/2007-April/thread.html#00114
+	 */
+	if (uri->query_raw != NULL)
+	    xmlFree (uri->query_raw);
+	uri->query_raw = STRNDUP (*str, cur - *str);
     }
     *str = cur;
     return (0);
@@ -1253,7 +1296,7 @@ xmlParseURIServer(xmlURIPtr uri, const char **str) {
 	if (uri != NULL) {
 	    if (uri->user != NULL) xmlFree(uri->user);
 	    if (uri->cleanup & 2)
-		uri->path = STRNDUP(*str, cur - *str);
+		uri->user = STRNDUP(*str, cur - *str);
 	    else
 		uri->user = xmlURIUnescapeString(*str, cur - *str, NULL);
 	}
@@ -1943,8 +1986,12 @@ xmlBuildURI(const xmlChar *URI, const xmlChar *base) {
 	}
 	if (bas->path != NULL)
 	    res->path = xmlMemStrdup(bas->path);
-	if (ref->query != NULL)
+	if (ref->query_raw != NULL)
+	    res->query_raw = xmlMemStrdup (ref->query_raw);
+	else if (ref->query != NULL)
 	    res->query = xmlMemStrdup(ref->query);
+	else if (bas->query_raw != NULL)
+	    res->query_raw = xmlMemStrdup(bas->query_raw);
 	else if (bas->query != NULL)
 	    res->query = xmlMemStrdup(bas->query);
 	if (ref->fragment != NULL)
@@ -1965,7 +2012,9 @@ xmlBuildURI(const xmlChar *URI, const xmlChar *base) {
     if (bas->scheme != NULL)
 	res->scheme = xmlMemStrdup(bas->scheme);
  
-    if (ref->query != NULL)
+    if (ref->query_raw != NULL)
+	res->query_raw = xmlMemStrdup(ref->query_raw);
+    else if (ref->query != NULL)
 	res->query = xmlMemStrdup(ref->query);
     if (ref->fragment != NULL)
 	res->fragment = xmlMemStrdup(ref->fragment);
diff --git a/valid.c b/valid.c
index a239e68..2510b8d 100644
--- a/valid.c
+++ b/valid.c
@@ -2724,7 +2724,7 @@ xmlIsID(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) {
     } else if (doc->type == XML_HTML_DOCUMENT_NODE) {
         if ((xmlStrEqual(BAD_CAST "id", attr->name)) ||
 	    ((xmlStrEqual(BAD_CAST "name", attr->name)) &&
-	    ((elem == NULL) || (!xmlStrEqual(elem->name, BAD_CAST "input")))))
+	    ((elem == NULL) || (xmlStrEqual(elem->name, BAD_CAST "a")))))
 	    return(1);
 	return(0);    
     } else if (elem == NULL) {
@@ -2998,19 +2998,32 @@ xmlAddRef(xmlValidCtxtPtr ctxt, xmlDocPtr doc, const xmlChar *value,
 	    xmlErrValid(NULL, XML_ERR_INTERNAL_ERROR,
 		    "xmlAddRef: Reference list creation failed!\n",
 		    NULL);
-            return(NULL);
+	    goto failed;
         }
         if (xmlHashAddEntry(table, value, ref_list) < 0) {
             xmlListDelete(ref_list);
 	    xmlErrValid(NULL, XML_ERR_INTERNAL_ERROR,
 		    "xmlAddRef: Reference list insertion failed!\n",
 		    NULL);
-            return(NULL);
+	    goto failed;
         }
     }
-/*    xmlListInsert(ref_list, ret); */
-    xmlListAppend(ref_list, ret);
+    if (xmlListAppend(ref_list, ret) != 0) {
+	xmlErrValid(NULL, XML_ERR_INTERNAL_ERROR,
+		    "xmlAddRef: Reference list insertion failed!\n",
+		    NULL);
+        goto failed;
+    }
     return(ret);
+failed:
+    if (ret != NULL) {
+        if (ret->value != NULL)
+	    xmlFree((char *)ret->value);
+        if (ret->name != NULL)
+	    xmlFree((char *)ret->name);
+        xmlFree(ret);
+    }
+    return(NULL);
 }
 
 /**
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 35f4a80..9046ff3 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -25,11 +25,13 @@ XML_SO = $(XML_BASENAME).dll
 XML_IMP = $(XML_BASENAME).lib
 XML_DEF = $(XML_BASENAME).def
 XML_A = $(XML_BASENAME)_a.lib
+XML_A_DLL = $(XML_BASENAME)_a_dll.lib
 
 # Place where we let the compiler put its output.
 BINDIR = bin.msvc
 XML_INTDIR = int.msvc
 XML_INTDIR_A = int.a.msvc
+XML_INTDIR_A_DLL = int.a.dll.msvc
 UTILS_INTDIR = int.utils.msvc
 
 # The preprocessor and its options.
@@ -56,6 +58,7 @@ CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H"
 !if "$(WITH_ZLIB)" == "1"
 CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H"
 !endif
+CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 
 # The linker and its options.
 LD = link.exe
@@ -181,6 +184,51 @@ XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\
 	$(XML_INTDIR_A)\xpointer.obj\
 	$(XML_INTDIR_A)\xmlstring.obj
 
+# Static libxml object files.
+XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\c14n.obj\
+	$(XML_INTDIR_A_DLL)\catalog.obj\
+	$(XML_INTDIR_A_DLL)\chvalid.obj\
+	$(XML_INTDIR_A_DLL)\debugXML.obj\
+	$(XML_INTDIR_A_DLL)\dict.obj\
+	$(XML_INTDIR_A_DLL)\DOCBparser.obj\
+	$(XML_INTDIR_A_DLL)\encoding.obj\
+	$(XML_INTDIR_A_DLL)\entities.obj\
+	$(XML_INTDIR_A_DLL)\error.obj\
+	$(XML_INTDIR_A_DLL)\globals.obj\
+	$(XML_INTDIR_A_DLL)\hash.obj\
+	$(XML_INTDIR_A_DLL)\HTMLparser.obj\
+	$(XML_INTDIR_A_DLL)\HTMLtree.obj\
+	$(XML_INTDIR_A_DLL)\legacy.obj\
+	$(XML_INTDIR_A_DLL)\list.obj\
+	$(XML_INTDIR_A_DLL)\nanoftp.obj\
+	$(XML_INTDIR_A_DLL)\nanohttp.obj\
+	$(XML_INTDIR_A_DLL)\parser.obj\
+	$(XML_INTDIR_A_DLL)\parserInternals.obj\
+	$(XML_INTDIR_A_DLL)\pattern.obj\
+	$(XML_INTDIR_A_DLL)\relaxng.obj\
+	$(XML_INTDIR_A_DLL)\SAX2.obj\
+	$(XML_INTDIR_A_DLL)\SAX.obj\
+	$(XML_INTDIR_A_DLL)\schematron.obj\
+	$(XML_INTDIR_A_DLL)\threads.obj\
+	$(XML_INTDIR_A_DLL)\tree.obj\
+	$(XML_INTDIR_A_DLL)\uri.obj\
+	$(XML_INTDIR_A_DLL)\valid.obj\
+	$(XML_INTDIR_A_DLL)\xinclude.obj\
+	$(XML_INTDIR_A_DLL)\xlink.obj\
+	$(XML_INTDIR_A_DLL)\xmlIO.obj\
+	$(XML_INTDIR_A_DLL)\xmlmemory.obj\
+	$(XML_INTDIR_A_DLL)\xmlreader.obj\
+	$(XML_INTDIR_A_DLL)\xmlregexp.obj\
+	$(XML_INTDIR_A_DLL)\xmlmodule.obj\
+	$(XML_INTDIR_A_DLL)\xmlsave.obj\
+	$(XML_INTDIR_A_DLL)\xmlschemas.obj\
+	$(XML_INTDIR_A_DLL)\xmlschemastypes.obj\
+	$(XML_INTDIR_A_DLL)\xmlunicode.obj\
+	$(XML_INTDIR_A_DLL)\xmlwriter.obj\
+	$(XML_INTDIR_A_DLL)\xpath.obj\
+	$(XML_INTDIR_A_DLL)\xpointer.obj\
+	$(XML_INTDIR_A_DLL)\xmlstring.obj
+
 # Xmllint and friends executables.
 UTILS = $(BINDIR)\xmllint.exe\
 	$(BINDIR)\xmlcatalog.exe\
@@ -206,17 +254,28 @@ UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe
 UTILS = $(UTILS) $(BINDIR)\testThreads.exe
 !endif
 
-all : libxml libxmla utils
+!if "$(VCMANIFEST)" == "1"
+_VC_MANIFEST_EMBED_EXE= if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL= if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+!else
+_VC_MANIFEST_EMBED_EXE=
+_VC_MANIFEST_EMBED_DLL=
+!endif
+
+all : libxml libxmla libxmladll utils
 
 libxml : $(BINDIR)\$(XML_SO) 
 
 libxmla : $(BINDIR)\$(XML_A)
 
+libxmladll : $(BINDIR)\$(XML_A_DLL)
+
 utils : $(UTILS)
 
 clean :
 	if exist $(XML_INTDIR) rmdir /S /Q $(XML_INTDIR)
 	if exist $(XML_INTDIR_A) rmdir /S /Q $(XML_INTDIR_A)
+	if exist $(XML_INTDIR_A_DLL) rmdir /S /Q $(XML_INTDIR_A_DLL)
 	if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR)
 	if exist $(BINDIR) rmdir /S /Q $(BINDIR)
 
@@ -234,6 +293,7 @@ install-libs : all
 	copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml
 	copy $(BINDIR)\$(XML_SO) $(SOPREFIX)
 	copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
+	copy $(BINDIR)\$(XML_A_DLL) $(LIBPREFIX)
 	copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
 
 install : install-libs 
@@ -266,6 +326,10 @@ $(XML_INTDIR) :
 $(XML_INTDIR_A) :
 	if not exist $(XML_INTDIR_A) mkdir $(XML_INTDIR_A)
 
+# Makes the static for dll libxml intermediate directory.
+$(XML_INTDIR_A_DLL) :
+	if not exist $(XML_INTDIR_A_DLL) mkdir $(XML_INTDIR_A_DLL)
+
 # An implicit rule for libxml compilation.
 {$(XML_SRCDIR)}.c{$(XML_INTDIR)}.obj::
 	$(CC) $(CFLAGS) /Fo$(XML_INTDIR)\ /c $<
@@ -274,12 +338,19 @@ $(XML_INTDIR_A) :
 {$(XML_SRCDIR)}.c{$(XML_INTDIR_A)}.obj::
 	$(CC) $(CFLAGS) /D "LIBXML_STATIC" /Fo$(XML_INTDIR_A)\ /c $<
 
+# An implicit rule for static for dll libxml compilation.
+{$(XML_SRCDIR)}.c{$(XML_INTDIR_A_DLL)}.obj::
+	$(CC) $(CFLAGS) /D "LIBXML_STATIC" /D "LIBXML_STATIC_FOR_DLL" /Fo$(XML_INTDIR_A_DLL)\ /c $<
+
 # Compiles libxml source. Uses the implicit rule for commands.
 $(XML_OBJS) : $(XML_INTDIR) 
 
 # Compiles static libxml source. Uses the implicit rule for commands.
 $(XML_OBJS_A) : $(XML_INTDIR_A) 
 
+# Compiles static for dll libxml source. Uses the implicit rule for commands.
+$(XML_OBJS_A_DLL) : $(XML_INTDIR_A_DLL) 
+
 # Creates the export definition file (DEF) for libxml.
 $(XML_INTDIR)\$(XML_DEF) : $(XML_INTDIR) $(XML_DEF).src
 	$(CPP) $(CPPFLAGS) $(XML_DEF).src > $(XML_INTDIR)\$(XML_DEF)
@@ -288,6 +359,7 @@ $(XML_INTDIR)\$(XML_DEF) : $(XML_INTDIR) $(XML_DEF).src
 $(BINDIR)\$(XML_SO) : $(BINDIR) $(XML_OBJS) $(XML_INTDIR)\$(XML_DEF)
 	$(LD) $(LDFLAGS) /DLL \
 		/IMPLIB:$(BINDIR)\$(XML_IMP) /OUT:$(BINDIR)\$(XML_SO) $(XML_OBJS) $(LIBS)
+	@$(_VC_MANIFEST_EMBED_DLL)
 
 #$(BINDIR)\$(XML_SO) : $(BINDIR) $(XML_OBJS) $(XML_INTDIR)\$(XML_DEF)
 #	$(LD) $(LDFLAGS) /DLL /DEF:$(XML_INTDIR)\$(XML_DEF) \
@@ -297,6 +369,9 @@ $(BINDIR)\$(XML_SO) : $(BINDIR) $(XML_OBJS) $(XML_INTDIR)\$(XML_DEF)
 $(BINDIR)\$(XML_A) : $(BINDIR) $(XML_OBJS_A)
 	$(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(XML_A) $(XML_OBJS_A)
 
+# Creates the libxml static for dll archive.
+$(BINDIR)\$(XML_A_DLL) : $(BINDIR) $(XML_OBJS_A_DLL)
+	$(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(XML_A_DLL) $(XML_OBJS_A_DLL)
 
 # Makes the utils intermediate directory.
 $(UTILS_INTDIR) :
@@ -307,14 +382,16 @@ $(UTILS_INTDIR) :
 {$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe:
 	$(CC) /D "LIBXML_STATIC" $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $< 
 	$(LD) $(LDFLAGS) /OUT:$@ $(XML_A) $(LIBS) $(UTILS_INTDIR)\$(atom, ctxt->neg,
 			       type, 0, 0, NULL);
 	}
+    } else {
+	ERROR("Wrong escape sequence, misuse of character '\\'");
     }
 }
 
@@ -5307,6 +5309,10 @@ xmlRegexpCompile(const xmlChar *regexp) {
     if (CUR != 0) {
 	ERROR("xmlFAParseRegExp: extra characters");
     }
+    if (ctxt->error != 0) {
+	xmlRegFreeParserCtxt(ctxt);
+	return(NULL);
+    }
     ctxt->end = ctxt->state;
     ctxt->start->type = XML_REGEXP_START_STATE;
     ctxt->end->type = XML_REGEXP_FINAL_STATE;
diff --git a/xmlsave.c b/xmlsave.c
index 231ee7b..b97327e 100644
--- a/xmlsave.c
+++ b/xmlsave.c
@@ -834,7 +834,6 @@ xmlDocContentDumpOutput(xmlSaveCtxtPtr ctxt, xmlDocPtr cur) {
     xmlCharEncodingOutputFunc oldescape = ctxt->escape;
     xmlCharEncodingOutputFunc oldescapeAttr = ctxt->escapeAttr;
     xmlOutputBufferPtr buf = ctxt->buf;
-    xmlCharEncodingHandlerPtr handler = NULL;
     xmlCharEncoding enc;
 
     xmlInitParser();
diff --git a/xmlwriter.c b/xmlwriter.c
index 2e67a4f..f618610 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -97,6 +97,7 @@ struct _xmlTextWriter {
 static void xmlFreeTextWriterStackEntry(xmlLinkPtr lk);
 static int xmlCmpTextWriterStackEntry(const void *data0,
                                       const void *data1);
+static int xmlTextWriterOutputNSDecl(xmlTextWriterPtr writer);
 static void xmlFreeTextWriterNsStackEntry(xmlLinkPtr lk);
 static int xmlCmpTextWriterNsStackEntry(const void *data0,
                                         const void *data1);
@@ -734,6 +735,11 @@ xmlTextWriterStartComment(xmlTextWriterPtr writer)
                 case XML_TEXTWRITER_NONE:
                     break;
                 case XML_TEXTWRITER_NAME:
+                    /* Output namespace declarations */
+                    count = xmlTextWriterOutputNSDecl(writer);
+                    if (count < 0)
+                        return -1;
+                    sum += count;
                     count = xmlOutputBufferWriteString(writer->out, ">");
                     if (count < 0)
                         return -1;
@@ -965,6 +971,11 @@ xmlTextWriterStartElement(xmlTextWriterPtr writer, const xmlChar * name)
 					sum += count;
 					/* fallthrough */
                 case XML_TEXTWRITER_NAME:
+                    /* Output namespace declarations */
+                    count = xmlTextWriterOutputNSDecl(writer);
+                    if (count < 0)
+                        return -1;
+                    sum += count;
                     count = xmlOutputBufferWriteString(writer->out, ">");
                     if (count < 0)
                         return -1;
@@ -1055,17 +1066,31 @@ xmlTextWriterStartElementNS(xmlTextWriterPtr writer,
     sum += count;
 
     if (namespaceURI != 0) {
+        xmlTextWriterNsStackEntry *p = (xmlTextWriterNsStackEntry *) 
+        xmlMalloc(sizeof(xmlTextWriterNsStackEntry));
+        if (p == 0) {
+            xmlWriterErrMsg(writer, XML_ERR_NO_MEMORY, 
+                            "xmlTextWriterStartElementNS : out of memory!\n");
+            return -1;
+        }
+
         buf = xmlStrdup(BAD_CAST "xmlns");
         if (prefix != 0) {
             buf = xmlStrcat(buf, BAD_CAST ":");
             buf = xmlStrcat(buf, prefix);
         }
 
-        count = xmlTextWriterWriteAttribute(writer, buf, namespaceURI);
-        xmlFree(buf);
-        if (count < 0)
+        p->prefix = buf;
+        p->uri = xmlStrdup(namespaceURI);
+        if (p->uri == 0) {
+            xmlWriterErrMsg(writer, XML_ERR_NO_MEMORY,
+                            "xmlTextWriterStartElementNS : out of memory!\n");
+            xmlFree(p);
             return -1;
-        sum += count;
+        }
+        p->elem = xmlListFront(writer->nodes);
+
+        xmlListPushFront(writer->nsstack, p);
     }
 
     return sum;
@@ -1091,22 +1116,37 @@ xmlTextWriterEndElement(xmlTextWriterPtr writer)
         return -1;
 
     lk = xmlListFront(writer->nodes);
-    if (lk == 0)
+    if (lk == 0) {
+        xmlListDelete(writer->nsstack);
+        writer->nsstack = NULL;
         return -1;
+    }
 
     p = (xmlTextWriterStackEntry *) xmlLinkGetData(lk);
-    if (p == 0)
+    if (p == 0) {
+        xmlListDelete(writer->nsstack);
+        writer->nsstack = NULL;
         return -1;
+    }
 
     sum = 0;
     switch (p->state) {
         case XML_TEXTWRITER_ATTRIBUTE:
             count = xmlTextWriterEndAttribute(writer);
-            if (count < 0)
+            if (count < 0) {
+                xmlListDelete(writer->nsstack);
+                writer->nsstack = NULL;
                 return -1;
+            }
             sum += count;
             /* fallthrough */
         case XML_TEXTWRITER_NAME:
+            /* Output namespace declarations */
+            count = xmlTextWriterOutputNSDecl(writer);
+            if (count < 0)
+                return -1;
+            sum += count;
+
             if (writer->indent) /* next element needs indent */
                 writer->doindent = 1;
             count = xmlOutputBufferWriteString(writer->out, "/>");
@@ -1184,6 +1224,12 @@ xmlTextWriterFullEndElement(xmlTextWriterPtr writer)
             sum += count;
             /* fallthrough */
         case XML_TEXTWRITER_NAME:
+            /* Output namespace declarations */
+            count = xmlTextWriterOutputNSDecl(writer);
+            if (count < 0)
+                return -1;
+            sum += count;
+
             count = xmlOutputBufferWriteString(writer->out, ">");
             if (count < 0)
                 return -1;
@@ -1767,6 +1813,57 @@ xmlTextWriterStartAttributeNS(xmlTextWriterPtr writer,
     if ((writer == NULL) || (name == NULL) || (*name == '\0'))
         return -1;
 
+    /* Handle namespace first in case of error */
+    if (namespaceURI != 0) {
+        xmlTextWriterNsStackEntry nsentry, *curns;
+
+        buf = xmlStrdup(BAD_CAST "xmlns");
+        if (prefix != 0) {
+            buf = xmlStrcat(buf, BAD_CAST ":");
+            buf = xmlStrcat(buf, prefix);
+        }
+
+        nsentry.prefix = buf;
+        nsentry.uri = (xmlChar *)namespaceURI;
+        nsentry.elem = xmlListFront(writer->nodes);
+
+        curns = (xmlTextWriterNsStackEntry *)xmlListSearch(writer->nsstack, 
+                                                           (void *)&nsentry);
+        if ((curns != NULL)) {
+            xmlFree(buf);
+            if (xmlStrcmp(curns->uri, namespaceURI) == 0) {
+                /* Namespace already defined on element skip */
+                buf = NULL;
+            } else {
+                /* Prefix mismatch so error out */
+                return -1;
+            }
+        }
+
+        /* Do not add namespace decl to list - it is already there */
+        if (buf != NULL) {
+            p = (xmlTextWriterNsStackEntry *)
+                xmlMalloc(sizeof(xmlTextWriterNsStackEntry));
+            if (p == 0) {
+                xmlWriterErrMsg(writer, XML_ERR_NO_MEMORY,
+								        "xmlTextWriterStartAttributeNS : out of memory!\n");
+                return -1;
+            }
+
+            p->prefix = buf;
+            p->uri = xmlStrdup(namespaceURI);
+            if (p->uri == 0) {
+                xmlWriterErrMsg(writer, XML_ERR_NO_MEMORY,
+                        "xmlTextWriterStartAttributeNS : out of memory!\n");
+                xmlFree(p);
+                return -1;
+            }
+            p->elem = xmlListFront(writer->nodes);
+
+            xmlListPushFront(writer->nsstack, p);
+        }
+    }
+
     buf = NULL;
     if (prefix != 0) {
         buf = xmlStrdup(prefix);
@@ -1781,34 +1878,6 @@ xmlTextWriterStartAttributeNS(xmlTextWriterPtr writer,
         return -1;
     sum += count;
 
-    if (namespaceURI != 0) {
-        buf = xmlStrdup(BAD_CAST "xmlns");
-        if (prefix != 0) {
-            buf = xmlStrcat(buf, BAD_CAST ":");
-            buf = xmlStrcat(buf, prefix);
-        }
-
-        p = (xmlTextWriterNsStackEntry *)
-            xmlMalloc(sizeof(xmlTextWriterNsStackEntry));
-        if (p == 0) {
-            xmlWriterErrMsg(writer, XML_ERR_NO_MEMORY,
-                            "xmlTextWriterStartAttributeNS : out of memory!\n");
-            return -1;
-        }
-
-        p->prefix = buf;
-        p->uri = xmlStrdup(namespaceURI);
-        if (p->uri == 0) {
-            xmlWriterErrMsg(writer, XML_ERR_NO_MEMORY,
-                            "xmlTextWriterStartAttributeNS : out of memory!\n");
-            xmlFree(p);
-            return -1;
-        }
-        p->elem = xmlListFront(writer->nodes);
-
-        xmlListPushFront(writer->nsstack, p);
-    }
-
     return sum;
 }
 
@@ -1827,22 +1896,17 @@ xmlTextWriterEndAttribute(xmlTextWriterPtr writer)
     int sum;
     xmlLinkPtr lk;
     xmlTextWriterStackEntry *p;
-    xmlTextWriterNsStackEntry *np;
 
     if (writer == NULL)
         return -1;
 
     lk = xmlListFront(writer->nodes);
     if (lk == 0) {
-        xmlListDelete(writer->nsstack);
-	writer->nsstack = NULL;
         return -1;
     }
 
     p = (xmlTextWriterStackEntry *) xmlLinkGetData(lk);
     if (p == 0) {
-        xmlListDelete(writer->nsstack);
-	writer->nsstack = NULL;
         return -1;
     }
 
@@ -1853,45 +1917,11 @@ xmlTextWriterEndAttribute(xmlTextWriterPtr writer)
 
             count = xmlOutputBufferWrite(writer->out, 1, &writer->qchar);
             if (count < 0) {
-                xmlListDelete(writer->nsstack);
-		writer->nsstack = NULL;
                 return -1;
             }
             sum += count;
-
-            while (!xmlListEmpty(writer->nsstack)) {
-	        xmlChar *namespaceURI = NULL;
-		xmlChar *prefix = NULL;
-
-                lk = xmlListFront(writer->nsstack);
-                np = (xmlTextWriterNsStackEntry *) xmlLinkGetData(lk);
-
-		if (np != 0) {
-		    namespaceURI = xmlStrdup(np->uri);
-		    prefix = xmlStrdup(np->prefix);
-		}
-
-		xmlListPopFront(writer->nsstack);
-
-                if (np != 0) {
-                    count =
-                        xmlTextWriterWriteAttribute(writer, prefix,
-                                                    namespaceURI);
-		    xmlFree(namespaceURI);
-		    xmlFree(prefix);
-
-                    if (count < 0) {
-                        xmlListDelete(writer->nsstack);
-			writer->nsstack = NULL;
-                        return -1;
-                    }
-                    sum += count;
-                }
-            }
             break;
-
         default:
-            xmlListClear(writer->nsstack);
             return -1;
     }
 
@@ -2080,38 +2110,24 @@ xmlTextWriterWriteAttributeNS(xmlTextWriterPtr writer,
 {
     int count;
     int sum;
-    xmlChar *buf;
 
     if ((writer == NULL) || (name == NULL) || (*name == '\0'))
         return -1;
 
-    buf = NULL;
-    if (prefix != NULL) {
-        buf = xmlStrdup(prefix);
-        buf = xmlStrcat(buf, BAD_CAST ":");
-    }
-    buf = xmlStrcat(buf, name);
-
     sum = 0;
-    count = xmlTextWriterWriteAttribute(writer, buf, content);
-    xmlFree(buf);
+    count = xmlTextWriterStartAttributeNS(writer, prefix, name, namespaceURI);
+    if (count < 0)
+        return -1;
+    sum += count;
+    count = xmlTextWriterWriteString(writer, content);
+    if (count < 0)
+        return -1;
+    sum += count;
+    count = xmlTextWriterEndAttribute(writer);
     if (count < 0)
         return -1;
     sum += count;
 
-    if (namespaceURI != NULL) {
-        buf = NULL;
-        buf = xmlStrdup(BAD_CAST "xmlns");
-        if (prefix != NULL) {
-            buf = xmlStrcat(buf, BAD_CAST ":");
-            buf = xmlStrcat(buf, prefix);
-        }
-        count = xmlTextWriterWriteAttribute(writer, buf, namespaceURI);
-        xmlFree(buf);
-        if (count < 0)
-            return -1;
-        sum += count;
-    }
     return sum;
 }
 
@@ -2358,6 +2374,11 @@ xmlTextWriterStartPI(xmlTextWriterPtr writer, const xmlChar * target)
                     sum += count;
                     /* fallthrough */
                 case XML_TEXTWRITER_NAME:
+                    /* Output namespace declarations */
+                    count = xmlTextWriterOutputNSDecl(writer);
+                    if (count < 0)
+                        return -1;
+                    sum += count;
                     count = xmlOutputBufferWriteString(writer->out, ">");
                     if (count < 0)
                         return -1;
@@ -2592,6 +2613,11 @@ xmlTextWriterStartCDATA(xmlTextWriterPtr writer)
                     sum += count;
                     /* fallthrough */
                 case XML_TEXTWRITER_NAME:
+                    /* Output namespace declarations */
+                    count = xmlTextWriterOutputNSDecl(writer);
+                    if (count < 0)
+                        return -1;
+                    sum += count;
                     count = xmlOutputBufferWriteString(writer->out, ">");
                     if (count < 0)
                         return -1;
@@ -4247,6 +4273,51 @@ xmlCmpTextWriterStackEntry(const void *data0, const void *data1)
  * misc
  */
 
+/**
+ * xmlTextWriterOutputNSDecl:
+ * @writer:  the xmlTextWriterPtr
+ *
+ * Output the current namespace declarations.
+ */
+static int
+xmlTextWriterOutputNSDecl(xmlTextWriterPtr writer)
+{
+    xmlLinkPtr lk;
+    xmlTextWriterNsStackEntry *np;
+    int count;
+    int sum;
+
+    sum = 0;
+    while (!xmlListEmpty(writer->nsstack)) {
+        xmlChar *namespaceURI = NULL;
+        xmlChar *prefix = NULL;
+
+        lk = xmlListFront(writer->nsstack);
+        np = (xmlTextWriterNsStackEntry *) xmlLinkGetData(lk);
+
+        if (np != 0) {
+            namespaceURI = xmlStrdup(np->uri);
+            prefix = xmlStrdup(np->prefix);
+        }
+
+        xmlListPopFront(writer->nsstack);
+
+        if (np != 0) {
+            count = xmlTextWriterWriteAttribute(writer, prefix, namespaceURI);
+            xmlFree(namespaceURI);
+            xmlFree(prefix);
+
+            if (count < 0) {
+                xmlListDelete(writer->nsstack);
+                writer->nsstack = NULL;
+                return -1;
+            }
+            sum += count;
+        }
+    }
+    return sum;
+}
+
 /**
  * xmlFreeTextWriterNsStackEntry:
  * @lk:  the xmlLinkPtr
@@ -4300,8 +4371,8 @@ xmlCmpTextWriterNsStackEntry(const void *data0, const void *data1)
 
     rc = xmlStrcmp(p0->prefix, p1->prefix);
 
-    if (rc == 0)
-        rc = p0->elem == p1->elem;
+    if ((rc != 0) || (p0->elem != p1->elem))
+        rc = -1;
 
     return rc;
 }
@@ -4568,6 +4639,11 @@ xmlTextWriterHandleStateDependencies(xmlTextWriterPtr writer,
         sum = 0;
         switch (p->state) {
             case XML_TEXTWRITER_NAME:
+                /* Output namespace declarations */
+                count = xmlTextWriterOutputNSDecl(writer);
+                if (count < 0)
+                    return -1;
+                sum += count;
                 extra[0] = '>';
                 p->state = XML_TEXTWRITER_TEXT;
                 break;
diff --git a/xpath.c b/xpath.c
index 8c35e30..8f6545a 100644
--- a/xpath.c
+++ b/xpath.c
@@ -2648,9 +2648,10 @@ xmlXPathPopExternal (xmlXPathParserContextPtr ctxt) {
 
 #define UPPER_DOUBLE 1E9
 #define LOWER_DOUBLE 1E-5
+#define	LOWER_DOUBLE_EXP 5
 
 #define INTEGER_DIGITS DBL_DIG
-#define FRACTION_DIGITS (DBL_DIG + 1)
+#define FRACTION_DIGITS (DBL_DIG + 1 + (LOWER_DOUBLE_EXP))
 #define EXPONENT_DIGITS (3 + 2)
 
 /**
@@ -2701,8 +2702,16 @@ xmlXPathFormatNumber(double number, char buffer[], int buffersize)
 		*ptr = 0;
 	    }
 	} else {
-	    /* 3 is sign, decimal point, and terminating zero */
-	    char work[DBL_DIG + EXPONENT_DIGITS + 3];
+	    /*
+	      For the dimension of work,
+	          DBL_DIG is number of significant digits
+		  EXPONENT is only needed for "scientific notation"
+	          3 is sign, decimal point, and terminating zero
+		  LOWER_DOUBLE_EXP is max number of leading zeroes in fraction
+	      Note that this dimension is slightly (a few characters)
+	      larger than actually necessary.
+	    */
+	    char work[DBL_DIG + EXPONENT_DIGITS + 3 + LOWER_DOUBLE_EXP];
 	    int integer_place, fraction_place;
 	    char *ptr;
 	    char *after_fraction;
@@ -2725,24 +2734,25 @@ xmlXPathFormatNumber(double number, char buffer[], int buffersize)
 		size = snprintf(work, sizeof(work),"%*.*e",
 			 integer_place, fraction_place, number);
 		while ((size > 0) && (work[size] != 'e')) size--;
-		after_fraction = work + size;
 
 	    }
 	    else {
 		/* Use regular notation */
-		if (absolute_value > 0.0)
-		    integer_place = 1 + (int)log10(absolute_value);
-		else
-		    integer_place = 0;
-		fraction_place = (integer_place > 0)
-		    ? DBL_DIG - integer_place
-		    : DBL_DIG;
+		if (absolute_value > 0.0) {
+		    integer_place = (int)log10(absolute_value);
+		    if (integer_place > 0)
+		        fraction_place = DBL_DIG - integer_place - 1;
+		    else
+		        fraction_place = DBL_DIG - integer_place;
+		} else {
+		    fraction_place = 1;
+		}
 		size = snprintf(work, sizeof(work), "%0.*f",
 				fraction_place, number);
-		after_fraction = work + size;
 	    }
 
 	    /* Remove fractional trailing zeroes */
+	    after_fraction = work + size;
 	    ptr = after_fraction;
 	    while (*(--ptr) == '0')
 		;
@@ -3184,6 +3194,11 @@ xmlXPathCmpNodesExt(xmlNodePtr node1, xmlNodePtr node2) {
 
 turtle_comparison:
 
+    if (miscNode1 != NULL)
+	node1 = miscNode1;
+    if (miscNode2 != NULL)
+	node2 = miscNode2;
+
     if (node1 == node2->prev)
 	return(1);
     if (node1 == node2->next)
@@ -4602,12 +4617,13 @@ xmlXPathNodeTrailingSorted (xmlNodeSetPtr nodes, xmlNodePtr node) {
 	return(ret);
 
     l = xmlXPathNodeSetGetLength(nodes);
-    for (i = l; i > 0; i--) {
+    for (i = l - 1; i >= 0; i--) {
 	cur = xmlXPathNodeSetItem(nodes, i);
 	if (cur == node)
 	    break;
 	xmlXPathNodeSetAddUnique(ret, cur);
     }
+    xmlXPathNodeSetSort(ret);	/* bug 413451 */
     return(ret);
 }
 
@@ -5573,7 +5589,10 @@ xmlXPathCastNumberToString (double val) {
  */
 xmlChar *
 xmlXPathCastNodeToString (xmlNodePtr node) {
-    return(xmlNodeGetContent(node));
+xmlChar *ret;
+    if ((ret = xmlNodeGetContent(node)) == NULL)
+	ret = xmlStrdup((const xmlChar *) "");
+    return(ret);
 }
 
 /**
@@ -14678,8 +14697,7 @@ xmlXPathCompiledEvalInternal(xmlXPathCompExprPtr comp,
 	do {
 	    tmp = valuePop(pctxt);
 	    if (tmp != NULL) {
-		if (tmp != NULL)
-		    stack++; 
+		stack++; 
 		xmlXPathReleaseObject(ctxt, tmp);
 	    }
 	} while (tmp != NULL);
diff --git a/xstc/Makefile.am b/xstc/Makefile.am
index 57e1a4a..2d24f02 100644
--- a/xstc/Makefile.am
+++ b/xstc/Makefile.am
@@ -41,7 +41,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Metadata/$(MSTTESTDEF) Tests/M
 	   else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi)
 	-@(if [ -f $(TARBALL_2) ] ; then \
 	   echo -n "extracting test data (NIST)..." ; \
-	   $(TAR) -xzf $(TARBALL_2) '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \
+	   $(TAR) -xzf $(TARBALL_2) --wildcards '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \
 	   echo "done" ; \
 	   fi)
 	-@(if [ ! -f $(TARBALL) ] ; then \
@@ -53,7 +53,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Metadata/$(MSTTESTDEF) Tests/M
 	   else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi)
 	-@(if [ -f $(TARBALL) ] ; then \
 	   echo -n "extracting test data (Sun, Microsoft)..." ; \
-	   $(TAR) -C Tests -xzf $(TARBALL) '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
+	   $(TAR) -C Tests -xzf $(TARBALL) --wildcards '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
 	   if [ -d Tests/suntest ] ; then rm -r Tests/suntest ; fi ; \
 	   if [ -d Tests/msxsdtest ] ; then rm -r Tests/msxsdtest ; fi ; \
 	   mv Tests/xmlschema2002-01-16/* Tests ; \
@@ -126,7 +126,7 @@ tests:
 valgrind:
 	-@(if [ -x $(PYTHON) ] ; then 					\
 	   echo '## Running the regression tests under Valgrind' ;	\
-	   $(MAKE) CHECKER='valgrind' MAKEFLAGS+=--silent pytests ; fi);
+	   $(MAKE) CHECKER='valgrind -q' MAKEFLAGS+=--silent pytests ; fi);
 
 clean:
 	rm -f $(PYSCRIPTS) test.log
diff --git a/xstc/Makefile.in b/xstc/Makefile.in
index f889d3f..33533c0 100644
--- a/xstc/Makefile.in
+++ b/xstc/Makefile.in
@@ -461,7 +461,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Metadata/$(MSTTESTDEF) Tests/M
 	   else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi)
 	-@(if [ -f $(TARBALL_2) ] ; then \
 	   echo -n "extracting test data (NIST)..." ; \
-	   $(TAR) -xzf $(TARBALL_2) '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \
+	   $(TAR) -xzf $(TARBALL_2) --wildcards '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \
 	   echo "done" ; \
 	   fi)
 	-@(if [ ! -f $(TARBALL) ] ; then \
@@ -473,7 +473,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Metadata/$(MSTTESTDEF) Tests/M
 	   else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi)
 	-@(if [ -f $(TARBALL) ] ; then \
 	   echo -n "extracting test data (Sun, Microsoft)..." ; \
-	   $(TAR) -C Tests -xzf $(TARBALL) '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
+	   $(TAR) -C Tests -xzf $(TARBALL) --wildcards '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
 	   if [ -d Tests/suntest ] ; then rm -r Tests/suntest ; fi ; \
 	   if [ -d Tests/msxsdtest ] ; then rm -r Tests/msxsdtest ; fi ; \
 	   mv Tests/xmlschema2002-01-16/* Tests ; \
@@ -546,7 +546,7 @@ tests:
 valgrind:
 	-@(if [ -x $(PYTHON) ] ; then 					\
 	   echo '## Running the regression tests under Valgrind' ;	\
-	   $(MAKE) CHECKER='valgrind' MAKEFLAGS+=--silent pytests ; fi);
+	   $(MAKE) CHECKER='valgrind -q' MAKEFLAGS+=--silent pytests ; fi);
 
 clean:
 	rm -f $(PYSCRIPTS) test.log
-- 
cgit v1.2.3


From d03a853bb0370d89552eceee59df1746da4a37f8 Mon Sep 17 00:00:00 2001
From: Mike Hommey 
Date: Sun, 1 Mar 2009 10:53:23 +0100
Subject: Import upstream version 2.7.0

---
 ChangeLog                                |  450 ++++-
 HTMLparser.c                             |   23 +-
 Makefile.am                              |   62 +-
 Makefile.in                              |  157 +-
 Makefile.tests                           |   10 +-
 NEWS                                     |   74 +-
 README.tests                             |    7 +-
 SAX2.c                                   |   12 +-
 aclocal.m4                               |   38 +-
 catalog.c                                |    4 +-
 configure                                |   96 +-
 configure.in                             |   16 +-
 depcomp                                  |   33 +-
 dict.c                                   |  357 +++-
 doc/APIchunk1.html                       |    2 +
 doc/APIchunk10.html                      |   11 +-
 doc/APIchunk11.html                      |    8 +
 doc/APIchunk12.html                      |    8 +-
 doc/APIchunk13.html                      |   16 +-
 doc/APIchunk14.html                      |    5 +
 doc/APIchunk15.html                      |   11 +-
 doc/APIchunk17.html                      |    7 +
 doc/APIchunk18.html                      |    6 +
 doc/APIchunk19.html                      |   22 +-
 doc/APIchunk2.html                       |    3 -
 doc/APIchunk20.html                      |    3 +
 doc/APIchunk21.html                      |    7 +
 doc/APIchunk22.html                      |   64 +-
 doc/APIchunk23.html                      |   43 +-
 doc/APIchunk24.html                      |   11 +
 doc/APIchunk25.html                      |    3 +-
 doc/APIchunk26.html                      |    5 +
 doc/APIchunk27.html                      |    8 +
 doc/APIchunk28.html                      |    7 +
 doc/APIchunk3.html                       |    2 -
 doc/APIchunk4.html                       |    5 -
 doc/APIchunk5.html                       |    1 +
 doc/APIchunk6.html                       |    5 +-
 doc/APIchunk7.html                       |   20 +-
 doc/APIchunk8.html                       |    2 +-
 doc/APIchunk9.html                       |    9 +-
 doc/APIconstructors.html                 |    2 +
 doc/APIfiles.html                        |   20 +
 doc/APIfunctions.html                    |    5 +
 doc/APIsymbols.html                      |   20 +
 doc/FAQ.html                             |   26 +-
 doc/Makefile.in                          |   17 +-
 doc/apibuild.py                          |   44 +-
 doc/devhelp/Makefile.in                  |    4 +-
 doc/devhelp/libxml2-c14n.html            |    4 +-
 doc/devhelp/libxml2-entities.html        |    5 +
 doc/devhelp/libxml2-globals.html         |   16 +-
 doc/devhelp/libxml2-parser.html          |    5 +-
 doc/devhelp/libxml2-parserInternals.html |   14 +-
 doc/devhelp/libxml2-relaxng.html         |    8 +-
 doc/devhelp/libxml2-schematron.html      |    8 +-
 doc/devhelp/libxml2-tree.html            |   28 +-
 doc/devhelp/libxml2-uri.html             |    6 +-
 doc/devhelp/libxml2-valid.html           |    4 +-
 doc/devhelp/libxml2-xmlerror.html        |    4 +
 doc/devhelp/libxml2-xmlmemory.html       |    5 +
 doc/devhelp/libxml2-xmlreader.html       |    4 +-
 doc/devhelp/libxml2-xmlregexp.html       |    4 +-
 doc/devhelp/libxml2-xmlschemas.html      |   73 +-
 doc/devhelp/libxml2.devhelp              |   20 +
 doc/examples/Makefile.am                 |  104 +-
 doc/examples/Makefile.in                 |  121 +-
 doc/examples/examples.xml                |  464 ++---
 doc/examples/reader3.c                   |    5 +-
 doc/html/libxml-c14n.html                |    2 +-
 doc/html/libxml-entities.html            |    5 +-
 doc/html/libxml-globals.html             |    8 +-
 doc/html/libxml-parser.html              |    3 +
 doc/html/libxml-parserInternals.html     |   14 +-
 doc/html/libxml-relaxng.html             |    4 +-
 doc/html/libxml-schematron.html          |    4 +-
 doc/html/libxml-tree.html                |   27 +-
 doc/html/libxml-uri.html                 |    6 +-
 doc/html/libxml-valid.html               |    4 +-
 doc/html/libxml-xmlerror.html            |    4 +
 doc/html/libxml-xmlmemory.html           |    5 +-
 doc/html/libxml-xmlreader.html           |    2 +-
 doc/html/libxml-xmlregexp.html           |    2 +-
 doc/html/libxml-xmlschemas.html          |   65 +-
 doc/libxml2-api.xml                      |  346 ++--
 doc/libxml2.xsa                          |   54 +-
 doc/news.html                            |   26 +-
 doc/news.xsl                             |    2 +-
 doc/xml.html                             |   53 +-
 elfgcchack.h                             |   12 +
 encoding.c                               |    8 +-
 entities.c                               |  122 +-
 example/Makefile.in                      |   19 +-
 gentest.py                               |    5 +-
 include/Makefile.in                      |   17 +-
 include/libxml/Makefile.in               |   17 +-
 include/libxml/c14n.h                    |   46 +-
 include/libxml/entities.h                |   40 +-
 include/libxml/globals.h                 |   46 +-
 include/libxml/parser.h                  |    7 +-
 include/libxml/parserInternals.h         |    2 +-
 include/libxml/relaxng.h                 |   19 +-
 include/libxml/schematron.h              |   19 +-
 include/libxml/tree.h                    |   29 +-
 include/libxml/uri.h                     |   36 +-
 include/libxml/xmlerror.h                |    4 +
 include/libxml/xmlmemory.h               |   44 +-
 include/libxml/xmlreader.h               |  188 +-
 include/libxml/xmlregexp.h               |   42 +-
 include/libxml/xmlschemas.h              |   48 +-
 include/libxml/xmlversion.h              |    8 +-
 include/wsockcompat.h                    |    1 +
 libxml.spec.in                           |    2 +-
 libxml2.spec                             |    8 +-
 macos/src/XMLTestPrefix.h.orig           |    1 -
 nanoftp.c                                |    2 +-
 nanohttp.c                               |    4 +-
 parser.c                                 | 2753 +++++++++++++++----------
 parserInternals.c                        |    4 +-
 pattern.c                                |   10 +-
 python/Makefile.in                       |   27 +-
 python/generator.py                      |  760 +++----
 python/libxml.c                          |    5 +
 python/libxml_wrap.h                     |    4 +
 python/setup.py                          |    2 +-
 python/tests/Makefile.in                 |    4 +-
 python/types.c                           |    2 +
 relaxng.c                                |    4 +
 runsuite.c                               |    2 +-
 runtest.c                                |  165 +-
 runxmlconf.c                             |  603 ++++++
 testapi.c                                |  235 ++-
 testchar.c                               |  615 ++++++
 testdict.c                               |  444 +++++
 testrecurse.c                            |  973 +++++++++
 threads.c                                |    8 +-
 tree.c                                   |  706 ++++---
 uri.c                                    | 3216 +++++++++++++++---------------
 valid.c                                  |  279 ++-
 win32/Makefile.msvc.orig                 |  462 -----
 win32/libxml2.def.src                    |    3 +
 xinclude.c                               |    4 +-
 xmlIO.c                                  |   21 +-
 xmllint.c                                |   17 +
 xmlmemory.c                              |  143 +-
 xmlreader.c                              |   16 +-
 xmlregexp.c                              |   67 +-
 xmlschemas.c                             | 2205 ++++++++++----------
 xpath.c                                  |  792 ++++----
 xstc/Makefile.in                         |    4 +-
 150 files changed, 11637 insertions(+), 7023 deletions(-)
 delete mode 100644 macos/src/XMLTestPrefix.h.orig
 create mode 100644 runxmlconf.c
 create mode 100644 testchar.c
 create mode 100644 testdict.c
 create mode 100644 testrecurse.c
 delete mode 100644 win32/Makefile.msvc.orig

(limited to 'doc/devhelp/libxml2-uri.html')

diff --git a/ChangeLog b/ChangeLog
index 4da35e4..1f976e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,338 @@
+Sat Aug 30 14:50:16 CEST 2008 Daniel Veillard 
+
+	* include/libxml/tree.h tree.c: make a new kind of buffer where
+	  shrinking and adding in head can avoid reallocation or full
+	  buffer memmoves
+	* encoding.c xmlIO.c: use the new kind of buffers for output
+	  buffers
+
+Sat Aug 30 10:18:13 CEST 2008 Daniel Veillard 
+
+	* doc/* testapi.c: regenerated
+
+Fri Aug 29 21:53:12 CEST 2008 Daniel Veillard 
+
+	* doc/examples/reader3.c: patch from  Robert Schwebel , allows to
+	  compile the example if configured without output support fixes
+	  #545582
+	* Makefile.am: add testrecurse to the make check tests
+	* HTMLparser.c: if the parser got a encoding argument it should be
+	  used over what the meta specifies, patch fixing #536346
+
+Fri Aug 29 14:41:38 CEST 2008 Daniel Veillard 
+
+	* parser.c: a couple more fixes
+	* nanohttp.c nanoftp.c: patch from Andreas Färber to compile on Haiku
+	  fixes #527880
+	* doc/examples/*: regenerated
+
+Thu Aug 28 17:31:46 CEST 2008 Daniel Veillard 
+
+	* parser.c include/libxml/parser.h: completely different fix for
+	  the recursion detection based on entity density, big cleanups
+	  in the entity parsing code too
+	* result/*.sax*: the parser should not ask for used defined versions
+	  of the predefined entities
+	* testrecurse.c: automatic test for entity recursion checks
+	* Makefile.am: added testrecurse
+	* test/recurse/lol* test/recurse/good*: a first set of tests for
+	  the recursion
+
+Wed Aug 27 21:55:34 CEST 2008 Daniel Veillard 
+
+	* include/libxml/xmlerror.h parser.c: a bit of cleanup and
+	  added checks based on the regression tests of the xmlconf suite
+
+Wed Aug 27 19:22:35 CEST 2008 Daniel Veillard 
+
+	* uri.c: bug in parsing RFC 3986 uris with port numbers
+
+Wed Aug 27 17:30:48 CEST 2008 Daniel Veillard 
+
+	* configure.in Makefile.am: add an --with-coverage configure option
+	  and a 'make cov' target based on gcc profiling and the lcov
+	  tool. Currently at 68.9% coverage out of 'make check' and 
+	  runsuite executions.
+	* xmlreader.c: remove warnings due to C++ comments
+
+Wed Aug 27 15:00:54 CEST 2008 Daniel Veillard 
+
+	* include/libxml/parserInternals.h parser.c: cleanup entity
+	  pushing error handling based on a patch from Ashwin
+
+Wed Aug 27 13:41:26 CEST 2008 Daniel Veillard 
+
+	* threads.c: fix a small initialization problem raised by Ashwin
+	* testapi.c gentest.py: increase testing especially for document
+	  with an internal subset, and entities
+	* tree.c: fix a deallocation issue when unlinking entities from
+	  a document.
+	* valid.c: fix a missing entry point test not found previously.
+	* doc/*: regenerated the APIs, docs etc.
+
+Tue Aug 26 15:02:58 CEST 2008 Daniel Veillard 
+
+	* include/libxml/parser.h parser.c xmllint.c: strengthen some
+	  of the internal parser limits, add an XML_PARSE_HUGE option
+	  to bypass them all. More internal parser limits will still need
+	  to be added.
+
+Tue Aug 26 09:42:08 CEST 2008 Daniel Veillard 
+
+	* Makefile.am: add the testchar to 'make check'
+	* xmlschemas.c: Volker Grabsch pointed out a typo
+	* xmlregexp.c: production [19] from XML Schemas regexps were a
+	  mistake removed in version REC-xmlschema-2-20041028, Volker Grabsch
+	  provided a patch to remove it
+	* test/schemas/regexp-char-ref_0.xml test/schemas/regexp-char-ref_0.xsd
+	  test/schemas/regexp-char-ref_1.xsd result/schemas/regexp-char-ref_0_0
+	  result/schemas/regexp-char-ref_1_0: Volker Grabsch also provided
+	  regession tests for this
+
+Tue Aug 26 09:25:39 CEST 2008 Daniel Veillard 
+
+	* include/libxml/parser.h xinclude.c xmllint.c: patch based on
+	  Wieant Nielander contribution to add the option of not doing
+	  URI base fixup in XInclude
+
+Mon Aug 25 16:52:53 CEST 2008 Daniel Veillard 
+
+	* xmlreader.c: applied patch from Aswin to fix tree skipping
+	* include/libxml/entities.h entities.c: fixed a comment and
+	  added a new xmlNewEntity() entry point
+	* runtest.c: be less verbose
+	* tree.c: space and tabs cleanups
+
+Mon Aug 25 10:56:30 CEST 2008 Daniel Veillard 
+
+	* include/libxml/entities.h entities.c SAX2.c parser.c: rework
+	  the patch to avoid some ABI issue with people allocating
+	  entities structure directly
+
+Wed Aug 20 19:02:01 CEST 2008 Daniel Veillard 
+
+	* include/libxml/parser.h include/libxml/entities.h entities.c
+	  parserInternals.c parser.c: fix for CVE-2008-3281
+
+Sun Aug 10 17:06:13 CEST 2008 Rob Richards 
+
+	* dict.c: fix non GNUC builds.
+
+Fri Aug  8 14:13:06 CEST 2008 Daniel Veillard 
+
+	* makefile.am: adding a check-valgrind target
+
+Fri Aug  8 14:01:59 CEST 2008 Daniel Veillard 
+
+	* Makefile.am testdict.c: add the new test in 'make check' and
+	  update it to check subdictionaries processing.
+
+Fri Aug  8 12:07:20 CEST 2008 Daniel Veillard 
+
+	* testdict.c: added a program to regression test the dictionary code
+	* dict.c: improve the lookup efficiency by caching the key.
+
+Thu Aug  7 18:30:55 CEST 2008 Daniel Veillard 
+
+	* dict.c: chased and found a couple of nasty issues
+
+Thu Aug  7 15:51:31 CEST 2008 Sven Herzberg 
+
+	Bug 546629 – runtests doesn't pass on my mac
+	Reviewed by William M. Brack.
+
+	* runtest.c: use libpthread on Mac OS X as well
+
+Wed Aug  6 12:24:33 CEST 2008 Daniel Veillard 
+
+	* uri.c: allow [ and ] in fragment identifiers, 3986 disallow them
+	  but it's widely used for XPointer, and would break DocBook
+	  processing among others
+
+Wed Aug  6 11:32:21 CEST 2008 Daniel Veillard 
+
+	* dict.c: change the big key algorithm to work properly with QName
+	  too, fix a bug with dict size and sub dictionaries
+
+Mon Aug  4 17:27:27 CEST 2008 Daniel Veillard 
+
+	* uri.c include/libxml/uri.h: rewrite the URI parser to update to
+	  rfc3986 (from 2396)
+	* test/errors/webdav.xml result/errors/webdav.xml*: removed the
+	  error test, 'DAV:' is a correct URI under 3986
+	* Makefile.am: small cleanup in make check
+
+Thu Jul 31 21:49:45 CEST 2008 Daniel Veillard 
+
+	* runxmlconf.c: more progresses against the official regression tests
+	* runsuite.c: small cleanup for non-leak reports
+	* include/libxml/tree.h: parsing flags and other properties are
+	  now added to the document node, this is generally useful and
+	  allow to make Name and NmToken validations based on the parser
+	  flags, more specifically the 5th edition of XML or not
+	* HTMLparser.c tree.c: small side effects for the previous changes
+	* parser.c SAX2.c valid.c: the bulk of teh changes are here,
+	  the parser and validation behaviour can be affected, parsing
+	  flags need to be copied, lot of changes. Also fixing various
+	  validation problems in the regression tests.
+
+Thu Jul 31 10:15:53 CEST 2008 Daniel Veillard 
+
+	* runxmlconf.c: added a skipped list, insert rmt-ns10-035
+	* Makefile.am: improve 'make check'
+	* include/libxml/xmlerror.h parser.c: clean up namespace errors
+	  checking and reporting, errors when a document is labelled
+	  as UTF-16 while it is parsed as UTF-8 and no encoding was given
+	  explicitely.
+	* result/errors/webdav.xml.*: some warnings are no recategorized
+	  as Namespace errors
+
+Wed Jul 30 14:55:54 CEST 2008 Daniel Veillard 
+
+	* include/libxml/xmlmemory.h xmlmemory.c: add xmlMemDisplayLast to
+	  help debug incremental memory leaks, and some cleanups
+	* runxmlconf.c: use that new call and avoid ever touching the
+	  system catalog in the regression tests
+
+Wed Jul 30 14:33:33 CEST 2008 Daniel Veillard 
+
+	* parser.c include/libxml/xmlerror.h: an XML-1.0 document can't load
+	  an 1.1 entity
+	* runxmlconf.c: when using entities make sure we load them
+
+Tue Jul 29 18:43:07 CEST 2008 Daniel Veillard 
+
+	* parser.c: fix a bug not detecting cross entity comments probably
+	  when comment parsing got optimized.
+	* Makefile.am: add make check
+	* runxmlconf.c: fix the log file name
+
+Tue Jul 29 18:09:26 CEST 2008 Daniel Veillard 
+
+	* runxmlconf.c Makefile.am: add a C program to run the W3C test
+	  suite, work in progress
+	* xmllint.c: add a new option --oldxml10 to use the old parser
+	* parser.c: fix the XML_PARSE_OLD10 processing of the new option
+	  and a bug in version parsing
+
+Tue Jul 29 11:12:40 CEST 2008 Daniel Veillard 
+
+	* xpath.c: space and tabs cleanup
+
+Tue Jul 29 10:59:36 CEST 2008 Daniel Veillard 
+
+	* include/libxml/parser.h include/libxml/xmlerror.h parser.c:
+	  implement XML-1.0 5th edition, add parser option XML_PARSE_OLD10
+	  to stick to old behaviour
+	* testapi.c gentest.py: modified slightly and regenerated
+	* Makefile.am: add testchar
+
+Thu Jul 24 16:57:20 CEST 2008 Daniel Veillard 
+
+	* Makefile.am testchar.c Makefile.tests README.tests: add a
+	  new regression test program for testing character ranges and
+	  UTF8 encoding/decoding
+
+Wed Jul 23 15:32:39 CEST 2008 Daniel Veillard 
+
+	* libxml.spec.in: fix the build root
+
+Wed Jul 16 22:28:48 PDT 2008 William Brack 
+
+	* pattern.c: fix problem with xmlStreamPop when pattern includes
+	  a "." element (see discussion on libxslt list)
+
+Mon Jul  7 15:49:59 CEST 2008 Daniel Veillard 
+
+	* SAX2.c: fix line number on text nodes, problem raised by Ralf Junker
+
+Sun Jun 29 17:04:28 CEST 2008 Rob Richards 
+	* xmlschemas.c: fix crash with invalid whitespace facet
+
+Wed Jun 11 10:13:02 CEST 2008 Daniel Veillard 
+
+	* doc/xml.html doc/FAQ.html: add a section in the FAQ about
+	  multithread and xmlCleanupParser
+
+Tue Jun 10 16:52:17 CEST 2008 Daniel Veillard 
+
+	* catalog.c: apply a couple of fixes based on a Coverity report
+	  forwarded by Derrick Price.
+	* VxWorks/README VxWorks/Makefile VxWorks/build.sh: instructions
+	  Makefile, and shell script to build on VxWorks 6.4+ provided by
+	  Jim Wert.
+
+Tue Jun  3 18:07:13 CEST 2008 Daniel Veillard 
+
+	* python/generator.py python/setup.py: apply patch from Martin fixing
+	  python whitespaces
+	* NEWS: following previous commit rebuilt now in UTF-8
+
+Mon Jun  2 17:39:42 CEST 2008 Daniel Veillard 
+
+	* ChangeLog: patch from Hans de Goede to switch the file to UTF-8
+	* doc/news.xsl: switch to generate the NEWS file in UTF-8 instead of
+	  ISO-8859-1
+
+Mon May 12 15:12:44 CEST 2008 Daniel Veillard 
+
+	* xmlregexp.c: avoid a regexp crash, should fix #523738
+
+Mon May 12 14:56:06 CEST 2008 Daniel Veillard 
+
+	* xmlschemas.c runtest.c testapi.c include/libxml/xmlreader.h
+	  python/types.c python/libxml_wrap.h python/libxml.c: fx compilation
+	  when configured without the reader should fix #513110
+	* doc/*: regenerated
+
+Sat May  3 14:33:29 CEST 2008 Rob Richards 
+
+	* dict.c: check for stdint.h and define types when using MSVC
+
+Mon Apr 28 20:06:12 CEST 2008 Daniel Veillard 
+
+	* parserInternals.c: applied patch from Ashwin to avoid a potential
+	  double-free
+
+Thu Apr 24 13:56:53 CEST 2008 Daniel Veillard 
+
+	* uri.c: applied patch from Ashwin fixing a number of realloc problems
+	* HTMLparser.c: improve handling for misplaced html/head/body
+
+Tue Apr 22 10:27:17 CEST 2008 Daniel Veillard 
+
+	* dict.c: improvement on the hashing of the dictionnary, with visible
+	  speed up as the number of strings in the hash increases, work from
+	  Stefan Behnel
+
+Fri Apr 11 14:44:00 CEST 2008 Daniel Veillard 
+
+	* include/libxml/xmlschemas.h xmlschemas.c: added new function
+	  xmlSchemaValidCtxtGetParserCtxt based on Holger Kaelberer patch
+	* doc/apibuild.py doc/*: regenerated the doc, chased why the new
+	  function didn't got any documentation, added more checking in the
+	  generator
+	* include/libxml/relaxng.h include/libxml/schematron.h
+	  include/libxml/xmlschemas.h include/libxml/c14n.h
+	  include/libxml/xmlregexp.h include/libxml/globals.h
+	  include/libxml/xmlreader.h threads.c xmlschemas.c: various changes
+	  and cleanups following the new reports
+
+
+Thu Apr 10 10:07:00 CEST 2008 Daniel Veillard 
+
+	* Makefile.am: extend the cleanup rule
+	* xmlschemas.c: space cleanup
+
+Wed Apr  9 19:43:25 CEST 2008 Rob Richards 
+
+	* include/wsockcompat.h: support older win32 platforms when building
+	  with newer versions of VS
+
+Tue Apr  8 16:56:07 CEST 2008 Daniel Veillard 
+
+	* configure.in NEWS doc/*: preparing release of 2.6.32
+
 Tue Apr  8 10:19:01 CEST 2008 Daniel Veillard 
 
 	* tree.c: fix a bug introduced when fixing #438208 and reported by
@@ -481,7 +816,7 @@ Wed Jun 13 13:33:38 PDT 2007 William Brack 
 Tue Jun 12 18:17:28 CEST 2007 Daniel Veillard 
 
 	* doc/* configure.in NEWS: release of libxml2 2.6.29
-	* valid.c: patch from Dagfinn I. Manns�ker for idness of name
+	* valid.c: patch from Dagfinn I. Mannsåker for idness of name
 	  in HTML, c.f. bug #305885.
 
 Tue Jun 12 17:14:08 CEST 2007 Daniel Veillard 
@@ -571,7 +906,7 @@ Wed May 30 22:05:08 PDT 2007 William Brack 
 
 Mon May 28 16:14:50 CEST 2007 Daniel Veillard 
 
-	* uri.c: fix bug reported by Fran�ois Delyon
+	* uri.c: fix bug reported by François Delyon
 
 Tue May 22 08:59:48 PDT 2007 William Brack 
 
@@ -602,7 +937,7 @@ Fri May 11 22:45:18 HKT 2007 William Brack 
 Thu May 10 01:52:42 CEST 2007 Daniel Veillard 
 
 	* list.c: applied patch to fix xmlListAppend() from 
-	  Georges-Andr� SILBER
+	  Georges-André SILBER
 	* valid.c: also fix the place wher it was called.
 
 Wed May  2 18:47:33 CEST 2007 Daniel Veillard 
@@ -700,7 +1035,7 @@ Wed Mar 21 14:23:08 HKT 2007 William Brack 
 
 Tue Mar 20 09:58:13 CET 2007  Daniel Veillard 
 
-	* nanoftp.c: applied patch from Bj�rn Wiberg to try to fix again
+	* nanoftp.c: applied patch from Björn Wiberg to try to fix again
 	  the silly __ss_familly problem on various AIXes, should fix #420184
 
 Wed Mar 14 20:30:38 HKT 2007 William Brack 
@@ -772,7 +1107,7 @@ Wed Jan 31 10:25:38 PST 2007 William Brack 
 
 Fri Jan 26 00:05:18 PST 2007 William Brack 
 
-	* implemented patch from St�phane Bidoul for uri.c (bug #389767)
+	* implemented patch from Stéphane Bidoul for uri.c (bug #389767)
 
 Thu Jan 25 11:15:08 PST 2007 William Brack 
 
@@ -2481,7 +2816,7 @@ Fri Sep  9 12:56:19 CEST 2005 Daniel Veillard 
 
 Thu Sep  8 23:39:41 CEST 2005 Daniel Veillard 
 
-	* xmllint.c: patch from St�phane Bidoul to compile without schematron
+	* xmllint.c: patch from Stéphane Bidoul to compile without schematron
 
 Wed Sep  7 00:16:27 CEST 2005 Daniel Veillard 
 
@@ -4314,7 +4649,7 @@ Sun Jan 30 19:27:23 CET 2005 Daniel Veillard 
 	* pattern.c include/libxml/pattern.h xmllint.c: added a 
 	  streaming pattern detector for a subset of XPath, should
 	  help Kasimier for identity constraints
-	* python/generator.py: applied Stephane Bidoul patch to find
+	* python/generator.py: applied Stéphane Bidoul patch to find
 	  paths without breaking.
 
 Fri Jan 28 18:53:40 CET 2005 Daniel Veillard 
@@ -5903,7 +6238,7 @@ Thu Jul  1 14:53:36 CEST 2004 Daniel Veillard 
 
 	* python/libxml.c python/generator.py python/libxml.py
 	  python/libxml2-python-api.xml python/libxml2class.txt:
-	  applied patch from St�phane Bidoul to fix some Python bindings
+	  applied patch from Stéphane Bidoul to fix some Python bindings
 	  initialization, then had to change the parserCleanup() 
 	  to handle memory released there.
 	* xmlmemory.c: added more debugging comments.
@@ -6294,7 +6629,7 @@ Tue May 11 23:04:47 HKT 2004 William Brack 
 Tue May 11 09:06:53 CEST 2004 Daniel Veillard 
 
 	* python/tests/tstLastError.py: better portability fix for f(*args),
-	  use apply(f, args) as Stephane Bidoul suggested
+	  use apply(f, args) as Stéphane Bidoul suggested
 
 Mon May 10 15:49:22 HKT 2004 William Brack 
 
@@ -7159,7 +7494,7 @@ Wed Jan 21 10:59:55 CET 2004 Daniel Veillard 
 Thu Jan 15 00:48:46 CET 2004 Daniel Veillard 
 
 	* python/generator.py python/tests/tstLastError.py: applied
-	  patch from Stephane Bidoul to add enums to the Python bindings.
+	  patch from Stéphane Bidoul to add enums to the Python bindings.
 
 Tue Jan 13 21:50:05 CET 2004 Daniel Veillard 
 
@@ -7202,7 +7537,7 @@ Tue Jan  6 23:51:46 CET 2004 Daniel Veillard 
 
 	* python/libxml2-python-api.xml python/libxml_wrap.h python/types.c
 	  python/tests/Makefile.am python/tests/tstLastError.py: applied 
-	  patch from Stephane Bidoul for structured error handling from
+	  patch from Stéphane Bidoul for structured error handling from
 	  python, and the associated test
 
 Tue Jan  6 23:18:11 HKT 2004 William Brack 
@@ -7285,7 +7620,7 @@ Sun Jan  4 08:57:51 HKT 2004 William Brack 
 
 Fri Jan  2 21:22:18 CET 2004 Daniel Veillard 
 
-	* error.c: applied patch from St�phane Bidoul for structured error
+	* error.c: applied patch from Stéphane Bidoul for structured error
 	  reporting.
 
 Fri Jan  2 21:03:17 CET 2004 Daniel Veillard 
@@ -7314,7 +7649,7 @@ Wed Dec 31 22:02:37 HKT 2003 William Brack 
 Wed Dec 31 15:55:55 HKT 2003 William Brack 
 
 	* python/generator.py, python/libxml2class.txt: fixed problem
-	  pointed out by St�phane Bidoul on the list.
+	  pointed out by Stéphane Bidoul on the list.
 	* xinclude.c, xpointer.c, xpath.c, include/libxml/xpointer.h:
 	  completed modifications required to fix Bug 129967 (at last!).
 	  Now wait to see how long before further trouble...
@@ -8204,17 +8539,17 @@ Wed Oct 22 14:33:05 CEST 2003 Daniel Veillard 
 
 Wed Oct 22 10:50:31 CEST 2003 Daniel Veillard 
 
-	* chvalid.c genChRanges.py: Stephane Bidoul pointed out another
+	* chvalid.c genChRanges.py: Stéphane Bidoul pointed out another
 	  small glitch missing a const
 
 Wed Oct 22 10:43:21 CEST 2003 Daniel Veillard 
 
-	* chvalid.c genChRanges.py: Stephane Bidoul pointed out that
+	* chvalid.c genChRanges.py: Stéphane Bidoul pointed out that
 	  it doesn't define IN_LIBXML
 
 Tue Oct 21 21:14:55 CEST 2003 Daniel Veillard 
 
-	* win32/Makefile.mingw: typo pointed out by Stephane Bidoul
+	* win32/Makefile.mingw: typo pointed out by Stéphane Bidoul
 
 Tue Oct 21 11:26:36 CEST 2003 Daniel Veillard 
 
@@ -8574,7 +8909,7 @@ Tue Oct  7 13:30:39 CEST 2003 Daniel Veillard 
 Mon Oct  6 10:46:35 CEST 2003 Daniel Veillard 
 
 	* win32/Makefile.bcb win32/Makefile.mingw win32/Makefile.msvc
-	  win32/configure.js: applied patch from St�phane Bidoul to
+	  win32/configure.js: applied patch from Stéphane Bidoul to
 	  fix the compilation of 2.6.0 code on Win32
 
 Mon Oct  6 10:16:30 CEST 2003 Daniel Veillard 
@@ -8820,7 +9155,7 @@ Thu Sep 25 14:16:51 CEST 2003 Daniel Veillard 
 
 Wed Sep 24 23:42:08 CEST 2003 Daniel Veillard 
 
-	* win32/configure.js: patch from Stephane Bidoul for configuring
+	* win32/configure.js: patch from Stéphane Bidoul for configuring
 	  the beta2 version #123104
 
 Wed Sep 24 23:17:59 CEST 2003 Daniel Veillard 
@@ -9117,7 +9452,7 @@ Sat Sep  6 10:55:01 PTD 2003 William Brack 
 
 Fri Sep  5 10:33:42 CEST 2003 Daniel Veillard 
 
-	* include/libxml/globals.h: patch from St�phane Bidoul to export
+	* include/libxml/globals.h: patch from Stéphane Bidoul to export
 	  globals entry points to the python bindings
 
 Wed Sep  3 15:24:41 CEST 2003 Daniel Veillard 
@@ -9842,7 +10177,7 @@ Tue May 20 14:21:23 CEST 2003 Daniel Veillard 
 
 Sat May 17 12:53:11 CEST 2003 Igor Zlatkovic 
 
-	* threads.c: applied the patch from St�phane Bidoul for getting
+	* threads.c: applied the patch from Stéphane Bidoul for getting
 	  rid of extra threads in a dynamic library.
 	* win32/configure.js: threads default to 'native' now.
 
@@ -9854,7 +10189,7 @@ Fri May 16 13:17:52 EDT 2003 Daniel Veillard 
 Thu May 15 18:06:18 EDT 2003 Daniel Veillard 
 
 	* build_glob.py global.data globals.c parser.c
-	  include/libxml/globals.h: patch from St�phane Bidoul for setting
+	  include/libxml/globals.h: patch from Stéphane Bidoul for setting
 	  up threads global defaults.
 	* doc/libxml2-api.xml: this extends the API with new functions
 	* python/tests/Makefile.am python/tests/reader2.py
@@ -9911,7 +10246,7 @@ Sun May 11 16:13:20 EDT 2003 Daniel Veillard 
 
 Sat May 10 16:01:21 EDT 2003 Daniel Veillard 
 
-	* relaxng.c: St�phane Bidoul found an off by one addressing
+	* relaxng.c: Stéphane Bidoul found an off by one addressing
 	  error on the error handling.
 
 Fri May  9 19:08:20 EDT 2003 Daniel Veillard 
@@ -9970,7 +10305,7 @@ Mon Apr 28 02:19:00 CEST 2003 Igor Zlatkovic 
 Mon Apr 28 00:12:11 CEST 2003 Daniel Veillard 
 
 	* win32/configure.js python/setup.py.in: applied patch
-	  from St�phane Bidoul for the Python bindings on the new
+	  from Stéphane Bidoul for the Python bindings on the new
 	  release.
 
 Sun Apr 27 17:56:21 CEST 2003 Igor Zlatkovic 
@@ -10001,7 +10336,7 @@ Sat Apr 26 14:00:58 CEST 2003 Daniel Veillard 
 	* python/generator.py: fixed a problem in the generator where
 	  the way functions are remapped as methods on classes was
 	  not symetric and dependant on python internal hash order,
-	  as reported by St�phane Bidoul
+	  as reported by Stéphane Bidoul
 
 Fri Apr 25 21:52:33 MDT 2003 John Fleck 
 
@@ -10806,7 +11141,7 @@ Sun Feb 16 16:40:52 CET 2003 Daniel Veillard 
 	* relaxng.c: more bug-hunting
 	* testRelax.c include/libxml/relaxng.h: added --tree to dump the
 	  intermediate rng tree
-	* python/generator.py: patch from Stephane Bidoul to fix the generator
+	* python/generator.py: patch from Stéphane Bidoul to fix the generator
 	  on python < 2.2
 
 Fri Feb 14 17:49:26 CET 2003 Daniel Veillard 
@@ -10942,7 +11277,7 @@ Wed Feb  5 12:00:36 CET 2003 Daniel Veillard 
 Wed Feb  5 11:43:58 CET 2003 Daniel Veillard 
 
 	* SAX.c: added the redefinition of namespaced attribute
-	  check that was missing as Fabrice Desr� pointed out.
+	  check that was missing as Fabrice Desré pointed out.
 
 Wed Feb  5 11:09:29 CET 2003 Daniel Veillard 
 
@@ -11165,7 +11500,7 @@ Thu Jan 23 17:41:37 CET 2003 Daniel Veillard 
 Tue Jan 21 13:19:35 CET 2003 Daniel Veillard 
 
 	* xmlreader.c doc/apibuild.py: applied a new patch from
-	  St�phane Bidoul for cleanups
+	  Stéphane Bidoul for cleanups
 	* doc/libxml2-api.xml: rebuilt the API description with
 	  new entry points
 
@@ -11173,7 +11508,7 @@ Mon Jan 20 23:25:00 CET 2003 Daniel Veillard 
 
 	* xmlreader.c python/drv_libxml2.py python/generator.py
 	  python/libxml.c python/libxml.py python/libxml_wrap.h
-	  python/types.c: patch from St�phane Bidoul for better per
+	  python/types.c: patch from Stéphane Bidoul for better per
 	  context error message APIs
 	* python/tests/ctxterror.py python/tests/readererr.py:
 	  update of the tests
@@ -11187,7 +11522,7 @@ Fri Jan 17 00:31:30 CET 2003 Daniel Veillard 
 
 	* xmlreader.c include/libxml/xmlreader.h python/generator.py
 	  python/libxml.c python/libxml.py win32/libxml2.def.src: applied
-	  a patch from St�phane Bidoul to allow per XMLtextReader error
+	  a patch from Stéphane Bidoul to allow per XMLtextReader error
 	  and warning handling
 	* python/tests/Makefile.am python/tests/readererr.py: adding the
 	  specific regression test
@@ -11199,7 +11534,7 @@ Tue Jan 14 17:00:08 CET 2003 Daniel Veillard 
 
 Tue Jan 14 15:39:14 CET 2003 Daniel Veillard 
 
-	* python/libxml.c: cleanup patch from St�phane Bidoul
+	* python/libxml.c: cleanup patch from Stéphane Bidoul
 
 Tue Jan 14 14:41:18 CET 2003 Daniel Veillard 
 
@@ -11209,7 +11544,7 @@ Tue Jan 14 12:40:29 CET 2003 Daniel Veillard 
 
 	* python/generator.py python/libxml.c python/libxml.py
 	  python/libxml_wrap.h python/types.c: applied and fixed a patch
-	  from St�phane Bidoul to provide per parser error handlers at the
+	  from Stéphane Bidoul to provide per parser error handlers at the
 	  Python level.
 	* python/tests/Makefile.am python/tests/ctxterror.py: added a
 	  regression test for it.
@@ -11261,7 +11596,7 @@ Fri Jan 10 00:16:49 CET 2003 Daniel Veillard 
 
 Thu Jan  9 22:35:31 CET 2003 Daniel Veillard 
 
-	* python/drv_libxml2.py: update from St�phane Bidoul: python 2.1
+	* python/drv_libxml2.py: update from Stéphane Bidoul: python 2.1
 	  support and improved error handler registration
 
 Thu Jan  9 14:16:38 CET 2003 Daniel Veillard 
@@ -11351,7 +11686,7 @@ Sat Jan  4 17:33:17 CET 2003 Daniel Veillard 
 
 Sat Jan  4 13:46:14 CET 2003 Daniel Veillard 
 
-	* python/setup.py.in: patch from St�phane Bidoul to include
+	* python/setup.py.in: patch from Stéphane Bidoul to include
 	  drv_libxml2.py in setup.py
 
 Sat Jan  4 01:43:06 CET 2003 Daniel Veillard 
@@ -11378,13 +11713,13 @@ Fri Jan  3 02:17:18 CET 2003 Daniel Veillard 
 Thu Jan  2 15:15:26 CET 2003 Daniel Veillard 
 
 	* xmlreader.c python/tests/reader.py: another couple of problem
-	  related to IsEmptyElement reported by St�phane Bidoul needed 
+	  related to IsEmptyElement reported by Stéphane Bidoul needed 
 	  some fixes.
 
 Thu Jan  2 13:57:07 CET 2003 Daniel Veillard 
 
 	* libxml.spec.in python/Makefile.am python/drv_libxml2.py:
-	  integrated drv_libxml2.py Python xml.sax driver from St�phane Bidoul
+	  integrated drv_libxml2.py Python xml.sax driver from Stéphane Bidoul
 	  based on the python XmlTextReader interface.
 
 Wed Jan  1 22:05:40 CET 2003 Daniel Veillard 
@@ -11407,38 +11742,38 @@ Wed Jan  1 20:12:07 CET 2003 Daniel Veillard 
 Wed Jan  1 16:09:57 CET 2003 Daniel Veillard 
 
 	* xmlreader.c python/tests/reader.py: fixed another couple of
-	  xmlreader bugs reported by St�phane Bidoul and added tests.
+	  xmlreader bugs reported by Stéphane Bidoul and added tests.
 
 Wed Jan  1 15:42:54 CET 2003 Daniel Veillard 
 
 	* xmlreader.c python/tests/reader2.py: fixed another validity
-	  checking in external parsed entities raised by St�phane Bidoul
+	  checking in external parsed entities raised by Stéphane Bidoul
 	  and added a specific regression test.
 	* python/tests/reader3.py: cleanup
 
 Tue Dec 31 15:44:02 CET 2002 Daniel Veillard 
 
 	* xmlreader.c python/tests/reader2.py: fixed a problem with
-	  validation within entities pointed by St�phane Bidoul, augmented
+	  validation within entities pointed by Stéphane Bidoul, augmented
 	  the tests to catch those.
 
 Tue Dec 31 12:15:37 CET 2002 Daniel Veillard 
 
 	* python/generator.py: modified the generator to allow keeping
 	  class references when creating new classes, needed to fix a bug
-	  pointed by St�phane Bidoul where the input buffer of the
+	  pointed by Stéphane Bidoul where the input buffer of the
 	  xmlTextReader instance gets destroyed if the python wrapper for
 	  the input is not referenced anymore.
 
 Mon Dec 30 19:39:36 CET 2002 Daniel Veillard 
 
 	* xmlreader.c python/tests/reader.py: fixed another pair of problem
-	  pointed by St�phane Bidoul: depth start at 0 and a parse problem.
+	  pointed by Stéphane Bidoul: depth start at 0 and a parse problem.
 
 Mon Dec 30 13:36:50 CET 2002 Daniel Veillard 
 
 	* xmlreader.c python/tests/reader.py: fixed another problem
-	  pointed by St�phane Bidoul
+	  pointed by Stéphane Bidoul
 
 Mon Dec 30 12:39:55 CET 2002 Daniel Veillard 
 
@@ -11460,7 +11795,7 @@ Mon Dec 30 00:59:07 CET 2002 Daniel Veillard 
 Sun Dec 29 12:13:18 CET 2002 Daniel Veillard 
 
 	* xmlreader.c python/tests/reader.py: fixed a bug pointed out
-	  by St�phane Bidoul and integrated it into the tests
+	  by Stéphane Bidoul and integrated it into the tests
 
 Sat Dec 28 23:49:12 CET 2002 Daniel Veillard 
 
@@ -11522,7 +11857,7 @@ Mon Dec 23 16:54:22 CET 2002 Daniel Veillard 
 
 Mon Dec 23 15:42:24 CET 2002 Daniel Veillard 
 
-	* python/libxml.c python/setup.py.in: patch from St�phane Bidoul
+	* python/libxml.c python/setup.py.in: patch from Stéphane Bidoul
 	  for Python 2.1
 
 Sun Dec 22 11:24:06 CET 2002 Daniel Veillard 
@@ -11724,7 +12059,7 @@ Wed Nov 27 12:40:16 CET 2002 Daniel Veillard 
 
 Wed Nov 27 09:00:00 CET 2002 Daniel Veillard 
 
-	* python/setup.py.in: another patch from St�phane Bidoul for 
+	* python/setup.py.in: another patch from Stéphane Bidoul for 
 	  Python bindings on Windows
 	* doc/parsedecl.py: small cleanup
 
@@ -11749,7 +12084,7 @@ Sat Nov 23 17:22:22 CET 2002 Daniel Veillard 
 Sat Nov 23 12:21:24 CET 2002 Daniel Veillard 
 
 	* python/generator.py python/libxml.c python/setup.py.in: trying
-	  to fix the Python bindings build on Windows (St�phane Bidoul)
+	  to fix the Python bindings build on Windows (Stéphane Bidoul)
 
 Fri Nov 22 22:41:34 CEST 2002 Igor Zlatkovic 
 
@@ -13139,7 +13474,7 @@ Mon Apr  1 10:02:57 CEST 2002 Daniel Veillard 
 
 Fri Mar 29 23:41:53 CET 2002 Daniel Veillard 
 
-	* libxml.m4: Fr�d�ric Crozat gave a patch related to the change
+	* libxml.m4: Frédéric Crozat gave a patch related to the change
 	  of Include paths breaking the libxml.m4
 
 Fri Mar 29 18:25:54 CET 2002 Daniel Veillard 
@@ -15981,7 +16316,7 @@ Fri May 11 19:37:30 CEST 2001 Daniel Veillard 
 
 Fri May 11 16:07:13 CEST 2001 Daniel Veillard 
 
-	* HTMLparser.c: Patch from Jonas Borgstr�m
+	* HTMLparser.c: Patch from Jonas Borgström
 	(htmlGetEndPriority): New function, returns 
 	the priority of a certain element.
 	(htmlAutoCloseOnClose): Only close inline elements if they 
@@ -16049,7 +16384,7 @@ Thu May  3 12:47:46 CEST 2001 Daniel Veillard 
 
 Thu May  3 10:25:19 CEST 2001 Daniel Veillard 
 
-	* HTMLparser.c: trying to fix the problem reported by Jonas Borgstr�m
+	* HTMLparser.c: trying to fix the problem reported by Jonas Borgström
 	* results/HTML/ : a few changes in the output of the HTML tests as
 	  a result.
 	* configure.in: tying to fix -liconv where needed
@@ -16065,7 +16400,7 @@ Wed May  2 18:39:39 CEST 2001 Daniel Veillard 
 
 Wed May  2 14:39:57 CEST 2001 Daniel Veillard 
 
-	* DOCBparser.c: patche from  L�szl� Kov�cs, fixed entities refs
+	* DOCBparser.c: patche from  László Kovács, fixed entities refs
 	  in attributes handling
 
 Wed May  2 12:56:04 CEST 2001 Daniel Veillard 
@@ -16147,7 +16482,7 @@ Thu Apr 26 16:35:53 CEST 2001 Daniel Veillard 
 
 Thu Apr 26 12:57:58 CEST 2001 Daniel Veillard 
 
-	* DOCBparser.c: patche from  L�szl� Kov�cs
+	* DOCBparser.c: patche from  László Kovács
 
 Thu Apr 26 11:31:54 CEST 2001 Daniel Veillard 
 
@@ -16155,7 +16490,7 @@ Thu Apr 26 11:31:54 CEST 2001 Daniel Veillard 
 
 Thu Apr 26 11:14:56 CEST 2001 Daniel Veillard 
 
-	* error.c: Jean Fran�ois Lecomte provided a complete description
+	* error.c: Jean François Lecomte provided a complete description
 	  and a fix to bug #53537
 
 Thu Apr 26 09:42:58 CEST 2001 Daniel Veillard 
@@ -16169,7 +16504,7 @@ Wed Apr 25 21:05:31 CEST 2001 Daniel Veillard 
 
 Wed Apr 25 17:52:27 CEST 2001 Daniel Veillard 
 
-	* DOCBparser.c include/Makefile.am: two patches from  L�szl� Kov�cs
+	* DOCBparser.c include/Makefile.am: two patches from László Kovács
 
 Wed Apr 25 14:56:26 CEST 2001 Daniel Veillard 
 
@@ -16211,7 +16546,7 @@ Tue Apr 24 14:10:38 CEST 2001 Daniel Veillard 
 
 Tue Apr 24 13:21:36 CEST 2001 Daniel Veillard 
 
-	* HTMLparser.c: Jonas Borgstr�m patch, the , and  elements
+	* HTMLparser.c: Jonas Borgström patch, the , and  elements
 	  now means the end of any open ,,,,,.
 
 Mon Apr 23 15:40:04 CEST 2001 Daniel Veillard 
@@ -17013,7 +17348,7 @@ Wed Jan  3 21:51:13 CET 2001 Daniel Veillard 
 Wed Jan  3 18:56:00 CET 2001 Daniel Veillard 
 
 	* HTMLparser.c: htmlCheckParagraph to check htmlOmittedDefaultValue,
-	  reported by Jonas Borgstr�m
+	  reported by Jonas Borgström
 	* nanohttp.c: Applied Bjorn Reese' IPV6 first patch
 
 Wed Jan  3 16:19:39 CET 2001 Daniel Veillard 
@@ -18636,7 +18971,7 @@ Sun Jul 11 18:16:34 CEST 1999 Daniel Veillard 
 	* example/Makefile.am, configure.in: added the makefile for the
 	  gjobread example
 
-Sat Jul 10 14:19:11 CEST 1999 Tomasz K�oczko  
+Sat Jul 10 14:19:11 CEST 1999 Tomasz Kłoczko  
 
 	* doc/Makefile.am:
 	- fix which allow "make install DESTDIR=".
@@ -18739,7 +19074,7 @@ Wed Mar 24 21:37:02 CET 1999 Daniel Veillard 
 
 	* parser.c, parserInternals.h: moved the chars macro definitions
 	  to parserInternals.h
-	* parser.c, error.c: applied patches from "Knut �kesson"
+	* parser.c, error.c: applied patches from "Knut Åkesson"
 	   for clean compilation under MSVC 6 :-o
 
 Tue Mar 23 11:10:15 CET 1999 Daniel Veillard 
@@ -19046,3 +19381,6 @@ Fri Jul 24 16:47:14 1998  Daniel Veillard 
 	* migrated to automake
 	* prefixed the filenames by xml_ to avoid filename clashes
 
+#
+# vim: set enc=utf-8
+#
diff --git a/HTMLparser.c b/HTMLparser.c
index 92503a1..57e64df 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -2143,6 +2143,7 @@ htmlNewDocNoDtD(const xmlChar *URI, const xmlChar *ExternalID) {
     cur->refs = NULL;
     cur->_private = NULL;
     cur->charset = XML_CHAR_ENCODING_UTF8;
+    cur->properties = XML_DOC_HTML | XML_DOC_USERBUILT;
     if ((ExternalID != NULL) ||
 	(URI != NULL))
 	xmlCreateIntSubset(cur, BAD_CAST "html", ExternalID, URI);
@@ -3482,6 +3483,7 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
 	             "htmlParseStartTag: misplaced  tag\n",
 		     name, NULL);
 	discardtag = 1;
+	ctxt->depth++;
     }
     if ((ctxt->nameNr != 1) && 
 	(xmlStrEqual(name, BAD_CAST"head"))) {
@@ -3489,6 +3491,7 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
 	             "htmlParseStartTag: misplaced  tag\n",
 		     name, NULL);
 	discardtag = 1;
+	ctxt->depth++;
     }
     if (xmlStrEqual(name, BAD_CAST"body")) {
 	int indx;
@@ -3498,6 +3501,7 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
 		             "htmlParseStartTag: misplaced  tag\n",
 			     name, NULL);
 		discardtag = 1;
+		ctxt->depth++;
 	    }
 	}
     }
@@ -3648,7 +3652,6 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
     name = htmlParseHTMLName(ctxt);
     if (name == NULL)
         return (0);
-
     /*
      * We should definitely be at the ending "S? '>'" part
      */
@@ -3668,6 +3671,18 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
     } else
         NEXT;
 
+    /*
+     * if we ignored misplaced tags in htmlParseStartTag don't pop them
+     * out now.
+     */
+    if ((ctxt->depth > 0) &&
+        (xmlStrEqual(name, BAD_CAST "html") ||
+         xmlStrEqual(name, BAD_CAST "body") ||
+	 xmlStrEqual(name, BAD_CAST "head"))) {
+	ctxt->depth--;
+	return (0);
+    }
+
     /*
      * If the name read is not one of the element in the parsing stack
      * then return, it's just an error.
@@ -5958,8 +5973,12 @@ htmlDoRead(htmlParserCtxtPtr ctxt, const char *URL, const char *encoding,
         xmlCharEncodingHandlerPtr hdlr;
 
 	hdlr = xmlFindCharEncodingHandler(encoding);
-	if (hdlr != NULL)
+	if (hdlr != NULL) {
 	    xmlSwitchToEncoding(ctxt, hdlr);
+	    if (ctxt->input->encoding != NULL)
+	      xmlFree((xmlChar *) ctxt->input->encoding);
+            ctxt->input->encoding = xmlStrdup((xmlChar *)encoding);
+        }
     }
     if ((URL != NULL) && (ctxt->input != NULL) &&
         (ctxt->input->filename == NULL))
diff --git a/Makefile.am b/Makefile.am
index 5061f46..de57c46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAG
 
 noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
                 testThreads testC14N testAutomata testRegexp \
-                testReader testapi testModule runtest runsuite
+                testReader testapi testModule runtest runsuite testchar \
+		testdict runxmlconf testrecurse
 
 bin_PROGRAMS = xmllint xmlcatalog
 
@@ -55,6 +56,21 @@ runtest_LDFLAGS =
 runtest_DEPENDENCIES = $(DEPS)
 runtest_LDADD= @BASE_THREAD_LIBS@ @RDL_LIBS@ $(LDADDS)
 
+testrecurse_SOURCES=testrecurse.c
+testrecurse_LDFLAGS = 
+testrecurse_DEPENDENCIES = $(DEPS)
+testrecurse_LDADD= @BASE_THREAD_LIBS@ @RDL_LIBS@ $(LDADDS)
+
+testchar_SOURCES=testchar.c
+testchar_LDFLAGS = 
+testchar_DEPENDENCIES = $(DEPS)
+testchar_LDADD= @RDL_LIBS@ $(LDADDS)
+
+testdict_SOURCES=testdict.c
+testdict_LDFLAGS = 
+testdict_DEPENDENCIES = $(DEPS)
+testdict_LDADD= @RDL_LIBS@ $(LDADDS)
+
 runsuite_SOURCES=runsuite.c
 runsuite_LDFLAGS = 
 runsuite_DEPENDENCIES = $(DEPS)
@@ -150,12 +166,25 @@ testapi_LDFLAGS =
 testapi_DEPENDENCIES = $(DEPS)
 testapi_LDADD= $(LDADDS)
 
+runxmlconf_SOURCES=runxmlconf.c
+runxmlconf_LDFLAGS = 
+runxmlconf_DEPENDENCIES = $(DEPS)
+runxmlconf_LDADD= $(LDADDS)
+
 #testOOM_SOURCES=testOOM.c testOOMlib.h testOOMlib.c
 #testOOM_LDFLAGS = 
 #testOOM_DEPENDENCIES = $(DEPS)
 #testOOM_LDADD= $(LDADDS)
 
-check-local: all tests
+runtests:
+	$(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT)
+
+check: all runtests
+
+check-valgrind: all
+	@echo '## Running the regression tests under Valgrind'
+	@echo '## Go get a cup of coffee it is gonna take a while ...'
+	$(MAKE) CHECKER='valgrind -q' check
 
 testall : tests SVGtests SAXtests
 
@@ -1105,6 +1134,8 @@ ModuleTests: testModule$(EXEEXT) testdso.la
 
 cleanup:
 	-@(find . -name .\#\* -exec rm {} \;)
+	-@(find . -name \*.gcda -o *.gcno -exec rm {} \;)
+	-@(find . -name \*.orig -o -name \*.rej -o -name \*.old -exec rm {} \;)
 
 dist-hook: cleanup libxml2.spec
 	-cp libxml2.spec $(distdir)
@@ -1139,7 +1170,7 @@ xml2Conf.sh: xml2Conf.sh.in Makefile
 	       < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
 	&& mv xml2Conf.tmp xml2Conf.sh
 
-CLEANFILES=xml2Conf.sh
+CLEANFILES=xml2Conf.sh *.gcda *.gcno
 
 confexecdir=$(libdir)
 confexec_DATA = xml2Conf.sh
@@ -1191,3 +1222,28 @@ tst: tst.c
 
 sparse: clean
 	$(MAKE) CC=cgcc
+
+#
+# Coverage support, largely borrowed from libvirt
+# Both binaries comes from the lcov package in Fedora
+#
+LCOV = /usr/bin/lcov
+GENHTML = /usr/bin/genhtml
+
+cov: clean-cov
+	if [ "`echo $(LDFLAGS) | grep coverage`" = "" ] ; then \
+	    echo not configured with coverage; exit 1 ; fi
+	if [ ! -x $(LCOV) -o ! -x $(GENHTML) ] ; then \
+	    echo Need $(LCOV) and $(GENHTML) excecutables; exit 1 ; fi
+	-@($(MAKE) check)
+	-@(./runsuite$(EXEEXT))
+	mkdir $(top_builddir)/coverage
+	$(LCOV) -c -o $(top_builddir)/coverage/libxml2.info.tmp -d $(top_srcdir)
+	$(LCOV) -r $(top_builddir)/coverage/libxml2.info.tmp -o $(top_builddir)/coverage/libxml2.info *usr*
+	rm $(top_builddir)/coverage/libxml2.info.tmp
+	$(GENHTML) -s -t "libxml2" -o $(top_builddir)/coverage --legend $(top_builddir)/coverage/libxml2.info
+	echo "Coverage report is in $(top_builddir)/coverage/index.html"
+
+clean-cov:
+	rm -rf $(top_builddir)/coverage
+
diff --git a/Makefile.in b/Makefile.in
index 5fb6611..d986d7b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -40,7 +40,8 @@ noinst_PROGRAMS = testSchemas$(EXEEXT) testRelax$(EXEEXT) \
 	testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \
 	testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \
 	testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \
-	runsuite$(EXEEXT)
+	runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \
+	runxmlconf$(EXEEXT) testrecurse$(EXEEXT)
 bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -138,6 +139,11 @@ runtest_OBJECTS = $(am_runtest_OBJECTS)
 runtest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(runtest_LDFLAGS) \
 	$(LDFLAGS) -o $@
+am_runxmlconf_OBJECTS = runxmlconf.$(OBJEXT)
+runxmlconf_OBJECTS = $(am_runxmlconf_OBJECTS)
+runxmlconf_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(runxmlconf_LDFLAGS) $(LDFLAGS) -o $@
 am_testAutomata_OBJECTS = testAutomata.$(OBJEXT)
 testAutomata_OBJECTS = $(am_testAutomata_OBJECTS)
 testAutomata_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -203,6 +209,21 @@ testapi_OBJECTS = $(am_testapi_OBJECTS)
 testapi_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testapi_LDFLAGS) \
 	$(LDFLAGS) -o $@
+am_testchar_OBJECTS = testchar.$(OBJEXT)
+testchar_OBJECTS = $(am_testchar_OBJECTS)
+testchar_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testchar_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_testdict_OBJECTS = testdict.$(OBJEXT)
+testdict_OBJECTS = $(am_testdict_OBJECTS)
+testdict_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testdict_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_testrecurse_OBJECTS = testrecurse.$(OBJEXT)
+testrecurse_OBJECTS = $(am_testrecurse_OBJECTS)
+testrecurse_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(testrecurse_LDFLAGS) $(LDFLAGS) -o $@
 am_xmlcatalog_OBJECTS = xmlcatalog.$(OBJEXT)
 xmlcatalog_OBJECTS = $(am_xmlcatalog_OBJECTS)
 xmlcatalog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -228,19 +249,25 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libxml2_la_SOURCES) $(testdso_la_SOURCES) \
-	$(runsuite_SOURCES) $(runtest_SOURCES) $(testAutomata_SOURCES) \
-	$(testC14N_SOURCES) $(testHTML_SOURCES) $(testModule_SOURCES) \
+	$(runsuite_SOURCES) $(runtest_SOURCES) $(runxmlconf_SOURCES) \
+	$(testAutomata_SOURCES) $(testC14N_SOURCES) \
+	$(testHTML_SOURCES) $(testModule_SOURCES) \
 	$(testReader_SOURCES) $(testRegexp_SOURCES) \
 	$(testRelax_SOURCES) $(testSAX_SOURCES) $(testSchemas_SOURCES) \
 	$(testThreads_SOURCES) $(testURI_SOURCES) $(testXPath_SOURCES) \
-	$(testapi_SOURCES) $(xmlcatalog_SOURCES) $(xmllint_SOURCES)
+	$(testapi_SOURCES) $(testchar_SOURCES) $(testdict_SOURCES) \
+	$(testrecurse_SOURCES) $(xmlcatalog_SOURCES) \
+	$(xmllint_SOURCES)
 DIST_SOURCES = $(am__libxml2_la_SOURCES_DIST) $(testdso_la_SOURCES) \
-	$(runsuite_SOURCES) $(runtest_SOURCES) $(testAutomata_SOURCES) \
-	$(testC14N_SOURCES) $(testHTML_SOURCES) $(testModule_SOURCES) \
+	$(runsuite_SOURCES) $(runtest_SOURCES) $(runxmlconf_SOURCES) \
+	$(testAutomata_SOURCES) $(testC14N_SOURCES) \
+	$(testHTML_SOURCES) $(testModule_SOURCES) \
 	$(testReader_SOURCES) $(testRegexp_SOURCES) \
 	$(testRelax_SOURCES) $(testSAX_SOURCES) $(testSchemas_SOURCES) \
 	$(testThreads_SOURCES) $(testURI_SOURCES) $(testXPath_SOURCES) \
-	$(testapi_SOURCES) $(xmlcatalog_SOURCES) $(xmllint_SOURCES)
+	$(testapi_SOURCES) $(testchar_SOURCES) $(testdict_SOURCES) \
+	$(testrecurse_SOURCES) $(xmlcatalog_SOURCES) \
+	$(xmllint_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -522,6 +549,18 @@ runtest_SOURCES = runtest.c
 runtest_LDFLAGS = 
 runtest_DEPENDENCIES = $(DEPS)
 runtest_LDADD = @BASE_THREAD_LIBS@ @RDL_LIBS@ $(LDADDS)
+testrecurse_SOURCES = testrecurse.c
+testrecurse_LDFLAGS = 
+testrecurse_DEPENDENCIES = $(DEPS)
+testrecurse_LDADD = @BASE_THREAD_LIBS@ @RDL_LIBS@ $(LDADDS)
+testchar_SOURCES = testchar.c
+testchar_LDFLAGS = 
+testchar_DEPENDENCIES = $(DEPS)
+testchar_LDADD = @RDL_LIBS@ $(LDADDS)
+testdict_SOURCES = testdict.c
+testdict_LDFLAGS = 
+testdict_DEPENDENCIES = $(DEPS)
+testdict_LDADD = @RDL_LIBS@ $(LDADDS)
 runsuite_SOURCES = runsuite.c
 runsuite_LDFLAGS = 
 runsuite_DEPENDENCIES = $(DEPS)
@@ -589,7 +628,11 @@ testapi_SOURCES = testapi.c
 testapi_LDFLAGS = 
 testapi_DEPENDENCIES = $(DEPS)
 testapi_LDADD = $(LDADDS)
-CLEANFILES = xml2Conf.sh
+runxmlconf_SOURCES = runxmlconf.c
+runxmlconf_LDFLAGS = 
+runxmlconf_DEPENDENCIES = $(DEPS)
+runxmlconf_LDADD = $(LDADDS)
+CLEANFILES = xml2Conf.sh *.gcda *.gcno
 confexecdir = $(libdir)
 confexec_DATA = xml2Conf.sh
 CVS_EXTRA_DIST = 
@@ -615,6 +658,13 @@ pkgconfig_DATA = libxml-2.0.pc
 BASE_DIR = $(datadir)/doc
 DOC_MODULE = libxml2-$(VERSION)
 EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
+
+#
+# Coverage support, largely borrowed from libvirt
+# Both binaries comes from the lcov package in Fedora
+#
+LCOV = /usr/bin/lcov
+GENHTML = /usr/bin/genhtml
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -684,8 +734,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -693,8 +743,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -727,8 +777,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -759,6 +809,9 @@ runsuite$(EXEEXT): $(runsuite_OBJECTS) $(runsuite_DEPENDENCIES)
 runtest$(EXEEXT): $(runtest_OBJECTS) $(runtest_DEPENDENCIES) 
 	@rm -f runtest$(EXEEXT)
 	$(runtest_LINK) $(runtest_OBJECTS) $(runtest_LDADD) $(LIBS)
+runxmlconf$(EXEEXT): $(runxmlconf_OBJECTS) $(runxmlconf_DEPENDENCIES) 
+	@rm -f runxmlconf$(EXEEXT)
+	$(runxmlconf_LINK) $(runxmlconf_OBJECTS) $(runxmlconf_LDADD) $(LIBS)
 testAutomata$(EXEEXT): $(testAutomata_OBJECTS) $(testAutomata_DEPENDENCIES) 
 	@rm -f testAutomata$(EXEEXT)
 	$(testAutomata_LINK) $(testAutomata_OBJECTS) $(testAutomata_LDADD) $(LIBS)
@@ -798,6 +851,15 @@ testXPath$(EXEEXT): $(testXPath_OBJECTS) $(testXPath_DEPENDENCIES)
 testapi$(EXEEXT): $(testapi_OBJECTS) $(testapi_DEPENDENCIES) 
 	@rm -f testapi$(EXEEXT)
 	$(testapi_LINK) $(testapi_OBJECTS) $(testapi_LDADD) $(LIBS)
+testchar$(EXEEXT): $(testchar_OBJECTS) $(testchar_DEPENDENCIES) 
+	@rm -f testchar$(EXEEXT)
+	$(testchar_LINK) $(testchar_OBJECTS) $(testchar_LDADD) $(LIBS)
+testdict$(EXEEXT): $(testdict_OBJECTS) $(testdict_DEPENDENCIES) 
+	@rm -f testdict$(EXEEXT)
+	$(testdict_LINK) $(testdict_OBJECTS) $(testdict_LDADD) $(LIBS)
+testrecurse$(EXEEXT): $(testrecurse_OBJECTS) $(testrecurse_DEPENDENCIES) 
+	@rm -f testrecurse$(EXEEXT)
+	$(testrecurse_LINK) $(testrecurse_OBJECTS) $(testrecurse_LDADD) $(LIBS)
 xmlcatalog$(EXEEXT): $(xmlcatalog_OBJECTS) $(xmlcatalog_DEPENDENCIES) 
 	@rm -f xmlcatalog$(EXEEXT)
 	$(xmlcatalog_LINK) $(xmlcatalog_OBJECTS) $(xmlcatalog_LDADD) $(LIBS)
@@ -855,6 +917,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relaxng.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runsuite.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runxmlconf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/schematron.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testAutomata.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testC14N.Po@am__quote@
@@ -869,7 +932,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testURI.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testXPath.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testapi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testchar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdict.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdso.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testrecurse.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threads.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tree.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trio.Plo@am__quote@
@@ -1140,8 +1206,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -1166,8 +1232,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1177,13 +1243,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -1257,6 +1322,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -1283,6 +1352,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -1342,7 +1413,6 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
 		config.h
@@ -1452,11 +1522,11 @@ uninstall-man: uninstall-man1 uninstall-man3
 	install-strip
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am check-local clean \
-	clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+	all all-am am--refresh check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags \
+	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
+	dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
@@ -1494,7 +1564,15 @@ testapi.c:
 #testOOM_DEPENDENCIES = $(DEPS)
 #testOOM_LDADD= $(LDADDS)
 
-check-local: all tests
+runtests:
+	$(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT)
+
+check: all runtests
+
+check-valgrind: all
+	@echo '## Running the regression tests under Valgrind'
+	@echo '## Go get a cup of coffee it is gonna take a while ...'
+	$(MAKE) CHECKER='valgrind -q' check
 
 testall : tests SVGtests SAXtests
 
@@ -2444,6 +2522,8 @@ ModuleTests: testModule$(EXEEXT) testdso.la
 
 cleanup:
 	-@(find . -name .\#\* -exec rm {} \;)
+	-@(find . -name \*.gcda -o *.gcno -exec rm {} \;)
+	-@(find . -name \*.orig -o -name \*.rej -o -name \*.old -exec rm {} \;)
 
 dist-hook: cleanup libxml2.spec
 	-cp libxml2.spec $(distdir)
@@ -2495,6 +2575,23 @@ tst: tst.c
 
 sparse: clean
 	$(MAKE) CC=cgcc
+
+cov: clean-cov
+	if [ "`echo $(LDFLAGS) | grep coverage`" = "" ] ; then \
+	    echo not configured with coverage; exit 1 ; fi
+	if [ ! -x $(LCOV) -o ! -x $(GENHTML) ] ; then \
+	    echo Need $(LCOV) and $(GENHTML) excecutables; exit 1 ; fi
+	-@($(MAKE) check)
+	-@(./runsuite$(EXEEXT))
+	mkdir $(top_builddir)/coverage
+	$(LCOV) -c -o $(top_builddir)/coverage/libxml2.info.tmp -d $(top_srcdir)
+	$(LCOV) -r $(top_builddir)/coverage/libxml2.info.tmp -o $(top_builddir)/coverage/libxml2.info *usr*
+	rm $(top_builddir)/coverage/libxml2.info.tmp
+	$(GENHTML) -s -t "libxml2" -o $(top_builddir)/coverage --legend $(top_builddir)/coverage/libxml2.info
+	echo "Coverage report is in $(top_builddir)/coverage/index.html"
+
+clean-cov:
+	rm -rf $(top_builddir)/coverage
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Makefile.tests b/Makefile.tests
index bd223ca..619cbfb 100644
--- a/Makefile.tests
+++ b/Makefile.tests
@@ -8,12 +8,12 @@ LIBS=`xml2-config --libs`
 THREADLIB= -lpthread
 EXEEXT=
 
-all: runtest$(EXEEXT) runsuite$(EXEEXT) testapi$(EXEEXT)
+all: runtest$(EXEEXT) runsuite$(EXEEXT) testapi$(EXEEXT) testchar$(EXEEXT)
 
 clean:
 	$(RM) runtest$(EXEEXT) runsuite$(EXEEXT) testapi$(EXEEXT)
 
-check: do_runtest do_runsuite do_testapi
+check: do_runtest do_testchar do_testapi do_runsuite
 
 runtest$(EXEEXT): runtest.c
 	$(CC) -o runtest$(EXEEXT) $(CFLAGS) runtest.c $(LIBS) $(THREADLIB)
@@ -33,3 +33,9 @@ testapi$(EXEEXT): testapi.c
 do_testapi: testapi$(EXEEXT)
 	./testapi
 
+testchar$(EXEEXT): testchar.c
+	$(CC) -o testchar$(EXEEXT) $(CFLAGS) testchar.c $(LIBS)
+
+do_testchar: testchar$(EXEEXT)
+	./testchar
+
diff --git a/NEWS b/NEWS
index bd96196..2d6a794 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,42 @@ ChangeLog.html
 to the SVN at 
 http://svn.gnome.org/viewcvs/libxml2/trunk/
  code base.Here is the list of public releases:
+2.6.32: Apr 8 2008:
+   - Documentation: returning heap memory to kernel (Wolfram Sang),
+      trying to clarify xmlCleanupParser() use, xmlXPathContext improvement
+      (Jack Jansen), improve the *Recover* functions documentation,
+      XmlNodeType doc link fix (Martijn Arts)
+   - Bug fixes: internal subset memory leak (Ashwin), avoid problem with
+      paths starting with // (Petr Sumbera), streaming XSD validation callback
+      patches (Ashwin), fix redirection on port other than 80 (William Brack),
+      SAX2 leak (Ashwin), XInclude fragment of own document (Chris Ryan),
+      regexp bug with '.' (Andrew Tosh), flush the writer at the end of the
+      document (Alfred Mickautsch), output I/O bug fix (William Brack),
+      writer CDATA output after a text node (Alex Khesin), UTF-16 encoding
+      detection (William Brack), fix handling of empty CDATA nodes for Safari
+      team, python binding problem with namespace nodes, improve HTML parsing
+      (Arnold Hendriks), regexp automata build bug, memory leak fix (Vasily
+      Chekalkin), XSD test crash, weird system parameter entity parsing problem,
+      allow save to file:///X:/ windows paths, various attribute normalisation
+      problems, externalSubsetSplit fix (Ashwin), attribute redefinition in
+      the DTD (Ashwin), fix in char ref parsing check (Alex Khesin), many
+      out of memory handling fixes (Ashwin), XPath out of memory handling fixes
+      (Alvaro Herrera), various realloc problems (Ashwin), UCS4 encoding
+      conversion buffer size (Christian Fruth), problems with EatName
+      functions on memory errors, BOM handling in external parsed entities
+      (Mark Rowe)
+   - Code cleanup: fix build under VS 2008 (David Wimsey), remove useless
+      mutex in xmlDict (Florent Guilian), Mingw32 compilation fix (Carlo
+      Bramini), Win and MacOS EOL cleanups (Florent Guiliani), iconv need
+      a const detection (Roumen Petrov), simplify xmlSetProp (Julien Charbon),
+      cross compilation fixes for Mingw (Roumen Petrov), SCO Openserver build
+      fix (Florent Guiliani), iconv uses const on Win32 (Rob Richards),
+      duplicate code removal (Ashwin), missing malloc test and error reports
+      (Ashwin), VMS makefile fix (Tycho Hilhorst)
+   - improvements: better plug of schematron in the normal error handling
+      (Tobias Minich)
+
+
 2.6.31: Jan 11 2008:
    - Security fix: missing of checks in UTF-8 parsing
    - Bug fixes: regexp bug, dump attribute from XHTML document, fix
@@ -59,9 +95,9 @@ http://svn.gnome.org/viewcvs/libxml2/trunk/
       flag fix (Richard Jones), regexp interpretation of \,
       htmlCreateDocParserCtxt (Jean-Daniel Dupas), configure.in
       typo (Bjorn Reese), entity content failure, xmlListAppend() fix
-      (Georges-Andr� Silber), XPath number serialization (William Brack),
+      (Georges-André Silber), XPath number serialization (William Brack),
       nanohttp gzipped stream fix (William Brack and Alex Cornejo),
-      xmlCharEncFirstLine typo (Mark Rowe), uri bug (Fran�ois Delyon),
+      xmlCharEncFirstLine typo (Mark Rowe), uri bug (François Delyon),
       XPath string value of PI nodes (William Brack), XPath node set
       sorting bugs (William Brack), avoid outputting namespace decl
       dups in the writer (Rob Richards), xmlCtxtReset bug, UTF-8 encoding
@@ -69,7 +105,7 @@ http://svn.gnome.org/viewcvs/libxml2/trunk/
       workaround wrong file: URIs, htmlNodeDumpFormatOutput on attributes,
       invalid character in attribute detection bug, big comments before 
       internal subset streaming bug, HTML parsing of attributes with : in
-      the name, IDness of name in HTML (Dagfinn I. Manns�ker) 
+      the name, IDness of name in HTML (Dagfinn I. Mannsåker) 
    - Improvement: keep URI query parts in raw form (Richard Jones),
       embed tag support in HTML (Michael Day) 
 
@@ -84,7 +120,7 @@ http://svn.gnome.org/viewcvs/libxml2/trunk/
       (Steven Rainwater), user data propagation in XInclude (Michael Day),
       standalone and XML decl detection (Michael Day), Python id ouptut
       for some id, fix the big python string memory leak, URI parsing fixes
-      (St�phane Bidoul and William), long comments parsing bug (William),
+      (Stéphane Bidoul and William), long comments parsing bug (William),
       concurrent threads initialization (Ted Phelps), invalid char
       in text XInclude (William), XPath memory leak (William), tab in
       python problems (Andreas Hanke), XPath node comparison error
@@ -94,7 +130,7 @@ http://svn.gnome.org/viewcvs/libxml2/trunk/
       min occurs of 0 (William), HTML script/style parsing (Mike Day)
    - Improvement: make xmlTextReaderSetup() public
    - Compilation and postability: fix a missing include problem (William),
-      __ss_familly on AIX again (Bj�rn Wiberg), compilation without zlib
+      __ss_familly on AIX again (Björn Wiberg), compilation without zlib
       (Michael Day), catalog patch for Win32 (Christian Ehrlicher),
       Windows CE fixes (Andreas Stricke)
    - Various CVS to SVN infrastructure changes
@@ -241,7 +277,7 @@ Do not use or package 2.6.25
 
 
 2.6.22: Sep 12 2005:
-   - build fixes: compile without schematron (St�phane Bidoul)
+   - build fixes: compile without schematron (Stéphane Bidoul)
    - bug fixes: xmlDebugDumpNode on namespace node (Oleg Paraschenko)i,
     CDATA push parser bug, xmlElemDump problem with XHTML1 doc,
     XML_FEATURE_xxx clash with expat headers renamed XML_WITH_xxx, fix some
@@ -514,7 +550,7 @@ Do not use or package 2.6.25
     streaming problem (Steve Ball), DTD serialization problem (William),
     libxml.m4 fixes (Mike Hommey), do not provide destructors as methods on
     Python classes, xmlReader buffer bug, Python bindings memory interfaces
-    improvement (with St�phane Bidoul), Fixed the push parser to be back to
+    improvement (with Stéphane Bidoul), Fixed the push parser to be back to
     synchronous behaviour.
    - improvement: custom per-thread I/O enhancement (Rob Richards), register
     namespace in debug shell (Stefano Debenedetti), Python based regression
@@ -640,8 +676,8 @@ Do not use or package 2.6.25
     callbacks order for XPath callbacks (Frederic Peters)
    - Documentation: python scripts (William Brack), xslt stylesheets (John
     Fleck), doc (Sven Zimmerman), I/O example.
-   - Python bindings: fixes (William), enum support (St�phane Bidoul),
-    structured error reporting (St�phane Bidoul)
+   - Python bindings: fixes (William), enum support (Stéphane Bidoul),
+    structured error reporting (Stéphane Bidoul)
    - XInclude: various fixes for conformance, problem related to dictionnary
     references (William & me), recursion (William)
    - xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
@@ -771,7 +807,7 @@ Do not use or package 2.6.25
     and charset information if available.
    - Relax-NG: bug fixes including the one reported by Martijn Faassen and
     zeroOrMore, better error reporting.
-   - Python bindings (St�phane Bidoul), never use stdout for errors
+   - Python bindings (Stéphane Bidoul), never use stdout for errors
   output
    - Portability: all the headers have macros for export and calling
     convention definitions (Igor Zlatkovic), VMS update (Craig A. Berry),
@@ -852,11 +888,11 @@ A bugfixes only release   - Windows Makefiles (William Brack)
    - portability: DJGPP (MsDos) , OpenVMS (Craig A. Berry)
    - William Brack fixed multithreading lock problems
    - IPv6 patch for FTP and HTTP accesses (Archana Shah/Wipro)
-   - Windows fixes (Igor Zlatkovic,  Eric Zurcher), threading (St�phane
+   - Windows fixes (Igor Zlatkovic,  Eric Zurcher), threading (Stéphane
     Bidoul)
    - A few W3C Schemas Structure improvements
    - W3C Schemas Datatype improvements (Charlie Bozeman)
-   - Python bindings for thread globals (St�phane Bidoul), and method/class
+   - Python bindings for thread globals (Stéphane Bidoul), and method/class
     generator
    - added --nonet option to xmllint
    - documentation improvements (John Fleck)
@@ -932,7 +968,7 @@ A bugfixes only release   - Windows Makefiles (William Brack)
    - First implementation of RelaxNG, added --relaxng flag to xmllint
    - Schemas support now compiled in by default.
    - Bug fixes: DTD validation, namespace checking, XInclude and entities,
-    delegateURI in XML Catalogs, HTML parser, XML reader (St�phane Bidoul),
+    delegateURI in XML Catalogs, HTML parser, XML reader (Stéphane Bidoul),
     XPath parser and evaluation,  UTF8ToUTF8 serialization, XML reader memory
     consumption, HTML parser, HTML serialization in the presence of
   namespaces
@@ -941,7 +977,7 @@ A bugfixes only release   - Windows Makefiles (William Brack)
     patches (Stefan Kost)
    - Portability fixes: NetBSD (Julio Merino), Windows (Igor Zlatkovic)
    - Added python bindings for XPointer, contextual error reporting
-    (St�phane Bidoul)
+    (Stéphane Bidoul)
    - URI/file escaping problems (Stefano Zacchiroli)
 
 
@@ -953,11 +989,11 @@ A bugfixes only release   - Windows Makefiles (William Brack)
 
 2.5.0: Jan 6 2003:
    - New XmltextReader interface based on C#
-    API (with help of St�phane Bidoul)
+    API (with help of Stéphane Bidoul)
    - Windows: more exports, including the new API (Igor)
    - XInclude fallback fix
-   - Python: bindings for the new API, packaging (St�phane Bidoul),
-    drv_libxml2.py Python xml.sax driver (St�phane Bidoul), fixes, speedup
+   - Python: bindings for the new API, packaging (Stéphane Bidoul),
+    drv_libxml2.py Python xml.sax driver (Stéphane Bidoul), fixes, speedup
     and iterators for Python-2.2 (Hannu Krosing)
    - Tutorial fixes (john Fleck and Niraj Tolia) xmllint man update
   (John)
@@ -977,7 +1013,7 @@ A bugfixes only release   - Windows Makefiles (William Brack)
 
 2.4.29: Dec 11 2002:
    - Windows fixes (Igor): Windows CE port, pthread linking, python bindings
-    (St�phane Bidoul), Mingw (Magnus Henoch), and export list updates
+    (Stéphane Bidoul), Mingw (Magnus Henoch), and export list updates
    - Fix for prev in python bindings (ERDI Gergo)
    - Fix for entities handling (Marcus Clarke)
    - Refactored the XML and HTML dumps to a single code path, fixed XHTML1
@@ -1324,7 +1360,7 @@ it's actually not compiled in by default. The real fixes are:   - a couple of bu
 
 
 2.3.9: May 19 2001:
-Lots of bugfixes, and added a basic SGML catalog support:   - HTML push bugfix #54891 and another patch from Jonas Borgstr�m
+Lots of bugfixes, and added a basic SGML catalog support:   - HTML push bugfix #54891 and another patch from Jonas Borgström
    - some serious speed optimization again
    - some documentation cleanups
    - trying to get better linking on Solaris (-R)
diff --git a/README.tests b/README.tests
index eb7223d..66522ab 100644
--- a/README.tests
+++ b/README.tests
@@ -10,13 +10,14 @@ program has a different testing purpose:
   runtest.c : runs libxml2 basic internal regression tests
   runsuite.c: runs libxml2 against external regression tests
   testapi.c : exercises the library public entry points
+  testchar.c: exercise the check of character ranges and UTF-8 validation
 
 The command:
 
-  make -f Makefile.tests
+  make -f Makefile.tests check
 
 should be sufficient on an Unix system to build and exercise the tests
-for the version of the library installed on the system. Note however 
+for the version of the library installed on the system. Note however
 that there isn't backward compatibility provided so if the installed
 version is older to the testsuite one, failing to compile or run the tests
 is likely. In any event this won't work with an installed libxml2 older
@@ -26,4 +27,4 @@ like any other program using libxml2, running the test should be done
 simply by launching the resulting executables.
 
 Daniel Veillard
-Sun Jul 10 2005
+Thu Jul 24 2008
diff --git a/SAX2.c b/SAX2.c
index 7dbc2b2..80cd1bd 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -580,7 +580,8 @@ xmlSAX2GetEntity(void *ctx, const xmlChar *name)
 	    return(NULL);
 	}
 	ret->owner = 1;
-	ret->checked = 1;
+	if (ret->checked == 0)
+	    ret->checked = 1;
     }
     return(ret);
 }
@@ -957,6 +958,8 @@ xmlSAX2StartDocument(void *ctx)
 #ifdef LIBXML_HTML_ENABLED
 	if (ctxt->myDoc == NULL)
 	    ctxt->myDoc = htmlNewDocNoDtD(NULL, NULL);
+	ctxt->myDoc->properties = XML_DOC_HTML;
+	ctxt->myDoc->parseFlags = ctxt->options;
 	if (ctxt->myDoc == NULL) {
 	    xmlSAX2ErrMemory(ctxt, "xmlSAX2StartDocument");
 	    return;
@@ -972,6 +975,10 @@ xmlSAX2StartDocument(void *ctx)
     } else {
 	doc = ctxt->myDoc = xmlNewDoc(ctxt->version);
 	if (doc != NULL) {
+	    doc->properties = 0;
+	    if (ctxt->options & XML_PARSE_OLD10)
+	        doc->properties |= XML_DOC_OLD10;
+	    doc->parseFlags = ctxt->options;
 	    if (ctxt->encoding != NULL)
 		doc->encoding = xmlStrdup(ctxt->encoding);
 	    else
@@ -1837,6 +1844,9 @@ skip:
     } else
 	ret->content = (xmlChar *) intern;
 
+    if (ctxt->input != NULL)
+        ret->line = ctxt->input->line;
+
     if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
 	xmlRegisterNodeDefaultValue(ret);
     return(ret);
diff --git a/aclocal.m4 b/aclocal.m4
index 6da47d8..190c670 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
@@ -6584,7 +6587,7 @@ AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6599,7 +6602,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -6615,8 +6618,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -6888,7 +6893,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -6948,13 +6953,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -7059,16 +7064,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -7366,7 +7372,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
diff --git a/catalog.c b/catalog.c
index ee3f8f2..af84b7c 100644
--- a/catalog.c
+++ b/catalog.c
@@ -2616,6 +2616,8 @@ xmlCatalogSGMLResolve(xmlCatalogPtr catal, const xmlChar *pubID,
 	return(ret);
     if (sysID != NULL)
 	ret = xmlCatalogGetSGMLSystem(catal->sgml, sysID);
+    if (ret != NULL)
+	return(ret);
     return(NULL);
 }
 
@@ -2912,7 +2914,7 @@ xmlACatalogResolveURI(xmlCatalogPtr catal, const xmlChar *URI) {
 
 	sgml = xmlCatalogSGMLResolve(catal, NULL, URI);
 	if (sgml != NULL)
-            sgml = xmlStrdup(sgml);
+            ret = xmlStrdup(sgml);
     }
     return(ret);
 }
diff --git a/configure b/configure
index e80c4a9..5360aa8 100755
--- a/configure
+++ b/configure
@@ -1633,6 +1633,7 @@ Optional Packages:
   --with-xptr             add the XPointer support (on)
   --with-modules          add the dynamic modules support (on)
   --with-zlib[=DIR]       use libz in DIR
+  --with-coverage         build for code coverage with GCC (off)
 
 Some influential environment variables:
   CC          C compiler command
@@ -2189,8 +2190,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 LIBXML_MAJOR_VERSION=2
-LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=32
+LIBXML_MINOR_VERSION=7
+LIBXML_MICRO_VERSION=0
 LIBXML_MICRO_VERSION_SUFFIX=
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
@@ -5507,7 +5508,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5510 "configure"' > conftest.$ac_ext
+  echo '#line 5511 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8061,11 +8062,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8064: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8065: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8068: \$? = $ac_status" >&5
+   echo "$as_me:8069: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8351,11 +8352,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8354: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8355: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8358: \$? = $ac_status" >&5
+   echo "$as_me:8359: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8455,11 +8456,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8458: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8459: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8462: \$? = $ac_status" >&5
+   echo "$as_me:8463: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10806,7 +10807,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+   (eval echo "\"\$as_me:13330: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13333: \$? = $ac_status" >&5
+   echo "$as_me:13334: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13430,11 +13431,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13433: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13434: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13437: \$? = $ac_status" >&5
+   echo "$as_me:13438: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14994,11 +14995,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14997: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14998: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15001: \$? = $ac_status" >&5
+   echo "$as_me:15002: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15098,11 +15099,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15101: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15102: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15105: \$? = $ac_status" >&5
+   echo "$as_me:15106: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17287,11 +17288,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17290: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17291: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17294: \$? = $ac_status" >&5
+   echo "$as_me:17295: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17577,11 +17578,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17580: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17581: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17584: \$? = $ac_status" >&5
+   echo "$as_me:17585: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17681,11 +17682,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17684: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17685: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17688: \$? = $ac_status" >&5
+   echo "$as_me:17689: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20581,6 +20582,12 @@ if test "${with_zlib+set}" = set; then
 fi
 
 
+# Check whether --with-coverage was given.
+if test "${with_coverage+set}" = set; then
+  withval=$with_coverage;
+fi
+
+
 if test "$with_schemas" = "yes"
 then
     with_pattern=yes
@@ -26375,7 +26382,7 @@ fi
 { echo "$as_me:$LINENO: checking for type of socket length (socklen_t)" >&5
 echo $ECHO_N "checking for type of socket length (socklen_t)... $ECHO_C" >&6; }
 cat > conftest.$ac_ext <
@@ -26386,7 +26393,7 @@ int main(void) {
 (void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL)
 ; return 0; }
 EOF
-if { (eval echo configure:26389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
+if { (eval echo configure:26396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
   rm -rf conftest*
 
   { echo "$as_me:$LINENO: result: socklen_t *" >&5
@@ -26398,7 +26405,7 @@ else
   rm -rf conftest*
 
   cat > conftest.$ac_ext <
@@ -26409,7 +26416,7 @@ int main(void) {
 (void)getsockopt (1, 1, 1, NULL, (size_t *)NULL)
 ; return 0; }
 EOF
-if { (eval echo configure:26412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
+if { (eval echo configure:26419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
   rm -rf conftest*
 
     { echo "$as_me:$LINENO: result: size_t *" >&5
@@ -26421,7 +26428,7 @@ else
   rm -rf conftest*
 
     cat > conftest.$ac_ext <
@@ -26432,7 +26439,7 @@ int main(void) {
 (void)getsockopt (1, 1, 1, NULL, (int *)NULL)
 ; return 0; }
 EOF
-if { (eval echo configure:26435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
+if { (eval echo configure:26442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
   rm -rf conftest*
 
       { echo "$as_me:$LINENO: result: int *" >&5
@@ -29259,6 +29266,16 @@ esac
 
 
 
+if test "$with_coverage" = "yes" -a "${GCC}" = "yes"
+then
+    echo Enabling code coverage for GCC
+    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+    LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
+else
+    echo Disabling code coverage for GCC
+fi
+
+
 
 
 
@@ -30670,21 +30687,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -30721,7 +30739,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
diff --git a/configure.in b/configure.in
index 8fc76e5..65824f3 100644
--- a/configure.in
+++ b/configure.in
@@ -4,8 +4,8 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
-LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=32
+LIBXML_MINOR_VERSION=7
+LIBXML_MICRO_VERSION=0
 LIBXML_MICRO_VERSION_SUFFIX=
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
@@ -163,6 +163,8 @@ AC_ARG_WITH(zlib,
     LDFLAGS="${LDFLAGS} -L$withval/lib"
   fi
 ])
+AC_ARG_WITH(coverage,
+[  --with-coverage         build for code coverage with GCC (off)])
 
 dnl
 dnl hard dependancies on options
@@ -1371,8 +1373,18 @@ AC_SUBST(WIN32_EXTRA_LDFLAGS)
 AC_SUBST(CYGWIN_EXTRA_LDFLAGS)
 AC_SUBST(CYGWIN_EXTRA_PYTHON_LIBADD)
 
+if test "$with_coverage" = "yes" -a "${GCC}" = "yes"
+then
+    echo Enabling code coverage for GCC
+    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+    LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
+else
+    echo Disabling code coverage for GCC
+fi
+
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
 AC_SUBST(XML_CFLAGS)
 
 AC_SUBST(XML_LIBDIR)
diff --git a/depcomp b/depcomp
index ca5ea4e..e5f9736 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2006-10-15.18
+scriptversion=2007-03-29.01
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -215,34 +215,39 @@ aix)
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
diff --git a/dict.c b/dict.c
index c071887..20bd310 100644
--- a/dict.c
+++ b/dict.c
@@ -20,18 +20,44 @@
 #include "libxml.h"
 
 #include 
+#ifdef HAVE_STDINT_H
+#include 
+#elif defined(WIN32)
+typedef unsigned __int32 uint32_t;
+#endif
 #include 
 #include 
 #include 
 #include 
 #include 
 
-#define MAX_HASH_LEN 4
+/* #define DEBUG_GROW */
+/* #define DICT_DEBUG_PATTERNS */
+
+#define MAX_HASH_LEN 3
 #define MIN_DICT_SIZE 128
 #define MAX_DICT_HASH 8 * 2048
-
-/* #define ALLOW_REMOVAL */
-/* #define DEBUG_GROW */
+#define WITH_BIG_KEY
+
+#ifdef WITH_BIG_KEY
+#define xmlDictComputeKey(dict, name, len)			\
+    (((dict)->size == MIN_DICT_SIZE) ?				\
+     xmlDictComputeFastKey(name, len) :				\
+     xmlDictComputeBigKey(name, len))
+
+#define xmlDictComputeQKey(dict, prefix, plen, name, len)	\
+    (((prefix) == NULL) ?					\
+      (xmlDictComputeKey(dict, name, len)) :			\
+      (((dict)->size == MIN_DICT_SIZE) ?			\
+       xmlDictComputeFastQKey(prefix, plen, name, len) :	\
+       xmlDictComputeBigQKey(prefix, plen, name, len)))
+
+#else /* !WITH_BIG_KEY */
+#define xmlDictComputeKey(dict, name, len)			\
+        xmlDictComputeFastKey(name, len)
+#define xmlDictComputeQKey(dict, prefix, plen, name, len)	\
+        xmlDictComputeFastQKey(prefix, plen, name, len)
+#endif /* WITH_BIG_KEY */
 
 /*
  * An entry in the dictionnary
@@ -43,6 +69,7 @@ struct _xmlDictEntry {
     const xmlChar *name;
     int len;
     int valid;
+    unsigned long okey;
 };
 
 typedef struct _xmlDictStrings xmlDictStrings;
@@ -129,6 +156,9 @@ xmlDictAddString(xmlDictPtr dict, const xmlChar *name, int namelen) {
     const xmlChar *ret;
     int size = 0; /* + sizeof(_xmlDictStrings) == 1024 */
 
+#ifdef DICT_DEBUG_PATTERNS
+    fprintf(stderr, "-");
+#endif
     pool = dict->strings;
     while (pool != NULL) {
 	if (pool->end - pool->free > namelen)
@@ -153,12 +183,16 @@ xmlDictAddString(xmlDictPtr dict, const xmlChar *name, int namelen) {
 	pool->end = &pool->array[size];
 	pool->next = dict->strings;
 	dict->strings = pool;
+#ifdef DICT_DEBUG_PATTERNS
+        fprintf(stderr, "+");
+#endif
     }
 found_pool:
     ret = pool->free;
     memcpy(pool->free, name, namelen);
     pool->free += namelen;
     *(pool->free++) = 0;
+    pool->nbStrings++;
     return(ret);
 }
 
@@ -166,6 +200,7 @@ found_pool:
  * xmlDictAddQString:
  * @dict: the dictionnary
  * @prefix: the prefix of the userdata
+ * @plen: the prefix length
  * @name: the name of the userdata
  * @len: the length of the name, if -1 it is recomputed
  *
@@ -174,20 +209,21 @@ found_pool:
  * Returns the pointer of the local string, or NULL in case of error.
  */
 static const xmlChar *
-xmlDictAddQString(xmlDictPtr dict, const xmlChar *prefix,
+xmlDictAddQString(xmlDictPtr dict, const xmlChar *prefix, int plen,
                  const xmlChar *name, int namelen)
 {
     xmlDictStringsPtr pool;
     const xmlChar *ret;
     int size = 0; /* + sizeof(_xmlDictStrings) == 1024 */
-    int plen;
 
     if (prefix == NULL) return(xmlDictAddString(dict, name, namelen));
-    plen = xmlStrlen(prefix);
 
+#ifdef DICT_DEBUG_PATTERNS
+    fprintf(stderr, "=");
+#endif
     pool = dict->strings;
     while (pool != NULL) {
-	if (pool->end - pool->free > namelen)
+	if (pool->end - pool->free > namelen + plen + 1)
 	    goto found_pool;
 	if (pool->size > size) size = pool->size;
 	pool = pool->next;
@@ -198,8 +234,8 @@ xmlDictAddQString(xmlDictPtr dict, const xmlChar *prefix,
     if (pool == NULL) {
         if (size == 0) size = 1000;
 	else size *= 4; /* exponential growth */
-        if (size < 4 * namelen) 
-	    size = 4 * namelen; /* just in case ! */
+        if (size < 4 * (namelen + plen + 1))
+	    size = 4 * (namelen + plen + 1); /* just in case ! */
 	pool = (xmlDictStringsPtr) xmlMalloc(sizeof(xmlDictStrings) + size);
 	if (pool == NULL)
 	    return(NULL);
@@ -209,27 +245,106 @@ xmlDictAddQString(xmlDictPtr dict, const xmlChar *prefix,
 	pool->end = &pool->array[size];
 	pool->next = dict->strings;
 	dict->strings = pool;
+#ifdef DICT_DEBUG_PATTERNS
+        fprintf(stderr, "+");
+#endif
     }
 found_pool:
     ret = pool->free;
     memcpy(pool->free, prefix, plen);
     pool->free += plen;
     *(pool->free++) = ':';
-    namelen -= plen + 1;
     memcpy(pool->free, name, namelen);
     pool->free += namelen;
     *(pool->free++) = 0;
+    pool->nbStrings++;
     return(ret);
 }
 
+#ifdef WITH_BIG_KEY
+/*
+ * xmlDictComputeBigKey:
+ *
+ * Calculate a hash key using a good hash function that works well for
+ * larger hash table sizes.
+ *
+ * Hash function by "One-at-a-Time Hash" see
+ * http://burtleburtle.net/bob/hash/doobs.html
+ */
+
+static uint32_t
+xmlDictComputeBigKey(const xmlChar* data, int namelen) {
+    uint32_t hash;
+    int i;
+
+    if (namelen <= 0 || data == NULL) return(0);
+
+    hash = 0;
+
+    for (i = 0;i < namelen; i++) {
+        hash += data[i];
+	hash += (hash << 10);
+	hash ^= (hash >> 6);
+    }
+    hash += (hash << 3);
+    hash ^= (hash >> 11);
+    hash += (hash << 15);
+
+    return hash;
+}
+
+/*
+ * xmlDictComputeBigQKey:
+ *
+ * Calculate a hash key for two strings using a good hash function
+ * that works well for larger hash table sizes.
+ *
+ * Hash function by "One-at-a-Time Hash" see
+ * http://burtleburtle.net/bob/hash/doobs.html
+ *
+ * Neither of the two strings must be NULL.
+ */
+static unsigned long
+xmlDictComputeBigQKey(const xmlChar *prefix, int plen,
+                      const xmlChar *name, int len)
+{
+    uint32_t hash;
+    int i;
+
+    hash = 0;
+
+    for (i = 0;i < plen; i++) {
+        hash += prefix[i];
+	hash += (hash << 10);
+	hash ^= (hash >> 6);
+    }
+    hash += ':';
+    hash += (hash << 10);
+    hash ^= (hash >> 6);
+
+    for (i = 0;i < len; i++) {
+        hash += name[i];
+	hash += (hash << 10);
+	hash ^= (hash >> 6);
+    }
+    hash += (hash << 3);
+    hash ^= (hash >> 11);
+    hash += (hash << 15);
+
+    return hash;
+}
+#endif /* WITH_BIG_KEY */
+
 /*
- * xmlDictComputeKey:
- * Calculate the hash key
+ * xmlDictComputeFastKey:
+ *
+ * Calculate a hash key using a fast hash function that works well
+ * for low hash table fill.
  */
 static unsigned long
-xmlDictComputeKey(const xmlChar *name, int namelen) {
+xmlDictComputeFastKey(const xmlChar *name, int namelen) {
     unsigned long value = 0L;
-    
+
     if (name == NULL) return(0);
     value = *name;
     value <<= 5;
@@ -253,24 +368,24 @@ xmlDictComputeKey(const xmlChar *name, int namelen) {
 }
 
 /*
- * xmlDictComputeQKey:
- * Calculate the hash key
+ * xmlDictComputeFastQKey:
+ *
+ * Calculate a hash key for two strings using a fast hash function
+ * that works well for low hash table fill.
+ *
+ * Neither of the two strings must be NULL.
  */
 static unsigned long
-xmlDictComputeQKey(const xmlChar *prefix, const xmlChar *name, int len)
+xmlDictComputeFastQKey(const xmlChar *prefix, int plen,
+                       const xmlChar *name, int len)
 {
     unsigned long value = 0L;
-    int plen;
-    
-    if (prefix == NULL)
-        return(xmlDictComputeKey(name, len));
 
-    plen = xmlStrlen(prefix);
     if (plen == 0)
 	value += 30 * (unsigned long) ':';
     else
 	value += 30 * (*prefix);
-    
+
     if (len > 10) {
         value += name[len - (plen + 1 + 1)];
         len = 10;
@@ -325,7 +440,11 @@ xmlDictCreate(void) {
     if (!xmlDictInitialized)
         if (!xmlInitializeDict())
             return(NULL);
- 
+
+#ifdef DICT_DEBUG_PATTERNS
+    fprintf(stderr, "C");
+#endif
+
     dict = xmlMalloc(sizeof(xmlDict));
     if (dict) {
         dict->ref_counter = 1;
@@ -358,8 +477,11 @@ xmlDictCreate(void) {
 xmlDictPtr
 xmlDictCreateSub(xmlDictPtr sub) {
     xmlDictPtr dict = xmlDictCreate();
-  
+
     if ((dict != NULL) && (sub != NULL)) {
+#ifdef DICT_DEBUG_PATTERNS
+        fprintf(stderr, "R");
+#endif
         dict->subdict = sub;
 	xmlDictReference(dict->subdict);
     }
@@ -398,14 +520,16 @@ xmlDictReference(xmlDictPtr dict) {
  */
 static int
 xmlDictGrow(xmlDictPtr dict, int size) {
-    unsigned long key;
+    unsigned long key, okey;
     int oldsize, i;
     xmlDictEntryPtr iter, next;
     struct _xmlDictEntry *olddict;
 #ifdef DEBUG_GROW
     unsigned long nbElem = 0;
 #endif
-  
+    int ret = 0;
+    int keep_keys = 1;
+
     if (dict == NULL)
 	return(-1);
     if (size < 8)
@@ -413,11 +537,17 @@ xmlDictGrow(xmlDictPtr dict, int size) {
     if (size > 8 * 2048)
 	return(-1);
 
+#ifdef DICT_DEBUG_PATTERNS
+    fprintf(stderr, "*");
+#endif
+
     oldsize = dict->size;
     olddict = dict->dict;
     if (olddict == NULL)
         return(-1);
-  
+    if (oldsize == MIN_DICT_SIZE)
+        keep_keys = 0;
+
     dict->dict = xmlMalloc(size * sizeof(xmlDictEntry));
     if (dict->dict == NULL) {
 	dict->dict = olddict;
@@ -427,17 +557,44 @@ xmlDictGrow(xmlDictPtr dict, int size) {
     dict->size = size;
 
     /*	If the two loops are merged, there would be situations where
-	a new entry needs to allocated and data copied into it from 
-	the main dict. So instead, we run through the array twice, first
-	copying all the elements in the main array (where we can't get
-	conflicts) and then the rest, so we only free (and don't allocate)
+	a new entry needs to allocated and data copied into it from
+	the main dict. It is nicer to run through the array twice, first
+	copying all the elements in the main array (less probability of
+	allocate) and then the rest, so we only free in the second loop.
     */
     for (i = 0; i < oldsize; i++) {
-	if (olddict[i].valid == 0) 
+	if (olddict[i].valid == 0)
 	    continue;
-	key = xmlDictComputeKey(olddict[i].name, olddict[i].len) % dict->size;
-	memcpy(&(dict->dict[key]), &(olddict[i]), sizeof(xmlDictEntry));
-	dict->dict[key].next = NULL;
+
+	if (keep_keys)
+	    okey = olddict[i].okey;
+	else
+	    okey = xmlDictComputeKey(dict, olddict[i].name, olddict[i].len);
+	key = okey % dict->size;
+
+	if (dict->dict[key].valid == 0) {
+	    memcpy(&(dict->dict[key]), &(olddict[i]), sizeof(xmlDictEntry));
+	    dict->dict[key].next = NULL;
+	    dict->dict[key].okey = okey;
+	} else {
+	    xmlDictEntryPtr entry;
+
+	    entry = xmlMalloc(sizeof(xmlDictEntry));
+	    if (entry != NULL) {
+		entry->name = olddict[i].name;
+		entry->len = olddict[i].len;
+		entry->okey = okey;
+		entry->next = dict->dict[key].next;
+		entry->valid = 1;
+		dict->dict[key].next = entry;
+	    } else {
+	        /*
+		 * we don't have much ways to alert from herei
+		 * result is loosing an entry and unicity garantee
+		 */
+	        ret = -1;
+	    }
+	}
 #ifdef DEBUG_GROW
 	nbElem++;
 #endif
@@ -452,15 +609,21 @@ xmlDictGrow(xmlDictPtr dict, int size) {
 	     * put back the entry in the new dict
 	     */
 
-	    key = xmlDictComputeKey(iter->name, iter->len) % dict->size;
+	    if (keep_keys)
+		okey = iter->okey;
+	    else
+		okey = xmlDictComputeKey(dict, iter->name, iter->len);
+	    key = okey % dict->size;
 	    if (dict->dict[key].valid == 0) {
 		memcpy(&(dict->dict[key]), iter, sizeof(xmlDictEntry));
 		dict->dict[key].next = NULL;
 		dict->dict[key].valid = 1;
+		dict->dict[key].okey = okey;
 		xmlFree(iter);
 	    } else {
-	    	iter->next = dict->dict[key].next;
-	    	dict->dict[key].next = iter;
+		iter->next = dict->dict[key].next;
+		iter->okey = okey;
+		dict->dict[key].next = iter;
 	    }
 
 #ifdef DEBUG_GROW
@@ -478,7 +641,7 @@ xmlDictGrow(xmlDictPtr dict, int size) {
 	    "xmlDictGrow : from %d to %d, %d elems\n", oldsize, size, nbElem);
 #endif
 
-    return(0);
+    return(ret);
 }
 
 /**
@@ -565,12 +728,12 @@ xmlDictLookup(xmlDictPtr dict, const xmlChar *name, int len) {
 	return(NULL);
 
     if (len < 0)
-        len = xmlStrlen(name);
+        len = strlen((const char *) name);
 
     /*
      * Check for duplicate and insertion location.
      */
-    okey = xmlDictComputeKey(name, len);
+    okey = xmlDictComputeKey(dict, name, len);
     key = okey % dict->size;
     if (dict->dict[key].valid == 0) {
 	insert = NULL;
@@ -578,55 +741,66 @@ xmlDictLookup(xmlDictPtr dict, const xmlChar *name, int len) {
 	for (insert = &(dict->dict[key]); insert->next != NULL;
 	     insert = insert->next) {
 #ifdef __GNUC__
-	    if (insert->len == len) {
+	    if ((insert->okey == okey) && (insert->len == len)) {
 		if (!memcmp(insert->name, name, len))
 		    return(insert->name);
 	    }
 #else
-	    if ((insert->len == len) &&
+	    if ((insert->okey == okey) && (insert->len == len) &&
 	        (!xmlStrncmp(insert->name, name, len)))
 		return(insert->name);
 #endif
 	    nbi++;
 	}
 #ifdef __GNUC__
-	if (insert->len == len) {
+	if ((insert->okey == okey) && (insert->len == len)) {
 	    if (!memcmp(insert->name, name, len))
 		return(insert->name);
 	}
 #else
-	if ((insert->len == len) &&
+	if ((insert->okey == okey) && (insert->len == len) &&
 	    (!xmlStrncmp(insert->name, name, len)))
 	    return(insert->name);
 #endif
     }
 
     if (dict->subdict) {
-	key = okey % dict->subdict->size;
+        unsigned long skey;
+
+        /* we cannot always reuse the same okey for the subdict */
+        if (((dict->size == MIN_DICT_SIZE) &&
+	     (dict->subdict->size != MIN_DICT_SIZE)) ||
+            ((dict->size != MIN_DICT_SIZE) &&
+	     (dict->subdict->size == MIN_DICT_SIZE)))
+	    skey = xmlDictComputeKey(dict->subdict, name, len);
+	else
+	    skey = okey;
+
+	key = skey % dict->subdict->size;
 	if (dict->subdict->dict[key].valid != 0) {
 	    xmlDictEntryPtr tmp;
 
 	    for (tmp = &(dict->subdict->dict[key]); tmp->next != NULL;
 		 tmp = tmp->next) {
 #ifdef __GNUC__
-		if (tmp->len == len) {
+		if ((tmp->okey == skey) && (tmp->len == len)) {
 		    if (!memcmp(tmp->name, name, len))
 			return(tmp->name);
 		}
 #else
-		if ((tmp->len == len) &&
+		if ((tmp->okey == skey) && (tmp->len == len) &&
 		    (!xmlStrncmp(tmp->name, name, len)))
 		    return(tmp->name);
 #endif
 		nbi++;
 	    }
 #ifdef __GNUC__
-	    if (tmp->len == len) {
+	    if ((tmp->okey == skey) && (tmp->len == len)) {
 		if (!memcmp(tmp->name, name, len))
 		    return(tmp->name);
 	    }
 #else
-	    if ((tmp->len == len) &&
+	    if ((tmp->okey == skey) && (tmp->len == len) &&
 		(!xmlStrncmp(tmp->name, name, len)))
 		return(tmp->name);
 #endif
@@ -648,6 +822,7 @@ xmlDictLookup(xmlDictPtr dict, const xmlChar *name, int len) {
     entry->len = len;
     entry->next = NULL;
     entry->valid = 1;
+    entry->okey = okey;
 
 
     if (insert != NULL) 
@@ -656,8 +831,10 @@ xmlDictLookup(xmlDictPtr dict, const xmlChar *name, int len) {
     dict->nbElems++;
 
     if ((nbi > MAX_HASH_LEN) &&
-        (dict->size <= ((MAX_DICT_HASH / 2) / MAX_HASH_LEN)))
-	xmlDictGrow(dict, MAX_HASH_LEN * 2 * dict->size);
+        (dict->size <= ((MAX_DICT_HASH / 2) / MAX_HASH_LEN))) {
+	if (xmlDictGrow(dict, MAX_HASH_LEN * 2 * dict->size) != 0)
+	    return(NULL);
+    }
     /* Note that entry may have been freed at this point by xmlDictGrow */
 
     return(ret);
@@ -682,12 +859,12 @@ xmlDictExists(xmlDictPtr dict, const xmlChar *name, int len) {
 	return(NULL);
 
     if (len < 0)
-        len = xmlStrlen(name);
+        len = strlen((const char *) name);
 
     /*
      * Check for duplicate and insertion location.
      */
-    okey = xmlDictComputeKey(name, len);
+    okey = xmlDictComputeKey(dict, name, len);
     key = okey % dict->size;
     if (dict->dict[key].valid == 0) {
 	insert = NULL;
@@ -695,60 +872,70 @@ xmlDictExists(xmlDictPtr dict, const xmlChar *name, int len) {
 	for (insert = &(dict->dict[key]); insert->next != NULL;
 	     insert = insert->next) {
 #ifdef __GNUC__
-	    if (insert->len == len) {
+	    if ((insert->okey == okey) && (insert->len == len)) {
 		if (!memcmp(insert->name, name, len))
 		    return(insert->name);
 	    }
 #else
-	    if ((insert->len == len) &&
+	    if ((insert->okey == okey) && (insert->len == len) &&
 	        (!xmlStrncmp(insert->name, name, len)))
 		return(insert->name);
 #endif
 	    nbi++;
 	}
 #ifdef __GNUC__
-	if (insert->len == len) {
+	if ((insert->okey == okey) && (insert->len == len)) {
 	    if (!memcmp(insert->name, name, len))
 		return(insert->name);
 	}
 #else
-	if ((insert->len == len) &&
+	if ((insert->okey == okey) && (insert->len == len) &&
 	    (!xmlStrncmp(insert->name, name, len)))
 	    return(insert->name);
 #endif
     }
 
     if (dict->subdict) {
-	key = okey % dict->subdict->size;
+        unsigned long skey;
+
+        /* we cannot always reuse the same okey for the subdict */
+        if (((dict->size == MIN_DICT_SIZE) &&
+	     (dict->subdict->size != MIN_DICT_SIZE)) ||
+            ((dict->size != MIN_DICT_SIZE) &&
+	     (dict->subdict->size == MIN_DICT_SIZE)))
+	    skey = xmlDictComputeKey(dict->subdict, name, len);
+	else
+	    skey = okey;
+
+	key = skey % dict->subdict->size;
 	if (dict->subdict->dict[key].valid != 0) {
 	    xmlDictEntryPtr tmp;
 
 	    for (tmp = &(dict->subdict->dict[key]); tmp->next != NULL;
 		 tmp = tmp->next) {
 #ifdef __GNUC__
-		if (tmp->len == len) {
+		if ((tmp->okey == skey) && (tmp->len == len)) {
 		    if (!memcmp(tmp->name, name, len))
 			return(tmp->name);
 		}
 #else
-		if ((tmp->len == len) &&
+		if ((tmp->okey == skey) && (tmp->len == len) &&
 		    (!xmlStrncmp(tmp->name, name, len)))
 		    return(tmp->name);
 #endif
 		nbi++;
 	    }
 #ifdef __GNUC__
-	    if (tmp->len == len) {
+	    if ((tmp->okey == skey) && (tmp->len == len)) {
 		if (!memcmp(tmp->name, name, len))
 		    return(tmp->name);
 	    }
 #else
-	    if ((tmp->len == len) &&
+	    if ((tmp->okey == skey) && (tmp->len == len) &&
 		(!xmlStrncmp(tmp->name, name, len)))
 		return(tmp->name);
 #endif
 	}
-	key = okey % dict->size;
     }
 
     /* not found */
@@ -758,7 +945,7 @@ xmlDictExists(xmlDictPtr dict, const xmlChar *name, int len) {
 /**
  * xmlDictQLookup:
  * @dict: the dictionnary
- * @prefix: the prefix 
+ * @prefix: the prefix
  * @name: the name
  *
  * Add the QName @prefix:@name to the hash @dict if not present.
@@ -771,54 +958,67 @@ xmlDictQLookup(xmlDictPtr dict, const xmlChar *prefix, const xmlChar *name) {
     xmlDictEntryPtr entry;
     xmlDictEntryPtr insert;
     const xmlChar *ret;
-    int len;
+    int len, plen, l;
 
     if ((dict == NULL) || (name == NULL))
 	return(NULL);
+    if (prefix == NULL)
+        return(xmlDictLookup(dict, name, -1));
 
-    len = xmlStrlen(name);
-    if (prefix != NULL)
-        len += 1 + xmlStrlen(prefix);
+    l = len = strlen((const char *) name);
+    plen = strlen((const char *) prefix);
+    len += 1 + plen;
 
     /*
      * Check for duplicate and insertion location.
      */
-    okey = xmlDictComputeQKey(prefix, name, len);
+    okey = xmlDictComputeQKey(dict, prefix, plen, name, l);
     key = okey % dict->size;
     if (dict->dict[key].valid == 0) {
 	insert = NULL;
     } else {
 	for (insert = &(dict->dict[key]); insert->next != NULL;
 	     insert = insert->next) {
-	    if ((insert->len == len) &&
+	    if ((insert->okey == okey) && (insert->len == len) &&
 	        (xmlStrQEqual(prefix, name, insert->name)))
 		return(insert->name);
 	    nbi++;
 	}
-	if ((insert->len == len) &&
+	if ((insert->okey == okey) && (insert->len == len) &&
 	    (xmlStrQEqual(prefix, name, insert->name)))
 	    return(insert->name);
     }
 
     if (dict->subdict) {
-	key = okey % dict->subdict->size;
+        unsigned long skey;
+
+        /* we cannot always reuse the same okey for the subdict */
+        if (((dict->size == MIN_DICT_SIZE) &&
+	     (dict->subdict->size != MIN_DICT_SIZE)) ||
+            ((dict->size != MIN_DICT_SIZE) &&
+	     (dict->subdict->size == MIN_DICT_SIZE)))
+	    skey = xmlDictComputeQKey(dict->subdict, prefix, plen, name, l);
+	else
+	    skey = okey;
+
+	key = skey % dict->subdict->size;
 	if (dict->subdict->dict[key].valid != 0) {
 	    xmlDictEntryPtr tmp;
 	    for (tmp = &(dict->subdict->dict[key]); tmp->next != NULL;
 		 tmp = tmp->next) {
-		if ((tmp->len == len) &&
+		if ((tmp->okey == skey) && (tmp->len == len) &&
 		    (xmlStrQEqual(prefix, name, tmp->name)))
 		    return(tmp->name);
 		nbi++;
 	    }
-	    if ((tmp->len == len) &&
+	    if ((tmp->okey == skey) && (tmp->len == len) &&
 		(xmlStrQEqual(prefix, name, tmp->name)))
 		return(tmp->name);
 	}
 	key = okey % dict->size;
     }
 
-    ret = xmlDictAddQString(dict, prefix, name, len);
+    ret = xmlDictAddQString(dict, prefix, plen, name, l);
     if (ret == NULL)
         return(NULL);
     if (insert == NULL) {
@@ -832,6 +1032,7 @@ xmlDictQLookup(xmlDictPtr dict, const xmlChar *prefix, const xmlChar *name) {
     entry->len = len;
     entry->next = NULL;
     entry->valid = 1;
+    entry->okey = okey;
 
     if (insert != NULL) 
 	insert->next = entry;
diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html
index bedf943..eacab4b 100644
--- a/doc/APIchunk1.html
+++ b/doc/APIchunk1.html
@@ -39,6 +39,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 y-z
 Letter C:
C14N
xmlC14NDocSaveTo

 xmlC14NExecute

+xmlC14NIsVisibleCallback

 
CATALOG
xmlLoadACatalog

 xmlLoadCatalog

 xmlLoadSGMLSuperCatalog

@@ -108,6 +109,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlOutputOpenCallback

 xmlOutputWriteCallback

 xmlParserInputDeallocate

+xmlRegExecCallbacks

 xmlSAX2ExternalSubset

 xmlSAX2InternalSubset

 xmlValidityErrorFunc

diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html
index cbcc86b..94fd2fa 100644
--- a/doc/APIchunk10.html
+++ b/doc/APIchunk10.html
@@ -41,7 +41,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlURIEscapeStr

 
a-zA-Z
IS_ASCII_LETTER

 
a-zA-Z0-9
IS_PUBIDCHAR

-
a-zA-Z0-9_
xmlParseVersionNum

 
a@b
xmlNanoFTPProxy

 
abc
xmlXPathTranslateFunction

 
abc-
xmlXPathTranslateFunction

@@ -62,8 +61,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_SCHEMAS_ELEM_FINAL_ABSENT

 XML_SCHEMAS_TYPE_VARIETY_ABSENT

 
absoluteURI
xmlParseURI

-xmlParseURIRaw

-xmlParseURIReference

 
abstract
XML_SCHEMAS_ELEM_ABSTRACT

 XML_SCHEMAS_TYPE_ABSTRACT

 
accept
xmlExpMaxToken

@@ -88,6 +85,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlMemSetup

 xmlNewMutex

 xmlNewRMutex

+xmlSchemaValidCtxtGetParserCtxt

 
accessed
xmlTextReaderCurrentDoc

 xmlTextReaderCurrentNode

 
accesses
xmlCreateURLParserCtxt

@@ -315,6 +313,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlKeepBlanksDefault

 xmlNewDocNode

 xmlNewDocNodeEatName

+xmlParseVersionNum

+xmlSchemaValidCtxtGetParserCtxt

 xmlSearchNs

 xmlShell

 xmlValidateNCName

@@ -372,7 +372,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlReplaceNode

 xmlXPathNodeSetAddUnique

 xmlXPtrLocationSetAdd

-
also
xmlCharEncodingOutputFunc

+
also
_xmlEntity

+xmlCharEncodingOutputFunc

 xmlCheckHTTPInput

 xmlCleanupParser

 xmlHasProp

@@ -398,6 +399,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
amd
xmlCatalogIsEmpty

 
amount
INPUT_CHUNK

 _xmlParserInputBuffer

+xmlMemDisplayLast

 xmlMemUsed

 xmlParserInputBufferGrow

 xmlParserInputBufferRead

@@ -437,6 +439,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNamespaceParseNCName

 xmlNamespaceParseNSDef

 xmlNamespaceParseQName

+xmlNewEntity

 
anyway
xmlRecoverDoc

 xmlRecoverFile

 xmlRecoverMemory

diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html
index bcb58cf..7062e5e 100644
--- a/doc/APIchunk11.html
+++ b/doc/APIchunk11.html
@@ -56,8 +56,14 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNewEntityInputStream

 xmlNewInputFromFile

 xmlNewStringInputStream

+xmlParseURI

+xmlParseURIReference

 xmlRelaxNGNewValidCtxt

 xmlSchemaNewStringValue

+xmlSchemaNewValidCtxt

+xmlSchemaSAXPlug

+xmlSchemaSAXUnplug

+xmlSchemaValidateStream

 xmlSchematronNewValidCtxt

 xmlSetCompressMode

 xmlSetDocCompressMode

@@ -142,6 +148,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlAutomataNewOnceTrans

 xmlAutomataNewOnceTrans2

 xmlCatalogSetDefaultPrefer

+xmlMemDisplayLast

 xmlParseQuotedString

 xmlXPathDifference

 
beyond
xmlXPathStringFunction

@@ -192,6 +199,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
bracket
xmlParseCharData

 
branch
xmlDOMWrapCloneNode

 xmlDOMWrapRemoveNode

+xmlSchemaValidateOneElement

 
break
_xmlError

 xmlDOMWrapAdoptNode

 xmlDOMWrapCloneNode

diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html
index 769619b..ff1be47 100644
--- a/doc/APIchunk12.html
+++ b/doc/APIchunk12.html
@@ -55,6 +55,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlXPathSubValues

 xmlXPathValueFlipSign

 
calls
xlinkNodeDetectFunc

+xmlSchemaSAXPlug

 xmlXPathAxisFunc

 
came
xmlPopInput

 
cannot
xmlParseAttribute

@@ -769,6 +770,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 
corresponding
xmlGetDocEntity

 xmlGetDtdEntity

 xmlGetParameterEntity

+xmlOutputBufferCreateFilenameFunc

+xmlParserInputBufferCreateFilenameFunc

 xmlSetProp

 xmlXPathTranslateFunction

 
cost
xmlByteConsumed

@@ -788,7 +791,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlTextReaderSchemaValidateCtxt

 xmlTextReaderSetSchema

 xmlValidateDtd

-
count
ftpListCallback

+
count
_xmlEntity

+ftpListCallback

 xmlExpRef

 xmlLsCountNode

 xmlSaveDoc

@@ -849,12 +853,14 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlValidityErrorFunc

 xmlValidityWarningFunc

 
cur
xmlXPathAxisFunc

+
curent
xmlC14NIsVisibleCallback

 
currently
XML_SCHEMAS_INCLUDING_CONVERT_NS

 xmlGcMemGet

 xmlMemBlocks

 xmlMemGet

 xmlMemUsed

 xmlOutputBufferCreateFilename

+xmlSchemaValidateFile

 xmlXPathContextSetCache

 
custom
xmlDOMWrapAdoptNode

 xmlDOMWrapCloneNode

diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html
index c86ff16..2e8417f 100644
--- a/doc/APIchunk13.html
+++ b/doc/APIchunk13.html
@@ -178,6 +178,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 _xmlXPathContext

 xmlGetNsList

 xmlHandleEntity

+xmlNewEntity

 xmlNewNs

 xmlNodeGetBase

 xmlParseBalancedChunkMemory

@@ -248,6 +249,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlPatternMinDepth

 xmlTextReaderDepth

 
deregistration
xmlDeregisterNodeDefault

+xmlDeregisterNodeFunc

 
derivation
XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION

 XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION

 xmlExpExpDerive

@@ -301,6 +303,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 htmlReadFd

 xmlCtxtReadFd

 xmlMemDisplay

+xmlMemDisplayLast

 xmlMemShow

 xmlOutputBufferCreateFd

 xmlParserInputBufferCreateFd

@@ -356,6 +359,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSAX2EndElementNs

 xmlSAX2Reference

 xmlSAX2StartElementNs

+xmlSchemaIsValid

 
detection
docbCreatePushParserCtxt

 xlinkExtendedLinkFunk

 xlinkExtendedLinkSetFunk

@@ -400,7 +404,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlTextReaderGetRemainder

 xmlTextReaderStandalone

 
difference
xmlXPathDifference

-
different
xmlACatalogAdd

+
different
_xmlBuffer

+xmlACatalogAdd

 xmlBuildQName

 xmlCatalogAdd

 xmlNodeGetBase

@@ -408,6 +413,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlStrQEqual

 
differentiate
xmlXPathOrderDocElems

 
differently
xmlTextReaderGetRemainder

+
differs
xmlNewEntity

 
digit
xmlXPathStringFunction

 
digits
xmlXPathStringFunction

 
dir
xmlShellDir

@@ -462,6 +468,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_SCHEMAS_ELEM_BLOCK_RESTRICTION

 XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION

 
discard
xmlParserInputRead

+
discarded
xmlDeregisterNodeFunc

 
discarding
xmlParseAttValue

 xmlValidCtxtNormalizeAttributeValue

 xmlValidNormalizeAttributeValue

@@ -526,6 +533,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlXPathNodeTrailingSorted

 xmlXPathTrailing

 xmlXPathTrailingSorted

+
doing
xmlOutputBufferCreateFilenameFunc

+xmlParserInputBufferCreateFilenameFunc

+xmlRegExecCallbacks

 
don
XML_SCHEMAS_ANY_LAX

 xlinkIsLink

 xmlCreatePushParserCtxt

@@ -584,9 +594,11 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlDumpNotationDecl

 xmlDumpNotationTable

 xmlLsOneNode

+xmlMemDisplayLast

 xmlMemShow

 xmlSnprintfElementContent

 xmlXPathDebugDumpObject

+
dumping
xmlMemDisplayLast

 
dumps
xmlShellBase

 xmlShellCat

 xmlShellDir

@@ -597,7 +609,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 
duplicates
xmlSchemaCopyValue

 
duration
xmlSchemaGetCanonValue

 
during
xmlSAXDefaultVersion

+xmlSchemaIsValid

 xmlSchemaNewDocParserCtxt

+xmlSchemaSetValidOptions

 xmlSchematronNewDocParserCtxt

 
dynamic
LIBXML_MODULE_EXTENSION

 
A-B
diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html
index 61e35fc..0973657 100644
--- a/doc/APIchunk14.html
+++ b/doc/APIchunk14.html
@@ -186,6 +186,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 ensuring
xmlDOMWrapRemoveNode

 
entire
xmlCleanupInputCallbacks

 xmlCleanupOutputCallbacks

+
entites
_xmlEntity

 
entities:
xmlParseEntityRef

 xmlParserHandleReference

 
entproc
xmlParserHandlePEReference

@@ -321,7 +322,11 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlParseBalancedChunkMemoryRecover

 xmlTextWriterFullEndElement

 xmlXPathRoundFunction

+
event
xmlSchemaSAXPlug

+xmlSchemaSAXUnplug

+xmlSchemaValidateStream

 
events
htmlSAXParseDoc

+xmlSchemaValidateStream

 
ever
xmlExpCtxtNbCons

 
everywhere
xmlSAXParseFileWithData

 xmlSAXParseMemoryWithData

diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html
index 03616a5..d8ac416 100644
--- a/doc/APIchunk15.html
+++ b/doc/APIchunk15.html
@@ -105,6 +105,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSAXParseMemoryWithData

 
far
_xmlParserCtxt

 fatalErrorSAXFunc

+xmlSchemaIsValid

 
fashion
xmlNewRMutex

 
fast
htmlInitAutoClose

 
faster
htmlNodeStatus

@@ -231,6 +232,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlStringLenGetNodeList

 
floor
xmlXPathFloorFunction

 
flow
xmlScanName

+xmlSchemaSAXPlug

+xmlSchemaSAXUnplug

+xmlSchemaValidateStream

 
flushed
xmlTextWriterEndDocument

 
flushes
xmlOutputBufferClose

 xmlOutputBufferFlush

@@ -316,12 +320,11 @@ A:link, A:visited, A:active { text-decoration: underline }
 htmlSAXParseFile

 xmlParseCtxtExternalEntity

 xmlParseExternalEntity

+
forward
xmlSchemaValidateStream

 
fptr
XML_CAST_FPTR

 
fragment
_xmlURI

 xmlNewDocFragment

 xmlParseURI

-xmlParseURIRaw

-xmlParseURIReference

 xmlPushInput

 
fragments
xmlParseURIRaw

 
freeing
xmlCanonicPath

@@ -392,8 +395,11 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlRelaxNGSetParserStructuredErrors

 xmlRelaxNGSetValidErrors

 xmlRelaxNGSetValidStructuredErrors

+xmlSchemaGetValidErrors

 xmlSchemaSetParserErrors

 xmlSchemaSetParserStructuredErrors

+xmlSchemaSetValidErrors

+xmlSchemaSetValidStructuredErrors

 xmlSchematronSetValidStructuredErrors

 xmlShellCmd

 xmlSwitchEncoding

@@ -407,6 +413,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlValidNormalizeAttributeValue

 xmlXIncludeSetFlags

 
future
_xmlDOMWrapCtxt

+xmlSchemaValidateFile

 
A-B
 C-C
 D-E
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html
index 548d945..633240e 100644
--- a/doc/APIchunk17.html
+++ b/doc/APIchunk17.html
@@ -144,6 +144,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 included
xmlC14NDocDumpMemory

 xmlC14NDocSave

 xmlC14NDocSaveTo

+xmlC14NIsVisibleCallback

 xmlDocDumpMemory

 xmlFreeDoc

 xmlNanoHTTPContentLength

@@ -201,6 +202,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 nodePush

 xmlByteConsumed

 xmlParserFindNodeInfoIndex

+xmlPushInput

 xmlStrsub

 xmlTextReaderByteConsumed

 xmlTextReaderGetAttributeNo

@@ -236,6 +238,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
indicating
xmlParseCharData

 xmlParserFindNodeInfoIndex

 xmlShellCmd

+xmlTextReaderErrorFunc

 xmlTextReaderNormalization

 xmlXPathAxisFunc

 
indication
xmlNanoFTPRead

@@ -293,6 +296,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNewTextReader

 xmlRelaxNGGetParserErrors

 xmlSchemaGetParserErrors

+xmlSchemaValidateStream

 xmlTextReaderByteConsumed

 xmlXPathOrderDocElems

 
informations
_xmlAttr

@@ -317,6 +321,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlRelaxParserSetFlag

 xmlSAX2EndElementNs

 xmlSAX2StartElementNs

+xmlSchemaGetValidErrors

+xmlSchemaSetValidErrors

 xmlShellDir

 xmlXIncludeProcessNode

 
informative
_xmlError

@@ -472,6 +478,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlRelaxNGNewDocParserCtxt

 xmlRemoveID

 xmlRemoveRef

+xmlSchemaValidateFile

 xmlXPathContextSetCache

 
interned
xmlPatterncompile

 xmlTextReaderConstString

diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html
index fcdce05..78b4480 100644
--- a/doc/APIchunk18.html
+++ b/doc/APIchunk18.html
@@ -125,6 +125,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlHashUpdateEntry2

 xmlHashUpdateEntry3

 xmlKeepBlanksDefault

+xmlNewEntity

 xmlParseAttValue

 
latest
xmlNanoHTTPReturnCode

 
layer
xmlChildrenNode

@@ -136,6 +137,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlRootNode

 xmlSaveFileTo

 xmlSaveFormatFileTo

+xmlSchemaSAXPlug

+xmlSchemaSAXUnplug

 
leading
xmlParseAttValue

 xmlParseElementChildrenContentDecl

 xmlParseElementMixedContentDecl

@@ -152,6 +155,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlXPathStringFunction

 
left
xmlExpNewOr

 xmlExpNewSeq

+xmlMemDisplayLast

 xmlTextReaderGetRemainder

 
legacy
htmlNodeStatus

 
len
xmlBufferAdd

@@ -194,6 +198,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlDebugDumpOneNode

 xmlNodeDump

 xmlNodeDumpOutput

+xmlParseVersionNum

 xmlShellPwd

 xmlStreamPop

 xmlXPathDebugDumpCompExpr

@@ -348,6 +353,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlCanonicPath

 xmlPathToURI

 xmlSAX2SetDocumentLocator

+xmlTextReaderErrorFunc

 xmlTextReaderLocatorBaseURI

 xmlTextReaderLocatorLineNumber

 
locators
xlinkExtendedLinkFunk

diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html
index a5db809..eccf3d3 100644
--- a/doc/APIchunk19.html
+++ b/doc/APIchunk19.html
@@ -51,6 +51,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
main
xmlIsMainThread

 
maintained
xmlRemoveID

 xmlRemoveRef

+xmlSchemaSAXPlug

 
major
xmlDecodeEntities

 
make
xmlCreateEntitiesTable

 xmlNewNode

@@ -72,7 +73,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 
manage
xmlBufferWriteChar

 xmlBufferWriteQuotedString

 
manages
xmlBufferWriteCHAR

-
mandatory
xmlParseTextDecl

 
manipulated
xmlNewRMutex

 
manipulating
xmlExpNewCtxt

 xmlLoadSGMLSuperCatalog

@@ -185,6 +185,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
memo
getSystemId

 xmlSAX2GetSystemId

 
memorylist
xmlMemDisplay

+xmlMemDisplayLast

 xmlMemoryDump

 
merged
xmlTextMerge

 
merging
xmlAddChild

@@ -192,20 +193,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlAddNextSibling

 xmlAddPrevSibling

 xmlAddSibling

-
message
_xmlError

-errorSAXFunc

-fatalErrorSAXFunc

-warningSAXFunc

-xmlGenericErrorFunc

-xmlParserError

-xmlParserValidityError

-xmlParserValidityWarning

-xmlParserWarning

-xmlStrPrintf

-xmlStrVPrintf

-xmlValidityErrorFunc

-xmlValidityWarningFunc

-xmlXPatherror

 
messages
errorSAXFunc

 fatalErrorSAXFunc

 warningSAXFunc

@@ -220,6 +207,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 _xmlBuffer

 xmlNanoHTTPMethod

 xmlNanoHTTPMethodRedir

+xmlOutputBufferCreateFilenameFunc

+xmlParserInputBufferCreateFilenameFunc

 xmlRegisterHTTPPostCallbacks

 xmlSetBufferAllocationScheme

 xmlTextReaderClose

@@ -251,7 +240,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 
mixed-content
xmlParseElementMixedContentDecl

 
mmap
xmlParserInputBufferCreateStatic

 
mod
xmlXPathModValues

-
mode
_xmlParserCtxt

+
mode
_xmlBuffer

+_xmlParserCtxt

 docbCreatePushParserCtxt

 htmlCreatePushParserCtxt

 xmlCreatePushParserCtxt

diff --git a/doc/APIchunk2.html b/doc/APIchunk2.html
index 214bf62..1923889 100644
--- a/doc/APIchunk2.html
+++ b/doc/APIchunk2.html
@@ -227,13 +227,11 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Letter E:
ELEMENT
_xmlElementContent

 
EMPTY
xmlParseElementContentDecl

 
ENTITIES
xmlParseAttributeType

-xmlValidateAttributeValue

 xmlValidateDtdFinal

 
ENTITY
htmlParseEntityRef

 xmlParseAttributeType

 xmlParseEntityRef

 xmlParseEntityValue

-xmlValidateAttributeValue

 xmlValidateDtdFinal

 
ENTITY_REF
xmlNodeBufGetContent

 xmlNodeGetContent

@@ -322,7 +320,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlParsePEReference

 xmlParserHandlePEReference

 xmlParserHandleReference

-xmlValidateAttributeValue

 xmlValidateOneAttribute

 xmlValidateOneNamespace

 
EntityDecl
xmlParseEntityDecl

diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html
index 1f00aa3..3bd1894 100644
--- a/doc/APIchunk20.html
+++ b/doc/APIchunk20.html
@@ -73,6 +73,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlReconciliateNs

 
naming
xmlChildrenNode

 xmlRootNode

+
nbBytes
xmlMemDisplayLast

 
nbval
xmlRegExecErrInfo

 xmlRegExecNextValues

 
ncname
xmlBuildQName

@@ -120,10 +121,12 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlDOMWrapReconcileNamespaces

 xmlGetBufferAllocationScheme

 xmlLoadSGMLSuperCatalog

+xmlNewEntity

 xmlNewNodeEatName

 xmlParseElementChildrenContentDecl

 xmlParseElementMixedContentDecl

 xmlReconciliateNs

+xmlSchemaSAXPlug

 xmlSetBufferAllocationScheme

 xmlShellPwd

 xmlStrncat

diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html
index 05eab1d..cff8e69 100644
--- a/doc/APIchunk21.html
+++ b/doc/APIchunk21.html
@@ -67,6 +67,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlHashCreateDict

 xmlListRemoveFirst

 xmlListRemoveLast

+xmlTextReaderErrorFunc

 
occurences
xmlAutomataNewCountTrans

 xmlAutomataNewCountTrans2

 xmlAutomataNewOnceTrans

@@ -233,6 +234,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlDOMWrapCloneNode

 xmlDOMWrapReconcileNamespaces

 xmlGetLineNo

+xmlSchemaValidCtxtGetOptions

 
options
htmlCtxtUseOptions

 xmlCtxtUseOptions

 xmlDOMWrapRemoveNode

@@ -241,6 +243,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSaveToFd

 xmlSaveToFilename

 xmlSaveToIO

+xmlSchemaSetValidOptions

+xmlSchemaValidCtxtGetOptions

+xmlSchemaValidateFile

 xmlTextReaderSchemaValidateCtxt

 xmlTextReaderSetup

 xmlXPathContextSetCache

@@ -272,6 +277,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlListMerge

 xmlParseEntityValue

 xmlParseURIRaw

+xmlSchemaSAXPlug

+xmlSchemaSAXUnplug

 xmlShellSave

 xmlStrcat

 xmlStrncat

diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html
index 1fcc6c9..c84804c 100644
--- a/doc/APIchunk22.html
+++ b/doc/APIchunk22.html
@@ -170,7 +170,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlGcMemGet

 xmlMemGet

 xmlReplaceNode

-
places
xmlStrPrintf

+
places
xmlMemDisplayLast

+xmlStrPrintf

 xmlStrVPrintf

 
plug
xmlXPathFuncLookupFunc

 xmlXPathVariableLookupFunc

@@ -184,6 +185,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlReconciliateNs

 xmlRegExecErrInfo

 xmlRegExecNextValues

+xmlSchemaSAXPlug

+xmlSchemaSAXUnplug

 xmlValidGetValidElements

 
points
_xmlChRangeGroup

 
pop
xmlPopInput

@@ -202,35 +205,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 
positioned
xmlTextReaderReadString

 
positionned
xmlTextReaderReadAttributeValue

 
positions
xmlUTF8Strsub

-
positive
UTF8ToHtml

-UTF8Toisolat1

-docbEncodeEntities

-htmlEncodeEntities

-isolat1ToUTF8

-xmlBufferAdd

-xmlBufferAddHead

-xmlBufferCCat

-xmlBufferCat

-xmlCharEncodingInputFunc

-xmlCharEncodingOutputFunc

-xmlRelaxNGValidateDoc

-xmlSchemaCheckFacet

-xmlSchemaValPredefTypeNode

-xmlSchemaValPredefTypeNodeNoNorm

-xmlSchemaValidateFacet

-xmlSchemaValidateFacetWhtsp

-xmlSchemaValidateLengthFacet

-xmlSchemaValidateLengthFacetWhtsp

-xmlSchemaValidateListSimpleTypeFacet

-xmlSchemaValidatePredefinedType

-xmlTextReaderPreservePattern

-xmlValidateNCName

-xmlValidateNMToken

-xmlValidateName

-xmlValidateQName

-xmlXPathBooleanFunction

-xmlXPathFloorFunction

-xmlXPathStringFunction

 
possible
xmlCopyNodeList

 xmlCreateEntityParserCtxt

 xmlParseDefaultDecl

@@ -256,6 +230,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
potential
xmlDebugCheckDocument

 xmlValidGetPotentialChildren

 
potentially
_xmlURI

+
practice
xmlParseVersionNum

 
pre-interned
_xmlParserCtxt

 
preallocated
xmlBuildQName

 
precede
xmlParseEntityRef

@@ -281,6 +256,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlPatternStreamable

 xmlRegNewExecCtxt

 xmlRelaxNGNewValidCtxt

+xmlSchemaNewValidCtxt

 xmlSchematronNewValidCtxt

 xmlTextReaderRelaxNGSetSchema

 xmlTextReaderSetSchema

@@ -453,6 +429,32 @@ A:link, A:visited, A:active { text-decoration: underline }
 
produced
xmlCharEncodingOutputFunc

 xmlCurrentChar

 
producing
xmlCheckUTF8

+
production
IS_BASECHAR

+IS_BLANK

+IS_BYTE_CHAR

+IS_CHAR

+IS_COMBINING

+IS_DIGIT

+IS_EXTENDER

+IS_IDEOGRAPHIC

+IS_LETTER

+IS_PUBIDCHAR

+xmlIsLetter

+xmlParseAttributeType

+xmlParseBalancedChunkMemory

+xmlParseBalancedChunkMemoryRecover

+xmlParseCharRef

+xmlParseCtxtExternalEntity

+xmlParseExtParsedEnt

+xmlParseExternalEntity

+xmlParseExternalID

+xmlParseInNodeContext

+xmlValidateNameValue

+xmlValidateNamesValue

+xmlValidateNmtokenValue

+xmlValidateNmtokensValue

+xmlXPathIdFunction

+xmlXPathNormalizeFunction

 
production:
xmlCheckLanguageID

 
productions
xmlCheckLanguageID

 
program
xmlXPtrNewContext

@@ -479,7 +481,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlXPathIsNaN

 
prolog
xmlParseDocument

 
prompt
xmlShellReadlineFunc

-
proper
xmlValidateAttributeValue

 
properly
xmlParseElementChildrenContentDecl

 xmlParseMarkupDecl

 xmlReconciliateNs

@@ -521,6 +522,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlOutputMatchCallback

 xmlSaveFormatFile

 xmlSaveFormatFileEnc

+xmlSchemaValidateStream

 xmlUTF8Strloc

 xmlUTF8Strpos

 
provides
endElementNsSAX2Func

diff --git a/doc/APIchunk23.html b/doc/APIchunk23.html
index 4d76cc6..b7b26c2 100644
--- a/doc/APIchunk23.html
+++ b/doc/APIchunk23.html
@@ -118,7 +118,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 
read-only
xmlDictCreateSub

 
readable
xmlStrEqual

 
reader-
xmlTextReaderGetRemainder

-
reading
xmlShell

+
reading
xmlSchemaValidateStream

+xmlShell

 
ready
INPUT_CHUNK

 xmlAutomataCompile

 
realloc
_xmlBuffer

@@ -238,32 +239,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNewCharRef

 
referenced
xmlLinkGetData

 xmlParseAttValue

-
references
XML_SCHEMAS_ATTRGROUP_HAS_REFS

-XML_SCHEMAS_ATTR_INTERNAL_RESOLVED

-XML_SCHEMAS_ELEM_CIRCULAR

-XML_SCHEMAS_ELEM_INTERNAL_RESOLVED

-htmlParseEntityRef

-xmlGetRefs

-xmlLoadSGMLSuperCatalog

-xmlNewChild

-xmlNewDocNode

-xmlNewDocNodeEatName

-xmlNodeAddContent

-xmlNodeAddContentLen

-xmlNodeBufGetContent

-xmlNodeGetContent

-xmlNodeSetContent

-xmlNodeSetContentLen

-xmlParseAttribute

-xmlParseCharRef

-xmlParseEntityRef

-xmlParseMarkupDecl

-xmlParsePEReference

-xmlParseReference

-xmlParseSDDecl

-xmlParserHandlePEReference

-xmlScanName

-xmlSubstituteEntitiesDefault

 
referencing
xmlGetDocEntity

 xmlGetDtdEntity

 xmlGetParameterEntity

@@ -305,7 +280,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlOutputBufferCreateFilenameDefault

 xmlParserInputBufferCreateFilenameDefault

 xmlRegisterNodeDefault

+xmlRegisterNodeFunc

 
regular
LIBXML_REGEXP_ENABLED

+xmlRegExecCallbacks

 xmlRegFreeExecCtxt

 xmlRegNewExecCtxt

 xmlRegexpCompile

@@ -331,9 +308,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlTextReaderMoveToAttributeNo

 xmlUTF8Strloc

 xmlUTF8Strsub

-
relativeURI
xmlParseURI

-xmlParseURIRaw

+
relative-ref
xmlParseURIRaw

 xmlParseURIReference

+
relativeURI
xmlParseURI

 
release
xmlClearNodeInfoSeq

 xmlClearParserCtxt

 xmlDecodeEntities

@@ -406,6 +383,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlHashUpdateEntry2

 xmlHashUpdateEntry3

 xmlNewTextChild

+xmlSchemaSAXPlug

 xmlXPathTranslateFunction

 
replacement
xmlACatalogAdd

 xmlCatalogAdd

@@ -453,6 +431,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlHasFeature

 xmlIsID

 xmlMallocFunc

+xmlParserInputBufferCreateFilenameFunc

 xmlReallocFunc

 
requests
xmlRegisterHTTPPostCallbacks

 
required
XML_SCHEMAS_ATTR_USE_REQUIRED

@@ -514,6 +493,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlRelaxNGFreeParserCtxt

 xmlRelaxNGFreeValidCtxt

 xmlSchemaFreeParserCtxt

+xmlSchemaFreeValidCtxt

 xmlSchematronFreeParserCtxt

 xmlSchematronFreeValidCtxt

 xmlTextReaderClose

@@ -522,13 +502,15 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNodeSetContentLen

 
respect
xmlExpStringDerive

 
respecting
xmlValidGetValidElements

+
responsability
xmlNewEntity

 
response
xmlNanoFTPCheckResponse

 xmlNanoFTPGetResponse

 xmlNanoHTTPContentLength

 
responsible
xmlC14NDocDumpMemory

 xmlCanonicPath

 xmlPathToURI

-
restored
xmlTextReaderSetErrorHandler

+
restored
xmlSchemaSAXUnplug

+xmlTextReaderSetErrorHandler

 xmlTextReaderSetStructuredErrorHandler

 
restrict
xmlParseExternalID

 
restriction
XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION

@@ -636,6 +618,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
running
xmlKeepBlanksDefault

 
runtime
LIBXML_DEBUG_RUNTIME

 XML_MAX_NAMELEN

+xmlMemDisplayLast

 
A-B
 C-C
 D-E
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html
index 0a798e6..83f5111 100644
--- a/doc/APIchunk24.html
+++ b/doc/APIchunk24.html
@@ -128,8 +128,11 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSchemaGetFacetValueAsULong

 xmlSchemaGetValType

 xmlSchemaNewMemParserCtxt

+xmlSchemaValidateDoc

 xmlSchemaValidateFacet

 xmlSchemaValidateFacetWhtsp

+xmlSchemaValidateFile

+xmlSchemaValidateStream

 xmlSchematronNewMemParserCtxt

 xmlTextReaderSchemaValidate

 xmlTextReaderSchemaValidateCtxt

@@ -266,6 +269,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 setting
xmlSetGenericErrorFunc

 xmlXPathContextSetCache

 
setups
xmlParseEncodingDecl

+
severity
xmlTextReaderErrorFunc

 
sgmlsource
getSystemId

 xmlSAX2GetSystemId

 
shadowed
xmlDOMWrapAdoptNode

@@ -448,6 +452,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlCopyError

 xmlCtxtReadIO

 xmlNewTextReader

+xmlParserInputBufferCreateFilenameFunc

 xmlReadIO

 xmlReaderForIO

 xmlReaderNewIO

@@ -584,6 +589,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNewCharRef

 xmlNewTextWriterTree

 xmlSaveTree

+xmlSchemaValidateOneElement

 xmlXPathOrderDocElems

 xmlXPathSubstringFunction

 xmlXPtrNewCollapsedRange

@@ -674,6 +680,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlStrdup

 xmlStrdupFunc

 
streamable
xmlPatternStreamable

+xmlSchemaValidateFile

 
streaming
xmlPatternGetStreamCtxt

 xmlStreamWantsAnyNode

 
streams
_xmlParserCtxt

@@ -721,6 +728,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSchemaNewStringValue

 
structured
xmlRelaxNGSetValidStructuredErrors

 xmlSchemaSetParserStructuredErrors

+xmlSchemaSetValidStructuredErrors

 xmlSchematronSetValidStructuredErrors

 xmlSetStructuredErrorFunc

 
structures
xmlFreeDoc

@@ -793,6 +801,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlReconciliateNs

 xmlRelaxNGValidateFullElement

 xmlSaveTree

+xmlSchemaValidateOneElement

 xmlShellDu

 xmlShellWrite

 xmlTextReaderExpand

@@ -861,6 +870,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 
suffix
LIBXML_MODULE_EXTENSION

 
suggested
_htmlElemDesc

 
suitable
xmlNewIOInputStream

+xmlOutputBufferCreateFilenameFunc

+xmlParserInputBufferCreateFilenameFunc

 xmlRegexpCompile

 
sum
xmlXPathSubstringFunction

 xmlXPathSumFunction

diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html
index aa590d2..2dce6a0 100644
--- a/doc/APIchunk25.html
+++ b/doc/APIchunk25.html
@@ -216,6 +216,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlMutexLock

 xmlMutexUnlock

 xmlNewMutex

+xmlRegExecCallbacks

 xmlRegExecPushString

 xmlRegExecPushString2

 
token_r
xmlNewRMutex

@@ -400,6 +401,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlHasProp

 xmlLineNumbersDefault

 
two
_xmlParserCtxt

+xmlMemDisplayLast

 xmlStrncatNew

 xmlTextMerge

 xmlUTF8Charcmp

@@ -421,7 +423,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSchemaNewStringValue

 xmlSchemaValidateFacetWhtsp

 xmlStreamWantsAnyNode

-
typo
xmlParseTextDecl

 
A-B
 C-C
 D-E
diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html
index ed2a00d..4fca766 100644
--- a/doc/APIchunk26.html
+++ b/doc/APIchunk26.html
@@ -107,6 +107,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 unlinked
xmlAddNextSibling

 xmlAddPrevSibling

 xmlAddSibling

+xmlNewEntity

 xmlReplaceNode

 
unload
xmlModuleClose

 xmlModuleFree

@@ -121,6 +122,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlParseEntityRef

 xmlParserHandleReference

 xmlSAX2UnparsedEntityDecl

+
unplug
xmlSchemaSAXPlug

 
unpredictable
UTF8ToHtml

 UTF8Toisolat1

 docbEncodeEntities

@@ -155,6 +157,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 _xmlXPathContext

 xmlDOMWrapReconcileNamespaces

 xmlDOMWrapRemoveNode

+xmlSchemaValidateFile

 xmlShellBase

 xmlShellCat

 xmlShellDir

@@ -190,6 +193,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 _xmlSchemaElement

 
useful
xmlGcMemGet

 xmlGcMemSetup

+xmlMemDisplayLast

 xmlNewRMutex

 xmlParserInputBufferCreateStatic

 
useless
setDocumentLocator

@@ -275,6 +279,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
view
xmlShell

 
violated
XML_CAST_FPTR

 
visible
xmlC14NExecute

+xmlC14NIsVisibleCallback

 
void
XML_CAST_FPTR

 xmlSAXParseFileWithData

 xmlSAXParseMemoryWithData

diff --git a/doc/APIchunk27.html b/doc/APIchunk27.html
index d2272eb..d9fe323 100644
--- a/doc/APIchunk27.html
+++ b/doc/APIchunk27.html
@@ -62,9 +62,14 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlRelaxNGGetValidErrors

 xmlRelaxNGSetParserErrors

 xmlRelaxNGSetValidErrors

+xmlRelaxNGValidityWarningFunc

 xmlSAX2InitDefaultSAXHandler

 xmlSchemaGetParserErrors

+xmlSchemaGetValidErrors

 xmlSchemaSetParserErrors

+xmlSchemaSetValidErrors

+xmlSchemaValidityWarningFunc

+xmlSchematronValidityWarningFunc

 xmlSearchNs

 xmlTextReaderSetErrorHandler

 xmlTextReaderSetStructuredErrorHandler

@@ -115,6 +120,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlCheckLanguageID

 xmlKeepBlanksDefault

 xmlMemShow

+xmlSchemaIsValid

 xmlXIncludeProcess

 xmlXIncludeProcessFlags

 xmlXIncludeProcessFlagsData

@@ -143,6 +149,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNewNs

 xmlParseMarkupDecl

 xmlParseSDDecl

+xmlTextReaderErrorFunc

 
while
xmlInitCharEncodingHandlers

 xmlParseAttributeType

 xmlParseEnumeratedType

@@ -268,6 +275,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlIOFTPRead

 xmlIOHTTPRead

 xmlNewCharEncodingHandler

+xmlOutputBufferCreateFilenameFunc

 xmlOutputBufferCreateIO

 xmlOutputWriteCallback

 xmlSaveToIO

diff --git a/doc/APIchunk28.html b/doc/APIchunk28.html
index bc198ee..5fbd28f 100644
--- a/doc/APIchunk28.html
+++ b/doc/APIchunk28.html
@@ -98,6 +98,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
xml:space
_xmlParserCtxt

 xmlNodeGetSpacePreserve

 xmlNodeSetSpacePreserve

+
xmlAddDocEntity
xmlNewEntity

 
xmlAttr
attribute

 attributeSAXFunc

 
xmlAttrPtr
xmlCopyProp

@@ -141,6 +142,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
xmlDoc
_xmlNs

 
xmlDocCopyNodeList
xmlCopyNodeList

 
xmlDocNewPI
xmlNewPI

+
xmlDocProperties
_xmlDoc

 
xmlDocPtr
xmlCopyDoc

 xmlNewTextWriterDoc

 xmlNewTextWriterTree

@@ -312,6 +314,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
xmlOutputBufferClose
xmlSaveFileTo

 xmlSaveFormatFileTo

 
xmlOutputBufferPtr
xmlNewTextWriter

+xmlOutputBufferCreateFilenameFunc

 
xmlOutputCloseCallback
xmlRegisterOutputCallbacks

 
xmlOutputMatchCallback
xmlRegisterOutputCallbacks

 
xmlOutputOpenCallback
xmlRegisterOutputCallbacks

@@ -336,6 +339,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
xmlParserFindNodeInfoIndex
xmlParserFindNodeInfoIndex

 
xmlParserHandleReference
xmlScanName

 
xmlParserInputBufferPtr
xmlNewTextReader

+xmlParserInputBufferCreateFilenameFunc

 xmlTextReaderGetRemainder

 xmlTextReaderSetup

 
xmlParserInputPtr
resolveEntity

@@ -401,12 +405,15 @@ A:link, A:visited, A:active { text-decoration: underline }
 
xmlSAX2StartDocument
startDocument

 
xmlSAX2StartElement
startElement

 
xmlSAX2UnparsedEntityDecl
unparsedEntityDecl

+
xmlSAXHandlerPtr
xmlSchemaSAXPlug

 
xmlSAXVersion
xmlSAXDefaultVersion

 
xmlSaveOptions
xmlSaveToBuffer

 xmlSaveToFd

 xmlSaveToFilename

 xmlSaveToIO

+
xmlSchemaSAXPlug
xmlSchemaSAXUnplug

 
xmlSchemaValType
xmlSchemaGetValType

+
xmlSchemaValidOption
xmlSchemaSetValidOptions

 
xmlSchematronValidOptions
xmlSchematronNewValidCtxt

 
xmlSetExternalEntityLoader
resolveEntity

 resolveEntitySAXFunc

diff --git a/doc/APIchunk3.html b/doc/APIchunk3.html
index e8d2266..3f5646a 100644
--- a/doc/APIchunk3.html
+++ b/doc/APIchunk3.html
@@ -192,14 +192,12 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlParserInputBufferRead

 
IDREF
xmlParseAttributeType

 xmlValidateAttributeDecl

-xmlValidateAttributeValue

 xmlValidateDocumentFinal

 xmlValidateDtd

 xmlValidateOneAttribute

 xmlValidateOneElement

 xmlValidateOneNamespace

 
IDREFS
xmlParseAttributeType

-xmlValidateAttributeValue

 xmlValidateDocumentFinal

 
IDREFs
_xmlDoc

 
IDs
xmlXPathIdFunction

diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html
index b954f38..924c236 100644
--- a/doc/APIchunk4.html
+++ b/doc/APIchunk4.html
@@ -182,9 +182,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
NDataDecl
xmlParseEntityDecl

 
NDataDecl?
xmlParseEntityDecl

 
NMTOKEN
xmlParseAttributeType

-xmlValidateAttributeValue

 
NMTOKENS
xmlParseAttributeType

-xmlValidateAttributeValue

 
NMToken
xmlValidateNMToken

 
NOTATION
xmlParseEnumeratedType

 xmlParseNotationType

@@ -234,7 +232,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Names
xmlParseAttributeType

 xmlParseName

 xmlScanName

-xmlValidateAttributeValue

 xmlValidateNamesValue

 
Namespace
XML_XML_NAMESPACE

 _xmlElementContent

@@ -251,11 +248,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Nmtoken
xmlParseAttributeType

 xmlParseEnumerationType

 xmlParseNmtoken

-xmlValidateAttributeValue

 xmlValidateNmtokenValue

 
Nmtokens
xmlParseAttributeType

 xmlParseNmtoken

-xmlValidateAttributeValue

 xmlValidateNmtokensValue

 
Node
_xmlParserCtxt

 _xmlValidCtxt

diff --git a/doc/APIchunk5.html b/doc/APIchunk5.html
index 72067ed..0c4f510 100644
--- a/doc/APIchunk5.html
+++ b/doc/APIchunk5.html
@@ -153,6 +153,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
People
xmlEncodeEntities

 
PhoneticExtensions
xmlUCSIsPhoneticExtensions

 
Please
xmlNormalizeWindowsPath

+
Plug
xmlSchemaSAXPlug

 
Pointer
xmlCheckUTF8

 
Points
xmlXPtrNewRangePoints

 
Pop
xmlRelaxNGValidatePopElement

diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html
index 6e4a169..f598093 100644
--- a/doc/APIchunk6.html
+++ b/doc/APIchunk6.html
@@ -61,7 +61,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Query
xmlDictSize

 xmlHashSize

 xmlStreamWantsAnyNode

-
Question:
xmlParseTextDecl

 
Letter R:
REC
IS_BASECHAR

 IS_COMBINING

 IS_DIGIT

@@ -75,6 +74,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 
RFC
xmlBuildURI

 xmlNodeGetBase

 xmlNormalizeURIPath

+xmlParseURI

+xmlParseURIReference

 
RFC2396
xmlURIEscape

 
Raises
xmlXPathSetArityError

 xmlXPathSetError

@@ -176,6 +177,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlRelaxNGSetValidErrors

 xmlRelaxNGSetValidStructuredErrors

 xmlRelaxNGValidateDoc

+xmlRelaxNGValidityErrorFunc

+xmlRelaxNGValidityWarningFunc

 
RelaxNG
_xmlSchemaElement

 xmlRelaxNGCleanupTypes

 xmlRelaxNGDump

diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html
index df878bf..f9550fc 100644
--- a/doc/APIchunk7.html
+++ b/doc/APIchunk7.html
@@ -50,6 +50,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSAX2InitDocbDefaultSAXHandler

 xmlSAX2InitHtmlDefaultSAXHandler

 xmlSAX2StartElementNs

+xmlSchemaValidateStream

 
SAX::substituteEntities
xmlSubstituteEntitiesDefault

 
SDDecl
xmlParseSDDecl

 
SDDecl?
xmlParseXMLDecl

@@ -119,10 +120,13 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSchemaNewDocParserCtxt

 xmlSchemaNewMemParserCtxt

 xmlSchemaNewParserCtxt

+xmlSchemaNewValidCtxt

 
Schematron
LIBXML_SCHEMATRON_ENABLED

 xmlSchematronFree

 xmlSchematronParse

 xmlSchematronSetValidStructuredErrors

+xmlSchematronValidityErrorFunc

+xmlSchematronValidityWarningFunc

 
Schematrons
xmlSchematronNewDocParserCtxt

 xmlSchematronNewMemParserCtxt

 xmlSchematronNewParserCtxt

@@ -163,13 +167,13 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlLinkGetData

 xmlParseNotationDecl

 xmlTextReaderByteConsumed

-
Seems
xmlParseTextDecl

 
Semi
xmlRelaxParserSetFlag

 
Send
xmlNanoFTPQuit

 
Serialize
xmlAttrSerializeTxtContent

 xmlExpDump

 
Sets
htmlSetMetaEncoding

 xmlBufferSetAllocationScheme

+xmlSchemaSetValidOptions

 xmlXPathDifference

 xmlXPathDistinct

 xmlXPathDistinctSorted

@@ -205,12 +209,24 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlStringGetNodeList

 xmlStringLenGetNodeList

 
Show
xmlShellPwd

-
Signature
xmlFreeFunc

+
Signature
xmlC14NIsVisibleCallback

+xmlDeregisterNodeFunc

+xmlFreeFunc

 xmlGenericErrorFunc

 xmlMallocFunc

+xmlOutputBufferCreateFilenameFunc

+xmlParserInputBufferCreateFilenameFunc

 xmlReallocFunc

+xmlRegisterNodeFunc

+xmlRelaxNGValidityErrorFunc

+xmlRelaxNGValidityWarningFunc

+xmlSchemaValidityErrorFunc

+xmlSchemaValidityWarningFunc

+xmlSchematronValidityErrorFunc

+xmlSchematronValidityWarningFunc

 xmlStrdupFunc

 xmlStructuredErrorFunc

+xmlTextReaderErrorFunc

 
Similarly
xmlParseEntityRef

 
Simply
xmlCreateURI

 
Since
xmlStrcat

diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html
index 316f827..10e852a 100644
--- a/doc/APIchunk8.html
+++ b/doc/APIchunk8.html
@@ -119,7 +119,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Thus:
xmlXPathSubstringFunction

 
Tibetan
xmlUCSIsTibetan

 
Token
xmlParseAttributeType

-xmlValidateAttributeValue

 xmlValidateNmtokenValue

 xmlValidateNmtokensValue

 xmlValidateOneAttribute

@@ -222,6 +221,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlReplaceNode

 xmlUnlinkNode

 
Unlinks
xmlDOMWrapRemoveNode

+
Unplug
xmlSchemaSAXUnplug

 
Unregisters
xmlCleanupEncodingAliases

 xmlDelEncodingAlias

 
Update
xmlNanoFTPUpdateURL

diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html
index cf7f9d9..fb32180 100644
--- a/doc/APIchunk9.html
+++ b/doc/APIchunk9.html
@@ -41,9 +41,11 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Validate
XML_SCHEMAS_ANY_LAX

 xmlRelaxNGValidateDoc

 xmlRelaxNGValidateFullElement

+xmlSchemaValidateDoc

+xmlSchemaValidateOneElement

+xmlSchemaValidateStream

 xmlSchematronValidateDoc

 xmlShellValidate

-xmlValidateAttributeValue

 xmlValidateNameValue

 xmlValidateNamesValue

 xmlValidateNmtokenValue

@@ -60,7 +62,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlParseDefaultDecl

 xmlParseEnumerationType

 xmlParseNotationType

-xmlValidateAttributeValue

 
Variable
xmlXPathVariableLookup

 xmlXPathVariableLookupNS

 
VariationSelectors
xmlUCSIsVariationSelectors

@@ -154,6 +155,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlValidateOneElement

 xmlValidateOneNamespace

 xmlValidateRoot

+
XML-Schema
xmlSchemaGetValidErrors

 
XMLDecl
xmlParseXMLDecl

 
XMLDecl?
xmlParseDocument

 
XMLSchema
xmlSchemaGetPredefinedType

@@ -193,6 +195,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlStringLenDecodeEntities

 
XML_xxx_yyy_ENTITY
xmlAddDocEntity

 xmlAddDtdEntity

+xmlNewEntity

 
XMl-Schema
xmlSchemaGetParserErrors

 
XPATH
xmlXPathFreeCompExpr

 
XPATH_INVALID_ARITY
xmlXPathSetArityError

@@ -206,6 +209,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlXPtrNewContext

 xmlXPtrRangeToFunction

 
XSD
xmlAutomataNewNegTrans

+xmlSchemaValidityErrorFunc

+xmlSchemaValidityWarningFunc

 xmlTextReaderSchemaValidate

 xmlTextReaderSchemaValidateCtxt

 xmlTextReaderSetSchema

diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html
index 8ccc8a6..300fc03 100644
--- a/doc/APIconstructors.html
+++ b/doc/APIconstructors.html
@@ -318,6 +318,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlGetDtdEntity

 xmlGetParameterEntity

 xmlGetPredefinedEntity

+xmlNewEntity

 xmlParseEntityRef

 xmlSAX2GetEntity

 xmlSAX2GetParameterEntity

@@ -447,6 +448,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlCreatePushParserCtxt

 xmlCreateURLParserCtxt

 xmlNewParserCtxt

+xmlSchemaValidCtxtGetParserCtxt

 
Type xmlParserErrors:
xmlParseInNodeContext

 
Type xmlParserInputBufferCreateFilenameFunc:
xmlParserInputBufferCreateFilenameDefault

 xmlThrDefParserInputBufferCreateFilenameDefault

diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index 30d650a..479d244 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -405,6 +405,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlGetParameterEntity

 xmlGetPredefinedEntity

 xmlInitializePredefinedEntities

+xmlNewEntity

 
Module globals:
_xmlGlobalState

 docbDefaultSAXHandler

 htmlDefaultSAXHandler

@@ -601,6 +602,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_PARSE_DTDATTR

 XML_PARSE_DTDLOAD

 XML_PARSE_DTDVALID

+XML_PARSE_HUGE

+XML_PARSE_NOBASEFIX

 XML_PARSE_NOBLANKS

 XML_PARSE_NOCDATA

 XML_PARSE_NODICT

@@ -610,6 +613,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_PARSE_NOWARNING

 XML_PARSE_NOXINCNODE

 XML_PARSE_NSCLEAN

+XML_PARSE_OLD10

 XML_PARSE_PEDANTIC

 XML_PARSE_PUSH_DOM

 XML_PARSE_PUSH_SAX

@@ -1283,12 +1287,21 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_BUFFER_ALLOC_DOUBLEIT

 XML_BUFFER_ALLOC_EXACT

 XML_BUFFER_ALLOC_IMMUTABLE

+XML_BUFFER_ALLOC_IO

 XML_CDATA_SECTION_NODE

 XML_COMMENT_NODE

 XML_DOCB_DOCUMENT_NODE

 XML_DOCUMENT_FRAG_NODE

 XML_DOCUMENT_NODE

 XML_DOCUMENT_TYPE_NODE

+XML_DOC_DTDVALID

+XML_DOC_HTML

+XML_DOC_INTERNAL

+XML_DOC_NSVALID

+XML_DOC_OLD10

+XML_DOC_USERBUILT

+XML_DOC_WELLFORMED

+XML_DOC_XINCLUDE

 XML_DTD_NODE

 XML_ELEMENT_CONTENT_ELEMENT

 XML_ELEMENT_CONTENT_MULT

@@ -1398,6 +1411,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlDocDumpMemoryEnc

 xmlDocFormatDump

 xmlDocGetRootElement

+xmlDocProperties

 xmlDocPtr

 xmlDocSetRootElement

 xmlDtd

@@ -1835,6 +1849,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_DTD_CONTENT_MODEL

 XML_DTD_CONTENT_NOT_DETERMINIST

 XML_DTD_DIFFERENT_PREFIX

+XML_DTD_DUP_TOKEN

 XML_DTD_ELEM_DEFAULT_NAMESPACE

 XML_DTD_ELEM_NAMESPACE

 XML_DTD_ELEM_REDEFINED

@@ -1963,11 +1978,13 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_ERR_TAG_NOT_FINISHED

 XML_ERR_UNDECLARED_ENTITY

 XML_ERR_UNKNOWN_ENCODING

+XML_ERR_UNKNOWN_VERSION

 XML_ERR_UNPARSED_ENTITY

 XML_ERR_UNSUPPORTED_ENCODING

 XML_ERR_URI_FRAGMENT

 XML_ERR_URI_REQUIRED

 XML_ERR_VALUE_REQUIRED

+XML_ERR_VERSION_MISMATCH

 XML_ERR_VERSION_MISSING

 XML_ERR_WARNING

 XML_ERR_XMLDECL_NOT_FINISHED

@@ -2075,6 +2092,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_MODULE_CLOSE

 XML_MODULE_OPEN

 XML_NS_ERR_ATTRIBUTE_REDEFINED

+XML_NS_ERR_COLON

 XML_NS_ERR_EMPTY

 XML_NS_ERR_QNAME

 XML_NS_ERR_UNDEFINED_NAMESPACE

@@ -2581,6 +2599,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlMallocLoc

 xmlMemBlocks

 xmlMemDisplay

+xmlMemDisplayLast

 xmlMemFree

 xmlMemGet

 xmlMemMalloc

@@ -2849,6 +2868,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSchemaSetValidStructuredErrors

 xmlSchemaValidCtxt

 xmlSchemaValidCtxtGetOptions

+xmlSchemaValidCtxtGetParserCtxt

 xmlSchemaValidCtxtPtr

 xmlSchemaValidError

 xmlSchemaValidOption

diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html
index 9e83889..3cf9ced 100644
--- a/doc/APIfunctions.html
+++ b/doc/APIfunctions.html
@@ -59,6 +59,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlElemDump

 xmlLsOneNode

 xmlMemDisplay

+xmlMemDisplayLast

 xmlMemShow

 xmlOutputBufferCreateFile

 xmlParserInputBufferCreateFile

@@ -276,6 +277,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNewDocTextLen

 xmlNewDtd

 xmlNewElementContent

+xmlNewEntity

 xmlNewGlobalNs

 xmlNewNode

 xmlNewNs

@@ -577,6 +579,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSplitQName3

 xmlStringCurrentChar

 xmlValidGetPotentialChildren

+
Type long:
xmlMemDisplayLast

 
Type size_t:
xmlBufferCreateSize

 xmlBufferCreateStatic

 xmlMallocAtomicLoc

@@ -1161,6 +1164,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNewDocText

 xmlNewDocTextLen

 xmlNewDtd

+xmlNewEntity

 xmlNewGlobalNs

 xmlNewReference

 xmlNewTextWriterTree

@@ -1934,6 +1938,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSchemaSetValidOptions

 xmlSchemaSetValidStructuredErrors

 xmlSchemaValidCtxtGetOptions

+xmlSchemaValidCtxtGetParserCtxt

 xmlSchemaValidateDoc

 xmlSchemaValidateFile

 xmlSchemaValidateOneElement

diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index af09644..952abf5 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -146,6 +146,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_BUFFER_ALLOC_DOUBLEIT

 XML_BUFFER_ALLOC_EXACT

 XML_BUFFER_ALLOC_IMMUTABLE

+XML_BUFFER_ALLOC_IO

 XML_C14N_CREATE_CTXT

 XML_C14N_CREATE_STACK

 XML_C14N_INVALID_NODE

@@ -242,6 +243,14 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_DOCUMENT_FRAG_NODE

 XML_DOCUMENT_NODE

 XML_DOCUMENT_TYPE_NODE

+XML_DOC_DTDVALID

+XML_DOC_HTML

+XML_DOC_INTERNAL

+XML_DOC_NSVALID

+XML_DOC_OLD10

+XML_DOC_USERBUILT

+XML_DOC_WELLFORMED

+XML_DOC_XINCLUDE

 XML_DTD_ATTRIBUTE_DEFAULT

 XML_DTD_ATTRIBUTE_REDEFINED

 XML_DTD_ATTRIBUTE_VALUE

@@ -249,6 +258,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_DTD_CONTENT_MODEL

 XML_DTD_CONTENT_NOT_DETERMINIST

 XML_DTD_DIFFERENT_PREFIX

+XML_DTD_DUP_TOKEN

 XML_DTD_ELEM_DEFAULT_NAMESPACE

 XML_DTD_ELEM_NAMESPACE

 XML_DTD_ELEM_REDEFINED

@@ -396,11 +406,13 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_ERR_TAG_NOT_FINISHED

 XML_ERR_UNDECLARED_ENTITY

 XML_ERR_UNKNOWN_ENCODING

+XML_ERR_UNKNOWN_VERSION

 XML_ERR_UNPARSED_ENTITY

 XML_ERR_UNSUPPORTED_ENCODING

 XML_ERR_URI_FRAGMENT

 XML_ERR_URI_REQUIRED

 XML_ERR_VALUE_REQUIRED

+XML_ERR_VERSION_MISMATCH

 XML_ERR_VERSION_MISSING

 XML_ERR_WARNING

 XML_ERR_XMLDECL_NOT_FINISHED

@@ -529,6 +541,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_NAMESPACE_DECL

 XML_NOTATION_NODE

 XML_NS_ERR_ATTRIBUTE_REDEFINED

+XML_NS_ERR_COLON

 XML_NS_ERR_EMPTY

 XML_NS_ERR_QNAME

 XML_NS_ERR_UNDEFINED_NAMESPACE

@@ -564,6 +577,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_PARSE_DTDATTR

 XML_PARSE_DTDLOAD

 XML_PARSE_DTDVALID

+XML_PARSE_HUGE

+XML_PARSE_NOBASEFIX

 XML_PARSE_NOBLANKS

 XML_PARSE_NOCDATA

 XML_PARSE_NODICT

@@ -573,6 +588,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 XML_PARSE_NOWARNING

 XML_PARSE_NOXINCNODE

 XML_PARSE_NSCLEAN

+XML_PARSE_OLD10

 XML_PARSE_PEDANTIC

 XML_PARSE_PUSH_DOM

 XML_PARSE_PUSH_SAX

@@ -1908,6 +1924,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlDocDumpMemoryEnc

 xmlDocFormatDump

 xmlDocGetRootElement

+xmlDocProperties

 xmlDocPtr

 xmlDocSetRootElement

 xmlDtd

@@ -2206,6 +2223,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlMallocLoc

 xmlMemBlocks

 xmlMemDisplay

+xmlMemDisplayLast

 xmlMemFree

 xmlMemGet

 xmlMemMalloc

@@ -2290,6 +2308,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlNewDocTextLen

 xmlNewDtd

 xmlNewElementContent

+xmlNewEntity

 xmlNewEntityInputStream

 xmlNewGlobalNs

 xmlNewIOInputStream

@@ -2747,6 +2766,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 xmlSchemaValType

 xmlSchemaValidCtxt

 xmlSchemaValidCtxtGetOptions

+xmlSchemaValidCtxtGetParserCtxt

 xmlSchemaValidCtxtPtr

 xmlSchemaValidError

 xmlSchemaValidOption

diff --git a/doc/FAQ.html b/doc/FAQ.html
index 3b43432..6454942 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -217,9 +217,11 @@ pnode=pxmlDoc->children->children;
     and libxml2, but you need to install a more recent version:
     libxml(-devel) >= 1.8.8 or libxml2(-devel) >= 2.1.0
   
-  XPath implementation looks seriously broken
-    XPath implementation prior to 2.3.0 was really incomplete. Upgrade to
-    a recent version, there are no known bugs in the current version.
+  
Random crashes in threaded applications
+    Read and follow all advices on the thread
+    safety page, and make 100% sure you never call xmlCleanupParser()
+    while the library or an XML document might still be in use by another
+    thread.
   
   The example provided in the web page does not compile.
     It's hard to maintain the documentation in sync with the code
@@ -235,16 +237,8 @@ pnode=pxmlDoc->children->children;
         generated doc
       have a look at the set of
         examples.
-      look for examples of use for libxml2 function using the Gnome code.
-
-      
+      look for examples of use for libxml2 function using the Gnome code
+          or by asking on Google.
       Browse
         the libxml2 source , I try to write code as clean and documented
         as possible, so looking at it may be helpful. In particular the code
@@ -261,12 +255,6 @@ pnode=pxmlDoc->children->children;
         Website: http://libxmlplusplus.sourceforge.net/
         Download: http://sourceforge.net/project/showfiles.php?group_id=12999
       
-      
     
   How to validate a document a posteriori ?
     It is possible to validate documents which had not been validated at
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2310c52..62f96dc 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -460,8 +460,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -486,8 +486,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -497,13 +497,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/doc/apibuild.py b/doc/apibuild.py
index 1e73725..3c38061 100755
--- a/doc/apibuild.py
+++ b/doc/apibuild.py
@@ -51,6 +51,7 @@ ignored_files = {
   "tst.c": "not part of the library",
   "test.c": "not part of the library",
   "testdso.c": "test for dynamid shared libraries",
+  "testrecurse.c": "test for entities recursions",
 }
 
 ignored_words = {
@@ -356,7 +357,7 @@ class index:
 	self.analyze_dict("structs", self.structs)
 	self.analyze_dict("typedefs", self.typedefs)
 	self.analyze_dict("macros", self.macros)
-         
+
 class CLexer:
     """A lexer for the C language, tokenize the input by reading and
        analyzing it line by line"""
@@ -388,7 +389,7 @@ class CLexer:
 		else:
 		    line = line + n
         return line
-	 
+
     def getlineno(self):
         return self.lineno
 
@@ -557,12 +558,12 @@ class CLexer:
 		    else:
 		        break
 		self.tokens.append(('name', line[s:i]))
-             
+
 	tok = self.tokens[0]
 	self.tokens = self.tokens[1:]
 	self.last = tok
 	return tok
-      
+
 class CParser:
     """The C module parser"""
     def __init__(self, filename, idx = None):
@@ -717,7 +718,7 @@ class CParser:
 	    l = string.strip(l)
 	    desc = desc + " " + l
 	    del lines[0]
-		     
+
 	desc = string.strip(desc)
 
 	if quiet == 0:
@@ -787,7 +788,7 @@ class CParser:
 	    l = string.strip(l)
 	    desc = desc + " " + l
 	    del lines[0]
-		     
+
 	desc = string.strip(desc)
 
 	if quiet == 0:
@@ -888,7 +889,7 @@ class CParser:
 	    else:
 	        desc = desc + " " + l
 		del lines[0]
-		     
+
 	retdesc = string.strip(retdesc)
 	desc = string.strip(desc)
 
@@ -898,7 +899,8 @@ class CParser:
 	     #
 	    i = 0
 	    while i < nbargs:
-	        if args[i][2] == None and args[i][0] != "void" and args[i][1] != None:
+	        if args[i][2] == None and args[i][0] != "void" and \
+		   ((args[i][1] != None) or (args[i][1] == '')):
 		    self.warning("Function comment for %s lacks description of arg %s" % (name, args[i][1]))
 		i = i + 1
 	    if retdesc == "" and ret[0] != "void":
@@ -906,7 +908,6 @@ class CParser:
 	    if desc == "":
 	        self.warning("Function comment for %s lacks description of the function" % (name))
 
-
 	return(((ret[0], retdesc), args, desc))
 
     def parsePreproc(self, token):
@@ -966,7 +967,7 @@ class CParser:
 	    try:
 	        self.defines.append(apstr)
 		if string.find(apstr, 'ENABLED') != -1:
-		    self.conditionals.append("defined(%s)" % apstr)    
+		    self.conditionals.append("defined(%s)" % apstr)
 	    except:
 	        pass
 	elif name == "#ifndef":
@@ -974,7 +975,7 @@ class CParser:
 	    try:
 	        self.defines.append(apstr)
 		if string.find(apstr, 'ENABLED') != -1:
-		    self.conditionals.append("!defined(%s)" % apstr)    
+		    self.conditionals.append("!defined(%s)" % apstr)
 	    except:
 	        pass
 	elif name == "#if":
@@ -1096,7 +1097,7 @@ class CParser:
 		return token
 	token = self.token()
 	return token
-	     
+
      #
      # Parse a C code block, used for functions it parse till
      # the balancing } included
@@ -1131,7 +1132,7 @@ class CParser:
 		    elif oldtok[0] == "name" and oldtok[1][0:7] == "LIBXML_":
 			self.index_add_ref(oldtok[1], self.filename,
 					    0, "typedef")
-			 
+
 		else:
 		    token = self.token()
 	return token
@@ -1264,7 +1265,7 @@ class CParser:
 	if token == None:
 	    return token
 
-	while token[0] == "name" and ( 
+	while token[0] == "name" and (
 	      token[1] == "const" or \
 	      token[1] == "unsigned" or \
 	      token[1] == "signed"):
@@ -1284,7 +1285,7 @@ class CParser:
 		    self.type = tmp[1]
 		else:
 		    self.type = self.type + " " + tmp[1]
-	     
+
         elif token[0] == "name" and token[1] == "struct":
 	    if self.type == "":
 	        self.type = token[1]
@@ -1574,7 +1575,7 @@ class CParser:
 			token = self.token()
 		else:
 		    break
-		    
+
 	return token
 
     def parse(self):
@@ -1590,7 +1591,7 @@ class CParser:
 		return
 	self.parseTopComment(self.top_comment)
         return self.index
-	         
+
 
 class docBuilder:
     """A documentation builder"""
@@ -1687,7 +1688,7 @@ class docBuilder:
 		    self.headers[file] = None;
 	self.scanHeaders()
 	self.scanModules()
-         
+
     def modulename_file(self, file):
         module = os.path.basename(file)
 	if module[-2:] == '.h':
@@ -1781,7 +1782,7 @@ class docBuilder:
 	else:
 	    output.write("    \n" % (
 	            name, self.modulename_file(id.header)))
-	              
+
     def serialize_function(self, output, name):
         id = self.idx.functions[name]
 	if name == debugsym:
@@ -1802,6 +1803,11 @@ class docBuilder:
 	    output.write("      %s\n"% (apstr));
 	try:
 	    (ret, params, desc) = id.info
+	    if (desc == None or desc == '') and \
+	       name[0:9] != "xmlThrDef" and name != "xmlDllMain":
+	        print "%s %s from %s has no description" % (id.type, name,
+		       self.modulename_file(id.module))
+
 	    output.write("      %s\n" % (escape(desc)))
 	    self.indexString(name, desc)
 	    if ret[0] != None:
diff --git a/doc/devhelp/Makefile.in b/doc/devhelp/Makefile.in
index 169521d..1257ad4 100644
--- a/doc/devhelp/Makefile.in
+++ b/doc/devhelp/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/doc/devhelp/libxml2-c14n.html b/doc/devhelp/libxml2-c14n.html
index 72f53b6..e60f229 100644
--- a/doc/devhelp/libxml2-c14n.html
+++ b/doc/devhelp/libxml2-c14n.html
@@ -57,8 +57,8 @@ int	xmlC14NDocDumpMemory		(
         
Function type xmlC14NIsVisibleCallback
int	xmlC14NIsVisibleCallback	(void * user_data, 
					 xmlNodePtr node, 
					 xmlNodePtr parent)

-

-
user_data: 
node: 
parent: 
Returns: 
+Signature for a C14N callback on visible nodes
+user_data: user data
node: the curent node
parent: the parent node
Returns: 1 if the node should be included
         
         xmlC14NDocDumpMemory ()
int	xmlC14NDocDumpMemory		(xmlDocPtr doc, 
					 xmlNodeSetPtr nodes, 
					 int exclusive, 
					 xmlChar ** inclusive_ns_prefixes, 
					 int with_comments, 
					 xmlChar ** doc_txt_ptr)

 
Dumps the canonized image of given XML document into memory. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
diff --git a/doc/devhelp/libxml2-entities.html b/doc/devhelp/libxml2-entities.html
index cd1e9a8..0d0effb 100644
--- a/doc/devhelp/libxml2-entities.html
+++ b/doc/devhelp/libxml2-entities.html
@@ -47,6 +47,7 @@
 typedef struct _xmlHashTable xmlEntitiesTable;
 typedef xmlEntitiesTable * xmlEntitiesTablePtr;
 xmlEntityPtr	xmlAddDocEntity		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID, 
					 const xmlChar * content);
+xmlEntityPtr	xmlNewEntity		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID, 
					 const xmlChar * content);
 xmlChar *	xmlEncodeEntitiesReentrant	(xmlDocPtr doc, 
						 const xmlChar * input);
 xmlEntityPtr	xmlGetDocEntity		(xmlDocPtr doc, 
					 const xmlChar * name);
 xmlEntityPtr	xmlGetDtdEntity		(xmlDocPtr doc, 
					 const xmlChar * name);
@@ -155,6 +156,10 @@ The content of this structure is not made public by the API.
 Set up the predefined entities. Deprecated call
 
         
+        xmlNewEntity ()
xmlEntityPtr	xmlNewEntity		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID, 
					 const xmlChar * content)

+
Create a new entity, this differs from xmlAddDocEntity() that if the document is NULL or has no internal subset defined, then an unlinked entity structure will be returned, it is then the responsability of the caller to link it to the document later or free it when not needed anymore.
+doc: the document
name: the entity name
type: the entity type XML_xxx_yyy_ENTITY
ExternalID: the entity external ID if available
SystemID: the entity system ID if available
content: the entity content
Returns: a pointer to the entity or NULL in case of error
+        
       
     
   
diff --git a/doc/devhelp/libxml2-globals.html b/doc/devhelp/libxml2-globals.html
index c7f396e..449049e 100644
--- a/doc/devhelp/libxml2-globals.html
+++ b/doc/devhelp/libxml2-globals.html
@@ -125,20 +125,20 @@ const char *	xmlThrDefTreeIndentString
 
         
         Function type xmlDeregisterNodeFunc
void	xmlDeregisterNodeFunc		(xmlNodePtr node)

-

-
node: 
+Signature for the deregistration callback of a discarded node
+node: the current node
         
         Function type xmlOutputBufferCreateFilenameFunc
xmlOutputBufferPtr	xmlOutputBufferCreateFilenameFunc	(const char * URI, 
							 xmlCharEncodingHandlerPtr encoder, 
							 int compression)

-

-
URI: 
encoder: 
compression: 
Returns: 
+Signature for the function doing the lookup for a suitable output method corresponding to an URI.
+URI: the URI to write to
encoder: 
compression: 
Returns: the new xmlOutputBufferPtr in case of success or NULL if no method was found.
         
         Function type xmlParserInputBufferCreateFilenameFunc
xmlParserInputBufferPtr	xmlParserInputBufferCreateFilenameFunc	(const char * URI, 
							 xmlCharEncoding enc)

-

-
URI: 
enc: 
Returns: 
+Signature for the function doing the lookup for a suitable input method corresponding to an URI.
+URI: the URI to read from
enc: the requested source encoding
Returns: the new xmlParserInputBufferPtr in case of success or NULL if no method was found.
         
         Function type xmlRegisterNodeFunc
void	xmlRegisterNodeFunc		(xmlNodePtr node)

-

-
node: 
+Signature for the registration callback of a created node
+node: the current node
         
         Variable docbDefaultSAXHandler
xmlSAXHandlerV1 docbDefaultSAXHandler;
 

diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html
index 76b4967..ea0697f 100644
--- a/doc/devhelp/libxml2-parser.html
+++ b/doc/devhelp/libxml2-parser.html
@@ -302,7 +302,10 @@ void	xmlSetExternalEntityLoader	(XML_PARSE_NSCLEAN = 8192 /* remove redundant namespaces declarations */
     XML_PARSE_NOCDATA = 16384 /* merge CDATA as text nodes */
     XML_PARSE_NOXINCNODE = 32768 /* do not generate XINCLUDE START/END nodes */
-    XML_PARSE_COMPACT = 65536 /*  compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree) */
+    XML_PARSE_COMPACT = 65536 /* compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree) */
+    XML_PARSE_OLD10 = 131072 /* parse using XML-1.0 before update 5 */
+    XML_PARSE_NOBASEFIX = 262144 /* do not fixup XINCLUDE xml:base uris */
+    XML_PARSE_HUGE = 524288 /*  relax any hardcoded limit from the parser */
 };
 

 
diff --git a/doc/devhelp/libxml2-parserInternals.html b/doc/devhelp/libxml2-parserInternals.html
index 1e575f8..cdae32e 100644
--- a/doc/devhelp/libxml2-parserInternals.html
+++ b/doc/devhelp/libxml2-parserInternals.html
@@ -139,7 +139,7 @@ int	xmlParseElementContentDecl	(xmlParserInputPtr	inputPop	(xmlParserCtxtPtr ctxt);
 xmlChar	xmlPopInput			(xmlParserCtxtPtr ctxt);
 xmlChar *	xmlParsePubidLiteral	(xmlParserCtxtPtr ctxt);
-void	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input);
+int	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input);
 xmlChar *	xmlParseEntityValue	(xmlParserCtxtPtr ctxt, 
					 xmlChar ** orig);
 xmlChar *	xmlDecodeEntities	(xmlParserCtxtPtr ctxt, 
					 int len, 
					 int what, 
					 xmlChar end, 
					 xmlChar end2, 
					 xmlChar end3);
 xmlChar *	xmlParseVersionNum	(xmlParserCtxtPtr ctxt);
@@ -316,7 +316,7 @@ void	xmlParseEntityDecl		(inputPush ()
int	inputPush			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr value)

 
Pushes a new parser input on top of the input stack
-ctxt: an XML parser context
value: the parser input
Returns: 0 in case of error, the index in the stack otherwise
+ctxt: an XML parser context
value: the parser input
Returns: -1 in case of error, the index in the stack otherwise
         
         namePop ()
const xmlChar *	namePop			(xmlParserCtxtPtr ctxt)

 
Pops the top element name from the name stack
@@ -332,7 +332,7 @@ void	xmlParseEntityDecl		(nodePush ()
int	nodePush			(xmlParserCtxtPtr ctxt, 
					 xmlNodePtr value)

 
Pushes a new element node on top of the node stack
-ctxt: an XML parser context
value: the element node
Returns: 0 in case of error, the index in the stack otherwise
+ctxt: an XML parser context
value: the element node
Returns: -1 in case of error, the index in the stack otherwise
         
         xmlCheckLanguageID ()
int	xmlCheckLanguageID		(const xmlChar * lang)

 
Checks that the value conforms to the LanguageID production: NOTE: this is somewhat deprecated, those productions were removed from the XML Second edition. [33] LanguageID ::= Langcode ('-' Subcode)* [34] Langcode ::= ISO639Code | IanaCode | UserCode [35] ISO639Code ::= ([a-z] | [A-Z]) ([a-z] | [A-Z]) [36] IanaCode ::= ('i' | 'I') '-' ([a-z] | [A-Z])+ [37] UserCode ::= ('x' | 'X') '-' ([a-z] | [A-Z])+ [38] Subcode ::= ([a-z] | [A-Z])+
@@ -587,7 +587,7 @@ void	xmlParseEntityDecl		(ctxt: an XML parser context
Returns: the SystemLiteral parsed or NULL

         
         xmlParseTextDecl ()
void	xmlParseTextDecl		(xmlParserCtxtPtr ctxt)

-
parse an XML declaration header for external entities [77] TextDecl ::= '<?xml' VersionInfo? EncodingDecl S? '?>' Question: Seems that EncodingDecl is mandatory ? Is that a typo ?
+parse an XML declaration header for external entities [77] TextDecl ::= '<?xml' VersionInfo? EncodingDecl S? '?>'
 ctxt: an XML parser context
         
         xmlParseVersionInfo ()
xmlChar *	xmlParseVersionInfo	(xmlParserCtxtPtr ctxt)

@@ -595,7 +595,7 @@ void	xmlParseEntityDecl		(ctxt: an XML parser context
Returns: the version string, e.g. "1.0"

         
         xmlParseVersionNum ()
xmlChar *	xmlParseVersionNum	(xmlParserCtxtPtr ctxt)

-
parse the XML version value. [26] VersionNum ::= ([a-zA-Z0-9_.:] | '-')+
+parse the XML version value. [26] VersionNum ::= '1.' [0-9]+ In practice allow [0-9].[0-9]+ at that level
 ctxt: an XML parser context
Returns: the string giving the XML version number, or NULL
         
         xmlParseXMLDecl ()
void	xmlParseXMLDecl			(xmlParserCtxtPtr ctxt)

@@ -618,9 +618,9 @@ void	xmlParseEntityDecl		(ctxt: an XML parser context
Returns: the current xmlChar in the parser context

         
-        xmlPushInput ()
void	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)

+        xmlPushInput ()
int	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)

 
xmlPushInput: switch to a new input stream which is stacked on top of the previous one(s).
-ctxt: an XML parser context
input: an XML parser input fragment (entity, XML fragment ...).
+ctxt: an XML parser context
input: an XML parser input fragment (entity, XML fragment ...).
Returns: -1 in case of error or the index in the input stack
         
         xmlScanName ()
xmlChar *	xmlScanName		(xmlParserCtxtPtr ctxt)

 
Trickery: parse an XML name but without consuming the input flow Needed for rollback cases. Used only when parsing entities references. TODO: seems deprecated now, only used in the default part of xmlParserHandleReference [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender [5] Name ::= (Letter | '_' | ':') (NameChar)* [6] Names ::= Name (S Name)*
diff --git a/doc/devhelp/libxml2-relaxng.html b/doc/devhelp/libxml2-relaxng.html
index d7da3e5..a89b58f 100644
--- a/doc/devhelp/libxml2-relaxng.html
+++ b/doc/devhelp/libxml2-relaxng.html
@@ -169,12 +169,12 @@ The content of this structure is not made public by the API.
 
         
         Function type xmlRelaxNGValidityErrorFunc
void	xmlRelaxNGValidityErrorFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)

-

-
ctx: 
msg: 
...: 

+Signature of an error callback from a Relax-NG validation
+ctx: the validation context
msg: the message
...: extra arguments
         
         Function type xmlRelaxNGValidityWarningFunc
void	xmlRelaxNGValidityWarningFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)

-

-
ctx: 
msg: 
...: 

+Signature of a warning callback from a Relax-NG validation
+ctx: the validation context
msg: the message
...: extra arguments
         
         xmlRelaxNGCleanupTypes ()
void	xmlRelaxNGCleanupTypes		(void)

 
Cleanup the default Schemas type library associated to RelaxNG

diff --git a/doc/devhelp/libxml2-schematron.html b/doc/devhelp/libxml2-schematron.html
index bdcb944..c99e33e 100644
--- a/doc/devhelp/libxml2-schematron.html
+++ b/doc/devhelp/libxml2-schematron.html
@@ -113,12 +113,12 @@ The content of this structure is not made public by the API.
 

         
         Function type xmlSchematronValidityErrorFunc
void	xmlSchematronValidityErrorFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)

-

-
ctx: 
msg: 
...: 

+Signature of an error callback from a Schematron validation
+ctx: the validation context
msg: the message
...: extra arguments
         
         Function type xmlSchematronValidityWarningFunc
void	xmlSchematronValidityWarningFunc	(void * ctx, 
						 const char * msg, 
						 ... ...)

-

-
ctx: 
msg: 
...: 

+Signature of a warning callback from a Schematron validation
+ctx: the validation context
msg: the message
...: extra arguments
         
         xmlSchematronFree ()
void	xmlSchematronFree		(xmlSchematronPtr schema)

 
Deallocate a Schematron structure.
diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html
index d5879f5..188d43b 100644
--- a/doc/devhelp/libxml2-tree.html
+++ b/doc/devhelp/libxml2-tree.html
@@ -96,6 +96,7 @@ typedef struct _xmlOutputBuffer xmlOutputBuffer;
 typedef struct _xmlSAXLocator xmlSAXLocator;
 typedef xmlElementContent * xmlElementContentPtr;
 typedef enum xmlElementContentType;
+typedef enum xmlDocProperties;
 typedef xmlID * xmlIDPtr;
 typedef struct _xmlDtd xmlDtd;
 typedef struct _xmlAttribute xmlAttribute;
@@ -369,14 +370,16 @@ void	xmlFreeNsList			(xmlBufferAllocationScheme	alloc	: The realloc method
+    xmlChar *	contentIO	: in IO mode we may have a different base
 } xmlBuffer;
 
 
         
         Enum xmlBufferAllocationScheme
enum xmlBufferAllocationScheme {
-    XML_BUFFER_ALLOC_DOUBLEIT = 1
-    XML_BUFFER_ALLOC_EXACT = 2
-    XML_BUFFER_ALLOC_IMMUTABLE = 3
+    XML_BUFFER_ALLOC_DOUBLEIT = 1 /* double each time one need to grow */
+    XML_BUFFER_ALLOC_EXACT = 2 /* grow only to the minimal size */
+    XML_BUFFER_ALLOC_IMMUTABLE = 3 /* immutable buffer */
+    XML_BUFFER_ALLOC_IO = 4 /*  special allocation scheme used for I/O */
 };
 

 
@@ -421,8 +424,23 @@ void	xmlFreeNsList			(xmlCharEncoding
     struct _xmlDict *	dict	: dict used to allocate names or NULL
     void *	psvi	: for type/PSVI informations
+    int	parseFlags	: set of xmlParserOption used to parse the document
+    int	properties	: set of xmlDocProperties for this document set at the end of parsing
 } xmlDoc;
 
+
+        

+        Enum xmlDocProperties
enum xmlDocProperties {
+    XML_DOC_WELLFORMED = 1 /* document is XML well formed */
+    XML_DOC_NSVALID = 2 /* document is Namespace valid */
+    XML_DOC_OLD10 = 4 /* parsed with old XML-1.0 parser */
+    XML_DOC_DTDVALID = 8 /* DTD validation was successful */
+    XML_DOC_XINCLUDE = 16 /* XInclude substitution was done */
+    XML_DOC_USERBUILT = 32 /* Document was built using the API and not by parsing an instance */
+    XML_DOC_INTERNAL = 64 /* built for internal processing */
+    XML_DOC_HTML = 128 /*  parsed or built HTML document */
+};
+

 
         
         Typedef xmlDocPtr
xmlDoc * xmlDocPtr;
@@ -567,7 +585,7 @@ void	xmlFreeNsList			(xmlChar *	URI	: the full URI as computed
     int	owner	: does the entity own the childrens
-    int	checked	: was the entity content checked
+    int	checked	: was the entity content checked this is also used to count entites * r
 } xmlEntity;
 

 
@@ -757,6 +775,8 @@ void	xmlFreeNsList			(xmlAttrPtr	freeAttrs	: * the complete error informations for the last error. *
     xmlError	lastError
     xmlParserMode	parseMode	: the parser mode
+    unsigned long	nbentities	: number of entities references
+    unsigned long	sizeentities	: size of parsed entities
 } xmlParserCtxt;
 
 
diff --git a/doc/devhelp/libxml2-uri.html b/doc/devhelp/libxml2-uri.html
index c67dacf..8b33c4e 100644
--- a/doc/devhelp/libxml2-uri.html
+++ b/doc/devhelp/libxml2-uri.html
@@ -113,15 +113,15 @@ int	xmlParseURIReference		(path: pointer to the path string
Returns: 0 or an error code
         

         xmlParseURI ()
xmlURIPtr	xmlParseURI		(const char * str)

-
Parse an URI URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+Parse an URI based on RFC 3986 URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
 str: the URI string to analyze
Returns: a newly built xmlURIPtr or NULL in case of error
         
         xmlParseURIRaw ()
xmlURIPtr	xmlParseURIRaw		(const char * str, 
					 int raw)

-
Parse an URI but allows to keep intact the original fragments. URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+Parse an URI but allows to keep intact the original fragments. URI-reference = URI / relative-ref
 str: the URI string to analyze
raw: if 1 unescaping of URI pieces are disabled
Returns: a newly built xmlURIPtr or NULL in case of error
         
         xmlParseURIReference ()
int	xmlParseURIReference		(xmlURIPtr uri, 
					 const char * str)

-
Parse an URI reference string and fills in the appropriate fields of the @uri structure URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+Parse an URI reference string based on RFC 3986 and fills in the appropriate fields of the @uri structure URI-reference = URI / relative-ref
 uri: pointer to an URI structure
str: the string to analyze
Returns: 0 or the error code
         
         xmlPathToURI ()
xmlChar *	xmlPathToURI		(const xmlChar * path)

diff --git a/doc/devhelp/libxml2-valid.html b/doc/devhelp/libxml2-valid.html
index 3480214..15b3371 100644
--- a/doc/devhelp/libxml2-valid.html
+++ b/doc/devhelp/libxml2-valid.html
@@ -443,8 +443,8 @@ The content of this structure is not made public by the API.
 ctxt: the validation context
doc: a document instance
attr: an attribute definition
Returns: 1 if valid or 0 otherwise
         
         xmlValidateAttributeValue ()
int	xmlValidateAttributeValue	(xmlAttributeType type, 
					 const xmlChar * value)

-
Validate that the given attribute value match the proper production [ VC: ID ] Values of type ID must match the Name production.... [ VC: IDREF ] Values of type IDREF must match the Name production, and values of type IDREFS must match Names ... [ VC: Entity Name ] Values of type ENTITY must match the Name production, values of type ENTITIES must match Names ... [ VC: Name Token ] Values of type NMTOKEN must match the Nmtoken production; values of type NMTOKENS must match Nmtokens.
-type: an attribute type
value: an attribute value
Returns: 1 if valid or 0 otherwise
+
+
type: 
value: 
Returns: 
         
         xmlValidateDocument ()
int	xmlValidateDocument		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc)

 
Try to validate the document instance basically it does the all the checks described by the XML Rec i.e. validates the internal and external subset (if present) and validate the document tree.
diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html
index eaacd0b..cf445dd 100644
--- a/doc/devhelp/libxml2-xmlerror.html
+++ b/doc/devhelp/libxml2-xmlerror.html
@@ -247,11 +247,14 @@ void	xmlResetError			(XML_ERR_NOTATION_PROCESSING = 105 /* 105 */
     XML_WAR_NS_COLUMN = 106 /* 106 */
     XML_WAR_ENTITY_REDEFINED = 107 /* 107 */
+    XML_ERR_UNKNOWN_VERSION = 108 /* 108 */
+    XML_ERR_VERSION_MISMATCH = 109 /* 109 */
     XML_NS_ERR_XML_NAMESPACE = 200
     XML_NS_ERR_UNDEFINED_NAMESPACE = 201 /* 201 */
     XML_NS_ERR_QNAME = 202 /* 202 */
     XML_NS_ERR_ATTRIBUTE_REDEFINED = 203 /* 203 */
     XML_NS_ERR_EMPTY = 204 /* 204 */
+    XML_NS_ERR_COLON = 205 /* 205 */
     XML_DTD_ATTRIBUTE_DEFAULT = 500
     XML_DTD_ATTRIBUTE_REDEFINED = 501 /* 501 */
     XML_DTD_ATTRIBUTE_VALUE = 502 /* 502 */
@@ -293,6 +296,7 @@ void	xmlResetError			(XML_DTD_STANDALONE_DEFAULTED = 538 /* 538 */
     XML_DTD_XMLID_VALUE = 539 /* 539 */
     XML_DTD_XMLID_TYPE = 540 /* 540 */
+    XML_DTD_DUP_TOKEN = 541 /* 541 */
     XML_HTML_STRUCURE_ERROR = 800
     XML_HTML_UNKNOWN_TAG = 801 /* 801 */
     XML_RNGP_ANYNAME_ATTR_ANCESTOR = 1000
diff --git a/doc/devhelp/libxml2-xmlmemory.html b/doc/devhelp/libxml2-xmlmemory.html
index eabbbf9..8610538 100644
--- a/doc/devhelp/libxml2-xmlmemory.html
+++ b/doc/devhelp/libxml2-xmlmemory.html
@@ -52,6 +52,7 @@ void *	xmlMemRealloc			(void * ptr, 
					 size
 int	xmlInitMemory			(void);
 void	xmlMemFree			(void * ptr);
 void *	xmlMemMalloc			(size_t size);
+void	xmlMemDisplayLast		(FILE * fp, 
					 long nbBytes);
 int	xmlMemGet			(xmlFreeFunc * freeFunc, 
					 xmlMallocFunc * mallocFunc, 
					 xmlReallocFunc * reallocFunc, 
					 xmlStrdupFunc * strdupFunc);
 void	xmlMemoryDump			(void);
 void *	xmlMallocLoc			(size_t size, 
					 const char * file, 
					 int line);
@@ -130,6 +131,10 @@ char *	xmlMemStrdupLoc			(const char * str, 

         xmlMemDisplay ()
void	xmlMemDisplay			(FILE * fp)

 
show in-extenso the memory blocks allocated

 fp: a FILE descriptor used as the output file, if NULL, the result is written to the file .memorylist

+        
+        xmlMemDisplayLast ()
void	xmlMemDisplayLast		(FILE * fp, 
					 long nbBytes)

+
the last nbBytes of memory allocated and not freed, useful for dumping the memory left allocated between two places at runtime.

+fp: a FILE descriptor used as the output file, if NULL, the result is written to the file .memorylist
nbBytes: the amount of memory to dump

         
         xmlMemFree ()
void	xmlMemFree			(void * ptr)

 
a free() equivalent, with error checking.

diff --git a/doc/devhelp/libxml2-xmlreader.html b/doc/devhelp/libxml2-xmlreader.html
index 1609a96..2466e75 100644
--- a/doc/devhelp/libxml2-xmlreader.html
+++ b/doc/devhelp/libxml2-xmlreader.html
@@ -211,8 +211,8 @@ The content of this structure is not made public by the API.
 

         
         Function type xmlTextReaderErrorFunc
void	xmlTextReaderErrorFunc		(void * arg, 
					 const char * msg, 
					 xmlParserSeverities severity, 
					 xmlTextReaderLocatorPtr locator)

-

-
arg: 
msg: 
severity: 
locator: 
+Signature of an error callback from a reader parser
+arg: the user argument
msg: the message
severity: the severity of the error
locator: a locator indicating where the error occured
         
         xmlFreeTextReader ()
void	xmlFreeTextReader		(xmlTextReaderPtr reader)

 
Deallocate all the resources associated to the reader
diff --git a/doc/devhelp/libxml2-xmlregexp.html b/doc/devhelp/libxml2-xmlregexp.html
index e783648..4d11966 100644
--- a/doc/devhelp/libxml2-xmlregexp.html
+++ b/doc/devhelp/libxml2-xmlregexp.html
@@ -143,8 +143,8 @@ The content of this structure is not made public by the API.
 
         
         Function type xmlRegExecCallbacks
void	xmlRegExecCallbacks		(xmlRegExecCtxtPtr exec, 
					 const xmlChar * token, 
					 void * transdata, 
					 void * inputdata)

-

-
exec: 
token: 
transdata: 
inputdata: 
+Callback function when doing a transition in the automata
+exec: the regular expression context
token: the current token string
transdata: transition data
inputdata: input data
         
         Variable emptyExp
xmlExpNodePtr emptyExp;
 

diff --git a/doc/devhelp/libxml2-xmlschemas.html b/doc/devhelp/libxml2-xmlschemas.html
index 4801ea5..cc49dfa 100644
--- a/doc/devhelp/libxml2-xmlschemas.html
+++ b/doc/devhelp/libxml2-xmlschemas.html
@@ -68,7 +68,7 @@ void	xmlSchemaSetValidStructuredErr
 void	xmlSchemaSetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx);
 int	xmlSchemaValidCtxtGetOptions	(xmlSchemaValidCtxtPtr ctxt);
 int	xmlSchemaValidateFile		(xmlSchemaValidCtxtPtr ctxt, 
					 const char * filename, 
					 int options);
-int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr instance);
+int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr doc);
 void	xmlSchemaFree			(xmlSchemaPtr schema);
 xmlSchemaParserCtxtPtr	xmlSchemaNewMemParserCtxt	(const char * buffer, 
							 int size);
 int	xmlSchemaGetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc * err, 
					 xmlSchemaValidityWarningFunc * warn, 
					 void ** ctx);
@@ -77,6 +77,7 @@ void	xmlSchemaSetParserErrors	(xmlSchemaValidityWarningFunc	(void * ctx, 
					 const char * msg, 
					 ... ...);
 void	xmlSchemaDump			(FILE * output, 
					 xmlSchemaPtr schema);
 void	xmlSchemaFreeValidCtxt		(xmlSchemaValidCtxtPtr ctxt);
+xmlParserCtxtPtr	xmlSchemaValidCtxtGetParserCtxt	(xmlSchemaValidCtxtPtr ctxt);
 void	xmlSchemaSetParserStructuredErrors	(xmlSchemaParserCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx);
 xmlSchemaValidCtxtPtr	xmlSchemaNewValidCtxt	(xmlSchemaPtr schema);
 
@@ -185,12 +186,12 @@ The content of this structure is not made public by the API.
 
         
         Function type xmlSchemaValidityErrorFunc
void	xmlSchemaValidityErrorFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)

-

-
ctx: 
msg: 
...: 

+Signature of an error callback from an XSD validation
+ctx: the validation context
msg: the message
...: extra arguments
         
         Function type xmlSchemaValidityWarningFunc
void	xmlSchemaValidityWarningFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)

-

-
ctx: 
msg: 
...: 

+Signature of a warning callback from an XSD validation
+ctx: the validation context
msg: the message
...: extra arguments
         
         xmlSchemaDump ()
void	xmlSchemaDump			(FILE * output, 
					 xmlSchemaPtr schema)

 
Dump a Schema structure.
@@ -205,20 +206,20 @@ The content of this structure is not made public by the API.
 ctxt: the schema parser context
         
         xmlSchemaFreeValidCtxt ()
void	xmlSchemaFreeValidCtxt		(xmlSchemaValidCtxtPtr ctxt)

-

-
ctxt: 
+Free the resources associated to the schema validation context
+ctxt: the schema validation context
         
         xmlSchemaGetParserErrors ()
int	xmlSchemaGetParserErrors	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc * err, 
					 xmlSchemaValidityWarningFunc * warn, 
					 void ** ctx)

 
Get the callback information used to handle errors for a parser context
 ctxt: a XMl-Schema parser context
err: the error callback result
warn: the warning callback result
ctx: contextual data for the callbacks result
Returns: -1 in case of failure, 0 otherwise
         
         xmlSchemaGetValidErrors ()
int	xmlSchemaGetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc * err, 
					 xmlSchemaValidityWarningFunc * warn, 
					 void ** ctx)

-

-
ctxt: 
err: 
warn: 
ctx: 
Returns: 
+Get the error and warning callback informations
+ctxt: a XML-Schema validation context
err: the error function result
warn: the warning function result
ctx: the functions context result
Returns: -1 in case of error and 0 otherwise
         
         xmlSchemaIsValid ()
int	xmlSchemaIsValid		(xmlSchemaValidCtxtPtr ctxt)

-

-
ctxt: 
Returns: 
+Check if any error was detected during validation.
+ctxt: the schema validation context
Returns: 1 if valid so far, 0 if errors were detected, and -1 in case of internal error.
         
         xmlSchemaNewDocParserCtxt ()
xmlSchemaParserCtxtPtr	xmlSchemaNewDocParserCtxt	(xmlDocPtr doc)

 
Create an XML Schemas parse context for that document. NB. The document may be modified during the parsing process.
@@ -233,20 +234,20 @@ The content of this structure is not made public by the API.
 URL: the location of the schema
Returns: the parser context or NULL in case of error
         
         xmlSchemaNewValidCtxt ()
xmlSchemaValidCtxtPtr	xmlSchemaNewValidCtxt	(xmlSchemaPtr schema)

-

-
schema: 
Returns: 
+Create an XML Schemas validation context based on the given schema.
+schema: a precompiled XML Schemas
Returns: the validation context or NULL in case of error
         
         xmlSchemaParse ()
xmlSchemaPtr	xmlSchemaParse		(xmlSchemaParserCtxtPtr ctxt)

 
parse a schema definition resource and build an internal XML Shema struture which can be used to validate instances.
 ctxt: a schema validation context
Returns: the internal XML Schema structure built from the resource or NULL in case of error
         
         xmlSchemaSAXPlug ()
xmlSchemaSAXPlugPtr	xmlSchemaSAXPlug	(xmlSchemaValidCtxtPtr ctxt, 
						 xmlSAXHandlerPtr * sax, 
						 void ** user_data)

-

-
ctxt: 
sax: 
user_data: 
Returns: 
+Plug a SAX based validation layer in a SAX parsing event flow. The original @saxptr and @dataptr data are replaced by new pointers but the calls to the original will be maintained.
+ctxt: a schema validation context
sax: a pointer to the original xmlSAXHandlerPtr
user_data: a pointer to the original SAX user data pointer
Returns: a pointer to a data structure needed to unplug the validation layer or NULL in case of errors.
         
         xmlSchemaSAXUnplug ()
int	xmlSchemaSAXUnplug		(xmlSchemaSAXPlugPtr plug)

-

-
plug: 
Returns: 
+Unplug a SAX based validation layer in a SAX parsing event flow. The original pointers used in the call are restored.
+plug: a data structure returned by xmlSchemaSAXPlug
Returns: 0 in case of success and -1 in case of failure.
         
         xmlSchemaSetParserErrors ()
void	xmlSchemaSetParserErrors	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx)

 
Set the callback functions used to handle errors for a validation context
@@ -257,36 +258,40 @@ The content of this structure is not made public by the API.
 ctxt: a schema parser context
serror: the structured error function
ctx: the functions context
         
         xmlSchemaSetValidErrors ()
void	xmlSchemaSetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx)

-

-
ctxt: 
err: 
warn: 
ctx: 
+Set the error and warning callback informations
+ctxt: a schema validation context
err: the error function
warn: the warning function
ctx: the functions context
         
         xmlSchemaSetValidOptions ()
int	xmlSchemaSetValidOptions	(xmlSchemaValidCtxtPtr ctxt, 
					 int options)

-

-
ctxt: 
options: 
Returns: 
+Sets the options to be used during the validation.
+ctxt: a schema validation context
options: a combination of xmlSchemaValidOption
Returns: 0 in case of success, -1 in case of an API error.
         
         xmlSchemaSetValidStructuredErrors ()
void	xmlSchemaSetValidStructuredErrors	(xmlSchemaValidCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx)

-

-
ctxt: 
serror: 
ctx: 
+Set the structured error callback
+ctxt: a schema validation context
serror: the structured error function
ctx: the functions context
         
         xmlSchemaValidCtxtGetOptions ()
int	xmlSchemaValidCtxtGetOptions	(xmlSchemaValidCtxtPtr ctxt)

-

-
ctxt: 
Returns: 
+Get the validation context options.
+ctxt: a schema validation context
Returns: the option combination or -1 on error.
         
-        xmlSchemaValidateDoc ()
int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr instance)

-

-
ctxt: 
instance: 
Returns: 
+        xmlSchemaValidCtxtGetParserCtxt ()
xmlParserCtxtPtr	xmlSchemaValidCtxtGetParserCtxt	(xmlSchemaValidCtxtPtr ctxt)

+
allow access to the parser context of the schema validation context
+ctxt: a schema validation context
Returns: the parser context of the schema validation context or NULL in case of error.
+        
+        xmlSchemaValidateDoc ()
int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr doc)

+
Validate a document tree in memory.
+ctxt: a schema validation context
doc: a parsed document tree
Returns: 0 if the document is schemas valid, a positive error code number otherwise and -1 in case of internal or API error.
         
         xmlSchemaValidateFile ()
int	xmlSchemaValidateFile		(xmlSchemaValidCtxtPtr ctxt, 
					 const char * filename, 
					 int options)

-

-
ctxt: 
filename: 
options: 
Returns: 
+Do a schemas validation of the given resource, it will use the SAX streamable validation internally.
+ctxt: a schema validation context
filename: the URI of the instance
options: a future set of options, currently unused
Returns: 0 if the document is valid, a positive error code number otherwise and -1 in case of an internal or API error.
         
         xmlSchemaValidateOneElement ()
int	xmlSchemaValidateOneElement	(xmlSchemaValidCtxtPtr ctxt, 
					 xmlNodePtr elem)

-

-
ctxt: 
elem: 
Returns: 
+Validate a branch of a tree, starting with the given @elem.
+ctxt: a schema validation context
elem: an element node
Returns: 0 if the element and its subtree is valid, a positive error code number otherwise and -1 in case of an internal or API error.
         
         xmlSchemaValidateStream ()
int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 xmlSAXHandlerPtr sax, 
					 void * user_data)

-

-
ctxt: 
input: 
enc: 
sax: 
user_data: 
Returns: 
+Validate an input based on a flow of SAX event from the parser and forward the events to the @sax handler with the provided @user_data the user provided @sax handler must be a SAX2 one.
+ctxt: a schema validation context
input: the input to use for reading the data
enc: an optional encoding information
sax: a SAX handler for the resulting events
user_data: the context to provide to the SAX handler.
Returns: 0 if the document is schemas valid, a positive error code number otherwise and -1 in case of internal or API error.
         
       
     
diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp
index 499bcb9..1288b18 100644
--- a/doc/devhelp/libxml2.devhelp
+++ b/doc/devhelp/libxml2.devhelp
@@ -339,6 +339,7 @@
     
     
     
+    
     
     
     
@@ -427,6 +428,14 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -434,6 +443,7 @@
     
     
     
+    
     
     
     
@@ -581,11 +591,13 @@
     
     
     
+    
     
     
     
     
     
+    
     
     
     
@@ -710,6 +722,7 @@
     
     
     
+    
     
     
     
@@ -745,6 +758,8 @@
     
     
     
+    
+    
     
     
     
@@ -754,6 +769,7 @@
     
     
     
+    
     
     
     
@@ -1547,6 +1563,7 @@
     
     
     
+    
     
     
     
@@ -2414,6 +2431,7 @@
     
     
     
+    
     
     
     
@@ -2492,6 +2510,7 @@
     
     
     
+    
     
     
     
@@ -2835,6 +2854,7 @@
     
     
     
+    
     
     
     
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index d1beee5..d0f42aa 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -15,75 +15,65 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
 	-@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
 
-EXTRA_DIST=examples.xsl index.py examples.xml writer.xml test3.xml tst.xml test1.xml test2.xml io2.res xpath2.res tree1.res reader4.res io1.res tree2.res reader3.res xpath1.res reader1.res 
+EXTRA_DIST=examples.xsl index.py test1.xml examples.xml test2.xml tst.xml writer.xml test3.xml tree2.res xpath1.res reader1.res reader3.res reader4.res io1.res xpath2.res io2.res tree1.res 
 
-noinst_PROGRAMS=xpath2 reader1 reader4 parse2 reader2 parse3 reader3 tree2 parse4 io2 testWriter io1 xpath1 parse1 tree1 
+noinst_PROGRAMS=reader2 xpath2 xpath1 parse3 io2 tree2 reader1 testWriter parse4 reader3 io1 parse1 tree1 reader4 parse2 
+
+reader2_SOURCES=reader2.c
+reader2_LDFLAGS=
+reader2_DEPENDENCIES= $(DEPS)
+reader2_LDADD= @RDL_LIBS@ $(LDADDS)
 
 xpath2_SOURCES=xpath2.c
 xpath2_LDFLAGS=
 xpath2_DEPENDENCIES= $(DEPS)
 xpath2_LDADD= @RDL_LIBS@ $(LDADDS)
 
-reader1_SOURCES=reader1.c
-reader1_LDFLAGS=
-reader1_DEPENDENCIES= $(DEPS)
-reader1_LDADD= @RDL_LIBS@ $(LDADDS)
-
-reader4_SOURCES=reader4.c
-reader4_LDFLAGS=
-reader4_DEPENDENCIES= $(DEPS)
-reader4_LDADD= @RDL_LIBS@ $(LDADDS)
-
-parse2_SOURCES=parse2.c
-parse2_LDFLAGS=
-parse2_DEPENDENCIES= $(DEPS)
-parse2_LDADD= @RDL_LIBS@ $(LDADDS)
-
-reader2_SOURCES=reader2.c
-reader2_LDFLAGS=
-reader2_DEPENDENCIES= $(DEPS)
-reader2_LDADD= @RDL_LIBS@ $(LDADDS)
+xpath1_SOURCES=xpath1.c
+xpath1_LDFLAGS=
+xpath1_DEPENDENCIES= $(DEPS)
+xpath1_LDADD= @RDL_LIBS@ $(LDADDS)
 
 parse3_SOURCES=parse3.c
 parse3_LDFLAGS=
 parse3_DEPENDENCIES= $(DEPS)
 parse3_LDADD= @RDL_LIBS@ $(LDADDS)
 
-reader3_SOURCES=reader3.c
-reader3_LDFLAGS=
-reader3_DEPENDENCIES= $(DEPS)
-reader3_LDADD= @RDL_LIBS@ $(LDADDS)
+io2_SOURCES=io2.c
+io2_LDFLAGS=
+io2_DEPENDENCIES= $(DEPS)
+io2_LDADD= @RDL_LIBS@ $(LDADDS)
 
 tree2_SOURCES=tree2.c
 tree2_LDFLAGS=
 tree2_DEPENDENCIES= $(DEPS)
 tree2_LDADD= @RDL_LIBS@ $(LDADDS)
 
-parse4_SOURCES=parse4.c
-parse4_LDFLAGS=
-parse4_DEPENDENCIES= $(DEPS)
-parse4_LDADD= @RDL_LIBS@ $(LDADDS)
-
-io2_SOURCES=io2.c
-io2_LDFLAGS=
-io2_DEPENDENCIES= $(DEPS)
-io2_LDADD= @RDL_LIBS@ $(LDADDS)
+reader1_SOURCES=reader1.c
+reader1_LDFLAGS=
+reader1_DEPENDENCIES= $(DEPS)
+reader1_LDADD= @RDL_LIBS@ $(LDADDS)
 
 testWriter_SOURCES=testWriter.c
 testWriter_LDFLAGS=
 testWriter_DEPENDENCIES= $(DEPS)
 testWriter_LDADD= @RDL_LIBS@ $(LDADDS)
 
+parse4_SOURCES=parse4.c
+parse4_LDFLAGS=
+parse4_DEPENDENCIES= $(DEPS)
+parse4_LDADD= @RDL_LIBS@ $(LDADDS)
+
+reader3_SOURCES=reader3.c
+reader3_LDFLAGS=
+reader3_DEPENDENCIES= $(DEPS)
+reader3_LDADD= @RDL_LIBS@ $(LDADDS)
+
 io1_SOURCES=io1.c
 io1_LDFLAGS=
 io1_DEPENDENCIES= $(DEPS)
 io1_LDADD= @RDL_LIBS@ $(LDADDS)
 
-xpath1_SOURCES=xpath1.c
-xpath1_LDFLAGS=
-xpath1_DEPENDENCIES= $(DEPS)
-xpath1_LDADD= @RDL_LIBS@ $(LDADDS)
-
 parse1_SOURCES=parse1.c
 parse1_LDFLAGS=
 parse1_DEPENDENCIES= $(DEPS)
@@ -94,41 +84,51 @@ tree1_LDFLAGS=
 tree1_DEPENDENCIES= $(DEPS)
 tree1_LDADD= @RDL_LIBS@ $(LDADDS)
 
+reader4_SOURCES=reader4.c
+reader4_LDFLAGS=
+reader4_DEPENDENCIES= $(DEPS)
+reader4_LDADD= @RDL_LIBS@ $(LDADDS)
+
+parse2_SOURCES=parse2.c
+parse2_LDFLAGS=
+parse2_DEPENDENCIES= $(DEPS)
+parse2_LDADD= @RDL_LIBS@ $(LDADDS)
+
 valgrind: 
 	$(MAKE) CHECKER='valgrind' tests
 
 tests: $(noinst_PROGRAMS)
 	@(echo '## examples regression tests')
 	@(echo > .memdump)
-	@($(CHECKER) ./xpath2 test3.xml '//discarded' discarded > xpath2.tmp ; diff xpath2.tmp xpath2.res ; rm xpath2.tmp)
-	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./reader1 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp)
-	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp)
+	@($(CHECKER) ./reader2 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./parse2 test2.xml)
+	@($(CHECKER) ./xpath2 test3.xml '//discarded' discarded > xpath2.tmp ; diff xpath2.tmp xpath2.res ; rm xpath2.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./reader2 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp)
+	@($(CHECKER) ././xpath1 test3.xml '//child2' > xpath1.tmp ; diff xpath1.tmp xpath1.res ; rm xpath1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./parse3)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.tmp)
+	@($(CHECKER) ./io2 > io2.tmp ; diff io2.tmp io2.res ; rm -f io2.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./tree2 > tree2.tmp ; diff tree2.tmp tree2.res ; rm tree2.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./parse4 test3.xml)
-	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./io2 > io2.tmp ; diff io2.tmp io2.res ; rm -f io2.tmp)
+	@($(CHECKER) ./reader1 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./testWriter ; for i in 1 2 3 4 ; do diff writer.xml writer$$i.res ; done ; rm writer*.res)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./io1 > io1.tmp ; diff io1.tmp io1.res ; rm -f io1.tmp)
+	@($(CHECKER) ./parse4 test3.xml)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ././xpath1 test3.xml '//child2' > xpath1.tmp ; diff xpath1.tmp xpath1.res ; rm xpath1.tmp)
+	@($(CHECKER) ./reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.tmp)
+	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
+	@($(CHECKER) ./io1 > io1.tmp ; diff io1.tmp io1.res ; rm -f io1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./parse1 test1.xml)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./tree1 test2.xml > tree1.tmp ; diff tree1.tmp tree1.res ; rm tree1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
+	@($(CHECKER) ./reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp)
+	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
+	@($(CHECKER) ./parse2 test2.xml)
+	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 
 
diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in
index 14681b4..025ef95 100644
--- a/doc/examples/Makefile.in
+++ b/doc/examples/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -32,11 +32,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = xpath2$(EXEEXT) reader1$(EXEEXT) reader4$(EXEEXT) \
-	parse2$(EXEEXT) reader2$(EXEEXT) parse3$(EXEEXT) \
-	reader3$(EXEEXT) tree2$(EXEEXT) parse4$(EXEEXT) io2$(EXEEXT) \
-	testWriter$(EXEEXT) io1$(EXEEXT) xpath1$(EXEEXT) \
-	parse1$(EXEEXT) tree1$(EXEEXT)
+noinst_PROGRAMS = reader2$(EXEEXT) xpath2$(EXEEXT) xpath1$(EXEEXT) \
+	parse3$(EXEEXT) io2$(EXEEXT) tree2$(EXEEXT) reader1$(EXEEXT) \
+	testWriter$(EXEEXT) parse4$(EXEEXT) reader3$(EXEEXT) \
+	io1$(EXEEXT) parse1$(EXEEXT) tree1$(EXEEXT) reader4$(EXEEXT) \
+	parse2$(EXEEXT)
 subdir = doc/examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -125,7 +125,7 @@ xpath2_OBJECTS = $(am_xpath2_OBJECTS)
 xpath2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xpath2_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -370,59 +370,51 @@ top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
 DEPS = $(top_builddir)/libxml2.la
 LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm @WIN32_EXTRA_LIBADD@
-EXTRA_DIST = examples.xsl index.py examples.xml writer.xml test3.xml tst.xml test1.xml test2.xml io2.res xpath2.res tree1.res reader4.res io1.res tree2.res reader3.res xpath1.res reader1.res 
-xpath2_SOURCES = xpath2.c
-xpath2_LDFLAGS = 
-xpath2_DEPENDENCIES = $(DEPS)
-xpath2_LDADD = @RDL_LIBS@ $(LDADDS)
-reader1_SOURCES = reader1.c
-reader1_LDFLAGS = 
-reader1_DEPENDENCIES = $(DEPS)
-reader1_LDADD = @RDL_LIBS@ $(LDADDS)
-reader4_SOURCES = reader4.c
-reader4_LDFLAGS = 
-reader4_DEPENDENCIES = $(DEPS)
-reader4_LDADD = @RDL_LIBS@ $(LDADDS)
-parse2_SOURCES = parse2.c
-parse2_LDFLAGS = 
-parse2_DEPENDENCIES = $(DEPS)
-parse2_LDADD = @RDL_LIBS@ $(LDADDS)
+EXTRA_DIST = examples.xsl index.py test1.xml examples.xml test2.xml tst.xml writer.xml test3.xml tree2.res xpath1.res reader1.res reader3.res reader4.res io1.res xpath2.res io2.res tree1.res 
 reader2_SOURCES = reader2.c
 reader2_LDFLAGS = 
 reader2_DEPENDENCIES = $(DEPS)
 reader2_LDADD = @RDL_LIBS@ $(LDADDS)
+xpath2_SOURCES = xpath2.c
+xpath2_LDFLAGS = 
+xpath2_DEPENDENCIES = $(DEPS)
+xpath2_LDADD = @RDL_LIBS@ $(LDADDS)
+xpath1_SOURCES = xpath1.c
+xpath1_LDFLAGS = 
+xpath1_DEPENDENCIES = $(DEPS)
+xpath1_LDADD = @RDL_LIBS@ $(LDADDS)
 parse3_SOURCES = parse3.c
 parse3_LDFLAGS = 
 parse3_DEPENDENCIES = $(DEPS)
 parse3_LDADD = @RDL_LIBS@ $(LDADDS)
-reader3_SOURCES = reader3.c
-reader3_LDFLAGS = 
-reader3_DEPENDENCIES = $(DEPS)
-reader3_LDADD = @RDL_LIBS@ $(LDADDS)
-tree2_SOURCES = tree2.c
-tree2_LDFLAGS = 
-tree2_DEPENDENCIES = $(DEPS)
-tree2_LDADD = @RDL_LIBS@ $(LDADDS)
-parse4_SOURCES = parse4.c
-parse4_LDFLAGS = 
-parse4_DEPENDENCIES = $(DEPS)
-parse4_LDADD = @RDL_LIBS@ $(LDADDS)
 io2_SOURCES = io2.c
 io2_LDFLAGS = 
 io2_DEPENDENCIES = $(DEPS)
 io2_LDADD = @RDL_LIBS@ $(LDADDS)
+tree2_SOURCES = tree2.c
+tree2_LDFLAGS = 
+tree2_DEPENDENCIES = $(DEPS)
+tree2_LDADD = @RDL_LIBS@ $(LDADDS)
+reader1_SOURCES = reader1.c
+reader1_LDFLAGS = 
+reader1_DEPENDENCIES = $(DEPS)
+reader1_LDADD = @RDL_LIBS@ $(LDADDS)
 testWriter_SOURCES = testWriter.c
 testWriter_LDFLAGS = 
 testWriter_DEPENDENCIES = $(DEPS)
 testWriter_LDADD = @RDL_LIBS@ $(LDADDS)
+parse4_SOURCES = parse4.c
+parse4_LDFLAGS = 
+parse4_DEPENDENCIES = $(DEPS)
+parse4_LDADD = @RDL_LIBS@ $(LDADDS)
+reader3_SOURCES = reader3.c
+reader3_LDFLAGS = 
+reader3_DEPENDENCIES = $(DEPS)
+reader3_LDADD = @RDL_LIBS@ $(LDADDS)
 io1_SOURCES = io1.c
 io1_LDFLAGS = 
 io1_DEPENDENCIES = $(DEPS)
 io1_LDADD = @RDL_LIBS@ $(LDADDS)
-xpath1_SOURCES = xpath1.c
-xpath1_LDFLAGS = 
-xpath1_DEPENDENCIES = $(DEPS)
-xpath1_LDADD = @RDL_LIBS@ $(LDADDS)
 parse1_SOURCES = parse1.c
 parse1_LDFLAGS = 
 parse1_DEPENDENCIES = $(DEPS)
@@ -431,6 +423,14 @@ tree1_SOURCES = tree1.c
 tree1_LDFLAGS = 
 tree1_DEPENDENCIES = $(DEPS)
 tree1_LDADD = @RDL_LIBS@ $(LDADDS)
+reader4_SOURCES = reader4.c
+reader4_LDFLAGS = 
+reader4_DEPENDENCIES = $(DEPS)
+reader4_LDADD = @RDL_LIBS@ $(LDADDS)
+parse2_SOURCES = parse2.c
+parse2_LDFLAGS = 
+parse2_DEPENDENCIES = $(DEPS)
+parse2_LDADD = @RDL_LIBS@ $(LDADDS)
 all: all-am
 
 .SUFFIXES:
@@ -571,8 +571,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -584,8 +584,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -595,13 +595,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -762,36 +761,36 @@ valgrind:
 tests: $(noinst_PROGRAMS)
 	@(echo '## examples regression tests')
 	@(echo > .memdump)
-	@($(CHECKER) ./xpath2 test3.xml '//discarded' discarded > xpath2.tmp ; diff xpath2.tmp xpath2.res ; rm xpath2.tmp)
-	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./reader1 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp)
-	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp)
+	@($(CHECKER) ./reader2 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./parse2 test2.xml)
+	@($(CHECKER) ./xpath2 test3.xml '//discarded' discarded > xpath2.tmp ; diff xpath2.tmp xpath2.res ; rm xpath2.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./reader2 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp)
+	@($(CHECKER) ././xpath1 test3.xml '//child2' > xpath1.tmp ; diff xpath1.tmp xpath1.res ; rm xpath1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./parse3)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.tmp)
+	@($(CHECKER) ./io2 > io2.tmp ; diff io2.tmp io2.res ; rm -f io2.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./tree2 > tree2.tmp ; diff tree2.tmp tree2.res ; rm tree2.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./parse4 test3.xml)
-	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./io2 > io2.tmp ; diff io2.tmp io2.res ; rm -f io2.tmp)
+	@($(CHECKER) ./reader1 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./testWriter ; for i in 1 2 3 4 ; do diff writer.xml writer$$i.res ; done ; rm writer*.res)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ./io1 > io1.tmp ; diff io1.tmp io1.res ; rm -f io1.tmp)
+	@($(CHECKER) ./parse4 test3.xml)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
-	@($(CHECKER) ././xpath1 test3.xml '//child2' > xpath1.tmp ; diff xpath1.tmp xpath1.res ; rm xpath1.tmp)
+	@($(CHECKER) ./reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.tmp)
+	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
+	@($(CHECKER) ./io1 > io1.tmp ; diff io1.tmp io1.res ; rm -f io1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./parse1 test1.xml)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 	@($(CHECKER) ./tree1 test2.xml > tree1.tmp ; diff tree1.tmp tree1.res ; rm tree1.tmp)
 	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
+	@($(CHECKER) ./reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp)
+	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
+	@($(CHECKER) ./parse2 test2.xml)
+	@(grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/doc/examples/examples.xml b/doc/examples/examples.xml
index 2a0827b..a237a0e 100644
--- a/doc/examples/examples.xml
+++ b/doc/examples/examples.xml
@@ -1,4 +1,36 @@
 
+  
+    Parse and validate an XML file with an xmlReader
+    Demonstrate the use of xmlReaderForFile() to parse an XML file validating the content in the process and activating options like entities substitution, and DTD attributes defaulting. (Note that the XMLReader functions require libxml2 version later than 2.6.)
+    reader2 <valid_xml_filename>
+    reader2 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp
+    Daniel Veillard
+    see Copyright for the status of this software. 
+    xmlReader
+    
+      <libxml/xmlreader.h>
+    
+    
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
+  
   
     Load a document, locate subelements with XPath, modify said elements and save the resulting document.
     Shows how to make a full round-trip from a load/edit/save
@@ -32,114 +64,42 @@
       
     
   
-  
-    Parse an XML file with an xmlReader
-    Demonstrate the use of xmlReaderForFile() to parse an XML file and dump the informations about the nodes found in the process. (Note that the XMLReader functions require libxml2 version later than 2.6.)
-    reader1 <filename>
-    reader1 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp
-    Daniel Veillard
-    see Copyright for the status of this software. 
-    xmlReader
-    
-      <libxml/xmlreader.h>
-    
-    
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    
-  
-  
-    Parse multiple XML files reusing an xmlReader
-    Demonstrate the use of xmlReaderForFile() and xmlReaderNewFile to parse XML files while reusing the reader object and parser context.  (Note that the XMLReader functions require libxml2 version later than 2.6.)
-    reader4 <filename> [ filename ... ]
-    reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp
-    Graham Bennett
-    see Copyright for the status of this software. 
-    xmlReader
-    
-      <libxml/xmlreader.h>
-    
-    
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    
-  
-  
-    Parse and validate an XML file to a tree and free the result
-    Create a parser context for an XML file, then parse and validate the file, creating a tree, check the validation result and xmlFreeDoc() to free the resulting tree.
-    parse2 test2.xml
-    parse2 test2.xml
-    Daniel Veillard
+  
+    Evaluate XPath expression and prints result node set.
+    Shows how to evaluate XPath expression and register known namespaces in XPath context.
+    xpath1 <xml-file> <xpath-expr> [<known-ns-list>]
+    ./xpath1 test3.xml '//child2' > xpath1.tmp ; diff xpath1.tmp xpath1.res ; rm xpath1.tmp
+    Aleksey Sanin
     see Copyright for the status of this software. 
-    Parsing
+    XPath
     
-      <libxml/tree.h>
       <libxml/parser.h>
+      <libxml/xpath.h>
+      <libxml/xpathInternals.h>
+      <libxml/tree.h>
     
     
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    
-  
-  
-    Parse and validate an XML file with an xmlReader
-    Demonstrate the use of xmlReaderForFile() to parse an XML file validating the content in the process and activating options like entities substitution, and DTD attributes defaulting. (Note that the XMLReader functions require libxml2 version later than 2.6.)
-    reader2 <valid_xml_filename>
-    reader2 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp
-    Daniel Veillard
-    see Copyright for the status of this software. 
-    xmlReader
-    
-      <libxml/xmlreader.h>
-    
-    
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
     
   
   
@@ -163,27 +123,27 @@
       
     
   
-  
-    Show how to extract subdocuments with xmlReader
-    Demonstrate the use of xmlTextReaderPreservePattern() to parse an XML file with the xmlReader while collecting only some subparts of the document. (Note that the XMLReader functions require libxml2 version later than 2.6.)
-    reader3
-    reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.tmp
-    Daniel Veillard
+  
+    Output to char buffer
+    Demonstrate the use of xmlDocDumpMemory to output document to a character buffer
+    io2
+    io2 > io2.tmp ; diff io2.tmp io2.res ; rm -f io2.tmp
+    John Fleck
     see Copyright for the status of this software. 
-    xmlReader
+    InputOutput
     
-      <libxml/xmlreader.h>
+      <libxml/parser.h>
     
     
-      
-      
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
+      
+      
     
   
   
@@ -200,9 +160,12 @@
     
     
       
+      
       
       
       
+      
+      
       
       
       
@@ -211,45 +174,32 @@
       
     
   
-  
-    Parse an XML document chunk by chunk to a tree and free it
-    Demonstrate the use of xmlCreatePushParserCtxt() and xmlParseChunk() to read an XML file progressively into a tree and and xmlFreeDoc() to free the resulting tree
-    parse4 test3.xml
-    parse4 test3.xml
+  
+    Parse an XML file with an xmlReader
+    Demonstrate the use of xmlReaderForFile() to parse an XML file and dump the informations about the nodes found in the process. (Note that the XMLReader functions require libxml2 version later than 2.6.)
+    reader1 <filename>
+    reader1 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp
     Daniel Veillard
     see Copyright for the status of this software. 
-    Parsing
-    
-      <libxml/tree.h>
-      <libxml/parser.h>
-    
-    
-      
-      
-      
-      
-      
-    
-  
-  
-    Output to char buffer
-    Demonstrate the use of xmlDocDumpMemory to output document to a character buffer
-    io2
-    io2 > io2.tmp ; diff io2.tmp io2.res ; rm -f io2.tmp
-    John Fleck
-    see Copyright for the status of this software. 
-    InputOutput
+    xmlReader
     
-      <libxml/parser.h>
+      <libxml/xmlreader.h>
     
     
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
     
   
   
@@ -271,6 +221,7 @@
       
       
       
+      
       
       
       
@@ -282,6 +233,7 @@
       
       
       
+      
       
       
       
@@ -296,6 +248,47 @@
       
     
   
+  
+    Parse an XML document chunk by chunk to a tree and free it
+    Demonstrate the use of xmlCreatePushParserCtxt() and xmlParseChunk() to read an XML file progressively into a tree and and xmlFreeDoc() to free the resulting tree
+    parse4 test3.xml
+    parse4 test3.xml
+    Daniel Veillard
+    see Copyright for the status of this software. 
+    Parsing
+    
+      <libxml/tree.h>
+      <libxml/parser.h>
+    
+    
+      
+      
+      
+      
+      
+    
+  
+  
+    Show how to extract subdocuments with xmlReader
+    Demonstrate the use of xmlTextReaderPreservePattern() to parse an XML file with the xmlReader while collecting only some subparts of the document. (Note that the XMLReader functions require libxml2 version later than 2.6.)
+    reader3
+    reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.tmp
+    Daniel Veillard
+    see Copyright for the status of this software. 
+    xmlReader
+    
+      <libxml/xmlreader.h>
+    
+    
+      
+      
+      
+      
+      
+      
+      
+    
+  
   
     Example of custom Input/Output
     Demonstrate the use of xmlRegisterInputCallbacks to build a custom I/O layer, this is used in an XInclude method context to show how dynamic document can be built in a clean way.
@@ -317,39 +310,6 @@
       
     
   
-  
-    Evaluate XPath expression and prints result node set.
-    Shows how to evaluate XPath expression and register known namespaces in XPath context.
-    xpath1 <xml-file> <xpath-expr> [<known-ns-list>]
-    ./xpath1 test3.xml '//child2' > xpath1.tmp ; diff xpath1.tmp xpath1.res ; rm xpath1.tmp
-    Aleksey Sanin
-    see Copyright for the status of this software. 
-    XPath
-    
-      <libxml/parser.h>
-      <libxml/xpath.h>
-      <libxml/xpathInternals.h>
-      <libxml/tree.h>
-    
-    
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    
-  
   
     Parse an XML file to a tree and free it
     Demonstrate the use of xmlReadFile() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree
@@ -384,14 +344,54 @@
       
     
   
+  
+    Parse multiple XML files reusing an xmlReader
+    Demonstrate the use of xmlReaderForFile() and xmlReaderNewFile to parse XML files while reusing the reader object and parser context.  (Note that the XMLReader functions require libxml2 version later than 2.6.)
+    reader4 <filename> [ filename ... ]
+    reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp
+    Graham Bennett
+    see Copyright for the status of this software. 
+    xmlReader
+    
+      <libxml/xmlreader.h>
+    
+    
+      
+      
+      
+      
+      
+      
+    
+  
+  
+    Parse and validate an XML file to a tree and free the result
+    Create a parser context for an XML file, then parse and validate the file, creating a tree, check the validation result and xmlFreeDoc() to free the resulting tree.
+    parse2 test2.xml
+    parse2 test2.xml
+    Daniel Veillard
+    see Copyright for the status of this software. 
+    Parsing
+    
+      <libxml/tree.h>
+      <libxml/parser.h>
+    
+    
+      
+      
+      
+      
+      
+    
+  
   
     
-      
-      
-      
-      
       
+      
+      
       
+      
+      
     
     
       
@@ -408,8 +408,8 @@
       
     
     
-      
       
+      
     
     
       
@@ -430,12 +430,12 @@
       
     
     
-      
-      
-      
-      
       
+      
+      
       
+      
+      
     
     
       
@@ -459,42 +459,42 @@
     
     
       
-      
-      
+      
       
-      
+      
+      
       
     
     
-      
       
+      
       
     
     
       
     
     
+      
       
       
-      
     
     
       
-      
-      
+      
       
-      
+      
       
+      
     
     
-      
       
+      
     
     
-      
-      
       
+      
       
+      
     
     
       
@@ -507,27 +507,27 @@
       
     
     
-      
-      
-      
-      
       
+      
+      
       
+      
+      
     
     
       
     
     
-      
       
+      
       
     
     
       
     
     
-      
       
+      
     
     
       
@@ -551,9 +551,9 @@
       
     
     
+      
       
       
-      
     
     
       
@@ -570,8 +570,8 @@
       
     
     
-      
       
+      
     
     
       
@@ -582,10 +582,10 @@
       
     
     
-      
-      
       
+      
       
+      
     
     
       
@@ -609,54 +609,54 @@
       
     
     
-      
       
+      
     
     
-      
       
+      
     
     
-      
       
+      
     
     
-      
       
+      
     
     
-      
       
+      
     
     
-      
       
+      
     
     
-      
       
+      
     
     
       
     
     
-      
       
+      
     
     
       
     
     
-      
-      
       
+      
       
+      
     
     
-      
-      
       
+      
       
+      
     
     
       
@@ -725,10 +725,10 @@
       
     
     
-      
       
       
       
+      
     
     
       
@@ -739,10 +739,10 @@
       
     
     
-      
-      
       
+      
       
+      
     
     
       
diff --git a/doc/examples/reader3.c b/doc/examples/reader3.c
index acbff4f..51f9d3b 100644
--- a/doc/examples/reader3.c
+++ b/doc/examples/reader3.c
@@ -15,7 +15,8 @@
 #include 
 #include 
 
-#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_PATTERN_ENABLED)
+#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_PATTERN_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
+
 
 /**
  * streamFile:
@@ -113,7 +114,7 @@ int main(int argc, char **argv) {
 
 #else
 int main(void) {
-    fprintf(stderr, "Reader or Pattern support not compiled in\n");
+    fprintf(stderr, "Reader, Pattern or output support not compiled in\n");
     exit(1);
 }
 #endif
diff --git a/doc/html/libxml-c14n.html b/doc/html/libxml-c14n.html
index f4b3ecd..dfcb9c5 100644
--- a/doc/html/libxml-c14n.html
+++ b/doc/html/libxml-c14n.html
@@ -28,5 +28,5 @@ int	xmlC14NIsVisibleCallback	(void * use
 Dumps the canonized image of given XML document into the provided buffer. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
 doc: the XML document for canonization
is_visible_callback: the function to use to determine is node visible or not
user_data: the first parameter for @is_visible_callback function (in most cases, it is nodes set)
exclusive: the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
inclusive_ns_prefixes: the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
with_comments: include comments in the result (!=0) or not (==0)
buf: the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
Returns: non-negative value on success or a negative value on fail
Function type: xmlC14NIsVisibleCallback
Function type: xmlC14NIsVisibleCallback
 int	xmlC14NIsVisibleCallback	(void * user_data, 
					 xmlNodePtr node, 
					 xmlNodePtr parent)
-
user_data: 
node: 
parent: 
Returns: 


+Signature for a C14N callback on visible nodes
user_data: user data
node: the curent node
parent: the parent node
Returns: 1 if the node should be included


 Daniel Veillard
diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html
index fe4ea86..406e64e 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html
@@ -30,6 +30,7 @@ The content of this structure is not made public by the API.
 xmlEntityPtr	xmlGetParameterEntity	(xmlDocPtr doc, 
					 const xmlChar * name)
 xmlEntityPtr	xmlGetPredefinedEntity	(const xmlChar * name)
 void	xmlInitializePredefinedEntities	(void)
+xmlEntityPtr	xmlNewEntity		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID, 
					 const xmlChar * content)
 Description
 Structure xmlEntitiesTable
Structure xmlEntitiesTable
struct _xmlHashTable {
 The content of this structure is not made public by the API.
@@ -73,4 +74,6 @@ The content of this structure is not made public by the API.
 
Check whether this name is an predefined entity.
 name: the entity name
Returns: NULL if not, otherwise the entity
Function: xmlInitializePredefinedEntities
void	xmlInitializePredefinedEntities	(void)

 
Set up the predefined entities. Deprecated call
-Daniel Veillard
+Function: xmlNewEntity
xmlEntityPtr	xmlNewEntity		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID, 
					 const xmlChar * content)

+
Create a new entity, this differs from xmlAddDocEntity() that if the document is NULL or has no internal subset defined, then an unlinked entity structure will be returned, it is then the responsability of the caller to link it to the document later or free it when not needed anymore.
+doc: the document
name: the entity name
type: the entity type XML_xxx_yyy_ENTITY
ExternalID: the entity external ID if available
SystemID: the entity system ID if available
content: the entity content
Returns: a pointer to the entity or NULL in case of error
Daniel Veillard
diff --git a/doc/html/libxml-globals.html b/doc/html/libxml-globals.html
index fd9a06c..148d6a1 100644
--- a/doc/html/libxml-globals.html
+++ b/doc/html/libxml-globals.html
@@ -90,7 +90,7 @@ void	xmlRegisterNodeFunc		(func: function pointer to the new DeregisterNodeFunc
Returns: the previous value of the deregistration function
Function type: xmlDeregisterNodeFunc
Function type: xmlDeregisterNodeFunc
 void	xmlDeregisterNodeFunc		(xmlNodePtr node)
-
node: 


+

Signature for the deregistration callback of a discarded node

node: the current node

Function: xmlInitGlobals

void	xmlInitGlobals			(void)

Additional initialisation for multi-threading

Function: xmlInitializeGlobalState

void	xmlInitializeGlobalState	(xmlGlobalStatePtr gs)

@@ -99,17 +99,17 @@ void	xmlDeregisterNodeFunc		(xmlNodePtrRegisters a callback for URI output file handling
 func: function pointer to the new OutputBufferCreateFilenameFunc
Returns: the old value of the registration function
Function type: xmlOutputBufferCreateFilenameFunc
Function type: xmlOutputBufferCreateFilenameFunc
 xmlOutputBufferPtr	xmlOutputBufferCreateFilenameFunc	(const char * URI, 
							 xmlCharEncodingHandlerPtr encoder, 
							 int compression)
-
URI: 
encoder: 
compression: 
Returns: 


+

Signature for the function doing the lookup for a suitable output method corresponding to an URI.

`URI`:	the URI to write to
`encoder`:
`compression`:
`Returns`:	the new xmlOutputBufferPtr in case of success or NULL if no method was found.

Function: xmlParserInputBufferCreateFilenameDefault

xmlParserInputBufferCreateFilenameFunc	xmlParserInputBufferCreateFilenameDefault	(xmlParserInputBufferCreateFilenameFunc func)

Registers a callback for URI input file handling

`func`:	function pointer to the new ParserInputBufferCreateFilenameFunc
`Returns`:	the old value of the registration function

Function type: xmlParserInputBufferCreateFilenameFunc

Function type: xmlParserInputBufferCreateFilenameFunc
 xmlParserInputBufferPtr	xmlParserInputBufferCreateFilenameFunc	(const char * URI, 
							 xmlCharEncoding enc)
-

`URI`:
`enc`:
`Returns`:

Signature for the function doing the lookup for a suitable input method corresponding to an URI.

`URI`:	the URI to read from
`enc`:	the requested source encoding
`Returns`:	the new xmlParserInputBufferPtr in case of success or NULL if no method was found.

Function: xmlRegisterNodeDefault

xmlRegisterNodeFunc	xmlRegisterNodeDefault	(xmlRegisterNodeFunc func)

Registers a callback for node creation

`func`:	function pointer to the new RegisterNodeFunc
`Returns`:	the old value of the registration function

Function type: xmlRegisterNodeFunc

Function type: xmlRegisterNodeFunc
 void	xmlRegisterNodeFunc		(xmlNodePtr node)
-

node:

Signature for the registration callback of a created node

node: the current node

Function: xmlThrDefBufferAllocScheme

xmlBufferAllocationScheme	xmlThrDefBufferAllocScheme	(xmlBufferAllocationScheme v)

`v`:
`Returns`:

Function: xmlThrDefDefaultBufferSize

int	xmlThrDefDefaultBufferSize	(int v)

diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 82c6f8e..82dbf95 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -282,6 +282,9 @@ void	xmlParserInputDeallocate	(XML_PARSE_NOCDATA = 16384 : merge CDATA as text nodes
     XML_PARSE_NOXINCNODE = 32768 : do not generate XINCLUDE START/END nodes
     XML_PARSE_COMPACT = 65536 : compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
+    XML_PARSE_OLD10 = 131072 : parse using XML-1.0 before update 5
+    XML_PARSE_NOBASEFIX = 262144 : do not fixup XINCLUDE xml:base uris
+    XML_PARSE_HUGE = 524288 : relax any hardcoded limit from the parser
 }

Structure xmlSAXHandlerV1

Structure xmlSAXHandlerV1
struct _xmlSAXHandlerV1 {
     internalSubsetSAXFunc	internalSubset
diff --git a/doc/html/libxml-parserInternals.html b/doc/html/libxml-parserInternals.html
index 3c12a6a..ad1fb8e 100644
--- a/doc/html/libxml-parserInternals.html
+++ b/doc/html/libxml-parserInternals.html
@@ -92,7 +92,7 @@ void	xmlEntityReferenceFunc		(void	xmlParserHandleReference	(xmlParserCtxtPtr ctxt)

void	xmlParserInputShrink		(xmlParserInputPtr in)

xmlChar	xmlPopInput			(xmlParserCtxtPtr ctxt)

void	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)

int	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)

xmlChar *	xmlScanName		(xmlParserCtxtPtr ctxt)

void	xmlSetEntityReferenceFunc	(xmlEntityReferenceFunc func)

int	xmlSkipBlankChars		(xmlParserCtxtPtr ctxt)

@@ -140,7 +140,7 @@ void xmlEntityReferenceFunc (

`ctxt`:	an XML parser context
`Returns`:	the input just removed

Function: inputPush

Function: namePop

parse the XML version value. [26] VersionNum ::= '1.' [0-9]+ In practice allow [0-9].[0-9]+ at that level

Function: xmlParseXMLDecl

parse an XML declaration header [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>'

Function: xmlParserHandlePEReference

Function: xmlPopInput

xmlPopInput: the current input pointed by ctxt->input came to an end pop it and return the next char.

Function: xmlPushInput

Function type: xmlRelaxNGValidityWarningFunc

Function: xmlRelaxParserSetFlag

Semi private function used to pass informations to a parser context which are a combination of xmlRelaxNGParserFlag .

`reader`:	the xmlTextReaderPtr used
`Returns`:	the depth or -1 in case of error

`arg`:
`msg`:
`severity`:
`locator`:

`reader`:	the xmlTextReaderPtr used
`Returns`:	a node pointer valid until the next xmlTextReaderRead() call or NULL in case of error.

`ctxt`:	the expressions context
`exp`:	the englobing expression
`sub`:	the subexpression
`Returns`:	1 if true 0 if false and -1 in case of failure.

`exec`:
`token`:
`transdata`:
`inputdata`:

`URI`:	the URI reference under consideration
`base`:	the base value
`Returns`:	a new URI string (to be freed by the caller) or NULL in case error.

`URI`:	the URI instance found in the document
`base`:	the base value
`Returns`:	a new URI string (to be freed by the caller) or NULL in case of error.

`path`:	pointer to the path string
`Returns`:	0 or an error code

`str`:	the URI string to analyze
`Returns`:	a newly built xmlURIPtr or NULL in case of error

`str`:	the URI string to analyze
`raw`:	if 1 unescaping of URI pieces are disabled
`Returns`:	a newly built xmlURIPtr or NULL in case of error

`stream`:	a FILE* for the output
`uri`:	pointer to an xmlURI

`str`:	the string of the URI to escape
`Returns`:	an copy of the string, but escaped 25 May 2001 Uses xmlParseURI and xmlURIEscapeStr to try to escape correctly according to RFC2396. - Carl Douglas

`str`:	string to escape
`list`:	exception list string of chars not to escape
`Returns`:	a new escaped string or NULL in case of error.

`str`:	the string to unescape
`len`:	the length in bytes to unescape (or <= 0 to indicate full string)
`target`:	optional destination buffer
`Returns`:	an copy of the string, but unescaped

`ctxt`:	the schema validation context
`instance`:	the document instace tree
`Returns`:	0 in case of success, -1 in case of internal error and an error count otherwise.

`ctx`:	the validation context
`msg`:	the message
`...`:	extra arguments

`doc`:	the document
`elem`:	the parent
`name`:	the attribute name
`value`:	the attribute value
`Returns`:	a new normalized string if normalization is needed, NULL otherwise the caller must free the returned value.

`type`:	an attribute type
`value`:	an attribute value
`Returns`:	1 if valid or 0 otherwise

`fp`:	a FILE descriptor used as the output file, if NULL, the result is written to the file .memorylist
`nbBytes`:	the amount of memory to dump

`arg`:	the user argument
`msg`:	the message
`severity`:	the severity of the error
`locator`:	a locator indicating where the error occured

`exec`:	the regular expression context
`token`:	the current token string
`transdata`:	transition data
`inputdata`:	input data

`exec`:	a regexp execution context generating an error
`string`:	return value for the error string
`nbval`:	pointer to the number of accepted values IN/OUT
`nbneg`:	return number of negative transitions
`values`:	pointer to the array of acceptable values
`terminal`:	return value if this was a terminal state
`Returns`:	will be freed with the @exec context and don't need to be deallocated. Returns: 0 in case of success or -1 in case of error.

`ctxt`:	a XMl-Schema parser context
`err`:	the error callback result
`warn`:	the warning callback result
`ctx`:	contextual data for the callbacks result
`Returns`:	-1 in case of failure, 0 otherwise

`ctxt`:	a XML-Schema validation context
`err`:	the error function result
`warn`:	the warning function result
`ctx`:	the functions context result
`Returns`:	-1 in case of error and 0 otherwise

`doc`:	a preparsed document tree
`Returns`:	the parser context or NULL in case of error

+ uri +

Synopsis

Description

Details

Structure xmlURI

Typedef xmlURIPtr

Letter j:

Letter j:

A-B C-C D-E diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html index 561a743..b3c8364 100644 --- a/doc/APIchunk4.html +++ b/doc/APIchunk4.html @@ -200,6 +200,9 @@ A:link, A:visited, A:active { text-decoration: underline }

Letter W:

A-B C-C D-E diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html index 9e91cfa..c4d348c 100644 --- a/doc/APIconstructors.html +++ b/doc/APIconstructors.html @@ -79,6 +79,7 @@ A:link, A:visited, A:active { text-decoration: underline }

Type htmlParserCtxtPtr:

Type htmlStatus:

Type xmlNsPtr:

Type xmlDOMWrapCtxtPtr:

Type xmlDOMWrapCtxtPtr:

Type xmlXPathCompExprPtr:

Type xmlXPathContextPtr:

Letter M:

Letter S:

The XML C parser and toolkit of Gnome

DOM Principles

The XML C parser and toolkit of Gnome

DOM Principles

License(s)

Developercorner

Developer corner

The XML C parser and toolkit of Gnome

XML

The XML C parser and toolkit of Gnome

XML

The XML C parser and toolkit of Gnome

XSLT

The XML C parser and toolkit of Gnome

XSLT

The XML C parser and toolkit of Gnome

libxml2 architecture

The XML C parser and toolkit of Gnome

libxml2 architecture

The XML C parser and toolkit of Gnome

Reporting bugs and getting help

The XML C parser and toolkit of Gnome

Reporting bugs and getting help

How to create and maintaincatalogs:

How to create and maintain catalogs:

Initialization routines:

Preferences setup:

Querying routines:

Cleanup and Miscellaneous:

threaded environments:

Initialization routines:

Preferences setup:

Querying routines:

Cleanup and Miscellaneous:

threaded environments:

The XML C parser and toolkit of Gnome

Contributions

The XML C parser and toolkit of Gnome

Contributions

Structure xmlDOMWrapCtxt

Typedef xmlSAXLocatorPtr

Macro LIBXML_VERSION

Macro LIBXML_VERSION_EXTRA

Macro LIBXML_VERSION_STRING

Macro LIBXML_WRITER_ENABLED

Macro LIBXML_XPTR_ENABLED

Macro LIBXML_ZLIB_ENABLED

Macro WITHOUT_TRIO

The XML C parser and toolkit of Gnome

Developer Menu

The XML C parser and toolkit of Gnome

Developer Menu

The XML C parser and toolkit of Gnome

Downloads

The XML C parser and toolkit of Gnome

Downloads

The XML C parser and toolkit of Gnome

Encodings support

The XML C parser and toolkit of Gnome

Encodings support

`buffer`:	a pointer to a char array containing the schemas
`size`:	the size of the array
`Returns`:	the parser context or NULL in case of error

`URL`:	the location of the schema
`Returns`:	the parser context or NULL in case of error

`schema`:	a precompiled XML Schemas
`Returns`:	the validation context or NULL in case of error

`ctxt`:	a schema validation context
`Returns`:	the internal XML Schema structure built from the resource or NULL in case of error

`ctxt`:	a schema validation context
`sax`:	a pointer to the original xmlSAXHandlerPtr
`user_data`:	a pointer to the original SAX user data pointer
`Returns`:	a pointer to a data structure needed to unplug the validation layer or NULL in case of errors.

`plug`:	a data structure returned by xmlSchemaSAXPlug
`Returns`:	0 in case of success and -1 in case of failure.

`ctxt`:	a schema parser context
`serror`:	the structured error function
`ctx`:	the functions context

`ctxt`:
`input`:
`enc`:
`sax`:
`user_data`:
`Returns`:

`ctxt`:	a schema validation context
`filename`:	the URI of the instance
`options`:	a future set of options, currently unused
`Returns`:	0 if the document is valid, a positive error code number otherwise and -1 in case of an internal or API error.