Load /tmp/tmp.BmUFjT/libxml2-2.6.13 intoupstream/2.6.13

packages/libxml2/branches/upstream/current.

14 files changed, 317 insertions, 93 deletions

diff --git a/include/Makefile.in b/include/Makefile.in
index 87438c3..bdc1a97 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -78,6 +78,8 @@ CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_EXTRA_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@
+CYGWIN_EXTRA_PYTHON_LIBADD = @CYGWIN_EXTRA_PYTHON_LIBADD@
 DEBUG_OBJ = @DEBUG_OBJ@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -110,6 +112,7 @@ LIBXML_MAJOR_VERSION = @LIBXML_MAJOR_VERSION@
 LIBXML_MICRO_VERSION = @LIBXML_MICRO_VERSION@
 LIBXML_MINOR_VERSION = @LIBXML_MINOR_VERSION@
 LIBXML_VERSION = @LIBXML_VERSION@
+LIBXML_VERSION_EXTRA = @LIBXML_VERSION_EXTRA@
 LIBXML_VERSION_INFO = @LIBXML_VERSION_INFO@
 LIBXML_VERSION_NUMBER = @LIBXML_VERSION_NUMBER@
 LN_S = @LN_S@
@@ -127,6 +130,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATTERN_TEST = @PATTERN_TEST@
+PERL = @PERL@
 PYTHON = @PYTHON@
 PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@
diff --git a/include/libxml/Makefile.in b/include/libxml/Makefile.in
index 416fa98..8b5a631 100644
--- a/include/libxml/Makefile.in
+++ b/include/libxml/Makefile.in
@@ -76,6 +76,8 @@ CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_EXTRA_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@
+CYGWIN_EXTRA_PYTHON_LIBADD = @CYGWIN_EXTRA_PYTHON_LIBADD@
 DEBUG_OBJ = @DEBUG_OBJ@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -108,6 +110,7 @@ LIBXML_MAJOR_VERSION = @LIBXML_MAJOR_VERSION@
 LIBXML_MICRO_VERSION = @LIBXML_MICRO_VERSION@
 LIBXML_MINOR_VERSION = @LIBXML_MINOR_VERSION@
 LIBXML_VERSION = @LIBXML_VERSION@
+LIBXML_VERSION_EXTRA = @LIBXML_VERSION_EXTRA@
 LIBXML_VERSION_INFO = @LIBXML_VERSION_INFO@
 LIBXML_VERSION_NUMBER = @LIBXML_VERSION_NUMBER@
 LN_S = @LN_S@
@@ -125,6 +128,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATTERN_TEST = @PATTERN_TEST@
+PERL = @PERL@
 PYTHON = @PYTHON@
 PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 2826c2b..cc6fae1 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -915,6 +915,12 @@ XMLPUBFUN int XMLCALL
 					 int depth,
 					 const xmlChar *string,
 					 xmlNodePtr *lst);
+XMLPUBFUN xmlParserErrors XMLCALL
+		xmlParseInNodeContext	(xmlNodePtr node,
+					 const char *data,
+					 int datalen,
+					 int options,
+					 xmlNodePtr *lst);
 XMLPUBFUN int XMLCALL          
 		xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc,
                      xmlSAXHandlerPtr sax,
@@ -1065,7 +1071,8 @@ typedef enum {
     XML_PARSE_NONET	= 1<<11,/* Forbid network access */
     XML_PARSE_NODICT	= 1<<12,/* Do not reuse the context dictionnary */
     XML_PARSE_NSCLEAN	= 1<<13,/* remove redundant namespaces declarations */
-    XML_PARSE_NOCDATA	= 1<<14 /* merge CDATA as text nodes */
+    XML_PARSE_NOCDATA	= 1<<14,/* merge CDATA as text nodes */
+    XML_PARSE_NOXINCNODE= 1<<15 /* do not generate XINCLUDE START/END nodes */
 } xmlParserOption;
 
 XMLPUBFUN void XMLCALL
diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h
index 7e4503d..57c4b17 100644
--- a/include/libxml/parserInternals.h
+++ b/include/libxml/parserInternals.h
@@ -286,7 +286,7 @@ XMLPUBFUN int XMLCALL
 /* internal error reporting */
 XMLPUBFUN void XMLCALL
 			__xmlErrEncoding	(xmlParserCtxtPtr ctxt,
-						 xmlParserErrors error,
+						 xmlParserErrors xmlerr,
 						 const char *msg,
 						 const xmlChar * str1,
 						 const xmlChar * str2);
diff --git a/include/libxml/schemasInternals.h b/include/libxml/schemasInternals.h
index 8433499..6aa8dd6 100644
--- a/include/libxml/schemasInternals.h
+++ b/include/libxml/schemasInternals.h
@@ -209,13 +209,25 @@ struct _xmlSchemaAnnot {
  * allow elements in no namespace
  */
 #define XML_SCHEMAS_ATTR_GLOBAL        1 << 0
-
 /**
  * XML_SCHEMAS_ATTR_NSDEFAULT:
  *
  * allow elements in no namespace
  */
 #define XML_SCHEMAS_ATTR_NSDEFAULT	1 << 7
+/**
+ * XML_SCHEMAS_ATTR_NSDEFAULT:
+ *
+ * this is set when the "type" and "ref" references 
+ * have been resolved.
+ */
+#define XML_SCHEMAS_ATTR_INTERNAL_RESOLVED	1 << 8
+/**
+ * XML_SCHEMAS_ATTR_FIXED:
+ *
+ * the attribute has a fixed value
+ */
+#define XML_SCHEMAS_ATTR_FIXED	1 << 9
 
 /**
  * xmlSchemaAttribute:
@@ -226,22 +238,23 @@ typedef struct _xmlSchemaAttribute xmlSchemaAttribute;
 typedef xmlSchemaAttribute *xmlSchemaAttributePtr;
 struct _xmlSchemaAttribute {
     xmlSchemaTypeType type;	/* The kind of type */
-    struct _xmlSchemaAttribute *next;/* the next attribute if in a group ... */
-    const xmlChar *name;
+    struct _xmlSchemaAttribute *next;/* the next attribute if in a group ... */ 
+    const xmlChar *name; /* name of the declaration or empty if particle */
     const xmlChar *id;
-    const xmlChar *ref;
-    const xmlChar *refNs;
-    const xmlChar *typeName;
-    const xmlChar *typeNs;
+    const xmlChar *ref; /* the local name of the attribute decl. if a particle */
+    const xmlChar *refNs; /* the ns URI of the attribute decl. if a particle */
+    const xmlChar *typeName; /* the local name of the type definition */
+    const xmlChar *typeNs; /* the ns URI of the type definition */
     xmlSchemaAnnotPtr annot;
 
-    xmlSchemaTypePtr base;
+    xmlSchemaTypePtr base; /* obsolete, not used */
     int occurs;
     const xmlChar *defValue;
-    xmlSchemaTypePtr subtypes;
+    xmlSchemaTypePtr subtypes; /* the type definition */
     xmlNodePtr node;
-    const xmlChar *targetNamespace;
+    const xmlChar *targetNamespace; 
     int flags;
+    const xmlChar *refPrefix;
 };
 
 /**
@@ -327,6 +340,7 @@ struct _xmlSchemaAttributeGroup {
     xmlNodePtr node;
     int flags;
     xmlSchemaWildcardPtr attributeWildcard;
+    const xmlChar *refPrefix;
 };
 
 /**
@@ -467,7 +481,7 @@ struct _xmlSchemaType {
     xmlSchemaContentType contentType;
     const xmlChar *base;
     const xmlChar *baseNs;
-    xmlSchemaTypePtr baseType;
+    xmlSchemaTypePtr baseType; 
     xmlSchemaFacetPtr facets;
     struct _xmlSchemaType *redef;/* possible redefinitions for the type */
     int recurse;
@@ -476,6 +490,8 @@ struct _xmlSchemaType {
     int builtInType;
     xmlSchemaTypeLinkPtr memberTypes;
     xmlSchemaFacetLinkPtr facetSet;
+    const xmlChar *refPrefix;
+    xmlSchemaTypePtr contentTypeDef;
 };
 
 /*
@@ -535,6 +551,62 @@ struct _xmlSchemaType {
  * Obsolete, not used anymore.
  */
 #define XML_SCHEMAS_ELEM_NSDEFAULT	1 << 7
