diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2003-11-04 08:47:48 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2003-11-04 08:47:48 +0000 |
| commit | 42fd412637a769dcfa911386b499ad41e79d959e (patch) | |
| tree | b6c90cb4c1c1e500b9c8be949ba52bae10f7ad96 /HTMLtree.c | |
| parent | 798ae54344dad8ee3e32c3e18132e50d360a0cd2 (diff) | |
| download | android_external_libxml2-42fd412637a769dcfa911386b499ad41e79d959e.tar.gz android_external_libxml2-42fd412637a769dcfa911386b499ad41e79d959e.tar.bz2 android_external_libxml2-42fd412637a769dcfa911386b499ad41e79d959e.zip | |
change --html to make sure we use the HTML serialization rule by default
* xmllint.c: change --html to make sure we use the HTML serialization
rule by default when HTML parser is used, add --xmlout to allow to
force the XML serializer on HTML.
* HTMLtree.c: ugly tweak to fix the output on <p> element and
solve #125093
* result/HTML/*: this changes the output of some tests
Daniel
Diffstat (limited to 'HTMLtree.c')
| -rw-r--r-- | HTMLtree.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -835,7 +835,8 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, if ((cur->next->type != HTML_TEXT_NODE) && (cur->next->type != HTML_ENTITY_REF_NODE) && (cur->parent != NULL) && - (!xmlStrEqual(cur->parent->name, BAD_CAST "pre"))) + (cur->parent->name != NULL) && + (cur->parent->name[0] != 'p')) /* p, pre, param */ xmlOutputBufferWriteString(buf, "\n"); } return; @@ -860,7 +861,8 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, if ((cur->next->type != HTML_TEXT_NODE) && (cur->next->type != HTML_ENTITY_REF_NODE) && (cur->parent != NULL) && - (!xmlStrEqual(cur->parent->name, BAD_CAST "pre"))) + (cur->parent->name != NULL) && + (cur->parent->name[0] != 'p')) /* p, pre, param */ xmlOutputBufferWriteString(buf, "\n"); } return; @@ -880,14 +882,16 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, (cur->children->type != HTML_TEXT_NODE) && (cur->children->type != HTML_ENTITY_REF_NODE) && (cur->children != cur->last) && - (!xmlStrEqual(cur->name, BAD_CAST "pre"))) + (cur->name != NULL) && + (cur->name[0] != 'p')) /* p, pre, param */ xmlOutputBufferWriteString(buf, "\n"); htmlNodeListDumpOutput(buf, doc, cur->children, encoding, format); if ((format) && (info != NULL) && (!info->isinline) && (cur->last->type != HTML_TEXT_NODE) && (cur->last->type != HTML_ENTITY_REF_NODE) && (cur->children != cur->last) && - (!xmlStrEqual(cur->name, BAD_CAST "pre"))) + (cur->name != NULL) && + (cur->name[0] != 'p')) /* p, pre, param */ xmlOutputBufferWriteString(buf, "\n"); } xmlOutputBufferWriteString(buf, "</"); @@ -902,7 +906,8 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, if ((cur->next->type != HTML_TEXT_NODE) && (cur->next->type != HTML_ENTITY_REF_NODE) && (cur->parent != NULL) && - (!xmlStrEqual(cur->parent->name, BAD_CAST "pre"))) + (cur->parent->name != NULL) && + (cur->parent->name[0] != 'p')) /* p, pre, param */ xmlOutputBufferWriteString(buf, "\n"); } } |