diff --git a/ChangeLog b/ChangeLog index 9b2ea40d..6876bfec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 12 16:12:53 CEST 2006 Daniel Veillard + + * xmlschemas.c: applied patch from Marton Illes to fix an allocation + bug in xmlSchemaXPathEvaluate should close #351032 + Mon Aug 7 13:08:46 CEST 2006 Daniel Veillard * xmlschemas.c: applied patch from Bertrand Fritsch to fix a bug in diff --git a/doc/APIchunk0.html b/doc/APIchunk0.html index 4e55d779..1388ad78 100644 --- a/doc/APIchunk0.html +++ b/doc/APIchunk0.html @@ -129,6 +129,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Applies
htmlCtxtUseOptions
xmlCtxtUseOptions
xmlNormalizeURIPath
+xmlXPathCompiledEvalToBoolean
Apply
XML_SCHEMAS_ANYATTR_STRICT
XML_SCHEMAS_ANY_STRICT
Arabic
xmlUCSIsArabic
diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html index 7c9ff725..5b1ea9a3 100644 --- a/doc/APIchunk1.html +++ b/doc/APIchunk1.html @@ -337,7 +337,8 @@ A:link, A:visited, A:active { text-decoration: underline }
Current
_xmlParserCtxt
_xmlParserInput
_xmlValidCtxt
-
Currently
xmlNanoFTPGetConnection
+
Currently
xmlDOMWrapCloneNode
+xmlNanoFTPGetConnection
xmlNanoFTPInit
xmlNanoHTTPInit
xmlTextReaderNextSibling
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 0486624d..b6a2186e 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -105,6 +105,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParserHandleReference
xmlValidCtxtNormalizeAttributeValue
account
xmlSchemaValidateFacetWhtsp
+
acquire
_xmlDOMWrapCtxt
+xmlDOMWrapAcquireNsFunction
act
xmlStreamPush
xmlStreamPushAttr
xmlStreamPushNode
@@ -177,6 +179,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAddChild
xmlAddNextSibling
xmlAddPrevSibling
+xmlDOMWrapCloneNode
xmlDocDumpFormatMemory
xmlDocDumpFormatMemoryEnc
xmlDocFormatDump
@@ -223,7 +226,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAddChildList
xmlAddPrevSibling
xmlAddSibling
-
adoption
xmlDOMWrapCloneNode
affect
xmlKeepBlanksDefault
affiliation
_xmlSchemaElement
afraid
xmlEncodeEntities
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html index 515f882a..dc764d5e 100644 --- a/doc/APIchunk11.html +++ b/doc/APIchunk11.html @@ -190,7 +190,8 @@ A:link, A:visited, A:active { text-decoration: underline }
boundary
xmlParseElementChildrenContentDecl
xmlParseElementMixedContentDecl
bracket
xmlParseCharData
-
branch
xmlDOMWrapRemoveNode
+
branch
xmlDOMWrapCloneNode
+xmlDOMWrapRemoveNode
break
_xmlError
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html index 1c552b14..2b4a64e0 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -269,6 +269,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCleanupOutputCallbacks
client
xmlKeepBlanksDefault
clone
xmlDOMWrapCloneNode
+
cloned
xmlDOMWrapCloneNode
close
htmlAutoCloseTag
htmlCtxtReadIO
htmlIsAutoClosed
@@ -413,33 +414,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRecoverFile
xmlSAXParseFile
xmlSAXParseFileWithData
-
compiled
LIBXML_AUTOMATA_ENABLED
-LIBXML_EXPR_ENABLED
-LIBXML_LEGACY_ENABLED
-LIBXML_MODULES_ENABLED
-LIBXML_REGEXP_ENABLED
-LIBXML_SCHEMAS_ENABLED
-LIBXML_SCHEMATRON_ENABLED
-LIBXML_TEST_VERSION
-LIBXML_UNICODE_ENABLED
-_xmlSchemaAttribute
-_xmlSchemaElement
-_xmlSchemaFacet
-xmlAutomataCompile
-xmlCheckVersion
-xmlExpDump
-xmlExpMaxToken
-xmlGetLastError
-xmlHasFeature
-xmlPatterncompile
-xmlRegexpCompile
-xmlRegexpExec
-xmlRegexpIsDeterminist
-xmlRegexpPrint
-xmlSaveFile
-xmlSaveFormatFile
-xmlXPathCompiledEval
-xmlXPathDebugDumpCompExpr
compiled-in
xmlCleanupInputCallbacks
xmlCleanupOutputCallbacks
xmlPopInputCallbacks
@@ -703,6 +677,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextWriterWriteDTDExternalEntityContents
contentspec
xmlParseElementContentDecl
xmlParseElementDecl
+
contexts
_xmlDOMWrapCtxt
contextual
xmlRelaxNGGetParserErrors
xmlRelaxNGSetParserErrors
xmlRelaxNGSetParserStructuredErrors
@@ -867,7 +842,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidityWarningFunc
cur
xmlXPathAxisFunc
currently
XML_SCHEMAS_INCLUDING_CONVERT_NS
-xmlDOMWrapCloneNode
xmlGcMemGet
xmlMemBlocks
xmlMemGet
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index 5980cc29..af82134f 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -395,7 +395,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDictReference
xmlDictSize
xmlExpNewCtxt
-
dicts
xmlDOMWrapCloneNode
did
XML_SCHEMAS_TYPE_BLOCK_DEFAULT
xmlTextReaderGetRemainder
xmlTextReaderStandalone
@@ -528,6 +527,7 @@ A:link, A:visited, A:active { text-decoration: underline }
don
XML_SCHEMAS_ANY_LAX
xlinkIsLink
xmlCreatePushParserCtxt
+xmlDOMWrapCloneNode
xmlNewDocNode
xmlNewDocNodeEatName
xmlParseStartTag
diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html index f5134af2..5484f6f0 100644 --- a/doc/APIchunk14.html +++ b/doc/APIchunk14.html @@ -70,6 +70,7 @@ A:link, A:visited, A:active { text-decoration: underline } resolveEntitySAXFunc
xmlSAX2ResolveEntity
elem
XML_SCHEMAS_ELEM_INTERNAL_CHECKED
+
elem-
_xmlDOMWrapCtxt
element-
xmlStreamPushNode
xmlXPathOrderDocElems
element-node
xmlDOMWrapReconcileNamespaces
@@ -234,7 +235,6 @@ A:link, A:visited, A:active { text-decoration: underline }
equal
xmlAddChild
xmlAddNextSibling
xmlAddPrevSibling
-xmlDOMWrapCloneNode
xmlStrEqual
xmlStrQEqual
xmlTextReaderConstName
@@ -290,7 +290,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDocSetRootElement
xmlParseInNodeContext
evaluate
xmlXPathEvalExpr
-
evaluated
xmlXPathEvalPredicate
+
evaluated
xmlXPathCompiledEvalToBoolean
+xmlXPathEvalPredicate
xmlXPathEvaluatePredicateResult
xmlXPtrNewContext
evaluating
xmlXPathEvalPredicate
@@ -382,10 +383,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStreamPush
xmlStreamPushAttr
xmlStreamPushNode
-
experimental
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
-xmlDOMWrapReconcileNamespaces
-xmlDOMWrapRemoveNode
explicitly
xmlSAXDefaultVersion
explored
xmlXPathAxisFunc
exposing
xmlTextReaderRead
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 4ac0a55a..09bad2da 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -398,6 +398,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidCtxtNormalizeAttributeValue
xmlValidNormalizeAttributeValue
xmlXIncludeSetFlags
+
future
_xmlDOMWrapCtxt

A-B C-C D-E diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index 071403e8..9aa76a79 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -434,7 +434,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathFloorFunction
xmlXPathRoundFunction
xmlXPathStringFunction
-
intended
xmlSchemaNewStringValue
+
intended
_xmlDOMWrapCtxt
+xmlSchemaNewStringValue
+
intensively
xmlDOMWrapAdoptNode
+xmlDOMWrapReconcileNamespaces
+xmlDOMWrapRemoveNode
interact
xmlParseExternalID
interface
LIBXML_PATTERN_ENABLED
LIBXML_READER_ENABLED
diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html index 60efc29d..c2eb2af0 100644 --- a/doc/APIchunk18.html +++ b/doc/APIchunk18.html @@ -37,7 +37,8 @@ A:link, A:visited, A:active { text-decoration: underline } w-w x-x y-z -

