From 968041a8b2ec86c39b5074024ce97d136ecd9a95 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 26 Oct 2006 11:17:37 +0200 Subject: Load /tmp/libxml2-2.6.27 into libxml2/branches/upstream/current. --- ChangeLog | 442 +++ HTMLparser.c | 245 +- HTMLtree.c | 10 +- Makefile.in | 3 + NEWS | 68 + SAX2.c | 15 +- aclocal.m4 | 15 +- configure | 185 +- configure.in | 8 +- doc/APIchunk0.html | 4 +- doc/APIchunk1.html | 4 +- doc/APIchunk10.html | 9 +- doc/APIchunk11.html | 3 +- doc/APIchunk12.html | 32 +- doc/APIchunk13.html | 3 +- doc/APIchunk14.html | 10 +- doc/APIchunk15.html | 6 + doc/APIchunk16.html | 1 + doc/APIchunk17.html | 11 +- doc/APIchunk18.html | 6 +- doc/APIchunk19.html | 2 +- doc/APIchunk2.html | 1 + doc/APIchunk20.html | 13 +- doc/APIchunk21.html | 4 +- doc/APIchunk22.html | 2 + doc/APIchunk23.html | 5 +- doc/APIchunk24.html | 6 +- doc/APIchunk25.html | 8 +- doc/APIchunk26.html | 2 +- doc/APIchunk27.html | 5 +- doc/APIchunk28.html | 10 +- doc/APIchunk3.html | 3 +- doc/APIchunk4.html | 32 +- doc/APIchunk5.html | 1 - doc/APIchunk7.html | 1 - doc/APIchunk8.html | 1 + doc/APIchunk9.html | 10 +- doc/APIconstructors.html | 3 + doc/APIfiles.html | 7 + doc/APIfunctions.html | 10 +- doc/APIsymbols.html | 7 + doc/DOM.html | 16 +- doc/FAQ.html | 333 +-- doc/Makefile.in | 3 + doc/XMLinfo.html | 33 +- doc/XSLT.html | 9 +- doc/apibuild.py | 1 + doc/architecture.html | 7 +- doc/bugs.html | 118 +- doc/catalog.html | 324 +-- doc/contribs.html | 53 +- doc/devhelp/Makefile.in | 3 + doc/devhelp/libxml2-HTMLparser.html | 5 + doc/devhelp/libxml2-parser.html | 5 +- doc/devhelp/libxml2-tree.html | 22 +- doc/devhelp/libxml2-uri.html | 5 + doc/devhelp/libxml2-xinclude.html | 5 + doc/devhelp/libxml2-xmlsave.html | 2 +- doc/devhelp/libxml2-xmlversion.html | 9 +- doc/devhelp/libxml2-xpath.html | 11 +- doc/devhelp/libxml2.devhelp | 7 + doc/docs.html | 35 +- doc/downloads.html | 42 +- doc/encoding.html | 312 +-- doc/entities.html | 74 +- doc/example.html | 70 +- doc/examples/Makefile.am | 1 + doc/examples/Makefile.in | 4 + doc/help.html | 26 +- doc/html/index.html | 13 - doc/html/libxml-HTMLparser.html | 5 +- doc/html/libxml-parser.html | 5 +- doc/html/libxml-tree.html | 25 +- doc/html/libxml-uri.html | 5 +- doc/html/libxml-xinclude.html | 5 +- doc/html/libxml-xmlsave.html | 2 +- doc/html/libxml-xmlversion.html | 7 +- doc/html/libxml-xpath.html | 7 +- doc/index.html | 109 +- doc/interface.html | 35 +- doc/intro.html | 40 +- doc/library.html | 137 +- doc/libxml2-api.xml | 90 +- doc/libxml2.xsa | 17 +- doc/namespaces.html | 70 +- doc/news.html | 1730 ++++++------ doc/python.html | 247 +- doc/threads.html | 23 +- doc/tree.html | 32 +- doc/upgrade.html | 188 +- doc/xml.html | 5046 ++++++++++++++++++----------------- doc/xmlcatalog.1 | 62 +- doc/xmlcatalog_man.xml | 79 +- doc/xmldtd.html | 154 +- doc/xmlio.html | 123 +- doc/xmllint.1 | 89 +- doc/xmllint.xml | 116 +- doc/xmlmem.html | 166 +- encoding.c | 6 + entities.c | 11 +- example/Makefile.in | 3 + include/Makefile.in | 3 + include/libxml/HTMLparser.h | 3 + include/libxml/Makefile.in | 3 + include/libxml/entities.h | 1 + include/libxml/parser.h | 5 +- include/libxml/tree.h | 51 +- include/libxml/uri.h | 2 + include/libxml/xinclude.h | 4 + include/libxml/xmlversion.h | 23 +- include/libxml/xmlversion.h.in | 13 +- include/libxml/xpath.h | 6 +- libxml-2.0.pc.in | 3 +- libxml2.spec | 6 +- ltmain.sh | 162 +- parser.c | 197 +- parserInternals.c | 1 + python/Makefile.am | 2 +- python/Makefile.in | 5 +- python/generator.py | 2 +- python/libxml.c | 36 + python/libxml.py | 30 +- python/libxml2-py.c | 38 +- python/setup.py | 2 +- python/tests/Makefile.am | 3 +- python/tests/Makefile.in | 6 +- python/tests/compareNodes.py | 50 + python/types.c | 112 + relaxng.c | 2 + runtest.c | 21 +- testapi.c | 170 +- threads.c | 4 +- tree.c | 668 +++-- uri.c | 58 +- valid.c | 22 +- xinclude.c | 30 +- xmlIO.c | 494 ++-- xmllint.c | 121 +- xmlmemory.c | 6 +- xmlregexp.c | 7 +- xmlsave.c | 112 +- xmlschemas.c | 313 ++- xmlschemastypes.c | 14 +- xmlwriter.c | 11 +- xpath.c | 2298 +++++++++------- xstc/Makefile.am | 22 +- xstc/Makefile.in | 25 +- 147 files changed, 9627 insertions(+), 6935 deletions(-) delete mode 100644 doc/html/index.html create mode 100755 python/tests/compareNodes.py diff --git a/ChangeLog b/ChangeLog index f6b31ef..11098d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,445 @@ +Fri Oct 20 14:55:47 CEST 2006 Daniel Veillard + + * tree.c: fix comment for xmlDocSetRootElement c.f. #351981 + * xmllint.c: order XPath elements when using --shell + +Tue Oct 17 23:23:26 CEST 2006 Daniel Veillard + + * xmlregexp.c: applied fix from Christopher Boumenot for bug + #362714 on regexps missing ']' + +Tue Oct 17 22:32:42 CEST 2006 Daniel Veillard + + * parserInternals.c: applied patch from Marius Konitzer to avoid + leaking in xmlNewInputFromFile() in case of HTTP redirection + +Tue Oct 17 22:19:02 CEST 2006 Daniel Veillard + + * HTMLparser.c: fix one problem found in htmlCtxtUseOptions() + and pointed in #340591 + +Tue Oct 17 22:04:31 CEST 2006 Daniel Veillard + + * HTMLparser.c: fixed teh 2 stupid bugs affecting htmlReadDoc() and + htmlReadIO() this should fix #340322 + +Tue Oct 17 21:39:23 CEST 2006 Daniel Veillard + + * xpath.c: applied patch from Olaf Walkowiak which should fix #334104 + +Tue Oct 17 18:12:34 CEST 2006 Daniel Veillard + + * HTMLparser.c: fixing HTML minimized attribute values to be generated + internally if not present, fixes bug #332124 + * result/HTML/doc2.htm.sax result/HTML/doc3.htm.sax + result/HTML/wired.html.sax: this affects the SAX event strem for + a few test cases + +Tue Oct 17 17:56:31 CEST 2006 Daniel Veillard + + * HTMLparser.c: fixing HTML entities in attributes parsing bug #362552 + * result/HTML/entities2.html* test/HTML/entities2.html: added to + the regression suite + +Tue Oct 17 01:21:37 CEST 2006 Daniel Veillard + + * xmllint.c: started to switch xmllint to use xmlSaveDoc to test + #342556 + * xmlsave.c: fixed #342556 easy and a whole set of problems with + encodings, BOM and xmlSaveDoc() + +Mon Oct 16 15:14:53 CEST 2006 Daniel Veillard + + * HTMLparser.c: fix #348252 if the document clains to be in a + different encoding in the meta tag and it's obviously wrong, + don't screw up the end of the content. + +Mon Oct 16 11:32:09 CEST 2006 Daniel Veillard + + * HTMLparser.c: fix a chunking and script bug #347708 + +Mon Oct 16 09:51:05 CEST 2006 Daniel Veillard + + * HTMLparser.c: remove a warning + * encoding.c: check with uppercase for AIX iconv() should fix #352644 + * doc/examples/Makefile.am: partially handle one bug report + +Sun Oct 15 22:31:42 CEST 2006 Daniel Veillard + + * parser.c: fix the patch for unreproductable #343000 but + also fix a line/column keeping error + * result/errors/attr1.xml.err result/errors/attr2.xml.err + result/errors/name.xml.err result/errors/name2.xml.err + result/schemas/anyAttr-processContents-err1_0_0.err + result/schemas/bug312957_1_0.err: affected lines in error output + of the regression tests + +Sat Oct 14 10:46:46 CEST 2006 Daniel Veillard + + * tree.c: fixing bug #344390 with xmlReconciliateNs + +Sat Oct 14 00:31:49 CEST 2006 Daniel Veillard + + * xmllint.c: added --html --memory to test htmlReadMemory to + test #321632 + * HTMLparser.c: added various initialization calls which may help + #321632 but not conclusive + * testapi.c tree.c include/libxml/tree.h: fixed compilation with + --with-minimum --with-sax1 and --with-minimum --with-schemas + fixing #326442 + +Fri Oct 13 18:30:55 CEST 2006 Daniel Veillard + + * relaxng.c: fix a Relax-NG bug related to element content processing, + fixes bug #302836 + * test/relaxng/302836.rng test/relaxng/302836_0.xml + result/relaxng/302836*: added to regression tests + +Fri Oct 13 14:42:44 CEST 2006 Daniel Veillard + + * parser.c: fix a problem in xmlSplitQName resulting in bug #334669 + +Fri Oct 13 12:27:22 CEST 2006 Daniel Veillard + + * parser.c: fixed xmlIOParseDTD handling of @input in error case, + Should fix #335085 + * testapi.c: reset the http_proxy env variable to not waste time + on regression tests + +Thu Oct 12 23:07:43 CEST 2006 Rob Richards + + * xmlIO.c: fix Windows compile - missing xmlWrapOpen. + +Thu Oct 12 18:21:18 CEST 2006 Daniel Veillard + + * parser.c: fixed the heuristic used when trying to detect mixed-content + elememts if the parser wants to treat ignorable whitespaces + in a non-standard way, should fix bug #300263 + +Thu Oct 12 14:52:38 CEST 2006 Daniel Veillard + + * parser.c: fix a first arg error in SAX callback pointed out by + Mike Hommey, and another one still hanging around. Should fix #342737 + +Wed Oct 11 23:11:58 CEST 2006 Daniel Veillard + + * include/libxml/xmlversion.h.in: fix comment on versions + * xmlmemory.c: do not spend too much time digging in dumped memory + +Wed Oct 11 18:40:00 CEST 2006 Daniel Veillard + + * valid.c: fixed a weird error where validity context whould not + show up if warnings were disabled pointed out by Bob Stayton + * xmlIO.c doc/generator.py: cleanup and fix to regenerate the docs + * doc//* testapi.c: rebuilt the docs + +Wed Oct 11 14:32:00 CEST 2006 Daniel Veillard + + * libxml-2.0.pc.in: applied patch from Mikhail Zabaluev to separate + library flags for shared and static builds, fixes #344594. If this + bites you, use xml2-config. + +Wed Oct 11 11:27:37 CEST 2006 Daniel Veillard + + * python/Makefile.am: remove the build path recorded in the python + shared module as Peter Breitenlohner pointed out, should fix #346022 + +Wed Oct 11 11:14:51 CEST 2006 Daniel Veillard + + * xmlIO.c: applied patch from Mikhail Zabaluev fixing the conditions + of unescaping from URL to filepath, should fix #344588. + +Wed Oct 11 10:24:58 CEST 2006 Daniel Veillard + + * configure.in xstc/Makefile.am: applied patch from Peter Breitenlohner + for wget detection and fix of a Python path problem, should fix + #340993 + +Tue Oct 10 22:02:29 CEST 2006 Daniel Veillard + + * include/libxml/entities.h entities.c SAX2.c parser.c: trying to + fix entities behaviour when using SAX, had to extend entities + content and hack on the entities processing code, but that should + fix the long standing bug #159219 + +Tue Oct 10 14:36:18 CEST 2006 Daniel Veillard + + * uri.c include/libxml/uri.h: add a new function xmlPathToUri() + to provide a clean conversion when setting up a base + * SAX2.c tree.c: use said function when setting up doc->URL + or using the xmlSetBase function. Should fix #346261 + +Tue Oct 10 11:05:59 CEST 2006 Daniel Veillard + + * xmlIO.c: applied a portability patch from Emelyanov Alexey + +Tue Oct 10 10:52:01 CEST 2006 Daniel Veillard + + * parser.c: applied and slightly modified a patch from Michael Day to + keep _private in the parser context when parsing external entities + +Tue Oct 10 10:33:43 CEST 2006 Daniel Veillard + + * python/libxml.py python/types.c: applied patch from Ross Reedstrom, + Brian West and Stefan Anca to add XPointer suport to the Python bindings + +Fri Sep 29 11:13:59 CEST 2006 Daniel Veillard + + * xmlsave.c: fixed a comment + * xinclude.c include/libxml/xinclude.h: applied a patch from Michael Day + to add a new function providing the _private field for the generated + parser contexts xmlXIncludeProcessFlagsData() + +Thu Sep 21 10:36:11 CEST 2006 Daniel Veillard + + * xmlIO.c: applied patch from Michael Day doing some refactoring + for the catalog entity loaders. + +Thu Sep 21 08:53:06 CEST 2006 Daniel Veillard + + * HTMLparser.c include/libxml/HTMLparser.h: exports htmlNewParserCtxt() + as Michael Day pointed out this is needed to use htmlCtxtRead*() + +Tue Sep 19 14:42:59 CEST 2006 Daniel Veillard + + * parser.c: applied patch from Ben Darnell on #321545, I could not + reproduce the problem but 1/ this is safe 2/ it's better to be safe. + +Sat Sep 16 16:02:23 CEST 2006 Rob Richards + + * tree.c: xmlTextConcat works with comments and PI nodes (bug #355962). + * parser.c: fix resulting tree corruption when using XML namespace + with existing doc in xmlParseBalancedChunkMemoryRecover. + +Fri Sep 1 11:52:55 CEST 2006 Daniel Veillard + + * xmlIO.c: another patch from Emelyanov Alexey to clean up a few things + in the previous patch. + +Wed Aug 30 15:10:09 CEST 2006 Daniel Veillard + + * xmlIO.c: applied patch from Roland Schwingel to fix the problem + with file names in UTF-8 on Windows, and compat on older win9x + versions. + +Tue Aug 22 16:51:22 CEST 2006 Daniel Veillard + + * valid.c: fixed a bug #203125 in Red hat bugzilla, crashing PHP4 + on validation errors, the heuristic to guess is a vctxt user + pointer is the parsing context was insufficient. + +Mon Aug 21 10:40:10 CEST 2006 Daniel Veillard + + * doc/xmlcatalog.1 doc/xmlcatalog_man.xml doc/xmllint.1 doc/xmllint.xml: + applied patch to man pages from Daniel Leidert and regenerated + +Thu Aug 17 00:48:31 CEST 2006 Rob Richards + + * xmlwriter.c: Add a document to the xmlwriter structure and + pass document when writing attribute content for encoding support. + +Wed Aug 16 01:15:12 CEST 2006 Rob Richards + + * HTMLtree.c xmlsave.c: Add linefeeds to error messages allowing + for consistant handling. + +Tue Aug 15 15:02:18 CEST 2006 Kasimier Buchcik + + * xpath.c: Applied the proposed fix for the documentation + of xmlXPathCastToString(); see bug #346202. + +Tue Aug 15 14:49:18 CEST 2006 Kasimier Buchcik + + * xmlschemas.c: While investigating bug #350247, I noticed + that xmlSchemaIDCMatcher structs are massively recreated + although only a maximum of 3 structs is used at the same + time; added a cache for those structures to the + validation context. + +Sat Aug 12 16:12:53 CEST 2006 Daniel Veillard + + * xmlschemas.c: applied patch from Marton Illes to fix an allocation + bug in xmlSchemaXPathEvaluate should close #351032 + +Mon Aug 7 13:08:46 CEST 2006 Daniel Veillard + + * xmlschemas.c: applied patch from Bertrand Fritsch to fix a bug in + xmlSchemaClearValidCtxt + +Fri Aug 4 14:50:41 CEST 2006 Daniel Veillard + + * python/generator.py: fixed the conversion of long parameters + +Thu Jul 13 15:03:11 CEST 2006 Kasimier Buchcik + + * xmlsave.c: Removed the automatic generation of CDATA sections + for the content of the "script" and "style" elements when + serializing XHTML. The issue was reported by Vincent Lefevre, + bug #345147. + * result/xhtml1 result/noent/xhtml1: Adjusted regression test + results due to the serialization change described above. + +Thu Jul 13 08:32:21 CEST 2006 Daniel Veillard + + * configure.in parser.c xmllint.c include/libxml/parser.h + include/libxml/xmlversion.h.in: applied patch from Andrew W. Nosenko + to expose if zlib support was compiled in, in the header, in the + feature API and in the xmllint --version output. + +Thu Jul 13 08:24:14 CEST 2006 Daniel Veillard + + * SAX2.c: refactor to use normal warnings for entities problem + and not straight SAX callbacks. + +Wed Jul 12 17:13:03 CEST 2006 Kasimier Buchcik + + * xmlschemas.c: Fixed bug #347316, reported by David Belius: + The simple type, which was the content type definition + of a complex type, which in turn was the base type of a + extending complex type, was missed to be set on this + extending complex type in the derivation machinery. + +Mon Jul 3 13:36:43 CEST 2006 Kasimier Buchcik + + * xpath.c: Changed xmlXPathCollectAndTest() to use + xmlXPathNodeSetAddNs() when adding a ns-node in case of + NODE_TEST_TYPE (the ns-node was previously added plainly + to the list). Since for NODE_TEST_ALL and NODE_TEST_NAME + this specialized ns-addition function was already used, + I assume it was missed to be used with NODE_TEST_TYPE. + +Mon Jul 3 10:57:33 CEST 2006 Daniel Veillard + + * HTMLparser.c: applied const'ification of strings patch from + Matthias Clasen + +Thu Jun 29 13:51:12 CEST 2006 Daniel Veillard + + * threads.c: patch from Andrew W. Nosenko, xmlFreeRMutex forgot to + destroy the condition associated to the mutex. + +Thu Jun 29 12:48:00 CEST 2006 Kasimier Buchcik + + * xpath.c: Fixed a double-free in xmlXPathCompOpEvalToBoolean(), + revealed by a Libxslt regression test. + +Thu Jun 29 12:28:07 CEST 2006 Kasimier Buchcik + + * xpath.c: Enhanced xmlXPathCompOpEvalToBoolean() to be also + usable outside predicate evaluation; the intention is to + use it via xmlXPathCompiledEvalToBoolean() for XSLT tests, + like in . + +Wed Jun 28 19:11:16 CEST 2006 Kasimier Buchcik + + * xpath.c: Fix a memory leak which occurred when using + xmlXPathCompiledEvalToBoolean(). + +Mon Jun 26 17:24:28 UTC 2006 William Brack + + * python/libxml.c, python/libxml.py, python/tests/compareNodes.py, + python/tests/Makefile.am: + Added code submitted by Andreas Pakulat to provide node + equality, inequality and hash functions, plus a single + test program to check the functions (bugs 345779 + 345961). + +Mon Jun 26 18:38:51 CEST 2006 Kasimier Buchcik + + * xpath.c: Added xmlXPathCompiledEvalToBoolean() to the API and + adjusted/added xmlXPathRunEval(), xmlXPathRunStreamEval(), + xmlXPathCompOpEvalToBoolean(), xmlXPathNodeCollectAndTest() + to be aware of a boolean result request. The new function + is now used to evaluate predicates. + +Mon Jun 26 16:22:50 CEST 2006 Kasimier Buchcik + + * xpath.c: Fixed an bug in xmlXPathCompExprAdd(): the newly + introduced field @rewriteType on xmlXPathStepOp was not + initialized to zero here; this could lead to the activation + of the axis rewrite code in xmlXPathNodeCollectAndTest() when + @rewriteType is randomly set to the value 1. A test + (hardcoding the intial value to 1) revealed that the + resulting incorrect behaviour is similar to the behaviour + as described by Arnold Hendriks on the mailing list; so I + hope that will fix the issue. + +Fri Jun 23 18:26:08 CEST 2006 Kasimier Buchcik + + * xpath.c: Fixed an error in xmlXPathEvalExpr(), which + was introduced with the addition of the d-o-s rewrite + and made xpath.c unable to compile if XPATH_STREAMING + was not defined (reported by Kupriyanov Anatolij - + #345752). Fixed the check for d-o-s rewrite + to work on the correct XPath string, which is ctxt->base + and not comp->expr in this case. + +Mon Jun 19 12:23:41 CEST 2006 Kasimier Buchcik + + * xpath.c: Added optimization for positional predicates + (only short-hand form "[n]"), which have a preceding + predicate: "/foo[descendant::bar][3]". + +Sun Jun 18 20:59:02 EDT 2006 Daniel Veillard + + * parser.c: try to fix the crash raised by the parser in + recover mode as pointed by Ryan Phillips + +Sun Jun 18 18:44:56 EDT 2006 Daniel Veillard + + * python/types.c: patch from Nic Ferrier to provide a better type + mapping from XPath to python + +Sun Jun 18 18:35:50 EDT 2006 Daniel Veillard + + * runtest.c: applied patch from Boz for VMS and reporting + Schemas errors. + +Sun Jun 18 18:22:25 EDT 2006 Daniel Veillard + + * testapi.c: applied patch from Felipe Contreras when compiling + with --with-minimum + +Fri Jun 16 21:37:44 CEST 2006 Kasimier Buchcik + + * tree.c include/libxml/tree.h: Fixed a bug in + xmlDOMWrapAdoptNode(); the tree traversal stopped if the + very first given node had an attribute node :-( This was due + to a missed check in the traversal mechanism. + Expanded the xmlDOMWrapCtxt: it now holds the namespace map + used in xmlDOMWrapAdoptNode() and xmlDOMWrapCloneNode() for + reusal; so the map-items don't need to be created for every + cloning/adoption. Added a callback function to it for + retrieval of xmlNsPtr to be set on node->ns; this is needed + for my custom handling of ns-references in my DOM wrapper. + Substituted code which created the XML namespace decl on + the doc for a call to xmlTreeEnsureXMLDecl(). Removed + those nastly "warnigns" from the docs of the clone/adopt + functions; they work fine on my side. + +Mon Jun 12 13:23:11 CEST 2006 Kasimier Buchcik + + * result/pattern/namespaces: Adjusted the result of a + regression test, since the fix of xmlGetNodePath() revealed a + bug in this test result. + +Mon Jun 12 13:06:03 CEST 2006 Kasimier Buchcik + + * tree.c: Got rid of a compiler warning in xmlGetNodePath(). + +Mon Jun 12 12:54:25 CEST 2006 Kasimier Buchcik + + * tree.c: Fixed xmlGetNodePath() to generate the node test "*" + for elements in the default namespace, rather than generating + an unprefixed named node test and loosing the namespace + information. + +Fri Jun 9 21:45:02 CEST 2006 Kasimier Buchcik + + * include/libxml/parser.h: Clarified in the docs that the tree + must not be tried to be modified if using the parser flag + XML_PARSE_COMPACT as suggested by Stefan Behnel + (#344390). + Tue Jun 6 17:50:43 CEST 2006 Daniel Veillard * configure.ini NEWS doc//* libxml.spec.in : preparing release of 2.6.26 diff --git a/HTMLparser.c b/HTMLparser.c index 2e646ad..5e23ad7 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -493,11 +493,11 @@ htmlSkipBlankChars(xmlParserCtxtPtr ctxt) { #define EMPTY NULL -static const char* html_flow[] = { FLOW, NULL } ; -static const char* html_inline[] = { INLINE, NULL } ; +static const char* const html_flow[] = { FLOW, NULL } ; +static const char* const html_inline[] = { INLINE, NULL } ; /* placeholders: elts with content but no subelements */ -static const char* html_pcdata[] = { NULL } ; +static const char* const html_pcdata[] = { NULL } ; #define html_cdata html_pcdata @@ -516,103 +516,104 @@ static const char* html_pcdata[] = { NULL } ; #define CELLVALIGN "valign" #define NB_CELLVALIGN 1 -static const char* html_attrs[] = { ATTRS, NULL } ; -static const char* core_i18n_attrs[] = { COREATTRS, I18N, NULL } ; -static const char* core_attrs[] = { COREATTRS, NULL } ; -static const char* i18n_attrs[] = { I18N, NULL } ; +static const char* const html_attrs[] = { ATTRS, NULL } ; +static const char* const core_i18n_attrs[] = { COREATTRS, I18N, NULL } ; +static const char* const core_attrs[] = { COREATTRS, NULL } ; +static const char* const i18n_attrs[] = { I18N, NULL } ; /* Other declarations that should go inline ... */ -static const char* a_attrs[] = { ATTRS, "charset", "type", "name", +static const char* const a_attrs[] = { ATTRS, "charset", "type", "name", "href", "hreflang", "rel", "rev", "accesskey", "shape", "coords", "tabindex", "onfocus", "onblur", NULL } ; -static const char* target_attr[] = { "target", NULL } ; -static const char* rows_cols_attr[] = { "rows", "cols", NULL } ; -static const char* alt_attr[] = { "alt", NULL } ; -static const char* src_alt_attrs[] = { "src", "alt", NULL } ; -static const char* href_attrs[] = { "href", NULL } ; -static const char* clear_attrs[] = { "clear", NULL } ; -static const char* inline_p[] = { INLINE, "p", NULL } ; -static const char* flow_param[] = { FLOW, "param", NULL } ; -static const char* applet_attrs[] = { COREATTRS , "codebase", +static const char* const target_attr[] = { "target", NULL } ; +static const char* const rows_cols_attr[] = { "rows", "cols", NULL } ; +static const char* const alt_attr[] = { "alt", NULL } ; +static const char* const src_alt_attrs[] = { "src", "alt", NULL } ; +static const char* const href_attrs[] = { "href", NULL } ; +static const char* const clear_attrs[] = { "clear", NULL } ; +static const char* const inline_p[] = { INLINE, "p", NULL } ; + +static const char* const flow_param[] = { FLOW, "param", NULL } ; +static const char* const applet_attrs[] = { COREATTRS , "codebase", "archive", "alt", "name", "height", "width", "align", "hspace", "vspace", NULL } ; -static const char* area_attrs[] = { "shape", "coords", "href", "nohref", +static const char* const area_attrs[] = { "shape", "coords", "href", "nohref", "tabindex", "accesskey", "onfocus", "onblur", NULL } ; -static const char* basefont_attrs[] = +static const char* const basefont_attrs[] = { "id", "size", "color", "face", NULL } ; -static const char* quote_attrs[] = { ATTRS, "cite", NULL } ; -static const char* body_contents[] = { FLOW, "ins", "del", NULL } ; -static const char* body_attrs[] = { ATTRS, "onload", "onunload", NULL } ; -static const char* body_depr[] = { "background", "bgcolor", "text", +static const char* const quote_attrs[] = { ATTRS, "cite", NULL } ; +static const char* const body_contents[] = { FLOW, "ins", "del", NULL } ; +static const char* const body_attrs[] = { ATTRS, "onload", "onunload", NULL } ; +static const char* const body_depr[] = { "background", "bgcolor", "text", "link", "vlink", "alink", NULL } ; -static const char* button_attrs[] = { ATTRS, "name", "value", "type", +static const char* const button_attrs[] = { ATTRS, "name", "value", "type", "disabled", "tabindex", "accesskey", "onfocus", "onblur", NULL } ; -static const char* col_attrs[] = { ATTRS, "span", "width", CELLHALIGN, CELLVALIGN, NULL } ; -static const char* col_elt[] = { "col", NULL } ; -static const char* edit_attrs[] = { ATTRS, "datetime", "cite", NULL } ; -static const char* compact_attrs[] = { ATTRS, "compact", NULL } ; -static const char* dl_contents[] = { "dt", "dd", NULL } ; -static const char* compact_attr[] = { "compact", NULL } ; -static const char* label_attr[] = { "label", NULL } ; -static const char* fieldset_contents[] = { FLOW, "legend" } ; -static const char* font_attrs[] = { COREATTRS, I18N, "size", "color", "face" , NULL } ; -static const char* form_contents[] = { HEADING, LIST, INLINE, "pre", "p", "div", "center", "noscript", "noframes", "blockquote", "isindex", "hr", "table", "fieldset", "address", NULL } ; -static const char* form_attrs[] = { ATTRS, "method", "enctype", "accept", "name", "onsubmit", "onreset", "accept-charset", NULL } ; -static const char* frame_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "noresize", "scrolling" , NULL } ; -static const char* frameset_attrs[] = { COREATTRS, "rows", "cols", "onload", "onunload", NULL } ; -static const char* frameset_contents[] = { "frameset", "frame", "noframes", NULL } ; -static const char* head_attrs[] = { I18N, "profile", NULL } ; -static const char* head_contents[] = { "title", "isindex", "base", "script", "style", "meta", "link", "object", NULL } ; -static const char* hr_depr[] = { "align", "noshade", "size", "width", NULL } ; -static const char* version_attr[] = { "version", NULL } ; -static const char* html_content[] = { "head", "body", "frameset", NULL } ; -static const char* iframe_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "scrolling", "align", "height", "width", NULL } ; -static const char* img_attrs[] = { ATTRS, "longdesc", "name", "height", "width", "usemap", "ismap", NULL } ; -static const char* 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* prompt_attrs[] = { COREATTRS, I18N, "prompt", NULL } ; -static const char* label_attrs[] = { ATTRS, "for", "accesskey", "onfocus", "onblur", NULL } ; -static const char* legend_attrs[] = { ATTRS, "accesskey", NULL } ; -static const char* align_attr[] = { "align", NULL } ; -static const char* link_attrs[] = { ATTRS, "charset", "href", "hreflang", "type", "rel", "rev", "media", NULL } ; -static const char* map_contents[] = { BLOCK, "area", NULL } ; -static const char* name_attr[] = { "name", NULL } ; -static const char* action_attr[] = { "action", NULL } ; -static const char* blockli_elt[] = { BLOCK, "li", NULL } ; -static const char* meta_attrs[] = { I18N, "http-equiv", "name", "scheme", NULL } ; -static const char* content_attr[] = { "content", NULL } ; -static const char* type_attr[] = { "type", NULL } ; -static const char* noframes_content[] = { "body", FLOW MODIFIER, NULL } ; -static const char* object_contents[] = { FLOW, "param", NULL } ; -static const char* object_attrs[] = { ATTRS, "declare", "classid", "codebase", "data", "type", "codetype", "archive", "standby", "height", "width", "usemap", "name", "tabindex", NULL } ; -static const char* object_depr[] = { "align", "border", "hspace", "vspace", NULL } ; -static const char* ol_attrs[] = { "type", "compact", "start", NULL} ; -static const char* option_elt[] = { "option", NULL } ; -static const char* optgroup_attrs[] = { ATTRS, "disabled", NULL } ; -static const char* option_attrs[] = { ATTRS, "disabled", "label", "selected", "value", NULL } ; -static const char* param_attrs[] = { "id", "value", "valuetype", "type", NULL } ; -static const char* width_attr[] = { "width", NULL } ; -static const char* pre_content[] = { PHRASE, "tt", "i", "b", "u", "s", "strike", "a", "br", "script", "map", "q", "span", "bdo", "iframe", NULL } ; -static const char* script_attrs[] = { "charset", "src", "defer", "event", "for", NULL } ; -static const char* language_attr[] = { "language", NULL } ; -static const char* select_content[] = { "optgroup", "option", NULL } ; -static const char* select_attrs[] = { ATTRS, "name", "size", "multiple", "disabled", "tabindex", "onfocus", "onblur", "onchange", NULL } ; -static const char* style_attrs[] = { I18N, "media", "title", NULL } ; -static const char* table_attrs[] = { ATTRS "summary", "width", "border", "frame", "rules", "cellspacing", "cellpadding", "datapagesize", NULL } ; -static const char* table_depr[] = { "align", "bgcolor", NULL } ; -static const char* table_contents[] = { "caption", "col", "colgroup", "thead", "tfoot", "tbody", "tr", NULL} ; -static const char* tr_elt[] = { "tr", NULL } ; -static const char* talign_attrs[] = { ATTRS, CELLHALIGN, CELLVALIGN, NULL} ; -static const char* th_td_depr[] = { "nowrap", "bgcolor", "width", "height", NULL } ; -static const char* th_td_attr[] = { ATTRS, "abbr", "axis", "headers", "scope", "rowspan", "colspan", CELLHALIGN, CELLVALIGN, NULL } ; -static const char* textarea_attrs[] = { ATTRS, "name", "disabled", "readonly", "tabindex", "accesskey", "onfocus", "onblur", "onselect", "onchange", NULL } ; -static const char* tr_contents[] = { "th", "td", NULL } ; -static const char* bgcolor_attr[] = { "bgcolor", NULL } ; -static const char* li_elt[] = { "li", NULL } ; -static const char* ul_depr[] = { "type", "compact", NULL} ; -static const char* dir_attr[] = { "dir", NULL} ; +static const char* const col_attrs[] = { ATTRS, "span", "width", CELLHALIGN, CELLVALIGN, NULL } ; +static const char* const col_elt[] = { "col", NULL } ; +static const char* const edit_attrs[] = { ATTRS, "datetime", "cite", NULL } ; +static const char* const compact_attrs[] = { ATTRS, "compact", NULL } ; +static const char* const dl_contents[] = { "dt", "dd", NULL } ; +static const char* const compact_attr[] = { "compact", NULL } ; +static const char* const label_attr[] = { "label", NULL } ; +static const char* const fieldset_contents[] = { FLOW, "legend" } ; +static const char* const font_attrs[] = { COREATTRS, I18N, "size", "color", "face" , NULL } ; +static const char* const form_contents[] = { HEADING, LIST, INLINE, "pre", "p", "div", "center", "noscript", "noframes", "blockquote", "isindex", "hr", "table", "fieldset", "address", NULL } ; +static const char* const form_attrs[] = { ATTRS, "method", "enctype", "accept", "name", "onsubmit", "onreset", "accept-charset", NULL } ; +static const char* const frame_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "noresize", "scrolling" , NULL } ; +static const char* const frameset_attrs[] = { COREATTRS, "rows", "cols", "onload", "onunload", NULL } ; +static const char* const frameset_contents[] = { "frameset", "frame", "noframes", NULL } ; +static const char* const head_attrs[] = { I18N, "profile", NULL } ; +static const char* const head_contents[] = { "title", "isindex", "base", "script", "style", "meta", "link", "object", NULL } ; +static const char* const hr_depr[] = { "align", "noshade", "size", "width", NULL } ; +static const char* const version_attr[] = { "version", NULL } ; +static const char* const html_content[] = { "head", "body", "frameset", NULL } ; +static const char* const iframe_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "scrolling", "align", "height", "width", NULL } ; +static const char* const img_attrs[] = { ATTRS, "longdesc", "name", "height", "width", "usemap", "ismap", NULL } ; +static const char* const input_attrs[] = { ATTRS, "type", "name", "value", "checked", "disabled", "readonly", "size", "maxlength", "src", "alt", "usemap", "ismap", "tabindex", "accesskey", "onfocus", "onblur", "onselect", "onchange", "accept", NULL } ; +static const char* const prompt_attrs[] = { COREATTRS, I18N, "prompt", NULL } ; +static const char* const label_attrs[] = { ATTRS, "for", "accesskey", "onfocus", "onblur", NULL } ; +static const char* const legend_attrs[] = { ATTRS, "accesskey", NULL } ; +static const char* const align_attr[] = { "align", NULL } ; +static const char* const link_attrs[] = { ATTRS, "charset", "href", "hreflang", "type", "rel", "rev", "media", NULL } ; +static const char* const map_contents[] = { BLOCK, "area", NULL } ; +static const char* const name_attr[] = { "name", NULL } ; +static const char* const action_attr[] = { "action", NULL } ; +static const char* const blockli_elt[] = { BLOCK, "li", NULL } ; +static const char* const meta_attrs[] = { I18N, "http-equiv", "name", "scheme", NULL } ; +static const char* const content_attr[] = { "content", NULL } ; +static const char* const type_attr[] = { "type", NULL } ; +static const char* const noframes_content[] = { "body", FLOW MODIFIER, NULL } ; +static const char* const object_contents[] = { FLOW, "param", NULL } ; +static const char* const object_attrs[] = { ATTRS, "declare", "classid", "codebase", "data", "type", "codetype", "archive", "standby", "height", "width", "usemap", "name", "tabindex", NULL } ; +static const char* const object_depr[] = { "align", "border", "hspace", "vspace", NULL } ; +static const char* const ol_attrs[] = { "type", "compact", "start", NULL} ; +static const char* const option_elt[] = { "option", NULL } ; +static const char* const optgroup_attrs[] = { ATTRS, "disabled", NULL } ; +static const char* const option_attrs[] = { ATTRS, "disabled", "label", "selected", "value", NULL } ; +static const char* const param_attrs[] = { "id", "value", "valuetype", "type", NULL } ; +static const char* const width_attr[] = { "width", NULL } ; +static const char* const pre_content[] = { PHRASE, "tt", "i", "b", "u", "s", "strike", "a", "br", "script", "map", "q", "span", "bdo", "iframe", NULL } ; +static const char* const script_attrs[] = { "charset", "src", "defer", "event", "for", NULL } ; +static const char* const language_attr[] = { "language", NULL } ; +static const char* const select_content[] = { "optgroup", "option", NULL } ; +static const char* const select_attrs[] = { ATTRS, "name", "size", "multiple", "disabled", "tabindex", "onfocus", "onblur", "onchange", NULL } ; +static const char* const style_attrs[] = { I18N, "media", "title", NULL } ; +static const char* const table_attrs[] = { ATTRS "summary", "width", "border", "frame", "rules", "cellspacing", "cellpadding", "datapagesize", NULL } ; +static const char* const table_depr[] = { "align", "bgcolor", NULL } ; +static const char* const table_contents[] = { "caption", "col", "colgroup", "thead", "tfoot", "tbody", "tr", NULL} ; +static const char* const tr_elt[] = { "tr", NULL } ; +static const char* const talign_attrs[] = { ATTRS, CELLHALIGN, CELLVALIGN, NULL} ; +static const char* const th_td_depr[] = { "nowrap", "bgcolor", "width", "height", NULL } ; +static const char* const th_td_attr[] = { ATTRS, "abbr", "axis", "headers", "scope", "rowspan", "colspan", CELLHALIGN, CELLVALIGN, NULL } ; +static const char* const textarea_attrs[] = { ATTRS, "name", "disabled", "readonly", "tabindex", "accesskey", "onfocus", "onblur", "onselect", "onchange", NULL } ; +static const char* const tr_contents[] = { "th", "td", NULL } ; +static const char* const bgcolor_attr[] = { "bgcolor", NULL } ; +static const char* const li_elt[] = { "li", NULL } ; +static const char* const ul_depr[] = { "type", "compact", NULL} ; +static const char* const dir_attr[] = { "dir", NULL} ; #define DECL (const char**) @@ -896,7 +897,7 @@ html40ElementTable[] = { /* * start tags that imply the end of current element */ -static const char *htmlStartClose[] = { +static const char * const htmlStartClose[] = { "form", "form", "p", "hr", "h1", "h2", "h3", "h4", "h5", "h6", "dl", "ul", "ol", "menu", "dir", "address", "pre", "listing", "xmp", "head", NULL, @@ -961,7 +962,7 @@ NULL * TODO: extend that list by reading the HTML SGML DTD on * implied paragraph */ -static const char *htmlNoContentElements[] = { +static const char *const htmlNoContentElements[] = { "html", "head", NULL @@ -972,7 +973,7 @@ static const char *htmlNoContentElements[] = { * NOTE: when adding ones, check htmlIsScriptAttribute() since * it assumes the name starts with 'on' */ -static const char *htmlScriptAttributes[] = { +static const char *const htmlScriptAttributes[] = { "onclick", "ondblclick", "onmousedown", @@ -1046,7 +1047,7 @@ htmlInitAutoClose(void) { for (indx = 0;indx < 100;indx ++) htmlStartCloseIndex[indx] = NULL; indx = 0; while ((htmlStartClose[i] != NULL) && (indx < 100 - 1)) { - htmlStartCloseIndex[indx++] = &htmlStartClose[i]; + htmlStartCloseIndex[indx++] = (const char**) &htmlStartClose[i]; while (htmlStartClose[i] != NULL) i++; i++; } @@ -2376,7 +2377,7 @@ htmlParseHTMLAttribute(htmlParserCtxtPtr ctxt, const xmlChar stop) { growBuffer(buffer); out = &buffer[indx]; } - c = (xmlChar)ent->value; + c = ent->value; if (c < 0x80) { *out++ = c; bits= -6; } else if (c < 0x800) @@ -2706,7 +2707,7 @@ htmlParseScript(htmlParserCtxtPtr ctxt) { cur = CUR_CHAR(l); } - if (!(IS_CHAR_CH(cur))) { + if ((!(IS_CHAR_CH(cur))) && (!((cur == 0) && (ctxt->progressive)))) { htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, "Invalid char in CDATA 0x%X\n", cur); NEXT; @@ -3234,12 +3235,11 @@ htmlParseAttribute(htmlParserCtxtPtr ctxt, xmlChar **value) { NEXT; SKIP_BLANKS; val = htmlParseAttValue(ctxt); - /****** - } else { - * TODO : some attribute must have values, some may not - if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) - ctxt->sax->warning(ctxt->userData, - "No value for attribute %s\n", name); */ + } else if (htmlIsBooleanAttr(name)) { + /* + * assume a minimized attribute + */ + val = xmlStrdup(name); } *value = val; @@ -3290,7 +3290,18 @@ htmlCheckEncoding(htmlParserCtxtPtr ctxt, const xmlChar *attvalue) { * registered set of known encodings */ if (enc != XML_CHAR_ENCODING_ERROR) { - xmlSwitchEncoding(ctxt, enc); + if (((enc == XML_CHAR_ENCODING_UTF16LE) || + (enc == XML_CHAR_ENCODING_UTF16BE) || + (enc == XML_CHAR_ENCODING_UCS4LE) || + (enc == XML_CHAR_ENCODING_UCS4BE)) && + (ctxt->input->buf != NULL) && + (ctxt->input->buf->encoder == NULL)) { + htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING, + "htmlCheckEncoding: wrong encoding meta\n", + NULL, NULL); + } else { + xmlSwitchEncoding(ctxt, enc); + } ctxt->charset = XML_CHAR_ENCODING_UTF8; } else { /* @@ -4260,10 +4271,10 @@ htmlFreeParserCtxt(htmlParserCtxtPtr ctxt) * * Allocate and initialize a new parser context. * - * Returns the xmlParserCtxtPtr or NULL + * Returns the htmlParserCtxtPtr or NULL in case of allocation error */ -static htmlParserCtxtPtr +htmlParserCtxtPtr htmlNewParserCtxt(void) { xmlParserCtxtPtr ctxt; @@ -4336,7 +4347,8 @@ htmlCreateMemoryParserCtxt(const char *buffer, int size) { * Returns the new parser context or NULL */ static htmlParserCtxtPtr -htmlCreateDocParserCtxt(xmlChar *cur, const char *encoding ATTRIBUTE_UNUSED) { +htmlCreateDocParserCtxt(const xmlChar *cur, + const char *encoding ATTRIBUTE_UNUSED) { int len; htmlParserCtxtPtr ctxt; @@ -4939,9 +4951,17 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) { /* * Handle SCRIPT/STYLE separately */ - if ((!terminate) && - (htmlParseLookupSequence(ctxt, '<', '/', 0, 0) < 0)) - goto done; + if (!terminate) { + int idx; + xmlChar val; + + idx = htmlParseLookupSequence(ctxt, '<', '/', 0, 0); + if (idx < 0) + goto done; + val = in->cur[idx + 2]; + if (val == 0) /* bad cut of input */ + goto done; + } htmlParseScript(ctxt); if ((cur == '<') && (next == '/')) { ctxt->instate = XML_PARSER_END_TAG; @@ -5379,6 +5399,7 @@ htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data, xmlGenericError(xmlGenericErrorContext, "HPP: pushed %d\n", size); #endif } + ctxt->progressive = 1; return(ctxt); } @@ -5727,6 +5748,7 @@ htmlCtxtReset(htmlParserCtxtPtr ctxt) if (ctxt == NULL) return; + xmlInitParser(); dict = ctxt->dict; while ((input = inputPop(ctxt)) != NULL) { /* Non consuming */ @@ -5842,6 +5864,7 @@ htmlCtxtUseOptions(htmlParserCtxtPtr ctxt, int options) ctxt->keepBlanks = 1; if (options & HTML_PARSE_RECOVER) { ctxt->recovery = 1; + options -= HTML_PARSE_RECOVER; } else ctxt->recovery = 0; if (options & HTML_PARSE_COMPACT) { @@ -5914,7 +5937,8 @@ htmlReadDoc(const xmlChar * cur, const char *URL, const char *encoding, int opti if (cur == NULL) return (NULL); - ctxt = xmlCreateDocParserCtxt(cur); + xmlInitParser(); + ctxt = htmlCreateDocParserCtxt(cur, NULL); if (ctxt == NULL) return (NULL); return (htmlDoRead(ctxt, URL, encoding, options, 0)); @@ -5935,6 +5959,7 @@ htmlReadFile(const char *filename, const char *encoding, int options) { htmlParserCtxtPtr ctxt; + xmlInitParser(); ctxt = htmlCreateFileParserCtxt(filename, encoding); if (ctxt == NULL) return (NULL); @@ -5958,9 +5983,11 @@ htmlReadMemory(const char *buffer, int size, const char *URL, const char *encodi { htmlParserCtxtPtr ctxt; + xmlInitParser(); ctxt = xmlCreateMemoryParserCtxt(buffer, size); if (ctxt == NULL) return (NULL); + htmlDefaultSAXHandlerInit(); if (ctxt->sax != NULL) memcpy(ctxt->sax, &htmlDefaultSAXHandler, sizeof(xmlSAXHandlerV1)); return (htmlDoRead(ctxt, URL, encoding, options, 0)); @@ -5987,6 +6014,7 @@ htmlReadFd(int fd, const char *URL, const char *encoding, int options) if (fd < 0) return (NULL); + xmlInitParser(); input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE); if (input == NULL) return (NULL); @@ -6028,12 +6056,13 @@ htmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, if (ioread == NULL) return (NULL); + xmlInitParser(); input = xmlParserInputBufferCreateIO(ioread, ioclose, ioctx, XML_CHAR_ENCODING_NONE); if (input == NULL) return (NULL); - ctxt = xmlNewParserCtxt(); + ctxt = htmlNewParserCtxt(); if (ctxt == NULL) { xmlFreeParserInputBuffer(input); return (NULL); diff --git a/HTMLtree.c b/HTMLtree.c index d73024a..c1e5a0a 100644 --- a/HTMLtree.c +++ b/HTMLtree.c @@ -348,19 +348,19 @@ htmlSaveErr(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 = "HTML has no DOCTYPE"; + msg = "HTML has no DOCTYPE\n"; break; default: - msg = "unexpected error number"; + msg = "unexpected error number\n"; } __xmlSimpleError(XML_FROM_OUTPUT, code, node, msg, extra); } diff --git a/Makefile.in b/Makefile.in index 980d634..d0b3f87 100644 --- a/Makefile.in +++ b/Makefile.in @@ -302,6 +302,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@ @@ -330,6 +331,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@ @@ -365,6 +367,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/NEWS b/NEWS index 5c9554a..e13224f 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,74 @@ ChangeLog.html to the CVS at http://cvs.gnome.org/viewcvs/libxml2/ 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), + 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) + + +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), diff --git a/SAX2.c b/SAX2.c index 75d5f4c..7d4ab64 100644 --- a/SAX2.c +++ b/SAX2.c @@ -580,6 +580,7 @@ xmlSAX2GetEntity(void *ctx, const xmlChar *name) return(NULL); } ret->owner = 1; + ret->checked = 1; } return(ret); } @@ -987,7 +988,7 @@ xmlSAX2StartDocument(void *ctx) } if ((ctxt->myDoc != NULL) && (ctxt->myDoc->URL == NULL) && (ctxt->input != NULL) && (ctxt->input->filename != NULL)) { - ctxt->myDoc->URL = xmlCanonicPath((const xmlChar *) ctxt->input->filename); + ctxt->myDoc->URL = xmlPathToURI((const xmlChar *)ctxt->input->filename); if (ctxt->myDoc->URL == NULL) xmlSAX2ErrMemory(ctxt, "xmlSAX2StartDocument"); } @@ -1645,9 +1646,9 @@ xmlSAX2StartElement(void *ctx, const xmlChar *fullname, const xmlChar **atts) ns = xmlSearchNs(ctxt->myDoc, parent, prefix); if ((prefix != NULL) && (ns == NULL)) { ns = xmlNewNs(ret, NULL, prefix); - if ((ctxt->sax != NULL) && (ctxt->sax->warning != NULL)) - ctxt->sax->warning(ctxt->userData, - "Namespace prefix %s is not defined\n", prefix); + xmlNsWarnMsg(ctxt, XML_NS_ERR_UNDEFINED_NAMESPACE, + "Namespace prefix %s is not defined\n", + prefix, NULL); } /* @@ -2255,9 +2256,9 @@ xmlSAX2StartElementNs(void *ctx, xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElementNs"); return; } - if ((ctxt->sax != NULL) && (ctxt->sax->warning != NULL)) - ctxt->sax->warning(ctxt->userData, - "Namespace prefix %s was not found\n", prefix); + xmlNsWarnMsg(ctxt, XML_NS_ERR_UNDEFINED_NAMESPACE, + "Namespace prefix %s was not found\n", + prefix, NULL); } } diff --git a/aclocal.m4 b/aclocal.m4 index 7786a0f..6ec819a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1597,7 +1597,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -4305,6 +4305,9 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -4438,11 +4441,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -4454,7 +4457,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4534,7 +4537,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6370,6 +6373,7 @@ do done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6402,6 +6406,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do done ]) SED=$lt_cv_path_SED +AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) diff --git a/configure b/configure index 5bf44bb..0749a93 100755 --- a/configure +++ b/configure @@ -463,7 +463,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBXML_MAJOR_VERSION LIBXML_MINOR_VERSION LIBXML_MICRO_VERSION LIBXML_VERSION LIBXML_VERSION_INFO LIBXML_VERSION_NUMBER LIBXML_VERSION_EXTRA INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RM MV TAR PERL XMLLINT XSLTPROC EGREP U ANSI2KNR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL HTML_DIR Z_CFLAGS Z_LIBS PYTHON WITH_PYTHON_TRUE WITH_PYTHON_FALSE pythondir PYTHON_SUBDIR WITH_MODULES MODULE_PLATFORM_LIBS MODULE_EXTENSION TEST_MODULES STATIC_BINARIES WITH_TRIO_SOURCES_TRUE WITH_TRIO_SOURCES_FALSE WITH_TRIO THREAD_LIBS BASE_THREAD_LIBS WITH_THREADS THREAD_CFLAGS TEST_THREADS THREADS_W32 WITH_TREE WITH_FTP FTP_OBJ WITH_HTTP HTTP_OBJ WITH_LEGACY WITH_READER READER_TEST WITH_WRITER WITH_PATTERN TEST_PATTERN WITH_SAX1 TEST_SAX WITH_PUSH TEST_PUSH WITH_HTML HTML_OBJ TEST_HTML TEST_PHTML WITH_VALID TEST_VALID TEST_VTIME WITH_CATALOG CATALOG_OBJ TEST_CATALOG WITH_DOCB DOCB_OBJ WITH_XPTR XPTR_OBJ TEST_XPTR WITH_C14N C14N_OBJ TEST_C14N WITH_XINCLUDE XINCLUDE_OBJ TEST_XINCLUDE WITH_XPATH XPATH_OBJ TEST_XPATH WITH_OUTPUT WITH_ICONV WITH_ISO8859X WITH_SCHEMATRON TEST_SCHEMATRON WITH_SCHEMAS TEST_SCHEMAS WITH_REGEXPS TEST_REGEXPS WITH_DEBUG DEBUG_OBJ TEST_DEBUG WITH_MEM_DEBUG WITH_RUN_DEBUG WIN32_EXTRA_LIBADD WIN32_EXTRA_LDFLAGS CYGWIN_EXTRA_LDFLAGS CYGWIN_EXTRA_PYTHON_LIBADD XML_CFLAGS XML_LIBDIR XML_LIBS XML_LIBTOOLLIBS ICONV_LIBS XML_INCLUDEDIR HAVE_ISNAN HAVE_ISINF PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES M_LIBS RDL_LIBS RELDATE PYTHON_TESTS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBXML_MAJOR_VERSION LIBXML_MINOR_VERSION LIBXML_MICRO_VERSION LIBXML_VERSION LIBXML_VERSION_INFO LIBXML_VERSION_NUMBER LIBXML_VERSION_EXTRA INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RM MV TAR PERL WGET XMLLINT XSLTPROC EGREP U ANSI2KNR SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL HTML_DIR Z_CFLAGS Z_LIBS WITH_ZLIB PYTHON WITH_PYTHON_TRUE WITH_PYTHON_FALSE pythondir PYTHON_SUBDIR WITH_MODULES MODULE_PLATFORM_LIBS MODULE_EXTENSION TEST_MODULES STATIC_BINARIES WITH_TRIO_SOURCES_TRUE WITH_TRIO_SOURCES_FALSE WITH_TRIO THREAD_LIBS BASE_THREAD_LIBS WITH_THREADS THREAD_CFLAGS TEST_THREADS THREADS_W32 WITH_TREE WITH_FTP FTP_OBJ WITH_HTTP HTTP_OBJ WITH_LEGACY WITH_READER READER_TEST WITH_WRITER WITH_PATTERN TEST_PATTERN WITH_SAX1 TEST_SAX WITH_PUSH TEST_PUSH WITH_HTML HTML_OBJ TEST_HTML TEST_PHTML WITH_VALID TEST_VALID TEST_VTIME WITH_CATALOG CATALOG_OBJ TEST_CATALOG WITH_DOCB DOCB_OBJ WITH_XPTR XPTR_OBJ TEST_XPTR WITH_C14N C14N_OBJ TEST_C14N WITH_XINCLUDE XINCLUDE_OBJ TEST_XINCLUDE WITH_XPATH XPATH_OBJ TEST_XPATH WITH_OUTPUT WITH_ICONV WITH_ISO8859X WITH_SCHEMATRON TEST_SCHEMATRON WITH_SCHEMAS TEST_SCHEMAS WITH_REGEXPS TEST_REGEXPS WITH_DEBUG DEBUG_OBJ TEST_DEBUG WITH_MEM_DEBUG WITH_RUN_DEBUG WIN32_EXTRA_LIBADD WIN32_EXTRA_LDFLAGS CYGWIN_EXTRA_LDFLAGS CYGWIN_EXTRA_PYTHON_LIBADD XML_CFLAGS XML_LIBDIR XML_LIBS XML_LIBTOOLLIBS ICONV_LIBS XML_INCLUDEDIR HAVE_ISNAN HAVE_ISINF PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES M_LIBS RDL_LIBS RELDATE PYTHON_TESTS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1618,7 +1618,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=6 -LIBXML_MICRO_VERSION=26 +LIBXML_MICRO_VERSION=27 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 @@ -3633,6 +3633,46 @@ else echo "${ECHO_T}no" >&6 fi +# Extract the first word of "wget", so it can be a program name with args. +set dummy wget; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_WGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $WGET in + [\\/]* | ?:[\\/]*) + ac_cv_path_WGET="$WGET" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_WGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_WGET" && ac_cv_path_WGET="/usr/bin/wget" + ;; +esac +fi +WGET=$ac_cv_path_WGET + +if test -n "$WGET"; then + echo "$as_me:$LINENO: result: $WGET" >&5 +echo "${ECHO_T}$WGET" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + # Extract the first word of "xmllint", so it can be a program name with args. set dummy xmllint; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -4246,6 +4286,7 @@ do done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -4280,6 +4321,7 @@ done fi SED=$lt_cv_path_SED + echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -4704,7 +4746,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4707 "configure"' > conftest.$ac_ext + echo '#line 4749 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6072,7 +6114,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6075:" \ +echo "$as_me:6117:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -7135,11 +7177,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:7138: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7180: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7142: \$? = $ac_status" >&5 + echo "$as_me:7184: \$? = $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. @@ -7403,11 +7445,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:7406: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7448: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7410: \$? = $ac_status" >&5 + echo "$as_me:7452: \$? = $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. @@ -7507,11 +7549,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:7510: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7552: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7514: \$? = $ac_status" >&5 + echo "$as_me:7556: \$? = $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 @@ -8976,7 +9018,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8979 "configure"' > conftest.$ac_ext + echo '#line 9021 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8995,7 +9037,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -9873,7 +9915,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:12361: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12320: \$? = $ac_status" >&5 + echo "$as_me:12365: \$? = $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. @@ -12417,11 +12462,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:12420: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12465: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12424: \$? = $ac_status" >&5 + echo "$as_me:12469: \$? = $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 @@ -12953,7 +12998,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12956 "configure"' > conftest.$ac_ext + echo '#line 13001 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12972,7 +13017,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -13357,6 +13402,9 @@ CC=$lt_compiler_CXX # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -13490,11 +13538,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_CXX +predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_CXX +postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -13506,7 +13554,7 @@ postdeps=$lt_postdeps_CXX # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -13586,7 +13634,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_CXX # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -14008,11 +14056,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:14011: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14059: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14015: \$? = $ac_status" >&5 + echo "$as_me:14063: \$? = $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. @@ -14112,11 +14160,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:14115: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14163: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14119: \$? = $ac_status" >&5 + echo "$as_me:14167: \$? = $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 @@ -15561,7 +15609,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15564 "configure"' > conftest.$ac_ext + echo '#line 15612 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15580,7 +15628,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -15965,6 +16013,9 @@ CC=$lt_compiler_F77 # Is the compiler the GNU C compiler? with_gcc=$GCC_F77 +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -16098,11 +16149,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_F77 +predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_F77 +postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -16114,7 +16165,7 @@ postdeps=$lt_postdeps_F77 # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -16194,7 +16245,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_F77 # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -16336,11 +16387,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:16339: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16390: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16343: \$? = $ac_status" >&5 + echo "$as_me:16394: \$? = $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. @@ -16604,11 +16655,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:16607: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16658: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16611: \$? = $ac_status" >&5 + echo "$as_me:16662: \$? = $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. @@ -16708,11 +16759,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:16711: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16762: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16715: \$? = $ac_status" >&5 + echo "$as_me:16766: \$? = $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 @@ -18177,7 +18228,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 18180 "configure"' > conftest.$ac_ext + echo '#line 18231 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18196,7 +18247,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -18581,6 +18632,9 @@ CC=$lt_compiler_GCJ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -18714,11 +18768,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_GCJ +predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_GCJ +postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -18730,7 +18784,7 @@ postdeps=$lt_postdeps_GCJ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18810,7 +18864,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -19062,6 +19116,9 @@ CC=$lt_compiler_RC # Is the compiler the GNU C compiler? with_gcc=$GCC_RC +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -19195,11 +19252,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_RC +predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_RC +postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -19211,7 +19268,7 @@ postdeps=$lt_postdeps_RC # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -19291,7 +19348,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -19805,6 +19862,7 @@ fi echo Checking zlib +WITH_ZLIB=0 if test "$with_zlib" = "no"; then echo "Disabling compression support" else @@ -20021,9 +20079,10 @@ if test $ac_cv_lib_z_gzread = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBZ +#define HAVE_LIBZ 1 _ACEOF + WITH_ZLIB=1 if test "x${Z_DIR}" != "x"; then Z_CFLAGS="-I${Z_DIR}/include" Z_LIBS="-L${Z_DIR}/lib -lz" @@ -20046,6 +20105,7 @@ fi + CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags} @@ -25988,7 +26048,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 < @@ -25999,7 +26059,7 @@ int main(void) { (void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL) ; return 0; } EOF -if { (eval echo configure:26002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then +if { (eval echo configure:26062: \"$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 @@ -26011,7 +26071,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -26022,7 +26082,7 @@ int main(void) { (void)getsockopt (1, 1, 1, NULL, (size_t *)NULL) ; return 0; } EOF -if { (eval echo configure:26025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then +if { (eval echo configure:26085: \"$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 @@ -26034,7 +26094,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -26045,7 +26105,7 @@ int main(void) { (void)getsockopt (1, 1, 1, NULL, (int *)NULL) ; return 0; } EOF -if { (eval echo configure:26048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then +if { (eval echo configure:26108: \"$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 @@ -29698,11 +29758,13 @@ s,@RM@,$RM,;t t s,@MV@,$MV,;t t s,@TAR@,$TAR,;t t s,@PERL@,$PERL,;t t +s,@WGET@,$WGET,;t t s,@XMLLINT@,$XMLLINT,;t t s,@XSLTPROC@,$XSLTPROC,;t t s,@EGREP@,$EGREP,;t t s,@U@,$U,;t t s,@ANSI2KNR@,$ANSI2KNR,;t t +s,@SED@,$SED,;t t s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t s,@AR@,$AR,;t t @@ -29729,6 +29791,7 @@ s,@LIBTOOL@,$LIBTOOL,;t t s,@HTML_DIR@,$HTML_DIR,;t t s,@Z_CFLAGS@,$Z_CFLAGS,;t t s,@Z_LIBS@,$Z_LIBS,;t t +s,@WITH_ZLIB@,$WITH_ZLIB,;t t s,@PYTHON@,$PYTHON,;t t s,@WITH_PYTHON_TRUE@,$WITH_PYTHON_TRUE,;t t s,@WITH_PYTHON_FALSE@,$WITH_PYTHON_FALSE,;t t diff --git a/configure.in b/configure.in index e01408a..b2174c6 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=26 +LIBXML_MICRO_VERSION=27 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 @@ -40,6 +40,7 @@ AC_PATH_PROG(RM, rm, /bin/rm) AC_PATH_PROG(MV, mv, /bin/mv) AC_PATH_PROG(TAR, tar, /bin/tar) AC_PATH_PROG(PERL, perl, /usr/bin/perl) +AC_PATH_PROG(WGET, wget, /usr/bin/wget) AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint) AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) @@ -325,12 +326,14 @@ echo Checking zlib dnl Checks for zlib library. +WITH_ZLIB=0 if test "$with_zlib" = "no"; then echo "Disabling compression support" else AC_CHECK_HEADERS(zlib.h, AC_CHECK_LIB(z, gzread,[ - AC_DEFINE([HAVE_LIBZ], [], [Have compression library]) + AC_DEFINE([HAVE_LIBZ], [1], [Have compression library]) + WITH_ZLIB=1 if test "x${Z_DIR}" != "x"; then Z_CFLAGS="-I${Z_DIR}/include" Z_LIBS="-L${Z_DIR}/lib -lz" @@ -346,6 +349,7 @@ fi AC_SUBST(Z_CFLAGS) AC_SUBST(Z_LIBS) +AC_SUBST(WITH_ZLIB) CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags} diff --git a/doc/APIchunk0.html b/doc/APIchunk0.html index 4e55d77..f67a902 100644 --- a/doc/APIchunk0.html +++ b/doc/APIchunk0.html @@ -104,7 +104,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNanoFTPList
xmlParseAttValue
xmlTextWriterEndDocument
-
Allocate
xmlNanoFTPNewCtxt
+
Allocate
htmlNewParserCtxt
+xmlNanoFTPNewCtxt
xmlNewDocElementContent
xmlNewElementContent
xmlNewParserCtxt
@@ -129,6 +130,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Applies
htmlCtxtUseOptions
xmlCtxtUseOptions
xmlNormalizeURIPath
+xmlXPathCompiledEvalToBoolean
Apply
XML_SCHEMAS_ANYATTR_STRICT
XML_SCHEMAS_ANY_STRICT
Arabic
xmlUCSIsArabic
diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html index 7c9ff72..a222fe0 100644 --- a/doc/APIchunk1.html +++ b/doc/APIchunk1.html @@ -267,6 +267,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Computes
xmlBuildURI
Concat
xmlTextConcat
Constructs
xmlCanonicPath
+xmlPathToURI
Content
xmlNodeGetBase
xmlParseElementContentDecl
Content-Type
xmlNanoHTTPFetch
@@ -337,7 +338,8 @@ A:link, A:visited, A:active { text-decoration: underline }
Current
_xmlParserCtxt
_xmlParserInput
_xmlValidCtxt
-
Currently
xmlNanoFTPGetConnection
+
Currently
xmlDOMWrapCloneNode
+xmlNanoFTPGetConnection
xmlNanoFTPInit
xmlNanoHTTPInit
xmlTextReaderNextSibling
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 0486624..432eb31 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -105,9 +105,12 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParserHandleReference
xmlValidCtxtNormalizeAttributeValue
account
xmlSchemaValidateFacetWhtsp
+
acquire
_xmlDOMWrapCtxt
+xmlDOMWrapAcquireNsFunction
act
xmlStreamPush
xmlStreamPushAttr
xmlStreamPushNode
+
action
xmlDocSetRootElement
activate
xmlTextReaderSetParserProp
activated
DEBUG_MEMORY
xmlAutomataNewAllTrans
@@ -177,6 +180,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAddChild
xmlAddNextSibling
xmlAddPrevSibling
+xmlDOMWrapCloneNode
xmlDocDumpFormatMemory
xmlDocDumpFormatMemoryEnc
xmlDocFormatDump
@@ -223,7 +227,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAddChildList
xmlAddPrevSibling
xmlAddSibling
-
adoption
xmlDOMWrapCloneNode
affect
xmlKeepBlanksDefault
affiliation
_xmlSchemaElement
afraid
xmlEncodeEntities
@@ -280,7 +283,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewRMutex
xmlReallocLoc
xmlXPathObjectCopy
-
allocation
xmlBufferSetAllocationScheme
+
allocation
htmlNewParserCtxt
+xmlBufferSetAllocationScheme
xmlGetBufferAllocationScheme
xmlMallocAtomicLoc
xmlMallocLoc
@@ -476,6 +480,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseAttValue
xmlSAX2ResolveEntity
xmlSetExternalEntityLoader
+xmlXIncludeProcessFlagsData
applications
xmlSetGenericErrorFunc
xmlSetStructuredErrorFunc
applied
xmlHashCopy
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html index 515f882..dc764d5 100644 --- a/doc/APIchunk11.html +++ b/doc/APIchunk11.html @@ -190,7 +190,8 @@ A:link, A:visited, A:active { text-decoration: underline }
boundary
xmlParseElementChildrenContentDecl
xmlParseElementMixedContentDecl
bracket
xmlParseCharData
-
branch
xmlDOMWrapRemoveNode
+
branch
xmlDOMWrapCloneNode
+xmlDOMWrapRemoveNode
break
_xmlError
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html index 1c552b1..b036fc8 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -193,6 +193,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParserInputBufferCreateMem
xmlParserInputBufferCreateStatic
checked
XML_SCHEMAS_ELEM_INTERNAL_CHECKED
+_xmlEntity
xmlNodeGetBase
xmlNodeGetLang
xmlNodeGetSpacePreserve
@@ -269,6 +270,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCleanupOutputCallbacks
client
xmlKeepBlanksDefault
clone
xmlDOMWrapCloneNode
+
cloned
xmlDOMWrapCloneNode
close
htmlAutoCloseTag
htmlCtxtReadIO
htmlIsAutoClosed
@@ -413,33 +415,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRecoverFile
xmlSAXParseFile
xmlSAXParseFileWithData
-
compiled
LIBXML_AUTOMATA_ENABLED
-LIBXML_EXPR_ENABLED
-LIBXML_LEGACY_ENABLED
-LIBXML_MODULES_ENABLED
-LIBXML_REGEXP_ENABLED
-LIBXML_SCHEMAS_ENABLED
-LIBXML_SCHEMATRON_ENABLED
-LIBXML_TEST_VERSION
-LIBXML_UNICODE_ENABLED
-_xmlSchemaAttribute
-_xmlSchemaElement
-_xmlSchemaFacet
-xmlAutomataCompile
-xmlCheckVersion
-xmlExpDump
-xmlExpMaxToken
-xmlGetLastError
-xmlHasFeature
-xmlPatterncompile
-xmlRegexpCompile
-xmlRegexpExec
-xmlRegexpIsDeterminist
-xmlRegexpPrint
-xmlSaveFile
-xmlSaveFormatFile
-xmlXPathCompiledEval
-xmlXPathDebugDumpCompExpr
compiled-in
xmlCleanupInputCallbacks
xmlCleanupOutputCallbacks
xmlPopInputCallbacks
@@ -604,6 +579,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidGetValidElements
construct
xmlParseElementChildrenContentDecl
construction
xmlCanonicPath
+xmlPathToURI
constructs
xmlExpParse
xmlParseNamespace
consumed
UTF8ToHtml
@@ -703,6 +679,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextWriterWriteDTDExternalEntityContents
contentspec
xmlParseElementContentDecl
xmlParseElementDecl
+
contexts
_xmlDOMWrapCtxt
contextual
xmlRelaxNGGetParserErrors
xmlRelaxNGSetParserErrors
xmlRelaxNGSetParserStructuredErrors
@@ -867,7 +844,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidityWarningFunc
cur
xmlXPathAxisFunc
currently
XML_SCHEMAS_INCLUDING_CONVERT_NS
-xmlDOMWrapCloneNode
xmlGcMemGet
xmlMemBlocks
xmlMemGet
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index 5980cc2..1c9e865 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -395,7 +395,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDictReference
xmlDictSize
xmlExpNewCtxt
-
dicts
xmlDOMWrapCloneNode
did
XML_SCHEMAS_TYPE_BLOCK_DEFAULT
xmlTextReaderGetRemainder
xmlTextReaderStandalone
@@ -528,6 +527,7 @@ A:link, A:visited, A:active { text-decoration: underline }
don
XML_SCHEMAS_ANY_LAX
xlinkIsLink
xmlCreatePushParserCtxt
+xmlDOMWrapCloneNode
xmlNewDocNode
xmlNewDocNodeEatName
xmlParseStartTag
@@ -589,6 +589,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlShellCat
xmlShellDir
duplicate
xmlCanonicPath
+xmlPathToURI
duplicated
xmlRelaxNGNewDocParserCtxt
xmlXPathNodeSetFreeNs
duplicates
xmlSchemaCopyValue
diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html index f5134af..dfe748d 100644 --- a/doc/APIchunk14.html +++ b/doc/APIchunk14.html @@ -70,6 +70,7 @@ A:link, A:visited, A:active { text-decoration: underline } resolveEntitySAXFunc
xmlSAX2ResolveEntity
elem
XML_SCHEMAS_ELEM_INTERNAL_CHECKED
+
elem-
_xmlDOMWrapCtxt
element-
xmlStreamPushNode
xmlXPathOrderDocElems
element-node
xmlDOMWrapReconcileNamespaces
@@ -234,7 +235,6 @@ A:link, A:visited, A:active { text-decoration: underline }
equal
xmlAddChild
xmlAddNextSibling
xmlAddPrevSibling
-xmlDOMWrapCloneNode
xmlStrEqual
xmlStrQEqual
xmlTextReaderConstName
@@ -290,7 +290,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDocSetRootElement
xmlParseInNodeContext
evaluate
xmlXPathEvalExpr
-
evaluated
xmlXPathEvalPredicate
+
evaluated
xmlXPathCompiledEvalToBoolean
+xmlXPathEvalPredicate
xmlXPathEvaluatePredicateResult
xmlXPtrNewContext
evaluating
xmlXPathEvalPredicate
@@ -382,13 +383,10 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStreamPush
xmlStreamPushAttr
xmlStreamPushNode
-
experimental
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
-xmlDOMWrapReconcileNamespaces
-xmlDOMWrapRemoveNode
explicitly
xmlSAXDefaultVersion
explored
xmlXPathAxisFunc
exposing
xmlTextReaderRead
+
expressing
xmlPathToURI
expressions
LIBXML_EXPR_ENABLED
LIBXML_REGEXP_ENABLED
xmlExpExpDerive
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 4ac0a55..5bd7b26 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -74,6 +74,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlShellLoad
xmlXIncludeProcess
xmlXIncludeProcessFlags
+xmlXIncludeProcessFlagsData
xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
@@ -89,6 +90,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCharEncOutFunc
xmlCheckFilename
xmlFileOpen
+xmlPathToURI
fallback
XINCLUDE_FALLBACK
docbSAXParseDoc
docbSAXParseFile
@@ -134,6 +136,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SKIP_IDS
_xmlError
xmlParseMisc
+xmlXIncludeProcessFlagsData
xmlXPathOrderDocElems
fields
XML_SAX2_MAGIC
_htmlElemDesc
@@ -145,6 +148,7 @@ A:link, A:visited, A:active { text-decoration: underline } htmlReadFile
xmlCanonicPath
xmlCtxtReadFile
+xmlPathToURI
xmlReadFile
xmlReaderForFile
xmlReaderNewFile
@@ -320,6 +324,7 @@ A:link, A:visited, A:active { text-decoration: underline }
fragments
xmlParseURIRaw
freeing
xmlCanonicPath
xmlParserInputDeallocate
+xmlPathToURI
frees
xmlBufferFree
xmlXPathContextSetCache
front
xmlValidateNCName
@@ -398,6 +403,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidCtxtNormalizeAttributeValue
xmlValidNormalizeAttributeValue
xmlXIncludeSetFlags
+
future
_xmlDOMWrapCtxt

