diff --git a/ChangeLog b/ChangeLog index 5423a24f..3961d741 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 22 22:44:15 CET 2001 Daniel Veillard + + * configure.in: 2.3.5 + * doc/html/*: rebuilt the docs + Thu Mar 22 15:36:45 CET 2001 Daniel Veillard * parser.c: fixed a reported bug in NOTATION parsing diff --git a/configure.in b/configure.in index dcd4241c..4a73b3dd 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=3 -LIBXML_MICRO_VERSION=4 +LIBXML_MICRO_VERSION=5 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION diff --git a/doc/html/index.sgml b/doc/html/index.sgml index b8e26454..d8b86cc5 100644 --- a/doc/html/index.sgml +++ b/doc/html/index.sgml @@ -473,19 +473,28 @@ + + - - - - - - + + + + + + + + + + + + + @@ -583,8 +592,12 @@ + + + + diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html index 68d3e003..f9172f94 100644 --- a/doc/html/libxml-debugxml.html +++ b/doc/html/libxml-debugxml.html @@ -121,7 +121,7 @@ NAME="LIBXML-DEBUGXML" >

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Parse a well-balanced chunk of an XML document +called by the parser +The allowed sequence for the Well Balanced Chunk is the one defined by +the content production in the XML grammar:

[43] content ::= (element | CharData | Reference | CDSect | PI | Comment)*

  the document the chunk pertains to  the SAX handler bloc (possibly NULL)  The user data returned on SAX callbacks (possibly NULL)  Used for loop detection, use 0  the input string in UTF8 or ISO-Latin (zero terminated)  the return value for the set of parsed nodes 0 if the chunk is well balanced, -1 in case of args problem and +the parser error code otherwise

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

struct xmlNotation {
-    const xmlChar               *name;	/* Notation name */
+    const xmlChar               *name;	        /* Notation name */
     const xmlChar               *PublicID;	/* Public identifier, if any */
     const xmlChar               *SystemID;	/* System identifier, if any */
 };

Name

Synopsis

Description

Details

TODO: make the proper implementation of this function by calling +xmlParseURIReference() and escaping each section accordingly +to the rules (c.f. bug 51876)

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

xmlXPathAxisPtr; +struct xmlXPathCompExpr; +typedef xmlXPathCompExprPtr; void (*xmlXPathFunction ctxt, int nargs); void xmlXPathFreeObject (xmlXPathObjectPtr obj); +xmlNodeSetPtr xmlXPathNodeSetCreate (xmlNodePtr val); +void xmlXPathFreeNodeSetList (xmlXPathObjectPtr obj); +void xmlXPathFreeNodeSet (xmlNodeSetPtr obj); +xmlXPathObjectPtr xmlXPathObjectCopy (xmlXPathObjectPtr val); +int xmlXPathCmpNodes (xmlNodePtr node1, + xmlNodePtr node2); +xmlXPathObjectPtr xmlXPathConvertBoolean (xmlXPathObjectPtr val); +xmlXPathObjectPtr xmlXPathConvertNumber (xmlXPathObjectPtr val); +xmlXPathObjectPtr xmlXPathConvertString (xmlXPathObjectPtr val); +void xmlXPathInit (void); @@ -306,13 +396,6 @@ HREF="libxml-tree.html#XMLCHAR" HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR" >xmlXPathContextPtr ctxt); -void xmlXPathFreeObject (xmlXPathObjectPtr obj); xmlXPathObjectPtrxmlXPathContextPtr ctxt); -xmlNodeSetPtr xmlXPathNodeSetCreate (xmlNodePtr val); -void xmlXPathFreeNodeSetList (xmlXPathObjectPtr obj); -void xmlXPathFreeNodeSet (xmlNodeSetPtr obj); -xmlXPathObjectPtr xmlXPathObjectCopy (xmlXPathObjectPtr val); int xmlXPathCmpNodes (xmlNodePtr node1, +HREF="libxml-xpath.html#XMLXPATHEVALPREDICATE" +>xmlXPathEvalPredicate (xmlXPathContextPtr ctxt, xmlNodePtr node2);xmlXPathObjectPtr res); +xmlXPathCompExprPtr xmlXPathCompile (const xmlChar *str); +xmlXPathObjectPtr xmlXPathCompiledEval (xmlXPathCompExprPtr comp, + xmlXPathContextPtr ctx); +void xmlXPathFreeCompExpr (xmlXPathCompExprPtr comp);

