]> git.lyx.org Git - lyx.git/blobdiff - src/CutAndPaste.cpp
Whoops. Revert last commit.
[lyx.git] / src / CutAndPaste.cpp
index 9a857a1f197ef962b5e1eb78b01d80991e9b39de..2450e0fc5cbfa5dc5eec958adf8341ecf0ac7fe4 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 "CutAndPaste.h"
 
+#include "BaseClassList.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Changes.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "gettext.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h"
@@ -32,7 +31,6 @@
 #include "LyXFunc.h"
 #include "LyXRC.h"
 #include "Text.h"
-#include "TextClassList.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "Undo.h"
 
 #include "insets/InsetFlex.h"
+#include "insets/InsetGraphics.h"
+#include "insets/InsetGraphicsParams.h"
 #include "insets/InsetTabular.h"
 
 #include "mathed/MathData.h"
 #include "mathed/InsetMath.h"
 #include "mathed/MathSupport.h"
 
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/limited_stack.h"
 #include "support/lstrings.h"
 
 #include "frontends/Clipboard.h"
 #include "frontends/Selection.h"
 
-#include <boost/current_function.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/next_prior.hpp>
 
 #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;
 
@@ -95,11 +90,11 @@ void region(CursorSlice const & i1, CursorSlice const & i2,
        c1 = p.col(i1.idx());
        c2 = p.col(i2.idx());
        if (c1 > c2)
-               std::swap(c1, c2);
+               swap(c1, c2);
        r1 = p.row(i1.idx());
        r2 = p.row(i2.idx());
        if (r1 > r2)
-               std::swap(r1, r2);
+               swap(r1, r2);
 }
 
 
@@ -125,18 +120,18 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 
        // Make a copy of the CaP paragraphs.
        ParagraphList insertion = parlist;
-       TextClassPtr const tc = buffer.params().getTextClassPtr();
+       TextClassPtr const tc = buffer.params().textClassPtr();
 
        // 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) {
+       Inset * inset = pars[pit].inInset();
+       if (inset && (inset->lyxCode() == ERT_CODE ||
+                       inset->lyxCode() == 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);
@@ -148,15 +143,16 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
                }
        }
 
-       // If we are in an inset which returns forceDefaultParagraphs,
-       // set the paragraphs to default
-       if (cur.inset().forceDefaultParagraphs(cur.idx())) {
+       // set the paragraphs to empty layout if necessary
+       // note that we are doing this if the empty layout is
+       // supposed to be the default, not just if it is forced
+       if (cur.inset().useEmptyLayout()) {
                LayoutPtr const layout =
-                       buffer.params().getTextClass().defaultLayout();
+                       buffer.params().textClass().emptyLayout();
                ParagraphList::iterator const end = insertion.end();
                for (ParagraphList::iterator par = insertion.begin();
                                par != end; ++par)
-                       par->layout(layout);
+                       par->setLayout(layout);
        }
 
        // Make sure there is no class difference.
@@ -196,10 +192,10 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
                // Set the inset owner of this paragraph.
                tmpbuf->setInsetOwner(pars[pit].inInset());
                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 (!pars[pit].insetAllowed(inset->lyxCode()))
+                                       tmpbuf->eraseChar(i--, false);
                }
 
                tmpbuf->setChange(Change(buffer.params().trackChanges ?
@@ -221,21 +217,10 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        ParIterator fend = par_iterator_end(in);
 
        for (; fpit != fend; ++fpit) {
-               InsetList::const_iterator lit = fpit->insetList().begin();
-               InsetList::const_iterator eit = fpit->insetList().end();
-
-               for (; lit != eit; ++lit) {
-                       switch (lit->inset->lyxCode()) {
-                       case TABULAR_CODE: {
-                               InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
-                               it->buffer(&buffer);
-                               break;
-                       }
-
-                       default:
-                               break; // nothing
-                       }
-               }
+               InsetList::const_iterator it = fpit->insetList().begin();
+               InsetList::const_iterator et = fpit->insetList().end();
+               for (; it != et; ++it)
+                               it->inset->setBuffer(const_cast<Buffer *>(&buffer));
        }
        insertion.swap(in.paragraphs());
 
@@ -314,7 +299,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);
@@ -339,7 +326,7 @@ void putClipboard(ParagraphList const & paragraphs, TextClassPtr textclass,
        buffer.setUnnamed(true);
        buffer.paragraphs() = paragraphs;
        buffer.params().setTextClass(textclass);
-       std::ostringstream lyx;
+       ostringstream lyx;
        if (buffer.write(lyx))
                theClipboard().put(lyx.str(), plaintext);
        else
@@ -405,35 +392,35 @@ docstring grabAndEraseSelection(Cursor & cur)
 }
 
 
-void switchBetweenClasses(TextClassPtr const & c1
-       TextClassPtr const & c2, InsetText & in, ErrorList & errorlist)
+void switchBetweenClasses(TextClassPtr const & oldone
+               TextClassPtr const & newone, InsetText & in, ErrorList & errorlist)
 {
        errorlist.clear();
 
        BOOST_ASSERT(!in.paragraphs().empty());
-       if (c1 == c2)
+       if (oldone == newone)
                return;
        
-       TextClass const & tclass1 = *c1;
-       TextClass const & tclass2 = *c2;
+       TextClass const & oldtc = *oldone;
+       TextClass 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);
+               bool hasLayout = newtc.hasLayout(name);
 
                if (hasLayout)
-                       it->layout(tclass2[name]);
+                       it->setLayout(newtc[name]);
                else
-                       it->layout(tclass2.defaultLayout());
+                       it->setLayout(newtc.defaultLayout());
 
-               if (!hasLayout && name != tclass1.defaultLayoutName()) {
+               if (!hasLayout && name != oldtc.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()));
+                        from_utf8(oldtc.name()), from_utf8(newtc.name()));
                        // To warn the user that something had to be done.
                        errorlist.push_back(ErrorItem(_("Changed Layout"), s,
                                                      it->id(), 0,
@@ -450,18 +437,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,7 +455,7 @@ void switchBetweenClasses(TextClassPtr const & c1,
 }
 
 
-std::vector<docstring> const availableSelections(Buffer const & buffer)
+vector<docstring> const availableSelections(Buffer const & buffer)
 {
        vector<docstring> selList;
 
@@ -533,7 +518,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
                                text->paragraphs(),
                                begpit, endpit,
                                cur.selBegin().pos(), endpos,
-                               bp.getTextClassPtr(), theCuts);
+                               bp.textClassPtr(), theCuts);
                        // Stuff what we got on the clipboard.
                        // Even if there is no selection.
                        putClipboard(theCuts[0].first, theCuts[0].second,
@@ -617,7 +602,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().textClassPtr(), cutstack);
                dirtyTabularStack(false);
        }
 
