X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselection-chemistry.cpp;h=0f89464411e395c9a6235bdd24fd5d1b80b54418;hb=278a51c395d23b0b26988eebe801e7438c952810;hp=a8cb4d4fe193096cdf8eaffbd4ce5f9971a27667;hpb=2f99f08590b9e75d4c4f33cc4374db3e8f97f15d;p=inkscape.git

diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index a8cb4d4fe..0f8946441 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -1,9 +1,9 @@
 #define __SP_SELECTION_CHEMISTRY_C__
 
-/*
- * Miscellanous operations on selected items
- *
- * Authors:
+/** @file
+ * @brief Miscellanous operations on selected items
+ */
+/* Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Frank Felfe <innerspace@iname.com>
  *   MenTaLguY <mental@rydia.net>
@@ -20,12 +20,14 @@
 # include "config.h"
 #endif
 
+#include "selection-chemistry.h"
+
 #include <gtkmm/clipboard.h>
 
 #include "svg/svg.h"
 #include "inkscape.h"
 #include "desktop.h"
-#include "desktop-style.h"
+//#include "desktop-style.h"
 #include "selection.h"
 #include "tools-switch.h"
 #include "desktop-handles.h"
@@ -70,25 +72,32 @@
 #include "layer-fns.h"
 #include "context-fns.h"
 #include <map>
+#include <cstring>
+#include <string>
 #include "helper/units.h"
 #include "sp-item.h"
+#include "box3d.h"
 #include "unit-constants.h"
 #include "xml/simple-document.h"
 #include "sp-filter-reference.h"
+#include "gradient-drag.h"
+#include "uri-references.h"
+#include "libnr/nr-convert2geom.h"
 
-using NR::X;
-using NR::Y;
+// For clippath editing
+#include "tools-switch.h"
+#include "shape-editor.h"
+#include "node-context.h"
+#include "nodepath.h"
 
-#include "selection-chemistry.h"
+#include "ui/clipboard.h"
 
-/* fixme: find a better place */
-Inkscape::XML::Document *clipboard_document = NULL;
-GSList *clipboard = NULL;
-GSList *defs_clipboard = NULL;
-SPCSSAttr *style_clipboard = NULL;
-NR::Maybe<NR::Rect> size_clipboard;
+using NR::X;
+using NR::Y;
 
-static void sp_copy_stuff_used_by_item(GSList **defs_clip, SPItem *item, const GSList *items, Inkscape::XML::Document* xml_doc);
+/* The clipboard handling is in ui/clipboard.cpp now. There are some legacy functions left here,
+because the layer manipulation code uses them. It should be rewritten specifically
+for that purpose. */
 
 /**
  * Copies repr and its inherited css style elements, along with the accumulated transform 'full_t',
@@ -104,7 +113,7 @@ void sp_selection_copy_one (Inkscape::XML::Node *repr, NR::Matrix full_t, GSList
     sp_repr_css_attr_unref(css);
 
     // write the complete accumulated transform passed to us
-    // (we're dealing with unattached repr, so we write to its attr 
+    // (we're dealing with unattached repr, so we write to its attr
     // instead of using sp_item_set_transform)
     gchar *affinestr=sp_svg_transform_write(full_t);
     copy->setAttribute("transform", affinestr);
@@ -113,66 +122,24 @@ void sp_selection_copy_one (Inkscape::XML::Node *repr, NR::Matrix full_t, GSList
     *clip = g_slist_prepend(*clip, copy);
 }
 
-void sp_selection_copy_impl (const GSList *items, GSList **clip, GSList **defs_clip, SPCSSAttr **style_clip, Inkscape::XML::Document* xml_doc)
+void sp_selection_copy_impl (GSList const *items, GSList **clip, Inkscape::XML::Document* xml_doc)
 {
+    // Sort items:
+    GSList *sorted_items = g_slist_copy ((GSList *) items);
+    sorted_items = g_slist_sort((GSList *) sorted_items, (GCompareFunc) sp_object_compare_position);
 
-    // Copy stuff referenced by all items to defs_clip:
-    if (defs_clip) {
-        for (GSList *i = (GSList *) items; i != NULL; i = i->next) {
-            sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (i->data), items, xml_doc);
-        }
-        *defs_clip = g_slist_reverse(*defs_clip);
-    }
-
-    // Store style:
-    if (style_clip) {
-        SPItem *item = SP_ITEM (items->data); // take from the first selected item
-        *style_clip = take_style_from_item (item);
-    }
-
-    if (clip) {
-        // Sort items:
-        GSList *sorted_items = g_slist_copy ((GSList *) items);
-        sorted_items = g_slist_sort((GSList *) sorted_items, (GCompareFunc) sp_object_compare_position);
-
-        // Copy item reprs:
-        for (GSList *i = (GSList *) sorted_items; i != NULL; i = i->next) {
-            sp_selection_copy_one (SP_OBJECT_REPR (i->data), sp_item_i2doc_affine(SP_ITEM (i->data)), clip, xml_doc);
-        }
-
-        *clip = g_slist_reverse(*clip);
-        g_slist_free ((GSList *) sorted_items);
+    // Copy item reprs:
+    for (GSList *i = (GSList *) sorted_items; i != NULL; i = i->next) {
+        sp_selection_copy_one (SP_OBJECT_REPR (i->data), sp_item_i2doc_affine(SP_ITEM (i->data)), clip, xml_doc);
     }
-}
-
-/**
- * Add gradients/patterns/markers referenced by copied objects to defs.
- * Iterates through 'defs_clip', and for each item it adds the data
- * repr into the global defs.
- */
-void
-paste_defs (GSList **defs_clip, SPDocument *doc)
-{
-    if (!defs_clip)
-        return;
 
-    for (GSList *gl = *defs_clip; gl != NULL; gl = gl->next) {
-        SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(doc);
-        Inkscape::XML::Node *repr = (Inkscape::XML::Node *) gl->data;
-        gchar const *id = repr->attribute("id");
-        if (!id || !doc->getObjectById(id)) {
-            Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
-            Inkscape::XML::Node *copy = repr->duplicate(xml_doc);
-            SP_OBJECT_REPR(defs)->addChild(copy, NULL);
-            Inkscape::GC::release(copy);
-        }
-    }
+    *clip = g_slist_reverse(*clip);
+    g_slist_free ((GSList *) sorted_items);
 }
 
-GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **clip, GSList **defs_clip)
+GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **clip)
 {
     Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
-    paste_defs (defs_clip, doc);
 
     GSList *copied = NULL;
     // add objects to document
@@ -201,14 +168,14 @@ GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **cli
     return copied;
 }
 
-void sp_selection_delete_impl(const GSList *items)
+void sp_selection_delete_impl(GSList const *items, bool propagate = true, bool propagate_descendants = true)
 {
-    for (const GSList *i = items ; i ; i = i->next ) {
+    for (GSList const *i = items ; i ; i = i->next ) {
         sp_object_ref((SPObject *)i->data, NULL);
     }
-    for (const GSList *i = items; i != NULL; i = i->next) {
+    for (GSList const *i = items; i != NULL; i = i->next) {
         SPItem *item = (SPItem *) i->data;
-        SP_OBJECT(item)->deleteObject();
+        SP_OBJECT(item)->deleteObject(propagate, propagate_descendants);
         sp_object_unref((SPObject *)item, NULL);
     }
 }
@@ -236,7 +203,7 @@ void sp_selection_delete()
         return;
     }
 
-    const GSList *selected = g_slist_copy(const_cast<GSList *>(selection->itemList()));
+    GSList const *selected = g_slist_copy(const_cast<GSList *>(selection->itemList()));
     selection->clear();
     sp_selection_delete_impl (selected);
     g_slist_free ((GSList *) selected);
@@ -249,7 +216,7 @@ void sp_selection_delete()
      */
     tools_switch ( desktop, tools_active ( desktop ) );
 
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DELETE, 
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DELETE,
                      _("Delete"));
 }
 
