diff --git a/ChangeLog b/ChangeLog index 6119ba5a..07e259d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 15 02:24:20 CEST 2003 Daniel Veillard + + * News configure.in: preparing libxml2-2.5.10 release + * doc/* : updated the doc and rebuilt + Fri Aug 15 01:55:53 CEST 2003 Daniel Veillard * parser.c: fixing the xmlSAXParseDTD bug #119536 raised by diff --git a/NEWS b/NEWS index cb9277fc..4e2349ee 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,18 @@ to test those - More testing on RelaxNG Schemas +2.5.10: Aug 15 2003: +A bugfixes only release - Windows Makefiles (William Brack) + - UTF-16 support fixes (Mark Itzcovitz) + - Makefile and portability (William Brack) automake, Linux alpha, Mingw + on Windows (Mikhail Grushinskiy) + - HTML parser (Oliver Stoeneberg) + - XInclude performance problem reported by Kevin Ruscoe + - XML parser performance problem reported by Grant Goodale + - xmlSAXParseDTD() bug fix from Malcolm Tredinnick + - and a couple other cleanup + + 2.5.9: Aug 9 2003: - bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), Windows build (Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter Sobisch), threading diff --git a/configure.in b/configure.in index 63aaed05..02e3e889 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=5 -LIBXML_MICRO_VERSION=9 +LIBXML_MICRO_VERSION=10 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/index.sgml b/doc/html/index.sgml index d24b50dd..73668120 100644 --- a/doc/html/index.sgml +++ b/doc/html/index.sgml @@ -112,6 +112,7 @@ + @@ -1294,13 +1295,14 @@ + + + + - - - diff --git a/doc/html/libxml-DOCBparser.html b/doc/html/libxml-DOCBparser.html index 3b697c5f..40a1e84b 100644 --- a/doc/html/libxml-DOCBparser.html +++ b/doc/html/libxml-DOCBparser.html @@ -113,7 +113,7 @@ plus SGML entities block of chars out.

outlen : the length of out in : a pointer to an array of UTF-8 chars inlen : the length of in -quoteChar : the quote character to escape (' or ") or zero. +quoteChar : the quote character to escape (' or ") or zero. Returns :0 if success, -2 if the transcoding fails, or -1 otherwise The value of inlen after return is the number of octets consumed as the return value is positive, else unpredictable. diff --git a/doc/html/libxml-HTMLparser.html b/doc/html/libxml-HTMLparser.html index eb236892..7a80334e 100644 --- a/doc/html/libxml-HTMLparser.html +++ b/doc/html/libxml-HTMLparser.html @@ -319,7 +319,7 @@ plus HTML entities block of chars out.

outlen : the length of out in : a pointer to an array of UTF-8 chars inlen : the length of in -quoteChar : the quote character to escape (' or ") or zero. +quoteChar : the quote character to escape (' or ") or zero. Returns :0 if success, -2 if the transcoding fails, or -1 otherwise The value of inlen after return is the number of octets consumed as the return value is positive, else unpredictable. diff --git a/doc/html/libxml-HTMLtree.html b/doc/html/libxml-HTMLtree.html index e677c924..7874f121 100644 --- a/doc/html/libxml-HTMLtree.html +++ b/doc/html/libxml-HTMLtree.html @@ -160,7 +160,7 @@ Dump an HTML document to an open FILE.

Returns : the number of byte written or -1 in case of failure.

htmlSaveFile ()

int         htmlSaveFile                    (const char *filename,
                                              xmlDocPtr cur);

-Dump an HTML document to a file. If filename is "-" the stdout file is +Dump an HTML document to a file. If filename is "-" the stdout file is used.

filename : the filename (or URL) diff --git a/doc/html/libxml-SAX.html b/doc/html/libxml-SAX.html index 58736a44..ba266047 100644 --- a/doc/html/libxml-SAX.html +++ b/doc/html/libxml-SAX.html @@ -129,7 +129,7 @@ void docbDefaultSAXHa

Description

Details

getPublicId ()

const xmlChar* getPublicId                  (void *ctx);

-Provides the public ID e.g. "-//SGMLSOURCE//DTD DEMO//EN"

+Provides the public ID e.g. "-//SGMLSOURCE//DTD DEMO//EN"

ctx : the user data (XML parser context)
Returns :a xmlChar * diff --git a/doc/html/libxml-c14n.html b/doc/html/libxml-c14n.html index d79d2d8a..83ca3e5a 100644 --- a/doc/html/libxml-c14n.html +++ b/doc/html/libxml-c14n.html @@ -70,8 +70,8 @@ int xmlC14NExecute int with_comments, xmlOutputBufferPtr buf);

Dumps the canonized image of given XML document into the provided buffer. -For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or -"Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)

+For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or +"Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)

doc : the XML document for canonization
nodes : the nodes set to be included in the canonized image @@ -94,8 +94,8 @@ For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or int with_comments, xmlChar **doc_txt_ptr);

Dumps the canonized image of given XML document into memory. -For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or -"Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)

+For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or +"Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)

doc : the XML document for canonization
nodes : the nodes set to be included in the canonized image @@ -119,8 +119,8 @@ For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or const char *filename, int compression);

Dumps the canonized image of given XML document into the file. -For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or -"Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)

+For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or +"Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)

doc : the XML document for canonization
nodes : the nodes set to be included in the canonized image @@ -156,8 +156,8 @@ For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or int with_comments, xmlOutputBufferPtr buf);

Dumps the canonized image of given XML document into the provided buffer. -For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or -"Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)

+For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or +"Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)

doc : the XML document for canonization
is_visible_callback :the function to use to determine is node visible diff --git a/doc/html/libxml-debugXML.html b/doc/html/libxml-debugXML.html index 4931e1cb..0c5a9567 100644 --- a/doc/html/libxml-debugXML.html +++ b/doc/html/libxml-debugXML.html @@ -248,7 +248,7 @@ Prints result to the output FILE

char *arg, xmlNodePtr node, xmlNodePtr node2);

-Implements the XML shell function "ls" +Implements the XML shell function "ls" Does an Unix like listing of the given node (like a directory)

ctxt : the shell context @@ -260,7 +260,7 @@ Does an Unix like listing of the given node (like a directory)

char *arg, xmlNodePtr node, xmlNodePtr node2);

-Implements the XML shell function "base" +Implements the XML shell function "base" dumps the current XML base of the node

ctxt : the shell context @@ -272,7 +272,7 @@ dumps the current XML base of the node

char *arg, xmlNodePtr node, xmlNodePtr node2);

-Implements the XML shell function "dir" +Implements the XML shell function "dir" dumps informations about the node (namespace, attributes, content).

ctxt : the shell context @@ -284,7 +284,7 @@ dumps informations about the node (namespace, attributes, content).

char *arg, xmlNodePtr node, xmlNodePtr node2);

-Implements the XML shell function "cat" +Implements the XML shell function "cat" dumps the serialization node content (XML or HTML).

ctxt : the shell context @@ -296,7 +296,7 @@ dumps the serialization node content (XML or HTML).

char *filename, xmlNodePtr node, xmlNodePtr node2);

-Implements the XML shell function "load" +Implements the XML shell function "load" loads a new document specified by the filename

ctxt : the shell context @@ -308,7 +308,7 @@ loads a new document specified by the filename

char *filename, xmlNodePtr node, xmlNodePtr node2);

-Implements the XML shell function "write" +Implements the XML shell function "write" Write the current node to the filename, it saves the serialization of the subtree under the node specified

@@ -321,7 +321,7 @@ of the subtree under the node specified

char *filename, xmlNodePtr node, xmlNodePtr node2);

-Implements the XML shell function "save" +Implements the XML shell function "save" Write the current document to the filename, or it's original name

ctxt : the shell context @@ -333,7 +333,7 @@ Write the current document to the filename, or it's original name

char *dtd, xmlNodePtr node, xmlNodePtr node2);

-Implements the XML shell function "validate" +Implements the XML shell function "validate" Validate the document, if a DTD path is provided, then the validation is done against the given DTD.

@@ -346,7 +346,7 @@ is done against the given DTD.

char *arg, xmlNodePtr tree, xmlNodePtr node2);

-Implements the XML shell function "du" +Implements the XML shell function "du" show the structure of the subtree under node tree If tree is null, the command works on the current node.

@@ -359,7 +359,7 @@ If tree is null, the command works on the current node.

char *buffer, xmlNodePtr node, xmlNodePtr node2);

-Implements the XML shell function "pwd" +Implements the XML shell function "pwd" Show the full path from the root to the node, if needed building thumblers when similar elements exists at a given ancestor level. The output is compatible with XPath commands.

diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html index dee2596e..6259d2c2 100644 --- a/doc/html/libxml-encoding.html +++ b/doc/html/libxml-encoding.html @@ -257,7 +257,7 @@ that the comparison is case insensitive accordingly to the section

Returns :one of the XML_CHAR_ENCODING_... values or XML_CHAR_ENCODING_NONE if not recognized.

xmlGetCharEncodingName ()

const char* xmlGetCharEncodingName          (xmlCharEncoding enc);

-The "canonical" name for XML encoding. +The "canonical" name for XML encoding. C.f. http://www.w3.org/TR/REC-xmlcharencoding Section 4.3.3 Character Encoding in Entities

diff --git a/doc/html/libxml-globals.html b/doc/html/libxml-globals.html index 647e5b4c..e1f7689a 100644 --- a/doc/html/libxml-globals.html +++ b/doc/html/libxml-globals.html @@ -297,7 +297,7 @@ Enabled by default

xmlTreeIndentString

#define     xmlTreeIndentString

-The string used to do one-level indent. By default is equal to " " (two spaces)

+The string used to do one-level indent. By default is equal to " " (two spaces)

xmlThrDefTreeIndentString ()

const char* xmlThrDefTreeIndentString       (const char *v);

diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html index 002e07b3..bc817d1b 100644 --- a/doc/html/libxml-nanoftp.html +++ b/doc/html/libxml-nanoftp.html @@ -104,7 +104,7 @@ A callback for the xmlNanoFTPList command. Note that only one of year and day:minute are specified.

userData : user provided data for the callback -
filename : the file name (including "->" when links are shown) +
filename : the file name (including "->" when links are shown)
attrib : the attribute string
owner : the owner string
group : the group string diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html index dc5db0c8..0a061743 100644 --- a/doc/html/libxml-parser.html +++ b/doc/html/libxml-parser.html @@ -297,7 +297,7 @@ void xmlSetExtern xmlParserCtxtPtr ctxt);

Description

-

Details

XML_DEFAULT_VERSION

#define XML_DEFAULT_VERSION	"1.0"
+

Details

XML_DEFAULT_VERSION

#define XML_DEFAULT_VERSION	"1.0"

The default version of XML used: 1.0

@@ -972,7 +972,7 @@ mixed content. This function is provided as a way to force the standard behavior on 1.X libs and to switch back to the old mode for compatibility when running 1.X client code on 2.X . Upgrade of 1.X code should be done -by using xmlIsBlankNode() commodity function to detect the "empty" +by using xmlIsBlankNode() commodity function to detect the "empty" nodes generated. This value also affect autogeneration of indentation when saving code if blanks sections are kept, indentation is not generated.

@@ -1142,7 +1142,7 @@ If sax is NULL, fallback to the default DOM tree building routines.

[78] extParsedEnt ::= TextDecl? content

-This correspond to a "Well Balanced" chunk

+This correspond to a "Well Balanced" chunk

sax : the SAX handler block
filename : the filename @@ -1152,7 +1152,7 @@ parse an XML external entity out of context and build a tree.

[78] extParsedEnt ::= TextDecl? content

-This correspond to a "Well Balanced" chunk

+This correspond to a "Well Balanced" chunk

filename : the filename
Returns :the resulting document tree diff --git a/doc/html/libxml-parserInternals.html b/doc/html/libxml-parserInternals.html index 0053ba46..1908fcf6 100644 --- a/doc/html/libxml-parserInternals.html +++ b/doc/html/libxml-parserInternals.html @@ -141,7 +141,7 @@ void xmlParseElemen xmlChar* xmlParseVersionNum (xmlParserCtxtPtr ctxt); xmlChar* xmlParseVersionInfo (xmlParserCtxtPtr ctxt); xmlChar* xmlParseEncName (xmlParserCtxtPtr ctxt); -xmlChar* xmlParseEncodingDecl (xmlParserCtxtPtr ctxt); +const xmlChar* xmlParseEncodingDecl (xmlParserCtxtPtr ctxt); int xmlParseSDDecl (xmlParserCtxtPtr ctxt); void xmlParseXMLDecl (xmlParserCtxtPtr ctxt); void xmlParseTextDecl (xmlParserCtxtPtr ctxt); @@ -566,8 +566,8 @@ parse an XML Nmtoken. xmlChar **orig);

parse a value for ENTITY declarations

-[9] EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"' | - "'" ([^%&'] | PEReference | Reference)* "'"

+[9] EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"' | + "'" ([^%&'] | PEReference | Reference)* "'"

ctxt : an XML parser context
orig : if non-NULL store a copy of the original entity value @@ -577,8 +577,8 @@ parse a value for an attribute Note: the parser won't do substitution of entities here, this will be handled later in xmlStringGetNodeList

-[10] AttValue ::= '"' ([^<&"] | Reference)* '"' | - "'" ([^<&'] | Reference)* "'" +[10] AttValue ::= '"' ([^<&"] | Reference)* '"' | + "'" ([^<&'] | Reference)* "'"

3.3.3 Attribute-Value Normalization: Before the value of an attribute is passed to the application or @@ -589,7 +589,7 @@ checked for validity, the XML processor must normalize it as follows: replacement text of the entity - a whitespace character (x20, xD, xA, x9) is processed by appending x20 to the normalized value, except that only a single - x20 is appended for a "xDxA" sequence that is part of an external + x20 is appended for a "xDxA" sequence that is part of an external parsed entity or the literal entity value of an internal parsed entity - other characters are processed by appending them to the normalized value If the declared value is not CDATA, then the XML processor must further @@ -604,14 +604,14 @@ by a non-validating parser as if declared CDATA.

xmlParseSystemLiteral ()

xmlChar*    xmlParseSystemLiteral           (xmlParserCtxtPtr ctxt);

parse an XML Literal

-[11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'")

+[11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'")

ctxt : an XML parser context
Returns :the SystemLiteral parsed or NULL

xmlParsePubidLiteral ()

xmlChar*    xmlParsePubidLiteral            (xmlParserCtxtPtr ctxt);

parse an XML public literal

-[12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'"

+[12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'"

ctxt : an XML parser context
Returns :the PubidLiteral parsed or NULL. @@ -620,9 +620,9 @@ parse an XML public literal parse a CharData section. if we are within a CDATA section ']]>' marks an end of section.

-The right angle bracket (>) may be represented using the string "&gt;", -and must, for compatibility, be escaped using "&gt;" or a character -reference when it appears in the string "]]>" in content, when that +The right angle bracket (>) may be represented using the string "&gt;", +and must, for compatibility, be escaped using "&gt;" or a character +reference when it appears in the string "]]>" in content, when that string is not marking the end of a CDATA section.

[14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)

@@ -651,8 +651,8 @@ NOTE: Productions [75] and [83] interact badly since [75] can generate it is possible to return NULL and have publicID set.

xmlParseComment ()

void        xmlParseComment                 (xmlParserCtxtPtr ctxt);

Skip an XML (SGML) comment <!-- .... --> - The spec says that "For compatibility, the string "--" (double-hyphen) - must not occur within comments. " + The spec says that "For compatibility, the string "--" (double-hyphen) + must not occur within comments. "

[15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'

@@ -925,7 +925,7 @@ parse ENTITY references declarations [ WFC: Entity Declared ] In a document without any DTD, a document with only an internal DTD subset which contains no parameter entity references, or a document -with "standalone='yes'", the Name given in the entity reference +with "standalone='yes'", the Name given in the entity reference must match that in an entity declaration, except that well-formed documents need not declare any of the following entities: amp, lt, gt, apos, quot. The declaration of a parameter entity must precede @@ -965,12 +965,12 @@ reference to itself, either directly or indirectly. [ WFC: Entity Declared ] In a document without any DTD, a document with only an internal DTD subset which contains no parameter entity references, or a document -with "standalone='yes'", ... ... The declaration of a parameter +with "standalone='yes'", ... ... The declaration of a parameter entity must precede any reference to it...

[ VC: Entity Declared ] In a document with an external subset or external parameter entities -with "standalone='no'", ... ... The declaration of a parameter entity +with "standalone='no'", ... ... The declaration of a parameter entity must precede any reference to it...

[ WFC: In DTD ] @@ -1001,7 +1001,7 @@ to external entities.

[ WFC: No < in Attribute Values ] The replacement text of any entity referred to directly or indirectly in -an attribute value (other than "&lt;") must not contain a <. +an attribute value (other than "&lt;") must not contain a <.

[ VC: Attribute Value Type ] The attribute must have been declared; the value must be of the type @@ -1104,12 +1104,12 @@ parse the XML version value.

xmlParseVersionInfo ()

xmlChar*    xmlParseVersionInfo             (xmlParserCtxtPtr ctxt);

parse the XML version.

-[24] VersionInfo ::= S 'version' Eq (' VersionNum ' | " VersionNum ") +[24] VersionInfo ::= S 'version' Eq (' VersionNum ' | " VersionNum ")

[25] Eq ::= S? '=' S?

ctxt : an XML parser context -
Returns :the version string, e.g. "1.0" +
Returns :the version string, e.g. "1.0"

xmlParseEncName ()

xmlChar*    xmlParseEncName                 (xmlParserCtxtPtr ctxt);

parse the XML encoding name

@@ -1117,10 +1117,10 @@ parse the XML encoding name

ctxt : an XML parser context
Returns :the encoding name value or NULL -

xmlParseEncodingDecl ()

xmlChar*    xmlParseEncodingDecl            (xmlParserCtxtPtr ctxt);

+

xmlParseEncodingDecl ()

const xmlChar* xmlParseEncodingDecl         (xmlParserCtxtPtr ctxt);

parse the XML encoding declaration

-[80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'") +[80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'")

this setups the conversion filters.

@@ -1130,10 +1130,10 @@ this setups the conversion filters.

parse the XML standalone declaration

[32] SDDecl ::= S 'standalone' Eq - (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no')'"')) + (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no')'"'))

[ VC: Standalone Document Declaration ] -TODO The standalone document declaration must have the value "no" +TODO The standalone document declaration must have the value "no" if any external markup declarations contain declarations of: - attributes with default values, if elements to which these attributes apply appear in the document without specifications @@ -1301,12 +1301,12 @@ reference to itself, either directly or indirectly. [ WFC: Entity Declared ] In a document without any DTD, a document with only an internal DTD subset which contains no parameter entity references, or a document -with "standalone='yes'", ... ... The declaration of a parameter +with "standalone='yes'", ... ... The declaration of a parameter entity must precede any reference to it...

[ VC: Entity Declared ] In a document with an external subset or external parameter entities -with "standalone='no'", ... ... The declaration of a parameter entity +with "standalone='no'", ... ... The declaration of a parameter entity must precede any reference to it...

[ WFC: In DTD ] @@ -1368,7 +1368,7 @@ 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 "xDxA" or a standalone literal xD, an XML processor +sequence "xDxA" 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.)

diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html index 36052df8..1ab10e5c 100644 --- a/doc/html/libxml-tree.html +++ b/doc/html/libxml-tree.html @@ -1253,7 +1253,7 @@ Free up all the structures associated to the chained namespaces.

xmlNewDoc ()

xmlDocPtr   xmlNewDoc                       (const xmlChar *version);

Creates a new XML document

-

version : xmlChar string giving the version of XML "1.0" +

version : xmlChar string giving the version of XML "1.0"
Returns :a new document

xmlFreeDoc ()

void        xmlFreeDoc                      (xmlDocPtr cur);

Free up all the structures used by a document, tree included.

@@ -1484,7 +1484,7 @@ Creation of a new node containing a CDATA block.

Creation of a new character reference node.

doc : the document -
name : the char ref string, starting with # or "&# ... ;" +
name : the char ref string, starting with # or "&# ... ;"
Returns :a pointer to the new node object.

xmlNewReference ()

xmlNodePtr  xmlNewReference                 (xmlDocPtr doc,
                                              const xmlChar *name);

@@ -1902,14 +1902,14 @@ of the xml:space attribute or the one carried by the nearest ancestor.

cur : the node being checked -
Returns :-1 if xml:space is not inherited, 0 if "default", 1 if "preserve" +
Returns :-1 if xml:space is not inherited, 0 if "default", 1 if "preserve"

xmlNodeSetSpacePreserve ()

void        xmlNodeSetSpacePreserve         (xmlNodePtr cur,
                                              int val);

Set (or reset) the space preserving behaviour of a node, i.e. the value of the xml:space attribute.

cur : the node being changed -
val : the xml:space value ("0": default, 1: "preserve") +
val : the xml:space value ("0": default, 1: "preserve")

xmlNodeGetBase ()

xmlChar*    xmlNodeGetBase                  (xmlDocPtr doc,
                                              xmlNodePtr cur);

Searches for the BASE URL. The code should work on both XML @@ -2068,7 +2068,7 @@ Dump an XML/HTML node, recursive behaviour, children are printed too.

xmlSaveFile ()

int         xmlSaveFile                     (const char *filename,
                                              xmlDocPtr cur);

Dump an XML document to a file. Will use compression if -compiled in and enabled. If filename is "-" the stdout file is +compiled in and enabled. If filename is "-" the stdout file is used.

filename : the filename (or URL) @@ -2078,7 +2078,7 @@ used.

xmlDocPtr cur, int format);

Dump an XML document to a file. Will use compression if -compiled in and enabled. If filename is "-" the stdout file is +compiled in and enabled. If filename is "-" the stdout file is used. If format is set then the document will be indented on output. Note that format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called

diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html index 4b271e57..8e32519a 100644 --- a/doc/html/libxml-uri.html +++ b/doc/html/libxml-uri.html @@ -93,7 +93,7 @@ RFC 2396

xmlParseURI ()

xmlURIPtr   xmlParseURI                     (const char *str);

Parse an URI

-URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]

+URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]

str : the URI string to analyze
Returns :a newly build xmlURIPtr or NULL in case of error @@ -102,7 +102,7 @@ URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]

Parse an URI reference string and fills in the appropriate fields of the uri structure

-URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]

+URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]

uri : pointer to an URI structure
str : the string to analyze diff --git a/doc/html/libxml-xmlIO.html b/doc/html/libxml-xmlIO.html index 56564444..704e18cf 100644 --- a/doc/html/libxml-xmlIO.html +++ b/doc/html/libxml-xmlIO.html @@ -234,7 +234,7 @@ Create a buffered parser input for progressive parsing

(const char *URI, xmlCharEncoding enc);

Create a buffered parser input for the progressive parsing of a file -If filename is "-' then we use stdin as the input. +If filename is "-' then we use stdin as the input. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. Do an encoding check if enc == XML_CHAR_ENCODING_NONE

@@ -353,7 +353,7 @@ Create a buffered parser output

xmlCharEncodingHandlerPtr encoder, int compression);

Create a buffered output for the progressive saving of a file -If filename is "-' then we use stdout as the output. +If filename is "-' then we use stdout as the output. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. TODO: currently if compression is set, the library only support @@ -446,8 +446,8 @@ request. Non-static as is called from the output buffer creation routine.

post_uri : The destination URI for the document
compression : The compression desired for the document.

xmlRegisterHTTPPostCallbacks ()

void        xmlRegisterHTTPPostCallbacks    (void);

-By default, libxml submits HTTP output requests using the "PUT" method. -Calling this method changes the HTTP output method to use the "POST" +By default, libxml submits HTTP output requests using the "PUT" method. +Calling this method changes the HTTP output method to use the "POST" method instead.

xmlNoNetExternalEntityLoader ()

xmlParserInputPtr xmlNoNetExternalEntityLoader
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index a79409c0..320df0cd 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -67,10 +67,6 @@ void*       xmlMemRealloc
                                              size_t size);
 void        xmlMemFree                      (void *ptr);
 char*       xmlMemoryStrdup                 (const char *str);
-#define     xmlMalloc                       (size)
-#define     xmlMallocAtomic                 (size)
-#define     xmlRealloc                      (ptr, size)
-#define     xmlMemStrdup                    (str)
 void*       xmlMallocLoc                    (size_t size,
                                              const char *file,
                                              int line);
@@ -78,9 +74,16 @@ void*       xmlReallocLoc
                                              size_t size,
                                              const char *file,
                                              int line);
+void*       xmlMallocAtomicLoc              (size_t size,
+                                             const char *file,
+                                             int line);
 char*       xmlMemStrdupLoc                 (const char *str,
                                              const char *file,
                                              int line);
+#define     xmlMalloc                       (size)
+#define     xmlMallocAtomic                 (size)
+#define     xmlRealloc                      (ptr, size)
+#define     xmlMemStrdup                    (str)

Description

Details

DEBUG_MEMORY

#define DEBUG_MEMORY
@@ -211,24 +214,6 @@ a str
 
 
str :  the initial string pointer
 
Returns :a pointer to the new string or NULL if allocation error occurred.
-

xmlMalloc()

#define     xmlMalloc(size)

-Wrapper for the malloc() function used in the XML library.

- -

size : number of bytes to allocate -

xmlMallocAtomic()

#define     xmlMallocAtomic(size)

-Wrapper for the malloc() function used in the XML library for allocation -of block not containing pointers to other areas.

- -

size : number of bytes to allocate -

xmlRealloc()

#define     xmlRealloc(ptr, size)

-Wrapper for the realloc() function used in the XML library.

- -

ptr : pointer to the existing allocated area -
size : number of bytes to allocate -

xmlMemStrdup()

#define     xmlMemStrdup(str)

-Wrapper for the strdup() function, xmlStrdup() is usually preferred.

- -

str : pointer to the existing string

xmlMallocLoc ()

void*       xmlMallocLoc                    (size_t size,
                                              const char *file,
                                              int line);

@@ -247,6 +232,14 @@ a re

size : an int specifying the size in byte to allocate.
file : the file name or NULL
line : the line number +

xmlMallocAtomicLoc ()

void*       xmlMallocAtomicLoc              (size_t size,
+                                             const char *file,
+                                             int line);

+a malloc() equivalent, with logging of the allocation info.

+ +

size : an int specifying the size in byte to allocate. +
file : the file name or NULL +
line : the line number

xmlMemStrdupLoc ()

char*       xmlMemStrdupLoc                 (const char *str,
                                              const char *file,
                                              int line);

@@ -256,4 +249,22 @@ a str

file : the file name or NULL
line : the line number
Returns :a pointer to the new string or NULL if allocation error occurred. +

xmlMalloc()

#define     xmlMalloc(size)

+Wrapper for the malloc() function used in the XML library.

+ +

size : number of bytes to allocate +

xmlMallocAtomic()

#define     xmlMallocAtomic(size)

+Wrapper for the malloc() function used in the XML library for allocation +of block not containing pointers to other areas.

+ +

size : number of bytes to allocate +

xmlRealloc()

#define     xmlRealloc(ptr, size)

+Wrapper for the realloc() function used in the XML library.

+ +

ptr : pointer to the existing allocated area +
size : number of bytes to allocate +

xmlMemStrdup()

#define     xmlMemStrdup(str)

+Wrapper for the strdup() function, xmlStrdup() is usually preferred.

+ +

str : pointer to the existing string
<< debugXMLxmlregexp >>
diff --git a/doc/html/libxml-xmlreader.html b/doc/html/libxml-xmlreader.html index 4e0a07d9..a177b349 100644 --- a/doc/html/libxml-xmlreader.html +++ b/doc/html/libxml-xmlreader.html @@ -34,6 +34,7 @@ enum xmlParserProperties; enum xmlParserSeverities; +enum xmlReaderTypes; struct xmlTextReader; typedef xmlTextReaderPtr; xmlTextReaderPtr xmlNewTextReader (xmlParserInputBufferPtr input, @@ -131,6 +132,28 @@ void xmlText } xmlParserSeverities;

+

enum xmlReaderTypes

typedef enum {
+    XML_READER_TYPE_NONE = 0,
+    XML_READER_TYPE_ELEMENT = 1,
+    XML_READER_TYPE_ATTRIBUTE = 2,
+    XML_READER_TYPE_TEXT = 3,
+    XML_READER_TYPE_CDATA = 4,
+    XML_READER_TYPE_ENTITY_REFERENCE = 5,
+    XML_READER_TYPE_ENTITY = 6,
+    XML_READER_TYPE_PROCESSING_INSTRUCTION = 7,
+    XML_READER_TYPE_COMMENT = 8,
+    XML_READER_TYPE_DOCUMENT = 9,
+    XML_READER_TYPE_DOCUMENT_TYPE = 10,
+    XML_READER_TYPE_DOCUMENT_FRAGMENT = 11,
+    XML_READER_TYPE_NOTATION = 12,
+    XML_READER_TYPE_WHITESPACE = 13,
+    XML_READER_TYPE_SIGNIFICANT_WHITESPACE = 14,
+    XML_READER_TYPE_END_ELEMENT = 15,
+    XML_READER_TYPE_END_ENTITY = 16,
+    XML_READER_TYPE_XML_DECLARATION = 17
+} xmlReaderTypes;
+

+

struct xmlTextReader

struct xmlTextReader;

xmlTextReaderPtr

typedef xmlTextReader *xmlTextReaderPtr;
@@ -254,7 +277,7 @@ A shorthand reference to the namespace associated with the node.

 The quotation mark character used to enclose the value of an attribute.

 
 
reader :  the xmlTextReaderPtr used
-
Returns :" or ' and -1 in case of error
+
Returns :" or ' and -1 in case of error

xmlTextReaderValue ()

xmlChar*    xmlTextReaderValue              (xmlTextReaderPtr reader);

Provides the text value of the node if present

diff --git a/doc/html/libxml-xmlschemastypes.html b/doc/html/libxml-xmlschemastypes.html index 064e61c2..fbf03f56 100644 --- a/doc/html/libxml-xmlschemastypes.html +++ b/doc/html/libxml-xmlschemastypes.html @@ -68,7 +68,7 @@ Cleanup the default XML Schemas type library

Lookup a type in the default XML Schemas type library

name : the type name -
ns : the URI of the namespace usually "http://www.w3.org/2001/XMLSchema" +
ns : the URI of the namespace usually "http://www.w3.org/2001/XMLSchema"
Returns :the type if found, NULL otherwise

xmlSchemaValidatePredefinedType ()

int         xmlSchemaValidatePredefinedType (xmlSchemaTypePtr type,
                                              const xmlChar *value,
diff --git a/doc/html/libxml-xpathInternals.html b/doc/html/libxml-xpathInternals.html
index a7e11fb3..f505a212 100644
--- a/doc/html/libxml-xpathInternals.html
+++ b/doc/html/libxml-xpathInternals.html
@@ -1015,7 +1015,7 @@ Is the name given a NodeType one.
Returns :1 if true 0 otherwise

xmlXPathNextSelf ()

xmlNodePtr  xmlXPathNextSelf                (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "self" direction +Traversal function for the "self" direction The self axis contains just the context node itself

ctxt : the XPath Parser context @@ -1023,7 +1023,7 @@ The self axis contains just the context node itself

Returns :the next element following that axis

xmlXPathNextChild ()

xmlNodePtr  xmlXPathNextChild               (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "child" direction +Traversal function for the "child" direction The child axis contains the children of the context node in document order.

ctxt : the XPath Parser context @@ -1031,7 +1031,7 @@ The child axis contains the children of the context node in document order.

<
Returns :the next element following that axis

xmlXPathNextDescendant ()

xmlNodePtr  xmlXPathNextDescendant          (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "descendant" direction +Traversal function for the "descendant" direction the descendant axis contains the descendants of the context node in document order; a descendant is a child or a child of a child and so on.

@@ -1040,7 +1040,7 @@ order; a descendant is a child or a child of a child and so on.

Returns :the next element following that axis

xmlXPathNextDescendantOrSelf ()

xmlNodePtr  xmlXPathNextDescendantOrSelf    (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "descendant-or-self" direction +Traversal function for the "descendant-or-self" direction the descendant-or-self axis contains the context node and the descendants of the context node in document order; thus the context node is the first node on the axis, and the first child of the context node is the second node @@ -1051,7 +1051,7 @@ on the axis

Returns :the next element following that axis

xmlXPathNextParent ()

xmlNodePtr  xmlXPathNextParent              (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "parent" direction +Traversal function for the "parent" direction The parent axis contains the parent of the context node, if there is one.

ctxt : the XPath Parser context @@ -1059,7 +1059,7 @@ The parent axis contains the parent of the context node, if there is one.

Returns :the next element following that axis

xmlXPathNextAncestorOrSelf ()

xmlNodePtr  xmlXPathNextAncestorOrSelf      (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "ancestor-or-self" direction +Traversal function for the "ancestor-or-self" direction he ancestor-or-self axis contains the context node and ancestors of the context node in reverse document order; thus the context node is the first node on the axis, and the context node's parent the second; @@ -1070,7 +1070,7 @@ parent here is defined the same as with the parent axis.

Returns :the next element following that axis

xmlXPathNextFollowingSibling ()

xmlNodePtr  xmlXPathNextFollowingSibling    (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "following-sibling" direction +Traversal function for the "following-sibling" direction The following-sibling axis contains the following siblings of the context node in document order.

@@ -1079,7 +1079,7 @@ node in document order.

Returns :the next element following that axis

xmlXPathNextFollowing ()

xmlNodePtr  xmlXPathNextFollowing           (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "following" direction +Traversal function for the "following" direction The following axis contains all nodes in the same document as the context node that are after the context node in document order, excluding any descendants and excluding attribute nodes and namespace nodes; the nodes @@ -1090,7 +1090,7 @@ are ordered in document order

Returns :the next element following that axis

xmlXPathNextNamespace ()

xmlNodePtr  xmlXPathNextNamespace           (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "namespace" direction +Traversal function for the "namespace" direction the namespace axis contains the namespace nodes of the context node; the order of nodes on this axis is implementation-defined; the axis will be empty unless the context node is an element @@ -1102,7 +1102,7 @@ We keep the XML namespace node at the end of the list.

Returns :the next element following that axis

xmlXPathNextAttribute ()

xmlNodePtr  xmlXPathNextAttribute           (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "attribute" direction +Traversal function for the "attribute" direction TODO: support DTD inherited default attributes

ctxt : the XPath Parser context @@ -1110,7 +1110,7 @@ TODO: support DTD inherited default attributes

Returns :the next element following that axis

xmlXPathNextPreceding ()

xmlNodePtr  xmlXPathNextPreceding           (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "preceding" direction +Traversal function for the "preceding" direction the preceding axis contains all nodes in the same document as the context node that are before the context node in document order, excluding any ancestors and excluding attribute nodes and namespace nodes; the nodes are @@ -1121,7 +1121,7 @@ ordered in reverse document order

Returns :the next element following that axis

xmlXPathNextAncestor ()

xmlNodePtr  xmlXPathNextAncestor            (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "ancestor" direction +Traversal function for the "ancestor" direction the ancestor axis contains the ancestors of the context node; the ancestors of the context node consist of the parent of context node and the parent's parent and so on; the nodes are ordered in reverse document order; thus the @@ -1133,7 +1133,7 @@ node on the axis

Returns :the next element following that axis

xmlXPathNextPrecedingSibling ()

xmlNodePtr  xmlXPathNextPrecedingSibling    (xmlXPathParserContextPtr ctxt,
                                              xmlNodePtr cur);

-Traversal function for the "preceding-sibling" direction +Traversal function for the "preceding-sibling" direction The preceding-sibling axis contains the preceding siblings of the context node in reverse document order; the first preceding sibling is first on the axis; the sibling preceding that node is the second on the axis and so on.

@@ -1287,10 +1287,10 @@ Implement the

+ - substring("12345", 1.5, 2.6) returns "234" + - substring("12345", 0, 3) returns "12" + - substring("12345", 0 div 0, 3) returns "" + - substring("12345", 1, 0 div 0) returns "" + - substring("12345", -42, 1 div 0) returns "12345" + - substring("12345", -1 div 0, 1 div 0) returns ""

ctxt : the XPath Parser context
nargs : the number of arguments @@ -1315,7 +1315,7 @@ The substring-before function returns the substring of the first argument string that precedes the first occurrence of the second argument string in the first argument string, or the empty string if the first argument string does not contain the second argument -string. For example, substring-before("1999/04/01","/") returns 1999.

+string. For example, substring-before("1999/04/01","/") returns 1999.

ctxt : the XPath Parser context
nargs : the number of arguments @@ -1327,8 +1327,8 @@ The substring-after function returns the substring of the first argument string that follows the first occurrence of the second argument string in the first argument string, or the empty stringi if the first argument string does not contain the second argument -string. For example, substring-after("1999/04/01","/") returns 04/01, -and substring-after("1999/04/01","19") returns 99/04/01.

+string. For example, substring-after("1999/04/01","/") returns 04/01, +and substring-after("1999/04/01","19") returns 99/04/01.

ctxt : the XPath Parser context
nargs : the number of arguments @@ -1352,12 +1352,12 @@ Implement the

+string are removed. For example, translate("--aaa--","abc-","ABC")

ctxt : the XPath Parser context
nargs : the number of arguments diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index c717243a..b0c12ba6 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -7667,7 +7667,7 @@ actually an xmlCharEncoding'/> parse the XML encoding declaration [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'") this setups the conversion filters. - + diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa index ec18759d..ca4befac 100644 --- a/doc/libxml2.xsa +++ b/doc/libxml2.xsa @@ -8,26 +8,9 @@ libxml2 - 2.5.9 - Aug 9 2003 + 2.5.10 + Aug 15 2003 http://xmlsoft.org/ - - bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), Windows build - (Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter Sobisch), threading - (Rob Richards), hexBinary type (), UTF-16 BOM (Dodji Seketeli), - xmlReader, Relax-NG schemas compilation, namespace handling, EXSLT (Sean - Griffin), HTML parsing problem (William Brack), DTD validation for mixed - content + namespaces, HTML serialization, library initialization, - progressive HTML parser - - better interfaces for Relax-NG error handling (Joachim Bauch, ) - - adding xmlXIncludeProcessTree() for XInclud'ing in a subtree - - doc fixes and improvements (John Fleck) - - configure flag for -with-fexceptions when embedding in C++ - - couple of new UTF-8 helper functions (William Brack) - - general encoding cleanup + ISO-8859-x without iconv (Peter Jacobi) - - xmlTextReader cleanup + enum for node types (Bjorn Reese) - - general compilation/warning cleanup Solaris/HP-UX/... (William - Brack) - - + A bugfixes only release diff --git a/doc/news.html b/doc/news.html index 59fe5b10..9d31149b 100644 --- a/doc/news.html +++ b/doc/news.html @@ -12,6 +12,15 @@ for a really accurate description

Items not finished and worked on, get i to test those

2.5.10: Aug 15 2003

A bugfixes only release

  • Windows Makefiles (William Brack)
    • +
  • UTF-16 support fixes (Mark Itzcovitz)
    • +
  • Makefile and portability (William Brack) automake, Linux alpha, Mingw + on Windows (Mikhail Grushinskiy)
    • +
  • HTML parser (Oliver Stoeneberg)
    • +
  • XInclude performance problem reported by Kevin Ruscoe
    • +
  • XML parser performance problem reported by Grant Goodale
    • +
  • xmlSAXParseDTD() bug fix from Malcolm Tredinnick
    • +
  • and a couple other cleanup

2.5.9: Aug 9 2003

  • bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), Windows build (Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter Sobisch), threading (Rob Richards), hexBinary type (), UTF-16 BOM (Dodji Seketeli), diff --git a/doc/xml.html b/doc/xml.html index 8de02603..08a01e9c 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -654,6 +654,21 @@ to test those

    Schemas
+

2.5.10: Aug 15 2003

+ +

A bugfixes only release

+
    +
  • Windows Makefiles (William Brack)
    • +
  • UTF-16 support fixes (Mark Itzcovitz)
    • +
  • Makefile and portability (William Brack) automake, Linux alpha, Mingw + on Windows (Mikhail Grushinskiy)
    • +
  • HTML parser (Oliver Stoeneberg)
    • +
  • XInclude performance problem reported by Kevin Ruscoe
    • +
  • XML parser performance problem reported by Grant Goodale
    • +
  • xmlSAXParseDTD() bug fix from Malcolm Tredinnick
    • +
  • and a couple other cleanup
    • +
+

2.5.9: Aug 9 2003

  • bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), Windows build