From 5f996eba6deaa804bf4caced8acc65d8626720d6 Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Wed, 18 Mar 2015 08:34:23 -0700 Subject: Do not emit surrounding whitespace for text nodes Previously we omitted extra whitespace for single PCDATA/CDATA children, but in mixed content there was extra indentation before/after text nodes. One of the problems with that is that the text that you saved is not exactly the same as the parsing result using default flags (parse_trim_pcdata helps). Another problem is that parse-format cycles do not have a fixed point for mixed content - the result expands indefinitely. Some XML libraries, like Python minidom, have the same issue, but this is definitely a problem. Pretty-printing mixed content is hard. It seems that the only other sensible choice is to switch mixed content nodes to raw formatting. In a way the code in this change is a weaker version of that - it removes indentation around text nodes but still keeps it around element siblings/children. Thus we can switch to mixed-raw formatting at some point later, which will be a superset of the current behavior. To do this we have to either switch at the first text node (.NET XmlDocument does that), or scan the children of each element for a possible text node and switch before we output the first child. The former behavior seems non-intuitive (and a bit broken); unfortunately, the latter behavior can cost up to 20% of the output time for trees *without* mixed content. Fixes #13. --- tests/writer_string.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/writer_string.cpp') diff --git a/tests/writer_string.cpp b/tests/writer_string.cpp index 661c792..26bca8d 100644 --- a/tests/writer_string.cpp +++ b/tests/writer_string.cpp @@ -45,7 +45,7 @@ std::string save_narrow(const pugi::xml_document& doc, unsigned int flags, pugi: { xml_writer_string writer; - doc.save(writer, STR(""), flags, encoding); + doc.save(writer, STR("\t"), flags, encoding); return writer.as_narrow(); } @@ -59,7 +59,7 @@ std::string write_narrow(pugi::xml_node node, unsigned int flags, pugi::xml_enco { xml_writer_string writer; - node.print(writer, STR(""), flags, encoding); + node.print(writer, STR("\t"), flags, encoding); return writer.as_narrow(); } @@ -73,7 +73,7 @@ std::basic_string write_wide(pugi::xml_node node, unsigned int flags, p { xml_writer_string writer; - node.print(writer, STR(""), flags, encoding); + node.print(writer, STR("\t"), flags, encoding); return writer.as_wide(); } -- cgit v1.2.3