A-B C-C D-E diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html index 5585cd5..0f91dc8 100644 --- a/doc/APIchunk16.html +++ b/doc/APIchunk16.html @@ -287,6 +287,7 @@ A:link, A:visited, A:active { text-decoration: underline } htmlEntityValueLookup
htmlParseEntityRef
htmlNodePtr
htmlNodeStatus
+
htmlParserCtxtPtr
htmlNewParserCtxt
htmlParserOption
htmlCtxtReadDoc
htmlCtxtReadFd
htmlCtxtReadFile
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index 071403e..9842c3a 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -153,6 +153,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCleanupOutputCallbacks
xmlPopInputCallbacks
xmlXIncludeProcessFlags
+xmlXIncludeProcessFlagsData
xmlXIncludeProcessTreeFlags
xmlXIncludeSetFlags
including
XML_SCHEMAS_INCLUDING_CONVERT_NS
@@ -357,6 +358,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_DETECT_IDS
XML_SKIP_IDS
htmlNewDocNoDtD
+htmlNewParserCtxt
xmlCharEncodingOutputFunc
xmlCreateEntitiesTable
xmlCreateEnumeration
@@ -403,6 +405,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAddNextSibling
xmlAddPrevSibling
xmlCopyElementContent
+xmlDocSetRootElement
xmlFreeElementContent
xmlIsBaseChar
xmlIsBlank
@@ -425,6 +428,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewPI
xmlSAX2ProcessingInstruction
insufficient
xmlCanonicPath
+xmlPathToURI
intact
xmlParseURIRaw
integer
xmlStrcasecmp
xmlStrcmp
@@ -434,7 +438,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathFloorFunction
xmlXPathRoundFunction
xmlXPathStringFunction
-
intended
xmlSchemaNewStringValue
+
intended
_xmlDOMWrapCtxt
+xmlSchemaNewStringValue
+
intensively
xmlDOMWrapAdoptNode
+xmlDOMWrapReconcileNamespaces
+xmlDOMWrapRemoveNode
interact
xmlParseExternalID
interface
LIBXML_PATTERN_ENABLED
LIBXML_READER_ENABLED
@@ -480,7 +488,6 @@ A:link, A:visited, A:active { text-decoration: underline }
invoking
xmlGetLineNo
isinf
xmlXPathIsInf
isn
xmlRegisterCharEncodingHandler
-xmlXPathCastToString
isnan
xmlXPathIsNaN
issue
xmlEncodeEntities
issued
xlinkIsLink
diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html index 60efc29..f965440 100644 --- a/doc/APIchunk18.html +++ b/doc/APIchunk18.html @@ -37,7 +37,8 @@ A:link, A:visited, A:active { text-decoration: underline } w-w x-x y-z -

