#include "math_support.h"
#include "BufferView.h"
+#include "CutAndPaste.h"
+#include "LColor.h"
+#include "LaTeXFeatures.h"
#include "cursor.h"
-#include "dispatchresult.h"
#include "debug.h"
+#include "dispatchresult.h"
#include "funcrequest.h"
#include "gettext.h"
-#include "LaTeXFeatures.h"
-#include "LColor.h"
+#include "lyx_main.h"
#include "lyxrc.h"
#include "outputparams.h"
#include "textpainter.h"
+#include "undo.h"
+
+#include "insets/render_preview.h"
#include "frontends/Alert.h"
-#include "support/std_sstream.h"
+#include "graphics/PreviewImage.h"
+#include "graphics/PreviewLoader.h"
+
+#include <boost/bind.hpp>
+#include <sstream>
+
+using lyx::cap::grabAndEraseSelection;
using std::endl;
using std::max;
MathHullInset::MathHullInset()
- : MathGridInset(1, 1), type_("none"), nonum_(1), label_(1)
+ : MathGridInset(1, 1), type_("none"), nonum_(1), label_(1),
+ preview_(new RenderPreview(this))
{
- // This is needed as long the math parser is not re-entrant
- initMath();
//lyxerr << "sizeof MathInset: " << sizeof(MathInset) << endl;
//lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
//lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << endl;
MathHullInset::MathHullInset(string const & type)
- : MathGridInset(getCols(type), 1), type_(type), nonum_(1), label_(1)
+ : MathGridInset(getCols(type), 1), type_(type), nonum_(1), label_(1),
+ preview_(new RenderPreview(this))
{
setDefaults();
}
+MathHullInset::MathHullInset(MathHullInset const & other)
+ : MathGridInset(other),
+ type_(other.type_), nonum_(other.nonum_), label_(other.label_),
+ preview_(new RenderPreview(this))
+{}
+
+
+MathHullInset::~MathHullInset()
+{}
+
+
auto_ptr<InsetBase> MathHullInset::clone() const
{
return auto_ptr<InsetBase>(new MathHullInset(*this));
}
+void MathHullInset::operator=(MathHullInset const & other)
+{
+ if (this == &other)
+ return;
+ *static_cast<MathGridInset*>(this) = MathGridInset(other);
+ type_ = other.type_;
+ nonum_ = other.nonum_;
+ label_ = other.label_;
+ preview_.reset(new RenderPreview(*other.preview_, this));
+}
+
+
MathInset::mode_type MathHullInset::currentMode() const
{
if (type_ == "none")
void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ BOOST_ASSERT(mi.base.bv && mi.base.bv->buffer());
+
+ bool use_preview = false;
+ if (!editing(mi.base.bv) &&
+ RenderPreview::status() == LyXRC::PREVIEW_ON) {
+ lyx::graphics::PreviewImage const * pimage =
+ preview_->getPreviewImage(*mi.base.bv->buffer());
+ use_preview = pimage && pimage->image();
+ }
+
+ if (use_preview) {
+ preview_->metrics(mi, dim);
+ // insert a one pixel gap in front of the formula
+ dim.wid += 1;
+ if (display())
+ dim.des += 12;
+ dim_ = dim;
+ return;
+ }
+
FontSetChanger dummy1(mi.base, standardFont());
StyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
dim.asc = max(dim.asc, asc);
dim.des = max(dim.des, des);
- // for markers
- metricsMarkers2(dim);
dim_ = dim;
}
void MathHullInset::draw(PainterInfo & pi, int x, int y) const
{
+ BOOST_ASSERT(pi.base.bv && pi.base.bv->buffer());
+
+ bool use_preview = false;
+ if (!editing(pi.base.bv) &&
+ RenderPreview::status() == LyXRC::PREVIEW_ON) {
+ lyx::graphics::PreviewImage const * pimage =
+ preview_->getPreviewImage(*pi.base.bv->buffer());
+ use_preview = pimage && pimage->image();
+ }
+
+ if (use_preview) {
+ // one pixel gap in front
+ preview_->draw(pi, x + 1, y);
+ setPosCache(pi, x, y);
+ return;
+ }
+
FontSetChanger dummy1(pi.base, standardFont());
StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
MathGridInset::draw(pi, x + 1, y);
drawStr(pi, pi.base.font, xx, yy, nicelabel(row));
}
}
-
- drawMarkers2(pi, x, y);
+ setPosCache(pi, x, y);
}
}
+namespace {
+
+string const latex_string(MathHullInset const & inset)
+{
+ ostringstream ls;
+ WriteStream wi(ls, false, false);
+ inset.write(wi);
+ return ls.str();
+}
+
+} // namespace anon
+
+
+void MathHullInset::addPreview(lyx::graphics::PreviewLoader & ploader) const
+{
+ if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
+ string const snippet = latex_string(*this);
+ preview_->addPreview(snippet, ploader);
+ }
+}
+
+
+void MathHullInset::notifyCursorLeaves(LCursor & cur)
+{
+ if (RenderPreview::status() != LyXRC::PREVIEW_ON)
+ return;
+
+ Buffer const & buffer = cur.buffer();
+ string const snippet = latex_string(*this);
+ preview_->addPreview(snippet, buffer);
+ preview_->startLoading(buffer);
+}
+
+
string MathHullInset::label(row_type row) const
{
row_type n = nrows();
}
-void MathHullInset::doExtern(LCursor & cur, FuncRequest const & func)
+void MathHullInset::doExtern(LCursor & cur, FuncRequest & func)
{
string lang;
string extra;
size_type pos = cur.cell().find_last(eq);
MathArray ar;
if (cur.inMathed() && cur.selection()) {
- asArray(cur.grabAndEraseSelection(), ar);
+ asArray(grabAndEraseSelection(cur), ar);
} else if (pos == cur.cell().size()) {
ar = cur.cell();
lyxerr << "use whole cell: " << ar << endl;
}
-DispatchResult
-MathHullInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
{
- //lyxerr << "*** MathHullInset: request: " << cmd << endl;
switch (cmd.action) {
- case LFUN_BREAKLINE:
- if (type_ == "simple" || type_ == "equation") {
- mutate("eqnarray");
- cur.idx() = 1;
- cur.pos() = 0;
- return DispatchResult(true, FINISHED);
- }
- return MathGridInset::priv_dispatch(cur, cmd);
-
- case LFUN_MATH_NUMBER:
- //lyxerr << "toggling all numbers" << endl;
- if (display()) {
- ////recordUndo(cur, Undo::INSERT);
- bool old = numberedType();
- if (type_ == "multline")
- numbered(nrows() - 1, !old);
- else
- for (row_type row = 0; row < nrows(); ++row)
- numbered(row, !old);
- cur.message(old ? _("No number") : _("Number"));
- }
- return DispatchResult(true, true);
-
- case LFUN_MATH_NONUMBER:
- if (display()) {
- row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
- ////recordUndo(cur, Undo::INSERT);
- bool old = numbered(r);
- cur.message(old ? _("No number") : _("Number"));
- numbered(r, !old);
- }
- return DispatchResult(true, true);
+ case LFUN_FINISHED_LEFT:
+ case LFUN_FINISHED_RIGHT:
+ case LFUN_FINISHED_UP:
+ case LFUN_FINISHED_DOWN:
+ MathGridInset::priv_dispatch(cur, cmd);
+ notifyCursorLeaves(cur);
+ break;
+
+ case LFUN_BREAKPARAGRAPH:
+ // just swallow this
+ break;
+
+ case LFUN_BREAKLINE:
+ if (type_ == "simple" || type_ == "equation") {
+ recordUndoInset(cur);
+ mutate("eqnarray");
+ cur.idx() = 0;
+ cur.pos() = cur.lastpos();
+ break;
+ }
+ MathGridInset::priv_dispatch(cur, cmd);
+ break;
+
+ case LFUN_MATH_NUMBER:
+ //lyxerr << "toggling all numbers" << endl;
+ if (display()) {
+ recordUndoInset(cur);
+ bool old = numberedType();
+ if (type_ == "multline")
+ numbered(nrows() - 1, !old);
+ else
+ for (row_type row = 0; row < nrows(); ++row)
+ numbered(row, !old);
+ cur.message(old ? _("No number") : _("Number"));
+ }
+ break;
- case LFUN_INSERT_LABEL: {
+ case LFUN_MATH_NONUMBER:
+ if (display()) {
+ recordUndoInset(cur);
row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
- string old_label = label(r);
- string new_label = cmd.argument;
-
- if (new_label.empty()) {
- string const default_label =
- (lyxrc.label_init_length >= 0) ? "eq:" : "";
- pair<bool, string> const res = old_label.empty()
- ? Alert::askForText(_("Enter new label to insert:"), default_label)
- : Alert::askForText(_("Enter label:"), old_label);
- if (!res.first)
- return DispatchResult(false);
- new_label = lyx::support::trim(res.second);
- }
-
- //if (new_label == old_label)
- // break; // Nothing to do
-
- if (!new_label.empty())
- numbered(r, true);
- label(r, new_label);
- return DispatchResult(true, true);
+ bool old = numbered(r);
+ cur.message(old ? _("No number") : _("Number"));
+ numbered(r, !old);
}
-
- case LFUN_MATH_EXTERN:
- doExtern(cur, cmd);
- return DispatchResult(true, FINISHED);
-
- case LFUN_MATH_MUTATE: {
- lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
- row_type r = cur.row();
- col_type c = cur.col();
- mutate(cmd.argument);
- cur.idx() = r * ncols() + c;
- if (cur.idx() >= nargs())
- cur.idx() = nargs() - 1;
- if (cur.pos() > cur.lastpos())
- cur.pos() = cur.lastpos();
- return DispatchResult(true, FINISHED);
+ break;
+
+ case LFUN_INSERT_LABEL: {
+ recordUndoInset(cur);
+ row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
+ string old_label = label(r);
+ string new_label = cmd.argument;
+
+ if (new_label.empty()) {
+ string const default_label =
+ (lyxrc.label_init_length >= 0) ? "eq:" : "";
+ pair<bool, string> const res = old_label.empty()
+ ? Alert::askForText(_("Enter new label to insert:"), default_label)
+ : Alert::askForText(_("Enter label:"), old_label);
+ new_label = lyx::support::trim(res.second);
}
- case LFUN_MATH_DISPLAY: {
- mutate(type_ == "simple" ? "equation" : "simple");
- cur.idx() = 0;
+ if (!new_label.empty())
+ numbered(r, true);
+ label(r, new_label);
+ break;
+ }
+
+ case LFUN_MATH_EXTERN:
+ recordUndoInset(cur);
+ doExtern(cur, cmd);
+ break;
+
+ case LFUN_MATH_MUTATE: {
+ recordUndoInset(cur);
+ row_type row = cur.row();
+ col_type col = cur.col();
+ mutate(cmd.argument);
+ cur.idx() = row * ncols() + col;
+ if (cur.idx() > cur.lastidx()) {
+ cur.idx() = cur.lastidx();
cur.pos() = cur.lastpos();
- return DispatchResult(true, FINISHED);
}
+ if (cur.pos() > cur.lastpos())
+ cur.pos() = cur.lastpos();
+ //cur.dispatched(FINISHED);
+ break;
+ }
+
+ case LFUN_MATH_DISPLAY: {
+ recordUndoInset(cur);
+ mutate(type_ == "simple" ? "equation" : "simple");
+ cur.idx() = 0;
+ cur.pos() = cur.lastpos();
+ //cur.dispatched(FINISHED);
+ break;
+ }
- default:
- return MathGridInset::priv_dispatch(cur, cmd);
+ default:
+ MathGridInset::priv_dispatch(cur, cmd);
+ break;
}
}
-string MathHullInset::fileInsetLabel() const
+bool MathHullInset::getStatus(LCursor & cur, FuncRequest const & cmd,
+ FuncStatus & flag) const
{
- return "Formula";
+ switch (cmd.action) {
+ case LFUN_BREAKLINE:
+ case LFUN_MATH_NUMBER:
+ case LFUN_MATH_NONUMBER:
+ case LFUN_INSERT_LABEL:
+ case LFUN_MATH_EXTERN:
+ case LFUN_MATH_MUTATE:
+ case LFUN_MATH_DISPLAY:
+ // we handle these
+ return true;
+ default:
+ return MathGridInset::getStatus(cur, cmd, flag);
+ }
}
/////////////////////////////////////////////////////////////////////
-#include "formulamacro.h"
#include "math_arrayinset.h"
#include "math_deliminset.h"
#include "math_factory.h"
#include "bufferview_funcs.h"
#include "lyxtext.h"
-#include "undo.h"
#include "frontends/LyXView.h"
#include "frontends/Dialogs.h"
-#include "support/std_sstream.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
-int MathHullInset::ylow() const
-{
- return yo_ - dim_.asc;
-}
-
-
-int MathHullInset::yhigh() const
-{
- return yo_ + dim_.des;
-}
-
-
-int MathHullInset::xlow() const
-{
- return xo_;
-}
-
-
-int MathHullInset::xhigh() const
-{
- return xo_ + dim_.wid;
-}
-
-
// simply scrap this function if you want
void MathHullInset::mutateToText()
{
}
-void MathHullInset::handleFont
- (LCursor & cur, string const & arg, string const & font)
+void MathHullInset::handleFont(LCursor & cur, string const & arg,
+ string const & font)
{
// this whole function is a hack and won't work for incremental font
// changes...
- //recordUndo(cur, Undo::ATOMIC);
-
- if (cur.inset()->asMathInset()->name() == font)
+ recordUndo(cur);
+ if (cur.inset().asMathInset()->name() == font)
cur.handleFont(font);
else {
cur.handleNest(createMathInset(font));
void MathHullInset::handleFont2(LCursor & cur, string const & arg)
{
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur);
LyXFont font;
bool b;
bv_funcs::string2font(arg, font, b);
}
-string const MathHullInset::editMessage() const
+void MathHullInset::edit(LCursor & cur, bool left)
{
- return _("Math editor mode");
+ cur.push(*this);
+ left ? idxFirst(cur) : idxLast(cur);
}
-void MathHullInset::insetUnlock(BufferView & bv)
+string const MathHullInset::editMessage() const
{
- if (bv.cursor().inMathed()) {
- if (bv.cursor().inMacroMode())
- bv.cursor().macroModeClose();
- }
- if (bv.buffer())
- generatePreview(*bv.buffer());
- bv.update();
+ return _("Math editor mode");
}
/////////////////////////////////////////////////////////////////////
-#if 1
-bool MathHullInset::searchForward(BufferView *, string const &, bool, bool)
-{
- return false;
-}
-
-#else
+#if 0
bool MathHullInset::searchForward(BufferView * bv, string const & str,
bool, bool)
{
- return false;
#ifdef WITH_WARNINGS
-#warning pretty ugly
+#warning completely broken
#endif
static MathHullInset * lastformula = 0;
- static CursorBase current = CursorBase(ibegin(nucleus()));
+ static CursorBase current = DocIterator(ibegin(nucleus()));
static MathArray ar;
static string laststr;
}
//lyxerr << "searching '" << str << "' in " << this << ar << endl;
- for (CursorBase it = current; it != iend(nucleus()); increment(it)) {
+ for (DocIterator it = current; it != iend(nucleus()); increment(it)) {
CursorSlice & top = it.back();
MathArray const & a = top.asMathInset()->cell(top.idx_);
if (a.matchpart(ar, top.pos_)) {
#endif
-bool MathHullInset::searchBackward(BufferView * bv, string const & what,
- bool a, bool b)
-{
- lyxerr[Debug::MATHED]
- << "searching backward not implemented in mathed" << endl;
- return searchForward(bv, what, a, b);
-}
-
-
void MathHullInset::write(Buffer const &, std::ostream & os) const
{
WriteStream wi(os, false, false);
- os << fileInsetLabel() << ' ';
+ os << "Formula ";
write(wi);
}
}
-int MathHullInset::latex(Buffer const &, ostream & os,
- OutputParams const & runparams) const
-{
- WriteStream wi(os, runparams.moving_arg, true);
- write(wi);
- return wi.line();
-}
-
-
int MathHullInset::plaintext(Buffer const &, ostream & os,
OutputParams const &) const
{
OutputParams const & runparams) const
{
MathMLStream ms(os);
- ms << MTag("equation");
+ string name="equation";
+ if (! label(0).empty()) name += " id=\"" + label(0)+ "\"";
+ ms << MTag(name.c_str());
ms << MTag("alt");
ms << "<[CDATA[";
int res = plaintext(buf, ms.os(), runparams);
projects / features.git / blobdiff