X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=c8e99abcabb9cb3b894e033299f0e9b674c93d0a;hb=fe8c185a6e23b590e084f21ea06ce622ea99820d;hp=317410497602ff19c1d95eebf0d7413fbae52714;hpb=f35561d0557a9d8eb13072532aa130a46b0a0fe1;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 3174104976..c8e99abcab 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -29,30 +29,34 @@ #include "InsetIterator.h" #include "InsetList.h" #include "Language.h" -#include "LyXFunc.h" +#include "LyX.h" #include "LyXRC.h" #include "Text.h" #include "Paragraph.h" -#include "paragraph_funcs.h" #include "ParagraphParameters.h" #include "ParIterator.h" -#include "Undo.h" +#include "TextClass.h" +#include "insets/InsetBibitem.h" #include "insets/InsetBranch.h" #include "insets/InsetCommand.h" #include "insets/InsetFlex.h" #include "insets/InsetGraphics.h" #include "insets/InsetGraphicsParams.h" #include "insets/InsetInclude.h" +#include "insets/InsetLabel.h" #include "insets/InsetTabular.h" #include "mathed/MathData.h" #include "mathed/InsetMath.h" +#include "mathed/InsetMathHull.h" +#include "mathed/InsetMathRef.h" #include "mathed/MathSupport.h" #include "support/debug.h" #include "support/docstream.h" #include "support/gettext.h" +#include "support/lassert.h" #include "support/limited_stack.h" #include "support/lstrings.h" @@ -94,7 +98,7 @@ bool checkPastePossible(int index) pair -pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, +pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, DocumentClass const * const oldDocClass, ErrorList & errorlist) { Buffer const & buffer = *cur.buffer(); @@ -121,10 +125,9 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, // 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! - InsetCode const code = target_inset->lyxCode(); - if (code == ERT_CODE || code == LISTINGS_CODE) { + // Convert newline to paragraph break in ParbreakIsNewline + if (target_inset->getLayout().parbreakIsNewline() + || pars[pit].layout().parbreak_is_newline) { for (size_t i = 0; i != insertion.size(); ++i) { for (pos_type j = 0; j != insertion[i].size(); ++j) { if (insertion[i].isNewline(j)) { @@ -164,7 +167,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, } } - InsetText in(buffer); + InsetText in(cur.buffer()); // Make sure there is no class difference. in.paragraphs().clear(); // This works without copying any paragraph data because we have @@ -225,25 +228,72 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, InsetIterator const i_end = inset_iterator_end(in); for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) { // Even though this will also be done later, it has to be done here - // since, e.g., InsetLabel::updateCommand() is going to try to access + // since some inset might going to try to access // the buffer() member. it->setBuffer(const_cast(buffer)); switch (it->lyxCode()) { + case MATH_HULL_CODE: { + // check for equation labels and resolve duplicates + InsetMathHull * ins = it->asInsetMath()->asHullInset(); + std::vector labels = ins->getLabels(); + for (size_t i = 0; i != labels.size(); ++i) { + if (!labels[i]) + continue; + InsetLabel * lab = labels[i]; + docstring const oldname = lab->getParam("name"); + lab->updateLabel(oldname); + // We need to update the buffer reference cache. + cur.forceBufferUpdate(); + docstring const newname = lab->getParam("name"); + if (oldname == newname) + continue; + // adapt the references + for (InsetIterator itt = inset_iterator_begin(in); + itt != i_end; ++itt) { + if (itt->lyxCode() == REF_CODE) { + InsetCommand * ref = itt->asInsetCommand(); + if (ref->getParam("reference") == oldname) + ref->setParam("reference", newname); + } else if (itt->lyxCode() == MATH_REF_CODE) { + InsetMathHull * mi = itt->asInsetMath()->asHullInset(); + // this is necessary to prevent an uninitialized + // buffer when the RefInset is in a MathBox. + // FIXME audit setBuffer calls + mi->setBuffer(const_cast(buffer)); + if (mi->asRefInset()->getTarget() == oldname) + mi->asRefInset()->changeTarget(newname); + } + } + } + break; + } + case LABEL_CODE: { // check for duplicates - InsetCommand & lab = static_cast(*it); + InsetLabel & lab = static_cast(*it); docstring const oldname = lab.getParam("name"); - lab.updateCommand(oldname, false); + lab.updateLabel(oldname); + // We need to update the buffer reference cache. + cur.forceBufferUpdate(); docstring const newname = lab.getParam("name"); - if (oldname != newname) { - // adapt the references - for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) { - if (itt->lyxCode() == REF_CODE) { - InsetCommand & ref = dynamic_cast(*itt); - if (ref.getParam("reference") == oldname) - ref.setParam("reference", newname); - } + if (oldname == newname) + break; + // adapt the references + for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) { + if (itt->lyxCode() == REF_CODE) { + InsetCommand & ref = static_cast(*itt); + if (ref.getParam("reference") == oldname) + ref.setParam("reference", newname); + } else if (itt->lyxCode() == MATH_REF_CODE) { + InsetMathHull & mi = + static_cast(*itt); + // this is necessary to prevent an uninitialized + // buffer when the RefInset is in a MathBox. + // FIXME audit setBuffer calls + mi.setBuffer(const_cast(buffer)); + if (mi.asRefInset()->getTarget() == oldname) + mi.asRefInset()->changeTarget(newname); } } break; @@ -252,23 +302,28 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, case INCLUDE_CODE: { InsetInclude & inc = static_cast(*it); inc.updateCommand(); + // We need to update the list of included files. + cur.forceBufferUpdate(); break; } case BIBITEM_CODE: { // check for duplicates - InsetCommand & bib = static_cast(*it); + InsetBibitem & bib = static_cast(*it); docstring const oldkey = bib.getParam("key"); bib.updateCommand(oldkey, false); + // We need to update the buffer reference cache. + cur.forceBufferUpdate(); docstring const newkey = bib.getParam("key"); - if (oldkey != newkey) { - // adapt the references - for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) { - if (itt->lyxCode() == CITE_CODE) { - InsetCommand & ref = dynamic_cast(*itt); - if (ref.getParam("key") == oldkey) - ref.setParam("key", newkey); - } + if (oldkey == newkey) + break; + // adapt the references + for (InsetIterator itt = inset_iterator_begin(in); + itt != i_end; ++itt) { + if (itt->lyxCode() == CITE_CODE) { + InsetCommand * ref = itt->asInsetCommand(); + if (ref->getParam("key") == oldkey) + ref->setParam("key", newkey); } } break; @@ -296,6 +351,8 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, text, 0, 1, _("&Add"), _("&Don't Add")) != 0) break; lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name)); + // We need to update the list of branches. + cur.forceBufferUpdate(); break; } @@ -333,7 +390,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, pit = last_paste; pos = pars[last_paste].size(); - // FIXME Should we do it here, or should we let updateLabels() do it? + // FIXME Should we do it here, or should we let updateBuffer() do it? // Set paragraph buffers. It's important to do this right away // before something calls Inset::buffer() and causes a crash. for (pit_type p = startpit; p <= pit; ++p) @@ -415,7 +472,7 @@ void putClipboard(ParagraphList const & paragraphs, // 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"); + FileName::tempName().absFileName() + "_clipboard.internal"); buffer->setUnnamed(true); buffer->paragraphs() = paragraphs; buffer->inset().setBuffer(*buffer); @@ -430,6 +487,21 @@ void putClipboard(ParagraphList const & paragraphs, } +/// return true if the whole ParagraphList is deleted +static bool isFullyDeleted(ParagraphList const & pars) +{ + pit_type const pars_size = static_cast(pars.size()); + + // check all paragraphs + for (pit_type pit = 0; pit < pars_size; ++pit) { + if (!pars[pit].empty()) // prevent assertion failure + if (!pars[pit].isDeleted(0, pars[pit].size())) + return false; + } + return true; +} + + void copySelectionHelper(Buffer const & buf, Text const & text, pit_type startpit, pit_type endpit, int start, int end, DocumentClass const * const dc, CutStack & cutstack) @@ -466,7 +538,7 @@ void copySelectionHelper(Buffer const & buf, Text const & text, // PassThru paragraphs have the Language // latex_language. This is invalid for others, so we // need to change it to the buffer language. - if (text.inset().getLayout().isPassThru()) + if (it->isPassThru()) it->changeLanguage(buf.params(), latex_language, buf.language()); } @@ -475,6 +547,8 @@ void copySelectionHelper(Buffer const & buf, Text const & text, // deleted, unless the whole selection was deleted if (!isFullyDeleted(copy_pars)) acceptChanges(copy_pars, buf.params()); + else + rejectChanges(copy_pars, buf.params()); // do some final cleanup now, to make sure that the paragraphs @@ -574,13 +648,25 @@ void switchBetweenClasses(DocumentClass const * const oldone, DocumentClass const & newtc = *newone; // layouts + ParIterator it = par_iterator_begin(in); ParIterator end = par_iterator_end(in); - for (ParIterator it = par_iterator_begin(in); it != end; ++it) { + // for remembering which layouts we've had to add + set newlayouts; + for (; it != end; ++it) { docstring const name = it->layout().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); + bool const added_one = newtc.addLayoutIfNeeded(name); + if (added_one) + newlayouts.insert(name); + + 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())); + } if (in.usePlainLayout()) it->setLayout(newtc.plainLayout()); @@ -594,15 +680,25 @@ void switchBetweenClasses(DocumentClass const * const oldone, if (it->lyxCode() != FLEX_CODE) // FIXME: Should we verify all InsetCollapsable? continue; - if (!it->undefined()) + + 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 s = bformat(_( - "Flex inset %1$s is " - "undefined because of class " - "conversion from\n%2$s to %3$s"), - it->name(), from_utf8(oldtc.name()), - from_utf8(newtc.name())); + 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"), @@ -687,7 +783,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) } if (begpit != endpit) - cur.updateFlags(Update::Force | Update::FitCursor); + cur.screenUpdateFlags(Update::Force | Update::FitCursor); boost::tie(endpit, endpos) = eraseSelectionHelper(bp, @@ -708,7 +804,12 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) // need a valid cursor. (Lgb) cur.clearSelection(); - cur.buffer()->updateLabels(); + + // After a cut operation, we must make sure that the Buffer is updated + // because some further operation might need updated label information for + // example. So we cannot just use "cur.forceBufferUpdate()" here. + // This fixes #7071. + cur.buffer()->updateBuffer(); // tell tabular that a recent copy happened dirtyTabularStack(false); @@ -886,7 +987,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, boost::tie(ppp, endpit) = pasteSelectionHelper(cur, parlist, docclass, errorList); - cur.buffer()->updateLabels(); + cur.forceBufferUpdate(); cur.clearSelection(); text->setCursor(cur, ppp.first, ppp.second); } @@ -944,6 +1045,40 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs) cur.text()->insertStringAsParagraphs(cur, text, cur.current_font); else cur.text()->insertStringAsLines(cur, text, cur.current_font); + cur.setSelection(); +} + + +void pasteSimpleText(Cursor & cur, bool asParagraphs) +{ + docstring text; + // Use internal clipboard if it is the most recent one + if (theClipboard().isInternal()) { + if (!checkPastePossible(0)) + return; + + ParagraphList const & pars = theCuts[0].first; + ParagraphList::const_iterator it = pars.begin(); + for (; it != pars.end(); ++it) { + if (it != pars.begin()) + text += "\n"; + text += (*it).asString(); + } + asParagraphs = false; + } else { + // Then try plain text + text = theClipboard().getAsText(); + } + + if (text.empty()) + return; + + cur.recordUndo(); + cutSelection(cur, true, false); + if (asParagraphs) + cur.text()->insertStringAsParagraphs(cur, text, cur.current_font); + else + cur.text()->insertStringAsLines(cur, text, cur.current_font); } @@ -958,9 +1093,9 @@ void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */, return; // create inset for graphic - InsetGraphics * inset = new InsetGraphics(*cur.buffer()); + InsetGraphics * inset = new InsetGraphics(cur.buffer()); InsetGraphicsParams params; - params.filename = support::DocFileName(filename.absFilename()); + params.filename = support::DocFileName(filename.absFileName(), false); inset->setParams(params); cur.recordUndo(); cur.insert(inset); @@ -1087,7 +1222,8 @@ docstring grabSelection(Cursor const & cur) if (i1.idx() == i2.idx()) { if (i1.inset().asInsetMath()) { MathData::const_iterator it = i1.cell().begin(); - return asString(MathData(it + i1.pos(), it + i2.pos())); + Buffer * buf = cur.buffer(); + return asString(MathData(buf, it + i1.pos(), it + i2.pos())); } else { return from_ascii("unknown selection 1"); }