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 504a86fea100f5d5e48cc0daf84be23348a6d538..26353829161cc780acb8809472664be8ccedc888 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -158,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);
@@ -192,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()) {
@@ -246,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;
 }
 
@@ -281,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]);
 }
 
 
@@ -515,7 +515,11 @@ void MathHullInset::mutate(string const & newtype)
                        }
                        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));