@@ -289,7 +256,7 @@ void sp_selection_duplicate()
         Inkscape::GC::release(copy);
     }
 
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE, 
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE,
                      _("Duplicate"));
 
     selection->setReprList(newsel);
@@ -319,7 +286,7 @@ void sp_edit_clear_all()
 }
 
 GSList *
-get_all_items (GSList *list, SPObject *from, SPDesktop *desktop, bool onlyvisible, bool onlysensitive, const GSList *exclude)
+get_all_items (GSList *list, SPObject *from, SPDesktop *desktop, bool onlyvisible, bool onlysensitive, GSList const *exclude)
 {
     for (SPObject *child = sp_object_first_child(SP_OBJECT(from)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
         if (SP_IS_ITEM(child) &&
@@ -356,7 +323,7 @@ void sp_edit_select_all_full (bool force_all_layers, bool invert)
 
     GSList *items = NULL;
 
-    const GSList *exclude = NULL;
+    GSList const *exclude = NULL;
     if (invert) {
         exclude = selection->itemList();
     }
@@ -487,7 +454,7 @@ void sp_selection_group()
                 sp_repr_unparent(current);
 
                 // paste into topmost_parent (temporarily)
-                GSList *copied = sp_selection_paste_impl (doc, doc->getObjectByRepr(topmost_parent), &temp_clip, NULL);
+                GSList *copied = sp_selection_paste_impl (doc, doc->getObjectByRepr(topmost_parent), &temp_clip);
                 if (temp_clip) g_slist_free (temp_clip);
                 if (copied) { // if success,
                     // take pasted object (now in topmost_parent)
@@ -511,7 +478,7 @@ void sp_selection_group()
     // Move to the position of the topmost, reduced by the number of items deleted from topmost_parent
     group->setPosition(topmost + 1);
 
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_GROUP, 
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_GROUP,
                      _("Group"));
 
     selection->set(group);
@@ -573,12 +540,12 @@ void sp_selection_ungroup()
 
     g_slist_free(items);
 
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_UNGROUP, 
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_UNGROUP,
                      _("Ungroup"));
 }
 
 static SPGroup *
-sp_item_list_common_parent_group(const GSList *items)
+sp_item_list_common_parent_group(GSList const *items)
 {
     if (!items) {
         return NULL;
@@ -597,10 +564,9 @@ sp_item_list_common_parent_group(const GSList *items)
     return SP_GROUP(parent);
 }
 
-/** Finds out the minimum common bbox of the selected items
- */
+/** Finds out the minimum common bbox of the selected items. */
 static NR::Maybe<NR::Rect>
-enclose_items(const GSList *items)
+enclose_items(GSList const *items)
 {
     g_assert(items != NULL);
 
@@ -648,14 +614,14 @@ sp_selection_raise()
 
     Inkscape::XML::Node *grepr = SP_OBJECT_REPR(group);
 
-    /* construct reverse-ordered list of selected children */
+    /* Construct reverse-ordered list of selected children. */
     GSList *rev = g_slist_copy((GSList *) items);
     rev = g_slist_sort(rev, (GCompareFunc) sp_item_repr_compare_position);
 
-    // find out the common bbox of the selected items
+    // Determine the common bbox of the selected items.
     NR::Maybe<NR::Rect> selected = enclose_items(items);
 
-    // for all objects in the selection (starting from top)
+    // Iterate over all objects in the selection (starting from top).
     if (selected) {
         while (rev) {
             SPObject *child = SP_OBJECT(rev->data);
@@ -681,7 +647,8 @@ sp_selection_raise()
     }
 
     sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_RAISE,
-                     _("Raise"));
+		     //TRANSLATORS: Only put the word "Raise" in the translation. Means "to raise an object" in the undo history
+                     Q_("undo_action|Raise"));
 }
 
 void sp_selection_raise_to_top()
@@ -716,7 +683,7 @@ void sp_selection_raise_to_top()
 
     g_slist_free(rl);
 
-    sp_document_done(document, SP_VERB_SELECTION_TO_FRONT, 
+    sp_document_done(document, SP_VERB_SELECTION_TO_FRONT,
                      _("Raise to top"));
 }
 
@@ -743,15 +710,15 @@ sp_selection_lower()
 
     Inkscape::XML::Node *grepr = SP_OBJECT_REPR(group);
 
-    // find out the common bbox of the selected items
+    // Determine the common bbox of the selected items.
     NR::Maybe<NR::Rect> selected = enclose_items(items);
 
-    /* construct direct-ordered list of selected children */
+    /* Construct direct-ordered list of selected children. */
     GSList *rev = g_slist_copy((GSList *) items);
     rev = g_slist_sort(rev, (GCompareFunc) sp_item_repr_compare_position);
     rev = g_slist_reverse(rev);
 
-    // for all objects in the selection (starting from top)
+    // Iterate over all objects in the selection (starting from top).
     if (selected) {
         while (rev) {
             SPObject *child = SP_OBJECT(rev->data);
@@ -780,7 +747,7 @@ sp_selection_lower()
         g_slist_free(rev);
     }
 
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_LOWER, 
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_LOWER,
                      _("Lower"));
 }
 
@@ -828,7 +795,7 @@ void sp_selection_lower_to_bottom()
 
     g_slist_free(rl);
 
-    sp_document_done(document, SP_VERB_SELECTION_TO_BACK, 
+    sp_document_done(document, SP_VERB_SELECTION_TO_BACK,
                      _("Lower to bottom"));
 }
 
@@ -852,122 +819,6 @@ void sp_selection_cut()
     sp_selection_delete();
 }
 
