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

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

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 7a54dc02b159e7d92a897e7ddd2946b2b685d95d..3eb3d1eceaf844de197abaab9b065e532e11d59d 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -36,12 +36,15 @@
 #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;
@@ -112,6 +115,7 @@ void InsetFormulaBase::metrics(BufferView * bv, LyXFont const & f) const
        metrics(bv);
 }
 
+
 void InsetFormulaBase::metrics(BufferView * bv) const 
 {
        if (bv)
@@ -219,7 +223,7 @@ void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
                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);
-               //lyxerr << "showInsetCursor: x: " << x << " y: " << y << "\n";
+               //lyxerr << "showInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
        }
        toggleInsetCursor(bv);
 }
@@ -252,15 +256,16 @@ 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;
 }
 
 
@@ -275,8 +280,8 @@ void InsetFormulaBase::insetButtonPress(BufferView * bv,
                return;
        }
 
-       //lyxerr << "insetButtonPress: " << x + xo_ << " " << y + yo_
-       //      << " but: " << button << "\n";
+       lyxerr << "insetButtonPress: " << x + xo_ << " " << y + yo_
+               << " but: " << button << "\n";
        switch (button) {
                default:
                case 1:
@@ -514,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);
@@ -522,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;
 
@@ -713,6 +723,64 @@ int InsetFormulaBase::xhigh() const
 /////////////////////////////////////////////////////////////////////
 
 
+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);
+}
+
+
+/////////////////////////////////////////////////////////////////////
+
+
 void mathDispatchCreation(BufferView * bv, string const & arg, bool display)
 {
        if (bv->available()) {