X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=ae82050fce1c5ca7b00cc83a1bf6b98ee3090ce0;hb=772325ff70c341a2cff1201efb29f75871cc371d;hp=c2f6a3f16a63bed92913114ea7dc07f328e84276;hpb=2506e0d643a6030d22a7990d47306837e51cb0d2;p=lyx.git diff --git a/src/Text2.cpp b/src/Text2.cpp index c2f6a3f16a..ae82050fce 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -4,16 +4,16 @@ * Licence details can be found in the file COPYING. * * \author Asger Alstrup - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Alfredo Braunstein * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author André Pönitz + * \author André Pönitz * \author Allan Rae * \author Stefan Schimanski * \author Dekel Tsur - * \author Jürgen Vigna + * \author Jürgen Vigna * * Full author contact details are available in file CREDITS. */ @@ -22,39 +22,33 @@ #include "Text.h" +#include "Bidi.h" #include "Buffer.h" #include "buffer_funcs.h" #include "BufferList.h" #include "BufferParams.h" #include "BufferView.h" -#include "Bullet.h" #include "Changes.h" #include "Cursor.h" #include "CutAndPaste.h" #include "DispatchResult.h" #include "ErrorList.h" -#include "FuncRequest.h" #include "Language.h" #include "Layout.h" #include "Lexer.h" -#include "LyXFunc.h" +#include "LyX.h" #include "LyXRC.h" #include "Paragraph.h" -#include "paragraph_funcs.h" #include "ParagraphParameters.h" -#include "ParIterator.h" -#include "Server.h" -#include "ServerSocket.h" #include "TextClass.h" #include "TextMetrics.h" #include "VSpace.h" -#include "frontends/FontMetrics.h" - -#include "insets/InsetEnvironment.h" +#include "insets/InsetCollapsable.h" #include "mathed/InsetMathHull.h" +#include "support/lassert.h" #include "support/debug.h" #include "support/gettext.h" #include "support/textutils.h" @@ -63,60 +57,64 @@ #include -using std::endl; -using std::ostringstream; -using std::string; -using std::max; -using std::min; -using std::istringstream; +using namespace std; namespace lyx { -Text::Text() - : autoBreakRows_(false) -{} - - -bool Text::isMainText(Buffer const & buffer) const +bool Text::isMainText() const { - return &buffer.text() == this; + return &owner_->buffer().text() == this; } -FontInfo Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const +// Note that this is supposed to return a fully realized font. +FontInfo Text::layoutFont(pit_type const pit) const { - LayoutPtr const & layout = pars_[pit].layout(); + Layout const & layout = pars_[pit].layout(); if (!pars_[pit].getDepth()) { - FontInfo lf = layout->resfont; + FontInfo lf = layout.resfont; // In case the default family has been customized - if (layout->font.family() == INHERIT_FAMILY) - lf.setFamily(buffer.params().getFont().fontInfo().family()); - return lf; + if (layout.font.family() == INHERIT_FAMILY) + lf.setFamily(owner_->buffer().params().getFont().fontInfo().family()); + // FIXME + // It ought to be possible here just to use Inset::getLayout() and skip + // the asInsetCollapsable() bit. Unfortunatley, that doesn't work right + // now, because Inset::getLayout() will return a default-constructed + // InsetLayout, and that e.g. sets the foreground color to red. So we + // need to do some work to make that possible. + InsetCollapsable const * icp = owner_->asInsetCollapsable(); + if (!icp) + return lf; + FontInfo icf = icp->getLayout().font(); + icf.realize(lf); + return icf; } - FontInfo font = layout->font; + FontInfo font = layout.font; // Realize with the fonts of lesser depth. - //font.realize(outerFont(pit, paragraphs())); - font.realize(buffer.params().getFont().fontInfo()); + //font.realize(outerFont(pit)); + font.realize(owner_->buffer().params().getFont().fontInfo()); return font; } -FontInfo Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const +// Note that this is supposed to return a fully realized font. +FontInfo Text::labelFont(Paragraph const & par) const { - LayoutPtr const & layout = par.layout(); + Buffer const & buffer = owner_->buffer(); + Layout const & layout = par.layout(); if (!par.getDepth()) { - FontInfo lf = layout->reslabelfont; + FontInfo lf = layout.reslabelfont; // In case the default family has been customized - if (layout->labelfont.family() == INHERIT_FAMILY) + if (layout.labelfont.family() == INHERIT_FAMILY) lf.setFamily(buffer.params().getFont().fontInfo().family()); return lf; } - FontInfo font = layout->labelfont; + FontInfo font = layout.labelfont; // Realize with the fonts of lesser depth. font.realize(buffer.params().getFont().fontInfo()); @@ -124,19 +122,20 @@ FontInfo Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const } -void Text::setCharFont(Buffer const & buffer, pit_type pit, +void Text::setCharFont(pit_type pit, pos_type pos, Font const & fnt, Font const & display_font) { + Buffer const & buffer = owner_->buffer(); Font font = fnt; - LayoutPtr const & layout = pars_[pit].layout(); + Layout const & layout = pars_[pit].layout(); // Get concrete layout font to reduce against FontInfo layoutfont; if (pos < pars_[pit].beginOfBody()) - layoutfont = layout->labelfont; + layoutfont = layout.labelfont; else - layoutfont = layout->font; + layoutfont = layout.font; // Realize against environment font information if (pars_[pit].getDepth()) { @@ -144,15 +143,15 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit, while (!layoutfont.resolved() && tp != pit_type(paragraphs().size()) && pars_[tp].getDepth()) { - tp = outerHook(tp, paragraphs()); + tp = outerHook(tp); if (tp != pit_type(paragraphs().size())) - layoutfont.realize(pars_[tp].layout()->font); + layoutfont.realize(pars_[tp].layout().font); } } // Inside inset, apply the inset's font attributes if any // (charstyle!) - if (!isMainText(buffer)) + if (!isMainText()) layoutfont.realize(display_font.fontInfo()); layoutfont.realize(buffer.params().getFont().fontInfo()); @@ -167,10 +166,9 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit, void Text::setInsetFont(BufferView const & bv, pit_type pit, pos_type pos, Font const & font, bool toggleall) { - BOOST_ASSERT(pars_[pit].isInset(pos) && - pars_[pit].getInset(pos)->noFontChange()); - Inset * const inset = pars_[pit].getInset(pos); + LASSERT(inset && inset->resetFontEdit(), /**/); + CursorSlice::idx_type endidx = inset->nargs(); for (CursorSlice cs(*inset); cs.idx() != endidx; ++cs.idx()) { Text * text = cs.text(); @@ -188,7 +186,7 @@ void Text::setInsetFont(BufferView const & bv, pit_type pit, // return past-the-last paragraph influenced by a layout change on pit pit_type Text::undoSpan(pit_type pit) { - pit_type end = paragraphs().size(); + pit_type const end = paragraphs().size(); pit_type nextpit = pit + 1; if (nextpit == end) return nextpit; @@ -204,20 +202,20 @@ pit_type Text::undoSpan(pit_type pit) } -void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end, - docstring const & layout) +void Text::setLayout(pit_type start, pit_type end, + docstring const & layout) { - BOOST_ASSERT(start != end); + LASSERT(start != end, /**/); - BufferParams const & bufparams = buffer.params(); - LayoutPtr const & lyxlayout = bufparams.getTextClass()[layout]; + Buffer const & buffer = owner_->buffer(); + BufferParams const & bp = buffer.params(); + Layout const & lyxlayout = bp.documentClass()[layout]; for (pit_type pit = start; pit != end; ++pit) { Paragraph & par = pars_[pit]; par.applyLayout(lyxlayout); - if (lyxlayout->margintype == MARGIN_MANUAL) - par.setLabelWidthString(par.translateIfPossible( - lyxlayout->labelstring(), buffer.params())); + if (lyxlayout.margintype == MARGIN_MANUAL) + par.setLabelWidthString(par.expandLabel(lyxlayout, bp)); } } @@ -225,37 +223,21 @@ void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end, // set layout over selection and make a total rebreak of those paragraphs void Text::setLayout(Cursor & cur, docstring const & layout) { - BOOST_ASSERT(this == cur.text()); - // special handling of new environment insets - BufferView & bv = cur.bv(); - BufferParams const & params = bv.buffer().params(); - LayoutPtr const & lyxlayout = params.getTextClass()[layout]; - if (lyxlayout->is_environment) { - // move everything in a new environment inset - LYXERR(Debug::DEBUG, "setting layout " << to_utf8(layout)); - lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN)); - lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT)); - lyx::dispatch(FuncRequest(LFUN_CUT)); - Inset * inset = new InsetEnvironment(params, layout); - insertInset(cur, inset); - //inset->edit(cur, true); - //lyx::dispatch(FuncRequest(LFUN_PASTE)); - return; - } + LASSERT(this == cur.text(), /**/); pit_type start = cur.selBegin().pit(); pit_type end = cur.selEnd().pit() + 1; pit_type undopit = undoSpan(end - 1); recUndo(cur, start, undopit - 1); - setLayout(cur.buffer(), start, end, layout); - updateLabels(cur.buffer()); + setLayout(start, end, layout); + cur.forceBufferUpdate(); } static bool changeDepthAllowed(Text::DEPTH_CHANGE type, Paragraph const & par, int max_depth) { - if (par.layout()->labeltype == LABEL_BIBLIO) + if (par.layout().labeltype == LABEL_BIBLIO) return false; int const depth = par.params().depth(); if (type == Text::INC_DEPTH && depth < max_depth) @@ -268,7 +250,7 @@ static bool changeDepthAllowed(Text::DEPTH_CHANGE type, bool Text::changeDepthAllowed(Cursor & cur, DEPTH_CHANGE type) const { - BOOST_ASSERT(this == cur.text()); + LASSERT(this == cur.text(), /**/); // this happens when selecting several cells in tabular (bug 2630) if (cur.selBegin().idx() != cur.selEnd().idx()) return false; @@ -288,7 +270,7 @@ bool Text::changeDepthAllowed(Cursor & cur, DEPTH_CHANGE type) const void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type) { - BOOST_ASSERT(this == cur.text()); + LASSERT(this == cur.text(), /**/); pit_type const beg = cur.selBegin().pit(); pit_type const end = cur.selEnd().pit() + 1; cur.recordUndoSelection(); @@ -307,25 +289,25 @@ void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type) } // this handles the counter labels, and also fixes up // depth values for follow-on (child) paragraphs - updateLabels(cur.buffer()); + cur.forceBufferUpdate(); } void Text::setFont(Cursor & cur, Font const & font, bool toggleall) { - BOOST_ASSERT(this == cur.text()); + LASSERT(this == cur.text(), /**/); // Set the current_font // Determine basis font FontInfo layoutfont; pit_type pit = cur.pit(); if (cur.pos() < pars_[pit].beginOfBody()) - layoutfont = getLabelFont(cur.buffer(), pars_[pit]); + layoutfont = labelFont(pars_[pit]); else - layoutfont = getLayoutFont(cur.buffer(), pit); + layoutfont = layoutFont(pit); // Update current font cur.real_current_font.update(font, - cur.buffer().params().language, + cur.buffer()->params().language, toggleall); // Reduce to implicit settings @@ -358,45 +340,46 @@ void Text::setFont(BufferView const & bv, CursorSlice const & begin, // nested insets. Language const * language = buffer.params().language; for (CursorSlice dit = begin; dit != end; dit.forwardPos()) { - if (dit.pos() != dit.lastpos()) { - pit_type const pit = dit.pit(); - pos_type const pos = dit.pos(); - if (pars_[pit].isInset(pos) && - pars_[pit].getInset(pos)->noFontChange()) - // We need to propagate the font change to all - // text cells of the inset (bug 1973). - // FIXME: This should change, see documentation - // of noFontChange in Inset.h - setInsetFont(bv, pit, pos, font, toggleall); - TextMetrics const & tm = bv.textMetrics(this); - Font f = tm.getDisplayFont(pit, pos); - f.update(font, language, toggleall); - setCharFont(buffer, pit, pos, f, tm.font_); + if (dit.pos() == dit.lastpos()) + continue; + pit_type const pit = dit.pit(); + pos_type const pos = dit.pos(); + Inset * inset = pars_[pit].getInset(pos); + if (inset && inset->resetFontEdit()) { + // We need to propagate the font change to all + // text cells of the inset (bugs 1973, 6919). + setInsetFont(bv, pit, pos, font, toggleall); } + TextMetrics const & tm = bv.textMetrics(this); + Font f = tm.displayFont(pit, pos); + f.update(font, language, toggleall); + setCharFont(pit, pos, f, tm.font_); + // font change may change language... + // spell checker has to know that + pars_[pit].requestSpellCheck(pos); } } bool Text::cursorTop(Cursor & cur) { - BOOST_ASSERT(this == cur.text()); + LASSERT(this == cur.text(), /**/); return setCursor(cur, 0, 0); } bool Text::cursorBottom(Cursor & cur) { - BOOST_ASSERT(this == cur.text()); + LASSERT(this == cur.text(), /**/); return setCursor(cur, cur.lastpit(), boost::prior(paragraphs().end())->size()); } void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall) { - BOOST_ASSERT(this == cur.text()); + LASSERT(this == cur.text(), /**/); // If the mask is completely neutral, tell user - if (font.fontInfo() == ignore_font && - (font.language() == 0 || font.language() == ignore_language)) { + if (font.fontInfo() == ignore_font && font.language() == ignore_language) { // Could only happen with user style cur.message(_("No font change defined.")); return; @@ -405,8 +388,8 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall) // Try implicit word selection // If there is a change in the language the implicit word selection // is disabled. - CursorSlice resetCursor = cur.top(); - bool implicitSelection = + CursorSlice const resetCursor = cur.top(); + bool const implicitSelection = font.language() == ignore_language && font.fontInfo().number() == FONT_IGNORE && selectWordWhenUnderCursor(cur, WHOLE_WORD_STRICT); @@ -426,44 +409,79 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall) docstring Text::getStringToIndex(Cursor const & cur) { - BOOST_ASSERT(this == cur.text()); + LASSERT(this == cur.text(), /**/); - docstring idxstring; if (cur.selection()) - idxstring = cur.selectionAsString(false); - else { - // Try implicit word selection. If there is a change - // in the language the implicit word selection is - // disabled. - Cursor tmpcur = cur; - selectWord(tmpcur, PREVIOUS_WORD); - - if (!tmpcur.selection()) - cur.message(_("Nothing to index!")); - else if (tmpcur.selBegin().pit() != tmpcur.selEnd().pit()) - cur.message(_("Cannot index more than one paragraph!")); - else - idxstring = tmpcur.selectionAsString(false); + return cur.selectionAsString(false); + + // Try implicit word selection. If there is a change + // in the language the implicit word selection is + // disabled. + Cursor tmpcur = cur; + selectWord(tmpcur, PREVIOUS_WORD); + + if (!tmpcur.selection()) + cur.message(_("Nothing to index!")); + else if (tmpcur.selBegin().pit() != tmpcur.selEnd().pit()) + cur.message(_("Cannot index more than one paragraph!")); + else + return tmpcur.selectionAsString(false); + + return docstring(); +} + + +void Text::setLabelWidthStringToSequence(pit_type const par_offset, + docstring const & s) +{ + pit_type offset = par_offset; + // Find first of same layout in sequence + while (!isFirstInSequence(offset)) { + offset = depthHook(offset, pars_[offset].getDepth()); } - return idxstring; + // now apply label width string to every par + // in sequence + pit_type const end = pars_.size(); + depth_type const depth = pars_[offset].getDepth(); + Layout const & layout = pars_[offset].layout(); + for (pit_type pit = offset; pit != end; ++pit) { + while (pars_[pit].getDepth() > depth) + ++pit; + if (pars_[pit].getDepth() < depth) + return; + if (pars_[pit].layout() != layout) + return; + pars_[pit].setLabelWidthString(s); + } } void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) { - BOOST_ASSERT(cur.text()); + LASSERT(cur.text(), /**/); // make sure that the depth behind the selection are restored, too pit_type undopit = undoSpan(cur.selEnd().pit()); recUndo(cur, cur.selBegin().pit(), undopit - 1); + //FIXME UNICODE + string const argument = to_utf8(arg); + depth_type priordepth = -1; + Layout priorlayout; for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit(); pit <= end; ++pit) { Paragraph & par = pars_[pit]; ParagraphParameters params = par.params(); - params.read(to_utf8(arg), merge); - Layout const & layout = *(par.layout()); - par.params().apply(params, layout); + params.read(argument, merge); + // Changes to label width string apply to all paragraphs + // with same layout in a sequence. + // Do this only once for a selected range of paragraphs + // of the same layout and depth. + if (par.getDepth() != priordepth || par.layout() != priorlayout) + setLabelWidthStringToSequence(pit, params.labelWidthString()); + par.params().apply(params, par.layout()); + priordepth = par.getDepth(); + priorlayout = par.layout(); } } @@ -473,78 +491,55 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) //quite so much. void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p) { - BOOST_ASSERT(cur.text()); + LASSERT(cur.text(), /**/); // make sure that the depth behind the selection are restored, too pit_type undopit = undoSpan(cur.selEnd().pit()); recUndo(cur, cur.selBegin().pit(), undopit - 1); + depth_type priordepth = -1; + Layout priorlayout; for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit(); pit <= end; ++pit) { Paragraph & par = pars_[pit]; - Layout const & layout = *(par.layout()); - par.params().apply(p, layout); - } + // Changes to label width string apply to all paragraphs + // with same layout in a sequence. + // Do this only once for a selected range of paragraphs + // of the same layout and depth. + if (par.getDepth() != priordepth || par.layout() != priorlayout) + setLabelWidthStringToSequence(pit, + par.params().labelWidthString()); + par.params().apply(p, par.layout()); + priordepth = par.getDepth(); + priorlayout = par.layout(); + } } // this really should just insert the inset and not move the cursor. void Text::insertInset(Cursor & cur, Inset * inset) { - BOOST_ASSERT(this == cur.text()); - BOOST_ASSERT(inset); + LASSERT(this == cur.text(), /**/); + LASSERT(inset, /**/); cur.paragraph().insertInset(cur.pos(), inset, cur.current_font, - Change(cur.buffer().params().trackChanges ? - Change::INSERTED : Change::UNCHANGED)); -} - - -// needed to insert the selection -void Text::insertStringAsLines(Cursor & cur, docstring const & str) -{ - cur.buffer().insertStringAsLines(pars_, cur.pit(), cur.pos(), - cur.current_font, str, autoBreakRows_); -} - - -// turn double CR to single CR, others are converted into one -// blank. Then insertStringAsLines is called -void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str) -{ - docstring linestr = str; - bool newline_inserted = false; - - for (string::size_type i = 0, siz = linestr.size(); i < siz; ++i) { - if (linestr[i] == '\n') { - if (newline_inserted) { - // we know that \r will be ignored by - // insertStringAsLines. Of course, it is a dirty - // trick, but it works... - linestr[i - 1] = '\r'; - linestr[i] = '\n'; - } else { - linestr[i] = ' '; - newline_inserted = true; - } - } else if (isPrintable(linestr[i])) { - newline_inserted = false; - } - } - insertStringAsLines(cur, linestr); + Change(cur.buffer()->params().trackChanges + ? Change::INSERTED : Change::UNCHANGED)); } bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos, bool setfont, bool boundary) { + TextMetrics const & tm = cur.bv().textMetrics(this); + bool const update_needed = !tm.contains(par); Cursor old = cur; setCursorIntern(cur, par, pos, setfont, boundary); - return cur.bv().checkDepm(cur, old); + return cur.bv().checkDepm(cur, old) || update_needed; } void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos) { - BOOST_ASSERT(par != int(paragraphs().size())); + LASSERT(par != int(paragraphs().size()), /**/); cur.pit() = par; cur.pos() = pos; @@ -553,15 +548,15 @@ void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos) // None of these should happen, but we're scaredy-cats if (pos < 0) { - lyxerr << "dont like -1" << endl; - BOOST_ASSERT(false); + lyxerr << "don't like -1" << endl; + LASSERT(false, /**/); } if (pos > para.size()) { - lyxerr << "dont like 1, pos: " << pos + lyxerr << "don't like 1, pos: " << pos << " size: " << para.size() << " par: " << par << endl; - BOOST_ASSERT(false); + LASSERT(false, /**/); } } @@ -569,7 +564,7 @@ void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos) void Text::setCursorIntern(Cursor & cur, pit_type par, pos_type pos, bool setfont, bool boundary) { - BOOST_ASSERT(this == cur.text()); + LASSERT(this == cur.text(), /**/); cur.boundary(boundary); setCursor(cur.top(), par, pos); if (setfont) @@ -586,7 +581,7 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front) if (!front && cur.pos() == 0) return false; Inset * inset = front ? cur.nextInset() : cur.prevInset(); - if (!inset || inset->editable() != Inset::HIGHLY_EDITABLE) + if (!inset || !inset->editable()) return false; /* * Apparently, when entering an inset we are expected to be positioned @@ -602,10 +597,28 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front) } +bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool movingLeft) +{ + if (cur.selection()) + return false; + if (cur.pos() == -1) + return false; + if (cur.pos() == cur.lastpos()) + return false; + Paragraph & par = cur.paragraph(); + Inset * inset = par.isInset(cur.pos()) ? par.getInset(cur.pos()) : 0; + if (!inset || !inset->editable()) + return false; + inset->edit(cur, movingForward, + movingLeft ? Inset::ENTRY_DIRECTION_RIGHT : Inset::ENTRY_DIRECTION_LEFT); + return true; +} + + bool Text::cursorBackward(Cursor & cur) { // Tell BufferView to test for FitCursor in any case! - cur.updateFlags(Update::FitCursor); + cur.screenUpdateFlags(Update::FitCursor); // not at paragraph start? if (cur.pos() > 0) { @@ -644,10 +657,36 @@ bool Text::cursorBackward(Cursor & cur) } +bool Text::cursorVisLeft(Cursor & cur, bool skip_inset) +{ + Cursor temp_cur = cur; + temp_cur.posVisLeft(skip_inset); + if (temp_cur.depth() > cur.depth()) { + cur = temp_cur; + return false; + } + return setCursor(cur, temp_cur.pit(), temp_cur.pos(), + true, temp_cur.boundary()); +} + + +bool Text::cursorVisRight(Cursor & cur, bool skip_inset) +{ + Cursor temp_cur = cur; + temp_cur.posVisRight(skip_inset); + if (temp_cur.depth() > cur.depth()) { + cur = temp_cur; + return false; + } + return setCursor(cur, temp_cur.pit(), temp_cur.pos(), + true, temp_cur.boundary()); +} + + bool Text::cursorForward(Cursor & cur) { // Tell BufferView to test for FitCursor in any case! - cur.updateFlags(Update::FitCursor); + cur.screenUpdateFlags(Update::FitCursor); // not at paragraph end? if (cur.pos() != cur.lastpos()) { @@ -771,10 +810,18 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, // delete the LineSeparator. // MISSING - bool const same_inset = &old.inset() == &cur.inset(); - bool const same_par = same_inset && old.pit() == cur.pit(); - bool const same_par_pos = same_par && old.pos() == cur.pos(); + // Find a common inset and the corresponding depth. + size_t depth = 0; + for (; depth < cur.depth(); ++depth) + if (&old.inset() == &cur[depth].inset()) + break; + // Whether a common inset is found and whether the cursor is still in + // the same paragraph (possibly nested). + bool const same_par = depth < cur.depth() && old.pit() == cur[depth].pit(); + bool const same_par_pos = depth == cur.depth() - 1 && same_par + && old.pos() == cur[depth].pos(); + // If the chars around the old cursor were spaces, delete one of them. if (!same_par_pos) { // Only if the cursor has really moved. @@ -784,14 +831,14 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, && oldpar.isLineSeparator(old.pos() - 1) && !oldpar.isDeleted(old.pos() - 1) && !oldpar.isDeleted(old.pos())) { - oldpar.eraseChar(old.pos() - 1, cur.buffer().params().trackChanges); + oldpar.eraseChar(old.pos() - 1, cur.buffer()->params().trackChanges); // FIXME: This will not work anymore when we have multiple views of the same buffer // In this case, we will have to correct also the cursors held by // other bufferviews. It will probably be easier to do that in a more // automated way in CursorSlice code. (JMarc 26/09/2001) // correct all cursor parts if (same_par) { - fixCursorAfterDelete(cur.top(), old.top()); + fixCursorAfterDelete(cur[depth], old.top()); need_anchor_change = true; } return true; @@ -839,7 +886,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, return true; } - if (oldpar.stripLeadingSpaces(cur.buffer().params().trackChanges)) { + if (oldpar.stripLeadingSpaces(cur.buffer()->params().trackChanges)) { need_anchor_change = true; // We return true here because the Paragraph contents changed and // we need a redraw before further action is processed. @@ -852,7 +899,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges) { - BOOST_ASSERT(first >= 0 && first <= last && last < (int) pars_.size()); + LASSERT(first >= 0 && first <= last && last < (int) pars_.size(), /**/); for (pit_type pit = first; pit <= last; ++pit) { Paragraph & par = pars_[pit]; @@ -870,8 +917,9 @@ void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool tra } } - // don't delete anything if this is the only remaining paragraph within the given range - // note: Text::acceptOrRejectChanges() sets the cursor to 'first' after calling DEPM + // don't delete anything if this is the only remaining paragraph + // within the given range. Note: Text::acceptOrRejectChanges() + // sets the cursor to 'first' after calling DEPM if (first == last) continue;