From 07a67fa4bcc1b8bf2651ab41e5fc54a05059cf7e Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Sat, 29 Apr 2006 21:57:40 +0200 Subject: Load /tmp/libxml2-2.6.24 into libxml2/branches/upstream/current. --- doc/devhelp/Makefile.in | 4 ++-- doc/devhelp/libxml2-chvalid.html | 22 +++++++++++----------- doc/devhelp/libxml2-relaxng.html | 5 +++++ doc/devhelp/libxml2-tree.html | 17 +++++++++++------ doc/devhelp/libxml2.devhelp | 2 ++ 5 files changed, 31 insertions(+), 19 deletions(-) (limited to 'doc/devhelp') diff --git a/doc/devhelp/Makefile.in b/doc/devhelp/Makefile.in index 87d1302..83b5866 100644 --- a/doc/devhelp/Makefile.in +++ b/doc/devhelp/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/doc/devhelp/libxml2-chvalid.html b/doc/devhelp/libxml2-chvalid.html index 8b17456..9c77158 100644 --- a/doc/devhelp/libxml2-chvalid.html +++ b/doc/devhelp/libxml2-chvalid.html @@ -67,7 +67,7 @@ int xmlIsChar (unsigned int ch); int xmlIsDigit (unsigned int ch); int xmlIsBlank (unsigned int ch); int xmlIsIdeographic (unsigned int ch); -int xmlCharInRange (unsigned int val,
const xmlChRangeGroupPtr rptr); +int xmlCharInRange (unsigned int val,
const xmlChRangeGroup * rptr); int xmlIsPubidChar (unsigned int ch); int xmlIsCombining (unsigned int ch); int xmlIsBaseChar (unsigned int ch); @@ -150,8 +150,8 @@ int xmlIsExtender (unsigned int ch);

Structure xmlChRangeGroup

struct _xmlChRangeGroup {
     int	nbShortRange
     int	nbLongRange
-    xmlChSRangePtr	shortRange	: points to an array of ranges
-    xmlChLRangePtr	longRange
+    const xmlChSRange *	shortRange	: points to an array of ranges
+    const xmlChLRange *	longRange
 } xmlChRangeGroup;

@@ -171,35 +171,35 @@ int xmlIsExtender (unsigned int ch);

-

Variable xmlIsBaseCharGroup

xmlChRangeGroup xmlIsBaseCharGroup;
+        
Variable xmlIsBaseCharGroup
const xmlChRangeGroup xmlIsBaseCharGroup;
 

 

         

-        
Variable xmlIsCharGroup
xmlChRangeGroup xmlIsCharGroup;
+        
Variable xmlIsCharGroup
const xmlChRangeGroup xmlIsCharGroup;
 

 

         

-        
Variable xmlIsCombiningGroup
xmlChRangeGroup xmlIsCombiningGroup;
+        
Variable xmlIsCombiningGroup
const xmlChRangeGroup xmlIsCombiningGroup;
 

 

         

-        
Variable xmlIsDigitGroup
xmlChRangeGroup xmlIsDigitGroup;
+        
Variable xmlIsDigitGroup
const xmlChRangeGroup xmlIsDigitGroup;
 

 

         

-        
Variable xmlIsExtenderGroup
xmlChRangeGroup xmlIsExtenderGroup;
+        
Variable xmlIsExtenderGroup
const xmlChRangeGroup xmlIsExtenderGroup;
 

 

         

-        
Variable xmlIsIdeographicGroup
xmlChRangeGroup xmlIsIdeographicGroup;
+        
Variable xmlIsIdeographicGroup
const xmlChRangeGroup xmlIsIdeographicGroup;
 

 

         

-        
Variable xmlIsPubidChar_tab
unsigned charxmlIsPubidChar_tab[256] xmlIsPubidChar_tab;
+        
Variable xmlIsPubidChar_tab
const unsigned charxmlIsPubidChar_tab[256] xmlIsPubidChar_tab;
 

 

         

-        
xmlCharInRange ()
int	xmlCharInRange			(unsigned int val, 
					 const xmlChRangeGroupPtr rptr)

