X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselection-chemistry.cpp;h=3e0da0571e92f24f9edb3d97058a8da659906d1c;hb=ff86396d7bac9863faecc84122d01bd4c5a18606;hp=5fa5b0d7ed83bff3c052cfe146571290b7ca83b5;hpb=d414fe3e051a6fced9010f6b610fdca5c7285304;p=inkscape.git

diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 5fa5b0d7e..3e0da0571 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,10 +20,11 @@
 # 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 "selection.h"
@@ -35,6 +36,7 @@
 #include "sp-use.h"
 #include "sp-textpath.h"
 #include "sp-tspan.h"
+#include "sp-tref.h"
 #include "sp-flowtext.h"
 #include "sp-flowregion.h"
 #include "text-editing.h"
@@ -48,6 +50,8 @@
 #include "libnr/nr-matrix-translate-ops.h"
 #include "libnr/nr-rotate-fns.h"
 #include "libnr/nr-scale-ops.h"
+#include <libnr/nr-matrix-ops.h>
+#include <libnr/nr-rotate-ops.h>
 #include "libnr/nr-scale-translate-ops.h"
 #include "libnr/nr-translate-matrix-ops.h"
 #include "libnr/nr-translate-scale-ops.h"
@@ -69,29 +73,42 @@
 #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"
-using NR::X;
-using NR::Y;
+#include "xml/simple-document.h"
+#include "sp-filter-reference.h"
+#include "gradient-drag.h"
+#include "uri-references.h"
+#include "libnr/nr-convert2geom.h"
+#include "display/curve.h"
+#include "display/canvas-bpath.h"
+
+// 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 */
-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);
+/* 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',
  * then prepends the copy to 'clip'.
  */
-void sp_selection_copy_one (Inkscape::XML::Node *repr, NR::Matrix full_t, GSList **clip)
+void sp_selection_copy_one (Inkscape::XML::Node *repr, NR::Matrix full_t, GSList **clip, Inkscape::XML::Document* xml_doc)
 {
-    Inkscape::XML::Node *copy = repr->duplicate();
+    Inkscape::XML::Node *copy = repr->duplicate(xml_doc);
 
     // copy complete inherited style
     SPCSSAttr *css = sp_repr_css_attr_inherited(repr, "style");
@@ -99,7 +116,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);
@@ -108,76 +125,36 @@ 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)
+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);
-        }
-        *defs_clip = g_slist_reverse(*defs_clip);
+    // 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);
     }
 
-    // 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);
-        }
-
-        *clip = g_slist_reverse(*clip);
-        g_slist_free ((GSList *) sorted_items);
-    }
-}
-
-/**
- * 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::Node *copy = repr->duplicate();
-            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 *document, SPObject *parent, GSList **clip, GSList **defs_clip)
+GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **clip)
 {
-    paste_defs (defs_clip, document);
+    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
 
     GSList *copied = NULL;
     // add objects to document
     for (GSList *l = *clip; l != NULL; l = l->next) {
         Inkscape::XML::Node *repr = (Inkscape::XML::Node *) l->data;
-        Inkscape::XML::Node *copy = repr->duplicate();
+        Inkscape::XML::Node *copy = repr->duplicate(xml_doc);
 
         // premultiply the item transform by the accumulated parent transform in the paste layer
-        NR::Matrix local = sp_item_i2doc_affine(SP_ITEM(parent));
+        NR::Matrix local (sp_item_i2doc_affine(SP_ITEM(parent)));
         if (!local.test_identity()) {
             gchar const *t_str = copy->attribute("transform");
-            NR::Matrix item_t (NR::identity());
+            Geom::Matrix item_t (NR::identity());
             if (t_str)
                 sp_svg_transform_read(t_str, &item_t);
             item_t *= local.inverse();
@@ -194,22 +171,21 @@ GSList *sp_selection_paste_impl (SPDocument *document, SPObject *parent, GSList
     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);
     }
 }
 
 
-void sp_selection_delete()
+void sp_selection_delete(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL) {
         return;
     }
@@ -229,7 +205,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);
@@ -242,17 +218,31 @@ 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"));
 }
 
-/* fixme: sequencing */
-void sp_selection_duplicate()
+void add_ids_recursive (std::vector<const gchar *> &ids, SPObject *obj)
+{
+    if (!obj)
+        return;
+
+    ids.push_back(SP_OBJECT_ID(obj));
+
+    if (SP_IS_GROUP(obj)) {
+        for (SPObject *child = sp_object_first_child(obj) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
+            add_ids_recursive (ids, child);
+        }
+    }
+}
+
+void sp_selection_duplicate(SPDesktop *desktop, bool suppressDone)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
+    SPDocument *doc = desktop->doc();
+    Inkscape::XML::Document* xml_doc = sp_document_repr_doc(doc);
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
     // check if something is selected
@@ -265,33 +255,72 @@ void sp_selection_duplicate()
 
     selection->clear();
 
-    // sorting items from different parents sorts each parent's subset without possibly mixing them, just what we need
+    // 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;
 
+    std::vector<const gchar *> old_ids;
+    std::vector<const gchar *> new_ids;
+    bool relink_clones = prefs_get_int_attribute ("options.relinkclonesonduplicate", "value", 0);
+
     while (reprs) {
-        Inkscape::XML::Node *parent = ((Inkscape::XML::Node *) reprs->data)->parent();
-        Inkscape::XML::Node *copy = ((Inkscape::XML::Node *) reprs->data)->duplicate();
+        Inkscape::XML::Node *old_repr = (Inkscape::XML::Node *) reprs->data;
+        Inkscape::XML::Node *parent = old_repr->parent();
+        Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc);
 
         parent->appendChild(copy);
 
