diff --git a/ChangeLog b/ChangeLog index 7f9cb73c..e06a28d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Nov 4 09:38:46 CET 2003 Daniel Veillard + + * 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

element and + solve #125093 + * result/HTML/*: this changes the output of some tests + Mon Nov 3 17:51:28 CET 2003 Daniel Veillard * xinclude.c: fixed bug #125812, about XPointer in XInclude diff --git a/HTMLtree.c b/HTMLtree.c index 61287e68..5724540f 100644 --- a/HTMLtree.c +++ b/HTMLtree.c @@ -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, "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"); } } diff --git a/result/HTML/doc3.htm b/result/HTML/doc3.htm index 15e87b95..fad60cbc 100644 --- a/result/HTML/doc3.htm +++ b/result/HTML/doc3.htm @@ -46,8 +46,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, -

-Monday, July 31st, 2000

+

Monday, July 31st, 2000

@@ -58,38 +57,31 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
-

-Abit BP6 Motherboard specification and information.
BP6 Specs +

Abit BP6 Motherboard specification and information.
BP6 Specs

-

-How to cool the BX Chipset on your BP6.
BX Cooling +

How to cool the BX Chipset on your BP6.
BX Cooling

-

-The U;timate Gaming Contest - Coming Soon!
UGM Contest +

The U;timate Gaming Contest - Coming Soon!
UGM Contest

-

-Cooling & Heatsink review for the BP6.
Heatsinks +

Cooling & Heatsink review for the BP6.
Heatsinks

-

-BP6 101 - Class is now in session. Welcome newbies!
BP6 101 +

BP6 101 - Class is now in session. Welcome newbies!
BP6 101

-

-Install guide for installing Windows 2000 on the BP6
Win2k Install +

Install guide for installing Windows 2000 on the BP6
Win2k Install

-

-Taking a first look at the Abit Linux release called
Gentus +

Taking a first look at the Abit Linux release called
Gentus

@@ -163,12 +155,9 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, error.
And 1 more person, THANK YOU TIM for letting me borrow your server space ;-)

If you need a weird resolution, feel free to e-mail me requesting - for one.
If you have ideas or more errors to point out, mailto:Holodeck2@home.com

800x600
1024x768
1152x864
1280x1024
1600x1200

Enjoy :-)
-

-

-Holodeck2,
[H]ard at - work on the Brand Spanking New Wallpaper.
-



Seti update
Posted by Holodeck2 @ 10:40PM + for one.
If you have ideas or more errors to point out, mailto:Holodeck2@home.com

800x600
1024x768
1152x864
1280x1024
1600x1200

Enjoy :-)

+

Holodeck2,
[H]ard at + work on the Brand Spanking New Wallpaper.



Seti update
Posted by Holodeck2 @ 10:40PM PDT  5 comments  | top

You like the pic?

Bp6 User Group Update:
Completed 61531 @@ -427,10 +416,8 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
-

-PC Price - Search

-

+

PC Price + Search





BP6.com Special - Enter CODE: BP6-hd in the order (notes) to receive a discount
BP6.COM @@ -444,8 +431,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
 
diff --git a/result/HTML/fp40.htm b/result/HTML/fp40.htm index 501eb610..e78b8bd3 100644 --- a/result/HTML/fp40.htm +++ b/result/HTML/fp40.htm @@ -30,9 +30,7 @@

This section provides complementary or late-breaking information to supplement the Microsoft FrontPage Server Extensions documentation.

-

-Apache 1.3.4 Support
Upgrading from previous version of FrontPage Server Extensions
Uploading files into executable folders -

+

Apache 1.3.4 Support
Upgrading from previous version of FrontPage Server Extensions
Uploading files into executable folders

Top of Page

@@ -106,9 +104,7 @@ see the FrontPage 2000 Server Extensions Resource Kit at Server Extensions Resource Kit
Server Extensions Resource Kit Update
Knowledge Base -

+

Server Extensions Resource Kit
Server Extensions Resource Kit Update
Knowledge Base

