diff --git a/ChangeLog b/ChangeLog index 0f5d34c7..74b373d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 24 21:09:19 CET 2003 Daniel Veillard + + * configure.in: preparing release 2.5.4 + * doc/*: updated and rebuilt the docs + * relaxng.c: removed warnings + * result/relaxng/*: updated the results + Mon Feb 24 20:53:17 CET 2003 Daniel Veillard * valid.c: fixes a DTD regexp generation problem. diff --git a/NEWS b/NEWS index 6ca6788d..5c55b8cd 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,20 @@ to test those +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 + namespaces, + 2 serialization bugs, node info generation problems, a DTD regexp + generation problem. + + - 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 version of RelaxNG Python bindings diff --git a/configure.in b/configure.in index 2058c821..62c7c346 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=5 -LIBXML_MICRO_VERSION=3 +LIBXML_MICRO_VERSION=4 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION diff --git a/doc/contribs.html b/doc/contribs.html index ab62833e..5c149afd 100644 --- a/doc/contribs.html +++ b/doc/contribs.html @@ -136,14 +136,10 @@ A:link, A:visited, A:active { text-decoration: underline } Digital Signature implementations for libxml2
  • -Steve Ball, - Zveno and contributors maintain - tcl bindings for libxml2 and libxslt, as well as - tkxmllint a GUI for - xmllint and - tkxsltproc a GUI for - xsltproc. -
    • +Steve Ball, Zveno and contributors maintain tcl bindings for libxml2 and + libxslt, as well as tkxmllint a GUI for + xmllint and tkxsltproc + a GUI for xsltproc.

    Daniel Veillard

    diff --git a/doc/index.html b/doc/index.html index ce96e6ca..a9a6df07 100644 --- a/doc/index.html +++ b/doc/index.html @@ -131,6 +131,8 @@ languages:

  • Canonical XML Version 1.0: http://www.w3.org/TR/xml-c14n and the Exclusive XML Canonicalization CR draft http://www.w3.org/TR/xml-exc-c14n +
    • +
  • Relax NG Committee Specification 3 December 2001 http://www.oasis-open.org/committees/relax-ng/spec-20011203.html

    • In most cases libxml tries to implement the specifications in a relatively @@ -154,8 +156,6 @@ specifications but doesn't claim to implement them completely:

  • DocBook SGML v4: libxml2 includes a hackish parser to transition to XML
    • -

    A first implementation of RelaxNG is available as of libxml2-2.5.2, it -should cover most of the specification, feedback welcome.

    A partial implementation of XML Schemas is being worked on but it would be far too early to make any conformance statement about it at the moment.

    Libxml2 is known to be very portable, the library should build and work diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index dd0307aa..015046f6 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -1167,6 +1167,7 @@ + @@ -1666,6 +1667,10 @@ + + + + @@ -1836,6 +1841,7 @@ + @@ -4526,6 +4532,11 @@ actually an xmlCharEncoding'/> + + Constructs a canonic path from the specified path. + + + Add an entry in the catalog, it may overwrite existing but different entries. If called before any other catalog routine, allows to override the default shared catalog put in place by xmlInitializeCatalog(); @@ -6779,9 +6790,9 @@ actually an xmlCharEncoding'/> - Normalize a Windows path to make an URL from it - - + This function is obsolete. Please see xmlURIFromPath in uri.c for a better solution. + + flushes and close the output I/O channel and free up all the associated resources @@ -7525,6 +7536,12 @@ actually an xmlCharEncoding'/> + + Dump the transformed RelaxNG tree. + + + + Deallocate a RelaxNG structure. @@ -9221,6 +9238,24 @@ actually an xmlCharEncoding'/> + + Check that a value conforms to the lexical space of NCName + + + + + + Check that a value conforms to the lexical space of NMToken + + + + + + Check that a value conforms to the lexical space of Name + + + + Validate that the given value match Name production @@ -9304,6 +9339,12 @@ actually an xmlCharEncoding'/> + + Check that a value conforms to the lexical space of QName + + + + Try to validate a the root element basically it does the following check as described by the XML-1.0 recommendation: - [ VC: Root Element Type ] it doesn't try to recurse or apply other check to the element diff --git a/doc/news.html b/doc/news.html index 23de5924..3ed114f1 100644 --- a/doc/news.html +++ b/doc/news.html @@ -105,6 +105,20 @@ to test those

    Schemas +

    2.5.4: Feb 20 2003

    +

    2.5.3: Feb 10 2003

    In most cases libxml tries to implement the specifications in a relatively @@ -80,9 +82,6 @@ specifications but doesn't claim to implement them completely:

    XML -

    A first implementation of RelaxNG is available as of libxml2-2.5.2, it -should cover most of the specification, feedback welcome.

    -

    A partial implementation of XML Schemas is being worked on but it would be far too early to make any conformance statement about it at the moment.

    @@ -611,6 +610,21 @@ to test those

    Schemas +

    2.5.4: Feb 20 2003

    + +

    2.5.3: Feb 10 2003

    diff --git a/doc/xmlio.html b/doc/xmlio.html index 33537092..a2b594ca 100644 --- a/doc/xmlio.html +++ b/doc/xmlio.html @@ -263,6 +263,7 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { + } diff --git a/python/libxml2class.txt b/python/libxml2class.txt index 8f1e8636..02ec3a88 100644 --- a/python/libxml2class.txt +++ b/python/libxml2class.txt @@ -140,12 +140,17 @@ newPI() newText() newTextLen() setCompressMode() +validateNCName() +validateNMToken() +validateName() +validateQName() # functions from module uri URIEscape() URIEscapeStr() URIUnescapeString() buildURI() +canonicPath() createURI() normalizeURIPath() parseURI() @@ -637,6 +642,7 @@ Class relaxNgSchema() # functions from module relaxng relaxNGDump() + relaxNGDumpTree() relaxNGFree() relaxNGNewValidCtxt() Class relaxNgValidCtxt() diff --git a/relaxng.c b/relaxng.c index 2f91afed..ca7d1940 100644 --- a/relaxng.c +++ b/relaxng.c @@ -1719,6 +1719,8 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParseNameClass( xmlRelaxNGDefinePtr def); static xmlRelaxNGGrammarPtr xmlRelaxNGParseGrammar( xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr nodes); +static int xmlRelaxNGElementMatch(xmlRelaxNGValidCtxtPtr ctxt, + xmlRelaxNGDefinePtr define, xmlNodePtr elem); #define IS_BLANK_NODE(n) \ @@ -2106,7 +2108,6 @@ xmlRelaxNGCompareNameClasses(xmlRelaxNGDefinePtr def1, return(0); return(1); } else if (def1->type == XML_RELAXNG_EXCEPT) { - xmlRelaxNGDefinePtr tmp = def1->content; TODO ret = 0; } else { diff --git a/result/relaxng/spec1_err b/result/relaxng/spec1_err index 51c6cf53..d3a5dd60 100644 --- a/result/relaxng/spec1_err +++ b/result/relaxng/spec1_err @@ -1 +1,2 @@ -Unimplemented block at relaxng.c:6428 +error detected at relaxng.c:7141 +extra data on the document diff --git a/result/relaxng/spec1_valid b/result/relaxng/spec1_valid index 8551c1e1..924f5853 100644 --- a/result/relaxng/spec1_valid +++ b/result/relaxng/spec1_valid @@ -1 +1 @@ -./test/relaxng/spec1.rng validates +./test/relaxng/spec1.rng fails to validate diff --git a/result/relaxng/tutor10_1_4.err b/result/relaxng/tutor10_1_4.err index a8fa363a..820cf4bd 100644 --- a/result/relaxng/tutor10_1_4.err +++ b/result/relaxng/tutor10_1_4.err @@ -1,4 +1,4 @@ -error detected at relaxng.c:6612 +error detected at relaxng.c:6557 Expecting a namespace for element foo -error detected at relaxng.c:7194 +error detected at relaxng.c:7141 extra data on the document diff --git a/result/relaxng/tutor10_1_5.err b/result/relaxng/tutor10_1_5.err index 839d3552..ea698c7c 100644 --- a/result/relaxng/tutor10_1_5.err +++ b/result/relaxng/tutor10_1_5.err @@ -1,4 +1,4 @@ -error detected at relaxng.c:6617 +error detected at relaxng.c:6562 Expecting element foo has wrong namespace: expecting http://www.example.com -error detected at relaxng.c:7194 +error detected at relaxng.c:7141 extra data on the document diff --git a/result/relaxng/tutor10_1_6.err b/result/relaxng/tutor10_1_6.err index 839d3552..ea698c7c 100644 --- a/result/relaxng/tutor10_1_6.err +++ b/result/relaxng/tutor10_1_6.err @@ -1,4 +1,4 @@ -error detected at relaxng.c:6617 +error detected at relaxng.c:6562 Expecting element foo has wrong namespace: expecting http://www.example.com -error detected at relaxng.c:7194 +error detected at relaxng.c:7141 extra data on the document diff --git a/result/relaxng/tutor10_2_3.err b/result/relaxng/tutor10_2_3.err index 2d06a903..2064874b 100644 --- a/result/relaxng/tutor10_2_3.err +++ b/result/relaxng/tutor10_2_3.err @@ -1,4 +1,4 @@ -error detected at relaxng.c:6629 +error detected at relaxng.c:6574 Expecting no namespace for element foo -error detected at relaxng.c:7194 +error detected at relaxng.c:7141 extra data on the document diff --git a/result/relaxng/tutor10_2_4.err b/result/relaxng/tutor10_2_4.err index 2d06a903..2064874b 100644 --- a/result/relaxng/tutor10_2_4.err +++ b/result/relaxng/tutor10_2_4.err @@ -1,4 +1,4 @@ -error detected at relaxng.c:6629 +error detected at relaxng.c:6574 Expecting no namespace for element foo -error detected at relaxng.c:7194 +error detected at relaxng.c:7141 extra data on the document diff --git a/result/relaxng/tutor10_7_3.err b/result/relaxng/tutor10_7_3.err index 975e57ad..34c0ef1c 100644 --- a/result/relaxng/tutor10_7_3.err +++ b/result/relaxng/tutor10_7_3.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element addressBook: card diff --git a/result/relaxng/tutor10_8_3.err b/result/relaxng/tutor10_8_3.err index 975e57ad..34c0ef1c 100644 --- a/result/relaxng/tutor10_8_3.err +++ b/result/relaxng/tutor10_8_3.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element addressBook: card diff --git a/result/relaxng/tutor11_2_2.err b/result/relaxng/tutor11_2_2.err index 62796e91..8d7fe33f 100644 --- a/result/relaxng/tutor11_2_2.err +++ b/result/relaxng/tutor11_2_2.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6836 +error detected at relaxng.c:6783 Invalid attribute foo for element card diff --git a/result/relaxng/tutor11_2_3.err b/result/relaxng/tutor11_2_3.err index 09099f9e..5a7b74a2 100644 --- a/result/relaxng/tutor11_2_3.err +++ b/result/relaxng/tutor11_2_3.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6836 +error detected at relaxng.c:6783 Invalid attribute b for element card diff --git a/result/relaxng/tutor11_3_1 b/result/relaxng/tutor11_3_1 index 83963d8d..e69de29b 100644 --- a/result/relaxng/tutor11_3_1 +++ b/result/relaxng/tutor11_3_1 @@ -1 +0,0 @@ -./test/relaxng/tutor11_3_1.xml validates diff --git a/result/relaxng/tutor11_3_1.err b/result/relaxng/tutor11_3_1.err index e69de29b..1d13cf47 100644 --- a/result/relaxng/tutor11_3_1.err +++ b/result/relaxng/tutor11_3_1.err @@ -0,0 +1 @@ +Attributes conflicts in group diff --git a/result/relaxng/tutor12_1_err b/result/relaxng/tutor12_1_err index 51c6cf53..d3a5dd60 100644 --- a/result/relaxng/tutor12_1_err +++ b/result/relaxng/tutor12_1_err @@ -1 +1,2 @@ -Unimplemented block at relaxng.c:6428 +error detected at relaxng.c:7141 +extra data on the document diff --git a/result/relaxng/tutor12_1_valid b/result/relaxng/tutor12_1_valid index a02fb415..4bf261d7 100644 --- a/result/relaxng/tutor12_1_valid +++ b/result/relaxng/tutor12_1_valid @@ -1 +1 @@ -./test/relaxng/tutor12_1.rng validates +./test/relaxng/tutor12_1.rng fails to validate diff --git a/result/relaxng/tutor3_2_1.err b/result/relaxng/tutor3_2_1.err index 6205f588..5b495ea5 100644 --- a/result/relaxng/tutor3_2_1.err +++ b/result/relaxng/tutor3_2_1.err @@ -1,4 +1,4 @@ -error detected at relaxng.c:6604 +error detected at relaxng.c:6549 Expecting element name, got email -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element card: email diff --git a/result/relaxng/tutor3_5_2.err b/result/relaxng/tutor3_5_2.err index 975e57ad..34c0ef1c 100644 --- a/result/relaxng/tutor3_5_2.err +++ b/result/relaxng/tutor3_5_2.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element addressBook: card diff --git a/result/relaxng/tutor3_7_err b/result/relaxng/tutor3_7_err index 5610b355..d3a5dd60 100644 --- a/result/relaxng/tutor3_7_err +++ b/result/relaxng/tutor3_7_err @@ -1,2 +1,2 @@ -error detected at relaxng.c:7194 +error detected at relaxng.c:7141 extra data on the document diff --git a/result/relaxng/tutor6_1_3.err b/result/relaxng/tutor6_1_3.err index c438e30e..d05cfe9c 100644 --- a/result/relaxng/tutor6_1_3.err +++ b/result/relaxng/tutor6_1_3.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6836 +error detected at relaxng.c:6783 Invalid attribute preferredFormat for element card diff --git a/result/relaxng/tutor6_2_4.err b/result/relaxng/tutor6_2_4.err index 5c96ccf2..1de98825 100644 --- a/result/relaxng/tutor6_2_4.err +++ b/result/relaxng/tutor6_2_4.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element preferredFormat: text diff --git a/result/relaxng/tutor6_3_1.err b/result/relaxng/tutor6_3_1.err index c438e30e..d05cfe9c 100644 --- a/result/relaxng/tutor6_3_1.err +++ b/result/relaxng/tutor6_3_1.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6836 +error detected at relaxng.c:6783 Invalid attribute preferredFormat for element card diff --git a/result/relaxng/tutor7_1_2.err b/result/relaxng/tutor7_1_2.err index f378bcd4..f3cddfdb 100644 --- a/result/relaxng/tutor7_1_2.err +++ b/result/relaxng/tutor7_1_2.err @@ -1,6 +1,6 @@ -error detected at relaxng.c:5715 +error detected at relaxng.c:5813 Internal: failed to validate type float -error detected at relaxng.c:7126 +error detected at relaxng.c:7073 error validating list -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element vector: text diff --git a/result/relaxng/tutor7_1_3.err b/result/relaxng/tutor7_1_3.err index 0ecd7ffd..36806108 100644 --- a/result/relaxng/tutor7_1_3.err +++ b/result/relaxng/tutor7_1_3.err @@ -1,6 +1,6 @@ -error detected at relaxng.c:5955 +error detected at relaxng.c:6053 Extra data in list: 5.6 -error detected at relaxng.c:7126 +error detected at relaxng.c:7073 error validating list -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element vector: text diff --git a/result/relaxng/tutor7_2_4.err b/result/relaxng/tutor7_2_4.err index 2cc782d0..0350cda4 100644 --- a/result/relaxng/tutor7_2_4.err +++ b/result/relaxng/tutor7_2_4.err @@ -1,4 +1,4 @@ -error detected at relaxng.c:5715 +error detected at relaxng.c:5813 Internal: failed to validate type double -error detected at relaxng.c:7126 +error detected at relaxng.c:7073 error validating list diff --git a/result/relaxng/tutor7_3_4.err b/result/relaxng/tutor7_3_4.err index b3754e78..8ab033d7 100644 --- a/result/relaxng/tutor7_3_4.err +++ b/result/relaxng/tutor7_3_4.err @@ -1,6 +1,6 @@ -error detected at relaxng.c:5955 +error detected at relaxng.c:6053 Extra data in list: 5.6 -error detected at relaxng.c:7126 +error detected at relaxng.c:7073 error validating list -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element path: text diff --git a/result/relaxng/tutor7_3_5.err b/result/relaxng/tutor7_3_5.err index be47182a..d67a740e 100644 --- a/result/relaxng/tutor7_3_5.err +++ b/result/relaxng/tutor7_3_5.err @@ -1,6 +1,6 @@ -error detected at relaxng.c:5715 +error detected at relaxng.c:5813 Internal: failed to validate type double -error detected at relaxng.c:7126 +error detected at relaxng.c:7073 error validating list -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element path: text diff --git a/result/relaxng/tutor8_2_4.err b/result/relaxng/tutor8_2_4.err index da7515fd..f5f7037e 100644 --- a/result/relaxng/tutor8_2_4.err +++ b/result/relaxng/tutor8_2_4.err @@ -1,4 +1,4 @@ -Unimplemented block at relaxng.c:6428 -Unimplemented block at relaxng.c:6428 -error detected at relaxng.c:6823 -Extra content for element head: meta +error detected at relaxng.c:6468 +Extra element title in interleave +error detected at relaxng.c:6770 +Extra content for element head: title diff --git a/result/relaxng/tutor8_2_5.err b/result/relaxng/tutor8_2_5.err index 3d1a4bde..5b063e38 100644 --- a/result/relaxng/tutor8_2_5.err +++ b/result/relaxng/tutor8_2_5.err @@ -1,4 +1,4 @@ -error detected at relaxng.c:6764 +error detected at relaxng.c:6709 Expecting an element, got empty -error detected at relaxng.c:6823 -Extra content for element head: meta +error detected at relaxng.c:6479 +Invalid sequence in interleave diff --git a/result/relaxng/tutor8_2_6.err b/result/relaxng/tutor8_2_6.err index 71429851..3d57dd3d 100644 --- a/result/relaxng/tutor8_2_6.err +++ b/result/relaxng/tutor8_2_6.err @@ -1,2 +1,4 @@ -error detected at relaxng.c:6823 +error detected at relaxng.c:6468 +Extra element base in interleave +error detected at relaxng.c:6770 Extra content for element head: base diff --git a/result/relaxng/tutor9_5_2.err b/result/relaxng/tutor9_5_2.err index 975e57ad..34c0ef1c 100644 --- a/result/relaxng/tutor9_5_2.err +++ b/result/relaxng/tutor9_5_2.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element addressBook: card diff --git a/result/relaxng/tutor9_5_3.err b/result/relaxng/tutor9_5_3.err index 975e57ad..34c0ef1c 100644 --- a/result/relaxng/tutor9_5_3.err +++ b/result/relaxng/tutor9_5_3.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element addressBook: card diff --git a/result/relaxng/tutor9_6_2.err b/result/relaxng/tutor9_6_2.err index 975e57ad..34c0ef1c 100644 --- a/result/relaxng/tutor9_6_2.err +++ b/result/relaxng/tutor9_6_2.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element addressBook: card diff --git a/result/relaxng/tutor9_6_3.err b/result/relaxng/tutor9_6_3.err index 975e57ad..34c0ef1c 100644 --- a/result/relaxng/tutor9_6_3.err +++ b/result/relaxng/tutor9_6_3.err @@ -1,2 +1,2 @@ -error detected at relaxng.c:6823 +error detected at relaxng.c:6770 Extra content for element addressBook: card