+        if (relink_clones) {
+            SPObject *old_obj = doc->getObjectByRepr(old_repr);
+            SPObject *new_obj = doc->getObjectByRepr(copy);
+            add_ids_recursive (old_ids, old_obj);
+            add_ids_recursive (new_ids, new_obj);
+        }
+
         newsel = g_slist_prepend(newsel, copy);
         reprs = g_slist_remove(reprs, reprs->data);
         Inkscape::GC::release(copy);
     }
 
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE, 
-                     _("Duplicate"));
+    if (relink_clones) {
+
+        g_assert (old_ids.size() == new_ids.size());
+
+        for(unsigned int i = 0; i < old_ids.size(); i++) {
+            const gchar *id = old_ids[i];
+            SPObject *old_clone = doc->getObjectById(id);
+            if (SP_IS_USE(old_clone)) {
+                SPItem *orig = sp_use_get_original(SP_USE(old_clone));
+                for(unsigned int j = 0; j < old_ids.size(); j++) {
+                    if (!strcmp(SP_OBJECT_ID(orig), old_ids[j])) {
+                        // we have both orig and clone in selection, relink
+                        // std::cout << id  << " old, its ori: " << SP_OBJECT_ID(orig) << "; will relink:" << new_ids[i] << " to " << new_ids[j] << "\n";
+                        gchar *newref = g_strdup_printf ("#%s", new_ids[j]);
+                        SPObject *new_clone = doc->getObjectById(new_ids[i]);
+                        SP_OBJECT_REPR(new_clone)->setAttribute("xlink:href", newref);
+                        new_clone->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+                        g_free (newref);
+                    }
+                }
+            }
+        }
+    }
+
+
+    if ( !suppressDone ) {
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE,
+                         _("Duplicate"));
+    }
 
     selection->setReprList(newsel);
 
     g_slist_free(newsel);
 }
 
-void sp_edit_clear_all()
+void sp_edit_clear_all(SPDesktop *dt)
 {
-    SPDesktop *dt = SP_ACTIVE_DESKTOP;
     if (!dt)
         return;
 
@@ -311,7 +340,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) &&
@@ -332,9 +361,8 @@ get_all_items (GSList *list, SPObject *from, SPDesktop *desktop, bool onlyvisibl
     return list;
 }
 
-void sp_edit_select_all_full (bool force_all_layers, bool invert)
+void sp_edit_select_all_full (SPDesktop *dt, bool force_all_layers, bool invert)
 {
-    SPDesktop *dt = SP_ACTIVE_DESKTOP;
     if (!dt)
         return;
 
@@ -348,7 +376,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();
     }
@@ -398,34 +426,33 @@ void sp_edit_select_all_full (bool force_all_layers, bool invert)
     }
 }
 
-void sp_edit_select_all ()
+void sp_edit_select_all (SPDesktop *desktop)
 {
-    sp_edit_select_all_full (false, false);
+    sp_edit_select_all_full (desktop, false, false);
 }
 
-void sp_edit_select_all_in_all_layers ()
+void sp_edit_select_all_in_all_layers (SPDesktop *desktop)
 {
-    sp_edit_select_all_full (true, false);
+    sp_edit_select_all_full (desktop, true, false);
 }
 
-void sp_edit_invert ()
+void sp_edit_invert (SPDesktop *desktop)
 {
-    sp_edit_select_all_full (false, true);
+    sp_edit_select_all_full (desktop, false, true);
 }
 
-void sp_edit_invert_in_all_layers ()
+void sp_edit_invert_in_all_layers (SPDesktop *desktop)
 {
-    sp_edit_select_all_full (true, true);
+    sp_edit_select_all_full (desktop, true, true);
 }
 
-void sp_selection_group()
+void sp_selection_group(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
-    SPDocument *document = sp_desktop_document (desktop);
-    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document);
+    SPDocument *doc = sp_desktop_document (desktop);
+    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
 
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
@@ -453,7 +480,7 @@ void sp_selection_group()
         Inkscape::XML::Node *current = (Inkscape::XML::Node *) p->data;
 
         if (current->parent() == topmost_parent) {
-            Inkscape::XML::Node *spnew = current->duplicate();
+            Inkscape::XML::Node *spnew = current->duplicate(xml_doc);
             sp_repr_unparent(current);
             group->appendChild(spnew);
             Inkscape::GC::release(spnew);
@@ -464,10 +491,10 @@ void sp_selection_group()
                 // At this point, current may already have no item, due to its being a clone whose original is already moved away
                 // So we copy it artificially calculating the transform from its repr->attr("transform") and the parent transform
                 gchar const *t_str = current->attribute("transform");
-                NR::Matrix item_t (NR::identity());
+                Geom::Matrix item_t (NR::identity());
                 if (t_str)
                     sp_svg_transform_read(t_str, &item_t);
-                item_t *= sp_item_i2doc_affine(SP_ITEM(document->getObjectByRepr(current->parent())));
+                item_t *= sp_item_i2doc_affine(SP_ITEM(doc->getObjectByRepr(current->parent())));
                 //FIXME: when moving both clone and original from a transformed group (either by
                 //grouping into another parent, or by cut/paste) the transform from the original's
                 //parent becomes embedded into original itself, and this affects its clones. Fix
@@ -475,17 +502,17 @@ void sp_selection_group()
                 //then, if this is clone, looking up its original in that array and pre-multiplying
                 //it by the inverse of that original's transform diff.
 
-                sp_selection_copy_one (current, item_t, &temp_clip);
+                sp_selection_copy_one (current, item_t, &temp_clip, xml_doc);
                 sp_repr_unparent(current);
 
                 // paste into topmost_parent (temporarily)
-                GSList *copied = sp_selection_paste_impl (document, document->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)
                     Inkscape::XML::Node *in_topmost = (Inkscape::XML::Node *) copied->data;
                     // make a copy
-                    Inkscape::XML::Node *spnew = in_topmost->duplicate();
+                    Inkscape::XML::Node *spnew = in_topmost->duplicate(xml_doc);
                     // remove pasted
                     sp_repr_unparent(in_topmost);
                     // put its copy into group
@@ -503,16 +530,15 @@ 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);
     Inkscape::GC::release(group);
 }
 
-void sp_selection_ungroup()
+void sp_selection_ungroup(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
@@ -565,18 +591,18 @@ 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;
     }
     SPObject *parent = SP_OBJECT_PARENT(items->data);
-    /* Strictly speaking this CAN happen, if user selects <svg> from XML editor */
+    /* Strictly speaking this CAN happen, if user selects <svg> from Inkscape::XML editor */
     if (!SP_IS_GROUP(parent)) {
         return NULL;
     }
@@ -589,14 +615,13 @@ sp_item_list_common_parent_group(const GSList *items)
     return SP_GROUP(parent);
 }
 
-/** Finds out the minimum common bbox of the selected items
- */
-static NR::Maybe<NR::Rect>
-enclose_items(const GSList *items)
+/** Finds out the minimum common bbox of the selected items. */
+static boost::optional<NR::Rect>
+enclose_items(GSList const *items)
 {
     g_assert(items != NULL);
 
-    NR::Maybe<NR::Rect> r = NR::Nothing();
+    boost::optional<NR::Rect> r;
     for (GSList const *i = items; i; i = i->next) {
         r = NR::union_bounds(r, sp_item_bbox_desktop((SPItem *) i->data));
     }
@@ -618,9 +643,8 @@ prev_sibling(SPObject *child)
 }
 
 void
