From f9fd652aae3634f6eb3739b372811d1e7d6558f8 Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Fri, 20 Jan 2023 02:42:07 +0100 Subject: [PATCH] MathML: improve formatting of formula in XHTML hull Contributed by lynx: https://www.lyx.org/trac/ticket/12629 --- src/mathed/InsetMathHull.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index 746da1d39f..f043882f53 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -2632,15 +2632,21 @@ docstring InsetMathHull::xhtml(XMLStream & xs, OutputParams const & op) const success = true; } catch (MathExportException const &) {} if (success) { + string const name_space_declaration = "xmlns='http://www.w3.org/1998/Math/MathML'"; if (getType() == hullSimple) - xs << xml::StartTag("math", - "xmlns=\"http://www.w3.org/1998/Math/MathML\"", true); - else - xs << xml::StartTag("math", - "display=\"block\" xmlns=\"http://www.w3.org/1998/Math/MathML\"", true); + xs << xml::StartTag("math", name_space_declaration, true); + else { + if (!xs.isLastTagCR()) + xs << xml::CR(); + xs << xml::StartTag("math", name_space_declaration + " display='block'", true); + } + xs << XMLStream::ESCAPE_NONE - << os.str() - << xml::EndTag("math"); + << os.str(); + + if (!xs.isLastTagCR()) + xs << xml::CR(); + xs << xml::EndTag("math") << xml::CR(); } } else if (mathtype == BufferParams::HTML) { odocstringstream os; -- 2.39.5