- added xmlRemoveID() and xmlRemoveRef()
- added check and handling when possibly removing an ID
- fixed some entities problems
- added xmlParseTryOrFinish()
- changed the way struct aredeclared to allow gtk-doc to expose those
- closed #4960
- fixes to libs detection from Albert Chin-A-Young
- preparing 1.8.3 release
Daniel
diff --git a/doc/html/gnome-xml-xpath.html b/doc/html/gnome-xml-xpath.html
index b6c4f4e..a9c46b6 100644
--- a/doc/html/gnome-xml-xpath.html
+++ b/doc/html/gnome-xml-xpath.html
@@ -4,7 +4,7 @@
>xpath</TITLE
><META
NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
REL="HOME"
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
><BODY
BGCOLOR="#FFFFFF"
TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
><DIV
CLASS="NAVHEADER"
><TABLE
@@ -111,19 +114,22 @@
></TABLE
></DIV
><H1
->xpath</H1
+><A
+NAME="GNOME-XML-XPATH"
+>xpath</A
+></H1
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN8441"
+NAME="AEN7611"
></A
><H2
>Name</H2
->xpath — </DIV
+>xpath -- </DIV
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN8444"
+NAME="AEN7614"
></A
><H2
>Synopsis</H2
@@ -251,31 +257,7 @@
<GTKDOCLINK
HREF="XMLXPATHCONTEXTPTR"
>xmlXPathContextPtr</GTKDOCLINK
-> ctxt);
-<GTKDOCLINK
-HREF="XMLNODESETPTR"
->xmlNodeSetPtr</GTKDOCLINK
-> <A
-HREF="gnome-xml-xpath.html#XMLXPATHNODESETCREATE"
->xmlXPathNodeSetCreate</A
-> (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> val);
-void <A
-HREF="gnome-xml-xpath.html#XMLXPATHFREENODESETLIST"
->xmlXPathFreeNodeSetList</A
-> (<GTKDOCLINK
-HREF="XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</GTKDOCLINK
-> obj);
-void <A
-HREF="gnome-xml-xpath.html#XMLXPATHFREENODESET"
->xmlXPathFreeNodeSet</A
-> (<GTKDOCLINK
-HREF="XMLNODESETPTR"
->xmlNodeSetPtr</GTKDOCLINK
-> obj);</PRE
+> ctxt);</PRE
></TD
></TR
></TABLE
@@ -283,7 +265,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN8485"
+NAME="AEN7648"
></A
><H2
>Description</H2
@@ -293,14 +275,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN8488"
+NAME="AEN7651"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8490"
+NAME="AEN7653"
></A
><H3
><A
@@ -316,7 +298,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_UNDEFINED 0</PRE
+>#define XPATH_UNDEFINED</PRE
></TD
></TR
></TABLE
@@ -326,7 +308,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8495"
+NAME="AEN7658"
></A
><H3
><A
@@ -342,7 +324,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_NODESET 1</PRE
+>#define XPATH_NODESET</PRE
></TD
></TR
></TABLE
@@ -352,7 +334,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8500"
+NAME="AEN7663"
></A
><H3
><A
@@ -368,7 +350,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_BOOLEAN 2</PRE
+>#define XPATH_BOOLEAN</PRE
></TD
></TR
></TABLE
@@ -378,7 +360,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8505"
+NAME="AEN7668"
></A
><H3
><A
@@ -394,7 +376,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_NUMBER 3</PRE
+>#define XPATH_NUMBER</PRE
></TD
></TR
></TABLE
@@ -404,7 +386,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8510"
+NAME="AEN7673"
></A
><H3
><A
@@ -420,7 +402,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_STRING 4</PRE
+>#define XPATH_STRING</PRE
></TD
></TR
></TABLE
@@ -430,7 +412,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8515"
+NAME="AEN7678"
></A
><H3
><A
@@ -446,7 +428,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_USERS 5</PRE
+>#define XPATH_USERS</PRE
></TD
></TR
></TABLE
@@ -456,7 +438,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8520"
+NAME="AEN7683"
></A
><H3
><A
@@ -550,7 +532,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8543"
+NAME="AEN7706"
></A
><H3
><A
@@ -629,7 +611,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8562"
+NAME="AEN7725"
></A
><H3
><A
@@ -729,7 +711,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8587"
+NAME="AEN7750"
></A
><H3
><A
@@ -808,7 +790,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8606"
+NAME="AEN7769"
></A
><H3
><A
@@ -864,7 +846,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the XML document</TD
+> </TD
></TR
><TR
><TD
@@ -879,7 +861,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->the xmlXPathContext just allocated.</TD
+> </TD
></TR
></TABLE
><P
@@ -889,7 +871,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8627"
+NAME="AEN7790"
></A
><H3
><A
@@ -942,7 +924,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the context to free</TD
+> </TD
></TR
></TABLE
><P
@@ -952,7 +934,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8643"
+NAME="AEN7806"
></A
><H3
><A
@@ -1012,7 +994,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the XPath expression</TD
+> </TD
></TR
><TR
><TD
@@ -1029,7 +1011,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the XPath context</TD
+> </TD
></TR
><TR
><TD
@@ -1044,8 +1026,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
-the caller has to free the object.</TD
+> </TD
></TR
></TABLE
><P
@@ -1055,7 +1036,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8669"
+NAME="AEN7832"
></A
><H3
><A
@@ -1108,7 +1089,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the object to free</TD
+> </TD
></TR
></TABLE
><P
@@ -1118,7 +1099,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8685"
+NAME="AEN7848"
></A
><H3
><A
@@ -1178,7 +1159,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the XPath expression</TD
+> </TD
></TR
><TR
><TD
@@ -1195,7 +1176,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the XPath context</TD
+> </TD
></TR
><TR
><TD
@@ -1210,229 +1191,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the evaluation or NULL.
-the caller has to free the object.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8711"
-></A
-><H3
-><A
-NAME="XMLXPATHNODESETCREATE"
-></A
->xmlXPathNodeSetCreate ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><GTKDOCLINK
-HREF="XMLNODESETPTR"
->xmlNodeSetPtr</GTKDOCLINK
-> xmlXPathNodeSetCreate (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a new xmlNodeSetPtr of type double and of value <TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
-></P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> an initial xmlNodePtr, or NULL</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the newly created object.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8733"
-></A
-><H3
-><A
-NAME="XMLXPATHFREENODESETLIST"
-></A
->xmlXPathFreeNodeSetList ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void xmlXPathFreeNodeSetList (<GTKDOCLINK
-HREF="XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</GTKDOCLINK
-> obj);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free up the xmlXPathObjectPtr <TT
-CLASS="PARAMETER"
-><I
->obj</I
-></TT
-> but don't deallocate the objects in
-the list contrary to <A
-HREF="gnome-xml-xpath.html#XMLXPATHFREEOBJECT"
->xmlXPathFreeObject</A
->().</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->obj</I
-></TT
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> an existing NodeSetList object</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8751"
-></A
-><H3
-><A
-NAME="XMLXPATHFREENODESET"
-></A
->xmlXPathFreeNodeSet ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void xmlXPathFreeNodeSet (<GTKDOCLINK
-HREF="XMLNODESETPTR"
->xmlNodeSetPtr</GTKDOCLINK
-> obj);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free the NodeSet compound (not the actual nodes !).</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->obj</I
-></TT
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the xmlNodeSetPtr to free</TD
+> </TD
></TR
></TABLE
><P