-sp_selection_raise()
+sp_selection_raise(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (!desktop)
         return;
 
@@ -640,14 +664,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
-    NR::Maybe<NR::Rect> selected = enclose_items(items);
+    // Determine the common bbox of the selected items.
+    boost::optional<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);
@@ -655,7 +679,7 @@ sp_selection_raise()
             for (SPObject *newref = child->next; newref; newref = newref->next) {
                 // if the sibling is an item AND overlaps our selection,
                 if (SP_IS_ITEM(newref)) {
-                    NR::Maybe<NR::Rect> newref_bbox = sp_item_bbox_desktop(SP_ITEM(newref));
+                    boost::optional<NR::Rect> newref_bbox = sp_item_bbox_desktop(SP_ITEM(newref));
                     if ( newref_bbox && selected->intersects(*newref_bbox) ) {
                         // AND if it's not one of our selected objects,
                         if (!g_slist_find((GSList *) items, newref)) {
@@ -673,12 +697,12 @@ 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()
+void sp_selection_raise_to_top(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
@@ -708,14 +732,13 @@ 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"));
 }
 
 void
-sp_selection_lower()
+sp_selection_lower(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
@@ -735,15 +758,15 @@ sp_selection_lower()
 
     Inkscape::XML::Node *grepr = SP_OBJECT_REPR(group);
 
-    // find out the common bbox of the selected items
-    NR::Maybe<NR::Rect> selected = enclose_items(items);
+    // Determine the common bbox of the selected items.
+    boost::optional<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);
@@ -751,7 +774,7 @@ sp_selection_lower()
             for (SPObject *newref = prev_sibling(child); newref; newref = prev_sibling(newref)) {
                 // if the sibling is an item AND overlaps our selection,
                 if (SP_IS_ITEM(newref)) {
-                    NR::Maybe<NR::Rect> ref_bbox = sp_item_bbox_desktop(SP_ITEM(newref));
+                    boost::optional<NR::Rect> ref_bbox = sp_item_bbox_desktop(SP_ITEM(newref));
                     if ( ref_bbox && selected->intersects(*ref_bbox) ) {
                         // AND if it's not one of our selected objects,
                         if (!g_slist_find((GSList *) items, newref)) {
@@ -772,13 +795,12 @@ 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"));
 }
 
-void sp_selection_lower_to_bottom()
+void sp_selection_lower_to_bottom(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
@@ -820,7 +842,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"));
 }
 
@@ -838,126 +860,10 @@ sp_redo(SPDesktop *desktop, SPDocument *)
             desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to redo."));
 }
 
-void sp_selection_cut()
+void sp_selection_cut(SPDesktop *desktop)
 {
     sp_selection_copy();
-    sp_selection_delete();
-}
-
-void sp_copy_gradient (GSList **defs_clip, SPGradient *gradient)
-{
-    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();
-        *defs_clip = g_slist_prepend (*defs_clip, grad_repr);
-
-        ref = ref->ref->getObject();
-    }
-}
-
-void sp_copy_pattern (GSList **defs_clip, SPPattern *pattern)
-{
-    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();
-        *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);
-        }
-
-        ref = ref->ref->getObject();
-    }
-}
-
-void sp_copy_single (GSList **defs_clip, SPObject *thing)
-{
-    Inkscape::XML::Node *duplicate_repr = SP_OBJECT_REPR(thing)->duplicate();
-    *defs_clip = g_slist_prepend (*defs_clip, duplicate_repr);
-}
-
-
-void sp_copy_textpath_path (GSList **defs_clip, SPTextPath *tp, const GSList *items)
-{
-    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();
-    *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)
-{
-    SPStyle *style = SP_OBJECT_STYLE (item);
-
-    if (style && (style->fill.type == SP_PAINT_TYPE_PAINTSERVER)) {
-        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));
-        if (SP_IS_PATTERN (server))
-            sp_copy_pattern (defs_clip, SP_PATTERN(server));
-    }
-
-    if (style && (style->stroke.type == SP_PAINT_TYPE_PAINTSERVER)) {
-        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));
-        if (SP_IS_PATTERN (server))
-            sp_copy_pattern (defs_clip, SP_PATTERN(server));
-    }
-
-    // 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]));
-            }
-        }
-    }
-
-    if (SP_IS_TEXT_TEXTPATH (item)) {
-        sp_copy_textpath_path (defs_clip, SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item))), items);
-    }
-
-    if (item->clip_ref->getObject()) {
-        sp_copy_single (defs_clip, item->clip_ref->getObject());
-    }
-
-    if (item->mask_ref->getObject()) {
-        SPObject *mask = item->mask_ref->getObject();
-        sp_copy_single (defs_clip, mask);
-        // 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);
-        }
-    }
-
-    if (style->filter.filter) {
-        SPObject *filter = style->filter.filter;
-        if (SP_IS_FILTER(filter)) {
-            sp_copy_single (defs_clip, filter);
-        }
-    }
-
-    // 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);
-    }
+    sp_selection_delete(desktop);
 }
 
 /**
@@ -986,7 +892,7 @@ take_style_from_item (SPItem *item)
             }
         }
     }
-    if (!(SP_IS_TEXT (item) || SP_IS_TSPAN (item) || SP_IS_STRING (item))) {
+    if (!(SP_IS_TEXT (item) || SP_IS_TSPAN (item) || SP_IS_TREF(item) || SP_IS_STRING (item))) {
         // do not copy text properties from non-text objects, it's confusing
         css = sp_css_attr_unset_text (css);
     }
@@ -1003,259 +909,104 @@ take_style_from_item (SPItem *item)
 
 void sp_selection_copy()
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop == NULL)
-        return;
-
-    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 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);
-
-    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();
-        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;
-            }
-        }
-        g_free (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)
+void sp_selection_paste(SPDesktop *desktop, 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
-    }
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    if(cm->paste(in_place))
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_PASTE, _("Paste"));
+}
 
-    // check if something is in the clipboard
-    if (clipboard == NULL) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
-        return;
-    }
+void sp_selection_paste_style(SPDesktop *desktop)
+{
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    if(cm->pasteStyle())
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_PASTE_STYLE, _("Paste style"));
+}
 
-    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);
+void sp_selection_paste_livepatheffect(SPDesktop *desktop)
+{
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    if(cm->pastePathEffect())
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_PASTE_LIVEPATHEFFECT,
+                     _("Paste live path effect"));
+}
 
-        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 */
-        /* FIXME: this gridsnap fiddling is a hack. */
-        Inkscape::GridSnapper &s = desktop->namedview->snap_manager.grid;
-        gdouble const curr_gridsnap = s.getDistance();
-        s.setDistance(NR_HUGE);
-        m = s.freeSnap(Inkscape::Snapper::SNAP_POINT, m, NULL).getPoint();
-        s.setDistance(curr_gridsnap);
-        sp_selection_move_relative(selection, m);
+void sp_selection_remove_livepatheffect_impl(SPItem *item)
+{
+    if ( item && SP_IS_LPE_ITEM(item) ) {
+        sp_lpe_item_remove_all_path_effects(SP_LPE_ITEM(item), false);
     }
-
-    sp_document_done(document, SP_VERB_EDIT_PASTE, 
-                     _("Paste"));
 }
 
