1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00

Patches added during last week on W3C CVS base:

- tree.c: coalesce adjacent text nodes
- valid.c: handling of blank nodes in DTd validation (raised
  by problems with a posteriori validation).
- nanohttp.c: changing behaviour on HTTP write stuff.
- HTMLtree.c: forced body and html to be explicitely closed.
- xpath.h: exported more XPath functions.
Daniel
This commit is contained in:
Daniel Veillard
2000-10-22 12:04:13 +00:00
parent 0c0692291e
commit 683cb02636
7 changed files with 167 additions and 6 deletions

17
valid.c
View File

@ -3505,9 +3505,19 @@ xmlValidateElementTypeElement(xmlValidCtxtPtr ctxt, xmlNodePtr *child,
*child = cur;
return(0);
}
if (ret == -1) return(-1);
cur = *child;
do {
cur = *child;
if (*child == NULL)
break; /* while */
if (((*child)->type == XML_TEXT_NODE) &&
(xmlIsBlankNode(*child))) {
*child = (*child)->next;
continue;
}
ret = xmlValidateElementTypeExpr(ctxt, child, cont);
if (ret == 1)
cur = *child;
} while (ret == 1);
if (ret == -1) return(-1);
*child = cur;
@ -3812,6 +3822,11 @@ child_ok:
child = elem->children;
cont = elemDecl->content;
ret = xmlValidateElementTypeElement(ctxt, &child, cont);
while ((child != NULL) && (child->type == XML_TEXT_NODE) &&
(xmlIsBlankNode(child))) {
child = child->next;
continue;
}
if ((ret == 0) || (child != NULL)) {
char expr[1000];
char list[2000];