// set layout over selection and make a total rebreak of those paragraphs
void Text::setLayout(Cursor & cur, docstring const & layout)
{
- LBUFERR(this == cur.text(), _("Invalid cursor."));
+ LBUFERR(this == cur.text());
pit_type start = cur.selBegin().pit();
pit_type end = cur.selEnd().pit() + 1;
bool Text::changeDepthAllowed(Cursor & cur, DEPTH_CHANGE type) const
{
- LBUFERR(this == cur.text(), _("Invalid cursor."));
+ LBUFERR(this == cur.text());
// this happens when selecting several cells in tabular (bug 2630)
if (cur.selBegin().idx() != cur.selEnd().idx())
return false;
void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type)
{
- LBUFERR(this == cur.text(), _("Invalid cursor."));
+ LBUFERR(this == cur.text());
pit_type const beg = cur.selBegin().pit();
pit_type const end = cur.selEnd().pit() + 1;
cur.recordUndoSelection();
newfi.setSeries(INHERIT_SERIES);
FontShape newshp = newfi.shape();
- if (newshp != INHERIT_SHAPE && newshp != IGNORE_SHAPE &&
+ if (newshp != INHERIT_SHAPE && newshp != IGNORE_SHAPE &&
newshp == oldfi.shape())
newfi.setShape(INHERIT_SHAPE);
bool Text::cursorTop(Cursor & cur)
{
- LBUFERR(this == cur.text(), _("Invalid cursor."));
+ LBUFERR(this == cur.text());
return setCursor(cur, 0, 0);
}
bool Text::cursorBottom(Cursor & cur)
{
- LBUFERR(this == cur.text(), _("Invalid cursor."));
+ LBUFERR(this == cur.text());
return setCursor(cur, cur.lastpit(), boost::prior(paragraphs().end())->size());
}
void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall)
{
- LBUFERR(this == cur.text(), _("Invalid cursor."));
+ LBUFERR(this == cur.text());
// If the mask is completely neutral, tell user
if (font.fontInfo() == ignore_font && font.language() == ignore_language) {
// Could only happen with user style
docstring Text::getStringToIndex(Cursor const & cur)
{
- LBUFERR(this == cur.text(), _("Invalid cursor."));
+ LBUFERR(this == cur.text());
if (cur.selection())
return cur.selectionAsString(false);
void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
{
- LBUFERR(cur.text(), _("Uninitalized cursor."));
+ LBUFERR(cur.text());
//FIXME UNICODE
string const argument = to_utf8(arg);
void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p)
{
- LBUFERR(cur.text(), _("Uninitalized cursor."));
+ LBUFERR(cur.text());
depth_type priordepth = -1;
Layout priorlayout;
// this really should just insert the inset and not move the cursor.
void Text::insertInset(Cursor & cur, Inset * inset)
{
- LBUFERR(this == cur.text(), _("Invalid cursor."));
- LBUFERR(inset, _("Uninitialized Text."));
+ LBUFERR(this == cur.text());
+ LBUFERR(inset);
cur.paragraph().insertInset(cur.pos(), inset, cur.current_font,
Change(cur.buffer()->params().trackChanges
? Change::INSERTED : Change::UNCHANGED));
bool const update_needed = !tm.contains(par);
Cursor old = cur;
setCursorIntern(cur, par, pos, setfont, boundary);
- // FIXME There is a chance that we'll miss a screen update here.
- // If so, then do DEPM and then check if cur wants an update and
- // go ahead and do it, if so.
return cur.bv().checkDepm(cur, old) || update_needed;
}
void Text::setCursorIntern(Cursor & cur,
pit_type par, pos_type pos, bool setfont, bool boundary)
{
- LBUFERR(this == cur.text(), _("Invalid cursor."));
+ LBUFERR(this == cur.text());
cur.boundary(boundary);
setCursor(cur.top(), par, pos);
if (setfont)
{
bool updated = false;
if (cur.pit() != cur.lastpit())
- updated = setCursor(cur, cur.pit() + 1, 0);
+ if (lyxrc.mac_like_cursor_movement)
+ if (cur.pos() == cur.lastpos())
+ updated = setCursor(cur, cur.pit() + 1, getPar(cur.pit() + 1).size());
+ else
+ updated = setCursor(cur, cur.pit(), cur.lastpos());
+ else
+ updated = setCursor(cur, cur.pit() + 1, 0);
else
updated = setCursor(cur, cur.pit(), cur.lastpos());
return updated;