X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=39b732fea6b2affdec2d3ab6d800c9b1bb010fe3;hb=77185fe83d28a0a1dc48980a9db3c34110e02e31;hp=8a71efb7748ea55f1c4ed3ccf53ae94e2e0dc579;hpb=7bbd67eb267966d1deb655ea126bc25a64fdf34d;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 8a71efb774..39b732fea6 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -29,14 +29,15 @@ #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 "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" @@ -96,7 +97,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(); @@ -123,10 +124,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)) { @@ -234,14 +234,16 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, case MATH_HULL_CODE: { // check for equation labels and resolve duplicates - InsetMathHull & ins = static_cast(*it); - std::vector labels = ins.getLabels(); + 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->updateCommand(oldname, false); + // We need to update the buffer reference cache. + cur.forceBufferUpdate(); docstring const newname = lab->getParam("name"); if (oldname == newname) continue; @@ -249,19 +251,17 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, 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); + InsetCommand * ref = itt->asInsetCommand(); + if (ref->getParam("reference") == oldname) + ref->setParam("reference", newname); } else if (itt->lyxCode() == MATH_REF_CODE) { - InsetMathHull & mi = - static_cast(*itt); + InsetMathHull * mi = itt->asInsetMath()->asHullInset(); // this is necessary to prevent an uninitialized // buffer when the RefInset is in a MathBox. - // FIXME audit setBuffer/updateLabels calls - mi.setBuffer(const_cast(buffer)); - if (mi.asRefInset()->getTarget() == oldname) - mi.asRefInset()->changeTarget(newname); + // FIXME audit setBuffer calls + mi->setBuffer(const_cast(buffer)); + if (mi->asRefInset()->getTarget() == oldname) + mi->asRefInset()->changeTarget(newname); } } } @@ -270,9 +270,11 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, 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); + // We need to update the buffer reference cache. + cur.forceBufferUpdate(); docstring const newname = lab.getParam("name"); if (oldname == newname) break; @@ -287,7 +289,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, static_cast(*itt); // this is necessary to prevent an uninitialized // buffer when the RefInset is in a MathBox. - // FIXME audit setBuffer/updateLabels calls + // FIXME audit setBuffer calls mi.setBuffer(const_cast(buffer)); if (mi.asRefInset()->getTarget() == oldname) mi.asRefInset()->changeTarget(newname); @@ -299,14 +301,18 @@ 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) break; @@ -314,10 +320,9 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) { if (itt->lyxCode() == CITE_CODE) { - InsetCommand & ref = - static_cast(*itt); - if (ref.getParam("key") == oldkey) - ref.setParam("key", newkey); + InsetCommand * ref = itt->asInsetCommand(); + if (ref->getParam("key") == oldkey) + ref->setParam("key", newkey); } } break; @@ -345,6 +350,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; } @@ -382,7 +389,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) @@ -464,7 +471,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); @@ -530,7 +537,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()); } @@ -539,6 +546,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 @@ -658,18 +667,25 @@ void switchBetweenClasses(DocumentClass const * const oldone, if (it->lyxCode() != FLEX_CODE) // FIXME: Should we verify all InsetCollapsable? continue; - docstring const & n = newone->insetLayout(it->name()).name(); + + 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"), @@ -754,7 +770,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, @@ -775,7 +791,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); @@ -953,7 +974,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); } @@ -1027,7 +1048,7 @@ void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */, // create inset for graphic 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);