Letter j:

just
htmlSetMetaEncoding
+

Letter j:

just
_xmlDOMWrapCtxt
+htmlSetMetaEncoding
inputPop
namePop
nodePop
@@ -46,7 +47,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCreateEntitiesTable
xmlCreateEnumeration
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
xmlHandleEntity
xmlNanoFTPInit
xmlNanoHTTPInit
@@ -82,6 +82,7 @@ A:link, A:visited, A:active { text-decoration: underline } _xmlSchemaType
_xmlSchemaWildcard
know
BAD_CAST
+xmlDOMWrapCloneNode
knowledge
htmlAttrAllowed
known
_xmlParserInput
xmlAllocParserInputBuffer
@@ -345,6 +346,7 @@ A:link, A:visited, A:active { text-decoration: underline } xlinkExtendedLinkFunk
xlinkExtendedLinkSetFunk
xmlCanonicPath
+xmlPathToURI
xmlSAX2SetDocumentLocator
xmlTextReaderLocatorBaseURI
xmlTextReaderLocatorLineNumber
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index 8541fe1..5bb6121 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -79,6 +79,7 @@ A:link, A:visited, A:active { text-decoration: underline }
manipulation
LIBXML_TREE_ENABLED
many
_xmlParserInput
xmlXPathStringFunction
+
map
_xmlDOMWrapCtxt
maps
xmlTextReaderLookupNamespace
xmlTextWriterWriteDocType
xmlTextWriterWriteProcessingInstruction
@@ -306,7 +307,6 @@ A:link, A:visited, A:active { text-decoration: underline }
most
xmlC14NExecute
xmlGetFeaturesList
move
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
moved
xmlTextReaderMoveToElement
much
xmlReconciliateNs
multi-threaded
xmlSetGenericErrorFunc
diff --git a/doc/APIchunk2.html b/doc/APIchunk2.html index 93faeaf..e771872 100644 --- a/doc/APIchunk2.html +++ b/doc/APIchunk2.html @@ -74,6 +74,7 @@ A:link, A:visited, A:active { text-decoration: underline } ignorableWhitespaceSAXFunc
resolveEntity
resolveEntitySAXFunc
+xmlDOMWrapAcquireNsFunction
xmlDOMWrapReconcileNamespaces
xmlDOMWrapRemoveNode
xmlDocDumpFormatMemoryEnc
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index ffcf125..2a9174d 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -65,6 +65,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlC14NExecute
xmlCopyDoc
xmlCopyNode
+xmlDOMWrapAcquireNsFunction
xmlDocCopyNode
xmlFreeNsList
xmlGetProp
@@ -92,6 +93,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SUBSTITUTE_NONE
XML_SUBSTITUTE_PEREF
XML_SUBSTITUTE_REF
+_xmlDOMWrapCtxt
xmlCreatePushParserCtxt
xmlGetNsList
xmlInitCharEncodingHandlers
@@ -126,7 +128,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextReaderCurrentDoc
xmlValidCtxtNormalizeAttributeValue
xmlValidNormalizeAttributeValue
-xmlXPathCastToString
xmlXPathPopBoolean
xmlXPathPopExternal
xmlXPathPopNodeSet
@@ -179,7 +180,8 @@ A:link, A:visited, A:active { text-decoration: underline }
nillable
XML_SCHEMAS_ELEM_NILLABLE
xmlExpIsNillable
nod
xmlEntityReferenceFunc
-
node-
xmlDOMWrapRemoveNode
+
node-
_xmlDOMWrapCtxt
+xmlDOMWrapRemoveNode
xmlValidGetValidElements
node-set?
xmlXPathLocalNameFunction
xmlXPathNamespaceURIFunction
@@ -221,7 +223,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathBooleanFunction
none
XML_SCHEMAS_TYPE_VARIETY_ABSENT
getNamespace
-xmlDOMWrapCloneNode
xmlDecodeEntities
xmlGetLastChild
xmlOutputBufferCreateFilename
@@ -260,7 +261,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidNormalizeAttributeValue
xmlXPathNormalizeFunction
normalizing
xmlCurrentChar
-
normally
c
+
normally
_xmlNs
+c
xmlValidityErrorFunc
xmlValidityWarningFunc
notations
_xmlDtd
@@ -279,7 +281,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDOMWrapReconcileNamespaces
ns-references
xmlDOMWrapReconcileNamespaces
xmlDOMWrapRemoveNode
-
nsDef
xmlDOMWrapAdoptNode
+
nsDef
_xmlDOMWrapCtxt
+xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapRemoveNode
null
xmlHashScan3
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html index f503ffe..f7cf410 100644 --- a/doc/APIchunk21.html +++ b/doc/APIchunk21.html @@ -55,6 +55,7 @@ A:link, A:visited, A:active { text-decoration: underline }
obsolete
xmlNormalizeWindowsPath
obsolete:
XML_SCHEMAS_ELEM_TOPLEVEL
occupied
xmlCanonicPath
+xmlPathToURI
occur
XML_SCHEMAS_TYPE_VARIETY_ABSENT
xmlParseComment
xmlParseMarkupDecl
@@ -212,7 +213,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathNotEqualValues
xmlXPathSubValues
xmlXPathValueFlipSign
-
operations
xmlModuleClose
+
operations
_xmlDOMWrapCtxt
+xmlModuleClose
xmlModuleFree
xmlReconciliateNs
operator
xmlExpParse
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index f4c8321..bd256cb 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -101,6 +101,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseAttValue
xmlSetGenericErrorFunc
xmlSetStructuredErrorFunc
+xmlXIncludeProcessFlagsData
xmlXPathEvalFunc
xmlXPathIntersection
passive
xmlNanoFTPGetConnection
@@ -122,6 +123,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNormalizeURIPath
xmlNormalizeWindowsPath
xmlParserGetDirectory
+xmlPathToURI
xmlShellPwd
xmlShellValidate
xmlTextReaderRelaxNGValidate
diff --git a/doc/APIchunk23.html b/doc/APIchunk23.html index 4a78224..effe8f5 100644 --- a/doc/APIchunk23.html +++ b/doc/APIchunk23.html @@ -353,6 +353,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlBufferShrink
xmlCatalogRemove
xmlDecodeEntities
+xmlDocSetRootElement
xmlEncodeEntities
xmlHashRemoveEntry
xmlHashRemoveEntry2
@@ -441,7 +442,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNanoHTTPOpen
xmlNanoHTTPOpenRedir
xmlNanoHTTPReturnCode
-
requested
xmlExternalEntityLoader
+
requested
xmlDOMWrapAcquireNsFunction
+xmlExternalEntityLoader
xmlHasFeature
xmlIsID
xmlMallocFunc
@@ -517,6 +519,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNanoHTTPContentLength
responsible
xmlC14NDocDumpMemory
xmlCanonicPath
+xmlPathToURI
restored
xmlTextReaderSetErrorHandler
xmlTextReaderSetStructuredErrorHandler
restrict
xmlParseExternalID
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html index 6ac493b..b737b67 100644 --- a/doc/APIchunk24.html +++ b/doc/APIchunk24.html @@ -67,6 +67,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlGcMemGet
xmlMemGet
xmlNanoHTTPFetch
+xmlSaveTree
xmlShell
xmlShellSave
saved
_htmlElemDesc
@@ -415,6 +416,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidatePushCData
xmlXIncludeProcess
xmlXIncludeProcessFlags
+xmlXIncludeProcessFlagsData
xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
@@ -492,7 +494,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewDocNode
xmlNewDocNodeEatName
xmlTextWriterWriteRawLen
-
specialized
xmlGcMemGet
+
specialized
_xmlDOMWrapCtxt
+xmlGcMemGet
xmlGcMemSetup
specific
XML_CATALOG_PI
_xmlValidCtxt
@@ -755,6 +758,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStringLenDecodeEntities
xmlXIncludeProcess
xmlXIncludeProcessFlags
+xmlXIncludeProcessFlagsData
xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html index befc7fa..848a69a 100644 --- a/doc/APIchunk25.html +++ b/doc/APIchunk25.html @@ -60,6 +60,7 @@ A:link, A:visited, A:active { text-decoration: underline } htmlIsAutoClosed
htmlSetMetaEncoding
take
xmlLockLibrary
+
taken
xmlDocSetRootElement
takes
xmlSchemaValidateFacetWhtsp
tatkes
xmlExpExpDerive
tell
XML_COMPLETE_ATTRS
@@ -96,11 +97,13 @@ A:link, A:visited, A:active { text-decoration: underline }
termination
xmlStrcat
xmlStrdup
terms
xmlBuildRelativeURI
-
test
xmlDOMWrapCloneNode
-xmlParserHandleReference
+
test
xmlParserHandleReference
xmlXPathEqualValues
xmlXPathNotEqualValues
tested
_xmlParserInput
+xmlDOMWrapAdoptNode
+xmlDOMWrapReconcileNamespaces
+xmlDOMWrapRemoveNode
testing
xmlRegexpCompile
text-
xmlStreamPushNode
xmlStreamWantsAnyNode
@@ -259,6 +262,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlPopInputCallbacks
xmlPushInput
xmlReconciliateNs
+xmlSaveTree
xmlSetTreeDoc
total
_xmlOutputBuffer
xmlGetFeaturesList
diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html index be247f2..828659a 100644 --- a/doc/APIchunk26.html +++ b/doc/APIchunk26.html @@ -101,7 +101,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlHasProp
xmlXPathNextNamespace
unliked
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
unlink
xmlFreeNode
unlinked
xmlAddNextSibling
xmlAddPrevSibling
@@ -263,6 +262,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAS_TYPE_VARIETY_ATOMIC
XML_SCHEMAS_TYPE_VARIETY_LIST
XML_SCHEMAS_TYPE_VARIETY_UNION
+
various
_xmlDOMWrapCtxt
very
_htmlElemDesc
_xmlParserInput
xmlCharEncFirstLine
diff --git a/doc/APIchunk27.html b/doc/APIchunk27.html index 2473a34..b0e889a 100644 --- a/doc/APIchunk27.html +++ b/doc/APIchunk27.html @@ -47,7 +47,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCharEncInFunc
xmlCharEncOutFunc
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
warn
xmlCheckVersion
warning
XML_CAST_FPTR
_xmlValidCtxt
@@ -118,6 +117,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlMemShow
xmlXIncludeProcess
xmlXIncludeProcessFlags
+xmlXIncludeProcessFlagsData
xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
@@ -258,7 +258,8 @@ A:link, A:visited, A:active { text-decoration: underline }
would
_xmlError
htmlAutoCloseTag
xmlTextReaderGetRemainder
-
wrapper
xmlDOMWrapReconcileNamespaces
+
wrapper
xmlDOMWrapAcquireNsFunction
+xmlDOMWrapReconcileNamespaces
xmlDOMWrapRemoveNode
wraps
xmlTextReaderByteConsumed
write
xmlFileRead
diff --git a/doc/APIchunk28.html b/doc/APIchunk28.html index b5471fb..05bde7b 100644 --- a/doc/APIchunk28.html +++ b/doc/APIchunk28.html @@ -138,6 +138,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlDefaultSAXLocator
setDocumentLocator
setDocumentLocatorSAXFunc
xmlSAX2SetDocumentLocator
+
xmlDoc
_xmlNs
xmlDocCopyNodeList
xmlCopyNodeList
xmlDocNewPI
xmlNewPI
xmlDocPtr
xmlCopyDoc
@@ -196,6 +197,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNodeListGetRawString
xmlNodeListGetString
xmlTextReaderValue
+xmlXPathCastToString
xmlFreeDoc
xmlTextReaderCurrentDoc
xmlFreeDocElementContent
xmlFreeElementContent
xmlFreeMutex
xmlFreeMutex
@@ -293,9 +295,12 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlNodeType
xmlTextReaderNodeType
xmlNotationPtr
xmlGetDtdNotationDesc
xmlNotationTablePtr
xmlCopyNotationTable
-
xmlNsPtr
getNamespace
+
xmlNs
xmlDOMWrapAcquireNsFunction
+
xmlNsPtr
_xmlDOMWrapCtxt
+getNamespace
xmlCopyNamespace
xmlCopyNamespaceList
+xmlDOMWrapAcquireNsFunction
xmlGetNsList
xmlOutputBufferClose
xmlSaveFileTo
xmlSaveFormatFileTo
@@ -432,7 +437,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlURIFromPath
xmlNormalizeWindowsPath
xmlURIPtr
xmlParseURI
xmlParseURIRaw
-
xmlUnlinkNode
xmlFreeNode
+
xmlUnlinkNode
xmlDocSetRootElement
+xmlFreeNode
xmlUnlockLibrary
xmlUnlockLibrary
xmlValidCtxtPtr
xmlValidityErrorFunc
xmlValidityWarningFunc
diff --git a/doc/APIchunk3.html b/doc/APIchunk3.html index b1d3cae..cffe694 100644 --- a/doc/APIchunk3.html +++ b/doc/APIchunk3.html @@ -305,7 +305,8 @@ A:link, A:visited, A:active { text-decoration: underline }
Instruction
xmlParsePI
Instuction
XML_CATALOG_PI
Intended
xmlSnprintfElementContent
-
Internal
xmlParseMarkupDecl
+
Internal
_xmlDOMWrapCtxt
+xmlParseMarkupDecl

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 }

