diff -r cecfd6bb4593 -r edd558965f58 svghmi/detachable_pages.ysl2 --- a/svghmi/detachable_pages.ysl2 Mon Feb 22 10:09:57 2021 +0100 +++ b/svghmi/detachable_pages.ysl2 Tue Feb 23 10:07:21 2021 +0100 @@ -73,14 +73,13 @@ def "func:sumarized_elements" { param "elements"; const "short_list", "$elements[not(ancestor::*/@id = $elements/@id)]"; - const "filled_groups", """$short_list/parent::svg:*[ - not(descendant::*[ - not(self::svg:g) and + const "filled_groups", """$short_list/parent::*[ + not(child::*[ not(@id = $discardable_elements/@id) and - not(@id = $short_list/descendant-or-self::*[not(self::svg:g)]/@id) + not(@id = $short_list/@id) ])]"""; const "groups_to_add", "$filled_groups[not(ancestor::*/@id = $filled_groups/@id)]"; - result "$groups_to_add | $short_list[not(ancestor::svg:g/@id = $filled_groups/@id)]"; + result "$groups_to_add | $short_list[not(ancestor::*/@id = $filled_groups/@id)]"; } def "func:detachable_elements" {