Couple of fixes, getting ready for 2.3.1:

- configure.in: applied patch from Daniel van Balen for OpenBSD and bumped version to 2.3.1 - HTMLtree.c result/HTML/doc3.htm result/HTML/wired.html: the attempt to find autoclosing was simply broken, removed it, updated the examples, this is better Daniel
2025-03-05 16:58:17 +03:00 · 2001-02-15 14:59:48 +00:00 · 2001-02-15 14:59:48 +00:00 · 760f4426f7
commit 760f4426f7
parent d194dd2892
5 changed files with 46 additions and 15 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+Thu Feb 15 15:57:14 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* configure.in: applied patch from Daniel van Balen for OpenBSD
+	  and bumped version to 2.3.1
+	* HTMLtree.c result/HTML/doc3.htm result/HTML/wired.html: the
+	  attempt to find autoclosing was simply broken, removed it,
+	  updated the examples, this is better
+
 Wed Feb 14 11:35:39 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>

 	* hash.[ch]: added Paolo Casarini patch to provide Delete from
--- a/HTMLtree.c
+++ b/HTMLtree.c
@ -565,6 +565,17 @@ htmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur) {
 	xmlBufferWriteCHAR(buf, cur->name);
 	xmlBufferWriteChar(buf, ">");
    }
+#if 0
+    if (!htmlIsAutoClosed(doc, cur)) {
+	xmlBufferWriteChar(buf, "</");
+	xmlBufferWriteCHAR(buf, cur->name);
+	xmlBufferWriteChar(buf, ">");
+    }
+#else
+    xmlBufferWriteChar(buf, "</");
+    xmlBufferWriteCHAR(buf, cur->name);
+    xmlBufferWriteChar(buf, ">");
+#endif
    if (cur->next != NULL) {
        if ((cur->next->type != HTML_TEXT_NODE) &&
 	    (cur->next->type != HTML_ENTITY_REF_NODE))
@ -667,6 +678,7 @@ htmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int *size) {
 * htmlDtdDump:
 * @buf:  the HTML buffer output
 * @doc:  the document
+ * @encoding:  the encoding string
 * 
 * Dump the HTML document DTD, if any.
 */
@ -700,6 +712,7 @@ htmlDtdDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, const char *encoding) {
 * @buf:  the HTML buffer output
 * @doc:  the document
 * @cur:  the attribute pointer
+ * @encoding:  the encoding string
 *
 * Dump an HTML attribute
 */
@ -731,6 +744,7 @@ htmlAttrDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur, const
 * @buf:  the HTML buffer output
 * @doc:  the document
 * @cur:  the first attribute pointer
+ * @encoding:  the encoding string
 *
 * Dump a list of HTML attributes
 */
@ -756,6 +770,7 @@ void htmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
 * @buf:  the HTML buffer output
 * @doc:  the document
 * @cur:  the first node
+ * @encoding:  the encoding string
 *
 * Dump an HTML node list, recursive behaviour,children are printed too.
 */
@ -773,10 +788,11 @@ htmlNodeListDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, co
 }

 /**
- * htmlNodeDump:
+ * htmlNodeDumpOutput:
 * @buf:  the HTML buffer output
 * @doc:  the document
 * @cur:  the current node
+ * @encoding:  the encoding string
 *
 * Dump an HTML node, recursive behaviour,children are printed too.
 */
@ -911,11 +927,17 @@ htmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, const
 	    (cur->children != cur->last))
 	    xmlOutputBufferWriteString(buf, "\n");
    }
+#if 0
    if (!htmlIsAutoClosed(doc, cur)) {
 	xmlOutputBufferWriteString(buf, "</");
 	xmlOutputBufferWriteString(buf, (const char *)cur->name);
 	xmlOutputBufferWriteString(buf, ">");
    }