NOTE:
_xmlParserInput
htmlSetMetaEncoding
xmlCheckLanguageID
+xmlDOMWrapAdoptNode
+xmlDOMWrapReconcileNamespaces
+xmlDOMWrapRemoveNode
xmlGetProp
xmlInitCharEncodingHandlers
xmlNewChild
@@ -289,35 +292,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseNotationDecl
NotationType
xmlParseEnumeratedType
xmlParseNotationType
-
Note
ftpListCallback
-htmlElementAllowedHere
-xmlAddAttributeDecl
-xmlAutomataNewNegTrans
-xmlCheckUTF8
-xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
-xmlDOMWrapReconcileNamespaces
-xmlDocDumpFormatMemory
-xmlDocDumpFormatMemoryEnc
-xmlDocDumpMemoryEnc
-xmlDocFormatDump
-xmlExpNewOr
-xmlExpNewRange
-xmlExpNewSeq
-xmlHasNsProp
-xmlNanoHTTPContentLength
-xmlNodeDump
-xmlNodeDumpOutput
-xmlParseCharEncoding
-xmlParseEntityRef
-xmlRemoveProp
-xmlSAXDefaultVersion
-xmlSaveFormatFile
-xmlSaveFormatFileEnc
-xmlSchemaValidateFacetWhtsp
-xmlStrncat
-xmlTextReaderSetParserProp
-xmlValidateDtd
Note:
fatalErrorSAXFunc
xmlBuildRelativeURI
xmlCharEncodingOutputFunc
diff --git a/doc/APIchunk5.html b/doc/APIchunk5.html index 3ebc5a8..9a6b23f 100644 --- a/doc/APIchunk5.html +++ b/doc/APIchunk5.html @@ -67,7 +67,6 @@ A:link, A:visited, A:active { text-decoration: underline }
Open
xmlIOHTTPOpenW
Opens
xmlModuleOpen
OpticalCharacterRecognition
xmlUCSIsOpticalCharacterRecognition
-
Optimize
xmlDOMWrapCloneNode
Optional
_htmlElemDesc
Oriya
xmlUCSIsOriya
Osmanya
xmlUCSIsOsmanya
diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html index 50949e1..ed7c4a2 100644 --- a/doc/APIchunk7.html +++ b/doc/APIchunk7.html @@ -263,7 +263,6 @@ A:link, A:visited, A:active { text-decoration: underline }
SupplementalMathematicalOperators
xmlUCSIsSupplementalMathematicalOperators
SupplementaryPrivateUseArea-A
xmlUCSIsSupplementaryPrivateUseAreaA
SupplementaryPrivateUseArea-B
xmlUCSIsSupplementaryPrivateUseAreaB
-
Support
xmlDOMWrapCloneNode
Syriac
xmlUCSIsSyriac
System
_xmlNotation
xmlExternalEntityLoader
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html index 82de64b..a980c2f 100644 --- a/doc/APIchunk8.html +++ b/doc/APIchunk8.html @@ -228,6 +228,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Upgrade
xmlKeepBlanksDefault
Use
XML_COMPLETE_ATTRS
XML_DETECT_IDS
+_xmlDOMWrapCtxt
_xmlParserCtxt
xmlCopyNodeList
xmlGetProp
diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html index 556b273..882ab74 100644 --- a/doc/APIchunk9.html +++ b/doc/APIchunk9.html @@ -72,11 +72,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseVersionNum

