]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/formulabase.C
fix typo that put too many include paths for most people
[lyx.git] / src / mathed / formulabase.C
index 64dee868ebb8c0b20833ae7a6323500de717346a..5bd77093ddeb9de73603d3a8c3756926f5348f90 100644 (file)
@@ -1,9 +1,8 @@
- /*
-*  File:        formula.C
-*  Purpose:     Implementation of formula inset
+/*
+*  File:        formulabase.C
+*  Purpose:     Implementation of common parts of the LyX  math insets
 *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
 *  Created:     January 1996
-*  Description: Allows the edition of math paragraphs inside Lyx.
 *
 *  Copyright: 1996-1998 Alejandro Aguilar Sierra
 *
@@ -17,6 +16,7 @@
 #include <fstream>
 
 #include "Lsstream.h"
+#include "support/LAssert.h"
 
 #ifdef __GNUG__
 #pragma implementation
 #include "formula.h"
 #include "formulamacro.h"
 #include "commandtags.h"
-#include "math_cursor.h"
-#include "math_parser.h"
 #include "BufferView.h"
 #include "lyxtext.h"
 #include "lyxfunc.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "debug.h"
+#include "math_support.h"
 #include "support/lstrings.h"
 #include "LyXView.h"
 #include "Painter.h"
 #include "font.h"
+#include "Lsstream.h"
 #include "math_arrayinset.h"
-#include "math_spaceinset.h"
+#include "math_charinset.h"
+#include "math_cursor.h"
+#include "math_factory.h"
+#include "math_hullinset.h"
+#include "math_iterator.h"
 #include "math_macrotable.h"
-#include "support/lyxlib.h"
-#include "mathed/support.h"
+#include "math_parser.h"
+#include "math_pos.h"
+#include "math_spaceinset.h"
 #include "undo_funcs.h"
+#include "textpainter.h"
+#include "frontends/Dialogs.h"
+#include "intl.h"
 
 using std::endl;
 using std::ostream;
 using std::vector;
 
-extern char const * latex_special_chars;
-
-extern char const * latex_mathenv[];
-MathCursor        * mathcursor = 0;
+MathCursor * mathcursor = 0;
 
 
 namespace {
 
 
 // local global
-int sel_x;
-int sel_y;
-bool sel_flag;
+int first_x;
+int first_y;
+int hack_x;
+int hack_y;
+int hack_button;
 
-void mathed_init_fonts();
 
-string nicelabel(string const & label)
-{
-       return "(" + (label.empty() ? "#" : label) + ")";
-}
-
-void handleFont(BufferView * bv, MathTextCodes t) 
+void handleFont(BufferView * bv, string const & arg, MathTextCodes t)
 {
        if (mathcursor->selection())
                bv->lockedInsetStoreUndo(Undo::EDIT);
        mathcursor->handleFont(t);
+       for (string::const_iterator it = arg.begin(); it != arg.end(); ++it)
+               mathcursor->insert(*it);
 }
 
-void handleAccent(BufferView * bv, string const & name)
-{
-       bv->lockedInsetStoreUndo(Undo::EDIT);
-       mathcursor->handleAccent(name);
-}
-
-void handleDelim(BufferView * bv, int l, int r)
-{
-       bv->lockedInsetStoreUndo(Undo::EDIT);
-       mathcursor->handleDelim(l, r);
-}
 
 bool openNewInset(BufferView * bv, UpdatableInset * new_inset)
 {
-       LyXText * lt = bv->getLyXText();
-       
-       bv->beforeChange(lt);
-       finishUndo();
        if (!bv->insertInset(new_inset)) {
                delete new_inset;
                return false;
@@ -103,65 +91,62 @@ bool openNewInset(BufferView * bv, UpdatableInset * new_inset)
 }
 
 
-// returns the nearest enclosing grid
-MathArrayInset * matrixpar(int & idx)
-{
-       idx = 0;
-       return (mathcursor ? mathcursor->enclosingArray(idx) : 0); 
-}
-
-
 } // namespace anon
 
 
 
 InsetFormulaBase::InsetFormulaBase()
+       : view_(0), font_(), xo_(0), yo_(0)
 {
-#ifdef WITH_WARNINGS
-#warning This is needed as long the math parser is not re-entrant
-#endif
+       // This is needed as long the math parser is not re-entrant
        MathMacroTable::builtinMacros();
        //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n";
+       //lyxerr << "sizeof(MathMetricsInfo): " << sizeof(MathMetricsInfo) << "\n";
+       //lyxerr << "sizeof(MathCharInset): " << sizeof(MathCharInset) << "\n";
 }
 
 
-void InsetFormulaBase::read(Buffer const *, LyXLex & lex)
+// simply scrap this function if you want
+void InsetFormulaBase::mutateToText()
 {
-       read(lex);
-}
+#if 0
+       // translate to latex
+       ostringstream os;
+       latex(NULL, os, false, false);
+       string str = os.str();
 
+       // insert this text
+       LyXText * lt = view_->getLyXText();
+       string::const_iterator cit = str.begin();
+       string::const_iterator end = str.end();
+       for (; cit != end; ++cit)
+               view_->owner()->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
 
-void InsetFormulaBase::write(Buffer const *, ostream & os) const
-{
-       write(os);
+       // remove ourselves
+       //view_->owner()->getLyXFunc()->dispatch(LFUN_ESCAPE);
+#endif
 }
 
-int InsetFormulaBase::latex(Buffer const *, ostream & os,
-       bool fragile, bool spacing) const
-{
-       return latex(os, fragile, spacing);
-}
 
-int InsetFormulaBase::ascii(Buffer const *, ostream & os, int spacing) const
-{
-       return ascii(os, spacing);
-}
+// Check if uses AMS macros
+void InsetFormulaBase::validate(LaTeXFeatures &) const
+{}
 
-int InsetFormulaBase::linuxdoc(Buffer const *, ostream & os) const
-{
-       return linuxdoc(os);
-}
 
-int InsetFormulaBase::docBook(Buffer const *, ostream & os) const
+void InsetFormulaBase::metrics(BufferView * bv, LyXFont const & f) const
 {
-       return docBook(os);
+       font_ = f;
+       metrics(bv);
 }
 
 
-
-// Check if uses AMS macros
-void InsetFormulaBase::validate(LaTeXFeatures &) const
-{}
+void InsetFormulaBase::metrics(BufferView * bv) const
+{
+       if (bv)
+               view_ = bv;
+       MathMetricsInfo mi(view_, font_, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       par()->metrics(mi);
+}
 
 
 string const InsetFormulaBase::editMessage() const
@@ -172,25 +157,29 @@ string const InsetFormulaBase::editMessage() const
 
 void InsetFormulaBase::edit(BufferView * bv, int x, int /*y*/, unsigned int)
 {
-       mathcursor = new MathCursor(this);
-
        if (!bv->lockInset(this))
                lyxerr[Debug::MATHED] << "Cannot lock inset!!!" << endl;
 
-       metrics();
-       //bv->updateInset(this, false);
-       if (x == 0)
-               mathcursor->first();
-       else
-               mathcursor->last();
-       sel_x = 0;
-       sel_y = 0;
-       sel_flag = false;
+       //lyxerr << "edit: " << x  << " " << y << " button: " << button << "\n";
+       if (!mathcursor) {
+               mathcursor = new MathCursor(this, x == 0);
+               metrics(bv);
+               // handle ignored click
+               if (hack_x || hack_y) {
+                       insetButtonPress(bv, hack_x, hack_y, hack_button);
+                       hack_x = hack_y = 0;
+               }
+       } else
+               metrics(bv);
+       // if that is removed, we won't get the magenta box when entering an
+       // inset for the first time
+       bv->updateInset(this, false);
 }
 
 
 void InsetFormulaBase::edit(BufferView * bv, bool front)
 {
+       // looks hackish but seems to work
        edit(bv, front ? 0 : 1, 0, 0);
 }
 