-void sp_selection_paste_style()
+void sp_selection_remove_livepatheffect(SPDesktop *desktop)
 {
-    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 style to."));
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to remove live path effects from."));
         return;
     }
 
-    paste_defs (&defs_clipboard, sp_desktop_document(desktop));
+    for ( GSList const *itemlist = selection->itemList(); itemlist != NULL; itemlist = g_slist_next(itemlist) ) {
+        SPItem *item = reinterpret_cast<SPItem*>(itemlist->data);
+
+        sp_selection_remove_livepatheffect_impl(item);
 
-    sp_desktop_set_style (desktop, style_clipboard);
+    }
 
-    sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_STYLE,
-                     _("Paste style"));
+    sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT,
+                     _("Remove live path effect"));
 }
 
-void sp_selection_paste_size (bool apply_x, bool apply_y)
+void sp_selection_remove_filter (SPDesktop *desktop)
 {
-    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."));
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to remove filters from."));
         return;
     }
 
-    NR::Maybe<NR::Rect> current = selection->bounds();
-    if ( !current || current->extent(NR::X) < 1e-6 || current->extent(NR::Y) < 1e-6 ) {
-        return;
-    }
+    SPCSSAttr *css = sp_repr_css_attr_new();
+    sp_repr_css_unset_property(css, "filter");
+    sp_desktop_set_style(desktop, css);
+    sp_repr_css_attr_unref(css);
 
-    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_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_REMOVE_FILTER,
+                     _("Remove filter"));
+}
 
-    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,
+void sp_selection_paste_size (SPDesktop *desktop, bool apply_x, bool apply_y)
+{
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    if(cm->pasteSize(false, apply_x, apply_y))
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_PASTE_SIZE,
                      _("Paste size"));
 }
 
-void sp_selection_paste_size_separately (bool apply_x, bool apply_y)
+void sp_selection_paste_size_separately (SPDesktop *desktop, 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->extent(NR::X) < 1e-6 || current->extent(NR::Y) < 1e-6 ) {
-            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(desktop), SP_VERB_EDIT_PASTE_SIZE_SEPARATELY,
                      _("Paste size separately"));
 }
 
-void sp_selection_to_next_layer ()
+void sp_selection_to_next_layer(SPDesktop *dt, bool suppressDone)
 {
-    SPDesktop *dt = SP_ACTIVE_DESKTOP;
-
     Inkscape::Selection *selection = sp_desktop_selection(dt);
 
     // check if something is selected
@@ -1264,28 +1015,30 @@ 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); // 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, 
-                         _("Raise to next layer"));
+        if ( !suppressDone ) {
+            sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_NEXT,
+                             _("Raise to next layer"));
+        }
     } else {
         no_more = true;
     }
@@ -1297,10 +1050,8 @@ void sp_selection_to_next_layer ()
     g_slist_free ((GSList *) items);
 }
 
-void sp_selection_to_prev_layer ()
+void sp_selection_to_prev_layer(SPDesktop *dt, bool suppressDone)
 {
-    SPDesktop *dt = SP_ACTIVE_DESKTOP;
-
     Inkscape::Selection *selection = sp_desktop_selection(dt);
 
     // check if something is selected
@@ -1309,28 +1060,30 @@ 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); // 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);
         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_PREV,
-                         _("Lower to previous layer"));
+        if ( !suppressDone ) {
+            sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_PREV,
+                             _("Lower to previous layer"));
+        }
     } else {
         no_more = true;
     }
@@ -1346,6 +1099,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;
@@ -1356,7 +1110,14 @@ selection_contains_original (SPItem *item, Inkscape::Selection *selection)
         if (item_use == item_use_first)
             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;
 }
 
@@ -1368,7 +1129,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;
@@ -1406,21 +1167,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);
@@ -1457,8 +1218,8 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const
 
             // calculate the matrix we need to apply to the clone to cancel its induced transform from its original
             NR::Matrix parent_transform = sp_item_i2root_affine(SP_ITEM(SP_OBJECT_PARENT (item)));
-            NR::Matrix t = parent_transform * matrix_to_desktop (matrix_from_desktop (affine, item), item) * parent_transform.inverse();
-            NR::Matrix t_inv =parent_transform * matrix_to_desktop (matrix_from_desktop (affine.inverse(), item), item) * parent_transform.inverse();
+            NR::Matrix t = parent_transform * from_2geom(matrix_to_desktop (matrix_from_desktop (affine, item), item)) * parent_transform.inverse();
+            NR::Matrix t_inv =parent_transform * from_2geom(matrix_to_desktop (matrix_from_desktop (affine.inverse(), item), item)) * parent_transform.inverse();
             NR::Matrix result = t_inv * item->transform * t;
 
             if ((prefs_parallel || prefs_unmoved) && affine.is_translation()) {
@@ -1486,7 +1247,7 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const
 
         } else {
             if (set_i2d) {
-                sp_item_set_i2d_affine(item, sp_item_i2d_affine(item) * affine);
+                sp_item_set_i2d_affine(item, sp_item_i2d_affine(item) * (Geom::Matrix)affine);
             }
             sp_item_write_transform(item, SP_OBJECT_REPR(item), item->transform, NULL);
         }
@@ -1500,9 +1261,8 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const
     }
 }
 
