]> git.lyx.org Git - lyx.git/blobdiff - src/CutAndPaste.cpp
Include the recently added test files in package
[lyx.git] / src / CutAndPaste.cpp
index 39b732fea6b2affdec2d3ab6d800c9b1bb010fe3..4b95b9be506f1d28f9a0dfcd2b1f7fb74d62dee0 100644 (file)
@@ -56,6 +56,7 @@
 #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"
 
@@ -78,7 +79,7 @@ namespace {
 
 typedef pair<pit_type, int> PitPosPair;
 
-typedef limited_stack<pair<ParagraphList, DocumentClass const *> > CutStack;
+typedef limited_stack<pair<ParagraphList, DocumentClassConstPtr> > CutStack;
 
 CutStack theCuts(10);
 // persistent selection, cleared until the next selection
@@ -98,7 +99,7 @@ bool checkPastePossible(int index)
 
 pair<PitPosPair, pit_type>
 pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist,
-                    DocumentClass const * const oldDocClass, ErrorList & errorlist)
+                    DocumentClassConstPtr oldDocClass, ErrorList & errorlist)
 {
        Buffer const & buffer = *cur.buffer();
        pit_type pit = cur.pit();
@@ -118,8 +119,7 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist,
 
        // Make a copy of the CaP paragraphs.
        ParagraphList insertion = parlist;
-       DocumentClass const * const newDocClass = 
-               buffer.params().documentClassPtr();
+       DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr();
 
        // Now remove all out of the pars which is NOT allowed in the
        // new environment and set also another font if that is required.
@@ -227,7 +227,7 @@ pasteSelectionHelper(Cursor const & 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 &>(buffer));
                switch (it->lyxCode()) {
@@ -241,7 +241,7 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist,
                                        continue;
                                InsetLabel * lab = labels[i];
                                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");
@@ -255,13 +255,13 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist,
                                                if (ref->getParam("reference") == oldname)
                                                        ref->setParam("reference", newname);
                                        } else if (itt->lyxCode() == MATH_REF_CODE) {
-                                               InsetMathHull * mi = itt->asInsetMath()->asHullInset();
+                                               InsetMathRef * mi = itt->asInsetMath()->asRefInset();
                                                // this is necessary to prevent an uninitialized
                                                // buffer when the RefInset is in a MathBox.
                                                // FIXME audit setBuffer calls
                                                mi->setBuffer(const_cast<Buffer &>(buffer));
-                                               if (mi->asRefInset()->getTarget() == oldname)
-                                                       mi->asRefInset()->changeTarget(newname);
+                                               if (mi->getTarget() == oldname)
+                                                       mi->changeTarget(newname);
                                        }
                                }
                        }
@@ -272,7 +272,7 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist,
                        // check for duplicates
                        InsetLabel & lab = static_cast<InsetLabel &>(*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");
@@ -285,14 +285,13 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist,
                                        if (ref.getParam("reference") == oldname)
                                                ref.setParam("reference", newname);
                                } else if (itt->lyxCode() == MATH_REF_CODE) {
-                                       InsetMathHull & mi =
-                                               static_cast<InsetMathHull &>(*itt);
+                                       InsetMathRef * mi = itt->asInsetMath()->asRefInset();
                                        // this is necessary to prevent an uninitialized
                                        // buffer when the RefInset is in a MathBox.
                                        // FIXME audit setBuffer calls
-                                       mi.setBuffer(const_cast<Buffer &>(buffer));
-                                       if (mi.asRefInset()->getTarget() == oldname)
-                                               mi.asRefInset()->changeTarget(newname);
+                                       mi->setBuffer(const_cast<Buffer &>(buffer));
+                                       if (mi->getTarget() == oldname)
+                                               mi->changeTarget(newname);
                                }
                        }
                        break;