Top of Page

diff --git a/result/HTML/wired.html b/result/HTML/wired.html index ab0c3605..674623fd 100644 --- a/result/HTML/wired.html +++ b/result/HTML/wired.html @@ -254,8 +254,7 @@

Powered by barnesandnoble.com -
-

+

-

-Copyright +

Copyright ©1999-2000 BP6.com, All rights reserved.
Got news? Send it to Tim

@@ -352,8 +351,7 @@ or PointCast
Führer Furor

Contruction workers in Berlin opened an old wound in the German psyche this week when they accidentally stumbled across Adolf Hitler's bunker while excavating near the Brandenburg Gate. The bunker, just south of the Gate, was where Hitler and his closest associates barricaded themselves as the Red Army approached Berlin in the waning days of World War II. It is also where the Führer and his bride, Eva Braun, committed suicide rather than fall into the hands of the Russians. Although the bunker's location has never been a mystery, it has been sealed off since the end of the war to keep neo-Nazis from turning it into a shrine. -
-

+

  • More from Lycos


    • @@ -368,8 +366,7 @@ Contruction workers in Berlin opened an old wound in the German psyche this week -




    - +




    Send us feedback  |  Work at Wired Digital @@ -381,15 +378,13 @@ Contruction workers in Berlin opened an old wound in the German psyche this week

    -

    -Copyright © 1994-99 Wired Digital Inc. All rights reserved. +

    Copyright © 1994-99 Wired Digital Inc. All rights reserved.
    - -

    +

    diff --git a/xmllint.c b/xmllint.c index 9ecad8ef..92b1c3e8 100644 --- a/xmllint.c +++ b/xmllint.c @@ -128,6 +128,7 @@ static int repeat = 0; static int insert = 0; #ifdef LIBXML_HTML_ENABLED static int html = 0; +static int xmlout = 0; #endif static int htmlout = 0; #ifdef LIBXML_PUSH_ENABLED @@ -1052,6 +1053,45 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { if ((timing) && (!repeat)) { startTimer(); } +#ifdef LIBXML_VALID_ENABLED + if ((html) && (!xmlout)) { + if (compress) { + htmlSaveFile(output ? output : "-", doc); + } + else if (encoding != NULL) { + if ( format ) { + htmlSaveFileFormat(output ? output : "-", doc, encoding, 1); + } + else { + htmlSaveFileFormat(output ? output : "-", doc, encoding, 0); + } + } + else if (format) { + htmlSaveFileFormat(output ? output : "-", doc, NULL, 1); + } + else { + FILE *out; + if (output == NULL) + out = stdout; + else { + out = fopen(output,"wb"); + } + if (out != NULL) { + if (htmlDocDump(out, doc) < 0) + progresult = 6; + + if (output != NULL) + fclose(out); + } else { + fprintf(stderr, "failed to open %s\n", output); + progresult = 6; + } + } + if ((timing) && (!repeat)) { + endTimer("Saving"); + } + } else +#endif #ifdef HAVE_SYS_MMAN_H if (memory) { xmlChar *result; @@ -1390,6 +1430,7 @@ static void usage(const char *name) { #endif /* LIBXML_OUTPUT_ENABLED */ #ifdef LIBXML_HTML_ENABLED printf("\t--html : use the HTML parser\n"); + printf("\t--xmlout : force to use the XML serializer when using --html\n"); #endif #ifdef LIBXML_PUSH_ENABLED printf("\t--push : use the push mode of the parser\n"); @@ -1521,6 +1562,10 @@ main(int argc, char **argv) { (!strcmp(argv[i], "--html"))) { html++; } + else if ((!strcmp(argv[i], "-xmlout")) || + (!strcmp(argv[i], "--xmlout"))) { + xmlout++; + } #endif /* LIBXML_HTML_ENABLED */ else if ((!strcmp(argv[i], "-loaddtd")) || (!strcmp(argv[i], "--loaddtd"))) {