- HTMLtree.c: trying to close bug #55772 escaping in script
elements
- doc/xml.html: suggest to send mail to the list
Daniel
diff --git a/ChangeLog b/ChangeLog
index cf30208..4a31857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-Tue Jun 5 19:11:02 CEST 2001 Bjorn Reese <breese@users.sourceforge.net>
+Tue Jun 5 22:54:21 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+ * 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 <Daniel.Veillard@imag.fr>
* 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 e61ce2b..be9b2f9 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -473,8 +473,10 @@
}
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 @@
}
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 e8d1430..ee125f5 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title>The XML C library for Gnome</title>
@@ -154,7 +156,9 @@
<p>Alternatively, you can just send the bug to the <a
href="mailto:xml@gnome.org">xml@gnome.org</a> list; if it's really libxml
-related I will approve it..</p>
+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.</p>
<p>Of course, bugs reported with a suggested patch for fixing them will
probably be processed faster.</p>
@@ -1555,6 +1559,6 @@
<p><a href="mailto:Daniel.Veillard@imag.fr">Daniel Veillard</a></p>
-<p>$Id: xml.html,v 1.84 2001/05/19 15:13:15 veillard Exp $</p>
+<p>$Id: xml.html,v 1.85 2001/06/01 10:11:57 veillard Exp $</p>
</body>
</html>