-void sp_copy_gradient (GSList **defs_clip, SPGradient *gradient, Inkscape::XML::Document* xml_doc)
-{
-    SPGradient *ref = gradient;
-
-    while (ref) {
-        // climb up the refs, copying each one in the chain
-        Inkscape::XML::Node *grad_repr = SP_OBJECT_REPR(ref)->duplicate(xml_doc);
-        *defs_clip = g_slist_prepend (*defs_clip, grad_repr);
-
-        ref = ref->ref->getObject();
-    }
-}
-
-void sp_copy_pattern (GSList **defs_clip, SPPattern *pattern, Inkscape::XML::Document* xml_doc)
-{
-    SPPattern *ref = pattern;
-
-    while (ref) {
-        // climb up the refs, copying each one in the chain
-        Inkscape::XML::Node *pattern_repr = SP_OBJECT_REPR(ref)->duplicate(xml_doc);
-        *defs_clip = g_slist_prepend (*defs_clip, pattern_repr);
-
-        // items in the pattern may also use gradients and other patterns, so we need to recurse here as well
-        for (SPObject *child = sp_object_first_child(SP_OBJECT(ref)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
-            if (!SP_IS_ITEM (child))
-                continue;
-            sp_copy_stuff_used_by_item (defs_clip, (SPItem *) child, NULL, xml_doc);
-        }
-
-        ref = ref->ref->getObject();
-    }
-}
-
-void sp_copy_single (GSList **defs_clip, SPObject *thing, Inkscape::XML::Document* xml_doc)
-{
-    Inkscape::XML::Node *duplicate_repr = SP_OBJECT_REPR(thing)->duplicate(xml_doc);
-    *defs_clip = g_slist_prepend (*defs_clip, duplicate_repr);
-}
-
-
-void sp_copy_textpath_path (GSList **defs_clip, SPTextPath *tp, const GSList *items, Inkscape::XML::Document* xml_doc)
-{
-    SPItem *path = sp_textpath_get_path_item (tp);
-    if (!path)
-        return;
-    if (items && g_slist_find ((GSList *) items, path)) // do not copy it to defs if it is already in the list of items copied
-        return;
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(path)->duplicate(xml_doc);
-    *defs_clip = g_slist_prepend (*defs_clip, repr);
-}
-
-/**
- * Copies things like patterns, markers, gradients, etc.
- */
-void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, const GSList *items, Inkscape::XML::Document* xml_doc)
-{
-    SPStyle *style = SP_OBJECT_STYLE (item);
-
-    if (style && (style->fill.isPaintserver())) {
-        SPObject *server = SP_OBJECT_STYLE_FILL_SERVER(item);
-        if (SP_IS_LINEARGRADIENT (server) || SP_IS_RADIALGRADIENT (server))
-            sp_copy_gradient (defs_clip, SP_GRADIENT(server), xml_doc);
-        if (SP_IS_PATTERN (server))
-            sp_copy_pattern (defs_clip, SP_PATTERN(server), xml_doc);
-    }
-
-    if (style && (style->stroke.isPaintserver())) {
-        SPObject *server = SP_OBJECT_STYLE_STROKE_SERVER(item);
-        if (SP_IS_LINEARGRADIENT (server) || SP_IS_RADIALGRADIENT (server))
-            sp_copy_gradient (defs_clip, SP_GRADIENT(server), xml_doc);
-        if (SP_IS_PATTERN (server))
-            sp_copy_pattern (defs_clip, SP_PATTERN(server), xml_doc);
-    }
-
-    // For shapes, copy all of the shape's markers into defs_clip
-    if (SP_IS_SHAPE (item)) {
-        SPShape *shape = SP_SHAPE (item);
-        for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) {
-            if (shape->marker[i]) {
-                sp_copy_single (defs_clip, SP_OBJECT (shape->marker[i]), xml_doc);
-            }
-        }
-    }
-
-    if (SP_IS_TEXT_TEXTPATH (item)) {
-        sp_copy_textpath_path (defs_clip, SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item))), items, xml_doc);
-    }
-
-    if (item->clip_ref->getObject()) {
-        sp_copy_single (defs_clip, item->clip_ref->getObject(), xml_doc);
-    }
-
-    if (item->mask_ref->getObject()) {
-        SPObject *mask = item->mask_ref->getObject();
-        sp_copy_single (defs_clip, mask, xml_doc);
-        // recurse into the mask for its gradients etc.
-        for (SPObject *o = SP_OBJECT(mask)->children; o != NULL; o = o->next) {
-            if (SP_IS_ITEM(o))
-                sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (o), items, xml_doc);
-        }
-    }
-
-    if (style->getFilter()) {
-        SPObject *filter = style->getFilter();
-        if (SP_IS_FILTER(filter)) {
-            sp_copy_single (defs_clip, filter, xml_doc);
-        }
-    }
-
-    // recurse
-    for (SPObject *o = SP_OBJECT(item)->children; o != NULL; o = o->next) {
-        if (SP_IS_ITEM(o))
-            sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (o), items, xml_doc);
-    }
-}
-
 /**
  * \pre item != NULL
  */
@@ -1011,301 +862,78 @@ take_style_from_item (SPItem *item)
 
 void sp_selection_copy()
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop == NULL)
-        return;
-
-    if (!clipboard_document) {
-        clipboard_document = new Inkscape::XML::SimpleDocument();
-    }
-
-    Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
-    if (tools_isactive (desktop, TOOLS_DROPPER)) {
-        sp_dropper_context_copy(desktop->event_context);
-        return; // copied color under cursor, nothing else to do
-    }
-
-    // check if something is selected
-    if (selection->isEmpty()) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing was copied."));
-        return;
-    }
-
-    const GSList *items = g_slist_copy ((GSList *) selection->itemList());
-
-    // 0. Copy text to system clipboard
-    // FIXME: for non-texts, put serialized Inkscape::XML as text to the clipboard;
-    //for this sp_repr_write_stream needs to be rewritten with iostream instead of FILE
-    Glib::ustring text;
-    if (tools_isactive (desktop, TOOLS_TEXT)) {
-        text = sp_text_get_selected_text(desktop->event_context);
-    }
-
-    if (text.empty()) {
-        guint texts = 0;
-        for (GSList *i = (GSList *) items; i; i = i->next) {
-            SPItem *item = SP_ITEM (i->data);
-            if (SP_IS_TEXT (item) || SP_IS_FLOWTEXT(item)) {
-                if (texts > 0) // if more than one text object is copied, separate them by spaces
-                    text += " ";
-                gchar *this_text = sp_te_get_string_multiline (item);
-                if (this_text) {
-                    text += this_text;
-                    g_free(this_text);
-                }
-                texts++;
-            }
-        }
-    }
-    if (!text.empty()) {
-        Glib::RefPtr<Gtk::Clipboard> refClipboard = Gtk::Clipboard::get();
-        refClipboard->set_text(text);
-    }
-
-    // clear old defs clipboard
-    while (defs_clipboard) {
-        Inkscape::GC::release((Inkscape::XML::Node *) defs_clipboard->data);
-        defs_clipboard = g_slist_remove (defs_clipboard, defs_clipboard->data);
-    }
-
-    // clear style clipboard
-    if (style_clipboard) {
-        sp_repr_css_attr_unref (style_clipboard);
-        style_clipboard = NULL;
-    }
-
-    //clear main clipboard
-    while (clipboard) {
-        Inkscape::GC::release((Inkscape::XML::Node *) clipboard->data);
-        clipboard = g_slist_remove(clipboard, clipboard->data);
-    }
-
-    sp_selection_copy_impl (items, &clipboard, &defs_clipboard, &style_clipboard, clipboard_document);
-
-    if (tools_isactive (desktop, TOOLS_TEXT)) { // take style from cursor/text selection, overwriting the style just set by copy_impl
-        SPStyle *const query = sp_style_new(SP_ACTIVE_DOCUMENT);
-        if (sp_desktop_query_style_all (desktop, query)) {
-            SPCSSAttr *css = sp_css_attr_from_style (query, SP_STYLE_FLAG_ALWAYS);
-            if (css != NULL) {
-                // clear style clipboard
-                if (style_clipboard) {
-                    sp_repr_css_attr_unref (style_clipboard);
-                    style_clipboard = NULL;
-                }
-                //sp_repr_css_print (css);
-                style_clipboard = css;
-            }
-        }
-        sp_style_unref(query);
-    }
-
-    size_clipboard = selection->bounds();
-
-    g_slist_free ((GSList *) items);
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    cm->copy();
 }
 
 void sp_selection_paste(bool in_place)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
-    if (desktop == NULL) {
-        return;
-    }
-
-    SPDocument *document = sp_desktop_document(desktop);
-
-    if (Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false) {
-        return;
-    }
-
-    Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
-    if (tools_isactive (desktop, TOOLS_TEXT)) {
-        if (sp_text_paste_inline(desktop->event_context))
-            return; // pasted from system clipboard into text, nothing else to do
-    }
-
-    // check if something is in the clipboard
-    if (clipboard == NULL) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
-        return;
-    }
-
-    GSList *copied = sp_selection_paste_impl(document, desktop->currentLayer(), &clipboard, &defs_clipboard);
-    // add pasted objects to selection
-    selection->setReprList((GSList const *) copied);
-    g_slist_free (copied);
-
-    if (!in_place) {
-        sp_document_ensure_up_to_date(document);
-
-        NR::Maybe<NR::Rect> sel_bbox = selection->bounds();
-        NR::Point m( desktop->point() );
-        if (sel_bbox) {
-            m -= sel_bbox->midpoint();
-        }
-
-        /* Snap the offset of the new item(s) to the grid */
-        SnapManager &sm = desktop->namedview->snap_manager;
-        SnapManager::SnapperList gs = sm.getGridSnappers();
-        m = sm.freeSnapAlways(Inkscape::Snapper::SNAPPOINT_NODE, m, NULL, gs).getPoint();
-        sp_selection_move_relative(selection, m);
-    }
-
-    sp_document_done(document, SP_VERB_EDIT_PASTE, 
-                     _("Paste"));
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    if(cm->paste(in_place))
+        sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_PASTE, _("Paste"));
 }
 
 void sp_selection_paste_style()
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop == NULL) return;
-
-    Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
-    // check if something is in the clipboard
-    if (clipboard == NULL) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
-        return;
-    }
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    if(cm->pasteStyle())
+        sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_PASTE_STYLE, _("Paste style"));
+}
 