Description

Details

struct xmlXPathCompExpr

struct xmlXPathCompExpr;

[14] Expr ::= OrExpr +[21] OrExpr ::= AndExpr +| OrExpr 'or' AndExpr

Parse and compile an expression

xmlXPathCompExprPtr

typedef xmlXPathCompExpr *xmlXPathCompExprPtr;

xmlXPathFreeObject ()

void        xmlXPathFreeObject              (xmlXPathObjectPtr obj);

Free up an xmlXPathObjectPtr object.

obj : the object to free

xmlXPathNodeSetCreate ()

xmlNodeSetPtr xmlXPathNodeSetCreate         (xmlNodePtr val);

Create a new xmlNodeSetPtr of type double and of value val

val : an initial xmlNodePtr, or NULL
Returns :the newly created object.

xmlXPathFreeNodeSetList ()

void        xmlXPathFreeNodeSetList         (xmlXPathObjectPtr obj);

Free up the xmlXPathObjectPtr obj but don't deallocate the objects in +the list contrary to xmlXPathFreeObject().

obj : an existing NodeSetList object

xmlXPathFreeNodeSet ()

void        xmlXPathFreeNodeSet             (xmlNodeSetPtr obj);

Free the NodeSet compound (not the actual nodes !).

obj : the xmlNodeSetPtr to free

xmlXPathObjectCopy ()

xmlXPathObjectPtr xmlXPathObjectCopy        (xmlXPathObjectPtr val);

allocate a new copy of a given object

val : the original object
Returns :the newly created object.

xmlXPathCmpNodes ()

int         xmlXPathCmpNodes                (xmlNodePtr node1,
+                                             xmlNodePtr node2);

Compare two nodes w.r.t document order

node1 : the first node
node2 : the second node
Returns :-2 in case of error 1 if first point < second point, 0 if +that's the same node, -1 otherwise

xmlXPathConvertBoolean ()

xmlXPathObjectPtr xmlXPathConvertBoolean    (xmlXPathObjectPtr val);

Converts an existing object to its boolean() equivalent

val : an XPath object
Returns :the new object, the old one is freed (or the operation +is done directly on val)

xmlXPathConvertNumber ()

xmlXPathObjectPtr xmlXPathConvertNumber     (xmlXPathObjectPtr val);

Converts an existing object to its number() equivalent

val : an XPath object
Returns :the new object, the old one is freed (or the operation +is done directly on val)

xmlXPathConvertString ()

xmlXPathObjectPtr xmlXPathConvertString     (xmlXPathObjectPtr val);

Converts an existing object to its string() equivalent

val : an XPath object
Returns :the new object, the old one is freed (or the operation +is done directly on val)

xmlXPathFreeObject ()

void        xmlXPathFreeObject              (xmlXPathObjectPtr obj);

Free up an xmlXPathObjectPtr object.

obj : the object to free

xmlXPathNodeSetCreate ()

xmlXPathEvalPredicate ()

xmlNodeSetPtr xmlXPathNodeSetCreate         (xmlNodePtr val);

Create a new xmlNodeSetPtr of type double and of value val

val : an initial xmlNodePtr, or NULL
Returns :the newly created object.

xmlXPathFreeNodeSetList ()

void        xmlXPathFreeNodeSetList         (xmlXPathObjectPtr obj);

Free up the xmlXPathObjectPtr obj but don't deallocate the objects in -the list contrary to xmlXPathFreeObject().

obj : an existing NodeSetList object

xmlXPathFreeNodeSet ()

void        xmlXPathFreeNodeSet             (xmlNodeSetPtr obj);

Free the NodeSet compound (not the actual nodes !).

obj : the xmlNodeSetPtr to free

xmlXPathObjectCopy ()

xmlXPathObjectPtr xmlXPathObjectCopy        (xmlXPathObjectPtr val);

allocate a new copy of a given object

val : the original object
Returns :the newly created object.

