- backport fix for bug #10466

Handle the command \multicolumn correctly in math macros

diff --git a/src/mathed/InsetMathAMSArray.h b/src/mathed/InsetMathAMSArray.h
index ceb3069c28190b83d8fb0bad38e461e9a75e3192..e5151f11bb4a2764b8b84a37804d8c2d5b3471a7 100644 (file)
--- a/src/mathed/InsetMathAMSArray.h
+++ b/src/mathed/InsetMathAMSArray.h
@@ -54,6 +54,9 @@ public:
        char const * name_left() const;
        ///
        char const * name_right() const;
+       /// 
+       bool handlesMulticolumn() const { return true; } //override 
+
 private:
        virtual Inset * clone() const;
        ///

diff --git a/src/mathed/InsetMathArray.h b/src/mathed/InsetMathArray.h
index 79236882c7198ed87f9ed857567aa19704e29130..f01887ca293379444fad681458328ed76830c543 100644 (file)
--- a/src/mathed/InsetMathArray.h
+++ b/src/mathed/InsetMathArray.h
@@ -51,6 +51,9 @@ public:
        void validate(LaTeXFeatures & features) const;
        ///
        InsetCode lyxCode() const { return MATH_ARRAY_CODE; }
+       /// 
+       bool handlesMulticolumn() const { return true; } //override 
+
 private:
        virtual Inset * clone() const;
        ///

diff --git a/src/mathed/InsetMathCases.h b/src/mathed/InsetMathCases.h
index 7820922f07fd95bc45b023a158389cff8ada6f68..c0d9abfef726aff82a8f22b5eb08313190d728ab 100644 (file)
--- a/src/mathed/InsetMathCases.h
+++ b/src/mathed/InsetMathCases.h
@@ -54,6 +54,9 @@ public:
        InsetCode lyxCode() const { return MATH_CASES_CODE; }
        ///
        int displayColSpace(col_type) const;
+       /// see e.g. https://tex.stackexchange.com/a/133283/87201 
+       bool handlesMulticolumn() const { return true; } //override
+
 private:
        virtual Inset * clone() const;
 };

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 426d941f19167bfa43be63ac68481575d7a31d45..1ea2e2781c4196719406595bfa4f62a77e0f67f8 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -221,6 +221,8 @@ public:
        virtual int vlinesep() const;
        ///
        virtual int border() const;
+       /// 
+       virtual bool handlesMulticolumn() const { return false; }
 
        ///
        void write(WriteStream & os) const;

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index cd069c3da5bd055332b33815d079c158aa692f49..d82e934d179ac4b1d12b96f04af94ed104f9dbaf 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -15,7 +15,6 @@
 #include "InsetMathChar.h"
 #include "InsetMathColor.h"
 #include "InsetMathFrac.h"
-#include "InsetMathGrid.h"
 #include "InsetMathNest.h"
 #include "InsetMathScript.h"
 #include "MathExtern.h"

diff --git a/src/mathed/InsetMathMatrix.h b/src/mathed/InsetMathMatrix.h
index 26a854402606476c29b14cb78aa5010f33ff773c..95829ac2394af89e1694b8656f4af1a9ecefe7d8 100644 (file)
--- a/src/mathed/InsetMathMatrix.h
+++ b/src/mathed/InsetMathMatrix.h
@@ -47,6 +47,8 @@ public:
        void octave(OctaveStream &) const;
        ///
        InsetCode lyxCode() const { return MATH_MATRIX_CODE; }
+       /// 
+       bool handlesMulticolumn() const { return true; } //override
 
 private:
        virtual Inset * clone() const;

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index e385e0a09ac3c3d735592d5bc7e8620278aff5ae..fb2ecbe083148047a843f849c4945571eab2d5ae 100644 (file)
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -48,11 +48,6 @@ Inset * InsetMathSplit::clone() const
 }
 
 