Letter j:

just
htmlSetMetaEncoding
+

Letter j:

just
_xmlDOMWrapCtxt
+htmlSetMetaEncoding
inputPop
namePop
nodePop
@@ -46,7 +47,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCreateEntitiesTable
xmlCreateEnumeration
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
xmlHandleEntity
xmlNanoFTPInit
xmlNanoHTTPInit
@@ -82,6 +82,7 @@ A:link, A:visited, A:active { text-decoration: underline } _xmlSchemaType
_xmlSchemaWildcard
know
BAD_CAST
+xmlDOMWrapCloneNode
knowledge
htmlAttrAllowed
known
_xmlParserInput
xmlAllocParserInputBuffer
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index 8541fe1a..5bb61215 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -79,6 +79,7 @@ A:link, A:visited, A:active { text-decoration: underline }
manipulation
LIBXML_TREE_ENABLED
many
_xmlParserInput
xmlXPathStringFunction
+
map
_xmlDOMWrapCtxt
maps
xmlTextReaderLookupNamespace
xmlTextWriterWriteDocType
xmlTextWriterWriteProcessingInstruction
@@ -306,7 +307,6 @@ A:link, A:visited, A:active { text-decoration: underline }
most
xmlC14NExecute
xmlGetFeaturesList
move
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
moved
xmlTextReaderMoveToElement
much
xmlReconciliateNs
multi-threaded
xmlSetGenericErrorFunc
diff --git a/doc/APIchunk2.html b/doc/APIchunk2.html index 93faeafb..e771872e 100644 --- a/doc/APIchunk2.html +++ b/doc/APIchunk2.html @@ -74,6 +74,7 @@ A:link, A:visited, A:active { text-decoration: underline } ignorableWhitespaceSAXFunc
resolveEntity
resolveEntitySAXFunc
+xmlDOMWrapAcquireNsFunction
xmlDOMWrapReconcileNamespaces
xmlDOMWrapRemoveNode
xmlDocDumpFormatMemoryEnc
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index ffcf1250..d654a0e9 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -65,6 +65,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlC14NExecute
xmlCopyDoc
xmlCopyNode
+xmlDOMWrapAcquireNsFunction
xmlDocCopyNode
xmlFreeNsList
xmlGetProp
@@ -92,6 +93,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SUBSTITUTE_NONE
XML_SUBSTITUTE_PEREF
XML_SUBSTITUTE_REF
+_xmlDOMWrapCtxt
xmlCreatePushParserCtxt
xmlGetNsList
xmlInitCharEncodingHandlers
@@ -179,7 +181,8 @@ A:link, A:visited, A:active { text-decoration: underline }
nillable
XML_SCHEMAS_ELEM_NILLABLE
xmlExpIsNillable
nod
xmlEntityReferenceFunc
-
node-
xmlDOMWrapRemoveNode
+
node-
_xmlDOMWrapCtxt
+xmlDOMWrapRemoveNode
xmlValidGetValidElements
node-set?
xmlXPathLocalNameFunction
xmlXPathNamespaceURIFunction
@@ -221,7 +224,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathBooleanFunction
none
XML_SCHEMAS_TYPE_VARIETY_ABSENT
getNamespace
-xmlDOMWrapCloneNode
xmlDecodeEntities
xmlGetLastChild
xmlOutputBufferCreateFilename
@@ -260,7 +262,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidNormalizeAttributeValue
xmlXPathNormalizeFunction
normalizing
xmlCurrentChar
-
normally
c
+
normally
_xmlNs
+c
xmlValidityErrorFunc
xmlValidityWarningFunc
notations
_xmlDtd
@@ -279,7 +282,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDOMWrapReconcileNamespaces
ns-references
xmlDOMWrapReconcileNamespaces
xmlDOMWrapRemoveNode
-
nsDef
xmlDOMWrapAdoptNode
+
nsDef
_xmlDOMWrapCtxt
+xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapRemoveNode
null
xmlHashScan3
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html index f503ffe8..7b77dd64 100644 --- a/doc/APIchunk21.html +++ b/doc/APIchunk21.html @@ -212,7 +212,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathNotEqualValues
xmlXPathSubValues
xmlXPathValueFlipSign
-
operations
xmlModuleClose
+
operations
_xmlDOMWrapCtxt
+xmlModuleClose
xmlModuleFree
xmlReconciliateNs
operator
xmlExpParse
diff --git a/doc/APIchunk23.html b/doc/APIchunk23.html index 4a782246..4bfe14f8 100644 --- a/doc/APIchunk23.html +++ b/doc/APIchunk23.html @@ -441,7 +441,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNanoHTTPOpen
xmlNanoHTTPOpenRedir
xmlNanoHTTPReturnCode
-
requested
xmlExternalEntityLoader
+
requested
xmlDOMWrapAcquireNsFunction
+xmlExternalEntityLoader
xmlHasFeature
xmlIsID
xmlMallocFunc
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html index 6ac493b1..778f69a5 100644 --- a/doc/APIchunk24.html +++ b/doc/APIchunk24.html @@ -492,7 +492,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewDocNode
xmlNewDocNodeEatName
xmlTextWriterWriteRawLen
-
specialized
xmlGcMemGet
+
specialized
_xmlDOMWrapCtxt
+xmlGcMemGet
xmlGcMemSetup
specific
XML_CATALOG_PI
_xmlValidCtxt
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html index befc7fa5..59ed59ab 100644 --- a/doc/APIchunk25.html +++ b/doc/APIchunk25.html @@ -96,11 +96,13 @@ A:link, A:visited, A:active { text-decoration: underline }
termination
xmlStrcat
xmlStrdup
terms
xmlBuildRelativeURI
-
test
xmlDOMWrapCloneNode
-xmlParserHandleReference
+
test
xmlParserHandleReference
xmlXPathEqualValues
xmlXPathNotEqualValues
tested
_xmlParserInput
+xmlDOMWrapAdoptNode
+xmlDOMWrapReconcileNamespaces
+xmlDOMWrapRemoveNode
testing
xmlRegexpCompile
text-
xmlStreamPushNode
xmlStreamWantsAnyNode
diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html index be247f26..828659a8 100644 --- a/doc/APIchunk26.html +++ b/doc/APIchunk26.html @@ -101,7 +101,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlHasProp
xmlXPathNextNamespace
unliked
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
unlink
xmlFreeNode
unlinked
xmlAddNextSibling
xmlAddPrevSibling
@@ -263,6 +262,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAS_TYPE_VARIETY_ATOMIC
XML_SCHEMAS_TYPE_VARIETY_LIST
XML_SCHEMAS_TYPE_VARIETY_UNION
+
various
_xmlDOMWrapCtxt
very
_htmlElemDesc
_xmlParserInput
xmlCharEncFirstLine
diff --git a/doc/APIchunk3.html b/doc/APIchunk3.html index b1d3caef..cffe6946 100644 --- a/doc/APIchunk3.html +++ b/doc/APIchunk3.html @@ -305,7 +305,8 @@ A:link, A:visited, A:active { text-decoration: underline }
Instruction
xmlParsePI
Instuction
XML_CATALOG_PI
Intended
xmlSnprintfElementContent
-
Internal
xmlParseMarkupDecl
+
Internal
_xmlDOMWrapCtxt
+xmlParseMarkupDecl

A-B C-C D-E diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html index 561a7437..b3c8364d 100644 --- a/doc/APIchunk4.html +++ b/doc/APIchunk4.html @@ -200,6 +200,9 @@ A:link, A:visited, A:active { text-decoration: underline }

