diff --git a/ChangeLog b/ChangeLog index 9a47de2b..bc95e476 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Feb 15 15:57:14 CET 2001 Daniel Veillard + + * 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 * hash.[ch]: added Paolo Casarini patch to provide Delete from diff --git a/HTMLtree.c b/HTMLtree.c index 5dce1744..8c6354a5 100644 --- 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, "name); + xmlBufferWriteChar(buf, ">"); + } +#else + xmlBufferWriteChar(buf, "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, "name); xmlOutputBufferWriteString(buf, ">"); } +#else + xmlOutputBufferWriteString(buf, "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. */ diff --git a/configure.in b/configure.in index e7edba90..775ef803 100644 --- 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}' diff --git a/result/HTML/doc3.htm b/result/HTML/doc3.htm index ae408417..c5a4f669 100644 --- 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, Gentus

- - + +
@@ -181,7 +181,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,

-
+

@@ -780,9 +780,9 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
- + - +

@@ -876,8 +876,8 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, Special
Code:BP6-hd
-

- + +
 
  diff --git a/result/HTML/wired.html b/result/HTML/wired.html index 74b68e88..66530977 100644 --- a/result/HTML/wired.html +++ b/result/HTML/wired.html @@ -67,7 +67,7 @@ - + True to the Original @@ -102,7 +102,7 @@ - + WIRED MAGAZINE @@ -587,7 +587,7 @@ Contruction workers in Berlin opened an old wound in the German psyche this week

- +