Letter W:

W3C
xmlTextReaderSchemaValidate
xmlTextReaderSchemaValidateCtxt
-
WARNING:
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
-xmlDOMWrapReconcileNamespaces
-xmlDOMWrapRemoveNode
-xmlSchemaGetCanonValue
+
WARNING:
xmlSchemaGetCanonValue
xmlSchemaNewStringValue
WFC:
xmlParseAttribute
xmlParseCharRef
@@ -113,6 +109,7 @@ A:link, A:visited, A:active { text-decoration: underline } notationDeclSAXFunc
unparsedEntityDecl
unparsedEntityDeclSAXFunc
+xmlDOMWrapCloneNode
xmlSAX2NotationDecl
xmlSAX2UnparsedEntityDecl
When
xmlHandleEntity
@@ -142,10 +139,12 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeNewContext
xmlXIncludeProcess
xmlXIncludeProcessFlags
+xmlXIncludeProcessFlagsData
xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
xmlXIncludeSetFlags
+
XInclude?
xmlDOMWrapCloneNode
XLINK_TYPE_NONE
xlinkIsLink
XML-1
xmlDetectCharEncoding
xmlValidateAttributeDecl
@@ -244,6 +243,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSAXUserParseFile
xmlSetCompressMode
xmlSetDocCompressMode
+
Zlib
LIBXML_ZLIB_ENABLED

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:

htmlCreateFileParserCtxt
htmlCreateMemoryParserCtxt
htmlCreatePushParserCtxt
+htmlNewParserCtxt

Type htmlStatus:

htmlAttrAllowed
htmlElementStatusHere
htmlNodeStatus
@@ -207,6 +208,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseSystemLiteral
xmlParseVersionInfo
xmlParseVersionNum
+xmlPathToURI
xmlSaveUri
xmlScanName
xmlSchemaCollapseString
@@ -422,6 +424,7 @@ A:link, A:visited, A:active { text-decoration: underline }

Type xmlNsPtr:

getNamespace
xmlCopyNamespace
xmlCopyNamespaceList
+xmlDOMWrapAcquireNsFunction
xmlNewGlobalNs
xmlNewNs
xmlSearchNs
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 2a5af4b..e10fe00 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -66,6 +66,7 @@ A:link, A:visited, A:active { text-decoration: underline } htmlHandleOmittedElem
htmlIsAutoClosed
htmlIsScriptAttribute
+htmlNewParserCtxt
htmlNodePtr
htmlNodeStatus
htmlParseCharRef
@@ -651,6 +652,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_WITH_XINCLUDE
XML_WITH_XPATH
XML_WITH_XPTR
+XML_WITH_ZLIB
_xmlParserCtxt
_xmlParserInput
_xmlParserNodeInfo
@@ -1374,6 +1376,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCopyProp
xmlCopyPropList
xmlCreateIntSubset
+xmlDOMWrapAcquireNsFunction
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapCtxt
@@ -1543,6 +1546,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseURI
xmlParseURIRaw
xmlParseURIReference
+xmlPathToURI
xmlPrintURI
xmlSaveUri
xmlURI
@@ -1655,6 +1659,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeNewContext
xmlXIncludeProcess
xmlXIncludeProcessFlags
+xmlXIncludeProcessFlagsData
xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
@@ -3120,6 +3125,7 @@ A:link, A:visited, A:active { text-decoration: underline } LIBXML_XINCLUDE_ENABLED
LIBXML_XPATH_ENABLED
LIBXML_XPTR_ENABLED
+LIBXML_ZLIB_ENABLED
WITHOUT_TRIO
WITH_TRIO
xmlCheckVersion
@@ -3273,6 +3279,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathCompExprPtr
xmlXPathCompile
xmlXPathCompiledEval
+xmlXPathCompiledEvalToBoolean
xmlXPathContext
xmlXPathContextPtr
xmlXPathContextSetCache
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html index 92489fb..fea4fd3 100644 --- a/doc/APIfunctions.html +++ b/doc/APIfunctions.html @@ -213,6 +213,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCreateEnumeration
xmlCreateIntSubset
xmlCtxtReadDoc
+xmlDOMWrapAcquireNsFunction
xmlDebugDumpString
xmlDictExists
xmlDictLookup
@@ -304,6 +305,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseElementContentDecl
xmlParseExternalEntity
xmlParseExternalSubset
+xmlPathToURI
xmlPatterncompile
xmlReadDoc
xmlReaderForDoc
@@ -861,6 +863,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlThrDefSetStructuredErrorFunc
xmlValidityErrorFunc
xmlValidityWarningFunc
+xmlXIncludeProcessFlagsData
xmlXPathFuncLookupFunc
xmlXPathRegisterFuncLookup
xmlXPathRegisterVariableLookup
@@ -1063,7 +1066,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlOutputBufferWriteEscape
xmlSaveSetAttrEscape
xmlSaveSetEscape
-

Type xmlDOMWrapCtxtPtr:

xmlDOMWrapAdoptNode
+

Type xmlDOMWrapCtxtPtr:

xmlDOMWrapAcquireNsFunction
+xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapFreeCtxt
xmlDOMWrapReconcileNamespaces
@@ -1214,6 +1218,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeNewContext
xmlXIncludeProcess
xmlXIncludeProcessFlags
+xmlXIncludeProcessFlagsData
xmlXPathNewContext
xmlXPathOrderDocElems
xmlXPtrNewContext
@@ -1427,6 +1432,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlC14NIsVisibleCallback
xmlCopyProp
xmlCopyPropList
+xmlDOMWrapAcquireNsFunction
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapReconcileNamespaces
@@ -2161,9 +2167,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeSetFlags

Type xmlXPathCompExprPtr:

xmlXPathCompiledEval
+xmlXPathCompiledEvalToBoolean
xmlXPathDebugDumpCompExpr
xmlXPathFreeCompExpr

Type xmlXPathContextPtr:

xmlXPathCompiledEval
+xmlXPathCompiledEvalToBoolean
xmlXPathContextSetCache
xmlXPathCtxtCompile
xmlXPathEval
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 7e1ba3c..c6c5265 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -94,6 +94,7 @@ A:link, A:visited, A:active { text-decoration: underline } LIBXML_XINCLUDE_ENABLED
LIBXML_XPATH_ENABLED
LIBXML_XPTR_ENABLED
+LIBXML_ZLIB_ENABLED

Letter M:

MOVETO_ENDTAG
MOVETO_STARTTAG

Letter S:

SKIP_EOL
@@ -1320,6 +1321,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_WITH_XINCLUDE
XML_WITH_XPATH
XML_WITH_XPTR
+XML_WITH_ZLIB
XML_XINCLUDE_BUILD_FAILED
XML_XINCLUDE_DEPRECATED_NS
XML_XINCLUDE_END
@@ -1566,6 +1568,7 @@ A:link, A:visited, A:active { text-decoration: underline } htmlIsScriptAttribute
htmlNewDoc
htmlNewDocNoDtD
+htmlNewParserCtxt
htmlNodeDump
htmlNodeDumpFile
htmlNodeDumpFileFormat
@@ -1846,6 +1849,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCtxtResetPush
xmlCtxtUseOptions
xmlCurrentChar
+xmlDOMWrapAcquireNsFunction
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapCtxt
@@ -2472,6 +2476,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParserValidityWarning
xmlParserVersion
xmlParserWarning
+xmlPathToURI
xmlPattern
xmlPatternFlags
xmlPatternFromRoot
@@ -3258,6 +3263,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeNewContext
xmlXIncludeProcess
xmlXIncludeProcessFlags
+xmlXIncludeProcessFlagsData
xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
@@ -3289,6 +3295,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathCompareValues
xmlXPathCompile
xmlXPathCompiledEval
+xmlXPathCompiledEvalToBoolean
xmlXPathConcatFunction
xmlXPathContainsFunction
xmlXPathContext
diff --git a/doc/DOM.html b/doc/DOM.html index a637399..52f1139 100644 --- a/doc/DOM.html +++ b/doc/DOM.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 } -DOM Principles
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

DOM Principles

Developer Menu
API Indexes
Related links

DOMstands for the -DocumentObjectModel; this is an API for accessing XML or HTML -structureddocuments.Native support for DOM in Gnome is on the way (module -gnome-dom),and will bebased on gnome-xml. This will be a far cleaner -interface tomanipulate XMLfiles within Gnome since it won't expose the -internalstructure.

The current DOM implementation on top of libxml2 is the gdome2 Gnome module,thisis -a full DOM interface, thanks to Paolo Casarini, check the Gdome2 -homepageformoreinformations.

Daniel Veillard

+DOM Principles
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

DOM Principles

Developer Menu
API Indexes
Related links

DOM stands for the Document +Object Model; this is an API for accessing XML or HTML structured +documents. Native support for DOM in Gnome is on the way (module gnome-dom), +and will be based on gnome-xml. This will be a far cleaner interface to +manipulate XML files within Gnome since it won't expose the internal +structure.

The current DOM implementation on top of libxml2 is the gdome2 Gnome module, this +is a full DOM interface, thanks to Paolo Casarini, check the Gdome2 homepage for more +informations.

Daniel Veillard

