Revert "DocBook: make openParTag/closeTag use paragraphs instead of layouts."

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

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index e385e0a09ac3c3d735592d5bc7e8620278aff5ae..31314b3f842822b38bf70ebd02d0978353a81538 100644 (file)
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -16,10 +16,12 @@
 #include "MathStream.h"
 #include "MathSupport.h"
 
+#include "Buffer.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "support/gettext.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include "support/lstrings.h"
 
@@ -48,11 +50,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")
@@ -98,10 +95,18 @@ int InsetMathSplit::displayColSpace(col_type col) const
 
 
 
+void InsetMathSplit::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+       Changer dummy = mi.base.changeEnsureMath();
+       InsetMathGrid::metrics(mi, dim);
+}
+
+
+
 void InsetMathSplit::draw(PainterInfo & pi, int x, int y) const
 {
+       Changer dummy = pi.base.changeEnsureMath();
        InsetMathGrid::draw(pi, x, y);
-       setPosCache(pi, x, y);
 }
 
 
@@ -111,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'")),