fix pullArg when pressing <Delete> at the end of an cell

[lyx.git] / src / mathed / math_matrixinset.C

diff --git a/src/mathed/math_matrixinset.C b/src/mathed/math_matrixinset.C
index 10c7e0234ed27591225a2e52a80d9ee75b64a637..d552e20242c35a77f4e4c3fce6a0f920abb728e7 100644 (file)
--- a/src/mathed/math_matrixinset.C
+++ b/src/mathed/math_matrixinset.C
@@ -1,11 +1,8 @@
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include <vector>
-#include <functional>
 
 #include "math_matrixinset.h"
 #include "debug.h"
@@ -14,8 +11,6 @@
 #include "LaTeXFeatures.h"
 
 
-LyXFont WhichFont(short type, int size);
-
 namespace {
 
 string const getAlign(short int type, int cols)
@@ -69,6 +64,17 @@ int getCols(short int type)
        return col;
 }
 
+// returns position of first relation operator in the array
+// used for "intelligent splitting"
+int firstRelOp(MathArray const & array)
+{
+       for (int pos = 0; pos < array.size(); array.next(pos))
+               if (!array.isInset(pos) &&
+                               MathIsRelOp(array.GetChar(pos), array.GetCode(pos)))
+                       return pos;
+       return array.size();
+}
+
 }
 
 MathMatrixInset::MathMatrixInset(MathInsetTypes t)
@@ -86,13 +92,10 @@ MathInset * MathMatrixInset::clone() const
 }
 
 
-void MathMatrixInset::Metrics(MathStyles /* st */)
+void MathMatrixInset::Metrics(MathStyles /* st */, int, int)
 {
        size_ = (GetType() == LM_OT_SIMPLE) ? LM_ST_TEXT : LM_ST_DISPLAY;
 
-       //LyXFont wfont = WhichFont(LM_TC_BF, size());
-       //wfont.setLatex(LyXFont::OFF);
-
        // let the cells adjust themselves
        MathGridInset::Metrics(size_);
 
@@ -104,7 +107,7 @@ void MathMatrixInset::Metrics(MathStyles /* st */)
        if (numberedType()) {
                int l = 0;
                for (int row = 0; row < nrows(); ++row)
-                       l = std::max(l, mathed_string_width(LM_TC_TEXTRM, size(), nicelabel(row)));
+                       l = std::max(l, mathed_string_width(LM_TC_BF, size(), nicelabel(row)));
 
                if (l)
                        width_ += 30 + l;
@@ -120,13 +123,11 @@ void MathMatrixInset::draw(Painter & pain, int x, int y)
        MathGridInset::draw(pain, x, y);
 
        if (numberedType()) {
-               LyXFont wfont = WhichFont(LM_TC_BF, size());
-#ifndef NO_LATEX
-               wfont.setLatex(LyXFont::OFF);
-#endif
                int xx = x + colinfo_.back().offset_ + colinfo_.back().width_ + 20;
-               for (int row = 0; row < nrows(); ++row) 
-                       pain.text(xx, y + rowinfo_[row].offset_, nicelabel(row), wfont);
+               for (int row = 0; row < nrows(); ++row) {
+                       int yy = y + rowinfo_[row].offset_;
+                       drawStr(pain, LM_TC_BF, size(), xx, yy, nicelabel(row));
+               }
        }
 }
 
@@ -213,7 +214,7 @@ bool MathMatrixInset::numberedType() const
 }
 
 
-void MathMatrixInset::Validate(LaTeXFeatures & features)
+void MathMatrixInset::Validate(LaTeXFeatures & features) const
 {
        features.amsstyle = ams();
 
@@ -222,40 +223,11 @@ void MathMatrixInset::Validate(LaTeXFeatures & features)
        //if (features.amsstyle)
        //  return;
 
-       //Validate1(features);
-
        features.boldsymbol = true;
-       features.binom      = true;
-}
+       //features.binom      = true;
 