NOTE:
_xmlParserInput
htmlSetMetaEncoding
xmlCheckLanguageID
+xmlDOMWrapAdoptNode
+xmlDOMWrapReconcileNamespaces
+xmlDOMWrapRemoveNode
xmlGetProp
xmlInitCharEncodingHandlers
xmlNewChild
@@ -289,35 +292,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseNotationDecl
NotationType
xmlParseEnumeratedType
xmlParseNotationType
-
Note
ftpListCallback
-htmlElementAllowedHere
-xmlAddAttributeDecl
-xmlAutomataNewNegTrans
-xmlCheckUTF8
-xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
-xmlDOMWrapReconcileNamespaces
-xmlDocDumpFormatMemory
-xmlDocDumpFormatMemoryEnc
-xmlDocDumpMemoryEnc
-xmlDocFormatDump
-xmlExpNewOr
-xmlExpNewRange
-xmlExpNewSeq
-xmlHasNsProp
-xmlNanoHTTPContentLength
-xmlNodeDump
-xmlNodeDumpOutput
-xmlParseCharEncoding
-xmlParseEntityRef
-xmlRemoveProp
-xmlSAXDefaultVersion
-xmlSaveFormatFile
-xmlSaveFormatFileEnc
-xmlSchemaValidateFacetWhtsp
-xmlStrncat
-xmlTextReaderSetParserProp
-xmlValidateDtd
Note:
fatalErrorSAXFunc
xmlBuildRelativeURI
xmlCharEncodingOutputFunc
diff --git a/doc/APIchunk5.html b/doc/APIchunk5.html index 3ebc5a88..9a6b23f6 100644 --- a/doc/APIchunk5.html +++ b/doc/APIchunk5.html @@ -67,7 +67,6 @@ A:link, A:visited, A:active { text-decoration: underline }
Open
xmlIOHTTPOpenW
Opens
xmlModuleOpen
OpticalCharacterRecognition
xmlUCSIsOpticalCharacterRecognition
-
Optimize
xmlDOMWrapCloneNode
Optional
_htmlElemDesc
Oriya
xmlUCSIsOriya
Osmanya
xmlUCSIsOsmanya
diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html index 50949e18..ed7c4a2f 100644 --- a/doc/APIchunk7.html +++ b/doc/APIchunk7.html @@ -263,7 +263,6 @@ A:link, A:visited, A:active { text-decoration: underline }
SupplementalMathematicalOperators
xmlUCSIsSupplementalMathematicalOperators
SupplementaryPrivateUseArea-A
xmlUCSIsSupplementaryPrivateUseAreaA
SupplementaryPrivateUseArea-B
xmlUCSIsSupplementaryPrivateUseAreaB
-
Support
xmlDOMWrapCloneNode
Syriac
xmlUCSIsSyriac
System
_xmlNotation
xmlExternalEntityLoader
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html index 82de64be..a980c2f3 100644 --- a/doc/APIchunk8.html +++ b/doc/APIchunk8.html @@ -228,6 +228,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Upgrade
xmlKeepBlanksDefault
Use
XML_COMPLETE_ATTRS
XML_DETECT_IDS
+_xmlDOMWrapCtxt
_xmlParserCtxt
xmlCopyNodeList
xmlGetProp
diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html index 556b273a..4d2a6071 100644 --- a/doc/APIchunk9.html +++ b/doc/APIchunk9.html @@ -72,11 +72,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseVersionNum

Letter W:

W3C
xmlTextReaderSchemaValidate
xmlTextReaderSchemaValidateCtxt
-
WARNING:
xmlDOMWrapAdoptNode
-xmlDOMWrapCloneNode
-xmlDOMWrapReconcileNamespaces
-xmlDOMWrapRemoveNode
-xmlSchemaGetCanonValue
+
WARNING:
xmlSchemaGetCanonValue
xmlSchemaNewStringValue
WFC:
xmlParseAttribute
xmlParseCharRef
@@ -113,6 +109,7 @@ A:link, A:visited, A:active { text-decoration: underline } notationDeclSAXFunc
unparsedEntityDecl
unparsedEntityDeclSAXFunc
+xmlDOMWrapCloneNode
xmlSAX2NotationDecl
xmlSAX2UnparsedEntityDecl
When
xmlHandleEntity
@@ -146,6 +143,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
xmlXIncludeSetFlags
+
XInclude?
xmlDOMWrapCloneNode
XLINK_TYPE_NONE
xlinkIsLink
XML-1
xmlDetectCharEncoding
xmlValidateAttributeDecl
@@ -244,6 +242,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSAXUserParseFile
xmlSetCompressMode
xmlSetDocCompressMode
+
Zlib
LIBXML_ZLIB_ENABLED

A-B C-C D-E diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html index 9e91cfa4..2def8ded 100644 --- a/doc/APIconstructors.html +++ b/doc/APIconstructors.html @@ -422,6 +422,7 @@ A:link, A:visited, A:active { text-decoration: underline }

Type xmlNsPtr:

getNamespace
xmlCopyNamespace
xmlCopyNamespaceList
+xmlDOMWrapAcquireNsFunction
xmlNewGlobalNs
xmlNewNs
xmlSearchNs
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 2a5af4b6..79f127cd 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -651,6 +651,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_WITH_XINCLUDE
XML_WITH_XPATH
XML_WITH_XPTR
+XML_WITH_ZLIB
_xmlParserCtxt
_xmlParserInput
_xmlParserNodeInfo
@@ -1374,6 +1375,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCopyProp
xmlCopyPropList
xmlCreateIntSubset
+xmlDOMWrapAcquireNsFunction
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapCtxt
@@ -3120,6 +3122,7 @@ A:link, A:visited, A:active { text-decoration: underline } LIBXML_XINCLUDE_ENABLED
LIBXML_XPATH_ENABLED
LIBXML_XPTR_ENABLED
+LIBXML_ZLIB_ENABLED
WITHOUT_TRIO
WITH_TRIO
xmlCheckVersion
@@ -3273,6 +3276,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathCompExprPtr
xmlXPathCompile
xmlXPathCompiledEval
+xmlXPathCompiledEvalToBoolean
xmlXPathContext
xmlXPathContextPtr
xmlXPathContextSetCache
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html index 92489fb0..46642d1e 100644 --- a/doc/APIfunctions.html +++ b/doc/APIfunctions.html @@ -213,6 +213,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCreateEnumeration
xmlCreateIntSubset
xmlCtxtReadDoc
+xmlDOMWrapAcquireNsFunction
xmlDebugDumpString
xmlDictExists
xmlDictLookup
@@ -1063,7 +1064,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlOutputBufferWriteEscape
xmlSaveSetAttrEscape
xmlSaveSetEscape
-

Type xmlDOMWrapCtxtPtr:

xmlDOMWrapAdoptNode
+

Type xmlDOMWrapCtxtPtr:

xmlDOMWrapAcquireNsFunction
+xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapFreeCtxt
xmlDOMWrapReconcileNamespaces
@@ -1427,6 +1429,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlC14NIsVisibleCallback
xmlCopyProp
xmlCopyPropList
+xmlDOMWrapAcquireNsFunction
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapReconcileNamespaces
@@ -2161,9 +2164,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessNode
xmlXIncludeSetFlags

Type xmlXPathCompExprPtr:

xmlXPathCompiledEval
+xmlXPathCompiledEvalToBoolean
xmlXPathDebugDumpCompExpr
xmlXPathFreeCompExpr

Type xmlXPathContextPtr:

xmlXPathCompiledEval
+xmlXPathCompiledEvalToBoolean
xmlXPathContextSetCache
xmlXPathCtxtCompile
xmlXPathEval
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 7e1ba3c4..25e61140 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -94,6 +94,7 @@ A:link, A:visited, A:active { text-decoration: underline } LIBXML_XINCLUDE_ENABLED
LIBXML_XPATH_ENABLED
LIBXML_XPTR_ENABLED
+LIBXML_ZLIB_ENABLED

Letter M:

MOVETO_ENDTAG
MOVETO_STARTTAG

Letter S:

SKIP_EOL
@@ -1320,6 +1321,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_WITH_XINCLUDE
XML_WITH_XPATH
XML_WITH_XPTR
+XML_WITH_ZLIB
XML_XINCLUDE_BUILD_FAILED
XML_XINCLUDE_DEPRECATED_NS
XML_XINCLUDE_END
@@ -1846,6 +1848,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCtxtResetPush
xmlCtxtUseOptions
xmlCurrentChar
+xmlDOMWrapAcquireNsFunction
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
xmlDOMWrapCtxt
@@ -3289,6 +3292,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathCompareValues
xmlXPathCompile
xmlXPathCompiledEval
+xmlXPathCompiledEvalToBoolean
xmlXPathConcatFunction
xmlXPathContainsFunction
xmlXPathContext
diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html index bc7e54eb..b26841e3 100644 --- a/doc/devhelp/libxml2-parser.html +++ b/doc/devhelp/libxml2-parser.html @@ -219,6 +219,7 @@ void xmlSetExternalEntityLoader (XML_WITH_DEBUG = 28 XML_WITH_DEBUG_MEM = 29 XML_WITH_DEBUG_RUN = 30 + XML_WITH_ZLIB = 31 XML_WITH_NONE = 99999 /* just to be sure of allocation size */ };

