* the GNU General Public Licence version 2 or later.
*/
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include <config.h>
void InsetFormula::write(Buffer const *, ostream & os) const
{
WriteStream wi(os, false, false);
- os << par_->fileInsetLabel() << " ";
+ os << par_->fileInsetLabel() << ' ';
par_->write(wi);
}
int InsetFormula::ascii(Buffer const *, ostream & os, int) const
{
- if (display()) {
+ if (0 && display()) {
TextMetricsInfo mi;
par()->metricsT(mi);
TextPainter tpain(par()->width(), par()->height());
MathPainterInfo pi(bv->painter());
if (use_preview) {
- pi.pain.image(x, y - a, w, h,
+ pi.pain.image(x + 1, y - a, w, h, // one pixel gap in front
*(preview_->pimage()->image(*this, *bv)));
} else {
- //pi.base.style = display() ? LM_ST_DISPLAY : LM_ST_TEXT;
pi.base.style = LM_ST_TEXT;
pi.base.font = font;
pi.base.font.setColor(LColor::math);
//pi.pain.rectangle(x, y - a, w, h, LColor::mathframe);
}
- par_->draw(pi, x + 1, y);
+ par_->draw(pi, x, y);
}
xx += w;
}
-UpdatableInset::RESULT
-InsetFormula::localDispatch(FuncRequest const & ev)
-{
- RESULT result = DISPATCHED;
- BufferView * bv = ev.view();
-
- switch (ev.action) {
-
- case LFUN_MATH_MUTATE:
- {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- int x;
- int y;
- mathcursor->getPos(x, y);
- mutate(ev.argument);
- mathcursor->setPos(x, y);
- mathcursor->normalize();
- updateLocal(bv, true);
- break;
- }
-
- case LFUN_MATH_EXTERN:
- {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- if (mathcursor)
- mathcursor->handleExtern(ev.argument);
- // re-compute inset dimension
- metrics(bv);
- updateLocal(bv, true);
- break;
- }
-
- case LFUN_MATH_DISPLAY:
- {
- int x = 0;
- int y = 0;
- mathcursor->getPos(x, y);
- if (hullType() == "simple")
- mutate("equation");
- else
- mutate("simple");
- mathcursor->setPos(x, y);
- mathcursor->normalize();
- updateLocal(bv, true);
- break;
- }
-
- case LFUN_PASTESELECTION:
- {
- string const clip = bv->getClipboard();
- if (!clip.empty())
- mathed_parse_normal(par_, clip);
- break;
- }
-
- default:
- result = InsetFormulaBase::localDispatch(ev);
- }
-
- return result;
-}
-
-
-bool InsetFormula::display() const
-{
- return hullType() != "simple" && hullType() != "none";
-}
-
-
-MathHullInset const * InsetFormula::hull() const
-{
- lyx::Assert(par_->asHullInset());
- return par_->asHullInset();
-}
-
-
-MathHullInset * InsetFormula::hull()
-{
- lyx::Assert(par_->asHullInset());
- return par_.nucleus()->asHullInset();
-}
-
Inset::Code InsetFormula::lyxCode() const
{
return Inset::MATH_CODE;
bool InsetFormula::insetAllowed(Inset::Code code) const
{
return
- (code == Inset::LABEL_CODE && display())
+ (code == Inset::LABEL_CODE)
|| code == Inset::REF_CODE
|| code == Inset::ERT_CODE;
}
{
metrics(bv, font);
return preview_->previewReady() ?
- preview_->pimage()->width() : par_->width();
-}
-
-
-string InsetFormula::hullType() const
-{
- return par()->getType();
+ 1 + preview_->pimage()->width() : par_->width();
+ // insert a one pixel gap in front of the formula
}
+/*
void InsetFormula::mutate(string const & type)
{
par_.nucleus()->mutate(type);
}
+*/
//
ostringstream ls;
WriteStream wi(ls, false, false);
parent().par_->write(wi);
- return ls.str().c_str();
+ return STRCONV(ls.str());
}