+#else
+    xmlOutputBufferWriteString(buf, "</");
+    xmlOutputBufferWriteString(buf, (const char *)cur->name);
+    xmlOutputBufferWriteString(buf, ">");
+#endif
    if (cur->next != NULL) {
        if ((cur->next->type != HTML_TEXT_NODE) &&
 	    (cur->next->type != HTML_ENTITY_REF_NODE))
@ -927,6 +949,7 @@ htmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, const
 * htmlDocContentDump:
 * @buf:  the HTML buffer output
 * @cur:  the document
+ * @encoding:  the encoding string
 *
 * Dump an HTML document.
 */
--- a/configure.in
+++ b/configure.in
@ -6,7 +6,7 @@ AC_CANONICAL_HOST

 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=3
-LIBXML_MICRO_VERSION=0
+LIBXML_MICRO_VERSION=1
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION

@ -140,7 +140,7 @@ dnl Checks for isnan in libm if not in libc
 AC_CHECK_FUNC(isnan, , AC_CHECK_LIB(m, isnan,
  [M_LIBS="-lm"; AC_DEFINE(HAVE_ISNAN)]))

-AC_CHECK_FUNC(isinf, , AC_CHECK_LIB(m, isinf,
+AC_CHECK_FUNC(isinf, AC_DEFINE(HAVE_ISINF) , AC_CHECK_LIB(m, isinf,
  [M_LIBS="-lm"; AC_DEFINE(HAVE_ISINF)]))

 XML_LIBDIR='-L${libdir}'
--- a/result/HTML/doc3.htm
+++ b/result/HTML/doc3.htm
@ -94,8 +94,8 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
 <a href="http://www.gentus.com/"><font color="white" face="Verdana" size="1">Gentus</font></a>
 </p></td>
 </tr></tbody></table></center>
-</tbody></table>
-</center></tbody></table>
+</td></tr></tbody></table>
+</center></td></tr></tbody></table></td></tr>
 </tbody></table>
 <table bgcolor="#003399" border="0" cellspacing="6" width="80%"><tbody><tr>
 <td bgcolor="black" valign="top" width="10%"><table border="0" cellpadding="3" cellspacing="0" width="100%"><tbody><tr><td width="100%">
@ -181,7 +181,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
 <center></center>
 <br>
 <!--<A HREF="code:javascript:ID_FTPWebView.InvokeHelp()"><FONT SIZE="1" COLOR="white" FACE="Verdana">FTP Help</FONT></A>-->
-</td></tr></tbody></table>
+</td></tr></tbody></table></td>
 <td bgcolor="white" valign="top" width="80%">
 <img height="1" src="doc3_files/spacer.gif" width="490">
 <br>
@ -780,9 +780,9 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
 <br>
 </font>
 <center><iframe frameborder="0" height="60" marginheight="0" marginwidth="0" noresize scrolling="no" src="doc3_files/ad_iframe.htm" width="468"><a href="http://ads.adflight.com/go_static.asp?asid=7708" target="_top"><img width="468" height="60" border="0" alt="Advertisement" src="http://ads.adflight.com/ad_static.asp?pid=2097&amp;sid=1881&amp;asid=7708"></a></iframe></center>
-</tbody></table>
+</td></tr></tbody></table>
 </center>
-
+</td>
 <td bgcolor="silver" valign="top" width="10%"><center>
 <p>
 <table bgcolor="silver" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colstart="1"><center>
@ -876,8 +876,8 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
            Special<br>Code:BP6-hd</font>
 </a>
 </td></tr></tbody></table>
-</center>
-</tbody></table>
+</center></td>
+</tr></tbody></table>
 <table bgcolor="silver" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%"><tbody><tr><td width="100%"> </td></tr></tbody></table>
 <!--	</TABLE>--><center></center>
 <tr><td colspan="3" valign="TOP" height="70"> </td></tr>
--- a/result/HTML/wired.html
+++ b/result/HTML/wired.html
@ -67,7 +67,7 @@
 </select>
 <input type="hidden" name="source" value="2hb8bhc059">
 </td></tr>
-</form></table>
+</form></table></td>
 <td valign="top" align="RIGHT"><a href="http://nsads.hotwired.com/event.ng/Type=click&amp;ProfileID=5597&amp;RunID=17167&amp;AdID=22588&amp;GroupID=1&amp;FamilyID=3228&amp;TagValues=8.25.159.171.172.174.179.180.181.182.183.196.197.199.208.241.389.412.436.2035.6749.6750.70367.78456.79630.81880&amp;Redirect=http:%2F%2Fwww.hp.com%2Fgo%2Foriginal%20" target="_top"><img src="http://static.wired.com/advertising/blipverts/hp_colorinkjet/hp_970c_120x60_6.gif" border="1" height="60" width="120" alt="True to the Original"></a></td>
 </tr></table>
 <!-- WIRED NEWS header --><!-- CMD_HOST = scoop.hotwired.com --><a name="#"></a>
@ -102,7 +102,7 @@
 <option value="http://www.hotbot.com/?SM=MC&amp;DV=0&amp;LG=any&amp;RD=RG&amp;DC=10&amp;DE=2&amp;_v=2&amp;OPs=MDRTP&amp;MT=">The Web -&gt; HotBot</option>
 </select></td>
 <td><input type="SUBMIT" name="SUBMIT" value="SEARCH"></td>
-</tr></form></table>
+</tr></form></table></td>
 </tr>
 <!-- 
 <TR>
@ -137,7 +137,7 @@
 <input type="TEXT" name="from" size="10" value="enter email">&nbsp;
 </form></td>
 <td valign="top" bgcolor="#99FF99"><input type="SUBMIT" name="SUBMIT" value="GO"></td>
-</tr></table></tr>
+</tr></table></td></tr>
 <tr><td bgcolor="#FF0000"><font face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF"><b><font size="1">STOCKS</font></b></font></td></tr>
 <tr><td bgcolor="#99FF99"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">Get Quote:</font></td></tr>
 <tr><td bgcolor="#99FF99" marginwidth="0" marginheight="0"><form method="get" action="http://r.wired.com/r/10020/http://stocks.wired.com/stocks_quotes.asp">
@ -219,7 +219,7 @@
 </font>
 <br clear="all">
 </p></td></tr>
-</table></tr>
+</table></td></tr>
 <!-- END B&N spot --><!-- BEGIN MAGAZINE SPOT --><tr><td bgcolor="#000000"><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="1"><b>WIRED 
      MAGAZINE </b></font></td></tr>
 <tr><td bgcolor="#FFFF99" align="CENTER"><font face="verdana, arial, helvetica, sans-serif" size="1">
@ -587,7 +587,7 @@ Contruction workers in Berlin opened an old wound in the German psyche this week
 <br>
 <br>
 <!-- SQL above --><!-- - - - - - - - - - - - - -->
-
+</td>
 </tr>
 <tr>
 <td valign="TOP" align="LEFT">