@@ -301,7 +302,7 @@ void xmlSetExternalEntityLoader (XML_PARSE_NSCLEAN = 8192 /* remove redundant namespaces declarations */ XML_PARSE_NOCDATA = 16384 /* merge CDATA as text nodes */ XML_PARSE_NOXINCNODE = 32768 /* do not generate XINCLUDE START/END nodes */ - XML_PARSE_COMPACT = 65536 /* compact small text nodes */ + XML_PARSE_COMPACT = 65536 /* compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree) */ };

diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html index d7757e36..7cb98725 100644 --- a/doc/devhelp/libxml2-tree.html +++ b/doc/devhelp/libxml2-tree.html @@ -187,6 +187,7 @@ void xmlSetDocCompressMode (xmlNodePtr xmlCopyNode (const xmlNodePtr node,
int extended); void xmlUnlinkNode (xmlNodePtr cur); const xmlChar * xmlSplitQName3 (const xmlChar * name,
int * len); +typedef xmlNsPtr xmlDOMWrapAcquireNsFunction (xmlDOMWrapCtxtPtr ctxt,
xmlNodePtr node,
const xmlChar * nsName,
const xmlChar * nsPrefix); xmlNodePtr xmlDocSetRootElement (xmlDocPtr doc,
xmlNodePtr root); long xmlGetLineNo (xmlNodePtr node); const xmlChar * xmlBufferContent (const xmlBufferPtr buf); @@ -385,7 +386,10 @@ void xmlFreeNsList (

Structure xmlDOMWrapCtxt

struct _xmlDOMWrapCtxt {
-    void *	_private
+    void *	_private	: * The type of this context, just in case we need specialized * context
+    int	type	: * Internal namespace map used for various operations. *
+    void *	namespaceMap	: * Use this one to acquire an xmlNsPtr intended for node->ns. * (Note t
+    xmlDOMWrapAcquireNsFunction	getNsForNodeFunc
 } xmlDOMWrapCtxt;

@@ -640,6 +644,7 @@ void xmlFreeNsList (xmlChar * href : URL for the namespace const xmlChar * prefix : prefix for the namespace void * _private : application data + struct _xmlDoc * context : normally an xmlDoc } xmlNs;

@@ -868,6 +873,10 @@ void xmlFreeNsList (

Typedef xmlSAXLocatorPtr

xmlSAXLocator * xmlSAXLocatorPtr;

+

+

Function type xmlDOMWrapAcquireNsFunction

xmlNsPtr	xmlDOMWrapAcquireNsFunction	(xmlDOMWrapCtxtPtr ctxt, 
						 xmlNodePtr node, 
						 const xmlChar * nsName, 
						 const xmlChar * nsPrefix)

+

A function called to acquire namespaces (xmlNs) from the wrapper.

+
ctxt:a DOM wrapper context
node:the context node (element or attribute)
nsName:the requested namespace name
nsPrefix:the requested namespace prefix
Returns:an xmlNsPtr or NULL in case of an error.

xmlAddChild ()

xmlNodePtr	xmlAddChild		(xmlNodePtr parent, 
					 xmlNodePtr cur)

Add a new node to @parent, at the end of the child (or property) list merging adjacent TEXT nodes (in which case @cur is freed) If the new node is ATTRIBUTE, it is added into properties instead of children. If there is an attribute with equal name, it is first destroyed.

@@ -1010,11 +1019,11 @@ void xmlFreeNsList (
doc:the document pointer
name:the DTD name
ExternalID:the external (PUBLIC) ID
SystemID:the system ID
Returns:a pointer to the new DTD structure

xmlDOMWrapAdoptNode ()

int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)

-

References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.

+

References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.

ctxt:the optional context for custom processing
sourceDoc:the optional sourceDoc
node:the node to start with
destDoc:the destination doc
destParent:the optional new parent of @node in @destDoc
options:option flags
Returns:0 if the operation succeeded, 1 if a node of unsupported type was given, 2 if a node of not yet supported type was given and -1 on API/internal errors.

xmlDOMWrapCloneNode ()

int	xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlNodePtr * resNode, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int deep, 
					 int options)

-

References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) Support dicts Optimize string adoption for equal or none dicts. 2) XInclude WARNING: This function is in a experimental state and should only be currently only be used to test it.

+

References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used. This is the case when you don't know already where the cloned branch will be added to. If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) What to do with XInclude? Currently this returns an error for XInclude.

ctxt:the optional context for custom processing
sourceDoc:the optional sourceDoc
node:the node to start with
resNode:the clone of the given @node
destDoc:the destination doc
destParent:the optional new parent of @node in @destDoc
deep:descend into child if set
options:option flags
Returns:0 if the operation succeeded, 1 if a node of unsupported (or not yet supported) type was given, -1 on API/internal errors.

xmlDOMWrapFreeCtxt ()

void	xmlDOMWrapFreeCtxt		(xmlDOMWrapCtxtPtr ctxt)

@@ -1026,11 +1035,11 @@ void	xmlFreeNsList			(
Returns:the xmlDOMWrapCtxtPtr or NULL in case of an internal errror.

xmlDOMWrapReconcileNamespaces ()

int	xmlDOMWrapReconcileNamespaces	(xmlDOMWrapCtxtPtr ctxt, 
					 xmlNodePtr elem, 
					 int options)

-

Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.

+

Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.

ctxt:DOM wrapper context, unused at the moment
elem:the element-node
options:option flags
Returns:0 if succeeded, -1 otherwise and on API/internal errors.

xmlDOMWrapRemoveNode ()

int	xmlDOMWrapRemoveNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr node, 
					 int options)

-

Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references. WARNING: This function is in a experimental state.

+

Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references. NOTE: This function was not intensively tested.

ctxt:a DOM wrapper context
doc:the doc
node:the node to be removed.
options:set of options, unused at the moment
Returns:0 on success, 1 if the node is not supported, -1 on API and internal errors.

xmlDocCopyNode ()

xmlNodePtr	xmlDocCopyNode		(const xmlNodePtr node, 
					 xmlDocPtr doc, 
					 int extended)

diff --git a/doc/devhelp/libxml2-xmlversion.html b/doc/devhelp/libxml2-xmlversion.html
index dcf26f8a..691f2e13 100644
--- a/doc/devhelp/libxml2-xmlversion.html
+++ b/doc/devhelp/libxml2-xmlversion.html
@@ -73,6 +73,7 @@
 #define LIBXML_UNICODE_ENABLED;
 #define LIBXML_FTP_ENABLED;
 #define LIBXML_AUTOMATA_ENABLED;
+#define LIBXML_ZLIB_ENABLED;
 #define LIBXML_WRITER_ENABLED;
 #define LIBXML_C14N_ENABLED;
 #define LIBXML_SCHEMAS_ENABLED;
@@ -242,6 +243,10 @@ void	xmlCheckVersion			(int version);
         

         
Macro LIBXML_XPTR_ENABLED
#define LIBXML_XPTR_ENABLED;
 
Whether XPointer is configured in

+

+        

+        
Macro LIBXML_ZLIB_ENABLED
#define LIBXML_ZLIB_ENABLED;
+
Whether the Zlib support is compiled in

 

         

         
Macro WITHOUT_TRIO
#define WITHOUT_TRIO;
diff --git a/doc/devhelp/libxml2-xpath.html b/doc/devhelp/libxml2-xpath.html
index f3fe7a67..a11090ff 100644
--- a/doc/devhelp/libxml2-xpath.html
+++ b/doc/devhelp/libxml2-xpath.html
@@ -74,7 +74,7 @@ typedef xmlXPathFunction xmlXPathIsNaN			(double val);
 int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options);
 xmlXPathObjectPtr	xmlXPathConvertString	(xmlXPathObjectPtr val);