+        
xmlCharInRange ()
int	xmlCharInRange			(unsigned int val, 
					 const xmlChRangeGroup * rptr)

 
Does a binary search of the range table to determine if char is valid

 
val:character to be validated
rptr:pointer to range to be used to validate
Returns:true if character valid, false otherwise

         

diff --git a/doc/devhelp/libxml2-relaxng.html b/doc/devhelp/libxml2-relaxng.html
index 9dd4bb1..d7da3e5 100644
--- a/doc/devhelp/libxml2-relaxng.html
+++ b/doc/devhelp/libxml2-relaxng.html
@@ -62,6 +62,7 @@ int	xmlRelaxNGValidatePopElement	(xmlRelaxNGDump			(FILE * output, 
					 xmlRelaxNGPtr schema);
 void	xmlRelaxNGSetParserErrors	(xmlRelaxNGParserCtxtPtr ctxt, 
					 xmlRelaxNGValidityErrorFunc err, 
					 xmlRelaxNGValidityWarningFunc warn, 
					 void * ctx);
 xmlRelaxNGPtr	xmlRelaxNGParse		(xmlRelaxNGParserCtxtPtr ctxt);
+void	xmlRelaxNGSetParserStructuredErrors	(xmlRelaxNGParserCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx);
 int	xmlRelaxNGValidateFullElement	(xmlRelaxNGValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr elem);
 typedef void xmlRelaxNGValidityErrorFunc	(void * ctx, 
					 const char * msg, 
					 ... ...);
 int	xmlRelaxNGValidatePushElement	(xmlRelaxNGValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr elem);
@@ -234,6 +235,10 @@ The content of this structure is not made public by the API.
         
xmlRelaxNGSetParserErrors ()
void	xmlRelaxNGSetParserErrors	(xmlRelaxNGParserCtxtPtr ctxt, 
					 xmlRelaxNGValidityErrorFunc err, 
					 xmlRelaxNGValidityWarningFunc warn, 
					 void * ctx)

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

 
ctxt:a Relax-NG validation context
err:the error callback
warn:the warning callback
ctx:contextual data for the callbacks

+        

+        
xmlRelaxNGSetParserStructuredErrors ()
void	xmlRelaxNGSetParserStructuredErrors	(xmlRelaxNGParserCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx)

+
Set the callback functions used to handle errors for a parsing context

+
ctxt:a Relax-NG parser context
serror:the error callback
ctx:contextual data for the callbacks

         

         
xmlRelaxNGSetValidErrors ()
void	xmlRelaxNGSetValidErrors	(xmlRelaxNGValidCtxtPtr ctxt, 
					 xmlRelaxNGValidityErrorFunc err, 
					 xmlRelaxNGValidityWarningFunc warn, 
					 void * ctx)

 
Set the error and warning callback informations

diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html
index 9395f76..d7757e3 100644
--- a/doc/devhelp/libxml2-tree.html
+++ b/doc/devhelp/libxml2-tree.html
@@ -131,6 +131,7 @@ int	xmlSaveFormatFileTo		(xmlNodeBufGetContent		(xmlBufferPtr buffer, 
					 xmlNodePtr cur);
 void	xmlBufferWriteChar		(xmlBufferPtr buf, 
					 const char * string);
 void	xmlBufferFree			(xmlBufferPtr buf);
+int	xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlNodePtr * resNode, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int deep, 
					 int options);
 xmlNodePtr	xmlNewNode		(xmlNsPtr ns, 
					 const xmlChar * name);
 int	xmlSaveFileTo			(xmlOutputBufferPtr buf, 
					 xmlDocPtr cur, 
					 const char * encoding);
 xmlNodePtr	xmlNewTextLen		(const xmlChar * content, 
					 int len);
@@ -1009,8 +1010,12 @@ void	xmlFreeNsList			(
doc:the document pointer
name:the DTD name
ExternalID:the external (PUBLIC) ID
SystemID:the system ID
Returns:a pointer to the new DTD structure

         

         
xmlDOMWrapAdoptNode ()
int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)

-
Ensures that ns-references point to @destDoc: either to elements->nsDef entries if @destParent is given, or to @destDoc->oldNs otherwise. If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.

-
ctxt:the optional context for custom processing
sourceDoc:the optional sourceDoc
node:the node to start with
destDoc:the destination doc
destParent:the optional new parent of @node in @destDoc
options:option flags
Returns:0 if succeeded, -1 otherwise and on API/internal errors.

+
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.

+
ctxt:the optional context for custom processing
sourceDoc:the optional sourceDoc
node:the node to start with
destDoc:the destination doc
destParent:the optional new parent of @node in @destDoc
options:option flags
Returns:0 if the operation succeeded, 1 if a node of unsupported type was given, 2 if a node of not yet supported type was given and -1 on API/internal errors.

+        

+        
xmlDOMWrapCloneNode ()
int	xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlNodePtr * resNode, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int deep, 
					 int options)

