]> git.lyx.org Git - lyx.git/blobdiff - src/CutAndPaste.cpp
Paragraph:
[lyx.git] / src / CutAndPaste.cpp
index 6984e5f5daf68b388e8d0582a0ba1bd00e9f5d5b..8a13b87fdf10ed11db07d370facb4af84f578d99 100644 (file)
@@ -1,4 +1,4 @@
-/*
+/**
  * \file CutAndPaste.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
 
 #include "Buffer.h"
 #include "buffer_funcs.h"
+#include "BufferList.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Changes.h"
 #include "Cursor.h"
 #include "ErrorList.h"
+#include "FuncCode.h"
 #include "FuncRequest.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h"
-#include "lfuns.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
 #include "Text.h"
-#include "TextClassList.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
@@ -38,6 +38,9 @@
 #include "Undo.h"
 
 #include "insets/InsetFlex.h"
+#include "insets/InsetCommand.h"
+#include "insets/InsetGraphics.h"
+#include "insets/InsetGraphicsParams.h"
 #include "insets/InsetTabular.h"
 
 #include "mathed/MathData.h"
 
 #include <string>
 
-using std::endl;
-using std::for_each;
-using std::make_pair;
-using std::pair;
-using std::vector;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
+using lyx::frontend::Clipboard;
 
 namespace lyx {
 
-using support::bformat;
-using frontend::Clipboard;
-
 namespace {
 
-typedef std::pair<pit_type, int> PitPosPair;
+typedef pair<pit_type, int> PitPosPair;
 
-typedef limited_stack<pair<ParagraphList, TextClassPtr> > CutStack;
+typedef limited_stack<pair<ParagraphList, DocumentClass const *> > CutStack;
 
 CutStack theCuts(10);
 // persistent selection, cleared until the next selection
@@ -87,22 +83,6 @@ CutStack selectionBuffer(1);
 bool dirty_tabular_stack_ = false;
 
 
-void region(CursorSlice const & i1, CursorSlice const & i2,
-       Inset::row_type & r1, Inset::row_type & r2,
-       Inset::col_type & c1, Inset::col_type & c2)
-{
-       Inset & p = i1.inset();
-       c1 = p.col(i1.idx());
-       c2 = p.col(i2.idx());
-       if (c1 > c2)
-               std::swap(c1, c2);
-       r1 = p.row(i1.idx());
-       r2 = p.row(i2.idx());
-       if (r1 > r2)
-               std::swap(r1, r2);
-}
-
-
 bool checkPastePossible(int index)
 {
        return size_t(index) < theCuts.size() && !theCuts[index].first.empty();
@@ -111,12 +91,18 @@ bool checkPastePossible(int index)
 
 pair<PitPosPair, pit_type>
 pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
-                    TextClassPtr textclass, ErrorList & errorlist)
+                    DocumentClass const * const oldDocClass, ErrorList & errorlist)
 {
        Buffer const & buffer = cur.buffer();
        pit_type pit = cur.pit();
        pos_type pos = cur.pos();
-       ParagraphList & pars = cur.text()->paragraphs();
+       InsetText * target_inset = cur.inset().asInsetText();
+       if (!target_inset) {
+               InsetTabular * it = cur.inset().asInsetTabular();
+               target_inset = it? it->cell(cur.idx())->asInsetText() : 0;
+       }
+       LASSERT(target_inset, return make_pair(PitPosPair(pit, pos), pit));
+       ParagraphList & pars = target_inset->paragraphs();
 
        if (parlist.empty())
                return make_pair(PitPosPair(pit, pos), pit);
@@ -125,48 +111,64 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 
        // Make a copy of the CaP paragraphs.
        ParagraphList insertion = parlist;
-       TextClassPtr const tc = buffer.params().getTextClassPtr();
+       DocumentClass const * const 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.
 
        // Convert newline to paragraph break in ERT inset.
        // This should not be here!
-       if (pars[pit].inInset() &&
-           (pars[pit].inInset()->lyxCode() == ERT_CODE ||
-               pars[pit].inInset()->lyxCode() == LISTINGS_CODE)) {
-               for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
-                       for (pos_type j = 0; j < insertion[i].size(); ++j) {
+       InsetCode const code = target_inset->lyxCode();
+       if (code == ERT_CODE || code == LISTINGS_CODE) {
+               for (size_t i = 0; i != insertion.size(); ++i) {
+                       for (pos_type j = 0; j != insertion[i].size(); ++j) {
                                if (insertion[i].isNewline(j)) {
                                        // do not track deletion of newline
                                        insertion[i].eraseChar(j, false);
+                                       insertion[i].setInsetOwner(target_inset);
                                        breakParagraphConservative(
                                                        buffer.params(),
                                                        insertion, i, j);
+                                       break;
                                }
                        }
                }
        }
 
-       // If we are in an inset which returns forceDefaultParagraphs,
-       // set the paragraphs to default
-       if (cur.inset().forceDefaultParagraphs(cur.idx())) {
-               LayoutPtr const layout =
-                       buffer.params().getTextClass().defaultLayout();
+       // set the paragraphs to plain layout if necessary
+       if (cur.inset().usePlainLayout()) {
+               bool forcePlainLayout = cur.inset().forcePlainLayout();
+               Layout const & plainLayout = newDocClass->plainLayout();
+               Layout const & defaultLayout = newDocClass->defaultLayout();
+               ParagraphList::iterator const end = insertion.end();
+               ParagraphList::iterator par = insertion.begin();
+               for (; par != end; ++par) {
+                       Layout const & parLayout = par->layout();
+                       if (forcePlainLayout || parLayout == defaultLayout)
+                               par->setLayout(plainLayout);
+               }
+       } else { // check if we need to reset from plain layout
+               Layout const & defaultLayout = newDocClass->defaultLayout();
+               Layout const & plainLayout = newDocClass->plainLayout();
                ParagraphList::iterator const end = insertion.end();
-               for (ParagraphList::iterator par = insertion.begin();
-                               par != end; ++par)
-                       par->layout(layout);
+               ParagraphList::iterator par = insertion.begin();
+               for (; par != end; ++par) {
+                       Layout const & parLayout = par->layout();
+                       if (parLayout == plainLayout)
+                               par->setLayout(defaultLayout);
+               }
        }
 
+       InsetText in(buffer);
        // Make sure there is no class difference.
-       InsetText in;
+       in.paragraphs().clear();
        // This works without copying any paragraph data because we have
        // a specialized swap method for ParagraphList. This is important
        // since we store pointers to insets at some places and we don't
        // want to invalidate them.
        insertion.swap(in.paragraphs());
-       cap::switchBetweenClasses(textclass, tc, in, errorlist);
+       cap::switchBetweenClasses(oldDocClass, newDocClass, in, errorlist);
        insertion.swap(in.paragraphs());
 
        ParagraphList::iterator tmpbuf = insertion.begin();
@@ -194,12 +196,12 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
                        max_depth = tmpbuf->getMaxDepthAfter();
 
                // Set the inset owner of this paragraph.
-               tmpbuf->setInsetOwner(pars[pit].inInset());
+               tmpbuf->setInsetOwner(target_inset);
                for (pos_type i = 0; i < tmpbuf->size(); ++i) {
-                       if (tmpbuf->isInset(i) &&
-                           !pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
-                               // do not track deletion of invalid insets
-                               tmpbuf->eraseChar(i--, false);
+                       // do not track deletion of invalid insets
+                       if (Inset * inset = tmpbuf->getInset(i))
+                               if (!target_inset->insetAllowed(inset->lyxCode()))
+                                       tmpbuf->eraseChar(i--, false);
                }
 
                tmpbuf->setChange(Change(buffer.params().trackChanges ?
@@ -217,24 +219,54 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        // A couple of insets store buffer references so need updating.
        insertion.swap(in.paragraphs());
 
-       ParIterator fpit = par_iterator_begin(in);
-       ParIterator fend = par_iterator_end(in);
+       InsetIterator const i_end = inset_iterator_end(in);
 
-       for (; fpit != fend; ++fpit) {
-               InsetList::const_iterator lit = fpit->insetList().begin();
-               InsetList::const_iterator eit = fpit->insetList().end();
+       for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) {
 
-               for (; lit != eit; ++lit) {
-                       switch (lit->inset->lyxCode()) {
-                       case TABULAR_CODE: {
-                               InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
-                               it->buffer(&buffer);
-                               break;
+               it->setBuffer(const_cast<Buffer &>(buffer));
+
+               switch (it->lyxCode()) {
+               case LABEL_CODE: {
+                       // check for duplicates
+                       InsetCommand & lab = static_cast<InsetCommand &>(*it);
+                       docstring const oldname = lab.getParam("name");
+                       lab.updateCommand(oldname, false);
+                       docstring const newname = lab.getParam("name");
+                       if (oldname != newname) {
+                               // adapt the references
+                               for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) {
+                                       if (itt->lyxCode() == REF_CODE) {
+                                               InsetCommand & ref = dynamic_cast<InsetCommand &>(*itt);
+                                               if (ref.getParam("reference") == oldname)
+                                                       ref.setParam("reference", newname);
+                                       }
+                               }
                        }
+                       break;
+               }
 
-                       default:
-                               break; // nothing
+               case BIBITEM_CODE: {
+                       // check for duplicates
+                       InsetCommand & bib = static_cast<InsetCommand &>(*it);
+                       docstring const oldkey = bib.getParam("key");
+                       bib.updateCommand(oldkey, false);
+                       docstring const newkey = bib.getParam("key");
+                       if (oldkey != newkey) {
+                               // adapt the references
+                               for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) {
+                                       if (itt->lyxCode() == CITE_CODE) {
+                                               InsetCommand & ref = dynamic_cast<InsetCommand &>(*itt);
+                                               if (ref.getParam("key") == oldkey)
+                                                       ref.setParam("key", newkey);
+                                       }
+                               }
                        }
+                       break;
+               }
+
+               default:
+                       break; // nothing
                }
        }
        insertion.swap(in.paragraphs());
@@ -260,6 +292,9 @@ 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;
 
@@ -314,7 +349,9 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
 
                // Separate handling of paragraph break:
                if (merge && pit != endpit &&
-                   (pit + 1 != endpit || pars[pit].hasSameLayout(pars[endpit]))) {
+                   (pit + 1 != endpit 
+                    || pars[pit].hasSameLayout(pars[endpit])
+                    || pars[endpit].size() == endpos)) {
                        if (pit + 1 == endpit)
                                endpos += pars[pit].size();
                        mergeParagraph(params, pars, pit);
@@ -330,30 +367,39 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
 }
 
 
-void putClipboard(ParagraphList const & paragraphs, TextClassPtr textclass,
-                 docstring const & plaintext)
+void putClipboard(ParagraphList const & paragraphs, 
+       DocumentClass const * const docclass, docstring const & plaintext)
 {
        // For some strange reason gcc 3.2 and 3.3 do not accept
        // Buffer buffer(string(), false);
-       Buffer buffer("", false);
-       buffer.setUnnamed(true);
-       buffer.paragraphs() = paragraphs;
-       buffer.params().setTextClass(textclass);
-       std::ostringstream lyx;
-       if (buffer.write(lyx))
+       // 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");
+       buffer->setUnnamed(true);
+       buffer->paragraphs() = paragraphs;
+       buffer->inset().setBuffer(*buffer);
+       buffer->params().setDocumentClass(docclass);
+       ostringstream lyx;
+       if (buffer->write(lyx))
                theClipboard().put(lyx.str(), plaintext);
        else
                theClipboard().put(string(), plaintext);
+       // Save that memory
+       buffer->paragraphs().clear();
 }
 
 
-void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
+void copySelectionHelper(Buffer const & buf, ParagraphList const & pars,
        pit_type startpit, pit_type endpit,
-       int start, int end, TextClassPtr tc, CutStack & cutstack)
+       int start, int end, DocumentClass const * const dc, CutStack & cutstack)
 {
-       BOOST_ASSERT(0 <= start && start <= pars[startpit].size());
-       BOOST_ASSERT(0 <= end && end <= pars[endpit].size());
-       BOOST_ASSERT(startpit != endpit || start <= end);
+       LASSERT(0 <= start && start <= pars[startpit].size(), /**/);
+       LASSERT(0 <= end && end <= pars[endpit].size(), /**/);
+       LASSERT(startpit != endpit || start <= end, /**/);
 
        // Clone the paragraphs within the selection.
        ParagraphList copy_pars(boost::next(pars.begin(), startpit),
@@ -385,7 +431,8 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
        // do not copy text (also nested in insets) which is marked as deleted
        acceptChanges(copy_pars, buf.params());
 
-       cutstack.push(make_pair(copy_pars, tc));
+       DocumentClass * d = const_cast<DocumentClass *>(dc);
+       cutstack.push(make_pair(copy_pars, d));
 }
 
 } // namespace anon
