diff --git a/ChangeLog b/ChangeLog index 6c793920..a4ef9186 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 4 22:45:49 CEST 2005 Daniel Veillard + + * configure.in doc/* configure.in: prepare for release + * xpath.c: work for #303289, fix a formatting bug for MIN_INT + Sun Sep 4 15:48:57 CEST 2005 Daniel Veillard * relaxng.c: real fix for #314881 and #314759 is was a bit more complex diff --git a/configure.in b/configure.in index cc1950da..ad902eb2 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=6 -LIBXML_MICRO_VERSION=20 +LIBXML_MICRO_VERSION=21 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/APIchunk12.html b/doc/APIchunk12.html index e3451a00..a3a22f74 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -385,6 +385,7 @@ A:link, A:visited, A:active { text-decoration: underline }
compatible
LIBXML_TEST_VERSION
xmlShellPwd
compilation
LIBXML_VERSION_EXTRA
+XML_XPATH_CHECKNS
_xmlXPathContext
xmlPatterncompile
xmlXPathCompile
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index 38891fc5..f2645f69 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -239,6 +239,7 @@ A:link, A:visited, A:active { text-decoration: underline }
depth
_xmlParserCtxt
_xmlValidCtxt
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlTextReaderDepth
deregistration
xmlDeregisterNodeDefault
derivation
XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 04cbb066..59d36820 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -240,6 +240,7 @@ A:link, A:visited, A:active { text-decoration: underline }
fonctionnalities
xmlInputMatchCallback
xmlOutputMatchCallback
for:
xmlSchemaGetCanonValue
+
forbid
XML_XPATH_NOVAR
force
xmlKeepBlanksDefault
xmlSetGenericErrorFunc
forced
xmlValidGetValidElements
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index 5e4b9d07..d9fbad56 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -149,6 +149,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlExpMaxToken
xmlExpNewCtxt
xmlPatternMaxDepth
+
mean
xmlPatternMinDepth
means
xmlExpNewRange
xmlSetGenericErrorFunc
xmlSetStructuredErrorFunc
@@ -232,6 +233,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlBufferGrow
xmlBufferResize
xmlGetUTF8Char
+xmlPatternMinDepth
minus
xmlXPathStringFunction
minute
ftpListCallback
misleading
xmlParsePEReference
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index ef605b69..682b06bb 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -54,7 +54,8 @@ A:link, A:visited, A:active { text-decoration: underline } XINCLUDE_OLD_NS
xmlParseAttribute
xmlParseStartTag
-
namespaces
_xmlParserCtxt
+
namespaces
XML_XPATH_CHECKNS
+_xmlParserCtxt
_xmlSchemaWildcard
_xmlXPathContext
xmlC14NDocDumpMemory
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index c84e2085..42008e7d 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -133,6 +133,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlPatternGetStreamCtxt
xmlPatternMatch
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlPatternStreamable
xmlPatterncompile
xmlSchemaValidateFacetWhtsp
@@ -244,6 +245,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlPatternGetStreamCtxt
xmlPatternMatch
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlPatternStreamable
xmlRegNewExecCtxt
xmlRelaxNGNewValidCtxt
diff --git a/doc/APIchunk23.html b/doc/APIchunk23.html index 8b31bf50..8a59e1db 100644 --- a/doc/APIchunk23.html +++ b/doc/APIchunk23.html @@ -110,6 +110,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewRMutex
xmlUnlockLibrary
reachable
xmlPatternMaxDepth
+xmlPatternMinDepth
reached
xmlRegExecPushString
xmlRegExecPushString2
read-only
xmlDictCreateSub
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html index 0ce15fbb..986d9984 100644 --- a/doc/APIchunk24.html +++ b/doc/APIchunk24.html @@ -531,6 +531,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGValidatePushElement
xmlSAX2StartDocument
xmlSAX2StartElementNs
+xmlSplitQName3
xmlTextReaderByteConsumed
xmlValidatePushElement
xmlXPtrNewLocationSetNodes
diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html index cff6ce40..3aefd617 100644 --- a/doc/APIchunk26.html +++ b/doc/APIchunk26.html @@ -247,7 +247,8 @@ A:link, A:visited, A:active { text-decoration: underline }
varags
xmlGenericErrorFunc
vararg
xmlValidityErrorFunc
xmlValidityWarningFunc
-
variables
_xmlXPathContext
+
variables
XML_XPATH_NOVAR
+_xmlXPathContext
xmlNanoFTPProxy
xmlXPathRegisteredNsCleanup
xmlXPathRegisteredVariablesCleanup
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 6f740218..675a349f 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -872,6 +872,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlPatternGetStreamCtxt
xmlPatternMatch
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlPatternPtr
xmlPatternStreamable
xmlPatterncompile
@@ -3146,6 +3147,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextWriterWriteVFormatRaw
xmlTextWriterWriteVFormatString

Module xpath:

XML_XPATH_CHECKNS
+XML_XPATH_NOVAR
XPATH_BOOLEAN
XPATH_ENCODING_ERROR
XPATH_EXPRESSION_OK
@@ -3223,7 +3225,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathEvalExpression
xmlXPathEvalFunc
xmlXPathEvalPredicate
-xmlXPathFlags
xmlXPathFreeCompExpr
xmlXPathFreeContext
xmlXPathFreeNodeSet
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html index 10add498..6ac8f036 100644 --- a/doc/APIfunctions.html +++ b/doc/APIfunctions.html @@ -1767,6 +1767,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlPatternGetStreamCtxt
xmlPatternMatch
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlPatternStreamable

Type xmlRMutexPtr:

xmlFreeRMutex
xmlRMutexLock
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index fd58561f..fe26d0d5 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -1305,6 +1305,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_XPATH_INVALID_PREDICATE_ERROR
XML_XPATH_INVALID_TYPE
XML_XPATH_MEMORY_ERROR
+XML_XPATH_NOVAR
XML_XPATH_NUMBER_ERROR
XML_XPATH_START_LITERAL_ERROR
XML_XPATH_UNCLOSED_ERROR
@@ -2423,6 +2424,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlPatternGetStreamCtxt
xmlPatternMatch
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlPatternPtr
xmlPatternStreamable
xmlPatterncompile
@@ -3254,7 +3256,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathEvalPredicate
xmlXPathEvaluatePredicateResult
xmlXPathFalseFunction
-xmlXPathFlags
xmlXPathFloorFunction
xmlXPathFreeCompExpr
xmlXPathFreeContext
diff --git a/doc/FAQ.html b/doc/FAQ.html index 7f68c997..4ad826fe 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -FAQ
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

FAQ

Main Menu
Related links

Table of Contents:

  • License(s)
  • +FAQ
    Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
    Made with Libxml2 Logo

    The XML C parser and toolkit of Gnome

    FAQ

    Main Menu
    Related links

    Table of Contents:

    • License(s)
    • Installation
    • Compilation
    • Developer corner
    • diff --git a/doc/XSLT.html b/doc/XSLT.html index 7212cb66..2e8a1abf 100644 --- a/doc/XSLT.html +++ b/doc/XSLT.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -XSLT
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo

      The XML C parser and toolkit of Gnome

      XSLT

      Main Menu
      Related links

      Check the separate libxslt page

      XSL Transformations, is a +XSLT
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo

      The XML C parser and toolkit of Gnome

      XSLT

      Main Menu
      Related links

      Check the separate libxslt page

      XSL Transformations, is a language for transforming XML documents into other XML documents (or HTML/textual output).

      A separate library called libxslt is available implementing XSLT-1.0 for libxml2. This module "libxslt" too can be found in the Gnome CVS base.

      You can check the progresses on the libxslt Changelog.

      Daniel Veillard

      diff --git a/doc/bugs.html b/doc/bugs.html index cadebe88..e47d7d3f 100644 --- a/doc/bugs.html +++ b/doc/bugs.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -Reporting bugs and getting help
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo

      The XML C parser and toolkit of Gnome

      Reporting bugs and getting help

      Main Menu
      Related links

      Well, bugs or missing features are always possible, and I will make a +Reporting bugs and getting help
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo

      The XML C parser and toolkit of Gnome

      Reporting bugs and getting help

      Main Menu
      Related links

      Well, bugs or missing features are always possible, and I will make a point of fixing them in a timely fashion. The best way to report a bug is to use the Gnome bug tracking database (make sure to use the "libxml2" module name). I diff --git a/doc/catalog.html b/doc/catalog.html index 9947f90a..f8463834 100644 --- a/doc/catalog.html +++ b/doc/catalog.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -Catalog support
      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
      Made with Libxml2 Logo

      The XML C parser and toolkit of Gnome

      Catalog support

      Main Menu
      Related links

      Table of Content:

      1. General overview
      2. +Catalog support
        Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
        Made with Libxml2 Logo

        The XML C parser and toolkit of Gnome

        Catalog support

        Main Menu
        Related links

        Table of Content:

        1. General overview
        2. The definition
        3. Using catalogs
        4. Some examples
        5. diff --git a/doc/contribs.html b/doc/contribs.html index 8ea1843b..6c20c3e6 100644 --- a/doc/contribs.html +++ b/doc/contribs.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -Contributions
          Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
          Made with Libxml2 Logo

          The XML C parser and toolkit of Gnome

          Contributions

          Main Menu
          Related links
          • Bjorn Reese, William Brack and Thomas Broyer have provided a number of +Contributions
            Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
            Made with Libxml2 Logo

            The XML C parser and toolkit of Gnome

            Contributions

            Main Menu
            Related links
            • Bjorn Reese, William Brack and Thomas Broyer have provided a number of patches, Gary Pennington worked on the validation API, threading support and Solaris port.
            • John Fleck helps maintaining the documentation and man pages.
            • diff --git a/doc/downloads.html b/doc/downloads.html index b0347d73..7a668972 100644 --- a/doc/downloads.html +++ b/doc/downloads.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -Downloads
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo

              The XML C parser and toolkit of Gnome

              Downloads

              Main Menu
              Related links

              The latest versions of libxml2 can be found on the xmlsoft.org server ( HTTP, FTP and rsync are available), there is also +Downloads
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo

              The XML C parser and toolkit of Gnome

              Downloads

              Main Menu
              Related links

              The latest versions of libxml2 can be found on the xmlsoft.org server ( HTTP, FTP and rsync are available), there is also mirrors (Australia( Web), France) or on the Gnome FTP server as source archive , Antonin Sprinzl also provide a mirror in Austria. (NOTE that you need both the libxml(2) and libxml(2)-devel diff --git a/doc/encoding.html b/doc/encoding.html index 04d54e79..5b6f7300 100644 --- a/doc/encoding.html +++ b/doc/encoding.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -Encodings support
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo

              The XML C parser and toolkit of Gnome

              Encodings support

              Main Menu
              Related links

              If you are not really familiar with Internationalization (usual shortcut +Encodings support
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo

              The XML C parser and toolkit of Gnome

              Encodings support

              Main Menu
              Related links

              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.

              If you don't understand why it does not make sense to have a string without knowing what encoding it uses, then as Joel Spolsky said diff --git a/doc/help.html b/doc/help.html index 3148b842..fa655ab9 100644 --- a/doc/help.html +++ b/doc/help.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -How to help
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo

              The XML C parser and toolkit of Gnome

              How to help

              Main Menu
              Related links

              You can help the project in various ways, the best thing to do first is to +How to help
              Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
              Made with Libxml2 Logo

              The XML C parser and toolkit of Gnome

              How to help

              Main Menu
              Related links

              You can help the project in various ways, the best thing to do first is to subscribe to the mailing-list as explained before, check the archives and the Gnome bug database:

              1. Provide patches when you find problems.
              2. Provide the diffs when you port libxml2 to a new platform. They may not diff --git a/doc/html/libxml-pattern.html b/doc/html/libxml-pattern.html index 1e1300fa..2415881c 100644 --- a/doc/html/libxml-pattern.html +++ b/doc/html/libxml-pattern.html @@ -24,6 +24,7 @@ The content of this structure is not made public by the API.
                xmlStreamCtxtPtr	xmlPatternGetStreamCtxt	(xmlPatternPtr comp)
                int	xmlPatternMatch			(xmlPatternPtr comp, 
                xmlNodePtr node)
                int	xmlPatternMaxDepth		(xmlPatternPtr comp)
                +
                int	xmlPatternMinDepth		(xmlPatternPtr comp)
                int	xmlPatternStreamable		(xmlPatternPtr comp)
                xmlPatternPtr	xmlPatterncompile	(const xmlChar * pattern, 
                xmlDict * dict,
                int flags,
                const xmlChar ** namespaces)
                int	xmlStreamPop			(xmlStreamCtxtPtr stream)
                @@ -54,7 +55,9 @@ The content of this structure is not made public by the API.

                Test whether the node matches the pattern

                comp:the precompiled pattern
                node:a node
                Returns:1 if it matches, 0 if it doesn't and -1 in case of failure

                Function: xmlPatternMaxDepth

                int	xmlPatternMaxDepth		(xmlPatternPtr comp)

                Check the maximum depth reachable by a pattern

                -
                comp:the precompiled pattern
                Returns:-2 if no limit (using //), otherwise the depth, and -1 in case of error

                Function: xmlPatternStreamable

                int	xmlPatternStreamable		(xmlPatternPtr comp)
                +
                comp:the precompiled pattern
                Returns:-2 if no limit (using //), otherwise the depth, and -1 in case of error

                Function: xmlPatternMinDepth

                int	xmlPatternMinDepth		(xmlPatternPtr comp)
                +

                Check the minimum depth reachable by a pattern, 0 mean the / or . are part of the set.

                +
                comp:the precompiled pattern
                Returns:-1 in case of error otherwise the depth,

                Function: xmlPatternStreamable

                int	xmlPatternStreamable		(xmlPatternPtr comp)

                Check if the pattern is streamable i.e. xmlPatternGetStreamCtxt() should work.

                comp:the precompiled pattern
                Returns:1 if streamable, 0 if not and -1 in case of error.

                Function: xmlPatterncompile

                xmlPatternPtr	xmlPatterncompile	(const xmlChar * pattern, 
                xmlDict * dict,
                int flags,
                const xmlChar ** namespaces)

                Compile a pattern.

                diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html index b7f90553..5a33b381 100644 --- a/doc/html/libxml-tree.html +++ b/doc/html/libxml-tree.html @@ -883,7 +883,7 @@ A:link, A:visited, A:active { text-decoration: underline }

                parse an XML qualified name string [NS 5] QName ::= (Prefix ':')? LocalPart [NS 6] Prefix ::= NCName [NS 7] LocalPart ::= NCName

                name:the full QName
                prefix:a xmlChar **
                Returns:NULL if not a QName, otherwise the local part, and prefix is updated to get the Prefix if any.

                Function: xmlSplitQName3

                const xmlChar *	xmlSplitQName3		(const xmlChar * name, 
                int * len)

                parse an XML qualified name string,i

                -
                name:the full QName
                len:an int *
                Returns:NULL if it is not a Qualified Name, otherwise, update len with the lenght in byte of the prefix and return a pointer

                Function: xmlStringGetNodeList

                xmlNodePtr	xmlStringGetNodeList	(xmlDocPtr doc, 
                const xmlChar * value)
                +
                name:the full QName
                len:an int *
                Returns:NULL if it is not a Qualified Name, otherwise, update len with the lenght in byte of the prefix and return a pointer to the start of the name without the prefix

                Function: xmlStringGetNodeList

                xmlNodePtr	xmlStringGetNodeList	(xmlDocPtr doc, 
                const xmlChar * value)

                Parse the value string and build the node list associated. Should produce a flat tree with only TEXTs and ENTITY_REFs.

                doc:the document
                value:the value of the attribute
                Returns:a pointer to the first child

                Function: xmlStringLenGetNodeList

                xmlNodePtr	xmlStringLenGetNodeList	(xmlDocPtr doc, 
                const xmlChar * value,
                int len)

                Parse the value string and build the node list associated. Should produce a flat tree with only TEXTs and ENTITY_REFs.

                diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html index b03364a9..ba4265fa 100644 --- a/doc/html/libxml-xpath.html +++ b/doc/html/libxml-xpath.html @@ -10,7 +10,7 @@ A:link, A:visited, A:active { text-decoration: underline } Module xpath from libxml2
                Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                Made with Libxml2 Logo

                Module xpath from libxml2

                API Menu
                API Indexes
                Related links

                API for the XML Path Language implementation XML Path Language implementation XPath is a language for addressing parts of an XML document, designed to be used by both XSLT and XPointer

                Table of Contents

                #define xmlXPathNodeSetGetLength
                #define xmlXPathNodeSetIsEmpty
                #define xmlXPathNodeSetItem
                Structure xmlNodeSet
                struct _xmlNodeSet + Module xpath from libxml2
                Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                Made with Libxml2 Logo

                Module xpath from libxml2

                API Menu
                API Indexes
                Related links

                API for the XML Path Language implementation XML Path Language implementation XPath is a language for addressing parts of an XML document, designed to be used by both XSLT and XPointer

                Table of Contents

                #define XML_XPATH_CHECKNS
                #define XML_XPATH_NOVAR
                #define xmlXPathNodeSetGetLength
                #define xmlXPathNodeSetIsEmpty
                #define xmlXPathNodeSetItem
                Structure xmlNodeSet
                struct _xmlNodeSet
                Typedef xmlNodeSet * xmlNodeSetPtr
                 
                Structure xmlXPathAxis
                struct _xmlXPathAxis
                Typedef xmlXPathAxis * xmlXPathAxisPtr
                @@ -20,7 +20,6 @@ The content of this structure is not made public by the API.
                 
                Structure xmlXPathContext
                struct _xmlXPathContext
                Typedef xmlXPathContext * xmlXPathContextPtr
                 
                Enum xmlXPathError
                -
                Enum xmlXPathFlags
                 
                Typedef xmlXPathFunct * xmlXPathFuncPtr
                 
                Structure xmlXPathFunct
                struct _xmlXPathFunct
                Structure xmlXPathObject
                struct _xmlXPathObject @@ -87,6 +86,8 @@ void xmlXPathFunction (xmlXPathObjectPtr xmlXPathVariableLookupFunc (void * ctxt,
                const xmlChar * name,
                const xmlChar * ns_uri)

                Description

                +

                Macro: XML_XPATH_CHECKNS

                #define XML_XPATH_CHECKNS

                check namespaces at compilation

                +

                Macro: XML_XPATH_NOVAR

                #define XML_XPATH_NOVAR

                forbid variables in expression

                Macro: xmlXPathNodeSetGetLength

                #define xmlXPathNodeSetGetLength

                Implement a functionality similar to the DOM NodeList.length. Returns the number of nodes in the node-set.

                Macro: xmlXPathNodeSetIsEmpty

                #define xmlXPathNodeSetIsEmpty

                Checks whether @ns is empty or not. Returns %TRUE if @ns is an empty node-set.

                Macro: xmlXPathNodeSetItem

                #define xmlXPathNodeSetItem

                Implements a functionality similar to the DOM NodeList.item(). Returns the xmlNodePtr at the given @index in @ns or NULL if @index is out of range (0 to length-1)

                @@ -163,9 +164,6 @@ The content of this structure is not made public by the API. XPATH_INVALID_CHAR_ERROR = 21 XPATH_INVALID_CTXT = 22 } -

                Enum xmlXPathFlags

                Enum xmlXPathFlags {
                -    XML_XPATH_CHECKNS = 1 : check namespaces at compilation
                -}
                 

                Structure xmlXPathFunct

                Structure xmlXPathFunct
                struct _xmlXPathFunct { const xmlChar * name : the function name xmlXPathEvalFunc func : the evaluation function diff --git a/doc/index.html b/doc/index.html index 69e54ad7..d38bb702 100644 --- a/doc/index.html +++ b/doc/index.html @@ -1,8 +1,7 @@ - - + Introduction
                Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                Made with Libxml2 Logo

                The XML C parser and toolkit of Gnome

                Introduction

                Main Menu
                Related links

                This document describes libxml, the XML C parser and toolkit developed for the +Introduction
                Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                Made with Libxml2 Logo

                The XML C parser and toolkit of Gnome

                Introduction

                Main Menu
                Related links

                This document describes libxml, the XML C parser and toolkit developed for the Gnome project. XML is a standard for building tag-based structured documents/data.

                Here are some key points about libxml:

                • Libxml2 exports Push (progressive) and Pull (blocking) type parser interfaces for both XML and HTML.
                • diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 985677b9..8d0bb389 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -963,6 +963,7 @@ + @@ -3366,13 +3367,14 @@ API for the XML Path Language implementation XML Path Language implementation XPath is a language for addressing parts of an XML document, designed to be used by both XSLT and XPointer Daniel Veillard - + + + - @@ -3403,12 +3405,11 @@ - + - @@ -4256,6 +4257,12 @@ This is the namespace for the special xml: prefix predefined in the XML Namespace specification. + + check namespaces at compilation + + + forbid variables in expression + Macro to raise an XPath error and return. @@ -5536,7 +5543,6 @@ - @@ -6549,7 +6555,6 @@ actually an xmlCharEncoding'/> - @@ -12032,6 +12037,12 @@ actually an xmlCharEncoding'/> + + defined(LIBXML_PATTERN_ENABLED) + Check the minimum depth reachable by a pattern, 0 mean the / or . are part of the set. + + + defined(LIBXML_PATTERN_ENABLED) Check if the pattern is streamable i.e. xmlPatternGetStreamCtxt() should work. @@ -13845,7 +13856,7 @@ actually an xmlCharEncoding'/> parse an XML qualified name string,i - + diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index 6ee67e48..bf493afe 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -1299,6 +1299,7 @@ + @@ -2417,6 +2418,7 @@ + @@ -3248,7 +3250,6 @@ - @@ -4739,6 +4740,7 @@ + @@ -5893,6 +5895,7 @@ + @@ -6724,7 +6727,6 @@ - @@ -9682,6 +9684,7 @@ + @@ -11204,6 +11207,7 @@ + @@ -13528,6 +13532,7 @@ + @@ -13605,7 +13610,6 @@ - @@ -19719,6 +19723,7 @@ + @@ -20651,6 +20656,7 @@ + @@ -22098,6 +22104,9 @@ + + + @@ -24196,6 +24205,9 @@ + + + @@ -24314,6 +24326,7 @@ + @@ -24501,6 +24514,7 @@ + @@ -25466,6 +25480,7 @@ + @@ -25663,6 +25678,7 @@ + @@ -26188,6 +26204,7 @@ + @@ -27673,6 +27690,7 @@ + @@ -29059,6 +29077,7 @@ + @@ -29357,6 +29376,7 @@ + diff --git a/doc/namespaces.html b/doc/namespaces.html index d2c9be3a..de579eb1 100644 --- a/doc/namespaces.html +++ b/doc/namespaces.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -Namespaces
                  Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                  Made with Libxml2 Logo

                  The XML C parser and toolkit of Gnome

                  Namespaces

                  Main Menu
                  Related links

                  The libxml2 library implements XML namespaces support by +Namespaces
                  Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                  Made with Libxml2 Logo

                  The XML C parser and toolkit of Gnome

                  Namespaces

                  Main Menu
                  Related links

                  The libxml2 library implements XML namespaces support by recognizing namespace constructs in the input, and does namespace lookup automatically when building the DOM tree. A namespace declaration is associated with an in-memory structure and all elements or attributes within diff --git a/doc/news.html b/doc/news.html index 3d6a7b7e..614873b7 100644 --- a/doc/news.html +++ b/doc/news.html @@ -7,12 +7,13 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -Releases
                  Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                  Made with Libxml2 Logo

                  The XML C parser and toolkit of Gnome

                  Releases

                  Main Menu
                  Related links

                  Items not finished and worked on, get in touch with the list if you want +Releases
                  Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                  Made with Libxml2 Logo

                  The XML C parser and toolkit of Gnome

                  Releases

                  Main Menu
                  Related links

                  Items not finished and worked on, get in touch with the list if you want to help those

                  The change log describes the recents commits -to the CVS code base.

                  There is the list of public releases:

                  2.6.20: Jul 10 2005

                  • build fixes: Windows build (Rob Richards), Mingw compilation (Igor +to the CVS code base.

                    There is the list of public releases:

                    2.6.21: Jul 10 2005

                      2.6.20: Jul 10 2005

                      +
                      • build fixes: Windows build (Rob Richards), Mingw compilation (Igor Zlatkovic), Windows Makefile (Igor), gcc warnings (Kasimier and andriy@google.com), use gcc weak references to pthread to avoid the pthread dependancy on Linux, compilation problem (Steve Nairn), @@ -50,7 +51,8 @@ to the CVS code base.

                        xmlSchemaValidateStream() xmlSchemaSAXPlug() and xmlSchemaSAXUnplug() SAX Schemas APIs, Schemas xmlReader support.

                      • -

                      2.6.19: Apr 02 2005

                      • build fixes: drop .la from RPMs, --with-minimum build fix (William +

                      2.6.19: Apr 02 2005

                      +
                      • build fixes: drop .la from RPMs, --with-minimum build fix (William Brack), use XML_SOCKLEN_T instead of SOCKLEN_T because it breaks with AIX 5.3 compiler, fixed elfgcchack.h generation and PLT reduction code on Linux/ELF/gcc4
                      • @@ -68,7 +70,8 @@ to the CVS code base.

                      • improvements: lot of work on Schemas by Kasimier Buchcik on facets checking and also mixed handling.
                      • -

                      2.6.18: Mar 13 2005

                      • build fixes: warnings (Peter Breitenlohner), testapi.c generation, +

                      2.6.18: Mar 13 2005

                      +
                      • build fixes: warnings (Peter Breitenlohner), testapi.c generation, Bakefile support (Francesco Montorsi), Windows compilation (Joel Reed), some gcc4 fixes, HP-UX portability fixes (Rick Jones).
                      • bug fixes: xmlSchemaElementDump namespace (Kasimier Buchcik), push and @@ -91,7 +94,8 @@ to the CVS code base.

                        values handling (Kasimier), add xmlTextReaderByteConsumed (Aron Stansvik),

                      • Documentation: Wiki support (Joel Reed) -

                      2.6.17: Jan 16 2005

                      • build fixes: Windows, warnings removal (William Brack), +

                      2.6.17: Jan 16 2005

                      +
                      • build fixes: Windows, warnings removal (William Brack), maintainer-clean dependency(William), build in a different directory (William), fixing --with-minimum configure build (William), BeOS build (Marcin Konicki), Python-2.4 detection (William), compilation @@ -115,7 +119,8 @@ to the CVS code base.

                        (mostly Joel Reed), error extraction API from regexps, new XMLSave option for format (Phil Shafer)

                      • documentation: site improvement (John Fleck), FAQ entries (William).
                      • -

                      2.6.16: Nov 10 2004

                      • general hardening and bug fixing crossing all the API based on new +

                      2.6.16: Nov 10 2004

                      +
                      • general hardening and bug fixing crossing all the API based on new automated regression testing
                      • build fix: IPv6 build and test on AIX (Dodji Seketeli)
                      • bug fixes: problem with XML::Libxml reported by Petr Pajas, encoding @@ -125,7 +130,8 @@ to the CVS code base.

                        were updated.

                      • improvements: DTD validation APIs provided at the Python level (Brent Hendricks)
                      • -

                      2.6.15: Oct 27 2004

                      • security fixes on the nanoftp and nanohttp modules
                      • +

                      2.6.15: Oct 27 2004

                      +
                      • security fixes on the nanoftp and nanohttp modules
                      • build fixes: xmllint detection bug in configure, building outside the source tree (Thomas Fitzsimmons)
                      • bug fixes: HTML parser on broken ASCII chars in names (William), Python @@ -140,7 +146,8 @@ to the CVS code base.

                      • improvements: better XInclude error reports (William), tree debugging module and tests, convenience functions at the Reader API (Graham Bennett), add support for PI in the HTML parser.
                      • -

                      2.6.14: Sep 29 2004

                      • build fixes: configure paths for xmllint and xsltproc, compilation +

                      2.6.14: Sep 29 2004

                      +
                      • build fixes: configure paths for xmllint and xsltproc, compilation without HTML parser, compilation warning cleanups (William Brack & Malcolm Tredinnick), VMS makefile update (Craig Berry),
                      • bug fixes: xmlGetUTF8Char (William Brack), QName properties (Kasimier @@ -155,7 +162,8 @@ to the CVS code base.

                        (Malcolm Tredinnick), Python libxml2 driver improvement (Malcolm Tredinnick), Schemas support for xsi:schemaLocation, xsi:noNamespaceSchemaLocation, xsi:type (Kasimier Buchcik)

                      • -

                      2.6.13: Aug 31 2004

                      • build fixes: Windows and zlib (Igor Zlatkovic), -O flag with gcc, +

                      2.6.13: Aug 31 2004

                      +
                      • build fixes: Windows and zlib (Igor Zlatkovic), -O flag with gcc, Solaris compiler warning, fixing RPM BuildRequires,
                      • fixes: DTD loading on Windows (Igor), Schemas error reports APIs (Kasimier Buchcik), Schemas validation crash, xmlCheckUTF8 (William Brack @@ -165,7 +173,8 @@ to the CVS code base.

                      • Improvements: Schemas validity improvements (Kasimier), added --path and --load-trace options to xmllint
                      • documentation: tutorial update (John Fleck)
                      • -

                      2.6.12: Aug 22 2004

                      • build fixes: fix --with-minimum, elfgcchack.h fixes (Peter +

                      2.6.12: Aug 22 2004

                      +
                      • build fixes: fix --with-minimum, elfgcchack.h fixes (Peter Breitenlohner), perl path lookup (William), diff on Solaris (Albert Chin), some 64bits cleanups.
                      • Python: avoid a warning with 2.3 (William Brack), tab and space mixes @@ -190,7 +199,8 @@ to the CVS code base.

                        tag (William)

                      • documentation: web pages fixes, validity API docs fixes (William) schemas API fix (Eric Haszlakiewicz), xmllint man page (John Fleck)
                      • -

                      2.6.11: July 5 2004

                      • Schemas: a lot of changes and improvements by Kasimier Buchcik for +

                      2.6.11: July 5 2004

                      +
                      • Schemas: a lot of changes and improvements by Kasimier Buchcik for attributes, namespaces and simple types.
                      • build fixes: --with-minimum (William Brack), some gcc cleanup (William), --with-thread-alloc (William)
                      • @@ -217,7 +227,8 @@ to the CVS code base.

                      • performance: hack done with Arjan van de Ven to reduce ELF footprint and generated code on Linux, plus use gcc runtime profiling to optimize the code generated in the RPM packages.
                      • -

                      2.6.10: May 17 2004

                      • Web page generated for ChangeLog
                      • +

                      2.6.10: May 17 2004

                      +
                      • Web page generated for ChangeLog
                      • build fixes: --without-html problems, make check without make all
                      • portability: problem with xpath.c on Windows (MSC and Borland), memcmp vs. strncmp on Solaris, XPath tests on Windows (Mark Vakoc), C++ do not @@ -234,7 +245,8 @@ to the CVS code base.

                        Buchcik), XInclude fallback problem (William), weird problems with DTD (William), structured error handler callback context (William), reverse xmlEncodeSpecialChars() behaviour back to escaping '"'

                      • -

                      2.6.9: Apr 18 2004

                      • implement xml:id Working Draft, relaxed XPath id() checking
                      • +

                      2.6.9: Apr 18 2004

                      +
                      • implement xml:id Working Draft, relaxed XPath id() checking
                      • bugfixes: xmlCtxtReset (Brent Hendricks), line number and CDATA (Dave Beckett), Relax-NG compilation (William Brack), Regexp patches (with William), xmlUriEscape (Mark Vakoc), a Relax-NG notAllowed problem (with @@ -251,7 +263,8 @@ to the CVS code base.

                        example (load, xpath, modify, save), xmlCatalogDump() comments,

                      • Windows: Borland C++ builder (Eric Zurcher), work around Microsoft compiler NaN handling bug (Mark Vakoc)
                      • -

                      2.6.8: Mar 23 2004

                      • First step of the cleanup of the serialization code and APIs
                      • +

                      2.6.8: Mar 23 2004

                      +
                      • First step of the cleanup of the serialization code and APIs
                      • XML Schemas: mixed content (Adam Dickmeiss), QName handling fixes (Adam Dickmeiss), anyURI for "" (John Belmonte)
                      • Python: Canonicalization C14N support added (Anthony Carrico)
                      • @@ -273,7 +286,8 @@ to the CVS code base.

                        (Peter Breitenlohner), MingW patch (Roland Schwingel), cross-compilation to Windows (Christophe de Vienne), --with-html-dir fixup (Julio Merino Vidal), Windows build (Eric Zurcher) -

                      2.6.7: Feb 23 2004

                      • documentation: tutorial updates (John Fleck), benchmark results
                      • +

                      2.6.7: Feb 23 2004

                      +
                      • documentation: tutorial updates (John Fleck), benchmark results
                      • xmlWriter: updates and fixes (Alfred Mickautsch, Lucas Brasilino)
                      • XPath optimization (Petr Pajas)
                      • DTD ID handling optimization
                      • @@ -283,7 +297,8 @@ to the CVS code base.

                        handling NULL, trying to fix Relax-NG/Perl interface.

                      • python: 2.3 compatibility, whitespace fixes (Malcolm Tredinnick)
                      • Added relaxng option to xmllint --shell
                      • -

                      2.6.6: Feb 12 2004

                      • nanohttp and nanoftp: buffer overflow error on URI parsing (Igor and +

                      2.6.6: Feb 12 2004

                      +
                      • nanohttp and nanoftp: buffer overflow error on URI parsing (Igor and William) reported by Yuuichi Teranishi
                      • bugfixes: make test and path issues, xmlWriter attribute serialization (William Brack), xmlWriter indentation (William), schemas validation @@ -305,7 +320,8 @@ to the CVS code base.

                        patch

                      • Parsers: added xmlByteConsumed(ctxt) API to get the byte offest in input.
                      • -

                      2.6.5: Jan 25 2004

                      • Bugfixes: dictionnaries for schemas (William Brack), regexp segfault +

                      2.6.5: Jan 25 2004

                      +
                      • Bugfixes: dictionnaries for schemas (William Brack), regexp segfault (William), xs:all problem (William), a number of XPointer bugfixes (William), xmllint error go to stderr, DTD validation problem with namespace, memory leak (William), SAX1 cleanup and minimal options fixes @@ -326,7 +342,8 @@ to the CVS code base.

                      • Windows: compiler patches (Mark Vakoc)
                      • Parser optimizations, a few new XPath and dictionnary APIs for future XSLT optimizations.
                      • -

                      2.6.4: Dec 24 2003

                      • Windows build fixes (Igor Zlatkovic)
                      • +

                      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 @@ -337,7 +354,8 @@ to the CVS code base.

                        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)
                      • +

                      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
                      • Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher, Mingw @@ -361,7 +379,8 @@ to the CVS code base.

                        constraints), added xmlTextReaderPreservePattern() to collect subdocument when streaming.

                      • various fixes in the structured error handling
                      • -

                      2.6.2: Nov 4 2003

                      • XPath context unregistration fixes
                      • +

                      2.6.2: Nov 4 2003

                      +
                      • XPath context unregistration fixes
                      • text node coalescing fixes (Mark Lilback)
                      • API to screate a W3C Schemas from an existing document (Steve Ball)
                      • BeOS patches (Marcin 'Shard' Konicki)
                      • @@ -381,7 +400,8 @@ to the CVS code base.

                      • fixed xmllint --html to use the HTML serializer on output (added --xmlout to implement the previous behaviour of saving it using the XML serializer)
                      • -

                      2.6.1: Oct 28 2003

                      • Mostly bugfixes after the big 2.6.0 changes
                      • +

                      2.6.1: Oct 28 2003

                      +
                      • Mostly bugfixes after the big 2.6.0 changes
                      • Unix compilation patches: libxml.m4 (Patrick Welche), warnings cleanup (William Brack)
                      • Windows compilation patches (Joachim Bauch, Stephane Bidoul, Igor @@ -400,7 +420,8 @@ to the CVS code base.

                      • general bug fixes: mandatory encoding in text decl, serializing Document Fragment nodes, xmlSearchNs 2.6.0 problem (Kasimier Buchcik), XPath errors not reported, slow HTML parsing of large documents.
                      • -

                      2.6.0: Oct 20 2003

                      • Major revision release: should be API and ABI compatible but got a lot +

                      2.6.0: Oct 20 2003

                      +
                      • Major revision release: should be API and ABI compatible but got a lot of change
                      • Increased the library modularity, far more options can be stripped out, a --with-minimum configuration will weight around 160KBytes
                      • @@ -464,9 +485,15 @@ to the CVS code base.

                      • libxml-2.0-uninstalled.pc from Malcolm Tredinnick
                      • deactivated the broken docBook SGML parser code and plugged the XML parser instead.
                      • -

                      2.5.11: Sep 9 2003

                      A bugfix only release:

                      • risk of crash in Relax-NG
                      • +

                      2.5.11: Sep 9 2003

                      + +

                      A bugfix only release:

                      +
                      • risk of crash in Relax-NG
                      • risk of crash when using multithreaded programs
                      • -

                      2.5.10: Aug 15 2003

                      A bugfixes only release

                      • Windows Makefiles (William Brack)
                      • +

                      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)
                      • @@ -475,7 +502,8 @@ to the CVS code base.

                      • 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 +

                      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), xmlReader, Relax-NG schemas compilation, namespace handling, EXSLT (Sean @@ -491,7 +519,8 @@ to the CVS code base.

                      • xmlTextReader cleanup + enum for node types (Bjorn Reese)
                      • general compilation/warning cleanup Solaris/HP-UX/... (William Brack)
                      • -

                      2.5.8: Jul 6 2003

                      • bugfixes: XPath, XInclude, file/URI mapping, UTF-16 save (Mark +

                      2.5.8: Jul 6 2003

                      +
                      • bugfixes: XPath, XInclude, file/URI mapping, UTF-16 save (Mark Itzcovitz), UTF-8 checking, URI saving, error printing (William Brack), PI related memleak, compilation without schemas or without xpath (Joerg Schmitz-Linneweber/Garry Pennington), xmlUnlinkNode problem with DTDs, @@ -508,7 +537,8 @@ to the CVS code base.

                        generator

                      • added --nonet option to xmllint
                      • documentation improvements (John Fleck)
                      • -

                      2.5.7: Apr 25 2003

                      • Relax-NG: Compiling to regexp and streaming validation on top of the +

                      2.5.7: Apr 25 2003

                      +
                      • Relax-NG: Compiling to regexp and streaming validation on top of the xmlReader interface, added to xmllint --stream
                      • xmlReader: Expand(), Next() and DOM access glue, bug fixes
                      • Support for large files: RGN validated a 4.5GB instance
                      • @@ -525,7 +555,8 @@ to the CVS code base.

                        xmlReader interfaces, removed excessive thread locking

                      • Documentation: man page (John Fleck), xmlReader documentation
                      • Python: adding binding for xmlCatalogAddLocal (Brent M Hendricks)
                      • -

                      2.5.6: Apr 1 2003

                      • Fixed W3C XML Schemas datatype, should be compliant now except for +

                      2.5.6: Apr 1 2003

                      +
                      • Fixed W3C XML Schemas datatype, should be compliant now except for binHex and base64 which are not supported yet.
                      • bug fixes: non-ASCII IDs, HTML output, XInclude on large docs and XInclude entities handling, encoding detection on external subsets, XML @@ -534,7 +565,8 @@ to the CVS code base.

                      • documentation: added --relaxng option to xmllint man page (John)
                      • improved error reporting: xml:space, start/end tag mismatches, Relax NG errors
                      • -

                      2.5.5: Mar 24 2003

                      • Lot of fixes on the Relax NG implementation. More testing including +

                      2.5.5: Mar 24 2003

                      +
                      • Lot of fixes on the Relax NG implementation. More testing including DocBook and TEI examples.
                      • Increased the support for W3C XML Schemas datatype
                      • Several bug fixes in the URI handling layer
                      • @@ -542,7 +574,8 @@ to the CVS code base.

                        conversion, line counting in the parser.

                      • Added support for $XMLLINT_INDENT environment variable, FTP delete
                      • Fixed the RPM spec file name
                      • -

                      2.5.4: Feb 20 2003

                      • Conformance testing and lot of fixes on Relax NG and XInclude +

                      2.5.4: Feb 20 2003

                      +
                      • Conformance testing and lot of fixes on Relax NG and XInclude implementation
                      • Implementation of XPointer element() scheme
                      • Bug fixes: XML parser, XInclude entities merge, validity checking on @@ -553,13 +586,15 @@ to the CVS code base.

                      • Portability: windows updates and path canonicalization (Igor)
                      • A few typo fixes (Kjartan Maraas)
                      • Python bindings generator fixes (Stephane Bidoul)
                      • -

                      2.5.3: Feb 10 2003

                      • RelaxNG and XML Schemas datatypes improvements, and added a first +

                      2.5.3: Feb 10 2003

                      +
                      • RelaxNG and XML Schemas datatypes improvements, and added a first version of RelaxNG Python bindings
                      • Fixes: XLink (Sean Chittenden), XInclude (Sean Chittenden), API fix for serializing namespace nodes, encoding conversion bug, XHTML1 serialization
                      • Portability fixes: Windows (Igor), AMD 64bits RPM spec file
                      • -

                      2.5.2: Feb 5 2003

                      • First implementation of RelaxNG, added --relaxng flag to xmllint
                      • +

                      2.5.2: Feb 5 2003

                      +
                      • First implementation of RelaxNG, added --relaxng flag to xmllint
                      • Schemas support now compiled in by default.
                      • Bug fixes: DTD validation, namespace checking, XInclude and entities, delegateURI in XML Catalogs, HTML parser, XML reader (Stéphane Bidoul), @@ -573,10 +608,12 @@ to the CVS code base.

                      • Added python bindings for XPointer, contextual error reporting (Stéphane Bidoul)
                      • URI/file escaping problems (Stefano Zacchiroli)
                      • -

                      2.5.1: Jan 8 2003

                      • Fixes a memory leak and configuration/compilation problems in 2.5.0
                      • +

                      2.5.1: Jan 8 2003

                      +
                      • Fixes a memory leak and configuration/compilation problems in 2.5.0
                      • documentation updates (John)
                      • a couple of XmlTextReader fixes
                      • -

                      2.5.0: Jan 6 2003

                      2.5.0: Jan 6 2003

                      +
                      • New XmltextReader interface based on C# API (with help of Stéphane Bidoul)
                      • Windows: more exports, including the new API (Igor)
                      • XInclude fallback fix
                      • @@ -591,10 +628,12 @@ to the CVS code base.

                      • new API to optionally track node creation and deletion (Lukas Schroeder)
                      • Added documentation for the XmltextReader interface and some XML guidelines
                      • -

                      2.4.30: Dec 12 2002

                      • 2.4.29 broke the python bindings, rereleasing
                      • +

                      2.4.30: Dec 12 2002

                      +
                      • 2.4.29 broke the python bindings, rereleasing
                      • Improvement/fixes of the XML API generator, and couple of minor code fixes.
                      • -

                      2.4.29: Dec 11 2002

                      • Windows fixes (Igor): Windows CE port, pthread linking, python bindings +

                      2.4.29: Dec 11 2002

                      +
                      • Windows fixes (Igor): Windows CE port, pthread linking, python bindings (Stéphane Bidoul), Mingw (Magnus Henoch), and export list updates
                      • Fix for prev in python bindings (ERDI Gergo)
                      • Fix for entities handling (Marcus Clarke)
                      • @@ -605,14 +644,16 @@ to the CVS code base.

                      • added an TextXmlReader (C#) like API (work in progress)
                      • Rewrote the API in XML generation script, includes a C parser and saves more informations needed for C# bindings
                      • -

                      2.4.28: Nov 22 2002

                      • a couple of python binding fixes
                      • +

                      2.4.28: Nov 22 2002

                      +
                      • a couple of python binding fixes
                      • 2 bug fixes in the XML push parser
                      • potential memory leak removed (Martin Stoilov)
                      • fix to the configure script for Unix (Dimitri Papadopoulos)
                      • added encoding support for XInclude parse="text"
                      • autodetection of XHTML1 and specific serialization rules added
                      • nasty threading bug fixed (William Brack)
                      • -

                      2.4.27: Nov 17 2002

                      • fixes for the Python bindings
                      • +

                      2.4.27: Nov 17 2002

                      +
                      • fixes for the Python bindings
                      • a number of bug fixes: SGML catalogs, xmlParseBalancedChunkMemory(), HTML parser, Schemas (Charles Bozeman), document fragment support (Christian Glahn), xmlReconciliateNs (Brian Stafford), XPointer, @@ -624,11 +665,13 @@ to the CVS code base.

                        better thread support on Windows

                      • cleanup of Unix Makefiles and spec file
                      • Improvements to the documentation (John Fleck)
                      • -

                      2.4.26: Oct 18 2002

                      • Patches for Windows CE port, improvements on Windows paths handling
                      • +

                      2.4.26: Oct 18 2002

                      +
                      • Patches for Windows CE port, improvements on Windows paths handling
                      • Fixes to the validation code (DTD and Schemas), xmlNodeGetPath() , HTML serialization, Namespace compliance, and a number of small problems
                      • -

                      2.4.25: Sep 26 2002

                      • A number of bug fixes: XPath, validation, Python bindings, DOM and +

                      2.4.25: Sep 26 2002

                      +
                      • A number of bug fixes: XPath, validation, Python bindings, DOM and tree, xmlI/O, Html
                      • Serious rewrite of XInclude
                      • Made XML Schemas regexp part of the default build and APIs, small fix @@ -645,7 +688,8 @@ to the CVS code base.

                      • removal of all stderr/perror use for error reporting
                      • Better error reporting: XPath and DTD validation
                      • update of the trio portability layer (Bjorn Reese)
                      • -

                      2.4.24: Aug 22 2002

                      • XPath fixes (William), xf:escape-uri() (Wesley Terpstra)
                      • +

                      2.4.24: Aug 22 2002

                      +
                      • XPath fixes (William), xf:escape-uri() (Wesley Terpstra)
                      • Python binding fixes: makefiles (William), generator, rpm build, x86-64 (fcrozat)
                      • HTML <style> and boolean attributes serializer fixes
                      • @@ -653,7 +697,8 @@ to the CVS code base.

                      • doc cleanups: Rick Jones
                      • Windows compiler makefile updates: Igor and Elizabeth Barham
                      • XInclude: implementation of fallback and xml:base fixup added
                      • -

                      2.4.23: July 6 2002

                      • performances patches: Peter Jacobi
                      • +

                      2.4.23: July 6 2002

                      +
                      • performances patches: Peter Jacobi
                      • c14n fixes, testsuite and performances: Aleksey Sanin
                      • added xmlDocFormatDump: Chema Celorio
                      • new tutorial: John Fleck
                      • @@ -662,7 +707,8 @@ to the CVS code base.

                      • a number of bug fixes: XPath (William Brack, Richard Jinks), XML and HTML parsers, ID lookup function
                      • removal of all remaining sprintf: Aleksey Sanin
                      • -

                      2.4.22: May 27 2002

                      • a number of bug fixes: configure scripts, base handling, parser, memory +

                      2.4.22: May 27 2002

                      +
                      • a number of bug fixes: configure scripts, base handling, parser, memory usage, HTML parser, XPath, documentation (Christian Cornelssen), indentation, URI parsing
                      • Optimizations for XMLSec, fixing and making public some of the network @@ -670,43 +716,53 @@ to the CVS code base.

                      • performance patch from Gary Pennington
                      • Charles Bozeman provided date and time support for XML Schemas datatypes
                      • -

                      2.4.21: Apr 29 2002

                      This release is both a bug fix release and also contains the early XML +

                    2.4.21: Apr 29 2002

                    + +

                    This release is both a bug fix release and also contains the early XML Schemas structures and datatypes code, beware, all interfaces are likely to change, there is huge holes, it is clearly a work in progress and don't even think of putting this code in a production system, -it's actually not compiled in by default. The real fixes are:

                    • a couple of bugs or limitations introduced in 2.4.20
                    • +it's actually not compiled in by default. The real fixes are:

                      +
                      • a couple of bugs or limitations introduced in 2.4.20
                      • patches for Borland C++ and MSC by Igor
                      • some fixes on XPath strings and conformance patches by Richard Jinks
                      • patch from Aleksey for the ExcC14N specification
                      • OSF/1 bug fix by Bjorn
                      • -

                      2.4.20: Apr 15 2002

                      • bug fixes: file descriptor leak, XPath, HTML output, DTD validation
                      • +

                      2.4.20: Apr 15 2002

                      +
                      • bug fixes: file descriptor leak, XPath, HTML output, DTD validation
                      • XPath conformance testing by Richard Jinks
                      • Portability fixes: Solaris, MPE/iX, Windows, OSF/1, python bindings, libxml.m4
                      • -

                      2.4.19: Mar 25 2002

                      • bug fixes: half a dozen XPath bugs, Validation, ISO-Latin to UTF8 +

                      2.4.19: Mar 25 2002

                      +
                      • bug fixes: half a dozen XPath bugs, Validation, ISO-Latin to UTF8 encoder
                      • portability fixes in the HTTP code
                      • memory allocation checks using valgrind, and profiling tests
                      • revamp of the Windows build and Makefiles
                      • -

                      2.4.18: Mar 18 2002

                      • bug fixes: tree, SAX, canonicalization, validation, portability, +

                      2.4.18: Mar 18 2002

                      +
                      • bug fixes: tree, SAX, canonicalization, validation, portability, XPath
                      • removed the --with-buffer option it was becoming unmaintainable
                      • serious cleanup of the Python makefiles
                      • speedup patch to XPath very effective for DocBook stylesheets
                      • Fixes for Windows build, cleanup of the documentation
                      • -

                      2.4.17: Mar 8 2002

                      • a lot of bug fixes, including "namespace nodes have no parents in +

                      2.4.17: Mar 8 2002

                      +
                      • a lot of bug fixes, including "namespace nodes have no parents in XPath"
                      • fixed/improved the Python wrappers, added more examples and more regression tests, XPath extension functions can now return node-sets
                      • added the XML Canonicalization support from Aleksey Sanin
                      • -

                      2.4.16: Feb 20 2002

                      • a lot of bug fixes, most of them were triggered by the XML Testsuite +

                      2.4.16: Feb 20 2002

                      +
                      • a lot of bug fixes, most of them were triggered by the XML Testsuite from OASIS and W3C. Compliance has been significantly improved.
                      • a couple of portability fixes too.
                      • -

                      2.4.15: Feb 11 2002

                      • Fixed the Makefiles, especially the python module ones
                      • +

                      2.4.15: Feb 11 2002

                      +
                      • Fixed the Makefiles, especially the python module ones
                      • A few bug fixes and cleanup
                      • Includes cleanup
                      • -

                      2.4.14: Feb 8 2002

                      • Change of License to the MIT +

                      2.4.14: Feb 8 2002

                      +
                      • Change of License to the MIT License basically for integration in XFree86 codebase, and removing confusion around the previous dual-licensing
                      • added Python bindings, beta software but should already be quite @@ -715,35 +771,42 @@ it's actually not compiled in by default. The real fixes are:

                        • a coupl manipulations
                        • cleanup of the headers, generation of a reference API definition in XML
                        • -

                        2.4.13: Jan 14 2002

                        • update of the documentation: John Fleck and Charlie Bozeman
                        • +

                        2.4.13: Jan 14 2002

                        +
                        • update of the documentation: John Fleck and Charlie Bozeman
                        • cleanup of timing code from Justin Fletcher
                        • fixes for Windows and initial thread support on Win32: Igor and Serguei Narojnyi
                        • Cygwin patch from Robert Collins
                        • added xmlSetEntityReferenceFunc() for Keith Isdale work on xsldbg
                        • -

                        2.4.12: Dec 7 2001

                        • a few bug fixes: thread (Gary Pennington), xmllint (Geert Kloosterman), +

                        2.4.12: Dec 7 2001

                        +
                        • a few bug fixes: thread (Gary Pennington), xmllint (Geert Kloosterman), XML parser (Robin Berjon), XPointer (Danny Jamshy), I/O cleanups (robert)
                        • Eric Lavigne contributed project files for MacOS
                        • some makefiles cleanups
                        • -

                        2.4.11: Nov 26 2001

                        • fixed a couple of errors in the includes, fixed a few bugs, some code +

                        2.4.11: Nov 26 2001

                        +
                        • fixed a couple of errors in the includes, fixed a few bugs, some code cleanups
                        • xmllint man pages improvement by Heiko Rupp
                        • updated VMS build instructions from John A Fotheringham
                        • Windows Makefiles updates from Igor
                        • -

                        2.4.10: Nov 10 2001

                        • URI escaping fix (Joel Young)
                        • +

                        2.4.10: Nov 10 2001

                        +
                        • URI escaping fix (Joel Young)
                        • added xmlGetNodePath() (for paths or XPointers generation)
                        • Fixes namespace handling problems when using DTD and validation
                        • improvements on xmllint: Morus Walter patches for --format and --encode, Stefan Kost and Heiko Rupp improvements on the --shell
                        • fixes for xmlcatalog linking pointed by Weiqi Gao
                        • fixes to the HTML parser
                        • -

                        2.4.9: Nov 6 2001

                        • fixes more catalog bugs
                        • +

                        2.4.9: Nov 6 2001

                        +
                        • fixes more catalog bugs
                        • avoid a compilation problem, improve xmlGetLineNo()
                        • -

                        2.4.8: Nov 4 2001

                        • fixed SGML catalogs broken in previous release, updated xmlcatalog +

                        2.4.8: Nov 4 2001

                        +
                        • fixed SGML catalogs broken in previous release, updated xmlcatalog tool
                        • fixed a compile errors and some includes troubles.
                        • -

                        2.4.7: Oct 30 2001

                        • exported some debugging interfaces
                        • +

                        2.4.7: Oct 30 2001

                        +
                        • exported some debugging interfaces
                        • serious rewrite of the catalog code
                        • integrated Gary Pennington thread safety patch, added configure option and regression tests
                        • @@ -755,40 +818,49 @@ it's actually not compiled in by default. The real fixes are:

                          • a coupl
                          • general bug fixes
                          • updated xmllint man page by John Fleck
                          • some VMS and Windows updates
                          • -

                          2.4.6: Oct 10 2001

                          • added an updated man pages by John Fleck
                          • +

                          2.4.6: Oct 10 2001

                          +
                          • added an 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 for 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
                          • +

                          2.4.5: Sep 14 2001

                          +
                          • Remove a few annoying bugs in 2.4.4
                          • forces the HTML serializer to output decimal charrefs since some version of Netscape can't handle hexadecimal ones
                          • -

                          1.8.16: Sep 14 2001

                          • maintenance release of the old libxml1 branch, couple of bug and +

                          1.8.16: Sep 14 2001

                          +
                          • maintenance release of the old libxml1 branch, couple of bug and portability fixes
                          • -

                          2.4.4: Sep 12 2001

                          • added --convert to xmlcatalog, bug fixes and cleanups of XML +

                          2.4.4: Sep 12 2001

                          +
                          • added --convert to xmlcatalog, bug fixes and cleanups of XML Catalog
                          • a few bug fixes and some portability changes
                          • some documentation cleanups
                          • -

                          2.4.3: Aug 23 2001

                          • XML Catalog support see the doc
                          • +

                          2.4.3: Aug 23 2001

                          +
                          • XML Catalog support see the doc
                          • New NaN/Infinity floating point code
                          • A few bug fixes
                          • -

                          2.4.2: Aug 15 2001

                          • adds xmlLineNumbersDefault() to control line number generation
                          • +

                          2.4.2: Aug 15 2001

                          +
                          • adds xmlLineNumbersDefault() to control line number generation
                          • lot of bug fixes
                          • the Microsoft MSC projects files should now be up to date
                          • inheritance of namespaces from DTD defaulted attributes
                          • fixes a serious potential security bug
                          • added a --format option to xmllint
                          • -

                          2.4.1: July 24 2001

                          • possibility to keep line numbers in the tree
                          • +

                          2.4.1: July 24 2001

                          +
                          • possibility to keep line numbers in the tree
                          • some computation NaN fixes
                          • extension of the XPath API
                          • cleanup for alpha and ia64 targets
                          • patch to allow saving through HTTP PUT or POST
                          • -

                          2.4.0: July 10 2001

                          • Fixed a few bugs in XPath, validation, and tree handling.
                          • +

                          2.4.0: July 10 2001

                          +
                          • Fixed a few bugs in XPath, validation, and tree handling.
                          • Fixed XML Base implementation, added a couple of examples to the regression tests
                          • A bit of cleanup
                          • -

                          2.3.14: July 5 2001

                          • fixed some entities problems and reduce memory requirement when +

                          2.3.14: July 5 2001

                          +
                          • fixed some entities problems and reduce memory requirement when substituting them
                          • lots of improvements in the XPath queries interpreter can be substantially faster
                          • @@ -796,11 +868,14 @@ it's actually not compiled in by default. The real fixes are:

                            • a coupl
                            • Fixes to XPath variable eval, and compare on empty node set
                            • HTML tag closing bug fixed
                            • Fixed an URI reference computation problem when validating
                            • -

                            2.3.13: June 28 2001

                            • 2.3.12 configure.in was broken as well as the push mode XML parser
                            • +

                            2.3.13: June 28 2001

                            +
                            • 2.3.12 configure.in was broken as well as the push mode XML parser
                            • a few more fixes for compilation on Windows MSC by Yon Derek
                            • -

                            1.8.14: June 28 2001

                            • Zbigniew Chyla gave a patch to use the old XML parser in push mode
                            • +

                            1.8.14: June 28 2001

                            +
                            • Zbigniew Chyla gave a patch to use the old XML parser in push mode
                            • Small Makefile fix
                            • -

                            2.3.12: June 26 2001

                            • lots of cleanup
                            • +

                            2.3.12: June 26 2001

                            +
                            • lots of cleanup
                            • a couple of validation fix
                            • fixed line number counting
                            • fixed serious problems in the XInclude processing
                            • @@ -812,7 +887,8 @@ it's actually not compiled in by default. The real fixes are:

                              • a coupl compilation on Windows MSC
                              • update of libxml-doc.el (Felix Natter)
                              • fixed 2 bugs in URI normalization code
                              • -

                              2.3.11: June 17 2001

                              • updates to trio, Makefiles and configure should fix some portability +

                              2.3.11: June 17 2001

                              +
                              • updates to trio, Makefiles and configure should fix some portability problems (alpha)
                              • fixed some HTML serialization problems (pre, script, and block/inline handling), added encoding aware APIs, cleanup of this code
                              • @@ -825,11 +901,15 @@ it's actually not compiled in by default. The real fixes are:

                                • a coupl
                                • fixed XInclude routine to implement the recursive behaviour
                                • fixed xmlFreeNode problem when libxml is included statically twice
                                • added --version to xmllint for bug reports
                                • -

                                2.3.10: June 1 2001

                                • fixed the SGML catalog support
                                • +

                                2.3.10: June 1 2001

                                +
                                • fixed the SGML catalog support
                                • a number of reported bugs got fixed, in XPath, iconv detection, XInclude processing
                                • XPath string function should now handle unicode correctly
                                • -

                                2.3.9: May 19 2001

                                Lots of bugfixes, and added a basic SGML catalog support:

                                • HTML push bugfix #54891 and another patch from Jonas Borgström
                                • +

                                2.3.9: May 19 2001

                                + +

                                Lots of bugfixes, and added a basic SGML catalog support:

                                +
                                • HTML push bugfix #54891 and another patch from Jonas Borgström
                                • some serious speed optimization again
                                • some documentation cleanups
                                • trying to get better linking on Solaris (-R)
                                • @@ -843,8 +923,10 @@ it's actually not compiled in by default. The real fixes are:

                                  • a coupl
                                  • bugfix in xmlNodeGetLang()
                                  • fixed a small configure portability problem
                                  • fixed an inversion of SYSTEM and PUBLIC identifier in HTML document
                                  • -

                                  1.8.13: May 14 2001

                                  • bugfixes release of the old libxml1 branch used by Gnome
                                  • -

                                  2.3.8: May 3 2001

                                  • Integrated an SGML DocBook parser for the Gnome project
                                  • +

                                  1.8.13: May 14 2001

                                  +
                                  • bugfixes release of the old libxml1 branch used by Gnome
                                  • +

                                  2.3.8: May 3 2001

                                  +
                                  • Integrated an SGML DocBook parser for the Gnome project
                                  • Fixed a few things in the HTML parser
                                  • Fixed some XPath bugs raised by XSLT use, tried to fix the floating point portability issue
                                  • @@ -854,7 +936,8 @@ it's actually not compiled in by default. The real fixes are:

                                    • a coupl
                                    • added xmlSaveFormatFile()
                                    • fixed problems in copying nodes with entities references (gdome)
                                    • removed some troubles surrounding the new validation module
                                    • -

                                    2.3.7: April 22 2001

                                    • lots of small bug fixes, corrected XPointer
                                    • +

                                    2.3.7: April 22 2001

                                    +
                                    • lots of small bug fixes, corrected XPointer
                                    • Non deterministic content model validation support
                                    • added xmlDocCopyNode for gdome2
                                    • revamped the way the HTML parser handles end of tags
                                    • @@ -864,7 +947,8 @@ it's actually not compiled in by default. The real fixes are:

                                      • a coupl
                                      • Improved validation speed sensible for DocBook
                                      • fixed a big bug with ID declared in external parsed entities
                                      • portability fixes, update of Trio from Bjorn Reese
                                      • -

                                      2.3.6: April 8 2001

                                      • Code cleanup using extreme gcc compiler warning options, found and +

                                      2.3.6: April 8 2001

                                      +
                                      • Code cleanup using extreme gcc compiler warning options, found and cleared half a dozen potential problem
                                      • the Eazel team found an XML parser bug
                                      • cleaned up the user of some of the string formatting function. used the @@ -873,12 +957,14 @@ it's actually not compiled in by default. The real fixes are:

                                        • a coupl
                                        • xpath: removed a memory leak and fixed the predicate evaluation problem, extended the testsuite and cleaned up the result. XPointer seems broken ...
                                        • -

                                        2.3.5: Mar 23 2001

                                        • Biggest change is separate parsing and evaluation of XPath expressions, +

                                        2.3.5: Mar 23 2001

                                        +
                                        • Biggest change is separate parsing and evaluation of XPath expressions, there is some new APIs for this too
                                        • included a number of bug fixes(XML push parser, 51876, notations, 52299)
                                        • Fixed some portability issues
                                        • -

                                        2.3.4: Mar 10 2001

                                        • Fixed bugs #51860 and #51861
                                        • +

                                        2.3.4: Mar 10 2001

                                        +
                                        • Fixed bugs #51860 and #51861
                                        • Added a global variable xmlDefaultBufferSize to allow default buffer size to be application tunable.
                                        • Some cleanup in the validation code, still a bug left and this part @@ -890,19 +976,23 @@ it's actually not compiled in by default. The real fixes are:

                                          • a coupl
                                          • Fixed a loop reported in the HTML parsing
                                          • blank space are reported even if the Dtd content model proves that they are formatting spaces, this is for XML conformance
                                          • -

                                          2.3.3: Mar 1 2001

                                          • small change in XPath for XSLT
                                          • +

                                          2.3.3: Mar 1 2001

                                          +
                                          • small change in XPath for XSLT
                                          • documentation cleanups
                                          • fix in validation by Gary Pennington
                                          • serious parsing performances improvements
                                          • -

                                          2.3.2: Feb 24 2001

                                          • chasing XPath bugs, found a bunch, completed some TODO
                                          • +

                                          2.3.2: Feb 24 2001

                                          +
                                          • chasing XPath bugs, found a bunch, completed some TODO
                                          • fixed a Dtd parsing bug
                                          • fixed a bug in xmlNodeGetContent
                                          • ID/IDREF support partly rewritten by Gary Pennington
                                          • -

                                          2.3.1: Feb 15 2001

                                          • some XPath and HTML bug fixes for XSLT
                                          • +

                                          2.3.1: Feb 15 2001

                                          +
                                          • some XPath and HTML bug fixes for XSLT
                                          • small extension of the hash table interfaces for DOM gdome2 implementation
                                          • A few bug fixes
                                          • -

                                          2.3.0: Feb 8 2001 (2.2.12 was on 25 Jan but I didn't kept track)

                                          • Lots of XPath bug fixes
                                          • +

                                          2.3.0: Feb 8 2001 (2.2.12 was on 25 Jan but I didn't kept track)

                                          +
                                          • Lots of XPath bug fixes
                                          • Add a mode with Dtd lookup but without validation error reporting for XSLT
                                          • Add support for text node without escaping (XSLT)
                                          • @@ -916,30 +1006,36 @@ it's actually not compiled in by default. The real fixes are:

                                            • a coupl
                                            • tree copying bugfixes
                                            • updates to Windows makefiles
                                            • optimization patch from Bjorn Reese
                                            • -

                                            2.2.11: Jan 4 2001

                                            • bunch of bug fixes (memory I/O, xpath, ftp/http, ...)
                                            • +

                                            2.2.11: Jan 4 2001

                                            +
                                            • bunch of bug fixes (memory I/O, xpath, ftp/http, ...)
                                            • added htmlHandleOmittedElem()
                                            • Applied Bjorn Reese's IPV6 first patch
                                            • Applied Paul D. Smith patches for validation of XInclude results
                                            • added XPointer xmlns() new scheme support
                                            • -

                                            2.2.10: Nov 25 2000

                                            • Fix the Windows problems of 2.2.8
                                            • +

                                            2.2.10: Nov 25 2000

                                            +
                                            • Fix the Windows problems of 2.2.8
                                            • integrate OpenVMS patches
                                            • better handling of some nasty HTML input
                                            • Improved the XPointer implementation
                                            • integrate a number of provided patches
                                            • -

                                            2.2.9: Nov 25 2000

                                            • erroneous release :-(
                                            • -

                                            2.2.8: Nov 13 2000

                                            2.2.9: Nov 25 2000

                                            +
                                            • erroneous release :-(
                                            • +

                                            2.2.8: Nov 13 2000

                                            +
                                            • First version of XInclude support
                                            • Patch in conditional section handling
                                            • updated MS compiler project
                                            • fixed some XPath problems
                                            • added an URI escaping function
                                            • some other bug fixes
                                            • -

                                            2.2.7: Oct 31 2000

                                            • added message redirection
                                            • +

                                            2.2.7: Oct 31 2000

                                            +
                                            • added message redirection
                                            • XPath improvements (thanks TOM !)
                                            • xmlIOParseDTD() added
                                            • various small fixes in the HTML, URI, HTTP and XPointer support
                                            • some cleanup of the Makefile, autoconf and the distribution content
                                            • -

                                            2.2.6: Oct 25 2000:

                                            • Added an hash table module, migrated a number of internal structure to +

                                            2.2.6: Oct 25 2000:

                                            +
                                            • Added an hash table module, migrated a number of internal structure to those
                                            • Fixed a posteriori validation problems
                                            • HTTP module cleanups
                                            • @@ -947,7 +1043,8 @@ it's actually not compiled in by default. The real fixes are:

                                              • a coupl normalization)
                                              • coalescing of adjacent text nodes
                                              • couple of XPath bug fixes, exported the internal API
                                              • -

                                              2.2.5: Oct 15 2000:

                                              • XPointer implementation and testsuite
                                              • +

                                              2.2.5: Oct 15 2000:

                                              +
                                              • XPointer implementation and testsuite
                                              • Lot of XPath fixes, added variable and functions registration, more tests
                                              • Portability fixes, lots of enhancements toward an easy Windows build @@ -956,24 +1053,30 @@ it's actually not compiled in by default. The real fixes are:

                                                • a coupl
                                                • Integrated a lot of contributed patches
                                                • added memory management docs
                                                • a performance problem when using large buffer seems fixed
                                                • -

                                                2.2.4: Oct 1 2000:

                                                • main XPath problem fixed
                                                • +

                                                2.2.4: Oct 1 2000:

                                                +
                                                • main XPath problem fixed
                                                • Integrated portability patches for Windows
                                                • Serious bug fixes on the URI and HTML code
                                                • -

                                                2.2.3: Sep 17 2000

                                                • bug fixes
                                                • +

                                                2.2.3: Sep 17 2000

                                                +
                                                • bug fixes
                                                • cleanup of entity handling code
                                                • overall review of all loops in the parsers, all sprintf usage has been checked too
                                                • Far better handling of larges Dtd. Validating against DocBook XML Dtd works smoothly now.
                                                • -

                                                1.8.10: Sep 6 2000

                                                • bug fix release for some Gnome projects
                                                • -

                                                2.2.2: August 12 2000

                                                • mostly bug fixes
                                                • +

                                                1.8.10: Sep 6 2000

                                                +
                                                • bug fix release for some Gnome projects
                                                • +

                                                2.2.2: August 12 2000

                                                +
                                                • mostly bug fixes
                                                • started adding routines to access xml parser context options
                                                • -

                                                2.2.1: July 21 2000

                                                • a purely bug fixes release
                                                • +

                                                2.2.1: July 21 2000

                                                +
                                                • a purely bug fixes release
                                                • fixed an encoding support problem when parsing from a memory block
                                                • fixed a DOCTYPE parsing problem
                                                • removed a bug in the function allowing to override the memory allocation routines
                                                • -

                                                2.2.0: July 14 2000

                                                • applied a lot of portability fixes
                                                • +

                                                2.2.0: July 14 2000

                                                +
                                                • applied a lot of portability fixes
                                                • better encoding support/cleanup and saving (content is now always encoded in UTF-8)
                                                • the HTML parser now correctly handles encodings
                                                • @@ -983,12 +1086,15 @@ it's actually not compiled in by default. The real fixes are:

                                                  1.8.9: July 9 2000

                                                  • fixed the spec the RPMs should be better
                                                  • +

                                                  1.8.9: July 9 2000

                                                  +
                                                  • fixed the spec the RPMs should be better
                                                  • fixed a serious bug in the FTP implementation, released 1.8.9 to solve rpmfind users problem
                                                  • -

                                                  2.1.1: July 1 2000

                                                  • fixes a couple of bugs in the 2.1.0 packaging
                                                  • +

                                                  2.1.1: July 1 2000

                                                  +
                                                  • fixes a couple of bugs in the 2.1.0 packaging
                                                  • improvements on the HTML parser
                                                  • -

                                                  2.1.0 and 1.8.8: June 29 2000

                                                  • 1.8.8 is mostly a commodity package for upgrading to libxml2 according +

                                                  2.1.0 and 1.8.8: June 29 2000

                                                  +
                                                  • 1.8.8 is mostly a commodity package for upgrading to libxml2 according to new instructions. It fixes a nasty problem about &#38; charref parsing
                                                  • 2.1.0 also ease the upgrade from libxml v1 to the recent version. it @@ -1001,7 +1107,8 @@ it's actually not compiled in by default. The real fixes are:

                                                    • a coupl
                                                    • output to a given encoding has been added/tested
                                                    • lot of various fixes
                                                  • -

                                                  2.0.0: Apr 12 2000

                                                  • First public release of libxml2. If you are using libxml, it's a good +

                                                  2.0.0: Apr 12 2000

                                                  +
                                                  • First public release of libxml2. If you are using libxml, it's a good idea to check the 1.x to 2.x upgrade instructions. NOTE: while initially scheduled for Apr 3 the release occurred only on Apr 12 due to massive workload.
                                                  • @@ -1025,7 +1132,8 @@ it's actually not compiled in by default. The real fixes are:

                                                    • a coupl number of the libxml module in use
                                                    • a number of optional features of libxml can now be excluded at configure time (FTP/HTTP/HTML/XPath/Debug)
                                                    • -

                                                    2.0.0beta: Mar 14 2000

                                                    • This is a first Beta release of libxml version 2
                                                    • +

                                                    2.0.0beta: Mar 14 2000

                                                    +
                                                    • This is a first Beta release of libxml version 2
                                                    • It's available only fromxmlsoft.org FTP, it's packaged as libxml2-2.0.0beta and available as tar and RPMs
                                                    • @@ -1049,7 +1157,8 @@ it's actually not compiled in by default. The real fixes are:

                                                      • a coupl OASIS testsuite (except the Japanese tests since I don't support that encoding yet). This URL is rebuilt every couple of hours using the CVS head version.
                                                      • -

                                                      1.8.7: Mar 6 2000

                                                      • This is a bug fix release:
                                                      • +

                                                      1.8.7: Mar 6 2000

                                                      +
                                                      • This is a bug fix release:
                                                      • It is possible to disable the ignorable blanks heuristic used by libxml-1.x, a new function xmlKeepBlanksDefault(0) will allow this. Note that for adherence to XML spec, this behaviour will be disabled by @@ -1061,20 +1170,24 @@ it's actually not compiled in by default. The real fixes are:

                                                        • a coupl compilation on some platforms has been fixed
                                                        • nanoftp.c nanohttp.c: Fixed '#' and '?' stripping when processing URIs
                                                        • -

                                                        1.8.6: Jan 31 2000

                                                        • added a nanoFTP transport module, debugged until the new version of rpmfind can use +

                                                        1.8.6: Jan 31 2000

                                                        +
                                                        • added a nanoFTP transport module, debugged until the new version of rpmfind can use it without troubles
                                                        • -

                                                        1.8.5: Jan 21 2000

                                                        • adding APIs to parse a well balanced chunk of XML (production [43] content of the +

                                                        1.8.5: Jan 21 2000

                                                        +
                                                        • adding APIs to parse a well balanced chunk of XML (production [43] content of the XML spec)
                                                        • fixed a hideous bug in xmlGetProp pointed by Rune.Djurhuus@fast.no
                                                        • Jody Goldberg <jgoldberg@home.com> provided another patch trying to solve the zlib checks problems
                                                        • The current state in gnome CVS base is expected to ship as 1.8.5 with gnumeric soon
                                                        • -

                                                        1.8.4: Jan 13 2000

                                                        • bug fixes, reintroduced xmlNewGlobalNs(), fixed xmlNewNs()
                                                        • +

                                                        1.8.4: Jan 13 2000

                                                        +
                                                        • bug fixes, reintroduced xmlNewGlobalNs(), fixed xmlNewNs()
                                                        • all exit() call should have been removed from libxml
                                                        • fixed a problem with INCLUDE_WINSOCK on WIN32 platform
                                                        • added newDocFragment()
                                                        • -

                                                        1.8.3: Jan 5 2000

                                                        • a Push interface for the XML and HTML parsers
                                                        • +

                                                        1.8.3: Jan 5 2000

                                                        +
                                                        • a Push interface for the XML and HTML parsers
                                                        • a shell-like interface to the document tree (try tester --shell :-)
                                                        • lots of bug fixes and improvement added over XMas holidays
                                                        • fixed the DTD parsing code to work with the xhtml DTD
                                                        • @@ -1083,13 +1196,15 @@ it's actually not compiled in by default. The real fixes are:

                                                          • a coupl
                                                          • External entity loading code has been revamped, now it uses xmlLoadExternalEntity(), some fix on entities processing were added
                                                          • cleaned up WIN32 includes of socket stuff
                                                          • -

                                                          1.8.2: Dec 21 1999

                                                          • I got another problem with includes and C++, I hope this issue is fixed +

                                                          1.8.2: Dec 21 1999

                                                          +
                                                          • I got another problem with includes and C++, I hope this issue is fixed for good this time
                                                          • Added a few tree modification functions: xmlReplaceNode, xmlAddPrevSibling, xmlAddNextSibling, xmlNodeSetName and xmlDocSetRootElement
                                                          • Tried to improve the HTML output with help from Chris Lahey
                                                          • -

                                                          1.8.1: Dec 18 1999

                                                          • various patches to avoid troubles when using libxml with C++ compilers +

                                                          1.8.1: Dec 18 1999

                                                          +
                                                          • various patches to avoid troubles when using libxml with C++ compilers the "namespace" keyword and C escaping in include files
                                                          • a problem in one of the core macros IS_CHAR was corrected
                                                          • fixed a bug introduced in 1.8.0 breaking default namespace processing, @@ -1097,7 +1212,8 @@ it's actually not compiled in by default. The real fixes are:

                                                            • a coupl
                                                            • fixed a posteriori validation (validation after parsing, or by using a Dtd not specified in the original document)
                                                            • fixed a bug in
                                                            • -

                                                            1.8.0: Dec 12 1999

                                                            • cleanup, especially memory wise
                                                            • +

                                                            1.8.0: Dec 12 1999

                                                            +
                                                            • cleanup, especially memory wise
                                                            • the parser should be more reliable, especially the HTML one, it should not crash, whatever the input !
                                                            • Integrated various patches, especially a speedup improvement for large @@ -1106,21 +1222,25 @@ it's actually not compiled in by default. The real fixes are:

                                                              • a coupl
                                                              • attribute normalization, oops should have been added long ago !
                                                              • attributes defaulted from DTDs should be available, xmlSetProp() now does entities escaping by default.
                                                              • -

                                                              1.7.4: Oct 25 1999

                                                              • Lots of HTML improvement
                                                              • +

                                                              1.7.4: Oct 25 1999

                                                              +
                                                              • Lots of HTML improvement
                                                              • Fixed some errors when saving both XML and HTML
                                                              • More examples, the regression tests should now look clean
                                                              • Fixed a bug with contiguous charref
                                                              • -

                                                              1.7.3: Sep 29 1999

                                                              • portability problems fixed
                                                              • +

                                                              1.7.3: Sep 29 1999

                                                              +
                                                              • portability problems fixed
                                                              • snprintf was used unconditionally, leading to link problems on system were it's not available, fixed
                                                              • -

                                                              1.7.1: Sep 24 1999

                                                              • The basic type for strings manipulated by libxml has been renamed in +

                                                              1.7.1: Sep 24 1999

                                                              +
                                                              • The basic type for strings manipulated by libxml has been renamed in 1.7.1 from CHAR to xmlChar. The reason is that CHAR was conflicting with a predefined type on Windows. However on non WIN32 environment, compatibility is provided by the way of a #define .
                                                              • Changed another error : the use of a structure field called errno, and leading to troubles on platforms where it's a macro
                                                              • -

                                                              1.7.0: Sep 23 1999

                                                              • Added the ability to fetch remote DTD or parsed entities, see the nanohttp module.
                                                              • +

                                                              1.7.0: Sep 23 1999

                                                              +
                                                              • Added the ability to fetch remote DTD or parsed entities, see the nanohttp module.
                                                              • Added an errno to report errors by another mean than a simple printf like callback
                                                              • Finished ID/IDREF support and checking when validation
                                                              • @@ -1128,4 +1248,32 @@ it's actually not compiled in by default. The real fixes are:

                                                                • a coupl
                                                                • Improvement of XPath implementation
                                                                • Added an HTML parser front-end
                                                                • -

                                                                Daniel Veillard

                  + + +

                  XML is a standard for +markup-based structured documents. Here is an example XML +document:

                  +
                  <?xml version="1.0"?>
                  +<EXAMPLE prop1="gnome is great" prop2="&amp; linux too">
                  +  <head>
                  +   <title>Welcome to Gnome</title>
                  +  </head>
                  +  <chapter>
                  +   <title>The Linux adventure</title>
                  +   <p>bla bla bla ...</p>
                  +   <image href="linus.gif"/>
                  +   <p>...</p>
                  +  </chapter>
                  +</EXAMPLE>

                  The first line specifies that it is an XML document and gives useful +information about its encoding. Then the rest of the document is a text +format whose structure is specified by tags between brackets. Each +tag opened has to be closed. XML is pedantic about this. However, if +a tag is empty (no content), a single tag can serve as both the opening and +closing tag if it ends with /> rather than with +>. Note that, for example, the image tag has no content (just +an attribute) and is closed by ending the tag with />.

                  XML can be applied successfully to a wide range of tasks, ranging from +long term structured document maintenance (where it follows the steps of +SGML) to simple data encoding mechanisms like configuration file formatting +(glade), spreadsheets (gnumeric), or even shorter lived documents such as +WebDAV where it is used to encode remote calls between a client and a +server.

                  Daniel Veillard

                  diff --git a/doc/xml.html b/doc/xml.html index b02d144f..90d28a3b 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -716,6 +716,45 @@ to the CVS code base.

                  There is the list of public releases:

                  +

                  2.6.21: Sep 4 2005

                  +
                    +
                  • build fixes: Cygwin portability fixes (Gerrit P. Haase), calling + convention problems on Windows (Marcus Boerger), cleanups based on + Linus' sparse tool, update of win32/configure.js (Rob Richards), + remove warnings on Windows(Marcus Boerger), compilation without SAX1, + detection of the Python binary, use $GCC inestad of $CC = 'gcc' (Andrew + W. Nosenko), compilation/link with threads and old gcc, compile + problem by C370 on Z/OS,
                  • +
                  • bug fixes: http_proxy environments (Peter Breitenlohner), HTML UTF-8 + bug (Jiri Netolicky), XPath NaN compare bug (William Brack), + htmlParseScript potential bug, Schemas regexp handling of spaces, + Base64 Schemas comparisons NIST passes, automata build error xsd:all, + xmlGetNodePath for namespaced attributes (Alexander Pohoyda), + xmlSchemas foreign namespaces handling, XML Schemas facet comparison + (Kupriyanov Anatolij), xmlSchemaPSimpleTypeErr error report (Kasimier + Buchcik), xml: namespace ahndling in Schemas (Kasimier), empty model + group in Schemas (Kasimier), wilcard in Schemas (Kasimier), URI + composition (William), xs:anyType in Schemas (Kasimier), Python resolver + emmitting error messages directly, Python xmlAttr.parent (Jakub Piotr + Clapa), trying to fix the file path/URI conversion, + xmlTextReaderGetAttribute fix (Rob Richards), xmlSchemaFreeAnnot memleak + (Kasimier), HTML UTF-8 serialization, streaming XPath, Schemas determinism + detection problem, XInclude bug, Schemas context type (Dean Hill), + validation fix (Derek Poon), xmlTextReaderGetAttribute[Ns] namespaces + (Rob Richards), Schemas type fix (Kuba Nowakowski), UTF-8 parser bug, + error in encoding handling, xmlGetLineNo fixes, bug on entities handling, + entity name extraction in error handling with XInclude, text nodes + in HTML body tags (Gary Coady), xml:id and IDness at the treee level + fixes, XPath streaming patterns bugs.
                  • +
                  • improvements: structured interfaces for schemas and RNG error reports + (Marcus Boerger), optimization of the char data inner loop parsing + (thanks to Behdad Esfahbod for the idea), schematron validation + though not finished yet, xmlSaveOption to omit XML declaration, + keyref match error reports (Kasimier), formal expression handling + code not plugged yet, more lax mode for the HTML parser, + parser XML_PARSE_COMPACT option for text nodes allocation.
                  • +
                  • documentation: xmllint man page had --nonet duplicated
                  • +

                  2.6.20: Jul 10 2005

                  • build fixes: Windows build (Rob Richards), Mingw compilation (Igor diff --git a/doc/xmldtd.html b/doc/xmldtd.html index 45eb2494..7abc25d4 100644 --- a/doc/xmldtd.html +++ b/doc/xmldtd.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -Validation & DTDs
                    Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                    Made with Libxml2 Logo

                    The XML C parser and toolkit of Gnome

                    Validation & DTDs

                    Main Menu
                    Related links

                    Table of Content:

                    1. General overview
                    2. +Validation & DTDs
                      Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
                      Made with Libxml2 Logo

                      The XML C parser and toolkit of Gnome

                      Validation & DTDs

                      Main Menu
                      Related links

                      Table of Content:

                      1. General overview
                      2. The definition
                      3. Simple rules
                        1. How to reference a DTD from a document
                        2. diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h index 6b2bfa3a..76473a69 100644 --- a/include/libxml/xpath.h +++ b/include/libxml/xpath.h @@ -252,9 +252,18 @@ typedef xmlXPathFunction (*xmlXPathFuncLookupFunc) (void *ctxt, * xmlXPathFlags: * Flags for XPath engine compilation and runtime */ -typedef enum { - XML_XPATH_CHECKNS = 1 /* check namespaces at compilation */ -} xmlXPathFlags; +/** + * XML_XPATH_CHECKNS: + * + * check namespaces at compilation + */ +#define XML_XPATH_CHECKNS (1<<0) +/** + * XML_XPATH_NOVAR: + * + * forbid variables in expression + */ +#define XML_XPATH_NOVAR (1<<1) /** * xmlXPathContext: diff --git a/testapi.c b/testapi.c index 2798825f..3fc09ebf 100644 --- a/testapi.c +++ b/testapi.c @@ -16698,6 +16698,40 @@ test_xmlPatternMaxDepth(void) { } +static int +test_xmlPatternMinDepth(void) { + int test_ret = 0; + +#if defined(LIBXML_PATTERN_ENABLED) + int mem_base; + int ret_val; + xmlPatternPtr comp; /* the precompiled pattern */ + int n_comp; + + for (n_comp = 0;n_comp < gen_nb_xmlPatternPtr;n_comp++) { + mem_base = xmlMemBlocks(); + comp = gen_xmlPatternPtr(n_comp, 0); + + ret_val = xmlPatternMinDepth(comp); + desret_int(ret_val); + call_tests++; + des_xmlPatternPtr(n_comp, comp, 0); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlPatternMinDepth", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_comp); + printf("\n"); + } + } + function_tests++; +#endif + + return(test_ret); +} + + static int test_xmlPatternStreamable(void) { int test_ret = 0; @@ -16885,11 +16919,12 @@ static int test_pattern(void) { int test_ret = 0; - if (quiet == 0) printf("Testing pattern : 7 of 12 functions ...\n"); + if (quiet == 0) printf("Testing pattern : 8 of 13 functions ...\n"); test_ret += test_xmlPatternFromRoot(); test_ret += test_xmlPatternGetStreamCtxt(); test_ret += test_xmlPatternMatch(); test_ret += test_xmlPatternMaxDepth(); + test_ret += test_xmlPatternMinDepth(); test_ret += test_xmlPatternStreamable(); test_ret += test_xmlPatterncompile(); test_ret += test_xmlStreamPop(); diff --git a/xpath.c b/xpath.c index 297aa9ee..f57ba8c8 100644 --- a/xpath.c +++ b/xpath.c @@ -1400,25 +1400,16 @@ xmlXPathFormatNumber(double number, char buffer[], int buffersize) } else if (number == ((int) number)) { char work[30]; char *ptr, *cur; - int res, value = (int) number; + int value = (int) number; ptr = &buffer[0]; - if (value < 0) { - *ptr++ = '-'; - value = -value; - } if (value == 0) { *ptr++ = '0'; } else { + snprintf(work, 29, "%d", value); cur = &work[0]; - while (value != 0) { - res = value % 10; - value = value / 10; - *cur++ = '0' + res; - } - cur--; - while ((cur >= &work[0]) && (ptr - buffer < buffersize)) { - *ptr++ = *cur--; + while ((*cur) && (ptr - buffer < buffersize)) { + *ptr++ = *cur++; } } if (ptr - buffer < buffersize) { @@ -7936,6 +7927,9 @@ xmlXPathCompVariableReference(xmlXPathParserContextPtr ctxt) { PUSH_LONG_EXPR(XPATH_OP_VARIABLE, 0, 0, 0, name, prefix); SKIP_BLANKS; + if ((ctxt->context != NULL) && (ctxt->context->flags & XML_XPATH_NOVAR)) { + XP_ERROR(XPATH_UNDEF_VARIABLE_ERROR); + } } /**