#include "paragraph_funcs.h"
#include "pariterator.h"
-#include "insets/updatableinset.h"
#include "insets/insettabular.h"
#include "insets/insettext.h"
-#include "mathed/math_data.h"
-#include "mathed/math_inset.h"
-#include "mathed/math_macrotable.h"
+#include "mathed/MathData.h"
+#include "mathed/InsetMath.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/MathMacroTable.h"
+#include "mathed/MathParser.h"
#include "support/limited_stack.h"
-#include "frontends/LyXView.h"
+#include "frontends/Application.h"
#include "frontends/font_metrics.h"
#include <boost/assert.hpp>
#include <sstream>
#include <limits>
+using lyx::char_type;
+using lyx::docstring;
using lyx::pit_type;
using std::string;
using std::isalpha;
#endif
using std::min;
-using std::swap;
+using std::for_each;
namespace {
DocIterator it = c;
it.top().pos() = 0;
DocIterator et = c;
- et.top().pos() = et.top().asMathInset()->cell(et.top().idx()).size();
- for (int i = 0; ; ++i) {
+ et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size();
+ for (size_t i = 0; ; ++i) {
int xo;
int yo;
- LCursor cur = c;
- cur.setCursor(it);
- cur.inset().getCursorPos(cur.top(), xo, yo);
+ InsetBase const * inset = &it.inset();
+ Point o = theCoords.getInsets().xy(inset);
+ inset->cursorPos(it.top(), c.boundary(), xo, yo);
+ // Convert to absolute
+ xo += o.x_;
+ yo += o.y_;
double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
// '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a'
int x, int y, int xlow, int xhigh, int ylow, int yhigh)
{
BOOST_ASSERT(!cursor.empty());
- CursorSlice bottom = cursor[0];
- LyXText * text = bottom.text();
- BOOST_ASSERT(text);
-
- DocIterator it = doc_iterator_begin(bottom.inset());
- DocIterator const et = doc_iterator_end(bottom.inset());
+ InsetBase & inset = cursor[0].inset();
+
+ CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(cursor.bottom().text())->second;
+ // Get an iterator on the first paragraph in the cache
+ DocIterator it(inset);
+ it.push_back(CursorSlice(inset));
+ it.pit() = cache.begin()->first;
+ // Get an iterator after the last paragraph in the cache
+ DocIterator et(inset);
+ et.push_back(CursorSlice(inset));
+ et.pit() = boost::prior(cache.end())->first;
+ if (et.pit() >= et.lastpit())
+ et = doc_iterator_end(inset);
+ else
+ ++et.pit();
double best_dist = std::numeric_limits<double>::max();;
DocIterator best_cursor = et;
- for ( ; it != et; it.forwardPos()) {
+ for ( ; it != et; it.forwardPos(true)) {
// avoid invalid nesting when selecting
- if (bv_funcs::status(&cursor.bv(), it) == bv_funcs::CUR_INSIDE
- && (!cursor.selection() || positionable(it, cursor.anchor_))) {
- Point p = bv_funcs::getPos(it);
+ if (!cursor.selection() || positionable(it, cursor.anchor_)) {
+ Point p = bv_funcs::getPos(it, false);
int xo = p.x_;
int yo = p.y_;
if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
- double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
- //lyxerr << "xo: " << xo << " yo: " << yo << " d: " << d << endl;
+ double const dx = xo - x;
+ double const dy = yo - y;
+ double const d = dx * dx + dy * dy;
// '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a'
if (d <= best_dist) {
- //lyxerr << "*" << endl;
+ // lyxerr << "*" << endl;
best_dist = d;
best_cursor = it;
}
}
}
- //lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
if (best_cursor != et) {
cursor.setCursor(best_cursor);
return true;
return false;
}
+
+ /// moves position closest to (x, y) in given box
+ bool bruteFind3(LCursor & cur, int x, int y, bool up)
+ {
+ BufferView & bv = cur.bv();
+ int ylow = up ? 0 : y + 1;
+ int yhigh = up ? y - 1 : bv.workHeight();
+ int xlow = 0;
+ int xhigh = bv.workWidth();
+
+// FIXME: bit more work needed to get 'from' and 'to' right.
+ pit_type from = cur.bottom().pit();
+ //pit_type to = cur.bottom().pit();
+ //lyxerr << "Pit start: " << from << endl;
+
+ //lyxerr << "bruteFind3: x: " << x << " y: " << y
+ // << " xlow: " << xlow << " xhigh: " << xhigh
+ // << " ylow: " << ylow << " yhigh: " << yhigh
+ // << endl;
+ InsetBase & inset = bv.buffer()->inset();
+ DocIterator it = doc_iterator_begin(inset);
+ it.pit() = from;
+ DocIterator et = doc_iterator_end(inset);
+
+ double best_dist = std::numeric_limits<double>::max();
+ DocIterator best_cursor = et;
+
+ for ( ; it != et; it.forwardPos()) {
+ // avoid invalid nesting when selecting
+ if (bv_funcs::status(&bv, it) == bv_funcs::CUR_INSIDE
+ && (!cur.selection() || positionable(it, cur.anchor_))) {
+ Point p = bv_funcs::getPos(it, false);
+ int xo = p.x_;
+ int yo = p.y_;
+ if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
+ double const dx = xo - x;
+ double const dy = yo - y;
+ double const d = dx * dx + dy * dy;
+ //lyxerr << "itx: " << xo << " ity: " << yo << " d: " << d
+ // << " dx: " << dx << " dy: " << dy
+ // << " idx: " << it.idx() << " pos: " << it.pos()
+ // << " it:\n" << it
+ // << endl;
+ // '<=' in order to take the last possible position
+ // this is important for clicking behind \sum in e.g. '\sum_i a'
+ if (d <= best_dist) {
+ //lyxerr << "*" << endl;
+ best_dist = d;
+ best_cursor = it;
+ }
+ }
+ }
+ }
+
+ //lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
+ if (best_cursor == et)
+ return false;
+ cur.setCursor(best_cursor);
+ return true;
+ }
+
} // namespace anon
// bv functions are not yet available!
LCursor::LCursor(BufferView & bv)
: DocIterator(), bv_(&bv), anchor_(), x_target_(-1),
- selection_(false), mark_(false)
+ selection_(false), mark_(false), logicalpos_(false)
{}
void LCursor::getPos(int & x, int & y) const
{
- Point p = bv_funcs::getPos(*this);
+ Point p = bv_funcs::getPos(*this, boundary());
x = p.x_;
y = p.y_;
}
-void LCursor::paste(string const & data)
-{
- dispatch(FuncRequest(LFUN_PASTE, data));
-}
-
-
void LCursor::resetAnchor()
{
anchor_ = *this;
{
if (!selection())
return *this;
- return anchor() < top() ? anchor_ : *this;
+ DocIterator di = (anchor() < top() ? anchor_ : *this);
+ di.resize(depth());
+ return di;
}
{
if (!selection())
return *this;
- return anchor() > top() ? anchor_ : *this;
+ DocIterator di = (anchor() > top() ? anchor_ : *this);
+ if (di.depth() > depth()) {
+ di.resize(depth());
+ ++di.pos();
+ }
+ return di;
}
void LCursor::setSelection()
{
selection() = true;
- // a selection with no contents is not a selection
+ // A selection with no contents is not a selection
#ifdef WITH_WARNINGS
#warning doesnt look ok
#endif
selection() = false;
mark() = false;
resetAnchor();
- bv().unsetXSel();
}
//
// The part below is the non-integrated rest of the original math
// cursor. This should be either generalized for texted or moved
-// back to mathed (in most cases to MathNestInset).
+// back to mathed (in most cases to InsetMathNest).
//
///////////////////////////////////////////////////////////////////
-#include "mathed/math_charinset.h"
-#include "mathed/math_factory.h"
-#include "mathed/math_gridinset.h"
-#include "mathed/math_macroarg.h"
-#include "mathed/math_mathmlstream.h"
-#include "mathed/math_scriptinset.h"
-#include "mathed/math_support.h"
-#include "mathed/math_unknowninset.h"
+#include "mathed/InsetMathChar.h"
+#include "mathed/MathFactory.h"
+#include "mathed/InsetMathGrid.h"
+#include "mathed/MathMacroArgument.h"
+#include "mathed/MathMLStream.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/MathSupport.h"
+#include "mathed/InsetMathUnknown.h"
//#define FILEDEBUG 1
bool LCursor::isInside(InsetBase const * p)
{
- for (unsigned i = 0; i < depth(); ++i)
+ for (size_t i = 0; i != depth(); ++i)
if (&operator[](i).inset() == p)
return true;
return false;
}
+void LCursor::leaveInset(InsetBase const & inset)
+{
+ for (size_t i = 0; i != depth(); ++i) {
+ if (&operator[](i).inset() == &inset) {
+ resize(i);
+ return;
+ }
+ }
+}
+
+
bool LCursor::openable(MathAtom const & t) const
{
if (!t->isActive())
void LCursor::markInsert()
{
- insert(char(0));
+ insert(char_type(0));
}
void LCursor::insert(string const & str)
{
for_each(str.begin(), str.end(),
- boost::bind(static_cast<void(LCursor::*)(char)>
+ boost::bind(static_cast<void(LCursor::*)(char_type)>
(&LCursor::insert), this, _1));
}
-void LCursor::insert(char c)
+void LCursor::insert(char_type c)
{
//lyxerr << "LCursor::insert char '" << c << "'" << endl;
BOOST_ASSERT(!empty());
if (inMathed()) {
lyx::cap::selClearOrDel(*this);
- insert(new MathCharInset(c));
+ insert(new InsetMathChar(c));
} else {
text()->insertChar(*this, c);
}
// be careful here: don't use 'pushLeft(t)' as this we need to
// push the clone, not the original
pushLeft(*nextInset());
- paste(safe);
+ // We may not use niceInsert here (recursion)
+ MathArray ar;
+ asArray(safe, ar);
+ insert(ar);
}
}
}
if (inMacroMode()) {
- MathUnknownInset * p = activeMacro();
+ InsetMathUnknown * p = activeMacro();
if (p->name().size() > 1) {
p->setName(p->name().substr(0, p->name().size() - 1));
return true;
}
// 'clever' UI hack: only erase large items if previously slected
- if (pos() != lastpos() && inset().nargs() > 0) {
+ if (pos() != lastpos() && nextAtom()->nargs() > 0) {
resetAnchor();
selection() = true;
++pos();
}
-void LCursor::macroModeClose()
+bool LCursor::macroModeClose()
{
if (!inMacroMode())
- return;
- MathUnknownInset * p = activeMacro();
+ return false;
+ InsetMathUnknown * p = activeMacro();
p->finalize();
string const s = p->name();
--pos();
// do nothing if the macro name is empty
if (s == "\\")
- return;
-
- string const name = s.substr(1);
+ return false;
// prevent entering of recursive macros
// FIXME: this is only a weak attempt... only prevents immediate
// recursion
+ string const name = s.substr(1);
InsetBase const * macro = innerInsetOfType(InsetBase::MATHMACRO_CODE);
if (macro && macro->getInsetName() == name)
lyxerr << "can't enter recursive macro" << endl;
- plainInsert(createMathInset(name));
+ InsetMathNest * const in = inset().asInsetMath()->asNestInset();
+ if (in && in->interpret(*this, s))
+ return true;
+ plainInsert(createInsetMath(name));
+ return true;
}
{
if (pos() == 0)
return false;
- MathUnknownInset const * p = prevAtom()->asUnknownInset();
+ InsetMathUnknown const * p = prevAtom()->asUnknownInset();
return p && !p->final();
}
-MathUnknownInset * LCursor::activeMacro()
+InsetMathUnknown * LCursor::activeMacro()
{
return inMacroMode() ? prevAtom().nucleus()->asUnknownInset() : 0;
}
void LCursor::normalize()
{
- if (idx() >= nargs()) {
+ if (idx() > lastidx()) {
lyxerr << "this should not really happen - 1: "
<< idx() << ' ' << nargs()
<< " in: " << &inset() << endl;
+ idx() = lastidx();
}
- idx() = min(idx(), lastidx());
if (pos() > lastpos()) {
lyxerr << "this should not really happen - 2: "
<< pos() << ' ' << lastpos() << " in idx: " << idx()
<< " in atom: '";
WriteStream wi(lyxerr, false, true);
- inset().asMathInset()->write(wi);
+ inset().asInsetMath()->write(wi);
lyxerr << endl;
+ pos() = lastpos();
}
- pos() = min(pos(), lastpos());
}
int yo = 0;
getPos(xo, yo);
- // check if we had something else in mind, if not, this is the future goal
+ // check if we had something else in mind, if not, this is the future
+ // target
if (x_target() == -1)
x_target() = xo;
else
if (!selection()) {
// try left
if (pos() != 0) {
- MathScriptInset const * p = prevAtom()->asScriptInset();
+ InsetMathScript const * p = prevAtom()->asScriptInset();
if (p && p->has(up)) {
--pos();
- push(inset());
- idx() = up; // the superscript has index 1
+ push(*const_cast<InsetMathScript*>(p));
+ idx() = p->idxOfScript(up);
pos() = lastpos();
- //lyxerr << "updown: handled by scriptinset to the left" << endl;
return true;
}
}
// try right
if (pos() != lastpos()) {
- MathScriptInset const * p = nextAtom()->asScriptInset();
+ InsetMathScript const * p = nextAtom()->asScriptInset();
if (p && p->has(up)) {
- push(inset());
- idx() = up;
+ push(*const_cast<InsetMathScript*>(p));
+ idx() = p->idxOfScript(up);
pos() = 0;
- //lyxerr << "updown: handled by scriptinset to the right" << endl;
return true;
}
}
}
+// FIXME: Switch this on for more robust movement
+#if 0
+
+ return bruteFind3(*this, xo, yo, up);
+
+#else
//xarray().boundingBox(xlow, xhigh, ylow, yhigh);
//if (up)
// yhigh = yo - 4;
//lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
// ask inset first
if (inset().idxUpDown(*this, up)) {
+ //lyxerr << "idxUpDown triggered" << endl;
// try to find best position within this inset
if (!selection())
setCursor(bruteFind2(*this, xo, yo));
}
// no such inset found, just take something "above"
- //lyxerr << "updown: handled by strange case" << endl;
if (!popLeft()) {
+ //lyxerr << "updown: popleft failed (strange case)" << endl;
int ylow = up ? 0 : yo + 1;
int yhigh = up ? yo - 1 : bv().workHeight();
return bruteFind(*this, xo, yo, 0, bv().workWidth(), ylow, yhigh);
}
// any improvement so far?
+ //lyxerr << "updown: popLeft succeeded" << endl;
int xnew;
int ynew;
getPos(xnew, ynew);
// we should not come here.
BOOST_ASSERT(false);
+#endif
}
} else {
// cursor in between. split cell
MathArray::iterator bt = cell().begin();
- MathAtom at = createMathInset(font);
+ MathAtom at = createInsetMath(font);
at.nucleus()->cell(0) = MathArray(bt, bt + pos());
cell().erase(bt, bt + pos());
popLeft();
}
-void LCursor::message(string const & msg) const
+void LCursor::message(docstring const & msg) const
{
- bv().owner()->getLyXFunc().setMessage(msg);
+ theApp->lyxFunc().setMessage(msg);
}
-void LCursor::errorMessage(string const & msg) const
+void LCursor::errorMessage(docstring const & msg) const
{
- bv().owner()->getLyXFunc().setErrorMessage(msg);
+ theApp->lyxFunc().setErrorMessage(msg);
}
-string LCursor::selectionAsString(bool label) const
+docstring LCursor::selectionAsString(bool label) const
{
if (!selection())
- return string();
+ return docstring();
if (inTexted()) {
Buffer const & buffer = *bv().buffer();
- ParagraphList & pars = text()->paragraphs();
+ ParagraphList const & pars = text()->paragraphs();
// should be const ...
pit_type startpit = selBegin().pit();
size_t const endpos = selEnd().pos();
if (startpit == endpit)
- return pars[startpit].asString(buffer, startpos, endpos, label);
+ return lyx::from_utf8(pars[startpit].asString(buffer, startpos, endpos, label));
// First paragraph in selection
string result = pars[startpit].
// The paragraphs in between (if any)
for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
- Paragraph & par = pars[pit];
+ Paragraph const & par = pars[pit];
result += par.asString(buffer, 0, par.size(), label) + "\n\n";
}
// Last paragraph in selection
result += pars[endpit].asString(buffer, 0, endpos, label);
- return result;
+ return lyx::from_utf8(result);
}
-#ifdef WITH_WARNINGS
-#warning and mathed?
-#endif
- return string();
+ if (inMathed())
+ return lyx::from_utf8(lyx::cap::grabSelection(*this));
+
+ return docstring();
}
<< ". Trying to correct this." << endl;
newdepth = copy.depth() - 1;
}
- copy.pop();
+ copy.pop();
}
// shrink cursor to a size where everything is valid, possibly
// leaving insets
projects / lyx.git / blobdiff