@@ -212,8 +201,9 @@ void InsetFormulaBase::insetUnlock(BufferView * bv)
 void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
 {
        mathcursor->getPos(x, y);
-       x -= par()->xo();
-       y -= par()->yo();
+       x += xo_;
+       y += yo_;
+       //lyxerr << "getCursorPos: " << x << " " << y << "\n";
 }
 
 
@@ -225,15 +215,16 @@ void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
        if (isCursorVisible())
                bv->hideLockedInsetCursor();
        else {
+               metrics(bv);
                int x;
                int y;
                mathcursor->getPos(x, y);
-               //x -= par()->xo();
-               y -= par()->yo();
-               int asc;
-               int desc;
-               math_font_max_dim(LM_TC_TEXTRM, LM_ST_TEXT, asc, desc);
-               bv->showLockedInsetCursor(x, y, asc, desc);
+               y -= yo_;
+               int asc = 0;
+               int des = 0;
+               math_font_max_dim(font_, asc, des);
+               bv->showLockedInsetCursor(x, y, asc, des);
+               //lyxerr << "toggleInsetCursor: " << x << " " << y << "\n";
        }
 
        toggleCursorVisible();
@@ -242,20 +233,21 @@ void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
 
 void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
 {
-       if (!isCursorVisible()) {
-               if (mathcursor) {
-                       int x;
-                       int y;
-                       mathcursor->getPos(x, y);
-                       x -= par()->xo();
-                       y -= par()->yo();
-                       int asc;
-                       int desc;
-                       math_font_max_dim(LM_TC_TEXTRM, LM_ST_TEXT, asc, desc);
-                       bv->fitLockedInsetCursor(x, y, asc, desc);
-               }
-               toggleInsetCursor(bv);
+       if (isCursorVisible())
+               return;
+       if (mathcursor) {
+               metrics(bv);
+               int x;
+               int y;
+               mathcursor->getPos(x, y);
+               y -= yo_;
+               int asc = 0;
+               int des = 0;
+               math_font_max_dim(font_, asc, des);
+               bv->fitLockedInsetCursor(x, y, asc, des);
+               //lyxerr << "showInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
        }
+       toggleInsetCursor(bv);
 }
 
 
@@ -275,71 +267,101 @@ void InsetFormulaBase::toggleInsetSelection(BufferView * bv)
 
 vector<string> const InsetFormulaBase::getLabelList() const
 {
-  return std::vector<string>();
+  return vector<string>();
 }
 
 
 void InsetFormulaBase::updateLocal(BufferView * bv, bool dirty)
 {
-       metrics();
+       metrics(bv);
        bv->updateInset(this, dirty);
 }
 
 
-void InsetFormulaBase::insetButtonRelease(BufferView * bv,
-                                         int x, int y, int /*button*/)
+bool InsetFormulaBase::insetButtonRelease(BufferView * bv,
+                                         int /*x*/, int /*y*/, int /*button*/)
 {
-       if (mathcursor) {
-               hideInsetCursor(bv);
-               x += par()->xo();
-               y += par()->yo();
-               mathcursor->setPos(x, y);
-               showInsetCursor(bv);
-               if (sel_flag) {
-                       sel_flag = false;
-                       sel_x = 0;
-                       sel_y = 0;
-               }
-               bv->updateInset(this, false);
-       }
+       if (!mathcursor)
+               return false;
+       //lyxerr << "insetButtonRelease: " << x << " " << y << "\n";
+       hideInsetCursor(bv);
+       showInsetCursor(bv);
+       bv->updateInset(this, false);
+       return false;
 }
 
 
 void InsetFormulaBase::insetButtonPress(BufferView * bv,
-                                       int x, int y, int /*button*/)
+                                       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);
+       // hack to cope with mouseclick that comes before the call to edit()
+       if (!mathcursor) {
+               hack_x = x;
+               hack_y = y;
+               hack_button = button;
+               return;
        }
