diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.in | 2 | ||||
| -rw-r--r-- | include/libxml/Makefile.in | 2 | ||||
| -rw-r--r-- | include/libxml/nanohttp.h | 2 | ||||
| -rw-r--r-- | include/libxml/schemasInternals.h | 160 | ||||
| -rw-r--r-- | include/libxml/xmlautomata.h | 18 | ||||
| -rw-r--r-- | include/libxml/xmlerror.h | 271 | ||||
| -rw-r--r-- | include/libxml/xmlschemas.h | 39 | ||||
| -rw-r--r-- | include/libxml/xmlschemastypes.h | 2 | ||||
| -rw-r--r-- | include/libxml/xmlversion.h | 10 |
9 files changed, 308 insertions, 198 deletions
diff --git a/include/Makefile.in b/include/Makefile.in index bdc1a97..ad94885 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -200,6 +200,7 @@ WITH_XINCLUDE = @WITH_XINCLUDE@ WITH_XPATH = @WITH_XPATH@ WITH_XPTR = @WITH_XPTR@ XINCLUDE_OBJ = @XINCLUDE_OBJ@ +XMLLINT = @XMLLINT@ XML_CFLAGS = @XML_CFLAGS@ XML_INCLUDEDIR = @XML_INCLUDEDIR@ XML_LIBDIR = @XML_LIBDIR@ @@ -207,6 +208,7 @@ XML_LIBS = @XML_LIBS@ XML_LIBTOOLLIBS = @XML_LIBTOOLLIBS@ XPATH_OBJ = @XPATH_OBJ@ XPTR_OBJ = @XPTR_OBJ@ +XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ ac_ct_AR = @ac_ct_AR@ diff --git a/include/libxml/Makefile.in b/include/libxml/Makefile.in index 8b5a631..782fd6d 100644 --- a/include/libxml/Makefile.in +++ b/include/libxml/Makefile.in @@ -198,6 +198,7 @@ WITH_XINCLUDE = @WITH_XINCLUDE@ WITH_XPATH = @WITH_XPATH@ WITH_XPTR = @WITH_XPTR@ XINCLUDE_OBJ = @XINCLUDE_OBJ@ +XMLLINT = @XMLLINT@ XML_CFLAGS = @XML_CFLAGS@ XML_INCLUDEDIR = @XML_INCLUDEDIR@ XML_LIBDIR = @XML_LIBDIR@ @@ -205,6 +206,7 @@ XML_LIBS = @XML_LIBS@ XML_LIBTOOLLIBS = @XML_LIBTOOLLIBS@ XPATH_OBJ = @XPATH_OBJ@ XPTR_OBJ = @XPTR_OBJ@ +XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ ac_ct_AR = @ac_ct_AR@ diff --git a/include/libxml/nanohttp.h b/include/libxml/nanohttp.h index 2853184..1d8ac24 100644 --- a/include/libxml/nanohttp.h +++ b/include/libxml/nanohttp.h @@ -56,6 +56,8 @@ XMLPUBFUN const char * XMLCALL xmlNanoHTTPAuthHeader (void *ctx); XMLPUBFUN const char * XMLCALL xmlNanoHTTPRedir (void *ctx); +XMLPUBFUN int XMLCALL + xmlNanoHTTPContentLength( void * ctx ); XMLPUBFUN const char * XMLCALL xmlNanoHTTPEncoding (void *ctx); XMLPUBFUN const char * XMLCALL diff --git a/include/libxml/schemasInternals.h b/include/libxml/schemasInternals.h index 6aa8dd6..9fb7aba 100644 --- a/include/libxml/schemasInternals.h +++ b/include/libxml/schemasInternals.h @@ -44,15 +44,15 @@ typedef enum { XML_SCHEMAS_TOKEN, XML_SCHEMAS_LANGUAGE, XML_SCHEMAS_NMTOKEN, - XML_SCHEMAS_NMTOKENS, + XML_SCHEMAS_NMTOKENS, XML_SCHEMAS_NAME, XML_SCHEMAS_QNAME, XML_SCHEMAS_NCNAME, XML_SCHEMAS_ID, XML_SCHEMAS_IDREF, - XML_SCHEMAS_IDREFS, + XML_SCHEMAS_IDREFS, XML_SCHEMAS_ENTITY, - XML_SCHEMAS_ENTITIES, + XML_SCHEMAS_ENTITIES, XML_SCHEMAS_NOTATION, XML_SCHEMAS_ANYURI, XML_SCHEMAS_INTEGER, @@ -71,7 +71,7 @@ typedef enum { XML_SCHEMAS_HEXBINARY, XML_SCHEMAS_BASE64BINARY, XML_SCHEMAS_ANYTYPE, - XML_SCHEMAS_ANYSIMPLETYPE + XML_SCHEMAS_ANYSIMPLETYPE } xmlSchemaValType; /* @@ -149,25 +149,25 @@ struct _xmlSchemaAnnot { * Skip unknown attribute from validation * Obsolete, not used anymore. */ -#define XML_SCHEMAS_ANYATTR_SKIP 1 +#define XML_SCHEMAS_ANYATTR_SKIP 1 /** * XML_SCHEMAS_ANYATTR_LAX: * * Ignore validation non definition on attributes * Obsolete, not used anymore. */ -#define XML_SCHEMAS_ANYATTR_LAX 2 +#define XML_SCHEMAS_ANYATTR_LAX 2 /** * XML_SCHEMAS_ANYATTR_STRICT: * * Apply strict validation rules on attributes * Obsolete, not used anymore. */ -#define XML_SCHEMAS_ANYATTR_STRICT 3 +#define XML_SCHEMAS_ANYATTR_STRICT 3 /** * XML_SCHEMAS_ANY_SKIP: * - * Skip unknown attribute from validation + * Skip unknown attribute from validation */ #define XML_SCHEMAS_ANY_SKIP 1 /** @@ -214,20 +214,20 @@ struct _xmlSchemaAnnot { * * allow elements in no namespace */ -#define XML_SCHEMAS_ATTR_NSDEFAULT 1 << 7 +#define XML_SCHEMAS_ATTR_NSDEFAULT 1 << 7 /** - * XML_SCHEMAS_ATTR_NSDEFAULT: + * XML_SCHEMAS_ATTR_INTERNAL_RESOLVED: * - * this is set when the "type" and "ref" references + * this is set when the "type" and "ref" references * have been resolved. */ -#define XML_SCHEMAS_ATTR_INTERNAL_RESOLVED 1 << 8 +#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 +#define XML_SCHEMAS_ATTR_FIXED 1 << 9 /** * xmlSchemaAttribute: @@ -237,8 +237,8 @@ struct _xmlSchemaAnnot { 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 ... */ + xmlSchemaTypeType type; /* The kind of type */ + 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; /* the local name of the attribute decl. if a particle */ @@ -252,9 +252,11 @@ struct _xmlSchemaAttribute { const xmlChar *defValue; xmlSchemaTypePtr subtypes; /* the type definition */ xmlNodePtr node; - const xmlChar *targetNamespace; + const xmlChar *targetNamespace; int flags; const xmlChar *refPrefix; + xmlSchemaValPtr defVal; + xmlSchemaAttributePtr refDecl; }; /** @@ -318,6 +320,12 @@ struct _xmlSchemaWildcard { * The attribute wildcard has been already builded. */ #define XML_SCHEMAS_ATTRGROUP_GLOBAL 1 << 1 +/** + * XML_SCHEMAS_ATTRGROUP_MARKED: + * + * Marks the attr group as marked; used for circular checks. + */ +#define XML_SCHEMAS_ATTRGROUP_MARKED 1 << 2 /** * An attribute group definition. @@ -328,7 +336,7 @@ struct _xmlSchemaWildcard { typedef struct _xmlSchemaAttributeGroup xmlSchemaAttributeGroup; typedef xmlSchemaAttributeGroup *xmlSchemaAttributeGroupPtr; struct _xmlSchemaAttributeGroup { - xmlSchemaTypeType type; /* The kind of type */ + xmlSchemaTypeType type; /* The kind of type */ struct _xmlSchemaAttribute *next;/* the next attribute if in a group ... */ const xmlChar *name; const xmlChar *id; @@ -341,6 +349,7 @@ struct _xmlSchemaAttributeGroup { int flags; xmlSchemaWildcardPtr attributeWildcard; const xmlChar *refPrefix; + xmlSchemaAttributeGroupPtr refItem; /* The referenced attribute group */ }; /** @@ -371,7 +380,7 @@ struct _xmlSchemaFacetLink { * * the element content type is mixed */ -#define XML_SCHEMAS_TYPE_MIXED 1 << 0 +#define XML_SCHEMAS_TYPE_MIXED 1 << 0 /** * XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION: * @@ -457,6 +466,37 @@ struct _xmlSchemaFacetLink { * the simpleType has a final of "union". */ #define XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE 1 << 14 +/** + * XML_SCHEMAS_TYPE_MARKED + * + * Marks the item as marked; used for circular checks. + */ +#define XML_SCHEMAS_TYPE_MARKED 1 << 16 +/** + * XML_SCHEMAS_TYPE_BLOCK_DEFAULT: + * + * the complexType did not specify 'block' so use the default of the + * <schema> item. + */ +#define XML_SCHEMAS_TYPE_BLOCK_DEFAULT 1 << 17 +/** + * XML_SCHEMAS_TYPE_BLOCK_EXTENSION: + * + * the complexType has a 'block' of "extension". + */ +#define XML_SCHEMAS_TYPE_BLOCK_EXTENSION 1 << 18 +/** + * XML_SCHEMAS_TYPE_FINAL_RESTRICTION: + * + * the complexType has a 'block' of "restriction". + */ +#define XML_SCHEMAS_TYPE_BLOCK_RESTRICTION 1 << 19 +/** + * XML_SCHEMAS_TYPE_ABSTRACT: + * + * the simple/complexType is abstract. + */ +#define XML_SCHEMAS_TYPE_ABSTRACT 1 << 20 /** * _xmlSchemaType: @@ -464,7 +504,7 @@ struct _xmlSchemaFacetLink { * Schemas type definition. */ struct _xmlSchemaType { - xmlSchemaTypeType type; /* The kind of type */ + xmlSchemaTypeType type; /* The kind of type */ struct _xmlSchemaType *next;/* the next type if in a sequence ... */ const xmlChar *name; const xmlChar *id; @@ -481,7 +521,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; @@ -492,6 +532,7 @@ struct _xmlSchemaType { xmlSchemaFacetLinkPtr facetSet; const xmlChar *refPrefix; xmlSchemaTypePtr contentTypeDef; + xmlRegexpPtr contModel; }; /* @@ -506,112 +547,112 @@ struct _xmlSchemaType { * * the element is nillable */ -#define XML_SCHEMAS_ELEM_NILLABLE 1 << 0 +#define XML_SCHEMAS_ELEM_NILLABLE 1 << 0 /** * XML_SCHEMAS_ELEM_GLOBAL: * * the element is global */ -#define XML_SCHEMAS_ELEM_GLOBAL 1 << 1 +#define XML_SCHEMAS_ELEM_GLOBAL 1 << 1 /** * XML_SCHEMAS_ELEM_DEFAULT: * * the element has a default value */ -#define XML_SCHEMAS_ELEM_DEFAULT 1 << 2 +#define XML_SCHEMAS_ELEM_DEFAULT 1 << 2 /** * XML_SCHEMAS_ELEM_FIXED: * * the element has a fixed value */ -#define XML_SCHEMAS_ELEM_FIXED 1 << 3 +#define XML_SCHEMAS_ELEM_FIXED 1 << 3 /** * XML_SCHEMAS_ELEM_ABSTRACT: * * the element is abstract */ -#define XML_SCHEMAS_ELEM_ABSTRACT 1 << 4 +#define XML_SCHEMAS_ELEM_ABSTRACT 1 << 4 /** * XML_SCHEMAS_ELEM_TOPLEVEL: * * the element is top level * obsolete: use XML_SCHEMAS_ELEM_GLOBAL instead */ -#define XML_SCHEMAS_ELEM_TOPLEVEL 1 << 5 +#define XML_SCHEMAS_ELEM_TOPLEVEL 1 << 5 /** * XML_SCHEMAS_ELEM_REF: * * the element is a reference to a type */ -#define XML_SCHEMAS_ELEM_REF 1 << 6 +#define XML_SCHEMAS_ELEM_REF 1 << 6 /** * XML_SCHEMAS_ELEM_NSDEFAULT: * * allow elements in no namespace * Obsolete, not used anymore. */ -#define XML_SCHEMAS_ELEM_NSDEFAULT 1 << 7 +#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 +#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 +#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 +#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 +#define XML_SCHEMAS_ELEM_BLOCK_EXTENSION 1 << 11 /** * XML_SCHEMAS_ELEM_BLOCK_RESTRICTION: * * disallowed substitutions: "restriction" */ -#define XML_SCHEMAS_ELEM_BLOCK_RESTRICTION 1 << 12 +#define XML_SCHEMAS_ELEM_BLOCK_RESTRICTION 1 << 12 /** * XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION: * * disallowed substitutions: "substituion" */ -#define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION 1 << 13 +#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 +#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 +#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 +#define XML_SCHEMAS_ELEM_FINAL_RESTRICTION 1 << 16 typedef struct _xmlSchemaElement xmlSchemaElement; typedef xmlSchemaElement *xmlSchemaElementPtr; struct _xmlSchemaElement { - xmlSchemaTypeType type; /* The kind of type */ + xmlSchemaTypeType type; /* The kind of type */ struct _xmlSchemaType *next;/* the next type if in a sequence ... */ const xmlChar *name; const xmlChar *id; @@ -636,6 +677,7 @@ struct _xmlSchemaElement { xmlRegexpPtr contModel; xmlSchemaContentType contentType; const xmlChar *refPrefix; + xmlSchemaValPtr defVal; }; /* @@ -643,30 +685,30 @@ struct _xmlSchemaElement { * * unknown facet handling */ -#define XML_SCHEMAS_FACET_UNKNOWN 0 +#define XML_SCHEMAS_FACET_UNKNOWN 0 /* * XML_SCHEMAS_FACET_PRESERVE: * * preserve the type of the facet */ -#define XML_SCHEMAS_FACET_PRESERVE 1 +#define XML_SCHEMAS_FACET_PRESERVE 1 /* * XML_SCHEMAS_FACET_REPLACE: * * replace the type of the facet */ -#define XML_SCHEMAS_FACET_REPLACE 2 +#define XML_SCHEMAS_FACET_REPLACE 2 /* * XML_SCHEMAS_FACET_COLLAPSE: * * collapse the types of the facet */ -#define XML_SCHEMAS_FACET_COLLAPSE 3 +#define XML_SCHEMAS_FACET_COLLAPSE 3 /** * A facet definition. */ struct _xmlSchemaFacet { - xmlSchemaTypeType type; /* The kind of type */ + xmlSchemaTypeType type; /* The kind of type */ struct _xmlSchemaFacet *next;/* the next type if in a sequence ... */ const xmlChar *value; const xmlChar *id; @@ -684,7 +726,7 @@ struct _xmlSchemaFacet { typedef struct _xmlSchemaNotation xmlSchemaNotation; typedef xmlSchemaNotation *xmlSchemaNotationPtr; struct _xmlSchemaNotation { - xmlSchemaTypeType type; /* The kind of type */ + xmlSchemaTypeType type; /* The kind of type */ const xmlChar *name; xmlSchemaAnnotPtr annot; const xmlChar *identifier; @@ -695,62 +737,62 @@ struct _xmlSchemaNotation { * * the schema requires qualified elements */ -#define XML_SCHEMAS_QUALIF_ELEM 1 << 0 +#define XML_SCHEMAS_QUALIF_ELEM 1 << 0 /** * XML_SCHEMAS_QUALIF_ATTR: * * the schema requires qualified attributes */ -#define XML_SCHEMAS_QUALIF_ATTR 1 << 1 +#define XML_SCHEMAS_QUALIF_ATTR 1 << 1 /** * XML_SCHEMAS_FINAL_DEFAULT_EXTENSION: * * the schema has "extension" in the set of finalDefault. */ -#define XML_SCHEMAS_FINAL_DEFAULT_EXTENSION 1 << 2 +#define XML_SCHEMAS_FINAL_DEFAULT_EXTENSION 1 << 2 /** * XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION: * * the schema has "restriction" in the set of finalDefault. */ -#define XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION 1 << 3 +#define XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION 1 << 3 /** * XML_SCHEMAS_FINAL_DEFAULT_LIST: * * the cshema has "list" in the set of finalDefault. */ -#define XML_SCHEMAS_FINAL_DEFAULT_LIST 1 << 4 +#define XML_SCHEMAS_FINAL_DEFAULT_LIST 1 << 4 /** * XML_SCHEMAS_FINAL_DEFAULT_UNION: * * the schema has "union" in the set of finalDefault. */ -#define XML_SCHEMAS_FINAL_DEFAULT_UNION 1 << 5 +#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 +#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 +#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 +#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 +#define XML_SCHEMAS_INCLUDING_CONVERT_NS 1 << 9 /** * _xmlSchema: * @@ -773,15 +815,16 @@ struct _xmlSchema { xmlHashTablePtr schemasImports; - void *_private; /* unused by the library for users or bindings */ + void *_private; /* unused by the library for users or bindings */ xmlHashTablePtr groupDecl; xmlDictPtr dict; void *includes; /* the includes, this is opaque for now */ - int preserve; /* whether to free the document */ + int preserve; /* whether to free the document */ + int counter; /* used to give ononymous components unique names */ }; -XMLPUBFUN void XMLCALL xmlSchemaFreeType (xmlSchemaTypePtr type); -XMLPUBFUN void XMLCALL xmlSchemaFreeWildcard(xmlSchemaWildcardPtr wildcard); +XMLPUBFUN void XMLCALL xmlSchemaFreeType (xmlSchemaTypePtr type); +XMLPUBFUN void XMLCALL xmlSchemaFreeWildcard(xmlSchemaWildcardPtr wildcard); #ifdef __cplusplus } @@ -789,4 +832,3 @@ XMLPUBFUN void XMLCALL xmlSchemaFreeWildcard(xmlSchemaWildcardPtr wildcard); #endif /* LIBXML_SCHEMAS_ENABLED */ #endif /* __XML_SCHEMA_INTERNALS_H__ */ - diff --git a/include/libxml/xmlautomata.h b/include/libxml/xmlautomata.h index 16a1467..b1b9485 100644 --- a/include/libxml/xmlautomata.h +++ b/include/libxml/xmlautomata.h @@ -73,6 +73,15 @@ XMLPUBFUN xmlAutomataStatePtr XMLCALL int max, void *data); XMLPUBFUN xmlAutomataStatePtr XMLCALL + xmlAutomataNewCountTrans2 (xmlAutomataPtr am, + xmlAutomataStatePtr from, + xmlAutomataStatePtr to, + const xmlChar *token, + const xmlChar *token2, + int min, + int max, + void *data); +XMLPUBFUN xmlAutomataStatePtr XMLCALL xmlAutomataNewOnceTrans (xmlAutomataPtr am, xmlAutomataStatePtr from, xmlAutomataStatePtr to, @@ -80,6 +89,15 @@ XMLPUBFUN xmlAutomataStatePtr XMLCALL int min, int max, void *data); +XMLPUBFUN xmlAutomataStatePtr XMLCALL + xmlAutomataNewOnceTrans2 (xmlAutomataPtr am, + xmlAutomataStatePtr from, + xmlAutomataStatePtr to, + const xmlChar *token, + const xmlChar *token2, + int min, + int max, + void *data); XMLPUBFUN xmlAutomataStatePtr XMLCALL xmlAutomataNewAllTrans (xmlAutomataPtr am, xmlAutomataStatePtr from, diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h index 2b72abc..a991256 100644 --- a/include/libxml/xmlerror.h +++ b/include/libxml/xmlerror.h @@ -530,122 +530,126 @@ typedef enum { XML_SCHEMAP_UNKNOWN_UNION_CHILD, /* 1754 */ XML_SCHEMAP_ELEM_DEFAULT_FIXED, /* 1755 */ XML_SCHEMAP_REGEXP_INVALID, /* 1756 */ - XML_SCHEMAP_FAILED_LOAD, /* 1756 */ - XML_SCHEMAP_NOTHING_TO_PARSE, /* 1757 */ - XML_SCHEMAP_NOROOT, /* 1758 */ - XML_SCHEMAP_REDEFINED_GROUP, /* 1759 */ - XML_SCHEMAP_REDEFINED_TYPE, /* 1760 */ - XML_SCHEMAP_REDEFINED_ELEMENT, /* 1761 */ - XML_SCHEMAP_REDEFINED_ATTRGROUP, /* 1762 */ - XML_SCHEMAP_REDEFINED_ATTR, /* 1763 */ - XML_SCHEMAP_REDEFINED_NOTATION, /* 1764 */ - XML_SCHEMAP_FAILED_PARSE, /* 1765 */ - XML_SCHEMAP_UNKNOWN_PREFIX, /* 1766 */ - XML_SCHEMAP_DEF_AND_PREFIX, /* 1767 */ - XML_SCHEMAP_UNKNOWN_INCLUDE_CHILD, /* 1768 */ - XML_SCHEMAP_INCLUDE_SCHEMA_NOT_URI, /* 1769 */ - XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI, /* 1770 */ - XML_SCHEMAP_NOT_SCHEMA, /* 1771 */ - XML_SCHEMAP_UNKNOWN_MEMBER_TYPE, /* 1772 */ - 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_SCHEMAP_CT_PROPS_CORRECT_1, /* 1781 */ - XML_SCHEMAP_CT_PROPS_CORRECT_2, /* 1782 */ - XML_SCHEMAP_CT_PROPS_CORRECT_3, /* 1783 */ - XML_SCHEMAP_CT_PROPS_CORRECT_4, /* 1784 */ - XML_SCHEMAP_CT_PROPS_CORRECT_5, /* 1785 */ - XML_SCHEMAP_DERIVATION_OK_RESTRICTION_1, /* 1786 */ - XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_1, /* 1787 */ - XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_2, /* 1788 */ - XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_2, /* 1789 */ - XML_SCHEMAP_DERIVATION_OK_RESTRICTION_3, /* 1790 */ - XML_SCHEMAP_WILDCARD_INVALID_NS_MEMBER, /* 1791 */ - XML_SCHEMAP_INTERSECTION_NOT_EXPRESSIBLE, /* 1792 */ - XML_SCHEMAP_UNION_NOT_EXPRESSIBLE, /* 1793 */ - XML_SCHEMAP_SRC_IMPORT_3_1, /* 1794 */ - XML_SCHEMAP_SRC_IMPORT_3_2, /* 1795 */ - XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_1, /* 1796 */ - XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_2, /* 1797 */ - XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_3, /* 1798 */ - XML_SCHEMAP_COS_CT_EXTENDS_1_3, /* 1799 */ - XML_SCHEMAV_NOROOT = 1800, - XML_SCHEMAV_UNDECLAREDELEM, /* 1801 */ - XML_SCHEMAV_NOTTOPLEVEL, /* 1802 */ - XML_SCHEMAV_MISSING, /* 1803 */ - XML_SCHEMAV_WRONGELEM, /* 1804 */ - XML_SCHEMAV_NOTYPE, /* 1805 */ - XML_SCHEMAV_NOROLLBACK, /* 1806 */ - XML_SCHEMAV_ISABSTRACT, /* 1807 */ - XML_SCHEMAV_NOTEMPTY, /* 1808 */ - XML_SCHEMAV_ELEMCONT, /* 1809 */ - XML_SCHEMAV_HAVEDEFAULT, /* 1810 */ - XML_SCHEMAV_NOTNILLABLE, /* 1811 */ - XML_SCHEMAV_EXTRACONTENT, /* 1812 */ - XML_SCHEMAV_INVALIDATTR, /* 1813 */ - XML_SCHEMAV_INVALIDELEM, /* 1814 */ - XML_SCHEMAV_NOTDETERMINIST, /* 1815 */ - XML_SCHEMAV_CONSTRUCT, /* 1816 */ - XML_SCHEMAV_INTERNAL, /* 1817 */ - XML_SCHEMAV_NOTSIMPLE, /* 1818 */ - XML_SCHEMAV_ATTRUNKNOWN, /* 1819 */ - XML_SCHEMAV_ATTRINVALID, /* 1820 */ - XML_SCHEMAV_VALUE, /* 1821 */ - XML_SCHEMAV_FACET, /* 1822 */ - XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_1, /* 1823 */ - XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_2, /* 1824 */ - XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_3, /* 1825 */ - XML_SCHEMAV_CVC_TYPE_3_1_1, /* 1826 */ - XML_SCHEMAV_CVC_TYPE_3_1_2, /* 1827 */ - XML_SCHEMAV_CVC_FACET_VALID, /* 1828 */ - XML_SCHEMAV_CVC_LENGTH_VALID, /* 1829 */ - XML_SCHEMAV_CVC_MINLENGTH_VALID, /* 1830 */ - XML_SCHEMAV_CVC_MAXLENGTH_VALID, /* 1831 */ - XML_SCHEMAV_CVC_MININCLUSIVE_VALID, /* 1832 */ - XML_SCHEMAV_CVC_MAXINCLUSIVE_VALID, /* 1833 */ - XML_SCHEMAV_CVC_MINEXCLUSIVE_VALID, /* 1834 */ - XML_SCHEMAV_CVC_MAXEXCLUSIVE_VALID, /* 1835 */ - XML_SCHEMAV_CVC_TOTALDIGITS_VALID, /* 1836 */ - XML_SCHEMAV_CVC_FRACTIONDIGITS_VALID, /* 1837 */ - XML_SCHEMAV_CVC_PATTERN_VALID, /* 1838 */ - XML_SCHEMAV_CVC_ENUMERATION_VALID, /* 1839 */ - XML_SCHEMAV_CVC_COMPLEX_TYPE_2_1, /* 1840 */ - 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_SCHEMAP_FAILED_LOAD, /* 1757 */ + XML_SCHEMAP_NOTHING_TO_PARSE, /* 1758 */ + XML_SCHEMAP_NOROOT, /* 1759 */ + XML_SCHEMAP_REDEFINED_GROUP, /* 1760 */ + XML_SCHEMAP_REDEFINED_TYPE, /* 1761 */ + XML_SCHEMAP_REDEFINED_ELEMENT, /* 1762 */ + XML_SCHEMAP_REDEFINED_ATTRGROUP, /* 1763 */ + XML_SCHEMAP_REDEFINED_ATTR, /* 1764 */ + XML_SCHEMAP_REDEFINED_NOTATION, /* 1765 */ + XML_SCHEMAP_FAILED_PARSE, /* 1766 */ + XML_SCHEMAP_UNKNOWN_PREFIX, /* 1767 */ + XML_SCHEMAP_DEF_AND_PREFIX, /* 1768 */ + XML_SCHEMAP_UNKNOWN_INCLUDE_CHILD, /* 1769 */ + XML_SCHEMAP_INCLUDE_SCHEMA_NOT_URI, /* 1770 */ + XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI, /* 1771 */ + XML_SCHEMAP_NOT_SCHEMA, /* 1772 */ + XML_SCHEMAP_UNKNOWN_MEMBER_TYPE, /* 1773 */ + XML_SCHEMAP_INVALID_ATTR_USE, /* 1774 */ + XML_SCHEMAP_RECURSIVE, /* 1775 */ + XML_SCHEMAP_SUPERNUMEROUS_LIST_ITEM_TYPE, /* 1776 */ + XML_SCHEMAP_INVALID_ATTR_COMBINATION, /* 1777 */ + XML_SCHEMAP_INVALID_ATTR_INLINE_COMBINATION, /* 1778 */ + XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD, /* 1779 */ + XML_SCHEMAP_INVALID_ATTR_NAME, /* 1780 */ + XML_SCHEMAP_REF_AND_CONTENT, /* 1781 */ + XML_SCHEMAP_CT_PROPS_CORRECT_1, /* 1782 */ + XML_SCHEMAP_CT_PROPS_CORRECT_2, /* 1783 */ + XML_SCHEMAP_CT_PROPS_CORRECT_3, /* 1784 */ + XML_SCHEMAP_CT_PROPS_CORRECT_4, /* 1785 */ + XML_SCHEMAP_CT_PROPS_CORRECT_5, /* 1786 */ + XML_SCHEMAP_DERIVATION_OK_RESTRICTION_1, /* 1787 */ + XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_1, /* 1788 */ + XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_2, /* 1789 */ + XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_2, /* 1790 */ + XML_SCHEMAP_DERIVATION_OK_RESTRICTION_3, /* 1791 */ + XML_SCHEMAP_WILDCARD_INVALID_NS_MEMBER, /* 1792 */ + XML_SCHEMAP_INTERSECTION_NOT_EXPRESSIBLE, /* 1793 */ + XML_SCHEMAP_UNION_NOT_EXPRESSIBLE, /* 1794 */ + XML_SCHEMAP_SRC_IMPORT_3_1, /* 1795 */ + XML_SCHEMAP_SRC_IMPORT_3_2, /* 1796 */ + XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_1, /* 1797 */ + XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_2, /* 1798 */ + XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_3, /* 1799 */ + XML_SCHEMAP_COS_CT_EXTENDS_1_3, /* 1800 */ + XML_SCHEMAV_NOROOT = 1801, + XML_SCHEMAV_UNDECLAREDELEM, /* 1802 */ + XML_SCHEMAV_NOTTOPLEVEL, /* 1803 */ + XML_SCHEMAV_MISSING, /* 1804 */ + XML_SCHEMAV_WRONGELEM, /* 1805 */ + XML_SCHEMAV_NOTYPE, /* 1806 */ + XML_SCHEMAV_NOROLLBACK, /* 1807 */ + XML_SCHEMAV_ISABSTRACT, /* 1808 */ + XML_SCHEMAV_NOTEMPTY, /* 1809 */ + XML_SCHEMAV_ELEMCONT, /* 1810 */ + XML_SCHEMAV_HAVEDEFAULT, /* 1811 */ + XML_SCHEMAV_NOTNILLABLE, /* 1812 */ + XML_SCHEMAV_EXTRACONTENT, /* 1813 */ + XML_SCHEMAV_INVALIDATTR, /* 1814 */ + XML_SCHEMAV_INVALIDELEM, /* 1815 */ + XML_SCHEMAV_NOTDETERMINIST, /* 1816 */ + XML_SCHEMAV_CONSTRUCT, /* 1817 */ + XML_SCHEMAV_INTERNAL, /* 1818 */ + XML_SCHEMAV_NOTSIMPLE, /* 1819 */ + XML_SCHEMAV_ATTRUNKNOWN, /* 1820 */ + XML_SCHEMAV_ATTRINVALID, /* 1821 */ + XML_SCHEMAV_VALUE, /* 1822 */ + XML_SCHEMAV_FACET, /* 1823 */ + XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_1, /* 1824 */ + XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_2, /* 1825 */ + XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_3, /* 1826 */ + XML_SCHEMAV_CVC_TYPE_3_1_1, /* 1827 */ + XML_SCHEMAV_CVC_TYPE_3_1_2, /* 1828 */ + XML_SCHEMAV_CVC_FACET_VALID, /* 1829 */ + XML_SCHEMAV_CVC_LENGTH_VALID, /* 1830 */ + XML_SCHEMAV_CVC_MINLENGTH_VALID, /* 1831 */ + XML_SCHEMAV_CVC_MAXLENGTH_VALID, /* 1832 */ + XML_SCHEMAV_CVC_MININCLUSIVE_VALID, /* 1833 */ + XML_SCHEMAV_CVC_MAXINCLUSIVE_VALID, /* 1834 */ + XML_SCHEMAV_CVC_MINEXCLUSIVE_VALID, /* 1835 */ + XML_SCHEMAV_CVC_MAXEXCLUSIVE_VALID, /* 1836 */ + XML_SCHEMAV_CVC_TOTALDIGITS_VALID, /* 1837 */ + XML_SCHEMAV_CVC_FRACTIONDIGITS_VALID, /* 1838 */ + XML_SCHEMAV_CVC_PATTERN_VALID, /* 1839 */ + XML_SCHEMAV_CVC_ENUMERATION_VALID, /* 1840 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_2_1, /* 1841 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_2_2, /* 1842 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_2_3, /* 1843 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_2_4, /* 1844 */ + XML_SCHEMAV_CVC_ELT_1, /* 1845 */ + XML_SCHEMAV_CVC_ELT_2, /* 1846 */ + XML_SCHEMAV_CVC_ELT_3_1, /* 1847 */ + XML_SCHEMAV_CVC_ELT_3_2_1, /* 1848 */ + XML_SCHEMAV_CVC_ELT_3_2_2, /* 1849 */ + XML_SCHEMAV_CVC_ELT_4_1, /* 1850 */ + XML_SCHEMAV_CVC_ELT_4_2, /* 1851 */ + XML_SCHEMAV_CVC_ELT_4_3, /* 1852 */ + XML_SCHEMAV_CVC_ELT_5_1_1, /* 1853 */ + XML_SCHEMAV_CVC_ELT_5_1_2, /* 1854 */ + XML_SCHEMAV_CVC_ELT_5_2_1, /* 1855 */ + XML_SCHEMAV_CVC_ELT_5_2_2_1, /* 1856 */ + XML_SCHEMAV_CVC_ELT_5_2_2_2_1, /* 1857 */ + XML_SCHEMAV_CVC_ELT_5_2_2_2_2, /* 1858 */ + XML_SCHEMAV_CVC_ELT_6, /* 1859 */ + XML_SCHEMAV_CVC_ELT_7, /* 1860 */ + XML_SCHEMAV_CVC_ATTRIBUTE_1, /* 1861 */ + XML_SCHEMAV_CVC_ATTRIBUTE_2, /* 1862 */ + XML_SCHEMAV_CVC_ATTRIBUTE_3, /* 1863 */ + XML_SCHEMAV_CVC_ATTRIBUTE_4, /* 1864 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_3_1, /* 1865 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_1, /* 1866 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_2, /* 1867 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_4, /* 1868 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_5_1, /* 1869 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_5_2, /* 1870 */ + XML_SCHEMAV_ELEMENT_CONTENT, /* 1871 */ + XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING, /* 1872 */ + XML_SCHEMAV_CVC_COMPLEX_TYPE_1, /* 1873 */ + XML_SCHEMAV_CVC_AU, /* 1874 */ + XML_SCHEMAV_CVC_TYPE_1, /* 1875 */ + XML_SCHEMAV_CVC_TYPE_2, /* 1876 */ XML_XPTR_UNKNOWN_SCHEME = 1900, XML_XPTR_CHILDSEQ_START, /* 1901 */ XML_XPTR_EVAL_FAILED, /* 1902 */ @@ -718,19 +722,28 @@ typedef enum { 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 */ + XML_SCHEMAP_COS_VALID_DEFAULT_1, /* 3058 */ + XML_SCHEMAP_COS_VALID_DEFAULT_2_1, /* 3059 */ + XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1, /* 3060 */ + XML_SCHEMAP_COS_VALID_DEFAULT_2_2_2, /* 3061 */ + XML_SCHEMAP_CVC_SIMPLE_TYPE, /* 3062 */ + XML_SCHEMAP_COS_CT_EXTENDS_1_1, /* 3063 */ + XML_SCHEMAP_SRC_IMPORT_1_1, /* 3064 */ + XML_SCHEMAP_SRC_IMPORT_1_2, /* 3065 */ + XML_SCHEMAP_SRC_IMPORT_2, /* 3066 */ + XML_SCHEMAP_SRC_IMPORT_2_1, /* 3067 */ + XML_SCHEMAP_SRC_IMPORT_2_2, /* 3068 */ + XML_SCHEMAP_INTERNAL, /* 3069 non-W3C */ + XML_SCHEMAP_NOT_DETERMINISTIC, /* 3070 non-W3C */ + XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_1, /* 3071 */ + XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_2, /* 3072 */ + XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_3, /* 3073 */ + XML_SCHEMAP_MG_PROPS_CORRECT_1, /* 3074 */ + XML_SCHEMAP_MG_PROPS_CORRECT_2, /* 3075 */ + XML_SCHEMAP_SRC_CT_1, /* 3076 */ + XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_3, /* 3077 */ + XML_SCHEMAP_AU_PROPS_CORRECT_2, /* 3078 */ + XML_SCHEMAP_A_PROPS_CORRECT_2 } xmlParserErrors; /** diff --git a/include/libxml/xmlschemas.h b/include/libxml/xmlschemas.h index baf5dbf..0af2be5 100644 --- a/include/libxml/xmlschemas.h +++ b/include/libxml/xmlschemas.h @@ -54,6 +54,29 @@ typedef enum { XML_SCHEMAS_ERR_XXX } xmlSchemaValidError; +/* +* ATTENTION: Change xmlSchemaSetValidOptions's check +* for invalid values, if adding to the validation +* options below. +*/ +/** + * xmlSchemaValidOption: + * + * This is the set of XML Schema validation options. + */ +typedef enum { + XML_SCHEMA_VAL_VC_I_CREATE = 1<<0 + /* Default/fixed: create an attribute node + * or an element's text node on the instance. + */ +} xmlSchemaValidOption; + +/* + XML_SCHEMA_VAL_XSI_ASSEMBLE = 1<<1, + * assemble schemata using + * xsi:schemaLocation and + * xsi:noNamespaceSchemaLocation +*/ /** * The schemas related types are kept internal @@ -113,10 +136,15 @@ XMLPUBFUN void XMLCALL xmlSchemaValidityWarningFunc warn, void *ctx); XMLPUBFUN int XMLCALL - xmlSchemaGetValidErrors (xmlSchemaValidCtxtPtr ctxt, - xmlSchemaValidityErrorFunc *err, - xmlSchemaValidityWarningFunc *warn, - void **ctx); + xmlSchemaGetValidErrors (xmlSchemaValidCtxtPtr ctxt, + xmlSchemaValidityErrorFunc *err, + xmlSchemaValidityWarningFunc *warn, + void **ctx); +XMLPUBFUN int XMLCALL + xmlSchemaSetValidOptions (xmlSchemaValidCtxtPtr ctxt, + int options); +XMLPUBFUN int XMLCALL + xmlSchemaValidCtxtGetOptions(xmlSchemaValidCtxtPtr ctxt); XMLPUBFUN xmlSchemaValidCtxtPtr XMLCALL xmlSchemaNewValidCtxt (xmlSchemaPtr schema); @@ -125,6 +153,9 @@ XMLPUBFUN void XMLCALL XMLPUBFUN int XMLCALL xmlSchemaValidateDoc (xmlSchemaValidCtxtPtr ctxt, xmlDocPtr instance); +XMLPUBFUN int XMLCALL + xmlSchemaValidateOneElement (xmlSchemaValidCtxtPtr ctxt, + xmlNodePtr elem); XMLPUBFUN int XMLCALL xmlSchemaValidateStream (xmlSchemaValidCtxtPtr ctxt, xmlParserInputBufferPtr input, diff --git a/include/libxml/xmlschemastypes.h b/include/libxml/xmlschemastypes.h index 9b0d557..dca586a 100644 --- a/include/libxml/xmlschemastypes.h +++ b/include/libxml/xmlschemastypes.h @@ -43,7 +43,7 @@ XMLPUBFUN int XMLCALL xmlSchemaValidateFacet (xmlSchemaTypePtr base, xmlSchemaFacetPtr facet, const xmlChar *value, - xmlSchemaValPtr val); + xmlSchemaValPtr val); XMLPUBFUN void XMLCALL xmlSchemaFreeValue (xmlSchemaValPtr val); XMLPUBFUN xmlSchemaFacetPtr XMLCALL diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h index cbc44d8..2e026a7 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.13" +#define LIBXML_DOTTED_VERSION "2.6.14" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXML_VERSION 20613 +#define LIBXML_VERSION 20614 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXML_VERSION_STRING "20613" +#define LIBXML_VERSION_STRING "20614" /** * LIBXML_VERSION_EXTRA: * * extra version information, used to show a CVS compilation */ -#define LIBXML_VERSION_EXTRA "-CVS2151" +#define LIBXML_VERSION_EXTRA "-CVS2183" /** * 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(20613); +#define LIBXML_TEST_VERSION xmlCheckVersion(20614); #ifndef VMS #if 0 |