diff --git a/doc/FAQ.html b/doc/FAQ.html index cdc6585..0d5ded6 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -12,49 +12,53 @@ A:link, A:visited, A:active { text-decoration: underline }

  • Compilation
  • Developer corner

    • License(s)

    1. Licensing Terms for libxml -

      libxml2 is released under the MITLicense;see - the file Copyright in the distribution for the precisewording

      +

      libxml2 is released under the MIT + License; see the file Copyright in the distribution for the precise + wording

    2. Can I embed libxml2 in a proprietary application ? -

      Yes. The MIT License allows you to keep proprietary the changesyoumade - to libxml, but it would be graceful to send-back bug fixesandimprovements - as patches for possible incorporation in themaindevelopment tree.

      +

      Yes. The MIT License allows you to keep proprietary the changes you + made to libxml, but it would be graceful to send-back bug fixes and + improvements as patches for possible incorporation in the main + development tree.

      3. -

    Installation

    1. Do - NotUselibxml1, use libxml2
      2. -
    2. Where can I get libxml? -

      The original distribution comes from xmlsoft.orgor gnome.org

      -

      Most Linux and BSD distributions include libxml, this is - probablythesafer way for end-users to use libxml.

      +

    Installation

    1. Do Not Use + libxml1, use libxml2
      2. +
    2. Where can I get libxml ? +

      The original distribution comes from xmlsoft.org or gnome.org

      +

      Most Linux and BSD distributions include libxml, this is probably the + safer way for end-users to use libxml.

      David Doolin provides precompiled Windows versions at http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/

    3. I see libxml and libxml2 releases, which one should I install ? -
      • If you are not constrained by backward compatibility - issueswithexisting applications, install libxml2 only
        • -
      • If you are not doing development, you can safely - installboth.Usually the packages libxmland libxml2arecompatible(this - is not the case for development packages).
        • -
      • If you are a developer and your system provides - separatepackagingfor shared libraries and the development components, - it ispossibleto install libxml and libxml2, and also libxml-develandlibxml2-develtoofor - libxml2 >= 2.3.0
        • -
      • If you are developing a new application, please - developagainstlibxml2(-devel)
        • +
        • If you are not constrained by backward compatibility issues with + existing applications, install libxml2 only
          • +
        • If you are not doing development, you can safely install both. + Usually the packages libxml and libxml2 are + compatible (this is not the case for development packages).
          • +
        • If you are a developer and your system provides separate packaging + for shared libraries and the development components, it is possible + to install libxml and libxml2, and also libxml-devel + and libxml2-devel + too for libxml2 >= 2.3.0
          • +
        • If you are developing a new application, please develop against + libxml2(-devel)
      • I can't install the libxml package, it conflicts with libxml0 -

        You probably have an old libxml0 package used to provide - thesharedlibrary for libxml.so.0, you can probably safely remove it. - Thelibxmlpackages provided on xmlsoft.orgprovidelibxml.so.0

        +

        You probably have an old libxml0 package used to provide the shared + library for libxml.so.0, you can probably safely remove it. The libxml + packages provided on xmlsoft.org provide + libxml.so.0

        • -
      • I can't install the libxml(2) RPM package due - tofaileddependencies -

        The most generic solution is to re-fetch the latest src.rpm - ,andrebuild it locally with

        +
      • I can't install the libxml(2) RPM package due to failed + dependencies +

        The most generic solution is to re-fetch the latest src.rpm , and + rebuild it locally with

        rpm --rebuild libxml(2)-xxx.src.rpm.

        -

        If everything goes well it will generate two binary rpm - packages(oneproviding the shared libs and xmllint, and the other one, - the-develpackage, providing includes, static libraries and scripts needed - tobuildapplications with libxml(2)) that you can install locally.

        +

        If everything goes well it will generate two binary rpm packages (one + providing the shared libs and xmllint, and the other one, the -devel + package, providing includes, static libraries and scripts needed to build + applications with libxml(2)) that you can install locally.

    Compilation

    1. What is the process to compile libxml2 ?

      As most UNIX libraries libxml2 follows the "standard":

      @@ -65,106 +69,109 @@ A:link, A:visited, A:active { text-decoration: underline }

      ./configure [possible options]

      make

      make install

      -

      At that point you may have to rerun ldconfig or a similar - utilitytoupdate your list of installed shared libs.

      +

      At that point you may have to rerun ldconfig or a similar utility to + update your list of installed shared libs.

    2. What other libraries are needed to compile/install libxml2 ? -

      Libxml2 does not require any other library, the normal C ANSIAPIshould - be sufficient (please report any violation to this rule youmayfind).

      -

      However if found at configuration time libxml2 will detect and - usethefollowing libs:

      -
      • libz:ahighly - portable and available widely compression library.
        • -
      • iconv: a powerful character encoding conversion library. - Itisincluded by default in recent glibc libraries, so it doesn't - needtobe installed specifically on Linux. It now seems a partofthe - official UNIXspecification. Here is one implementation - ofthelibrarywhich source can be found here.
        • +

        Libxml2 does not require any other library, the normal C ANSI API + should be sufficient (please report any violation to this rule you may + find).

        +

        However if found at configuration time libxml2 will detect and use the + following libs:

        +
        • libz : a + highly portable and available widely compression library.
          • +
        • iconv: a powerful character encoding conversion library. It is + included by default in recent glibc libraries, so it doesn't need to + be installed specifically on Linux. It now seems a part + of the official UNIX specification. Here is one implementation of the + library which source can be found here.
      • Make check fails on some platforms -

        Sometimes the regression tests' results don't completely matchthevalue - produced by the parser, and the makefile uses diff to printthedelta. On - some platforms the diff return breaks the compilationprocess;if the diff - is small this is probably not a serious problem.

        -

        Sometimes (especially on Solaris) make checks fail due tolimitationsin - make. Try using GNU-make instead.

        +

        Sometimes the regression tests' results don't completely match the + value produced by the parser, and the makefile uses diff to print the + delta. On some platforms the diff return breaks the compilation process; + if the diff is small this is probably not a serious problem.

        +

        Sometimes (especially on Solaris) make checks fail due to limitations + in make. Try using GNU-make instead.

      • I use the CVS version and there is no configure script -

        The configure script (and other Makefiles) are generated. - Usetheautogen.sh script to regenerate the configure script - andMakefiles,like:

        +

        The configure script (and other Makefiles) are generated. Use the + autogen.sh script to regenerate the configure script and Makefiles, + like:

        ./autogen.sh --prefix=/usr --disable-shared

      • I have troubles when running make tests with gcc-3.0 -

        It seems the initial release of gcc-3.0 has a problem withtheoptimizer - which miscompiles the URI module. Please useanothercompiler.

        +

        It seems the initial release of gcc-3.0 has a problem with the + optimizer which miscompiles the URI module. Please use another + compiler.

        • -

    Developercorner

    1. Troubles compiling or linking programs using libxml2 -

      Usually the problem comes from the fact that the compiler - doesn'tgetthe right compilation or linking flags. There is a small - shellscriptxml2-configwhich is installed as part of - libxml2usualinstall process which provides those flags. Use

      +

    Developer corner

    1. Troubles compiling or linking programs using libxml2 +

      Usually the problem comes from the fact that the compiler doesn't get + the right compilation or linking flags. There is a small shell script + xml2-config which is installed as part of libxml2 usual + install process which provides those flags. Use

      xml2-config --cflags

      to get the compilation flags and

      xml2-config --libs

      -

      to get the linker flags. Usually this is done directly fromtheMakefile - as:

      +

      to get the linker flags. Usually this is done directly from the + Makefile as:

      CFLAGS=`xml2-config --cflags`

      LIBS=`xml2-config --libs`

      2. -
    2. I want to install my own copy of libxml2 in my home - directoryandlink my programs against it, but it doesn't work -

      There are many different ways to accomplish this. Here is one waytodo - this under Linux. Suppose your home directory - is/home/user.Then:

      +
    3. I want to install my own copy of libxml2 in my home directory and + link my programs against it, but it doesn't work +

      There are many different ways to accomplish this. Here is one way to + do this under Linux. Suppose your home directory is /home/user. + Then:

      • Create a subdirectory, let's call it myxml
      • unpack the libxml2 distribution into that subdirectory
        • -
      • chdir into the unpacked - distribution(/home/user/myxml/libxml2)
        • -
      • configure the library using the - "--prefix"switch,specifying an installation - subdirectoryin/home/user/myxml, e.g. -

        ./configure - --prefix/home/user/myxml/xmlinst{otherconfiguration - options}

        +
      • chdir into the unpacked distribution + (/home/user/myxml/libxml2 )
        • +
      • configure the library using the "--prefix" switch, + specifying an installation subdirectory in + /home/user/myxml, e.g. +

        ./configure --prefix /home/user/myxml/xmlinst {other + configuration options}

        • -
      • now run makefollowed by make install
        • -
      • At this point, the installation subdirectory contains - thecomplete"private" include files, library files and binary - programfiles (e.g.xmllint), located in -

        /home/user/myxml/xmlinst/lib,/home/user/myxml/xmlinst/includeand - /home/user/myxml/xmlinst/bin

        +
      • now run make followed by make install
        • +
      • At this point, the installation subdirectory contains the complete + "private" include files, library files and binary program files (e.g. + xmllint), located in +

        /home/user/myxml/xmlinst/lib, + /home/user/myxml/xmlinst/include and + /home/user/myxml/xmlinst/bin

        respectively.
        • -
      • In order to use this "private" library, you should first add - ittothe beginning of your default PATH (so that your own - privateprogramfiles such as xmllint will be used instead of the - normalsystemones). To do this, the Bash command would be +
      • In order to use this "private" library, you should first add it to + the beginning of your default PATH (so that your own private program + files such as xmllint will be used instead of the normal system + ones). To do this, the Bash command would be

        export PATH=/home/user/myxml/xmlinst/bin:$PATH

        • -
      • Now suppose you have a program test1.cthat - youwouldlike to compile with your "private" library. Simply compile - itusingthe command +
      • Now suppose you have a program test1.c that you would + like to compile with your "private" library. Simply compile it using + the command

        gcc `xml2-config --cflags --libs` -o test test.c

        - Note that, because your PATH has been set - with/home/user/myxml/xmlinst/binat the beginning, - thexml2-configprogram which you just installed will be used instead - ofthe systemdefault one, and this will automaticallyget - thecorrectlibraries linked with your program.
        • + Note that, because your PATH has been set with + /home/user/myxml/xmlinst/bin at the beginning, the xml2-config + program which you just installed will be used instead of the system + default one, and this will automatically get the correct + libraries linked with your program.

    4. xmlDocDump() generates output on one line. -

      Libxml2 will not inventspaces in the content - ofadocument since all spaces in the content of a - documentaresignificant. If you build a tree from the API - andwantindentation:

      +

      Libxml2 will not invent spaces in the content of a + document since all spaces in the content of a document are + significant. If you build a tree from the API and want + indentation:

      1. the correct way is to generate those yourself too.
        2. -
      2. the dangerous way is to ask libxml2 to add those blanks - toyourcontent modifying the content of your document - intheprocess. The result may not be what you expect. - ThereisNOway to guarantee that such a - modificationwon'taffect other parts of the content of your document. - See xmlKeepBlanksDefault()andxmlSaveFormatFile()
        3. +
      3. the dangerous way is to ask libxml2 to add those blanks to your + content modifying the content of your document in the + process. The result may not be what you expect. There is + NO way to guarantee that such a modification won't + affect other parts of the content of your document. See xmlKeepBlanksDefault + () and xmlSaveFormatFile + ()
    5. Extra nodes in the document:

      For a XML file as below:

      @@ -173,10 +180,10 @@ A:link, A:visited, A:active { text-decoration: underline } <NODE CommFlag="0"/> <NODE CommFlag="1"/> </PLAN> -

      after parsing it with - thefunctionpxmlDoc=xmlParseFile(...);

      -

      I want to the get the content of the first node (node - withtheCommFlag="0")

      +

      after parsing it with the function + pxmlDoc=xmlParseFile(...);

      +

      I want to the get the content of the first node (node with the + CommFlag="0")

      so I did it as following;

      xmlNodePtr pnode;
 pnode=pxmlDoc->children->children;
      @@ -184,62 +191,63 @@ pnode=pxmlDoc->children->children; 
      pnode=pxmlDoc->children->children->next;

      then it works. Can someone explain it to me.

      -

      In XML all characters in the content of the document - aresignificantincluding blanks and formatting - linebreaks.

      -

      The extra nodes you are wondering about are just that, text - nodeswiththe formatting spaces which are part of the document but that - peopletendto forget. There is a function xmlKeepBlanksDefault()toremove - those at parse time, but that's an heuristic, and itsuse should belimited - to cases where you are certain there is nomixed-content in - thedocument.

      +

      In XML all characters in the content of the document are significant + including blanks and formatting line breaks.

      +

      The extra nodes you are wondering about are just that, text nodes with + the formatting spaces which are part of the document but that people tend + to forget. There is a function xmlKeepBlanksDefault + () to remove those at parse time, but that's an heuristic, and its + use should be limited to cases where you are certain there is no + mixed-content in the document.

      6. -
    6. I get compilation errors of existing code like - whenaccessingrootor child - fieldsofnodes. -

      You are compiling code developed for libxml version 1 and - usingalibxml2 development environment. Either switch back to libxml v1 - develoreven better fix the code to compile with libxml2 (or both) by following the instructions.

      +
    7. I get compilation errors of existing code like when accessing + root or child fields of nodes. +

      You are compiling code developed for libxml version 1 and using a + libxml2 development environment. Either switch back to libxml v1 devel or + even better fix the code to compile with libxml2 (or both) by following the instructions.

      8. -
    8. I get compilation errors about - nonexistingxmlRootNodeorxmlChildrenNodefields. -

      The source code you are using has been upgradedto be able to compile with both - libxmlandlibxml2, but you need to install a more recent - version:libxml(-devel)>= 1.8.8 or libxml2(-devel) >= 2.1.0

      +
    9. I get compilation errors about non existing + xmlRootNode or xmlChildrenNode + fields. +

      The source code you are using has been upgraded to be able to compile with both libxml + and libxml2, but you need to install a more recent version: + libxml(-devel) >= 1.8.8 or libxml2(-devel) >= 2.1.0

    10. XPath implementation looks seriously broken -

      XPath implementation prior to 2.3.0 was really incomplete. Upgrade - toarecent version, there are no known bugs in the current version.

      +

      XPath implementation prior to 2.3.0 was really incomplete. Upgrade to + a recent version, there are no known bugs in the current version.

    11. The example provided in the web page does not compile. -

      It's hard to maintain the documentation in sync with - thecode<grin/> ...

      -

      Check the previous points 1/ and 2/ raised before, and - pleasesendpatches.

      +

      It's hard to maintain the documentation in sync with the code + <grin/> ...

      +

      Check the previous points 1/ and 2/ raised before, and please send + patches.

      12. -
    12. Where can I get more examples and information than provided - ontheweb page? -

      Ideally a libxml2 book would be nice. I have no such plan ... - Butyoucan:

      -
      • check more deeply the existinggenerated doc
        • -
      • have a look at the - setofexamples.
        • -
      • look for examples of use for libxml2 function using the - Gnomecode.For example the following will query the full Gnome CVS - base fortheuse of the xmlAddChild()function: +
      • Where can I get more examples and information than provided on the + web page? +

        Ideally a libxml2 book would be nice. I have no such plan ... But you + can:

        +
        • check more deeply the existing + generated doc
          • +
        • have a look at the set of + examples.
          • +
        • look for examples of use for libxml2 function using the Gnome code. + For example the following will query the full Gnome CVS base for the + use of the xmlAddChild() function:

          http://cvs.gnome.org/lxr/search?string=xmlAddChild

          -

          This may be slow, a large hardware donation to the - gnomeprojectcould cure this :-)

          +

          This may be slow, a large hardware donation to the gnome project + could cure this :-)

          • -
        • Browsethelibxml2 - source, I try to write code as clean and documentedaspossible, so - looking at it may be helpful. In particular the codeofxmllint.c and - of the various testXXX.c test programs shouldprovidegood examples of - how to do things with the library.
          • +
        • 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 + of xmllint.c and of the various testXXX.c test programs should + provide good examples of how to do things with the library.
      • What about C++ ? -

        libxml2 is written in pure C in order to allow easy reuse on anumberof - platforms, including embedded systems. I don't intend to converttoC++.

        +

        libxml2 is written in pure C in order to allow easy reuse on a number + of platforms, including embedded systems. I don't intend to convert to + C++.

        There is however a C++ wrapper which may fulfill your needs:

      • How to validate a document a posteriori ? -

        It is possible to validate documents which had not been - validatedatinitial parsing time or documents which have been built - fromscratchusing the API. Use the xmlValidateDtd()function.It - is also possible to simply add a DTD to an existingdocument:

        +

        It is possible to validate documents which had not been validated at + initial parsing time or documents which have been built from scratch + using the API. Use the xmlValidateDtd() + function. It is also possible to simply add a DTD to an existing + document:

        xmlDocPtr doc; /* your existing document */
 xmlDtdPtr dtd = xmlParseDTD(NULL, filename_of_dtd); /* parse the DTD */
 
@@ -268,10 +277,10 @@ xmlDtdPtr dtd = xmlParseDTD(NULL, filename_of_dtd); /* parse the DTD */
      • So what is this funky "xmlChar" used all the time? -

        It is a null terminated sequence of utf-8 characters. And - onlyutf-8!You need to convert strings encoded in different ways to - utf-8beforepassing them to the API. This can be accomplished with the - iconvlibraryfor instance.

        +

        It is a null terminated sequence of utf-8 characters. And only utf-8! + You need to convert strings encoded in different ways to utf-8 before + passing them to the API. This can be accomplished with the iconv library + for instance.

      • etc ...

    Daniel Veillard

    diff --git a/doc/Makefile.in b/doc/Makefile.in index 70bd86e..56ec810 100644 --- a/doc/Makefile.in +++ b/doc/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/doc/XMLinfo.html b/doc/XMLinfo.html index 5314fac..474f9c1 100644 --- a/doc/XMLinfo.html +++ b/doc/XMLinfo.html @@ -7,9 +7,9 @@ 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 } -XML
    Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
    Made with Libxml2 Logo

    The XML C parser and toolkit of Gnome

    XML

    Main Menu
    Related links

    XML is astandardformarkup-based -structured documents. Here is an example -XMLdocument:

    <?xml version="1.0"?>
+XML
    Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
    Made with Libxml2 Logo
    The XML C parser and toolkit of Gnome
    XML
    Main Menu
    Related links
    XML is a standard for
+markup-based structured documents. Here is an example XML
+document:
    <?xml version="1.0"?>
 <EXAMPLE prop1="gnome is great" prop2="&amp; linux too">
   <head>
    <title>Welcome to Gnome</title>
@@ -20,17 +20,16 @@ XMLdocument:
    <?xml version="1.0"?>
    <image href="linus.gif"/>
    <p>...</p>
   </chapter>
-</EXAMPLE>
    The first line specifies that it is an XML document and
-givesusefulinformation about its encoding.  Then the rest of the document is
-atextformat whose structure is specified by tags between
-brackets.Eachtag opened has to be closed. XML is pedantic
-about this.However, ifa tag is empty (no content), a single tag can serve as
-both theopening andclosing tag if it ends with />rather
-thanwith>. Note that, for example, the image tag has no
-content(justan attribute) and is closed by ending the tag
-with/>.
    XML can be applied successfully to a wide range of tasks, ranging
-fromlongterm structured document maintenance (where it follows the steps
-ofSGML) tosimple data encoding mechanisms like configuration file
-formatting(glade),spreadsheets (gnumeric), or even shorter lived documents
-such asWebDAV whereit is used to encode remote calls between a client and
-aserver.
    Daniel Veillard
    
+</EXAMPLE>

    The first line specifies that it is an XML document and gives useful +information about its encoding. Then the rest of the document is a text +format whose structure is specified by tags between brackets. Each +tag opened has to be closed. XML is pedantic about this. However, if +a tag is empty (no content), a single tag can serve as both the opening and +closing tag if it ends with /> rather than with +>. Note that, for example, the image tag has no content (just +an attribute) and is closed by ending the tag with />.

    XML can be applied successfully to a wide range of tasks, ranging from +long term structured document maintenance (where it follows the steps of +SGML) to simple data encoding mechanisms like configuration file formatting +(glade), spreadsheets (gnumeric), or even shorter lived documents such as +WebDAV where it is used to encode remote calls between a client and a +server.

    Daniel Veillard

    diff --git a/doc/XSLT.html b/doc/XSLT.html index 4a8c09b..657ead3 100644 --- a/doc/XSLT.html +++ b/doc/XSLT.html @@ -7,8 +7,7 @@ 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 } -XSLT
    Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
    Made with Libxml2 Logo

    The XML C parser and toolkit of Gnome

    XSLT

    Main Menu
    Related links

    Check the separate libxslt page

    XSL Transformations, is -alanguagefor transforming XML documents into other XML documents -(orHTML/textualoutput).

    A separate library called libxslt is available implementing -XSLT-1.0forlibxml2. This module "libxslt" too can be found in the Gnome CVS -base.

    You can check the progresses on the libxslt Changelog.

    Daniel Veillard

    +XSLT
    Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
    Made with Libxml2 Logo

    The XML C parser and toolkit of Gnome

    XSLT

    Main Menu
    Related links

    Check the separate libxslt page

    XSL Transformations, is a +language for transforming XML documents into other XML documents (or +HTML/textual output).

    A separate library called libxslt is available implementing XSLT-1.0 for +libxml2. This module "libxslt" too can be found in the Gnome CVS base.

    You can check the progresses on the libxslt Changelog.

    Daniel Veillard

    diff --git a/doc/apibuild.py b/doc/apibuild.py index f1a795f..1e73725 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -49,6 +49,7 @@ ignored_files = { "runtest.c": "regression tests program", "runsuite.c": "regression tests program", "tst.c": "not part of the library", + "test.c": "not part of the library", "testdso.c": "test for dynamid shared libraries", } diff --git a/doc/architecture.html b/doc/architecture.html index 7809bc6..906c5b2 100644 --- a/doc/architecture.html +++ b/doc/architecture.html @@ -7,8 +7,8 @@ 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 } -libxml2 architecture
    Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
    Made with Libxml2 Logo

    The XML C parser and toolkit of Gnome

    libxml2 architecture

    Developer Menu
    API Indexes
    Related links

    Libxml2 is made of multiple components; some of them are optional, -andmostof the block interfaces are public. The main components are:

    • an Input/Output layer
      • +libxml2 architecture
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo

      The XML C parser and toolkit of Gnome

      libxml2 architecture

      Developer Menu
      API Indexes
      Related links

      Libxml2 is made of multiple components; some of them are optional, and +most of the block interfaces are public. The main components are:

      • an Input/Output layer
      • FTP and HTTP client layers (optional)
      • an Internationalization layer managing the encodings support
      • a URI module
        • @@ -17,6 +17,7 @@ andmostof the block interfaces are public. The main components are:

        • a
        • a SAX tree module to build an in-memory DOM representation
        • a tree module to manipulate the DOM representation
        • a validation module using the DOM representation (optional)
          • -
        • an XPath module for global lookup in a DOM representation(optional)
          • +
        • an XPath module for global lookup in a DOM representation + (optional)
        • a debug module (optional)

        Graphically this gives the following:

        a graphical view of the various

        Daniel Veillard

      diff --git a/doc/bugs.html b/doc/bugs.html index c755d00..6415c85 100644 --- a/doc/bugs.html +++ b/doc/bugs.html @@ -7,62 +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 } -Reporting bugs and getting help
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo

      The XML C parser and toolkit of Gnome

      Reporting bugs and getting help

      Main Menu
      Related links

      Well, bugs or missing features are always possible, and I will make -apointof fixing them in a timely fashion. The best way to report a bug is -touse theGnomebugtracking -database(make sure to use the "libxml2" module name). Ilook atreports -there regularly and it's good to have a reminder when a bugis stillopen. Be -sure to specify that the bug is for the package libxml2.

      For small problems you can try to get help on IRC, the #xml -channelonirc.gnome.org (port 6667) usually have a few person subscribed which -mayhelp(but there is no garantee and if a real issue is raised it should go -onthemailing-list for archival).

      There is also a mailing-list xml@gnome.orgfor libxml, with an on-line archive(old). To subscribe to this -list,pleasevisit the associatedWebpage -andfollow the instructions. Do not send code, I won'tdebug -it(but patches are really appreciated!).

      Please note that with the current amount of virus and SPAM, sending -mailtothe list without being subscribed won't work. There is *far too -manybounces*(in the order of a thousand a day !) I cannot approve them -manuallyanymore.If your mail to the list bounced waiting for administrator -approval,it isLOST ! Repost it and fix the problem triggering the error. Also -pleasenotethat emails -withalegal warning asking to not copy or redistribute freely the -informationstheycontainare NOTacceptable for the -mailing-list,suchmail will as much as possible be discarded automatically, -and are lesslikelyto be answered if they made it to the list, DO -NOTpost tothe list from an email address where such legal -requirements areautomaticallyadded, get private paying support if you can't -shareinformations.

      Check the following beforeposting:

      • Read the FAQand usethesearch engineto get information related to - your problem.
        • -
      • Make sure you are using - arecentversion, and that the problem still shows up in a - recentversion.
        • -
      • Check the listarchivesto see if - theproblem was reported already. In this casethere is probably a - fixavailable, similarly check the registeredopenbugs.
        • -
      • Make sure you can reproduce the bug with xmllint or one of - thetestprograms found in source in the distribution.
        • -
      • Please send the command showing the error as well as the input - (asanattachment)
        • -

      Then send the bug with associated information to reproduce it to the xml@gnome.orglist; if it's -reallylibxmlrelated I will approve it. Please do not send mail to me -directly, itmakesthings really hard to track and in some cases I am not the -best persontoanswer a given question, ask on the list.

      To be really clear about support:

      • Support or help requests MUST be senttothe - list or on bugzillain case of problems, so that theQuestionand - Answers can be shared publicly. Failing to do so carries - theimplicitmessage "I want free support but I don't want to share - thebenefits withothers" and is not welcome. I will automatically - Carbon-Copythexml@gnome.org mailing list for any technical reply made - about libxml2orlibxslt.
        • -
      • There is no garantee of - support,ifyour question remains unanswered after a week, repost - it, making sureyougave all the detail needed and the information - requested.
        • -
      • Failing to provide information as requested or double checking - firstforprior feedback also carries the implicit message "the time of - thelibrarymaintainers is less valuable than my time" and might not - bewelcome.
        • -

      Of course, bugs reported with a suggested patch for fixing -themwillprobably be processed faster than those without.

      If you're looking for help, a quick look at the list -archivemayactuallyprovide the answer. I usually send source samples when -answeringlibxml2usage questions. The auto-generateddocumentationisnot -as polished as I would like (i need to learn moreabout DocBook), butit's a -good starting point.

      Daniel Veillard

      +Reporting bugs and getting help
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo

      The XML C parser and toolkit of Gnome

      Reporting bugs and getting help

      Main Menu
      Related links

      Well, bugs or missing features are always possible, and I will make a +point of fixing them in a timely fashion. The best way to report a bug is to +use the Gnome +bug tracking database (make sure to use the "libxml2" module name). I +look at reports there regularly and it's good to have a reminder when a bug +is still open. Be sure to specify that the bug is for the package libxml2.

      For small problems you can try to get help on IRC, the #xml channel on +irc.gnome.org (port 6667) usually have a few person subscribed which may help +(but there is no garantee and if a real issue is raised it should go on the +mailing-list for archival).

      There is also a mailing-list xml@gnome.org for libxml, with an on-line archive (old). To subscribe to this list, +please visit the associated Web page and +follow the instructions. Do not send code, I won't debug it +(but patches are really appreciated!).

      Please note that with the current amount of virus and SPAM, sending mail +to the list without being subscribed won't work. There is *far too many +bounces* (in the order of a thousand a day !) I cannot approve them manually +anymore. If your mail to the list bounced waiting for administrator approval, +it is LOST ! Repost it and fix the problem triggering the error. Also please +note that emails with +a legal warning asking to not copy or redistribute freely the informations +they contain are NOT acceptable for the mailing-list, +such mail will as much as possible be discarded automatically, and are less +likely to be answered if they made it to the list, DO NOT +post to the list from an email address where such legal requirements are +automatically added, get private paying support if you can't share +informations.

      Check the following before +posting:

      • Read the FAQ and use the + search engine to get information related to your problem.
        • +
      • Make sure you are using a recent + version, and that the problem still shows up in a recent version.
        • +
      • Check the list + archives to see if the problem was reported already. In this case + there is probably a fix available, similarly check the registered + open bugs.
        • +
      • Make sure you can reproduce the bug with xmllint or one of the test + programs found in source in the distribution.
        • +
      • Please send the command showing the error as well as the input (as an + attachment)
        • +

      Then send the bug with associated information to reproduce it to the xml@gnome.org list; if it's really libxml +related I will approve it. Please do not send mail to me directly, it makes +things really hard to track and in some cases I am not the best person to +answer a given question, ask on the list.

      To be really clear about support:

      • Support or help requests MUST be sent to + the list or on bugzilla in case of problems, so that the Question + and Answers can be shared publicly. Failing to do so carries the implicit + message "I want free support but I don't want to share the benefits with + others" and is not welcome. I will automatically Carbon-Copy the + xml@gnome.org mailing list for any technical reply made about libxml2 or + libxslt.
        • +
      • There is no garantee of support, if + your question remains unanswered after a week, repost it, making sure you + gave all the detail needed and the information requested.
        • +
      • Failing to provide information as requested or double checking first + for prior feedback also carries the implicit message "the time of the + library maintainers is less valuable than my time" and might not be + welcome.
        • +

      Of course, bugs reported with a suggested patch for fixing them will +probably be processed faster than those without.

      If you're looking for help, a quick look at the list archive may actually +provide the answer. I usually send source samples when answering libxml2 +usage questions. The auto-generated documentation is +not as polished as I would like (i need to learn more about DocBook), but +it's a good starting point.

      Daniel Veillard

      diff --git a/doc/catalog.html b/doc/catalog.html index 34f9902..4100fed 100644 --- a/doc/catalog.html +++ b/doc/catalog.html @@ -14,78 +14,77 @@ A:link, A:visited, A:active { text-decoration: underline }
    • How to tune catalog usage
    • How to debug catalog processing
    • How to create and maintain catalogs
      • -
    • The implementor corner quick review - oftheAPI
      • +
    • The implementor corner quick review of the + API
    • Other resources
      • -

      General overview

      What is a catalog? Basically it's a lookup mechanism used when an -entity(afile or a remote resource) references another entity. The catalog -lookupisinserted between the moment the reference is recognized by the -software(XMLparser, stylesheet processing, or even images referenced for -inclusionin arendering) and the time where loading that resource is -actuallystarted.

      It is basically used for 3 things:

      • mapping from "logical" names, the public identifiers and a - moreconcretename usable for download (and URI). For example it can - associatethelogical name +

        General overview

        What is a catalog? Basically it's a lookup mechanism used when an entity +(a file or a remote resource) references another entity. The catalog lookup +is inserted between the moment the reference is recognized by the software +(XML parser, stylesheet processing, or even images referenced for inclusion +in a rendering) and the time where loading that resource is actually +started.

        It is basically used for 3 things:

        • mapping from "logical" names, the public identifiers and a more + concrete name usable for download (and URI). For example it can associate + the logical name

          "-//OASIS//DTD DocBook XML V4.1.2//EN"

          -

          of the DocBook 4.1.2 XML DTD with the actual URL where it - canbedownloaded

          +

          of the DocBook 4.1.2 XML DTD with the actual URL where it can be + downloaded

          http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd

          • -
        • remapping from a given URL to another one, like an - HTTPindirectionsaying that +
        • remapping from a given URL to another one, like an HTTP indirection + saying that

          "http://www.oasis-open.org/committes/tr.xsl"

          should really be looked at

          "http://www.oasis-open.org/committes/entity/stylesheets/base/tr.xsl"

          • -
        • providing a local cache mechanism allowing to load - theentitiesassociated to public identifiers or remote resources, this is - areallyimportant feature for any significant deployment of XML or - SGMLsince itallows to avoid the aleas and delays associated to - fetchingremoteresources.
          • -

        The definitions

        Libxml, as of 2.4.3 implements 2 kind of catalogs:

        • the older SGML catalogs, the official spec is SGML - OpenTechnicalResolution TR9401:1997, but is better understood by reading - the SP - CatalogpagefromJames Clark. This is relatively old and not the - preferredmode ofoperation of libxml.
          • -
        • XMLCatalogsisfar - more flexible, more recent, uses an XML syntax andshould scale - quitebetter. This is the default option of libxml.
          • -

        Using catalog

        In a normal environment libxml2 will by default check the presence -ofacatalog in /etc/xml/catalog, and assuming it has been -correctlypopulated,the processing is completely transparent to the document -user. Totake aconcrete example, suppose you are authoring a DocBook document, -thisonestarts with the following DOCTYPE definition:

        <?xml version='1.0'?>
+  
      • providing a local cache mechanism allowing to load the entities
+    associated to public identifiers or remote resources, this is a really
+    important feature for any significant deployment of XML or SGML since it
+    allows to avoid the aleas and delays associated to fetching remote
+    resources.
        • 
+

      The definitions

      Libxml, as of 2.4.3 implements 2 kind of catalogs:

      • the older SGML catalogs, the official spec is SGML Open Technical + Resolution TR9401:1997, but is better understood by reading the SP Catalog page from + James Clark. This is relatively old and not the preferred mode of + operation of libxml.
        • +
      • XML + Catalogs is far more flexible, more recent, uses an XML syntax and + should scale quite better. This is the default option of libxml.
        • +

      Using catalog

      In a normal environment libxml2 will by default check the presence of a +catalog in /etc/xml/catalog, and assuming it has been correctly populated, +the processing is completely transparent to the document user. To take a +concrete example, suppose you are authoring a DocBook document, this one +starts with the following DOCTYPE definition:

      <?xml version='1.0'?>
 <!DOCTYPE book PUBLIC "-//Norman Walsh//DTD DocBk XML V3.1.4//EN"
-          "http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd">

      When validating the document with libxml, the catalog will -beautomaticallyconsulted to lookup the public identifier "-//Norman -Walsh//DTDDocBk XMLV3.1.4//EN" and the -systemidentifier"http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd", and if -theseentities havebeen installed on your system and the catalogs actually -point tothem, libxmlwill fetch them from the local disk.

      Note: Really don't usethisDOCTYPE -example it's a really old version, but is fine as an example.

      Libxml2 will check the catalog each time that it is requested to -loadanentity, this includes DTD, external parsed entities, stylesheets, etc -...Ifyour system is correctly configured all the authoring phase -andprocessingshould use only local files, even if your document stays -portablebecause ituses the canonical public and system ID, referencing the -remotedocument.

      Some examples:

      Here is a couple of fragments from XML Catalogs used in -libxml2earlyregression tests in test/catalogs:

      <?xml version="1.0"?>
+          "http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd">

      When validating the document with libxml, the catalog will be +automatically consulted to lookup the public identifier "-//Norman Walsh//DTD +DocBk XML V3.1.4//EN" and the system identifier +"http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd", and if these entities have +been installed on your system and the catalogs actually point to them, libxml +will fetch them from the local disk.

      Note: Really don't use this +DOCTYPE example it's a really old version, but is fine as an example.

      Libxml2 will check the catalog each time that it is requested to load an +entity, this includes DTD, external parsed entities, stylesheets, etc ... If +your system is correctly configured all the authoring phase and processing +should use only local files, even if your document stays portable because it +uses the canonical public and system ID, referencing the remote document.

      Some examples:

      Here is a couple of fragments from XML Catalogs used in libxml2 early +regression tests in test/catalogs :

      <?xml version="1.0"?>
 <!DOCTYPE catalog PUBLIC 
    "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
    "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
   <public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
    uri="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/>
-...

      This is the beginning of a catalog for DocBook 4.1.2, XML -Catalogsarewritten in XML, there is a specific namespace for -catalogelements"urn:oasis:names:tc:entity:xmlns:xml:catalog". The first entry -inthiscatalog is a publicmapping it allows to associate -aPublicIdentifier with an URI.

      ...
+...

      This is the beginning of a catalog for DocBook 4.1.2, XML Catalogs are +written in XML, there is a specific namespace for catalog elements +"urn:oasis:names:tc:entity:xmlns:xml:catalog". The first entry in this +catalog is a public mapping it allows to associate a Public +Identifier with an URI.

      ...
     <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/"
                    rewritePrefix="file:///usr/share/xml/docbook/"/>
-...

      A rewriteSystemis a very powerful instruction, it saysthatany -URI starting with a given prefix should be looked at anotherURIconstructed by -replacing the prefix with an new one. In effect this actslikea cache system -for a full area of the Web. In practice it is extremelyusefulwith a file -prefix if you have installed a copy of those resources onyourlocal system.

      ...
+...

      A rewriteSystem is a very powerful instruction, it says that +any URI starting with a given prefix should be looked at another URI +constructed by replacing the prefix with an new one. In effect this acts like +a cache system for a full area of the Web. In practice it is extremely useful +with a file prefix if you have installed a copy of those resources on your +local system.

      ...
 <delegatePublic publicIdStartString="-//OASIS//DTD XML Catalog //"
                 catalog="file:///usr/share/xml/docbook.xml"/>
 <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML"
@@ -96,21 +95,21 @@ prefix if you have installed a copy of those resources onyourlocal system.
      Delegation is the core features which allows to build a tree
-ofcatalogs,easier to maintain than a single catalog, based on
-PublicIdentifier, SystemIdentifier or URI prefixes it instructs the
-catalogsoftware to look upentries in another resource. This feature allow to
-buildhierarchies ofcatalogs, the set of entries presented should be
-sufficient toredirect theresolution of all DocBook references to the specific
-catalogin/usr/share/xml/docbook.xmlthis one in turn could
-delegateallreferences for DocBook 4.2.1 to a specific catalog installed at
-the sametimeas the DocBook resources on the local machine.
      How to tune catalog usage:
      The user can change the default catalog behaviour by redirecting
-queriestoits own set of catalogs, this can be done by
-settingtheXML_CATALOG_FILESenvironment variable to a list of
-catalogs,anempty one should deactivate loading the
-default/etc/xml/catalogdefault catalog
      How to debug catalog processing:
      Setting up the XML_DEBUG_CATALOGenvironment variable
-willmakelibxml2 output debugging informations for each catalog
-operations,forexample:
      orchis:~/XML -> xmllint --memory --noout test/ent2
+...
      Delegation is the core features which allows to build a tree of catalogs,
+easier to maintain than a single catalog, based on Public Identifier, System
+Identifier or URI prefixes it instructs the catalog software to look up
+entries in another resource. This feature allow to build hierarchies of
+catalogs, the set of entries presented should be sufficient to redirect the
+resolution of all DocBook references to the specific catalog in
+/usr/share/xml/docbook.xml this one in turn could delegate all
+references for DocBook 4.2.1 to a specific catalog installed at the same time
+as the DocBook resources on the local machine.
      How to tune catalog usage:
      The user can change the default catalog behaviour by redirecting queries
+to its 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
      How to debug catalog processing:
      Setting up the XML_DEBUG_CATALOG environment variable will
+make libxml2 output debugging informations for each catalog operations, for
+example:
      orchis:~/XML -> xmllint --memory --noout test/ent2
 warning: failed to load external entity "title.xml"
 orchis:~/XML -> export XML_DEBUG_CATALOG=
 orchis:~/XML -> xmllint --memory --noout test/ent2
@@ -118,26 +117,26 @@ Failed to parse catalog /etc/xml/catalog
 Failed to parse catalog /etc/xml/catalog
 warning: failed to load external entity "title.xml"
 Catalogs cleanup
-orchis:~/XML -> 
      The test/ent2 references an entity, running the parser from memorymakesthe
-base URI unavailable and the the "title.xml" entity cannot beloaded.Setting
-up the debug environment variable allows to detect that anattempt ismade to
-load the /etc/xml/catalogbut since it's notpresent theresolution
-fails.
      But the most advanced way to debug XML catalog processing is to
-usethexmlcatalogcommand shipped with libxml2, it allows
-toloadcatalogs and make resolution queries to see what is going on. This
-isalsoused for the regression tests:
      orchis:~/XML -> ./xmlcatalog test/catalogs/docbook.xml \
+orchis:~/XML -> 
      The test/ent2 references an entity, running the parser from memory makes
+the base URI unavailable and the the "title.xml" entity cannot be loaded.
+Setting up the debug environment variable allows to detect that an attempt is
+made to load the /etc/xml/catalog but since it's not present the
+resolution fails.
      But the most advanced way to debug XML catalog processing is to use the
+xmlcatalog command shipped with libxml2, it allows to load
+catalogs and make resolution queries to see what is going on. This is also
+used for the regression tests:
      orchis:~/XML -> ./xmlcatalog test/catalogs/docbook.xml \
                    "-//OASIS//DTD DocBook XML V4.1.2//EN"
 http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
-orchis:~/XML -> 
      For debugging what is going on, adding one -v flags increase
-theverbositylevel to indicate the processing done (adding a second flag
-alsoindicatewhat elements are recognized at parsing):
      orchis:~/XML -> ./xmlcatalog -v test/catalogs/docbook.xml \
+orchis:~/XML -> 
      For debugging what is going on, adding one -v flags increase the verbosity
+level to indicate the processing done (adding a second flag also indicate
+what elements are recognized at parsing):
      orchis:~/XML -> ./xmlcatalog -v test/catalogs/docbook.xml \
                    "-//OASIS//DTD DocBook XML V4.1.2//EN"
 Parsing catalog test/catalogs/docbook.xml's content
 Found public match -//OASIS//DTD DocBook XML V4.1.2//EN
 http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
 Catalogs cleanup
-orchis:~/XML -> 
      A shell interface is also available to debug and process
-multiplequeries(and for regression tests):
      orchis:~/XML -> ./xmlcatalog -shell test/catalogs/docbook.xml \
+orchis:~/XML -> 
      A shell interface is also available to debug and process multiple queries
+(and for regression tests):
      orchis:~/XML -> ./xmlcatalog -shell test/catalogs/docbook.xml \
                    "-//OASIS//DTD DocBook XML V4.1.2//EN"
 > help   
 Commands available:
@@ -153,18 +152,18 @@ exit:  quit the shell
 > public "-//OASIS//DTD DocBook XML V4.1.2//EN"
 http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
 > quit
-orchis:~/XML -> 
      This should be sufficient for most debugging purpose, this wasactuallyused
-heavily to debug the XML Catalog implementation itself.
      How to create and maintaincatalogs:
      Basically XML Catalogs are XML files, you can either use XML toolstomanage
-them or use  xmlcatalogfor this. The basic stepisto create a
-catalog the -create option provide this facility:
      orchis:~/XML -> ./xmlcatalog --create tst.xml
+orchis:~/XML -> 
      This should be sufficient for most debugging purpose, this was actually
+used heavily to debug the XML Catalog implementation itself.
      How to create and maintain catalogs:
      Basically XML Catalogs are XML files, you can either use XML tools to
+manage them or use  xmlcatalog for this. The basic step is
+to create a catalog the -create option provide this facility:
      orchis:~/XML -> ./xmlcatalog --create tst.xml
 <?xml version="1.0"?>
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
          "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/>
-orchis:~/XML -> 
      By default xmlcatalog does not overwrite the original catalog and
-savetheresult on the standard output, this can be overridden using
-the-nooutoption. The -addcommand allows to add entries
-inthecatalog:
      orchis:~/XML -> ./xmlcatalog --noout --create --add "public" \
+orchis:~/XML -> 
      By default xmlcatalog does not overwrite the original catalog and save the
+result on the standard output, this can be overridden using the -noout
+option. The -add command allows to add entries in the
+catalog:
      orchis:~/XML -> ./xmlcatalog --noout --create --add "public" \
   "-//OASIS//DTD DocBook XML V4.1.2//EN" \
   http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd tst.xml
 orchis:~/XML -> cat tst.xml
@@ -175,80 +174,83 @@ orchis:~/XML -> cat tst.xml
 <public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
         uri="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/>
 </catalog>
-orchis:~/XML -> 
      The -addoption will always take 3 parameters even if
-someofthe XML Catalog constructs (like nextCatalog) will have only
-asingleargument, just pass a third empty string, it will be ignored.
      Similarly the -deloption remove matching entries
-fromthecatalog:
      orchis:~/XML -> ./xmlcatalog --del \
+orchis:~/XML -> 
      The -add option will always take 3 parameters even if some of
+the XML Catalog constructs (like nextCatalog) will have only a single
+argument, just pass a third empty string, it will be ignored.
      Similarly the -del option remove matching entries from the
+catalog:
      orchis:~/XML -> ./xmlcatalog --del \
   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" tst.xml
 <?xml version="1.0"?>
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
     "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/>
-orchis:~/XML -> 
      The catalog is now empty. Note that the matching
-of-delisexact and would have worked in a similar fashion with
-thePublic IDstring.
      This is rudimentary but should be sufficient to manage a not
-toocomplexcatalog tree of resources.
      The implementor corner quick review
-oftheAPI:
      First, and like for every other module of libxml, there is
-anautomaticallygenerated API page
-forcatalogsupport.
      The header for the catalog interfaces should be included as:
      #include <libxml/catalog.h>
      The API is voluntarily kept very simple. First it is not
-obviousthatapplications really need access to it since it is the default
-behaviouroflibxml2 (Note: it is possible to completely override libxml2
-defaultcatalogby using xmlSetExternalEntityLoadertoplug
-anapplication specific resolver).
      Basically libxml2 support 2 catalog lists:
      • the default one, global shared by all the application
        • 
-  
      • a per-document catalog, this one is built if the document
-    usestheoasis-xml-catalogPIs to specify its own catalog list,
-    itisassociated to the parser context and destroyed when the
-    parsingcontextis destroyed.
        • 
-
      the document one will be used first if it exists.
      Initialization routines:
      xmlInitializeCatalog(), xmlLoadCatalog() and xmlLoadCatalogs()
-shouldbeused at startup to initialize the catalog, if the catalog
-shouldbeinitialized with specific values xmlLoadCatalog() 
-orxmlLoadCatalogs()should be called before xmlInitializeCatalog() which
-wouldotherwise do adefault initialization first.
      The xmlCatalogAddLocal() call is used by the parser to grow thedocumentown
-catalog list if needed.
      Preferences setup:
      The XML Catalog spec requires the possibility to select
-defaultpreferencesbetween  public and system
-delegation,xmlCatalogSetDefaultPrefer() allowsthis, xmlCatalogSetDefaults()
-andxmlCatalogGetDefaults() allow to control  ifXML Catalogs resolution
-shouldbe forbidden, allowed for global catalog, fordocument catalog or both,
-thedefault is to allow both.
      And of course xmlCatalogSetDebug() allows to generate
-debugmessages(through the xmlGenericError() mechanism).
      Querying routines:
      xmlCatalogResolve(),
-xmlCatalogResolveSystem(),xmlCatalogResolvePublic()and xmlCatalogResolveURI()
-are relatively explicitif you read the XMLCatalog specification they
-correspond to section 7algorithms, they shouldalso work if you have loaded an
-SGML catalog with asimplified semantic.
      xmlCatalogLocalResolve() and xmlCatalogLocalResolveURI() are the
-samebutoperate on the document catalog list
      Cleanup and Miscellaneous:
      xmlCatalogCleanup() free-up the global catalog, xmlCatalogFreeLocal()isthe
-per-document equivalent.
      xmlCatalogAdd() and xmlCatalogRemove() are used to dynamically
-modifythefirst catalog in the global list, and xmlCatalogDump() allows to
-dumpacatalog state, those routines are primarily designed for xmlcatalog,
-I'mnotsure that exposing more complex interfaces (like navigation ones)
-wouldbereally useful.
      The xmlParseCatalogFile() is a function used to load XML Catalogfiles,it's
-similar as xmlParseFile() except it bypass all catalog lookups,it'sprovided
-because this functionality may be useful for client tools.
      threaded environments:
      Since the catalog tree is built progressively, some care has been
-takentotry to avoid troubles in multithreaded environments. The code is
-nowthreadsafe assuming that the libxml2 library has been compiled
-withthreadssupport.
      Other resources
      The XML Catalog specification is relatively recent so there
-isn'tmuchliterature to point at:
      • You can find a good rant from Norm Walsh about theneedfor
-    catalogs, it provides a lot of context informations even ifIdon't
-    agree with everything presented. Norm also wrote a morerecentarticle XMLentitiesand
-    URI resolversdescribing them.
        • 
-  
      • An oldXMLcatalog
-    proposalfrom John Cowan
        • 
-  
      • The Resource
-    DirectoryDescriptionLanguage(RDDL) another catalog system but more
-    orientedtowardproviding metadata for XML namespaces.
        • 
-  
      • the page from the OASIS Technical Committee
-    onEntityResolutionwho maintains XML Catalog, you will find pointers
-    tothespecification update, some background and pointers to
-    otherstoolsproviding XML Catalog support
        • 
-  
      • There is a shell scriptto
