diff --git a/ChangeLog b/ChangeLog index cf302085..4a318573 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -Tue Jun 5 19:11:02 CEST 2001 Bjorn Reese +Tue Jun 5 22:54:21 CEST 2001 Daniel Veillard + + * HTMLtree.c: trying to close bug #55772 escaping in script + elements + * doc/xml.html: suggest to send mail to the list + +Tue Jun 5 19:11:02 CEST 2001 Daniel Veillard * error.c: attempt to fix the xmlGetVarStr breakage once and for good. Use a macro and based on the solution provided in diff --git a/HTMLtree.c b/HTMLtree.c index e61ce2b9..be9b2f94 100644 --- a/HTMLtree.c +++ b/HTMLtree.c @@ -473,8 +473,10 @@ htmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur) { } if (cur->type == HTML_TEXT_NODE) { if (cur->content != NULL) { - if ((cur->name == xmlStringText) || - (cur->name != xmlStringTextNoenc)) { + if (((cur->name == xmlStringText) || + (cur->name != xmlStringTextNoenc)) && + ((cur->parent == NULL) || + (!xmlStrEqual(cur->parent->name, BAD_CAST "script")))) { xmlChar *buffer; #ifndef XML_USE_BUFFER_CONTENT @@ -889,8 +891,10 @@ htmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, } if (cur->type == HTML_TEXT_NODE) { if (cur->content != NULL) { - if ((cur->name == xmlStringText) || - (cur->name != xmlStringTextNoenc)) { + if (((cur->name == xmlStringText) || + (cur->name != xmlStringTextNoenc)) && + ((cur->parent == NULL) || + (!xmlStrEqual(cur->parent->name, BAD_CAST "script")))) { xmlChar *buffer; #ifndef XML_USE_BUFFER_CONTENT diff --git a/doc/xml.html b/doc/xml.html index e8d14305..ee125f59 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -1,3 +1,5 @@ + The XML C library for Gnome @@ -154,7 +156,9 @@ Web page and follow the instructions.

Alternatively, you can just send the bug to the xml@gnome.org list; if it's really libxml -related I will approve it..

+related I will approve it.. Please do not send me mail directly especially for +portability problem, it makes things really harder to track and in some cases +I'm not the best person to answer a given question, ask the list instead.

Of course, bugs reported with a suggested patch for fixing them will probably be processed faster.

@@ -1555,6 +1559,6 @@ Gnome CVS base under gnome-xml/example

Daniel Veillard

-

$Id: xml.html,v 1.84 2001/05/19 15:13:15 veillard Exp $

+

$Id: xml.html,v 1.85 2001/06/01 10:11:57 veillard Exp $