the lfun3 patches (overall cleanup and "localizing" dispatch() in mathed)

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

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 504a86fea100f5d5e48cc0daf84be23348a6d538..8b3b2d1197f15cc1c545f1dd4a320597c065c68e 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -11,6 +11,7 @@
 #include "debug.h"
 #include "frontends/Painter.h"
 #include "textpainter.h"
+#include "funcrequest.h"
 #include "Lsstream.h"
 #include "LaTeXFeatures.h"
 #include "support/LAssert.h"
@@ -158,7 +159,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 +194,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 +249,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 +284,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 +516,10 @@ void MathHullInset::mutate(string const & newtype)
                        }
                        setType("eqnarray");
                        mutate(newtype);
-               } else {
+               } else if (newtype == "multline" || newtype == "gather") {
+                       setType(newtype);
+                       numbered(0, false);
+               } else {                        
                        MathGridInset::addCol(1);
                        // split it "nicely"
                        pos_type pos = firstRelOp(cell(0));
@@ -642,3 +646,47 @@ void MathHullInset::check() const
        lyx::Assert(nonum_.size() == nrows());
        lyx::Assert(label_.size() == nrows());
 }
+
+
+MathInset::result_type MathHullInset::dispatch
+       (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+{
+       switch (cmd.action) {
+
+               case LFUN_BREAKLINE:
+                       if (type_ == "simple" || type_ == "equation") {
+                               mutate("eqnarray");
+                               idx = 1;
+                               pos = 0;
+                               return DISPATCHED_POP;
+                       } 
+                       return MathGridInset::dispatch(cmd, idx, pos);
+
+               case LFUN_MATH_NUMBER:
+                       //lyxerr << "toggling all numbers\n";
+                       if (display()) {
+                               //bv->lockedInsetStoreUndo(Undo::INSERT);
+                               bool old = numberedType();
+                               for (row_type row = 0; row < nrows(); ++row)
+                                       numbered(row, !old);
+                               //bv->owner()->message(old ? _("No number") : _("Number"));
+                               //updateLocal(bv, true);
+                       }
+                       return DISPATCHED; 
+               
+               case LFUN_MATH_NONUMBER:        
+                       if (display()) {
+                               //bv->lockedInsetStoreUndo(Undo::INSERT);
+                               bool old = numbered(row(idx));
+                               //bv->owner()->message(old ? _("No number") : _("Number"));
+                               numbered(row(idx), !old);
+                               //updateLocal(bv, true);
+                       }
+                       return DISPATCHED; 
+
+               default:
+                       return UNDISPATCHED; 
+       }
+       return UNDISPATCHED;
+}
+