-void sp_selection_remove_transform()
+void sp_selection_remove_transform(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
@@ -1510,11 +1270,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"));
 }
 
@@ -1526,7 +1286,7 @@ sp_selection_scale_absolute(Inkscape::Selection *selection,
     if (selection->isEmpty())
         return;
 
-    NR::Maybe<NR::Rect> const bbox(selection->bounds());
+    boost::optional<NR::Rect> const bbox(selection->bounds());
     if ( !bbox || bbox->isEmpty() ) {
         return;
     }
@@ -1548,7 +1308,7 @@ void sp_selection_scale_relative(Inkscape::Selection *selection, NR::Point const
     if (selection->isEmpty())
         return;
 
-    NR::Maybe<NR::Rect> const bbox(selection->bounds());
+    boost::optional<NR::Rect> const bbox(selection->bounds());
 
     if ( !bbox || bbox->isEmpty() ) {
         return;
@@ -1607,10 +1367,8 @@ void sp_selection_move_relative(Inkscape::Selection *selection, double dx, doubl
  *
  */
 
-void sp_selection_rotate_90_cw()
+void sp_selection_rotate_90_cw(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
     if (selection->isEmpty())
@@ -1623,22 +1381,16 @@ 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()
+void sp_selection_rotate_90_ccw(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
     if (selection->isEmpty())
@@ -1661,7 +1413,7 @@ sp_selection_rotate(Inkscape::Selection *selection, gdouble const angle_degrees)
     if (selection->isEmpty())
         return;
 
-    NR::Maybe<NR::Point> center = selection->center();
+    boost::optional<NR::Point> center = selection->center();
     if (!center) {
         return;
     }
@@ -1671,8 +1423,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"));
 }
 
@@ -1685,8 +1437,8 @@ sp_selection_rotate_screen(Inkscape::Selection *selection, gdouble angle)
     if (selection->isEmpty())
         return;
 
-    NR::Maybe<NR::Rect> const bbox(selection->bounds());
-    NR::Maybe<NR::Point> center = selection->center();
+    boost::optional<NR::Rect> const bbox(selection->bounds());
+    boost::optional<NR::Point> center = selection->center();
 
     if ( !bbox || !center ) {
         return;
@@ -1694,7 +1446,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;
 
@@ -1704,7 +1456,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"));
 }
 
@@ -1714,7 +1466,7 @@ sp_selection_scale(Inkscape::Selection *selection, gdouble grow)
     if (selection->isEmpty())
         return;
 
-    NR::Maybe<NR::Rect> const bbox(selection->bounds());
+    boost::optional<NR::Rect> const bbox(selection->bounds());
     if (!bbox) {
         return;
     }
@@ -1751,7 +1503,7 @@ sp_selection_scale_times(Inkscape::Selection *selection, gdouble times)
     if (selection->isEmpty())
         return;
 
-    NR::Maybe<NR::Rect> sel_bbox = selection->bounds();
+    boost::optional<NR::Rect> sel_bbox = selection->bounds();
 
     if (!sel_bbox) {
         return;
@@ -1759,14 +1511,13 @@ 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"));
 }
 
 void
-sp_selection_move(gdouble dx, gdouble dy)
+sp_selection_move(SPDesktop *desktop, gdouble dx, gdouble dy)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
     if (selection->isEmpty()) {
         return;
@@ -1775,22 +1526,20 @@ 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"));
     }
 }
 
 void
-sp_selection_move_screen(gdouble dx, gdouble dy)
+sp_selection_move_screen(SPDesktop *desktop, gdouble dx, gdouble dy)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
     if (selection->isEmpty()) {
         return;
@@ -1803,13 +1552,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"));
     }
 }
@@ -1829,7 +1578,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); }
@@ -1867,9 +1616,8 @@ private:
 }
 
 void
-sp_selection_item_next(void)
+sp_selection_item_next(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     g_return_if_fail(desktop != NULL);
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
@@ -1895,10 +1643,9 @@ sp_selection_item_next(void)
 }
 
 void
-sp_selection_item_prev(void)
+sp_selection_item_prev(SPDesktop *desktop)
 {
-    SPDocument *document = SP_ACTIVE_DOCUMENT;
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    SPDocument *document = sp_desktop_document(desktop);
     g_return_if_fail(document != NULL);
     g_return_if_fail(desktop != NULL);
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
@@ -1924,6 +1671,72 @@ 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;
+                        // TODO: should we set the item for nodepath or knotholder or both? seems to work with both.
+                        shape_editor->set_item(SP_ITEM(child), SH_NODEPATH);
+                        shape_editor->set_item(SP_ITEM(child), SH_KNOTHOLDER);
+                        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>
@@ -2011,7 +1824,7 @@ SPItem *next_item(SPDesktop *desktop, GSList *path, SPObject *root,
 void scroll_to_show_item(SPDesktop *desktop, SPItem *item)
 {
     NR::Rect dbox = desktop->get_display_area();
-    NR::Maybe<NR::Rect> sbox = sp_item_bbox_desktop(item);
+    boost::optional<NR::Rect> sbox = sp_item_bbox_desktop(item);
 
     if ( sbox && dbox.contains(*sbox) == false ) {
         NR::Point const s_dt = sbox->midpoint();
@@ -2027,9 +1840,8 @@ void scroll_to_show_item(SPDesktop *desktop, SPItem *item)
 
 
 void
-sp_selection_clone()
+sp_selection_clone(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
@@ -2044,26 +1856,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);
 
@@ -2071,26 +1883,75 @@ sp_selection_clone()
         reprs = g_slist_remove(reprs, sel_repr);
         Inkscape::GC::release(clone);
     }
-    
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_CLONE, 
-                     _("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,
+                     Q_("action|Clone"));
 
     selection->setReprList(newsel);
- 
+
     g_slist_free(newsel);
 }
 
 void
-sp_selection_unlink()
+sp_selection_relink(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (!desktop)
         return;
 
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
     if (selection->isEmpty()) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select a <b>clone</b> to unlink."));
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>clones</b> to relink."));
+        return;
+    }
+
+    Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+    const gchar *newid = cm->getFirstObjectID();
+    if (!newid) {
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Copy an <b>object</b> to clipboard to relink clones to."));
+        return;
+    }
+    gchar *newref = g_strdup_printf ("#%s", newid);
+
+    // Get a copy of current selection.
+    bool relinked = false;
+    for (GSList *items = (GSList *) selection->itemList();
+         items != NULL;
+         items = items->next)
+    {
+        SPItem *item = (SPItem *) items->data;
+
+        if (!SP_IS_USE(item))
+            continue;
+
+        SP_OBJECT_REPR(item)->setAttribute("xlink:href", newref);
+        SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+        relinked = true;
+    }
+
+    g_free(newref);
+
+    if (!relinked) {
+        desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No clones to relink</b> in the selection."));
+    } else {
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNLINK_CLONE,
+                     _("Relink clone"));
+    }
+}
+
+
+void
+sp_selection_unlink(SPDesktop *desktop)
+{
+    if (!desktop)
+        return;
+
+    Inkscape::Selection *selection = sp_desktop_selection(desktop);
+
+    if (selection->isEmpty()) {
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>clones</b> to unlink."));
         return;
     }
 
@@ -2101,15 +1962,33 @@ sp_selection_unlink()
          items != NULL;
          items = items->next)
     {
-        SPItem *use = (SPItem *) items->data;
+        SPItem *item = (SPItem *) items->data;
+
+        if (SP_IS_TEXT(item)) {
+            SPObject *tspan = sp_tref_convert_to_tspan(SP_OBJECT(item));
 
-        if (!SP_IS_USE(use)) {
-            // keep the non-yse item in the new selection
-            new_select = g_slist_prepend(new_select, use);
+            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;
+        }
+
+        if (!(SP_IS_USE(item) || SP_IS_TREF(item))) {
+            // keep the non-use item in the new selection
+            new_select = g_slist_prepend(new_select, item);
             continue;
         }
 
-        SPItem *unlink = sp_use_unlink(SP_USE(use));
+        SPItem *unlink;
+        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);
@@ -2129,9 +2008,8 @@ sp_selection_unlink()
 }
 
 void
