X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.C;h=373ee6c01b80f31833daacc0e5112e708e9c2466;hb=e7fc677261bd14fdf159e594fcf422e985c72664;hp=8202bb0ed427c2db3f6a12695c9bb30f96907e99;hpb=68b7ef25fb7d2da230d3eb11d6737701abfc2e64;p=lyx.git diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index 8202bb0ed4..373ee6c01b 100644 --- a/src/CutAndPaste.C +++ b/src/CutAndPaste.C @@ -19,8 +19,13 @@ #include "bufferparams.h" #include "BufferView.h" #include "cursor.h" +#include "debug.h" #include "errorlist.h" +#include "funcrequest.h" #include "gettext.h" +#include "insetiterator.h" +#include "lfuns.h" +#include "lyxrc.h" #include "lyxtext.h" #include "lyxtextclasslist.h" #include "paragraph.h" @@ -30,18 +35,24 @@ #include "pariterator.h" #include "undo.h" +#include "insets/insetcharstyle.h" #include "insets/insettabular.h" +#include "mathed/math_data.h" +#include "mathed/math_inset.h" +#include "mathed/math_support.h" + #include "support/lstrings.h" #include using lyx::pos_type; -using lyx::par_type; +using lyx::pit_type; using lyx::textclass_type; using lyx::support::bformat; +using std::endl; using std::for_each; using std::make_pair; using std::pair; @@ -51,221 +62,84 @@ using std::string; namespace { -typedef std::pair PitPosPair; +typedef std::pair PitPosPair; typedef limited_stack > CutStack; -CutStack cuts(10); +CutStack theCuts(10); + +// store whether the tabular stack is newer than the normal copy stack +// FIXME: this is a workaround for bug 1919. Should be removed for 1.5, +// when we (hopefully) have a one-for-all paste mechanism. +bool dirty_tabular_stack_; -struct resetOwnerAndChanges : public std::unary_function { +class resetOwnerAndChanges : public std::unary_function { +public: void operator()(Paragraph & p) const { p.cleanChanges(); p.setInsetOwner(0); } }; -} // namespace anon - - -namespace lyx { -namespace cap { - - -int SwitchLayoutsBetweenClasses(textclass_type c1, textclass_type c2, - ParagraphList & pars, ErrorList & errorlist) -{ - BOOST_ASSERT(!pars.empty()); - int ret = 0; - if (c1 == c2) - return ret; - - LyXTextClass const & tclass1 = textclasslist[c1]; - LyXTextClass const & tclass2 = textclasslist[c2]; - - InsetText in; - std::swap(in.paragraphs(), pars); - - ParIterator end = par_iterator_end(in); - for (ParIterator it = par_iterator_begin(in); it != end; ++it) { - string const name = it->layout()->name(); - bool hasLayout = tclass2.hasLayout(name); - - if (hasLayout) - it->layout(tclass2[name]); - else - it->layout(tclass2.defaultLayout()); - - if (!hasLayout && name != tclass1.defaultLayoutName()) { - ++ret; - string const s = bformat( - _("Layout had to be changed from\n%1$s to %2$s\n" - "because of class conversion from\n%3$s to %4$s"), - name, it->layout()->name(), tclass1.name(), tclass2.name()); - // To warn the user that something had to be done. - errorlist.push_back(ErrorItem("Changed Layout", s, - it->id(), 0, - it->size())); - } - } - std::swap(in.paragraphs(), pars); - return ret; -} - - -std::vector const availableSelections(Buffer const & buffer) -{ - vector selList; - - CutStack::const_iterator cit = cuts.begin(); - CutStack::const_iterator end = cuts.end(); - for (; cit != end; ++cit) { - // we do not use cit-> here because gcc 2.9x does not - // like it (JMarc) - ParagraphList const & pars = (*cit).first; - string asciiSel; - ParagraphList::const_iterator pit = pars.begin(); - ParagraphList::const_iterator pend = pars.end(); - for (; pit != pend; ++pit) { - asciiSel += pit->asString(buffer, false); - if (asciiSel.size() > 25) { - asciiSel.replace(22, string::npos, "..."); - break; - } - } - - selList.push_back(asciiSel); - } - - return selList; -} - - -PitPosPair eraseSelection(BufferParams const & params, ParagraphList & pars, - par_type startpit, par_type endpit, - int startpos, int endpos, bool doclear) -{ - if (startpit == par_type(pars.size()) || - (startpos > pars[startpit].size())) - return PitPosPair(endpit, endpos); - - if (endpit == par_type(pars.size()) || - startpit == endpit) { - endpos -= pars[startpit].erase(startpos, endpos); - return PitPosPair(endpit, endpos); - } - - // clear end/begin fragments of the first/last par in selection - bool all_erased = true; - - pars[startpit].erase(startpos, pars[startpit].size()); - if (pars[startpit].size() != startpos) - all_erased = false; - - endpos -= pars[endpit].erase(0, endpos); - if (endpos != 0) - all_erased = false; - - // Loop through the deleted pars if any, erasing as needed - for (par_type pit = startpit + 1; pit != endpit;) { - // "erase" the contents of the par - pars[pit].erase(0, pars[pit].size()); - if (!pars[pit].size()) { - // remove the par if it's now empty - pars.erase(pars.begin() + pit); - --endpit; - } else { - ++pit; - all_erased = false; - } - } - -#if 0 // FIXME: why for cut but not copy ? - // the cut selection should begin with standard layout - if (realcut) { - buf->params().clear(); - buf->bibkey = 0; - buf->layout(textclasslist[buffer->params.textclass].defaultLayoutName()); - } -#endif - - if (startpit + 1 == par_type(pars.size())) - return PitPosPair(endpit, endpos); - - if (doclear) { - pars[startpit + 1].stripLeadingSpaces(); - } - - // paste the paragraphs again, if possible - if (all_erased && - (pars[startpit].hasSameLayout(pars[startpit + 1]) || - pars[startpit + 1].empty())) { - mergeParagraph(params, pars, startpit); - // this because endpar gets deleted here! - endpit = startpit; - endpos = startpos; - } - return PitPosPair(endpit, endpos); - -} - - -bool copySelection(ParagraphList & pars, - par_type startpit, par_type endpit, - int start, int end, textclass_type tc) +void region(CursorSlice const & i1, CursorSlice const & i2, + InsetBase::row_type & r1, InsetBase::row_type & r2, + InsetBase::col_type & c1, InsetBase::col_type & c2) { - BOOST_ASSERT(0 <= start && start <= pars[startpit].size()); - BOOST_ASSERT(0 <= end && end <= pars[endpit].size()); - BOOST_ASSERT(startpit != endpit || start <= end); - - // Clone the paragraphs within the selection. - ParagraphList paragraphs(pars.begin() + startpit, pars.begin() + endpit + 1); - for_each(paragraphs.begin(), paragraphs.end(), resetOwnerAndChanges()); - - // Cut out the end of the last paragraph. - Paragraph & back = paragraphs.back(); - back.erase(end, back.size()); - - // Cut out the begin of the first paragraph - Paragraph & front = paragraphs.front(); - front.erase(0, start); - - cuts.push(make_pair(paragraphs, tc)); - - return true; + InsetBase & p = i1.inset(); + c1 = p.col(i1.idx()); + c2 = p.col(i2.idx()); + if (c1 > c2) + std::swap(c1, c2); + r1 = p.row(i1.idx()); + r2 = p.row(i2.idx()); + if (r1 > r2) + std::swap(r1, r2); } -PitPosPair cutSelection(BufferParams const & params, ParagraphList & pars, - par_type startpit, par_type endpit, - int startpos, int endpos, textclass_type tc, bool doclear) +bool checkPastePossible(int index) { - copySelection(pars, startpit, endpit, startpos, endpos, tc); - return eraseSelection(params, pars, startpit, endpit, startpos, - endpos, doclear); + return size_t(index) < theCuts.size() && !theCuts[index].first.empty(); } -pair -pasteSelection(Buffer const & buffer, ParagraphList & pars, - par_type pit, int pos, - textclass_type tc, size_t cut_index, ErrorList & errorlist) +pair +pasteSelectionHelper(Buffer const & buffer, + ParagraphList & pars, pit_type pit, int pos, + ParagraphList const & parlist, textclass_type textclass, + ErrorList & errorlist) { - if (!checkPastePossible()) + if (parlist.empty()) return make_pair(PitPosPair(pit, pos), pit); BOOST_ASSERT (pos <= pars[pit].size()); // Make a copy of the CaP paragraphs. - ParagraphList insertion = cuts[cut_index].first; - textclass_type const textclass = cuts[cut_index].second; + ParagraphList insertion = parlist; + textclass_type const tc = buffer.params().textclass; // Now remove all out of the pars which is NOT allowed in the // new environment and set also another font if that is required. + // Convert newline to paragraph break in ERT inset. + // This should not be here! + if (pars[pit].inInset() && + pars[pit].inInset()->lyxCode() == InsetBase::ERT_CODE) { + for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) { + for (pos_type j = 0; j < insertion[i].size(); ++j) { + if (insertion[i].isNewline(j)) { + insertion[i].erase(j); + breakParagraphConservative( + buffer.params(), + insertion, i, j); + } + } + } + } + // Make sure there is no class difference. - SwitchLayoutsBetweenClasses(textclass, tc, insertion, - errorlist); + lyx::cap::SwitchBetweenClasses(textclass, tc, insertion, errorlist); ParagraphList::iterator tmpbuf = insertion.begin(); int depth_delta = pars[pit].params().depth() - tmpbuf->params().depth(); @@ -294,15 +168,18 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars, // Set the inset owner of this paragraph. tmpbuf->setInsetOwner(pars[pit].inInset()); for (pos_type i = 0; i < tmpbuf->size(); ++i) { - if (tmpbuf->getChar(i) == Paragraph::META_INSET) { - if (!pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode())) - tmpbuf->erase(i--); - } + if (tmpbuf->getChar(i) == Paragraph::META_INSET && + !pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode())) + tmpbuf->erase(i--); } } - // Make the buf exactly the same layout as the cursor paragraph. - insertion.begin()->makeSameLayout(pars[pit]); + bool const empty = pars[pit].empty(); + if (!empty) { + // Make the buf exactly the same layout as the cursor + // paragraph. + insertion.begin()->makeSameLayout(pars[pit]); + } // Prepare the paragraphs and insets for insertion. // A couple of insets store buffer references so need updating. @@ -318,9 +195,9 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars, for (; lit != eit; ++lit) { switch (lit->inset->lyxCode()) { - case InsetOld::TABULAR_CODE: { + case InsetBase::TABULAR_CODE: { InsetTabular * it = static_cast(lit->inset); - it->buffer(const_cast(&buffer)); + it->buffer(&buffer); break; } @@ -332,24 +209,36 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars, std::swap(in.paragraphs(), insertion); // Split the paragraph for inserting the buf if necessary. - bool did_split = false; - if (pars[pit].size() || pit + 1 == par_type(pars.size())) { + if (!empty) breakParagraphConservative(buffer.params(), pars, pit, pos); - did_split = true; - } // Paste it! - pars.insert(pars.begin() + pit + 1, insertion.begin(), insertion.end()); - mergeParagraph(buffer.params(), pars, pit); + if (empty) { + pars.insert(boost::next(pars.begin(), pit), + insertion.begin(), + insertion.end()); + + // merge the empty par with the last par of the insertion + mergeParagraph(buffer.params(), pars, + pit + insertion.size() - 1); + } else { + pars.insert(boost::next(pars.begin(), pit + 1), + insertion.begin(), + insertion.end()); + + // merge the first par of the insertion with the current par + mergeParagraph(buffer.params(), pars, pit); + } - par_type last_paste = pit + insertion.size() - 1; + pit_type last_paste = pit + insertion.size() - 1; // Store the new cursor position. pit = last_paste; pos = pars[last_paste].size(); - // Maybe some pasting. - if (did_split && last_paste + 1 != par_type(pars.size())) { + // Join (conditionally) last pasted paragraph with next one, i.e., + // the tail of the spliced document paragraph + if (!empty && last_paste + 1 != pit_type(pars.size())) { if (pars[last_paste + 1].hasSameLayout(pars[last_paste])) { mergeParagraph(buffer.params(), pars, last_paste); } else if (pars[last_paste + 1].empty()) { @@ -368,40 +257,205 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars, } -pair -pasteSelection(Buffer const & buffer, ParagraphList & pars, - par_type pit, int pos, textclass_type tc, ErrorList & errorlist) +PitPosPair eraseSelectionHelper(BufferParams const & params, + ParagraphList & pars, + pit_type startpit, pit_type endpit, + int startpos, int endpos, bool doclear) { - return pasteSelection(buffer, pars, pit, pos, tc, 0, errorlist); + // Start of selection is really invalid. + if (startpit == pit_type(pars.size()) || + (startpos > pars[startpit].size())) + return PitPosPair(endpit, endpos); + + // Start and end is inside same paragraph + if (endpit == pit_type(pars.size()) || + startpit == endpit) { + endpos -= pars[startpit].erase(startpos, endpos); + return PitPosPair(endpit, endpos); + } + + // A paragraph break has to be physically removed by merging, but + // only if either (1) change tracking is off, or (2) the para break + // is "blue" + for (pit_type pit = startpit; pit != endpit + 1;) { + bool const merge = !params.tracking_changes || + pars[pit].lookupChange(pars[pit].size()) == + Change::INSERTED; + pos_type const left = ( pit == startpit ? startpos : 0 ); + pos_type const right = ( pit == endpit ? endpos : + pars[pit].size() + 1 ); + // Logical erase only: + pars[pit].erase(left, right); + // Separate handling of para break: + if (merge && pit != endpit && + pars[pit].hasSameLayout(pars[pit + 1])) { + pos_type const thissize = pars[pit].size(); + if (doclear) + pars[pit + 1].stripLeadingSpaces(); + mergeParagraph(params, pars, pit); + --endpit; + if (pit == endpit) + endpos += thissize; + } else + ++pit; + } + + // Ensure legal cursor pos: + endpit = startpit; + endpos = startpos; + return PitPosPair(endpit, endpos); } -int nrOfParagraphs() +void copySelectionHelper(ParagraphList & pars, + pit_type startpit, pit_type endpit, + int start, int end, textclass_type tc) { - return cuts.empty() ? 0 : cuts[0].first.size(); + BOOST_ASSERT(0 <= start && start <= pars[startpit].size()); + BOOST_ASSERT(0 <= end && end <= pars[endpit].size()); + BOOST_ASSERT(startpit != endpit || start <= end); + + // Clone the paragraphs within the selection. + ParagraphList paragraphs(boost::next(pars.begin(), startpit), + boost::next(pars.begin(), endpit + 1)); + + for_each(paragraphs.begin(), paragraphs.end(), resetOwnerAndChanges()); + + // Cut out the end of the last paragraph. + Paragraph & back = paragraphs.back(); + back.erase(end, back.size()); + + // Cut out the begin of the first paragraph + Paragraph & front = paragraphs.front(); + front.erase(0, start); + + theCuts.push(make_pair(paragraphs, tc)); } +} // namespace anon + + + + +namespace lyx { +namespace cap { -bool checkPastePossible() +string grabAndEraseSelection(LCursor & cur) { - return !cuts.empty() && !cuts[0].first.empty(); + if (!cur.selection()) + return string(); + string res = grabSelection(cur); + eraseSelection(cur); + return res; } -void cutSelection(LCursor & cur, bool doclear, bool realcut) +void SwitchBetweenClasses(textclass_type c1, textclass_type c2, + ParagraphList & pars, ErrorList & errorlist) { - LyXText * text = cur.text(); - BOOST_ASSERT(text); - // Stuff what we got on the clipboard. Even if there is no selection. - - // There is a problem with having the stuffing here in that the - // larger the selection the slower LyX will get. This can be - // solved by running the line below only when the selection has - // finished. The solution used currently just works, to make it - // faster we need to be more clever and probably also have more - // calls to stuffClipboard. (Lgb) - cur.bv().stuffClipboard(cur.selectionAsString(true)); + BOOST_ASSERT(!pars.empty()); + if (c1 == c2) + return; + + LyXTextClass const & tclass1 = textclasslist[c1]; + LyXTextClass const & tclass2 = textclasslist[c2]; + + InsetText in; + std::swap(in.paragraphs(), pars); + + // layouts + ParIterator end = par_iterator_end(in); + for (ParIterator it = par_iterator_begin(in); it != end; ++it) { + string const name = it->layout()->name(); + bool hasLayout = tclass2.hasLayout(name); + + if (hasLayout) + it->layout(tclass2[name]); + else + it->layout(tclass2.defaultLayout()); + + if (!hasLayout && name != tclass1.defaultLayoutName()) { + string const s = bformat( + _("Layout had to be changed from\n%1$s to %2$s\n" + "because of class conversion from\n%3$s to %4$s"), + name, it->layout()->name(), tclass1.name(), tclass2.name()); + // To warn the user that something had to be done. + errorlist.push_back(ErrorItem(_("Changed Layout"), s, + it->id(), 0, + it->size())); + } + } + + // character styles + InsetIterator const i_end = inset_iterator_end(in); + for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) { + if (it->lyxCode() == InsetBase::CHARSTYLE_CODE) { + InsetCharStyle & inset = + static_cast(*it); + string const name = inset.params().type; + CharStyles::iterator const found_cs = + tclass2.charstyle(name); + if (found_cs == tclass2.charstyles().end()) { + // The character style is undefined in tclass2 + inset.setUndefined(); + string const s = bformat(_( + "Character style %1$s is " + "undefined because of class " + "conversion from\n%2$s to %3$s"), + name, tclass1.name(), tclass2.name()); + // To warn the user that something had to be done. + errorlist.push_back(ErrorItem( + _("Undefined character style"), + s, it.paragraph().id(), + it.pos(), it.pos() + 1)); + } else if (inset.undefined()) { + // The character style is undefined in + // tclass1 and is defined in tclass2 + inset.setDefined(found_cs); + } + } + } + + std::swap(in.paragraphs(), pars); +} + + +std::vector const availableSelections(Buffer const & buffer) +{ + vector selList; + + CutStack::const_iterator cit = theCuts.begin(); + CutStack::const_iterator end = theCuts.end(); + for (; cit != end; ++cit) { + // we do not use cit-> here because gcc 2.9x does not + // like it (JMarc) + ParagraphList const & pars = (*cit).first; + string asciiSel; + ParagraphList::const_iterator pit = pars.begin(); + ParagraphList::const_iterator pend = pars.end(); + for (; pit != pend; ++pit) { + asciiSel += pit->asString(buffer, false); + if (asciiSel.size() > 25) { + asciiSel.replace(22, string::npos, "..."); + break; + } + } + + selList.push_back(asciiSel); + } + return selList; +} + + +lyx::size_type numberOfSelections() +{ + return theCuts.size(); +} + + +void cutSelection(LCursor & cur, bool doclear, bool realcut) +{ // This doesn't make sense, if there is no selection if (!cur.selection()) return; @@ -409,47 +463,78 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut) // OK, we have a selection. This is always between cur.selBegin() // and cur.selEnd() - // make sure that the depth behind the selection are restored, too - recordUndoSelection(cur); - par_type begpit = cur.selBegin().par(); - par_type endpit = cur.selEnd().par(); - - int endpos = cur.selEnd().pos(); - - BufferParams const & bufparams = cur.bv().buffer()->params(); - boost::tie(endpit, endpos) = realcut ? - cutSelection(bufparams, - text->paragraphs(), - begpit, endpit, - cur.selBegin().pos(), endpos, - bufparams.textclass, - doclear) - : eraseSelection(bufparams, - text->paragraphs(), - begpit, endpit, - cur.selBegin().pos(), endpos, - doclear); - // sometimes necessary - if (doclear) - text->paragraphs()[begpit].stripLeadingSpaces(); - - text->redoParagraphs(begpit, begpit + 1); - // cutSelection can invalidate the cursor so we need to set - // it anew. (Lgb) - // we prefer the end for when tracking changes - cur.pos() = endpos; - cur.par() = endpit; - - // need a valid cursor. (Lgb) - cur.clearSelection(); - text->updateCounters(); + if (cur.inTexted()) { + LyXText * text = cur.text(); + BOOST_ASSERT(text); + // Stuff what we got on the clipboard. Even if there is no selection. + + // There is a problem with having the stuffing here in that the + // larger the selection the slower LyX will get. This can be + // solved by running the line below only when the selection has + // finished. The solution used currently just works, to make it + // faster we need to be more clever and probably also have more + // calls to stuffClipboard. (Lgb) +// cur.bv().stuffClipboard(cur.selectionAsString(true)); + + // make sure that the depth behind the selection are restored, too + recordUndoSelection(cur); + pit_type begpit = cur.selBegin().pit(); + pit_type endpit = cur.selEnd().pit(); + + int endpos = cur.selEnd().pos(); + + BufferParams const & bp = cur.buffer().params(); + if (realcut) { + copySelectionHelper(text->paragraphs(), + begpit, endpit, + cur.selBegin().pos(), endpos, + bp.textclass); + } + + boost::tie(endpit, endpos) = + eraseSelectionHelper(bp, + text->paragraphs(), + begpit, endpit, + cur.selBegin().pos(), endpos, + doclear); + + // sometimes necessary + if (doclear) + text->paragraphs()[begpit].stripLeadingSpaces(); + + // cutSelection can invalidate the cursor so we need to set + // it anew. (Lgb) + // we prefer the end for when tracking changes + cur.pos() = endpos; + cur.pit() = endpit; + + // need a valid cursor. (Lgb) + cur.clearSelection(); + updateCounters(cur.buffer()); + + // tell tabular that a recent copy happened + dirtyTabularStack(false); + } + + if (cur.inMathed()) { + if (cur.selBegin().idx() != cur.selEnd().idx()) { + // The current selection spans more than one cell. + // Record all cells + recordUndoInset(cur); + } else { + // Record only the current cell to avoid a jumping + // cursor after undo + recordUndo(cur); + } + if (realcut) + copySelection(cur); + eraseSelection(cur); + } } void copySelection(LCursor & cur) { - LyXText * text = cur.text(); - BOOST_ASSERT(text); // stuff the selection onto the X clipboard, from an explicit copy request cur.bv().stuffClipboard(cur.selectionAsString(true)); @@ -457,54 +542,88 @@ void copySelection(LCursor & cur) if (!cur.selection()) return; - // ok we have a selection. This is always between cur.selBegin() - // and sel_end cursor - - // copy behind a space if there is one - ParagraphList & pars = text->paragraphs(); - pos_type pos = cur.selBegin().pos(); - par_type par = cur.selBegin().par(); - while (pos < pars[par].size() - && pars[par].isLineSeparator(pos) - && (par != cur.selEnd().par() || pos < cur.selEnd().pos())) - ++pos; + if (cur.inTexted()) { + LyXText * text = cur.text(); + BOOST_ASSERT(text); + // ok we have a selection. This is always between cur.selBegin() + // and sel_end cursor + + // copy behind a space if there is one + ParagraphList & pars = text->paragraphs(); + pos_type pos = cur.selBegin().pos(); + pit_type par = cur.selBegin().pit(); + while (pos < pars[par].size() + && pars[par].isLineSeparator(pos) + && (par != cur.selEnd().pit() || pos < cur.selEnd().pos())) + ++pos; + + copySelectionHelper(pars, par, cur.selEnd().pit(), + pos, cur.selEnd().pos(), cur.buffer().params().textclass); + } - copySelection(pars, par, cur.selEnd().par(), - pos, cur.selEnd().pos(), cur.bv().buffer()->params().textclass); + if (cur.inMathed()) { + lyxerr << "copySelection in mathed" << endl; + ParagraphList pars; + pars.push_back(Paragraph()); + BufferParams const & bp = cur.buffer().params(); + pars.back().layout(bp.getLyXTextClass().defaultLayout()); + for_each(pars.begin(), pars.end(), resetOwnerAndChanges()); + pars.back().insert(0, grabSelection(cur), LyXFont()); + theCuts.push(make_pair(pars, bp.textclass)); + } + // tell tabular that a recent copy happened + dirtyTabularStack(false); } -void pasteSelection(LCursor & cur, size_t sel_index) +std::string getSelection(Buffer const & buf, size_t sel_index) { - LyXText * text = cur.text(); - BOOST_ASSERT(text); - // this does not make sense, if there is nothing to paste - if (!checkPastePossible()) - return; + return sel_index < theCuts.size() + ? theCuts[sel_index].first.back().asString(buf, false) + : string(); +} - recordUndo(cur); - par_type endpit; - PitPosPair ppp; +void pasteParagraphList(LCursor & cur, ParagraphList const & parlist, + textclass_type textclass) +{ + if (cur.inTexted()) { + LyXText * text = cur.text(); + BOOST_ASSERT(text); + + recordUndo(cur); + + pit_type endpit; + PitPosPair ppp; + ErrorList el; + + boost::tie(ppp, endpit) = + pasteSelectionHelper(cur.buffer(), + text->paragraphs(), + cur.pit(), cur.pos(), + parlist, textclass, + el); + bufferErrors(cur.buffer(), el); + updateCounters(cur.buffer()); + cur.clearSelection(); + text->setCursor(cur, ppp.first, ppp.second); + } - ErrorList el; + // mathed is handled in MathNestInset/MathGridInset + BOOST_ASSERT(!cur.inMathed()); +} - boost::tie(ppp, endpit) = - pasteSelection(*cur.bv().buffer(), - text->paragraphs(), - cur.par(), cur.pos(), - cur.bv().buffer()->params().textclass, - sel_index, el); - bufferErrors(*cur.bv().buffer(), el); - text->bv()->showErrorList(_("Paste")); - text->redoParagraphs(cur.par(), endpit); +void pasteSelection(LCursor & cur, size_t sel_index) +{ + // this does not make sense, if there is nothing to paste + if (!checkPastePossible(sel_index)) + return; - cur.clearSelection(); - cur.resetAnchor(); - text->setCursor(cur, ppp.first, ppp.second); + pasteParagraphList(cur, theCuts[sel_index].first, + theCuts[sel_index].second); + cur.bv().showErrorList(_("Paste")); cur.setSelection(); - text->updateCounters(); } @@ -530,14 +649,15 @@ void replaceSelectionWithString(LCursor & cur, string const & str) // Get font setting before we cut pos_type pos = cur.selEnd().pos(); - LyXFont const font = text->getPar(cur.selBegin().par()). - getFontSettings(cur.bv().buffer()->params(), cur.selBegin().pos()); + Paragraph & par = text->getPar(cur.selEnd().pit()); + LyXFont const font = + par.getFontSettings(cur.buffer().params(), cur.selBegin().pos()); // Insert the new string string::const_iterator cit = str.begin(); string::const_iterator end = str.end(); for (; cit != end; ++cit, ++pos) - text->getPar(cur.selEnd().par()).insertChar(pos, (*cit), font); + par.insertChar(pos, (*cit), font); // Cut the selection cutSelection(cur, true, false); @@ -566,5 +686,117 @@ void replaceWord(LCursor & cur, string const & replacestring) } +void eraseSelection(LCursor & cur) +{ + //lyxerr << "LCursor::eraseSelection begin: " << cur << endl; + CursorSlice const & i1 = cur.selBegin(); + CursorSlice const & i2 = cur.selEnd(); + if (i1.inset().asMathInset()) { + cur.top() = i1; + if (i1.idx() == i2.idx()) { + i1.cell().erase(i1.pos(), i2.pos()); + // We may have deleted i1.cell(cur.pos()). + // Make sure that pos is valid. + if (cur.pos() > cur.lastpos()) + cur.pos() = cur.lastpos(); + } else { + MathInset * p = i1.asMathInset(); + InsetBase::row_type r1, r2; + InsetBase::col_type c1, c2; + region(i1, i2, r1, r2, c1, c2); + for (InsetBase::row_type row = r1; row <= r2; ++row) + for (InsetBase::col_type col = c1; col <= c2; ++col) + p->cell(p->index(row, col)).clear(); + // We've deleted the whole cell. Only pos 0 is valid. + cur.pos() = 0; + } + // need a valid cursor. (Lgb) + cur.clearSelection(); + } else { + lyxerr << "can't erase this selection 1" << endl; + } + //lyxerr << "LCursor::eraseSelection end: " << cur << endl; +} + + +void selDel(LCursor & cur) +{ + //lyxerr << "LCursor::selDel" << endl; + if (cur.selection()) + eraseSelection(cur); +} + + +void selClearOrDel(LCursor & cur) +{ + //lyxerr << "LCursor::selClearOrDel" << endl; + if (lyxrc.auto_region_delete) + selDel(cur); + else + cur.selection() = false; +} + + +string grabSelection(LCursor const & cur) +{ + if (!cur.selection()) + return string(); + + // FIXME: What is wrong with the following? +#if 0 + std::ostringstream os; + for (DocIterator dit = cur.selectionBegin(); + dit != cur.selectionEnd(); dit.forwardPos()) + os << asString(dit.cell()); + return os.str(); +#endif + + CursorSlice i1 = cur.selBegin(); + CursorSlice i2 = cur.selEnd(); + + if (i1.idx() == i2.idx()) { + if (i1.inset().asMathInset()) { + MathArray::const_iterator it = i1.cell().begin(); + return asString(MathArray(it + i1.pos(), it + i2.pos())); + } else { + return "unknown selection 1"; + } + } + + InsetBase::row_type r1, r2; + InsetBase::col_type c1, c2; + region(i1, i2, r1, r2, c1, c2); + + string data; + if (i1.inset().asMathInset()) { + for (InsetBase::row_type row = r1; row <= r2; ++row) { + if (row > r1) + data += "\\\\"; + for (InsetBase::col_type col = c1; col <= c2; ++col) { + if (col > c1) + data += '&'; + data += asString(i1.asMathInset()-> + cell(i1.asMathInset()->index(row, col))); + } + } + } else { + data = "unknown selection 2"; + } + return data; +} + + +void dirtyTabularStack(bool b) +{ + dirty_tabular_stack_ = b; +} + + +bool tabularStackDirty() +{ + return dirty_tabular_stack_; +} + + } // namespace cap } // namespace lyx