xmlXPathCmpNodes ()

int         xmlXPathCmpNodes                (xmlNodePtr node1,
+>int         xmlXPathEvalPredicate           (xmlXPathContextPtr ctxt,
                                              xmlNodePtr node2);
xmlXPathObjectPtr res);

Compare two nodes w.r.t document order

Evaluate a predicate result for the current node. +A PredicateExpr is evaluated by evaluating the Expr and converting +the result to a boolean. If the result is a number, the result will +be converted to true if the number is equal to the position of the +context node in the context node list (as returned by the position +function) and will be converted to false otherwise; if the result +is not a number, then the result will be converted as if by a call +to the boolean function.

Return 1 if predicate is true, 0 otherwise

node1ctxt : the first node the XPath contextnode2res : the second node the Predicate Expression evaluation result-2 in case of error 1 if first point < second point, 0 if -that's the same node, -1 otherwise

xmlXPathCompile ()

xmlXPathCompExprPtr xmlXPathCompile         (const xmlChar *str);

Compile an XPath expression

str : the XPath expression
Returns :the xmlXPathObjectPtr resulting from the eveluation or NULL. +the caller has to free the object.

xmlXPathCompiledEval ()

xmlXPathObjectPtr xmlXPathCompiledEval      (xmlXPathCompExprPtr comp,
+                                             xmlXPathContextPtr ctx);

Evaluate the Precompiled XPath expression in the given context.

comp : the compiled XPath expression
ctx : the XPath context
Returns :the xmlXPathObjectPtr resulting from the eveluation or NULL. +the caller has to free the object.

xmlXPathFreeCompExpr ()

void        xmlXPathFreeCompExpr            (xmlXPathCompExprPtr comp);

Free up the memory allocated by comp

comp : an XPATH comp

Name

Synopsis

Description

Details

Dump the content of the object for debugging purposes

  the FILE * to dump the output  the object to inspect indentation level

[14] Expr ::= OrExpr -[21] OrExpr ::= AndExpr -| OrExpr 'or' AndExpr

Parse and evaluate an expression, then push the result on the stack

Parse and evaluate an XPath expression in the given context, +then push the result on the context stack

Parse and evaluate a Number in the string +>Compile a Number in the string In complement of the Number expression, this function also handles negative values : '-' Number.

Name

Synopsis

xmlLocationSetPtr; +xmlLocationSetPtr xmlXPtrLocationSetCreate (xmlXPathObjectPtr val); void xmlXPtrFreeLocationSetxmlLocationSetPtr val2); xmlXPathObjectPtr xmlXPtrNewRangeNodeObject (xmlNodePtr start, + xmlXPathObjectPtr end); +void xmlXPtrLocationSetAdd (xmlLocationSetPtr cur, + xmlXPathObjectPtr val); +xmlXPathObjectPtr xmlXPtrWrapLocationSet (xmlLocationSetPtr val); +xmlXPathContextPtr

Description

Details

xmlXPtrLocationSetCreate ()

xmlLocationSetPtr xmlXPtrLocationSetCreate  (xmlXPathObjectPtr val);

Create a new xmlLocationSetPtr of type double and of value val

val : an initial xmlXPathObjectPtr, or NULL
Returns :the newly created object.

xmlXPtrNewRangeNodeObject ()

xmlXPathObjectPtr xmlXPtrNewRangeNodeObject (xmlNodePtr start,
+                                             xmlXPathObjectPtr end);

Create a new xmlXPathObjectPtr of type range from a not to an object

start : the starting node
end : the ending object
Returns :the newly created object.

xmlXPtrLocationSetAdd ()

void        xmlXPtrLocationSetAdd           (xmlLocationSetPtr cur,
+                                             xmlXPathObjectPtr val);

add a new xmlXPathObjectPtr ot an existing LocationSet +If the location already exist in the set val is freed.

cur : the initial range set
val : a new xmlXPathObjectPtr

xmlXPtrWrapLocationSet ()

xmlXPathObjectPtr xmlXPtrWrapLocationSet    (xmlLocationSetPtr val);

Wrap the LocationSet val in a new xmlXPathObjectPtr

val : the LocationSet value
Returns :the newly created object.