-sp_select_clone_original()
+sp_select_clone_original(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
@@ -2139,7 +2017,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) {
@@ -2174,6 +2052,25 @@ sp_select_clone_original()
     }
 
     if (original) {
+
+        bool highlight = prefs_get_int_attribute ("options.highlightoriginal", "value", 0);
+        if (highlight) {
+            boost::optional<NR::Rect> a = item->getBounds(sp_item_i2d_affine(item));
+            boost::optional<NR::Rect> b = original->getBounds(sp_item_i2d_affine(original));
+            if ( a && b ) {
+                // draw a flashing line between the objects
+                SPCurve *curve = new SPCurve();
+                curve->moveto(a->midpoint());
+                curve->lineto(b->midpoint());
+
+                SPCanvasItem * canvasitem = sp_canvas_bpath_new(sp_desktop_tempgroup(desktop), curve);
+                sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(canvasitem), 0x0000ddff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT, 5, 3);
+                sp_canvas_item_show(canvasitem);
+                curve->unref();
+                desktop->add_temporary_canvasitem (canvasitem, 1000);
+            }
+        }
+
         selection->clear();
         selection->set(original);
         if (SP_CYCLING == SP_CYCLE_FOCUS) {
@@ -2182,15 +2079,135 @@ sp_select_clone_original()
     }
 }
 
+
+void sp_selection_to_marker(SPDesktop *desktop, bool apply)
+{
+    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);
+    boost::optional<NR::Rect> r = selection->bounds();
+    boost::optional<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)
+{
+    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)
+sp_selection_tile(SPDesktop *desktop, bool apply)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
-    SPDocument *document = sp_desktop_document(desktop);
-    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document);
+    SPDocument *doc = sp_desktop_document(desktop);
+    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
 
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
@@ -2200,14 +2217,14 @@ sp_selection_tile(bool apply)
         return;
     }
 
-    sp_document_ensure_up_to_date(document);
-    NR::Maybe<NR::Rect> r = selection->bounds();
+    sp_document_ensure_up_to_date(doc);
+    boost::optional<NR::Rect> r = selection->bounds();
     if ( !r || 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(document)) - (r->min() + NR::Point (0, r->extent(NR::Y)));
+    NR::Point move_p = NR::Point(0, sp_document_height(doc)) - (r->min() + NR::Point (0, r->extent(NR::Y)));
     move_p[NR::Y] = -move_p[NR::Y];
     NR::Matrix move = NR::Matrix (NR::translate (move_p));
 
@@ -2218,7 +2235,7 @@ sp_selection_tile(bool apply)
     // bottommost object, after sorting
     SPObject *parent = SP_OBJECT_PARENT (items->data);
 
-    NR::Matrix parent_transform = sp_item_i2root_affine(SP_ITEM(parent));
+    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();
@@ -2226,9 +2243,11 @@ sp_selection_tile(bool apply)
     // 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();
+        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()));
 
@@ -2246,8 +2265,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, document,
-                                        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);
@@ -2277,18 +2299,18 @@ sp_selection_tile(bool apply)
 
     g_slist_free (items);
 
-    sp_document_done (document, SP_VERB_EDIT_TILE, 
+    sp_document_done (doc, SP_VERB_EDIT_TILE,
                       _("Objects to pattern"));
 }
 
 void
-sp_selection_untile()
+sp_selection_untile(SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
-    SPDocument *document = 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);
 
@@ -2310,7 +2332,7 @@ sp_selection_untile()
 
         SPStyle *style = SP_OBJECT_STYLE (item);
 
-        if (!style || style->fill.type != SP_PAINT_TYPE_PAINTSERVER)
+        if (!style || !style->fill.isPaintserver())
             continue;
 
         SPObject *server = SP_OBJECT_STYLE_FILL_SERVER(item);
@@ -2326,14 +2348,14 @@ sp_selection_untile()
         pat_transform *= item->transform;
 
         for (SPObject *child = sp_object_first_child(SP_OBJECT(pattern)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
-            Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate();
+            Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate(xml_doc);
             SPItem *i = SP_ITEM (desktop->currentLayer()->appendChildRepr(copy));
 
            // FIXME: relink clones to the new canvas objects
            // use SPObject::setid when mental finishes it to steal ids of
 
             // this is needed to make sure the new item has curve (simply requestDisplayUpdate does not work)
-            sp_document_ensure_up_to_date (document);
+            sp_document_ensure_up_to_date (doc);
 
             NR::Matrix transform( i->transform * pat_transform );
             sp_item_write_transform(i, SP_OBJECT_REPR(i), transform);
@@ -2349,20 +2371,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;
@@ -2372,7 +2394,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) {
@@ -2402,10 +2424,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");
 
@@ -2423,9 +2445,8 @@ sp_document_get_export_hints (SPDocument * doc, const char **filename, float *xd
 }
 
 void
-sp_selection_create_bitmap_copy ()
+sp_selection_create_bitmap_copy (SPDesktop *desktop)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
@@ -2440,11 +2461,16 @@ sp_selection_create_bitmap_copy ()
         return;
     }
 
+    desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Rendering bitmap..."));
+    // set "busy" cursor
+    desktop->setWaitingCursor();
+
     // Get the bounding box of the selection
     NRRect bbox;
     sp_document_ensure_up_to_date (document);
     selection->bounds(&bbox);
     if (NR_RECT_DFLS_TEST_EMPTY(&bbox)) {
+        desktop->clearWaitingCursor();
         return; // exceptional situation, so not bother with a translatable error message, just quit quietly
     }
 
@@ -2487,7 +2513,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) {
@@ -2508,13 +2534,13 @@ sp_selection_create_bitmap_copy ()
     unsigned width = (unsigned) floor ((bbox.x1 - bbox.x0) * res / PX_PER_IN);
     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");
+    // Find out if we have to run an external 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
@@ -2533,11 +2559,11 @@ sp_selection_create_bitmap_copy ()
     }
 
     // Calculate the matrix that will be applied to the image so that it exactly overlaps the source objects
-    NR::Matrix eek = sp_item_i2d_affine (SP_ITEM(parent_object));
+    NR::Matrix eek (sp_item_i2d_affine (SP_ITEM(parent_object)));
     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
@@ -2558,7 +2584,8 @@ sp_selection_create_bitmap_copy ()
     // Run filter, if any
     if (run) {
         g_print ("Running external filter: %s\n", run);
-        system (run);
+        int retval;
+        retval = system (run);
     }
 
     // Import the image back
@@ -2600,30 +2627,30 @@ sp_selection_create_bitmap_copy ()
                           _("Create bitmap"));
     }
 
+    desktop->clearWaitingCursor();
+
     g_free (filename);
     g_free (filepath);
 }
 
 /**
- * \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)
+sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_to_layer)
 {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
         return;
 
-    SPDocument *document = 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);
 
     // check if something is selected
@@ -2636,18 +2663,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(document);
+
+    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
@@ -2656,13 +2683,13 @@ 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());
 
         for (GSList *i = items; i != NULL; i = i->next) {
-            Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate();
+            Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
             mask_items = g_slist_prepend (mask_items, dup);
 
             if (remove_original) {
@@ -2673,14 +2700,14 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
     } else if (!topmost) {
         // topmost item is used as a mask, which is applied to other items in a selection
         GSList *i = items;
-        Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate();
+        Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
         mask_items = g_slist_prepend (mask_items, dup);
 
         if (remove_original) {
             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);
         }
@@ -2690,7 +2717,7 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
             apply_to_items = g_slist_prepend (apply_to_items, i->data);
         }
 
-        Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate();
+        Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
         mask_items = g_slist_prepend (mask_items, dup);
 
         if (remove_original) {
@@ -2698,11 +2725,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,
@@ -2711,15 +2738,15 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
 
         GSList *mask_items_dup = NULL;
         for (GSList *mask_item = mask_items; NULL != mask_item; mask_item = mask_item->next) {
-            Inkscape::XML::Node *dup = reinterpret_cast<Inkscape::XML::Node *>(mask_item->data)->duplicate();
+            Inkscape::XML::Node *dup = reinterpret_cast<Inkscape::XML::Node *>(mask_item->data)->duplicate(xml_doc);
             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, document, &maskTransform);
+            mask_id = sp_clippath_create(mask_items_dup, doc, &maskTransform);
         } else {
-            mask_id = sp_mask_create(mask_items_dup, document, &maskTransform);
+            mask_id = sp_mask_create(mask_items_dup, doc, &maskTransform);
         }
 
         g_slist_free (mask_items_dup);
@@ -2737,18 +2764,18 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
     }
     g_slist_free (items_to_delete);
 
-    if (apply_clip_path) 
-        sp_document_done (document, SP_VERB_OBJECT_SET_CLIPPATH, _("Set clipping path"));
-    else 
-        sp_document_done (document, SP_VERB_OBJECT_SET_MASK, _("Set mask"));
+    if (apply_clip_path)
+        sp_document_done (doc, SP_VERB_OBJECT_SET_CLIPPATH, _("Set clipping path"));
+    else
+        sp_document_done (doc, SP_VERB_OBJECT_SET_MASK, _("Set mask"));
 }
 
-void sp_selection_unset_mask(bool apply_clip_path) {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+void sp_selection_unset_mask(SPDesktop *desktop, bool apply_clip_path) {
     if (desktop == NULL)
         return;
-    
-    SPDocument *document = 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);
 
     // check if something is selected
@@ -2756,18 +2783,20 @@ 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(document);
+    sp_document_ensure_up_to_date(doc);
 
-    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) {
+    gchar const *attributeName = apply_clip_path ? "clip-path" : "mask";
+    std::map<SPObject*,SPItem*> referenced_objects; 
+    // SPObject* refers to a group containing the clipped path or mask itself, 
+    // whereas SPItem* refers to the item being clipped or masked
+    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 {
@@ -2785,10 +2814,11 @@ void sp_selection_unset_mask(bool apply_clip_path) {
 
     // restore mask objects into a document
     for ( std::map<SPObject*,SPItem*>::iterator it = referenced_objects.begin() ; it != referenced_objects.end() ; ++it) {
-        SPObject *obj = (*it).first;
+        SPObject *obj = (*it).first; // Group containing the clipped paths or masks
         GSList *items_to_move = NULL;
         for (SPObject *child = sp_object_first_child(obj) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
-            Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate();
+            // Collect all clipped paths and masks within a single group 
+            Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate(xml_doc);
             items_to_move = g_slist_prepend (items_to_move, copy);
         }
 
@@ -2801,6 +2831,7 @@ void sp_selection_unset_mask(bool apply_clip_path) {
         Inkscape::XML::Node *parent = SP_OBJECT_REPR((*it).second)->parent();
         gint pos = SP_OBJECT_REPR((*it).second)->position();
 
+        // Iterate through all clipped paths / masks
         for (GSList *i = items_to_move; NULL != i; i = i->next) {
             Inkscape::XML::Node *repr = (Inkscape::XML::Node *)i->data;
 
@@ -2820,38 +2851,73 @@ void sp_selection_unset_mask(bool apply_clip_path) {
         g_slist_free (items_to_move);
     }
 
-    if (apply_clip_path) 
-        sp_document_done (document, SP_VERB_OBJECT_UNSET_CLIPPATH, _("Release clipping path"));
-    else 
-        sp_document_done (document, SP_VERB_OBJECT_UNSET_MASK, _("Release mask"));
+    if (apply_clip_path)
+        sp_document_done (doc, SP_VERB_OBJECT_UNSET_CLIPPATH, _("Release clipping path"));
+    else
+        sp_document_done (doc, SP_VERB_OBJECT_UNSET_MASK, _("Release mask"));
 }
 
-void fit_canvas_to_selection(SPDesktop *desktop) {
-    g_return_if_fail(desktop != NULL);
+/**
+ * Returns true if an undoable change should be recorded.
+ */
+bool
+fit_canvas_to_selection(SPDesktop *desktop)
+{
+    g_return_val_if_fail(desktop != NULL, false);
     SPDocument *doc = sp_desktop_document(desktop);
 
-    g_return_if_fail(doc != NULL);
-    g_return_if_fail(desktop->selection != NULL);
-    g_return_if_fail(!desktop->selection->isEmpty());
-    NRRect bbox(0, 0, 0, 0);
+    g_return_val_if_fail(doc != NULL, false);
+    g_return_val_if_fail(desktop->selection != NULL, false);
 
-    desktop->selection->bounds(&bbox);
-    if (!nr_rect_d_test_empty(&bbox)) {
-        doc->fitToRect(bbox);
+    if (desktop->selection->isEmpty()) {
+        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to fit canvas to."));
+        return false;
     }
-};
+    boost::optional<NR::Rect> const bbox(desktop->selection->bounds());
+    if (bbox && !bbox->isEmpty()) {
+        doc->fitToRect(*bbox);
+        return true;
+    } else {
+        return false;
+    }
+}
 
