XInclude and other stuff while travelling. Contributed patches:

- tree.[ch] xinclude.[ch] xmllint.c configure.in valid.c
  debugXML.c xmlversion.h.in: Started adding XInclude support,
  this is a new xmllint option
- tree.c xpath.c: applied TOM patches for XPath
- xpointer.c: fixed a couple of errors.
- uri.c: added an escaping function needed for xinclude
- testXPath.c hash.c HTMLtree.c: minor cleanups raised by
  new warning from RH70 gcc's version
Daniel

1 files changed, 11 insertions, 0 deletions

diff --git a/debugXML.c b/debugXML.c
index 4a1ce5b4..9764885f 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -559,6 +559,7 @@ void xmlDebugDumpOneNode(FILE *output, xmlNodePtr node, int depth) {
 	    fprintf(output, "DOCUMENT_FRAG\n");
 	    break;
 	case XML_NOTATION_NODE:
+	    fprintf(output, shift);
 	    fprintf(output, "NOTATION\n");
 	    break;
 	case XML_DTD_NODE:
@@ -576,6 +577,14 @@ void xmlDebugDumpOneNode(FILE *output, xmlNodePtr node, int depth) {
         case XML_NAMESPACE_DECL:
 	    xmlDebugDumpNamespace(output, (xmlNsPtr) node, depth);
 	    return;
+        case XML_XINCLUDE_START:
+	    fprintf(output, shift);
+	    fprintf(output, "INCLUDE START\n");
+	    return;
+        case XML_XINCLUDE_END:
+	    fprintf(output, shift);
+	    fprintf(output, "INCLUDE END\n");
+	    return;
 	default:
 	    fprintf(output, shift);
 	    fprintf(output, "NODE_%d !!!\n", node->type);
@@ -917,6 +926,8 @@ static int xmlLsCountNode(xmlNodePtr node) {
         case XML_ATTRIBUTE_DECL:
         case XML_ENTITY_DECL:
 	case XML_NAMESPACE_DECL:
+	case XML_XINCLUDE_START:
+	case XML_XINCLUDE_END:
 	    ret = 1;
 	    break;
     }