2 files changed, 42 insertions, 0 deletions
diff --git a/lib/extensions/__init__.py b/lib/extensions/__init__.py
index 0ae88c76..c0ddf0ce 100644
--- a/lib/extensions/__init__.py
+++ b/lib/extensions/__init__.py
@@ -57,6 +57,7 @@ from .stroke_to_lpe_satin import StrokeToLpeSatin
 from .tartan import Tartan
 from .test_swatches import TestSwatches
 from .troubleshoot import Troubleshoot
+from .unlink_clone import UnlinkClone
 from .update_svg import UpdateSvg
 from .zigzag_line_to_satin import ZigzagLineToSatin
 from .zip import Zip
@@ -115,6 +116,7 @@ __all__ = extensions = [ApplyPalette,
                         Tartan,
                         TestSwatches,
                         Troubleshoot,
+                        UnlinkClone,
                         UpdateSvg,
                         ZigzagLineToSatin,
                         Zip]
diff --git a/lib/extensions/unlink_clone.py b/lib/extensions/unlink_clone.py
new file mode 100644
index 00000000..e361da14
--- /dev/null
+++ b/lib/extensions/unlink_clone.py
@@ -0,0 +1,40 @@
+# Authors: see git history
+#
+# Copyright (c) 2010 Authors
+# Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
+
+from inkex import Boolean, errormsg, BaseElement
+
+from ..elements import Clone
+from ..i18n import _
+from .base import InkstitchExtension
+
+from typing import List, Tuple
+
+
+class UnlinkClone(InkstitchExtension):
+    def __init__(self, *args, **kwargs):
+        InkstitchExtension.__init__(self, *args, **kwargs)
+        self.arg_parser.add_argument("-r", "--recursive", dest="recursive", type=Boolean, default=True)
+
+    def effect(self):
+        recursive: bool = self.options.recursive
+
+        if not self.get_elements():
+            return
+
+        if not self.svg.selection:
+            errormsg(_("Please select one or more clones to unlink."))
+            return
+
+        # Two passes here: One to resolve all clones, and then another to replace those clones with their resolved versions.
+        # This way we don't accidentally remove a node that another clone refers to.
+        clones_resolved: List[Tuple[BaseElement, BaseElement]] = []
+        for element in self.elements:
+            if isinstance(element, Clone):
+                resolved = element.resolve_clone(recursive=recursive)
+                clones_resolved.append((element.node, resolved))
+
+        for (clone, resolved) in clones_resolved:
+            clone.getparent().remove(clone)
+            resolved.set_id(clone.get_id())