diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index cfab238a..2559bb5b 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -520,6 +520,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSAX2ResolveEntity
xmlSetExternalEntityLoader
xmlXIncludeProcessFlagsData
+xmlXIncludeProcessTreeFlagsData
applications
xmlSetGenericErrorFunc
xmlSetStructuredErrorFunc
applied
xmlHashCopy
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 87f05f6d..8bb44374 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -78,6 +78,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
+xmlXIncludeProcessTreeFlagsData
xmlXPathCompareValues
fails
UTF8ToHtml
UTF8Toisolat1
@@ -140,6 +141,7 @@ A:link, A:visited, A:active { text-decoration: underline } _xmlError
xmlParseMisc
xmlXIncludeProcessFlagsData
+xmlXIncludeProcessTreeFlagsData
xmlXPathOrderDocElems
fields
XML_SAX2_MAGIC
_htmlElemDesc
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index 9c1f0899..09b98a1f 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -156,6 +156,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessFlags
xmlXIncludeProcessFlagsData
xmlXIncludeProcessTreeFlags
+xmlXIncludeProcessTreeFlagsData
xmlXIncludeSetFlags
including
XML_SCHEMAS_INCLUDING_CONVERT_NS
attribute
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index 0727fd7a..f6501fbe 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -102,6 +102,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSetGenericErrorFunc
xmlSetStructuredErrorFunc
xmlXIncludeProcessFlagsData
+xmlXIncludeProcessTreeFlagsData
xmlXPathEvalFunc
xmlXPathIntersection
passive
xmlNanoFTPGetConnection
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html index 57807f69..f4d8bfa1 100644 --- a/doc/APIchunk24.html +++ b/doc/APIchunk24.html @@ -439,6 +439,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
+xmlXIncludeProcessTreeFlagsData
sometimes
xmlCleanupParser
xmlCleanupThreads
xmlExpExpDerive
@@ -802,6 +803,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
+xmlXIncludeProcessTreeFlagsData
substitutions:
XML_SCHEMAS_ELEM_BLOCK_RESTRICTION
XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION
substring
xmlNodeAddContent
diff --git a/doc/APIchunk27.html b/doc/APIchunk27.html index f667b498..e04260d2 100644 --- a/doc/APIchunk27.html +++ b/doc/APIchunk27.html @@ -127,6 +127,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
+xmlXIncludeProcessTreeFlagsData
wether
_xmlNodeSet
what
xmlCatalogGetDefaults
xmlCatalogSetDefaults
diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html index 69542d9f..56230840 100644 --- a/doc/APIchunk9.html +++ b/doc/APIchunk9.html @@ -153,6 +153,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
+xmlXIncludeProcessTreeFlagsData
xmlXIncludeSetFlags
XInclude?
xmlDOMWrapCloneNode
XLINK_TYPE_NONE
xlinkIsLink
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index d8bd3589..c4b84015 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -1692,6 +1692,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
+xmlXIncludeProcessTreeFlagsData
xmlXIncludeSetFlags

Module xlink:

