diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2001-04-23 09:13:36 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2001-04-23 09:13:36 +0000 |
| commit | de57c61c9dff4af4ae767033dc1c6291cf774cb1 (patch) | |
| tree | 3ff751eee25f970cf62a3e48954201e2f5de9f84 /HTMLtree.c | |
| parent | 393df01cac24c7344ddcdc3b6968f893790c5e67 (diff) | |
| download | android_external_libxml2-de57c61c9dff4af4ae767033dc1c6291cf774cb1.tar.gz android_external_libxml2-de57c61c9dff4af4ae767033dc1c6291cf774cb1.tar.bz2 android_external_libxml2-de57c61c9dff4af4ae767033dc1c6291cf774cb1.zip | |
- HTMLtree.c: applied change for Paul Sponagl on script saving
- Makefile.am: the warning about entity title.xml are normal.
Daniel
Diffstat (limited to 'HTMLtree.c')
| -rw-r--r-- | HTMLtree.c | 33 |
1 files changed, 10 insertions, 23 deletions
@@ -493,6 +493,16 @@ htmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur) { } 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, "<!--"); @@ -577,17 +587,9 @@ 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)) @@ -947,17 +949,9 @@ htmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, (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)) @@ -984,13 +978,6 @@ htmlDocContentDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, const char *enco cur->type = XML_HTML_DOCUMENT_NODE; if (cur->intSubset != NULL) { htmlDtdDumpOutput(buf, cur, NULL); -#if 0 - /* Disabled for XSLT output */ - } else { - /* Default to HTML-4.0 transitionnal @@@@ */ - xmlOutputBufferWriteString(buf, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n"); - -#endif } if (cur->children != NULL) { htmlNodeListDumpOutput(buf, cur, cur->children, encoding); |