fix reading of labels with underscore and probably break a few other things

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

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 8fd885464ebda87604c41f475c5c6f85a1a4431d..26353829161cc780acb8809472664be8ccedc888 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -94,18 +94,19 @@ MathHullInset::MathHullInset(string const & type)
        setDefaults();
 }
 
-/*
-MathHullInset::MathHullInset(string const & type, MathGridInset const & grid)
-       : MathGridInset(grid), type_(type), nonum_(1), label_(1)
+
+MathInset * MathHullInset::clone() const
 {
-       setDefaults();
+       return new MathHullInset(*this);
 }
-*/
 
 
-MathInset * MathHullInset::clone() const
+MathInset::mode_type MathHullInset::currentMode() const
 {
-       return new MathHullInset(*this);
+       if (type_ == "none")
+               return UNDECIDED_MODE;
+       // definitely math mode ...
+       return MATH_MODE;
 }
 
 
@@ -157,7 +158,8 @@ char const * MathHullInset::standardFont() const
 
 void MathHullInset::metrics(MathMetricsInfo & mi) const
 {
-       MathFontSetChanger dummy(mi.base, standardFont());
+       MathFontSetChanger dummy1(mi.base, standardFont());
+       MathStyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
 
        // let the cells adjust themselves
        MathGridInset::metrics(mi);
@@ -191,7 +193,8 @@ void MathHullInset::metrics(MathMetricsInfo & mi) const
 
 void MathHullInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       MathFontSetChanger dummy(pi.base, standardFont());
+       MathFontSetChanger dummy1(pi.base, standardFont());
+       MathStyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
        MathGridInset::draw(pi, x + 1, y);
 
        if (numberedType()) {
@@ -245,7 +248,7 @@ string MathHullInset::label(row_type row) const
 
 void MathHullInset::label(row_type row, string const & label)
 {
-       lyxerr << "setting label '" << label << "' for row " << row << endl;
+       //lyxerr << "setting label '" << label << "' for row " << row << endl;
        label_[row] = label;
 }
 
@@ -280,13 +283,11 @@ bool MathHullInset::display() const
 }
 
 
-vector<string> MathHullInset::getLabelList() const
+void MathHullInset::getLabelList(std::vector<string> & labels) const
 {
-       vector<string> res;
        for (row_type row = 0; row < nrows(); ++row)
                if (!label_[row].empty() && nonum_[row] != 1)
-                       res.push_back(label_[row]);
-       return res;
+                       labels.push_back(label_[row]);
 }
 
 
@@ -443,7 +444,7 @@ void MathHullInset::glueall()
 {
        MathArray ar;
        for (idx_type i = 0; i < nargs(); ++i)
-               ar.push_back(cell(i));
+               ar.append(cell(i));
        *this = MathHullInset("simple");
        cell(0) = ar;
        setDefaults();
@@ -505,16 +506,20 @@ void MathHullInset::mutate(string const & newtype)
 
                        // split it "nicely" on the firest relop
                        pos_type pos = firstRelOp(cell(0));
-                       cell(1) = MathArray(cell(0), pos, cell(0).size());
+                       cell(1) = MathArray(cell(0).begin() + pos, cell(0).end());
                        cell(0).erase(pos, cell(0).size());
 
                        if (cell(1).size()) {
-                               cell(2) = MathArray(cell(1), 1, cell(1).size());
+                               cell(2) = MathArray(cell(1).begin() + 1, cell(1).end());
                                cell(1).erase(1, cell(1).size());
                        }
                        setType("eqnarray");
                        mutate(newtype);
-               } else {
+               } else if (newtype == "multline" || newtype == "gather") {
+                       setType("multline");
+                       numbered(0, false);
+                       mutate(newtype);
+               } else {                        
                        MathGridInset::addCol(1);
                        // split it "nicely"
                        pos_type pos = firstRelOp(cell(0));
@@ -550,7 +555,7 @@ void MathHullInset::mutate(string const & newtype)
                } else { // align & Co.
                        for (row_type row = 0; row < nrows(); ++row) {
                                idx_type c = 3 * row + 1;
-                               cell(c).push_back(cell(c + 1));
+                               cell(c).append(cell(c + 1));
                        }
                        MathGridInset::delCol(2);
                        setType("align");