+
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) Support dicts Optimize string adoption for equal or none dicts. 2) XInclude WARNING: This function is in a experimental state and should only be currently only be used to test it.

+
ctxt:the optional context for custom processing
sourceDoc:the optional sourceDoc
node:the node to start with
resNode:the clone of the given @node
destDoc:the destination doc
destParent:the optional new parent of @node in @destDoc
deep:descend into child if set
options:option flags
Returns:0 if the operation succeeded, 1 if a node of unsupported (or not yet supported) type was given, -1 on API/internal errors.

         

         
xmlDOMWrapFreeCtxt ()
void	xmlDOMWrapFreeCtxt		(xmlDOMWrapCtxtPtr ctxt)

 
Frees the DOM-wrapper context.

@@ -1409,12 +1414,12 @@ void	xmlFreeNsList			(
node:a node in the document
ns:a namespace pointer

         

         
xmlSetNsProp ()
xmlAttrPtr	xmlSetNsProp		(xmlNodePtr node, 
					 xmlNsPtr ns, 
					 const xmlChar * name, 
					 const xmlChar * value)

-
Set (or reset) an attribute carried by a node. The ns structure must be in scope, this is not checked.

+
Set (or reset) an attribute carried by a node. The ns structure must be in scope, this is not checked

 
node:the node
ns:the namespace definition
name:the attribute name
value:the attribute value
Returns:the attribute pointer.

         

         
xmlSetProp ()
xmlAttrPtr	xmlSetProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * value)

-
Set (or reset) an attribute carried by a node.

-
node:the node
name:the attribute name
value:the attribute value
Returns:the attribute pointer.

+
Set (or reset) an attribute carried by a node. If @name has a prefix, then the corresponding namespace-binding will be used, if in scope; it is an error it there's no such ns-binding for the prefix in scope.

+
node:the node
name:the attribute name (a QName)
value:the attribute value
Returns:the attribute pointer.

         

         
xmlSetTreeDoc ()
void	xmlSetTreeDoc			(xmlNodePtr tree, 
					 xmlDocPtr doc)

 
update all nodes under the tree to point to the right document

@@ -1453,7 +1458,7 @@ void	xmlFreeNsList			(
node:the node
ns:the namespace definition
name:the attribute name
Returns:0 if successful, -1 if not found

         

         
xmlUnsetProp ()
int	xmlUnsetProp			(xmlNodePtr node, 
					 const xmlChar * name)

-
Remove an attribute carried by a node.

+
Remove an attribute carried by a node. This handles only attributes in no namespace.

 
node:the node
name:the attribute name
Returns:0 if successful, -1 if not found

         

         
xmlValidateNCName ()
int	xmlValidateNCName		(const xmlChar * value, 
					 int space)

diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp
index c8d5572..ca79c03 100644
--- a/doc/devhelp/libxml2.devhelp
+++ b/doc/devhelp/libxml2.devhelp
@@ -2157,6 +2157,7 @@
     
     
     
+    
     
     
     
@@ -2700,6 +2701,7 @@
     
     
     
+    
     
     
     
-- 
cgit v1.2.3