-/*
-void MathMatrixInset::Validate1(LaTeXFeatures & features)
-{
-       MathIter it(cell());
-
-       while (it.OK() && !(features.binom && features.boldsymbol)) {
-               MathInset * p = it.GetInset();
-               if (p) {
-                       p = it.GetActiveInset();
-                       if (p) {
-                               if (!features.binom && p->GetType() == LM_OT_MACRO &&
-                                   p->name() == "binom") {
-                                       features.binom = true;
-                               } else {
-                                       for (int i = 0; i <= p->getMaxArgumentIdx(); ++i) {
-                                               p->setArgumentIdx(i);
-                                               Validate1(features, p);
-                                       }
-                               }
-                       } else {
-                               if (!features.boldsymbol && p->name() == "boldsymbol") 
-                                       features.boldsymbol = true;
-                       }
-               }
-               it.Next();
-       }
+       MathInset::Validate(features);
 }
-*/
 
 
 void MathMatrixInset::header_write(std::ostream & os) const
@@ -446,7 +418,7 @@ void MathMatrixInset::mutate(short newtype)
        switch (GetType()) {
                case LM_OT_SIMPLE:
                        SetType(LM_OT_EQUATION);
-                       numbered(false);
+                       numbered(0, false);
                        mutate(newtype);
                        break;
 
@@ -456,15 +428,36 @@ void MathMatrixInset::mutate(short newtype)
                                        SetType(LM_OT_SIMPLE);
                                        break;
 
-                               case LM_OT_ALIGN:
+                               case LM_OT_ALIGN: {
                                        MathGridInset::addCol(1);
+
+                                       // split it "nicely"
+                                       int pos = firstRelOp(cell(0));  
+                                       cell(1) = cell(0);
+                                       cell(0).erase(pos, cell(0).size());
+                                       cell(1).erase(0, pos);
+
                                        halign("rl");
                                        SetType(LM_OT_ALIGN);
                                        break;
+                               }
 
+                               case LM_OT_EQNARRAY:
                                default:
                                        MathGridInset::addCol(1);
                                        MathGridInset::addCol(1);
+
+                                       // split it "nicely" on the firest relop
+                                       int pos1 = firstRelOp(cell(0)); 
+                                       cell(1) = cell(0);
+                                       cell(0).erase(pos1, cell(0).size());
+                                       cell(1).erase(0, pos1);
+                                       int pos2 = 0;
+                                       cell(1).next(pos2);
+                                       cell(2) = cell(1);
+                                       cell(1).erase(pos2, cell(1).size());
+                                       cell(2).erase(0, pos2);
+
                                        halign("rcl");
                                        SetType(LM_OT_EQNARRAY);
                                        mutate(newtype);
@@ -476,12 +469,14 @@ void MathMatrixInset::mutate(short newtype)
                        switch (newtype) {
                                case LM_OT_SIMPLE:
                                case LM_OT_EQUATION: {
+                                       // set correct (no)numbering
                                        bool allnonum = true;
                                        for (int r = 0; r < nrows(); ++r) {
                                                if (!nonum_[r])
                                                        allnonum = false;
                                        }
 
+                                       // set first non-empty label
                                        string label;
                                        for (int r = 0; r < nrows(); ++r) {
                                                if (!label_[r].empty()) {
@@ -491,14 +486,15 @@ void MathMatrixInset::mutate(short newtype)
                                        }
 
                                        glueall();
-                                       mutate(newtype);
-                                       label_[0] = label;
+
                                        nonum_[0] = allnonum;
+                                       label_[0] = label;
+                                       mutate(newtype);
                                        break;
                                }
 
                                case LM_OT_ALIGN:
-                               default:
+                               default: {
                                        for (int row = 0; row < nrows(); ++row) {
                                                int c = 3 * row + 1;
                                                cell(c).push_back(cell(c + 1));
@@ -508,6 +504,7 @@ void MathMatrixInset::mutate(short newtype)
                                        halign("rl");
                                        mutate(newtype);
                                        break;
+                               }
                        }
                        break;