@@ -395,6 +442,22 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
 
 namespace cap {
 
+void region(CursorSlice const & i1, CursorSlice const & i2,
+           Inset::row_type & r1, Inset::row_type & r2,
+           Inset::col_type & c1, Inset::col_type & c2)
+{
+       Inset & p = i1.inset();
+       c1 = p.col(i1.idx());
+       c2 = p.col(i2.idx());
+       if (c1 > c2)
+               swap(c1, c2);
+       r1 = p.row(i1.idx());
+       r2 = p.row(i2.idx());
+       if (r1 > r2)
+               swap(r1, r2);
+}
+
+
 docstring grabAndEraseSelection(Cursor & cur)
 {
        if (!cur.selection())
@@ -405,40 +468,70 @@ docstring grabAndEraseSelection(Cursor & cur)
 }
 
 
-void switchBetweenClasses(TextClassPtr const & c1, 
-       TextClassPtr const & c2, InsetText & in, ErrorList & errorlist)
+bool reduceSelectionToOneCell(Cursor & cur)
+{
+       if (!cur.selection() || !cur.inMathed())
+               return false;
+
+       CursorSlice i1 = cur.selBegin();
+       CursorSlice i2 = cur.selEnd();
+       if (!i1.inset().asInsetMath())
+               return false;
+
+       // the easy case: do nothing if only one cell is selected
+       if (i1.idx() == i2.idx())
+               return true;
+       
+       cur.top().pos() = 0;
+       cur.resetAnchor();
+       cur.top().pos() = cur.top().lastpos();
+       
+       return true;
+}
+
+
+bool multipleCellsSelected(Cursor const & cur)
+{
+       if (!cur.selection() || !cur.inMathed())
+               return false;
+       
+       CursorSlice i1 = cur.selBegin();
+       CursorSlice i2 = cur.selEnd();
+       if (!i1.inset().asInsetMath())
+               return false;
+       
+       if (i1.idx() == i2.idx())
+               return false;
+       
+       return true;
+}
+
+
+void switchBetweenClasses(DocumentClass const * const oldone, 
+               DocumentClass const * const newone, InsetText & in, ErrorList & errorlist)
 {
        errorlist.clear();
 
-       BOOST_ASSERT(!in.paragraphs().empty());
-       if (c1 == c2)
+       LASSERT(!in.paragraphs().empty(), /**/);
+       if (oldone == newone)
                return;
        
-       TextClass const & tclass1 = *c1;
-       TextClass const & tclass2 = *c2;
+       DocumentClass const & oldtc = *oldone;
+       DocumentClass const & newtc = *newone;
 
        // layouts
        ParIterator end = par_iterator_end(in);
        for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
-               docstring const name = it->layout()->name();
-               bool hasLayout = tclass2.hasLayout(name);
+               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);
 
-               if (hasLayout)
-                       it->layout(tclass2[name]);
+               if (in.usePlainLayout())
+                       it->setLayout(newtc.plainLayout());
                else
-                       it->layout(tclass2.defaultLayout());
-
-               if (!hasLayout && name != tclass1.defaultLayoutName()) {
-                       docstring const s = bformat(
-                                                _("Layout had to be changed from\n%1$s to %2$s\n"
-                                               "because of class conversion from\n%3$s to %4$s"),
-                        name, it->layout()->name(),
-                        from_utf8(tclass1.name()), from_utf8(tclass2.name()));
-                       // To warn the user that something had to be done.
-                       errorlist.push_back(ErrorItem(_("Changed Layout"), s,
-                                                     it->id(), 0,
-                                                     it->size()));
-               }
+                       it->setLayout(newtc[name]);
        }
 
        // character styles