XLINK_ACTUATE_AUTO
XLINK_ACTUATE_NONE
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html index 78342166..b105fb03 100644 --- a/doc/APIfunctions.html +++ b/doc/APIfunctions.html @@ -871,6 +871,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidityErrorFunc
xmlValidityWarningFunc
xmlXIncludeProcessFlagsData
+xmlXIncludeProcessTreeFlagsData
xmlXPathFuncLookupFunc
xmlXPathRegisterFuncLookup
xmlXPathRegisterVariableLookup
@@ -1543,6 +1544,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
+xmlXIncludeProcessTreeFlagsData
xmlXPathCastNodeToNumber
xmlXPathCastNodeToString
xmlXPathCmpNodes
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 8769ec9b..091ee6ce 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -3312,6 +3312,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
+xmlXIncludeProcessTreeFlagsData
xmlXIncludeSetFlags
xmlXPathAddValues
xmlXPathAxis
diff --git a/doc/Makefile.am b/doc/Makefile.am index 764aec7e..f131f2b0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -91,8 +91,8 @@ $(WIN32_DIR)/libxml2.def.src: libxml2-api.xml libxml2-api.xml libxml2-refs.xml ../libxml2.syms: apibuild.py symbols.xml syms.xsl checkapisym.xsl ../include/libxml/*.h ../*.c -(./apibuild.py) - -($(XSLTPROC) checkapisym.xsl libxml2-api.xml) - -($(XSLTPROC) -o ../libxml2.syms syms.xsl symbols.xml) + ($(XSLTPROC) checkapisym.xsl libxml2-api.xml) + ($(XSLTPROC) -o ../libxml2.syms syms.xsl symbols.xml) -@(cd .. ; $(MAKE) rebuild_testapi) diff --git a/doc/devhelp/libxml2-xinclude.html b/doc/devhelp/libxml2-xinclude.html index 31df9279..12a61d5a 100644 --- a/doc/devhelp/libxml2-xinclude.html +++ b/doc/devhelp/libxml2-xinclude.html @@ -55,6 +55,7 @@ #define XINCLUDE_OLD_NS; typedef struct _xmlXIncludeCtxt xmlXIncludeCtxt; typedef xmlXIncludeCtxt * xmlXIncludeCtxtPtr; +int xmlXIncludeProcessTreeFlagsData (xmlNodePtr tree,
int flags,
void * data); int xmlXIncludeProcessFlagsData (xmlDocPtr doc,
int flags,
void * data); int xmlXIncludeProcessFlags (xmlDocPtr doc,
int flags); int xmlXIncludeProcessTree (xmlNodePtr tree); @@ -153,6 +154,10 @@ The content of this structure is not made public by the API.

xmlXIncludeProcessTreeFlags ()

int	xmlXIncludeProcessTreeFlags	(xmlNodePtr tree, 
					 int flags)

Implement the XInclude substitution for the given subtree

tree:a node in an XML document
flags:a set of xmlParserOption used for parsing XML includes
Returns:0 if no substitution were done, -1 if some processing failed or the number of substitutions done.
+
+

xmlXIncludeProcessTreeFlagsData ()

int	xmlXIncludeProcessTreeFlagsData	(xmlNodePtr tree, 
					 int flags, 
					 void * data)

+

Implement the XInclude substitution on the XML node @tree

+
tree:an XML node
flags:a set of xmlParserOption used for parsing XML includes
data:application data that will be passed to the parser context in the _private field of the parser context(s)
Returns:0 if no substitution were done, -1 if some processing failed or the number of substitutions done.

xmlXIncludeSetFlags ()

int	xmlXIncludeSetFlags		(xmlXIncludeCtxtPtr ctxt, 
					 int flags)

Set the flags used for further processing of XML resources.

diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp index a98ed75d..cf2f99f7 100644 --- a/doc/devhelp/libxml2.devhelp +++ b/doc/devhelp/libxml2.devhelp @@ -3348,6 +3348,7 @@ + diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html index f6b16bf2..152506aa 100644 --- a/doc/html/libxml-xinclude.html +++ b/doc/html/libxml-xinclude.html @@ -21,6 +21,7 @@ The content of this structure is not made public by the API. 
int	xmlXIncludeProcessNode		(xmlXIncludeCtxtPtr ctxt, 
					 xmlNodePtr node)
int	xmlXIncludeProcessTree		(xmlNodePtr tree)
int	xmlXIncludeProcessTreeFlags	(xmlNodePtr tree, 
					 int flags)
+
int	xmlXIncludeProcessTreeFlagsData	(xmlNodePtr tree, 
					 int flags, 
					 void * data)
int	xmlXIncludeSetFlags		(xmlXIncludeCtxtPtr ctxt, 
					 int flags)

Description

Macro: XINCLUDE_FALLBACK

#define XINCLUDE_FALLBACK

Macro defining "fallback"

@@ -51,6 +52,8 @@ The content of this structure is not made public by the API.

Implement the XInclude substitution for the given subtree

tree:a node in an XML document
Returns:0 if no substitution were done, -1 if some processing failed or the number of substitutions done.

Function: xmlXIncludeProcessTreeFlags

int	xmlXIncludeProcessTreeFlags	(xmlNodePtr tree, 
					 int flags)

Implement the XInclude substitution for the given subtree

-
tree:a node in an XML document
flags:a set of xmlParserOption used for parsing XML includes
Returns:0 if no substitution were done, -1 if some processing failed or the number of substitutions done.

Function: xmlXIncludeSetFlags

int	xmlXIncludeSetFlags		(xmlXIncludeCtxtPtr ctxt, 
					 int flags)

+
tree:a node in an XML document
flags:a set of xmlParserOption used for parsing XML includes
Returns:0 if no substitution were done, -1 if some processing failed or the number of substitutions done.
Function: xmlXIncludeProcessTreeFlagsData
int	xmlXIncludeProcessTreeFlagsData	(xmlNodePtr tree, 
					 int flags, 
					 void * data)

+
Implement the XInclude substitution on the XML node @tree

+
tree:an XML node
flags:a set of xmlParserOption used for parsing XML includes
data:application data that will be passed to the parser context in the _private field of the parser context(s)
Returns:0 if no substitution were done, -1 if some processing failed or the number of substitutions done.
Function: xmlXIncludeSetFlags
int	xmlXIncludeSetFlags		(xmlXIncludeCtxtPtr ctxt, 
					 int flags)

 
Set the flags used for further processing of XML resources.

 
ctxt:an XInclude processing context
flags:a set of xmlParserOption used for parsing XML includes
Returns:0 in case of success and -1 in case of error.
Daniel Veillard

diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 0adb9ae5..c158d2a2 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1819,6 +1819,7 @@
      
      
      
+     
      
      
      
@@ -17054,6 +17055,14 @@ Could we use @subtypes for this?'/>
       
       
     
+    
+      defined(LIBXML_XINCLUDE_ENABLED)
+      Implement the XInclude substitution on the XML node @tree
+      
+      
+      
+      
+    
     
       defined(LIBXML_XINCLUDE_ENABLED)
       Set the flags used for further processing of XML resources.
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 11d8e441..3e54c5ca 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -3306,6 +3306,7 @@
     
     
     
+    
     
     
     
@@ -6896,6 +6897,7 @@
       
       
       
+      
       
       
       
@@ -8840,6 +8842,7 @@
       
       
       
+      
       
       
       
@@ -9666,6 +9669,7 @@
       
       
       
+      
       
       
       
@@ -12332,6 +12336,7 @@
       
       
       
+      
       
     
     
@@ -18300,6 +18305,7 @@
           
           
           
+          
           
         
         
@@ -19180,6 +19186,7 @@
           
           
           
+          
         
         
           
@@ -22503,6 +22510,7 @@
           
           
           
+          
           
         
         
@@ -22597,6 +22605,7 @@
           
           
           
+          
           
         
         
@@ -23631,6 +23640,7 @@
           
           
           
+          
           
         
         
@@ -26125,6 +26135,7 @@
           
           
           
+          
           
           
         
@@ -28285,6 +28296,7 @@
           
           
           
+          
         
         
           
@@ -28840,6 +28852,7 @@
           
           
           
+          
         
         
           
@@ -30085,6 +30098,7 @@
           
           
           
+          
         
         
           
diff --git a/doc/symbols.xml b/doc/symbols.xml
index be221175..b4d90826 100644
--- a/doc/symbols.xml
+++ b/doc/symbols.xml
@@ -1739,5 +1739,6 @@
   
   
     xmlStructuredErrorContext
+    xmlXIncludeProcessTreeFlagsData
   
 
diff --git a/elfgcchack.h b/elfgcchack.h
index 14cad6da..84e81516 100644
--- a/elfgcchack.h
+++ b/elfgcchack.h
@@ -15489,6 +15489,18 @@ extern __typeof (xmlXIncludeProcessTreeFlags) xmlXIncludeProcessTreeFlags__inter
 #endif
 #endif
 
+#if defined(LIBXML_XINCLUDE_ENABLED)
+#ifdef bottom_xinclude
+#undef xmlXIncludeProcessTreeFlagsData
+extern __typeof (xmlXIncludeProcessTreeFlagsData) xmlXIncludeProcessTreeFlagsData __attribute((alias("xmlXIncludeProcessTreeFlagsData__internal_alias")));
+#else
+#ifndef xmlXIncludeProcessTreeFlagsData
+extern __typeof (xmlXIncludeProcessTreeFlagsData) xmlXIncludeProcessTreeFlagsData__internal_alias __attribute((visibility("hidden")));
+#define xmlXIncludeProcessTreeFlagsData xmlXIncludeProcessTreeFlagsData__internal_alias
+#endif
+#endif
+#endif
+
 #if defined(LIBXML_XINCLUDE_ENABLED)
 #ifdef bottom_xinclude
 #undef xmlXIncludeSetFlags
diff --git a/libxml2.syms b/libxml2.syms
index 95294771..5a951752 100644
--- a/libxml2.syms
+++ b/libxml2.syms
@@ -2226,5 +2226,8 @@ LIBXML2_2.7.4 {
 
 # globals
   xmlStructuredErrorContext; # variable
+
+# xinclude
+  xmlXIncludeProcessTreeFlagsData;
 } LIBXML2_2.7.3;
 
diff --git a/testapi.c b/testapi.c
index 315e47bb..da6ce1bc 100644
--- a/testapi.c
+++ b/testapi.c
@@ -27382,6 +27382,54 @@ test_xmlXIncludeProcessTreeFlags(void) {
 }
 
 
+static int
+test_xmlXIncludeProcessTreeFlagsData(void) {
+    int test_ret = 0;
+
+#if defined(LIBXML_XINCLUDE_ENABLED)
+    int mem_base;
+    int ret_val;
+    xmlNodePtr tree; /* an XML node */
+    int n_tree;
+    int flags; /* a set of xmlParserOption used for parsing XML includes */
+    int n_flags;
+    void * data; /* application data that will be passed to the parser context in the _private field of the parser context(s) */
+    int n_data;
+
+    for (n_tree = 0;n_tree < gen_nb_xmlNodePtr;n_tree++) {
+    for (n_flags = 0;n_flags < gen_nb_int;n_flags++) {
+    for (n_data = 0;n_data < gen_nb_userdata;n_data++) {
+        mem_base = xmlMemBlocks();
+        tree = gen_xmlNodePtr(n_tree, 0);
+        flags = gen_int(n_flags, 1);
+        data = gen_userdata(n_data, 2);
+
+        ret_val = xmlXIncludeProcessTreeFlagsData(tree, flags, data);
+        desret_int(ret_val);
+        call_tests++;
+        des_xmlNodePtr(n_tree, tree, 0);
+        des_int(n_flags, flags, 1);
+        des_userdata(n_data, data, 2);
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in xmlXIncludeProcessTreeFlagsData",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf(" %d", n_tree);
+            printf(" %d", n_flags);
+            printf(" %d", n_data);
+            printf("\n");
+        }
+    }
+    }
+    }
+    function_tests++;
+#endif
+
+    return(test_ret);
+}
+
+
 static int
 test_xmlXIncludeSetFlags(void) {
     int test_ret = 0;
@@ -27426,7 +27474,7 @@ static int
 test_xinclude(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing xinclude : 7 of 9 functions ...\n");
+    if (quiet == 0) printf("Testing xinclude : 8 of 10 functions ...\n");
     test_ret += test_xmlXIncludeNewContext();
     test_ret += test_xmlXIncludeProcess();
     test_ret += test_xmlXIncludeProcessFlags();
@@ -27434,6 +27482,7 @@ test_xinclude(void) {
     test_ret += test_xmlXIncludeProcessNode();
     test_ret += test_xmlXIncludeProcessTree();
     test_ret += test_xmlXIncludeProcessTreeFlags();
+    test_ret += test_xmlXIncludeProcessTreeFlagsData();
     test_ret += test_xmlXIncludeSetFlags();
 
     if (test_ret != 0)
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index df195920..ce3f24a4 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -2631,6 +2631,9 @@ xmlXIncludeProcessTree
 xmlXIncludeProcessTreeFlags
 #endif
 #ifdef LIBXML_XINCLUDE_ENABLED
+xmlXIncludeProcessTreeFlagsData
+#endif
+#ifdef LIBXML_XINCLUDE_ENABLED
 xmlXIncludeSetFlags
 #endif
 #ifdef LIBXML_XPATH_ENABLED