-xmlXPathObjectPtr	xmlXPathConvertBoolean	(xmlXPathObjectPtr val);
+int	xmlXPathCompiledEvalToBoolean	(xmlXPathCompExprPtr comp, 
					 xmlXPathContextPtr ctxt);
 int	xmlXPathIsInf			(double val);
 long	xmlXPathOrderDocElems		(xmlDocPtr doc);
 xmlNodeSetPtr	xmlXPathNodeSetCreate	(xmlNodePtr val);
@@ -96,11 +96,12 @@ void	xmlXPathFreeNodeSetList		(xmlXPathObjectPtr	xmlXPathCompiledEval	(xmlXPathCompExprPtr comp, 
						 xmlXPathContextPtr ctx);
 xmlXPathObjectPtr	xmlXPathEvalExpression	(const xmlChar * str, 
						 xmlXPathContextPtr ctxt);
 void	xmlXPathInit			(void);
-xmlXPathCompExprPtr	xmlXPathCtxtCompile	(xmlXPathContextPtr ctxt, 
						 const xmlChar * str);
+xmlXPathObjectPtr	xmlXPathConvertBoolean	(xmlXPathObjectPtr val);
 typedef int xmlXPathConvertFunc		(xmlXPathObjectPtr obj, 
					 int type);
 typedef void xmlXPathFunction		(xmlXPathParserContextPtr ctxt, 
					 int nargs);
 int	xmlXPathCmpNodes		(xmlNodePtr node1, 
					 xmlNodePtr node2);
 xmlChar *	xmlXPathCastToString	(xmlXPathObjectPtr val);
+xmlXPathCompExprPtr	xmlXPathCtxtCompile	(xmlXPathContextPtr ctxt, 
						 const xmlChar * str);
 typedef void xmlXPathEvalFunc		(xmlXPathParserContextPtr ctxt, 
					 int nargs);
 xmlChar *	xmlXPathCastBooleanToString	(int val);
 int	xmlXPathCastNumberToBoolean	(double val);
@@ -437,6 +438,10 @@ The content of this structure is not made public by the API.
         
xmlXPathCompiledEval ()
xmlXPathObjectPtr	xmlXPathCompiledEval	(xmlXPathCompExprPtr comp, 
						 xmlXPathContextPtr ctx)

 
Evaluate the Precompiled XPath expression in the given context.

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

+        

+        
xmlXPathCompiledEvalToBoolean ()
int	xmlXPathCompiledEvalToBoolean	(xmlXPathCompExprPtr comp, 
					 xmlXPathContextPtr ctxt)

+
Applies the XPath boolean() function on the result of the given compiled expression.

+
comp:the compiled XPath expression
ctxt:the XPath context
Returns:1 if the expression evaluated to true, 0 if to false and -1 in API and internal errors.

         

         
xmlXPathContextSetCache ()
int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options)

 
Creates/frees an object cache on the XPath context. If activates XPath objects (xmlXPathObject) will be cached internally to be reused. @options: 0: This will set the XPath object caching: @value: This will set the maximum number of XPath objects to be cached per slot There are 5 slots for: node-set, string, number, boolean, and misc objects. Use <0 for the default number (100). Other values for @options have currently no effect.

diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp
index e0af8368..a7277bf4 100644
--- a/doc/devhelp/libxml2.devhelp
+++ b/doc/devhelp/libxml2.devhelp
@@ -127,6 +127,7 @@
     
     
     
+    
     
     
     
@@ -1413,6 +1414,7 @@
     
     
     
+    
     
     
     
@@ -1788,6 +1790,7 @@
     
     
     
+    
     
     
     
@@ -3319,6 +3322,7 @@
     
     
     
+    
     
     
     
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 438500b0..26f407d3 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -223,6 +223,7 @@ void	xmlParserInputDeallocate	(XML_WITH_DEBUG = 28
     XML_WITH_DEBUG_MEM = 29
     XML_WITH_DEBUG_RUN = 30
+    XML_WITH_ZLIB = 31
     XML_WITH_NONE = 99999 : just to be sure of allocation size
 }
 
Enum xmlParserInputState
Enum xmlParserInputState {
@@ -280,7 +281,7 @@ void	xmlParserInputDeallocate	(XML_PARSE_NSCLEAN = 8192 : remove redundant namespaces declarations
     XML_PARSE_NOCDATA = 16384 : merge CDATA as text nodes
     XML_PARSE_NOXINCNODE = 32768 : do not generate XINCLUDE START/END nodes
-    XML_PARSE_COMPACT = 65536 : compact small text nodes
+    XML_PARSE_COMPACT = 65536 : compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
 }
 
Structure xmlSAXHandlerV1
Structure xmlSAXHandlerV1
struct _xmlSAXHandlerV1 {
     internalSubsetSAXFunc	internalSubset
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 9e45be1b..3a175833 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -95,6 +95,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 
xmlAttrPtr	xmlCopyProp		(xmlNodePtr target, 
					 xmlAttrPtr cur)

 
xmlAttrPtr	xmlCopyPropList		(xmlNodePtr target, 
					 xmlAttrPtr cur)

 
xmlDtdPtr	xmlCreateIntSubset	(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)

+
Function type: xmlDOMWrapAcquireNsFunction
+xmlNsPtr	xmlDOMWrapAcquireNsFunction	(xmlDOMWrapCtxtPtr ctxt, 
						 xmlNodePtr node, 
						 const xmlChar * nsName, 
						 const xmlChar * nsPrefix)
+

 
int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)

 
int	xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlNodePtr * resNode, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int deep, 
					 int options)

 
void	xmlDOMWrapFreeCtxt		(xmlDOMWrapCtxtPtr ctxt)

@@ -280,7 +283,10 @@ A:link, A:visited, A:active { text-decoration: underline }
     XML_BUFFER_ALLOC_IMMUTABLE = 3
 }
 
Structure xmlDOMWrapCtxt
Structure xmlDOMWrapCtxt
struct _xmlDOMWrapCtxt {
-    void *	_private
+    void *	_private	: * The type of this context, just in case
+    int	type	: * Internal namespace map used for variou
+    void *	namespaceMap	: * Use this one to acquire an xmlNsPtr in
+    xmlDOMWrapAcquireNsFunction	getNsForNodeFunc
 }
Structure xmlDoc
Structure xmlDoc
struct _xmlDoc {
     void *	_private	: application data
     xmlElementType	type	: XML_DOCUMENT_NODE, must be second !
@@ -443,6 +449,7 @@ A:link, A:visited, A:active { text-decoration: underline }
     const xmlChar *	href	: URL for the namespace
     const xmlChar *	prefix	: prefix for the namespace
     void *	_private	: application data
+    struct _xmlDoc *	context	: normally an xmlDoc
 }
Structure xmlOutputBuffer
Structure xmlOutputBuffer
struct _xmlOutputBuffer {
     void *	context
     xmlOutputWriteCallback	writecallback
@@ -674,18 +681,21 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Do a copy of an attribute list.

 
target:the element where the attributes will be grafted
cur:the first attribute
Returns:a new #xmlAttrPtr, or NULL in case of error.
Function: xmlCreateIntSubset
xmlDtdPtr	xmlCreateIntSubset	(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)

 
Create the internal subset of a document

-
doc:the document pointer
name:the DTD name
ExternalID:the external (PUBLIC) ID
SystemID:the system ID
Returns:a pointer to the new DTD structure
Function: xmlDOMWrapAdoptNode
int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)

-
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.

+
doc:the document pointer
name:the DTD name
ExternalID:the external (PUBLIC) ID
SystemID:the system ID
Returns:a pointer to the new DTD structure
Function type: xmlDOMWrapAcquireNsFunction
Function type: xmlDOMWrapAcquireNsFunction
+xmlNsPtr	xmlDOMWrapAcquireNsFunction	(xmlDOMWrapCtxtPtr ctxt, 
						 xmlNodePtr node, 
						 const xmlChar * nsName, 
						 const xmlChar * nsPrefix)
+
A function called to acquire namespaces (xmlNs) from the wrapper.
ctxt:a DOM wrapper context
node:the context node (element or attribute)
nsName:the requested namespace name
nsPrefix:the requested namespace prefix
Returns:an xmlNsPtr or NULL in case of an error.


+
Function: xmlDOMWrapAdoptNode
int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)

