shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-02-24 05:57:54 +03:00
Code

augmented the XInclude API to be able to pass XML parser flags down to the

Browse Source 
* 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
This commit is contained in:
Daniel Veillard 2003-12-09 11:35:37 +00:00
parent b5fa02085e
commit e74d2e1cb8
45 changed files with 421 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -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

14
Makefile.am
View File

@ -405,14 +405,15 @@ XIncludetests : xmllint$(EXEEXT)
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 @@ XIncludetests : xmllint$(EXEEXT)
$(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)

3
doc/APIchunk11.html
View File

@ -171,10 +171,12 @@ A:link, A:visited, A:active { text-decoration: underline }
<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 @@ A:link, A:visited, A:active { text-decoration: underline }
</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 />

4
doc/APIchunk13.html
View File

@ -56,8 +56,10 @@ A:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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>

1
doc/APIchunk14.html
View File

@ -314,6 +314,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<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 />

3
doc/APIchunk15.html
View File

@ -134,6 +134,9 @@ A:link, A:visited, A:active { text-decoration: underline }
</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 />

1
doc/APIchunk18.html
View File

@ -46,6 +46,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<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 />

1
doc/APIchunk19.html
View File

@ -224,6 +224,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<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 />

25
doc/APIchunk20.html
View File

@ -358,31 +358,6 @@ A:link, A:visited, A:active { text-decoration: underline }
<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 />

1
doc/APIchunk21.html
View File

@ -463,6 +463,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<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 />

7
doc/APIchunk22.html
View File

@ -332,8 +332,10 @@ A:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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 />

3
doc/APIchunk24.html
View File

@ -297,8 +297,10 @@ A:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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 />

1
doc/APIchunk25.html
View File

@ -456,6 +456,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<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>

1
doc/APIchunk6.html
View File

@ -339,6 +339,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<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 />

5
doc/APIchunk8.html
View File

@ -122,11 +122,15 @@ A:link, A:visited, A:active { text-decoration: underline }
</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:link, A:visited, A:active { text-decoration: underline }
<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 />

6
doc/APIconstructors.html
View File

@ -178,6 +178,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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 />

22
doc/APIfiles.html
View File

@ -1407,19 +1407,24 @@ A:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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 />

3
doc/APIfunctions.html
View File

@ -1368,6 +1368,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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 />

8
doc/APIsymbols.html
View File

@ -95,10 +95,12 @@ A:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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:link, A:visited, A:active { text-decoration: underline }
<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 />

19
doc/html/libxml-xinclude.html
View File

File diff suppressed because one or more lines are too long

3
doc/html/libxml-xmlerror.html
View File

@ -228,6 +228,7 @@ void <a href="#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> (void * userD
<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 @@ void <a href="#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> (void * userD
<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

57
doc/libxml2-api.xml
View File

@ -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 &quot;include&quot;</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 &quot;parse&quot;</info>
@ -3304,6 +3315,9 @@
<macro name='XINCLUDE_PARSE_XML' file='xinclude'>
<info>Macro defining &quot;xml&quot;</info>
</macro>
<macro name='XINCLUDE_PARSE_XPOINTER' file='xinclude'>
<info>Macro defining &quot;xpointer&quot;</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 @@ actually an xmlCharEncoding'/>
<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 @@ actually an xmlCharEncoding'/>
<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'/>

109
doc/libxml2-refs.xml
View File

@ -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'>

13
include/libxml/xinclude.h
View File

@ -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.
*
@ -89,13 +89,22 @@ typedef xmlXIncludeCtxt *xmlXIncludeCtxtPtr;
*/
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

1
include/libxml/xmlerror.h
View File

@ -465,6 +465,7 @@ typedef enum {
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 */

2
python/libxml2class.txt
View File

@ -488,6 +488,7 @@ Class xmlNode(xmlCore)
# functions from module xinclude
xincludeProcessTree()
xincludeProcessTreeFlags()
# functions from module xpath
xpathCastNodeToNumber()
@ -616,6 +617,7 @@ Class xmlDoc(xmlNode)
# functions from module xinclude
xincludeProcess()
xincludeProcessFlags()
# functions from module xmlreader
NewWalker()

0
result/XInclude/docids.xml.err Normal file
View File

0
result/XInclude/fallback.xml.err Normal file
View File

0
result/XInclude/include.xml.err Normal file
View File

0
result/XInclude/nodes.xml.err Normal file
View File

9
result/XInclude/nodes2.xml Normal file
View File

@ -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>

0
result/XInclude/nodes2.xml.err Normal file
View File

28
result/XInclude/nodes2.xml.rdr Normal file
View File

@ -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

5
result/XInclude/nodes3.xml Normal file
View File

@ -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>

1
result/XInclude/nodes3.xml.err Normal file
View File

@ -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

10
result/XInclude/nodes3.xml.rdr Normal file
View File

@ -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

0
result/XInclude/recursive.xml.err Normal file
View File

0
result/XInclude/tstencoding.xml.err Normal file
View File

0
result/XInclude/txtinclude.xml.err Normal file
View File

4
test/XInclude/docs/nodes2.xml Normal file
View File

@ -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>

4
test/XInclude/docs/nodes3.xml Normal file
View File

@ -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>

9
win32/libxml2.def.src
View File

@ -2315,11 +2315,20 @@ xmlXIncludeNewContext
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

137
xinclude.c
View File

@ -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 @@ struct _xmlXIncludeCtxt {
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 @@ xmlXIncludeFreeContext(xmlXIncludeCtxtPtr ctxt) {
* 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 @@ xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt ATTRIBUTE_UNUSED, const char *URL)
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 @@ xmlXIncludeAddNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur) {
"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 @@ xmlXIncludeAddNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur) {
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 @@ xmlXIncludeTestNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) {
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 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, xmlNodePtr tree) {
}
/**
* 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 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, xmlNodePtr tree) {
* 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 @@ xmlXIncludeProcess(xmlDocPtr doc) {
ctxt = xmlXIncludeNewContext(doc);
if (ctxt == NULL)
return(-1);
xmlXIncludeSetFlags(ctxt, flags);
ret = xmlXIncludeDoProcess(ctxt, doc, tree);
if ((ret >= 0) && (ctxt->nbErrors > 0))
ret = -1;
@ -2135,6 +2200,49 @@ xmlXIncludeProcess(xmlDocPtr doc) {
return(ret);
}
/**
* 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 @@ xmlXIncludeProcess(xmlDocPtr doc) {
*/
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));
}
/**

2
xmllint.c
View File

@ -1007,7 +1007,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
if ((timing) && (!repeat)) {
startTimer();
}
xmlXIncludeProcess(doc);
xmlXIncludeProcessFlags(doc, options);
if ((timing) && (!repeat)) {
endTimer("Xinclude processing");
}

3
xmlreader.c
View File

@ -156,6 +156,7 @@ struct _xmlTextReader {
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 @@ node_found:
(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 @@ xmlTextReaderSetup(xmlTextReaderPtr reader,
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)) {