diff -r 17a9c7a334f7 -r 8094494113b6 svghmi/widgets_common.ysl2 --- a/svghmi/widgets_common.ysl2 Tue Jan 26 11:17:08 2021 +0100 +++ b/svghmi/widgets_common.ysl2 Tue Feb 02 10:59:00 2021 +0100 @@ -288,12 +288,13 @@ } || -const "excluded_types", "str:split('Page Lang VarInit')"; +const "excluded_types", "str:split('Page VarInit')"; const "included_ids","$parsed_widgets/widget[not(@type = $excluded_types) and not(@id = $discardable_elements/@id)]/@id"; +const "hmi_widgets","$hmi_elements[@id = $included_ids]"; emit "declarations:hmi-elements" { | var hmi_widgets = { - apply "$hmi_elements[@id = $included_ids]", mode="hmi_widgets"; + apply "$hmi_widgets", mode="hmi_widgets"; | } }