@@ -450,18 +543,16 @@ void switchBetweenClasses(TextClassPtr const & c1,
                if (inset->lyxCode() != FLEX_CODE)
                        // FIXME: Should we verify all InsetCollapsable?
                        continue;
-               docstring const name = inset->name();
-               InsetLayout const & il = tclass2.insetlayout(name);
-               inset->setLayout(il);
-               if (il.labelstring != from_utf8("UNDEFINED"))
+               inset->setLayout(newone);
+               if (!inset->undefined())
                        continue;
-               // The flex inset is undefined in tclass2
+               // 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"),
-                       name, from_utf8(tclass1.name()),
-                       from_utf8(tclass2.name()));
+                       inset->name(), from_utf8(oldtc.name()),
+                       from_utf8(newtc.name()));
                // To warn the user that something had to be done.
                errorlist.push_back(ErrorItem(
                                _("Undefined flex inset"),
@@ -470,9 +561,11 @@ void switchBetweenClasses(TextClassPtr const & c1,
 }
 
 
-std::vector<docstring> const availableSelections(Buffer const & buffer)
+vector<docstring> availableSelections(Buffer const * buf)
 {
        vector<docstring> selList;
+       if (!buf)
+               return selList;
 
        CutStack::const_iterator cit = theCuts.begin();
        CutStack::const_iterator end = theCuts.end();
@@ -484,7 +577,10 @@ std::vector<docstring> const availableSelections(Buffer const & buffer)
                ParagraphList::const_iterator pit = pars.begin();
                ParagraphList::const_iterator pend = pars.end();
                for (; pit != pend; ++pit) {
-                       asciiSel += pit->asString(buffer, false);
+                       Paragraph par(*pit, 0, 26);
+                       // adapt paragraph to current buffer.
+                       par.setBuffer(const_cast<Buffer &>(*buf));
+                       asciiSel += par.asString(AS_STR_INSETS);
                        if (asciiSel.size() > 25) {
                                asciiSel.replace(22, docstring::npos,
                                                 from_ascii("..."));
@@ -516,7 +612,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
 
        if (cur.inTexted()) {
                Text * text = cur.text();
-               BOOST_ASSERT(text);
+               LASSERT(text, /**/);
 
                saveSelection(cur);
 
@@ -533,13 +629,16 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
                                text->paragraphs(),
                                begpit, endpit,
                                cur.selBegin().pos(), endpos,
-                               bp.getTextClassPtr(), theCuts);
+                               bp.documentClassPtr(), theCuts);
                        // Stuff what we got on the clipboard.
                        // Even if there is no selection.
                        putClipboard(theCuts[0].first, theCuts[0].second,
                                cur.selectionAsString(true));
                }
 
+               if (begpit != endpit)
+                       cur.updateFlags(Update::Force | Update::FitCursor);
+
                boost::tie(endpit, endpos) =
                        eraseSelectionHelper(bp,
                                text->paragraphs(),
@@ -582,7 +681,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
 }
 
 
-void copySelection(Cursor & cur)
+void copySelection(Cursor const & cur)
 {
        copySelection(cur, cur.selectionAsString(true));
 }
@@ -590,7 +689,7 @@ void copySelection(Cursor & cur)
 
 namespace {
 
-void copySelectionToStack(Cursor & cur, CutStack & cutstack)
+void copySelectionToStack(Cursor const & cur, CutStack & cutstack)
 {
        // this doesn't make sense, if there is no selection
        if (!cur.selection())
@@ -602,7 +701,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
 
        if (cur.inTexted()) {
                Text * text = cur.text();
-               BOOST_ASSERT(text);
+               LASSERT(text, /**/);
                // ok we have a selection. This is always between cur.selBegin()
                // and sel_end cursor
 
@@ -617,7 +716,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
 
                copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(),
                        pos, cur.selEnd().pos(), 
-                       cur.buffer().params().getTextClassPtr(), cutstack);
+                       cur.buffer().params().documentClassPtr(), cutstack);
                dirtyTabularStack(false);
        }
 
@@ -626,10 +725,11 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getTextClass().defaultLayout());
+               // FIXME This should be the plain layout...right?
+               par.setLayout(bp.documentClass().plainLayout());
                par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
-               cutstack.push(make_pair(pars, bp.getTextClassPtr()));
+               cutstack.push(make_pair(pars, bp.documentClassPtr()));
        }
 }
 
