- xpath.c: trying to get 52979 solved
- tree.c result/ result/noent/: trying to get 52712 solved, this
also made me clean up the fact that XML output in general should
not add formating blanks by default, this changed the output of
a few tests
Daniel
diff --git a/ChangeLog b/ChangeLog
index 34da40f..2b00340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr 10 18:13:10 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+ * xpath.c: trying to get 52979 solved
+ * tree.c result/ result/noent/: trying to get 52712 solved, this
+ also made me clean up the fact that XML output in general should
+ not add formating blanks by default, this changed the output of
+ a few tests
+
Tue Apr 10 16:30:20 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* xpath.c: Bill Brack pointer an error in detecting a null nodeset
diff --git a/result/dtd10 b/result/dtd10
index 86bf28d..8c7d5e7 100644
--- a/result/dtd10
+++ b/result/dtd10
@@ -6,8 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<c> is a</c>
-<d> valid document</d>
-</doc>
+<doc><b>This</b><c> is a</c><d> valid document</d></doc>
diff --git a/result/dtd6 b/result/dtd6
index 51ed455..ed2d993 100644
--- a/result/dtd6
+++ b/result/dtd6
@@ -4,8 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
-<a>This</a>
-<b> is a valid</b>
-<a> document</a>
-</doc>
+<doc><a>This</a><b> is a valid</b><a> document</a></doc>
diff --git a/result/dtd7 b/result/dtd7
index 1dec033..0a4075f 100644
--- a/result/dtd7
+++ b/result/dtd7
@@ -4,7 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
-<a>This</a>
-<b> is a valid document</b>
-</doc>
+<doc><a>This</a><b> is a valid document</b></doc>
diff --git a/result/dtd8 b/result/dtd8
index b845a9e..7a655f9 100644
--- a/result/dtd8
+++ b/result/dtd8
@@ -6,7 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<c> is a valid document</c>
-</doc>
+<doc><b>This</b><c> is a valid document</c></doc>
diff --git a/result/dtd9 b/result/dtd9
index cded211..89cc1d4 100644
--- a/result/dtd9
+++ b/result/dtd9
@@ -6,7 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<d> is a valid document</d>
-</doc>
+<doc><b>This</b><d> is a valid document</d></doc>
diff --git a/result/ent7 b/result/ent7
index dcbc9ca..f46d8bb 100644
--- a/result/ent7
+++ b/result/ent7
@@ -5,6 +5,4 @@
<!ELEMENT item (para)+>
<!ELEMENT para (#PCDATA)>
]>
-<item>
-<para>'they called me &sampleEnt;'</para>
-</item>
+<item><para>'they called me &sampleEnt;'</para></item>
diff --git a/result/noent/dtd10 b/result/noent/dtd10
index 86bf28d..8c7d5e7 100644
--- a/result/noent/dtd10
+++ b/result/noent/dtd10
@@ -6,8 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<c> is a</c>
-<d> valid document</d>
-</doc>
+<doc><b>This</b><c> is a</c><d> valid document</d></doc>
diff --git a/result/noent/dtd6 b/result/noent/dtd6
index 51ed455..ed2d993 100644
--- a/result/noent/dtd6
+++ b/result/noent/dtd6
@@ -4,8 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
-<a>This</a>
-<b> is a valid</b>
-<a> document</a>
-</doc>
+<doc><a>This</a><b> is a valid</b><a> document</a></doc>
diff --git a/result/noent/dtd7 b/result/noent/dtd7
index 1dec033..0a4075f 100644
--- a/result/noent/dtd7
+++ b/result/noent/dtd7
@@ -4,7 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
-<a>This</a>
-<b> is a valid document</b>
-</doc>
+<doc><a>This</a><b> is a valid document</b></doc>
diff --git a/result/noent/dtd8 b/result/noent/dtd8
index b845a9e..7a655f9 100644
--- a/result/noent/dtd8
+++ b/result/noent/dtd8
@@ -6,7 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<c> is a valid document</c>
-</doc>
+<doc><b>This</b><c> is a valid document</c></doc>
diff --git a/result/noent/dtd9 b/result/noent/dtd9
index cded211..89cc1d4 100644
--- a/result/noent/dtd9
+++ b/result/noent/dtd9
@@ -6,7 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<d> is a valid document</d>
-</doc>
+<doc><b>This</b><d> is a valid document</d></doc>
diff --git a/result/noent/ent2 b/result/noent/ent2
index b0c49a6..b643ac3 100644
--- a/result/noent/ent2
+++ b/result/noent/ent2
@@ -6,5 +6,7 @@
]>
<EXAMPLE>
+<title>my title</title>
+
This text is about XML, the Extensible Markup Language and this is an embedded <IMG src="image"/>
</EXAMPLE>
diff --git a/result/noent/ent7 b/result/noent/ent7
index 1bf69ce..1c895af 100644
--- a/result/noent/ent7
+++ b/result/noent/ent7
@@ -5,6 +5,4 @@
<!ELEMENT item (para)+>
<!ELEMENT para (#PCDATA)>
]>
-<item>
-<para>'they called me the hyacinth girl'</para>
-</item>
+<item><para>'they called me the hyacinth girl'</para></item>
diff --git a/result/noent/xml1 b/result/noent/xml1
index 951830a..637d265 100644
--- a/result/noent/xml1
+++ b/result/noent/xml1
@@ -4,8 +4,6 @@
numerically (&#38;#38;) or with a general entity
(&amp;).</p>">
]>
-<test>
-<p>An ampersand (&) may be escaped
+<test><p>An ampersand (&) may be escaped
numerically (&#38;) or with a general entity
- (&amp;).</p>
-</test>
+ (&amp;).</p></test>
diff --git a/tree.c b/tree.c
index 6d026b9..5c5fb8d 100644
--- a/tree.c
+++ b/tree.c
@@ -5779,7 +5779,7 @@
void
xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr,
int * doc_txt_len, const char * txt_encoding,
- int format ATTRIBUTE_UNUSED) {
+ int format) {
int dummy = 0;
xmlCharEncoding doc_charset;
@@ -5842,7 +5842,7 @@
return;
}
- xmlDocContentDumpOutput(out_buff, out_doc, txt_encoding, 1);
+ xmlDocContentDumpOutput(out_buff, out_doc, txt_encoding, format);
xmlOutputBufferFlush(out_buff);
if (out_buff->conv != NULL) {
*doc_txt_len = out_buff->conv->use;
@@ -5909,7 +5909,7 @@
xmlDocDumpMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr,
int * doc_txt_len, const char * txt_encoding) {
xmlDocDumpFormatMemoryEnc(out_doc, doc_txt_ptr, doc_txt_len,
- txt_encoding, 1);
+ txt_encoding, 0);
}
/**
@@ -6011,7 +6011,7 @@
}
buf = xmlOutputBufferCreateFile(f, handler);
if (buf == NULL) return(-1);
- xmlDocContentDumpOutput(buf, cur, NULL, 1);
+ xmlDocContentDumpOutput(buf, cur, NULL, 0);
ret = xmlOutputBufferClose(buf);
return(ret);
@@ -6032,7 +6032,7 @@
int ret;
if (buf == NULL) return(0);
- xmlDocContentDumpOutput(buf, cur, encoding, 1);
+ xmlDocContentDumpOutput(buf, cur, encoding, 0);
ret = xmlOutputBufferClose(buf);
return(ret);
}
@@ -6076,7 +6076,7 @@
buf = xmlOutputBufferCreateFilename(filename, handler, 0);
if (buf == NULL) return(-1);
- xmlDocContentDumpOutput(buf, cur, encoding, 1);
+ xmlDocContentDumpOutput(buf, cur, encoding, 0);
ret = xmlOutputBufferClose(buf);
return(ret);
@@ -6131,7 +6131,7 @@
buf = xmlOutputBufferCreateFilename(filename, handler, cur->compression);
if (buf == NULL) return(-1);
- xmlDocContentDumpOutput(buf, cur, NULL, 1);
+ xmlDocContentDumpOutput(buf, cur, NULL, 0);
ret = xmlOutputBufferClose(buf);
return(ret);
diff --git a/xpath.c b/xpath.c
index d533a59..2854ba4 100644
--- a/xpath.c
+++ b/xpath.c
@@ -164,14 +164,11 @@
if (initialized) return;
- xmlXPathNAN = 0;
- xmlXPathNAN /= 0;
+ xmlXPathNAN = 0.0 / 0.0;
- xmlXPathPINF = 1;
- xmlXPathPINF /= 0;
+ xmlXPathPINF = 1 / 0.0;
- xmlXPathNINF = -1;
- xmlXPathNINF /= 0;
+ xmlXPathNINF = -1 / 0.0;
initialized = 1;
}