Load /tmp/tmp.QVLX5b/libxml2-2.6.10 intoupstream/2.6.10

packages/libxml2/branches/upstream/current.

8 files changed, 71 insertions, 23 deletions

diff --git a/include/libxml/SAX2.h b/include/libxml/SAX2.h
index f5cc53c..0ca019b 100644
--- a/include/libxml/SAX2.h
+++ b/include/libxml/SAX2.h
@@ -136,22 +136,6 @@ XMLPUBFUN void XMLCALL
 						 const xmlChar *target,
 						 const xmlChar *data);
 XMLPUBFUN void XMLCALL		
-		xmlSAX2GlobalNamespace		(void *ctx,
-						 const xmlChar *href,
-						 const xmlChar *prefix);
-XMLPUBFUN void XMLCALL		
-		xmlSAX2SetNamespace		(void *ctx,
-						 const xmlChar *name);
-XMLPUBFUN xmlNsPtr XMLCALL	
-		xmlSAX2GetNamespace		(void *ctx);
-XMLPUBFUN int XMLCALL		
-		xmlSAX2CheckNamespace		(void *ctx,
-						 xmlChar *nameSpace);
-XMLPUBFUN void XMLCALL		
-		xmlSAX2NamespaceDecl		(void *ctx,
-						 const xmlChar *href,
-						 const xmlChar *prefix);
-XMLPUBFUN void XMLCALL		
 		xmlSAX2Comment			(void *ctx,
 						 const xmlChar *value);
 XMLPUBFUN void XMLCALL		