+/**
+ * XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
+ *
+ * this is set when "type", "ref", "substitutionGroup"
+ * references have been resolved.
+ */
+#define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED	1 << 8
+ /**
+ * XML_SCHEMAS_ELEM_CIRCULAR
+ *
+ * a helper flag for the search of circular references.
+ */
+#define XML_SCHEMAS_ELEM_CIRCULAR	1 << 9
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_ABSENT:
+ *
+ * the "block" attribute is absent
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_ABSENT	1 << 10
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_EXTENSION:
+ *
+ * disallowed substitutions are absent
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_EXTENSION	1 << 11
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_RESTRICTION:
+ *
+ * disallowed substitutions: "restriction"
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_RESTRICTION	1 << 12
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION:
+ *
+ * disallowed substitutions: "substituion"
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION	1 << 13
+/**
+ * XML_SCHEMAS_ELEM_FINAL_ABSENT:
+ *
+ * substitution group exclusions are absent
+ */
+#define XML_SCHEMAS_ELEM_FINAL_ABSENT	1 << 14
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_EXTENSION:
+ *
+ * substitution group exclusions: "extension"
+ */
+#define XML_SCHEMAS_ELEM_FINAL_EXTENSION	1 << 15
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_RESTRICTION:
+ *
+ * substitution group exclusions: "restriction"
+ */
+#define XML_SCHEMAS_ELEM_FINAL_RESTRICTION	1 << 16
+
 
 typedef struct _xmlSchemaElement xmlSchemaElement;
 typedef xmlSchemaElement *xmlSchemaElementPtr;
