# HG changeset patch # User Edouard Tisserant # Date 1587211601 -7200 # Node ID 4296ab974d4daaa3a6f790711308e3a63aa40ec9 # Parent 1379cd5c69dd1c8ab7f89cf8ea5f9639eafcdc38 SVGHMI: Move reflective debug tags from "reflect" to "debug" namespace, preparing for per-purpose namespaces. diff -r 1379cd5c69dd -r 4296ab974d4d svghmi/detachable_pages.ysl2 --- a/svghmi/detachable_pages.ysl2 Sat Apr 18 13:14:45 2020 +0200 +++ b/svghmi/detachable_pages.ysl2 Sat Apr 18 14:06:41 2020 +0200 @@ -157,9 +157,9 @@ template "*", mode="per_page_widget_template"; -reflect:detachable_pages; +debug:detachable_pages; -template "reflect:detachable-pages", mode="debug" { +template "debug:detachable-pages", mode="debug" { | DETACHABLES: foreach "$detachable_elements"{ diff -r 1379cd5c69dd -r 4296ab974d4d svghmi/gen_index_xhtml.xslt --- a/svghmi/gen_index_xhtml.xslt Sat Apr 18 13:14:45 2020 +0200 +++ b/svghmi/gen_index_xhtml.xslt Sat Apr 18 14:06:41 2020 +0200 @@ -1,5 +1,5 @@ - + @@ -157,7 +157,7 @@ - + @@ -178,7 +178,7 @@ - + Raw HMI tree @@ -195,8 +195,8 @@ - - + + ID, x, y, w, h @@ -460,8 +460,8 @@ - - + + DETACHABLES: @@ -590,8 +590,8 @@ - - + + Unlinked : @@ -2079,6 +2079,7 @@ + var hmi_hash = [ ]; @@ -3222,7 +3223,7 @@ }; - + : @@ -3234,6 +3235,7 @@ Made with SVGHMI. https://beremiz.org + diff -r 1379cd5c69dd -r 4296ab974d4d svghmi/gen_index_xhtml.ysl2 --- a/svghmi/gen_index_xhtml.ysl2 Sat Apr 18 13:14:45 2020 +0200 +++ b/svghmi/gen_index_xhtml.ysl2 Sat Apr 18 14:06:41 2020 +0200 @@ -13,12 +13,12 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:xhtml="http://www.w3.org/1999/xhtml" - xmlns:reflect="reflect" + xmlns:debug="debug" /* Our namespace to invoke python code */ xmlns:ns="beremiz" extension-element-prefixes="ns func exsl regexp str dyn" - exclude-result-prefixes="ns str regexp exsl func dyn reflect" { + exclude-result-prefixes="ns str regexp exsl func dyn debug" { const "hmi_elements", "//svg:*[starts-with(@inkscape:label, 'HMI:')]"; @@ -37,7 +37,7 @@ include scripts.ysl2 - template "*[namespace-uri()='reflect']", mode="debug_as_comment" { + template "*[namespace-uri()='debug']", mode="debug_as_comment" { comment { | «local-name()» : apply ".", mode="debug"; @@ -48,7 +48,7 @@ comment > Made with SVGHMI. https://beremiz.org // all debug output from included definitions, as comments - // apply "document('')/*/reflect:*", mode="debug_as_comment"; + // apply "document('')/*/debug:*", mode="debug_as_comment"; html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" diff -r 1379cd5c69dd -r 4296ab974d4d svghmi/geometry.ysl2 --- a/svghmi/geometry.ysl2 Sat Apr 18 13:14:45 2020 +0200 +++ b/svghmi/geometry.ysl2 Sat Apr 18 14:06:41 2020 +0200 @@ -7,10 +7,10 @@ // const "geometry", "ns:GetSVGGeometry()"; -reflect:geometry; +debug:geometry; // Debug data -template "reflect:geometry", mode="debug" { +template "debug:geometry", mode="debug" { | ID, x, y, w, h foreach "$geometry" | «@Id» «@x» «@y» «@w» «@h» diff -r 1379cd5c69dd -r 4296ab974d4d svghmi/hmi_tree.ysl2 --- a/svghmi/hmi_tree.ysl2 Sat Apr 18 13:14:45 2020 +0200 +++ b/svghmi/hmi_tree.ysl2 Sat Apr 18 14:06:41 2020 +0200 @@ -126,7 +126,7 @@ result "$class_a and $class_b and $class_a = $class_b"; } -reflect:hmi_tree; +debug:hmi_tree; // Debug data template "*", mode="testtree"{ @@ -138,7 +138,7 @@ with "indent" value "concat($indent,'>')" }; } -template "reflect:hmi-tree", mode="debug" { +template "debug:hmi-tree", mode="debug" { | Raw HMI tree apply "$hmitree", mode="testtree"; | diff -r 1379cd5c69dd -r 4296ab974d4d svghmi/inline_svg.ysl2 --- a/svghmi/inline_svg.ysl2 Sat Apr 18 13:14:45 2020 +0200 +++ b/svghmi/inline_svg.ysl2 Sat Apr 18 14:06:41 2020 +0200 @@ -115,8 +115,8 @@ const "result_svg" apply "/", mode="inline_svg"; const "result_svg_ns", "exsl:node-set($result_svg)"; -reflect:inline_svg; -template "reflect:inline-svg", mode="debug" { +debug:inline_svg; +template "debug:inline-svg", mode="debug" { | Unlinked : foreach "$to_unlink"{ | «@id»