#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;
metrics(bv);
}
+
void InsetFormulaBase::metrics(BufferView * bv) const
{
if (bv)
{
mathcursor->getPos(x, y);
x += xo_;
- y += yo_ - 3;
+ y += yo_;
//lyxerr << "getCursorPos: " << x << " " << y << "\n";
}
int x;
int y;
mathcursor->getPos(x, y);
- y -= 3;
y -= yo_;
int asc = 0;
int des = 0;
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);
}
}
-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;
}
return;
}
- //lyxerr << "insetButtonPress: " << x + xo_ << " " << y + yo_
- // << " but: " << button << "\n";
+ lyxerr << "insetButtonPress: " << x + xo_ << " " << y + yo_
+ << " but: " << button << "\n";
switch (button) {
default:
case 1:
hideInsetCursor(bv);
mathcursor->normalize();
-
switch (action) {
// --- Cursor Movements ---------------------------------------------
case LFUN_CARON: handleAccent(bv, "check"); break;
case LFUN_BREVE: handleAccent(bv, "breve"); break;
case LFUN_VECTOR: handleAccent(bv, "vec"); break;
+ case LFUN_UNDERBAR: handleAccent(bv, "underbar"); break;
// Math fonts
case LFUN_GREEK_TOGGLE: handleFont(bv, LM_TC_GREEK); 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_FRAK: handleFont(bv, LM_TC_EUFRAK); break;
+ case LFUN_ITAL: handleFont(bv, LM_TC_IT); 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);
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;
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());
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)
}
-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);
+}
+
+
/////////////////////////////////////////////////////////////////////
void mathDispatchMathDelim(BufferView * bv, string const & arg)
-{
+{
if (bv->available()) {
if (openNewInset(bv, new InsetFormula))
bv->theLockingInset()->localDispatch(bv, LFUN_MATH_DELIM, arg);
projects / lyx.git / blobdiff