+
+       lyxerr << "insetButtonPress: " << x + xo_ << " " << y + yo_
+               << " but: " << button << "\n";
+       switch (button) {
+               default:
+               case 1:
+                       // just click
+                       first_x = x;
+                       first_y = y;
+                       if (mathcursor) {
+                               mathcursor->selClear();
+                               mathcursor->setPos(x + xo_, y + yo_);
+                       }
+                       break;
+/*
+               case 2:
+                       lyxerr << "insetButtonPress: 2\n";
+                       // insert stuff
+                       if (mathcursor) {
+                               bv->lockedInsetStoreUndo(Undo::EDIT);
+                               MathArray ar;
+                               mathcursor->selGet(ar);
+                               mathcursor->setPos(x + xo_, y + yo_);
+                               string sel =
+                                       bv->getLyXText()->selectionAsString(bv->buffer(), false);
+                               mathed_parse_cell(ar, sel);
+                               mathcursor->insert(ar);
+                       }
+                       break;
+*/
+               case 3:
+                       // launch math panel for right mouse button
+                       bv->owner()->getDialogs()->showMathPanel();
+                       break;
+       }
+       bv->updateInset(this, false);
 }
 
 
 void InsetFormulaBase::insetMotionNotify(BufferView * bv,
                                         int x, int y, int /*button*/)
 {
-       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;
+       if (!mathcursor)
+               return;
+
+       if (abs(x - first_x) < 2 && abs(y - first_y) < 2) {
+               //lyxerr << "insetMotionNotify: ignored\n";
+               return;
        }
+       first_x = x;
+       first_y = y;
+
+       if (!mathcursor->selection())
+               mathcursor->selStart();
+
+       //lyxerr << "insetMotionNotify: " << x + xo_ << ' ' << y + yo_
+       //      << ' ' << button << "\n";
+       hideInsetCursor(bv);
+       mathcursor->setPos(x + xo_, y + yo_);
+       showInsetCursor(bv);
+       bv->updateInset(this, false);
 }
 
 
@@ -349,31 +371,30 @@ void InsetFormulaBase::insetKeyPress(XKeyEvent *)
 }
 
 
