X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.C;h=e554ac6311098839dcff14ca605c8e4445001370;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=dcab51805b5c0e64971a5a47966d6c5df2d42060;hpb=8b5616664142ff0c6384afc18248ae4bf002caa8;p=lyx.git diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index dcab51805b..e554ac6311 100644 --- a/src/CutAndPaste.C +++ b/src/CutAndPaste.C @@ -33,7 +33,6 @@ #include "paragraph.h" #include "paragraph_funcs.h" #include "ParagraphParameters.h" -#include "ParagraphList_fwd.h" #include "pariterator.h" #include "undo.h" @@ -49,6 +48,7 @@ #include "frontends/Clipboard.h" #include "frontends/Selection.h" +#include #include #include @@ -331,7 +331,9 @@ PitPosPair eraseSelectionHelper(BufferParams const & params, void putClipboard(ParagraphList const & paragraphs, textclass_type textclass, docstring const & plaintext) { - Buffer buffer(string(), false); + // For some strange reason gcc 3.2 and 3.3 do not accept + // Buffer buffer(string(), false); + Buffer buffer("", false); buffer.setUnnamed(true); buffer.paragraphs() = paragraphs; buffer.params().textclass = textclass; @@ -352,11 +354,19 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars, 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)); + ParagraphList copy_pars(boost::next(pars.begin(), startpit), + boost::next(pars.begin(), endpit + 1)); - ParagraphList::iterator it = paragraphs.begin(); - ParagraphList::iterator it_end = paragraphs.end(); + // Remove the end of the last paragraph; afterwards, remove the beginning + // of the first paragraph. Keep this order - there may only be one paragraph! + // Do not track deletions here; this is an internal action not visible to the user + Paragraph & back = copy_pars.back(); + back.eraseChars(end, back.size(), false); + Paragraph & front = copy_pars.front(); + front.eraseChars(0, start, false); + + ParagraphList::iterator it = copy_pars.begin(); + ParagraphList::iterator it_end = copy_pars.end(); for (; it != it_end; it++) { // ERT paragraphs have the Language latex_language. @@ -369,17 +379,15 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars, it->setInsetOwner(0); } - // Cut out the end of the last paragraph. - Paragraph & back = paragraphs.back(); - // do not track deletion here; it is an internal action not visible to the user - back.eraseChars(end, back.size(), false); - - // Cut out the begin of the first paragraph - Paragraph & front = paragraphs.front(); - // again, do not track deletion - front.eraseChars(0, start, false); + // do not copy text (also nested in insets) which is marked as deleted + // acceptChanges() is defined for LyXText rather than ParagraphList + // Thus we must wrap copy_pars into a LyXText object and cross our fingers + LyXText lt; + copy_pars.swap(lt.paragraphs()); + lt.acceptChanges(buf.params()); + copy_pars.swap(lt.paragraphs()); - cutstack.push(make_pair(paragraphs, tc)); + cutstack.push(make_pair(copy_pars, tc)); } } // namespace anon @@ -540,16 +548,17 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut) cur.selBegin().pos(), endpos, doclear); - // sometimes necessary - if (doclear) - text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges); - // 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; + // sometimes necessary + if (doclear + && text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges)) + cur.fixIfBroken(); + // need a valid cursor. (Lgb) cur.clearSelection(); updateLabels(cur.buffer()); @@ -600,9 +609,9 @@ void copySelectionToStack(LCursor & cur, CutStack & cutstack) 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())) + while (pos < pars[par].size() && + pars[par].isLineSeparator(pos) && + (par != cur.selEnd().pit() || pos < cur.selEnd().pos())) ++pos; copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(), @@ -633,7 +642,20 @@ void copySelectionToStack() void copySelection(LCursor & cur, docstring const & plaintext) { - copySelectionToStack(cur, theCuts); + // In tablemode, because copy and paste actually use special table stack + // we do not attemp to get selected paragraphs under cursor. Instead, a + // paragraph with the plain text version is generated so that table cells + // can be pasted as pure text somewhere else. + if (cur.selBegin().idx() != cur.selEnd().idx()) { + ParagraphList pars; + Paragraph par; + BufferParams const & bp = cur.buffer().params(); + par.layout(bp.getLyXTextClass().defaultLayout()); + par.insert(0, plaintext, LyXFont(), Change(Change::UNCHANGED)); + pars.push_back(par); + theCuts.push(make_pair(pars, bp.textclass)); + } else + copySelectionToStack(cur, theCuts); // stuff the selection onto the X clipboard, from an explicit copy request putClipboard(theCuts[0].first, theCuts[0].second, plaintext); @@ -642,8 +664,10 @@ void copySelection(LCursor & cur, docstring const & plaintext) void saveSelection(LCursor & cur) { - lyxerr[Debug::ACTION] << "cap::saveSelection: `" - << to_utf8(cur.selectionAsString(true)) << "'." << endl; + if (lyxerr.debugging(Debug::ACTION)) + lyxerr << BOOST_CURRENT_FUNCTION << ": `" + << to_utf8(cur.selectionAsString(true)) << "'." + << endl; if (cur.selection()) copySelectionToStack(cur, selectionBuffer); @@ -713,7 +737,7 @@ void pasteClipboard(LCursor & cur, ErrorList & errorList, bool asParagraphs) { // Use internal clipboard if it is the most recent one if (theClipboard().isInternal()) { - pasteClipboard(cur, errorList, 0); + pasteFromStack(cur, errorList, 0); return; } @@ -721,7 +745,9 @@ void pasteClipboard(LCursor & cur, ErrorList & errorList, bool asParagraphs) if (theClipboard().hasLyXContents()) { string lyx = theClipboard().getAsLyX(); if (!lyx.empty()) { - Buffer buffer(string(), false); + // For some strange reason gcc 3.2 and 3.3 do not accept + // Buffer buffer(string(), false); + Buffer buffer("", false); buffer.setUnnamed(true); if (buffer.readString(lyx)) { recordUndo(cur);