c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply fix for XHTML1 formating from Nick Wellnhofer fixes bug #141266

Browse Source 
* xmlsave.c: apply fix for XHTML1 formating from Nick Wellnhofer
  fixes bug #141266
* test/xhtmlcomp result//xhtmlcomp*: added the specific regression
  test
Daniel
This commit is contained in:
Daniel Veillard 2004-05-09 23:48:39 +00:00
parent a90de5ef96
commit f0244cea96
7 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sun May 9 19:46:13 CEST 2004 Daniel Veillard <daniel@veillard.com>
* 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 <daniel@veillard.com> Sun May 9 14:07:21 CEST 2004 Daniel Veillard <daniel@veillard.com>
* Makefile.am: fix for a pedantic make check without make all request * Makefile.am: fix for a pedantic make check without make all request

7
result/noent/xhtmlcomp Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<body>
<h1><abbr>a</abbr> b</h1>
</body>
</html>

7
result/xhtmlcomp Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<body>
<h1><abbr>a</abbr> b</h1>
</body>
</html>

19
result/xhtmlcomp.rdr Normal file
View File

@ -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

23
result/xhtmlcomp.sax Normal file
View File

@ -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()

8
test/xhtmlcomp Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<body>
<h1><abbr>a</abbr> b</h1>
</body>
</html>

4
xmlsave.c
View File

@ -1127,10 +1127,14 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
child = child->next; child = child->next;
} }
} else if (cur->children != NULL) { } else if (cur->children != NULL) {
int indent = ctxt->format;
if (format) xmlOutputBufferWriteString(buf, "\n"); if (format) xmlOutputBufferWriteString(buf, "\n");
if (ctxt->level >= 0) ctxt->level++; if (ctxt->level >= 0) ctxt->level++;
ctxt->format = format;
xhtmlNodeListDumpOutput(ctxt, cur->children); xhtmlNodeListDumpOutput(ctxt, cur->children);
if (ctxt->level > 0) ctxt->level--; if (ctxt->level > 0) ctxt->level--;
ctxt->format = indent;
if ((xmlIndentTreeOutput) && (format)) if ((xmlIndentTreeOutput) && (format))
xmlOutputBufferWrite(buf, ctxt->indent_size * xmlOutputBufferWrite(buf, ctxt->indent_size *
(ctxt->level > ctxt->indent_nr ? (ctxt->level > ctxt->indent_nr ?