@@ -461,17 +460,16 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
 
 
 void putClipboard(ParagraphList const & paragraphs, 
-       DocumentClass const * const docclass, docstring const & plaintext)
+       DocumentClassConstPtr docclass, docstring const & plaintext)
 {
        // For some strange reason gcc 3.2 and 3.3 do not accept
        // Buffer buffer(string(), false);
-       // This needs to be static to avoid a memory leak. When a Buffer is
-       // constructed, it constructs a BufferParams, which in turn constructs
-       // a DocumentClass, via new, that is never deleted. If we were to go to
-       // 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");
+       // This used to need to be static to avoid a memory leak. It no longer needs
+       // to be so, but the alternative is to construct a new one of these (with a
+       // new temporary directory, etc) every time, and then to destroy it. So maybe
+       // it's worth just keeping this one around.
+       static Buffer * buffer = theBufferList().newInternalBuffer(
+               FileName::tempName("clipboard.internal").absFileName());
        buffer->setUnnamed(true);
        buffer->paragraphs() = paragraphs;
        buffer->inset().setBuffer(*buffer);
@@ -503,7 +501,7 @@ static bool isFullyDeleted(ParagraphList const & pars)
 
 void copySelectionHelper(Buffer const & buf, Text const & text,
        pit_type startpit, pit_type endpit,
-       int start, int end, DocumentClass const * const dc, CutStack & cutstack)
+       int start, int end, DocumentClassConstPtr dc, CutStack & cutstack)
 {
        ParagraphList const & pars = text.paragraphs();
 
@@ -528,7 +526,7 @@ void copySelectionHelper(Buffer const & buf, Text const & text,
        ParagraphList::iterator it = copy_pars.begin();
        ParagraphList::iterator it_end = copy_pars.end();
 
-       for (; it != it_end; it++) {
+       for (; it != it_end; ++it) {
                // Since we have a copy of the paragraphs, the insets
                // do not have a proper buffer reference. It makes
                // sense to add them temporarily, because the
@@ -553,13 +551,12 @@ void copySelectionHelper(Buffer const & buf, Text const & text,
        // do some final cleanup now, to make sure that the paragraphs
        // are not linked to something else.
        it = copy_pars.begin();
-       for (; it != it_end; it++) {
+       for (; it != it_end; ++it) {
                it->setBuffer(*static_cast<Buffer *>(0));
                it->setInsetOwner(0);
        }
 
-       DocumentClass * d = const_cast<DocumentClass *>(dc);
-       cutstack.push(make_pair(copy_pars, d));
+       cutstack.push(make_pair(copy_pars, dc));
 }
 
 } // namespace anon
@@ -634,8 +631,8 @@ bool multipleCellsSelected(Cursor const & cur)
 }
 
 
-void switchBetweenClasses(DocumentClass const * const oldone, 
-               DocumentClass const * const newone, InsetText & in, ErrorList & errorlist)
+void switchBetweenClasses(DocumentClassConstPtr  oldone,
+               DocumentClassConstPtr newone, InsetText & in, ErrorList & errorlist)
 {
        errorlist.clear();
 
@@ -647,13 +644,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<docstring> 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());
@@ -963,7 +972,7 @@ docstring selection(size_t sel_index)
 
 
 void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
-                       DocumentClass const * const docclass, ErrorList & errorList)
+                       DocumentClassConstPtr docclass, ErrorList & errorList)
 {
        if (cur.inTexted()) {
                Text * text = cur.text();
@@ -993,7 +1002,6 @@ void pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index)
        cur.recordUndo();
        pasteParagraphList(cur, theCuts[sel_index].first,
                           theCuts[sel_index].second, errorList);
-       cur.setSelection();
 }
 
 
@@ -1017,7 +1025,6 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs)
                                cur.recordUndo();
                                pasteParagraphList(cur, buffer.paragraphs(),
                                        buffer.params().documentClassPtr(), errorList);
-                               cur.setSelection();
                                return;
                        }
                }
@@ -1035,6 +1042,39 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs)
 }
 
 
+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);
+}
+
+
 void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */,
                            Clipboard::GraphicsType preferedType)
 {
@@ -1065,7 +1105,7 @@ void pasteSelection(Cursor & cur, ErrorList & errorList)
 }
 
 
-void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwards)
+void replaceSelectionWithString(Cursor & cur, docstring const & str)
 {
        cur.recordUndo();
        DocIterator selbeg = cur.selectionBegin();
@@ -1084,13 +1124,6 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwa
 
        // Cut the selection
        cutSelection(cur, true, false);
-
-       // select the replacement
-       if (backwards) {
-               selbeg.pos() += str.length();
-               cur.setSelection(selbeg, -int(str.length()));
-       } else
-               cur.setSelection(selbeg, str.length());
 }