From 2ae13382c389912f89d0df8ab4fcce376db6ae82 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 25 Jan 2005 23:45:06 +0000 Subject: [PATCH] fixing the way testapi.c is generated, fixes bug #161386 fix a comment * Makefile.am testapi.c doc/Makefile.am: fixing the way testapi.c is generated, fixes bug #161386 * dict.c: fix a comment typo * elfgcchack.h doc/*: regenerated Daniel --- ChangeLog | 7 ++ Makefile.am | 9 ++- dict.c | 2 +- doc/APIchunk0.html | 2 + doc/APIchunk10.html | 1 - doc/APIchunk11.html | 6 ++ doc/APIchunk13.html | 1 + doc/APIchunk15.html | 2 + doc/APIchunk17.html | 6 +- doc/APIchunk19.html | 5 +- doc/APIchunk2.html | 3 + doc/APIchunk21.html | 4 +- doc/APIchunk22.html | 4 ++ doc/APIchunk25.html | 2 + doc/APIchunk26.html | 7 +- doc/APIconstructors.html | 5 +- doc/APIfiles.html | 5 ++ doc/APIfunctions.html | 10 ++- doc/APIsymbols.html | 5 ++ doc/Makefile.am | 2 + doc/html/libxml-dict.html | 7 +- doc/html/libxml-entities.html | 2 +- doc/html/libxml-hash.html | 5 +- doc/html/libxml-valid.html | 19 +++-- doc/libxml2-api.xml | 52 +++++++++++--- doc/libxml2-refs.xml | 73 ++++++++++++++++++- elfgcchack.h | 20 ++++++ python/libxml2class.txt | 3 + testapi.c | 128 +++++++++++++++++++++++++++++++++- win32/libxml2.def.src | 5 ++ 30 files changed, 369 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index c66d0646..b89316f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jan 26 00:43:05 CET 2005 Daniel Veillard + + * Makefile.am testapi.c doc/Makefile.am: fixing the way testapi.c + is generated, fixes bug #161386 + * dict.c: fix a comment typo + * elfgcchack.h doc/*: regenerated + Tue Jan 25 22:39:33 CET 2005 Daniel Veillard * parser.c: found and fixed 2 problems in the internal subset scanning diff --git a/Makefile.am b/Makefile.am index 3ac28879..4f273e46 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,7 +123,14 @@ noinst_LTLIBRARIES = testdso.la testdso_la_SOURCES = testdso.c testdso_la_LDFLAGS = -module -rpath $(libdir) -testapi.c: $(srcdir)/gentest.py doc/libxml2-api.xml +# that one forces the rebuild when "make rebuild" is run on doc/ +rebuild_testapi: + -@(if [ "$(PYTHON)" != "" ] ; then \ + $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi ) + +# that one is just to make sure it is rebuilt if missing +# but adding the dependances generate mess +testapi.c: -@(if [ "$(PYTHON)" != "" ] ; then \ $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi ) diff --git a/dict.c b/dict.c index fd3e5317..8b1b121f 100644 --- a/dict.c +++ b/dict.c @@ -100,7 +100,7 @@ static int xmlInitializeDict() { } /** - * xmlCatalogCleanup: + * xmlDictCleanup: * * Free the dictionary mutex. */ diff --git a/doc/APIchunk0.html b/doc/APIchunk0.html index c0d3fe32..997b59b3 100644 --- a/doc/APIchunk0.html +++ b/doc/APIchunk0.html @@ -121,6 +121,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseAttValue
xmlTextWriterEndDocument
Allocate
xmlNanoFTPNewCtxt
+xmlNewDocElementContent
xmlNewElementContent
xmlNewParserCtxt
xmlNewValidCtxt
@@ -247,6 +248,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Bugs:
_htmlElemDesc
Buhid
xmlUCSIsBuhid
Build
xmlCopyAttributeTable
+xmlCopyDocElementContent
xmlCopyElementContent
xmlCopyElementTable
xmlCopyEntitiesTable
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 4b7b59d1..f890431e 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -41,7 +41,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCharEncodingOutputFunc
xmlCleanupParser
xmlCleanupPredefinedEntities
-xmlFreeElementContent
xmlInitializePredefinedEntities
xmlNanoFTPRead
xmlNanoHTTPRead
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html index f48ee2ad..777baa94 100644 --- a/doc/APIchunk11.html +++ b/doc/APIchunk11.html @@ -108,6 +108,7 @@ A:link, A:visited, A:active { text-decoration: underline }
decimal
xmlXPathStringFunction
decl
_xmlSchemaAttribute
xmlAddAttributeDecl
+xmlNewDocElementContent
xmlNewElementContent
declarations
_xmlXPathContext
htmlParseCharRef
@@ -223,6 +224,7 @@ A:link, A:visited, A:active { text-decoration: underline } htmlElementStatusHere
htmlNodeStatus
xmlCheckLanguageID
+xmlCreateEntitiesTable
xmlDecodeEntities
xmlParserHandleReference
xmlScanName
@@ -266,6 +268,7 @@ A:link, A:visited, A:active { text-decoration: underline }
description
_htmlElemDesc
_htmlEntityDesc
htmlElementAllowedHereDesc
+xmlCopyDocElementContent
xmlCopyElementContent
xmlGetDtdAttrDesc
xmlGetDtdElementDesc
@@ -350,9 +353,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRegexpIsDeterminist
dict
_xmlDoc
dictionary
_xmlParserCtxt
+xmlDictCleanup
xmlDictCreate
xmlDictCreateSub
xmlDictReference
+xmlHashCreateDict
dictionnary
_xmlParserCtxt
_xmlXPathContext
xmlDictCreate
@@ -497,6 +502,7 @@ A:link, A:visited, A:active { text-decoration: underline }
doesn
_htmlElemDesc
htmlElementAllowedHere
xmlCleanupParser
+xmlCreateEntitiesTable
xmlFreeNode
xmlInitCharEncodingHandlers
xmlKeepBlanksDefault
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index 81e2cd81..d43cd9a6 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -127,6 +127,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStrEqual
fatal
fatalErrorSAXFunc
fatalError
fatalErrorSAXFunc
+
favor
xmlNewElementContent
feature
xmlGetFeature
xmlGetFeaturesList
xmlSetFeature
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index afdadd16..03cff701 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -382,6 +382,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAddChild
xmlAddNextSibling
xmlAddPrevSibling
+xmlCopyElementContent
+xmlFreeElementContent
xmlIsBaseChar
xmlIsBlank
xmlIsChar
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index 7f05a0cb..74b905ac 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -48,7 +48,8 @@ A:link, A:visited, A:active { text-decoration: underline }
maintained
xmlRemoveID
xmlRemoveRef
major
xmlDecodeEntities
-
make
xmlNewNode
+
make
xmlCreateEntitiesTable
+xmlNewNode
xmlSaveClose
xmlSaveFlush
makes
xmlLoadCatalog
@@ -285,7 +286,8 @@ A:link, A:visited, A:active { text-decoration: underline }
multiply
xmlXPathMultValues
multithreaded
htmlInitAutoClose
xmlInitParser
-
mutex
xmlFreeMutex
+
mutex
xmlDictCleanup
+xmlFreeMutex
xmlFreeRMutex
xmlMutexLock
xmlMutexUnlock
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index 1c0d2475..e482e6f3 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -59,6 +59,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDictCreateSub
xmlGetLastError
xmlHashCreate
+xmlHashCreateDict
xmlListRemoveFirst
xmlListRemoveLast
occurences
xmlAutomataNewCountTrans
@@ -331,7 +332,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDictOwns
owner
ftpListCallback
ownership
xmlAddAttributeDecl
-
owning
xmlNewDocFragment
+
owning
xmlCopyDocElementContent
+xmlFreeDocElementContent
+xmlNewDocFragment
owns
XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD

A-B C-C diff --git a/doc/APIchunk2.html b/doc/APIchunk2.html index 7c690173..a37dcda9 100644 --- a/doc/APIchunk2.html +++ b/doc/APIchunk2.html @@ -126,7 +126,10 @@ A:link, A:visited, A:active { text-decoration: underline }
Deletes
xmlListDelete
Deprecated
htmlAttrAllowed
xmlCleanupPredefinedEntities
+xmlCopyElementContent
+xmlFreeElementContent
xmlInitializePredefinedEntities
+xmlNewElementContent
xmlParseQuotedString
xmlSprintfElementContent
Depth
_xmlParserCtxt
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html index 7b403a07..0d8413bc 100644 --- a/doc/APIchunk21.html +++ b/doc/APIchunk21.html @@ -133,6 +133,7 @@ A:link, A:visited, A:active { text-decoration: underline } htmlEntityLookup
htmlEntityValueLookup
xmlBuildRelativeURI
+xmlCreateEntitiesTable
reasonable
xmlBuildRelativeURI
received
ftpDataCallback
xmlNanoHTTPReturnCode
@@ -193,7 +194,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDocCopyNode
xmlDocCopyNodeList
xmlElemDump
-xmlFreeElementContent
xmlFreeEnumeration
xmlFreeNode
xmlFreeNodeList
@@ -354,6 +354,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlBufferShrink
xmlCatalogRemove
xmlCheckLanguageID
+xmlFreeDocElementContent
+xmlFreeElementContent
xmlHandleEntity
xmlHashRemoveEntry
xmlHashRemoveEntry2
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index 267fd233..15ce36eb 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -167,6 +167,7 @@ A:link, A:visited, A:active { text-decoration: underline }
selects
xmlXPathIdFunction
self
xmlXPathNextSelf
semantic
xmlXPathNodeSetFreeNs
+
sense
xmlCreateEntitiesTable
separated
xmlLoadCatalogs
separately
xmlSetGenericErrorFunc
xmlSetStructuredErrorFunc
@@ -676,6 +677,7 @@ A:link, A:visited, A:active { text-decoration: underline }
sub-elements
_htmlElemDesc
subelement
_htmlElemDesc
htmlDefaultSubelement
+xmlNewDocElementContent
xmlNewElementContent
subelements
_htmlElemDesc
subject
xmlParseSDDecl
@@ -721,6 +723,8 @@ A:link, A:visited, A:active { text-decoration: underline }
subtraction
xmlXPathSubValues
subtree
attribute
attributeSAXFunc
+xmlFreeDocElementContent
+xmlFreeElementContent
xmlReconciliateNs
xmlRelaxNGValidateFullElement
xmlSaveTree
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html index a9fbc939..97e1381d 100644 --- a/doc/APIchunk25.html +++ b/doc/APIchunk25.html @@ -156,6 +156,8 @@ A:link, A:visited, A:active { text-decoration: underline }
whitespaces
ignorableWhitespace
ignorableWhitespaceSAXFunc
xmlSAX2IgnorableWhitespace
+
whole
xmlFreeDocElementContent
+xmlFreeElementContent
whose
xmlAutomataNewCountTrans
xmlAutomataNewCountTrans2
xmlAutomataNewOnceTrans
diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html index f3d9bc17..76a6b8c8 100644 --- a/doc/APIchunk26.html +++ b/doc/APIchunk26.html @@ -127,6 +127,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParserInputRead
xmlCleanupParser
xmlCleanupParser
xmlCleanupThreads
xmlCleanupThreads
+
xmlCopyDocElementContent
xmlCopyElementContent
xmlCreateIntSubset
xmlNewDtd
xmlDefaultSAXLocator
setDocumentLocator
setDocumentLocatorSAXFunc
@@ -142,7 +143,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlIOParseDTD
xmlParseDTD
xmlSAXParseDTD
-
xmlElementContentPtr
xmlCopyElementContent
+
xmlElementContentPtr
xmlCopyDocElementContent
+xmlCopyElementContent
xmlParseElementChildrenContentDecl
xmlParseElementMixedContentDecl
xmlElementPtr
xmlGetDtdElementDesc
@@ -183,6 +185,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNodeListGetString
xmlTextReaderValue
xmlFreeDoc
xmlTextReaderCurrentDoc
+
xmlFreeDocElementContent
xmlFreeElementContent
xmlFreeMutex
xmlFreeMutex
xmlGetGlobalState
xmlGetGlobalState
xmlGetNoNsProp
xmlGetProp
@@ -190,6 +193,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlGetProp
xmlGetNoNsProp
xmlGetThreadId
xmlGetThreadId
xmlHashTablePtr
xmlHashCreate
+xmlHashCreateDict
xmlIDPtr
xmlAddID
xmlIndentTreeOutput
xmlDocDumpFormatMemory
xmlDocDumpFormatMemoryEnc
@@ -243,6 +247,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlNanoFTPGet
ftpDataCallback
xmlNanoFTPList
ftpListCallback
xmlNewChild
xmlNewTextChild
+
xmlNewDocElementContent
xmlNewElementContent
xmlNewDocRawNode
xmlNewDocNode
xmlNewDocNodeEatName
xmlNewMutex
xmlNewMutex
diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html index a1856c8f..45e705b3 100644 --- a/doc/APIconstructors.html +++ b/doc/APIconstructors.html @@ -290,7 +290,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewDtd
xmlParseDTD
xmlSAXParseDTD
-