@@ -643,7 +743,7 @@ void copySelectionToStack()
 }
 
 
-void copySelection(Cursor & cur, docstring const & plaintext)
+void copySelection(Cursor const & cur, docstring const & plaintext)
 {
        // In tablemode, because copy and paste actually use special table stack
        // we do not attempt to get selected paragraphs under cursor. Instead, a
@@ -653,10 +753,10 @@ void copySelection(Cursor & cur, docstring const & plaintext)
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getTextClass().defaultLayout());
+               par.setLayout(bp.documentClass().plainLayout());
                par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
-               theCuts.push(make_pair(pars, bp.getTextClassPtr()));
+               theCuts.push(make_pair(pars, bp.documentClassPtr()));
        } else {
                copySelectionToStack(cur, theCuts);
        }
@@ -666,7 +766,7 @@ void copySelection(Cursor & cur, docstring const & plaintext)
 }
 
 
-void saveSelection(Cursor & cur)
+void saveSelection(Cursor const & cur)
 {
        // This function is called, not when a selection is formed, but when
        // a selection is cleared. Therefore, multiple keyboard selection
@@ -674,7 +774,7 @@ void saveSelection(Cursor & cur)
        if (cur.selection() 
            && cur.selBegin() == cur.bv().cursor().selBegin()
            && cur.selEnd() == cur.bv().cursor().selEnd()) {
-               LYXERR(Debug::ACTION, "'" << cur.selectionAsString(true) << "'");
+               LYXERR(Debug::SELECTION, "saveSelection: '" << cur.selectionAsString(true) << "'");
                copySelectionToStack(cur, selectionBuffer);
        }
 }