+
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.

 
ctxt:the optional context for custom processing
sourceDoc:the optional sourceDoc
node:the node to start with
destDoc:the destination doc
destParent:the optional new parent of @node in @destDoc
options:option flags
Returns:0 if the operation succeeded, 1 if a node of unsupported type was given, 2 if a node of not yet supported type was given and -1 on API/internal errors.
Function: xmlDOMWrapCloneNode
int	xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlNodePtr * resNode, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int deep, 
					 int options)

-
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) Support dicts Optimize string adoption for equal or none dicts. 2) XInclude WARNING: This function is in a experimental state and should only be currently only be used to test it.

+

References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used. This is the case when you don't know already where the cloned branch will be added to. If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) What to do with XInclude? Currently this returns an error for XInclude.

ctxt:the optional context for custom processing
sourceDoc:the optional sourceDoc
node:the node to start with
resNode:the clone of the given @node
destDoc:the destination doc
destParent:the optional new parent of @node in @destDoc
deep:descend into child if set
options:option flags
Returns:0 if the operation succeeded, 1 if a node of unsupported (or not yet supported) type was given, -1 on API/internal errors.

Function: xmlDOMWrapFreeCtxt

void	xmlDOMWrapFreeCtxt		(xmlDOMWrapCtxtPtr ctxt)

Frees the DOM-wrapper context.

ctxt:the DOM-wrapper context

Function: xmlDOMWrapNewCtxt

xmlDOMWrapCtxtPtr	xmlDOMWrapNewCtxt	(void)

Allocates and initializes a new DOM-wrapper context.

Returns:the xmlDOMWrapCtxtPtr or NULL in case of an internal errror.

Function: xmlDOMWrapReconcileNamespaces

int	xmlDOMWrapReconcileNamespaces	(xmlDOMWrapCtxtPtr ctxt, 
					 xmlNodePtr elem, 
					 int options)

-

Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.

+

Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.

ctxt:DOM wrapper context, unused at the moment
elem:the element-node
options:option flags
Returns:0 if succeeded, -1 otherwise and on API/internal errors.

Function: xmlDOMWrapRemoveNode

int	xmlDOMWrapRemoveNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr node, 
					 int options)

-

Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references. WARNING: This function is in a experimental state.

+

Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references. NOTE: This function was not intensively tested.

ctxt:a DOM wrapper context
doc:the doc
node:the node to be removed.
options:set of options, unused at the moment
Returns:0 on success, 1 if the node is not supported, -1 on API and internal errors.

Function: xmlDocCopyNode

xmlNodePtr	xmlDocCopyNode		(const xmlNodePtr node, 
					 xmlDocPtr doc, 
					 int extended)

Do a copy of the node to a given document.

node:the node
doc:the document
extended:if 1 do a recursive copy (properties, namespaces and children when applicable) if 2 copy properties and namespaces (when applicable)
Returns:a new #xmlNodePtr, or NULL in case of error.

Function: xmlDocCopyNodeList

xmlNodePtr	xmlDocCopyNodeList	(xmlDocPtr doc, 
					 const xmlNodePtr node)

diff --git a/doc/html/libxml-xmlversion.html b/doc/html/libxml-xmlversion.html
index c27b701a..d45db372 100644
--- a/doc/html/libxml-xmlversion.html
+++ b/doc/html/libxml-xmlversion.html
@@ -10,7 +10,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 Module xmlversion from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo
Module xmlversion from libxml2
API Menu
API Indexes
Related links
PrevxmlunicodeUpAPI documentationHomeThe XML C parser and toolkit of GnomexmlwriterNext
compile-time version informations for the XML library 
Table of Contents
#define ATTRIBUTE_UNUSED
#define DEBUG_MEMORY_LOCATION
#define LIBXML_AUTOMATA_ENABLED
#define LIBXML_C14N_ENABLED
#define LIBXML_CATALOG_ENABLED
#define LIBXML_DEBUG_ENABLED
#define LIBXML_DEBUG_RUNTIME
#define LIBXML_DOCB_ENABLED
#define LIBXML_DOTTED_VERSION
#define LIBXML_EXPR_ENABLED
#define LIBXML_FTP_ENABLED
#define LIBXML_HTML_ENABLED
#define LIBXML_HTTP_ENABLED
#define LIBXML_ICONV_ENABLED
#define LIBXML_ISO8859X_ENABLED
#define LIBXML_LEGACY_ENABLED
#define LIBXML_MODULES_ENABLED
#define LIBXML_MODULE_EXTENSION
#define LIBXML_OUTPUT_ENABLED
#define LIBXML_PATTERN_ENABLED
#define LIBXML_PUSH_ENABLED
#define LIBXML_READER_ENABLED
#define LIBXML_REGEXP_ENABLED
#define LIBXML_SAX1_ENABLED
#define LIBXML_SCHEMAS_ENABLED
#define LIBXML_SCHEMATRON_ENABLED
#define LIBXML_TEST_VERSION
#define LIBXML_THREAD_ENABLED
#define LIBXML_TREE_ENABLED
#define LIBXML_UNICODE_ENABLED
#define LIBXML_VALID_ENABLED
#define LIBXML_VERSION
#define LIBXML_VERSION_EXTRA
#define LIBXML_VERSION_STRING
#define LIBXML_WRITER_ENABLED
#define LIBXML_XINCLUDE_ENABLED
#define LIBXML_XPATH_ENABLED
#define LIBXML_XPTR_ENABLED
#define WITHOUT_TRIO
#define WITH_TRIO
void	xmlCheckVersion			(int version)

+    Module xmlversion from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo
Module xmlversion from libxml2
API Menu
API Indexes
Related links
PrevxmlunicodeUpAPI documentationHomeThe XML C parser and toolkit of GnomexmlwriterNext
compile-time version informations for the XML library 
Table of Contents
#define ATTRIBUTE_UNUSED
#define DEBUG_MEMORY_LOCATION
#define LIBXML_AUTOMATA_ENABLED
#define LIBXML_C14N_ENABLED
#define LIBXML_CATALOG_ENABLED
#define LIBXML_DEBUG_ENABLED
#define LIBXML_DEBUG_RUNTIME
#define LIBXML_DOCB_ENABLED
#define LIBXML_DOTTED_VERSION
#define LIBXML_EXPR_ENABLED
#define LIBXML_FTP_ENABLED
#define LIBXML_HTML_ENABLED
#define LIBXML_HTTP_ENABLED
#define LIBXML_ICONV_ENABLED
#define LIBXML_ISO8859X_ENABLED
#define LIBXML_LEGACY_ENABLED
#define LIBXML_MODULES_ENABLED
#define LIBXML_MODULE_EXTENSION
#define LIBXML_OUTPUT_ENABLED
#define LIBXML_PATTERN_ENABLED
#define LIBXML_PUSH_ENABLED
#define LIBXML_READER_ENABLED
#define LIBXML_REGEXP_ENABLED
#define LIBXML_SAX1_ENABLED
#define LIBXML_SCHEMAS_ENABLED
#define LIBXML_SCHEMATRON_ENABLED
#define LIBXML_TEST_VERSION
#define LIBXML_THREAD_ENABLED
#define LIBXML_TREE_ENABLED
#define LIBXML_UNICODE_ENABLED
#define LIBXML_VALID_ENABLED
#define LIBXML_VERSION
#define LIBXML_VERSION_EXTRA
#define LIBXML_VERSION_STRING
#define LIBXML_WRITER_ENABLED
#define LIBXML_XINCLUDE_ENABLED
#define LIBXML_XPATH_ENABLED
#define LIBXML_XPTR_ENABLED
#define LIBXML_ZLIB_ENABLED
#define WITHOUT_TRIO
#define WITH_TRIO
void	xmlCheckVersion			(int version)

 
Description

 
Macro: ATTRIBUTE_UNUSED
#define ATTRIBUTE_UNUSED
Macro used to signal to GCC unused function parameters

 
Macro: DEBUG_MEMORY_LOCATION
#define DEBUG_MEMORY_LOCATION
Whether the memory debugging is configured in

@@ -50,6 +50,7 @@ A:link, A:visited, A:active { text-decoration: underline }
 
Macro: LIBXML_XINCLUDE_ENABLED
#define LIBXML_XINCLUDE_ENABLED
Whether XInclude is configured in

 
Macro: LIBXML_XPATH_ENABLED
#define LIBXML_XPATH_ENABLED
Whether XPath is configured in

 
Macro: LIBXML_XPTR_ENABLED
#define LIBXML_XPTR_ENABLED
Whether XPointer is configured in