diff --git a/include/libxml/schemasInternals.h b/include/libxml/schemasInternals.h
index 740747b..5f42ddf 100644
--- a/include/libxml/schemasInternals.h
+++ b/include/libxml/schemasInternals.h
@@ -49,6 +49,7 @@ typedef enum {
     XML_SCHEMA_TYPE_NOTATION,
     XML_SCHEMA_TYPE_LIST,
     XML_SCHEMA_TYPE_UNION,
+    XML_SCHEMA_TYPE_ANY_ATTRIBUTE,
     XML_SCHEMA_FACET_MININCLUSIVE = 1000,
     XML_SCHEMA_FACET_MINEXCLUSIVE,
     XML_SCHEMA_FACET_MAXINCLUSIVE,
diff --git a/include/libxml/valid.h b/include/libxml/valid.h
index 1ff3f0b..004bb90 100644
--- a/include/libxml/valid.h
+++ b/include/libxml/valid.h
@@ -363,7 +363,7 @@ XMLPUBFUN xmlElementPtr XMLCALL
 XMLPUBFUN int XMLCALL		
 		xmlValidGetValidElements(xmlNode *prev,
 					 xmlNode *next,
-					 const xmlChar **list,
+					 const xmlChar **names,
 					 int max);
 XMLPUBFUN int XMLCALL		
 		xmlValidGetPotentialChildren(xmlElementContent *ctree,
diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
index 58a7bb6..9c7dc33 100644
--- a/include/libxml/xmlIO.h
+++ b/include/libxml/xmlIO.h
@@ -158,6 +158,9 @@ struct _xmlOutputBuffer {
 XMLPUBFUN void XMLCALL	
 	xmlCleanupInputCallbacks		(void);
 
+XMLPUBFUN int XMLCALL
+	xmlPopInputCallbacks			(void);
+
 XMLPUBFUN void XMLCALL	
 	xmlRegisterDefaultInputCallbacks	(void);
 XMLPUBFUN xmlParserInputBufferPtr XMLCALL
@@ -240,6 +243,10 @@ XMLPUBFUN int XMLCALL
 XMLPUBFUN int XMLCALL	
 	xmlOutputBufferWriteString	(xmlOutputBufferPtr out,
 					 const char *str);
+XMLPUBFUN int XMLCALL	
+	xmlOutputBufferWriteEscape	(xmlOutputBufferPtr out,
+					 const xmlChar *str,
+					 xmlCharEncodingOutputFunc escaping);
 
 XMLPUBFUN int XMLCALL	
 	xmlOutputBufferFlush		(xmlOutputBufferPtr out);
diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h
index 777cd0d..048ecf3 100644
--- a/include/libxml/xmlerror.h
+++ b/include/libxml/xmlerror.h
@@ -547,8 +547,14 @@ typedef enum {
     XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI, /* 1770 */
     XML_SCHEMAP_NOT_SCHEMA, /* 1771 */
     XML_SCHEMAP_UNKNOWN_MEMBER_TYPE, /* 1772 */
-    XML_SCHEMAP_INVALID_ATTR_USE, /* 1723 */
-    XML_SCHEMAP_RECURSIVE, /* 1724 */
+    XML_SCHEMAP_INVALID_ATTR_USE, /* 1773 */
+    XML_SCHEMAP_RECURSIVE, /* 1774 */
+    XML_SCHEMAP_SUPERNUMEROUS_LIST_ITEM_TYPE, /* 1775 */
+    XML_SCHEMAP_INVALID_ATTR_COMBINATION, /* 1776 */
+    XML_SCHEMAP_INVALID_ATTR_INLINE_COMBINATION, /* 1777 */
+    XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD, /* 1778 */
+    XML_SCHEMAP_INVALID_ATTR_NAME, /* 1779 */
+    XML_SCHEMAP_REF_AND_CONTENT, /* 1780 */
     XML_SCHEMAV_NOROOT = 1800,
     XML_SCHEMAV_UNDECLAREDELEM, /* 1801 */
     XML_SCHEMAV_NOTTOPLEVEL, /* 1802 */
diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h
index 4e45201..de13041 100644
--- a/include/libxml/xmlreader.h
+++ b/include/libxml/xmlreader.h
@@ -21,6 +21,27 @@
 extern "C" {
 #endif
 
+/**
+ * xmlTextReaderMode:
+ *
+ * Internal state values for the reader.
+ */
+typedef enum {
+    XML_TEXTREADER_MODE_INITIAL = 0,
+    XML_TEXTREADER_MODE_INTERACTIVE = 1,
+    XML_TEXTREADER_MODE_ERROR = 2,
+    XML_TEXTREADER_MODE_EOF =3,
+    XML_TEXTREADER_MODE_CLOSED = 4,
+    XML_TEXTREADER_MODE_READING = 5
+} xmlTextReaderMode;
+
+/**
+ * xmlParserProperties:
+ *
+ * Some common options to use with xmlTextReaderSetParserProp, but it
+ * is better to use xmlParserOption and the xmlReaderNewxxx and 
+ * xmlReaderForxxx APIs now.
+ */
 typedef enum {
     XML_PARSER_LOADDTD = 1,
     XML_PARSER_DEFAULTATTRS = 2,
@@ -28,6 +49,12 @@ typedef enum {
     XML_PARSER_SUBST_ENTITIES = 4
 } xmlParserProperties;
 
+/**
+ * xmlParserSeverities:
+ *
+ * How severe an error callback is when the per-reader error callback API
+ * is used.
+ */
 typedef enum {
     XML_PARSER_SEVERITY_VALIDITY_WARNING = 1,
     XML_PARSER_SEVERITY_VALIDITY_ERROR = 2,
@@ -35,6 +62,11 @@ typedef enum {
     XML_PARSER_SEVERITY_ERROR = 4
 } xmlParserSeverities;
 
+/**
+ * xmlReaderTypes:
+ *
+ * Predefined constants for the different types of nodes.
+ */
 typedef enum {
     XML_READER_TYPE_NONE = 0,
     XML_READER_TYPE_ELEMENT = 1,
@@ -56,7 +88,18 @@ typedef enum {
     XML_READER_TYPE_XML_DECLARATION = 17
 } xmlReaderTypes;
 
+/**
+ * xmlTextReader:
+ *
+ * Structure for an xmlReader context.
+ */
 typedef struct _xmlTextReader xmlTextReader;
+
+/**
+ * xmlTextReaderPtr:
+ *
+ * Pointer to an xmlReader context.
+ */
 typedef xmlTextReader *xmlTextReaderPtr;
 
 /*
diff --git a/include/libxml/xmlsave.h b/include/libxml/xmlsave.h
index 1d43a71..d83038e 100644
--- a/include/libxml/xmlsave.h
+++ b/include/libxml/xmlsave.h
@@ -12,6 +12,7 @@
 
 #include <libxml/xmlversion.h>
 #include <libxml/tree.h>
+#include <libxml/encoding.h>
 #include <libxml/xmlIO.h>
 
 #ifdef LIBXML_OUTPUT_ENABLED
@@ -52,6 +53,12 @@ XMLPUBFUN int XMLCALL
 		xmlSaveFlush		(xmlSaveCtxtPtr ctxt);
 XMLPUBFUN int XMLCALL
 		xmlSaveClose		(xmlSaveCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlSaveSetEscape	(xmlSaveCtxtPtr ctxt,
+					 xmlCharEncodingOutputFunc escape);
+XMLPUBFUN int XMLCALL
+		xmlSaveSetAttrEscape	(xmlSaveCtxtPtr ctxt,
+					 xmlCharEncodingOutputFunc escape);
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h
index cd7b26d..a2ab03d 100644
--- a/include/libxml/xmlversion.h
+++ b/include/libxml/xmlversion.h
@@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.6.9"
+#define LIBXML_DOTTED_VERSION "2.6.10"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXML_VERSION 20609
+#define LIBXML_VERSION 20610
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXML_VERSION_STRING "20609"
+#define LIBXML_VERSION_STRING "20610"
 
 /**
  * LIBXML_TEST_VERSION:
@@ -51,7 +51,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(20609);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20610);
 
 #ifndef VMS
 #if 0