From e6e59cdf33e02648fc8f33c357accadf2a657668 Mon Sep 17 00:00:00 2001
From: Daniel Veillard
Date: Wed, 24 Dec 2003 11:56:44 +0000
Subject: [PATCH] updated the docs and prepared a new release 2.6.4 Daniel
* configure.in NEWS doc/*: updated the docs and prepared a new
release 2.6.4
Daniel
---
ChangeLog | 5 ++
NEWS | 18 ++++-
configure.in | 2 +-
doc/APIchunk10.html | 7 +-
doc/APIchunk12.html | 4 ++
doc/APIchunk15.html | 28 ++------
doc/APIchunk16.html | 5 ++
doc/APIchunk17.html | 1 +
doc/APIchunk19.html | 1 +
doc/APIchunk20.html | 3 +-
doc/APIchunk21.html | 10 ++-
doc/APIchunk22.html | 3 +
doc/APIchunk4.html | 6 +-
doc/APIchunk8.html | 7 ++
doc/APIchunk9.html | 2 +
doc/APIconstructors.html | 10 +--
doc/encoding.html | 4 +-
doc/html/libxml-parser.html | 26 +++----
doc/html/libxml-parserInternals.html | 2 +-
doc/html/libxml-schemasInternals.html | 1 +
doc/html/libxml-tree.html | 4 +-
doc/html/libxml-xmlmemory.html | 16 ++---
doc/html/libxml-xmlreader.html | 40 +++++------
doc/libxml2-api.xml | 97 ++++++++++++++-------------
doc/libxml2-refs.xml | 83 +++++++++++++++--------
doc/libxml2.xsa | 39 ++++-------
doc/news.html | 15 ++++-
doc/xml.html | 23 +++++--
28 files changed, 276 insertions(+), 186 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1f5fcb39..b117430d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 24 12:54:25 CET 2003 Daniel Veillard
+
+ * configure.in NEWS doc/*: updated the docs and prepared a new
+ release 2.6.4
+
Wed Dec 24 12:07:52 CET 2003 Daniel Veillard
* legacy.c: remove deprecated warning on startElement()
diff --git a/NEWS b/NEWS
index 4ad0f867..eeded5c9 100644
--- a/NEWS
+++ b/NEWS
@@ -15,10 +15,24 @@ to test those - More testing on RelaxNG
Schemas
+2.6.4: Dec 24 2003:
+ - Windows build fixes (Igor Zlatkovic)
+ - Some serious XInclude problems reported by Oleg Paraschenko and
+ - Unix and Makefile packaging fixes (me, William Brack,
+ - Documentation improvements (John Fleck, William Brack), example fix
+ (Lucas Brasilino)
+ - bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
+ NULL strings (William Brack) , API building reader or parser from
+ filedescriptor should not close it, changed XPath sorting to be stable
+ again (William Brack), xmlGetNodePath() generating '(null)' (William
+ Brack), DTD validation and namespace bug (William Brack), XML Schemas
+ double inclusion behaviour
+
+
2.6.3: Dec 10 2003:
- documentation updates and cleanup (DV, William Brack, John Fleck)
- added a repository of examples, examples from Aleksey Sanin, Dodji
- Seketeli, Alfred Mickautsch
+ Seketeli, Alfred Mickautsch
- Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher, Mingw
(Kenneth Haley)
- Unicode range checking (William Brack)
@@ -35,7 +49,7 @@ to test those - More testing on RelaxNG
namespace change.
- XML Schemas improvements: include (Robert Stepanek), import and
namespace handling, fixed the regression tests troubles, added examples
- based on Eric van der Vlist book, regexp fixes
+ based on Eric van der Vlist book, regexp fixes
- preliminary pattern support for streaming (needed for schemas
constraints), added xmlTextReaderPreservePattern() to collect subdocument
when streaming.
diff --git a/configure.in b/configure.in
index 2b229565..392c597c 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_HOST
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=3
+LIBXML_MICRO_VERSION=4
LIBXML_MICRO_VERSION_SUFFIX=
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html
index 48e2d4f3..cb6c2702 100644
--- a/doc/APIchunk10.html
+++ b/doc/APIchunk10.html
@@ -234,6 +234,7 @@ A:link, A:visited, A:active { text-decoration: underline }
checkingxlinkIsLink
xmlBufferWriteQuotedString
xmlBuildURI
+xmlMemFree
xmlUTF8Strlen
checkingsxmlValidateOneElement
checkshtmlAutoCloseTag
@@ -333,7 +334,11 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlReaderForIO
xmlReaderNewIO
xmlTextReaderClose
-closedxmlTextWriterEndDocument
+closedxmlCtxtReadFd
+xmlReadFd
+xmlReaderForFd
+xmlReaderNewFd
+xmlTextWriterEndDocument
closesxmlNanoHTTPClose
xmlNanoHTTPSave
closestxmlXPathCeilingFunction
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html
index 21f7efd1..1da73a4a 100644
--- a/doc/APIchunk12.html
+++ b/doc/APIchunk12.html
@@ -222,7 +222,11 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlListDataCompare
equivalentxmlMallocAtomicLoc
xmlMallocLoc
+xmlMemFree
+xmlMemMalloc
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlNodeListGetRawString
xmlNodeListGetString
xmlReallocLoc
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html
index 64df767e..784dc8f2 100644
--- a/doc/APIchunk15.html
+++ b/doc/APIchunk15.html
@@ -228,7 +228,10 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlInitNodeInfoSeq
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlNanoFTPList
xmlParserAddNodeInfo
xmlParserFindNodeInfo
@@ -282,11 +285,15 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlEntityReferenceFunc
xmlNodeGetSpacePreserve
xmlXPathNextAttribute
+inheritsxmlNewChild
+xmlNewTextChild
initial_xmlDoc
xmlAutomataGetInitState
xmlBufferCreateSize
xmlInitNodeInfoSeq
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlReallocLoc
xmlShell
xmlXPathNodeSetAdd
@@ -366,27 +373,6 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlNewPI
xmlSAX2ProcessingInstruction
insufficientxmlCanonicPath
-int_xmlParserCtxt
-c
-getColumnNumber
-getLineNumber
-htmlHandleOmittedElem
-htmlParseCharRef
-xmlIsLetter
-xmlKeepBlanksDefault
-xmlLineNumbersDefault
-xmlMallocAtomicLoc
-xmlMallocLoc
-xmlMemUsed
-xmlParseCharData
-xmlParseCharRef
-xmlPedanticParserDefault
-xmlReallocLoc
-xmlSAX2GetColumnNumber
-xmlSAX2GetLineNumber
-xmlShellCmd
-xmlSplitQName3
-xmlSubstituteEntitiesDefault
integerxmlStrcasecmp
xmlStrcmp
xmlStrncasecmp
diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html
index fc61d026..6f94f873 100644
--- a/doc/APIchunk16.html
+++ b/doc/APIchunk16.html
@@ -92,6 +92,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlCharEncodingOutputFunc
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlReallocLoc
langxmlNodeGetLang
xmlXPathLangFunction
@@ -337,7 +339,10 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlUnlockLibrary
loggingxmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlReallocLoc
longIS_BASECHAR
IS_COMBINING
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html
index 919e2a41..d587e738 100644
--- a/doc/APIchunk17.html
+++ b/doc/APIchunk17.html
@@ -60,6 +60,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlMallocFunc
xmlMallocLoc
xmlMemGet
+xmlMemMalloc
xmlMemSetup
mallocAtomicFuncxmlGcMemGet
xmlGcMemSetup
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html
index 0766df8f..6c295b35 100644
--- a/doc/APIchunk19.html
+++ b/doc/APIchunk19.html
@@ -60,6 +60,7 @@ A:link, A:visited, A:active { text-decoration: underline }
occurencesxmlAutomataNewCountTrans
xmlAutomataNewOnceTrans
occurredxmlMemStrdupLoc
+xmlMemoryStrdup
occurrencexmlStrcasestr
xmlStrchr
xmlStrstr
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html
index d7718bb5..18ecb35a 100644
--- a/doc/APIchunk20.html
+++ b/doc/APIchunk20.html
@@ -195,7 +195,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathBooleanFunction
xmlXPathFloorFunction
xmlXPathStringFunction
-possiblexmlCreateEntityParserCtxt
+possible_xmlSchemaType
+xmlCreateEntityParserCtxt
xmlParseDefaultDecl
xmlParseExternalID
xmlReconciliateNs
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html
index af8576f3..cc053760 100644
--- a/doc/APIchunk21.html
+++ b/doc/APIchunk21.html
@@ -107,7 +107,9 @@ A:link, A:visited, A:active { text-decoration: underline }
reachedxmlRegExecPushString
xmlRegExecPushString2
readablexmlStrEqual
-readerxmlFreeTextReader
+readerxmlCtxtReadFd
+xmlFreeTextReader
+xmlReadFd
xmlReaderForDoc
xmlReaderForFd
xmlReaderForFile
@@ -139,6 +141,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlGcMemGet
xmlGcMemSetup
xmlMemGet
+xmlMemRealloc
xmlMemSetup
xmlReallocFunc
xmlReallocLoc
@@ -222,6 +225,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlParseAttValue
redeclaredxmlReconciliateNs
redefinitionxmlErrMemory
+redefinitions_xmlSchemaType
redirxmlNanoHTTPMethodRedir
redirectedxmlNanoHTTPMethodRedir
xmlNanoHTTPOpenRedir
@@ -429,9 +433,13 @@ A:link, A:visited, A:active { text-decoration: underline }
reservedxmlNewTextChild
xmlURIEscapeStr
resetinitGenericErrorDefaultFunc
+xmlCtxtReadFd
xmlNodeSetBase
xmlNodeSetName
xmlNodeSetSpacePreserve
+xmlReadFd
+xmlReaderForFd
+xmlReaderNewFd
xmlSetGenericErrorFunc
xmlSetNsProp
xmlSetProp
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html
index 0285b350..fff14849 100644
--- a/doc/APIchunk22.html
+++ b/doc/APIchunk22.html
@@ -442,6 +442,8 @@ A:link, A:visited, A:active { text-decoration: underline }
specifyxmlTextReaderLookupNamespace
specifyingxmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlReallocLoc
speedxmlXPathOrderDocElems
speedupxmlTextReaderConstString
@@ -568,6 +570,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlMemGet
xmlMemSetup
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlStrdup
xmlStrdupFunc
stream_xmlParserCtxt
diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html
index 828aa170..2b0672b5 100644
--- a/doc/APIchunk4.html
+++ b/doc/APIchunk4.html
@@ -179,8 +179,12 @@ A:link, A:visited, A:active { text-decoration: underline }
NOTATIONxmlParseEnumeratedType
xmlParseNotationType
xmlValidateDtdFinal
-NOTExmlParseExternalID
+NOTExmlCtxtReadFd
+xmlParseExternalID
xmlParseNotationDecl
+xmlReadFd
+xmlReaderForFd
+xmlReaderNewFd
NOTE:_xmlParserInput
htmlSetMetaEncoding
xmlCheckLanguageID
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html
index f132e03a..854a05ac 100644
--- a/doc/APIchunk8.html
+++ b/doc/APIchunk8.html
@@ -403,6 +403,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlBuildQName
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlNewMutex
xmlNewRMutex
xmlReallocLoc
@@ -411,7 +413,10 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlGetBufferAllocationScheme
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlNormalizeURIPath
xmlReallocLoc
xmlSetBufferAllocationScheme
@@ -593,6 +598,8 @@ A:link, A:visited, A:active { text-decoration: underline }
areaxmlBufferCreateStatic
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlParserInputBufferCreateMem
xmlParserInputBufferCreateStatic
xmlReallocLoc
diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html
index 8cb407cd..eb265197 100644
--- a/doc/APIchunk9.html
+++ b/doc/APIchunk9.html
@@ -269,6 +269,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlCharEncOutFunc
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlNanoFTPRead
xmlNanoHTTPRead
xmlOutputBufferClose
diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html
index dbfe0f6e..ac23e72d 100644
--- a/doc/APIconstructors.html
+++ b/doc/APIconstructors.html
@@ -17,7 +17,6 @@ A:link, A:visited, A:active { text-decoration: underline }
htmlGetMetaEncoding
xmlTextReaderConstLocalName
xmlParseName
-getSystemId
namePop
xmlStrcasestr
xmlDictLookup
@@ -27,6 +26,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlParseEncodingDecl
xmlBufferContent
xmlTextReaderConstString
+getSystemId
xmlCatalogGetSystem
xmlSAX2GetPublicId
xmlTextReaderConstName
@@ -56,6 +56,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathPopNumber
xmlXPathCastBooleanToNumber
Type htmlDocPtr:
htmlParseDoc
+htmlReadIO
htmlCtxtReadFile
htmlSAXParseDoc
htmlCtxtReadFd
@@ -69,7 +70,6 @@ A:link, A:visited, A:active { text-decoration: underline }
htmlParseFile
htmlReadDoc
htmlNewDoc
-htmlReadIO
htmlReadFd
Type htmlParserCtxtPtr:
htmlCreatePushParserCtxt
htmlCreateFileParserCtxt
@@ -156,11 +156,11 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlScanName
xmlValidCtxtNormalizeAttributeValue
xmlGetNoNsProp
+xmlStrcat
xmlTextReaderReadOuterXml
xmlNodeListGetRawString
xmlTextReaderNamespaceUri
xmlCatalogResolvePublic
-xmlStrcat
xmlXPathPopString
xmlTextReaderReadString
xmlCatalogResolveSystem
@@ -269,10 +269,10 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlParseFile
xmlTextReaderCurrentDoc
xmlNewDoc
-
Type xmlDtdPtr:
xmlCopyDtd
+
Type xmlDtdPtr:
xmlIOParseDTD
+xmlCopyDtd
xmlGetIntSubset
xmlCreateIntSubset
-xmlIOParseDTD
xmlSAXParseDTD
xmlParseDTD
xmlNewDtd
diff --git a/doc/encoding.html b/doc/encoding.html
index ad57821b..85af4a3d 100644
--- a/doc/encoding.html
+++ b/doc/encoding.html
@@ -15,8 +15,8 @@ A:link, A:visited, A:active { text-decoration: underline }
Default supported encodings
How to extend the existing
support
-If you are not really familiar with Internationalization (usual shortcut is
-I18N) , Unicode, characters and glyphs, I suggest you read a presentation
+
If you are not really familiar with Internationalization (usual shortcut
+is I18N) , Unicode, characters and glyphs, I suggest you read a presentation
by Tim Bray on Unicode and why you should care about it.
XML was designed from the start to allow the support of any character set
by using Unicode. Any conformant XML parser has to support the UTF-8 and
UTF-16 default encodings which can both express the full unicode ranges. UTF8
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 22d54ab5..f91e5ea1 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -390,21 +390,21 @@ void warningSAXFunc (void * ctx,
const char * msg,
...
Create a parser context for using the XML parser in push mode. If @buffer and @size are non-NULL, the data is used to detect the encoding. The remaining characters will be parsed so they don't need to be fed in again through xmlParseChunk. To allow content encoding detection, @size should be >= 4 The value of @filename is used for fetching external entities and error/warning reports.
sax: | a SAX handler |
user_data: | The user data returned on SAX callbacks |
chunk: | a pointer to an array of chars |
size: | number of chars in the array |
filename: | an optional file name or URI |
Returns: | the new parser context or NULL |
Function: xmlCtxtReadDoc
xmlDocPtr xmlCtxtReadDoc (xmlParserCtxtPtr ctxt,
const xmlChar * cur,
const char * URL,
const char * encoding,
int options)
parse an XML in-memory document and build a tree. This reuses the existing @ctxt parser context
-ctxt: | an XML parser context |
cur: | a pointer to a zero terminated string |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlCtxtReadFd
xmlDocPtr xmlCtxtReadFd (xmlParserCtxtPtr ctxt,
int fd,
const char * URL,
const char * encoding,
int options)
-
parse an XML from a file descriptor and build a tree. This reuses the existing @ctxt parser context
-ctxt: | an XML parser context |
fd: | an open file descriptor |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlCtxtReadFile
xmlDocPtr xmlCtxtReadFile (xmlParserCtxtPtr ctxt,
const char * filename,
const char * encoding,
int options)
+ctxt: | an XML parser context |
cur: | a pointer to a zero terminated string |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlCtxtReadFd
xmlDocPtr xmlCtxtReadFd (xmlParserCtxtPtr ctxt,
int fd,
const char * URL,
const char * encoding,
int options)
+
parse an XML from a file descriptor and build a tree. This reuses the existing @ctxt parser context NOTE that the file descriptor will not be closed when the reader is closed or reset.
+ctxt: | an XML parser context |
fd: | an open file descriptor |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlCtxtReadFile
xmlDocPtr xmlCtxtReadFile (xmlParserCtxtPtr ctxt,
const char * filename,
const char * encoding,
int options)
parse an XML file from the filesystem or the network. This reuses the existing @ctxt parser context
-ctxt: | an XML parser context |
filename: | a file or URL |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlCtxtReadIO
xmlDocPtr xmlCtxtReadIO (xmlParserCtxtPtr ctxt,
xmlInputReadCallback ioread,
xmlInputCloseCallback ioclose,
void * ioctx,
const char * URL,
const char * encoding,
int options)
+ctxt: | an XML parser context |
filename: | a file or URL |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlCtxtReadIO
xmlDocPtr xmlCtxtReadIO (xmlParserCtxtPtr ctxt,
xmlInputReadCallback ioread,
xmlInputCloseCallback ioclose,
void * ioctx,
const char * URL,
const char * encoding,
int options)
parse an XML document from I/O functions and source and build a tree. This reuses the existing @ctxt parser context
-ctxt: | an XML parser context |
ioread: | an I/O read function |
ioclose: | an I/O close function |
ioctx: | an I/O handler |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlCtxtReadMemory
xmlDocPtr xmlCtxtReadMemory (xmlParserCtxtPtr ctxt,
const char * buffer,
int size,
const char * URL,
const char * encoding,
int options)
+ctxt: | an XML parser context |
ioread: | an I/O read function |
ioclose: | an I/O close function |
ioctx: | an I/O handler |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlCtxtReadMemory
xmlDocPtr xmlCtxtReadMemory (xmlParserCtxtPtr ctxt,
const char * buffer,
int size,
const char * URL,
const char * encoding,
int options)
parse an XML in-memory document and build a tree. This reuses the existing @ctxt parser context
-ctxt: | an XML parser context |
buffer: | a pointer to a char array |
size: | the size of the array |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlCtxtReset
void xmlCtxtReset (xmlParserCtxtPtr ctxt)
+ctxt: | an XML parser context |
buffer: | a pointer to a char array |
size: | the size of the array |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlCtxtReset
void xmlCtxtReset (xmlParserCtxtPtr ctxt)
Reset a parser context
ctxt: | an XML parser context |
Function: xmlCtxtResetPush
int xmlCtxtResetPush (xmlParserCtxtPtr ctxt,
const char * chunk,
int size,
const char * filename,
const char * encoding)
Reset a push parser context
ctxt: | an XML parser context |
chunk: | a pointer to an array of chars |
size: | number of chars in the array |
filename: | an optional file name or URI |
encoding: | the document encoding, or NULL |
Returns: | 0 in case of success and 1 in case of error |
Function: xmlCtxtUseOptions
int xmlCtxtUseOptions (xmlParserCtxtPtr ctxt,
int options)
Applies the options to the parser context
-ctxt: | an XML parser context |
options: | a combination of xmlParserOption(s) |
Returns: | 0 in case of success, the set of unknown or unimplemented options in case of error. |
Function type: xmlExternalEntityLoader
Function type: xmlExternalEntityLoader
+ctxt: | an XML parser context |
options: | a combination of xmlParserOption |
Returns: | 0 in case of success, the set of unknown or unimplemented options in case of error. |
Function type: xmlExternalEntityLoader
Function type: xmlExternalEntityLoader
xmlParserInputPtr xmlExternalEntityLoader (const char * URL,
const char * ID,
xmlParserCtxtPtr context)
External entity loaders types.
URL: | The System ID of the resource requested |
ID: | The Public ID of the resource requested |
context: | the XML parser context |
Returns: | the entity input parser. |
Function: xmlFreeParserCtxt
void xmlFreeParserCtxt (xmlParserCtxtPtr ctxt)
@@ -474,15 +474,15 @@ void xmlParserInputDeallocate (xmlChar *
Set and return the previous value for enabling pedantic warnings.
val: | int 0 or 1 |
Returns: | the last value for 0 for no substitution, 1 for substitution. |
Function: xmlReadDoc
xmlDocPtr xmlReadDoc (const xmlChar * cur,
const char * URL,
const char * encoding,
int options)
parse an XML in-memory document and build a tree.
-cur: | a pointer to a zero terminated string |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlReadFd
xmlDocPtr xmlReadFd (int fd,
const char * URL,
const char * encoding,
int options)
-
parse an XML from a file descriptor and build a tree.
-fd: | an open file descriptor |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlReadFile
xmlDocPtr xmlReadFile (const char * filename,
const char * encoding,
int options)
+cur: | a pointer to a zero terminated string |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlReadFd
xmlDocPtr xmlReadFd (int fd,
const char * URL,
const char * encoding,
int options)
+
parse an XML from a file descriptor and build a tree. NOTE that the file descriptor will not be closed when the reader is closed or reset.
+fd: | an open file descriptor |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlReadFile
xmlDocPtr xmlReadFile (const char * filename,
const char * encoding,
int options)
parse an XML file from the filesystem or the network.
-filename: | a file or URL |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlReadIO
xmlDocPtr xmlReadIO (xmlInputReadCallback ioread,
xmlInputCloseCallback ioclose,
void * ioctx,
const char * URL,
const char * encoding,
int options)
+filename: | a file or URL |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlReadIO
xmlDocPtr xmlReadIO (xmlInputReadCallback ioread,
xmlInputCloseCallback ioclose,
void * ioctx,
const char * URL,
const char * encoding,
int options)
parse an XML document from I/O functions and source and build a tree.
-ioread: | an I/O read function |
ioclose: | an I/O close function |
ioctx: | an I/O handler |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlReadMemory
xmlDocPtr xmlReadMemory (const char * buffer,
int size,
const char * URL,
const char * encoding,
int options)
+ioread: | an I/O read function |
ioclose: | an I/O close function |
ioctx: | an I/O handler |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlReadMemory
xmlDocPtr xmlReadMemory (const char * buffer,
int size,
const char * URL,
const char * encoding,
int options)
parse an XML in-memory document and build a tree.
-buffer: | a pointer to a char array |
size: | the size of the array |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the resulting document tree |
Function: xmlRecoverDoc
xmlDocPtr xmlRecoverDoc (xmlChar * cur)
+buffer: | a pointer to a char array |
size: | the size of the array |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the resulting document tree |
Function: xmlRecoverDoc
xmlDocPtr xmlRecoverDoc (xmlChar * cur)
parse an XML in-memory document and build a tree. In the case the document is not Well Formed, a tree is built anyway
cur: | a pointer to an array of xmlChar |
Returns: | the resulting document tree |
Function: xmlRecoverFile
xmlDocPtr xmlRecoverFile (const char * filename)
parse an XML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. In the case the document is not Well Formed, a tree is built anyway
diff --git a/doc/html/libxml-parserInternals.html b/doc/html/libxml-parserInternals.html
index c722d96b..44e363b8 100644
--- a/doc/html/libxml-parserInternals.html
+++ b/doc/html/libxml-parserInternals.html
@@ -160,7 +160,7 @@ void xmlEntityReferenceFunc (
buffer: | a pointer to a char array |
size: | the size of the array |
Returns: | the new parser context or NULL |
Function: xmlCreateURLParserCtxt
xmlParserCtxtPtr xmlCreateURLParserCtxt (const char * filename,
int options)
Create a parser context for a file or URL content. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time and for file accesses
-filename: | the filename or URL |
options: | a combination of xmlParserOption(s) |
Returns: | the new parser context or NULL |
Function: xmlCurrentChar
int xmlCurrentChar (xmlParserCtxtPtr ctxt,
int * len)
+filename: | the filename or URL |
options: | a combination of xmlParserOption |
Returns: | the new parser context or NULL |
Function: xmlCurrentChar
int xmlCurrentChar (xmlParserCtxtPtr ctxt,
int * len)
The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. Implement the end of line normalization: 2.11 End-of-Line Handling Wherever an external parsed entity or the literal entity value of an internal parsed entity contains either the literal two-character sequence "#xD#xA" or a standalone literal #xD, an XML processor must pass to the application the single character #xA. This behavior can conveniently be produced by normalizing all line breaks to #xA on input, before parsing.)
ctxt: | the XML parser context |
len: | pointer to the length of the char read |
Returns: | the current char value and its length |
Function: xmlDecodeEntities
xmlChar * xmlDecodeEntities (xmlParserCtxtPtr ctxt,
int len,
int what,
xmlChar end,
xmlChar end2,
xmlChar end3)
This function is deprecated, we now always process entities content through xmlStringDecodeEntities TODO: remove it in next major release. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';'
diff --git a/doc/html/libxml-schemasInternals.html b/doc/html/libxml-schemasInternals.html
index f8b7bc0a..10964954 100644
--- a/doc/html/libxml-schemasInternals.html
+++ b/doc/html/libxml-schemasInternals.html
@@ -149,6 +149,7 @@ The content of this structure is not made public by the API.
const xmlChar * baseNs
xmlSchemaTypePtr baseType
xmlSchemaFacetPtr facets
+ struct _xmlSchemaType * redef : possible redefinitions for the type
}
Enum xmlSchemaTypeType {
XML_SCHEMA_TYPE_BASIC = 1
XML_SCHEMA_TYPE_ANY = 2
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index a6bf5872..48ce8536 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -729,7 +729,7 @@ A:link, A:visited, A:active { text-decoration: underline }
doc: | the document |
content: | the CDATA block content content |
len: | the length of the block |
Returns: | a pointer to the new node object. |
Function: xmlNewCharRef
xmlNodePtr xmlNewCharRef (xmlDocPtr doc,
const xmlChar * name)
Creation of a new character reference node.
doc: | the document |
name: | the char ref string, starting with # or "&# ... ;" |
Returns: | a pointer to the new node object. |
Function: xmlNewChild
xmlNodePtr xmlNewChild (xmlNodePtr parent,
xmlNsPtr ns,
const xmlChar * name,
const xmlChar * content)
-
Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @content is non NULL, a child list containing the TEXTs and ENTITY_REFs node will be created. NOTE: @content is supposed to be a piece of XML CDATA, so it allows entity references. XML special chars must be escaped first by using xmlEncodeEntitiesReentrant(), or xmlNewTextChild() should be used.
+
Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @ns is NULL, the newly created element inherits the namespace of @parent. If @content is non NULL, a child list containing the TEXTs and ENTITY_REFs node will be created. NOTE: @content is supposed to be a piece of XML CDATA, so it allows entity references. XML special chars must be escaped first by using xmlEncodeEntitiesReentrant(), or xmlNewTextChild() should be used.
parent: | the parent node |
ns: | a namespace if any |
name: | the name of the child |
content: | the XML content of the child if any. |
Returns: | a pointer to the new node object. |
Function: xmlNewComment
xmlNodePtr xmlNewComment (const xmlChar * content)
Creation of a new node containing a comment.
content: | the comment content |
Returns: | a pointer to the new node object. |
Function: xmlNewDoc
xmlDocPtr xmlNewDoc (const xmlChar * version)
@@ -773,7 +773,7 @@ A:link, A:visited, A:active { text-decoration: underline }
doc: | the document |
name: | the reference name, or the reference string with & and ; |
Returns: | a pointer to the new node object. |
Function: xmlNewText
xmlNodePtr xmlNewText (const xmlChar * content)
Creation of a new text node.
content: | the text content |
Returns: | a pointer to the new node object. |
Function: xmlNewTextChild
xmlNodePtr xmlNewTextChild (xmlNodePtr parent,
xmlNsPtr ns,
const xmlChar * name,
const xmlChar * content)
-
Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @content is non NULL, a child TEXT node will be created containing the string @content. NOTE: Use xmlNewChild() if @content will contain entities that need to be preserved. Use this function, xmlNewTextChild(), if you need to ensure that reserved XML chars that might appear in @content, such as the ampersand, greater-than or less-than signs, are automatically replaced by their XML escaped entity representations.
+
Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @ns is NULL, the newly created element inherits the namespace of @parent. If @content is non NULL, a child TEXT node will be created containing the string @content. NOTE: Use xmlNewChild() if @content will contain entities that need to be preserved. Use this function, xmlNewTextChild(), if you need to ensure that reserved XML chars that might appear in @content, such as the ampersand, greater-than or less-than signs, are automatically replaced by their XML escaped entity representations.
parent: | the parent node |
ns: | a namespace if any |
name: | the name of the child |
content: | the text content of the child if any. |
Returns: | a pointer to the new node object. |
Function: xmlNewTextLen
xmlNodePtr xmlNewTextLen (const xmlChar * content,
int len)
Creation of a new text node with an extra parameter for the content's length
content: | the text content |
len: | the text len. |
Returns: | a pointer to the new node object. |
Function: xmlNodeAddContent
void xmlNodeAddContent (xmlNodePtr cur,
const xmlChar * content)
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 2f8462fc..746188ba 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -68,14 +68,14 @@ void * xmlMallocFunc (size_t size)
size: | an int specifying the size in byte to allocate. |
file: | the file name or NULL |
line: | the line number |
Returns: | a pointer to the allocated area or NULL in case of lack of memory. |
Function: xmlMemDisplay
void xmlMemDisplay (FILE * fp)
show in-extenso the memory blocks allocated
fp: | a FILE descriptor used as the output file, if NULL, the result is written to the file .memorylist |
Function: xmlMemFree
void xmlMemFree (void * ptr)
-
-Function: xmlMemGet
int xmlMemGet (xmlFreeFunc * freeFunc,
xmlMallocFunc * mallocFunc,
xmlReallocFunc * reallocFunc,
xmlStrdupFunc * strdupFunc)
+
a free() equivalent, with error checking.
+ptr: | the memory block pointer |
Function: xmlMemGet
int xmlMemGet (xmlFreeFunc * freeFunc,
xmlMallocFunc * mallocFunc,
xmlReallocFunc * reallocFunc,
xmlStrdupFunc * strdupFunc)
Provides the memory access functions set currently in use
freeFunc: | place to save the free() function in use |
mallocFunc: | place to save the malloc() function in use |
reallocFunc: | place to save the realloc() function in use |
strdupFunc: | place to save the strdup() function in use |
Returns: | 0 on success |
Function: xmlMemMalloc
void * xmlMemMalloc (size_t size)
-
-Function: xmlMemRealloc
void * xmlMemRealloc (void * ptr,
size_t size)
-
-Function: xmlMemSetup
int xmlMemSetup (xmlFreeFunc freeFunc,
xmlMallocFunc mallocFunc,
xmlReallocFunc reallocFunc,
xmlStrdupFunc strdupFunc)
+
a malloc() equivalent, with logging of the allocation info.
+size: | an int specifying the size in byte to allocate. |
Returns: | a pointer to the allocated area or NULL in case of lack of memory. |
Function: xmlMemRealloc
void * xmlMemRealloc (void * ptr,
size_t size)
+
a realloc() equivalent, with logging of the allocation info.
+ptr: | the initial memory block pointer |
size: | an int specifying the size in byte to allocate. |
Returns: | a pointer to the allocated area or NULL in case of lack of memory. |
Function: xmlMemSetup
int xmlMemSetup (xmlFreeFunc freeFunc,
xmlMallocFunc mallocFunc,
xmlReallocFunc reallocFunc,
xmlStrdupFunc strdupFunc)
Override the default memory access functions with a new set This has to be called before any other libxml routines ! Should this be blocked if there was already some allocations done ?
freeFunc: | the free() function to use |
mallocFunc: | the malloc() function to use |
reallocFunc: | the realloc() function to use |
strdupFunc: | the strdup() function to use |
Returns: | 0 on success |
Function: xmlMemShow
void xmlMemShow (FILE * fp,
int nr)
show a show display of the memory allocated, and dump the @nr last allocated areas which were not freed
@@ -86,8 +86,8 @@ void * xmlMallocFunc (size_t size)
Returns: | an int representing the amount of memory allocated. |
Function: xmlMemoryDump
void xmlMemoryDump (void)
Dump in-extenso the memory blocks allocated to the file .memorylist
Function: xmlMemoryStrdup
char * xmlMemoryStrdup (const char * str)
-
-Function type: xmlReallocFunc
Function type: xmlReallocFunc
+
a strdup() equivalent, with logging of the allocation info.
+str: | the initial string pointer |
Returns: | a pointer to the new string or NULL if allocation error occurred. |
Function type: xmlReallocFunc
Function type: xmlReallocFunc
void * xmlReallocFunc (void * mem,
size_t size)
Signature for a realloc() implementation.
mem: | an already allocated block of memory |
size: | the new size requested in bytes |
Returns: | a pointer to the newly reallocated block or NULL in case of error. |
Function: xmlReallocLoc
void * xmlReallocLoc (void * ptr,
size_t size,
const char * file,
int line)
diff --git a/doc/html/libxml-xmlreader.html b/doc/html/libxml-xmlreader.html
index 936150d5..e0c83b78 100644
--- a/doc/html/libxml-xmlreader.html
+++ b/doc/html/libxml-xmlreader.html
@@ -135,26 +135,26 @@ The content of this structure is not made public by the API.
Function: xmlNewTextReaderFilename
xmlTextReaderPtr xmlNewTextReaderFilename (const char * URI)
Create an xmlTextReader structure fed with the resource at @URI
URI: | the URI of the resource to process |
Returns: | the new xmlTextReaderPtr or NULL in case of error |
Function: xmlReaderForDoc
xmlTextReaderPtr xmlReaderForDoc (const xmlChar * cur,
const char * URL,
const char * encoding,
int options)
-
Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption(s).
-cur: | a pointer to a zero terminated string |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderForFd
xmlTextReaderPtr xmlReaderForFd (int fd,
const char * URL,
const char * encoding,
int options)
-
Create an xmltextReader for an XML from a file descriptor. The parsing flags @options are a combination of xmlParserOption(s).
-fd: | an open file descriptor |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderForFile
xmlTextReaderPtr xmlReaderForFile (const char * filename,
const char * encoding,
int options)
-
parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption(s).
-filename: | a file or URL |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderForIO
xmlTextReaderPtr xmlReaderForIO (xmlInputReadCallback ioread,
xmlInputCloseCallback ioclose,
void * ioctx,
const char * URL,
const char * encoding,
int options)
-
Create an xmltextReader for an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption(s).
-ioread: | an I/O read function |
ioclose: | an I/O close function |
ioctx: | an I/O handler |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderForMemory
xmlTextReaderPtr xmlReaderForMemory (const char * buffer,
int size,
const char * URL,
const char * encoding,
int options)
-
Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption(s).
-buffer: | a pointer to a char array |
size: | the size of the array |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderNewDoc
int xmlReaderNewDoc (xmlTextReaderPtr reader,
const xmlChar * cur,
const char * URL,
const char * encoding,
int options)
-
Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
-reader: | an XML reader |
cur: | a pointer to a zero terminated string |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewFd
int xmlReaderNewFd (xmlTextReaderPtr reader,
int fd,
const char * URL,
const char * encoding,
int options)
-
Setup an xmltextReader to parse an XML from a file descriptor. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
-reader: | an XML reader |
fd: | an open file descriptor |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewFile
int xmlReaderNewFile (xmlTextReaderPtr reader,
const char * filename,
const char * encoding,
int options)
-
parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
-reader: | an XML reader |
filename: | a file or URL |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewIO
int xmlReaderNewIO (xmlTextReaderPtr reader,
xmlInputReadCallback ioread,
xmlInputCloseCallback ioclose,
void * ioctx,
const char * URL,
const char * encoding,
int options)
-
Setup an xmltextReader to parse an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
-reader: | an XML reader |
ioread: | an I/O read function |
ioclose: | an I/O close function |
ioctx: | an I/O handler |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewMemory
int xmlReaderNewMemory (xmlTextReaderPtr reader,
const char * buffer,
int size,
const char * URL,
const char * encoding,
int options)
-
Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
-reader: | an XML reader |
buffer: | a pointer to a char array |
size: | the size of the array |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption(s) |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewWalker
int xmlReaderNewWalker (xmlTextReaderPtr reader,
xmlDocPtr doc)
+
Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption.
+cur: | a pointer to a zero terminated string |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderForFd
xmlTextReaderPtr xmlReaderForFd (int fd,
const char * URL,
const char * encoding,
int options)
+
Create an xmltextReader for an XML from a file descriptor. The parsing flags @options are a combination of xmlParserOption. NOTE that the file descriptor will not be closed when the reader is closed or reset.
+fd: | an open file descriptor |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderForFile
xmlTextReaderPtr xmlReaderForFile (const char * filename,
const char * encoding,
int options)
+
parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption.
+filename: | a file or URL |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderForIO
xmlTextReaderPtr xmlReaderForIO (xmlInputReadCallback ioread,
xmlInputCloseCallback ioclose,
void * ioctx,
const char * URL,
const char * encoding,
int options)
+
Create an xmltextReader for an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption.
+ioread: | an I/O read function |
ioclose: | an I/O close function |
ioctx: | an I/O handler |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderForMemory
xmlTextReaderPtr xmlReaderForMemory (const char * buffer,
int size,
const char * URL,
const char * encoding,
int options)
+
Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption.
+buffer: | a pointer to a char array |
size: | the size of the array |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | the new reader or NULL in case of error. |
Function: xmlReaderNewDoc
int xmlReaderNewDoc (xmlTextReaderPtr reader,
const xmlChar * cur,
const char * URL,
const char * encoding,
int options)
+
Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
+reader: | an XML reader |
cur: | a pointer to a zero terminated string |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewFd
int xmlReaderNewFd (xmlTextReaderPtr reader,
int fd,
const char * URL,
const char * encoding,
int options)
+
Setup an xmltextReader to parse an XML from a file descriptor. NOTE that the file descriptor will not be closed when the reader is closed or reset. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
+reader: | an XML reader |
fd: | an open file descriptor |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewFile
int xmlReaderNewFile (xmlTextReaderPtr reader,
const char * filename,
const char * encoding,
int options)
+
parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
+reader: | an XML reader |
filename: | a file or URL |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewIO
int xmlReaderNewIO (xmlTextReaderPtr reader,
xmlInputReadCallback ioread,
xmlInputCloseCallback ioclose,
void * ioctx,
const char * URL,
const char * encoding,
int options)
+
Setup an xmltextReader to parse an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
+reader: | an XML reader |
ioread: | an I/O read function |
ioclose: | an I/O close function |
ioctx: | an I/O handler |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewMemory
int xmlReaderNewMemory (xmlTextReaderPtr reader,
const char * buffer,
int size,
const char * URL,
const char * encoding,
int options)
+
Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
+reader: | an XML reader |
buffer: | a pointer to a char array |
size: | the size of the array |
URL: | the base URL to use for the document |
encoding: | the document encoding, or NULL |
options: | a combination of xmlParserOption |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderNewWalker
int xmlReaderNewWalker (xmlTextReaderPtr reader,
xmlDocPtr doc)
Setup an xmltextReader to parse a preparsed XML document. This reuses the existing @reader xmlTextReader.
reader: | an XML reader |
doc: | a preparsed document |
Returns: | 0 in case of success and -1 in case of error |
Function: xmlReaderWalker
xmlTextReaderPtr xmlReaderWalker (xmlDocPtr doc)
Create an xmltextReader for a preparsed document.
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 21d297d9..87788066 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -5194,6 +5194,7 @@ actually an xmlCharEncoding'/>
+
@@ -7302,7 +7303,7 @@ actually an xmlCharEncoding'/>
Create a parser context for a file or URL content. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time and for file accesses
-
+
Get the last parsing error registered.
@@ -7316,16 +7317,16 @@ actually an xmlCharEncoding'/>
-
+
- parse an XML from a file descriptor and build a tree. This reuses the existing @ctxt parser context
+ parse an XML from a file descriptor and build a tree. This reuses the existing @ctxt parser context NOTE that the file descriptor will not be closed when the reader is closed or reset.
-
+
parse an XML file from the filesystem or the network. This reuses the existing @ctxt parser context
@@ -7333,7 +7334,7 @@ actually an xmlCharEncoding'/>
-
+
parse an XML document from I/O functions and source and build a tree. This reuses the existing @ctxt parser context
@@ -7344,7 +7345,7 @@ actually an xmlCharEncoding'/>
-
+
parse an XML in-memory document and build a tree. This reuses the existing @ctxt parser context
@@ -7354,7 +7355,7 @@ actually an xmlCharEncoding'/>
-
+
Reset a parser context
@@ -7379,7 +7380,7 @@ actually an xmlCharEncoding'/>
Applies the options to the parser context
-
+
The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. Implement the end of line normalization: 2.11 End-of-Line Handling Wherever an external parsed entity or the literal entity value of an internal parsed entity contains either the literal two-character sequence "#xD#xA" or a standalone literal #xD, an XML processor must pass to the application the single character #xA. This behavior can conveniently be produced by normalizing all line breaks to #xA on input, before parsing.)
@@ -8729,9 +8730,9 @@ actually an xmlCharEncoding'/>
-
+ a free() equivalent, with error checking.
-
+
Provides the memory access functions set currently in use
@@ -8742,15 +8743,15 @@ actually an xmlCharEncoding'/>
-
-
-
+ a malloc() equivalent, with logging of the allocation info.
+
+
-
-
-
-
+ a realloc() equivalent, with logging of the allocation info.
+
+
+
Override the default memory access functions with a new set This has to be called before any other libxml routines ! Should this be blocked if there was already some allocations done ?
@@ -8782,9 +8783,9 @@ actually an xmlCharEncoding'/>
-
-
-
+ a strdup() equivalent, with logging of the allocation info.
+
+
xmlMutexLock() is used to lock a libxml2 token.
@@ -9064,7 +9065,7 @@ actually an xmlCharEncoding'/>
- Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @content is non NULL, a child list containing the TEXTs and ENTITY_REFs node will be created. NOTE: @content is supposed to be a piece of XML CDATA, so it allows entity references. XML special chars must be escaped first by using xmlEncodeEntitiesReentrant(), or xmlNewTextChild() should be used.
+ Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @ns is NULL, the newly created element inherits the namespace of @parent. If @content is non NULL, a child list containing the TEXTs and ENTITY_REFs node will be created. NOTE: @content is supposed to be a piece of XML CDATA, so it allows entity references. XML special chars must be escaped first by using xmlEncodeEntitiesReentrant(), or xmlNewTextChild() should be used.
@@ -9259,7 +9260,7 @@ actually an xmlCharEncoding'/>
- Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @content is non NULL, a child TEXT node will be created containing the string @content. NOTE: Use xmlNewChild() if @content will contain entities that need to be preserved. Use this function, xmlNewTextChild(), if you need to ensure that reserved XML chars that might appear in @content, such as the ampersand, greater-than or less-than signs, are automatically replaced by their XML escaped entity representations.
+ Creation of a new child element, added at the end of @parent children list. @ns and @content parameters are optional (NULL). If @ns is NULL, the newly created element inherits the namespace of @parent. If @content is non NULL, a child TEXT node will be created containing the string @content. NOTE: Use xmlNewChild() if @content will contain entities that need to be preserved. Use this function, xmlNewTextChild(), if you need to ensure that reserved XML chars that might appear in @content, such as the ampersand, greater-than or less-than signs, are automatically replaced by their XML escaped entity representations.
@@ -10086,22 +10087,22 @@ actually an xmlCharEncoding'/>
-
+
- parse an XML from a file descriptor and build a tree.
+ parse an XML from a file descriptor and build a tree. NOTE that the file descriptor will not be closed when the reader is closed or reset.
-
+
parse an XML file from the filesystem or the network.
-
+
parse an XML document from I/O functions and source and build a tree.
@@ -10111,7 +10112,7 @@ actually an xmlCharEncoding'/>
-
+
parse an XML in-memory document and build a tree.
@@ -10120,78 +10121,78 @@ actually an xmlCharEncoding'/>
-
+
- Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption(s).
+ Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption.
-
+
- Create an xmltextReader for an XML from a file descriptor. The parsing flags @options are a combination of xmlParserOption(s).
+ Create an xmltextReader for an XML from a file descriptor. The parsing flags @options are a combination of xmlParserOption. NOTE that the file descriptor will not be closed when the reader is closed or reset.
-
+
- parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption(s).
+ parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption.
-
+
- Create an xmltextReader for an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption(s).
+ Create an xmltextReader for an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption.
-
+
- Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption(s).
+ Create an xmltextReader for an XML in-memory document. The parsing flags @options are a combination of xmlParserOption.
-
+
- Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
+ Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
-
+
- Setup an xmltextReader to parse an XML from a file descriptor. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
+ Setup an xmltextReader to parse an XML from a file descriptor. NOTE that the file descriptor will not be closed when the reader is closed or reset. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
-
+
- parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
+ parse an XML file from the filesystem or the network. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
-
+
- Setup an xmltextReader to parse an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
+ Setup an xmltextReader to parse an XML document from I/O functions and source. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
@@ -10199,17 +10200,17 @@ actually an xmlCharEncoding'/>
-
+
- Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption(s). This reuses the existing @reader xmlTextReader.
+ Setup an xmltextReader to parse an XML in-memory document. The parsing flags @options are a combination of xmlParserOption. This reuses the existing @reader xmlTextReader.
-
+
Setup an xmltextReader to parse a preparsed XML document. This reuses the existing @reader xmlTextReader.
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 4ec48fa9..b4e5eef6 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -5734,7 +5734,6 @@
-
@@ -5744,6 +5743,7 @@
+
@@ -5783,6 +5783,7 @@
+
@@ -5796,7 +5797,6 @@
-
@@ -5923,11 +5923,11 @@
+
-
@@ -6048,10 +6048,10 @@
+
-
@@ -14134,8 +14134,12 @@
+
+
+
+
@@ -16263,6 +16267,8 @@
+
+
@@ -16273,7 +16279,10 @@
+
+
+
@@ -16545,6 +16554,8 @@
+
+
@@ -16979,6 +16990,8 @@
+
+
@@ -17268,6 +17281,7 @@
+
@@ -17403,6 +17417,10 @@
+
+
+
+
@@ -19084,7 +19102,11 @@
+
+
+
+
@@ -20515,7 +20537,10 @@
+
+
+
@@ -20580,12 +20605,18 @@
+
+
+
+
+
+
@@ -20704,29 +20735,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -20962,6 +20970,8 @@
+
+
@@ -21309,7 +21319,10 @@
+
+
+
@@ -21408,6 +21421,7 @@
+
@@ -22167,6 +22181,7 @@
+
@@ -22767,6 +22782,7 @@
+
@@ -23313,7 +23329,9 @@
+
+
@@ -23351,6 +23369,7 @@
+
@@ -23473,6 +23492,9 @@
+
+
+
@@ -23793,9 +23815,13 @@
+
+
+
+
@@ -24582,6 +24608,8 @@
+
+
@@ -24786,6 +24814,7 @@
+
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index 07e4b67d..bcc2f4b7 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,33 +8,20 @@
libxml2
- 2.6.3
- Dec 10 2003
+ 2.6.4
+ Dec 24 2003
http://xmlsoft.org/
- - documentation updates and cleanup (DV, William Brack, John Fleck)
- - added a repository of examples, examples from Aleksey Sanin, Dodji
- Seketeli, Alfred Mickautsch
- - Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher, Mingw
- (Kenneth Haley)
- - Unicode range checking (William Brack)
- - code cleanup (William Brack)
- - Python bindings: doc (John Fleck), bug fixes
- - UTF-16 cleanup and BOM issues (William Brack)
- - bug fixes: ID and xmlReader validation, XPath (William Brack),
- xmlWriter (Alfred Mickautsch), hash.h inclusion problem, HTML parser
- (James Bursa), attribute defaulting and validation, some serialization
- cleanups, XML_GET_LINE macro, memory debug when using threads (William
- Brack), serialization of attributes and entities content, xmlWriter
- (Daniel Schulman)
- - XInclude bugfix, new APIs and update to the last version including the
- namespace change.
- - XML Schemas improvements: include (Robert Stepanek), import and
- namespace handling, fixed the regression tests troubles, added examples
- based on Eric van der Vlist book, regexp fixes
- - preliminary pattern support for streaming (needed for schemas
- constraints), added xmlTextReaderPreservePattern() to collect subdocument
- when streaming.
- - various fixes in the structured error handling
+ - Windows build fixes (Igor Zlatkovic)
+ - Some serious XInclude problems reported by Oleg Paraschenko and
+ - Unix and Makefile packaging fixes (me, William Brack,
+ - Documentation improvements (John Fleck, William Brack), example fix
+ (Lucas Brasilino)
+ - bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
+ NULL strings (William Brack) , API building reader or parser from
+ filedescriptor should not close it, changed XPath sorting to be stable
+ again (William Brack), xmlGetNodePath() generating '(null)' (William
+ Brack), DTD validation and namespace bug (William Brack), XML Schemas
+ double inclusion behaviour
diff --git a/doc/news.html b/doc/news.html
index cd71924e..73fb70cf 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -12,9 +12,20 @@ for a really accurate descriptionItems not finished and worked on, get i
to test those
2.6.4: Dec 24 2003
- Windows build fixes (Igor Zlatkovic)
+ - Some serious XInclude problems reported by Oleg Paraschenko and
+ - Unix and Makefile packaging fixes (me, William Brack,
+ - Documentation improvements (John Fleck, William Brack), example fix
+ (Lucas Brasilino)
+ - bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
+ NULL strings (William Brack) , API building reader or parser from
+ filedescriptor should not close it, changed XPath sorting to be stable
+ again (William Brack), xmlGetNodePath() generating '(null)' (William
+ Brack), DTD validation and namespace bug (William Brack), XML Schemas
+ double inclusion behaviour
2.6.3: Dec 10 2003
- documentation updates and cleanup (DV, William Brack, John Fleck)
- added a repository of examples, examples from Aleksey Sanin, Dodji
- Seketeli, Alfred Mickautsch
+ Seketeli, Alfred Mickautsch
- Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher, Mingw
(Kenneth Haley)
- Unicode range checking (William Brack)
@@ -31,7 +42,7 @@ to test those- More testing on RelaxNG
namespace change.
- XML Schemas improvements: include (Robert Stepanek), import and
namespace handling, fixed the regression tests troubles, added examples
- based on Eric van der Vlist book, regexp fixes
+ based on Eric van der Vlist book, regexp fixes
- preliminary pattern support for streaming (needed for schemas
constraints), added xmlTextReaderPreservePattern() to collect subdocument
when streaming.
diff --git a/doc/xml.html b/doc/xml.html
index adb945bb..9fba28d8 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -662,11 +662,26 @@ to test those
Schemas
+2.6.4: Dec 24 2003
+
+ - Windows build fixes (Igor Zlatkovic)
+ - Some serious XInclude problems reported by Oleg Paraschenko and
+ - Unix and Makefile packaging fixes (me, William Brack,
+ - Documentation improvements (John Fleck, William Brack), example fix
+ (Lucas Brasilino)
+ - bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
+ NULL strings (William Brack) , API building reader or parser from
+ filedescriptor should not close it, changed XPath sorting to be stable
+ again (William Brack), xmlGetNodePath() generating '(null)' (William
+ Brack), DTD validation and namespace bug (William Brack), XML Schemas
+ double inclusion behaviour
+
+
2.6.3: Dec 10 2003
- documentation updates and cleanup (DV, William Brack, John Fleck)
- added a repository of examples, examples from Aleksey Sanin, Dodji
- Seketeli, Alfred Mickautsch
+ Seketeli, Alfred Mickautsch
- Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher, Mingw
(Kenneth Haley)
- Unicode range checking (William Brack)
@@ -683,7 +698,7 @@ to test those
namespace change.
- XML Schemas improvements: include (Robert Stepanek), import and
namespace handling, fixed the regression tests troubles, added examples
- based on Eric van der Vlist book, regexp fixes
+ based on Eric van der Vlist book, regexp fixes
- preliminary pattern support for streaming (needed for schemas
constraints), added xmlTextReaderPreservePattern() to collect subdocument
when streaming.
@@ -2748,8 +2763,8 @@ of a number of things:
-If you are not really familiar with Internationalization (usual shortcut is
-I18N) , Unicode, characters and glyphs, I suggest you read a If you are not really familiar with Internationalization (usual shortcut
+is I18N) , Unicode, characters and glyphs, I suggest you read a presentation
by Tim Bray on Unicode and why you should care about it.