]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/formula.C
fix pullArg when pressing <Delete> at the end of an cell
[lyx.git] / src / mathed / formula.C
index a4185a9cdcc6275b026264a8c3993c6139a967c2..31af423668c2985d0b523bb75415fee006172d9f 100644 (file)
 *   the GNU General Public Licence version 2 or later.
 */
 
-#include <config.h>
-
-#include "Lsstream.h"
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
+#include <config.h>
+#include <fstream>
+
 #include "formula.h"
 #include "commandtags.h"
 #include "math_cursor.h"
 #include "math_parser.h"
 #include "lyx_main.h"
-#include "minibuffer.h"
 #include "BufferView.h"
-#include "lyxtext.h"
 #include "gettext.h"
-#include "LaTeXFeatures.h"
 #include "debug.h"
 #include "lyx_gui_misc.h"
 #include "support/LOstream.h"
+#include "support/lyxlib.h"
+#include "support/syscall.h"
 #include "LyXView.h"
 #include "Painter.h"
-#include "font.h"
-#include "support/lyxlib.h"
 #include "lyxrc.h"
-#include "math_inset.h"
-#include "math_parinset.h"
 #include "math_matrixinset.h"
-#include "math_rowst.h"
-#include "math_spaceinset.h"
-#include "math_deliminset.h"
 #include "mathed/support.h"
 
 using std::ostream;
+using std::ifstream;
 using std::istream;
 using std::pair;
 using std::endl;
 using std::vector;
-using std::max;
-
-extern string mathed_label;
 
-extern char const * latex_special_chars;
-
-int greek_kb_flag = 0;
 extern char const * latex_mathenv[];
+extern MathCursor * mathcursor;
 
-// this is only used by Whichfont and mathed_init_fonts (Lgb)
-LyXFont * Math_Fonts = 0;
-
-static LyXFont::FONT_SIZE lfont_size = LyXFont::SIZE_NORMAL;
-
-// local global
-static int sel_x;
-static int sel_y;
-static bool sel_flag;
 
 // quite a hack i know. Should be done with return values...
 int number_of_newlines = 0;
 
-static
-int mathed_write(MathParInset *, std::ostream &, bool fragile,
-                string const & label = string());
-
-void mathed_init_fonts();
 
-static
-void mathedValidate(LaTeXFeatures & features, MathParInset * par);
+InsetFormula::InsetFormula()
+       : InsetFormulaBase(new MathMatrixInset)
+{}
 
 
-MathedCursor * InsetFormula::mathcursor = 0;
+InsetFormula::InsetFormula(MathInsetTypes t)
+       : InsetFormulaBase(new MathMatrixInset(t))
+{}
 
 
-LyXFont WhichFont(short type, int size)
+InsetFormula::InsetFormula(string const & s)
+       : InsetFormulaBase(mathed_parse(s))
 {
-       LyXFont f;
-       
-       if (!Math_Fonts)
-               mathed_init_fonts();
-
-       switch (type) {
-       case LM_TC_SYMB:        
-               f = Math_Fonts[2];
-               break;
-
-       case LM_TC_BSYM:        
-               f = Math_Fonts[2];
-               break;
-
-       case LM_TC_VAR:
-       case LM_TC_IT:
-               f = Math_Fonts[0];
-               break;
-
-       case LM_TC_BF:
-               f = Math_Fonts[3];
-               break;
-
-       case LM_TC_SF:
-               f = Math_Fonts[7];
-               break;
-
-       case LM_TC_CAL:
-               f = Math_Fonts[4];
-               break;
-
-       case LM_TC_TT:
-               f = Math_Fonts[5];
-               break;
-
-       case LM_TC_SPECIAL: //f = Math_Fonts[0]; break;
-       case LM_TC_TEXTRM:
-       case LM_TC_RM:
-               f = Math_Fonts[6];
-               break;
-
-       default:
-               f = Math_Fonts[1];
-               break;
-       }
-
-       f.setSize(lfont_size);
-
-       switch (size) {
-       case LM_ST_DISPLAY:
-               if (type == LM_TC_BSYM) {
-                       f.incSize();
-                       f.incSize();
-               }
-               break;
-
-       case LM_ST_TEXT:
-               break;
-
-       case LM_ST_SCRIPT:
-               f.decSize();
-               break;
-
-       case LM_ST_SCRIPTSCRIPT:
-               f.decSize();
-               f.decSize();
-               break;
-
-       default:
-               lyxerr << "Mathed Error: wrong font size: " << size << endl;
-               break;
-       }
-
-       if (type != LM_TC_TEXTRM)
-               f.setColor(LColor::math);
-
-       return f;
+       Metrics();
 }
 
 
-void mathed_init_fonts() //removed 'static' because DEC cxx does not
-//like it (JMarc)
-// Probably because this func is declared as a friend in math_defs.h
-// Lgb
+Inset * InsetFormula::clone(Buffer const &, bool) const
 {
-       Math_Fonts = new LyXFont[8]; //DEC cxx cannot initialize all fonts
-       //at once (JMarc) rc
-
-       for (int i = 0 ; i < 8 ; ++i) {
-               Math_Fonts[i] = LyXFont(LyXFont::ALL_SANE);
-       }
-
-       Math_Fonts[0].setShape(LyXFont::ITALIC_SHAPE);
-
-       Math_Fonts[1].setFamily(LyXFont::SYMBOL_FAMILY);
-
-       Math_Fonts[2].setFamily(LyXFont::SYMBOL_FAMILY);
-       Math_Fonts[2].setShape(LyXFont::ITALIC_SHAPE);
-
-       Math_Fonts[3].setSeries(LyXFont::BOLD_SERIES);
-
-       Math_Fonts[4].setFamily(LyXFont::SANS_FAMILY);
-       Math_Fonts[4].setShape(LyXFont::ITALIC_SHAPE);
-
-       Math_Fonts[5].setFamily(LyXFont::TYPEWRITER_FAMILY);
-
-       Math_Fonts[6].setFamily(LyXFont::ROMAN_FAMILY);
-
-       Math_Fonts[7].setFamily(LyXFont::SANS_FAMILY);
-
-       LyXFont f = WhichFont(LM_TC_VAR, LM_ST_TEXT);
-       MathedInset::defaultAscent(lyxfont::maxAscent(f));
-       MathedInset::defaultDescent(lyxfont::maxDescent(f));
-       MathedInset::defaultWidth(lyxfont::width('I', f));
-}
-
-
-
-InsetFormula::InsetFormula(bool display)
-{
-       par = new MathParInset; // this leaks
-       //  mathcursor = 0;
-       disp_flag = display;
-       //label = 0;
-       if (disp_flag) {
-               par->SetType(LM_OT_PAR);
-               par->SetStyle(LM_ST_DISPLAY);
-       }
-}
-
-
-InsetFormula::InsetFormula(MathParInset * p)
-{
-       if (is_matrix_type(p->GetType()))
-               lyxerr << "InsetFormula::InsetFormula: This shouldn't happen" << endl;
-
-       par = is_multiline(p->GetType()) ?
-               new MathMatrixInset(static_cast<MathMatrixInset*>(p)):
-               new MathParInset(*p);
-       //   mathcursor = 0;
-
-       disp_flag = (par->GetType()>0);
-       //label = 0;
-}
-
-
-InsetFormula::~InsetFormula()
-{
-       delete par;
+       return new InsetFormula(*this);
 }
 
 