@@ -698,34 +798,33 @@ void clearCutStack()
 }
 
 
-docstring getSelection(Buffer const & buf, size_t sel_index)
+docstring selection(size_t sel_index)
 {
        return sel_index < theCuts.size()
-               ? theCuts[sel_index].first.back().asString(buf, false)
+               ? theCuts[sel_index].first.back().asString(AS_STR_INSETS)
                : docstring();
 }
 
 
 void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
-                       TextClassPtr textclass, ErrorList & errorList)
+                       DocumentClass const * const docclass, ErrorList & errorList)
 {
        if (cur.inTexted()) {
                Text * text = cur.text();
-               BOOST_ASSERT(text);
+               LASSERT(text, /**/);
 
                pit_type endpit;
                PitPosPair ppp;
 
                boost::tie(ppp, endpit) =
-                       pasteSelectionHelper(cur, parlist,
-                                            textclass, errorList);
+                       pasteSelectionHelper(cur, parlist, docclass, errorList);
                updateLabels(cur.buffer());
                cur.clearSelection();
                text->setCursor(cur, ppp.first, ppp.second);
        }
 
        // mathed is handled in InsetMathNest/InsetMathGrid
-       BOOST_ASSERT(!cur.inMathed());
+       LASSERT(!cur.inMathed(), /**/);
 }
 
 
