beremiz: comparison svghmi/gen_index

equal deleted inserted replaced

-:50d0fef791d5
+:1e9b9d7451cd
 <?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:regexp="http://exslt.org/regular-expressions" xmlns:str="http://exslt.org/strings" xmlns:func="http://exslt.org/functions" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 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:debug="debug" xmlns:preamble="preamble" xmlns:declarations="declarations" xmlns:definitions="definitions" xmlns:epilogue="epilogue" xmlns:ns="beremiz" version="1.0" extension-element-prefixes="ns func exsl regexp str dyn" exclude-result-prefixes="ns func exsl regexp str dyn debug preamble epilogue declarations definitions">
+<xsl:stylesheet xmlns:ns="beremiz" xmlns:definitions="definitions" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:func="http://exslt.org/functions" xmlns:epilogue="epilogue" xmlns:preamble="preamble" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:svg="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:str="http://exslt.org/strings" xmlns:regexp="http://exslt.org/regular-expressions" xmlns:exsl="http://exslt.org/common" xmlns:declarations="declarations" xmlns:debug="debug" exclude-result-prefixes="ns func exsl regexp str dyn debug preamble epilogue declarations definitions" extension-element-prefixes="ns func exsl regexp str dyn" version="1.0">
-<xsl:output cdata-section-elements="xhtml:script" method="xml"/>
+<xsl:output method="xml" cdata-section-elements="xhtml:script"/>
 <xsl:variable name="svg" select="/svg:svg"/>
 <xsl:variable name="hmi_elements" select="//svg:*[starts-with(@inkscape:label, 'HMI:')]"/>
 <xsl:variable name="hmitree" select="ns:GetHMITree()"/>
 <xsl:variable name="_categories">
 <noindex>
 <xsl:otherwise>
 <func:result select="/.."/>
 </xsl:otherwise>
 </xsl:choose>
 </func:function>
-<xsl:variable name="required_elements" select="//svg:defs/descendant-or-self::svg:*&#10;       | func:required_elements($hmi_pages | $keypads)/ancestor-or-self::svg:*"/>
+<xsl:variable name="required_page_elements" select="func:required_elements($hmi_pages | $keypads)/ancestor-or-self::svg:*"/>
+<xsl:variable name="hmi_lists_descs" select="$parsed_widgets/widget[@type = 'List']"/>
+<xsl:variable name="hmi_lists" select="$hmi_elements[@id = $hmi_lists_descs/@id]"/>
+<xsl:variable name="required_list_elements" select="func:refered_elements($hmi_lists[@id = $required_page_elements/@id])"/>
+<xsl:variable name="required_elements" select="//svg:defs/descendant-or-self::svg:*&#10;       | $required_list_elements&#10;       | $required_page_elements"/>
 <xsl:variable name="discardable_elements" select="//svg:*[not(@id = $required_elements/@id)]"/>
 <func:function name="func:sumarized_elements">
 <xsl:param name="elements"/>
 <xsl:variable name="short_list" select="$elements[not(ancestor::*/@id = $elements/@id)]"/>
 <xsl:variable name="filled_groups" select="$short_list/parent::*[&#10;        not(child::*[&#10;            not(@id = $discardable_elements/@id) and&#10;            not(@id = $short_list/@id)&#10;        ])]"/>
 <xsl:template xmlns="http://www.w3.org/2000/svg" mode="inline_svg" match="svg:text/@inkscape:label[starts-with(., '_')]">
 <xsl:attribute name="{name()}">
 <xsl:value-of select="substring(., 2)"/>
 </xsl:attribute>
 </xsl:template>
-<xsl:variable name="hmi_lists_descs" select="$parsed_widgets/widget[@type = 'List']"/>
-<xsl:variable name="hmi_lists" select="$hmi_elements[@id = $hmi_lists_descs/@id]"/>
 <xsl:variable name="targets_not_to_unlink" select="$hmi_lists/descendant-or-self::svg:*"/>
 <xsl:variable name="to_unlink" select="$hmi_elements[not(@id = $hmi_pages/@id)]/descendant-or-self::svg:use"/>
 <func:function name="func:is_unlinkable">
 <xsl:param name="targetid"/>
 <xsl:param name="eltid"/>
 </xsl:text>
 <xsl:text>
 </xsl:text>
 </xsl:template>
 <xsl:variable name="excluded_types" select="str:split('Page VarInit VarInitPersistent')"/>
-<xsl:key name="TypesKey" match="widget" use="@type"/>
+<xsl:key use="@type" name="TypesKey" match="widget"/>
 <declarations:hmi-classes/>
 <xsl:template match="declarations:hmi-classes">
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:text>Made with SVGHMI. https://beremiz.org</xsl:text>
 </xsl:comment>
 <xsl:comment>
 <xsl:apply-templates select="document('')/*/debug:*"/>
 </xsl:comment>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<html xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml">
 <head/>
 <body style="margin:0;overflow:hidden;user-select:none;touch-action:none;">
 <xsl:copy-of select="$result_svg"/>
 <script>
 <xsl:text>

branch	svghmi
changeset 3186	1e9b9d7451cd
parent 3181	50d0fef791d5
child 3187	ba8ff21fd82b