-    // check if something is selected
-    if (selection->isEmpty()) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to paste style to."));
-        return;
-    }
 
-    paste_defs (&defs_clipboard, sp_desktop_document(desktop));
+void sp_selection_paste_livepatheffect()
+{
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    if(cm->pastePathEffect())
+        sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_PASTE_LIVEPATHEFFECT,
+                     _("Paste live path effect"));
+}
 
-    sp_desktop_set_style (desktop, style_clipboard);
 
-    sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_STYLE,
-                     _("Paste style"));
+void sp_selection_remove_livepatheffect_impl(SPItem *item)
+{
+    if ( item && SP_IS_LPE_ITEM(item) ) {
+        sp_lpe_item_remove_path_effect(SP_LPE_ITEM(item), false);
+    }
 }
 
-void sp_selection_paste_livepatheffect()
+void sp_selection_remove_livepatheffect()
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL) return;
 
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
-    // check if something is in the clipboard
-    if (clipboard == NULL) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
-        return;
-    }
-
     // check if something is selected
     if (selection->isEmpty()) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to paste live path effect to."));
-        return;
-    }
-
-    paste_defs (&defs_clipboard, sp_desktop_document(desktop));
-
-    Inkscape::XML::Node *repr = (Inkscape::XML::Node *) clipboard->data;
-    const char * effectstr = repr->attribute("inkscape:path-effect");
-    if (!effectstr) {
-        SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Clipboard does not contain a live path effect."));
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to remove live path effects from."));
         return;
     }
 
     for ( GSList const *itemlist = selection->itemList(); itemlist != NULL; itemlist = g_slist_next(itemlist) ) {
         SPItem *item = reinterpret_cast<SPItem*>(itemlist->data);
-        if ( item && SP_IS_SHAPE(item) ) {
-            Inkscape::XML::Node *selrepr = (Inkscape::XML::Node *) SP_OBJECT_REPR(item);
-            selrepr->setAttribute("inkscape:path-effect", effectstr);
-
-            // set inkscape:original-d for paths. the other shapes don't need this.
-            if ( SP_IS_PATH(item) ) {
-                Inkscape::XML::Node *pathrepr = SP_OBJECT_REPR(item);
-                if ( ! pathrepr->attribute("inkscape:original-d") ) {
-                    pathrepr->setAttribute("inkscape:original-d", pathrepr->attribute("d"));
-                }
-            }
-        }
+
+        sp_selection_remove_livepatheffect_impl(item);
+
     }
 
     sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_LIVEPATHEFFECT,
-                     _("Paste live path effect"));
+                     _("Remove live path effect"));
 }
 
 void sp_selection_paste_size (bool apply_x, bool apply_y)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop == NULL) return;
-
-    Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
-    // check if something is in the clipboard
-    if (!size_clipboard) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
-        return;
-    }
-
-    // check if something is selected
-    if (selection->isEmpty()) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to paste size to."));
-        return;
-    }
-
-    NR::Maybe<NR::Rect> current = selection->bounds();
-    if ( !current || current->isEmpty() ) {
-        return;
-    }
-
-    double scale_x = size_clipboard->extent(NR::X) / current->extent(NR::X);
-    double scale_y = size_clipboard->extent(NR::Y) / current->extent(NR::Y);
-
-    sp_selection_scale_relative (selection, current->midpoint(),
-                                 NR::scale(
-                                     apply_x? scale_x : (desktop->isToolboxButtonActive ("lock")? scale_y : 1.0),
-                                     apply_y? scale_y : (desktop->isToolboxButtonActive ("lock")? scale_x : 1.0)));
-
-    sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_SIZE,
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    if(cm->pasteSize(false, apply_x, apply_y))
+        sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_EDIT_PASTE_SIZE,
                      _("Paste size"));
 }
 
 void sp_selection_paste_size_separately (bool apply_x, bool apply_y)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop == NULL) return;
-
-    Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
-    // check if something is in the clipboard
-    if ( !size_clipboard ) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
-        return;
-    }
-
-    // check if something is selected
-    if (selection->isEmpty()) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to paste size to."));
-        return;
-    }
-
-    for (GSList const *l = selection->itemList(); l != NULL; l = l->next) {
-        SPItem *item = SP_ITEM(l->data);
-
-        NR::Maybe<NR::Rect> current = sp_item_bbox_desktop(item);
-        if ( !current || current->isEmpty() ) {
-            continue;
-        }
-
-        double scale_x = size_clipboard->extent(NR::X) / current->extent(NR::X);
-        double scale_y = size_clipboard->extent(NR::Y) / current->extent(NR::Y);
-
-        sp_item_scale_rel (item,
-                                 NR::scale(
-                                     apply_x? scale_x : (desktop->isToolboxButtonActive ("lock")? scale_y : 1.0),
-                                     apply_y? scale_y : (desktop->isToolboxButtonActive ("lock")? scale_x : 1.0)));
-
-    }
-
-    sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_SIZE_SEPARATELY,
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    if(cm->pasteSize(true, apply_x, apply_y))
+        sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_EDIT_PASTE_SIZE_SEPARATELY,
                      _("Paste size separately"));
 }
 
@@ -1321,27 +949,27 @@ void sp_selection_to_next_layer ()
         return;
     }
 
-    const GSList *items = g_slist_copy ((GSList *) selection->itemList());
+    GSList const *items = g_slist_copy ((GSList *) selection->itemList());
 
     bool no_more = false; // Set to true, if no more layers above
     SPObject *next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer());
     if (next) {
         GSList *temp_clip = NULL;
-        sp_selection_copy_impl (items, &temp_clip, NULL, NULL, sp_document_repr_doc(dt->doc())); // we're in the same doc, so no need to copy defs
-        sp_selection_delete_impl (items);
+        sp_selection_copy_impl (items, &temp_clip, sp_document_repr_doc(dt->doc()));
+        sp_selection_delete_impl (items, false, false);
         next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer()); // Fixes bug 1482973: crash while moving layers
         GSList *copied;
         if(next) {
-            copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL);
+            copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip);
         } else {
-            copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip, NULL);
+            copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip);
             no_more = true;
         }
         selection->setReprList((GSList const *) copied);
         g_slist_free (copied);
         if (temp_clip) g_slist_free (temp_clip);
         if (next) dt->setCurrentLayer(next);
-        sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_NEXT, 
+        sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_NEXT,
                          _("Raise to next layer"));
     } else {
         no_more = true;
@@ -1366,20 +994,20 @@ void sp_selection_to_prev_layer ()
         return;
     }
 
