X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=17dbdc626e1aa84f45e07e8f0f932eafecb33921;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=893c9ef39324d82759b4c7a01a7e34001861ccb3;hpb=07ca50d90590c13446eb76927d136db63c70711b;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 893c9ef393..17dbdc626e 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -60,15 +60,16 @@ #include "support/lassert.h" #include "support/limited_stack.h" #include "support/lstrings.h" +#include "support/lyxalgo.h" +#include "support/TempFile.h" +#include "support/unique_ptr.h" #include "frontends/alert.h" #include "frontends/Clipboard.h" #include "frontends/Selection.h" -#include -#include - #include +#include using namespace std; using namespace lyx::support; @@ -85,6 +86,8 @@ typedef limited_stack > CutStack; CutStack theCuts(10); // persistent selection, cleared until the next selection CutStack selectionBuffer(1); +// temporary scratch area +CutStack tempCut(1); // 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, @@ -99,39 +102,41 @@ bool checkPastePossible(int index) struct PasteReturnValue { - PasteReturnValue(pit_type r_par, pos_type r_pos, bool r_nu) : - par(r_par), pos(r_pos), needupdate(r_nu) + PasteReturnValue(pit_type r_pit, pos_type r_pos, bool r_nu) : + pit(r_pit), pos(r_pos), needupdate(r_nu) {} - pit_type par; + pit_type pit; pos_type pos; bool needupdate; }; PasteReturnValue pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, - DocumentClassConstPtr oldDocClass, ErrorList & errorlist) + DocumentClassConstPtr oldDocClass, cap::BranchAction branchAction, + ErrorList & errorlist) { Buffer const & buffer = *cur.buffer(); pit_type pit = cur.pit(); pos_type pos = cur.pos(); bool need_update = false; + + if (parlist.empty()) + return PasteReturnValue(pit, pos, need_update); + InsetText * target_inset = cur.inset().asInsetText(); if (!target_inset) { InsetTabular * it = cur.inset().asInsetTabular(); - target_inset = it? it->cell(cur.idx())->asInsetText() : 0; + target_inset = it ? it->cell(cur.idx())->asInsetText() : 0; } LASSERT(target_inset, return PasteReturnValue(pit, pos, need_update)); - ParagraphList & pars = target_inset->paragraphs(); - if (parlist.empty()) - return PasteReturnValue(pit, pos, need_update); - - BOOST_ASSERT (pos <= pars[pit].size()); + ParagraphList & pars = target_inset->paragraphs(); + LASSERT(pos <= pars[pit].size(), + return PasteReturnValue(pit, pos, need_update)); // Make a copy of the CaP paragraphs. ParagraphList insertion = parlist; - DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr(); // Now remove all out of the pars which is NOT allowed in the // new environment and set also another font if that is required. @@ -155,8 +160,9 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, } // set the paragraphs to plain layout if necessary + DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr(); if (cur.inset().usePlainLayout()) { - bool forcePlainLayout = cur.inset().forcePlainLayout(); + bool forcePlainLayout = target_inset->forcePlainLayout(); Layout const & plainLayout = newDocClass->plainLayout(); Layout const & defaultLayout = newDocClass->defaultLayout(); ParagraphList::iterator const end = insertion.end(); @@ -166,7 +172,8 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, if (forcePlainLayout || parLayout == defaultLayout) par->setLayout(plainLayout); } - } else { // check if we need to reset from plain layout + } else { + // check if we need to reset from plain layout Layout const & defaultLayout = newDocClass->defaultLayout(); Layout const & plainLayout = newDocClass->plainLayout(); ParagraphList::iterator const end = insertion.end(); @@ -208,10 +215,8 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, if (tmpbuf->params().depth() > max_depth) tmpbuf->params().depth(max_depth); - // Only set this from the 2nd on as the 2nd depends - // for maxDepth still on pit. - if (tmpbuf != insertion.begin()) - max_depth = tmpbuf->getMaxDepthAfter(); + // Set max_depth for the next paragraph + max_depth = tmpbuf->getMaxDepthAfter(); // Set the inset owner of this paragraph. tmpbuf->setInsetOwner(target_inset); @@ -222,7 +227,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, tmpbuf->eraseChar(i--, false); } - tmpbuf->setChange(Change(buffer.params().trackChanges ? + tmpbuf->setChange(Change(buffer.params().track_changes ? Change::INSERTED : Change::UNCHANGED)); } @@ -352,15 +357,28 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, || (is_child && (branchlist.find(name) || buffer.masterBuffer()->params().branchlist().find(name)))) break; - // FIXME: add an option to add the branch to the master's BranchList. - docstring text = bformat( + switch(branchAction) { + case cap::BRANCH_ADD: { + // This is for a temporary buffer, so simply create the branch. + // Must not use lyx::dispatch(), since tmpbuffer has no view. + DispatchResult dr; + const_cast(buffer).dispatch(FuncRequest(LFUN_BRANCH_ADD, name), dr); + break; + } + case cap::BRANCH_ASK: { + docstring text = bformat( _("The pasted branch \"%1$s\" is undefined.\n" "Do you want to add it to the document's branch list?"), name); - if (frontend::Alert::prompt(_("Unknown branch"), + if (frontend::Alert::prompt(_("Unknown branch"), text, 0, 1, _("&Add"), _("&Don't Add")) != 0) + break; + lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name)); break; - lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name)); + } + case cap::BRANCH_IGNORE: + break; + } // We need to update the list of branches. need_update = true; break; @@ -378,7 +396,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, // Paste it! if (empty) { - pars.insert(boost::next(pars.begin(), pit), + pars.insert(lyx::next(pars.begin(), pit), insertion.begin(), insertion.end()); @@ -386,7 +404,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, mergeParagraph(buffer.params(), pars, pit + insertion.size() - 1); } else { - pars.insert(boost::next(pars.begin(), pit + 1), + pars.insert(lyx::next(pars.begin(), pit + 1), insertion.begin(), insertion.end()); @@ -418,7 +436,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, pars[last_paste].makeSameLayout(pars[last_paste + 1]); mergeParagraph(buffer.params(), pars, last_paste); } else { - pars[last_paste + 1].stripLeadingSpaces(buffer.params().trackChanges); + pars[last_paste + 1].stripLeadingSpaces(buffer.params().track_changes); ++last_paste; } } @@ -439,17 +457,17 @@ PitPosPair eraseSelectionHelper(BufferParams const & params, // Start and end is inside same paragraph if (endpit == pit_type(pars.size()) || startpit == endpit) { - endpos -= pars[startpit].eraseChars(startpos, endpos, params.trackChanges); + endpos -= pars[startpit].eraseChars(startpos, endpos, params.track_changes); return PitPosPair(endpit, endpos); } for (pit_type pit = startpit; pit != endpit + 1;) { pos_type const left = (pit == startpit ? startpos : 0); pos_type right = (pit == endpit ? endpos : pars[pit].size() + 1); - bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.trackChanges); + bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.track_changes); // Logically erase only, including the end-of-paragraph character - pars[pit].eraseChars(left, right, params.trackChanges); + pars[pit].eraseChars(left, right, params.track_changes); // Separate handling of paragraph break: if (merge && pit != endpit && @@ -471,59 +489,92 @@ PitPosPair eraseSelectionHelper(BufferParams const & params, } -void putClipboard(ParagraphList const & paragraphs, - DocumentClassConstPtr docclass, docstring const & plaintext) +Buffer * copyToTempBuffer(ParagraphList const & paragraphs, DocumentClassConstPtr docclass) { // This used to need to be static to avoid a memory leak. It no longer needs // to be so, but the alternative is to construct a new one of these (with a // new temporary directory, etc) every time, and then to destroy it. So maybe // it's worth just keeping this one around. - Buffer * staticbuffer = theBufferList().newInternalBuffer( - FileName::tempName("clipboard.internal").absFileName()); - - // These two things only really need doing the first time. - staticbuffer->setUnnamed(true); - staticbuffer->inset().setBuffer(*staticbuffer); - + static TempFile tempfile("clipboard.internal"); + tempfile.setAutoRemove(false); + // The initialization of staticbuffer is thread-safe. Using a lambda + // guarantees that the properties are set only once. + static Buffer * staticbuffer = [&](){ + Buffer * b = + theBufferList().newInternalBuffer(tempfile.name().absFileName()); + b->setUnnamed(true); + b->inset().setBuffer(*b); + //initialize staticbuffer with b + return b; + }(); // Use a clone for the complicated stuff so that we do not need to clean // up in order to avoid a crash. Buffer * buffer = staticbuffer->cloneBufferOnly(); - LASSERT(buffer, return); + LASSERT(buffer, return 0); // This needs doing every time. + // Since setDocumentClass() causes deletion of the old document class + // we need to reset all layout pointers in paragraphs (otherwise they + // would be dangling). + ParIterator const end = buffer->par_iterator_end(); + for (ParIterator it = buffer->par_iterator_begin(); it != end; ++it) { + docstring const name = it->layout().name(); + if (docclass->hasLayout(name)) + it->setLayout((*docclass)[name]); + else + it->setPlainOrDefaultLayout(*docclass); + } buffer->params().setDocumentClass(docclass); // we will use pasteSelectionHelper to copy the paragraphs into the // temporary Buffer, since it does a lot of things to fix them up. DocIterator dit = doc_iterator_begin(buffer, &buffer->inset()); ErrorList el; - pasteSelectionHelper(dit, paragraphs, docclass, el); + pasteSelectionHelper(dit, paragraphs, docclass, cap::BRANCH_ADD, el); + + return buffer; +} + + +void putClipboard(ParagraphList const & paragraphs, + DocumentClassConstPtr docclass, docstring const & plaintext) +{ + Buffer * buffer = copyToTempBuffer(paragraphs, docclass); + if (!buffer) // already asserted in copyToTempBuffer() + return; // We don't want to produce images that are not used. Therefore, // output formulas as MathML. Even if this is not understood by all // applications, the number that can parse it should go up in the future. buffer->params().html_math_output = BufferParams::MathML; - // The Buffer is being used to export. This is necessary so that the - // updateMacros call will record the needed information. - MarkAsExporting mex(buffer); - - buffer->updateBuffer(Buffer::UpdateMaster, OutputUpdate); - buffer->updateMacros(); - buffer->updateMacroInstances(OutputUpdate); - - // LyX's own format - string lyx; - ostringstream oslyx; - if (buffer->write(oslyx)) - lyx = oslyx.str(); - - // XHTML format - odocstringstream oshtml; - OutputParams runparams(encodings.fromLyXName("utf8")); - buffer->writeLyXHTMLSource(oshtml, runparams, Buffer::FullSource); - - theClipboard().put(lyx, oshtml.str(), plaintext); + // Make sure MarkAsExporting is deleted before buffer is + { + // The Buffer is being used to export. This is necessary so that the + // updateMacros call will record the needed information. + MarkAsExporting mex(buffer); + + buffer->updateBuffer(Buffer::UpdateMaster, OutputUpdate); + buffer->updateMacros(); + buffer->updateMacroInstances(OutputUpdate); + + // LyX's own format + string lyx; + ostringstream oslyx; + if (buffer->write(oslyx)) + lyx = oslyx.str(); + + // XHTML format + odocstringstream oshtml; + OutputParams runparams(encodings.fromLyXName("utf8")); + // We do not need to produce images, etc. + runparams.dryrun = true; + // We are not interested in errors (bug 8866) + runparams.silent = true; + buffer->writeLyXHTMLSource(oshtml, runparams, Buffer::FullSource); + + theClipboard().put(lyx, oshtml.str(), plaintext); + } // Save that memory delete buffer; @@ -559,8 +610,8 @@ void copySelectionHelper(Buffer const & buf, Text const & text, LASSERT(startpit != endpit || start <= end, return); // Clone the paragraphs within the selection. - ParagraphList copy_pars(boost::next(pars.begin(), startpit), - boost::next(pars.begin(), endpit + 1)); + ParagraphList copy_pars(lyx::next(pars.begin(), startpit), + lyx::next(pars.begin(), endpit + 1)); // Remove the end of the last paragraph; afterwards, remove the // beginning of the first paragraph. Keep this order - there may only @@ -601,7 +652,7 @@ void copySelectionHelper(Buffer const & buf, Text const & text, // are not linked to something else. it = copy_pars.begin(); for (; it != it_end; ++it) { - it->setBuffer(*static_cast(0)); + it->resetBuffer(); it->setInsetOwner(0); } @@ -685,7 +736,7 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, { errorlist.clear(); - LBUFERR(!in.paragraphs().empty(), ""); + LBUFERR(!in.paragraphs().empty()); if (oldone == newone) return; @@ -709,8 +760,8 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, if (added_one || newlayouts.find(name) != newlayouts.end()) { // Warn the user. docstring const s = bformat(_("Layout `%1$s' was not found."), name); - errorlist.push_back( - ErrorItem(_("Layout Not Found"), s, it->id(), 0, it->size())); + errorlist.push_back(ErrorItem(_("Layout Not Found"), s, + {it->id(), 0}, {it->id(), -1})); } if (in.usePlainLayout()) @@ -719,35 +770,43 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, it->setLayout(newtc[name]); } - // character styles + // character styles and hidden table cells InsetIterator const i_end = inset_iterator_end(in); for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) { - if (it->lyxCode() != FLEX_CODE) + InsetCode const code = it->lyxCode(); + if (code == FLEX_CODE) { // FIXME: Should we verify all InsetCollapsable? - continue; - - docstring const layoutName = it->layoutName(); - docstring const & n = newone->insetLayout(layoutName).name(); - bool const is_undefined = n.empty() || - n == DocumentClass::plainInsetLayout().name(); - if (!is_undefined) - continue; - - // The flex inset is undefined in newtc - docstring const oldname = from_utf8(oldtc.name()); - docstring const newname = from_utf8(newtc.name()); - docstring s; - if (oldname == newname) - s = bformat(_("Flex inset %1$s is undefined after " - "reloading `%2$s' layout."), layoutName, oldname); - else - s = bformat(_("Flex inset %1$s is undefined because of " - "conversion from `%2$s' layout to `%3$s'."), - layoutName, oldname, newname); - // To warn the user that something had to be done. - errorlist.push_back(ErrorItem( - _("Undefined flex inset"), - s, it.paragraph().id(), it.pos(), it.pos() + 1)); + docstring const layoutName = it->layoutName(); + docstring const & n = newone->insetLayout(layoutName).name(); + bool const is_undefined = n.empty() || + n == DocumentClass::plainInsetLayout().name(); + if (!is_undefined) + continue; + + // The flex inset is undefined in newtc + docstring const oldname = from_utf8(oldtc.name()); + docstring const newname = from_utf8(newtc.name()); + docstring s; + if (oldname == newname) + s = bformat(_("Flex inset %1$s is undefined after " + "reloading `%2$s' layout."), layoutName, oldname); + else + s = bformat(_("Flex inset %1$s is undefined because of " + "conversion from `%2$s' layout to `%3$s'."), + layoutName, oldname, newname); + // To warn the user that something had to be done. + errorlist.push_back(ErrorItem( + _("Undefined flex inset"), s, + {it.paragraph().id(), it.pos()}, + {it.paragraph().id(), it.pos()+1})); + } else if (code == TABULAR_CODE) { + // The recursion above does not catch paragraphs in "hidden" cells, + // i.e., ones that are part of a multirow or multicolum. So we need + // to handle those separately. + // This is the cause of bug #9049. + InsetTabular * table = it->asInsetTabular(); + table->setLayoutForHiddenCells(newtc); + } } } @@ -764,22 +823,20 @@ vector availableSelections(Buffer const * buf) // we do not use cit-> here because gcc 2.9x does not // like it (JMarc) ParagraphList const & pars = (*cit).first; - docstring asciiSel; + docstring textSel; ParagraphList::const_iterator pit = pars.begin(); ParagraphList::const_iterator pend = pars.end(); for (; pit != pend; ++pit) { - Paragraph par(*pit, 0, 26); + Paragraph par(*pit, 0, 46); // adapt paragraph to current buffer. par.setBuffer(const_cast(*buf)); - asciiSel += par.asString(AS_STR_INSETS); - if (asciiSel.size() > 25) { - asciiSel.replace(22, docstring::npos, - from_ascii("...")); + textSel += par.asString(AS_STR_INSETS); + if (textSel.size() > 45) { + support::truncateWithEllipsis(textSel,45); break; } } - - selList.push_back(asciiSel); + selList.push_back(textSel); } return selList; @@ -791,8 +848,9 @@ size_type numberOfSelections() return theCuts.size(); } +namespace { -void cutSelection(Cursor & cur, bool doclear, bool realcut) +void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool doclear, bool realcut, bool putclip) { // This doesn't make sense, if there is no selection if (!cur.selection()) @@ -803,7 +861,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) if (cur.inTexted()) { Text * text = cur.text(); - LBUFERR(text, _("Invalid cursor!")); + LBUFERR(text); saveSelection(cur); @@ -820,21 +878,20 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) *text, begpit, endpit, cur.selBegin().pos(), endpos, - bp.documentClassPtr(), theCuts); + bp.documentClassPtr(), cuts); // Stuff what we got on the clipboard. // Even if there is no selection. - putClipboard(theCuts[0].first, theCuts[0].second, - cur.selectionAsString(true)); + if (putclip) + putClipboard(cuts[0].first, cuts[0].second, + cur.selectionAsString(true)); } if (begpit != endpit) cur.screenUpdateFlags(Update::Force | Update::FitCursor); - boost::tie(endpit, endpos) = - eraseSelectionHelper(bp, - text->paragraphs(), - begpit, endpit, - cur.selBegin().pos(), endpos); + tie(endpit, endpos) = + eraseSelectionHelper(bp, text->paragraphs(), begpit, endpit, + cur.selBegin().pos(), endpos); // cutSelection can invalidate the cursor so we need to set // it anew. (Lgb) @@ -844,7 +901,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) // sometimes necessary if (doclear - && text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges)) + && text->paragraphs()[begpit].stripLeadingSpaces(bp.track_changes)) cur.fixIfBroken(); // need a valid cursor. (Lgb) @@ -876,6 +933,19 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) } } +} + +void cutSelection(Cursor & cur, bool doclear, bool realcut) +{ + cutSelectionHelper(cur, theCuts, doclear, realcut, true); +} + + +void cutSelectionToTemp(Cursor & cur, bool doclear, bool realcut) +{ + cutSelectionHelper(cur, tempCut, doclear, realcut, false); +} + void copySelection(Cursor const & cur) { @@ -889,7 +959,8 @@ void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext) Paragraph par; BufferParams const & bp = cur.buffer()->params(); par.setLayout(bp.documentClass().plainLayout()); - par.insertInset(0, inset, Change(Change::UNCHANGED)); + Font font(inherit_font, bp.language); + par.insertInset(0, inset, font, Change(Change::UNCHANGED)); pars.push_back(par); theCuts.push(make_pair(pars, bp.documentClassPtr())); @@ -912,23 +983,14 @@ void copySelectionToStack(Cursor const & cur, CutStack & cutstack) if (cur.inTexted()) { Text * text = cur.text(); - LBUFERR(text, _("Invalid cursor!")); + LBUFERR(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(*cur.buffer(), *text, par, cur.selEnd().pit(), - pos, cur.selEnd().pos(), - cur.buffer()->params().documentClassPtr(), cutstack); - + copySelectionHelper(*cur.buffer(), *text, + cur.selBegin().pit(), cur.selEnd().pit(), + cur.selBegin().pos(), cur.selEnd().pos(), + cur.buffer()->params().documentClassPtr(), + cutstack); // Reset the dirty_tabular_stack_ flag only when something // is copied to the clipboard (not to the selectionBuffer). if (&cutstack == &theCuts) @@ -1010,30 +1072,37 @@ void clearSelection() void clearCutStack() { theCuts.clear(); + tempCut.clear(); } -docstring selection(size_t sel_index) +docstring selection(size_t sel_index, DocumentClassConstPtr docclass) { - return sel_index < theCuts.size() - ? theCuts[sel_index].first.back().asString(AS_STR_INSETS | AS_STR_NEWLINES) - : docstring(); + if (sel_index >= theCuts.size()) + return docstring(); + + unique_ptr buffer(copyToTempBuffer(theCuts[sel_index].first, + docclass)); + if (!buffer) + return docstring(); + + return buffer->paragraphs().back().asString(AS_STR_INSETS | AS_STR_NEWLINES); } void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, - DocumentClassConstPtr docclass, ErrorList & errorList) + DocumentClassConstPtr docclass, ErrorList & errorList, + cap::BranchAction branchAction) { if (cur.inTexted()) { Text * text = cur.text(); - LBUFERR(text, _("Invalid cursor!")); + LBUFERR(text); PasteReturnValue prv = - pasteSelectionHelper(cur, parlist, docclass, errorList); - if (prv.needupdate) - cur.forceBufferUpdate(); + pasteSelectionHelper(cur, parlist, docclass, branchAction, errorList); + cur.forceBufferUpdate(); cur.clearSelection(); - text->setCursor(cur, prv.par, prv.pos); + text->setCursor(cur, prv.pit, prv.pos); } // mathed is handled in InsetMathNest/InsetMathGrid @@ -1041,27 +1110,39 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, } -void pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index) +bool pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index) { // this does not make sense, if there is nothing to paste if (!checkPastePossible(sel_index)) - return; + return false; cur.recordUndo(); pasteParagraphList(cur, theCuts[sel_index].first, - theCuts[sel_index].second, errorList); + theCuts[sel_index].second, errorList, BRANCH_ASK); + return true; +} + + +bool pasteFromTemp(Cursor & cur, ErrorList & errorList) +{ + // this does not make sense, if there is nothing to paste + if (tempCut.empty() || tempCut[0].first.empty()) + return false; + + cur.recordUndo(); + pasteParagraphList(cur, tempCut[0].first, + tempCut[0].second, errorList, BRANCH_IGNORE); + return true; } -void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, +bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, Clipboard::TextType type) { // Use internal clipboard if it is the most recent one // This overrides asParagraphs and type on purpose! - if (theClipboard().isInternal()) { - pasteFromStack(cur, errorList, 0); - return; - } + if (theClipboard().isInternal()) + return pasteFromStack(cur, errorList, 0); // First try LyX format if ((type == Clipboard::LyXTextType || @@ -1078,14 +1159,14 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, cur.recordUndo(); pasteParagraphList(cur, buffer.paragraphs(), buffer.params().documentClassPtr(), errorList); - return; + return true; } } } // Then try TeX and HTML Clipboard::TextType types[2] = {Clipboard::HtmlTextType, Clipboard::LaTeXTextType}; - string names[2] = {"html", "latex"}; + string names[2] = {"html", "latexclipboard"}; for (int i = 0; i < 2; ++i) { if (type != types[i] && type != Clipboard::AnyTextType) continue; @@ -1107,11 +1188,14 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, // Buffer buffer(string(), false); Buffer buffer("", false); buffer.setUnnamed(true); - if (buffer.importString(names[i], text, errorList)) { + available = buffer.importString(names[i], text, errorList); + if (available) + available = !buffer.paragraphs().empty(); + if (available && !buffer.paragraphs()[0].empty()) { cur.recordUndo(); pasteParagraphList(cur, buffer.paragraphs(), buffer.params().documentClassPtr(), errorList); - return; + return true; } } } @@ -1120,12 +1204,14 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, // Then try plain text docstring const text = theClipboard().getAsText(Clipboard::PlainTextType); if (text.empty()) - return; + return false; cur.recordUndo(); if (asParagraphs) cur.text()->insertStringAsParagraphs(cur, text, cur.current_font); else cur.text()->insertStringAsLines(cur, text, cur.current_font); + cur.forceBufferUpdate(); + return true; } @@ -1207,7 +1293,7 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str) docstring::const_iterator cit = str.begin(); docstring::const_iterator end = str.end(); for (; cit != end; ++cit, ++pos) - par.insertChar(pos, *cit, font, cur.buffer()->params().trackChanges); + par.insertChar(pos, *cit, font, cur.buffer()->params().track_changes); // Cut the selection cutSelection(cur, true, false); @@ -1226,31 +1312,43 @@ void eraseSelection(Cursor & cur) //lyxerr << "cap::eraseSelection begin: " << cur << endl; CursorSlice const & i1 = cur.selBegin(); CursorSlice const & i2 = cur.selEnd(); - if (i1.inset().asInsetMath()) { - saveSelection(cur); - 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 { - InsetMath * p = i1.asInsetMath(); - Inset::row_type r1, r2; - Inset::col_type c1, c2; - region(i1, i2, r1, r2, c1, c2); - for (Inset::row_type row = r1; row <= r2; ++row) - for (Inset::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(); + if (!i1.asInsetMath()) { + LYXERR0("Can't erase this selection"); + return; + } + + saveSelection(cur); + cur.top() = i1; + InsetMath * p = i1.asInsetMath(); + 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 if (p->nrows() > 0 && p->ncols() > 0) { + // This is a grid, delete a nice square region + Inset::row_type r1, r2; + Inset::col_type c1, c2; + region(i1, i2, r1, r2, c1, c2); + for (Inset::row_type row = r1; row <= r2; ++row) + for (Inset::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; } else { - lyxerr << "can't erase this selection 1" << endl; + Inset::idx_type idx1 = i1.idx(); + Inset::idx_type idx2 = i2.idx(); + if (idx1 > idx2) + swap(idx1, idx2); + for (Inset::idx_type idx = idx1 ; idx <= idx2; ++idx) + p->cell(idx).clear(); + // We've deleted the whole cell. Only pos 0 is valid. + cur.pos() = 0; } + + // need a valid cursor. (Lgb) + cur.clearSelection(); //lyxerr << "cap::eraseSelection end: " << cur << endl; } @@ -1269,7 +1367,7 @@ void selClearOrDel(Cursor & cur) if (lyxrc.auto_region_delete) selDel(cur); else - cur.setSelection(false); + cur.selection(false); }