@@ -742,7 +841,7 @@ void pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index)
 }
 
 
-void pasteClipboard(Cursor & cur, ErrorList & errorList, bool asParagraphs)
+void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs)
 {
        // Use internal clipboard if it is the most recent one
        if (theClipboard().isInternal()) {
@@ -761,7 +860,7 @@ void pasteClipboard(Cursor & cur, ErrorList & errorList, bool asParagraphs)
                        if (buffer.readString(lyx)) {
                                cur.recordUndo();
                                pasteParagraphList(cur, buffer.paragraphs(),
-                                       buffer.params().getTextClassPtr(), errorList);
+                                       buffer.params().documentClassPtr(), errorList);
                                cur.setSelection();
                                return;
                        }
@@ -780,6 +879,26 @@ void pasteClipboard(Cursor & cur, ErrorList & errorList, bool asParagraphs)
 }
 
 
+void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */,
+                           Clipboard::GraphicsType preferedType)
+{
+       LASSERT(theClipboard().hasGraphicsContents(preferedType), /**/);
+
+       // get picture from clipboard
+       FileName filename = theClipboard().getAsGraphics(cur, preferedType);
+       if (filename.empty())
+               return;
+
+       // create inset for graphic
+       InsetGraphics * inset = new InsetGraphics(cur.buffer());
+       InsetGraphicsParams params;
+       params.filename = support::DocFileName(filename.absFilename());
+       inset->setParams(params);
+       cur.recordUndo();
+       cur.insert(inset);
+}
+
+
 void pasteSelection(Cursor & cur, ErrorList & errorList)
 {
        if (selectionBuffer.empty())
@@ -796,7 +915,7 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwa
        DocIterator selbeg = cur.selectionBegin();
 
        // Get font setting before we cut
-       Font const font =
+       Font const font =
                selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos());
 
        // Insert the new string
@@ -874,7 +993,7 @@ void selClearOrDel(Cursor & cur)
        if (lyxrc.auto_region_delete)
                selDel(cur);
        else
-               cur.selection() = false;
+               cur.setSelection(false);
 }
 
 
@@ -883,9 +1002,11 @@ docstring grabSelection(Cursor const & cur)
        if (!cur.selection())
                return docstring();
 
-       // FIXME: What is wrong with the following?
 #if 0
-       std::ostringstream os;
+       // grab selection by glueing multiple cells together. This is not what
+       // we want because selections spanning multiple cells will get "&" and "\\"
+       // seperators.
+       ostringstream os;
        for (DocIterator dit = cur.selectionBegin();
             dit != cur.selectionEnd(); dit.forwardPos())
                os << asString(dit.cell());