-
 UpdatableInset::RESULT
 InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                            string const & arg)
 {
-       //lyxerr << "InsetFormulaBase::LocalDispatch: act: " << action
+       //lyxerr << "InsetFormulaBase::localDispatch: act: " << action
        //      << " arg: '" << arg << "' cursor: " << mathcursor << "\n";
 
-       static int greek_kb_flag = 0;
-
-       if (!mathcursor) 
+       if (!mathcursor)
                return UNDISPATCHED;
 
-       MathTextCodes varcode = LM_TC_MIN;
-       bool was_macro = mathcursor->inMacroMode();
-       bool sel = false;
+       if (mathcursor->asHyperActiveInset()) {
+               lyxerr << " uurr.... getting dificult now\n";
+               return mathcursor->asHyperActiveInset()->localDispatch(bv, action, arg);
+       }
+
+       RESULT result      = DISPATCHED;
+       bool sel           = false;
+       bool was_macro     = mathcursor->inMacroMode();
        bool was_selection = mathcursor->selection();
-       RESULT result = DISPATCHED;
 
        hideInsetCursor(bv);
 
-       if (mathcursor->getLastCode() == LM_TC_TEX)
-               varcode = LM_TC_TEX;
-
        mathcursor->normalize();
+       mathcursor->touch();
 
        switch (action) {
 
@@ -383,8 +404,12 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                sel = true; // fall through...
 
        case LFUN_RIGHT:
-               result = DISPATCH_RESULT(mathcursor->right(sel));
+               result = mathcursor->right(sel) ? DISPATCHED : FINISHED_RIGHT;
+               //lyxerr << "calling scroll 20\n";
+               //scroll(bv, 20);
                updateLocal(bv, false);
+               // write something to the minibuffer
+               //bv->owner()->message(mathcursor->info());
                break;
 
 
@@ -392,7 +417,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                sel = true; // fall through
 
        case LFUN_LEFT:
-               result = DISPATCH_RESULT(mathcursor->left(sel));
+               result = mathcursor->left(sel) ? DISPATCHED : FINISHED;
                updateLocal(bv, false);
                break;
 
@@ -401,7 +426,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                sel = true;
 
        case LFUN_UP:
-               result = DISPATCH_RESULT(mathcursor->up(sel));
+               result = mathcursor->up(sel) ? DISPATCHED : FINISHED_UP;
                updateLocal(bv, false);
                break;
 
@@ -410,17 +435,23 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                sel = true;
 
        case LFUN_DOWN:
-               result = DISPATCH_RESULT(mathcursor->down(sel));
+               result = mathcursor->down(sel) ? DISPATCHED : FINISHED_DOWN;
                updateLocal(bv, false);
                break;
 
+       case LFUN_HOMESEL:
+               sel = true;
+
        case LFUN_HOME:
-               mathcursor->home();
+               mathcursor->home(sel);
                updateLocal(bv, false);
                break;
 
+       case LFUN_ENDSEL:
+               sel = true;
+
        case LFUN_END:
-               mathcursor->end();
+               mathcursor->end(sel);
                updateLocal(bv, false);
                break;
 
@@ -446,42 +477,39 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                updateLocal(bv, true);
                break;
 
+       case LFUN_DELETE_WORD_BACKWARD:
        case LFUN_BACKSPACE:
                bv->lockedInsetStoreUndo(Undo::DELETE);
                mathcursor->backspace();
                bv->updateInset(this, true);
                break;
 
+       case LFUN_DELETE_WORD_FORWARD:
        case LFUN_DELETE:
                bv->lockedInsetStoreUndo(Undo::DELETE);
                mathcursor->erase();
                bv->updateInset(this, true);
                break;
 
-               //    case LFUN_GETXY:
-               //      sprintf(dispatch_buffer, "%d %d",);
-               //      dispatch_result = dispatch_buffer;
-               //      break;
-       case LFUN_SETXY:
-       {
+       //    case LFUN_GETXY:
+       //      sprintf(dispatch_buffer, "%d %d",);
+       //      dispatch_result = dispatch_buffer;
+       //      break;
+       case LFUN_SETXY: {
                lyxerr << "LFUN_SETXY broken!\n";
-               int x;
-               int y;
-               int x1;
-               int y1;
+               int x = 0;
+               int y = 0;
                istringstream is(arg.c_str());
                is >> x >> y;
-               par()->getXY(x1, y1);
-               mathcursor->setPos(x1 + x, y1 + y);
+               mathcursor->setPos(x, y);
                updateLocal(bv, false);
+               break;
        }
-       break;
-
 
        case LFUN_PASTE:
                if (was_macro)
                        mathcursor->macroModeClose();
-               bv->lockedInsetStoreUndo(Undo::INSERT);
+               bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->selPaste();
                updateLocal(bv, true);
                break;
@@ -496,149 +524,131 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                mathcursor->selCopy();
                break;
 
-       case LFUN_HOMESEL:
-       case LFUN_ENDSEL:
        case LFUN_WORDRIGHTSEL:
        case LFUN_WORDLEFTSEL:
                break;
 
-               // --- accented characters ------------------------------
-
-       case LFUN_UMLAUT:     handleAccent(bv, "ddot"); break;
-       case LFUN_CIRCUMFLEX: handleAccent(bv, "hat"); break;
-       case LFUN_GRAVE:      handleAccent(bv, "grave"); break;
-       case LFUN_ACUTE:      handleAccent(bv, "acute"); break;
-       case LFUN_TILDE:      handleAccent(bv, "tilde"); break;
-       case LFUN_MACRON:     handleAccent(bv, "bar"); break;
-       case LFUN_DOT:        handleAccent(bv, "dot"); break;
-       case LFUN_CARON:      handleAccent(bv, "check"); break;
-       case LFUN_BREVE:      handleAccent(bv, "breve"); break;
-       case LFUN_VECTOR:     handleAccent(bv, "vec"); break;
+       // Special casing for superscript in case of LyX handling
+       // dead-keys:
+       case LFUN_CIRCUMFLEX:
+               if (arg.empty()) {
+                       // do superscript if LyX handles
+                       // deadkeys
+                       bv->lockedInsetStoreUndo(Undo::EDIT);
+                       mathcursor->script(true);
+                       updateLocal(bv, true);
+               }
+               break;
+       case LFUN_UMLAUT:
+       case LFUN_ACUTE:
+       case LFUN_GRAVE:
+       case LFUN_BREVE:
+       case LFUN_DOT:
+       case LFUN_MACRON:
+       case LFUN_CARON:
+       case LFUN_TILDE:
+       case LFUN_CEDILLA:
+       case LFUN_CIRCLE:
+       case LFUN_UNDERDOT:
+       case LFUN_TIE:
+       case LFUN_OGONEK:
+       case LFUN_HUNG_UMLAUT:
+               break;
+
+       //  Math fonts
+       case LFUN_GREEK_TOGGLE: handleFont(bv, arg, LM_TC_GREEK); break;
+       case LFUN_BOLD:         handleFont(bv, arg, LM_TC_BF); break;
+       case LFUN_SANS:         handleFont(bv, arg, LM_TC_SF); break;
+       case LFUN_EMPH:         handleFont(bv, arg, LM_TC_CAL); break;
+       case LFUN_ROMAN:        handleFont(bv, arg, LM_TC_RM); break;
+       case LFUN_CODE:         handleFont(bv, arg, LM_TC_TT); break;
+       case LFUN_FRAK:         handleFont(bv, arg, LM_TC_EUFRAK); break;
+       case LFUN_ITAL:         handleFont(bv, arg, LM_TC_IT); break;
+       case LFUN_NOUN:         handleFont(bv, arg, LM_TC_BB); break;
+       case LFUN_DEFAULT:      handleFont(bv, arg, LM_TC_VAR); break;
+       case LFUN_FREE:         handleFont(bv, arg, LM_TC_TEXTRM); break;
 
-               // Greek mode
        case LFUN_GREEK:
-               if (!greek_kb_flag) {
-                       greek_kb_flag = 1;
-                       bv->owner()->message(_("Math greek mode on"));
-               } else
-                       greek_kb_flag = 0;
+               handleFont(bv, arg, LM_TC_GREEK1);
+               if (arg.size())
+                       mathcursor->interpret(arg);
                break;
 
-               // Greek keyboard
-       case LFUN_GREEK_TOGGLE:
-               greek_kb_flag = greek_kb_flag ? 0 : 2;
-               if (greek_kb_flag)
-                       bv->owner()->message(_("Math greek keyboard on"));
-               else
-                       bv->owner()->message(_("Math greek keyboard off"));
-               break;
+       case LFUN_MATH_MODE:
+#if 1
+               handleFont(bv, arg, LM_TC_TEXTRM);
+#endif
 
-               //  Math fonts
-       case LFUN_BOLD:    handleFont(bv, LM_TC_BF); break;
-       case LFUN_SANS:    handleFont(bv, LM_TC_SF); break;
-       case LFUN_EMPH:    handleFont(bv, LM_TC_CAL); break;
-       case LFUN_ROMAN:   handleFont(bv, LM_TC_RM); break;
-       case LFUN_CODE:    handleFont(bv, LM_TC_TT); break;
-       case LFUN_DEFAULT: handleFont(bv, LM_TC_VAR); break;
+#if 0
+               mathcursor->niceInsert(MathAtom(new MathHullInset(LM_OT_SIMPLE)));
+               updateLocal(bv, true);
+#endif
 
-       case LFUN_MATH_MODE:
-               handleFont(bv, LM_TC_TEXTRM);
                //bv->owner()->message(_("math text mode toggled"));
                break;
 
        case LFUN_MATH_LIMITS:
-               bv->lockedInsetStoreUndo(Undo::INSERT);
+               bv->lockedInsetStoreUndo(Undo::EDIT);
                if (mathcursor->toggleLimits())
                        updateLocal(bv, true);
                break;
 
        case LFUN_MATH_SIZE:
+#if 0
                if (!arg.empty()) {
-                       bv->lockedInsetStoreUndo(Undo::INSERT);
-                       latexkeys const * l = in_word_set(arg);
-                       mathcursor->setSize(MathStyles(l ? l->id : static_cast<unsigned int>(-1)));
+                       bv->lockedInsetStoreUndo(Undo::EDIT);
+                       mathcursor->setSize(arg);
                        updateLocal(bv, true);
                }
+#endif
                break;
 
        case LFUN_INSERT_MATRIX:
                if (!arg.empty()) {
-                       bv->lockedInsetStoreUndo(Undo::INSERT);
+                       bv->lockedInsetStoreUndo(Undo::EDIT);
                        mathcursor->interpret("matrix " + arg);
                        updateLocal(bv, true);
                }
                break;
 
-       case LFUN_INSERT_MATH:
-               if (!arg.empty()) {
-                       bv->lockedInsetStoreUndo(Undo::INSERT);
-                       mathcursor->interpret(arg);
-                       updateLocal(bv, true);
-               }
+       case LFUN_MATH_SPACE:
+       {
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               mathcursor->insert(MathAtom(new MathSpaceInset(1)));
+               updateLocal(bv, true);
                break;
+       }
 
-       case LFUN_MATH_SPACE:
+       case LFUN_SUPERSCRIPT:
+       case LFUN_SUBSCRIPT:
        {
                bv->lockedInsetStoreUndo(Undo::EDIT);
-               MathSpaceInset * p = mathcursor->prevSpaceInset();
-               if (p) 
-                       p->incSpace();
-               else
-                       mathcursor->insert(new MathSpaceInset(1));
+               mathcursor->script((action == LFUN_SUPERSCRIPT));
                updateLocal(bv, true);
                break;
        }
 
        case LFUN_MATH_DELIM:
        {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               static const string vdelim("(){}[]./|");
-               //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
-
-               if (arg.empty())
-                       break;
-
-               // try to read integers first
-               int ilt = '(';
-               int irt = '.';
+               lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
+               string ls;
+               string rs;
                istringstream is(arg.c_str());
-               is >> ilt >> irt;
-
-               if (!is) { // ok, the beasties are no integers... try something else
-                       ilt = '(';
-                       irt = '.';
-
-                       istringstream is(arg.c_str());
-                       string lt;
-                       string rt;
-                       is >> lt >> rt;
-                       //lyxerr << "formulabase::LFUN_MATH_DELIM, lt: '" << lt << "'\n";
-                       //lyxerr << "formulabase::LFUN_MATH_DELIM, rt: '" << rt << "'\n";
-
-                       if (lt.size() > 1) {
-                               latexkeys const * l = in_word_set(lt);
-                               if (l)
-                                       ilt = l->id;
-                       } else if (vdelim.find(lt[0]) != string::npos)
-                                       ilt = lt[0];
-
-                       if (rt.size() > 1) {
-                               latexkeys const * l = in_word_set(rt);
-                               if (l)
-                                       irt = l->id;
-                       } else if (vdelim.find(rt[0]) != string::npos)
-                                       irt = rt[0];
+               is >> ls >> rs;
+               if (!is) {
+                       lyxerr << "can't parse delimeters from '" << arg << "'\n";
+                       break;
                }
-
-               handleDelim(bv, ilt, irt);
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               mathcursor->handleDelim(ls, rs);
                updateLocal(bv, true);
                break;
        }
 
        case LFUN_PROTECTEDSPACE:
                //lyxerr << " called LFUN_PROTECTEDSPACE\n";
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               mathcursor->insert(new MathSpaceInset(1));
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               mathcursor->insert(MathAtom(new MathSpaceInset(1)));
                updateLocal(bv, true);
                break;
 
@@ -648,218 +658,78 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
 
 
        case LFUN_MATH_HALIGN:
-       {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               lyxerr << "handling halign '" << arg << "'\n";
-               int idx;
-               MathArrayInset * p = matrixpar(idx);
-               if (!p)
-                       break; 
-               p->halign(arg.size() ? arg[0] : 'c', p->col(idx));
-               updateLocal(bv, true);
-               break;
-       }
-
        case LFUN_MATH_VALIGN:
+       case LFUN_MATH_ROW_INSERT:
+       case LFUN_MATH_ROW_DELETE:
+       case LFUN_MATH_COLUMN_INSERT:
+       case LFUN_MATH_COLUMN_DELETE:
        {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               lyxerr << "handling valign '" << arg << "'\n";
-               int idx;
-               MathArrayInset * p = matrixpar(idx);
-               if (!p)
-                       break; 
-               p->valign(arg.size() ? arg[0] : 'c');
-               updateLocal(bv, true);
+               MathInset::idx_type idx = 0;
+               MathGridInset * p = mathcursor ? mathcursor->enclosingGrid(idx) : 0;
+               if (p) {
+                       mathcursor->popToEnclosingGrid();
+                       bv->lockedInsetStoreUndo(Undo::EDIT);
+                       char align = arg.size() ? arg[0] : 'c';
+                       switch (action) {
+                               case LFUN_MATH_HALIGN: p->halign(align, p->col(idx)); break;
+                               case LFUN_MATH_VALIGN: p->valign(align); break;
+                               case LFUN_MATH_ROW_INSERT: p->addRow(p->row(idx)); break;
+                               case LFUN_MATH_ROW_DELETE: p->delRow(p->row(idx)); break;
+                               case LFUN_MATH_COLUMN_INSERT: p->addCol(p->col(idx)); break;
+                               case LFUN_MATH_COLUMN_DELETE: p->delCol(p->col(idx)); break;
+                               default: ;
+                       }
+                       updateLocal(bv, true);
+               }
                break;
        }
 
-       case LFUN_MATH_ROW_INSERT:
-       {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               int idx;
-               MathArrayInset * p = matrixpar(idx);
-               lyxerr << " calling LFUN_MATH_ROW_INSERT on " << p << endl;
-               if (!p)
-                       break; 
-               p->addRow(p->row(idx));
-               updateLocal(bv, true);
+       case LFUN_EXEC_COMMAND:
+               result = UNDISPATCHED;
                break;
-       }
 
-       case LFUN_MATH_ROW_DELETE:
-       {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               int idx;
-               MathArrayInset * p = matrixpar(idx);
-               lyxerr << " calling LFUN_MATH_ROW_DELETE on " << p << endl;
-               if (!p)
-                       break; 
-               p->delRow(p->row(idx));
-               updateLocal(bv, true);
+       case LFUN_BREAKPARAGRAPH:
+       case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+               //lyxerr << "LFUN ignored\n";
                break;
-       }
 
-       case LFUN_MATH_COLUMN_INSERT:
-       {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               int idx;
-               MathArrayInset * p = matrixpar(idx);
-               if (!p)
-                       break; 
-               p->addCol(p->col(idx));
+       case LFUN_INSET_ERT:
+               // interpret this as if a backslash was typed
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               mathcursor->interpret("\\");
                updateLocal(bv, true);
                break;
-       }
 
-       case LFUN_MATH_COLUMN_DELETE:
-       {
-               bv->lockedInsetStoreUndo(Undo::INSERT);
-               int idx;
-               MathArrayInset * p = matrixpar(idx);
-               if (!p)
-                       break; 
-               p->delCol(p->col(idx));
-               updateLocal(bv, true);
+       case -1:
+       case LFUN_INSERT_MATH:
+       case LFUN_SELFINSERT:
+               if (!arg.empty()) {
+                       bv->lockedInsetStoreUndo(Undo::EDIT);
+                       result = mathcursor->interpret(arg) ? DISPATCHED : FINISHED_RIGHT;
+                       updateLocal(bv, true);
+               }
                break;
-       }
 
-       case LFUN_EXEC_COMMAND:
+       case LFUN_MATH_PANEL:
                result = UNDISPATCHED;
                break;
 
-       default:
-               if ((action == -1 || action == LFUN_SELFINSERT) && !arg.empty()) {
-                       unsigned char c = arg[0];
-
-                       lyxerr << "Action: " << action << endl;
-                       
-                       lyxerr << "char: '" << c << "'  int: " << int(c) << endl;
-                       //owner_->getIntl()->getTrans().TranslateAndInsert(c, lt);      
-                       //lyxerr << "trans: '" << c << "'  int: " << int(c) << endl;
-                       bv->lockedInsetStoreUndo(Undo::INSERT);
-
-                       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) {          
-                                       MathTextCodes f = mathcursor->getLastCode() ?
-                                               mathcursor->getLastCode() :
-                                               mathcursor->nextCode();
-                                       varcode = MathIsAlphaFont(f) ?
-                                               static_cast<MathTextCodes>(f) :
-                                               LM_TC_VAR;
-                               }
-                               
-                               //           lyxerr << "Varcode << vardoce;
-                               MathTextCodes 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',
-                                        0,  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)) {
-                               MathTextCodes code = mathcursor->getLastCode();
-                               if (code != LM_TC_TEXTRM)
-                                       code = LM_TC_CONST;
-                               mathcursor->insert(c, code);
-                       } else if (strchr("+/-*<>=", c)) {
-                               MathTextCodes code = mathcursor->getLastCode();
-                               if (code != LM_TC_TEXTRM)
-                                       code = LM_TC_BOP;
-                               mathcursor->insert(c, code);
-                       } else if (strchr(latex_special_chars, c) && c != '_') {
-                               MathTextCodes code = mathcursor->getLastCode();
-                               if (code != LM_TC_TEXTRM)
-                                       code = LM_TC_SPECIAL;
-                               mathcursor->insert(c, code);
-                       } else if (c == '_' || c == '^') {
-                               char s[2];
-                               s[0] = c;
-                               s[1] = 0;
-                               mathcursor->interpret(s);
-                       } else if (c == ' ') {
-                               if (!varcode) { 
-                                       MathTextCodes f = (mathcursor->getLastCode()) ?
-                                               mathcursor->getLastCode() :
-                                               mathcursor->nextCode();
-                                       varcode = MathIsAlphaFont(f) ? f : LM_TC_VAR;
-                               }
-                               
-                               if (varcode == LM_TC_TEXTRM)
-                                       mathcursor->insert(c, LM_TC_TEXTRM);
-                               else if (was_macro)
-                                       mathcursor->macroModeClose();
-                               else if (mathcursor->popRight())
-                                       ;
-                               else {
-                                       // this would not work if the inset is in an table!
-                                       //bv->text->cursorRight(bv, true);
-                                       result = FINISHED;
-                               }
-                       } else if (c == '\'' || c == '@') {
-                               mathcursor->insert(c, LM_TC_VAR);
-                       } else if (c == '\\') {
-                               if (was_macro)
-                                       mathcursor->macroModeClose();
-                               bv->owner()->message(_("TeX mode"));
-                               mathcursor->setLastCode(LM_TC_TEX);
-                       }
-                       updateLocal(bv, true);
-               } else if (action == LFUN_MATH_PANEL) {
+       case LFUN_ESCAPE:
+               if (mathcursor->selection())
+                       mathcursor->selClear();
+               else
                        result = UNDISPATCHED;
-               } else {
-                       lyxerr << "Closed by action " << action << endl;
-                       result =  FINISHED;
-               }
+               break;
+
+       default:
+               result = UNDISPATCHED;
        }
 
        mathcursor->normalize();
