]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/formulabase.C
make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.
[lyx.git] / src / mathed / formulabase.C
index 27430ac5e2cd72f859eb5b716128c20e30ab883d..3eb3d1eceaf844de197abaab9b065e532e11d59d 100644 (file)
 #include "LyXView.h"
 #include "Painter.h"
 #include "font.h"
-#include "math_cursor.h"
 #include "math_arrayinset.h"
-#include "math_spaceinset.h"
-#include "math_macrotable.h"
+#include "math_cursor.h"
 #include "math_factory.h"
+#include "math_hullinset.h"
+#include "math_iterator.h"
+#include "math_macrotable.h"
 #include "math_parser.h"
+#include "math_pos.h"
+#include "math_spaceinset.h"
 #include "undo_funcs.h"
 
 using std::endl;
@@ -57,6 +60,9 @@ namespace {
 // local global
 int first_x;
 int first_y;
+int hack_x;
+int hack_y;
+int hack_button;
 
 
 void handleFont(BufferView * bv, MathTextCodes t) 
@@ -109,6 +115,7 @@ void InsetFormulaBase::metrics(BufferView * bv, LyXFont const & f) const
        metrics(bv);
 }
 
+
 void InsetFormulaBase::metrics(BufferView * bv) const 
 {
        if (bv)
@@ -130,9 +137,16 @@ void InsetFormulaBase::edit(BufferView * bv, int x, int /*y*/, unsigned int)
                lyxerr[Debug::MATHED] << "Cannot lock inset!!!" << endl;
 
        //lyxerr << "edit: " << x  << " " << y << " button: " << button << "\n";
-       if (!mathcursor)
+       if (!mathcursor) {
                mathcursor = new MathCursor(this, x == 0);
-       metrics(bv);
+               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);
@@ -164,7 +178,7 @@ void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
 {
        mathcursor->getPos(x, y);
        x += xo_;
-       y += yo_ - 3;
+       y += yo_;
        //lyxerr << "getCursorPos: " << x << " " << y << "\n";
 }
 
@@ -181,7 +195,6 @@ void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
                int x;
                int y;
                mathcursor->getPos(x, y);
-               y -= 3;
                y -= yo_;
                int asc = 0;
                int des = 0;
@@ -200,16 +213,17 @@ void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
        if (isCursorVisible())
                return;
        if (mathcursor) {
+               metrics(bv);
                int x;
                int y;
                mathcursor->getPos(x, y);
+               y -= yo_;
                int asc = 0;
                int des = 0;
                MathMetricsInfo mi(bv, font_, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
                math_font_max_dim(LM_TC_TEXTRM, mi, asc, des);
-               //bv->fitLockedInsetCursor(x, y, asc, des);
-               //metrics(bv);
-               //lyxerr << "showInsetCursor: " << x << " " << y << "\n";
+               bv->fitLockedInsetCursor(x, y, asc, des);
+               //lyxerr << "showInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
        }
        toggleInsetCursor(bv);
 }
@@ -242,23 +256,32 @@ void InsetFormulaBase::updateLocal(BufferView * bv, bool 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)
-               return;
+               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)
 {
-       //lyxerr << "insetButtonPress: " << x + xo_ << " " << y + yo_
-       //      << " but: " << button << "\n";
+       // 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:
@@ -270,6 +293,7 @@ void InsetFormulaBase::insetButtonPress(BufferView * bv,
                                mathcursor->setPos(x + xo_, y + yo_);
                        }
                        break;
+/*
                case 2:
                        lyxerr << "insetButtonPress: 2\n";
                        // insert stuff
@@ -284,6 +308,7 @@ void InsetFormulaBase::insetButtonPress(BufferView * bv,
                                mathcursor->insert(ar);
                        }       
                        break;
+*/
        }
        bv->updateInset(this, false);
 }
@@ -494,6 +519,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        case LFUN_CODE:         handleFont(bv, LM_TC_TT); break;
        case LFUN_NOUN:         handleFont(bv, LM_TC_BB); break;
        case LFUN_DEFAULT:      handleFont(bv, LM_TC_VAR); break;
+       case LFUN_FREE:         handleFont(bv, LM_TC_TEXTRM); break;
 
        case LFUN_GREEK: 
                handleFont(bv, LM_TC_GREEK1);
@@ -502,7 +528,11 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                break;
 
        case LFUN_MATH_MODE:
-               handleFont(bv, LM_TC_TEXTRM);
+               //handleFont(bv, LM_TC_TEXTRM);
+
+               //mathcursor->niceInsert(MathAtom(new MathHullInset(LM_OT_SIMPLE)));
+               //updateLocal(bv, true);
+
                //bv->owner()->message(_("math text mode toggled"));
                break;
 
@@ -537,10 +567,19 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                updateLocal(bv, true);
                break;
        }
-
+       
+       case LFUN_SUPERSCRIPT:
+       case LFUN_SUBSCRIPT:
+       {
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               mathcursor->script((action == LFUN_SUPERSCRIPT));
+               updateLocal(bv, true);
+               break;
+       }
+       
        case LFUN_MATH_DELIM:
        {
-               //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
+               lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
                string ls;
                string rs;
                istringstream is(arg.c_str());
@@ -623,10 +662,19 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                result = UNDISPATCHED;
                break;
 
+       case LFUN_ESCAPE:
+               if (mathcursor->selection())
+                       mathcursor->selClear();
+               else
+                       result = UNDISPATCHED;
+               break;
+
        default:
                result = UNDISPATCHED;
        }
 
+       mathcursor->normalize();
+
        lyx::Assert(mathcursor);
 
        if (mathcursor->selection() || was_selection)
@@ -648,18 +696,88 @@ Inset::Code InsetFormulaBase::lyxCode() const
 }
 
 
-int InsetFormulaBase::upperY() const
+int InsetFormulaBase::ylow() const
 {
        return yo_ - ascent(view_, font_);
 }
 
 
-int InsetFormulaBase::lowerY() const
+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 const &, bool const &)
+{
+#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 const & a, bool const & b)
+{
+       lyxerr << "searching backward not implemented in mathed" << endl;
+       return searchForward(bv, what, a, b);
+}
+
+
 /////////////////////////////////////////////////////////////////////
 
 
@@ -734,7 +852,7 @@ void mathDispatchMathMacro(BufferView * bv, string const & arg)
 
 
 void mathDispatchMathDelim(BufferView * bv, string const & arg)
-{         
+{
        if (bv->available()) { 
                if (openNewInset(bv, new InsetFormula))
                        bv->theLockingInset()->localDispatch(bv, LFUN_MATH_DELIM, arg);