From 60087f30f3b4cf21de48f39181736e7d71e7a661 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 10 Oct 2001 09:45:09 +0000 Subject: [PATCH] preparing 2.4.6 release updated and rebuilt the docs fixed a number of * configure.in: preparing 2.4.6 release * doc/xml.html doc/html/*: updated and rebuilt the docs * include/libxml/*.h *.c: fixed a number of teh/the widht/width typos Daniel --- ChangeLog | 6 + DOCBparser.c | 4 +- HTMLparser.c | 4 +- SAX.c | 4 +- catalog.c | 2 +- configure.in | 2 +- doc/html/book1.html | 3 +- doc/html/index.sgml | 3 + doc/html/libxml-catalog.html | 195 +++++--- doc/html/libxml-debugxml.html | 67 +-- doc/html/libxml-docbparser.html | 69 +-- doc/html/libxml-encoding.html | 129 ++--- doc/html/libxml-entities.html | 79 ++-- doc/html/libxml-htmlparser.html | 113 ++--- doc/html/libxml-htmltree.html | 69 +-- doc/html/libxml-lib.html | 3 +- doc/html/libxml-nanoftp.html | 99 ++-- doc/html/libxml-nanohttp.html | 59 +-- doc/html/libxml-notes.html | 3 +- doc/html/libxml-parser.html | 587 ++++++++++++++--------- doc/html/libxml-parserinternals.html | 461 +++++++++--------- doc/html/libxml-sax.html | 153 +++--- doc/html/libxml-tree.html | 609 ++++++++++++------------ doc/html/libxml-uri.html | 59 +-- doc/html/libxml-valid.html | 261 +++++------ doc/html/libxml-xinclude.html | 15 +- doc/html/libxml-xmlerror.html | 45 +- doc/html/libxml-xmlio.html | 169 +++---- doc/html/libxml-xmlmemory.html | 81 ++-- doc/html/libxml-xpath.html | 213 ++++----- doc/html/libxml-xpathinternals.html | 671 +++++++++++++++------------ doc/html/libxml-xpointer.html | 99 ++-- doc/xml.html | 12 +- encoding.c | 2 +- include/libxml/encoding.h | 8 +- include/libxml/parser.h | 2 +- include/libxml/parserInternals.h | 2 +- include/libxml/xmlwin32version.h | 8 +- nanoftp.c | 4 +- parserInternals.c | 10 +- tree.c | 14 +- uri.c | 2 +- xpath.c | 2 +- xpointer.c | 2 +- 44 files changed, 2383 insertions(+), 2021 deletions(-) diff --git a/ChangeLog b/ChangeLog index 952e784b..9b641aa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Oct 10 11:35:45 CEST 2001 Daniel Veillard + + * configure.in: preparing 2.4.6 release + * doc/xml.html doc/html/*: updated and rebuilt the docs + * include/libxml/*.h *.c: fixed a number of teh/the widht/width typos + Mon Oct 8 20:38:27 MDT 2001 John Fleck * doc/xmlcatalog_man.xml, xmlcatalog.1, xmlcatalog_man.html diff --git a/DOCBparser.c b/DOCBparser.c index 237d6d4f..3983c5a0 100644 --- a/DOCBparser.c +++ b/DOCBparser.c @@ -228,7 +228,7 @@ PUSH_AND_POP(static, xmlChar*, name) * If the encoding is unspecified, in the case we find an ISO-Latin-1 * char, then the encoding converter is plugged in automatically. * - * Returns the current char value and its lenght + * Returns the current char value and its length */ static int @@ -310,7 +310,7 @@ docbCurrentChar(xmlParserCtxtPtr ctxt, int *len) { } } /* - * Assume it's a fixed lenght encoding (1) with + * Assume it's a fixed length encoding (1) with * a compatibke encoding for the ASCII set, since * XML constructs only use < 128 chars */ diff --git a/HTMLparser.c b/HTMLparser.c index 86d9e545..6817191b 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -184,7 +184,7 @@ PUSH_AND_POP(static, xmlChar*, name) * If the encoding is unspecified, in the case we find an ISO-Latin-1 * char, then the encoding converter is plugged in automatically. * - * Returns the current char value and its lenght + * Returns the current char value and its length */ static int @@ -266,7 +266,7 @@ htmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) { } } /* - * Assume it's a fixed lenght encoding (1) with + * Assume it's a fixed length encoding (1) with * a compatibke encoding for the ASCII set, since * XML constructs only use < 128 chars */ diff --git a/SAX.c b/SAX.c index 59158a22..be5c7608 100644 --- a/SAX.c +++ b/SAX.c @@ -1317,10 +1317,10 @@ characters(void *ctx, const xmlChar *ch, int len) #ifndef XML_USE_BUFFER_CONTENT /* * The whole point of maintaining nodelen and nodemem, - * xmlTextConcat is too costly, i.e. compute lenght, + * xmlTextConcat is too costly, i.e. compute length, * reallocate a new buffer, move data, append ch. Here * We try to minimaze realloc() uses and avoid copying - * and recomputing lenght over and over. + * and recomputing length over and over. */ if (ctxt->nodelen + len >= ctxt->nodemem) { xmlChar *newbuf; diff --git a/catalog.c b/catalog.c index eaaf0754..55c20a6e 100644 --- a/catalog.c +++ b/catalog.c @@ -1050,7 +1050,7 @@ xmlAddXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *type, /** * xmlDelXMLCatalog: * @catal: top of an XML catalog - * @value: the value to remove from teh catalog + * @value: the value to remove from the catalog * * Remove entries in the XML catalog where the value or the URI * is equal to @value diff --git a/configure.in b/configure.in index eb5f5d2f..baed6df6 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=4 -LIBXML_MICRO_VERSION=5 +LIBXML_MICRO_VERSION=6 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION diff --git a/doc/html/book1.html b/doc/html/book1.html index 17db1777..f0f78efc 100644 --- a/doc/html/book1.html +++ b/doc/html/book1.html @@ -4,7 +4,8 @@ >Gnome XML Library Reference Manual + @@ -568,6 +569,7 @@ + @@ -811,6 +813,7 @@ + diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html index f47329cc..787702b1 100644 --- a/doc/html/libxml-catalog.html +++ b/doc/html/libxml-catalog.html @@ -4,7 +4,8 @@ >catalog