+       mathcursor->touch();
+
+       lyx::Assert(mathcursor);
 
-       if (was_macro != mathcursor->inMacroMode()
-                               && action >= 0 && action != LFUN_BACKSPACE) 
-               updateLocal(bv, true);
-       
        if (mathcursor->selection() || was_selection)
                toggleInsetSelection(bv);
 
@@ -869,69 +739,203 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        else
                bv->unlockInset(this);
 
+       revealCodes(bv);
+
        return result;  // original version
 }
 
 
+void InsetFormulaBase::revealCodes(BufferView * /*bv*/) const
+{
+       if (!mathcursor)
+               return;
+#if 0
+       // write something to the minibuffer
+       // translate to latex
+       mathcursor->markInsert();
+       ostringstream os;
+       write(NULL, os);
+       string str = os.str();
+       mathcursor->markErase();
+       string::size_type pos = 0;
+       string res;
+       for (string::iterator it = str.begin(); it != str.end(); ++it) {
+               if (*it == '\n')
+                       res += ' ';
+               else if (*it == '\0') {
+                       res += "  -X-  ";
+                       pos = it - str.begin();
+               }
+               else
+                       res += *it;
+       }
+       if (pos > 30)
+               res = res.substr(pos - 30);
+       if (res.size() > 60)
+               res = res.substr(0, 60);
+       bv->owner()->message(res);
+#endif
+}
+
+
 Inset::Code InsetFormulaBase::lyxCode() const
 {
        return Inset::MATH_CODE;
 }
 
 