+
Macro: LIBXML_ZLIB_ENABLED
#define LIBXML_ZLIB_ENABLED
Whether the Zlib support is compiled in

 
Macro: WITHOUT_TRIO
#define WITHOUT_TRIO
defined if the trio support should not be configured in

 
Macro: WITH_TRIO
#define WITH_TRIO
defined if the trio support need to be configured in

 
Function: xmlCheckVersion
void	xmlCheckVersion			(int version)

diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index a0d9ba74..5a797bc0 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -51,6 +51,7 @@ The content of this structure is not made public by the API.
 
int	xmlXPathCmpNodes		(xmlNodePtr node1, 
					 xmlNodePtr node2)

 
xmlXPathCompExprPtr	xmlXPathCompile	(const xmlChar * str)

 
xmlXPathObjectPtr	xmlXPathCompiledEval	(xmlXPathCompExprPtr comp, 
						 xmlXPathContextPtr ctx)

+
int	xmlXPathCompiledEvalToBoolean	(xmlXPathCompExprPtr comp, 
					 xmlXPathContextPtr ctxt)

 
int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options)

 
xmlXPathObjectPtr	xmlXPathConvertBoolean	(xmlXPathObjectPtr val)

 
Function type: xmlXPathConvertFunc
@@ -246,7 +247,9 @@ The content of this structure is not made public by the API.
 
Compile an XPath expression

 
str:the XPath expression
Returns:the xmlXPathCompExprPtr resulting from the compilation or NULL. the caller has to free the object.
Function: xmlXPathCompiledEval
xmlXPathObjectPtr	xmlXPathCompiledEval	(xmlXPathCompExprPtr comp, 
						 xmlXPathContextPtr ctx)

 
Evaluate the Precompiled XPath expression in the given context.

-
comp:the compiled XPath expression
ctx:the XPath context
Returns:the xmlXPathObjectPtr resulting from the evaluation or NULL. the caller has to free the object.
Function: xmlXPathContextSetCache
int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options)

+
comp:the compiled XPath expression
ctx:the XPath context
Returns:the xmlXPathObjectPtr resulting from the evaluation or NULL. the caller has to free the object.
Function: xmlXPathCompiledEvalToBoolean
int	xmlXPathCompiledEvalToBoolean	(xmlXPathCompExprPtr comp, 
					 xmlXPathContextPtr ctxt)

+
Applies the XPath boolean() function on the result of the given compiled expression.

+
comp:the compiled XPath expression
ctxt:the XPath context
Returns:1 if the expression evaluated to true, 0 if to false and -1 in API and internal errors.
Function: xmlXPathContextSetCache
int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options)

 
Creates/frees an object cache on the XPath context. If activates XPath objects (xmlXPathObject) will be cached internally to be reused. @options: 0: This will set the XPath object caching: @value: This will set the maximum number of XPath objects to be cached per slot There are 5 slots for: node-set, string, number, boolean, and misc objects. Use <0 for the default number (100). Other values for @options have currently no effect.

 
ctxt:the XPath context
active:enables/disables (creates/frees) the cache
value:a value with semantics dependant on @options
options:options (currently only the value 0 is used)
Returns:0 if the setting succeeded, and -1 on API or internal errors.
Function: xmlXPathConvertBoolean
xmlXPathObjectPtr	xmlXPathConvertBoolean	(xmlXPathObjectPtr val)

 
Converts an existing object to its boolean() equivalent

diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 2dbf900e..2ef1c394 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -722,6 +722,7 @@
      
      
      
+     
      
      
      
@@ -1587,6 +1588,7 @@
      
      
      
+     
      
      
      
@@ -3322,6 +3324,7 @@
      
      
      
+     
      
      
      
@@ -3501,7 +3504,7 @@
      
      
      
-     
+     
      
      
      
@@ -3523,11 +3526,12 @@
      
      
      
-     
+     
      
      
      
      
+     
      
      
      
@@ -3967,6 +3971,9 @@
     
       Whether XPointer is configured in
     
+    
+      Whether the Zlib support is compiled in
+    
     
       Skips to the next '>' char.
       
@@ -4964,7 +4971,9 @@
     
     
     
-    
+    
     
     
     
@@ -5641,6 +5650,7 @@
     
     
     
+    
     
     
     
@@ -5872,7 +5882,15 @@ if necessary or NULL'/>
     
     
     
-      
+      
+      
+      
+      
     
     
     
@@ -6113,6 +6131,7 @@ actually an xmlCharEncoding'/>
       
       
       
+      
     
     
     
@@ -9038,8 +9057,16 @@ Could we use @subtypes for this?'/>
       
       
     
+    
+      A function called to acquire namespaces (xmlNs) from the wrapper.
+      
+      
+      
+      
+      
+    
     
-      References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of  If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.
+      References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of  If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.
       
       
       
@@ -9049,7 +9076,7 @@ Could we use @subtypes for this?'/>
       
     
     
-      References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unliked node and just want to move it to the context of  If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) Support dicts Optimize string adoption for equal or none dicts. 2) XInclude WARNING: This function is in a experimental state and should only be currently only be used to test it.
+      References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used. This is the case when you don't know already where the cloned branch will be added to.  If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) What to do with XInclude? Currently this returns an error for XInclude.
       
       
       
@@ -9070,14 +9097,14 @@ Could we use @subtypes for this?'/>
       
     
     
-      Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. WARNING: This function is in a experimental state.
+      Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content.  NOTE: This function was not intensively tested.
       
       
       
       
     
     
-      Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references. WARNING: This function is in a experimental state.
+      Unlinks the given node from its owner. This will substitute ns-references to node->nsDef for ns-references to doc->oldNs, thus ensuring the removed branch to be autark wrt ns-references.  NOTE: This function was not intensively tested.
       
       
       
@@ -16970,6 +16997,13 @@ Could we use @subtypes for this?'/>
       
       
     
+    
+      defined(LIBXML_XPATH_ENABLED)
+      Applies the XPath boolean() function on the result of the given compiled expression.
+      
+      
+      
+    
     
       defined(LIBXML_XPATH_ENABLED)
       Implement the concat() XPath function string concat(string, string, string*) The concat function returns the concatenation of its arguments.
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 30a8bbd9..f89a436e 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -88,6 +88,7 @@
     
     
     
+    
     
     
     
@@ -1314,6 +1315,7 @@
     
     
     
+    
     
     
     
@@ -1840,6 +1842,7 @@
     
     
     
+    
     
     
     
@@ -3283,6 +3286,7 @@
     
     
     
+    
     
     
     
@@ -3580,6 +3584,7 @@
       
       
       
+      
     
     
       
@@ -4816,6 +4821,7 @@
       
       
       
+      
       
       
       
@@ -5378,6 +5384,7 @@
       
       
       
+      
       
       
       
@@ -6821,6 +6828,7 @@
       
       
       
+      
       
       
       
@@ -7549,6 +7557,7 @@
       
       
       
+      
       
       
       
@@ -8020,6 +8029,7 @@
       
       
       
+      
       
       
       
@@ -8970,6 +8980,7 @@
       
     
     
+      
       
       
       
@@ -9434,6 +9445,7 @@
       
       
       
+      
       
       
       
@@ -10312,11 +10324,13 @@
     
     
       
+      
       
       
     
     
       
+      
       
       
       
@@ -11131,6 +11145,7 @@
       
       
       
+      
       
       
       
@@ -11868,6 +11883,7 @@
       
       
       
+      
       
       
       
@@ -13650,6 +13666,7 @@
       
       
       
+      
       
       
       
@@ -13807,6 +13824,7 @@
       
       
       
+      
       
       
       
@@ -14182,6 +14200,7 @@
           
           
           
+          
         
         
           
@@ -14866,6 +14885,7 @@
           
         
         
+          
           
           
           
@@ -14941,6 +14961,7 @@
           
           
           
+          
           
           
           
@@ -15957,6 +15978,7 @@
           
         
         
+          
           
         
       
@@ -16299,6 +16321,9 @@
           
           
           
+          
+          
+          
           
           
           
@@ -16443,37 +16468,6 @@
           
           
         
-        
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-        
         
           
           
@@ -16552,9 +16546,6 @@
         
           
         
-        
-          
-        
         
           
         