Name

Synopsis

xmlLoadCatalog (const char *filename); +int xmlLoadSGMLSuperCatalog (const char *filename); void xmlLoadCatalogs

Description

Details

xmlLoadSGMLSuperCatalog ()

int         xmlLoadSGMLSuperCatalog         (const char *filename);

Load an SGML super catalog. It won't expand CATALOG or DELEGATE +references. This is only needed for manipulating SGML Super Catalogs +like adding and removing CATALOG or DELEGATE entries.

filename : a file path
Returns :0 in case of success -1 in case of error

0 if successful, -1 otherwisethe number of entries removed if successful, -1 otherwise

debugXML

Name

Synopsis

Description

Details

DOCBparser

Name

Synopsis

Description

Details

encoding

Name

Synopsis

Description

Details

the lenght of the length of out the lenght of the length of in

the lenght of the length of out the lenght of the length of in

compute the lenght of an UTF8 string, it doesn't do a full UTF8 +>compute the length of an UTF8 string, it doesn't do a full UTF8 checking of the content of the string.

entities

Name

Synopsis

Description

Details

HTMLparser

Name

Synopsis

Description

Details

HTMLtree

Name

Synopsis

Description

Details

Libxml Library Referencenanoftp

Name

Synopsis

Description

Details

nanohttp

Name

Synopsis

Description

Details