+int InsetFormulaBase::ylow() const
+{
+       return yo_ - ascent(view_, font_);
+}
+
+
+int InsetFormulaBase::yhigh() const
+{
+       return yo_ + descent(view_, font_);
+}
+
+
+int InsetFormulaBase::xlow() const
+{
+       return xo_;
+}
+
+
+int InsetFormulaBase::xhigh() const
+{
+       return xo_ + width(view_, font_);
+}
+
+
+/////////////////////////////////////////////////////////////////////
+
+
+bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
+                                    bool, bool)
+{
+#ifdef WITH_WARNINGS
+#warning pretty ugly
+#endif
+       static InsetFormulaBase * lastformula = 0;
+       static MathIterator current = MathIterator(ibegin(par().nucleus()));
+       static MathArray ar;
+       static string laststr;
+
+       if (lastformula != this || laststr != str) {
+               //lyxerr << "reset lastformula to " << this << "\n";
+               lastformula = this;
+               laststr = str;
+               current = ibegin(par().nucleus());
+               ar.clear();
+               mathed_parse_cell(ar, str);
+       } else {
+               ++current;
+       }
+       //lyxerr << "searching '" << str << "' in " << this << ar << endl;
+
+       for (MathIterator it = current; it != iend(par().nucleus()); ++it) {
+               if (it.cell().matchpart(ar, it.position().pos_)) {
+                       mathcursor->setSelection(it.cursor(), ar.size());
+                       current = it;
+                       it.jump(ar.size());
+                       // I guess some of the following can go
+                       bv->toggleSelection(true);
+                       hideInsetCursor(bv);
+                       updateLocal(bv, true);
+                       showInsetCursor(bv);
+                       metrics(bv);
+                       return true;
+               }
+       }
+
+       //lyxerr << "not found!\n";
+       lastformula = 0;
+       // we have to unlock ourself in this function by default!
+       // don't ask me why...
+       bv->unlockInset(this);
+       return false;
+}
+
+
+bool InsetFormulaBase::searchBackward(BufferView * bv, string const & what,
+                                     bool a, bool b)
+{
+       lyxerr << "searching backward not implemented in mathed" << endl;
+       return searchForward(bv, what, a, b);
+}
+
+
+/////////////////////////////////////////////////////////////////////
+
+
 void mathDispatchCreation(BufferView * bv, string const & arg, bool display)
 {
        if (bv->available()) {
-// Feature "Read math inset from selection" disabled.
-//             // use selection if available..
-//             string sel;
-//             if (action == LFUN_MATH_IMPORT_SELECTION)
-//                     sel = "";
-//             else
-//                     sel = bv->getLyXText()->selectionAsString(bv->buffer());
-
-                       InsetFormula * f;
-//             if (sel.empty()) {
-                               f = new InsetFormula;
-                               if (openNewInset(bv, f)) {
-                                       // don't do that also for LFUN_MATH_MODE unless you want end up with
-                                       // always changing to mathrm when opening an inlined inset
-                                       // -- I really hate "LyXfunc overloading"...
-                                       if (display)
-                                               f->localDispatch(bv, LFUN_MATH_DISPLAY, string());
-                                       f->localDispatch(bv, LFUN_INSERT_MATH, arg);
-                               }
-//             } else {
-//                     f = new InsetFormula(sel);
-//                     bv->getLyXText()->cutSelection(bv);
-//                     openNewInset(bv, f);
-//             }
+               // use selection if available..
+               //string sel;
+               //if (action == LFUN_MATH_IMPORT_SELECTION)
+               //      sel = "";
+               //else
+
+               string sel = bv->getLyXText()->selectionAsString(bv->buffer(), false);
+
+               InsetFormulaBase * f;
+               if (sel.empty()) {
+                       f = new InsetFormula;
+                       if (openNewInset(bv, f)) {
+                               // don't do that also for LFUN_MATH_MODE unless you want end up with
+                               // always changing to mathrm when opening an inlined inset
+                               // -- I really hate "LyXfunc overloading"...
+                               if (display)
+                                       f->localDispatch(bv, LFUN_MATH_DISPLAY, string());
+                               f->localDispatch(bv, LFUN_INSERT_MATH, arg);
+                       }
+               } else {
+                       // create a macro if we see "\\newcommand" somewhere, and an ordinary
+                       // formula otherwise
+                       if (sel.find("\\newcommand") == string::npos &&
+                                 sel.find("\\def") == string::npos)
+                               f = new InsetFormula(sel);
+                       else {
+                               string name;
+                               if (!mathed_parse_macro(name, sel))
+                                       return;
+                               f = new InsetFormulaMacro(sel);
+                       }
+                       bv->getLyXText()->cutSelection(bv);
+                       openNewInset(bv, f);
+               }
        }
        bv->owner()->getLyXFunc()->setMessage(N_("Math editor mode"));
 }
 