-    generateXMLCatalogs for DocBook 4.1.2 . If it can write to the
-    /etc/xml/directory,it will set-up /etc/xml/catalog and /etc/xml/docbook
-    based ontheresources found on the system. Otherwise it will just
-    create~/xmlcatalogand ~/dbkxmlcatalog and doing:
+orchis:~/XML ->

      The catalog is now empty. Note that the matching of -del is +exact and would have worked in a similar fashion with the Public ID +string.

      This is rudimentary but should be sufficient to manage a not too complex +catalog tree of resources.

      The implementor corner quick review of the +API:

      First, and like for every other module of libxml, there is an +automatically generated API page for +catalog support.

      The header for the catalog interfaces should be included as:

      #include <libxml/catalog.h>

      The API is voluntarily kept very simple. First it is not obvious that +applications really need access to it since it is the default behaviour of +libxml2 (Note: it is possible to completely override libxml2 default catalog +by using xmlSetExternalEntityLoader to +plug an application specific resolver).

      Basically libxml2 support 2 catalog lists:

      • the default one, global shared by all the application
        • +
      • a per-document catalog, this one is built if the document uses the + oasis-xml-catalog PIs to specify its own catalog list, it is + associated to the parser context and destroyed when the parsing context + is destroyed.
        • +

      the document one will be used first if it exists.

      Initialization routines:

      xmlInitializeCatalog(), xmlLoadCatalog() and xmlLoadCatalogs() should be +used at startup to initialize the catalog, if the catalog should be +initialized with specific values xmlLoadCatalog() or xmlLoadCatalogs() +should be called before xmlInitializeCatalog() which would otherwise do a +default initialization first.

      The xmlCatalogAddLocal() call is used by the parser to grow the document +own catalog list if needed.

      Preferences setup:

      The XML Catalog spec requires the possibility to select default +preferences between public and system delegation, +xmlCatalogSetDefaultPrefer() allows this, xmlCatalogSetDefaults() and +xmlCatalogGetDefaults() allow to control if XML Catalogs resolution should +be forbidden, allowed for global catalog, for document catalog or both, the +default is to allow both.

      And of course xmlCatalogSetDebug() allows to generate debug messages +(through the xmlGenericError() mechanism).

      Querying routines:

      xmlCatalogResolve(), xmlCatalogResolveSystem(), xmlCatalogResolvePublic() +and xmlCatalogResolveURI() are relatively explicit if you read the XML +Catalog specification they correspond to section 7 algorithms, they should +also work if you have loaded an SGML catalog with a simplified semantic.

      xmlCatalogLocalResolve() and xmlCatalogLocalResolveURI() are the same but +operate on the document catalog list

      Cleanup and Miscellaneous:

      xmlCatalogCleanup() free-up the global catalog, xmlCatalogFreeLocal() is +the per-document equivalent.

      xmlCatalogAdd() and xmlCatalogRemove() are used to dynamically modify the +first catalog in the global list, and xmlCatalogDump() allows to dump a +catalog state, those routines are primarily designed for xmlcatalog, I'm not +sure that exposing more complex interfaces (like navigation ones) would be +really useful.

      The xmlParseCatalogFile() is a function used to load XML Catalog files, +it's similar as xmlParseFile() except it bypass all catalog lookups, it's +provided because this functionality may be useful for client tools.

      threaded environments:

      Since the catalog tree is built progressively, some care has been taken to +try to avoid troubles in multithreaded environments. The code is now thread +safe assuming that the libxml2 library has been compiled with threads +support.

      Other resources

      The XML Catalog specification is relatively recent so there isn't much +literature to point at:

      • You can find a good rant from Norm Walsh about the + need for catalogs, it provides a lot of context informations even if + I don't agree with everything presented. Norm also wrote a more recent + article XML + entities and URI resolvers describing them.
        • +
      • An old XML + catalog proposal from John Cowan
        • +
      • The Resource Directory Description + Language (RDDL) another catalog system but more oriented toward + providing metadata for XML namespaces.
        • +
      • the page from the OASIS Technical Committee on Entity + Resolution who maintains XML Catalog, you will find pointers to the + specification update, some background and pointers to others tools + providing XML Catalog support
        • +
      • There is a shell script to generate + XML Catalogs for DocBook 4.1.2 . If it can write to the /etc/xml/ + directory, it will set-up /etc/xml/catalog and /etc/xml/docbook based on + the resources found on the system. Otherwise it will just create + ~/xmlcatalog and ~/dbkxmlcatalog and doing:

        export XML_CATALOG_FILES=$HOME/xmlcatalog

        -

        should allow to process DocBook documentations withoutrequiringnetwork - accesses for the DTD or stylesheets

        +

        should allow to process DocBook documentations without requiring + network accesses for the DTD or stylesheets

        • -
      • I have uploaded asmalltarballcontaining - XML Catalogs for DocBook 4.1.2 which seemsto workfine for me too
        • -
      • The xmlcatalogmanualpage
        • -

      If you have suggestions for corrections or additions, simply contactme:

      Daniel Veillard

    +
  • I have uploaded a + small tarball containing XML Catalogs for DocBook 4.1.2 which seems + to work fine for me too
    • +
  • The xmlcatalog + manual page
    • +

    If you have suggestions for corrections or additions, simply contact +me:

    Daniel Veillard

    diff --git a/doc/contribs.html b/doc/contribs.html index 2163d60..e493eb3 100644 --- a/doc/contribs.html +++ b/doc/contribs.html @@ -7,29 +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 } -Contributions
    Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
    Made with Libxml2 Logo

    The XML C parser and toolkit of Gnome

    Contributions

    Main Menu
    Related links
    • Bjorn Reese, William Brack and Thomas Broyer have provided a - numberofpatches, Gary Pennington worked on the validation API, - threadingsupportand Solaris port.
      • +Contributions
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo

      The XML C parser and toolkit of Gnome

      Contributions

      Main Menu
      Related links

      Daniel Veillard

      diff --git a/doc/devhelp/Makefile.in b/doc/devhelp/Makefile.in index 83b5866..0e0e053 100644 --- a/doc/devhelp/Makefile.in +++ b/doc/devhelp/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@ diff --git a/doc/devhelp/libxml2-HTMLparser.html b/doc/devhelp/libxml2-HTMLparser.html index 3a4a67d..827da39 100644 --- a/doc/devhelp/libxml2-HTMLparser.html +++ b/doc/devhelp/libxml2-HTMLparser.html @@ -95,6 +95,7 @@ void htmlFreeParserCtxt (htmlDocPtr htmlReadFile (const char * filename,
      const char * encoding,
      int options); htmlDocPtr htmlCtxtReadFile (htmlParserCtxtPtr ctxt,
      const char * filename,
      const char * encoding,
      int options); int htmlParseDocument (htmlParserCtxtPtr ctxt); +htmlParserCtxtPtr htmlNewParserCtxt (void); htmlDocPtr htmlSAXParseDoc (xmlChar * cur,
      const char * encoding,
      htmlSAXHandlerPtr sax,
      void * userData); int htmlCtxtUseOptions (htmlParserCtxtPtr ctxt,
      int options); htmlDocPtr htmlParseDoc (xmlChar * cur,
      const char * encoding); @@ -294,6 +295,10 @@ int htmlCtxtUseOptions (

      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
      +
      +

      htmlNewParserCtxt ()

      htmlParserCtxtPtr	htmlNewParserCtxt	(void)
      
+

      Allocate and initialize a new parser context.

      +
      Returns:the htmlParserCtxtPtr or NULL in case of allocation error

      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)

      diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html index bc7e54e..c12cd02 100644 --- a/doc/devhelp/libxml2-parser.html +++ b/doc/devhelp/libxml2-parser.html @@ -219,6 +219,7 @@ void xmlSetExternalEntityLoader (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 */ };

      @@ -301,7 +302,7 @@ 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 */ + 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) */ };

      @@ -553,7 +554,7 @@ void xmlSetExternalEntityLoader (

      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.
      +
      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.

      xmlInitNodeInfoSeq ()

      void	xmlInitNodeInfoSeq		(xmlParserNodeInfoSeqPtr seq)

      -- Initialize (set to initial state) node info sequence

      diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html index d7757e3..70c6e50 100644 --- a/doc/devhelp/libxml2-tree.html +++ b/doc/devhelp/libxml2-tree.html @@ -187,6 +187,7 @@ void xmlSetDocCompressMode (xmlNodePtr xmlCopyNode (const xmlNodePtr node,
      int extended); void xmlUnlinkNode (xmlNodePtr cur); const xmlChar * xmlSplitQName3 (const xmlChar * name,
      int * len); +typedef xmlNsPtr xmlDOMWrapAcquireNsFunction (xmlDOMWrapCtxtPtr ctxt,
      xmlNodePtr node,
      const xmlChar * nsName,
      const xmlChar * nsPrefix); xmlNodePtr xmlDocSetRootElement (xmlDocPtr doc,
      xmlNodePtr root); long xmlGetLineNo (xmlNodePtr node); const xmlChar * xmlBufferContent (const xmlBufferPtr buf); @@ -385,7 +386,10 @@ void xmlFreeNsList (

      Structure xmlDOMWrapCtxt

      struct _xmlDOMWrapCtxt {
-    void *	_private
+    void *	_private	: * The type of this context, just in case we need specialized * context
+    int	type	: * Internal namespace map used for various operations. *
+    void *	namespaceMap	: * Use this one to acquire an xmlNsPtr intended for node->ns. * (Note t
+    xmlDOMWrapAcquireNsFunction	getNsForNodeFunc
 } xmlDOMWrapCtxt;

      @@ -563,6 +567,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 } xmlEntity;

      @@ -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;

      @@ -868,6 +874,10 @@ void xmlFreeNsList (

      Typedef xmlSAXLocatorPtr

      xmlSAXLocator * 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.

      +

      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.

      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.

      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.

      +

      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.

      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.

      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
      +
      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

      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
      diff --git a/doc/devhelp/libxml2-xmlversion.html b/doc/devhelp/libxml2-xmlversion.html index dcf26f8..6a3a089 100644 --- a/doc/devhelp/libxml2-xmlversion.html +++ b/doc/devhelp/libxml2-xmlversion.html @@ -73,6 +73,7 @@ #define LIBXML_UNICODE_ENABLED; #define LIBXML_FTP_ENABLED; #define LIBXML_AUTOMATA_ENABLED; +#define LIBXML_ZLIB_ENABLED; #define LIBXML_WRITER_ENABLED; #define LIBXML_C14N_ENABLED; #define LIBXML_SCHEMAS_ENABLED; @@ -217,7 +218,7 @@ void xmlCheckVersion (int version);

      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
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo
      The XML C parser and toolkit of Gnome
      Developer Menu
      Developer Menu
      API Indexes
      Related links
      There are several on-line resources related to using libxml:
      1. Use the search engineto lookupinformation.
        2. 
+Developer Menu
        Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
        Made with Libxml2 Logo
        The XML C parser and toolkit of Gnome
        Developer Menu
        Developer Menu
        API Indexes
        Related links
        There are several on-line resources related to using libxml:
        1. Use the search engine to look up
+  information.
          2. 
   
        2. Check the FAQ.
          3. 
-  
        3. Check the extensivedocumentationautomaticallyextracted
-    from code comments.
          4. 
-  
        4. Look at the documentation about libxmlinternationalization support.
          5. 
-  
        5. This page provides a global overview and someexampleson how to use libxml.
          6. 
+  
        6. Check the extensive
+    documentation automatically extracted from code comments.
          7. 
+  
        7. Look at the documentation about libxml
+    internationalization support.
          8. 
+  
        8. This page provides a global overview and some
+    examples on how to use libxml.
          9. 
   
        9. Code examples
          10. 
-  
        10. John Fleck's libxml2 tutorial: htmlorpdf.
          11. 
-  
        11. If you need to parse large files, check the xmlReaderAPI tutorial
          12. 
-  
        12. James Henstridgewrote somenicedocumentationexplaining
-    how to use the libxml SAX interface.
          13. 
-  
        13. George Lebl wrote anarticlefor
-    IBM developerWorksabout using libxml.
          14. 
-  
        14. Check theTODOfile.
          15. 
-  
        15. Read the 1.x to 2.x upgrade
-    pathdescription.If you are starting a new project using libxml you
-    shouldreally use the2.x version.
          16. 
+  
        16. John Fleck's libxml2 tutorial: html
+    or pdf.
          17. 
+  
        17. If you need to parse large files, check the xmlReader API tutorial
          18. 
+  
        18. James Henstridge wrote some nice
+    documentation explaining how to use the libxml SAX interface.
          19. 
+  
        19. George Lebl wrote an article
+    for IBM developerWorks about using libxml.
          20. 
+  
        20. Check the TODO
+    file.
          21. 
+  
        21. 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.
          22. 
   
        22. And don't forget to look at the mailing-list archive.
          23. 
 
        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
        Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
        Made with Libxml2 Logo
        The XML C parser and toolkit of Gnome
        Downloads
        Main Menu
        Related links
        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
          Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
          Made with Libxml2 Logo
          The XML C parser and toolkit of Gnome
          Downloads
          Main Menu
          Related links
          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:
          If you know other supported binary ports, please contact me.
          Snapshot:
          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:
          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
          Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
          Made with Libxml2 Logo
          The XML C parser and toolkit of Gnome
          Encodings support
          Main Menu
          Related links
          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:
          1. What does internationalization
-    supportmean?
            2. 
-  
          2. The internal encoding,
-  howandwhy
            3. 
+Encodings support
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            Encodings support
            Main Menu
            Related links
            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:
            1. What does internationalization support
+    mean ?
              2. 
+  
            2. The internal encoding, how and
+  why
              3. 
   
            3. How is it implemented ?
              4. 
   
            4. Default supported encodings
              5. 
-  
            5. How to extend theexistingsupport
              6. 
-
            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"?>
+  
          3. How to extend the existing
+  support
            4. 
+
            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"
+  
          4. it can also be saved in another encoding supported by libxml2 (for
+    example straight UTF8 or even an ASCII form)
            5. 
+
            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:
            1. 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
              2. 
-  
            2. 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.
              3. 
-  
            3. 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:
              1. 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
                2. 
+  
              2. 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.
                3. 
+  
              3. 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>
    ^
                
   
                4. 
-  
              4. 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:
+  
              5. 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"?>
                                              ^
                
   
                6. 
-  
              6. 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).
                7. 
-  
              7. The result (when using DOM) is an internal form completely in
-    UTF-8withjust an encoding information on the document node.
                8. 
-
              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:
              1. if no encoding is given, libxml2 will look for an
-    encodingvalueassociated to the document and if it exists will try to save
-    tothatencoding,
+  
              2. 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).
                3. 
+  
              3. The result (when using DOM) is an internal form completely in UTF-8
+    with just an encoding information on the document node.
                4. 
+
              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:
              1. 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
                
   
                2. 
-  
              2. 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
                3. 
-  
              3. 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.
                4. 
-  
              4. 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
                5. 
+  
              5. 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
                6. 
+  
              6. 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.
                7. 
+  
              7. 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
                8. 
 
              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):
              1. UTF-8 is supported by default (null handlers)
                2. 
+~/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):
            1. UTF-8 is supported by default (null handlers)
              2. 
   
            2. UTF-16, both little and big endian
              3. 
   
            3. ISO-Latin-1 (ISO-8859-1) covering most western languages
              4. 
   
            4. ASCII, useful mostly for saving
              5. 
-  
            5. HTML, a specific handler for the conversion of UTF-8 to ASCII
-    withHTMLpredefined entities like &copy; for the Copyright sign.
              6. 
-
            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
          Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
          Made with Libxml2 Logo
          The XML C parser and toolkit of Gnome
          Entities or no entities
          Developer Menu
          API Indexes
          Related links
          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
          Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
          Made with Libxml2 Logo
          The XML C parser and toolkit of Gnome
          Entities or no entities
          Developer Menu
          API Indexes
          Related links
          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
          Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
          Made with Libxml2 Logo
          The XML C parser and toolkit of Gnome
          A real example
          Developer Menu
          API Indexes
          Related links
          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
          Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
          Made with Libxml2 Logo
          The XML C parser and toolkit of Gnome
          A real example
          Developer Menu
          API Indexes
          Related links
          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
          Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
          Made with Libxml2 Logo
          The XML C parser and toolkit of Gnome
          How to help
          Main Menu
          Related links
          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:
          1. Provide patches when you find problems.
            2. 
-  
          2. Provide the diffs when you port libxml2 to a new platform. They
-    maynotbe integrated in all cases but help pinpointing
-    portabilityproblemsand
            3. 
-  
          3. Provide documentation fixes (either as patches to the code commentsoras
-    HTML diffs).
            4. 
-  
          4. Provide new documentations pieces (translations, examples, etc...).
            5. 
+How to help
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            How to help
            Main Menu
            Related links
            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:
            1. Provide patches when you find problems.
              2. 
+  
            2. 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
              3. 
+  
            3. Provide documentation fixes (either as patches to the code comments or
+    as HTML diffs).
              4. 
+  
            4. Provide new documentations pieces (translations, examples, etc
+  ...).
              5. 
   
            5. Check the TODO file and try to close one of the items.
              6. 
-  
            6. 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 :-)
              7. 
+  
            7. 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 :-)
              8. 
 
            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
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            Reference Manual for libxml2
            API Menu
            API Indexes
            Related links
            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
        Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
        Made with Libxml2 Logo
        Module xmlversion from libxml2
        API Menu
        API Indexes
        Related links
        PrevxmlunicodeUpAPI documentationHomeThe XML C parser and toolkit of GnomexmlwriterNext
        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
        Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
        Made with Libxml2 Logo
        Module xmlversion from libxml2
        API Menu
        API Indexes
        Related links
        PrevxmlunicodeUpAPI documentationHomeThe XML C parser and toolkit of GnomexmlwriterNext
        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:
        
                                   
-                                  
        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.
            • 
+                                  
                                   
            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
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            The SAX interface
            Developer Menu
            API Indexes
            Related links
            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
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            The SAX interface
            Developer Menu
            API Indexes
            Related links
            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
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            Introduction
            Main Menu
            Related links
            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:
            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
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            The parser interfaces
            Developer Menu
            API Indexes
            Related links
            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
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            The parser interfaces
            Developer Menu
            API Indexes
            Related links
            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
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            Namespaces
            Main Menu
            Related links
            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
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            Namespaces
            Main Menu
            Related links
            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
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo
            The XML C parser and toolkit of Gnome
            Releases
            Main Menu
            Related links
            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
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo
              The XML C parser and toolkit of Gnome
              Releases
              Main Menu
              Related links
              Items not finished and worked on, get in touch with the list if you want
+to help those
              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
              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
                            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
                                    • 
+    
-  
                                  • 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
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo
              The XML C parser and toolkit of Gnome
              Python and bindings
              Developer Menu
              API Indexes
              Related links
              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
                Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                Made with Libxml2 Logo
                The XML C parser and toolkit of Gnome
                Python and bindings
                Developer Menu
                API Indexes
                Related links
                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:
                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
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo
              The XML C parser and toolkit of Gnome
              Thread safety
              Developer Menu
              API Indexes
              Related links
              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:
              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
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo
              The XML C parser and toolkit of Gnome
              The tree output
              Developer Menu
              API Indexes
              Related links
              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):
               structure.gif 
              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
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo
              The XML C parser and toolkit of Gnome
              The tree output
              Developer Menu
              API Indexes
              Related links
              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):
               structure.gif 
              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
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo
              The XML C parser and toolkit of Gnome
              Upgrading 1.x code
              Developer Menu
              API Indexes
              Related links
              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:
              1. 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
                2. 
-  
              2. Node childsfield has
-    beenrenamedchildrenso s/childs/children/g should
-    beapplied(probability of having "childs" anywhere else is close to 0+
                3. 
-  
              3. 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.
                4. 
-  
              4. 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:
-    
                1. 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.
                  2. 
-      
                2. 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.
                  3. 
-    
                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
                Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                Made with Libxml2 Logo
                The XML C parser and toolkit of Gnome
                Upgrading 1.x code
                Developer Menu
                API Indexes
                Related links
                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:
                1. 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
                  2. 
+  
                2. 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+
                  3. 
+  
                3. 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.
                  4. 
+  
                4. 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:
+    
                  1. 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.
                    2. 
+      
                  2. 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.
                    3. 
+    
                  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.
                  
   
                  5. 
-  
                5. The include path has changed to $prefix/libxml/ and
-    theincludesthemselves uses this new prefix in includes instructions...
-    Ifyou areusing (as expected) the
+  
                6. 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
                  
   
                  7. 
-  
                7. xmlDetectCharEncoding takes an extra argument indicating the
-    lengthinbyte of the head of the document available for character
-    detection.
                  8. 
-
                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:
                1. similar include naming, one
-    shoulduse#include<libxml/...>in both cases.
                  2. 
-  
                2. similar identifiers defined via macros for the child and
-    rootfields:respectivelyxmlChildrenNodeandxmlRootNode
                  3. 
-  
                3. a new macro LIBXML_TEST_VERSIONwhich should
-    beinsertedonce in the client code
                  4. 
-
                So the roadmap to upgrade your existing libxml applications
-isthefollowing:
                1. install the  libxml-1.8.8 (and libxml-devel-1.8.8) packages
                  2. 
-  
                2. find all occurrences where the xmlDoc rootfield
-    isusedand change it to xmlRootNode
                  3. 
-  
                3. similarly find all occurrences where
-    thexmlNodechildsfield is used and change
-    ittoxmlChildrenNode
                  4. 
-  
                4. add a LIBXML_TEST_VERSIONmacro somewhere
-    inyourmain()or in the library init entry point
                  5. 
+  
                5. xmlDetectCharEncoding takes an extra argument indicating the length in
+    byte of the head of the document available for character detection.
                  6. 
+
                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:
                1. similar include naming, one should use
+    #include<libxml/...> in both cases.
                  2. 
+  
                2. similar identifiers defined via macros for the child and root fields:
+    respectively xmlChildrenNode and
+    xmlRootNode
                  3. 
+  
                3. a new macro LIBXML_TEST_VERSION which should be
+    inserted once in the client code
                  4. 
+
                So the roadmap to upgrade your existing libxml applications is the
+following:
                1. install the  libxml-1.8.8 (and libxml-devel-1.8.8) packages
                  2. 
+  
                2. find all occurrences where the xmlDoc root field is
+    used and change it to xmlRootNode
                  3. 
+  
                3. similarly find all occurrences where the xmlNode
+    childs field is used and change it to
+    xmlChildrenNode
                  4. 
+  
                4. add a LIBXML_TEST_VERSION macro somewhere in your
+    main() or in the library init entry point
                  5. 
   
                5. Recompile, check compatibility, it should still work
                  6. 
-  
                6. 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.
                  7. 
-  
                7. install libxml2-2.3.x and  libxml2-devel-2.3.x
-    (libxml-1.8.yandlibxml-devel-1.8.y can be kept simultaneously)
                  8. 
-  
                8. remove your config.cache, relaunch your configuration
-    mechanism,andrecompile, if steps 2 and 3 were done right it should
-    compileas-is
                  9. 
-  
                9. 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).
                  10. 
-
                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
                
+  
              5. 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.
                6. 
+  
              6. 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)
                7. 
+  
              7. remove your config.cache, relaunch your configuration mechanism, and
+    recompile, if steps 2 and 3 were done right it should compile as-is
                8. 
+  
              8. 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).
                9. 
+
              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:
              
 
 
-
              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:
              
 
 
-	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):
              (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):
                (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:
                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:
              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:
                1. The default entity loader
-    callsxmlNewInputFromFile()withthe parsing context and the
-    URIstring.
                  2. 
-  
                2. 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
                  3. 
-  
                3. the open() function of the handler is called and if
-    successfulwillreturn an I/O Input buffer
                  4. 
-  
                4. 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
                  5. 
-  
                5. if an encoding change is detected it will be installed on
-    theinputbuffer, providing buffering and efficient use of
-    theconversionroutines
                  6. 
-  
                6. once the parser has finished, the close() function of the
-    handleriscalled once and the Input buffer and associated
-    resourcesaredeallocated.
                  7. 
-
                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:
              1. The default entity loader calls xmlNewInputFromFile() with
+    the parsing context and the URI string.
                2. 
+  
              2. 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
                3. 
+  
              3. the open() function of the handler is called and if successful will
+    return an I/O Input buffer
                4. 
+  
              4. 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
                5. 
+  
              5. if an encoding change is detected it will be installed on the input
+    buffer, providing buffering and efficient use of the conversion
+  routines
                6. 
+  
              6. once the parser has finished, the close() function of the handler is
+    called once and the Input buffer and associated resources are
+  deallocated.
                7. 
+
              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:
              1. 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:
                1. 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 }
   
                2. Cleaning up after parsing
                  3. 
   
                3. Debugging routines
                  4. 
   
                4. General memory requirements
                  5. 
-
                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:
              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:
              1. write down the block number xxxx not allocated
                2. 
-  
              2. 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:
            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:
            1. write down the block number xxxx not allocated
              2. 
+  
            2. 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.
              
   
              3. 
-  
            3. run the program under a debugger and set a
-    breakpointonxmlMallocBreakpoint() a specific function called when this
-    preciseblockis allocated
              4. 
-  
            4. when the breakpoint is reached you can then do a fine analysis
-    oftheallocation an step  to see the condition resulting in
-    themissingdeallocation.
              5. 
-
            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