From f0244cea968f14bbc7cf93e480ae8fec3e74d217 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sun, 9 May 2004 23:48:39 +0000 Subject: [PATCH] apply fix for XHTML1 formating from Nick Wellnhofer fixes bug #141266 * xmlsave.c: apply fix for XHTML1 formating from Nick Wellnhofer fixes bug #141266 * test/xhtmlcomp result//xhtmlcomp*: added the specific regression test Daniel --- ChangeLog | 7 +++++++ result/noent/xhtmlcomp | 7 +++++++ result/xhtmlcomp | 7 +++++++ result/xhtmlcomp.rdr | 19 +++++++++++++++++++ result/xhtmlcomp.sax | 23 +++++++++++++++++++++++ test/xhtmlcomp | 8 ++++++++ xmlsave.c | 4 ++++ 7 files changed, 75 insertions(+) create mode 100644 result/noent/xhtmlcomp create mode 100644 result/xhtmlcomp create mode 100644 result/xhtmlcomp.rdr create mode 100644 result/xhtmlcomp.sax create mode 100644 test/xhtmlcomp diff --git a/ChangeLog b/ChangeLog index 04679df3..47d230a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun May 9 19:46:13 CEST 2004 Daniel Veillard + + * xmlsave.c: apply fix for XHTML1 formating from Nick Wellnhofer + fixes bug #141266 + * test/xhtmlcomp result//xhtmlcomp*: added the specific regression + test + Sun May 9 14:07:21 CEST 2004 Daniel Veillard * Makefile.am: fix for a pedantic make check without make all request diff --git a/result/noent/xhtmlcomp b/result/noent/xhtmlcomp new file mode 100644 index 00000000..4ce634cb --- /dev/null +++ b/result/noent/xhtmlcomp @@ -0,0 +1,7 @@ + + + + +

a b

+ + diff --git a/result/xhtmlcomp b/result/xhtmlcomp new file mode 100644 index 00000000..4ce634cb --- /dev/null +++ b/result/xhtmlcomp @@ -0,0 +1,7 @@ + + + + +

a b

+ + diff --git a/result/xhtmlcomp.rdr b/result/xhtmlcomp.rdr new file mode 100644 index 00000000..97517b78 --- /dev/null +++ b/result/xhtmlcomp.rdr @@ -0,0 +1,19 @@ +0 10 html 0 0 +0 1 html 0 0 +1 14 #text 0 1 + +1 1 body 0 0 +2 14 #text 0 1 + +2 1 h1 0 0 +3 1 abbr 0 0 +4 3 #text 0 1 a +3 15 abbr 0 0 +3 3 #text 0 1 b +2 15 h1 0 0 +2 14 #text 0 1 + +1 15 body 0 0 +1 14 #text 0 1 + +0 15 html 0 0 diff --git a/result/xhtmlcomp.sax b/result/xhtmlcomp.sax new file mode 100644 index 00000000..a7a0d69c --- /dev/null +++ b/result/xhtmlcomp.sax @@ -0,0 +1,23 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(html, -//W3C//DTD XHTML 1.0 Strict//EN, http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd) +SAX.externalSubset(html, -//W3C//DTD XHTML 1.0 Strict//EN, http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd) +SAX.startElement(html) +SAX.characters( + , 3) +SAX.startElement(body) +SAX.characters( + , 5) +SAX.startElement(h1) +SAX.startElement(abbr) +SAX.characters(a, 1) +SAX.endElement(abbr) +SAX.characters( b, 2) +SAX.endElement(h1) +SAX.characters( + , 3) +SAX.endElement(body) +SAX.characters( +, 1) +SAX.endElement(html) +SAX.endDocument() diff --git a/test/xhtmlcomp b/test/xhtmlcomp new file mode 100644 index 00000000..47dd2a74 --- /dev/null +++ b/test/xhtmlcomp @@ -0,0 +1,8 @@ + + + + +

a b

+ + diff --git a/xmlsave.c b/xmlsave.c index b4f6de9c..65b96d1b 100644 --- a/xmlsave.c +++ b/xmlsave.c @@ -1127,10 +1127,14 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) { child = child->next; } } else if (cur->children != NULL) { + int indent = ctxt->format; + if (format) xmlOutputBufferWriteString(buf, "\n"); if (ctxt->level >= 0) ctxt->level++; + ctxt->format = format; xhtmlNodeListDumpOutput(ctxt, cur->children); if (ctxt->level > 0) ctxt->level--; + ctxt->format = indent; if ((xmlIndentTreeOutput) && (format)) xmlOutputBufferWrite(buf, ctxt->indent_size * (ctxt->level > ctxt->indent_nr ?