-void fit_canvas_to_drawing(SPDocument *doc) {
-    g_return_if_fail(doc != NULL);
-    NRRect bbox(0, 0, 0, 0);
+/**
+ * Fit canvas to the bounding box of the selection, as an undoable action.
+ */
+void
+verb_fit_canvas_to_selection(SPDesktop *const desktop)
+{
+    if (fit_canvas_to_selection(desktop)) {
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_FIT_CANVAS_TO_SELECTION,
+                         _("Fit Page to Selection"));
+    }
+}
+
+bool
+fit_canvas_to_drawing(SPDocument *doc)
+{
+    g_return_val_if_fail(doc != NULL, false);
 
-    sp_document_ensure_up_to_date (doc);
-    sp_item_invoke_bbox(SP_ITEM(doc->root), &bbox, sp_item_i2r_affine(SP_ITEM(doc->root)), TRUE);
+    sp_document_ensure_up_to_date(doc);
+    SPItem const *const root = SP_ITEM(doc->root);
+    boost::optional<NR::Rect> const bbox(root->getBounds(sp_item_i2r_affine(root)));
+    if (bbox && !bbox->isEmpty()) {
+        doc->fitToRect(*bbox);
+        return true;
+    } else {
+        return false;
+    }
+}
 
-    if (!nr_rect_d_test_empty(&bbox)) {
-        doc->fitToRect(bbox);
+void
+verb_fit_canvas_to_drawing(SPDesktop *desktop)
+{
+    if (fit_canvas_to_drawing(sp_desktop_document(desktop))) {
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_FIT_CANVAS_TO_DRAWING,
+                         _("Fit Page to Drawing"));
     }
-};
+}
 
 void fit_canvas_to_selection_or_drawing(SPDesktop *desktop) {
     g_return_if_fail(desktop != NULL);
@@ -2860,15 +2926,69 @@ void fit_canvas_to_selection_or_drawing(SPDesktop *desktop) {
     g_return_if_fail(doc != NULL);
     g_return_if_fail(desktop->selection != NULL);
 
-    if (desktop->selection->isEmpty()) {
-        fit_canvas_to_drawing(doc);
+    bool const changed = ( desktop->selection->isEmpty()
+                           ? fit_canvas_to_drawing(doc)
+                           : fit_canvas_to_selection(desktop) );
+    if (changed) {
+        sp_document_done(sp_desktop_document(desktop), SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING,
+                         _("Fit Page to Selection or Drawing"));
+    }
+};
+
+static void itemtree_map(void (*f)(SPItem *, SPDesktop *), SPObject *root, SPDesktop *desktop) {
+    // don't operate on layers
+    if (SP_IS_ITEM(root) && !desktop->isLayer(SP_ITEM(root))) {
+        f(SP_ITEM(root), desktop);
+    }
+    for ( SPObject::SiblingIterator iter = root->firstChild() ; iter ; ++iter ) {
+        //don't recurse into locked layers
+        if (!(SP_IS_ITEM(&*iter) && desktop->isLayer(SP_ITEM(&*iter)) && SP_ITEM(&*iter)->isLocked())) {
+            itemtree_map(f, iter, desktop);
+        }
+    }
+}
+
+static void unlock(SPItem *item, SPDesktop */*desktop*/) {
+    if (item->isLocked()) {
+        item->setLocked(FALSE);
+    }
+}
+
+static void unhide(SPItem *item, SPDesktop *desktop) {
+    if (desktop->itemIsHidden(item)) {
+        item->setExplicitlyHidden(FALSE);
+    }
+}
+
+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 {
-        fit_canvas_to_selection(desktop);
+        root = dt->currentRoot();
     }
 
-    sp_document_done(doc, SP_VERB_FIT_CANVAS_TO_DRAWING, 
-                     _("Fit page to selection"));
-};
+    itemtree_map(f, root, dt);
+}
+
+void unlock_all(SPDesktop *dt) {
+    process_all(&unlock, dt, true);
+}
+
+void unlock_all_in_all_layers(SPDesktop *dt) {
+    process_all(&unlock, dt, false);
+}
+
+void unhide_all(SPDesktop *dt) {
+    process_all(&unhide, dt, true);
+}
+
+void unhide_all_in_all_layers(SPDesktop *dt) {
+    process_all(&unhide, dt, false);
+}
+
 
 /*
   Local Variables:
@@ -2879,4 +2999,4 @@ void fit_canvas_to_selection_or_drawing(SPDesktop *desktop) {
   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 :