From 0fd83af441e251fc23fc1af7959fd6ecfa105fe1 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 6 Jan 2006 18:28:17 +0100 Subject: Load /tmp/tmp.U9vXwU/libxml2-2.6.23 into local/libxml2/branches/upstream/current. --- doc/devhelp/libxml2-HTMLtree.html | 9 +- doc/devhelp/libxml2-pattern.html | 14 ++- doc/devhelp/libxml2-relaxng.html | 2 +- doc/devhelp/libxml2-schemasInternals.html | 145 +++++++++++++++++------------- doc/devhelp/libxml2-tree.html | 2 +- doc/devhelp/libxml2-valid.html | 6 +- doc/devhelp/libxml2-xmlIO.html | 7 +- doc/devhelp/libxml2-xmlerror.html | 5 ++ doc/devhelp/libxml2-xmlreader.html | 9 +- doc/devhelp/libxml2-xmlregexp.html | 12 +-- doc/devhelp/libxml2-xmlsave.html | 5 ++ doc/devhelp/libxml2-xmlschemas.html | 73 ++++++++------- doc/devhelp/libxml2-xmlstring.html | 8 +- doc/devhelp/libxml2.devhelp | 17 ++++ 14 files changed, 195 insertions(+), 119 deletions(-) (limited to 'doc/devhelp') diff --git a/doc/devhelp/libxml2-HTMLtree.html b/doc/devhelp/libxml2-HTMLtree.html index b7c35b4..6430f8b 100644 --- a/doc/devhelp/libxml2-HTMLtree.html +++ b/doc/devhelp/libxml2-HTMLtree.html @@ -51,9 +51,10 @@ int htmlNodeDumpFileFormat (FILE * out,
xmlDocPtr doc,
xmlNodePtr cur,
const char * encoding,
int format); void htmlDocDumpMemory (xmlDocPtr cur,
xmlChar ** mem,
int * size); int htmlSaveFile (const char * filename,
xmlDocPtr cur); -htmlDocPtr htmlNewDocNoDtD (const xmlChar * URI,
const xmlChar * ExternalID); int htmlDocDump (FILE * f,
xmlDocPtr cur); +void htmlDocDumpMemoryFormat (xmlDocPtr cur,
xmlChar ** mem,
int * size,
int format); int htmlIsBooleanAttr (const xmlChar * name); +int htmlSaveFileFormat (const char * filename,
xmlDocPtr cur,
const char * encoding,
int format); void htmlNodeDumpFormatOutput (xmlOutputBufferPtr buf,
xmlDocPtr doc,
xmlNodePtr cur,
const char * encoding,
int format); int htmlSetMetaEncoding (htmlDocPtr doc,
const xmlChar * encoding); int htmlSaveFileEnc (const char * filename,
xmlDocPtr cur,
const char * encoding); @@ -63,7 +64,7 @@ int htmlNodeDump (xmlChar * htmlGetMetaEncoding (htmlDocPtr doc); void htmlNodeDumpFile (FILE * out,
xmlDocPtr doc,
xmlNodePtr cur); void htmlDocContentDumpFormatOutput (xmlOutputBufferPtr buf,
xmlDocPtr cur,
const char * encoding,
int format); -int htmlSaveFileFormat (const char * filename,
xmlDocPtr cur,
const char * encoding,
int format); +htmlDocPtr htmlNewDocNoDtD (const xmlChar * URI,
const xmlChar * ExternalID); void htmlDocContentDumpOutput (xmlOutputBufferPtr buf,
xmlDocPtr cur,
const char * encoding); @@ -108,6 +109,10 @@ void htmlDocContentDumpOutput (

htmlDocDumpMemory ()

void	htmlDocDumpMemory		(xmlDocPtr cur, 
					 xmlChar ** mem, 
					 int * size)

Dump an HTML document in memory and return the xmlChar * and it's size. It's up to the caller to free the memory.

cur:the document
mem:OUT: the memory pointer
size:OUT: the memory length
+
+

htmlDocDumpMemoryFormat ()

void	htmlDocDumpMemoryFormat		(xmlDocPtr cur, 
					 xmlChar ** mem, 
					 int * size, 
					 int format)

+

Dump an HTML document in memory and return the xmlChar * and it's size. It's up to the caller to free the memory.

+
cur:the document
mem:OUT: the memory pointer
size:OUT: the memory length
format:should formatting spaces been added

htmlGetMetaEncoding ()

const xmlChar *	htmlGetMetaEncoding	(htmlDocPtr doc)

Encoding definition lookup in the Meta tags

diff --git a/doc/devhelp/libxml2-pattern.html b/doc/devhelp/libxml2-pattern.html index 621767e..321bd79 100644 --- a/doc/devhelp/libxml2-pattern.html +++ b/doc/devhelp/libxml2-pattern.html @@ -55,11 +55,13 @@ void xmlFreePatternList (xmlPatternStreamable (xmlPatternPtr comp); int xmlStreamPushAttr (xmlStreamCtxtPtr stream,
const xmlChar * name,
const xmlChar * ns); int xmlPatternMatch (xmlPatternPtr comp,
xmlNodePtr node); +int xmlStreamWantsAnyNode (xmlStreamCtxtPtr streamCtxt); int xmlStreamPop (xmlStreamCtxtPtr stream); void xmlFreePattern (xmlPatternPtr comp); int xmlStreamPush (xmlStreamCtxtPtr stream,
const xmlChar * name,
const xmlChar * ns); int xmlPatternMaxDepth (xmlPatternPtr comp); xmlPatternPtr xmlPatterncompile (const xmlChar * pattern,
xmlDict * dict,
int flags,
const xmlChar ** namespaces); +int xmlStreamPushNode (xmlStreamCtxtPtr stream,
const xmlChar * name,
const xmlChar * ns,
int nodeType); void xmlFreeStreamCtxt (xmlStreamCtxtPtr stream);
@@ -143,13 +145,21 @@ The content of this structure is not made public by the API.
stream:the stream context
Returns:-1 in case of error, 0 otherwise.

xmlStreamPush ()

int	xmlStreamPush			(xmlStreamCtxtPtr stream, 
					 const xmlChar * name, 
					 const xmlChar * ns)

-

Push new data onto the stream. NOTE: if the call xmlPatterncompile() indicated a dictionary, then strings for name and ns will be expected to come from the dictionary. Both @name and @ns being NULL means the / i.e. the root of the document. This can also act as a reset.

+

Push new data onto the stream. NOTE: if the call xmlPatterncompile() indicated a dictionary, then strings for name and ns will be expected to come from the dictionary. Both @name and @ns being NULL means the / i.e. the root of the document. This can also act as a reset. Otherwise the function will act as if it has been given an element-node.

stream:the stream context
name:the current name
ns:the namespace name
Returns:-1 in case of error, 1 if the current state in the stream is a match and 0 otherwise.

xmlStreamPushAttr ()

int	xmlStreamPushAttr		(xmlStreamCtxtPtr stream, 
					 const xmlChar * name, 
					 const xmlChar * ns)

-

Push new attribute data onto the stream. NOTE: if the call xmlPatterncompile() indicated a dictionary, then strings for name and ns will be expected to come from the dictionary. Both @name and @ns being NULL means the / i.e. the root of the document. This can also act as a reset.

+

Push new attribute data onto the stream. NOTE: if the call xmlPatterncompile() indicated a dictionary, then strings for name and ns will be expected to come from the dictionary. Both @name and @ns being NULL means the / i.e. the root of the document. This can also act as a reset. Otherwise the function will act as if it has been given an attribute-node.

stream:the stream context
name:the current name
ns:the namespace name
Returns:-1 in case of error, 1 if the current state in the stream is a match and 0 otherwise.
+

xmlStreamPushNode ()

int	xmlStreamPushNode		(xmlStreamCtxtPtr stream, 
					 const xmlChar * name, 
					 const xmlChar * ns, 
					 int nodeType)

+

Push new data onto the stream. NOTE: if the call xmlPatterncompile() indicated a dictionary, then strings for name and ns will be expected to come from the dictionary. Both @name and @ns being NULL means the / i.e. the root of the document. This can also act as a reset. Different from xmlStreamPush() this function can be fed with nodes of type: element-, attribute-, text-, cdata-section-, comment- and processing-instruction-node.

+
stream:the stream context
name:the current name
ns:the namespace name
nodeType:the type of the node being pushed
Returns:-1 in case of error, 1 if the current state in the stream is a match and 0 otherwise.
+
+

xmlStreamWantsAnyNode ()

int	xmlStreamWantsAnyNode		(xmlStreamCtxtPtr streamCtxt)

+

Query if the streaming pattern additionally needs to be fed with text-, cdata-section-, comment- and processing-instruction-nodes. If the result is 0 then only element-nodes and attribute-nodes need to be pushed.

+
streamCtxt:the stream context
Returns:1 in case of need of nodes of the above described types, 0 otherwise. -1 on API errors.
+
diff --git a/doc/devhelp/libxml2-relaxng.html b/doc/devhelp/libxml2-relaxng.html index a10bd11..9dd4bb1 100644 --- a/doc/devhelp/libxml2-relaxng.html +++ b/doc/devhelp/libxml2-relaxng.html @@ -228,7 +228,7 @@ The content of this structure is not made public by the API.
schema:a precompiled XML RelaxNGs
Returns:the validation context or NULL in case of error

xmlRelaxNGParse ()

xmlRelaxNGPtr	xmlRelaxNGParse		(xmlRelaxNGParserCtxtPtr ctxt)

-

parse a schema definition resource and build an internal XML Shema struture which can be used to validate instances. *WARNING* this interface is highly subject to change

+

parse a schema definition resource and build an internal XML Shema struture which can be used to validate instances.

ctxt:a Relax-NG parser context
Returns:the internal XML RelaxNG structure built from the resource or NULL in case of error

xmlRelaxNGSetParserErrors ()

void	xmlRelaxNGSetParserErrors	(xmlRelaxNGParserCtxtPtr ctxt, 
					 xmlRelaxNGValidityErrorFunc err, 
					 xmlRelaxNGValidityWarningFunc warn, 
					 void * ctx)

diff --git a/doc/devhelp/libxml2-schemasInternals.html b/doc/devhelp/libxml2-schemasInternals.html
index ba7d1c1..2f9cbc9 100644
--- a/doc/devhelp/libxml2-schemasInternals.html
+++ b/doc/devhelp/libxml2-schemasInternals.html
@@ -39,7 +39,7 @@
       schemasInternals
     
     
schemasInternals - internal interfaces for XML Schemas

-    
internal interfaces for the XML Schemas handling and schema validity checking 

+    
internal interfaces for the XML Schemas handling and schema validity checking The Schemas development is a Work In Progress. Some of those interfaces are not garanteed to be API or ABI stable ! 

     
Author(s): Daniel Veillard 

     

       
Synopsis

@@ -66,11 +66,12 @@
 #define XML_SCHEMAS_ATTR_USE_PROHIBITED;
 #define XML_SCHEMAS_ELEM_NILLABLE;
 #define XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION;
-#define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED;
+#define XML_SCHEMAS_ATTRGROUP_REDEFINED;
 #define XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD;
 #define XML_SCHEMAS_TYPE_BLOCK_DEFAULT;
 #define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION;
 #define XML_SCHEMAS_TYPE_FINAL_EXTENSION;
+#define XML_SCHEMAS_TYPE_REDEFINED;
 #define XML_SCHEMAS_ELEM_FIXED;
 #define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD;
 #define XML_SCHEMAS_TYPE_VARIETY_ATOMIC;
@@ -90,7 +91,9 @@
 #define XML_SCHEMAS_ANYATTR_LAX;
 #define XML_SCHEMAS_TYPE_GLOBAL;
 #define XML_SCHEMAS_TYPE_ABSTRACT;
+#define XML_SCHEMAS_TYPE_MIXED;
 #define XML_SCHEMAS_ATTR_FIXED;
+#define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED;
 #define XML_SCHEMAS_ANY_SKIP;
 #define XML_SCHEMAS_FINAL_DEFAULT_LIST;
 #define XML_SCHEMAS_TYPE_VARIETY_ABSENT;
@@ -99,7 +102,7 @@
 #define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED;
 #define XML_SCHEMAS_ELEM_NSDEFAULT;
 #define XML_SCHEMAS_ELEM_GLOBAL;
-#define XML_SCHEMAS_TYPE_MIXED;
+#define XML_SCHEMAS_ELEM_TOPLEVEL;
 #define XML_SCHEMAS_ANY_LAX;
 #define XML_SCHEMAS_TYPE_FINAL_RESTRICTION;
 #define XML_SCHEMAS_TYPE_HAS_FACETS;
@@ -108,7 +111,7 @@
 #define XML_SCHEMAS_ELEM_FINAL_ABSENT;
 #define XML_SCHEMAS_TYPE_BLOCK_EXTENSION;
 #define XML_SCHEMAS_TYPE_INTERNAL_INVALID;
-#define XML_SCHEMAS_ELEM_TOPLEVEL;
+#define XML_SCHEMAS_ATTRGROUP_HAS_REFS;
 #define XML_SCHEMAS_ELEM_ABSTRACT;
 #define XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION;
 #define XML_SCHEMAS_TYPE_FINAL_UNION;
@@ -187,10 +190,18 @@ void	xmlSchemaFreeWildcard		(
Macro XML_SCHEMAS_ATTRGROUP_GLOBAL
#define XML_SCHEMAS_ATTRGROUP_GLOBAL;
 
The attribute wildcard has been already builded.

+

+        

+        
Macro XML_SCHEMAS_ATTRGROUP_HAS_REFS
#define XML_SCHEMAS_ATTRGROUP_HAS_REFS;
+
Whether this attr. group contains attr. group references.

 

         

         
Macro XML_SCHEMAS_ATTRGROUP_MARKED
#define XML_SCHEMAS_ATTRGROUP_MARKED;
 
Marks the attr group as marked; used for circular checks.

+

+        

+        
Macro XML_SCHEMAS_ATTRGROUP_REDEFINED
#define XML_SCHEMAS_ATTRGROUP_REDEFINED;
+
The attr group was redefined.

 

         

         
Macro XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
#define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED;
@@ -443,10 +454,14 @@ void	xmlSchemaFreeWildcard		(
Macro XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
#define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD;
 
the complexType owns an attribute wildcard, i.e. it can be freed by the complexType

+

+        

+        
Macro XML_SCHEMAS_TYPE_REDEFINED
#define XML_SCHEMAS_TYPE_REDEFINED;
+
The type was redefined.

 

         

         
Macro XML_SCHEMAS_TYPE_VARIETY_ABSENT
#define XML_SCHEMAS_TYPE_VARIETY_ABSENT;
-
the simpleType has a variety of "absent".

+

the simpleType has a variety of "absent". TODO: Actually not necessary :-/, since if none of the variety flags occur then it's automatically absent.

Macro XML_SCHEMAS_TYPE_VARIETY_ATOMIC

#define XML_SCHEMAS_TYPE_VARIETY_ATOMIC;
@@ -489,25 +504,25 @@ void	xmlSchemaFreeWildcard		(
Structure xmlSchemaAttribute
struct _xmlSchemaAttribute {
-    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
-    const xmlChar *	refNs	: the ns URI of the attribute decl. if a particle
+    xmlSchemaTypeType	type
+    struct _xmlSchemaAttribute *	next	: the next attribute (not used?)
+    const xmlChar *	name	: the name of the declaration
+    const xmlChar *	id	: Deprecated; not used
+    const xmlChar *	ref	: Deprecated; not used
+    const xmlChar *	refNs	: Deprecated; not used
     const xmlChar *	typeName	: the local name of the type definition
     const xmlChar *	typeNs	: the ns URI of the type definition
     xmlSchemaAnnotPtr	annot
-    xmlSchemaTypePtr	base	: obsolete, not used
-    int	occurs
-    const xmlChar *	defValue
+    xmlSchemaTypePtr	base	: Deprecated; not used
+    int	occurs	: Deprecated; not used
+    const xmlChar *	defValue	: The initial value of the value constraint
     xmlSchemaTypePtr	subtypes	: the type definition
     xmlNodePtr	node
     const xmlChar *	targetNamespace
     int	flags
-    const xmlChar *	refPrefix
-    xmlSchemaValPtr	defVal
-    xmlSchemaAttributePtr	refDecl
+    const xmlChar *	refPrefix	: Deprecated; not used
+    xmlSchemaValPtr	defVal	: The compiled value constraint
+    xmlSchemaAttributePtr	refDecl	: Deprecated; not used
 } xmlSchemaAttribute;
@@ -517,16 +532,17 @@ void xmlSchemaFreeWildcard (attribute if in a group ... const xmlChar * name const xmlChar * id - const xmlChar * ref - const xmlChar * refNs + const xmlChar * ref : Deprecated; not used + const xmlChar * refNs : Deprecated; not used xmlSchemaAnnotPtr annot - xmlSchemaAttributePtr attributes + xmlSchemaAttributePtr attributes : Deprecated; not used xmlNodePtr node int flags xmlSchemaWildcardPtr attributeWildcard - const xmlChar * refPrefix - xmlSchemaAttributeGroupPtr refItem : The referenced attribute group - const xmlChar * targetNamespace : xmlSchemaAttributeGroupPtr redef Redefinitions + const xmlChar * refPrefix : Deprecated; not used + xmlSchemaAttributeGroupPtr refItem : Deprecated; not used + const xmlChar * targetNamespace + void * attrUses } xmlSchemaAttributeGroup;

@@ -556,7 +572,7 @@ void xmlSchemaFreeWildcard (XML_SCHEMA_CONTENT_ELEMENTS = 2 XML_SCHEMA_CONTENT_MIXED = 3 XML_SCHEMA_CONTENT_SIMPLE = 4 - XML_SCHEMA_CONTENT_MIXED_OR_ELEMENTS = 5 /* obsolete, not used */ + XML_SCHEMA_CONTENT_MIXED_OR_ELEMENTS = 5 /* Obsolete */ XML_SCHEMA_CONTENT_BASIC = 6 XML_SCHEMA_CONTENT_ANY = 7 }; @@ -565,17 +581,17 @@ void xmlSchemaFreeWildcard (

Structure xmlSchemaElement

struct _xmlSchemaElement {
     xmlSchemaTypeType	type	: The kind of type
-    struct _xmlSchemaType *	next	: the next type if in a sequence ...
+    struct _xmlSchemaType *	next	: Not used?
     const xmlChar *	name
-    const xmlChar *	id
-    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
+    const xmlChar *	id	: Deprecated; not used
+    const xmlChar *	ref	: Deprecated; not used
+    const xmlChar *	refNs	: Deprecated; not used
     xmlSchemaAnnotPtr	annot
     xmlSchemaTypePtr	subtypes	: the type definition
     xmlSchemaAttributePtr	attributes
     xmlNodePtr	node
-    int	minOccurs
-    int	maxOccurs
+    int	minOccurs	: Deprecated; not used
+    int	maxOccurs	: Deprecated; not used
     int	flags
     const xmlChar *	targetNamespace
     const xmlChar *	namedType
@@ -583,13 +599,13 @@ void	xmlSchemaFreeWildcard		(xmlChar *	substGroup
     const xmlChar *	substGroupNs
     const xmlChar *	scope
-    const xmlChar *	value
+    const xmlChar *	value	: The original value of the value constraint.
     struct _xmlSchemaElement *	refDecl	: This will now be used for the substitution group affiliation
-    xmlRegexpPtr	contModel
+    xmlRegexpPtr	contModel	: Obsolete for WXS, maybe used for RelaxNG
     xmlSchemaContentType	contentType
-    const xmlChar *	refPrefix
-    xmlSchemaValPtr	defVal
-    void *	idcs
+    const xmlChar *	refPrefix	: Deprecated; not used
+    xmlSchemaValPtr	defVal	: The compiled value contraint.
+    void *	idcs	: The identity-constraint defs
 } xmlSchemaElement;

@@ -601,14 +617,14 @@ void xmlSchemaFreeWildcard (

Structure xmlSchemaFacet

struct _xmlSchemaFacet {
     xmlSchemaTypeType	type	: The kind of type
     struct _xmlSchemaFacet *	next	: the next type if in a sequence ...
-    const xmlChar *	value
-    const xmlChar *	id
+    const xmlChar *	value	: The original value
+    const xmlChar *	id	: Obsolete
     xmlSchemaAnnotPtr	annot
     xmlNodePtr	node
-    int	fixed
+    int	fixed	: XML_SCHEMAS_FACET_PRESERVE, etc.
     int	whitespace
-    xmlSchemaValPtr	val
-    xmlRegexpPtr	regexp
+    xmlSchemaValPtr	val	: The compiled value
+    xmlRegexpPtr	regexp	: The regex for patterns
 } xmlSchemaFacet;

@@ -646,39 +662,40 @@ void xmlSchemaFreeWildcard (xmlSchemaTypeType type : The kind of type struct _xmlSchemaType * next : the next type if in a sequence ... const xmlChar * name - const xmlChar * id - const xmlChar * ref - const xmlChar * refNs + const xmlChar * id : Deprecated; not used + const xmlChar * ref : Deprecated; not used + const xmlChar * refNs : Deprecated; not used xmlSchemaAnnotPtr annot xmlSchemaTypePtr subtypes - xmlSchemaAttributePtr attributes + xmlSchemaAttributePtr attributes : Deprecated; not used xmlNodePtr node - int minOccurs - int maxOccurs + int minOccurs : Deprecated; not used + int maxOccurs : Deprecated; not used int flags xmlSchemaContentType contentType - const xmlChar * base - const xmlChar * baseNs - xmlSchemaTypePtr baseType - xmlSchemaFacetPtr facets - struct _xmlSchemaType * redef : possible redefinitions for the type - int recurse - xmlSchemaAttributeLinkPtr attributeUses + const xmlChar * base : Base type's local name + const xmlChar * baseNs : Base type's target namespace + xmlSchemaTypePtr baseType : The base type component + xmlSchemaFacetPtr facets : Local facets + struct _xmlSchemaType * redef : Deprecated; not used + int recurse : Obsolete + xmlSchemaAttributeLinkPtr * attributeUses : Deprecated; not used xmlSchemaWildcardPtr attributeWildcard - int builtInType - xmlSchemaTypeLinkPtr memberTypes - xmlSchemaFacetLinkPtr facetSet - const xmlChar * refPrefix - xmlSchemaTypePtr contentTypeDef - xmlRegexpPtr contModel + int builtInType : Type of built-in types. + xmlSchemaTypeLinkPtr memberTypes : member-types if a union type. + xmlSchemaFacetLinkPtr facetSet : All facets (incl. inherited) + const xmlChar * refPrefix : Deprecated; not used + xmlSchemaTypePtr contentTypeDef : Used for the simple content of complex types. Could we use @subtypes + xmlRegexpPtr contModel : Holds the automaton of the content model const xmlChar * targetNamespace + void * attrUses } xmlSchemaType;

Structure xmlSchemaTypeLink

struct _xmlSchemaTypeLink {
     struct _xmlSchemaTypeLink *	next	: the next type link ...
-    xmlSchemaTypePtr	type	: the linked typ
+    xmlSchemaTypePtr	type	: the linked type
 } xmlSchemaTypeLink;

@@ -717,6 +734,7 @@ void xmlSchemaFreeWildcard (XML_SCHEMA_TYPE_IDC_KEY = 23 XML_SCHEMA_TYPE_IDC_KEYREF = 24 XML_SCHEMA_TYPE_PARTICLE = 25 + XML_SCHEMA_TYPE_ATTRIBUTE_USE = 26 XML_SCHEMA_FACET_MININCLUSIVE = 1000 XML_SCHEMA_FACET_MINEXCLUSIVE = 1001 XML_SCHEMA_FACET_MAXINCLUSIVE = 1002 @@ -730,6 +748,7 @@ void xmlSchemaFreeWildcard (XML_SCHEMA_FACET_MAXLENGTH = 1010 XML_SCHEMA_FACET_MINLENGTH = 1011 XML_SCHEMA_EXTRA_QNAMEREF = 2000 + XML_SCHEMA_EXTRA_ATTR_USE_PROHIB = 2001 };

@@ -798,11 +817,11 @@ The content of this structure is not made public by the API.

Structure xmlSchemaWildcard

struct _xmlSchemaWildcard {
     xmlSchemaTypeType	type	: The kind of type
-    const xmlChar *	id
+    const xmlChar *	id	: Deprecated; not used
     xmlSchemaAnnotPtr	annot
     xmlNodePtr	node
-    int	minOccurs
-    int	maxOccurs
+    int	minOccurs	: Deprecated; not used
+    int	maxOccurs	: Deprecated; not used
     int	processContents
     int	any	: Indicates if the ns constraint is of ##any
     xmlSchemaWildcardNsPtr	nsSet	: The list of allowed namespaces
diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html
index 9b77b9a..9395f76 100644
--- a/doc/devhelp/libxml2-tree.html
+++ b/doc/devhelp/libxml2-tree.html
@@ -1225,7 +1225,7 @@ void	xmlFreeNsList			(
doc:the document pointer
name:the DTD name
ExternalID:the external ID
SystemID:the system ID
Returns:a pointer to the new DTD structure

xmlNewGlobalNs ()

xmlNsPtr	xmlNewGlobalNs		(xmlDocPtr doc, 
					 const xmlChar * href, 
					 const xmlChar * prefix)

-

Creation of a Namespace, the old way using PI and without scoping DEPRECATED !!! It now create a namespace on the root element of the document if found.

+

Creation of a Namespace, the old way using PI and without scoping DEPRECATED !!!

doc:the document carrying the namespace
href:the URI associated
prefix:the prefix for the namespace
Returns:NULL this functionality had been removed

xmlNewNode ()

xmlNodePtr	xmlNewNode		(xmlNsPtr ns, 
					 const xmlChar * name)

diff --git a/doc/devhelp/libxml2-valid.html b/doc/devhelp/libxml2-valid.html
index 7832502..3b23e67 100644
--- a/doc/devhelp/libxml2-valid.html
+++ b/doc/devhelp/libxml2-valid.html
@@ -81,7 +81,7 @@ int	xmlValidateAttributeDecl	(xmlElementPtr	xmlGetDtdQElementDesc	(xmlDtdPtr dtd, 
					 const xmlChar * name, 
					 const xmlChar * prefix);
 xmlNotationTablePtr	xmlCopyNotationTable	(xmlNotationTablePtr table);
 int	xmlValidateDocument		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc);
-int	xmlValidGetPotentialChildren	(xmlElementContent * ctree, 
					 const xmlChar ** list, 
					 int * len, 
					 int max);
+int	xmlValidGetPotentialChildren	(xmlElementContent * ctree, 
					 const xmlChar ** names, 
					 int * len, 
					 int max);
 xmlNotationPtr	xmlAddNotationDecl	(xmlValidCtxtPtr ctxt, 
					 xmlDtdPtr dtd, 
					 const xmlChar * name, 
					 const xmlChar * PublicID, 
					 const xmlChar * SystemID);
 int	xmlValidateElementDecl		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlElementPtr elem);
 xmlAttributePtr	xmlAddAttributeDecl	(xmlValidCtxtPtr ctxt, 
					 xmlDtdPtr dtd, 
					 const xmlChar * elem, 
					 const xmlChar * name, 
					 const xmlChar * ns, 
					 xmlAttributeType type, 
					 xmlAttributeDefault def, 
					 const xmlChar * defaultValue, 
					 xmlEnumerationPtr tree);
@@ -426,9 +426,9 @@ The content of this structure is not made public by the API.

Does the validation related extra step of the normalization of attribute values: If the declared value is not CDATA, then the XML processor must further process the normalized attribute value by discarding any leading and trailing space (#x20) characters, and by replacing sequences of space (#x20) characters by single space (#x20) character. Also check VC: Standalone Document Declaration in P32, and update ctxt->valid accordingly

ctxt:the validation context or NULL
doc:the document
elem:the parent
name:the attribute name
value:the attribute value
Returns:a new normalized string if normalization is needed, NULL otherwise the caller must free the returned value.
-

xmlValidGetPotentialChildren ()

int	xmlValidGetPotentialChildren	(xmlElementContent * ctree, 
					 const xmlChar ** list, 
					 int * len, 
					 int max)

+        
xmlValidGetPotentialChildren ()
int	xmlValidGetPotentialChildren	(xmlElementContent * ctree, 
					 const xmlChar ** names, 
					 int * len, 
					 int max)

 
Build/extend a list of potential children allowed by the content tree

-
ctree:an element content tree
list:an array to store the list of child names
len:a pointer to the number of element in the list
max:the size of the array
Returns:the number of element in the list, or -1 in case of error.

+
ctree:an element content tree
names:an array to store the list of child names
len:a pointer to the number of element in the list
max:the size of the array
Returns:the number of element in the list, or -1 in case of error.

xmlValidGetValidElements ()

int	xmlValidGetValidElements	(xmlNode * prev, 
					 xmlNode * next, 
					 const xmlChar ** names, 
					 int max)

This function returns the list of authorized children to insert within an existing tree while respecting the validity constraints forced by the Dtd. The insertion point is defined using @prev and @next in the following ways: to insert before 'node': xmlValidGetValidElements(node->prev, node, ... to insert next 'node': xmlValidGetValidElements(node, node->next, ... to replace 'node': xmlValidGetValidElements(node->prev, node->next, ... to prepend a child to 'node': xmlValidGetValidElements(NULL, node->childs, to append a child to 'node': xmlValidGetValidElements(node->last, NULL, ... pointers to the element names are inserted at the beginning of the array and do not need to be freed.

diff --git a/doc/devhelp/libxml2-xmlIO.html b/doc/devhelp/libxml2-xmlIO.html index 9e03d5f..8c41d1d 100644 --- a/doc/devhelp/libxml2-xmlIO.html +++ b/doc/devhelp/libxml2-xmlIO.html @@ -71,9 +71,10 @@ int xmlRegisterInputCallbacks (xmlFreeParserInputBuffer (xmlParserInputBufferPtr in); void xmlRegisterDefaultInputCallbacks (void); int xmlParserInputBufferGrow (xmlParserInputBufferPtr in,
int len); +typedef int xmlOutputCloseCallback (void * context); xmlOutputBufferPtr xmlAllocOutputBuffer (xmlCharEncodingHandlerPtr encoder); xmlParserInputPtr xmlNoNetExternalEntityLoader (const char * URL,
const char * ID,
xmlParserCtxtPtr ctxt); -typedef int xmlOutputCloseCallback (void * context); +xmlOutputBufferPtr xmlOutputBufferCreateBuffer (xmlBufferPtr buffer,
xmlCharEncodingHandlerPtr encoder); int xmlIOHTTPMatch (const char * filename); void * xmlIOHTTPOpen (const char * filename); xmlParserInputBufferPtr xmlParserInputBufferCreateIO (xmlInputReadCallback ioread,
xmlInputCloseCallback ioclose,
void * ioctx,
xmlCharEncoding enc); @@ -229,6 +230,10 @@ void * xmlIOHTTPOpenW (const char * post_uri,

xmlOutputBufferClose ()

int	xmlOutputBufferClose		(xmlOutputBufferPtr out)

flushes and close the output I/O channel and free up all the associated resources

out:a buffered output
Returns:the number of byte written or -1 in case of error.
+
+

xmlOutputBufferCreateBuffer ()

xmlOutputBufferPtr	xmlOutputBufferCreateBuffer	(xmlBufferPtr buffer, 
							 xmlCharEncodingHandlerPtr encoder)

+

Create a buffered output for the progressive saving to a xmlBuffer

+
buffer:a xmlBufferPtr
encoder:the encoding converter or NULL
Returns:the new parser output or NULL

xmlOutputBufferCreateFd ()

xmlOutputBufferPtr	xmlOutputBufferCreateFd	(int fd, 
						 xmlCharEncodingHandlerPtr encoder)

Create a buffered output for the progressive saving to a file descriptor

diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html index 44792da..d0eb477 100644 --- a/doc/devhelp/libxml2-xmlerror.html +++ b/doc/devhelp/libxml2-xmlerror.html @@ -811,6 +811,11 @@ void xmlResetError (XML_SCHEMAP_WARN_UNLOCATED_SCHEMA = 3084 /* 3084 */ XML_SCHEMAP_WARN_ATTR_REDECL_PROH = 3085 /* 3085 */ XML_SCHEMAP_WARN_ATTR_POINTLESS_PROH = 3086 /* 3085 */ + XML_SCHEMAP_AG_PROPS_CORRECT = 3087 /* 3086 */ + XML_SCHEMAP_COS_CT_EXTENDS_1_2 = 3088 /* 3087 */ + XML_SCHEMAP_AU_PROPS_CORRECT = 3089 /* 3088 */ + XML_SCHEMAP_A_PROPS_CORRECT_3 = 3090 /* 3089 */ + XML_SCHEMAP_COS_ALL_LIMITED = 3091 /* 3090 */ XML_MODULE_OPEN = 4900 /* 4900 */ XML_MODULE_CLOSE = 4901 /* 4901 */ XML_CHECK_FOUND_ELEMENT = 5000 diff --git a/doc/devhelp/libxml2-xmlreader.html b/doc/devhelp/libxml2-xmlreader.html index 585f47e..a3bbbb5 100644 --- a/doc/devhelp/libxml2-xmlreader.html +++ b/doc/devhelp/libxml2-xmlreader.html @@ -124,6 +124,7 @@ int xmlReaderNewMemory (xmlChar * xmlTextReaderConstValue (xmlTextReaderPtr reader); xmlTextReaderPtr xmlNewTextReader (xmlParserInputBufferPtr input,
const char * URI); xmlChar * xmlTextReaderGetAttributeNo (xmlTextReaderPtr reader,
int no); +int xmlTextReaderSchemaValidateCtxt (xmlTextReaderPtr reader,
xmlSchemaValidCtxtPtr ctxt,
int options); xmlChar * xmlTextReaderLocalName (xmlTextReaderPtr reader); xmlNodePtr xmlTextReaderExpand (xmlTextReaderPtr reader); const xmlChar * xmlTextReaderConstName (xmlTextReaderPtr reader); @@ -513,8 +514,12 @@ The content of this structure is not made public by the API.
reader:the xmlTextReaderPtr used
rng:the path to a RelaxNG schema or NULL
Returns:0 in case the RelaxNG validation could be (des)activated and -1 in case of error.

xmlTextReaderSchemaValidate ()

int	xmlTextReaderSchemaValidate	(xmlTextReaderPtr reader, 
					 const char * xsd)

-

Use W3C XSD schema to validate the document as it is processed. Activation is only possible before the first Read(). if @xsd is NULL, then RelaxNG validation is desactivated.

-
reader:the xmlTextReaderPtr used
xsd:the path to a W3C XSD schema or NULL
Returns:0 in case the schemas validation could be (des)activated and -1 in case of error.
+

Use W3C XSD schema to validate the document as it is processed. Activation is only possible before the first Read(). If @xsd is NULL, then XML Schema validation is deactivated.

+
reader:the xmlTextReaderPtr used
xsd:the path to a W3C XSD schema or NULL
Returns:0 in case the schemas validation could be (de)activated and -1 in case of error.
+
+

xmlTextReaderSchemaValidateCtxt ()

int	xmlTextReaderSchemaValidateCtxt	(xmlTextReaderPtr reader, 
					 xmlSchemaValidCtxtPtr ctxt, 
					 int options)

+

Use W3C XSD schema context to validate the document as it is processed. Activation is only possible before the first Read(). If @ctxt is NULL, then XML Schema validation is deactivated.

+
reader:the xmlTextReaderPtr used
ctxt:the XML Schema validation context or NULL
options:options (not used yet)
Returns:0 in case the schemas validation could be (de)activated and -1 in case of error.

xmlTextReaderSetErrorHandler ()

void	xmlTextReaderSetErrorHandler	(xmlTextReaderPtr reader, 
					 xmlTextReaderErrorFunc f, 
					 void * arg)

Register a callback function that will be called on error and warnings. If @f is NULL, the default error and warning handlers are restored.

diff --git a/doc/devhelp/libxml2-xmlregexp.html b/doc/devhelp/libxml2-xmlregexp.html index 0de6668..e783648 100644 --- a/doc/devhelp/libxml2-xmlregexp.html +++ b/doc/devhelp/libxml2-xmlregexp.html @@ -75,10 +75,10 @@ void xmlExpFree (xmlExpNodePtr xmlExpNewAtom (xmlExpCtxtPtr ctxt,
const xmlChar * name,
int len); int xmlRegexpExec (xmlRegexpPtr comp,
const xmlChar * content); int xmlRegExecPushString (xmlRegExecCtxtPtr exec,
const xmlChar * value,
void * data); -int xmlExpGetStart (xmlExpCtxtPtr ctxt,
xmlExpNodePtr exp,
const xmlChar ** list,
int len); +int xmlExpGetStart (xmlExpCtxtPtr ctxt,
xmlExpNodePtr exp,
const xmlChar ** tokList,
int len); xmlExpNodePtr xmlExpParse (xmlExpCtxtPtr ctxt,
const char * expr); xmlExpCtxtPtr xmlExpNewCtxt (int maxNodes,
xmlDictPtr dict); -int xmlExpGetLanguage (xmlExpCtxtPtr ctxt,
xmlExpNodePtr exp,
const xmlChar ** list,
int len); +int xmlExpGetLanguage (xmlExpCtxtPtr ctxt,
xmlExpNodePtr exp,
const xmlChar ** langList,
int len); xmlExpNodePtr xmlExpStringDerive (xmlExpCtxtPtr ctxt,
xmlExpNodePtr exp,
const xmlChar * str,
int len); int xmlExpCtxtNbNodes (xmlExpCtxtPtr ctxt); int xmlExpMaxToken (xmlExpNodePtr expr); @@ -178,13 +178,13 @@ The content of this structure is not made public by the API.

Free an expression context

ctxt:an expression context
-

xmlExpGetLanguage ()

int	xmlExpGetLanguage		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** list, 
					 int len)

+        
xmlExpGetLanguage ()
int	xmlExpGetLanguage		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** langList, 
					 int len)

 
Find all the strings used in @exp and store them in @list

-
ctxt:the expression context
exp:the expression
list:where to store the tokens
len:the allocated lenght of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings

+
ctxt:the expression context
exp:the expression
langList:where to store the tokens
len:the allocated lenght of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings
-

xmlExpGetStart ()

int	xmlExpGetStart			(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** list, 
					 int len)

+        
xmlExpGetStart ()
int	xmlExpGetStart			(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** tokList, 
					 int len)

 
Find all the strings that appears at the start of the languages accepted by @exp and store them in @list. E.g. for (a, b) | c it will return the list [a, c]

-
ctxt:the expression context
exp:the expression
list:where to store the tokens
len:the allocated lenght of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings

+
ctxt:the expression context
exp:the expression
tokList:where to store the tokens
len:the allocated lenght of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings

xmlExpIsNillable ()

int	xmlExpIsNillable		(xmlExpNodePtr exp)

Finds if the expression is nillable, i.e. if it accepts the empty sequqnce

diff --git a/doc/devhelp/libxml2-xmlsave.html b/doc/devhelp/libxml2-xmlsave.html index 0c416f4..910a1df 100644 --- a/doc/devhelp/libxml2-xmlsave.html +++ b/doc/devhelp/libxml2-xmlsave.html @@ -50,6 +50,7 @@ typedef xmlSaveCtxt * xmlSaveCtxtPtr xmlSaveToFd (int fd,
const char * encoding,
int options); int xmlSaveClose (xmlSaveCtxtPtr ctxt); int xmlSaveSetAttrEscape (xmlSaveCtxtPtr ctxt,
xmlCharEncodingOutputFunc escape); +xmlSaveCtxtPtr xmlSaveToBuffer (xmlBufferPtr buffer,
const char * encoding,
int options); xmlSaveCtxtPtr xmlSaveToFilename (const char * filename,
const char * encoding,
int options); int xmlSaveFlush (xmlSaveCtxtPtr ctxt); long xmlSaveDoc (xmlSaveCtxtPtr ctxt,
xmlDocPtr doc); @@ -101,6 +102,10 @@ The content of this structure is not made public by the API.

xmlSaveSetEscape ()

int	xmlSaveSetEscape		(xmlSaveCtxtPtr ctxt, 
					 xmlCharEncodingOutputFunc escape)

Set a custom escaping function to be used for text in element content

ctxt:a document saving context
escape:the escaping function
Returns:0 if successful or -1 in case of error.
+
+

xmlSaveToBuffer ()

xmlSaveCtxtPtr	xmlSaveToBuffer		(xmlBufferPtr buffer, 
					 const char * encoding, 
					 int options)

+

Create a document saving context serializing to a buffer with the encoding and the options given

+
buffer:a buffer
encoding:the encoding name to use or NULL
options:a set of xmlSaveOptions
Returns:a new serialization context or NULL in case of error.

xmlSaveToFd ()

xmlSaveCtxtPtr	xmlSaveToFd		(int fd, 
					 const char * encoding, 
					 int options)

Create a document saving context serializing to a file descriptor with the encoding and the options given.

diff --git a/doc/devhelp/libxml2-xmlschemas.html b/doc/devhelp/libxml2-xmlschemas.html index bf5120e..4801ea5 100644 --- a/doc/devhelp/libxml2-xmlschemas.html +++ b/doc/devhelp/libxml2-xmlschemas.html @@ -68,7 +68,7 @@ void xmlSchemaSetValidStructuredErr void xmlSchemaSetValidErrors (xmlSchemaValidCtxtPtr ctxt,
xmlSchemaValidityErrorFunc err,
xmlSchemaValidityWarningFunc warn,
void * ctx); int xmlSchemaValidCtxtGetOptions (xmlSchemaValidCtxtPtr ctxt); int xmlSchemaValidateFile (xmlSchemaValidCtxtPtr ctxt,
const char * filename,
int options); -int xmlSchemaValidateDoc (xmlSchemaValidCtxtPtr ctxt,
xmlDocPtr doc); +int xmlSchemaValidateDoc (xmlSchemaValidCtxtPtr ctxt,
xmlDocPtr instance); void xmlSchemaFree (xmlSchemaPtr schema); xmlSchemaParserCtxtPtr xmlSchemaNewMemParserCtxt (const char * buffer,
int size); int xmlSchemaGetValidErrors (xmlSchemaValidCtxtPtr ctxt,
xmlSchemaValidityErrorFunc * err,
xmlSchemaValidityWarningFunc * warn,
void ** ctx); @@ -77,6 +77,7 @@ void xmlSchemaSetParserErrors (xmlSchemaValidityWarningFunc (void * ctx,
const char * msg,
... ...); void xmlSchemaDump (FILE * output,
xmlSchemaPtr schema); void xmlSchemaFreeValidCtxt (xmlSchemaValidCtxtPtr ctxt); +void xmlSchemaSetParserStructuredErrors (xmlSchemaParserCtxtPtr ctxt,
xmlStructuredErrorFunc serror,
void * ctx); xmlSchemaValidCtxtPtr xmlSchemaNewValidCtxt (xmlSchemaPtr schema);
@@ -90,7 +91,7 @@ void xmlSchemaFreeValidCtxt (xmlChar * name : schema name const xmlChar * targetNamespace : the target namespace const xmlChar * version - const xmlChar * id + const xmlChar * id : Obsolete xmlDocPtr doc xmlSchemaAnnotPtr annot int flags @@ -106,8 +107,8 @@ void xmlSchemaFreeValidCtxt (xmlHashTablePtr idcDef - void * volatiles : Deprecated; not used anymore. + xmlHashTablePtr idcDef : All identity-constraint defs. + void * volatiles : Obsolete } xmlSchema;

@@ -204,20 +205,20 @@ The content of this structure is not made public by the API.
ctxt:the schema parser context

xmlSchemaFreeValidCtxt ()

void	xmlSchemaFreeValidCtxt		(xmlSchemaValidCtxtPtr ctxt)

-

Free the resources associated to the schema validation context

-
ctxt:the schema validation context
+

+

ctxt:

xmlSchemaGetParserErrors ()

int	xmlSchemaGetParserErrors	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc * err, 
					 xmlSchemaValidityWarningFunc * warn, 
					 void ** ctx)

Get the callback information used to handle errors for a parser context

ctxt:a XMl-Schema parser context
err:the error callback result
warn:the warning callback result
ctx:contextual data for the callbacks result
Returns:-1 in case of failure, 0 otherwise

xmlSchemaGetValidErrors ()

int	xmlSchemaGetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc * err, 
					 xmlSchemaValidityWarningFunc * warn, 
					 void ** ctx)

-

Get the error and warning callback informations

-
ctxt:a XML-Schema validation context
err:the error function result
warn:the warning function result
ctx:the functions context result
Returns:-1 in case of error and 0 otherwise
+

+

ctxt:
err:
warn:
ctx:
Returns:

xmlSchemaIsValid ()

int	xmlSchemaIsValid		(xmlSchemaValidCtxtPtr ctxt)

-

Check if any error was detected during validation.

-
ctxt:the schema validation context
Returns:1 if valid so far, 0 if errors were detected, and -1 in case of internal error.
+

+

ctxt:
Returns:

xmlSchemaNewDocParserCtxt ()

xmlSchemaParserCtxtPtr	xmlSchemaNewDocParserCtxt	(xmlDocPtr doc)

Create an XML Schemas parse context for that document. NB. The document may be modified during the parsing process.

@@ -232,56 +233,60 @@ The content of this structure is not made public by the API.
URL:the location of the schema
Returns:the parser context or NULL in case of error

xmlSchemaNewValidCtxt ()

xmlSchemaValidCtxtPtr	xmlSchemaNewValidCtxt	(xmlSchemaPtr schema)

-

Create an XML Schemas validation context based on the given schema.

-
schema:a precompiled XML Schemas
Returns:the validation context or NULL in case of error
+

+

schema:
Returns:

xmlSchemaParse ()

xmlSchemaPtr	xmlSchemaParse		(xmlSchemaParserCtxtPtr ctxt)

-

parse a schema definition resource and build an internal XML Shema struture which can be used to validate instances. *WARNING* this interface is highly subject to change

+

parse a schema definition resource and build an internal XML Shema struture which can be used to validate instances.

ctxt:a schema validation context
Returns:the internal XML Schema structure built from the resource or NULL in case of error

xmlSchemaSAXPlug ()

xmlSchemaSAXPlugPtr	xmlSchemaSAXPlug	(xmlSchemaValidCtxtPtr ctxt, 
						 xmlSAXHandlerPtr * sax, 
						 void ** user_data)

-

Plug a SAX based validation layer in a SAX parsing event flow. The original @saxptr and @dataptr data are replaced by new pointers but the calls to the original will be maintained.

-
ctxt:a schema validation context
sax:a pointer to the original xmlSAXHandlerPtr
user_data:a pointer to the original SAX user data pointer
Returns:a pointer to a data structure needed to unplug the validation layer or NULL in case of errors.
+

+

ctxt:
sax:
user_data:
Returns:

xmlSchemaSAXUnplug ()

int	xmlSchemaSAXUnplug		(xmlSchemaSAXPlugPtr plug)

-

Unplug a SAX based validation layer in a SAX parsing event flow. The original pointers used in the call are restored.

-
plug:a data structure returned by xmlSchemaSAXPlug
Returns:0 in case of success and -1 in case of failure.
+

+

plug:
Returns:

xmlSchemaSetParserErrors ()

void	xmlSchemaSetParserErrors	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx)

Set the callback functions used to handle errors for a validation context

ctxt:a schema validation context
err:the error callback
warn:the warning callback
ctx:contextual data for the callbacks
+
+

xmlSchemaSetParserStructuredErrors ()

void	xmlSchemaSetParserStructuredErrors	(xmlSchemaParserCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx)

+

Set the structured error callback

+
ctxt:a schema parser context
serror:the structured error function
ctx:the functions context

xmlSchemaSetValidErrors ()

void	xmlSchemaSetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx)

-

Set the error and warning callback informations

-
ctxt:a schema validation context
err:the error function
warn:the warning function
ctx:the functions context
+

+

ctxt:
err:
warn:
ctx:

xmlSchemaSetValidOptions ()

int	xmlSchemaSetValidOptions	(xmlSchemaValidCtxtPtr ctxt, 
					 int options)

-

Sets the options to be used during the validation.

-
ctxt:a schema validation context
options:a combination of xmlSchemaValidOption
Returns:0 in case of success, -1 in case of an API error.
+

+

ctxt:
options:
Returns:

xmlSchemaSetValidStructuredErrors ()

void	xmlSchemaSetValidStructuredErrors	(xmlSchemaValidCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx)

-

Set the structured error callback

-
ctxt:a schema validation context
serror:the structured error function
ctx:the functions context
+

+

ctxt:
serror:
ctx:

xmlSchemaValidCtxtGetOptions ()

int	xmlSchemaValidCtxtGetOptions	(xmlSchemaValidCtxtPtr ctxt)

-

Get the validation context options.

-
ctxt:a schema validation context
Returns:the option combination or -1 on error.
+

+

ctxt:
Returns:
-

xmlSchemaValidateDoc ()

int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr doc)

-

Validate a document tree in memory.

-
ctxt:a schema validation context
doc:a parsed document tree
Returns:0 if the document is schemas valid, a positive error code number otherwise and -1 in case of internal or API error.
+

xmlSchemaValidateDoc ()

int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr instance)

+

+

ctxt:
instance:
Returns:

xmlSchemaValidateFile ()

int	xmlSchemaValidateFile		(xmlSchemaValidCtxtPtr ctxt, 
					 const char * filename, 
					 int options)

-

Do a schemas validation of the given resource, it will use the SAX streamable validation internally.

-
ctxt:a schema validation context
filename:the URI of the instance
options:a future set of options, currently unused
Returns:0 if the document is valid, a positive error code number otherwise and -1 in case of an internal or API error.
+

+

ctxt:
filename:
options:
Returns:

xmlSchemaValidateOneElement ()

int	xmlSchemaValidateOneElement	(xmlSchemaValidCtxtPtr ctxt, 
					 xmlNodePtr elem)

-

Validate a branch of a tree, starting with the given @elem.

-
ctxt:a schema validation context
elem:an element node
Returns:0 if the element and its subtree is valid, a positive error code number otherwise and -1 in case of an internal or API error.
+

+

ctxt:
elem:
Returns:

xmlSchemaValidateStream ()

int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 xmlSAXHandlerPtr sax, 
					 void * user_data)

-

Validate an input based on a flow of SAX event from the parser and forward the events to the @sax handler with the provided @user_data the user provided @sax handler must be a SAX2 one.

-
ctxt:a schema validation context
input:the input to use for reading the data
enc:an optional encoding information
sax:a SAX handler for the resulting events
user_data:the context to provide to the SAX handler.
Returns:0 if the document is schemas valid, a positive error code number otherwise and -1 in case of internal or API error.
+

+

ctxt:
input:
enc:
sax:
user_data:
Returns:
diff --git a/doc/devhelp/libxml2-xmlstring.html b/doc/devhelp/libxml2-xmlstring.html index f7abfa3..43da9a4 100644 --- a/doc/devhelp/libxml2-xmlstring.html +++ b/doc/devhelp/libxml2-xmlstring.html @@ -108,7 +108,7 @@ int xmlUTF8Strloc (const
utf:a sequence of UTF-8 encoded bytes
len:a pointer to the minimum number of bytes present in the sequence. This is used to assure the next character is completely contained within the sequence.
Returns:the char value or -1 in case of error, and sets *len to the actual number of bytes consumed (0 in case of error)

xmlStrEqual ()

int	xmlStrEqual			(const xmlChar * str1, 
					 const xmlChar * str2)

-

Check if both string are equal of have same content Should be a bit more readable and faster than xmlStrEqual()

+

Check if both strings are equal of have same content. Should be a bit more readable and faster than xmlStrcmp()

str1:the first xmlChar *
str2:the second xmlChar *
Returns:1 if they are equal, 0 if they are different

xmlStrPrintf ()

int	xmlStrPrintf			(xmlChar * buf, 
					 int len, 
					 const xmlChar * msg, 
					 ... ...)

@@ -156,12 +156,12 @@ int	xmlUTF8Strloc			(const 
str1:the first xmlChar *
str2:the second xmlChar *
len:the max comparison length
Returns:the integer result of the comparison

xmlStrncat ()

xmlChar *	xmlStrncat		(xmlChar * cur, 
					 const xmlChar * add, 
					 int len)

-

a strncat for array of xmlChar's, it will extend @cur with the len first bytes of @add.

+

a strncat for array of xmlChar's, it will extend @cur with the len first bytes of @add. Note that if @len < 0 then this is an API error and NULL will be returned.

cur:the original xmlChar * array
add:the xmlChar * array added
len:the length of @add
Returns:a new xmlChar *, the original @cur is reallocated if needed and should not be freed

xmlStrncatNew ()

xmlChar *	xmlStrncatNew		(const xmlChar * str1, 
					 const xmlChar * str2, 
					 int len)

-

same as xmlStrncat, but creates a new string. The original two strings are not freed.

-
str1:first xmlChar string
str2:second xmlChar string
len:the len of @str2
Returns:a new xmlChar * or NULL
+

same as xmlStrncat, but creates a new string. The original two strings are not freed. If @len is < 0 then the length will be calculated automatically.

+
str1:first xmlChar string
str2:second xmlChar string
len:the len of @str2 or < 0
Returns:a new xmlChar * or NULL

xmlStrncmp ()

int	xmlStrncmp			(const xmlChar * str1, 
					 const xmlChar * str2, 
					 int len)

a strncmp for xmlChar's

diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp index edc74cd..c8d5572 100644 --- a/doc/devhelp/libxml2.devhelp +++ b/doc/devhelp/libxml2.devhelp @@ -166,7 +166,9 @@ + + @@ -230,6 +232,7 @@ + @@ -956,13 +959,18 @@ + + + + + @@ -1309,6 +1317,7 @@ + @@ -1327,6 +1336,7 @@ + @@ -1922,6 +1932,7 @@ + @@ -2521,6 +2532,7 @@ + @@ -2757,6 +2769,7 @@ + @@ -2801,6 +2814,7 @@ + @@ -2881,6 +2895,8 @@ + + @@ -2961,6 +2977,7 @@ + -- cgit v1.2.3