+
 void mathDispatchMathDisplay(BufferView * bv, string const & arg)
 {
        mathDispatchCreation(bv, arg, true);
 }
-       
+
+
 void mathDispatchMathMode(BufferView * bv, string const & arg)
 {
        mathDispatchCreation(bv, arg, false);
 }
 
+
 void mathDispatchMathImportSelection(BufferView * bv, string const & arg)
 {
        mathDispatchCreation(bv, arg, true);
 }
 
+
 void mathDispatchMathMacro(BufferView * bv, string const & arg)
 {
        if (bv->available()) {
                if (arg.empty())
                        bv->owner()->getLyXFunc()->setErrorMessage(N_("Missing argument"));
                else {
-                       string s(arg);
+                       string s = arg;
                        string const s1 = token(s, ' ', 1);
                        int const na = s1.empty() ? 0 : lyx::atoi(s1);
                        openNewInset(bv, new InsetFormulaMacro(token(s, ' ', 0), na));
@@ -939,30 +943,49 @@ void mathDispatchMathMacro(BufferView * bv, string const & arg)
        }
 }
 
+
 void mathDispatchMathDelim(BufferView * bv, string const & arg)
-{         
-       if (bv->available()) { 
+{
+       if (bv->available()) {
                if (openNewInset(bv, new InsetFormula))
                        bv->theLockingInset()->localDispatch(bv, LFUN_MATH_DELIM, arg);
        }
-}         
+}
 
 
 void mathDispatchInsertMatrix(BufferView * bv, string const & arg)
-{         
-       if (bv->available()) { 
+{
+       if (bv->available()) {
                if (openNewInset(bv, new InsetFormula))
                        bv->theLockingInset()->localDispatch(bv, LFUN_INSERT_MATRIX, arg);
        }
-}         
+}
+
 
 void mathDispatchInsertMath(BufferView * bv, string const & arg)
 {
        if (bv->available()) {
-               if (arg.size() && arg[0] == '\\')
-                       openNewInset(bv, new InsetFormula(arg));
-               else
+               if (arg.size() && arg[0] == '\\') {
+                       InsetFormula * f = new InsetFormula(arg);
+                       if (!bv->insertInset(f))
+                               delete f;
+               } else
                        mathDispatchMathMode(bv, arg);
        }
 }
 
+
+void mathDispatchGreek(BufferView * bv, string const & arg)
+{
+       if (bv->available()) {
+               InsetFormula * f = new InsetFormula;
+               if (openNewInset(bv, f)) {
+                       bv->theLockingInset()->localDispatch(bv, LFUN_GREEK, arg);
+                       bv->unlockInset(f);
+               }
+       }
+}
+
+
+void mathDispatch(BufferView *, kb_action, string const &)
+{}