Libxml Programming NotesparserxmlDocPtr xmlSAXParseFileWithData (xmlSAXHandlerPtr sax, + const char *filename, + int recovery, + void *data); +xmlDocPtr xmlSAXParseEntity (

Description

Details

xmlSAXParseFileWithData ()

xmlDocPtr   xmlSAXParseFileWithData         (xmlSAXHandlerPtr sax,
+                                             const char *filename,
+                                             int recovery,
+                                             void *data);

parse an XML file and build a tree. Automatic support for ZLIB/Compress +compressed document is provided by default if found at compile-time. +It use the given SAX function block to handle the parsing callback. +If sax is NULL, fallback to the default DOM tree building routines.

User data (void *) is stored within the parser context, so it is +available nearly everywhere in libxml.

sax : the SAX handler block
filename : the filename
recovery : work in recovery mode, i.e. tries to read no Well Formed +documents
data : the userdata
Returns :the resulting document tree

parserInternals

Name

Synopsis

Description

Details

the current char value and its lenghtthe current char value and its length

the current char value and its lenghtthe current char value and its length

SAX

Name

Synopsis

Description

Details

tree

Name

Synopsis

Description

Details

Add a string range to an XML buffer. if len == -1, the lenght of +>Add a string range to an XML buffer. if len == -1, the length of str is recomputed.

Add a string range to the beginning of an XML buffer. -if len == -1, the lenght of str

Creation of a new text node with an extra content lenght parameter. The +>Creation of a new text node with an extra content length parameter. The text node pertain to a given document.

Creation of a new text node with an extra parameter for the content's lenght

Creation of a new text node with an extra parameter for the content's length

content lenght length

OUT: the memory lenght OUT: the memory length

OUT: the memory lenght OUT: the memory length

uri

Name

Synopsis

Description

Details

valid

Name

Synopsis

Description

Details

xinclude

Name

Synopsis

Description

Details

xmlerror

Name

Synopsis

Description

Details

xmlIO

Name

Synopsis

Description

Details

xmlmemory

Name

Synopsis

Description

Details

xpath

Name

Synopsis

Description

Details

xpathInternals

Name

Synopsis

xmlXPathStackIsNodeSet (ctxt) #define xmlXPathStackIsExternal (ctxt) +#define xmlXPathEmptyNodeSet (ns) @@ -1526,7 +1531,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR" >

Description

Details

xmlXPathStackIsExternal()

#define     xmlXPathStackIsExternal(ctxt)

Checks if the current value on the XPath stack is an external +object.

ctxt : an XPath parser context

We keep the XML namespace node at the end of the list.

xpointer

Name

Synopsis

Description

Details

SGML docs +

2.4.6: Oct 10 2001

+
    +
  • added and updated man pages by John Fleck
    • +
  • portability and configure fixes
    • +
  • an infinite loop on the HTML parser was removed (William)
    • +
  • Windows makefile patches from Igor
    • +
  • fixed half a dozen bugs reported fof libxml or libxslt
    • +
  • updated xmlcatalog to be able to modify SGML super catalogs
    • +
+

2.4.5: Sep 14 2001

  • Remove a few annoying bugs in 2.4.4
    • @@ -1701,6 +1711,6 @@ Gnome CVS base under gnome-xml/example

    Daniel Veillard

    -

    $Id: xml.html,v 1.110 2001/09/13 14:24:44 veillard Exp $

    +

    $Id: xml.html,v 1.111 2001/09/15 09:21:44 veillard Exp $

    diff --git a/encoding.c b/encoding.c index 8237450b..781d8dab 100644 --- a/encoding.c +++ b/encoding.c @@ -86,7 +86,7 @@ static int xmlLittleEndian = 1; * xmlUTF8Strlen: * @utf: a sequence of UTF-8 encoded bytes * - * compute the lenght of an UTF8 string, it doesn't do a full UTF8 + * compute the length of an UTF8 string, it doesn't do a full UTF8 * checking of the content of the string. * * Returns the number of characters in the string or -1 in case of error diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h index c20fbcee..b2ff102a 100644 --- a/include/libxml/encoding.h +++ b/include/libxml/encoding.h @@ -83,9 +83,9 @@ typedef enum { /** * xmlCharEncodingInputFunc: * @out: a pointer ot an array of bytes to store the UTF-8 result - * @outlen: the lenght of @out + * @outlen: the length of @out * @in: a pointer ot an array of chars in the original encoding - * @inlen: the lenght of @in + * @inlen: the length of @in * * Take a block of chars in the original encoding and try to convert * it to an UTF-8 block of chars out. @@ -103,9 +103,9 @@ typedef int (* xmlCharEncodingInputFunc)(unsigned char* out, int *outlen, /** * xmlCharEncodingOutputFunc: * @out: a pointer ot an array of bytes to store the result - * @outlen: the lenght of @out + * @outlen: the length of @out * @in: a pointer ot an array of UTF-8 chars - * @inlen: the lenght of @in + * @inlen: the length of @in * * Take a block of UTF-8 chars in and try to convert it to an other * encoding. diff --git a/include/libxml/parser.h b/include/libxml/parser.h index 9c4c272f..37244a6c 100644 --- a/include/libxml/parser.h +++ b/include/libxml/parser.h @@ -46,7 +46,7 @@ struct _xmlParserInput { xmlParserInputBufferPtr buf; /* UTF-8 encoded buffer */ const char *filename; /* The file analyzed, if any */ - const char *directory; /* the directory/base of teh file */ + const char *directory; /* the directory/base of the file */ const xmlChar *base; /* Base of the array to parse */ const xmlChar *cur; /* Current char being parsed */ const xmlChar *end; /* end of the arry to parse */ diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h index 81ecff72..9ebc48e9 100644 --- a/include/libxml/parserInternals.h +++ b/include/libxml/parserInternals.h @@ -194,7 +194,7 @@ LIBXML_DLL_IMPORT extern const xmlChar xmlStringTextNoenc[]; LIBXML_DLL_IMPORT extern const xmlChar xmlStringComment[]; /* - * Function to finish teh work of the macros where needed + * Function to finish the work of the macros where needed */ int xmlIsBaseChar (int c); int xmlIsBlank (int c); diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h index 065cbee8..9b2dbc06 100644 --- a/include/libxml/xmlwin32version.h +++ b/include/libxml/xmlwin32version.h @@ -27,21 +27,21 @@ extern void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.4.5" +#define LIBXML_DOTTED_VERSION "2.4.6" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXML_VERSION 20405 +#define LIBXML_VERSION 20406 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXML_VERSION_STRING "20405" +#define LIBXML_VERSION_STRING "20406" /** * LIBXML_TEST_VERSION: @@ -49,7 +49,7 @@ extern void xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20405); +#define LIBXML_TEST_VERSION xmlCheckVersion(20406); #if 0 /** diff --git a/nanoftp.c b/nanoftp.c index c8ff2617..1080e6d1 100644 --- a/nanoftp.c +++ b/nanoftp.c @@ -603,7 +603,7 @@ xmlNanoFTPGetMore(void *ctx) { } /* - * Read the amount left on teh control connection + * Read the amount left on the control connection */ if ((len = recv(ctxt->controlFd, &ctxt->controlBuf[ctxt->controlBufIndex], size, 0)) < 0) { @@ -1373,7 +1373,7 @@ xmlNanoFTPCloseConnection(void *ctx) { * * Parse at most one entry from the listing. * - * Returns -1 incase of error, the lenght of data parsed otherwise + * Returns -1 incase of error, the length of data parsed otherwise */ static int diff --git a/parserInternals.c b/parserInternals.c index 4517df2f..4a1a77ae 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -1203,7 +1203,7 @@ xmlNextChar(xmlParserCtxtPtr ctxt) { ctxt->input->cur++; } else { /* - * Assume it's a fixed lenght encoding (1) with + * Assume it's a fixed length encoding (1) with * a compatibke encoding for the ASCII set, since * XML constructs only use < 128 chars */ @@ -1262,7 +1262,7 @@ encoding_error: * This behavior can conveniently be produced by normalizing all * line breaks to #xA on input, before parsing.) * - * Returns the current char value and its lenght + * Returns the current char value and its length */ int @@ -1355,7 +1355,7 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) { } } /* - * Assume it's a fixed lenght encoding (1) with + * Assume it's a fixed length encoding (1) with * a compatibke encoding for the ASCII set, since * XML constructs only use < 128 chars */ @@ -1399,7 +1399,7 @@ encoding_error: * The current char value, if using UTF-8 this may actaully span multiple * bytes in the input buffer. * - * Returns the current char value and its lenght + * Returns the current char value and its length */ int @@ -1467,7 +1467,7 @@ xmlStringCurrentChar(xmlParserCtxtPtr ctxt, const xmlChar *cur, int *len) { } } /* - * Assume it's a fixed lenght encoding (1) with + * Assume it's a fixed length encoding (1) with * a compatibke encoding for the ASCII set, since * XML constructs only use < 128 chars */ diff --git a/tree.c b/tree.c index 395080ea..836bb032 100644 --- a/tree.c +++ b/tree.c @@ -1669,7 +1669,7 @@ xmlNewDocText(xmlDocPtr doc, const xmlChar *content) { * @content: the text content * @len: the text len. * - * Creation of a new text node with an extra parameter for the content's lenght + * Creation of a new text node with an extra parameter for the content's length * Returns a pointer to the new node object. */ xmlNodePtr @@ -1708,7 +1708,7 @@ xmlNewTextLen(const xmlChar *content, int len) { * @content: the text content * @len: the text len. * - * Creation of a new text node with an extra content lenght parameter. The + * Creation of a new text node with an extra content length parameter. The * text node pertain to a given document. * Returns a pointer to the new node object. */ @@ -4714,7 +4714,7 @@ xmlIsBlankNode(xmlNodePtr node) { * xmlTextConcat: * @node: the node * @content: the content - * @len: @content lenght + * @len: @content length * * Concat the given string at the end of the existing node content */ @@ -5037,7 +5037,7 @@ xmlBufferResize(xmlBufferPtr buf, unsigned int size) * @str: the xmlChar string * @len: the number of xmlChar to add * - * Add a string range to an XML buffer. if len == -1, the lenght of + * Add a string range to an XML buffer. if len == -1, the length of * str is recomputed. */ void @@ -5086,7 +5086,7 @@ xmlBufferAdd(xmlBufferPtr buf, const xmlChar *str, int len) { * @len: the number of xmlChar to add * * Add a string range to the beginning of an XML buffer. - * if len == -1, the lenght of @str is recomputed. + * if len == -1, the length of @str is recomputed. */ void xmlBufferAddHead(xmlBufferPtr buf, const xmlChar *str, int len) { @@ -6220,7 +6220,7 @@ xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr, * xmlDocDumpMemory: * @cur: the document * @mem: OUT: the memory pointer - * @size: OUT: the memory lenght + * @size: OUT: the memory length * * Dump an XML document in memory and return the xmlChar * and it's size. * It's up to the caller to free the memory. @@ -6234,7 +6234,7 @@ xmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int *size) { * xmlDocDumpFormatMemory: * @cur: the document * @mem: OUT: the memory pointer - * @size: OUT: the memory lenght + * @size: OUT: the memory length * @format: should formatting spaces been added * * diff --git a/uri.c b/uri.c index a2e427ae..d386e1d3 100644 --- a/uri.c +++ b/uri.c @@ -922,7 +922,7 @@ xmlNormalizeURIPath(char *path) { /** * xmlURIUnescapeString: * @str: the string to unescape - * @len: the lenght in bytes to unescape (or <= 0 to indicate full string) + * @len: the length in bytes to unescape (or <= 0 to indicate full string) * @target: optionnal destination buffer * * Unescaping routine, does not do validity checks ! diff --git a/xpath.c b/xpath.c index 64502ee2..3283283c 100644 --- a/xpath.c +++ b/xpath.c @@ -6277,7 +6277,7 @@ static xmlChar * xmlXPathParseNameComplex(xmlXPathParserContextPtr ctxt, * The current char value, if using UTF-8 this may actaully span multiple * bytes in the input buffer. * - * Returns the current char value and its lenght + * Returns the current char value and its length */ static int diff --git a/xpointer.c b/xpointer.c index 2bc29cbe..77645786 100644 --- a/xpointer.c +++ b/xpointer.c @@ -1600,7 +1600,7 @@ xmlXPtrBuildNodeList(xmlXPathObjectPtr obj) { * xmlXPtrNbLocChildren: * @node: an xmlNodePtr * - * Count the number of location children of @node or the lenght of the + * Count the number of location children of @node or the length of the * string value in case of text/PI/Comments nodes * * Returns the number of location children