Assure correct spacing of colored items in mathed

[lyx.git] / src / mathed / InsetMathHull.cpp

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 9800866d6b9c3961dffe6c4d31aaeeb4c19fd5ed..d0e11fe2ab1118b9b4401ac8f1eb91f460c1bce9 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -2406,11 +2406,6 @@ int InsetMathHull::plaintext(odocstringstream & os,
 
 void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
-       // With DocBook 5, MathML must be within its own namespace; defined in Buffer.cpp::writeDocBookSource as "m".
-       // Output everything in a separate stream so that this does not interfere with the standard flow of DocBook tags.
-       odocstringstream osmath;
-       MathStream ms(osmath, "m", true);
-
        // Choose the tag around the MathML equation.
        docstring name;
        if (getType() == hullSimple)
@@ -2420,15 +2415,21 @@ void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) cons
 
        // DocBook also has <equation>, but it comes with a title.
 
-       docstring bname = name;
+       docstring attr;
        for (row_type i = 0; i < nrows(); ++i) {
                if (!label(i).empty()) {
-                       bname += " xml:id=\"" + xml::cleanID(label(i)) + "\"";
+                       attr = "xml:id=\"" + xml::cleanID(label(i)) + "\"";
                        break;
                }
        }
 
-       ++ms.tab(); ms.cr(); ms.os() << '<' << bname << '>';
+       xs << xml::StartTag(name, attr);
+       xs << xml::CR();
+
+       // With DocBook 5, MathML must be within its own namespace; defined in Buffer.cpp::writeDocBookSource as "m".
+       // Output everything in a separate stream so that this does not interfere with the standard flow of DocBook tags.
+       odocstringstream osmath;
+       MathStream ms(osmath, "m", true);
 
        // Output the MathML subtree.
        odocstringstream ls;
@@ -2444,30 +2445,29 @@ void InsetMathHull::docbook(XMLStream & xs, OutputParams const & runparams) cons
        ms << from_utf8(subst(subst(to_utf8(ls.str()), "&", "&amp;"), "<", "&lt;"));
        ms << "</" << from_ascii("alt") << ">";
 
-    // Actual transformation of the formula into MathML. This translation may fail (for example, due to custom macros).
-    // The new output stream is required to deal with the errors: first write completely the formula into this
-    // temporary stream; then, if it is possible without error, then copy it back to the "real" stream. Otherwise,
+       // Actual transformation of the formula into MathML. This translation may fail (for example, due to custom macros).
+       // The new output stream is required to deal with the errors: first write completely the formula into this
+       // temporary stream; then, if it is possible without error, then copy it back to the "real" stream. Otherwise,
        // some incomplete tags might be put into the real stream.
-    try {
-       // First, generate the MathML expression.
-           odocstringstream ostmp;
-           MathStream mstmp(ostmp, ms.xmlns(), ms.xmlMode());
-           InsetMathGrid::mathmlize(mstmp);
-
-       // Then, output it (but only if the generation can be done without errors!).
-           ms << MTag("math");
-           ms.cr();
+       try {
+               // First, generate the MathML expression.
+               odocstringstream ostmp;
+               MathStream mstmp(ostmp, ms.xmlns(), ms.xmlMode());
+               InsetMathGrid::mathmlize(mstmp);
+
+               // Then, output it (but only if the generation can be done without errors!).
+               ms << MTag("math");
+               ms.cr();
                osmath << ostmp.str(); // osmath is not a XMLStream, so no need for XMLStream::ESCAPE_NONE.
-           ms << ETag("math");
-    } catch (MathExportException const &) {
-           osmath << "MathML export failed. Please report this as a bug.";
+               ms << ETag("math");
+       } catch (MathExportException const &) {
+               osmath << "MathML export failed. Please report this as a bug.";
        }
 
-       // Close the DocBook tag enclosing the formula.
-       ms.cr(); --ms.tab(); ms.os() << "</" << name << '>';
-
-       // Output the complete tag to the DocBook stream.
+       // Output the complete formula to the DocBook stream.
        xs << XMLStream::ESCAPE_NONE << osmath.str();
+       xs << xml::CR();
+       xs << xml::EndTag(name);
 }