-    const GSList *items = g_slist_copy ((GSList *) selection->itemList());
+    GSList const *items = g_slist_copy ((GSList *) selection->itemList());
 
     bool no_more = false; // Set to true, if no more layers below
     SPObject *next=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer());
     if (next) {
         GSList *temp_clip = NULL;
-        sp_selection_copy_impl (items, &temp_clip, NULL, NULL, sp_document_repr_doc(dt->doc())); // we're in the same doc, so no need to copy defs
-        sp_selection_delete_impl (items);
+        sp_selection_copy_impl (items, &temp_clip, sp_document_repr_doc(dt->doc())); // we're in the same doc, so no need to copy defs
+        sp_selection_delete_impl (items, false, false);
         next=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer()); // Fixes bug 1482973: crash while moving layers
         GSList *copied;
         if(next) {
-            copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL);
+            copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip);
         } else {
-            copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip, NULL);
+            copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip);
             no_more = true;
         }
         selection->setReprList((GSList const *) copied);
@@ -1403,7 +1031,7 @@ bool
 selection_contains_original (SPItem *item, Inkscape::Selection *selection)
 {
     bool contains_original = false;
-    
+
     bool is_use = SP_IS_USE(item);
     SPItem *item_use = item;
     SPItem *item_use_first = item;
@@ -1415,13 +1043,13 @@ selection_contains_original (SPItem *item, Inkscape::Selection *selection)
             break;
         is_use = SP_IS_USE(item_use);
     }
-    
+
     // If it's a tref, check whether the object containing the character
     // data is part of the selection
     if (!contains_original && SP_IS_TREF(item)) {
         contains_original = selection->includes(SP_TREF(item)->getObjectReferredTo());
     }
-       
+
     return contains_original;
 }
 
@@ -1433,7 +1061,7 @@ selection_contains_both_clone_and_original (Inkscape::Selection *selection)
     for (GSList const *l = selection->itemList(); l != NULL; l = l->next) {
         SPItem *item = SP_ITEM(l->data);
         clone_with_original |= selection_contains_original(item, selection);
-        if (clone_with_original) 
+        if (clone_with_original)
             break;
     }
     return clone_with_original;
@@ -1471,21 +1099,21 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const
         bool transform_flowtext_with_frame = (SP_IS_FLOWTEXT(item) && selection->includes( SP_FLOWTEXT(item)->get_frame (NULL))); // (only the first frame is checked so far)
         // ...both an offset and its source?
         bool transform_offset_with_source = (SP_IS_OFFSET(item) && SP_OFFSET (item)->sourceHref) && selection->includes( sp_offset_get_source (SP_OFFSET(item)) );
-       
+
         // If we're moving a connector, we want to detach it
         // from shapes that aren't part of the selection, but
         // leave it attached if they are
         if (cc_item_is_connector(item)) {
             SPItem *attItem[2];
             SP_PATH(item)->connEndPair.getAttachedItems(attItem);
-            
+
             for (int n = 0; n < 2; ++n) {
                 if (!selection->includes(attItem[n])) {
                     sp_conn_end_detach(item, n);
                 }
             }
         }
-        
+
         // "clones are unmoved when original is moved" preference
         int compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
         bool prefs_unmoved = (compensation == SP_CLONE_COMPENSATION_UNMOVED);
@@ -1575,11 +1203,11 @@ void sp_selection_remove_transform()
 
     GSList const *l = (GSList *) selection->reprList();
     while (l != NULL) {
-        sp_repr_set_attr((Inkscape::XML::Node*)l->data, "transform", NULL);
+        ((Inkscape::XML::Node*)l->data)->setAttribute("transform", NULL, false);
         l = l->next;
     }
 
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_FLATTEN, 
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_FLATTEN,
                      _("Remove transform"));
 }
 
@@ -1688,18 +1316,14 @@ void sp_selection_rotate_90_cw()
         sp_item_rotate_rel(item, rot_neg_90);
     }
 
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_ROTATE_90_CCW, 
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_ROTATE_90_CCW,
                      _("Rotate 90&#176; CW"));
 }
 
 
 /**
- * \brief sp_selection_rotate_90_ccw
- *
- * This function rotates selected objects 90 degrees counter-clockwise.
- *
+ * @brief Rotates selected objects 90 degrees counter-clockwise.
  */
-
 void sp_selection_rotate_90_ccw()
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -1736,8 +1360,8 @@ sp_selection_rotate(Inkscape::Selection *selection, gdouble const angle_degrees)
     sp_document_maybe_done(sp_desktop_document(selection->desktop()),
                            ( ( angle_degrees > 0 )
                              ? "selector:rotate:ccw"
-                             : "selector:rotate:cw" ), 
-                           SP_VERB_CONTEXT_SELECT, 
+                             : "selector:rotate:cw" ),
+                           SP_VERB_CONTEXT_SELECT,
                            _("Rotate"));
 }
 
@@ -1759,7 +1383,7 @@ sp_selection_rotate_screen(Inkscape::Selection *selection, gdouble angle)
 
     gdouble const zoom = selection->desktop()->current_zoom();
     gdouble const zmove = angle / zoom;
-    gdouble const r = NR::L2(bbox->max() - *center);
+    gdouble const r = NR::L2(bbox->cornerFarthestFrom(*center) - *center);
 
     gdouble const zangle = 180 * atan2(zmove, r) / M_PI;
 
@@ -1769,7 +1393,7 @@ sp_selection_rotate_screen(Inkscape::Selection *selection, gdouble angle)
                            ( (angle > 0)
                              ? "selector:rotate:ccw"
                              : "selector:rotate:cw" ),
-                           SP_VERB_CONTEXT_SELECT, 
+                           SP_VERB_CONTEXT_SELECT,
                            _("Rotate by pixels"));
 }
 
@@ -1824,7 +1448,7 @@ sp_selection_scale_times(Inkscape::Selection *selection, gdouble times)
 
     NR::Point const center(sel_bbox->midpoint());
     sp_selection_scale_relative(selection, center, NR::scale(times, times));
-    sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_CONTEXT_SELECT, 
+    sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_CONTEXT_SELECT,
                      _("Scale by whole factor"));
 }
 
@@ -1840,13 +1464,13 @@ sp_selection_move(gdouble dx, gdouble dy)
     sp_selection_move_relative(selection, dx, dy);
 
     if (dx == 0) {
-        sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT, 
+        sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT,
                                _("Move vertically"));
     } else if (dy == 0) {
-        sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT, 
+        sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT,
                                _("Move horizontally"));
     } else {
-        sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT, 
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT,
                          _("Move"));
     }
 }
@@ -1868,13 +1492,13 @@ sp_selection_move_screen(gdouble dx, gdouble dy)
     sp_selection_move_relative(selection, zdx, zdy);
 
     if (dx == 0) {
-        sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT, 
+        sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT,
                                _("Move vertically by pixels"));
     } else if (dy == 0) {
-        sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT, 
+        sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT,
                                _("Move horizontally by pixels"));
     } else {
-        sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT, 
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT,
                          _("Move"));
     }
 }
@@ -1894,7 +1518,7 @@ struct Forward {
 
     static Iterator children(SPObject *o) { return sp_object_first_child(o); }
     static Iterator siblings_after(SPObject *o) { return SP_OBJECT_NEXT(o); }
-    static void dispose(Iterator i) {}
+    static void dispose(Iterator /*i*/) {}
 
     static SPObject *object(Iterator i) { return i; }
     static Iterator next(Iterator i) { return SP_OBJECT_NEXT(i); }
@@ -1989,6 +1613,70 @@ sp_selection_item_prev(void)
     }
 }
 