Type xmlElementContentPtr:

xmlCopyElementContent
+

Type xmlElementContentPtr:

xmlCopyDocElementContent
+xmlCopyElementContent
+xmlNewDocElementContent
xmlNewElementContent
xmlParseElementChildrenContentDecl
xmlParseElementMixedContentDecl
@@ -323,6 +325,7 @@ A:link, A:visited, A:active { text-decoration: underline }

Type xmlGlobalStatePtr:

xmlGetGlobalState

Type xmlHashTablePtr:

xmlHashCopy
xmlHashCreate
+xmlHashCreateDict

Type xmlIDPtr:

xmlAddID

Type xmlLinkPtr:

xmlListEnd
xmlListFront
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 017b653a..b50ca677 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -315,6 +315,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlShellValidate
xmlShellWrite

Module dict:

xmlDict
+xmlDictCleanup
xmlDictCreate
xmlDictCreateSub
xmlDictExists
@@ -472,6 +473,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlHashCopier
xmlHashCopy
xmlHashCreate
+xmlHashCreateDict
xmlHashDeallocator
xmlHashFree
xmlHashLookup
@@ -1447,6 +1449,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAttributeTable
xmlAttributeTablePtr
xmlCopyAttributeTable
+xmlCopyDocElementContent
xmlCopyElementContent
xmlCopyElementTable
xmlCopyEnumeration
@@ -1461,6 +1464,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlElementTable
xmlElementTablePtr
xmlFreeAttributeTable
+xmlFreeDocElementContent
xmlFreeElementContent
xmlFreeElementTable
xmlFreeEnumeration
@@ -1480,6 +1484,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlIsID
xmlIsMixedElement
xmlIsRef
+xmlNewDocElementContent
xmlNewElementContent
xmlNewValidCtxt
xmlNotationTable
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html index c8012a93..61897c75 100644 --- a/doc/APIfunctions.html +++ b/doc/APIfunctions.html @@ -260,6 +260,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewComment
xmlNewDoc
xmlNewDocComment
+xmlNewDocElementContent
xmlNewDocNode
xmlNewDocNodeEatName
xmlNewDocPI
@@ -1039,6 +1040,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDictQLookup
xmlDictReference
xmlDictSize
+xmlHashCreateDict

Type xmlDocPtr:

htmlDocContentDumpFormatOutput
htmlDocContentDumpOutput
htmlDocDump
@@ -1062,6 +1064,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlC14NDocSaveTo
xmlC14NExecute
xmlCopyDoc
+xmlCopyDocElementContent
xmlCreateIntSubset
xmlDebugCheckDocument
xmlDebugDumpDocument
@@ -1082,6 +1085,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlEncodeEntitiesReentrant
xmlEncodeSpecialChars
xmlFreeDoc
+xmlFreeDocElementContent
xmlGetDocCompressMode
xmlGetDocEntity
xmlGetDtdEntity
@@ -1096,6 +1100,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewCDataBlock
xmlNewCharRef
xmlNewDocComment
+xmlNewDocElementContent
xmlNewDocFragment
xmlNewDocNode
xmlNewDocNodeEatName
@@ -1183,13 +1188,16 @@ A:link, A:visited, A:active { text-decoration: underline }

Type xmlElementContentPtr:

elementDecl
elementDeclSAXFunc
xmlAddElementDecl
+xmlCopyDocElementContent
xmlCopyElementContent
+xmlFreeDocElementContent
xmlFreeElementContent
xmlSAX2ElementDecl
xmlSnprintfElementContent
xmlSprintfElementContent

Type xmlElementContentPtr *:

xmlParseElementContentDecl
-

Type xmlElementContentType:

xmlNewElementContent
+

Type xmlElementContentType:

xmlNewDocElementContent
+xmlNewElementContent

Type xmlElementPtr:

