*** HTMLtree.c	2001/04/25 10:29:44	1.47
--- HTMLtree.c	2001/05/08 08:25:38
***************
*** 493,508 ****
  	}
  	return;
      }
-     if (cur->type == HTML_PRESERVE_NODE) {
- 	if (cur->content != NULL) {
- #ifndef XML_USE_BUFFER_CONTENT
- 	    xmlBufferWriteCHAR(buf, cur->content);
- #else
- 	    xmlBufferWriteCHAR(buf, xmlBufferContent(cur->content));
- #endif
- 	}
- 	return;
-     }
      if (cur->type == HTML_COMMENT_NODE) {
  	if (cur->content != NULL) {
  	    xmlBufferWriteChar(buf, "<!--");
--- 493,498 ----
***************
*** 537,545 ****
          xmlBufferWriteChar(buf, ";");
  	return;
      }
  
      /*
!      * Get specific HTmL info for taht node.
       */
      info = htmlTagLookup(cur->name);
  
--- 527,545 ----
          xmlBufferWriteChar(buf, ";");
  	return;
      }
+     if (cur->type == HTML_PRESERVE_NODE) {
+ 	if (cur->content != NULL) {
+ #ifndef XML_USE_BUFFER_CONTENT
+ 	    xmlBufferWriteCHAR(buf, cur->content);
+ #else
+ 	    xmlBufferWriteCHAR(buf, xmlBufferContent(cur->content));
+ #endif
+ 	}
+ 	return;
+     }
  
      /*
!      * Get specific HTML info for taht node.
       */
      info = htmlTagLookup(cur->name);
  
***************
*** 558,566 ****
  	return;
      }
      if ((cur->content == NULL) && (cur->children == NULL)) {
!         if ((info != NULL) && (info->endTag != 0))
  	    xmlBufferWriteChar(buf, ">");
! 	else {
  	    xmlBufferWriteChar(buf, "></");
  	    xmlBufferWriteCHAR(buf, cur->name);
  	    xmlBufferWriteChar(buf, ">");
--- 558,567 ----
  	return;
      }
      if ((cur->content == NULL) && (cur->children == NULL)) {
!         if ((info != NULL) && (info->saveEndTag != 0) &&
! 	    (strcmp(info->name, "html")) && (strcmp(info->name, "body"))) {
  	    xmlBufferWriteChar(buf, ">");
! 	} else {
  	    xmlBufferWriteChar(buf, "></");
  	    xmlBufferWriteCHAR(buf, cur->name);
  	    xmlBufferWriteChar(buf, ">");
***************
*** 577,586 ****
  	xmlChar *buffer;
  
  #ifndef XML_USE_BUFFER_CONTENT
!     buffer = xmlEncodeEntitiesReentrant(doc, cur->content);
  #else
!     buffer = xmlEncodeEntitiesReentrant(doc, 
!                                         xmlBufferContent(cur->content));
  #endif
  	if (buffer != NULL) {
  	    xmlBufferWriteCHAR(buf, buffer);
--- 578,587 ----
  	xmlChar *buffer;
  
  #ifndef XML_USE_BUFFER_CONTENT
! 	buffer = xmlEncodeEntitiesReentrant(doc, cur->content);
  #else
! 	buffer = xmlEncodeEntitiesReentrant(doc, 
! 			    xmlBufferContent(cur->content));
  #endif
  	if (buffer != NULL) {
  	    xmlBufferWriteCHAR(buf, buffer);
***************
*** 598,608 ****
  	    (cur->children != cur->last))
  	    xmlBufferWriteChar(buf, "\n");
      }
-     if (!htmlIsAutoClosed(doc, cur)) {
- 	xmlBufferWriteChar(buf, "</");
- 	xmlBufferWriteCHAR(buf, cur->name);
- 	xmlBufferWriteChar(buf, ">");
-     }
      xmlBufferWriteChar(buf, "</");
      xmlBufferWriteCHAR(buf, cur->name);
      xmlBufferWriteChar(buf, ">");
--- 599,604 ----
***************
*** 939,948 ****
      }
      if ((cur->content == NULL) && (cur->children == NULL)) {
          if ((info != NULL) && (info->saveEndTag != 0) &&
- /*
- 	    (xmlStrcasecmp(BAD_CAST info->name, BAD_CAST "html")) && 
- 	    (xmlStrcasecmp(BAD_CAST info->name, BAD_CAST "body"))) {
- */
  	    (strcmp(info->name, "html")) && (strcmp(info->name, "body"))) {
  	    xmlOutputBufferWriteString(buf, ">");
  	} else {
--- 935,940 ----