diff --git a/ChangeLog b/ChangeLog index 14ce3cc2..0f064b03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Aug 3 18:56:54 EDT 2003 Daniel Veillard + + * valid.c: fixed bug #118712 about mixed content, and namespaced + element names. + * test/valid/mixed_ns.xml result/valid/mixed_ns*: added a check + in the regression tests + Fri Aug 1 23:55:23 HKT 2003 William Brack Coninuing work on bug 118559 diff --git a/doc/downloads.html b/doc/downloads.html index 701d3b6d..0ce55531 100644 --- a/doc/downloads.html +++ b/doc/downloads.html @@ -9,7 +9,9 @@ H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } Downloads
Gnome2 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 xmlsoft.org (Seattle, France) or on the Gnome FTP server either as a source -archive +archive , Antonin Sprinzl also provide a mirror in Austria. (NOTE that you need both the libxml(2) and libxml(2)-devel packages installed to compile applications using libxml.)

Binary ports:

  • Red Hat RPMs for i386 are available directly on xmlsoft.org, the source RPM will compile on diff --git a/doc/encoding.html b/doc/encoding.html index 28e935b6..7e50d6fa 100644 --- a/doc/encoding.html +++ b/doc/encoding.html @@ -92,7 +92,7 @@ rationale for those choices:

    • keeping the native encoding in the inter (internationalization) support get triggered only during I/O operation, i.e. when reading a document or saving one. Let's look first at the reading sequence:

      1. when a document is processed, we usually don't know the encoding, a - simple heuristic allows to detect UTF-18 and UCS-4 from whose where the + simple heuristic allows to detect UTF-16 and UCS-4 from whose where the ASCII range (0-0x7F) maps with ASCII
      2. the xml declaration if available is parsed, including the encoding declaration. At that point, if the autodetected encoding is different diff --git a/doc/xml.html b/doc/xml.html index de9fa907..2a9f8b5c 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -2655,7 +2655,7 @@ when reading a document or saving one. Let's look first at the reading sequence:

        1. when a document is processed, we usually don't know the encoding, a - simple heuristic allows to detect UTF-18 and UCS-4 from whose where the + simple heuristic allows to detect UTF-16 and UCS-4 from whose where the ASCII range (0-0x7F) maps with ASCII
        2. the xml declaration if available is parsed, including the encoding declaration. At that point, if the autodetected encoding is different diff --git a/result/valid/mixed_ns.xml b/result/valid/mixed_ns.xml new file mode 100644 index 00000000..d8aedb81 --- /dev/null +++ b/result/valid/mixed_ns.xml @@ -0,0 +1,16 @@ + + + + + + + +]> + + Some text. + + Some text. + + Some text. + diff --git a/result/valid/mixed_ns.xml.err b/result/valid/mixed_ns.xml.err new file mode 100644 index 00000000..e69de29b diff --git a/test/valid/mixed_ns.xml b/test/valid/mixed_ns.xml new file mode 100644 index 00000000..22d8ed88 --- /dev/null +++ b/test/valid/mixed_ns.xml @@ -0,0 +1,16 @@ + + + + + + + +]> + + Some text. + + Some text. + + Some text. + diff --git a/valid.c b/valid.c index d3dac10d..9dee4bbc 100644 --- a/valid.c +++ b/valid.c @@ -3717,20 +3717,34 @@ xmlValidateElementDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc, next = cur->c2; while (next != NULL) { if (next->type == XML_ELEMENT_CONTENT_ELEMENT) { - if (xmlStrEqual(next->name, name)) { - VERROR(ctxt->userData, + if ((xmlStrEqual(next->name, name)) && + (xmlStrEqual(next->prefix, cur->prefix))) { + if (cur->prefix == NULL) { + VERROR(ctxt->userData, "Definition of %s has duplicate references of %s\n", - elem->name, name); + elem->name, name); + } else { + VERROR(ctxt->userData, + "Definition of %s has duplicate references of %s:%s\n", + elem->name, cur->prefix, name); + } ret = 0; } break; } if (next->c1 == NULL) break; if (next->c1->type != XML_ELEMENT_CONTENT_ELEMENT) break; - if (xmlStrEqual(next->c1->name, name)) { - VERROR(ctxt->userData, - "Definition of %s has duplicate references of %s\n", - elem->name, name); + if ((xmlStrEqual(next->c1->name, name)) && + (xmlStrEqual(next->c1->prefix, cur->prefix))) { + if (cur->prefix == NULL) { + VERROR(ctxt->userData, + "Definition of %s has duplicate references to %s\n", + elem->name, name); + } else { + VERROR(ctxt->userData, + "Definition of %s has duplicate references to %s:%s\n", + elem->name, cur->prefix, name); + } ret = 0; } next = next->c2;