@@ -17551,9 +17542,6 @@
         
           
         
-        
-          
-        
         
           
         
@@ -17885,6 +17873,7 @@
         
           
           
+          
           
           
           
@@ -18000,10 +17989,6 @@
           
         
         
-          
-          
-          
-          
           
           
         
@@ -18057,6 +18042,7 @@
           
           
           
+          
           
           
         
@@ -18117,6 +18103,9 @@
           
           
         
+        
+          
+        
         
           
         
@@ -18313,6 +18302,9 @@
           
           
         
+        
+          
+        
       
     
     
@@ -18437,6 +18429,10 @@
         
           
         
+        
+          
+          
+        
         
           
           
@@ -18530,6 +18526,7 @@
           
           
           
+          
           
           
           
@@ -18593,9 +18590,6 @@
           
           
         
-        
-          
-        
         
           
         
@@ -19369,6 +19363,7 @@
           
         
         
+          
           
         
         
@@ -19841,6 +19836,9 @@
         
           
         
+        
+          
+        
         
           
           
@@ -20061,35 +20059,6 @@
           
           
         
-        
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-        
         
           
           
@@ -20455,6 +20424,9 @@
           
           
         
+        
+          
+        
         
           
           
@@ -20700,7 +20672,6 @@
         
         
           
-          
           
           
           
@@ -21206,9 +21177,6 @@
           
           
         
-        
-          
-        
         
           
           
@@ -21408,6 +21376,7 @@
           
           
           
+          
           
           
           
@@ -21567,6 +21536,9 @@
         
           
         
+        
+          
+        
         
           
           
@@ -21824,7 +21796,6 @@
           
           
           
-          
           
           
           
@@ -21904,6 +21875,7 @@
           
         
         
+          
           
           
           
@@ -22047,12 +22019,6 @@
           
           
         
-        
-          
-          
-          
-          
-        
         
           
         
@@ -22648,6 +22614,9 @@
           
           
         
+        
+          
+        
       
     
     
@@ -23654,8 +23623,14 @@
           
         
         
+          
           
         
+        
+          
+          
+          
+        
         
           
         
@@ -23781,6 +23756,7 @@
     
       
         
+          
           
           
           
@@ -23790,7 +23766,6 @@
           
           
           
-          
           
           
           
@@ -23842,6 +23817,7 @@
         
         
           
+          
         
         
           
@@ -24374,6 +24350,9 @@
           
           
         
+        
+          
+        
         
           
           
@@ -24716,7 +24695,6 @@
         
         
           
-          
         
         
           
@@ -24810,6 +24788,7 @@
           
           
           
+          
           
           
           
@@ -24853,6 +24832,7 @@
           
           
           
+          
           
           
           
@@ -24968,6 +24948,7 @@
           
         
         
+          
           
           
         
@@ -25054,7 +25035,6 @@
         
           
           
-          
           
           
           
@@ -25113,6 +25093,7 @@
           
         
         
+          
           
           
           
@@ -25146,6 +25127,7 @@
           
         
         
+          
           
           
           
@@ -25431,6 +25413,7 @@
           
         
         
+          
           
           
           
@@ -27025,6 +27008,7 @@
           
         
         
+          
           
           
           
@@ -27953,6 +27937,7 @@
           
         
         
+          
           
           
         
@@ -28662,13 +28647,15 @@
           
         
         
-          
           
           
           
         
         
           
+          
+          
+          
         
         
           
@@ -29216,7 +29203,6 @@
         
         
           
-          
         
         
           
@@ -29465,6 +29451,9 @@
           
           
         
+        
+          
+        
         
           
           
@@ -29510,7 +29499,6 @@
           
           
           
-          
         
         
           
@@ -29797,6 +29785,7 @@
           
         
         
+          
           
           
         
@@ -30073,6 +30062,9 @@
           
           
         
+        
+          
+        
         
           
         
@@ -30384,10 +30376,15 @@
         
           
         
+        
+          
+        
         
+          
           
           
           
+          
           
         
         
diff --git a/testapi.c b/testapi.c
index 2bfc545a..096a396b 100644
--- a/testapi.c
+++ b/testapi.c
@@ -30599,7 +30599,7 @@ static int
 test_xmlTextReaderGetErrorHandler(void) {
     int test_ret = 0;
 
-#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_SCHEMAS_ENABLED)
+#if defined(LIBXML_READER_ENABLED)
     int mem_base;
     xmlTextReaderPtr reader; /* the xmlTextReaderPtr used */
     int n_reader;
@@ -31943,7 +31943,7 @@ test_xmlTextReaderSchemaValidate(void) {
     return(test_ret);
 }
 
-#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_SCHEMAS_ENABLED)
+#ifdef LIBXML_READER_ENABLED
 
 #define gen_nb_xmlSchemaValidCtxtPtr 1
 static xmlSchemaValidCtxtPtr gen_xmlSchemaValidCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
@@ -32059,7 +32059,7 @@ test_xmlTextReaderSetParserProp(void) {
     return(test_ret);
 }
 
-#if defined(LIBXML_READER_ENABLED) && defined(LIBXML_SCHEMAS_ENABLED)
+#ifdef LIBXML_READER_ENABLED
 
 #define gen_nb_xmlSchemaPtr 1
 static xmlSchemaPtr gen_xmlSchemaPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
@@ -45558,6 +45558,47 @@ test_xmlXPathCompiledEval(void) {
 }
 
 
+static int
+test_xmlXPathCompiledEvalToBoolean(void) {
+    int test_ret = 0;
+
+#if defined(LIBXML_XPATH_ENABLED)
+    int mem_base;
+    int ret_val;
+    xmlXPathCompExprPtr comp; /* the compiled XPath expression */
+    int n_comp;
+    xmlXPathContextPtr ctxt; /* the XPath context */
+    int n_ctxt;
+
+    for (n_comp = 0;n_comp < gen_nb_xmlXPathCompExprPtr;n_comp++) {
+    for (n_ctxt = 0;n_ctxt < gen_nb_xmlXPathContextPtr;n_ctxt++) {
+        mem_base = xmlMemBlocks();
+        comp = gen_xmlXPathCompExprPtr(n_comp, 0);
+        ctxt = gen_xmlXPathContextPtr(n_ctxt, 1);
+
+        ret_val = xmlXPathCompiledEvalToBoolean(comp, ctxt);
+        desret_int(ret_val);
+        call_tests++;
+        des_xmlXPathCompExprPtr(n_comp, comp, 0);
+        des_xmlXPathContextPtr(n_ctxt, ctxt, 1);
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in xmlXPathCompiledEvalToBoolean",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf(" %d", n_comp);
+            printf(" %d", n_ctxt);
+            printf("\n");
+        }
+    }
+    }
+    function_tests++;
+#endif
+
+    return(test_ret);
+}
+
+
 static int
 test_xmlXPathContextSetCache(void) {
     int test_ret = 0;
@@ -46059,7 +46100,7 @@ static int
 test_xpath(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing xpath : 29 of 37 functions ...\n");
+    if (quiet == 0) printf("Testing xpath : 30 of 38 functions ...\n");
     test_ret += test_xmlXPathCastBooleanToNumber();
     test_ret += test_xmlXPathCastBooleanToString();
     test_ret += test_xmlXPathCastNodeSetToBoolean();
@@ -46077,6 +46118,7 @@ test_xpath(void) {
     test_ret += test_xmlXPathCmpNodes();
     test_ret += test_xmlXPathCompile();
     test_ret += test_xmlXPathCompiledEval();
+    test_ret += test_xmlXPathCompiledEvalToBoolean();
     test_ret += test_xmlXPathContextSetCache();
     test_ret += test_xmlXPathConvertBoolean();
     test_ret += test_xmlXPathConvertNumber();
diff --git a/xmlschemas.c b/xmlschemas.c
index e0d3b7a1..3baae056 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -22197,7 +22197,7 @@ xmlSchemaXPathEvaluate(xmlSchemaValidCtxtPtr vctxt,
 		    "allocating the state object history", NULL);
 		return(-1);
 	    }
-	    sto->sizeHistory = 10;
+	    sto->sizeHistory = 5;
 	} else if (sto->sizeHistory <= sto->nbHistory) {
 	    sto->sizeHistory *= 2;
 	    sto->history = (int *) xmlRealloc(sto->history,