@@ -626,10 +611,10 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getTextClass().defaultLayout());
+               par.setLayout(bp.textClass().defaultLayout());
                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.textClassPtr()));
        }
 }
 
@@ -646,19 +631,20 @@ void copySelectionToStack()
 void copySelection(Cursor & cur, docstring const & plaintext)
 {
        // In tablemode, because copy and paste actually use special table stack
-       // we do not attemp to get selected paragraphs under cursor. Instead, a
+       // we do not attempt to get selected paragraphs under cursor. Instead, a
        // paragraph with the plain text version is generated so that table cells
        // can be pasted as pure text somewhere else.
        if (cur.selBegin().idx() != cur.selEnd().idx()) {
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getTextClass().defaultLayout());
+               par.setLayout(bp.textClass().defaultLayout());
                par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
-               theCuts.push(make_pair(pars, bp.getTextClassPtr()));
-       } else
+               theCuts.push(make_pair(pars, bp.textClassPtr()));
+       } else {
                copySelectionToStack(cur, theCuts);
+       }
 
        // stuff the selection onto the X clipboard, from an explicit copy request
        putClipboard(theCuts[0].first, theCuts[0].second, plaintext);
@@ -673,9 +659,7 @@ void saveSelection(Cursor & cur)
        if (cur.selection() 
            && cur.selBegin() == cur.bv().cursor().selBegin()
            && cur.selEnd() == cur.bv().cursor().selEnd()) {
-               LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION << ": `"
-                          << to_utf8(cur.selectionAsString(true)) << "'."
-                          << endl;
+               LYXERR(Debug::ACTION, "'" << cur.selectionAsString(true) << "'");
                copySelectionToStack(cur, selectionBuffer);
        }
 }
@@ -718,8 +702,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
                PitPosPair ppp;
 
                boost::tie(ppp, endpit) =
-                       pasteSelectionHelper(cur, parlist,
-                                            textclass, errorList);
+                       pasteSelectionHelper(cur, parlist, textclass, errorList);
                updateLabels(cur.buffer());
                cur.clearSelection();
                text->setCursor(cur, ppp.first, ppp.second);
@@ -743,7 +726,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()) {
@@ -762,7 +745,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().textClassPtr(), errorList);
                                cur.setSelection();
                                return;
                        }
@@ -781,6 +764,26 @@ void pasteClipboard(Cursor & cur, ErrorList & errorList, bool asParagraphs)
 }
 
 
+void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */,
+                           Clipboard::GraphicsType preferedType)
+{
+       BOOST_ASSERT(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;
+       InsetGraphicsParams params;
+       params.filename = EmbeddedFile(filename.absFilename(), cur.buffer().filePath());
+       inset->setParams(params);
+       cur.recordUndo();
+       cur.insert(inset);
+}
+
+
 void pasteSelection(Cursor & cur, ErrorList & errorList)
 {
        if (selectionBuffer.empty())
@@ -886,7 +889,7 @@ docstring grabSelection(Cursor const & cur)
 
        // FIXME: What is wrong with the following?
 #if 0
-       std::ostringstream os;
+       ostringstream os;
        for (DocIterator dit = cur.selectionBegin();
             dit != cur.selectionEnd(); dit.forwardPos())
                os << asString(dit.cell());