+void sp_selection_next_patheffect_param(SPDesktop * dt)
+{
+    if (!dt) return;
+
+    Inkscape::Selection *selection = sp_desktop_selection(dt);
+    if ( selection && !selection->isEmpty() ) {
+        SPItem *item = selection->singleItem();
+        if ( item && SP_IS_SHAPE(item)) {
+            if (sp_lpe_item_has_path_effect(SP_LPE_ITEM(item))) {
+                sp_lpe_item_edit_next_param_oncanvas(SP_LPE_ITEM(item), dt);
+            } else {
+                dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied path effect."));
+            }
+        }
+    }
+}
+
+void sp_selection_edit_clip_or_mask(SPDesktop * dt, bool clip)
+{
+    if (!dt) return;
+
+    Inkscape::Selection *selection = sp_desktop_selection(dt);
+    if ( selection && !selection->isEmpty() ) {
+        SPItem *item = selection->singleItem();
+        if ( item ) {
+            SPObject *obj = NULL;
+            if (clip)
+                obj = item->clip_ref ? SP_OBJECT(item->clip_ref->getObject()) : NULL;
+            else
+                obj = item->mask_ref ? SP_OBJECT(item->mask_ref->getObject()) : NULL;
+
+            if (obj) {
+                // obj is a group object, the children are the actual clippers
+                for ( SPObject *child = obj->children ; child ; child = child->next ) {
+                    if ( SP_IS_ITEM(child) ) {
+                        // If not already in nodecontext, goto it!
+                        if (!tools_isactive(dt, TOOLS_NODES)) {
+                            tools_switch_current(TOOLS_NODES);
+                        }
+
+                        ShapeEditor * shape_editor = SP_NODE_CONTEXT( dt->event_context )->shape_editor;
+                        shape_editor->set_item(SP_ITEM(child));
+                        Inkscape::NodePath::Path *np = shape_editor->get_nodepath();
+                        if (np) {
+                            // take colors from prefs (same as used in outline mode)
+                            np->helperpath_rgba = clip ? 
+                                prefs_get_int_attribute("options.wireframecolors", "clips", 0x00ff00ff) : 
+                                prefs_get_int_attribute("options.wireframecolors", "masks", 0x0000ffff);
+                            np->helperpath_width = 1.0;
+                            sp_nodepath_show_helperpath(np, true);
+                        }
+                        break; // break out of for loop after 1st encountered item
+                    }
+                }
+            } else if (clip) {
+                dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied clip path."));
+            } else {
+                dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied mask."));
+            }
+        }
+    }
+}
+
+
 namespace {
 
 template <typename D>
@@ -2109,26 +1797,26 @@ sp_selection_clone()
     }
 
     GSList *reprs = g_slist_copy((GSList *) selection->reprList());
-  
+
     selection->clear();
-  
+
     // sorting items from different parents sorts each parent's subset without possibly mixing them, just what we need
     reprs = g_slist_sort(reprs, (GCompareFunc) sp_repr_compare_position);
 
     GSList *newsel = NULL;
- 
+
     while (reprs) {
         Inkscape::XML::Node *sel_repr = (Inkscape::XML::Node *) reprs->data;
         Inkscape::XML::Node *parent = sp_repr_parent(sel_repr);
 
         Inkscape::XML::Node *clone = xml_doc->createElement("svg:use");
-        sp_repr_set_attr(clone, "x", "0");
-        sp_repr_set_attr(clone, "y", "0");
-        sp_repr_set_attr(clone, "xlink:href", g_strdup_printf("#%s", sel_repr->attribute("id")));
-
-        sp_repr_set_attr(clone, "inkscape:transform-center-x", sel_repr->attribute("inkscape:transform-center-x"));
-        sp_repr_set_attr(clone, "inkscape:transform-center-y", sel_repr->attribute("inkscape:transform-center-y"));
+        clone->setAttribute("x", "0", false);
+        clone->setAttribute("y", "0", false);
+        clone->setAttribute("xlink:href", g_strdup_printf("#%s", sel_repr->attribute("id")), false);
         
+        clone->setAttribute("inkscape:transform-center-x", sel_repr->attribute("inkscape:transform-center-x"), false);
+        clone->setAttribute("inkscape:transform-center-y", sel_repr->attribute("inkscape:transform-center-y"), false);
+
         // add the new clone to the top of the original's parent
         parent->appendChild(clone);
 
@@ -2136,14 +1824,14 @@ sp_selection_clone()
         reprs = g_slist_remove(reprs, sel_repr);
         Inkscape::GC::release(clone);
     }
-    
+
     // TRANSLATORS: only translate "string" in "context|string".
     // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_CLONE, 
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_CLONE,
                      Q_("action|Clone"));
 
     selection->setReprList(newsel);
- 
+
     g_slist_free(newsel);
 }
 
@@ -2172,11 +1860,11 @@ sp_selection_unlink()
 
         if (SP_IS_TEXT(item)) {
             SPObject *tspan = sp_tref_convert_to_tspan(SP_OBJECT(item));
-            
-            if (tspan) {            
+
+            if (tspan) {
                 SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             }
-            
+
             // Set unlink to true, and fall into the next if which
             // will include this text item in the new selection
             unlinked = true;
@@ -2189,12 +1877,12 @@ sp_selection_unlink()
         }
 
         SPItem *unlink;
-        if (SP_IS_USE(item)) { 
+        if (SP_IS_USE(item)) {
             unlink = sp_use_unlink(SP_USE(item));
         } else /*if (SP_IS_TREF(use))*/ {
             unlink = SP_ITEM(sp_tref_convert_to_tspan(SP_OBJECT(item)));
         }
-        
+
         unlinked = true;
         // Add ungrouped items to the new selection.
         new_select = g_slist_prepend(new_select, unlink);
@@ -2224,7 +1912,7 @@ sp_select_clone_original()
 
     SPItem *item = selection->singleItem();
 
-    const gchar *error = _("Select a <b>clone</b> to go to its original. Select a <b>linked offset</b> to go to its source. Select a <b>text on path</b> to go to the path. Select a <b>flowed text</b> to go to its frame.");
+    gchar const *error = _("Select a <b>clone</b> to go to its original. Select a <b>linked offset</b> to go to its source. Select a <b>text on path</b> to go to the path. Select a <b>flowed text</b> to go to its frame.");
 
     // Check if other than two objects are selected
     if (g_slist_length((GSList *) selection->itemList()) != 1 || !item) {
@@ -2267,6 +1955,129 @@ sp_select_clone_original()
     }
 }
 
+
+void sp_selection_to_marker(bool apply)
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if (desktop == NULL)
+        return;
+
+    SPDocument *doc = sp_desktop_document(desktop);
+    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
+
+    Inkscape::Selection *selection = sp_desktop_selection(desktop);
+
+    // check if something is selected
+    if (selection->isEmpty()) {
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to convert to marker."));
+        return;
+    }
+
+    sp_document_ensure_up_to_date(doc);
+    NR::Maybe<NR::Rect> r = selection->bounds();
+    NR::Maybe<NR::Point> c = selection->center();
+    if ( !r || !c || r->isEmpty() ) {
+        return;
+    }
+
+    // calculate the transform to be applied to objects to move them to 0,0
+    NR::Point move_p = NR::Point(0, sp_document_height(doc)) - *c;
+    move_p[NR::Y] = -move_p[NR::Y];
+    NR::Matrix move = NR::Matrix (NR::translate (move_p));
+
+    GSList *items = g_slist_copy((GSList *) selection->itemList());
+
+    items = g_slist_sort (items, (GCompareFunc) sp_object_compare_position);
+
+    // bottommost object, after sorting
+    SPObject *parent = SP_OBJECT_PARENT (items->data);
+
+    NR::Matrix parent_transform = sp_item_i2root_affine(SP_ITEM(parent));
+
+    // remember the position of the first item
+    gint pos = SP_OBJECT_REPR (items->data)->position();
+    (void)pos; // TODO check why this was remembered
+
+    // create a list of duplicates
+    GSList *repr_copies = NULL;
+    for (GSList *i = items; i != NULL; i = i->next) {
+        Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
+        repr_copies = g_slist_prepend (repr_copies, dup);
+    }
+
+    NR::Rect bounds(desktop->dt2doc(r->min()), desktop->dt2doc(r->max()));
+
+    if (apply) {
+        // delete objects so that their clones don't get alerted; this object will be restored shortly
+        for (GSList *i = items; i != NULL; i = i->next) {
+            SPObject *item = SP_OBJECT (i->data);
+            item->deleteObject (false);
+        }
+    }
+
+    // Hack: Temporarily set clone compensation to unmoved, so that we can move clone-originals
+    // without disturbing clones.
+    // See ActorAlign::on_button_click() in src/ui/dialog/align-and-distribute.cpp
+    int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
+    prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
+
+    gchar const *mark_id = generate_marker(repr_copies, bounds, doc,
+                                           ( NR::Matrix(NR::translate(desktop->dt2doc(NR::Point(r->min()[NR::X],
+                                                                                                r->max()[NR::Y]))))
+                                             * parent_transform.inverse() ),
+                                           parent_transform * move);
+    (void)mark_id;
+
+    // restore compensation setting
+    prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
+
+
+    g_slist_free (items);
+
+    sp_document_done (doc, SP_VERB_EDIT_SELECTION_2_MARKER,
+                      _("Objects to marker"));
+}
+
+static void sp_selection_to_guides_recursive(SPItem *item, bool deleteitem, bool wholegroups) {
+    if (SP_IS_GROUP(item) && !SP_IS_BOX3D(item) && !wholegroups) {
+        for (GSList *i = sp_item_group_item_list (SP_GROUP(item)); i != NULL; i = i->next) {
+            sp_selection_to_guides_recursive(SP_ITEM(i->data), deleteitem, wholegroups);
+        }
+    } else {
+        sp_item_convert_item_to_guides(item);
+
+        if (deleteitem) {
+            SP_OBJECT(item)->deleteObject(true);
+        }
+    }
+}
+
+void sp_selection_to_guides()
+{
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if (desktop == NULL)
+        return;
+
+    SPDocument *doc = sp_desktop_document(desktop);
+    Inkscape::Selection *selection = sp_desktop_selection(desktop);
+    // we need to copy the list because it gets reset when objects are deleted
+    GSList *items = g_slist_copy((GSList *) selection->itemList());
+
+    if (!items) {
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to convert to guides."));
+        return;
+    }
+ 
+    bool deleteitem = (prefs_get_int_attribute("tools", "cvg_keep_objects", 0) == 0);
+    bool wholegroups = (prefs_get_int_attribute("tools", "cvg_convert_whole_groups", 0) != 0);
+
+    for (GSList const *i = items; i != NULL; i = i->next) {
+        sp_selection_to_guides_recursive(SP_ITEM(i->data), deleteitem, wholegroups);
+    }
+
+    sp_document_done (doc, SP_VERB_EDIT_SELECTION_2_GUIDES, _("Objects to guides"));
+}
+
 void
 sp_selection_tile(bool apply)
 {
@@ -2314,6 +2125,8 @@ sp_selection_tile(bool apply)
         Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
         repr_copies = g_slist_prepend (repr_copies, dup);
     }
