XML: improve formatting of error message for unrecognised tag type.

Before, there was always a space after the tag, even when there were no attributes. Now, the space is output conditionally, so that the output makes more sense.

Before, one space too many for the tag name (title), casting doubt on whether the code had this space hard coded or not:

<!-- Output Error: Unrecognised tag type 'para' for 'title ' -->

After, no such space:

<!-- Output Error: Unrecognised tag type 'para' for 'title' -->

diff --git a/src/xml.cpp b/src/xml.cpp
index 7ee8d9137a754749b08134bdc39dcfb29431113c..f466f612831f92fe0ad834f08c4a9f638fb083aa 100644 (file)
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -812,7 +812,8 @@ void xml::openTag(XMLStream & xs, const docstring & tag, const docstring & attr,
        else if (tagtype == "none")
                xs << xml::StartTag(tag, attr);
        else
-               xs.writeError("Unrecognised tag type '" + tagtype + "' for '" + to_utf8(tag) + " " + to_utf8(attr) + "'");
+               xs.writeError("Unrecognised tag type '" + tagtype + "' for '" + to_utf8(tag) + (attr.empty() ? "" : " ") +
+                               to_utf8(attr) + "'");
 }