de.po

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 1d4299ad6cc796a2bf1f36c68b4fab82d264fc3f..c71697ffda99b8892b57de705c5c0038541da0fc 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -125,6 +125,19 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
        if (parlist.empty())
                return PasteReturnValue(pit, pos, need_update);
 
+       // Check whether we paste into an inset that does not
+       // produce output (needed for label duplicate check)
+       bool in_active_inset = cur.paragraph().inInset().producesOutput();
+       if (in_active_inset) {
+               for (size_type sl = 0 ; sl < cur.depth() ; ++sl) {
+                       Paragraph const & outer_par = cur[sl].paragraph();
+                       if (!outer_par.inInset().producesOutput()) {
+                               in_active_inset = false;
+                               break;
+                       }
+               }
+       }
+
        InsetText * target_inset = cur.inset().asInsetText();
        if (!target_inset) {
                InsetTabular * it = cur.inset().asInsetTabular();
@@ -142,6 +155,14 @@ pasteSelectionHelper(DocIterator const & 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.
 
+       // Merge paragraphs that are to be pasted into a text inset
+       // that does not allow multiple pars.
+       InsetText * inset_text = target_inset->asInsetText();
+       if (inset_text && !inset_text->allowMultiPar()) {
+               while (insertion.size() > 1)
+                       mergeParagraph(buffer.params(), insertion, 0);
+       }
+
        // Convert newline to paragraph break in ParbreakIsNewline
        if (target_inset->getLayout().parbreakIsNewline()
            || pars[pit].layout().parbreak_is_newline) {
@@ -297,7 +318,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                                        continue;
                                InsetLabel * lab = labels[i];
                                docstring const oldname = lab->getParam("name");
-                               lab->updateLabel(oldname);
+                               lab->updateLabel(oldname, in_active_inset);
                                // We need to update the buffer reference cache.
                                need_update = true;
                                docstring const newname = lab->getParam("name");
@@ -328,7 +349,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                        // check for duplicates
                        InsetLabel & lab = static_cast<InsetLabel &>(*it);
                        docstring const oldname = lab.getParam("name");
-                       lab.updateLabel(oldname);
+                       lab.updateLabel(oldname, in_active_inset);
                        // We need to update the buffer reference cache.
                        need_update = true;
                        docstring const newname = lab.getParam("name");
@@ -897,7 +918,7 @@ size_type numberOfSelections()
 
 namespace {
 
-void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool doclear, bool realcut, bool putclip)
+void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool realcut, bool putclip)
 {
        // This doesn't make sense, if there is no selection
        if (!cur.selection())
@@ -946,11 +967,6 @@ void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool doclear, bool realcu
                cur.pos() = endpos;
                cur.pit() = endpit;
 
-               // sometimes necessary
-               if (doclear
-                       && text->paragraphs()[begpit].stripLeadingSpaces(bp.track_changes))
-                       cur.fixIfBroken();
-
                // need a valid cursor. (Lgb)
                cur.clearSelection();
 
@@ -982,15 +998,15 @@ void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool doclear, bool realcu
 
 } // namespace
 
-void cutSelection(Cursor & cur, bool doclear, bool realcut)
+void cutSelection(Cursor & cur, bool realcut)
 {
-       cutSelectionHelper(cur, theCuts, doclear, realcut, true);
+       cutSelectionHelper(cur, theCuts, realcut, true);
 }
 
 
-void cutSelectionToTemp(Cursor & cur, bool doclear, bool realcut)
+void cutSelectionToTemp(Cursor & cur, bool realcut)
 {
-       cutSelectionHelper(cur, tempCut, doclear, realcut, false);
+       cutSelectionHelper(cur, tempCut, realcut, false);
 }
 
 
@@ -1070,6 +1086,12 @@ void copySelectionToStack()
 }
 
 
+void copySelectionToTemp(Cursor & cur)
+{
+       copySelectionToStack(cur, tempCut);
+}
+
+
 void copySelection(Cursor const & cur, docstring const & plaintext)
 {
        // In tablemode, because copy and paste actually use special table stack
@@ -1239,13 +1261,13 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs,
                                Buffer buffer("", false);
                                buffer.setUnnamed(true);
                                available = buffer.importString(names[i], text, errorList);
-                               // TeX2lyx (also used in the HTML chain) assumes English as document language
-                               // if no language is explicitly set (as is the case here).
-                               // We thus reset the temp buffer's language to the context language
-                               buffer.changeLanguage(buffer.language(), cur.getFont().language());
                                if (available)
                                        available = !buffer.paragraphs().empty();
                                if (available && !buffer.paragraphs()[0].empty()) {
+                                       // TeX2lyx (also used in the HTML chain) assumes English as document language
+                                       // if no language is explicitly set (as is the case here).
+                                       // We thus reset the temp buffer's language to the context language
+                                       buffer.changeLanguage(buffer.language(), cur.getFont().language());
                                        cur.recordUndo();
                                        pasteParagraphList(cur, buffer.paragraphs(),
                                                buffer.params().documentClassPtr(), errorList);
@@ -1294,7 +1316,7 @@ void pasteSimpleText(Cursor & cur, bool asParagraphs)
                return;
 
        cur.recordUndo();
-       cutSelection(cur, true, false);
+       cutSelection(cur, false);
        if (asParagraphs)
                cur.text()->insertStringAsParagraphs(cur, text, cur.current_font);
        else
@@ -1350,14 +1372,14 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str)
                par.insertChar(pos, *cit, font, cur.buffer()->params().track_changes);
 
        // Cut the selection
-       cutSelection(cur, true, false);
+       cutSelection(cur, false);
 }
 
 
 void replaceSelection(Cursor & cur)
 {
        if (cur.selection())
-               cutSelection(cur, true, false);
+               cutSelection(cur, false);
 }