X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=901b7d7f4a6abafe0d4bcd587e91c64884f10506;hb=f83a38b3defc997f808539d0dfd618f5ba71e13c;hp=bd0b3baaa7cdddfa974b49b52897f687ba0dd97d;hpb=a01cb111a07717a337c18860216359cdbe22af3c;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index bd0b3baaa7..901b7d7f4a 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -17,16 +17,17 @@ #include "Buffer.h" #include "buffer_funcs.h" +#include "BufferList.h" #include "BufferParams.h" #include "BufferView.h" #include "Changes.h" #include "Cursor.h" #include "ErrorList.h" +#include "FuncCode.h" #include "FuncRequest.h" #include "InsetIterator.h" #include "InsetList.h" #include "Language.h" -#include "lfuns.h" #include "LyXFunc.h" #include "LyXRC.h" #include "Text.h" @@ -82,22 +83,6 @@ CutStack selectionBuffer(1); bool dirty_tabular_stack_ = false; -void region(CursorSlice const & i1, CursorSlice const & i2, - Inset::row_type & r1, Inset::row_type & r2, - Inset::col_type & c1, Inset::col_type & c2) -{ - Inset & p = i1.inset(); - c1 = p.col(i1.idx()); - c2 = p.col(i2.idx()); - if (c1 > c2) - swap(c1, c2); - r1 = p.row(i1.idx()); - r2 = p.row(i2.idx()); - if (r1 > r2) - swap(r1, r2); -} - - bool checkPastePossible(int index) { return size_t(index) < theCuts.size() && !theCuts[index].first.empty(); @@ -106,12 +91,14 @@ bool checkPastePossible(int index) pair pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, - DocumentClass const * const docclass, ErrorList & errorlist) + DocumentClass const * const oldDocClass, ErrorList & errorlist) { Buffer const & buffer = cur.buffer(); pit_type pit = cur.pit(); pos_type pos = cur.pos(); - ParagraphList & pars = cur.text()->paragraphs(); + InsetText * target_inset = cur.inset().asInsetText(); + LASSERT(target_inset, return make_pair(PitPosPair(pit, pos), pit)); + ParagraphList & pars = target_inset->paragraphs(); if (parlist.empty()) return make_pair(PitPosPair(pit, pos), pit); @@ -120,49 +107,64 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, // Make a copy of the CaP paragraphs. ParagraphList insertion = parlist; - DocumentClass const * const tc = buffer.params().documentClassPtr(); + DocumentClass const * const 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. // Convert newline to paragraph break in ERT inset. // This should not be here! - Inset * inset = pars[pit].inInset(); - if (inset && (inset->lyxCode() == ERT_CODE || - inset->lyxCode() == LISTINGS_CODE)) { + InsetCode const code = target_inset->lyxCode(); + if (code == ERT_CODE || code == LISTINGS_CODE) { for (size_t i = 0; i != insertion.size(); ++i) { for (pos_type j = 0; j != insertion[i].size(); ++j) { if (insertion[i].isNewline(j)) { // do not track deletion of newline insertion[i].eraseChar(j, false); + insertion[i].setInsetOwner(target_inset); breakParagraphConservative( buffer.params(), insertion, i, j); + break; } } } } - // set the paragraphs to empty layout if necessary - // note that we are doing this if the empty layout is - // supposed to be the default, not just if it is forced - if (cur.inset().useEmptyLayout()) { - Layout const & layout = - buffer.params().documentClass().emptyLayout(); + // set the paragraphs to plain layout if necessary + if (cur.inset().usePlainLayout()) { + bool forcePlainLayout = cur.inset().forcePlainLayout(); + Layout const & plainLayout = newDocClass->plainLayout(); + Layout const & defaultLayout = newDocClass->defaultLayout(); ParagraphList::iterator const end = insertion.end(); - for (ParagraphList::iterator par = insertion.begin(); - par != end; ++par) - par->setLayout(layout); + ParagraphList::iterator par = insertion.begin(); + for (; par != end; ++par) { + Layout const & parLayout = par->layout(); + if (forcePlainLayout || parLayout == defaultLayout) + par->setLayout(plainLayout); + } + } 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(); + ParagraphList::iterator par = insertion.begin(); + for (; par != end; ++par) { + Layout const & parLayout = par->layout(); + if (parLayout == plainLayout) + par->setLayout(defaultLayout); + } } + InsetText in(buffer); // Make sure there is no class difference. - InsetText in; + in.paragraphs().clear(); // This works without copying any paragraph data because we have // a specialized swap method for ParagraphList. This is important // since we store pointers to insets at some places and we don't // want to invalidate them. insertion.swap(in.paragraphs()); - cap::switchBetweenClasses(docclass, tc, in, errorlist); + cap::switchBetweenClasses(oldDocClass, newDocClass, in, errorlist); insertion.swap(in.paragraphs()); ParagraphList::iterator tmpbuf = insertion.begin(); @@ -190,11 +192,11 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, max_depth = tmpbuf->getMaxDepthAfter(); // Set the inset owner of this paragraph. - tmpbuf->setInsetOwner(pars[pit].inInset()); + tmpbuf->setInsetOwner(target_inset); for (pos_type i = 0; i < tmpbuf->size(); ++i) { // do not track deletion of invalid insets if (Inset * inset = tmpbuf->getInset(i)) - if (!pars[pit].insetAllowed(inset->lyxCode())) + if (!target_inset->insetAllowed(inset->lyxCode())) tmpbuf->eraseChar(i--, false); } @@ -286,6 +288,9 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, // merge the first par of the insertion with the current par mergeParagraph(buffer.params(), pars, pit); } + //FIXME: We should call setBuffer() on each inserted paragraph. + // instead, we call setBuffer() for the main inset at the beginning + // of updateLabels() pit_type last_paste = pit + insertion.size() - 1; @@ -363,25 +368,34 @@ void putClipboard(ParagraphList const & paragraphs, { // 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().setDocumentClass(docclass); + // This needs to be static to avoid a memory leak. When a Buffer is + // constructed, it constructs a BufferParams, which in turn constructs + // a DocumentClass, via new, that is never deleted. If we were to go to + // some kind of garbage collection there, or a shared_ptr, then this + // would not be needed. + static Buffer * buffer = theBufferList().newBuffer( + FileName::tempName().absFilename() + "_clipboard.internal"); + buffer->setUnnamed(true); + buffer->paragraphs() = paragraphs; + buffer->inset().setBuffer(*buffer); + buffer->params().setDocumentClass(docclass); ostringstream lyx; - if (buffer.write(lyx)) + if (buffer->write(lyx)) theClipboard().put(lyx.str(), plaintext); else theClipboard().put(string(), plaintext); + // Save that memory + buffer->paragraphs().clear(); } -void copySelectionHelper(Buffer const & buf, ParagraphList & pars, +void copySelectionHelper(Buffer const & buf, ParagraphList const & pars, pit_type startpit, pit_type endpit, int start, int end, DocumentClass const * const dc, CutStack & cutstack) { - BOOST_ASSERT(0 <= start && start <= pars[startpit].size()); - BOOST_ASSERT(0 <= end && end <= pars[endpit].size()); - BOOST_ASSERT(startpit != endpit || start <= end); + LASSERT(0 <= start && start <= pars[startpit].size(), /**/); + LASSERT(0 <= end && end <= pars[endpit].size(), /**/); + LASSERT(startpit != endpit || start <= end, /**/); // Clone the paragraphs within the selection. ParagraphList copy_pars(boost::next(pars.begin(), startpit), @@ -424,6 +438,22 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars, namespace cap { +void region(CursorSlice const & i1, CursorSlice const & i2, + Inset::row_type & r1, Inset::row_type & r2, + Inset::col_type & c1, Inset::col_type & c2) +{ + Inset & p = i1.inset(); + c1 = p.col(i1.idx()); + c2 = p.col(i2.idx()); + if (c1 > c2) + swap(c1, c2); + r1 = p.row(i1.idx()); + r2 = p.row(i2.idx()); + if (r1 > r2) + swap(r1, r2); +} + + docstring grabAndEraseSelection(Cursor & cur) { if (!cur.selection()) @@ -434,12 +464,51 @@ docstring grabAndEraseSelection(Cursor & cur) } +bool reduceSelectionToOneCell(Cursor & cur) +{ + if (!cur.selection() || !cur.inMathed()) + return false; + + CursorSlice i1 = cur.selBegin(); + CursorSlice i2 = cur.selEnd(); + if (!i1.inset().asInsetMath()) + return false; + + // the easy case: do nothing if only one cell is selected + if (i1.idx() == i2.idx()) + return true; + + cur.top().pos() = 0; + cur.resetAnchor(); + cur.top().pos() = cur.top().lastpos(); + + return true; +} + + +bool multipleCellsSelected(Cursor const & cur) +{ + if (!cur.selection() || !cur.inMathed()) + return false; + + CursorSlice i1 = cur.selBegin(); + CursorSlice i2 = cur.selEnd(); + if (!i1.inset().asInsetMath()) + return false; + + if (i1.idx() == i2.idx()) + return false; + + return true; +} + + void switchBetweenClasses(DocumentClass const * const oldone, DocumentClass const * const newone, InsetText & in, ErrorList & errorlist) { errorlist.clear(); - BOOST_ASSERT(!in.paragraphs().empty()); + LASSERT(!in.paragraphs().empty(), /**/); if (oldone == newone) return; @@ -450,26 +519,15 @@ void switchBetweenClasses(DocumentClass const * const oldone, ParIterator end = par_iterator_end(in); for (ParIterator it = par_iterator_begin(in); it != end; ++it) { docstring const name = it->layout().name(); - bool hasLayout = newtc.hasLayout(name); - if (in.useEmptyLayout()) - it->setLayout(newtc.emptyLayout()); - else if (hasLayout) - it->setLayout(newtc[name]); + // the pasted text will keep their own layout name. If this layout does + // not exist in the new document, it will behave like a standard layout. + newtc.addLayoutIfNeeded(name); + + if (in.usePlainLayout()) + it->setLayout(newtc.plainLayout()); else - it->setLayout(newtc.defaultLayout()); - - if (!hasLayout && name != oldtc.defaultLayoutName()) { - docstring 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(), - from_utf8(oldtc.name()), from_utf8(newtc.name())); - // To warn the user that something had to be done. - errorlist.push_back(ErrorItem(_("Changed Layout"), s, - it->id(), 0, - it->size())); - } + it->setLayout(newtc[name]); } // character styles @@ -499,9 +557,11 @@ void switchBetweenClasses(DocumentClass const * const oldone, } -vector availableSelections() +vector availableSelections(Buffer const * buf) { vector selList; + if (!buf) + return selList; CutStack::const_iterator cit = theCuts.begin(); CutStack::const_iterator end = theCuts.end(); @@ -513,7 +573,10 @@ vector availableSelections() ParagraphList::const_iterator pit = pars.begin(); ParagraphList::const_iterator pend = pars.end(); for (; pit != pend; ++pit) { - asciiSel += pit->asString(false); + Paragraph par(*pit, 0, 26); + // 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("...")); @@ -545,7 +608,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) if (cur.inTexted()) { Text * text = cur.text(); - BOOST_ASSERT(text); + LASSERT(text, /**/); saveSelection(cur); @@ -569,6 +632,9 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) cur.selectionAsString(true)); } + if (begpit != endpit) + cur.updateFlags(Update::Force | Update::FitCursor); + boost::tie(endpit, endpos) = eraseSelectionHelper(bp, text->paragraphs(), @@ -611,7 +677,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) } -void copySelection(Cursor & cur) +void copySelection(Cursor const & cur) { copySelection(cur, cur.selectionAsString(true)); } @@ -619,7 +685,7 @@ void copySelection(Cursor & cur) namespace { -void copySelectionToStack(Cursor & cur, CutStack & cutstack) +void copySelectionToStack(Cursor const & cur, CutStack & cutstack) { // this doesn't make sense, if there is no selection if (!cur.selection()) @@ -631,7 +697,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack) if (cur.inTexted()) { Text * text = cur.text(); - BOOST_ASSERT(text); + LASSERT(text, /**/); // ok we have a selection. This is always between cur.selBegin() // and sel_end cursor @@ -655,8 +721,8 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack) ParagraphList pars; Paragraph par; BufferParams const & bp = cur.buffer().params(); - // FIXME This should be the empty layout...right? - par.setLayout(bp.documentClass().emptyLayout()); + // FIXME This should be the plain layout...right? + par.setLayout(bp.documentClass().plainLayout()); par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED)); pars.push_back(par); cutstack.push(make_pair(pars, bp.documentClassPtr())); @@ -673,7 +739,7 @@ void copySelectionToStack() } -void copySelection(Cursor & cur, docstring const & plaintext) +void copySelection(Cursor const & cur, docstring const & plaintext) { // In tablemode, because copy and paste actually use special table stack // we do not attempt to get selected paragraphs under cursor. Instead, a @@ -683,7 +749,7 @@ void copySelection(Cursor & cur, docstring const & plaintext) ParagraphList pars; Paragraph par; BufferParams const & bp = cur.buffer().params(); - par.setLayout(bp.documentClass().emptyLayout()); + par.setLayout(bp.documentClass().plainLayout()); par.insert(0, plaintext, Font(), Change(Change::UNCHANGED)); pars.push_back(par); theCuts.push(make_pair(pars, bp.documentClassPtr())); @@ -696,7 +762,7 @@ void copySelection(Cursor & cur, docstring const & plaintext) } -void saveSelection(Cursor & cur) +void saveSelection(Cursor const & cur) { // This function is called, not when a selection is formed, but when // a selection is cleared. Therefore, multiple keyboard selection @@ -704,7 +770,7 @@ void saveSelection(Cursor & cur) if (cur.selection() && cur.selBegin() == cur.bv().cursor().selBegin() && cur.selEnd() == cur.bv().cursor().selEnd()) { - LYXERR(Debug::ACTION, "'" << cur.selectionAsString(true) << "'"); + LYXERR(Debug::SELECTION, "saveSelection: '" << cur.selectionAsString(true) << "'"); copySelectionToStack(cur, selectionBuffer); } } @@ -731,7 +797,7 @@ void clearCutStack() docstring selection(size_t sel_index) { return sel_index < theCuts.size() - ? theCuts[sel_index].first.back().asString(false) + ? theCuts[sel_index].first.back().asString(AS_STR_INSETS) : docstring(); } @@ -741,7 +807,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, { if (cur.inTexted()) { Text * text = cur.text(); - BOOST_ASSERT(text); + LASSERT(text, /**/); pit_type endpit; PitPosPair ppp; @@ -754,7 +820,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, } // mathed is handled in InsetMathNest/InsetMathGrid - BOOST_ASSERT(!cur.inMathed()); + LASSERT(!cur.inMathed(), /**/); } @@ -812,7 +878,7 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs) void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */, Clipboard::GraphicsType preferedType) { - BOOST_ASSERT(theClipboard().hasGraphicsContents(preferedType)); + LASSERT(theClipboard().hasGraphicsContents(preferedType), /**/); // get picture from clipboard FileName filename = theClipboard().getAsGraphics(cur, preferedType); @@ -820,9 +886,9 @@ void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */, return; // create inset for graphic - InsetGraphics * inset = new InsetGraphics; + InsetGraphics * inset = new InsetGraphics(cur.buffer()); InsetGraphicsParams params; - params.filename = EmbeddedFile(filename.absFilename(), cur.buffer().filePath()); + params.filename = support::DocFileName(filename.absFilename()); inset->setParams(params); cur.recordUndo(); cur.insert(inset); @@ -932,8 +998,10 @@ docstring grabSelection(Cursor const & cur) if (!cur.selection()) return docstring(); - // FIXME: What is wrong with the following? #if 0 + // grab selection by glueing multiple cells together. This is not what + // we want because selections spanning multiple cells will get "&" and "\\" + // seperators. ostringstream os; for (DocIterator dit = cur.selectionBegin(); dit != cur.selectionEnd(); dit.forwardPos())