Allow automatic text direction in Painter::text()

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

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 07e78f41a2472713b92225d576e4b459fc79171f..2adb84522b40392ec63b6257572a0df1ee59419c 100644 (file)
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -48,52 +48,20 @@ Inset * InsetMathSplit::clone() const
 }
 
 
-//FIXME: This has probably no effect and can be removed.\r
 char InsetMathSplit::defaultColAlign(col_type col)
 {
+       if (name_ == "split")
+               return 'l';
        if (name_ == "gathered")
                return 'c';
-       if (name_ == "lgathered")\r
-               return 'l';\r
-       if (name_ == "rgathered")\r
-               return 'r';\r
-       if (name_ == "split"\r
-           || name_ == "aligned"\r
-           || name_ == "align"\r
-           || name_ == "alignedat")\r
-               return colAlign(hullAlign, col);\r
+       if (name_ == "aligned" || name_ == "align")
+               return (col & 1) ? 'l' : 'r';
+       if (name_ == "alignedat")
+               return (col & 1) ? 'l' : 'r';
        return 'l';
 }
 
 
-char InsetMathSplit::displayColAlign(idx_type idx) const\r
-{\r
-       if (name_ == "gathered")\r
-               return 'c';\r
-       if (name_ == "lgathered")\r
-               return 'l';\r
-       if (name_ == "rgathered")\r
-               return 'r';\r
-       if (name_ == "split"\r
-           || name_ == "aligned"\r
-           || name_ == "align"\r
-           || name_ == "alignedat")\r
-               return colAlign(hullAlign, col(idx));\r
-       return InsetMathGrid::displayColAlign(idx);\r
-}\r
-\r
-\r
-int InsetMathSplit::displayColSpace(col_type col) const\r
-{\r
-       if (name_ == "split" || name_ == "aligned" || name_ == "align")\r
-               return colSpace(hullAlign, col);\r
-       if (name_ == "alignedat")\r
-               return colSpace(hullAlignAt, col);\r
-       return 0;\r
-}\r
-\r
-\r
-\r
 void InsetMathSplit::draw(PainterInfo & pi, int x, int y) const
 {
        InsetMathGrid::draw(pi, x, y);
@@ -105,23 +73,15 @@ bool InsetMathSplit::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
        switch (cmd.action()) {
-       case LFUN_INSET_MODIFY: {
-               istringstream is(to_utf8(cmd.argument()));
-               string s;
-               is >> s;
-               if (s != "tabular")
-                       break;
-               is >> s;
+       case LFUN_TABULAR_FEATURE: {
+               string s = cmd.getArg(0);
                if (s == "add-vline-left" || s == "add-vline-right") {
                        flag.message(bformat(
-                               from_utf8(N_("Can't add vertical grid lines in '%1$s'")),       name_));
+                               from_utf8(N_("Can't add vertical grid lines in '%1$s'")),
+                               name_));
                        flag.setEnabled(false);
                        return true;
                }
-               if (s == "align-left" || s == "align-center" || s == "align-right") {\r
-                       flag.setEnabled(false);\r
-                       return true;\r
-               }\r
                break;
        }
        default: