Fix bug #12772

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

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 0bb9b8e47bff7419c8a19847f07c4a5f1ff29e2a..537d6670c5ffa0d090ffb0b2acfd5c372a001f83 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -148,7 +148,7 @@ namespace {
 } // namespace
 
 
-static InsetLabel * dummy_pointer = 0;
+static InsetLabel * dummy_pointer = nullptr;
 
 InsetMathHull::InsetMathHull(Buffer * buf)
        : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NONUMBER),
@@ -703,7 +703,7 @@ static docstring latexString(InsetMathHull const & inset)
        // \newcommand{\xxx}{\text{$\phi$}}) gets processed twice. The
        // first time as a whole, and the second time only the inner math.
        // In this last case inset.buffer() would be invalid.
-       static Encoding const * encoding = 0;
+       static Encoding const * encoding = nullptr;
        if (inset.isBufferValid())
                encoding = &(inset.buffer().params().encoding());
        otexrowstream ots(ls);
@@ -1356,7 +1356,7 @@ void InsetMathHull::glueall(HullType type)
        MathData ar;
        for (idx_type i = 0; i < nargs(); ++i)
                ar.append(cell(i));
-       InsetLabel * label = 0;
+       InsetLabel * label = nullptr;
        if (type == hullEquation) {
                // preserve first non-empty label
                for (row_type row = 0; row < nrows(); ++row) {
@@ -2532,33 +2532,37 @@ void InsetMathHull::mathmlize(MathMLStream & ms) const
 {
        bool const havetable = haveNumbers() || nrows() > 1 || ncols() > 1;
 
-    if (havetable) {
-        if (getType() == hullSimple) {
-               ms << MTag("mtable");
-        } else if (getType() >= hullAlign && getType() <= hullXXAlignAt) {
-            string alignment;
-            for (col_type col = 0; col < ncols(); ++col) {
-                alignment += (col % 2) ? "left " : "right ";
-            }
-            ms << MTag("mtable", "displaystyle='true' columnalign='" + alignment + "'");
-           } else {
-               ms << MTag("mtable", "displaystyle='true'");
+       // Simplest case: single row, single column, no numbering.
+       if (!havetable) {
+               ms << cell(index(0, 0));
+               return;
+       }
+
+       // More complex case: wrap elements in a table.
+    if (getType() == hullSimple) {
+        ms << MTag("mtable");
+    } else if (getType() >= hullAlign && getType() <= hullXXAlignAt) {
+               // hullAlign, hullAlignAt, hullXAlignAt, hullXXAlignAt
+        string alignment;
+        for (col_type col = 0; col < ncols(); ++col) {
+            alignment += (col % 2) ? "left " : "right ";
         }
+        ms << MTag("mtable", "displaystyle='true' columnalign='" + alignment + "'");
+    } else {
+        ms << MTag("mtable", "displaystyle='true'");
     }
 
-       char const * const celltag = havetable ? "mtd" : "mrow";
-       // FIXME There does not seem to be wide support at the moment
-       // for mlabeledtr, so we have to use just mtr for now.
-       // char const * const rowtag = haveNumbers() ? "mlabeledtr" : "mtr";
-       char const * const rowtag = "mtr";
        for (row_type row = 0; row < nrows(); ++row) {
-               if (havetable)
-                       ms << MTag(rowtag);
+               // No Wed browser supports mlabeledtr in 2023, even though it has been introduced in
+               // MathML 2 (2003). Moreover, it is not supported in MathML 4 Core.
+               ms << MTag("mtr");
+
                for (col_type col = 0; col < ncols(); ++col) {
-                       ms << MTag(celltag)
+                       ms << MTag("mtd")
                           << cell(index(row, col))
-                          << ETag(celltag);
+                          << ETag("mtd");
                }
+
                // fleqn?
                if (haveNumbers()) {
                        ms << MTag("mtd");
@@ -2567,18 +2571,18 @@ void InsetMathHull::mathmlize(MathMLStream & ms) const
                                ms << MTagInline("mtext") << '(' << num << ')' << ETagInline("mtext");
                    ms << ETag("mtd");
                }
-               if (havetable)
-                       ms << ETag(rowtag);
+
+               ms << ETag("mtr");
        }
-       if (havetable)
-               ms << ETag("mtable");
+
+       ms << ETag("mtable");
 }
 
 
 void InsetMathHull::mathAsLatex(TeXMathStream & os) const
 {
        MathEnsurer ensurer(os, false);
-       bool havenumbers = haveNumbers();
+       bool const havenumbers = haveNumbers();
        bool const havetable = havenumbers || nrows() > 1 || ncols() > 1;
 
        if (!havetable) {
@@ -2599,7 +2603,7 @@ void InsetMathHull::mathAsLatex(TeXMathStream & os) const
                        docstring const & num = numbers_[row];
                        if (!num.empty())
                                os << '(' << num << ')';
-                 os << "</td>";
+                   os << "</td>";
                }
                os << "</tr>";
        }
@@ -2741,7 +2745,7 @@ docstring InsetMathHull::xhtml(XMLStream & xs, OutputParams const & op) const
 void InsetMathHull::toString(odocstream & os) const
 {
        odocstringstream ods;
-       plaintext(ods, OutputParams(0));
+       plaintext(ods, OutputParams(nullptr));
        os << ods.str();
 }
 
@@ -2749,7 +2753,7 @@ void InsetMathHull::toString(odocstream & os) const
 void InsetMathHull::forOutliner(docstring & os, size_t const, bool const) const
 {
        odocstringstream ods;
-       OutputParams op(0);
+       OutputParams op(nullptr);
        op.for_toc = true;
        // FIXME: this results in spilling TeX into the LyXHTML output since the
        // outliner is used to generate the LyXHTML list of figures/etc.