-Inset * InsetFormula::Clone(Buffer const &) const
-{
-       InsetFormula * f = new InsetFormula(par);
-       f->label = label;
-       return f;
-}
-
-
-void InsetFormula::Write(Buffer const * buf, ostream & os) const
+void InsetFormula::write(ostream & os) const
 {
        os << "Formula ";
-       Latex(buf, os, false, false);
+       latex(os, false, false);
 }
 
 
-int InsetFormula::Latex(Buffer const *, ostream & os, bool fragile, bool) const
+int InsetFormula::latex(ostream & os, bool fragile, bool) const
 {
-       //#warning Alejandro, the number of lines is not returned in this case
-       // This problem will disapear at 0.13.
-       return mathed_write(par, os, fragile, label);
+       par()->Write(os, fragile);
+       return 1;
 }
 
 
-int InsetFormula::Ascii(Buffer const *, ostream & os, int) const
+int InsetFormula::ascii(ostream & os, int) const
 {
-       par->Write(os, false);
-       return 0;
+       par()->Write(os, false);
+       return 1;
 }
 
 
-int InsetFormula::Linuxdoc(Buffer const * buf, ostream & os) const
+int InsetFormula::linuxdoc(ostream & os) const
 {
-       return Ascii(buf, os, 0);
+       return ascii(os, 0);
 }
 
 
-int InsetFormula::DocBook(Buffer const * buf, ostream & os) const
+int InsetFormula::docBook(ostream & os) const
 {
-       return Ascii(buf, os, 0);
+       return ascii(os, 0);
 }
 
 
-// Check if uses AMS macros
-void InsetFormula::Validate(LaTeXFeatures & features) const
+void InsetFormula::read(LyXLex & lex)
 {
-       if (is_ams(par->GetType()))
-               features.amsstyle = true;
-
-       // Validation is necessary only if not using AMS math.
-       // To be safe, we will always run mathedValidate.
-       //if (!features.amsstyle)
-       mathedValidate(features, par);
+       par(mathed_parse(lex));
+       Metrics();
 }
 
 
