make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 0b14506d4f15aef9b4d028ea98b6e9986089f6e4..40fbf3d7ad5831b6ab80db9d23bd9fc857118a63 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -283,20 +283,19 @@ void InsetFormula::write(Buffer const * buf, ostream & os) const
 }
 
 
-int InsetFormula::latex(Buffer const * buf, ostream & os, bool fragil, bool)
-       const
+int InsetFormula::latex(Buffer const *, ostream & os, bool fragil, bool) const
 {
-       WriteStream wi(buf, os, fragil);
+       WriteStream wi(os, fragil);
        par_->write(wi);
-       return wi.line_;
+       return wi.line();
 }
 
 
-int InsetFormula::ascii(Buffer const * buf, ostream & os, int) const
+int InsetFormula::ascii(Buffer const *, ostream & os, int) const
 {
-       WriteStream wi(buf, os, false);
+       WriteStream wi(os, false);
        par_->write(wi);
-       return wi.line_;
+       return wi.line();
 }
 
 
@@ -310,11 +309,11 @@ int InsetFormula::docbook(Buffer const * buf, ostream & os) const
 {
        MathMLStream ms(os);
        ms << MTag("equation") << MTag("alt");
-       int res = ascii(buf, ms.os_, 0);
+       int res = ascii(buf, ms.os(), 0);
        ms << ETag("alt") << MTag("math");
        ms << par_.nucleus();
        ms << ETag("math") << ETag("equation");
-       return ms.line_ + res;
+       return ms.line() + res;
 }
 
 
@@ -347,7 +346,9 @@ void InsetFormula::draw(BufferView * bv, LyXFont const & font,
        if (lcolor.getX11Name(LColor::mathbg)!=lcolor.getX11Name(LColor::background))
                pain.fillRectangle(x, y - a, w, h, LColor::mathbg);
 
-       if (mathcursor && mathcursor->formula() == this) {
+       if (mathcursor &&
+                       const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
+       {
                mathcursor->drawSelection(pain);
                pain.rectangle(x, y - a, w, h, LColor::mathframe);
        }
@@ -363,7 +364,7 @@ void InsetFormula::draw(BufferView * bv, LyXFont const & font,
 
 vector<string> const InsetFormula::getLabelList() const
 {
-       return mat()->getLabelList();
+       return hull()->getLabelList();
 }
 
 
@@ -387,9 +388,9 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                        //lyxerr << "toggling all numbers\n";
                        if (display()) {
                                bv->lockedInsetStoreUndo(Undo::INSERT);
-                               bool old = mat()->numberedType();
+                               bool old = hull()->numberedType();
                                for (MathInset::row_type row = 0; row < par_->nrows(); ++row)
-                                       mat()->numbered(row, !old);
+                                       hull()->numbered(row, !old);
                                bv->owner()->message(old ? _("No number") : _("Number"));
                                updateLocal(bv, true);
                        }
@@ -401,10 +402,10 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                        //lyxerr << "toggling line number\n";
                        if (display()) {
                                bv->lockedInsetStoreUndo(Undo::INSERT);
-                               MathCursor::row_type row = mathcursor->row();
-                               bool old = mat()->numbered(row);
+                               MathCursor::row_type row = mathcursor->hullRow();
+                               bool old = hull()->numbered(row);
                                bv->owner()->message(old ? _("No number") : _("Number"));
-                               mat()->numbered(row, !old);
+                               hull()->numbered(row, !old);
                                updateLocal(bv, true);
                        }
                        break;
@@ -414,8 +415,8 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                {
                        bv->lockedInsetStoreUndo(Undo::INSERT);
 
-                       MathCursor::row_type row = mathcursor->row();
-                       string old_label = mat()->label(row);
+                       MathCursor::row_type row = mathcursor->hullRow();
+                       string old_label = hull()->label(row);
                        string new_label = arg;
 
                        if (new_label.empty()) {
@@ -424,8 +425,6 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                                pair<bool, string> const res = old_label.empty()
                                        ? Alert::askForText(_("Enter new label to insert:"), default_label)
                                        : Alert::askForText(_("Enter label:"), old_label);
-                               
-                               lyxerr << "res: " << res.first << " - '" << res.second << "'\n";
                                if (!res.first)
                                        break;
                                new_label = frontStrip(strip(res.second));
@@ -436,13 +435,13 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
 
                        if (!new_label.empty()) {
                                lyxerr << "setting label to '" << new_label << "'\n";
-                               mat()->numbered(row, true);
+                               hull()->numbered(row, true);
                        }
 
                        if (!new_label.empty() && bv->ChangeRefsIfUnique(old_label, new_label))
                                bv->redraw();
 
-                       mat()->label(row, new_label);
+                       hull()->label(row, new_label);
 
                        updateLocal(bv, true);
                        break;
@@ -454,7 +453,7 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                        int x;
                        int y;
                        mathcursor->getPos(x, y);
-                       mat()->mutate(arg);
+                       hull()->mutate(arg);
                        mathcursor->setPos(x, y);
                        mathcursor->normalize();
                        updateLocal(bv, true);
@@ -476,10 +475,10 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                        int x = 0;
                        int y = 0;
                        mathcursor->getPos(x, y);
-                       if (mat()->getType() == LM_OT_SIMPLE)
-                               mat()->mutate(LM_OT_EQUATION);
+                       if (hull()->getType() == LM_OT_SIMPLE)
+                               hull()->mutate(LM_OT_EQUATION);
                        else
-                               mat()->mutate(LM_OT_SIMPLE);
+                               hull()->mutate(LM_OT_SIMPLE);
                        mathcursor->setPos(x, y);
                        mathcursor->normalize();
                        updateLocal(bv, true);
@@ -494,16 +493,6 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                        break;
                }
 
-               case LFUN_MATH_COLUMN_INSERT:
-               {
-                       if (mat()->getType() == LM_OT_ALIGN)
-                               mat()->mutate(LM_OT_ALIGNAT);
-                       mat()->addCol(mat()->ncols());
-                       mathcursor->normalize();
-                       updateLocal(bv, true);
-                       break;
-               }
-
                default:
                        result = InsetFormulaBase::localDispatch(bv, action, arg);
        }
@@ -514,7 +503,6 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
 
 bool needEqnArray(string const & extra)
 {
-       return false;
        return extra == "dsolve";
 }
 
@@ -537,7 +525,7 @@ void InsetFormula::handleExtern(const string & arg)
        MathArray ar;
        if (needEqnArray(extra)) {
                mathcursor->last();
-               mathcursor->readLine(ar);
+               //mathcursor->readLine(ar);
                mathcursor->breakLine();
        } else if (selected) {
                mathcursor->selGet(ar);
@@ -556,18 +544,18 @@ void InsetFormula::handleExtern(const string & arg)
 
 bool InsetFormula::display() const
 {
-       return mat()->getType() != LM_OT_SIMPLE;
+       return hull()->getType() != LM_OT_SIMPLE;
 }
 
 
-MathHullInset const * InsetFormula::mat() const
+MathHullInset const * InsetFormula::hull() const
 {
        lyx::Assert(par_->asHullInset());
        return par_->asHullInset();
 }
 
 
-MathHullInset * InsetFormula::mat()
+MathHullInset * InsetFormula::hull()
 {
        lyx::Assert(par_->asHullInset());
        return par_->asHullInset();
@@ -615,5 +603,5 @@ int InsetFormula::width(BufferView * bv, LyXFont const & font) const
 
 MathInsetTypes InsetFormula::getType() const
 {
-       return mat()->getType();
+       return hull()->getType();
 }