augmented the XInclude API to be able to pass XML parser flags down to the
* xinclude.c xmllint.c xmlreader.c include/libxml/xinclude.h
include/libxml/xmlerror.h: augmented the XInclude API
to be able to pass XML parser flags down to the Inclusion
process. Also resynchronized with the Last Call W3C Working
Draft 10 November 2003 for the xpointer attribute.
* Makefile.am test/XInclude/docs/nodes[23].xml
result/XInclude/*: augmented the tests for the new namespace and
testing the xpointer attribute, changed the way error messages
are tested
* doc/*: regenerated the documentation
Daniel
diff --git a/ChangeLog b/ChangeLog
index b40922b..e7a2dd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Dec 9 12:29:26 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+ * xinclude.c xmllint.c xmlreader.c include/libxml/xinclude.h
+ include/libxml/xmlerror.h: augmented the XInclude API
+ to be able to pass XML parser flags down to the Inclusion
+ process. Also resynchronized with the Last Call W3C Working
+ Draft 10 November 2003 for the xpointer attribute.
+ * Makefile.am test/XInclude/docs/nodes[23].xml
+ result/XInclude/*: augmented the tests for the new namespace and
+ testing the xpointer attribute, changed the way error messages
+ are tested
+ * doc/*: regenerated the documentation
+
Mon Dec 8 18:38:26 CET 2003 Daniel Veillard <daniel@veillard.com>
* error.c: filter warning messages if the global setting blocks them
diff --git a/Makefile.am b/Makefile.am
index f10ed55..cedd520 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -405,14 +405,15 @@
if [ ! -d $$i ] ; then \
if [ ! -f $(srcdir)/result/XInclude/$$name ] ; then \
echo New test file $$name ; \
- $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > $(srcdir)/result/XInclude/$$name ; \
+ $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > $(srcdir)/result/XInclude/$$name 2> $(srcdir)/result/XInclude/$$name.err ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
else \
- log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i 2>&1 > result.$$name | grep -v 'failed to load external entity' ; \
+ log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > result.$$name 2>error.$$name | grep -v 'failed to load external entity' ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
- diff $(srcdir)/result/XInclude/$$name result.$$name` ; \
+ diff $(srcdir)/result/XInclude/$$name result.$$name ; \
+ diff $(srcdir)/result/XInclude/$$name.err error.$$name` ; \
if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
- rm result.$$name ; \
+ rm result.$$name error.$$name ; \
fi ; fi ; done)
@(echo > .memdump)
@echo "## XInclude xmlReader regression tests"
@@ -424,11 +425,12 @@
$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --walker --debug $$i > $(srcdir)/result/XInclude/$$name.rdr ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
else \
- log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i 2>&1 > result.$$name | grep -v 'failed to load external entity' ; \
+ log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > result.$$name 2>error.$$name | grep -v 'failed to load external entity' ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
+ diff $(srcdir)/result/XInclude/$$name.err error.$$name ; \
diff $(srcdir)/result/XInclude/$$name.rdr result.$$name` ; \
if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
- rm result.$$name ; \
+ rm result.$$name error.$$name ; \
fi ; fi ; done)
Scripttests : xmllint$(EXEEXT)
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html
index 0c953d8..9c36846 100644
--- a/doc/APIchunk11.html
+++ b/doc/APIchunk11.html
@@ -171,10 +171,12 @@
<a href="html/libxml-xinclude.html#XINCLUDE_HREF">XINCLUDE_HREF</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_NODE">XINCLUDE_NODE</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_NS">XINCLUDE_NS</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE">XINCLUDE_PARSE</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_ENCODING">XINCLUDE_PARSE_ENCODING</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_TEXT">XINCLUDE_PARSE_TEXT</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_XML">XINCLUDE_PARSE_XML</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_XPOINTER">XINCLUDE_PARSE_XPOINTER</a><br />
<a href="html/libxml-valid.html#xmlGetID">xmlGetID</a><br />
<a href="html/libxml-tree.html#xmlReconciliateNs">xmlReconciliateNs</a><br />
<a href="html/libxml-debugXML.html#xmlShellDu">xmlShellDu</a><br />
@@ -504,6 +506,7 @@
</dd><dt>doublequotes</dt><dd><a href="html/libxml-parserInternals.html#xmlParseQuotedString">xmlParseQuotedString</a><br />
</dd><dt>down</dt><dd><a href="html/libxml-tree.html#xmlGetBufferAllocationScheme">xmlGetBufferAllocationScheme</a><br />
<a href="html/libxml-tree.html#xmlSetBufferAllocationScheme">xmlSetBufferAllocationScheme</a><br />
+</dd><dt>draft</dt><dd><a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
</dd><dt>drop</dt><dd><a href="html/libxml-xmlIO.html#xmlFileRead">xmlFileRead</a><br />
<a href="html/libxml-xmlIO.html#xmlIOFTPRead">xmlIOFTPRead</a><br />
<a href="html/libxml-xmlIO.html#xmlIOHTTPRead">xmlIOHTTPRead</a><br />
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html
index 4011fac..698cc4c 100644
--- a/doc/APIchunk13.html
+++ b/doc/APIchunk13.html
@@ -56,8 +56,10 @@
<a href="html/libxml-valid.html#xmlRemoveRef">xmlRemoveRef</a><br />
<a href="html/libxml-debugXML.html#xmlShellLoad">xmlShellLoad</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
<a href="html/libxml-xpathInternals.html#xmlXPathCompareValues">xmlXPathCompareValues</a><br />
</dd><dt>fails</dt><dd><a href="html/libxml-HTMLparser.html#UTF8ToHtml">UTF8ToHtml</a><br />
<a href="html/libxml-encoding.html#UTF8Toisolat1">UTF8Toisolat1</a><br />
@@ -197,6 +199,7 @@
<a href="html/libxml-xmlreader.html#xmlReaderNewFile">xmlReaderNewFile</a><br />
<a href="html/libxml-xmlreader.html#xmlReaderNewIO">xmlReaderNewIO</a><br />
<a href="html/libxml-xmlreader.html#xmlReaderNewMemory">xmlReaderNewMemory</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
</dd><dt>flat</dt><dd><a href="html/libxml-tree.html#xmlStringGetNodeList">xmlStringGetNodeList</a><br />
<a href="html/libxml-tree.html#xmlStringLenGetNodeList">xmlStringLenGetNodeList</a><br />
</dd><dt>floor</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathFloorFunction">xmlXPathFloorFunction</a><br />
@@ -356,6 +359,7 @@
<a href="html/libxml-parser.html#xmlStopParser">xmlStopParser</a><br />
<a href="html/libxml-valid.html#xmlValidCtxtNormalizeAttributeValue">xmlValidCtxtNormalizeAttributeValue</a><br />
<a href="html/libxml-valid.html#xmlValidNormalizeAttributeValue">xmlValidNormalizeAttributeValue</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
</dd></dl><h2 align="center"><a href="APIchunk0.html">A-B</a>
<a href="APIchunk1.html">C-C</a>
<a href="APIchunk2.html">D-E</a>
diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html
index e3f8702..76e06c4 100644
--- a/doc/APIchunk14.html
+++ b/doc/APIchunk14.html
@@ -314,6 +314,7 @@
<a href="html/libxml-HTMLparser.html#htmlIsAutoClosed">htmlIsAutoClosed</a><br />
</dd><dt>htmlStartCloseIndex</dt><dd><a href="html/libxml-parserInternals.html#htmlInitAutoClose">htmlInitAutoClose</a><br />
</dd><dt>http:</dt><dd><a href="html/libxml-xinclude.html#XINCLUDE_NS">XINCLUDE_NS</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
<a href="html/libxml-SAX.html#getSystemId">getSystemId</a><br />
<a href="html/libxml-c14n.html#xmlC14NDocDumpMemory">xmlC14NDocDumpMemory</a><br />
<a href="html/libxml-c14n.html#xmlC14NDocSave">xmlC14NDocSave</a><br />
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html
index 2e0ed36..80f0881 100644
--- a/doc/APIchunk15.html
+++ b/doc/APIchunk15.html
@@ -134,6 +134,9 @@
</dd><dt>includes</dt><dd><a href="html/libxml-schemasInternals.html#_xmlSchema">_xmlSchema</a><br />
<a href="html/libxml-xmlIO.html#xmlCleanupInputCallbacks">xmlCleanupInputCallbacks</a><br />
<a href="html/libxml-xmlIO.html#xmlCleanupOutputCallbacks">xmlCleanupOutputCallbacks</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
</dd><dt>including</dt><dd><a href="html/libxml-SAX.html#attribute">attribute</a><br />
<a href="html/libxml-parser.html#attributeSAXFunc">attributeSAXFunc</a><br />
<a href="html/libxml-nanoftp.html#ftpListCallback">ftpListCallback</a><br />
diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html
index c045738..7564bba 100644
--- a/doc/APIchunk18.html
+++ b/doc/APIchunk18.html
@@ -46,6 +46,7 @@
<a href="html/libxml-valid.html#xmlValidGetValidElements">xmlValidGetValidElements</a><br />
</dd><dt>namespace-uri</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathNamespaceURIFunction">xmlXPathNamespaceURIFunction</a><br />
</dd><dt>namespace:</dt><dd><a href="html/libxml-xinclude.html#XINCLUDE_NS">XINCLUDE_NS</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
<a href="html/libxml-parserInternals.html#xmlParseAttribute">xmlParseAttribute</a><br />
<a href="html/libxml-parserInternals.html#xmlParseStartTag">xmlParseStartTag</a><br />
</dd><dt>namespaces</dt><dd><a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br />
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html
index 4d62a35..f2ce57a 100644
--- a/doc/APIchunk19.html
+++ b/doc/APIchunk19.html
@@ -224,6 +224,7 @@
<a href="html/libxml-xpathInternals.html#xmlXPathNextPreceding">xmlXPathNextPreceding</a><br />
</dd><dt>ordering</dt><dd><a href="html/libxml-list.html#xmlListDataCompare">xmlListDataCompare</a><br />
</dd><dt>org</dt><dd><a href="html/libxml-xinclude.html#XINCLUDE_NS">XINCLUDE_NS</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
<a href="html/libxml-c14n.html#xmlC14NDocDumpMemory">xmlC14NDocDumpMemory</a><br />
<a href="html/libxml-c14n.html#xmlC14NDocSave">xmlC14NDocSave</a><br />
<a href="html/libxml-c14n.html#xmlC14NDocSaveTo">xmlC14NDocSaveTo</a><br />
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html
index 3bcbc46..db92216 100644
--- a/doc/APIchunk20.html
+++ b/doc/APIchunk20.html
@@ -358,31 +358,6 @@
<a href="html/libxml-SAX2.html#xmlSAX2StartElement">xmlSAX2StartElement</a><br />
<a href="html/libxml-xmlreader.html#xmlTextReaderRelaxNGSetSchema">xmlTextReaderRelaxNGSetSchema</a><br />
<a href="html/libxml-xmlreader.html#xmlTextReaderRelaxNGValidate">xmlTextReaderRelaxNGValidate</a><br />
-</dd><dt>processing</dt><dd><a href="html/libxml-HTMLtree.html#HTML_PI_NODE">HTML_PI_NODE</a><br />
-<a href="html/libxml-SAX.html#entityDecl">entityDecl</a><br />
-<a href="html/libxml-parser.html#entityDeclSAXFunc">entityDeclSAXFunc</a><br />
-<a href="html/libxml-parserInternals.html#htmlInitAutoClose">htmlInitAutoClose</a><br />
-<a href="html/libxml-SAX.html#processingInstruction">processingInstruction</a><br />
-<a href="html/libxml-parser.html#processingInstructionSAXFunc">processingInstructionSAXFunc</a><br />
-<a href="html/libxml-parser.html#xmlCleanupParser">xmlCleanupParser</a><br />
-<a href="html/libxml-threads.html#xmlCleanupThreads">xmlCleanupThreads</a><br />
-<a href="html/libxml-tree.html#xmlGetProp">xmlGetProp</a><br />
-<a href="html/libxml-encoding.html#xmlInitCharEncodingHandlers">xmlInitCharEncodingHandlers</a><br />
-<a href="html/libxml-parser.html#xmlInitParser">xmlInitParser</a><br />
-<a href="html/libxml-list.html#xmlListReverseWalk">xmlListReverseWalk</a><br />
-<a href="html/libxml-list.html#xmlListWalk">xmlListWalk</a><br />
-<a href="html/libxml-tree.html#xmlNewPI">xmlNewPI</a><br />
-<a href="html/libxml-parserInternals.html#xmlParseAttValue">xmlParseAttValue</a><br />
-<a href="html/libxml-parserInternals.html#xmlParsePI">xmlParsePI</a><br />
-<a href="html/libxml-SAX2.html#xmlSAX2EntityDecl">xmlSAX2EntityDecl</a><br />
-<a href="html/libxml-SAX2.html#xmlSAX2ProcessingInstruction">xmlSAX2ProcessingInstruction</a><br />
-<a href="html/libxml-parser.html#xmlStopParser">xmlStopParser</a><br />
-<a href="html/libxml-xmlreader.html#xmlTextReaderSetParserProp">xmlTextReaderSetParserProp</a><br />
-<a href="html/libxml-valid.html#xmlValidateOneAttribute">xmlValidateOneAttribute</a><br />
-<a href="html/libxml-valid.html#xmlValidateOneNamespace">xmlValidateOneNamespace</a><br />
-<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
-<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
-<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
</dd><dt>processing-instruction</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathIsNodeType">xmlXPathIsNodeType</a><br />
</dd><dt>processor</dt><dd><a href="html/libxml-parserInternals.html#xmlCurrentChar">xmlCurrentChar</a><br />
<a href="html/libxml-parserInternals.html#xmlParseAttValue">xmlParseAttValue</a><br />
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html
index 043ad62..20b664b 100644
--- a/doc/APIchunk21.html
+++ b/doc/APIchunk21.html
@@ -463,6 +463,7 @@
<a href="html/libxml-xmlschemas.html#xmlSchemaFreeParserCtxt">xmlSchemaFreeParserCtxt</a><br />
<a href="html/libxml-xmlschemas.html#xmlSchemaFreeValidCtxt">xmlSchemaFreeValidCtxt</a><br />
<a href="html/libxml-xmlreader.html#xmlTextReaderClose">xmlTextReaderClose</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
</dd><dt>respecting</dt><dd><a href="html/libxml-valid.html#xmlValidGetValidElements">xmlValidGetValidElements</a><br />
</dd><dt>response</dt><dd><a href="html/libxml-nanoftp.html#xmlNanoFTPCheckResponse">xmlNanoFTPCheckResponse</a><br />
<a href="html/libxml-nanoftp.html#xmlNanoFTPGetResponse">xmlNanoFTPGetResponse</a><br />
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html
index 9140943..77f1159 100644
--- a/doc/APIchunk22.html
+++ b/doc/APIchunk22.html
@@ -332,8 +332,10 @@
<a href="html/libxml-xmlreader.html#xmlTextReaderSetParserProp">xmlTextReaderSetParserProp</a><br />
<a href="html/libxml-valid.html#xmlValidatePushCData">xmlValidatePushCData</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
</dd><dt>somewhat</dt><dd><a href="html/libxml-parserInternals.html#xmlCheckLanguageID">xmlCheckLanguageID</a><br />
</dd><dt>sorted</dt><dd><a href="html/libxml-parser.html#xmlParserAddNodeInfo">xmlParserAddNodeInfo</a><br />
<a href="html/libxml-parser.html#xmlParserFindNodeInfoIndex">xmlParserFindNodeInfoIndex</a><br />
@@ -666,13 +668,17 @@
<a href="html/libxml-parserInternals.html#xmlStringLenDecodeEntities">xmlStringLenDecodeEntities</a><br />
<a href="html/libxml-parser.html#xmlSubstituteEntitiesDefault">xmlSubstituteEntitiesDefault</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
</dd><dt>substitutions</dt><dd><a href="html/libxml-parserInternals.html#xmlStringDecodeEntities">xmlStringDecodeEntities</a><br />
<a href="html/libxml-parserInternals.html#xmlStringLenDecodeEntities">xmlStringLenDecodeEntities</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
</dd><dt>substring</dt><dd><a href="html/libxml-tree.html#xmlNodeAddContent">xmlNodeAddContent</a><br />
<a href="html/libxml-tree.html#xmlNodeAddContentLen">xmlNodeAddContentLen</a><br />
<a href="html/libxml-parser.html#xmlStrsub">xmlStrsub</a><br />
@@ -695,6 +701,7 @@
<a href="html/libxml-valid.html#xmlValidateElement">xmlValidateElement</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
</dd><dt>succeeded</dt><dd><a href="html/libxml-hash.html#xmlHashAddEntry">xmlHashAddEntry</a><br />
<a href="html/libxml-hash.html#xmlHashAddEntry2">xmlHashAddEntry2</a><br />
<a href="html/libxml-hash.html#xmlHashAddEntry3">xmlHashAddEntry3</a><br />
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html
index 5025291..c1e7aa6 100644
--- a/doc/APIchunk24.html
+++ b/doc/APIchunk24.html
@@ -297,8 +297,10 @@
<a href="html/libxml-parser.html#xmlKeepBlanksDefault">xmlKeepBlanksDefault</a><br />
<a href="html/libxml-xmlmemory.html#xmlMemShow">xmlMemShow</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
</dd><dt>wether</dt><dd><a href="html/libxml-xpath.html#_xmlNodeSet">_xmlNodeSet</a><br />
<a href="html/libxml-pattern.html#xmlPatternMatch">xmlPatternMatch</a><br />
</dd><dt>what</dt><dd><a href="html/libxml-catalog.html#xmlCatalogGetDefaults">xmlCatalogGetDefaults</a><br />
@@ -415,6 +417,7 @@
<a href="html/libxml-xmlIO.html#xmlOutputBufferWriteString">xmlOutputBufferWriteString</a><br />
</dd><dt>writing</dt><dd><a href="html/libxml-xmlIO.html#xmlOutputBufferCreateFilename">xmlOutputBufferCreateFilename</a><br />
</dd><dt>www</dt><dd><a href="html/libxml-xinclude.html#XINCLUDE_NS">XINCLUDE_NS</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
<a href="html/libxml-SAX.html#getSystemId">getSystemId</a><br />
<a href="html/libxml-c14n.html#xmlC14NDocDumpMemory">xmlC14NDocDumpMemory</a><br />
<a href="html/libxml-c14n.html#xmlC14NDocSave">xmlC14NDocSave</a><br />
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html
index 7c6b29c..3503d93 100644
--- a/doc/APIchunk25.html
+++ b/doc/APIchunk25.html
@@ -456,6 +456,7 @@
<a href="html/libxml-xmlreader.html#xmlReaderWalker">xmlReaderWalker</a><br />
</dd><dt>xpath</dt><dd><a href="html/libxml-debugXML.html#xmlShellPrintXPathError">xmlShellPrintXPathError</a><br />
<a href="html/libxml-debugXML.html#xmlShellPrintXPathResult">xmlShellPrintXPathResult</a><br />
+</dd><dt>xpointer</dt><dd><a href="html/libxml-xinclude.html#XINCLUDE_PARSE_XPOINTER">XINCLUDE_PARSE_XPOINTER</a><br />
</dd></dl><h2 align="center"><a href="APIchunk0.html">A-B</a>
<a href="APIchunk1.html">C-C</a>
<a href="APIchunk2.html">D-E</a>
diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html
index 6281f66..4850183 100644
--- a/doc/APIchunk6.html
+++ b/doc/APIchunk6.html
@@ -339,6 +339,7 @@
<a href="html/libxml-tree.html#xmlSetNsProp">xmlSetNsProp</a><br />
<a href="html/libxml-tree.html#xmlSetProp">xmlSetProp</a><br />
<a href="html/libxml-parser.html#xmlSubstituteEntitiesDefault">xmlSubstituteEntitiesDefault</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
<a href="html/libxml-xpointer.html#xmlXPtrEvalRangePredicate">xmlXPtrEvalRangePredicate</a><br />
</dd><dt>Sets</dt><dd><a href="html/libxml-HTMLtree.html#htmlSetMetaEncoding">htmlSetMetaEncoding</a><br />
<a href="html/libxml-tree.html#xmlBufferSetAllocationScheme">xmlBufferSetAllocationScheme</a><br />
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html
index f31e653..20882d9 100644
--- a/doc/APIchunk8.html
+++ b/doc/APIchunk8.html
@@ -122,11 +122,15 @@
</dd></dl><h2>Letter X:</h2><dl><dt>XHTML</dt><dd><a href="html/libxml-tree.html#xmlIsXHTML">xmlIsXHTML</a><br />
</dd><dt>XInclude</dt><dd><a href="html/libxml-xmlversion.html#LIBXML_XINCLUDE_ENABLED">LIBXML_XINCLUDE_ENABLED</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_NS">XINCLUDE_NS</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeFreeContext">xmlXIncludeFreeContext</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeNewContext">xmlXIncludeNewContext</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
</dd><dt>XLINK_TYPE_NONE</dt><dd><a href="html/libxml-xlink.html#xlinkIsLink">xlinkIsLink</a><br />
</dd><dt>XML-1</dt><dd><a href="html/libxml-encoding.html#xmlDetectCharEncoding">xmlDetectCharEncoding</a><br />
<a href="html/libxml-valid.html#xmlValidateAttributeDecl">xmlValidateAttributeDecl</a><br />
@@ -188,6 +192,7 @@
<a href="html/libxml-xpathInternals.html#xmlXPathNewValueTree">xmlXPathNewValueTree</a><br />
<a href="html/libxml-xpathInternals.html#xmlXPathStackIsNodeSet">xmlXPathStackIsNodeSet</a><br />
</dd><dt>Xinclude</dt><dd><a href="html/libxml-xinclude.html#XINCLUDE_NS">XINCLUDE_NS</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
</dd><dt>Xml</dt><dd><a href="html/libxml-xmlreader.html#xmlTextReaderNodeType">xmlTextReaderNodeType</a><br />
</dd><dt>XmlNodeType</dt><dd><a href="html/libxml-xmlreader.html#xmlTextReaderNodeType">xmlTextReaderNodeType</a><br />
</dd></dl><h2>Letter Y:</h2><dl><dt>YES</dt><dd><a href="html/libxml-HTMLparser.html#htmlNodeStatus">htmlNodeStatus</a><br />
diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html
index f977640..ac23e72 100644
--- a/doc/APIconstructors.html
+++ b/doc/APIconstructors.html
@@ -178,6 +178,7 @@
<a href="html/libxml-parserInternals.html#xmlStringDecodeEntities">xmlStringDecodeEntities</a><br />
<a href="html/libxml-parserInternals.html#xmlParseEncName">xmlParseEncName</a><br />
<a href="html/libxml-xmlreader.html#xmlTextReaderPrefix">xmlTextReaderPrefix</a><br />
+<a href="html/libxml-parserInternals.html#xmlDecodeEntities">xmlDecodeEntities</a><br />
<a href="html/libxml-xpath.html#xmlXPathCastNumberToString">xmlXPathCastNumberToString</a><br />
<a href="html/libxml-parserInternals.html#xmlParseNmtoken">xmlParseNmtoken</a><br />
<a href="html/libxml-xmlreader.html#xmlTextReaderLocatorBaseURI">xmlTextReaderLocatorBaseURI</a><br />
@@ -189,7 +190,6 @@
<a href="html/libxml-entities.html#xmlEncodeSpecialChars">xmlEncodeSpecialChars</a><br />
<a href="html/libxml-uri.html#xmlURIEscapeStr">xmlURIEscapeStr</a><br />
<a href="html/libxml-tree.html#xmlGetNsProp">xmlGetNsProp</a><br />
-<a href="html/libxml-parserInternals.html#xmlDecodeEntities">xmlDecodeEntities</a><br />
<a href="html/libxml-xpath.html#xmlXPathCastNodeToString">xmlXPathCastNodeToString</a><br />
<a href="html/libxml-parserInternals.html#xmlNamespaceParseNCName">xmlNamespaceParseNCName</a><br />
<a href="html/libxml-catalog.html#xmlCatalogResolveURI">xmlCatalogResolveURI</a><br />
@@ -247,8 +247,8 @@
<a href="html/libxml-parser.html#xmlSAXParseMemoryWithData">xmlSAXParseMemoryWithData</a><br />
<a href="html/libxml-parser.html#xmlSAXParseEntity">xmlSAXParseEntity</a><br />
<a href="html/libxml-parser.html#xmlParseEntity">xmlParseEntity</a><br />
-<a href="html/libxml-parser.html#xmlRecoverDoc">xmlRecoverDoc</a><br />
<a href="html/libxml-parser.html#xmlSAXParseFileWithData">xmlSAXParseFileWithData</a><br />
+<a href="html/libxml-parser.html#xmlRecoverDoc">xmlRecoverDoc</a><br />
<a href="html/libxml-parser.html#xmlReadDoc">xmlReadDoc</a><br />
<a href="html/libxml-parser.html#xmlReadMemory">xmlReadMemory</a><br />
<a href="html/libxml-parser.html#xmlCtxtReadIO">xmlCtxtReadIO</a><br />
@@ -256,13 +256,13 @@
<a href="html/libxml-parser.html#xmlReadFile">xmlReadFile</a><br />
<a href="html/libxml-parser.html#xmlRecoverFile">xmlRecoverFile</a><br />
<a href="html/libxml-parser.html#xmlSAXParseDoc">xmlSAXParseDoc</a><br />
-<a href="html/libxml-catalog.html#xmlParseCatalogFile">xmlParseCatalogFile</a><br />
<a href="html/libxml-parser.html#xmlCtxtReadFile">xmlCtxtReadFile</a><br />
<a href="html/libxml-parser.html#xmlCtxtReadFd">xmlCtxtReadFd</a><br />
<a href="html/libxml-parser.html#xmlReadIO">xmlReadIO</a><br />
<a href="html/libxml-tree.html#xmlCopyDoc">xmlCopyDoc</a><br />
<a href="html/libxml-parser.html#xmlCtxtReadMemory">xmlCtxtReadMemory</a><br />
<a href="html/libxml-parser.html#xmlReadFd">xmlReadFd</a><br />
+<a href="html/libxml-catalog.html#xmlParseCatalogFile">xmlParseCatalogFile</a><br />
<a href="html/libxml-parser.html#xmlCtxtReadDoc">xmlCtxtReadDoc</a><br />
<a href="html/libxml-parser.html#xmlParseMemory">xmlParseMemory</a><br />
<a href="html/libxml-parser.html#xmlSAXParseFile">xmlSAXParseFile</a><br />
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index 9b64301..38fee13 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -1407,19 +1407,24 @@
<a href="html/libxml-valid.html#xmlValidatePushCData">xmlValidatePushCData</a><br />
<a href="html/libxml-valid.html#xmlRefTablePtr">xmlRefTablePtr</a><br />
</p><h2><a name="xinclude" id="xinclude">Module xinclude</a>:</h2><p><a href="html/libxml-xinclude.html#XINCLUDE_PARSE_TEXT">XINCLUDE_PARSE_TEXT</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_XPOINTER">XINCLUDE_PARSE_XPOINTER</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeCtxt">xmlXIncludeCtxt</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_HREF">XINCLUDE_HREF</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_FALLBACK">XINCLUDE_FALLBACK</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_NS">XINCLUDE_NS</a><br />
-<a href="html/libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_PARSE">XINCLUDE_PARSE</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeFreeContext">xmlXIncludeFreeContext</a><br />
-<a href="html/libxml-xinclude.html#XINCLUDE_PARSE">XINCLUDE_PARSE</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_NODE">XINCLUDE_NODE</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_XML">XINCLUDE_PARSE_XML</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeNewContext">xmlXIncludeNewContext</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_ENCODING">XINCLUDE_PARSE_ENCODING</a><br />
</p><h2><a name="xlink" id="xlink">Module xlink</a>:</h2><p><a href="html/libxml-xlink.html#xlinkShow">xlinkShow</a><br />
<a href="html/libxml-xlink.html#XLINK_TYPE_SIMPLE">XLINK_TYPE_SIMPLE</a><br />
@@ -1645,7 +1650,7 @@
<a href="html/libxml-xmlerror.html#XML_XPATH_INVALID_CTXT_POSITION">XML_XPATH_INVALID_CTXT_POSITION</a><br />
<a href="html/libxml-xmlerror.html#XML_ERR_NOTATION_NOT_FINISHED">XML_ERR_NOTATION_NOT_FINISHED</a><br />
<a href="html/libxml-xmlerror.html#xmlError">xmlError</a><br />
-<a href="html/libxml-xmlerror.html#XML_HTML_STRUCURE_ERROR">XML_HTML_STRUCURE_ERROR</a><br />
+<a href="html/libxml-xmlerror.html#XML_DTD_STANDALONE_DEFAULTED">XML_DTD_STANDALONE_DEFAULTED</a><br />
<a href="html/libxml-xmlerror.html#XML_DTD_INVALID_DEFAULT">XML_DTD_INVALID_DEFAULT</a><br />
<a href="html/libxml-xmlerror.html#XML_DTD_UNKNOWN_ELEM">XML_DTD_UNKNOWN_ELEM</a><br />
<a href="html/libxml-xmlerror.html#XML_SCHEMAP_REDEFINED_TYPE">XML_SCHEMAP_REDEFINED_TYPE</a><br />
@@ -1726,11 +1731,11 @@
<a href="html/libxml-xmlerror.html#XML_SCHEMAP_COMPLEXTYPE_NONAME_NOREF">XML_SCHEMAP_COMPLEXTYPE_NONAME_NOREF</a><br />
<a href="html/libxml-xmlerror.html#XML_SCHEMAP_UNKNOWN_EXTENSION_CHILD">XML_SCHEMAP_UNKNOWN_EXTENSION_CHILD</a><br />
<a href="html/libxml-xmlerror.html#XML_RNGP_PAT_START_INTERLEAVE">XML_RNGP_PAT_START_INTERLEAVE</a><br />
-<a href="html/libxml-xmlerror.html#XML_IO_ENFILE">XML_IO_ENFILE</a><br />
+<a href="html/libxml-xmlerror.html#XML_HTML_STRUCURE_ERROR">XML_HTML_STRUCURE_ERROR</a><br />
<a href="html/libxml-xmlerror.html#XML_SCHEMAV_MISSING">XML_SCHEMAV_MISSING</a><br />
<a href="html/libxml-xmlerror.html#XML_RNGP_GRAMMAR_CONTENT">XML_RNGP_GRAMMAR_CONTENT</a><br />
<a href="html/libxml-xmlerror.html#XML_XINCLUDE_XPTR_FAILED">XML_XINCLUDE_XPTR_FAILED</a><br />
-<a href="html/libxml-xmlerror.html#XML_DTD_ELEM_REDEFINED">XML_DTD_ELEM_REDEFINED</a><br />
+<a href="html/libxml-xmlerror.html#XML_IO_ENFILE">XML_IO_ENFILE</a><br />
<a href="html/libxml-xmlerror.html#XML_RNGP_PARENTREF_CREATE_FAILED">XML_RNGP_PARENTREF_CREATE_FAILED</a><br />
<a href="html/libxml-xmlerror.html#XML_ERR_ENTITY_IS_PARAMETER">XML_ERR_ENTITY_IS_PARAMETER</a><br />
<a href="html/libxml-xmlerror.html#XML_ERR_RESERVED_XML_NAME">XML_ERR_RESERVED_XML_NAME</a><br />
@@ -1818,7 +1823,7 @@
<a href="html/libxml-xmlerror.html#XML_RNGP_PAT_DATA_EXCEPT_ATTR">XML_RNGP_PAT_DATA_EXCEPT_ATTR</a><br />
<a href="html/libxml-xmlerror.html#XML_FTP_ACCNT">XML_FTP_ACCNT</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_RELAXNGV">XML_FROM_RELAXNGV</a><br />
-<a href="html/libxml-xmlerror.html#XML_RNGP_PAT_START_DATA">XML_RNGP_PAT_START_DATA</a><br />
+<a href="html/libxml-xmlerror.html#XML_RNGP_REF_NAME_INVALID">XML_RNGP_REF_NAME_INVALID</a><br />
<a href="html/libxml-xmlerror.html#XML_SCHEMAV_NOTTOPLEVEL">XML_SCHEMAV_NOTTOPLEVEL</a><br />
<a href="html/libxml-xmlerror.html#XML_IO_ENOENT">XML_IO_ENOENT</a><br />
<a href="html/libxml-xmlerror.html#XML_ERR_NO_DTD">XML_ERR_NO_DTD</a><br />
@@ -1868,6 +1873,7 @@
<a href="html/libxml-xmlerror.html#XML_WAR_CATALOG_PI">XML_WAR_CATALOG_PI</a><br />
<a href="html/libxml-xmlerror.html#XML_SCHEMAP_INVALID_MINOCCURS">XML_SCHEMAP_INVALID_MINOCCURS</a><br />
<a href="html/libxml-xmlerror.html#XML_IO_ENOLCK">XML_IO_ENOLCK</a><br />
+<a href="html/libxml-xmlerror.html#XML_XINCLUDE_DEPRECATED_NS">XML_XINCLUDE_DEPRECATED_NS</a><br />
<a href="html/libxml-xmlerror.html#XML_RNGP_CHOICE_EMPTY">XML_RNGP_CHOICE_EMPTY</a><br />
<a href="html/libxml-xmlerror.html#XML_ERR_LITERAL_NOT_FINISHED">XML_ERR_LITERAL_NOT_FINISHED</a><br />
<a href="html/libxml-xmlerror.html#xmlSetStructuredErrorFunc">xmlSetStructuredErrorFunc</a><br />
@@ -1940,13 +1946,14 @@
<a href="html/libxml-xmlerror.html#xmlCtxtResetLastError">xmlCtxtResetLastError</a><br />
<a href="html/libxml-xmlerror.html#XML_IO_EFBIG">XML_IO_EFBIG</a><br />
<a href="html/libxml-xmlerror.html#XML_ERR_NS_DECL_ERROR">XML_ERR_NS_DECL_ERROR</a><br />
-<a href="html/libxml-xmlerror.html#XML_RNGP_REF_NAME_INVALID">XML_RNGP_REF_NAME_INVALID</a><br />
+<a href="html/libxml-xmlerror.html#XML_RNGP_PAT_START_DATA">XML_RNGP_PAT_START_DATA</a><br />
<a href="html/libxml-xmlerror.html#XML_ERR_ERROR">XML_ERR_ERROR</a><br />
<a href="html/libxml-xmlerror.html#XML_DTD_MISSING_ATTRIBUTE">XML_DTD_MISSING_ATTRIBUTE</a><br />
<a href="html/libxml-xmlerror.html#XML_IO_EMFILE">XML_IO_EMFILE</a><br />
<a href="html/libxml-xmlerror.html#XML_RNGP_EMPTY_NOT_EMPTY">XML_RNGP_EMPTY_NOT_EMPTY</a><br />
<a href="html/libxml-xmlerror.html#XML_DTD_ELEM_NAMESPACE">XML_DTD_ELEM_NAMESPACE</a><br />
<a href="html/libxml-xmlerror.html#XML_RNGP_PAT_ATTR_ELEM">XML_RNGP_PAT_ATTR_ELEM</a><br />
+<a href="html/libxml-xmlerror.html#XML_XINCLUDE_FRAGMENT_ID">XML_XINCLUDE_FRAGMENT_ID</a><br />
<a href="html/libxml-xmlerror.html#XML_IO_NO_INPUT">XML_IO_NO_INPUT</a><br />
<a href="html/libxml-xmlerror.html#XML_NS_ERR_UNDEFINED_NAMESPACE">XML_NS_ERR_UNDEFINED_NAMESPACE</a><br />
<a href="html/libxml-xmlerror.html#XML_XPATH_INVALID_ARITY">XML_XPATH_INVALID_ARITY</a><br />
@@ -1976,6 +1983,7 @@
<a href="html/libxml-xmlerror.html#XML_FROM_XPOINTER">XML_FROM_XPOINTER</a><br />
<a href="html/libxml-xmlerror.html#XML_ERR_ATTRIBUTE_WITHOUT_VALUE">XML_ERR_ATTRIBUTE_WITHOUT_VALUE</a><br />
<a href="html/libxml-xmlerror.html#XML_RNGP_TEXT_HAS_CHILD">XML_RNGP_TEXT_HAS_CHILD</a><br />
+<a href="html/libxml-xmlerror.html#XML_DTD_ELEM_REDEFINED">XML_DTD_ELEM_REDEFINED</a><br />
<a href="html/libxml-xmlerror.html#XML_SCHEMAV_NOTNILLABLE">XML_SCHEMAV_NOTNILLABLE</a><br />
<a href="html/libxml-xmlerror.html#XML_SCHEMAP_ELEM_DEFAULT_FIXED">XML_SCHEMAP_ELEM_DEFAULT_FIXED</a><br />
<a href="html/libxml-xmlerror.html#XML_SCHEMAP_UNKNOWN_TYPE">XML_SCHEMAP_UNKNOWN_TYPE</a><br />
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html
index c21ab2f..94d42a4 100644
--- a/doc/APIfunctions.html
+++ b/doc/APIfunctions.html
@@ -1368,6 +1368,7 @@
<a href="html/libxml-valid.html#xmlValidateRoot">xmlValidateRoot</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeNewContext">xmlXIncludeNewContext</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
<a href="html/libxml-xpath.html#xmlXPathNewContext">xmlXPathNewContext</a><br />
<a href="html/libxml-xpath.html#xmlXPathOrderDocElems">xmlXPathOrderDocElems</a><br />
<a href="html/libxml-xpointer.html#xmlXPtrNewContext">xmlXPtrNewContext</a><br />
@@ -1663,6 +1664,7 @@
<a href="html/libxml-valid.html#xmlValidatePushElement">xmlValidatePushElement</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
<a href="html/libxml-xpath.html#xmlXPathCastNodeToNumber">xmlXPathCastNodeToNumber</a><br />
<a href="html/libxml-xpath.html#xmlXPathCastNodeToString">xmlXPathCastNodeToString</a><br />
<a href="html/libxml-xpath.html#xmlXPathCmpNodes">xmlXPathCmpNodes</a><br />
@@ -2199,6 +2201,7 @@
<a href="html/libxml-valid.html#xmlValidateRoot">xmlValidateRoot</a><br />
</p><h2>Type xmlXIncludeCtxtPtr:</h2><p><a href="html/libxml-xinclude.html#xmlXIncludeFreeContext">xmlXIncludeFreeContext</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
</p><h2>Type xmlXPathCompExprPtr:</h2><p><a href="html/libxml-xpath.html#xmlXPathCompiledEval">xmlXPathCompiledEval</a><br />
<a href="html/libxml-xpathInternals.html#xmlXPathDebugDumpCompExpr">xmlXPathDebugDumpCompExpr</a><br />
<a href="html/libxml-xpath.html#xmlXPathFreeCompExpr">xmlXPathFreeCompExpr</a><br />
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index 0cdcee1..bca353e 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -95,10 +95,12 @@
<a href="html/libxml-xinclude.html#XINCLUDE_HREF">XINCLUDE_HREF</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_NODE">XINCLUDE_NODE</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_NS">XINCLUDE_NS</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE">XINCLUDE_PARSE</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_ENCODING">XINCLUDE_PARSE_ENCODING</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_TEXT">XINCLUDE_PARSE_TEXT</a><br />
<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_XML">XINCLUDE_PARSE_XML</a><br />
+<a href="html/libxml-xinclude.html#XINCLUDE_PARSE_XPOINTER">XINCLUDE_PARSE_XPOINTER</a><br />
<a href="html/libxml-xlink.html#XLINK_ACTUATE_AUTO">XLINK_ACTUATE_AUTO</a><br />
<a href="html/libxml-xlink.html#XLINK_ACTUATE_NONE">XLINK_ACTUATE_NONE</a><br />
<a href="html/libxml-xlink.html#XLINK_ACTUATE_ONREQUEST">XLINK_ACTUATE_ONREQUEST</a><br />
@@ -216,6 +218,7 @@
<a href="html/libxml-xmlerror.html#XML_DTD_NO_PREFIX">XML_DTD_NO_PREFIX</a><br />
<a href="html/libxml-xmlerror.html#XML_DTD_NO_ROOT">XML_DTD_NO_ROOT</a><br />
<a href="html/libxml-xmlerror.html#XML_DTD_ROOT_NAME">XML_DTD_ROOT_NAME</a><br />
+<a href="html/libxml-xmlerror.html#XML_DTD_STANDALONE_DEFAULTED">XML_DTD_STANDALONE_DEFAULTED</a><br />
<a href="html/libxml-xmlerror.html#XML_DTD_STANDALONE_WHITE_SPACE">XML_DTD_STANDALONE_WHITE_SPACE</a><br />
<a href="html/libxml-xmlerror.html#XML_DTD_UNKNOWN_ATTRIBUTE">XML_DTD_UNKNOWN_ATTRIBUTE</a><br />
<a href="html/libxml-xmlerror.html#XML_DTD_UNKNOWN_ELEM">XML_DTD_UNKNOWN_ELEM</a><br />
@@ -872,10 +875,12 @@
<a href="html/libxml-xmlerror.html#XML_WAR_UNDECLARED_ENTITY">XML_WAR_UNDECLARED_ENTITY</a><br />
<a href="html/libxml-xmlerror.html#XML_WAR_UNKNOWN_VERSION">XML_WAR_UNKNOWN_VERSION</a><br />
<a href="html/libxml-xmlerror.html#XML_XINCLUDE_BUILD_FAILED">XML_XINCLUDE_BUILD_FAILED</a><br />
+<a href="html/libxml-xmlerror.html#XML_XINCLUDE_DEPRECATED_NS">XML_XINCLUDE_DEPRECATED_NS</a><br />
<a href="html/libxml-tree.html#XML_XINCLUDE_END">XML_XINCLUDE_END</a><br />
<a href="html/libxml-xmlerror.html#XML_XINCLUDE_ENTITY_DEF_MISMATCH">XML_XINCLUDE_ENTITY_DEF_MISMATCH</a><br />
<a href="html/libxml-xmlerror.html#XML_XINCLUDE_FALLBACKS_IN_INCLUDE">XML_XINCLUDE_FALLBACKS_IN_INCLUDE</a><br />
<a href="html/libxml-xmlerror.html#XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE">XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE</a><br />
+<a href="html/libxml-xmlerror.html#XML_XINCLUDE_FRAGMENT_ID">XML_XINCLUDE_FRAGMENT_ID</a><br />
<a href="html/libxml-xmlerror.html#XML_XINCLUDE_HREF_URI">XML_XINCLUDE_HREF_URI</a><br />
<a href="html/libxml-xmlerror.html#XML_XINCLUDE_INCLUDE_IN_INCLUDE">XML_XINCLUDE_INCLUDE_IN_INCLUDE</a><br />
<a href="html/libxml-xmlerror.html#XML_XINCLUDE_INVALID_CHAR">XML_XINCLUDE_INVALID_CHAR</a><br />
@@ -2604,8 +2609,11 @@
<a href="html/libxml-xinclude.html#xmlXIncludeFreeContext">xmlXIncludeFreeContext</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeNewContext">xmlXIncludeNewContext</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a><br />
<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />
+<a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
<a href="html/libxml-xpathInternals.html#xmlXPathAddValues">xmlXPathAddValues</a><br />
<a href="html/libxml-xpath.html#xmlXPathAxis">xmlXPathAxis</a><br />
<a href="html/libxml-xpath.html#xmlXPathAxisFunc">xmlXPathAxisFunc</a><br />
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index 8c4368a..ff7b367 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -10,23 +10,28 @@
</style><style type="text/css">
div.deprecated pre.programlisting {border-style: double;border-color:red}
pre.programlisting {border-style: double}
- </style><title>Module xinclude from libxml2</title></head><body bgcolor="#8b7765" text="#000000" link="#000000" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="../epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="../gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="../w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="../redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="../Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1></h1><h2>Module xinclude from libxml2</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="../search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a style="font-weight:bold" href="../index.html">Main Menu</a></li><li><a style="font-weight:bold" href="../docs.html">Developer Menu</a></li><li><a style="font-weight:bold" href="../examples/index.html">Code Examples</a></li><li><a style="font-weight:bold" href="index.html">API Menu</a></li><li><a href="libxml-parser.html">Parser API</a></li><li><a href="libxml-tree.html">Tree API</a></li><li><a href="libxml-xmlreader.html">Reader API</a></li><li><a href="../guidelines.html">XML Guidelines</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="../APIchunk0.html">Alphabetic</a></li><li><a href="../APIconstructors.html">Constructors</a></li><li><a href="../APIfunctions.html">Functions/Types</a></li><li><a href="../APIfiles.html">Modules</a></li><li><a href="../APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li><li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"><td><a accesskey="p" href="libxml-valid.html"><img src="left.png" width="24" height="24" border="0" alt="Prev" /></a></td><th align="left"><a href="libxml-valid.html">valid</a></th><td><a accesskey="u" href="index.html"><img src="up.png" width="24" height="24" border="0" alt="Up" /></a></td><th align="left"><a href="index.html">API documentation</a></th><td><a accesskey="h" href="../index.html"><img src="home.png" width="24" height="24" border="0" alt="Home" /></a></td><th align="center"><a href="../index.html">The XML C parser and toolkit of Gnome</a></th><th align="right"><a href="libxml-xlink.html">xlink</a></th><td><a accesskey="n" href="libxml-xlink.html"><img src="right.png" width="24" height="24" border="0" alt="Next" /></a></td></tr></table><p>API to handle XInclude processing, implements the World Wide Web Consortium Working Draft 26 October 2000</p><h2>Table of Contents</h2><pre class="programlisting">#define <a href="#XINCLUDE_FALLBACK">XINCLUDE_FALLBACK</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_HREF">XINCLUDE_HREF</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_NODE">XINCLUDE_NODE</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_NS">XINCLUDE_NS</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_PARSE">XINCLUDE_PARSE</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_PARSE_ENCODING">XINCLUDE_PARSE_ENCODING</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_PARSE_TEXT">XINCLUDE_PARSE_TEXT</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_PARSE_XML">XINCLUDE_PARSE_XML</a></pre><pre class="programlisting">Structure <a href="#xmlXIncludeCtxt">xmlXIncludeCtxt</a><br />struct _xmlXIncludeCtxt
+ </style><title>Module xinclude from libxml2</title></head><body bgcolor="#8b7765" text="#000000" link="#000000" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="../epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="../gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="../w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="../redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="../Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1></h1><h2>Module xinclude from libxml2</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="../search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a style="font-weight:bold" href="../index.html">Main Menu</a></li><li><a style="font-weight:bold" href="../docs.html">Developer Menu</a></li><li><a style="font-weight:bold" href="../examples/index.html">Code Examples</a></li><li><a style="font-weight:bold" href="index.html">API Menu</a></li><li><a href="libxml-parser.html">Parser API</a></li><li><a href="libxml-tree.html">Tree API</a></li><li><a href="libxml-xmlreader.html">Reader API</a></li><li><a href="../guidelines.html">XML Guidelines</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="../APIchunk0.html">Alphabetic</a></li><li><a href="../APIconstructors.html">Constructors</a></li><li><a href="../APIfunctions.html">Functions/Types</a></li><li><a href="../APIfiles.html">Modules</a></li><li><a href="../APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li><li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"><td><a accesskey="p" href="libxml-valid.html"><img src="left.png" width="24" height="24" border="0" alt="Prev" /></a></td><th align="left"><a href="libxml-valid.html">valid</a></th><td><a accesskey="u" href="index.html"><img src="up.png" width="24" height="24" border="0" alt="Up" /></a></td><th align="left"><a href="index.html">API documentation</a></th><td><a accesskey="h" href="../index.html"><img src="home.png" width="24" height="24" border="0" alt="Home" /></a></td><th align="center"><a href="../index.html">The XML C parser and toolkit of Gnome</a></th><th align="right"><a href="libxml-xlink.html">xlink</a></th><td><a accesskey="n" href="libxml-xlink.html"><img src="right.png" width="24" height="24" border="0" alt="Next" /></a></td></tr></table><p>API to handle XInclude processing, implements the World Wide Web Consortium Last Call Working Draft 10 November 2003</p><h2>Table of Contents</h2><pre class="programlisting">#define <a href="#XINCLUDE_FALLBACK">XINCLUDE_FALLBACK</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_HREF">XINCLUDE_HREF</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_NODE">XINCLUDE_NODE</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_NS">XINCLUDE_NS</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_OLD_NS">XINCLUDE_OLD_NS</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_PARSE">XINCLUDE_PARSE</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_PARSE_ENCODING">XINCLUDE_PARSE_ENCODING</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_PARSE_TEXT">XINCLUDE_PARSE_TEXT</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_PARSE_XML">XINCLUDE_PARSE_XML</a></pre><pre class="programlisting">#define <a href="#XINCLUDE_PARSE_XPOINTER">XINCLUDE_PARSE_XPOINTER</a></pre><pre class="programlisting">Structure <a href="#xmlXIncludeCtxt">xmlXIncludeCtxt</a><br />struct _xmlXIncludeCtxt
The content of this structure is not made public by the API.
</pre><pre class="programlisting">Typedef <a href="libxml-xinclude.html#xmlXIncludeCtxt">xmlXIncludeCtxt</a> * <a name="xmlXIncludeCtxtPtr" id="xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a>
</pre><pre class="programlisting">void <a href="#xmlXIncludeFreeContext">xmlXIncludeFreeContext</a> (<a href="libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt)</pre>
<pre class="programlisting"><a href="libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> <a href="#xmlXIncludeNewContext">xmlXIncludeNewContext</a> (<a href="libxml-tree.html#xmlDocPtr">xmlDocPtr</a> doc)</pre>
<pre class="programlisting">int <a href="#xmlXIncludeProcess">xmlXIncludeProcess</a> (<a href="libxml-tree.html#xmlDocPtr">xmlDocPtr</a> doc)</pre>
+<pre class="programlisting">int <a href="#xmlXIncludeProcessFlags">xmlXIncludeProcessFlags</a> (<a href="libxml-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br /> int flags)</pre>
<pre class="programlisting">int <a href="#xmlXIncludeProcessNode">xmlXIncludeProcessNode</a> (<a href="libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt, <br /> <a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> node)</pre>
<pre class="programlisting">int <a href="#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a> (<a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> tree)</pre>
+<pre class="programlisting">int <a href="#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a> (<a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br /> int flags)</pre>
+<pre class="programlisting">int <a href="#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a> (<a href="libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt, <br /> int flags)</pre>
<h2>Description</h2>
<h3><a name="XINCLUDE_FALLBACK" id="XINCLUDE_FALLBACK"></a>Macro: XINCLUDE_FALLBACK</h3><pre>#define XINCLUDE_FALLBACK</pre><p>Macro defining "fallback"</p>
<h3><a name="XINCLUDE_HREF" id="XINCLUDE_HREF"></a>Macro: XINCLUDE_HREF</h3><pre>#define XINCLUDE_HREF</pre><p>Macro defining "href"</p>
<h3><a name="XINCLUDE_NODE" id="XINCLUDE_NODE"></a>Macro: XINCLUDE_NODE</h3><pre>#define XINCLUDE_NODE</pre><p>Macro defining "include"</p>
-<h3><a name="XINCLUDE_NS" id="XINCLUDE_NS"></a>Macro: XINCLUDE_NS</h3><pre>#define XINCLUDE_NS</pre><p>Macro defining the Xinclude namespace: http://www.w3.org/2001/XInclude</p>
+<h3><a name="XINCLUDE_NS" id="XINCLUDE_NS"></a>Macro: XINCLUDE_NS</h3><pre>#define XINCLUDE_NS</pre><p>Macro defining the Xinclude namespace: http://www.w3.org/2003/XInclude</p>
+<h3><a name="XINCLUDE_OLD_NS" id="XINCLUDE_OLD_NS"></a>Macro: XINCLUDE_OLD_NS</h3><pre>#define XINCLUDE_OLD_NS</pre><p>Macro defining the draft Xinclude namespace: http://www.w3.org/2001/XInclude</p>
<h3><a name="XINCLUDE_PARSE" id="XINCLUDE_PARSE"></a>Macro: XINCLUDE_PARSE</h3><pre>#define XINCLUDE_PARSE</pre><p>Macro defining "parse"</p>
<h3><a name="XINCLUDE_PARSE_ENCODING" id="XINCLUDE_PARSE_ENCODING"></a>Macro: XINCLUDE_PARSE_ENCODING</h3><pre>#define XINCLUDE_PARSE_ENCODING</pre><p>Macro defining "encoding"</p>
<h3><a name="XINCLUDE_PARSE_TEXT" id="XINCLUDE_PARSE_TEXT"></a>Macro: XINCLUDE_PARSE_TEXT</h3><pre>#define XINCLUDE_PARSE_TEXT</pre><p>Macro defining "text"</p>
<h3><a name="XINCLUDE_PARSE_XML" id="XINCLUDE_PARSE_XML"></a>Macro: XINCLUDE_PARSE_XML</h3><pre>#define XINCLUDE_PARSE_XML</pre><p>Macro defining "xml"</p>
+<h3><a name="XINCLUDE_PARSE_XPOINTER" id="XINCLUDE_PARSE_XPOINTER"></a>Macro: XINCLUDE_PARSE_XPOINTER</h3><pre>#define XINCLUDE_PARSE_XPOINTER</pre><p>Macro defining "xpointer"</p>
<h3><a name="xmlXIncludeCtxt" id="xmlXIncludeCtxt">Structure xmlXIncludeCtxt</a></h3><pre class="programlisting">Structure xmlXIncludeCtxt<br />struct _xmlXIncludeCtxt {
The content of this structure is not made public by the API.
}</pre><h3><a name="xmlXIncludeFreeContext" id="xmlXIncludeFreeContext"></a>Function: xmlXIncludeFreeContext</h3><pre class="programlisting">void xmlXIncludeFreeContext (<a href="libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt)<br />
@@ -35,8 +40,14 @@
</pre><p>Creates a new XInclude context</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>doc</tt></i>:</span></td><td>an XML Document</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the new set</td></tr></tbody></table></div><h3><a name="xmlXIncludeProcess" id="xmlXIncludeProcess"></a>Function: xmlXIncludeProcess</h3><pre class="programlisting">int xmlXIncludeProcess (<a href="libxml-tree.html#xmlDocPtr">xmlDocPtr</a> doc)<br />
</pre><p>Implement the XInclude substitution on the XML document @doc</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>doc</tt></i>:</span></td><td>an XML document</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no substitution were done, -1 if some processing failed or the number of substitutions done.</td></tr></tbody></table></div><h3><a name="xmlXIncludeProcessNode" id="xmlXIncludeProcessNode"></a>Function: xmlXIncludeProcessNode</h3><pre class="programlisting">int xmlXIncludeProcessNode (<a href="libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt, <br /> <a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> node)<br />
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>doc</tt></i>:</span></td><td>an XML document</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no substitution were done, -1 if some processing failed or the number of substitutions done.</td></tr></tbody></table></div><h3><a name="xmlXIncludeProcessFlags" id="xmlXIncludeProcessFlags"></a>Function: xmlXIncludeProcessFlags</h3><pre class="programlisting">int xmlXIncludeProcessFlags (<a href="libxml-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br /> int flags)<br />
+</pre><p>Implement the XInclude substitution on the XML document @doc</p>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>doc</tt></i>:</span></td><td>an XML document</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>a set of <a href="libxml-parser.html#xmlParserOption">xmlParserOption</a> used for parsing XML includes</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no substitution were done, -1 if some processing failed or the number of substitutions done.</td></tr></tbody></table></div><h3><a name="xmlXIncludeProcessNode" id="xmlXIncludeProcessNode"></a>Function: xmlXIncludeProcessNode</h3><pre class="programlisting">int xmlXIncludeProcessNode (<a href="libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt, <br /> <a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> node)<br />
</pre><p>Implement the XInclude substitution for the given subtree reusing the informations and data coming from the given context.</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>ctxt</tt></i>:</span></td><td>an existing XInclude context</td></tr><tr><td><span class="term"><i><tt>node</tt></i>:</span></td><td>a node in an XML document</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no substitution were done, -1 if some processing failed or the number of substitutions done.</td></tr></tbody></table></div><h3><a name="xmlXIncludeProcessTree" id="xmlXIncludeProcessTree"></a>Function: xmlXIncludeProcessTree</h3><pre class="programlisting">int xmlXIncludeProcessTree (<a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> tree)<br />
</pre><p>Implement the XInclude substitution for the given subtree</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>tree</tt></i>:</span></td><td>a node in an XML document</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no substitution were done, -1 if some processing failed or the number of substitutions done.</td></tr></tbody></table></div><p><a href="../bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>tree</tt></i>:</span></td><td>a node in an XML document</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no substitution were done, -1 if some processing failed or the number of substitutions done.</td></tr></tbody></table></div><h3><a name="xmlXIncludeProcessTreeFlags" id="xmlXIncludeProcessTreeFlags"></a>Function: xmlXIncludeProcessTreeFlags</h3><pre class="programlisting">int xmlXIncludeProcessTreeFlags (<a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> tree, <br /> int flags)<br />
+</pre><p>Implement the XInclude substitution for the given subtree</p>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>tree</tt></i>:</span></td><td>a node in an XML document</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>a set of <a href="libxml-parser.html#xmlParserOption">xmlParserOption</a> used for parsing XML includes</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no substitution were done, -1 if some processing failed or the number of substitutions done.</td></tr></tbody></table></div><h3><a name="xmlXIncludeSetFlags" id="xmlXIncludeSetFlags"></a>Function: xmlXIncludeSetFlags</h3><pre class="programlisting">int xmlXIncludeSetFlags (<a href="libxml-xinclude.html#xmlXIncludeCtxtPtr">xmlXIncludeCtxtPtr</a> ctxt, <br /> int flags)<br />
+</pre><p>Set the flags used for further processing of XML resources.</p>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>ctxt</tt></i>:</span></td><td>an XInclude processing context</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>a set of <a href="libxml-parser.html#xmlParserOption">xmlParserOption</a> used for parsing XML includes</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success and -1 in case of error.</td></tr></tbody></table></div><p><a href="../bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html>
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index b8a9d34..8777fe6 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -228,6 +228,7 @@
<a name="XML_DTD_UNKNOWN_ENTITY" id="XML_DTD_UNKNOWN_ENTITY">XML_DTD_UNKNOWN_ENTITY</a> = 535 : 535
<a name="XML_DTD_UNKNOWN_ID" id="XML_DTD_UNKNOWN_ID">XML_DTD_UNKNOWN_ID</a> = 536 : 536
<a name="XML_DTD_UNKNOWN_NOTATION" id="XML_DTD_UNKNOWN_NOTATION">XML_DTD_UNKNOWN_NOTATION</a> = 537 : 537
+ <a name="XML_DTD_STANDALONE_DEFAULTED" id="XML_DTD_STANDALONE_DEFAULTED">XML_DTD_STANDALONE_DEFAULTED</a> = 538 : 538
<a name="XML_HTML_STRUCURE_ERROR" id="XML_HTML_STRUCURE_ERROR">XML_HTML_STRUCURE_ERROR</a> = 800
<a name="XML_HTML_UNKNOWN_TAG" id="XML_HTML_UNKNOWN_TAG">XML_HTML_UNKNOWN_TAG</a> = 801 : 801
<a name="XML_RNGP_ANYNAME_ATTR_ANCESTOR" id="XML_RNGP_ANYNAME_ATTR_ANCESTOR">XML_RNGP_ANYNAME_ATTR_ANCESTOR</a> = 1000
@@ -457,6 +458,8 @@
<a name="XML_XINCLUDE_INCLUDE_IN_INCLUDE" id="XML_XINCLUDE_INCLUDE_IN_INCLUDE">XML_XINCLUDE_INCLUDE_IN_INCLUDE</a> = 1614 : 1614
<a name="XML_XINCLUDE_FALLBACKS_IN_INCLUDE" id="XML_XINCLUDE_FALLBACKS_IN_INCLUDE">XML_XINCLUDE_FALLBACKS_IN_INCLUDE</a> = 1615 : 1615
<a name="XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE" id="XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE">XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE</a> = 1616 : 1616
+ <a name="XML_XINCLUDE_DEPRECATED_NS" id="XML_XINCLUDE_DEPRECATED_NS">XML_XINCLUDE_DEPRECATED_NS</a> = 1617 : 1617
+ <a name="XML_XINCLUDE_FRAGMENT_ID" id="XML_XINCLUDE_FRAGMENT_ID">XML_XINCLUDE_FRAGMENT_ID</a> = 1618 : 1618
<a name="XML_CATALOG_MISSING_ATTR" id="XML_CATALOG_MISSING_ATTR">XML_CATALOG_MISSING_ATTR</a> = 1650
<a name="XML_CATALOG_ENTRY_BROKEN" id="XML_CATALOG_ENTRY_BROKEN">XML_CATALOG_ENTRY_BROKEN</a> = 1651 : 1651
<a name="XML_CATALOG_PREFER_VALUE" id="XML_CATALOG_PREFER_VALUE">XML_CATALOG_PREFER_VALUE</a> = 1652 : 1652
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 155ba3f..33de437 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1533,23 +1533,28 @@
</file>
<file name='xinclude'>
<summary>implementation of XInclude</summary>
- <description>API to handle XInclude processing, implements the World Wide Web Consortium Working Draft 26 October 2000</description>
+ <description>API to handle XInclude processing, implements the World Wide Web Consortium Last Call Working Draft 10 November 2003</description>
<author>Daniel Veillard </author>
<exports symbol='XINCLUDE_PARSE_TEXT' type='macro'/>
+ <exports symbol='XINCLUDE_PARSE_XPOINTER' type='macro'/>
<exports symbol='XINCLUDE_NODE' type='macro'/>
<exports symbol='XINCLUDE_PARSE_XML' type='macro'/>
<exports symbol='XINCLUDE_HREF' type='macro'/>
+ <exports symbol='XINCLUDE_PARSE_ENCODING' type='macro'/>
<exports symbol='XINCLUDE_FALLBACK' type='macro'/>
<exports symbol='XINCLUDE_NS' type='macro'/>
<exports symbol='XINCLUDE_PARSE' type='macro'/>
- <exports symbol='XINCLUDE_PARSE_ENCODING' type='macro'/>
+ <exports symbol='XINCLUDE_OLD_NS' type='macro'/>
<exports symbol='xmlXIncludeCtxt' type='typedef'/>
<exports symbol='xmlXIncludeCtxtPtr' type='typedef'/>
+ <exports symbol='xmlXIncludeProcessTree' type='function'/>
+ <exports symbol='xmlXIncludeProcessNode' type='function'/>
+ <exports symbol='xmlXIncludeFreeContext' type='function'/>
+ <exports symbol='xmlXIncludeSetFlags' type='function'/>
<exports symbol='xmlXIncludeProcess' type='function'/>
<exports symbol='xmlXIncludeNewContext' type='function'/>
- <exports symbol='xmlXIncludeProcessNode' type='function'/>
- <exports symbol='xmlXIncludeProcessTree' type='function'/>
- <exports symbol='xmlXIncludeFreeContext' type='function'/>
+ <exports symbol='xmlXIncludeProcessTreeFlags' type='function'/>
+ <exports symbol='xmlXIncludeProcessFlags' type='function'/>
</file>
<file name='xlink'>
<summary>unfinished XLink detection module</summary>
@@ -1787,7 +1792,7 @@
<exports symbol='XML_IO_EFAULT' type='enum'/>
<exports symbol='XML_XPATH_INVALID_CTXT_POSITION' type='enum'/>
<exports symbol='XML_ERR_NOTATION_NOT_FINISHED' type='enum'/>
- <exports symbol='XML_HTML_STRUCURE_ERROR' type='enum'/>
+ <exports symbol='XML_DTD_STANDALONE_DEFAULTED' type='enum'/>
<exports symbol='XML_DTD_INVALID_DEFAULT' type='enum'/>
<exports symbol='XML_DTD_UNKNOWN_ELEM' type='enum'/>
<exports symbol='XML_SCHEMAP_REDEFINED_TYPE' type='enum'/>
@@ -1865,11 +1870,11 @@
<exports symbol='XML_SCHEMAP_COMPLEXTYPE_NONAME_NOREF' type='enum'/>
<exports symbol='XML_SCHEMAP_UNKNOWN_EXTENSION_CHILD' type='enum'/>
<exports symbol='XML_RNGP_PAT_START_INTERLEAVE' type='enum'/>
- <exports symbol='XML_IO_ENFILE' type='enum'/>
+ <exports symbol='XML_HTML_STRUCURE_ERROR' type='enum'/>
<exports symbol='XML_SCHEMAV_MISSING' type='enum'/>
<exports symbol='XML_RNGP_GRAMMAR_CONTENT' type='enum'/>
<exports symbol='XML_XINCLUDE_XPTR_FAILED' type='enum'/>
- <exports symbol='XML_DTD_ELEM_REDEFINED' type='enum'/>
+ <exports symbol='XML_IO_ENFILE' type='enum'/>
<exports symbol='XML_RNGP_PARENTREF_CREATE_FAILED' type='enum'/>
<exports symbol='XML_ERR_ENTITY_IS_PARAMETER' type='enum'/>
<exports symbol='XML_ERR_RESERVED_XML_NAME' type='enum'/>
@@ -1953,7 +1958,7 @@
<exports symbol='XML_RNGP_PAT_DATA_EXCEPT_ATTR' type='enum'/>
<exports symbol='XML_FTP_ACCNT' type='enum'/>
<exports symbol='XML_FROM_RELAXNGV' type='enum'/>
- <exports symbol='XML_RNGP_PAT_START_DATA' type='enum'/>
+ <exports symbol='XML_RNGP_REF_NAME_INVALID' type='enum'/>
<exports symbol='XML_SCHEMAV_NOTTOPLEVEL' type='enum'/>
<exports symbol='XML_IO_ENOENT' type='enum'/>
<exports symbol='XML_ERR_NO_DTD' type='enum'/>
@@ -2003,6 +2008,7 @@
<exports symbol='XML_WAR_CATALOG_PI' type='enum'/>
<exports symbol='XML_SCHEMAP_INVALID_MINOCCURS' type='enum'/>
<exports symbol='XML_IO_ENOLCK' type='enum'/>
+ <exports symbol='XML_XINCLUDE_DEPRECATED_NS' type='enum'/>
<exports symbol='XML_RNGP_CHOICE_EMPTY' type='enum'/>
<exports symbol='XML_ERR_LITERAL_NOT_FINISHED' type='enum'/>
<exports symbol='XML_ERR_ENTITYREF_SEMICOL_MISSING' type='enum'/>
@@ -2069,13 +2075,14 @@
<exports symbol='XML_RNGP_PAT_DATA_EXCEPT_EMPTY' type='enum'/>
<exports symbol='XML_IO_EFBIG' type='enum'/>
<exports symbol='XML_ERR_NS_DECL_ERROR' type='enum'/>
- <exports symbol='XML_RNGP_REF_NAME_INVALID' type='enum'/>
+ <exports symbol='XML_RNGP_PAT_START_DATA' type='enum'/>
<exports symbol='XML_ERR_ERROR' type='enum'/>
<exports symbol='XML_DTD_MISSING_ATTRIBUTE' type='enum'/>
<exports symbol='XML_IO_EMFILE' type='enum'/>
<exports symbol='XML_RNGP_EMPTY_NOT_EMPTY' type='enum'/>
<exports symbol='XML_DTD_ELEM_NAMESPACE' type='enum'/>
<exports symbol='XML_RNGP_PAT_ATTR_ELEM' type='enum'/>
+ <exports symbol='XML_XINCLUDE_FRAGMENT_ID' type='enum'/>
<exports symbol='XML_IO_NO_INPUT' type='enum'/>
<exports symbol='XML_NS_ERR_UNDEFINED_NAMESPACE' type='enum'/>
<exports symbol='XML_XPATH_INVALID_ARITY' type='enum'/>
@@ -2105,6 +2112,7 @@
<exports symbol='XML_FROM_XPOINTER' type='enum'/>
<exports symbol='XML_ERR_ATTRIBUTE_WITHOUT_VALUE' type='enum'/>
<exports symbol='XML_RNGP_TEXT_HAS_CHILD' type='enum'/>
+ <exports symbol='XML_DTD_ELEM_REDEFINED' type='enum'/>
<exports symbol='XML_SCHEMAV_NOTNILLABLE' type='enum'/>
<exports symbol='XML_SCHEMAP_ELEM_DEFAULT_FIXED' type='enum'/>
<exports symbol='XML_SCHEMAP_UNKNOWN_TYPE' type='enum'/>
@@ -3290,7 +3298,10 @@
<info>Macro defining "include"</info>
</macro>
<macro name='XINCLUDE_NS' file='xinclude'>
- <info>Macro defining the Xinclude namespace: http://www.w3.org/2001/XInclude</info>
+ <info>Macro defining the Xinclude namespace: http://www.w3.org/2003/XInclude</info>
+ </macro>
+ <macro name='XINCLUDE_OLD_NS' file='xinclude'>
+ <info>Macro defining the draft Xinclude namespace: http://www.w3.org/2001/XInclude</info>
</macro>
<macro name='XINCLUDE_PARSE' file='xinclude'>
<info>Macro defining "parse"</info>
@@ -3304,6 +3315,9 @@
<macro name='XINCLUDE_PARSE_XML' file='xinclude'>
<info>Macro defining "xml"</info>
</macro>
+ <macro name='XINCLUDE_PARSE_XPOINTER' file='xinclude'>
+ <info>Macro defining "xpointer"</info>
+ </macro>
<macro name='XMLCALL' file='xmlexports'>
</macro>
<macro name='XMLPUBFUN' file='xmlexports'>
@@ -3729,6 +3743,7 @@
<enum name='XML_DTD_NO_PREFIX' file='xmlerror' value='524' type='xmlParserErrors' info='524'/>
<enum name='XML_DTD_NO_ROOT' file='xmlerror' value='525' type='xmlParserErrors' info='525'/>
<enum name='XML_DTD_ROOT_NAME' file='xmlerror' value='531' type='xmlParserErrors' info='531'/>
+ <enum name='XML_DTD_STANDALONE_DEFAULTED' file='xmlerror' value='538' type='xmlParserErrors' info='538'/>
<enum name='XML_DTD_STANDALONE_WHITE_SPACE' file='xmlerror' value='532' type='xmlParserErrors' info='532'/>
<enum name='XML_DTD_UNKNOWN_ATTRIBUTE' file='xmlerror' value='533' type='xmlParserErrors' info='533'/>
<enum name='XML_DTD_UNKNOWN_ELEM' file='xmlerror' value='534' type='xmlParserErrors' info='534'/>
@@ -4356,10 +4371,12 @@
<enum name='XML_WAR_UNDECLARED_ENTITY' file='xmlerror' value='27' type='xmlParserErrors' info='27'/>
<enum name='XML_WAR_UNKNOWN_VERSION' file='xmlerror' value='97' type='xmlParserErrors' info='97'/>
<enum name='XML_XINCLUDE_BUILD_FAILED' file='xmlerror' value='1609' type='xmlParserErrors' info='1609'/>
+ <enum name='XML_XINCLUDE_DEPRECATED_NS' file='xmlerror' value='1617' type='xmlParserErrors' info='1617'/>
<enum name='XML_XINCLUDE_END' file='tree' value='20' type='xmlElementType'/>
<enum name='XML_XINCLUDE_ENTITY_DEF_MISMATCH' file='xmlerror' value='1602' type='xmlParserErrors' info='1602'/>
<enum name='XML_XINCLUDE_FALLBACKS_IN_INCLUDE' file='xmlerror' value='1615' type='xmlParserErrors' info='1615'/>
<enum name='XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE' file='xmlerror' value='1616' type='xmlParserErrors' info='1616'/>
+ <enum name='XML_XINCLUDE_FRAGMENT_ID' file='xmlerror' value='1618' type='xmlParserErrors' info='1618'/>
<enum name='XML_XINCLUDE_HREF_URI' file='xmlerror' value='1605' type='xmlParserErrors' info='1605'/>
<enum name='XML_XINCLUDE_INCLUDE_IN_INCLUDE' file='xmlerror' value='1614' type='xmlParserErrors' info='1614'/>
<enum name='XML_XINCLUDE_INVALID_CHAR' file='xmlerror' value='1608' type='xmlParserErrors' info='1608'/>
@@ -13551,6 +13568,12 @@
<return type='int' info='0 if no substitution were done, -1 if some processing failed or the number of substitutions done.'/>
<arg name='doc' type='xmlDocPtr' info='an XML document'/>
</function>
+ <function name='xmlXIncludeProcessFlags' file='xinclude'>
+ <info>Implement the XInclude substitution on the XML document @doc</info>
+ <return type='int' info='0 if no substitution were done, -1 if some processing failed or the number of substitutions done.'/>
+ <arg name='doc' type='xmlDocPtr' info='an XML document'/>
+ <arg name='flags' type='int' info='a set of xmlParserOption used for parsing XML includes'/>
+ </function>
<function name='xmlXIncludeProcessNode' file='xinclude'>
<info>Implement the XInclude substitution for the given subtree reusing the informations and data coming from the given context.</info>
<return type='int' info='0 if no substitution were done, -1 if some processing failed or the number of substitutions done.'/>
@@ -13562,6 +13585,18 @@
<return type='int' info='0 if no substitution were done, -1 if some processing failed or the number of substitutions done.'/>
<arg name='tree' type='xmlNodePtr' info='a node in an XML document'/>
</function>
+ <function name='xmlXIncludeProcessTreeFlags' file='xinclude'>
+ <info>Implement the XInclude substitution for the given subtree</info>
+ <return type='int' info='0 if no substitution were done, -1 if some processing failed or the number of substitutions done.'/>
+ <arg name='tree' type='xmlNodePtr' info='a node in an XML document'/>
+ <arg name='flags' type='int' info='a set of xmlParserOption used for parsing XML includes'/>
+ </function>
+ <function name='xmlXIncludeSetFlags' file='xinclude'>
+ <info>Set the flags used for further processing of XML resources.</info>
+ <return type='int' info='0 in case of success and -1 in case of error.'/>
+ <arg name='ctxt' type='xmlXIncludeCtxtPtr' info='an XInclude processing context'/>
+ <arg name='flags' type='int' info='a set of xmlParserOption used for parsing XML includes'/>
+ </function>
<function name='xmlXPathAddValues' file='xpathInternals'>
<info>Implement the add operation on XPath objects: The numeric operators convert their operands to numbers as if by calling the number function.</info>
<return type='void'/>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 3169d24..ef46d22 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -89,10 +89,12 @@
<reference name='XINCLUDE_HREF' href='html/libxml-xinclude.html#XINCLUDE_HREF'/>
<reference name='XINCLUDE_NODE' href='html/libxml-xinclude.html#XINCLUDE_NODE'/>
<reference name='XINCLUDE_NS' href='html/libxml-xinclude.html#XINCLUDE_NS'/>
+ <reference name='XINCLUDE_OLD_NS' href='html/libxml-xinclude.html#XINCLUDE_OLD_NS'/>
<reference name='XINCLUDE_PARSE' href='html/libxml-xinclude.html#XINCLUDE_PARSE'/>
<reference name='XINCLUDE_PARSE_ENCODING' href='html/libxml-xinclude.html#XINCLUDE_PARSE_ENCODING'/>
<reference name='XINCLUDE_PARSE_TEXT' href='html/libxml-xinclude.html#XINCLUDE_PARSE_TEXT'/>
<reference name='XINCLUDE_PARSE_XML' href='html/libxml-xinclude.html#XINCLUDE_PARSE_XML'/>
+ <reference name='XINCLUDE_PARSE_XPOINTER' href='html/libxml-xinclude.html#XINCLUDE_PARSE_XPOINTER'/>
<reference name='XLINK_ACTUATE_AUTO' href='html/libxml-xlink.html#XLINK_ACTUATE_AUTO'/>
<reference name='XLINK_ACTUATE_NONE' href='html/libxml-xlink.html#XLINK_ACTUATE_NONE'/>
<reference name='XLINK_ACTUATE_ONREQUEST' href='html/libxml-xlink.html#XLINK_ACTUATE_ONREQUEST'/>
@@ -210,6 +212,7 @@
<reference name='XML_DTD_NO_PREFIX' href='html/libxml-xmlerror.html#XML_DTD_NO_PREFIX'/>
<reference name='XML_DTD_NO_ROOT' href='html/libxml-xmlerror.html#XML_DTD_NO_ROOT'/>
<reference name='XML_DTD_ROOT_NAME' href='html/libxml-xmlerror.html#XML_DTD_ROOT_NAME'/>
+ <reference name='XML_DTD_STANDALONE_DEFAULTED' href='html/libxml-xmlerror.html#XML_DTD_STANDALONE_DEFAULTED'/>
<reference name='XML_DTD_STANDALONE_WHITE_SPACE' href='html/libxml-xmlerror.html#XML_DTD_STANDALONE_WHITE_SPACE'/>
<reference name='XML_DTD_UNKNOWN_ATTRIBUTE' href='html/libxml-xmlerror.html#XML_DTD_UNKNOWN_ATTRIBUTE'/>
<reference name='XML_DTD_UNKNOWN_ELEM' href='html/libxml-xmlerror.html#XML_DTD_UNKNOWN_ELEM'/>
@@ -866,10 +869,12 @@
<reference name='XML_WAR_UNDECLARED_ENTITY' href='html/libxml-xmlerror.html#XML_WAR_UNDECLARED_ENTITY'/>
<reference name='XML_WAR_UNKNOWN_VERSION' href='html/libxml-xmlerror.html#XML_WAR_UNKNOWN_VERSION'/>
<reference name='XML_XINCLUDE_BUILD_FAILED' href='html/libxml-xmlerror.html#XML_XINCLUDE_BUILD_FAILED'/>
+ <reference name='XML_XINCLUDE_DEPRECATED_NS' href='html/libxml-xmlerror.html#XML_XINCLUDE_DEPRECATED_NS'/>
<reference name='XML_XINCLUDE_END' href='html/libxml-tree.html#XML_XINCLUDE_END'/>
<reference name='XML_XINCLUDE_ENTITY_DEF_MISMATCH' href='html/libxml-xmlerror.html#XML_XINCLUDE_ENTITY_DEF_MISMATCH'/>
<reference name='XML_XINCLUDE_FALLBACKS_IN_INCLUDE' href='html/libxml-xmlerror.html#XML_XINCLUDE_FALLBACKS_IN_INCLUDE'/>
<reference name='XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE' href='html/libxml-xmlerror.html#XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE'/>
+ <reference name='XML_XINCLUDE_FRAGMENT_ID' href='html/libxml-xmlerror.html#XML_XINCLUDE_FRAGMENT_ID'/>
<reference name='XML_XINCLUDE_HREF_URI' href='html/libxml-xmlerror.html#XML_XINCLUDE_HREF_URI'/>
<reference name='XML_XINCLUDE_INCLUDE_IN_INCLUDE' href='html/libxml-xmlerror.html#XML_XINCLUDE_INCLUDE_IN_INCLUDE'/>
<reference name='XML_XINCLUDE_INVALID_CHAR' href='html/libxml-xmlerror.html#XML_XINCLUDE_INVALID_CHAR'/>
@@ -2598,8 +2603,11 @@
<reference name='xmlXIncludeFreeContext' href='html/libxml-xinclude.html#xmlXIncludeFreeContext'/>
<reference name='xmlXIncludeNewContext' href='html/libxml-xinclude.html#xmlXIncludeNewContext'/>
<reference name='xmlXIncludeProcess' href='html/libxml-xinclude.html#xmlXIncludeProcess'/>
+ <reference name='xmlXIncludeProcessFlags' href='html/libxml-xinclude.html#xmlXIncludeProcessFlags'/>
<reference name='xmlXIncludeProcessNode' href='html/libxml-xinclude.html#xmlXIncludeProcessNode'/>
<reference name='xmlXIncludeProcessTree' href='html/libxml-xinclude.html#xmlXIncludeProcessTree'/>
+ <reference name='xmlXIncludeProcessTreeFlags' href='html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags'/>
+ <reference name='xmlXIncludeSetFlags' href='html/libxml-xinclude.html#xmlXIncludeSetFlags'/>
<reference name='xmlXPathAddValues' href='html/libxml-xpathInternals.html#xmlXPathAddValues'/>
<reference name='xmlXPathAxis' href='html/libxml-xpath.html#xmlXPathAxis'/>
<reference name='xmlXPathAxisFunc' href='html/libxml-xpath.html#xmlXPathAxisFunc'/>
@@ -2933,10 +2941,12 @@
<ref name='XINCLUDE_HREF'/>
<ref name='XINCLUDE_NODE'/>
<ref name='XINCLUDE_NS'/>
+ <ref name='XINCLUDE_OLD_NS'/>
<ref name='XINCLUDE_PARSE'/>
<ref name='XINCLUDE_PARSE_ENCODING'/>
<ref name='XINCLUDE_PARSE_TEXT'/>
<ref name='XINCLUDE_PARSE_XML'/>
+ <ref name='XINCLUDE_PARSE_XPOINTER'/>
<ref name='XLINK_ACTUATE_AUTO'/>
<ref name='XLINK_ACTUATE_NONE'/>
<ref name='XLINK_ACTUATE_ONREQUEST'/>
@@ -3054,6 +3064,7 @@
<ref name='XML_DTD_NO_PREFIX'/>
<ref name='XML_DTD_NO_ROOT'/>
<ref name='XML_DTD_ROOT_NAME'/>
+ <ref name='XML_DTD_STANDALONE_DEFAULTED'/>
<ref name='XML_DTD_STANDALONE_WHITE_SPACE'/>
<ref name='XML_DTD_UNKNOWN_ATTRIBUTE'/>
<ref name='XML_DTD_UNKNOWN_ELEM'/>
@@ -3710,10 +3721,12 @@
<ref name='XML_WAR_UNDECLARED_ENTITY'/>
<ref name='XML_WAR_UNKNOWN_VERSION'/>
<ref name='XML_XINCLUDE_BUILD_FAILED'/>
+ <ref name='XML_XINCLUDE_DEPRECATED_NS'/>
<ref name='XML_XINCLUDE_END'/>
<ref name='XML_XINCLUDE_ENTITY_DEF_MISMATCH'/>
<ref name='XML_XINCLUDE_FALLBACKS_IN_INCLUDE'/>
<ref name='XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE'/>
+ <ref name='XML_XINCLUDE_FRAGMENT_ID'/>
<ref name='XML_XINCLUDE_HREF_URI'/>
<ref name='XML_XINCLUDE_INCLUDE_IN_INCLUDE'/>
<ref name='XML_XINCLUDE_INVALID_CHAR'/>
@@ -5478,8 +5491,11 @@
<ref name='xmlXIncludeFreeContext'/>
<ref name='xmlXIncludeNewContext'/>
<ref name='xmlXIncludeProcess'/>
+ <ref name='xmlXIncludeProcessFlags'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='xmlXIncludeProcessTree'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
+ <ref name='xmlXIncludeSetFlags'/>
<ref name='xmlXPathAddValues'/>
<ref name='xmlXPathAxis'/>
<ref name='xmlXPathAxisFunc'/>
@@ -5929,6 +5945,7 @@
<ref name='xmlStringDecodeEntities'/>
<ref name='xmlParseEncName'/>
<ref name='xmlTextReaderPrefix'/>
+ <ref name='xmlDecodeEntities'/>
<ref name='xmlXPathCastNumberToString'/>
<ref name='xmlParseNmtoken'/>
<ref name='xmlTextReaderLocatorBaseURI'/>
@@ -5940,7 +5957,6 @@
<ref name='xmlEncodeSpecialChars'/>
<ref name='xmlURIEscapeStr'/>
<ref name='xmlGetNsProp'/>
- <ref name='xmlDecodeEntities'/>
<ref name='xmlXPathCastNodeToString'/>
<ref name='xmlNamespaceParseNCName'/>
<ref name='xmlCatalogResolveURI'/>
@@ -6008,8 +6024,8 @@
<ref name='xmlSAXParseMemoryWithData'/>
<ref name='xmlSAXParseEntity'/>
<ref name='xmlParseEntity'/>
- <ref name='xmlRecoverDoc'/>
<ref name='xmlSAXParseFileWithData'/>
+ <ref name='xmlRecoverDoc'/>
<ref name='xmlReadDoc'/>
<ref name='xmlReadMemory'/>
<ref name='xmlCtxtReadIO'/>
@@ -6017,13 +6033,13 @@
<ref name='xmlReadFile'/>
<ref name='xmlRecoverFile'/>
<ref name='xmlSAXParseDoc'/>
- <ref name='xmlParseCatalogFile'/>
<ref name='xmlCtxtReadFile'/>
<ref name='xmlCtxtReadFd'/>
<ref name='xmlReadIO'/>
<ref name='xmlCopyDoc'/>
<ref name='xmlCtxtReadMemory'/>
<ref name='xmlReadFd'/>
+ <ref name='xmlParseCatalogFile'/>
<ref name='xmlCtxtReadDoc'/>
<ref name='xmlParseMemory'/>
<ref name='xmlSAXParseFile'/>
@@ -7873,6 +7889,7 @@
<ref name='xmlValidateRoot'/>
<ref name='xmlXIncludeNewContext'/>
<ref name='xmlXIncludeProcess'/>
+ <ref name='xmlXIncludeProcessFlags'/>
<ref name='xmlXPathNewContext'/>
<ref name='xmlXPathOrderDocElems'/>
<ref name='xmlXPtrNewContext'/>
@@ -8252,6 +8269,7 @@
<ref name='xmlValidatePushElement'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='xmlXIncludeProcessTree'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
<ref name='xmlXPathCastNodeToNumber'/>
<ref name='xmlXPathCastNodeToString'/>
<ref name='xmlXPathCmpNodes'/>
@@ -8902,6 +8920,7 @@
<type name='xmlXIncludeCtxtPtr'>
<ref name='xmlXIncludeFreeContext'/>
<ref name='xmlXIncludeProcessNode'/>
+ <ref name='xmlXIncludeSetFlags'/>
</type>
<type name='xmlXPathCompExprPtr'>
<ref name='xmlXPathCompiledEval'/>
@@ -10497,19 +10516,24 @@
</file>
<file name='xinclude'>
<ref name='XINCLUDE_PARSE_TEXT'/>
+ <ref name='XINCLUDE_PARSE_XPOINTER'/>
+ <ref name='xmlXIncludeProcessFlags'/>
<ref name='xmlXIncludeCtxt'/>
<ref name='XINCLUDE_HREF'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='XINCLUDE_FALLBACK'/>
<ref name='XINCLUDE_NS'/>
- <ref name='xmlXIncludeCtxtPtr'/>
+ <ref name='XINCLUDE_PARSE'/>
<ref name='xmlXIncludeProcessTree'/>
<ref name='xmlXIncludeProcess'/>
<ref name='xmlXIncludeFreeContext'/>
- <ref name='XINCLUDE_PARSE'/>
+ <ref name='xmlXIncludeCtxtPtr'/>
<ref name='XINCLUDE_NODE'/>
+ <ref name='xmlXIncludeSetFlags'/>
<ref name='XINCLUDE_PARSE_XML'/>
<ref name='xmlXIncludeNewContext'/>
+ <ref name='XINCLUDE_OLD_NS'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
<ref name='XINCLUDE_PARSE_ENCODING'/>
</file>
<file name='xlink'>
@@ -10743,7 +10767,7 @@
<ref name='XML_XPATH_INVALID_CTXT_POSITION'/>
<ref name='XML_ERR_NOTATION_NOT_FINISHED'/>
<ref name='xmlError'/>
- <ref name='XML_HTML_STRUCURE_ERROR'/>
+ <ref name='XML_DTD_STANDALONE_DEFAULTED'/>
<ref name='XML_DTD_INVALID_DEFAULT'/>
<ref name='XML_DTD_UNKNOWN_ELEM'/>
<ref name='XML_SCHEMAP_REDEFINED_TYPE'/>
@@ -10824,11 +10848,11 @@
<ref name='XML_SCHEMAP_COMPLEXTYPE_NONAME_NOREF'/>
<ref name='XML_SCHEMAP_UNKNOWN_EXTENSION_CHILD'/>
<ref name='XML_RNGP_PAT_START_INTERLEAVE'/>
- <ref name='XML_IO_ENFILE'/>
+ <ref name='XML_HTML_STRUCURE_ERROR'/>
<ref name='XML_SCHEMAV_MISSING'/>
<ref name='XML_RNGP_GRAMMAR_CONTENT'/>
<ref name='XML_XINCLUDE_XPTR_FAILED'/>
- <ref name='XML_DTD_ELEM_REDEFINED'/>
+ <ref name='XML_IO_ENFILE'/>
<ref name='XML_RNGP_PARENTREF_CREATE_FAILED'/>
<ref name='XML_ERR_ENTITY_IS_PARAMETER'/>
<ref name='XML_ERR_RESERVED_XML_NAME'/>
@@ -10916,7 +10940,7 @@
<ref name='XML_RNGP_PAT_DATA_EXCEPT_ATTR'/>
<ref name='XML_FTP_ACCNT'/>
<ref name='XML_FROM_RELAXNGV'/>
- <ref name='XML_RNGP_PAT_START_DATA'/>
+ <ref name='XML_RNGP_REF_NAME_INVALID'/>
<ref name='XML_SCHEMAV_NOTTOPLEVEL'/>
<ref name='XML_IO_ENOENT'/>
<ref name='XML_ERR_NO_DTD'/>
@@ -10966,6 +10990,7 @@
<ref name='XML_WAR_CATALOG_PI'/>
<ref name='XML_SCHEMAP_INVALID_MINOCCURS'/>
<ref name='XML_IO_ENOLCK'/>
+ <ref name='XML_XINCLUDE_DEPRECATED_NS'/>
<ref name='XML_RNGP_CHOICE_EMPTY'/>
<ref name='XML_ERR_LITERAL_NOT_FINISHED'/>
<ref name='xmlSetStructuredErrorFunc'/>
@@ -11038,13 +11063,14 @@
<ref name='xmlCtxtResetLastError'/>
<ref name='XML_IO_EFBIG'/>
<ref name='XML_ERR_NS_DECL_ERROR'/>
- <ref name='XML_RNGP_REF_NAME_INVALID'/>
+ <ref name='XML_RNGP_PAT_START_DATA'/>
<ref name='XML_ERR_ERROR'/>
<ref name='XML_DTD_MISSING_ATTRIBUTE'/>
<ref name='XML_IO_EMFILE'/>
<ref name='XML_RNGP_EMPTY_NOT_EMPTY'/>
<ref name='XML_DTD_ELEM_NAMESPACE'/>
<ref name='XML_RNGP_PAT_ATTR_ELEM'/>
+ <ref name='XML_XINCLUDE_FRAGMENT_ID'/>
<ref name='XML_IO_NO_INPUT'/>
<ref name='XML_NS_ERR_UNDEFINED_NAMESPACE'/>
<ref name='XML_XPATH_INVALID_ARITY'/>
@@ -11074,6 +11100,7 @@
<ref name='XML_FROM_XPOINTER'/>
<ref name='XML_ERR_ATTRIBUTE_WITHOUT_VALUE'/>
<ref name='XML_RNGP_TEXT_HAS_CHILD'/>
+ <ref name='XML_DTD_ELEM_REDEFINED'/>
<ref name='XML_SCHEMAV_NOTNILLABLE'/>
<ref name='XML_SCHEMAP_ELEM_DEFAULT_FIXED'/>
<ref name='XML_SCHEMAP_UNKNOWN_TYPE'/>
@@ -15100,6 +15127,7 @@
<ref name='xmlSetNsProp'/>
<ref name='xmlSetProp'/>
<ref name='xmlSubstituteEntitiesDefault'/>
+ <ref name='xmlXIncludeSetFlags'/>
<ref name='xmlXPtrEvalRangePredicate'/>
</word>
<word name='Sets'>
@@ -15774,11 +15802,15 @@
<word name='XInclude'>
<ref name='LIBXML_XINCLUDE_ENABLED'/>
<ref name='XINCLUDE_NS'/>
+ <ref name='XINCLUDE_OLD_NS'/>
<ref name='xmlXIncludeFreeContext'/>
<ref name='xmlXIncludeNewContext'/>
<ref name='xmlXIncludeProcess'/>
+ <ref name='xmlXIncludeProcessFlags'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='xmlXIncludeProcessTree'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
+ <ref name='xmlXIncludeSetFlags'/>
</word>
<word name='XLINK_TYPE_NONE'>
<ref name='xlinkIsLink'/>
@@ -15906,6 +15938,7 @@
</word>
<word name='Xinclude'>
<ref name='XINCLUDE_NS'/>
+ <ref name='XINCLUDE_OLD_NS'/>
</word>
<word name='Xml'>
<ref name='xmlTextReaderNodeType'/>
@@ -18229,10 +18262,12 @@
<ref name='XINCLUDE_HREF'/>
<ref name='XINCLUDE_NODE'/>
<ref name='XINCLUDE_NS'/>
+ <ref name='XINCLUDE_OLD_NS'/>
<ref name='XINCLUDE_PARSE'/>
<ref name='XINCLUDE_PARSE_ENCODING'/>
<ref name='XINCLUDE_PARSE_TEXT'/>
<ref name='XINCLUDE_PARSE_XML'/>
+ <ref name='XINCLUDE_PARSE_XPOINTER'/>
<ref name='xmlGetID'/>
<ref name='xmlReconciliateNs'/>
<ref name='xmlShellDu'/>
@@ -18705,6 +18740,9 @@
<ref name='xmlGetBufferAllocationScheme'/>
<ref name='xmlSetBufferAllocationScheme'/>
</word>
+ <word name='draft'>
+ <ref name='XINCLUDE_OLD_NS'/>
+ </word>
<word name='drop'>
<ref name='xmlFileRead'/>
<ref name='xmlIOFTPRead'/>
@@ -19320,8 +19358,10 @@
<ref name='xmlRemoveRef'/>
<ref name='xmlShellLoad'/>
<ref name='xmlXIncludeProcess'/>
+ <ref name='xmlXIncludeProcessFlags'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='xmlXIncludeProcessTree'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
<ref name='xmlXPathCompareValues'/>
</word>
<word name='fails'>
@@ -19527,6 +19567,7 @@
<ref name='xmlReaderNewFile'/>
<ref name='xmlReaderNewIO'/>
<ref name='xmlReaderNewMemory'/>
+ <ref name='xmlXIncludeSetFlags'/>
</word>
<word name='flat'>
<ref name='xmlStringGetNodeList'/>
@@ -19750,6 +19791,7 @@
<ref name='xmlStopParser'/>
<ref name='xmlValidCtxtNormalizeAttributeValue'/>
<ref name='xmlValidNormalizeAttributeValue'/>
+ <ref name='xmlXIncludeSetFlags'/>
</word>
</letter>
</chunk>
@@ -20161,6 +20203,7 @@
</word>
<word name='http:'>
<ref name='XINCLUDE_NS'/>
+ <ref name='XINCLUDE_OLD_NS'/>
<ref name='getSystemId'/>
<ref name='xmlC14NDocDumpMemory'/>
<ref name='xmlC14NDocSave'/>
@@ -20331,6 +20374,9 @@
<ref name='_xmlSchema'/>
<ref name='xmlCleanupInputCallbacks'/>
<ref name='xmlCleanupOutputCallbacks'/>
+ <ref name='xmlXIncludeProcessFlags'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
+ <ref name='xmlXIncludeSetFlags'/>
</word>
<word name='including'>
<ref name='attribute'/>
@@ -21711,6 +21757,7 @@
</word>
<word name='namespace:'>
<ref name='XINCLUDE_NS'/>
+ <ref name='XINCLUDE_OLD_NS'/>
<ref name='xmlParseAttribute'/>
<ref name='xmlParseStartTag'/>
</word>
@@ -22316,6 +22363,7 @@
</word>
<word name='org'>
<ref name='XINCLUDE_NS'/>
+ <ref name='XINCLUDE_OLD_NS'/>
<ref name='xmlC14NDocDumpMemory'/>
<ref name='xmlC14NDocSave'/>
<ref name='xmlC14NDocSaveTo'/>
@@ -22932,33 +22980,6 @@
<ref name='xmlTextReaderRelaxNGSetSchema'/>
<ref name='xmlTextReaderRelaxNGValidate'/>
</word>
- <word name='processing'>
- <ref name='HTML_PI_NODE'/>
- <ref name='entityDecl'/>
- <ref name='entityDeclSAXFunc'/>
- <ref name='htmlInitAutoClose'/>
- <ref name='processingInstruction'/>
- <ref name='processingInstructionSAXFunc'/>
- <ref name='xmlCleanupParser'/>
- <ref name='xmlCleanupThreads'/>
- <ref name='xmlGetProp'/>
- <ref name='xmlInitCharEncodingHandlers'/>
- <ref name='xmlInitParser'/>
- <ref name='xmlListReverseWalk'/>
- <ref name='xmlListWalk'/>
- <ref name='xmlNewPI'/>
- <ref name='xmlParseAttValue'/>
- <ref name='xmlParsePI'/>
- <ref name='xmlSAX2EntityDecl'/>
- <ref name='xmlSAX2ProcessingInstruction'/>
- <ref name='xmlStopParser'/>
- <ref name='xmlTextReaderSetParserProp'/>
- <ref name='xmlValidateOneAttribute'/>
- <ref name='xmlValidateOneNamespace'/>
- <ref name='xmlXIncludeProcess'/>
- <ref name='xmlXIncludeProcessNode'/>
- <ref name='xmlXIncludeProcessTree'/>
- </word>
<word name='processing-instruction'>
<ref name='xmlXPathIsNodeType'/>
</word>
@@ -23790,6 +23811,7 @@
<ref name='xmlSchemaFreeParserCtxt'/>
<ref name='xmlSchemaFreeValidCtxt'/>
<ref name='xmlTextReaderClose'/>
+ <ref name='xmlXIncludeSetFlags'/>
</word>
<word name='respecting'>
<ref name='xmlValidGetValidElements'/>
@@ -24382,8 +24404,10 @@
<ref name='xmlTextReaderSetParserProp'/>
<ref name='xmlValidatePushCData'/>
<ref name='xmlXIncludeProcess'/>
+ <ref name='xmlXIncludeProcessFlags'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='xmlXIncludeProcessTree'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
</word>
<word name='somewhat'>
<ref name='xmlCheckLanguageID'/>
@@ -24890,15 +24914,19 @@
<ref name='xmlStringLenDecodeEntities'/>
<ref name='xmlSubstituteEntitiesDefault'/>
<ref name='xmlXIncludeProcess'/>
+ <ref name='xmlXIncludeProcessFlags'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='xmlXIncludeProcessTree'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
</word>
<word name='substitutions'>
<ref name='xmlStringDecodeEntities'/>
<ref name='xmlStringLenDecodeEntities'/>
<ref name='xmlXIncludeProcess'/>
+ <ref name='xmlXIncludeProcessFlags'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='xmlXIncludeProcessTree'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
</word>
<word name='substring'>
<ref name='xmlNodeAddContent'/>
@@ -24931,6 +24959,7 @@
<ref name='xmlValidateElement'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='xmlXIncludeProcessTree'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
</word>
<word name='succeeded'>
<ref name='xmlHashAddEntry'/>
@@ -25963,8 +25992,10 @@
<ref name='xmlKeepBlanksDefault'/>
<ref name='xmlMemShow'/>
<ref name='xmlXIncludeProcess'/>
+ <ref name='xmlXIncludeProcessFlags'/>
<ref name='xmlXIncludeProcessNode'/>
<ref name='xmlXIncludeProcessTree'/>
+ <ref name='xmlXIncludeProcessTreeFlags'/>
</word>
<word name='wether'>
<ref name='_xmlNodeSet'/>
@@ -26129,6 +26160,7 @@
</word>
<word name='www'>
<ref name='XINCLUDE_NS'/>
+ <ref name='XINCLUDE_OLD_NS'/>
<ref name='getSystemId'/>
<ref name='xmlC14NDocDumpMemory'/>
<ref name='xmlC14NDocSave'/>
@@ -27031,6 +27063,9 @@
<ref name='xmlShellPrintXPathError'/>
<ref name='xmlShellPrintXPathResult'/>
</word>
+ <word name='xpointer'>
+ <ref name='XINCLUDE_PARSE_XPOINTER'/>
+ </word>
</letter>
</chunk>
<chunk name='chunk26'>
diff --git a/include/libxml/xinclude.h b/include/libxml/xinclude.h
index 8c26e91..880a280 100644
--- a/include/libxml/xinclude.h
+++ b/include/libxml/xinclude.h
@@ -2,8 +2,8 @@
* Summary: implementation of XInclude
* Description: API to handle XInclude processing,
* implements the
- * World Wide Web Consortium Working Draft 26 October 2000
- * http://www.w3.org/TR/2000/WD-xinclude-20001026
+ * World Wide Web Consortium Last Call Working Draft 10 November 2003
+ * http://www.w3.org/TR/2003/WD-xinclude-20031110
*
* Copy: See Copyright for the status of this software.
*
@@ -90,12 +90,21 @@
XMLPUBFUN int XMLCALL
xmlXIncludeProcess (xmlDocPtr doc);
XMLPUBFUN int XMLCALL
+ xmlXIncludeProcessFlags (xmlDocPtr doc,
+ int flags);
+XMLPUBFUN int XMLCALL
xmlXIncludeProcessTree (xmlNodePtr tree);
+XMLPUBFUN int XMLCALL
+ xmlXIncludeProcessTreeFlags(xmlNodePtr tree,
+ int flags);
/*
* contextual processing
*/
XMLPUBFUN xmlXIncludeCtxtPtr XMLCALL
xmlXIncludeNewContext (xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+ xmlXIncludeSetFlags (xmlXIncludeCtxtPtr ctxt,
+ int flags);
XMLPUBFUN void XMLCALL
xmlXIncludeFreeContext (xmlXIncludeCtxtPtr ctxt);
XMLPUBFUN int XMLCALL
diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h
index 8a4fd7a..46d93c4 100644
--- a/include/libxml/xmlerror.h
+++ b/include/libxml/xmlerror.h
@@ -465,6 +465,7 @@
XML_XINCLUDE_FALLBACKS_IN_INCLUDE, /* 1615 */
XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE, /* 1616 */
XML_XINCLUDE_DEPRECATED_NS, /* 1617 */
+ XML_XINCLUDE_FRAGMENT_ID, /* 1618 */
XML_CATALOG_MISSING_ATTR = 1650,
XML_CATALOG_ENTRY_BROKEN, /* 1651 */
XML_CATALOG_PREFER_VALUE, /* 1652 */
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index 271dbeb..8eab930 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -488,6 +488,7 @@
# functions from module xinclude
xincludeProcessTree()
+ xincludeProcessTreeFlags()
# functions from module xpath
xpathCastNodeToNumber()
@@ -616,6 +617,7 @@
# functions from module xinclude
xincludeProcess()
+ xincludeProcessFlags()
# functions from module xmlreader
NewWalker()
diff --git a/result/XInclude/docids.xml.err b/result/XInclude/docids.xml.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/result/XInclude/docids.xml.err
diff --git a/result/XInclude/fallback.xml.err b/result/XInclude/fallback.xml.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/result/XInclude/fallback.xml.err
diff --git a/result/XInclude/include.xml.err b/result/XInclude/include.xml.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/result/XInclude/include.xml.err
diff --git a/result/XInclude/nodes.xml.err b/result/XInclude/nodes.xml.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/result/XInclude/nodes.xml.err
diff --git a/result/XInclude/nodes2.xml b/result/XInclude/nodes2.xml
new file mode 100644
index 0000000..a515a57
--- /dev/null
+++ b/result/XInclude/nodes2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<x xmlns:xinclude="http://www.w3.org/2003/XInclude">
+ <!-- Simple test of including a set of nodes from an XML document -->
+ <doc xml:base="test/XInclude/ents/something.xml">
+<p>something</p>
+<p>really</p>
+<p>simple</p>
+</doc>
+</x>
diff --git a/result/XInclude/nodes2.xml.err b/result/XInclude/nodes2.xml.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/result/XInclude/nodes2.xml.err
diff --git a/result/XInclude/nodes2.xml.rdr b/result/XInclude/nodes2.xml.rdr
new file mode 100644
index 0000000..b4978c0
--- /dev/null
+++ b/result/XInclude/nodes2.xml.rdr
@@ -0,0 +1,28 @@
+0 1 x 0 0
+1 14 #text 0 1
+
+1 8 #comment 0 1 Simple test of including a set of nodes from an XML document
+1 14 #text 0 1
+
+1 1 doc 0 0
+2 14 #text 0 1
+
+2 1 p 0 0
+3 3 #text 0 1 something
+2 15 p 0 0
+2 14 #text 0 1
+
+2 1 p 0 0
+3 3 #text 0 1 really
+2 15 p 0 0
+2 14 #text 0 1
+
+2 1 p 0 0
+3 3 #text 0 1 simple
+2 15 p 0 0
+2 14 #text 0 1
+
+1 15 doc 0 0
+1 14 #text 0 1
+
+0 15 x 0 0
diff --git a/result/XInclude/nodes3.xml b/result/XInclude/nodes3.xml
new file mode 100644
index 0000000..9ab2044
--- /dev/null
+++ b/result/XInclude/nodes3.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<x xmlns:xinclude="http://www.w3.org/2003/XInclude">
+ <!-- Simple test of including a set of nodes from an XML document -->
+ <xinclude:include href="../ents/something.xml#xpointer(//p)"/>
+</x>
diff --git a/result/XInclude/nodes3.xml.err b/result/XInclude/nodes3.xml.err
new file mode 100644
index 0000000..fb11525
--- /dev/null
+++ b/result/XInclude/nodes3.xml.err
@@ -0,0 +1 @@
+./test/XInclude/docs/nodes3.xml:3: element include: XInclude error : Invalid fragment identifier in URI test/XInclude/ents/something.xml#xpointer(//p) use the xpointer attribute
diff --git a/result/XInclude/nodes3.xml.rdr b/result/XInclude/nodes3.xml.rdr
new file mode 100644
index 0000000..f2ae87b
--- /dev/null
+++ b/result/XInclude/nodes3.xml.rdr
@@ -0,0 +1,10 @@
+0 1 x 0 0
+1 14 #text 0 1
+
+1 8 #comment 0 1 Simple test of including a set of nodes from an XML document
+1 14 #text 0 1
+
+1 1 xinclude:include 1 0
+1 14 #text 0 1
+
+0 15 x 0 0
diff --git a/result/XInclude/recursive.xml.err b/result/XInclude/recursive.xml.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/result/XInclude/recursive.xml.err
diff --git a/result/XInclude/tstencoding.xml.err b/result/XInclude/tstencoding.xml.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/result/XInclude/tstencoding.xml.err
diff --git a/result/XInclude/txtinclude.xml.err b/result/XInclude/txtinclude.xml.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/result/XInclude/txtinclude.xml.err
diff --git a/test/XInclude/docs/nodes2.xml b/test/XInclude/docs/nodes2.xml
new file mode 100644
index 0000000..32f8cfe
--- /dev/null
+++ b/test/XInclude/docs/nodes2.xml
@@ -0,0 +1,4 @@
+<x xmlns:xinclude="http://www.w3.org/2003/XInclude">
+ <!-- Simple test of including a set of nodes from an XML document -->
+ <xinclude:include href="../ents/something.xml" xpointer="xpointer(//p)"/>
+</x>
diff --git a/test/XInclude/docs/nodes3.xml b/test/XInclude/docs/nodes3.xml
new file mode 100644
index 0000000..355c548
--- /dev/null
+++ b/test/XInclude/docs/nodes3.xml
@@ -0,0 +1,4 @@
+<x xmlns:xinclude="http://www.w3.org/2003/XInclude">
+ <!-- Simple test of including a set of nodes from an XML document -->
+ <xinclude:include href="../ents/something.xml#xpointer(//p)"/>
+</x>
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index ab92f21..705c2ba 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -2315,11 +2315,20 @@
xmlXIncludeProcess
#endif
#ifdef LIBXML_XINCLUDE_ENABLED
+xmlXIncludeProcessFlags
+#endif
+#ifdef LIBXML_XINCLUDE_ENABLED
xmlXIncludeProcessNode
#endif
#ifdef LIBXML_XINCLUDE_ENABLED
xmlXIncludeProcessTree
#endif
+#ifdef LIBXML_XINCLUDE_ENABLED
+xmlXIncludeProcessTreeFlags
+#endif
+#ifdef LIBXML_XINCLUDE_ENABLED
+xmlXIncludeSetFlags
+#endif
#ifdef LIBXML_XPATH_ENABLED
xmlXPathAddValues
#endif
diff --git a/xinclude.c b/xinclude.c
index d7dc130..3bfbc72 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -1,8 +1,8 @@
/*
* xinclude.c : Code to implement XInclude processing
*
- * World Wide Web Consortium W3C Last Call Working Draft 16 May 2001
- * http://www.w3.org/TR/2001/WD-xinclude-20010516/
+ * World Wide Web Consortium W3C Last Call Working Draft 10 November 2003
+ * http://www.w3.org/TR/2003/WD-xinclude-20031110
*
* See Copyright for the status of this software.
*
@@ -79,6 +79,7 @@
int nbErrors; /* the number of errors detected */
int legacy; /* using XINCLUDE_OLD_NS */
+ int parseFlags; /* the flags used for parsing XML documents */
};
static int
@@ -404,17 +405,39 @@
* parse an document for XInclude
*/
static xmlDocPtr
-xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt ATTRIBUTE_UNUSED, const char *URL) {
+xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt, const char *URL) {
xmlDocPtr ret;
xmlParserCtxtPtr pctxt;
char *directory = NULL;
+ xmlParserInputPtr inputStream;
xmlInitParser();
- pctxt = xmlCreateFileParserCtxt(URL);
+ pctxt = xmlNewParserCtxt();
if (pctxt == NULL) {
+ xmlXIncludeErrMemory(ctxt, NULL, "cannot allocate parser context");
return(NULL);
}
+ /*
+ * try to ensure that the new document included are actually
+ * built with the same dictionary as the including document.
+ */
+ if ((ctxt->doc != NULL) && (ctxt->doc->dict != NULL) &&
+ (pctxt->dict != NULL)) {
+ xmlDictFree(pctxt->dict);
+ pctxt->dict = ctxt->doc->dict;
+ xmlDictReference(pctxt->dict);
+ }
+
+ xmlCtxtUseOptions(pctxt, ctxt->parseFlags | XML_PARSE_DTDLOAD);
+
+ inputStream = xmlLoadExternalEntity(URL, NULL, pctxt);
+ if (inputStream == NULL) {
+ xmlFreeParserCtxt(pctxt);
+ return(NULL);
+ }
+
+ inputPush(pctxt, inputStream);
if ((pctxt->directory == NULL) && (directory == NULL))
directory = xmlParserGetDirectory(URL);
@@ -432,6 +455,8 @@
xmlFreeDoc(pctxt->myDoc);
pctxt->myDoc = NULL;
}
+ if ((pctxt->myDoc != NULL) && (pctxt->dict == pctxt->myDoc->dict))
+ xmlDictReference(pctxt->dict);
xmlFreeParserCtxt(pctxt);
return(ret);
@@ -529,6 +554,7 @@
"failed build URL\n", NULL);
return(-1);
}
+ fragment = xmlXIncludeGetProp(ctxt, cur, XINCLUDE_PARSE_XPOINTER);
/*
* Check the URL and remove any fragment identifier
@@ -537,10 +563,29 @@
if (uri == NULL) {
xmlXIncludeErr(ctxt, cur, XML_XINCLUDE_HREF_URI,
"invalid value URI %s\n", URI);
+ if (fragment != NULL)
+ xmlFree(fragment);
+ xmlFree(URI);
return(-1);
}
+
if (uri->fragment != NULL) {
- fragment = (xmlChar *) uri->fragment;
+ if (ctxt->legacy != 0) {
+ if (fragment == NULL) {
+ fragment = (xmlChar *) uri->fragment;
+ } else {
+ xmlFree(uri->fragment);
+ }
+ } else {
+ xmlXIncludeErr(ctxt, cur, XML_XINCLUDE_FRAGMENT_ID,
+ "Invalid fragment identifier in URI %s use the xpointer attribute\n",
+ URI);
+ if (fragment != NULL)
+ xmlFree(fragment);
+ xmlFreeURI(uri);
+ xmlFree(URI);
+ return(-1);
+ }
uri->fragment = NULL;
}
URL = xmlSaveUri(uri);
@@ -1972,6 +2017,7 @@
xmlXIncludeWarn(ctxt, node, XML_XINCLUDE_DEPRECATED_NS,
"Deprecated XInclude namespace found, use %s",
XINCLUDE_NS);
+ ctxt->legacy = 1;
}
}
if (xmlStrEqual(node->name, XINCLUDE_NODE)) {
@@ -2105,8 +2151,26 @@
}
/**
- * xmlXIncludeProcess:
+ * xmlXIncludeSetFlags:
+ * @ctxt: an XInclude processing context
+ * @flags: a set of xmlParserOption used for parsing XML includes
+ *
+ * Set the flags used for further processing of XML resources.
+ *
+ * Returns 0 in case of success and -1 in case of error.
+ */
+int
+xmlXIncludeSetFlags(xmlXIncludeCtxtPtr ctxt, int flags) {
+ if (ctxt == NULL)
+ return(-1);
+ ctxt->parseFlags = flags;
+ return(0);
+}
+
+/**
+ * xmlXIncludeProcessFlags:
* @doc: an XML document
+ * @flags: a set of xmlParserOption used for parsing XML includes
*
* Implement the XInclude substitution on the XML document @doc
*
@@ -2114,7 +2178,7 @@
* or the number of substitutions done.
*/
int
-xmlXIncludeProcess(xmlDocPtr doc) {
+xmlXIncludeProcessFlags(xmlDocPtr doc, int flags) {
xmlXIncludeCtxtPtr ctxt;
xmlNodePtr tree;
int ret = 0;
@@ -2127,6 +2191,7 @@
ctxt = xmlXIncludeNewContext(doc);
if (ctxt == NULL)
return(-1);
+ xmlXIncludeSetFlags(ctxt, flags);
ret = xmlXIncludeDoProcess(ctxt, doc, tree);
if ((ret >= 0) && (ctxt->nbErrors > 0))
ret = -1;
@@ -2136,6 +2201,49 @@
}
/**
+ * xmlXIncludeProcess:
+ * @doc: an XML document
+ *
+ * Implement the XInclude substitution on the XML document @doc
+ *
+ * Returns 0 if no substitution were done, -1 if some processing failed
+ * or the number of substitutions done.
+ */
+int
+xmlXIncludeProcess(xmlDocPtr doc) {
+ return(xmlXIncludeProcessFlags(doc, 0));
+}
+
+/**
+ * xmlXIncludeProcessTreeFlags:
+ * @tree: a node in an XML document
+ * @flags: a set of xmlParserOption used for parsing XML includes
+ *
+ * Implement the XInclude substitution for the given subtree
+ *
+ * Returns 0 if no substitution were done, -1 if some processing failed
+ * or the number of substitutions done.
+ */
+int
+xmlXIncludeProcessTreeFlags(xmlNodePtr tree, int flags) {
+ xmlXIncludeCtxtPtr ctxt;
+ int ret = 0;
+
+ if ((tree == NULL) || (tree->doc == NULL))
+ return(-1);
+ ctxt = xmlXIncludeNewContext(tree->doc);
+ if (ctxt == NULL)
+ return(-1);
+ xmlXIncludeSetFlags(ctxt, flags);
+ ret = xmlXIncludeDoProcess(ctxt, tree->doc, tree);
+ if ((ret >= 0) && (ctxt->nbErrors > 0))
+ ret = -1;
+
+ xmlXIncludeFreeContext(ctxt);
+ return(ret);
+}
+
+/**
* xmlXIncludeProcessTree:
* @tree: a node in an XML document
*
@@ -2146,20 +2254,7 @@
*/
int
xmlXIncludeProcessTree(xmlNodePtr tree) {
- xmlXIncludeCtxtPtr ctxt;
- int ret = 0;
-
- if ((tree == NULL) || (tree->doc == NULL))
- return(-1);
- ctxt = xmlXIncludeNewContext(tree->doc);
- if (ctxt == NULL)
- return(-1);
- ret = xmlXIncludeDoProcess(ctxt, tree->doc, tree);
- if ((ret >= 0) && (ctxt->nbErrors > 0))
- ret = -1;
-
- xmlXIncludeFreeContext(ctxt);
- return(ret);
+ return(xmlXIncludeProcessTreeFlags(tree, 0));
}
/**
diff --git a/xmllint.c b/xmllint.c
index 37dc72e..106c362 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -1007,7 +1007,7 @@
if ((timing) && (!repeat)) {
startTimer();
}
- xmlXIncludeProcess(doc);
+ xmlXIncludeProcessFlags(doc, options);
if ((timing) && (!repeat)) {
endTimer("Xinclude processing");
}
diff --git a/xmlreader.c b/xmlreader.c
index bbba459..485859e 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -156,6 +156,7 @@
xmlPatternPtr *patternTab; /* array of preserve patterns */
#endif
int preserves; /* level of preserves */
+ int parserFlags; /* the set of options set */
};
#define NODE_IS_EMPTY 0x1
@@ -1368,6 +1369,7 @@
(xmlStrEqual(reader->node->ns->href, XINCLUDE_OLD_NS)))) {
if (reader->xincctxt == NULL) {
reader->xincctxt = xmlXIncludeNewContext(reader->ctxt->myDoc);
+ xmlXIncludeSetFlags(reader->xincctxt, reader->parserFlags);
}
/*
* expand that node and process it
@@ -4032,6 +4034,7 @@
reader->doc = NULL;
reader->entNr = 0;
+ reader->parserFlags = options;
reader->validate = XML_TEXTREADER_NOT_VALIDATE;
if ((input != NULL) && (reader->input != NULL) &&
(reader->allocs & XML_TEXTREADER_INPUT)) {