inset-split should not be dispatched to inset at point

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 6ab73f4be1334663f3456e9721e15a6e36c5a250..b5147ae6e011334f661acdb618788594750a3a7a 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -289,12 +289,25 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                                                 Change::INSERTED : Change::UNCHANGED));
        }
 
-       bool const empty = pars[pit].empty();
-       if (!empty) {
-               // Make the buf exactly the same layout as the cursor
-               // paragraph.
+       bool const target_empty = pars[pit].empty();
+       // Use the paste content's layout, if...
+       bool const paste_layout =
+               // if target paragraph is empty
+               (target_empty
+                // ... and its layout is default
+                && (pars[pit].layout() == defaultLayout
+                    // ... or plain
+                    || pars[pit].layout() == plainLayout
+                    // ... or the paste content spans several paragraphs
+                    || insertion.size() > 1))
+               // or if pasting is done at the beginning of paragraph
+                || (pos == 0
+                    // and the paste content spans several paragraphs
+                    && insertion.size() > 1);
+       if (!paste_layout)
+               // Give the first paragraph to insert the same layout as the
+               // target paragraph.
                insertion.begin()->makeSameLayout(pars[pit]);
-       }
 
        // Prepare the paragraphs and insets for insertion.
        insertion.swap(in.paragraphs());
@@ -458,11 +471,17 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
        insertion.swap(in.paragraphs());
 
        // Split the paragraph for inserting the buf if necessary.
-       if (!empty)
+       if (!target_empty)
                breakParagraphConservative(buffer.params(), pars, pit, pos);
 
+       // If multiple paragraphs are inserted before the target paragraph,
+       // the cursor is now in a new paragraph before it,
+       // so use layout from paste content in that case.
+       if (pos == 0 && insertion.size() > 1)
+               pars[pit].makeSameLayout(* insertion.begin());
+
        // Paste it!
-       if (empty) {
+       if (target_empty) {
                pars.insert(pars.iterator_at(pit),
                            insertion.begin(), insertion.end());
 
@@ -491,7 +510,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
 
        // Join (conditionally) last pasted paragraph with next one, i.e.,
        // the tail of the spliced document paragraph
-       if (!empty && last_paste + 1 != pit_type(pars.size())) {
+       if (!target_empty && last_paste + 1 != pit_type(pars.size())) {
                if (pars[last_paste + 1].hasSameLayout(pars[last_paste])) {
                        mergeParagraph(buffer.params(), pars, last_paste);
                } else if (pars[last_paste + 1].empty()) {
@@ -535,10 +554,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
                pars[pit].eraseChars(left, right, params.track_changes);
 
                // Separate handling of paragraph break:
-               if (merge && pit != endpit &&
-                   (pit + 1 != endpit
-                    || pars[pit].hasSameLayout(pars[endpit])
-                    || pars[endpit].size() == endpos)) {
+        if (merge && pit != endpit) {
                        if (pit + 1 == endpit)
                                endpos += pars[pit].size();
                        mergeParagraph(params, pars, pit);
@@ -853,7 +869,10 @@ void switchBetweenClasses(DocumentClassConstPtr oldone,
                        docstring const & n = newone->insetLayout(layoutName).name();
                        bool const is_undefined = n.empty() ||
                                n == DocumentClass::plainInsetLayout().name();
-                       if (!is_undefined)
+                       docstring const & oldn = oldone->insetLayout(layoutName).name();
+                       bool const was_undefined = oldn.empty() ||
+                               oldn == DocumentClass::plainInsetLayout().name();
+                       if (!is_undefined || was_undefined)
                                continue;
 
                        // The flex inset is undefined in newtc
@@ -1015,7 +1034,9 @@ void copySelection(Cursor const & cur)
 }
 
 
-void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext)
+namespace {
+
+void copyInsetToStack(Cursor const & cur, CutStack & cutstack, Inset * inset)
 {
        ParagraphList pars;
        Paragraph par;
@@ -1024,13 +1045,28 @@ void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext)
        Font font(inherit_font, bp.language);
        par.insertInset(0, inset, font, Change(Change::UNCHANGED));
        pars.push_back(par);
-       theCuts.push(make_pair(pars, make_pair(bp.documentClassPtr(), bp.authors())));
+       cutstack.push(make_pair(pars, make_pair(bp.documentClassPtr(), bp.authors())));
+}
+
+}
+
+
+void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext)
+{
+       copyInsetToStack(cur, theCuts, inset);
 
        // stuff the selection onto the X clipboard, from an explicit copy request
+       BufferParams const & bp = cur.buffer()->params();
        putClipboard(theCuts[0].first, theCuts[0].second, plaintext, bp);
 }
 
 
+void copyInsetToTemp(Cursor const & cur, Inset * inset)
+{
+       copyInsetToStack(cur, tempCut, inset);
+}
+
+
 namespace {
 
 void copySelectionToStack(CursorData const & cur, CutStack & cutstack)
@@ -1260,6 +1296,7 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs,
                string lyx = theClipboard().getAsLyX();
                if (!lyx.empty()) {
                        Buffer buffer(string(), false);
+                       buffer.setInternal(true);
                        buffer.setUnnamed(true);
                        if (buffer.readString(lyx)) {
                                cur.recordUndo();
@@ -1293,7 +1330,9 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs,
                        available = !text.empty();
                        if (available) {
                                Buffer buffer(string(), false);
+                               buffer.setInternal(true);
                                buffer.setUnnamed(true);
+                               buffer.params() = cur.buffer()->params();
                                available = buffer.importString(names[i], text, errorList);
                                if (available)
                                        available = !buffer.paragraphs().empty();