+    // restore the z-order after prepends
+    repr_copies = g_slist_reverse (repr_copies);
 
     NR::Rect bounds(desktop->dt2doc(r->min()), desktop->dt2doc(r->max()));
 
@@ -2331,8 +2144,11 @@ sp_selection_tile(bool apply)
     int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
     prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
 
-    const gchar *pat_id = pattern_tile (repr_copies, bounds, doc,
-                                        NR::Matrix(NR::translate(desktop->dt2doc(NR::Point(r->min()[NR::X], r->max()[NR::Y])))) * parent_transform.inverse(), parent_transform * move);
+    gchar const *pat_id = pattern_tile(repr_copies, bounds, doc,
+                                       ( NR::Matrix(NR::translate(desktop->dt2doc(NR::Point(r->min()[NR::X],
+                                                                                            r->max()[NR::Y]))))
+                                         * parent_transform.inverse() ),
+                                       parent_transform * move);
 
     // restore compensation setting
     prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
@@ -2362,7 +2178,7 @@ sp_selection_tile(bool apply)
 
     g_slist_free (items);
 
-    sp_document_done (doc, SP_VERB_EDIT_TILE, 
+    sp_document_done (doc, SP_VERB_EDIT_TILE,
                       _("Objects to pattern"));
 }
 
@@ -2435,20 +2251,20 @@ sp_selection_untile()
     if (!did) {
         desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No pattern fills</b> in the selection."));
     } else {
-        sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNTILE, 
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNTILE,
                          _("Pattern to objects"));
         selection->setList(new_select);
     }
 }
 
 void
