Cache icons of dynamic menu buttons

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

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 200a0bc3c9fd3a23e0a6f7efe5142dd8af65385e..141b57bebf74d03bda36be1104cec122d078319d 100644 (file)
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -62,7 +62,7 @@ char InsetMathSplit::defaultColAlign(col_type col)
            || name_ == "aligned"
            || name_ == "align"
            || name_ == "alignedat")
-               return colAlign(hullAlign, col, buffer().params());
+               return colAlign(hullAlign, col);
        return 'l';
 }
 
@@ -79,7 +79,7 @@ char InsetMathSplit::displayColAlign(idx_type idx) const
            || name_ == "aligned"
            || name_ == "align"
            || name_ == "alignedat")
-               return colAlign(hullAlign, col(idx), buffer().params());
+               return colAlign(hullAlign, col(idx));
        return InsetMathGrid::displayColAlign(idx);
 }
 
@@ -116,6 +116,12 @@ bool InsetMathSplit::getStatus(Cursor & cur, FuncRequest const & cmd,
        switch (cmd.action()) {
        case LFUN_TABULAR_FEATURE: {
                string s = cmd.getArg(0);
+               if (s == "append-column"
+                   && (name_ == "gathered" || name_ == "lgathered" || name_ == "rgathered")) {
+                       // gathered does not support multiple columns
+                       flag.setEnabled(false);
+                       return true;
+               }
                if (s == "add-vline-left" || s == "add-vline-right") {
                        flag.message(bformat(
                                from_utf8(N_("Can't add vertical grid lines in '%1$s'")),
@@ -136,7 +142,7 @@ bool InsetMathSplit::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetMathSplit::write(WriteStream & ws) const
+void InsetMathSplit::write(TeXMathStream & ws) const
 {
        MathEnsurer ensurer(ws);
        if (ws.fragile())
@@ -180,7 +186,7 @@ void InsetMathSplit::infoize(odocstream & os) const
 }
 
 
-void InsetMathSplit::mathmlize(MathStream & ms) const
+void InsetMathSplit::mathmlize(MathMLStream & ms) const
 {
        // split, gathered, aligned, alignedat
        // At the moment, those seem to display just fine without any