xmlDumpElementDecl
xmlValidBuildContentModel
xmlValidateElementDecl
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index f62c93fb..5cb4140f 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -1691,6 +1691,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCopyChar
xmlCopyCharMultiByte
xmlCopyDoc
+xmlCopyDocElementContent
xmlCopyDtd
xmlCopyElementContent
xmlCopyElementTable
@@ -1748,6 +1749,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDeregisterNodeFunc
xmlDetectCharEncoding
xmlDict
+xmlDictCleanup
xmlDictCreate
xmlDictCreateSub
xmlDictExists
@@ -1819,6 +1821,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlFreeAutomata
xmlFreeCatalog
xmlFreeDoc
+xmlFreeDocElementContent
xmlFreeDtd
xmlFreeElementContent
xmlFreeElementTable
@@ -1894,6 +1897,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlHashCopier
xmlHashCopy
xmlHashCreate
+xmlHashCreateDict
xmlHashDeallocator
xmlHashFree
xmlHashLookup
@@ -2111,6 +2115,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewComment
xmlNewDoc
xmlNewDocComment
+xmlNewDocElementContent
xmlNewDocFragment
xmlNewDocNode
xmlNewDocNodeEatName
diff --git a/doc/Makefile.am b/doc/Makefile.am index 1bdcb792..926135e7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -82,6 +82,8 @@ $(WIN32_DIR)/libxml2.def.src: libxml2-api.xml libxml2-api.xml libxml2-refs.xml: apibuild.py ../include/libxml/*.h ../*.c -(./apibuild.py) + -@(cd .. ; $(MAKE) rebuild_testapi) + xmllint.1: xmllint.xml -@($(XSLTPROC) --nonet xmllint.xml) diff --git a/doc/html/libxml-dict.html b/doc/html/libxml-dict.html index f480d76e..a944ed1b 100644 --- a/doc/html/libxml-dict.html +++ b/doc/html/libxml-dict.html @@ -13,7 +13,8 @@ A:link, A:visited, A:active { text-decoration: underline } Module dict from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Module dict from libxml2

API Menu
API Indexes
Related links
PrevdebugXMLUpAPI documentationHomeThe XML C parser and toolkit of GnomeencodingNext

dictionary of reusable strings, just used to avoid allocation and freeing operations.

Table of Contents

Structure xmlDict
struct _xmlDict
 The content of this structure is not made public by the API.
 
Typedef xmlDict * xmlDictPtr
-
xmlDictPtr	xmlDictCreate		(void)
+
void	xmlDictCleanup			(void)
+
xmlDictPtr	xmlDictCreate		(void)
xmlDictPtr	xmlDictCreateSub	(xmlDictPtr sub)
const xmlChar *	xmlDictExists		(xmlDictPtr dict, 
					 const xmlChar * name, 
					 int len)
void	xmlDictFree			(xmlDictPtr dict)
@@ -25,7 +26,9 @@ The content of this structure is not made public by the API.

Description

Structure xmlDict

Structure xmlDict
struct _xmlDict {
 The content of this structure is not made public by the API.
-}

Function: xmlDictCreate

xmlDictPtr	xmlDictCreate		(void)

+}

Function: xmlDictCleanup

void	xmlDictCleanup			(void)

+

Free the dictionary mutex.

+

Function: xmlDictCreate

xmlDictPtr	xmlDictCreate		(void)

Create a new dictionary

Returns:the newly created dictionnary, or NULL if an error occured.

Function: xmlDictCreateSub

xmlDictPtr	xmlDictCreateSub	(xmlDictPtr sub)

Create a new dictionary, inheriting strings from the read-only dictionnary @sub. On lookup, strings are first searched in the new dictionnary, then in @sub, and if not found are created in the new dictionnary.

diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html index 31ed35ed..ff56a7ef 100644 --- a/doc/html/libxml-entities.html +++ b/doc/html/libxml-entities.html @@ -50,7 +50,7 @@ The content of this structure is not made public by the API.

Function: xmlCopyEntitiesTable

xmlEntitiesTablePtr	xmlCopyEntitiesTable	(xmlEntitiesTablePtr table)

Build a copy of an entity table.

table:An entity table
Returns:the new xmlEntitiesTablePtr or NULL in case of error.

Function: xmlCreateEntitiesTable

xmlEntitiesTablePtr	xmlCreateEntitiesTable	(void)

-

create and initialize an empty entities hash table.

+

create and initialize an empty entities hash table. This really doesn't make sense and should be deprecated

Returns:the xmlEntitiesTablePtr just created or NULL in case of error.

Function: xmlDumpEntitiesTable

void	xmlDumpEntitiesTable		(xmlBufferPtr buf, 
					 xmlEntitiesTablePtr table)

This will dump the content of the entity table as an XML DTD definition

buf:An XML buffer.
table:An entity table

Function: xmlDumpEntityDecl

void	xmlDumpEntityDecl		(xmlBufferPtr buf, 
					 xmlEntityPtr ent)

diff --git a/doc/html/libxml-hash.html b/doc/html/libxml-hash.html
index 278bdd41..a2b4879a 100644
--- a/doc/html/libxml-hash.html
+++ b/doc/html/libxml-hash.html
@@ -21,6 +21,7 @@ void *	xmlHashCopier			(void * payload, 

 
xmlHashTablePtr	xmlHashCopy		(xmlHashTablePtr table, 
					 xmlHashCopier f)
xmlHashTablePtr	xmlHashCreate		(int size)
+
xmlHashTablePtr	xmlHashCreateDict	(int size, 
					 xmlDictPtr dict)
Function type: xmlHashDeallocator
 void	xmlHashDeallocator		(void * payload, 
					 xmlChar * name)
@@ -65,7 +66,9 @@ void * xmlHashCopier (void * payload,
table:the hash table
f:the copier function for items in the hash
Returns:the new table or NULL in case of error.

Function: xmlHashCreate

xmlHashTablePtr	xmlHashCreate		(int size)

Create a new xmlHashTablePtr.

-
size:the size of the hash table
Returns:the newly created object, or NULL if an error occured.

Function type: xmlHashDeallocator

Function type: xmlHashDeallocator
+
size:the size of the hash table
Returns:the newly created object, or NULL if an error occured.
Function: xmlHashCreateDict
xmlHashTablePtr	xmlHashCreateDict	(int size, 
					 xmlDictPtr dict)

+
Create a new xmlHashTablePtr which will use @dict as the internal dictionary

+
size:the size of the hash table
dict:a dictionary to use for the hash
Returns:the newly created object, or NULL if an error occured.
Function type: xmlHashDeallocator
Function type: xmlHashDeallocator
 void	xmlHashDeallocator		(void * payload, 
					 xmlChar * name)
 
Callback to free data from a hash.
payload:the data in the hash
name:the name associated


 
Function: xmlHashFree
void	xmlHashFree			(xmlHashTablePtr table, 
					 xmlHashDeallocator f)

diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index 9cbceb21..d02b3272 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html
@@ -36,6 +36,7 @@ The content of this structure is not made public by the API.
 
xmlNotationPtr	xmlAddNotationDecl	(xmlValidCtxtPtr ctxt, 
					 xmlDtdPtr dtd, 
					 const xmlChar * name, 
					 const xmlChar * PublicID, 
					 const xmlChar * SystemID)

 
xmlRefPtr	xmlAddRef		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 const xmlChar * value, 
					 xmlAttrPtr attr)

 
xmlAttributeTablePtr	xmlCopyAttributeTable	(xmlAttributeTablePtr table)

+
xmlElementContentPtr	xmlCopyDocElementContent	(xmlDocPtr doc, 
							 xmlElementContentPtr cur)

 
xmlElementContentPtr	xmlCopyElementContent	(xmlElementContentPtr cur)

 
xmlElementTablePtr	xmlCopyElementTable	(xmlElementTablePtr table)

 
xmlEnumerationPtr	xmlCopyEnumeration	(xmlEnumerationPtr cur)

@@ -48,6 +49,7 @@ The content of this structure is not made public by the API.
 
void	xmlDumpNotationDecl		(xmlBufferPtr buf, 
					 xmlNotationPtr nota)

 
void	xmlDumpNotationTable		(xmlBufferPtr buf, 
					 xmlNotationTablePtr table)

 
void	xmlFreeAttributeTable		(xmlAttributeTablePtr table)

+
void	xmlFreeDocElementContent	(xmlDocPtr doc, 
					 xmlElementContentPtr cur)

 
void	xmlFreeElementContent		(xmlElementContentPtr cur)

 
void	xmlFreeElementTable		(xmlElementTablePtr table)

 
void	xmlFreeEnumeration		(xmlEnumerationPtr cur)

@@ -65,6 +67,7 @@ The content of this structure is not made public by the API.
 
int	xmlIsID			(xmlDocPtr doc, 
					 xmlNodePtr elem, 
					 xmlAttrPtr attr)

 
int	xmlIsMixedElement		(xmlDocPtr doc, 
					 const xmlChar * name)

 
int	xmlIsRef			(xmlDocPtr doc, 
					 xmlNodePtr elem, 
					 xmlAttrPtr attr)

+
xmlElementContentPtr	xmlNewDocElementContent	(xmlDocPtr doc, 
						 const xmlChar * name, 
						 xmlElementContentType type)

 
xmlElementContentPtr	xmlNewElementContent	(const xmlChar * name, 
						 xmlElementContentType type)

 
xmlValidCtxtPtr	xmlNewValidCtxt		(void)

 
int	xmlRemoveID			(xmlDocPtr doc, 
					 xmlAttrPtr attr)

@@ -149,8 +152,10 @@ The content of this structure is not made public by the API.
 
Register a new ref declaration

 
ctxt:the validation context
doc:pointer to the document
value:the value name
attr:the attribute holding the Ref
Returns:NULL if not, otherwise the new xmlRefPtr
Function: xmlCopyAttributeTable
xmlAttributeTablePtr	xmlCopyAttributeTable	(xmlAttributeTablePtr table)

 
Build a copy of an attribute table.

-
table:An attribute table
Returns:the new xmlAttributeTablePtr or NULL in case of error.
Function: xmlCopyElementContent
xmlElementContentPtr	xmlCopyElementContent	(xmlElementContentPtr cur)

+
table:An attribute table
Returns:the new xmlAttributeTablePtr or NULL in case of error.
Function: xmlCopyDocElementContent
xmlElementContentPtr	xmlCopyDocElementContent	(xmlDocPtr doc, 
							 xmlElementContentPtr cur)

 
Build a copy of an element content description.

+
doc:the document owning the element declaration
cur:An element content pointer.
Returns:the new xmlElementContentPtr or NULL in case of error.
Function: xmlCopyElementContent
xmlElementContentPtr	xmlCopyElementContent	(xmlElementContentPtr cur)

+
Build a copy of an element content description. Deprecated, use xmlCopyDocElementContent instead

 
cur:An element content pointer.
Returns:the new xmlElementContentPtr or NULL in case of error.
Function: xmlCopyElementTable
xmlElementTablePtr	xmlCopyElementTable	(xmlElementTablePtr table)

 
Build a copy of an element table.

 
table:An element table
Returns:the new xmlElementTablePtr or NULL in case of error.
Function: xmlCopyEnumeration
xmlEnumerationPtr	xmlCopyEnumeration	(xmlEnumerationPtr cur)

@@ -173,8 +178,10 @@ The content of this structure is not made public by the API.
 
This will dump the content of the notation table as an XML DTD definition

 
buf:the XML buffer output
table:A notation table
Function: xmlFreeAttributeTable
void	xmlFreeAttributeTable		(xmlAttributeTablePtr table)

 
Deallocate the memory used by an entities hash table.

-
table:An attribute table
Function: xmlFreeElementContent
void	xmlFreeElementContent		(xmlElementContentPtr cur)

-
Free an element content structure. This is a recursive call !

+
table:An attribute table
Function: xmlFreeDocElementContent
void	xmlFreeDocElementContent	(xmlDocPtr doc, 
					 xmlElementContentPtr cur)

+
Free an element content structure. The whole subtree is removed.

+
doc:the document owning the element declaration
cur:the element content tree to free
Function: xmlFreeElementContent
void	xmlFreeElementContent		(xmlElementContentPtr cur)

+
Free an element content structure. The whole subtree is removed. Deprecated, use xmlFreeDocElementContent instead

 
cur:the element content tree to free
Function: xmlFreeElementTable
void	xmlFreeElementTable		(xmlElementTablePtr table)

 
Deallocate the memory used by an element hash table.

 
table:An element table
Function: xmlFreeEnumeration
void	xmlFreeEnumeration		(xmlEnumerationPtr cur)

@@ -207,8 +214,10 @@ The content of this structure is not made public by the API.
 
Search in the DtDs whether an element accept Mixed content (or ANY) basically if it is supposed to accept text childs

 
doc:the document
name:the element name
Returns:0 if no, 1 if yes, and -1 if no element description is available
Function: xmlIsRef
int	xmlIsRef			(xmlDocPtr doc, 
					 xmlNodePtr elem, 
					 xmlAttrPtr attr)

 
Determine whether an attribute is of type Ref. In case we have DTD(s) then this is simple, otherwise we use an heuristic: name Ref (upper or lowercase).

-
doc:the document
elem:the element carrying the attribute
attr:the attribute
Returns:0 or 1 depending on the lookup result
Function: xmlNewElementContent
xmlElementContentPtr	xmlNewElementContent	(const xmlChar * name, 
						 xmlElementContentType type)

-
Allocate an element content structure.

+
doc:the document
elem:the element carrying the attribute
attr:the attribute
Returns:0 or 1 depending on the lookup result
Function: xmlNewDocElementContent
xmlElementContentPtr	xmlNewDocElementContent	(xmlDocPtr doc, 
						 const xmlChar * name, 
						 xmlElementContentType type)

+
Allocate an element content structure for the document.

+
doc:the document
name:the subelement name or NULL
type:the type of element content decl
Returns:NULL if not, otherwise the new element content structure
Function: xmlNewElementContent
xmlElementContentPtr	xmlNewElementContent	(const xmlChar * name, 
						 xmlElementContentType type)

+
Allocate an element content structure. Deprecated in favor of xmlNewDocElementContent

 
name:the subelement name or NULL
type:the type of element content decl
Returns:NULL if not, otherwise the new element content structure
Function: xmlNewValidCtxt
xmlValidCtxtPtr	xmlNewValidCtxt		(void)

 
Allocate a validation context structure.

 
Returns:NULL if not, otherwise the new validation context structure
Function: xmlRemoveID
int	xmlRemoveID			(xmlDocPtr doc, 
					 xmlAttrPtr attr)

diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index a33b6d5b..e9fc2df7 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -362,14 +362,15 @@
      
      
      
+     
      
      
      
      
      
-     
-     
      
+     
+     
     
     
      interface for the encoding conversion functions
@@ -536,6 +537,7 @@
      
      
      
+     
      
      
      
@@ -1593,6 +1595,7 @@
      
      
      
+     
      
      
      
@@ -1610,13 +1613,13 @@
      
      
      
-     
+     
      
      
      
      
      
-     
+     
      
      
      
@@ -1626,7 +1629,7 @@
      
      
      
-     
+     
      
      
      
@@ -1647,6 +1650,8 @@
      
      
      
+     
+     
     
     
      implementation of XInclude
@@ -8357,6 +8362,12 @@ actually an xmlCharEncoding'/>
       
       
     
+    
+      Build a copy of an element content description.
+      
+      
+      
+    
     
       defined(LIBXML_TREE_ENABLED)
       Do a copy of the dtd.
@@ -8364,7 +8375,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      Build a copy of an element content description.
+      Build a copy of an element content description. Deprecated, use xmlCopyDocElementContent instead
       
       
     
@@ -8437,7 +8448,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      create and initialize an empty entities hash table.
+      create and initialize an empty entities hash table. This really doesn't make sense and should be deprecated
       
     
     
@@ -8702,6 +8713,10 @@ actually an xmlCharEncoding'/>
       
       
     
+    
+      Free the dictionary mutex.
+      
+    
     
       Create a new dictionary
       
@@ -8982,13 +8997,19 @@ actually an xmlCharEncoding'/>
       
       
     
+    
+      Free an element content structure. The whole subtree is removed.
+      
+      
+      
+    
     
       Free a DTD structure.
       
       
     
     
-      Free an element content structure. This is a recursive call !
+      Free an element content structure. The whole subtree is removed. Deprecated, use xmlFreeDocElementContent instead
       
       
     
@@ -9384,6 +9405,12 @@ actually an xmlCharEncoding'/>
       
       
     
+    
+      Create a new xmlHashTablePtr which will use @dict as the internal dictionary
+      
+      
+      
+    
     
       Callback to free data from a hash.
       
@@ -10449,6 +10476,13 @@ actually an xmlCharEncoding'/>
       
       
     
+    
+      Allocate an element content structure for the document.
+      
+      
+      
+      
+    
     
       defined(LIBXML_TREE_ENABLED)
       Creation of a new Fragment node.
@@ -10516,7 +10550,7 @@ actually an xmlCharEncoding'/>
       
     
     
-      Allocate an element content structure.
+      Allocate an element content structure. Deprecated in favor of xmlNewDocElementContent
       
       
       
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index ecfcb731..6e387797 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -1685,6 +1685,7 @@
     
     
     
+    
     
     
     
@@ -1742,6 +1743,7 @@
     
     
     
+    
     
     
     
@@ -1813,6 +1815,7 @@
     
     
     
+    
     
     
     
@@ -1888,6 +1891,7 @@
     
     
     
+    
     
     
     
@@ -2105,6 +2109,7 @@
     
     
     
+    
     
     
     
@@ -5000,6 +5005,7 @@
       
       
       
+      
       
       
       
@@ -5057,6 +5063,7 @@
       
       
       
+      
       
       
       
@@ -5128,6 +5135,7 @@
       
       
       
+      
       
       
       
@@ -5203,6 +5211,7 @@
       
       
       
+      
       
       
       
@@ -5420,6 +5429,7 @@
       
       
       
+      
       
       
       
@@ -6925,7 +6935,9 @@
       
     
     
+      
       
+      
       
       
       
@@ -6976,6 +6988,7 @@
     
       
       
+      
     
     
       
@@ -7570,6 +7583,7 @@
       
       
       
+      
       
       
       
@@ -8453,6 +8467,7 @@
       
       
       
+      
     
     
       
@@ -8478,6 +8493,7 @@
       
       
       
+      
       
       
       
@@ -8498,6 +8514,7 @@
       
       
       
+      
       
       
       
@@ -8512,6 +8529,7 @@
       
       
       
+      
       
       
       
@@ -8607,7 +8625,9 @@
       
       
       
+      
       
+      
       
       
       
@@ -8617,6 +8637,7 @@
       
     
     
+      
       
     
     
@@ -10116,6 +10137,7 @@
     
     
       
+      
       
       
       
@@ -10281,6 +10303,7 @@
       
       
       
+      
       
       
       
@@ -11280,6 +11303,7 @@
       
       
       
+      
       
       
       
@@ -11294,6 +11318,7 @@
       
       
       
+      
       
       
       
@@ -11313,6 +11338,7 @@
       
       
       
+      
       
       
       
@@ -13268,6 +13294,7 @@
         
         
           
+          
           
           
           
@@ -13500,6 +13527,7 @@
         
         
           
+          
           
           
           
@@ -14116,7 +14144,10 @@
         
           
           
+          
+          
           
+          
           
           
         
@@ -18346,7 +18377,6 @@
           
           
           
-          
           
           
           
@@ -19583,6 +19613,7 @@
         
           
           
+          
           
         
         
@@ -19736,6 +19767,7 @@
           
           
           
+          
           
           
           
@@ -19801,6 +19833,7 @@
           
           
           
+          
           
           
           
@@ -19917,9 +19950,11 @@
         
         
           
+          
           
           
           
+          
         
         
           
@@ -20132,6 +20167,7 @@
           
           
           
+          
           
           
           
@@ -20932,6 +20968,9 @@
         
           
         
+        
+          
+        
         
           
           
@@ -22257,6 +22296,8 @@
           
           
           
+          
+          
           
           
           
@@ -22956,6 +22997,7 @@
           
         
         
+          
           
           
           
@@ -23329,6 +23371,7 @@
           
         
         
+          
           
           
           
@@ -23774,6 +23817,7 @@
           
           
           
+          
           
           
         
@@ -24144,6 +24188,8 @@
           
         
         
+          
+          
           
         
         
@@ -25043,6 +25089,7 @@
           
           
           
+          
         
         
           
@@ -25133,7 +25180,6 @@
           
           
           
-          
           
           
           
@@ -25370,6 +25416,8 @@
           
           
           
+          
+          
           
           
           
@@ -25916,6 +25964,9 @@
         
           
         
+        
+          
+        
         
           
         
@@ -26674,6 +26725,7 @@
         
           
           
+          
           
         
         
@@ -26755,6 +26807,8 @@
         
           
           
+          
+          
           
           
           
@@ -27945,6 +27999,10 @@
           
           
         
+        
+          
+          
+        
         
           
           
@@ -28304,6 +28362,9 @@
         
           
         
+        
+          
+        
         
           
         
@@ -28334,6 +28395,7 @@
           
         
         
+          
           
           
           
@@ -28398,6 +28460,9 @@
         
           
         
+        
+          
+        
         
           
         
@@ -28418,6 +28483,7 @@
         
         
           
+          
         
         
           
@@ -28548,6 +28614,9 @@
         
           
         
+        
+          
+        
         
           
           
diff --git a/elfgcchack.h b/elfgcchack.h
index e247b22c..2d6964d3 100644
--- a/elfgcchack.h
+++ b/elfgcchack.h
@@ -1021,6 +1021,10 @@ extern __typeof (xmlCopyDoc) xmlCopyDoc __attribute((alias("xmlCopyDoc__internal
 #define xmlCopyDoc xmlCopyDoc__internal_alias
 #endif
 
+extern __typeof (xmlCopyDocElementContent) xmlCopyDocElementContent__internal_alias __attribute((visibility("hidden")));
+extern __typeof (xmlCopyDocElementContent) xmlCopyDocElementContent __attribute((alias("xmlCopyDocElementContent__internal_alias")));
+#define xmlCopyDocElementContent xmlCopyDocElementContent__internal_alias
+
 #if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlCopyDtd) xmlCopyDtd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlCopyDtd) xmlCopyDtd __attribute((alias("xmlCopyDtd__internal_alias")));
@@ -1261,6 +1265,10 @@ extern __typeof (xmlDetectCharEncoding) xmlDetectCharEncoding__internal_alias __
 extern __typeof (xmlDetectCharEncoding) xmlDetectCharEncoding __attribute((alias("xmlDetectCharEncoding__internal_alias")));
 #define xmlDetectCharEncoding xmlDetectCharEncoding__internal_alias
 
+extern __typeof (xmlDictCleanup) xmlDictCleanup__internal_alias __attribute((visibility("hidden")));
+extern __typeof (xmlDictCleanup) xmlDictCleanup __attribute((alias("xmlDictCleanup__internal_alias")));
+#define xmlDictCleanup xmlDictCleanup__internal_alias
+
 extern __typeof (xmlDictCreate) xmlDictCreate__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlDictCreate) xmlDictCreate __attribute((alias("xmlDictCreate__internal_alias")));
 #define xmlDictCreate xmlDictCreate__internal_alias
@@ -1463,6 +1471,10 @@ extern __typeof (xmlFreeDoc) xmlFreeDoc__internal_alias __attribute((visibility(
 extern __typeof (xmlFreeDoc) xmlFreeDoc __attribute((alias("xmlFreeDoc__internal_alias")));
 #define xmlFreeDoc xmlFreeDoc__internal_alias
 
+extern __typeof (xmlFreeDocElementContent) xmlFreeDocElementContent__internal_alias __attribute((visibility("hidden")));
+extern __typeof (xmlFreeDocElementContent) xmlFreeDocElementContent __attribute((alias("xmlFreeDocElementContent__internal_alias")));
+#define xmlFreeDocElementContent xmlFreeDocElementContent__internal_alias
+
 extern __typeof (xmlFreeDtd) xmlFreeDtd__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlFreeDtd) xmlFreeDtd __attribute((alias("xmlFreeDtd__internal_alias")));
 #define xmlFreeDtd xmlFreeDtd__internal_alias
@@ -1751,6 +1763,10 @@ extern __typeof (xmlHashCreate) xmlHashCreate__internal_alias __attribute((visib
 extern __typeof (xmlHashCreate) xmlHashCreate __attribute((alias("xmlHashCreate__internal_alias")));
 #define xmlHashCreate xmlHashCreate__internal_alias
 
+extern __typeof (xmlHashCreateDict) xmlHashCreateDict__internal_alias __attribute((visibility("hidden")));
+extern __typeof (xmlHashCreateDict) xmlHashCreateDict __attribute((alias("xmlHashCreateDict__internal_alias")));
+#define xmlHashCreateDict xmlHashCreateDict__internal_alias
+
 extern __typeof (xmlHashFree) xmlHashFree__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlHashFree) xmlHashFree __attribute((alias("xmlHashFree__internal_alias")));
 #define xmlHashFree xmlHashFree__internal_alias
@@ -2525,6 +2541,10 @@ extern __typeof (xmlNewDocComment) xmlNewDocComment__internal_alias __attribute(
 extern __typeof (xmlNewDocComment) xmlNewDocComment __attribute((alias("xmlNewDocComment__internal_alias")));
 #define xmlNewDocComment xmlNewDocComment__internal_alias
 
+extern __typeof (xmlNewDocElementContent) xmlNewDocElementContent__internal_alias __attribute((visibility("hidden")));
+extern __typeof (xmlNewDocElementContent) xmlNewDocElementContent __attribute((alias("xmlNewDocElementContent__internal_alias")));
+#define xmlNewDocElementContent xmlNewDocElementContent__internal_alias
+
 #if defined(LIBXML_TREE_ENABLED)
 extern __typeof (xmlNewDocFragment) xmlNewDocFragment__internal_alias __attribute((visibility("hidden")));
 extern __typeof (xmlNewDocFragment) xmlNewDocFragment __attribute((alias("xmlNewDocFragment__internal_alias")));
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index c3031662..c8e12ba0 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -63,6 +63,9 @@ boolToText()
 debugDumpString()
 shellPrintXPathError()
 
+# functions from module dict
+dictCleanup()
+
 # functions from module encoding
 addEncodingAlias()
 cleanupCharEncodingHandlers()
diff --git a/testapi.c b/testapi.c
index 84b04f26..2dd00983 100644
--- a/testapi.c
+++ b/testapi.c
@@ -7937,6 +7937,29 @@ test_debugXML(void) {
     return(test_ret);
 }
 
+static int
+test_xmlDictCleanup(void) {
+    int test_ret = 0;
+
+    int mem_base;
+
+        mem_base = xmlMemBlocks();
+
+        xmlDictCleanup();
+        call_tests++;
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in xmlDictCleanup",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf("\n");
+        }
+    function_tests++;
+
+    return(test_ret);
+}
+
+
 static int
 test_xmlDictCreate(void) {
     int test_ret = 0;
@@ -8239,7 +8262,8 @@ static int
 test_dict(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing dict : 8 of 9 functions ...\n");
+    if (quiet == 0) printf("Testing dict : 9 of 10 functions ...\n");
+    test_ret += test_xmlDictCleanup();
     test_ret += test_xmlDictCreate();
     test_ret += test_xmlDictCreateSub();
     test_ret += test_xmlDictExists();
@@ -9616,6 +9640,16 @@ test_xmlHashCreate(void) {
 }
 
 
+static int
+test_xmlHashCreateDict(void) {
+    int test_ret = 0;
+
+
+    /* missing type support */
+    return(test_ret);
+}
+
+
 static int
 test_xmlHashLookup(void) {
     int test_ret = 0;
@@ -10348,12 +10382,13 @@ static int
 test_hash(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing hash : 16 of 23 functions ...\n");
+    if (quiet == 0) printf("Testing hash : 16 of 24 functions ...\n");
     test_ret += test_xmlHashAddEntry();
     test_ret += test_xmlHashAddEntry2();
     test_ret += test_xmlHashAddEntry3();
     test_ret += test_xmlHashCopy();
     test_ret += test_xmlHashCreate();
+    test_ret += test_xmlHashCreateDict();
     test_ret += test_xmlHashLookup();
     test_ret += test_xmlHashLookup2();
     test_ret += test_xmlHashLookup3();
@@ -23590,6 +23625,45 @@ test_xmlCopyAttributeTable(void) {
 }
 
 
+static int
+test_xmlCopyDocElementContent(void) {
+    int test_ret = 0;
+
+    int mem_base;
+    xmlElementContentPtr ret_val;
+    xmlDocPtr doc; /* the document owning the element declaration */
+    int n_doc;
+    xmlElementContentPtr cur; /* An element content pointer. */
+    int n_cur;
+
+    for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) {
+    for (n_cur = 0;n_cur < gen_nb_xmlElementContentPtr;n_cur++) {
+        mem_base = xmlMemBlocks();
+        doc = gen_xmlDocPtr(n_doc, 0);
+        cur = gen_xmlElementContentPtr(n_cur, 1);
+
+        ret_val = xmlCopyDocElementContent(doc, cur);
+        desret_xmlElementContentPtr(ret_val);
+        call_tests++;
+        des_xmlDocPtr(n_doc, doc, 0);
+        des_xmlElementContentPtr(n_cur, cur, 1);
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in xmlCopyDocElementContent",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf(" %d", n_doc);
+            printf(" %d", n_cur);
+            printf("\n");
+        }
+    }
+    }
+    function_tests++;
+
+    return(test_ret);
+}
+
+
 static int
 test_xmlCopyElementContent(void) {
     int test_ret = 0;
@@ -24305,6 +24379,52 @@ test_xmlIsRef(void) {
 }
 
 
+static int
+test_xmlNewDocElementContent(void) {
+    int test_ret = 0;
+
+    int mem_base;
+    xmlElementContentPtr ret_val;
+    xmlDocPtr doc; /* the document */
+    int n_doc;
+    xmlChar * name; /* the subelement name or NULL */
+    int n_name;
+    xmlElementContentType type; /* the type of element content decl */
+    int n_type;
+
+    for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) {
+    for (n_name = 0;n_name < gen_nb_const_xmlChar_ptr;n_name++) {
+    for (n_type = 0;n_type < gen_nb_xmlElementContentType;n_type++) {
+        mem_base = xmlMemBlocks();
+        doc = gen_xmlDocPtr(n_doc, 0);
+        name = gen_const_xmlChar_ptr(n_name, 1);
+        type = gen_xmlElementContentType(n_type, 2);
+
+        ret_val = xmlNewDocElementContent(doc, (const xmlChar *)name, type);
+        desret_xmlElementContentPtr(ret_val);
+        call_tests++;
+        des_xmlDocPtr(n_doc, doc, 0);
+        des_const_xmlChar_ptr(n_name, (const xmlChar *)name, 1);
+        des_xmlElementContentType(n_type, type, 2);
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in xmlNewDocElementContent",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf(" %d", n_doc);
+            printf(" %d", n_name);
+            printf(" %d", n_type);
+            printf("\n");
+        }
+    }
+    }
+    }
+    function_tests++;
+
+    return(test_ret);
+}
+
+
 static int
 test_xmlNewElementContent(void) {
     int test_ret = 0;
@@ -25779,13 +25899,14 @@ static int
 test_valid(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing valid : 48 of 67 functions ...\n");
+    if (quiet == 0) printf("Testing valid : 50 of 70 functions ...\n");
     test_ret += test_xmlAddAttributeDecl();
     test_ret += test_xmlAddElementDecl();
     test_ret += test_xmlAddID();
     test_ret += test_xmlAddNotationDecl();
     test_ret += test_xmlAddRef();
     test_ret += test_xmlCopyAttributeTable();
+    test_ret += test_xmlCopyDocElementContent();
     test_ret += test_xmlCopyElementContent();
     test_ret += test_xmlCopyElementTable();
     test_ret += test_xmlCopyEnumeration();
@@ -25807,6 +25928,7 @@ test_valid(void) {
     test_ret += test_xmlIsID();
     test_ret += test_xmlIsMixedElement();
     test_ret += test_xmlIsRef();
+    test_ret += test_xmlNewDocElementContent();
     test_ret += test_xmlNewElementContent();
     test_ret += test_xmlNewValidCtxt();
     test_ret += test_xmlRemoveID();
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index 07ce9590..cb7bede3 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -663,6 +663,7 @@ xmlCopyAttributeTable
 xmlCopyChar
 xmlCopyCharMultiByte
 xmlCopyDoc
+xmlCopyDocElementContent
 xmlCopyDtd
 xmlCopyElementContent
 xmlCopyElementTable
@@ -736,6 +737,7 @@ xmlDefaultSAXHandlerInit
 xmlDelEncodingAlias
 xmlDeregisterNodeDefault
 xmlDetectCharEncoding
+xmlDictCleanup
 xmlDictCreate
 xmlDictCreateSub
 xmlDictExists
@@ -781,6 +783,7 @@ xmlFreeAutomata
 xmlFreeCatalog
 #endif
 xmlFreeDoc
+xmlFreeDocElementContent
 xmlFreeDtd
 xmlFreeElementContent
 xmlFreeElementTable
@@ -848,6 +851,7 @@ xmlHashAddEntry2
 xmlHashAddEntry3
 xmlHashCopy
 xmlHashCreate
+xmlHashCreateDict
 xmlHashFree
 xmlHashLookup
 xmlHashLookup2
@@ -1130,6 +1134,7 @@ xmlNewChild
 xmlNewComment
 xmlNewDoc
 xmlNewDocComment
+xmlNewDocElementContent
 xmlNewDocFragment
 xmlNewDocNode
 xmlNewDocNodeEatName