beta 2011.12.14 00:20

3 files changed, 69 insertions, 33 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 01219f0ab..175263748 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -9664,18 +9664,30 @@ local function copiedelement(element,newparent)
 end
 
 function xml.delete(root,pattern)
-    local collected = xmlapplylpath(root,pattern)
-    if collected then
-        for c=1,#collected do
-            local e = collected[c]
-            local p = e.__p__
-            if p then
-                if trace_manipulations then
-                    report('deleting',pattern,c,e)
+    if not pattern or pattern == "" then
+        local p = root.__p__
+        if p then
+            if trace_manipulations then
+                report('deleting',"--",c,root)
+            end
+            local d = p.dt
+            remove(d,root.ni)
+            redo_ni(d) -- can be made faster and inlined
+        end
+    else
+        local collected = xmlapplylpath(root,pattern)
+        if collected then
+            for c=1,#collected do
+                local e = collected[c]
+                local p = e.__p__
+                if p then
+                    if trace_manipulations then
+                        report('deleting',pattern,c,e)
+                    end
+                    local d = p.dt
+                    remove(d,e.ni)
+                    redo_ni(d) -- can be made faster and inlined
                 end
-                local d = p.dt
-                remove(d,e.ni)
-                redo_ni(d) -- can be made faster and inlined
             end
         end
     end
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 01219f0ab..175263748 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -9664,18 +9664,30 @@ local function copiedelement(element,newparent)
 end
 
 function xml.delete(root,pattern)
-    local collected = xmlapplylpath(root,pattern)
-    if collected then
-        for c=1,#collected do
-            local e = collected[c]
-            local p = e.__p__
-            if p then
-                if trace_manipulations then
-                    report('deleting',pattern,c,e)
+    if not pattern or pattern == "" then
+        local p = root.__p__
+        if p then
+            if trace_manipulations then
+                report('deleting',"--",c,root)
+            end
+            local d = p.dt
+            remove(d,root.ni)
+            redo_ni(d) -- can be made faster and inlined
+        end
+    else
+        local collected = xmlapplylpath(root,pattern)
+        if collected then
+            for c=1,#collected do
+                local e = collected[c]
+                local p = e.__p__
+                if p then
+                    if trace_manipulations then
+                        report('deleting',pattern,c,e)
+                    end
+                    local d = p.dt
+                    remove(d,e.ni)
+                    redo_ni(d) -- can be made faster and inlined
                 end
-                local d = p.dt
-                remove(d,e.ni)
-                redo_ni(d) -- can be made faster and inlined
             end
         end
     end
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 01219f0ab..175263748 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -9664,18 +9664,30 @@ local function copiedelement(element,newparent)
 end
 
 function xml.delete(root,pattern)
-    local collected = xmlapplylpath(root,pattern)
-    if collected then
-        for c=1,#collected do
-            local e = collected[c]
-            local p = e.__p__
-            if p then
-                if trace_manipulations then
-                    report('deleting',pattern,c,e)
+    if not pattern or pattern == "" then
+        local p = root.__p__
+        if p then
+            if trace_manipulations then
+                report('deleting',"--",c,root)
+            end
+            local d = p.dt
+            remove(d,root.ni)
+            redo_ni(d) -- can be made faster and inlined
+        end
+    else
+        local collected = xmlapplylpath(root,pattern)
+        if collected then
+            for c=1,#collected do
+                local e = collected[c]
+                local p = e.__p__
+                if p then
+                    if trace_manipulations then
+                        report('deleting',pattern,c,e)
+                    end
+                    local d = p.dt
+                    remove(d,e.ni)
+                    redo_ni(d) -- can be made faster and inlined
                 end
-                local d = p.dt
-                remove(d,e.ni)
-                redo_ni(d) -- can be made faster and inlined
             end
         end
     end