-void InsetFormula::Read(Buffer const *, LyXLex & lex)
+void InsetFormula::draw(BufferView * bv, LyXFont const &,
+                       int y, float & xx, bool) const
 {
-       istream & is = lex.getStream();
-
-       mathed_parser_file(is, lex.GetLineNo());
-
-       // Silly hack to read labels.
-       mathed_label.erase();
+       int x = int(xx) - 1;
+       y -= 2;
 
-       MathedArray ar;
-       mathed_parse(ar, 0, &par);
-       par->Metrics();
-       disp_flag = (par->GetType() > 0);
+       MathInset::workwidth = bv->workWidth();
+       Painter & pain = bv->painter();
 
-       // Update line number
-       lex.setLineNo(mathed_parser_lineno());
+       Metrics();
+       int w = par()->width();
+       int h = par()->height();
+       int a = par()->ascent();
+       pain.fillRectangle(x, y - a, w, h, LColor::mathbg);
 
-       if (!mathed_label.empty()) {
-               label = mathed_label;
-               mathed_label.erase();
+       if (mathcursor && mathcursor->formula() == this) {
+               mathcursor->drawSelection(pain);
+               pain.rectangle(x, y - a, w, h, LColor::mathframe);
        }
 
-       // reading of end_inset in the inset!!!
-       while (lex.IsOK()) {
-               lex.nextToken();
-               if (lex.GetString() == "\\end_inset")
-                       break;
-               lyxerr << "InsetFormula::Read: Garbage before \\end_inset,"
-                       " or missing \\end_inset!" << endl;
-       }
+       par()->draw(pain, x, y);
+       xx += par()->width();
 
-#ifdef DEBUG
-       Write(lyxerr);
-#endif
+       setCursorVisible(false);
 }
 
 
-int InsetFormula::ascent(BufferView *, LyXFont const &) const
+void InsetFormula::Metrics() const 
 {
-       return par->Ascent() + (disp_flag ? 8 : 1);
+       const_cast<MathInset *>(par_)->Metrics(display() ? LM_ST_DISPLAY : LM_ST_TEXT);
 }
 
-
-int InsetFormula::descent(BufferView *, LyXFont const &) const
-{
-       return par->Descent() + (disp_flag ? 8 : 1);
-}
-
-
-int InsetFormula::width(BufferView * bv, LyXFont const & f) const
+vector<string> const InsetFormula::getLabelList() const
 {
-       MathedInset::workWidth = bv->workWidth();
-       lfont_size = f.size();
-       par->Metrics();
-       return par->Width(); //+2;
+       return par()->getLabelList();
 }
 
 
-void InsetFormula::draw(BufferView * bv, LyXFont const & f,
-                       int baseline, float & x, bool) const
+UpdatableInset::RESULT
+InsetFormula::localDispatch(BufferView * bv, kb_action action,
+        string const & arg)
 {
-       MathedInset::workWidth = bv->workWidth();
-       Painter & pain = bv->painter();
-       // Seems commenting out solves a problem.
-       LyXFont font = mathed_get_font(LM_TC_TEXTRM, LM_ST_TEXT);
-       font.setSize(f.size());
-       lfont_size = font.size();
-       /// Let's try to wait a bit with this... (Lgb)
-       //UpdatableInset::draw(pain, font, baseline, x);
-
-       // otherwise a segfault could occur
-       // in some XDrawRectangles (i.e. matrix) (Matthias)
-       if (mathcursor && mathcursor->GetPar() == par) {
-               if (mathcursor->Selection()) {
-                       int n;
-                       int * xp = 0;
-                       int * yp = 0;
-                       mathcursor->SelGetArea(&xp, &yp, n);
-                       pain.fillPolygon(xp, yp, n, LColor::selection);
-               }
-               mathcursor->draw(pain, int(x), baseline);
-       } else {
-               par->draw(pain, int(x), baseline);
-       }
-       x += float(width(bv, font));
+       RESULT result = DISPATCHED;
 
-       if (is_numbered(par->GetType())) {
-               LyXFont wfont = WhichFont(LM_TC_BF, par->size());
-               wfont.setLatex(LyXFont::OFF);
+       switch (action) {
 
-               if (is_singlely_numbered(par->GetType())) {
-                       string str;
-                       if (!label.empty())
-                               str = string("(") + label + ")";
-                       else
-                               str = string("(#)");
-                       pain.text(int(x + 20), baseline, str, wfont);
-               } else {
-                       MathMatrixInset * mt =
-                               static_cast<MathMatrixInset*>(par);
+               case LFUN_BREAKLINE: 
+                       bv->lockedInsetStoreUndo(Undo::INSERT);
+                       int x;
                        int y;
-                       MathedRowSt const * crow = mt->getRowSt();
-                       while (crow) {
-                               y = baseline + crow->getBaseline();
-                               if (crow->isNumbered()) {
-                                       string str;
-                                       if (!crow->getLabel().empty())
-                                               str = string("(") + crow->getLabel() + ")";
-                                       else
-                                               str = "(#)";
-                                       pain.text(int(x + 20), y, str, wfont);
-                               }
-                               crow = crow->getNext();
+                       mathcursor->GetPos(x, y);
+                       mathcursor->breakLine();
+                       mathcursor->normalize();
+                       updateLocal(bv, true);
+                       break;
+
+               case LFUN_MATH_NUMBER:
+               {
+                       //lyxerr << "toggling all numbers\n";
+                       if (display()) {
+                               bv->lockedInsetStoreUndo(Undo::INSERT);
+                               bool old = par()->numberedType();
+                               for (int row = 0; row < par()->nrows(); ++row)
+                                       par()->numbered(row, !old);
+                               bv->owner()->message(old ? _("No number") : _("Number"));
+                               updateLocal(bv, true);
                        }
+                       break;
                }
-       }
-       cursor_visible = false;
-}
-
 
-string const InsetFormula::EditMessage() const
-{
-       return _("Math editor mode");
-}
-
-
-void InsetFormula::Edit(BufferView * bv, int x, int y, unsigned int)
-{
-       mathcursor = new MathedCursor(par);
-
-       if (!bv->lockInset(this))
-               lyxerr[Debug::MATHED] << "Cannot lock inset!!!" << endl;
-
-       par->Metrics();
-       bv->updateInset(this, false);
-       x += par->xo();
-       y += par->yo();
-       mathcursor->SetPos(x, y);
-       sel_x = 0;
-       sel_y = 0;
-       sel_flag = false;
-}
+               case LFUN_MATH_NONUMBER:
+               {
+                       //lyxerr << "toggling line number\n";
+                       if (display()) {
+                               bv->lockedInsetStoreUndo(Undo::INSERT);
+                               int row = mathcursor->row();
+                               bool old = par()->numbered(row);
+                               bv->owner()->message(old ? _("No number") : _("Number"));
+                               par()->numbered(row, !old);
+                               updateLocal(bv, true);
+                       }
+                       break;
+               }
 
+               case LFUN_INSERT_LABEL:
+               {
+                       bv->lockedInsetStoreUndo(Undo::INSERT);
 
-void InsetFormula::InsetUnlock(BufferView * bv)
-{
-       if (mathcursor) {
-               if (mathcursor->InMacroMode()) {
-                       mathcursor->MacroModeClose();
-                       UpdateLocal(bv);
-               }
-               delete mathcursor;
-       }
-       mathcursor = 0;
-       bv->updateInset(this, false);
-}
+                       int row = mathcursor->row();
+                       string old_label = par()->label(row);
+                       string new_label = arg;
 
+                       if (new_label.empty()) {
+                               string const default_label =
+                                       (lyxrc.label_init_length >= 0) ? "eq:" : "";
+                               pair<bool, string> const res = old_label.empty()
+                                       ? askForText(_("Enter new label to insert:"), default_label)
+                                       : askForText(_("Enter label:"), old_label);
+                               
+                               lyxerr << "res: " << res.first << " - '" << res.second << "'\n";
+                               if (!res.first)
+                                       break;
+                               new_label = frontStrip(strip(res.second));
+                       }
 
-// Now a symbol can be inserted only if the inset is locked
-void InsetFormula::InsertSymbol(BufferView * bv, string const & s)
-{
-       if (s.empty() || !mathcursor)
-               return;
-       mathcursor->Interpret(s);
-       UpdateLocal(bv);
-}
+                       //if (new_label == old_label)
+                       //      break;  // Nothing to do
 
+                       if (!new_label.empty()) {
+                               lyxerr << "setting label to '" << new_label << "'\n";
+                               par()->numbered(row, true);
+                       }
 
-void InsetFormula::GetCursorPos(BufferView *, int & x, int & y) const
-{
-       mathcursor->GetPos(x, y);
-       x -= par->xo();
-       y -= par->yo();
-}
+                       if (!new_label.empty() && bv->ChangeRefsIfUnique(old_label, new_label))
+                               bv->redraw();
 
+                       par()->label(row, new_label);
 
-void InsetFormula::ToggleInsetCursor(BufferView * bv)
-{
-       if (!mathcursor)
-               return;
-
-       int x;
-       int y;
-       mathcursor->GetPos(x, y);
-       //  x -= par->xo;
-       y -= par->yo();
-       LyXFont font = WhichFont(LM_TC_TEXTRM, LM_ST_TEXT);
-       int asc = lyxfont::maxAscent(font);
-       int desc = lyxfont::maxDescent(font);
-
-       if (cursor_visible)
-               bv->hideLockedInsetCursor();
-       else
-               bv->showLockedInsetCursor(x, y, asc, desc);
-
-       cursor_visible = !cursor_visible;
-}
+                       updateLocal(bv, true);
+                       break;
+               }
 
+               case LFUN_MATH_EXTERN:
+                       bv->lockedInsetStoreUndo(Undo::EDIT);
+                       handleExtern(arg, bv);
+                       updateLocal(bv, true);
+                       break;
 
-void InsetFormula::ShowInsetCursor(BufferView * bv, bool)
-{
-       if (!cursor_visible) {
-               if (mathcursor) {
+               case LFUN_MATH_MUTATE:
+               {
+                       bv->lockedInsetStoreUndo(Undo::EDIT);
                        int x;
                        int y;
                        mathcursor->GetPos(x, y);
-                       //  x -= par->xo;
-                       y -= par->yo();
-                       LyXFont font = WhichFont(LM_TC_TEXTRM, LM_ST_TEXT);
-                       int asc = lyxfont::maxAscent(font);
-                       int desc = lyxfont::maxDescent(font);
-                       bv->fitLockedInsetCursor(x, y, asc, desc);
+                       par()->mutate(arg);
+                       mathcursor->SetPos(x, y);
+                       mathcursor->normalize();
+                       updateLocal(bv, true);
+                       break;
                }
-               ToggleInsetCursor(bv);
-       }
-}
-
-
-void InsetFormula::HideInsetCursor(BufferView * bv)
-{
-       if (cursor_visible)
-               ToggleInsetCursor(bv);
-}
-
-
-void InsetFormula::ToggleInsetSelection(BufferView * bv)
-{
-       if (!mathcursor)
-               return;
 
-       bv->updateInset(this, false);
-}
-
-
-void InsetFormula::display(bool dspf)
-{
-       if (dspf != disp_flag) {
-               if (dspf) {
-                       par->SetType(LM_OT_PAR);
-                       par->SetStyle(LM_ST_DISPLAY);
-               } else {
-                       if (is_multiline(par->GetType())) {
-                               if (mathcursor)
-                                       mathcursor->SetPar(par);
-                       }
-                       par->SetType(LM_OT_MIN);
-                       par->SetStyle(LM_ST_TEXT);
-                       if (!label.empty()) {
-                               label.erase();
-                       }
+               case LFUN_MATH_DISPLAY:
+               {
+                       int x;
+                       int y;
+                       mathcursor->GetPos(x, y);
+                       if (par()->GetType() == LM_OT_SIMPLE)
+                               par()->mutate(LM_OT_EQUATION);
+                       else
+                               par()->mutate(LM_OT_SIMPLE);
+                       mathcursor->SetPos(x, y);
+                       mathcursor->normalize();
+                       updateLocal(bv, true);
+                       break;
                }
-               disp_flag = dspf;
+
+               default:
+                       result = InsetFormulaBase::localDispatch(bv, action, arg);
        }
+
+       return result;
 }
 
 
-vector<string> const InsetFormula::getLabelList() const
+void InsetFormula::handleExtern(const string & arg, BufferView *)
 {
-       //#warning This is dirty, I know. Ill clean it at 0.11
-       // Correction, the only way to clean this is with a new kernel: 0.13.
-
-       vector<string> label_list;
-
-       if (is_multi_numbered(par->GetType())) {
-               MathMatrixInset * mt = static_cast<MathMatrixInset*>(par);
-               MathedRowSt const * crow = mt->getRowSt();
-               while (crow) {
-                       if (!crow->getLabel().empty())
-                               label_list.push_back(crow->getLabel());
-                       crow = crow->getNext();
-               }
-       } else if (!label.empty())
-               label_list.push_back(label);
+       //string outfile = lyx::tempName("maple.out");
+       string outfile = "/tmp/lyx2" + arg + ".out";
+       ostringstream os;
+       par()->WriteNormal(os); 
+       string code = os.str().c_str();
+       string script = "lyx2" + arg + " '" + code + "' " + outfile;
+       lyxerr << "calling: " << script << endl;
+       Systemcalls cmd(Systemcalls::System, script, 0);
 
-       return label_list;
+       ifstream is(outfile.c_str());
+       par(mathed_parse(is));
+       Metrics();
 }
 
-
-void InsetFormula::UpdateLocal(BufferView * bv)
+bool InsetFormula::display() const
 {
-       par->Metrics();  // To inform lyx kernel the exact size
-       // (there were problems with arrays).
-       bv->updateInset(this, true);
+       return par_->GetType() != LM_OT_SIMPLE;
 }
 
 
-void InsetFormula::InsetButtonRelease(BufferView * bv,
-                                     int x, int y, int /*button*/)
+MathMatrixInset * InsetFormula::par() const
 {
-       if (mathcursor) {
-               HideInsetCursor(bv);
-               x += par->xo();
-               y += par->yo();
-               mathcursor->SetPos(x, y);
-               ShowInsetCursor(bv);
-               if (sel_flag) {
-                       sel_flag = false;
-                       sel_x = sel_y = 0;
-                       bv->updateInset(this, false);
-               }
-       }
+       return static_cast<MathMatrixInset *>(par_);
 }
 
-
-void InsetFormula::InsetButtonPress(BufferView * bv, int x, int y,
-                                   int /*button*/)
-{
-       sel_flag = false;
-       sel_x = x;  sel_y = y;
-       if (mathcursor && mathcursor->Selection()) {
-               mathcursor->SelClear();
-               bv->updateInset(this, false);
-       }
+void InsetFormula::par(MathInset * p)
+{ 
+       delete par_;
+       par_ = p ? p : new MathMatrixInset;
 }
 
 
-void InsetFormula::InsetMotionNotify(BufferView * bv,
-                                    int x, int y, int /*button*/)
+Inset::Code InsetFormula::lyxCode() const
 {
-       if (sel_x && sel_y && abs(x-sel_x) > 4 && !sel_flag) {
-               sel_flag = true;
-               HideInsetCursor(bv);
-               mathcursor->SetPos(sel_x + par->xo(), sel_y + par->yo());
-               mathcursor->SelStart();
-               ShowInsetCursor(bv);
-               mathcursor->GetPos(sel_x, sel_y);
-       } else if (sel_flag) {
-               HideInsetCursor(bv);
-               x += par->xo();
-               y += par->yo();
-               mathcursor->SetPos(x, y);
-               ShowInsetCursor(bv);
-               mathcursor->GetPos(x, y);
-               if (sel_x != x || sel_y != y)
-                       bv->updateInset(this, false);
-               sel_x = x;
-               sel_y = y;
-       }
+       return Inset::MATH_CODE;
 }
 
 
-void InsetFormula::InsetKeyPress(XKeyEvent *)
+void InsetFormula::validate(LaTeXFeatures & features) const
 {
-       lyxerr[Debug::MATHED] << "Used InsetFormula::InsetKeyPress." << endl;
+       par()->Validate(features);
 }
 
-
-// Special Mathed functions
-bool InsetFormula::SetNumber(bool numbf)
+bool InsetFormula::insetAllowed(Inset::Code code) const
 {
-       if (disp_flag) {
-               short type = par->GetType();
-               bool const oldf = is_numbered(type);
-               if (numbf && !oldf)
-                       ++type;
-               if (!numbf && oldf)
-                       --type;
-               par->SetType(type);
-               return oldf;
-       } else
-               return false;
+       return code == Inset::LABEL_CODE; 
 }
 
 
-UpdatableInset::RESULT
-InsetFormula::LocalDispatch(BufferView * bv, int action, string const & arg)
+int InsetFormula::ascent(BufferView *, LyXFont const &) const
 {
-       //   extern char *dispatch_result;
-       MathedTextCodes varcode = LM_TC_MIN;
-       bool was_macro = mathcursor->InMacroMode();
-       bool sel = false;
-       bool space_on = false;
-       bool was_selection = mathcursor->Selection();
-       RESULT result = DISPATCHED;
-       static MathSpaceInset * sp= 0;
-
-       HideInsetCursor(bv);
-
-       if (mathcursor->getLastCode() == LM_TC_TEX) {
-               varcode = LM_TC_TEX;
-       }
-
-       switch (action) {
-               // --- Cursor Movements ---------------------------------------------
-       case LFUN_RIGHTSEL:
-               sel = true; // fall through...
-
-       case LFUN_RIGHT:
-               result = DISPATCH_RESULT(mathcursor->Right(sel));
-               if (!sel && (result == DISPATCHED))
-                       result = DISPATCHED_NOUPDATE;
-               break;
-
-
-       case LFUN_LEFTSEL:
-               sel = true; // fall through
-
-       case LFUN_LEFT:
-               result = DISPATCH_RESULT(mathcursor->Left(sel));
-               if (!sel && (result == DISPATCHED))
-                       result = DISPATCHED_NOUPDATE;
-               break;
-
-
-       case LFUN_UPSEL:
-               sel = true;
-
-       case LFUN_UP:
-               result = DISPATCH_RESULT(mathcursor->Up(sel));
-               if (!sel && (result == DISPATCHED))
-                       result = DISPATCHED_NOUPDATE;
-               break;
-
-
-       case LFUN_DOWNSEL:
-               sel = true;
-
-       case LFUN_DOWN:
-               result = DISPATCH_RESULT(mathcursor->Down(sel));
-               if (!sel && (result == DISPATCHED))
-                       result = DISPATCHED_NOUPDATE;
-               break;
-
-
-       case LFUN_HOME:
-               mathcursor->Home();
-               result = DISPATCHED_NOUPDATE;
-               break;
-
-       case LFUN_END:
-               mathcursor->End();
-               result = DISPATCHED_NOUPDATE;
-               break;
-
-       case LFUN_DELETE_LINE_FORWARD:
-               bv->lockedInsetStoreUndo(Undo::DELETE);
-               mathcursor->DelLine();
-               UpdateLocal(bv);
-               break;
-
-       case LFUN_BREAKLINE: 
-       {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               byte c = arg.empty() ? '1' : arg[0];
-               mathcursor->Insert(c, LM_TC_CR);
-               if (!label.empty()) {
-                       mathcursor->setLabel(label);
-                       label.erase();
-               }
-               par = mathcursor->GetPar();
-               UpdateLocal(bv);
-       }
-       break;
-
-       case LFUN_TAB:
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               mathcursor->Insert(0, LM_TC_TAB);
-               //UpdateInset(this);
-               break;
-
-       case LFUN_TABINSERT:
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               mathcursor->Insert('T', LM_TC_TAB);
-               UpdateLocal(bv);
-               break;
-
-       case LFUN_BACKSPACE:
-               if (!mathcursor->Left())
-                       break;
-
-               if (!mathcursor->InMacroMode() && mathcursor->pullArg()) {
-                       bv->updateInset(this, true);
-                       break;
-               }
-               // fall through...
-
-       case LFUN_DELETE:
-               bv->lockedInsetStoreUndo(Undo::DELETE);
-               mathcursor->Delete();
-               bv->updateInset(this, true);
-               break;
-
-               //    case LFUN_GETXY:
-               //      sprintf(dispatch_buffer, "%d %d",);
-               //      dispatch_result = dispatch_buffer;
-               //      break;
-       case LFUN_SETXY:
-       {
-               int x;
-               int y;
-               int x1;
-               int y1;
-               istringstream ist(arg.c_str());
-               ist >> x >> y;
-               par->GetXY(x1, y1);
-               mathcursor->SetPos(x1 + x, y1 + y);
-       }
-       break;
-
-               /* cursor selection ---------------------------- */
-
-       case LFUN_PASTE:
-               if (was_macro)
-                       mathcursor->MacroModeClose();
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               mathcursor->SelPaste();
-               UpdateLocal(bv);
-               break;
-
-       case LFUN_CUT:
-               bv->lockedInsetStoreUndo(Undo::DELETE);
-               mathcursor->SelCut();
-               UpdateLocal(bv);
-               break;
-
-       case LFUN_COPY:
-               mathcursor->SelCopy();
-               break;
-
-       case LFUN_HOMESEL:
-       case LFUN_ENDSEL:
-       case LFUN_WORDRIGHTSEL:
-       case LFUN_WORDLEFTSEL:
-               break;
-
-               // --- accented characters ------------------------------
-
-       case LFUN_UMLAUT:     mathcursor->setAccent(LM_ddot); break;
-       case LFUN_CIRCUMFLEX: mathcursor->setAccent(LM_hat); break;
-       case LFUN_GRAVE:      mathcursor->setAccent(LM_grave); break;
-       case LFUN_ACUTE:      mathcursor->setAccent(LM_acute); break;
-       case LFUN_TILDE:      mathcursor->setAccent(LM_tilde); break;
-       case LFUN_MACRON:     mathcursor->setAccent(LM_bar); break;
-       case LFUN_DOT:        mathcursor->setAccent(LM_dot); break;
-       case LFUN_CARON:      mathcursor->setAccent(LM_check); break;
-       case LFUN_BREVE:      mathcursor->setAccent(LM_breve); break;
-       case LFUN_VECTOR:     mathcursor->setAccent(LM_vec); break;
-
-               // Greek mode
-       case LFUN_GREEK:
-               if (!greek_kb_flag) {
-                       greek_kb_flag = 1;
-                       bv->owner()->getMiniBuffer()->Set(_("Math greek mode on"));
-               } else
-                       greek_kb_flag = 0;
-               break;
-
-               // Greek keyboard
-       case LFUN_GREEK_TOGGLE:
-               greek_kb_flag = (greek_kb_flag) ? 0 : 2;
-               if (greek_kb_flag)
-                       bv->owner()->getMiniBuffer()->Set(_("Math greek keyboard on"));
-               else
-                       bv->owner()->getMiniBuffer()->Set(_("Math greek keyboard off"));
-               break;
-
-               //  Math fonts
-       case LFUN_BOLD:  mathcursor->toggleLastCode(LM_TC_BF); break;
-       case LFUN_SANS:  mathcursor->toggleLastCode(LM_TC_SF); break;
-       case LFUN_EMPH:  mathcursor->toggleLastCode(LM_TC_CAL); break;
-       case LFUN_ROMAN: mathcursor->toggleLastCode(LM_TC_RM); break;
-       case LFUN_CODE:  mathcursor->toggleLastCode(LM_TC_TT); break;
-       case LFUN_DEFAULT:  mathcursor->setLastCode(LM_TC_VAR); break;
-
-       case LFUN_TEX:
-               // varcode = LM_TC_TEX;
-               mathcursor->setLastCode(LM_TC_TEX);
-               bv->owner()->getMiniBuffer()->Set(_("TeX mode"));
-               break;
-
-       case LFUN_MATH_NUMBER:
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               if (disp_flag) {
-                       short type = par->GetType();
-                       if (is_numbered(type)) {
-                               --type;
-                               if (!label.empty()) {
-                                       label.erase();
-                               }
-                               bv->owner()->getMiniBuffer()->Set(_("No number"));
-                       } else {
-                               ++type;
-                               bv->owner()->getMiniBuffer()->Set(_("Number"));
-                       }
-                       par->SetType(type);
-                       UpdateLocal(bv);
-               }
-               break;
-
-       case LFUN_MATH_NONUMBER:
-               if (is_multi_numbered(par->GetType())) {
-                               //         MathMatrixInset *mt = (MathMatrixInset*)par;
-                               //BUG
-                               //         mt->SetNumbered(!mt->IsNumbered());
-
-#warning This is a terrible hack! We should find a better solution.
-                       while (mathcursor->getLabel() == MathedXIter::error_label) {
-                               if (LocalDispatch(bv, LFUN_LEFT, string()) == FINISHED)
-                                       return DISPATCHED;
-                       }
-                       mathcursor->setNumbered();
-                       UpdateLocal(bv);
-               }
-               break;
-
-       case LFUN_MATH_LIMITS:
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               if (mathcursor->Limits())
-                       UpdateLocal(bv);
-               // fall through!
-
-       case LFUN_MATH_SIZE:
-               if (!arg.empty()) {
-                       latexkeys const * l = in_word_set(arg);
-                       int sz = (l) ? l->id: -1;
-                       mathcursor->SetSize(sz);
-                       UpdateLocal(bv);
-                       break;
-               }
-               // possible fall through?
-
-       case LFUN_INSERT_MATH:
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               InsertSymbol(bv, arg);
-               break;
-
-
-       case LFUN_INSERT_MATRIX:
-       {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               int k, m, n;
-               char s[80], arg2[80];
-                               // This is just so that too long args won't ooze out of s.
-               strncpy(arg2, arg.c_str(), 80); arg2[79]= '\0';
-               k = sscanf(arg2, "%d %d %s", &m, &n, s);
-               s[79] = '\0';
-
-               if (k < 1) {
-                       m = n = 1;
-               } else if (k == 1) {
-                       n = 1;
-               }
-
-               MathMatrixInset * p = new MathMatrixInset(m, n);
-               if (mathcursor && p) {
-                       if (k > 2 && int(strlen(s)) > m)
-                               p->SetAlign(s[0], &s[1]);
-                       mathcursor->insertInset(p, LM_TC_ACTIVE_INSET);
-                       UpdateLocal(bv);
-               }
-               break;
-       }
-
-       case LFUN_MATH_DELIM:
-       {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               char lf[40], rg[40], arg2[40];
-               int ilf = '(', irg = '.';
-               latexkeys const * l;
-               string vdelim("(){}[]./|");
-
-               if (arg.empty())
-                       break;
-               ::strncpy(arg2, arg.c_str(), 40);
-               arg2[39]= '\0';
-               int n = sscanf(arg2, "%s %s", lf, rg);
-               lf[39] = '\0';
-               rg[39] = '\0';
-
-               if (n > 0) {
-                       if (isdigit(lf[0]))
-                               ilf = lyx::atoi(lf);
-                       else
-                               if (lf[1]) {
-                                       l = in_word_set(lf, strlen(lf));
-                                       // Long words will cause l == 0; so check.
-                                       if (l)
-                                               ilf = l->id;
-                               } else if (vdelim.find(lf[0]) != string::npos)
-                                       ilf = lf[0];
-
-                       if (n > 1) {
-                               if (isdigit(rg[0]))
-                                       irg = lyx::atoi(rg);
-                               else
-                                       if (rg[1]) {
-                                               l = in_word_set(rg, strlen(rg));
-                                               if (l)
-                                                       irg = l->id;
-                                       } else if (vdelim.find(rg[0]) != string::npos)
-                                               irg = rg[0];
-                       }
-               }
-
-               MathDelimInset * p = new MathDelimInset(ilf, irg);
-               mathcursor->insertInset(p, LM_TC_ACTIVE_INSET);
-               UpdateLocal(bv);
-               break;
-       }
-
-       case LFUN_PROTECTEDSPACE:
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               sp = new MathSpaceInset(1);
-               mathcursor->insertInset(sp, LM_TC_INSET);
-               space_on = true;
-               UpdateLocal(bv);
-               break;
-
-       case LFUN_INSERT_LABEL:
-       {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               if (par->GetType() < LM_OT_PAR)
-                       break;
-
-               string old_label = is_multiline(par->GetType())
-                       ? mathcursor->getLabel() : label;
-
-#warning This is a terrible hack! We should find a better solution.
-               // This is needed because in some positions
-               // mathcursor->cursor->crow is equal to 0, and therefore
-               // the label cannot be inserted.
-               // So we move the cursor left until
-               // mathcursor->cursor->crow != 0.
-               while (old_label == MathedXIter::error_label) {
-                       if (LocalDispatch(bv, LFUN_LEFT, string()) == FINISHED)
-                               return DISPATCHED;
-                       old_label = mathcursor->getLabel();
-               }
-
-               string new_label = arg;
-               if (new_label.empty()) {
-                       string default_label = (lyxrc.label_init_length >= 0) ? "eq:" : "";
-                       pair<bool, string> res = old_label.empty()
-                               ? askForText(_("Enter new label to insert:"), default_label)
-                               : askForText(_("Enter label:"), old_label);
-                       if (!res.first)
-                               break;
-                       new_label = frontStrip(strip(res.second));
-               }
-
-               if (new_label == old_label)
-                       break;  // Nothing to do
-
-               if (!new_label.empty())
-                       SetNumber(true);
-
-               if (!new_label.empty() && bv->ChangeRefsIfUnique(old_label, new_label))
-                       bv->redraw();
-
-               if (is_multi_numbered(par->GetType())) {
-                       mathcursor->setLabel(new_label);
-                       // MathMatrixInset *mt = (MathMatrixInset*)par;
-                       // mt->SetLabel(new_label);
-               } else
-                       label = new_label;
-
-               UpdateLocal(bv);
-               break;
-       }
-
-       case LFUN_MATH_DISPLAY:
-               bv->lockedInsetStoreUndo(Undo::EDIT);
-               display(!disp_flag);
-               UpdateLocal(bv);
-               break;
-
-               // Invalid actions under math mode
-       case LFUN_MATH_MODE:
-               if (mathcursor->getLastCode()!= LM_TC_TEXTRM) {
-                       bv->owner()->getMiniBuffer()->Set(_("math text mode"));
-                       varcode = LM_TC_TEXTRM;
-               } else {
-                       varcode = LM_TC_VAR;
-               }
-               mathcursor->setLastCode(varcode);
-               break;
-
-       case LFUN_UNDO:
-               bv->owner()->getMiniBuffer()->Set(_("Invalid action in math mode!"));
-               break;
-
-               //------- dummy actions
-       case LFUN_EXEC_COMMAND:
-               bv->owner()->getMiniBuffer()->PrepareForCommand();
-               break;
-
-       default:
-               if ((action == -1  || action == LFUN_SELFINSERT) && !arg.empty())  {
-                       unsigned char c = arg[0];
-                       bv->lockedInsetStoreUndo(Undo::INSERT);
-
-                       if (c == ' ' && mathcursor->getAccent() == LM_hat) {
-                               c = '^';
-                               mathcursor->setAccent(0);
-                       }
-
-                       if (c == 0) {      // Dead key, do nothing
-                               //lyxerr << "deadkey" << endl;
-                               break;
-                       }
-
-                       if (isalpha(c)) {
-                               if (mathcursor->getLastCode() == LM_TC_TEX) {
-                                       mathcursor->MacroModeOpen();
-                                       mathcursor->clearLastCode();
-                                       varcode = LM_TC_MIN;
-                               } else if (!varcode) {          
-                                       short f = (mathcursor->getLastCode()) ?
-                                               mathcursor->getLastCode() :
-                                               static_cast<MathedTextCodes>(mathcursor->GetFCode());
-                                       varcode = MathIsAlphaFont(f) ?
-                                               static_cast<MathedTextCodes>(f) :
-                                               LM_TC_VAR;
-                               }
-                               
-                               //           lyxerr << "Varcode << vardoce;
-                               MathedTextCodes char_code = varcode;
-                               if (greek_kb_flag) {
-                                       char greek[26] =
-                                       {'A', 'B', 'X',  0 , 'E',  0 ,  0 , 'H', 'I',  0 ,
-                                        'K',  0 , 'M', 'N', 'O',  0 ,  0 , 'P',  0 , 'T',
-                                        'Y',  0,   0,   0,   0 , 'Z' };
-                                       
-                                       if ('A' <= c && c <= 'Z' && greek[c - 'A']) {
-                                               char_code = LM_TC_RM;
-                                               c = greek[c - 'A'];
-                                       } else
-                                               char_code = LM_TC_SYMB;
-                               }
-                               
-                               mathcursor->Insert(c, char_code);
-                               
-                               if (greek_kb_flag && char_code == LM_TC_RM )
-                                       mathcursor->setLastCode(LM_TC_VAR);
-                               
-                               varcode = LM_TC_MIN;
-                               
-                               if (greek_kb_flag<2)
-                                       greek_kb_flag = 0;
-                               
-                       } else if (strchr("!,:;{}", c) && (varcode == LM_TC_TEX||was_macro)) {
-                               mathcursor->Insert(c, LM_TC_TEX);
-                               if (c == '{') {
-                                       mathcursor->Insert('}', LM_TC_TEX);
-                                       mathcursor->Left();
-                               }
-                               mathcursor->clearLastCode();
-                               //             varcode = LM_TC_MIN;
-                       } else if (c == '_' && varcode == LM_TC_TEX) {
-                               mathcursor->Insert(c, LM_TC_SPECIAL);
-                               mathcursor->clearLastCode();
-                               //             varcode = LM_TC_MIN;
-                       } else if (('0'<= c && c<= '9') && (varcode == LM_TC_TEX||was_macro)) {
-                               mathcursor->MacroModeOpen();
-                               mathcursor->clearLastCode();
-                               mathcursor->Insert(c, LM_TC_MIN);
-                       } else if (('0'<= c && c<= '9') || strchr(";:!|[]().,?", c)) {
-                               mathcursor->Insert(c, LM_TC_CONST);
-                       } else if (strchr("+/-*<>=", c)) {
-                               mathcursor->Insert(c, LM_TC_BOP);
-                       } else if (strchr(latex_special_chars, c) && c!= '_') {
-                               mathcursor->Insert(c, LM_TC_SPECIAL);
-                       } else if (c == '_' || c == '^') {
-                               char s[2];
-                               s[0] = c;
-                               s[1] = 0;
-                               mathcursor->Interpret(s);
-                       } else if (c == ' ') {  
-                               if (!varcode) { 
-                                       short f = (mathcursor->getLastCode()) ?
-                                               mathcursor->getLastCode() :
-                                               static_cast<MathedTextCodes>(mathcursor->GetFCode());
-                                       varcode = MathIsAlphaFont(f) ?
-                                               static_cast<MathedTextCodes>(f) :
-                                               LM_TC_VAR;
-                               }
-                               
-                               if (varcode == LM_TC_TEXTRM) {
-                                       mathcursor->Insert(c, LM_TC_TEXTRM);
-                               } else if (was_macro) {
-                                       mathcursor->MacroModeClose();
-                               } else if (sp) {
-                                       int isp = (sp->GetSpace()<5) ? sp->GetSpace()+1: 0;
-                                       sp->SetSpace(isp);
-                                       space_on = true;
-                               } else if (!mathcursor->Pop() && mathcursor->IsEnd())
-                                       result = FINISHED;
-                       } else if (c == '\'' || c == '@') {
-                               mathcursor->Insert (c, LM_TC_VAR);
-                       } else if (c == '\\') {
-                               if (was_macro)
-                                       mathcursor->MacroModeClose();
-                               bv->owner()->getMiniBuffer()->Set(_("TeX mode"));
-                               mathcursor->setLastCode(LM_TC_TEX);
-                       }
-                       UpdateLocal(bv);
-               } else if (action == LFUN_MATH_PANEL) {
-                       result = UNDISPATCHED;
-               } else {
-                       // lyxerr << "Closed by action " << action << endl;
-                       result =  FINISHED;
-               }
-       }
-       
-       if (was_macro != mathcursor->InMacroMode()
-           && action >= 0
-           && action != LFUN_BACKSPACE) 
-               UpdateLocal(bv);
-
-       if (sp && !space_on)
-               sp = 0;
-
-       if (mathcursor->Selection() || was_selection)
-               ToggleInsetSelection(bv);
-
-       if ((result == DISPATCHED) || (result == DISPATCHED_NOUPDATE) ||
-           (result == UNDISPATCHED))
-               ShowInsetCursor(bv);
-       else
-               bv->unlockInset(this);
-
-       return result;
+       return par()->ascent() + 1;
 }
 
 
-
-static
-void mathedValidate(LaTeXFeatures & features, MathParInset * par)
+int InsetFormula::descent(BufferView *, LyXFont const &) const
 {
-       MathedIter it(&par->GetData());
-
-       while (it.OK() && !(features.binom && features.boldsymbol)) {
-               if (it.IsInset()) {
-                       if (it.IsActive()) {
-                               MathParInset * p = it.GetActiveInset();
-                               if (!features.binom && p->GetType() == LM_OT_MACRO &&
-                                   p->GetName() == "binom") {
-                                       features.binom = true;
-                               } else {
-                                       for (int i = 0; i <= p->getMaxArgumentIdx(); ++i) {
-                                               p->setArgumentIdx(i);
-                                               mathedValidate(features, p);
-                                       }
-                               }
-                       } else {
-                               MathedInset * p = it.GetInset();
-                               if (!features.boldsymbol && p->GetName() == "boldsymbol") {
-                                       features.boldsymbol = true;
-                               }
-                       }
-               }
-               it.Next();
-       }
+       return par()->descent() + 1;
 }
 
 
-static
-int mathed_write(MathParInset * p, ostream & os,
-                bool fragile, string const & label)
+int InsetFormula::width(BufferView *, LyXFont const &) const
 {
-       number_of_newlines = 0;
-       short mathed_env = p->GetType();
-       
-       if (mathed_env == LM_OT_MIN) {
-               if (fragile) os << "\\protect";
-               os << "\\( "; // changed from " \\( " (Albrecht Dress)
-       } else {
-               if (mathed_env == LM_OT_PAR){
-                       os << "\\[\n";
-               } else {
-                       os << "\\begin{"
-                          << latex_mathenv[mathed_env]
-                          << "}";
-                       if (is_multicolumn(mathed_env)) {
-                               if (mathed_env != LM_OT_ALIGNAT
-                                   && mathed_env != LM_OT_ALIGNATN)
-                                       os << "%";
-                               os << "{" << p->GetColumns()/2 << "}";
-                       }
-                       os << "\n";
-               }
-               ++number_of_newlines;
-       }
-       
-       if (!label.empty() && label[0] > ' '
-           && is_singlely_numbered(mathed_env)) {
-               os << "\\label{"
-                  << label
-                  << "}\n";
-               ++number_of_newlines;
-       }
-       
-       p->Write(os, fragile);
-       
-       if (mathed_env == LM_OT_MIN){
-               if (fragile) os << "\\protect";
-               os << " \\)";
-       } else if (mathed_env == LM_OT_PAR) {
-               os << "\\]\n";
-               ++number_of_newlines;
-       } else {
-               os << "\n\\end{"
-                  << latex_mathenv[mathed_env]
-                  << "}\n";
-               number_of_newlines += 2;
-       }
-       return number_of_newlines;
+       Metrics();
+       return par()->width();
 }