* GuiDocument.cpp:

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index bfce241918a7b2be9d587eed8f253e9209c0e168..b85aa21c34417993062d68d1204f8e3c45707773 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -15,6 +15,7 @@
 
 #include "CutAndPaste.h"
 
+#include "BranchList.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferList.h"
@@ -37,10 +38,12 @@
 #include "ParIterator.h"
 #include "Undo.h"
 
-#include "insets/InsetFlex.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/InsetTabular.h"
 
 #include "mathed/MathData.h"
@@ -53,6 +56,7 @@
 #include "support/limited_stack.h"
 #include "support/lstrings.h"
 
+#include "frontends/alert.h"
 #include "frontends/Clipboard.h"
 #include "frontends/Selection.h"
 
@@ -220,11 +224,12 @@ 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) {
-       // Insets store buffer references so need updating.
+               // 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
+               // the buffer() member.
                it->setBuffer(const_cast<Buffer &>(buffer));
-
                switch (it->lyxCode()) {
- 
+
                case LABEL_CODE: {
                        // check for duplicates
                        InsetCommand & lab = static_cast<InsetCommand &>(*it);
@@ -244,6 +249,12 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
                        break;
                }
 
+               case INCLUDE_CODE: {
+                       InsetInclude & inc = static_cast<InsetInclude &>(*it);
+                       inc.updateCommand();
+                       break;
+               }
+
                case BIBITEM_CODE: {
                        // check for duplicates
                        InsetCommand & bib = static_cast<InsetCommand &>(*it);
@@ -263,6 +274,31 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
                        break;
                }
 
+               case BRANCH_CODE: {
+                       // check if branch is known to target buffer
+                       // or its master
+                       InsetBranch & br = static_cast<InsetBranch &>(*it);
+                       docstring const name = br.branch();
+                       if (name.empty())
+                               break;
+                       bool const is_child = (&buffer != buffer.masterBuffer());
+                       BranchList branchlist = buffer.params().branchlist();
+                       if ((!is_child && branchlist.find(name))
+                           || (is_child && (branchlist.find(name)
+                               || buffer.masterBuffer()->params().branchlist().find(name))))
+                               break;
+                       // FIXME: add an option to add the branch to the master's BranchList.
+                       docstring text = bformat(
+                                       _("The pasted branch \"%1$s\" is undefined.\n"
+                                         "Do you want to add it to the document's branch list?"),
+                                       name);
+                       if (frontend::Alert::prompt(_("Unknown branch"),
+                                         text, 0, 1, _("&Add"), _("&Don't Add")) != 0)
+                               break;
+                       lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name));
+                       break;
+               }
+
                default:
                        break; // nothing
                }
@@ -290,16 +326,19 @@ 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;
 
        // Store the new cursor position.
+       pit_type last_paste = pit + insertion.size() - 1;
+       pit_type startpit = pit;
        pit = last_paste;
        pos = pars[last_paste].size();
 
+       // FIXME Should we do it here, or should we let updateLabels() 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)
+               pars[p].setBuffer(const_cast<Buffer &>(buffer));
+
        // 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())) {
@@ -420,14 +459,16 @@ void copySelectionHelper(Buffer const & buf, ParagraphList const & pars,
                // ERT paragraphs have the Language latex_language.
                // This is invalid outside of ERT, so we need to change it
                // to the buffer language.
-               if (it->ownerCode() == ERT_CODE || it->ownerCode() == LISTINGS_CODE) {
+               if (it->ownerCode() == ERT_CODE || it->ownerCode() == LISTINGS_CODE)
                        it->changeLanguage(buf.params(), latex_language, buf.language());
-               }
+
                it->setInsetOwner(0);
        }
 
-       // do not copy text (also nested in insets) which is marked as deleted
-       acceptChanges(copy_pars, buf.params());
+       // do not copy text (also nested in insets) which is marked as deleted,
+       // unless the whole selection was deleted
+       if (!isFullyDeleted(copy_pars))
+               acceptChanges(copy_pars, buf.params());
 
        DocumentClass * d = const_cast<DocumentClass *>(dc);
        cutstack.push(make_pair(copy_pars, d));
@@ -729,7 +770,11 @@ void copySelectionToStack(Cursor const & cur, CutStack & cutstack)
                copySelectionHelper(*cur.buffer(), pars, par, cur.selEnd().pit(),
                        pos, cur.selEnd().pos(), 
                        cur.buffer()->params().documentClassPtr(), cutstack);
-               dirtyTabularStack(false);
+
+               // Reset the dirty_tabular_stack_ flag only when something
+               // is copied to the clipboard (not to the selectionBuffer).
+               if (&cutstack == &theCuts)
+                       dirtyTabularStack(false);
        }
 
        if (cur.inMathed()) {