@@ -543,10 +615,10 @@ struct _xmlSchemaElement {
     struct _xmlSchemaType *next;/* the next type if in a sequence ... */
     const xmlChar *name;
     const xmlChar *id;
-    const xmlChar *ref;
-    const xmlChar *refNs;
+    const xmlChar *ref; /* the local name of the element declaration if a particle */
+    const xmlChar *refNs; /* the ns URI of the element declaration if a particle */
     xmlSchemaAnnotPtr annot;
-    xmlSchemaTypePtr subtypes;
+    xmlSchemaTypePtr subtypes; /* the type definition */
     xmlSchemaAttributePtr attributes;
     xmlNodePtr node;
     int minOccurs;
@@ -560,9 +632,10 @@ struct _xmlSchemaElement {
     const xmlChar *substGroupNs;
     const xmlChar *scope;
     const xmlChar *value;
-    struct _xmlSchemaElement *refDecl;
+    struct _xmlSchemaElement *refDecl; /* the element declaration if a particle */
     xmlRegexpPtr contModel;
     xmlSchemaContentType contentType;
+    const xmlChar *refPrefix;
 };
 
 /*
@@ -620,40 +693,65 @@ struct _xmlSchemaNotation {
 /**
  * XML_SCHEMAS_QUALIF_ELEM:
  *
- * the shemas requires qualified elements
+ * the schema requires qualified elements
  */
 #define XML_SCHEMAS_QUALIF_ELEM		1 << 0
 /**
  * XML_SCHEMAS_QUALIF_ATTR:
  *
- * the shemas requires qualified attributes
+ * the schema requires qualified attributes
  */
 #define XML_SCHEMAS_QUALIF_ATTR	    1 << 1
 /**
  * XML_SCHEMAS_FINAL_DEFAULT_EXTENSION:
  *
- * the shema has "extension" in the set of finalDefault.
+ * the schema has "extension" in the set of finalDefault.
  */
 #define XML_SCHEMAS_FINAL_DEFAULT_EXTENSION	1 << 2
 /**
  * XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION:
  *
- * the shema has "restriction" in the set of finalDefault.
+ * the schema has "restriction" in the set of finalDefault.
  */
 #define XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION	    1 << 3
 /**
  * XML_SCHEMAS_FINAL_DEFAULT_LIST:
  *
- * the shema has "list" in the set of finalDefault.
+ * the cshema has "list" in the set of finalDefault.
  */
 #define XML_SCHEMAS_FINAL_DEFAULT_LIST	    1 << 4
 /**
  * XML_SCHEMAS_FINAL_DEFAULT_UNION:
  *
- * the shema has "union" in the set of finalDefault.
+ * the schema has "union" in the set of finalDefault.
  */
 #define XML_SCHEMAS_FINAL_DEFAULT_UNION	    1 << 5
 /**
+ * XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION:
+ *
+ * the schema has "extension" in the set of blockDefault.
+ */
+#define XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION	    1 << 6
+/**
+ * XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION:
+ *
+ * the schema has "restriction" in the set of blockDefault.
+ */
+#define XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION	    1 << 7
+/**
+ * XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION:
+ *
+ * the schema has "substitution" in the set of blockDefault.
+ */
+#define XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION	    1 << 8
+/**
+ * XML_SCHEMAS_INCLUDING_CONVERT_NS:
+ *
+ * the schema is currently including an other schema with
+ * no target namespace.
+ */
+#define XML_SCHEMAS_INCLUDING_CONVERT_NS	    1 << 9
+/**
  * _xmlSchema:
  *
  * A Schemas definition
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index 470151d..7615ff2 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -585,18 +585,18 @@ XMLPUBFUN void XMLCALL
 XMLPUBFUN int XMLCALL		
 		xmlBufferDump		(FILE *file,
 					 xmlBufferPtr buf);
-XMLPUBFUN void XMLCALL		
+XMLPUBFUN int XMLCALL		
 		xmlBufferAdd		(xmlBufferPtr buf,
 					 const xmlChar *str,
 					 int len);
-XMLPUBFUN void XMLCALL		
+XMLPUBFUN int XMLCALL		
 		xmlBufferAddHead	(xmlBufferPtr buf,
 					 const xmlChar *str,
 					 int len);
-XMLPUBFUN void XMLCALL		
+XMLPUBFUN int XMLCALL		
 		xmlBufferCat		(xmlBufferPtr buf,
 					 const xmlChar *str);
-XMLPUBFUN void XMLCALL	
+XMLPUBFUN int XMLCALL	
 		xmlBufferCCat		(xmlBufferPtr buf,
 					 const char *str);
 XMLPUBFUN int XMLCALL		
diff --git a/include/libxml/valid.h b/include/libxml/valid.h
index ec34ef0..a734902 100644
--- a/include/libxml/valid.h
+++ b/include/libxml/valid.h
@@ -30,7 +30,9 @@ typedef xmlValidState *xmlValidStatePtr;
 
 /**
  * xmlValidityErrorFunc:
- * @ctx:  an xmlValidCtxtPtr validity error context
+ * @ctx:  usually an xmlValidCtxtPtr to a validity error context,
+ *        but comes from ctxt->userData (which normally contains such
+ *        a pointer); ctxt->userData can be changed by the user.
  * @msg:  the string to format *printf like vararg
  * @...:  remaining arguments to the format
  *
@@ -43,7 +45,9 @@ typedef void (*xmlValidityErrorFunc) (void *ctx,
 
 /**
  * xmlValidityWarningFunc:
- * @ctx:  an xmlValidCtxtPtr validity error context
+ * @ctx:  usually an xmlValidCtxtPtr to a validity error context,
+ *        but comes from ctxt->userData (which normally contains such
+ *        a pointer); ctxt->userData can be changed by the user.
  * @msg:  the string to format *printf like vararg
  * @...:  remaining arguments to the format
  *
diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h
index 513c244..2b72abc 100644
--- a/include/libxml/xmlerror.h
+++ b/include/libxml/xmlerror.h
@@ -618,6 +618,34 @@ typedef enum {
     XML_SCHEMAV_CVC_COMPLEX_TYPE_2_2, /* 1841 */
     XML_SCHEMAV_CVC_COMPLEX_TYPE_2_3, /* 1842 */
     XML_SCHEMAV_CVC_COMPLEX_TYPE_2_4, /* 1843 */
+    XML_SCHEMAV_CVC_ELT_1, /* 1844 */
+    XML_SCHEMAV_CVC_ELT_2, /* 1845 */
+    XML_SCHEMAV_CVC_ELT_3_1,
+    XML_SCHEMAV_CVC_ELT_3_2_1,
+    XML_SCHEMAV_CVC_ELT_3_2_2,
+    XML_SCHEMAV_CVC_ELT_4_1,
+    XML_SCHEMAV_CVC_ELT_4_2,
+    XML_SCHEMAV_CVC_ELT_4_3,
+    XML_SCHEMAV_CVC_ELT_5_1_1,
+    XML_SCHEMAV_CVC_ELT_5_1_2,
+    XML_SCHEMAV_CVC_ELT_5_2_1,  
+    XML_SCHEMAV_CVC_ELT_5_2_2_1,
+    XML_SCHEMAV_CVC_ELT_5_2_2_2_1,
+    XML_SCHEMAV_CVC_ELT_5_2_2_2_2,
+    XML_SCHEMAV_CVC_ELT_6,
+    XML_SCHEMAV_CVC_ELT_7,
+    XML_SCHEMAV_CVC_ATTRIBUTE_1,
+    XML_SCHEMAV_CVC_ATTRIBUTE_2,
+    XML_SCHEMAV_CVC_ATTRIBUTE_3,
+    XML_SCHEMAV_CVC_ATTRIBUTE_4,
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_1,
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_1,
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_2,
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_4,
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_1,
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_2,
+    XML_SCHEMAV_ELEMENT_CONTENT, /* 1846 non-W3C */
+    XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING, /* non-W3C */
     XML_XPTR_UNKNOWN_SCHEME = 1900, 
     XML_XPTR_CHILDSEQ_START, /* 1901 */
     XML_XPTR_EVAL_FAILED, /* 1902 */
@@ -637,22 +665,22 @@ typedef enum {
     XML_SCHEMAP_SRC_SIMPLE_TYPE_3, /* 3002 */
     XML_SCHEMAP_SRC_SIMPLE_TYPE_4, /* 3003 */
     XML_SCHEMAP_SRC_RESOLVE, /* 3004 */ 
-    XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE, /* 3004 */
-    XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE, /* 3005 */
-    XML_SCHEMAP_SRC_UNION_MEMBERTYPES_OR_SIMPLETYPES, /* 3006 */
-    XML_SCHEMAP_ST_PROPS_CORRECT_1, /* 3007 */
-    XML_SCHEMAP_ST_PROPS_CORRECT_2, /* 3008 */
-    XML_SCHEMAP_ST_PROPS_CORRECT_3, /* 3009 */     
-    XML_SCHEMAP_COS_ST_RESTRICTS_1_1, /* 3010 */
-    XML_SCHEMAP_COS_ST_RESTRICTS_1_2, /* 3011 */    
-    XML_SCHEMAP_COS_ST_RESTRICTS_1_3_1, /* 3012 */
-    XML_SCHEMAP_COS_ST_RESTRICTS_1_3_2, /* 3013 */
-    XML_SCHEMAP_COS_ST_RESTRICTS_2_1, /* 3014 */
-    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_1, /* 3015 */
-    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_2, /* 3016 */
-    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_1, /* 3017 */
-    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_2, /* 3018 */
-    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_3, /* 3019 */
+    XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE, /* 3005 */
+    XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE, /* 3006 */
+    XML_SCHEMAP_SRC_UNION_MEMBERTYPES_OR_SIMPLETYPES, /* 3007 */
+    XML_SCHEMAP_ST_PROPS_CORRECT_1, /* 3008 */
+    XML_SCHEMAP_ST_PROPS_CORRECT_2, /* 3009 */
+    XML_SCHEMAP_ST_PROPS_CORRECT_3, /* 3010 */     
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_1, /* 3011 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_2, /* 3012 */    
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_3_1, /* 3013 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_3_2, /* 3014 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_1, /* 3015 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_1, /* 3016 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_2, /* 3017 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_1, /* 3018 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_2, /* 3019 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_3, /* 3020 */
     XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_4, /* 3021 */
     XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_5, /* 3022 */
     XML_SCHEMAP_COS_ST_RESTRICTS_3_1, /* 3023 */
@@ -668,7 +696,41 @@ typedef enum {
     XML_SCHEMAP_S4S_ELEM_NOT_ALLOWED, /* 3033 */
     XML_SCHEMAP_S4S_ELEM_MISSING, /* 3034 */
     XML_SCHEMAP_S4S_ATTR_NOT_ALLOWED, /* 3035 */
-    XML_SCHEMAP_S4S_ATTR_MISSING /* 3036 */
+    XML_SCHEMAP_S4S_ATTR_MISSING, /* 3036 */
+    XML_SCHEMAP_S4S_ATTR_INVALID_VALUE, /* 3037 */
+    XML_SCHEMAP_SRC_ELEMENT_1, /* 3038 */
+    XML_SCHEMAP_SRC_ELEMENT_2_1, /* 3039 */
+    XML_SCHEMAP_SRC_ELEMENT_2_2, /* 3040 */
+    XML_SCHEMAP_SRC_ELEMENT_3, /* 3041 */
+    XML_SCHEMAP_P_PROPS_CORRECT_1, /* 3042 */
+    XML_SCHEMAP_P_PROPS_CORRECT_2_1, /* 3043 */
+    XML_SCHEMAP_P_PROPS_CORRECT_2_2, /* 3044 */
+    XML_SCHEMAP_E_PROPS_CORRECT_2, /* 3045 */
+    XML_SCHEMAP_E_PROPS_CORRECT_3, /* 3046 */
+    XML_SCHEMAP_E_PROPS_CORRECT_4, /* 3047 */
+    XML_SCHEMAP_E_PROPS_CORRECT_5, /* 3048 */
+    XML_SCHEMAP_E_PROPS_CORRECT_6, /* 3049 */
+    XML_SCHEMAP_SRC_INCLUDE, /* 3050 */    
+    XML_SCHEMAP_SRC_ATTRIBUTE_1, /* 3051 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_2, /* 3052 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_3_1, /* 3053 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_3_2, /* 3054 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_4, /* 3055 */
+    XML_SCHEMAP_NO_XMLNS, /* 3056 */
+    XML_SCHEMAP_NO_XSI, /* 3057 */      
+    XML_SCHEMAP_COS_VALID_DEFAULT_1,
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_1,
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1,
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_2,
+    XML_SCHEMAP_CVC_SIMPLE_TYPE,
+    XML_SCHEMAP_COS_CT_EXTENDS_1_1,
+    XML_SCHEMAP_SRC_IMPORT_1_1,
+    XML_SCHEMAP_SRC_IMPORT_1_2,
+    XML_SCHEMAP_SRC_IMPORT_2,
+    XML_SCHEMAP_SRC_IMPORT_2_1,
+    XML_SCHEMAP_SRC_IMPORT_2_2,
+    XML_SCHEMAP_INTERNAL, /* non-W3C */
+    XML_SCHEMAP_NOT_DETERMINISTIC /* non-W3C */
 } xmlParserErrors;
 
 /**
diff --git a/include/libxml/xmlschemas.h b/include/libxml/xmlschemas.h
index 49bf3b4..baf5dbf 100644
--- a/include/libxml/xmlschemas.h
+++ b/include/libxml/xmlschemas.h
@@ -22,6 +22,9 @@
 extern "C" {
 #endif
 
+/**
+ * This error codes are obsolete; not used any more.
+ */
 typedef enum {
     XML_SCHEMAS_ERR_OK		= 0,
     XML_SCHEMAS_ERR_NOROOT	= 1,
@@ -87,6 +90,11 @@ XMLPUBFUN void XMLCALL
 					 xmlSchemaValidityErrorFunc err,
 					 xmlSchemaValidityWarningFunc warn,
 					 void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchemaGetParserErrors	(xmlSchemaParserCtxtPtr ctxt,
+					xmlSchemaValidityErrorFunc * err,
+					xmlSchemaValidityWarningFunc * warn,
+					void **ctx);
 XMLPUBFUN xmlSchemaPtr XMLCALL	
 	    xmlSchemaParse		(xmlSchemaParserCtxtPtr ctxt);
 XMLPUBFUN void XMLCALL		
@@ -104,6 +112,12 @@ XMLPUBFUN void XMLCALL
 					 xmlSchemaValidityErrorFunc err,
 					 xmlSchemaValidityWarningFunc warn,
 					 void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchemaGetValidErrors (xmlSchemaValidCtxtPtr ctxt,
+					xmlSchemaValidityErrorFunc *err,
+					xmlSchemaValidityWarningFunc *warn,
+					void **ctx);
+
 XMLPUBFUN xmlSchemaValidCtxtPtr XMLCALL	
 	    xmlSchemaNewValidCtxt	(xmlSchemaPtr schema);
 XMLPUBFUN void XMLCALL			
diff --git a/include/libxml/xmlschemastypes.h b/include/libxml/xmlschemastypes.h
index b81e9b4..9b0d557 100644
--- a/include/libxml/xmlschemastypes.h
+++ b/include/libxml/xmlschemastypes.h
@@ -70,8 +70,19 @@ xmlSchemaGetBuiltInType(xmlSchemaValType type);
 XMLPUBFUN int XMLCALL
 xmlSchemaIsBuiltInTypeFacet(xmlSchemaTypePtr type, 
 			    int facetType);
-XMLPUBFUN xmlChar *  XMLCALL
+XMLPUBFUN xmlChar * XMLCALL
 xmlSchemaCollapseString(const xmlChar *value);
+XMLPUBFUN unsigned long  XMLCALL
+xmlSchemaGetFacetValueAsULong(xmlSchemaFacetPtr facet);
+XMLPUBFUN int XMLCALL
+xmlSchemaValidateLengthFacet(xmlSchemaTypePtr type, 
+			     xmlSchemaFacetPtr facet,
+			     const xmlChar *value,
+			     xmlSchemaValPtr val,
+			     unsigned long *length) ;
+XMLPUBFUN int XMLCALL
+xmlSchemaValPredefTypeNodeNoNorm(xmlSchemaTypePtr type, const xmlChar *value,
+				 xmlSchemaValPtr *val, xmlNodePtr node);
 
 #ifdef __cplusplus
 }
diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h
index 85d1eec..cbc44d8 100644
--- a/include/libxml/xmlversion.h
+++ b/include/libxml/xmlversion.h
@@ -29,21 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.6.11"
+#define LIBXML_DOTTED_VERSION "2.6.13"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXML_VERSION 20611
+#define LIBXML_VERSION 20613
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXML_VERSION_STRING "20611"
+#define LIBXML_VERSION_STRING "20613"
+
+/**
+ * LIBXML_VERSION_EXTRA:
+ *
+ * extra version information, used to show a CVS compilation
+ */
+#define LIBXML_VERSION_EXTRA "-CVS2151"
 
 /**
  * LIBXML_TEST_VERSION:
@@ -51,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(20611);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20613);
 
 #ifndef VMS
 #if 0
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index 6939937..8f261b2 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -46,6 +46,13 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_VERSION_STRING "@LIBXML_VERSION_NUMBER@"
 
 /**
+ * LIBXML_VERSION_EXTRA:
+ *
+ * extra version information, used to show a CVS compilation
+ */
+#define LIBXML_VERSION_EXTRA "@LIBXML_VERSION_EXTRA@"
+
+/**
  * LIBXML_TEST_VERSION:
  *
  * Macro to check that the libxml version in use is compatible with
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index 8a2e210..20426e7 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -198,6 +198,52 @@ struct _xmlXPathAxis {
 };
 
 /**
+ * xmlXPathFunction:
+ * @ctxt:  the XPath interprestation context
+ * @nargs:  the number of arguments
+ *
+ * An XPath function.
+ * The arguments (if any) are popped out from the context stack
+ * and the result is pushed on the stack.
+ */
+
+typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs);
+
+/*
+ * Function and Variable Lookup.
+ */
+
+/**
+ * xmlXPathVariableLookupFunc:
+ * @ctxt:  an XPath context
+ * @name:  name of the variable
+ * @ns_uri:  the namespace name hosting this variable
+ *
+ * Prototype for callbacks used to plug variable lookup in the XPath
+ * engine.
+ *
+ * Returns the XPath object value or NULL if not found.
+ */
+typedef xmlXPathObjectPtr (*xmlXPathVariableLookupFunc) (void *ctxt,
+                                         const xmlChar *name,
+                                         const xmlChar *ns_uri);
+
+/**
+ * xmlXPathFuncLookupFunc:
+ * @ctxt:  an XPath context
+ * @name:  name of the function
+ * @ns_uri:  the namespace name hosting this function
+ *
+ * Prototype for callbacks used to plug function lookup in the XPath
+ * engine.
+ *
+ * Returns the XPath function or NULL if not found.
+ */
+typedef xmlXPathFunction (*xmlXPathFuncLookupFunc) (void *ctxt,
+					 const xmlChar *name,
+					 const xmlChar *ns_uri);
+
+/**
  * xmlXPathContext:
  *
  * Expression evaluation occurs with respect to a context.
@@ -247,7 +293,7 @@ struct _xmlXPathContext {
 
     /* the set of namespace declarations in scope for the expression */
     xmlHashTablePtr nsHash;		/* The namespaces hash table */
-    void *varLookupFunc;		/* variable lookup func */
+    xmlXPathVariableLookupFunc varLookupFunc;/* variable lookup func */
     void *varLookupData;		/* variable lookup data */
 
     /* Possibility to link in an extra item */
@@ -258,7 +304,7 @@ struct _xmlXPathContext {
     const xmlChar *functionURI;
 
     /* function lookup function and data */
-    void *funcLookupFunc;		/* function lookup func */
+    xmlXPathFuncLookupFunc funcLookupFunc;/* function lookup func */
     void *funcLookupData;		/* function lookup data */
 
     /* temporary namespace lists kept for walking the namespace axis */
@@ -305,18 +351,6 @@ struct _xmlXPathParserContext {
     xmlNodePtr         ancestor;	/* used for walking preceding axis */
 };
 
-/**
- * xmlXPathFunction:
- * @ctxt:  the XPath interprestation context
- * @nargs:  the number of arguments
- *
- * An XPath function.
- * The arguments (if any) are popped out from the context stack
- * and the result is pushed on the stack.
- */
-
-typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs);
-
 /************************************************************************
  *									*
  *			Public API					*
diff --git a/include/libxml/xpathInternals.h b/include/libxml/xpathInternals.h
index 4ee1965..88ee27c 100644
--- a/include/libxml/xpathInternals.h
+++ b/include/libxml/xpathInternals.h
@@ -327,20 +327,6 @@ XMLPUBFUN void * XMLCALL
 /*
  * Variable Lookup forwarding.
  */
-/**
- * xmlXPathVariableLookupFunc:
- * @ctxt:  an XPath context
- * @name:  name of the variable
- * @ns_uri:  the namespace name hosting this variable
- *
- * Prototype for callbacks used to plug variable lookup in the XPath
- * engine.
- *
- * Returns the XPath object value or NULL if not found.
- */
-typedef xmlXPathObjectPtr (*xmlXPathVariableLookupFunc) (void *ctxt,
-					 const xmlChar *name,
-					 const xmlChar *ns_uri);
 
 XMLPUBFUN void XMLCALL	
 	xmlXPathRegisterVariableLookup	(xmlXPathContextPtr ctxt,
@@ -350,20 +336,6 @@ XMLPUBFUN void XMLCALL
 /*
  * Function Lookup forwarding.
  */
-/**
- * xmlXPathFuncLookupFunc:
- * @ctxt:  an XPath context
- * @name:  name of the function
- * @ns_uri:  the namespace name hosting this function
- *
- * Prototype for callbacks used to plug function lookup in the XPath
- * engine.
- *
- * Returns the XPath function or NULL if not found.
- */
-typedef xmlXPathFunction (*xmlXPathFuncLookupFunc) (void *ctxt,
-					 const xmlChar *name,
-					 const xmlChar *ns_uri);
 
 XMLPUBFUN void XMLCALL	
 	    xmlXPathRegisterFuncLookup	(xmlXPathContextPtr ctxt,