-// FIXME: InsetMathGrid should be changed to let the real column alignment be
-// given by a virtual method like displayColAlign, because the values produced
-// by defaultColAlign can be invalidated by lfuns such as add-column. I suspect
-// that for the moment the values produced by defaultColAlign are not used,
-// notably because alignment is not implemented in the LyXHTML output.
 char InsetMathSplit::defaultColAlign(col_type col)
 {
        if (name_ == "gathered")

diff --git a/src/mathed/InsetMathTabular.h b/src/mathed/InsetMathTabular.h
index a4aa50f1b9137874e4d7f8c7c40dfe686a28e017..8fb06bd2c9fa98ed7321558f4bbdfafbf042ed60 100644 (file)
--- a/src/mathed/InsetMathTabular.h
+++ b/src/mathed/InsetMathTabular.h
@@ -47,6 +47,8 @@ public:
        void maple(MapleStream &) const;
        ///
        InsetCode lyxCode() const { return MATH_TABULAR_CODE; }
+       /// 
+       bool handlesMulticolumn() const { return true; } //override
 
 private:
        Inset * clone() const;

diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index f05af6438d59929aa5324ae24dc10e68e9617249..a2094c920ed262585b82dc8409517a0f0311fa67 100644 (file)
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -1361,36 +1361,39 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
                        }
                }
 
-               else if (t.cs() == "multicolumn") {
-                       // extract column count and insert dummy cells
+               else if (t.cs() == "multicolumn" && grid.handlesMulticolumn()) {
+                       // if the columns are specified numerically,
+                       // extract column count and insert dummy cells,
+                       // otherwise parse it as an user macro
                        MathData count;
                        parse(count, FLAG_ITEM, mode);
-                       int cols = 1;
-                       if (!extractNumber(count, cols)) {
-                               success_ = false;
-                               error("can't extract number of multicolumn cells");
-                       }
-                       // resize the table if necessary
-                       size_t first = grid.index(cellrow, cellcol);
-                       for (int i = 1; i < cols; ++i) {
-                               if (addCol(grid, cellcol)) {
-                                       size_t const idx = grid.index(cellrow, cellcol);
-                                       grid.cellinfo(idx).multi_ =
-                                               InsetMathGrid::CELL_PART_OF_MULTICOLUMN;
+                       int cols;
+                       if (extractNumber(count, cols)) {
+                               // resize the table if necessary
+                               size_t first = grid.index(cellrow, cellcol);
+                               for (int i = 1; i < cols; ++i) {
+                                       if (addCol(grid, cellcol)) {
+                                               size_t const idx = grid.index(cellrow, cellcol);
+                                               grid.cellinfo(idx).multi_ = 
+                                                       InsetMathGrid::CELL_PART_OF_MULTICOLUMN;
+                                       }
                                }
-                       }
-
-                       // the first cell is the real thing, not a dummy
-                       cell = &grid.cell(first);
-                       grid.cellinfo(first).multi_ = InsetMathGrid::CELL_BEGIN_OF_MULTICOLUMN;
 
-                       // read special alignment
-                       MathData align;
-                       parse(align, FLAG_ITEM, mode);
-                       grid.cellinfo(first).align_ = asString(align);
-
-                       // parse the remaining contents into the "real" cell
-                       parse(*cell, FLAG_ITEM, mode);
+                               // the first cell is the real thing, not a dummy 
+                               cell = &grid.cell(first); 
+                               grid.cellinfo(first).multi_ =
+                                       InsetMathGrid::CELL_BEGIN_OF_MULTICOLUMN; 
+                               // read special alignment 
+                               MathData align; 
+                               parse(align, FLAG_ITEM, mode); 
+                               grid.cellinfo(first).align_ = asString(align); 
+                               // parse the remaining contents into the "real" cell
+                               parse(*cell, FLAG_ITEM, mode); 
+                       } else {
+                               MathAtom at = MathAtom(new MathMacro(buf, t.cs()));
+                               cell->push_back(at);
+                               cell->push_back(MathAtom(new InsetMathBrace(count)));
+                       }
                }
 
                else if (t.cs() == "limits" || t.cs() == "nolimits") {

diff --git a/status.22x b/status.22x
index b93ba9369e944cf5a375cb5cafa9178ad7f7cff3..d7a5bb91364368cec52c8bab7aa779aa65780a7f 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -160,7 +160,7 @@ What's new
 
 - Do not convert "--" to "\twohyphens" in formula macros.
 
-- Fix bug in the reversion of colored boxes with special frame settings.
+- Fix bugs in the reversion of colored boxes with special frame settings.
 
 
 * USER INTERFACE
@@ -219,6 +219,8 @@ What's new
 - Fix display and output of math macros with optional arguments appearing
   in the optional argument of another macro.
 
+- Handle the command \multicolumn correctly in math macros (bug 10466).
+
 - Do not prematurely cut selected text when inserting a Hyperref (bug 10306).
 
 - Consider the argument of the hyperref-insert function even if there is a