-sp_selection_get_export_hints (Inkscape::Selection *selection, const char **filename, float *xdpi, float *ydpi) 
+sp_selection_get_export_hints (Inkscape::Selection *selection, char const **filename, float *xdpi, float *ydpi)
 {
     if (selection->isEmpty()) {
         return;
     }
 
-    const GSList * reprlst = selection->reprList();
+    GSList const *reprlst = selection->reprList();
     bool filename_search = TRUE;
     bool xdpi_search = TRUE;
     bool ydpi_search = TRUE;
@@ -2458,7 +2274,7 @@ sp_selection_get_export_hints (Inkscape::Selection *selection, const char **file
             xdpi_search &&
             ydpi_search;
         reprlst = reprlst->next) {
-        const gchar * dpi_string;
+        gchar const *dpi_string;
         Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data;
 
         if (filename_search) {
@@ -2488,10 +2304,10 @@ sp_selection_get_export_hints (Inkscape::Selection *selection, const char **file
 }
 
 void
-sp_document_get_export_hints (SPDocument * doc, const char **filename, float *xdpi, float *ydpi) 
+sp_document_get_export_hints (SPDocument *doc, char const **filename, float *xdpi, float *ydpi)
 {
     Inkscape::XML::Node * repr = sp_document_repr_root(doc);
-    const gchar * dpi_string;
+    gchar const *dpi_string;
 
     *filename = repr->attribute("inkscape:export-filename");
 
@@ -2573,7 +2389,7 @@ sp_selection_create_bitmap_copy ()
         res = PX_PER_IN * prefs_min / MIN ((bbox.x1 - bbox.x0), (bbox.y1 - bbox.y0));
     } else {
         float hint_xdpi = 0, hint_ydpi = 0;
-        const char *hint_filename;
+        char const *hint_filename;
         // take resolution hint from the selected objects
         sp_selection_get_export_hints (selection, &hint_filename, &hint_xdpi, &hint_ydpi);
         if (hint_xdpi != 0) {
@@ -2595,12 +2411,12 @@ sp_selection_create_bitmap_copy ()
     unsigned height =(unsigned) floor ((bbox.y1 - bbox.y0) * res / PX_PER_IN);
 
     // Find out if we have to run a filter
-    const gchar *run = NULL;
-    const gchar *filter = prefs_get_string_attribute ("options.createbitmap", "filter");
+    gchar const *run = NULL;
+    gchar const *filter = prefs_get_string_attribute ("options.createbitmap", "filter");
     if (filter) {
         // filter command is given;
         // see if we have a parameter to pass to it
-        const gchar *param1 = prefs_get_string_attribute ("options.createbitmap", "filter_param1");
+        gchar const *param1 = prefs_get_string_attribute ("options.createbitmap", "filter_param1");
         if (param1) {
             if (param1[strlen(param1) - 1] == '%') {
                 // if the param string ends with %, interpret it as a percentage of the image's max dimension
@@ -2623,7 +2439,7 @@ sp_selection_create_bitmap_copy ()
     NR::Matrix t;
 
     double shift_x = bbox.x0;
-    double shift_y = bbox.y1; 
+    double shift_y = bbox.y1;
     if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid
         shift_x = round (shift_x);
         shift_y = -round (-shift_y); // this gets correct rounding despite coordinate inversion, remove the negations when the inversion is gone
@@ -2691,15 +2507,13 @@ sp_selection_create_bitmap_copy ()
 }
 
 /**
- * \brief sp_selection_set_mask
- *
- * This function creates a mask or clipPath from selection
+ * \brief Creates a mask or clipPath from selection
  * Two different modes:
  *  if applyToLayer, all selection is moved to DEFS as mask/clippath
  *       and is applied to current layer
  *  otherwise, topmost object is used as mask for other objects
  * If \a apply_clip_path parameter is true, clipPath is created, otherwise mask
- * 
+ *
  */
 void
 sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
@@ -2710,7 +2524,7 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
 
     SPDocument *doc = sp_desktop_document(desktop);
     Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
-    
+
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
     // check if something is selected
@@ -2723,18 +2537,18 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
         return;
     }
 
-    // FIXME: temporary patch to prevent crash! 
+    // FIXME: temporary patch to prevent crash!
     // Remove this when bboxes are fixed to not blow up on an item clipped/masked with its own clone
     bool clone_with_original = selection_contains_both_clone_and_original (selection);
     if (clone_with_original) {
         return; // in this version, you cannot clip/mask an object with its own clone
     }
     // /END FIXME
-    
+
     sp_document_ensure_up_to_date(doc);
 
     GSList *items = g_slist_copy((GSList *) selection->itemList());
-    
+
     items = g_slist_sort (items, (GCompareFunc) sp_object_compare_position);
 
     // create a list of duplicates
@@ -2743,7 +2557,7 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
     GSList *items_to_delete = NULL;
     bool topmost = prefs_get_int_attribute ("options.maskobject", "topmost", 1);
     bool remove_original = prefs_get_int_attribute ("options.maskobject", "remove", 1);
-    
+
     if (apply_to_layer) {
         // all selected items are used for mask, which is applied to a layer
         apply_to_items = g_slist_prepend (apply_to_items, desktop->currentLayer());
@@ -2767,7 +2581,7 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
             SPObject *item = SP_OBJECT (i->data);
             items_to_delete = g_slist_prepend (items_to_delete, item);
         }
-        
+
         for (i = i->next; i != NULL; i = i->next) {
             apply_to_items = g_slist_prepend (apply_to_items, i->data);
         }
@@ -2785,11 +2599,11 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
             items_to_delete = g_slist_prepend (items_to_delete, item);
         }
     }
-    
+
     g_slist_free (items);
     items = NULL;
-            
-    gchar const* attributeName = apply_clip_path ? "clip-path" : "mask";
+
+    gchar const *attributeName = apply_clip_path ? "clip-path" : "mask";
     for (GSList *i = apply_to_items; NULL != i; i = i->next) {
         SPItem *item = reinterpret_cast<SPItem *>(i->data);
         // inverted object transform should be applied to a mask object,
@@ -2802,7 +2616,7 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
             mask_items_dup = g_slist_prepend (mask_items_dup, dup);
         }
 
-        const gchar *mask_id = NULL;
+        gchar const *mask_id = NULL;
         if (apply_clip_path) {
             mask_id = sp_clippath_create(mask_items_dup, doc, &maskTransform);
         } else {
@@ -2824,9 +2638,9 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
     }
     g_slist_free (items_to_delete);
 
-    if (apply_clip_path) 
+    if (apply_clip_path)
         sp_document_done (doc, SP_VERB_OBJECT_SET_CLIPPATH, _("Set clipping path"));
-    else 
+    else
         sp_document_done (doc, SP_VERB_OBJECT_SET_MASK, _("Set mask"));
 }
 
@@ -2834,8 +2648,8 @@ void sp_selection_unset_mask(bool apply_clip_path) {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
-    
-    SPDocument *doc = sp_desktop_document(desktop);    
+
+    SPDocument *doc = sp_desktop_document(desktop);
     Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
@@ -2844,18 +2658,18 @@ void sp_selection_unset_mask(bool apply_clip_path) {
         desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to remove clippath or mask from."));
         return;
     }
-    
+
     bool remove_original = prefs_get_int_attribute ("options.maskobject", "remove", 1);
     sp_document_ensure_up_to_date(doc);
 
-    gchar const* attributeName = apply_clip_path ? "clip-path" : "mask";
+    gchar const *attributeName = apply_clip_path ? "clip-path" : "mask";
     std::map<SPObject*,SPItem*> referenced_objects;
-    for (GSList const*i = selection->itemList(); NULL != i; i = i->next) {
+    for (GSList const *i = selection->itemList(); NULL != i; i = i->next) {
         if (remove_original) {
             // remember referenced mask/clippath, so orphaned masks can be moved back to document
             SPItem *item = reinterpret_cast<SPItem *>(i->data);
             Inkscape::URIReference *uri_ref = NULL;
-        
+
             if (apply_clip_path) {
                 uri_ref = item->clip_ref;
             } else {
@@ -2908,9 +2722,9 @@ void sp_selection_unset_mask(bool apply_clip_path) {
         g_slist_free (items_to_move);
     }
 
-    if (apply_clip_path) 
+    if (apply_clip_path)
         sp_document_done (doc, SP_VERB_OBJECT_UNSET_CLIPPATH, _("Release clipping path"));
-    else 
+    else
         sp_document_done (doc, SP_VERB_OBJECT_UNSET_MASK, _("Release mask"));
 }
 
@@ -2920,8 +2734,11 @@ void fit_canvas_to_selection(SPDesktop *desktop) {
 
     g_return_if_fail(doc != NULL);
     g_return_if_fail(desktop->selection != NULL);
-    g_return_if_fail(!desktop->selection->isEmpty());
 
+    if (desktop->selection->isEmpty()) {
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to fit canvas to."));
+        return;
+    }
     NR::Maybe<NR::Rect> const bbox(desktop->selection->bounds());
     if (bbox && !bbox->isEmpty()) {
         doc->fitToRect(*bbox);
@@ -2952,7 +2769,7 @@ void fit_canvas_to_selection_or_drawing(SPDesktop *desktop) {
         fit_canvas_to_selection(desktop);
     }
 
-    sp_document_done(doc, SP_VERB_FIT_CANVAS_TO_DRAWING, 
+    sp_document_done(doc, SP_VERB_FIT_CANVAS_TO_DRAWING,
                      _("Fit page to selection"));
 };
 
@@ -2969,7 +2786,7 @@ static void itemtree_map(void (*f)(SPItem *, SPDesktop *), SPObject *root, SPDes
     }
 }
 
-static void unlock(SPItem *item, SPDesktop *desktop) {
+static void unlock(SPItem *item, SPDesktop */*desktop*/) {
     if (item->isLocked()) {
         item->setLocked(FALSE);
     }
@@ -2983,14 +2800,14 @@ static void unhide(SPItem *item, SPDesktop *desktop) {
 
 static void process_all(void (*f)(SPItem *, SPDesktop *), SPDesktop *dt, bool layer_only) {
     if (!dt) return;
-        
+
     SPObject *root;
     if (layer_only) {
         root = dt->currentLayer();
     } else {
         root = dt->currentRoot();
     }
-    
+
     itemtree_map(f, root, dt);
 }
 
@@ -3011,10 +2828,6 @@ void unhide_all_in_all_layers(SPDesktop *dt) {
 }
 
 
-GSList * sp_selection_get_clipboard() {
-    return clipboard;
-}
-
 /*
   Local Variables:
   mode:c++
@@ -3024,4 +2837,4 @@ GSList * sp_selection_get_clipboard() {
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :