a.binder 6 jaren geleden
bovenliggende
commit
d269d0db8f

+ 33 - 2
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/GRAFIK_PRACY_view.ditamap

@@ -53,14 +53,21 @@
             <svg-container
                      system_cache__dita__x3A__svg:data.y1.name="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.name"
                     system_cache__dita__x3A__svg:data.y1.value="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.value"
+                    
                     system_cache__dita__x3A__svg:data.y1.label="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.label"
+                    system_cache__dita__x3A__svg:data.y2.label="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y2.label"
                      system_cache__dita__x3A__svg:data.y2.name="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y2.name"
                     system_cache__dita__x3A__svg:data.y2.value="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y2.value"
                      system_cache__dita__x3A__svg:data.x.label="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.label"
                       system_cache__dita__x3A__svg:data.x.name="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.name"
               system_cache__dita__x3A__svg:data.x.name.value="GRAFIK_PRACY_view.raport"
+              system_cache__dita__x3A__svg:xAxis.data.x.name.value="GRAFIK_PRACY_view.raport.xAxis"
                      system_cache__dita__x3A__svg:data.x.value="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value"
               system_cache__dita__x3A__svg:data.x.value.bounds="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value.bounds"
+              system_cache__dita__x3A__svg:data.y.value.bounds="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value.bounds"
+                    system_cache__dita__x3A__svg:data.position="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.data.position"
+                    system_cache__dita__x3A__svg:data.x.value.Yaxis="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value.Yaxis"
+                    system_cache__dita__x3A__svg:data.y.value.Xaxis="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y.value.Xaxis"
               >
             </svg-container>
           <!--</foreign>-->
@@ -136,16 +143,37 @@
                       </ogc:PropertyIsLike>
                     </ogc:And>
                   </simpleTypeMakeOgcFilter>
+                  <foreign rev="just to extra pos for Xaxis1"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.name="GRAFIK_PRACY_view.raport.xAxis"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.data.position="position()"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value.Yaxis="1"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y.value.Xaxis="1"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.label="text()"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.value="text()"
+                    xpath="START_WORK_HOUR"
+                    ></foreign>
+                  <foreign rev="just to extra pos for Xaxis2"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.name="GRAFIK_PRACY_view.raport.xAxis"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.data.position="position()"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value.Yaxis="1"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y.value.Xaxis="1"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.label="text()"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.value="text()"
+                    xpath="END_WORK_HOUR"
+                    ></foreign>
+                  
                   <row 
                     system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.name="GRAFIK_PRACY_view.raport"
-                    
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.data.position="position()"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value.Yaxis="1"
+                    system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y.value.Xaxis="1"
                     >
                     <entry>
                       <sub xpath="DATE" system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.label="text()"/>
                     </entry>
                     <entry xpath="WEEK"
                       system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value="text()"
-                      system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value.bounds="text()"
+                      
                     />
                     <entry>
                       <sub xpath="DAY_OF_WEEK"/>
@@ -157,11 +185,14 @@
                       system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.name="START_WORK_HOUR"
                       >
                       <sub xpath="START_WORK_HOUR" system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.value="text()"
+                        system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.label="text()"
+                        system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value.bounds="text()"
                         />
                     </entry>
                     <entry>
                       <sub xpath="END_WORK_HOUR" system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y2.name="END_WORK_HOUR"
                         system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y2.value="text()"
+                        system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y2.label="text()"
                       />
                     </entry>
                     <entry>

+ 61 - 33
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.ditamap_root.embedded_map.xsl

@@ -26,13 +26,19 @@
         <xsl:param name="system_cache__dita__x3A__svg:data.y1.name" select="@system_cache__dita__x3A__svg:data.y1.name"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.y1.value" select="@system_cache__dita__x3A__svg:data.y1.value"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.y1.label" select="@system_cache__dita__x3A__svg:data.y1.label"/>
+        <xsl:param name="system_cache__dita__x3A__svg:data.y2.label" select="@system_cache__dita__x3A__svg:data.y2.label"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.y2.name" select="@system_cache__dita__x3A__svg:data.y2.name"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.y2.value" select="@system_cache__dita__x3A__svg:data.y2.value"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.label" select="@system_cache__dita__x3A__svg:data.x.label"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name" select="@system_cache__dita__x3A__svg:data.x.name"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name.value" select="@system_cache__dita__x3A__svg:data.x.name.value"/>
+        <xsl:param name="system_cache__dita__x3A__svg:xAxis.data.x.name.value" select="@system_cache__dita__x3A__svg:xAxis.data.x.name.value" />
         <xsl:param name="system_cache__dita__x3A__svg:data.x.value" select="@system_cache__dita__x3A__svg:data.x.value"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.value.bounds" select="@system_cache__dita__x3A__svg:data.x.value.bounds" />
+        <xsl:param name="system_cache__dita__x3A__svg:data.x.value.Yaxis" select="@system_cache__dita__x3A__svg:data.x.value.Yaxis"/>
+        <xsl:param name="system_cache__dita__x3A__svg:data.y.value.Xaxis" select="@system_cache__dita__x3A__svg:data.y.value.Xaxis"/>
+        
+        <xsl:param name="system_cache__dita__x3A__svg:data.position" select="@system_cache__dita__x3A__svg:data.position"/>
         <xsl:param name="system_cache__dita__x3A__svg:width" select="600"/>
         <xsl:param name="system_cache__dita__x3A__svg:height" select="300"/>
         <xsl:param name="system_cache__dita__x3A__svg:offsetY" select="8"/>
@@ -72,6 +78,7 @@
                     system_cache__dita__x3A__svg:data.x.value="{$system_cache__dita__x3A__svg:data.x.value}"
                     system_cache__dita__x3A__svg:data.x.value.bounds="{$system_cache__dita__x3A__svg:data.x.value.bounds}"
                     viewBox="0 0 {$system_cache__dita__x3A__svg:width} {$system_cache__dita__x3A__svg:height.max}"
+                    system_cache__dita__x3A__svg:xAxis.data.x.name.value="{$system_cache__dita__x3A__svg:xAxis.data.x.name.value}"
                     >
                     
                         <xsl:comment>system_cache__dita__x3A__svg:cursor#110</xsl:comment>
@@ -177,17 +184,24 @@
                                 
                                 
                                 
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.name" select="$system_cache__dita__x3A__svg:data.y1.name"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.value" select="$system_cache__dita__x3A__svg:data.y1.value"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.label" select="$system_cache__dita__x3A__svg:data.y1.label"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.name" select="$system_cache__dita__x3A__svg:data.y2.name"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.value" select="$system_cache__dita__x3A__svg:data.y2.value"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="$system_cache__dita__x3A__svg:data.x.label"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="$system_cache__dita__x3A__svg:data.x.name"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="$system_cache__dita__x3A__svg:data.x.name.value"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="$system_cache__dita__x3A__svg:data.x.value"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.name" select="$system_cache__dita__x3A__svg:data.x.name"/><!-- $system_cache__dita__x3A__svg:data.y1.name -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.value" select="$system_cache__dita__x3A__svg:data.position"/><!-- $system_cache__dita__x3A__svg:data.y1.value -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.label" select="$system_cache__dita__x3A__svg:data.position"/><!-- $system_cache__dita__x3A__svg:data.y1.label -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.name" select="$system_cache__dita__x3A__svg:data.x.name"/><!-- $system_cache__dita__x3A__svg:data.y2.name -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.value" select="$system_cache__dita__x3A__svg:data.position"/><!-- $system_cache__dita__x3A__svg:data.y2.value -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="$system_cache__dita__x3A__svg:data.position"/><!-- $system_cache__dita__x3A__svg:data.x.label -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="$system_cache__dita__x3A__svg:data.x.name"/><!-- $system_cache__dita__x3A__svg:data.x.name -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="$system_cache__dita__x3A__svg:data.x.name.value"/><!--  $system_cache__dita__x3A__svg:xAxis.data.x.name.value-->
+                                <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="$system_cache__dita__x3A__svg:data.x.value"/>-->
+                                
                                 
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value.bounds" select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.value" select="$system_cache__dita__x3A__svg:data.y1.value"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.label" select="$system_cache__dita__x3A__svg:data.y2.label"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.value" select="$system_cache__dita__x3A__svg:data.y2.value"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.label" select="$system_cache__dita__x3A__svg:data.y2.label"/>
+                                
+                                
+                                <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.value.bounds" select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>DOTO DISTRUPTS-->
                                 <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.preceding-sibling.fid" select="'system_cache__dita__x3A__svg:data.x.preceding-sibling.fid'"/>-->
                                 <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.following-sibling.fid" select="'system_cache__dita__x3A__svg:data.x.following-sibling.fid'"/>-->
                                 <xsl:with-param name="system_cache__dita__x3A__svg:data.x.self.fid" select="'system_cache__dita__x3A__svg:data.x.self.fid'"/>
@@ -198,7 +212,7 @@
                         
                         <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign">
                             <system_cache__dita__x3A__svg:data.current-group>
-                                <xsl:copy-of select="root()/descendant-or-self::*[@*[name()=$system_cache__dita__x3A__svg:data.x.name ]  and @*[$system_cache__dita__x3A__svg:data.x.name.value ] ]/descendant-or-self::*"/>
+                                <xsl:copy-of select="root()/descendant-or-self::*[@*[name()=$system_cache__dita__x3A__svg:data.x.name ]  and @*[$system_cache__dita__x3A__svg:data.x.name.value or $system_cache__dita__x3A__svg:xAxis.data.x.name.value  ] ]/descendant-or-self::*"/>
                             </system_cache__dita__x3A__svg:data.current-group>
                         </xsl:variable>
                         
@@ -216,21 +230,26 @@
                                 <xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.labelMajor" select="true()"  />
                                 <!--<xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.openData" select="'Open'"/>-->            
                                 
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.name" select="$system_cache__dita__x3A__svg:data.y1.name"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.value" select="$system_cache__dita__x3A__svg:data.y1.value"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.label" select="$system_cache__dita__x3A__svg:data.y1.label"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.name" select="$system_cache__dita__x3A__svg:data.y2.name"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.value" select="$system_cache__dita__x3A__svg:data.y2.value"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="$system_cache__dita__x3A__svg:data.x.label"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.name" select="$system_cache__dita__x3A__svg:data.x.name"/><!-- $system_cache__dita__x3A__svg:data.y1.name -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.value" select="$system_cache__dita__x3A__svg:data.position"/><!-- $system_cache__dita__x3A__svg:data.y1.value -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.label" select="$system_cache__dita__x3A__svg:data.position"/><!-- $system_cache__dita__x3A__svg:data.y1.label -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.name" select="$system_cache__dita__x3A__svg:data.x.name"/><!-- $system_cache__dita__x3A__svg:data.y2.name -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.value" select="$system_cache__dita__x3A__svg:data.position"/><!-- $system_cache__dita__x3A__svg:data.y2.value -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="$system_cache__dita__x3A__svg:data.y2.label"/><!-- $system_cache__dita__x3A__svg:data.x.label -->
                                 <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="$system_cache__dita__x3A__svg:data.x.name"/>-->
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="'system_cache__dita__x3A__svg:data.position'"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="$system_cache__dita__x3A__svg:data.x.name"/><!-- 'system_cache__dita__x3A__svg:data.position' -->
                                 <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="$system_cache__dita__x3A__svg:data.x.name.value"/>
                                 <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="'system_cache__dita__x3A__svg:data.position'"/>-->
                                 
-                                <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="$system_cache__dita__x3A__svg:data.x.value"/>-->
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="'system_cache__dita__x3A__svg:data.position'"/>
+                                    <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="$system_cache__dita__x3A__svg:data.x.value"/>-->
+                                <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="'system_cache__dita__x3A__svg:data.position'"/>-->
+                                
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.value" select="$system_cache__dita__x3A__svg:data.x.value.Yaxis"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.label" select="$system_cache__dita__x3A__svg:data.x.label"/><!-- 'default_db__x3A__BI_audit_BENFORD:NameField.foreign.value' -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.value" select="$system_cache__dita__x3A__svg:data.x.value.Yaxis"/><!-- 'system_cache__dita__x3A__svg:data.y2.value' -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.label" select="$system_cache__dita__x3A__svg:data.x.label"/><!-- 'default_db__x3A__BI_audit_BENFORD:NameField.foreign.value' -->
                                 
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value.bounds" select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>
+                                <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.value.bounds" select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>-->
                                 <xsl:with-param name="system_cache__dita__x3A__svg:offsetX-text-margin" select="6"/>
                                 <xsl:with-param name="system_cache__dita__x3A__svg:text-anchor" select="'end'"/>
                                 <xsl:with-param name="system_cache__dita__x3A__svg:font-size" select="'font-size'"/>
@@ -265,11 +284,11 @@
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="'system_cache__dita__x3A__svg:data.position'"/>-->
                                 
                                 <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="'system_cache__dita__x3A__svg:data.y.BI_audit_ENERGA_FAKTURY.current-grouping-key'"/>-->
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="'system_cache__dita__x3A__svg:data.position'"/><!-- $system_cache__dita__x3A__svg:data.x.label -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="$system_cache__dita__x3A__svg:data.y1.label"/><!-- 'system_cache__dita__x3A__svg:data.position' --><!-- $system_cache__dita__x3A__svg:data.x.label -->
                                 <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="$system_cache__dita__x3A__svg:data.x.name"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="$system_cache__dita__x3A__svg:data.x.name.value"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="$system_cache__dita__x3A__svg:data.x.value"/>
-                                <xsl:with-param name="system_cache__dita__x3A__svg:offsetX-text-margin" select="8"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="$system_cache__dita__x3A__svg:xAxis.data.x.name.value"/><!--$system_cache__dita__x3A__svg:data.x.name.value $system_cache__dita__x3A__svg:data.x.name.value -->
+                                <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="$system_cache__dita__x3A__svg:data.y1.value"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:offsetX-text-margin" select="5"/>
                                 <!--<xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.closeData" select="'Close'"/>-->
                                 <!--<xsl:with-param name=""></xsl:with-param>-->
                             </xsl:call-template>
@@ -280,6 +299,7 @@
                             <xsl:apply-templates mode="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data__x3A__assign" select="$system_cache__dita__x3A__svg:data__x3A__assign">
                                 <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="$system_cache__dita__x3A__svg:data.x.name.value" tunnel="yes" />
                                 <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="$system_cache__dita__x3A__svg:data.x.name" tunnel="yes"/>
+                                <xsl:with-param name="system_cache__dita__x3A__svg:xAxis.data.x.name.value" select="$system_cache__dita__x3A__svg:xAxis.data.x.name.value" tunnel="yes"/>
                             </xsl:apply-templates>
                         </xsl:variable>
                         
@@ -290,11 +310,11 @@
                                     <xsl:with-param name="system_cache__dita__x3A__svg:height__x3A__limit__x3A__validate" select="$system_cache__dita__x3A__svg:height" tunnel="yes"/>
                                     <xsl:with-param name="system_cache__dita__x3A__svg:width__x3A__limit__x3A__validate" select="$system_cache__dita__x3A__svg:width" tunnel="yes"/>
                                     <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region" select="system_cache__dita__x3A__svg:resolution.coordinate.region(system_cache__dita__x3A__svg:resolution.coordinate.region.start())"/>-->
-                                    <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region">system_cache__dita__x3A__svg:esolution.coordinate.region.body</xsl:with-param>-->
+                                    <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region">system_cache__dita__x3A__svg:esolution.coordinate.region.body</xsl:with-param>
                                     <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region.position" select="1"/>-->
                                     <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.id" select="system_cache__dita__x3A__svg:resolution.coordinate.block.hi-lo-chart-1()"/>-->
                                     <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.id" select="system_cache__dita__x3A__svg:resolution.coordinate.block.horizontal-time-activity()"/>-->
-                                    <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.id" select="concat(system_cache__dita__x3A__svg:resolution.coordinate.block.horizontal-time-activity(),'.region_after')"/>-->
+<!--                                    <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.id" select="concat(system_cache__dita__x3A__svg:resolution.coordinate.block.horizontal-time-activity(),'.region_after')"/>-->
                                     <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.id" select="system_cache__dita__x3A__svg:resolution.coordinate.block.total-volume()"/>-->
                                     <xsl:with-param name="system_cache__dita__x3A__svg:data__x3A__assign" select="$system_cache__dita__x3A__svg:data__x3A__assign" tunnel="yes"/>
                                 </xsl:call-template>
@@ -306,7 +326,7 @@
                             <xsl:with-param name="system_cache__dita__x3A__svg:height__x3A__limit__x3A__validate" select="$system_cache__dita__x3A__svg:height" tunnel="yes"/>
                             <xsl:with-param name="system_cache__dita__x3A__svg:width__x3A__limit__x3A__validate" select="$system_cache__dita__x3A__svg:width" tunnel="yes"/>
                             <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region" select="system_cache__dita__x3A__svg:resolution.coordinate.region(system_cache__dita__x3A__svg:resolution.coordinate.region.start())"/>-->
-                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region">system_cache__dita__x3A__svg:esolution.coordinate.region.body</xsl:with-param>-->
+                            <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region">system_cache__dita__x3A__svg:esolution.coordinate.region.body</xsl:with-param>
                             <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region.position" select="1"/>-->
                             <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.id" select="system_cache__dita__x3A__svg:resolution.coordinate.block.hi-lo-chart-1()"/>-->
                             <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.id" select="system_cache__dita__x3A__svg:resolution.coordinate.block.horizontal-time-activity()"/>-->
@@ -326,9 +346,9 @@
                         <xsl:result-document href="{system_cache__dita:xref_result-document('system_cache__dita__x3A__svg.cursor.xml')}">
                             <xsl:copy-of select="$system_cache__dita__x3A__svg:cursor"/>        
                         </xsl:result-document>
-                        <!--<xsl:result-document href="{system_cache__dita:xref_result-document('system_cache__dita__x3A__svg.data__x3A__assign.xml')}">
+                        <xsl:result-document href="{system_cache__dita:xref_result-document('system_cache__dita__x3A__svg.data__x3A__assign.xml')}">
                                 <xsl:copy-of select="$system_cache__dita__x3A__svg:data__x3A__assign"/>        
-                            </xsl:result-document>-->
+                            </xsl:result-document>
                         
                         
                     </svg:g>
@@ -357,10 +377,17 @@
         <xsl:attribute name="{name()}" select="../replace(.,':','')"/>
     </xsl:template>-->
     
+    
+    <xsl:template mode="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data__x3A__assign" match="@system_cache__dita__x3A__svg:GRAFIK_PRACY_view.data.position[ . = 'position()' ]">
+        <xsl:attribute name="{name()}" select="count(parent::*/preceding-sibling::*[@*[name() = current()/name()]])"/>
+    </xsl:template>
+    
     <xsl:template mode="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data__x3A__assign" match="@system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.value[ . = 'text()' ]">
         <xsl:attribute name="{name()}" select="number(../replace(.,':',''))"/>
     </xsl:template>
     
+    
+    
     <xsl:template mode="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data__x3A__assign" match="@system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y2.value[ . = 'text()' ]">
         <xsl:attribute name="{name()}" select="number(../replace(.,':',''))"/>
     </xsl:template>
@@ -370,15 +397,16 @@
     </xsl:template>
     
     <xsl:template mode="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data__x3A__assign" match="@system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.value.bounds[ . = 'text()' ]">
-        <xsl:attribute name="{name()}" select="../number(.)"/>
+        <xsl:attribute name="{name()}" select="number(../replace(.,':',''))"/>
     </xsl:template>
     
     <xsl:template mode="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data__x3A__assign" match="*">
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name.value"  tunnel="yes"  required="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name"  tunnel="yes" required="yes"/>
+        <xsl:param name="system_cache__dita__x3A__svg:xAxis.data.x.name.value" tunnel="yes" required="yes"/>
         <xsl:choose>
-            <xsl:when test="@*[name()=$system_cache__dita__x3A__svg:data.x.name and . = $system_cache__dita__x3A__svg:data.x.name.value]">
-                <system_cache__dita__x3A__svg:relation_DateRangeElements system_cache__dita__x3A__svg:data.position="{count(preceding-sibling::*[@*[name()=$system_cache__dita__x3A__svg:data.x.name and . = $system_cache__dita__x3A__svg:data.x.name.value]])}">
+            <xsl:when test="@*[name()=$system_cache__dita__x3A__svg:data.x.name and ( . = $system_cache__dita__x3A__svg:data.x.name.value or .= $system_cache__dita__x3A__svg:xAxis.data.x.name.value) ]">
+                <system_cache__dita__x3A__svg:relation_DateRangeElements system_cache__dita__x3A__svg:data.position="{count(preceding-sibling::*[@*[name()=$system_cache__dita__x3A__svg:data.x.name and (. = $system_cache__dita__x3A__svg:data.x.name.value or . = $system_cache__dita__x3A__svg:xAxis.data.x.name.value ) ]])}">
                     <xsl:apply-templates mode="#current" select="descendant-or-self::*/@*"/>
                 </system_cache__dita__x3A__svg:relation_DateRangeElements>
             </xsl:when>

+ 13 - 10
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.Hi-Lo-Close.xsl

@@ -12,9 +12,11 @@
     
     <xsl:include href="system_cache__dita__x3A__svg.plot.Hi-Lo-CloseYaxis.xsl"/>
     
-    <xsl:template mode="system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal" match="system_cache__dita__x3A__svg:data.current-group"/>
+    <xsl:template mode="system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal" match="system_cache__dita__x3A__svg:data.current-group">
+        <xsl:message>#16 [WARNING][TEMP]bypassewd[n/[<xsl:value-of select="name()"/>]]</xsl:message>
+    </xsl:template>
     
-    <xsl:template mode="system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal" match="system_cache__dita__x3A__svg:data.current-group[@system_cache__dita__x3A__svg:data.name='relation_DateRangeElements']">
+    <xsl:template mode="system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal" match="system_cache__dita__x3A__svg:data.current-group[@system_cache__dita__x3A__svg:data.name='relation_DateRangeElements' or 1=1]">
         <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.id" tunnel="yes" required="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.block" tunnel="yes" required="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:cursor" tunnel="yes" required="yes"/>
@@ -47,7 +49,7 @@
         <xsl:param name="system_cache__dita__x3A__svg:data.x1.label" tunnel="yes" required="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x2.value" tunnel="yes" required="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x2.label" tunnel="yes" required="yes"/>
-        <xsl:message>#50 system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal n/<xsl:value-of select="name()"/>
+        <xsl:message>#509 system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal n/<xsl:value-of select="name()"/>
             system_cache__dita__x3A__svg:resolution.coordinate.id[<xsl:value-of select="$system_cache__dita__x3A__svg:resolution.coordinate.id"/>]
             system_cache__dita__x3A__svg:resolution.coordinate.block[<xsl:value-of select="$system_cache__dita__x3A__svg:resolution.coordinate.block"/>]
         </xsl:message>
@@ -98,11 +100,12 @@
             </xsl:call-template>
         </xsl:variable>
         <!-- SWAPPING X/Y --><!-- SWAPPING X/Y --><!-- SWAPPING X/Y --><!-- SWAPPING X/Y --><!-- SWAPPING X/Y -->
-        <xsl:message>#37 mode system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal cont/n=<xsl:value-of select="name()"/>; 
+        <xsl:message>#370 mode system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal cont/n=<xsl:value-of select="name()"/>; 
         $system_cache__dita__x3A__svg:data.x.value.bounds = <xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>
             T1 $system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate = <xsl:value-of select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate"/>
             T2 $system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate = <xsl:value-of select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate"/>
-            T3 $system_cache__dita__x3A__svg:data.x1.value = <xsl:value-of select="$system_cache__dita__x3A__svg:data.x1.value"/>
+            T3 $system_cache__dita__x3A__svg:data.x1.value = [<xsl:value-of select="$system_cache__dita__x3A__svg:data.x1.value"/>]
+            T4 $system_cache__dita__x3A__svg:data.x2.value = [<xsl:value-of select="$system_cache__dita__x3A__svg:data.x2.value"/>]
           
             
         </xsl:message>
@@ -338,7 +341,7 @@
             <!-- y1="{$loData[$pos]}" -->
             <!--  x2="{$spacing * $pos}"   -->
             <!-- y2="{current( )}" -->
-            <xsl:if test="$x1Value='' or $x2Value=''"><xsl:message>#859 debug $position==$x1Value==<xsl:value-of select="$x1Value"/>; $x2Value=<xsl:value-of select="$x2Value"/></xsl:message></xsl:if>
+            <xsl:if test="$x1Value='' or $x2Value=''"><xsl:message>#859AA debug $position==$x1Value==<xsl:value-of select="$x1Value"/>; $x2Value=<xsl:value-of select="$x2Value"/></xsl:message></xsl:if>
             <xsl:call-template name="system_cache__dita__x3A__svg:resolution.x">
                 <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.index" select="1"/>
                 <xsl:with-param name="system_cache__dita__x3A__svg:position" select="$x1Value"/>
@@ -677,7 +680,7 @@
                     <!-\-<xsl:with-param name="context" select="$context"/>-\->
                 </xsl:call-template>-->
                     </xsl:attribute>
-                    <xsl:if test="$x2Value=''"><xsl:message>#859 debug $position==$x1Value==<xsl:value-of select="$x2Value"/>;</xsl:message></xsl:if>
+                    <xsl:if test="$x2Value=''"><xsl:message>#859VV debug $position==$x1Value==<xsl:value-of select="$x2Value"/>;</xsl:message></xsl:if>
                     <xsl:call-template name="system_cache__dita__x3A__svg:resolution.x">
                         <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.index" select="''"/>
                         <xsl:with-param name="system_cache__dita__x3A__svg:position" select="$x2Value"/>
@@ -731,7 +734,7 @@
                     <!-- y1="{$loData[$pos]}" -->
                     <!--  x2="{$spacing * $pos}"   -->
                     <!-- y2="{current( )}" -->
-                    <xsl:if test="$x1Value='' or $x2Value=''"><xsl:message>#859 debug $position==$x1Value==<xsl:value-of select="$x1Value"/>; $x2Value=<xsl:value-of select="$x2Value"/></xsl:message></xsl:if>
+                    <xsl:if test="$x1Value='' or $x2Value=''"><xsl:message>#859XX debug $position==$x1Value==<xsl:value-of select="$x1Value"/>; $x2Value=<xsl:value-of select="$x2Value"/></xsl:message></xsl:if>
                     <xsl:call-template name="system_cache__dita__x3A__svg:resolution.x">
                         <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.index" select="1"/>
                         <xsl:with-param name="system_cache__dita__x3A__svg:position" select="$x1Value"/>
@@ -1821,7 +1824,7 @@
                     <!-\-<xsl:with-param name="context" select="$context"/>-\->
                 </xsl:call-template>-->
                     </xsl:attribute>
-                    <xsl:if test="$x2Value=''"><xsl:message>#859 debug $position==$x1Value==<xsl:value-of select="$x2Value"/>;</xsl:message></xsl:if>
+                    <xsl:if test="$x2Value=''"><xsl:message>#859KK debug $position==$x1Value==<xsl:value-of select="$x2Value"/>;</xsl:message></xsl:if>
                     <xsl:call-template name="system_cache__dita__x3A__svg:resolution.x">
                         <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.index" select="''"/>
                         <xsl:with-param name="system_cache__dita__x3A__svg:position" select="$x2Value"/>
@@ -1915,7 +1918,7 @@
                     <!-- y1="{$loData[$pos]}" -->
                     <!--  x2="{$spacing * $pos}"   -->
                     <!-- y2="{current( )}" -->
-                    <xsl:if test="$x1Value='' or $x2Value=''"><xsl:message>#859 debug $position==$x1Value==<xsl:value-of select="$x1Value"/>; $x2Value=<xsl:value-of select="$x2Value"/></xsl:message></xsl:if>
+                    <xsl:if test="$x1Value='' or $x2Value=''"><xsl:message>#859LL debug $position==$x1Value==<xsl:value-of select="$x1Value"/>; $x2Value=<xsl:value-of select="$x2Value"/></xsl:message></xsl:if>
                     <xsl:call-template name="system_cache__dita__x3A__svg:resolution.x">
                         <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.index" select="1"/>
                         <xsl:with-param name="system_cache__dita__x3A__svg:position" select="$x1Value"/>

+ 1 - 1
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.Hi-Lo-CloseYaxis.xsl

@@ -20,7 +20,7 @@
     
     
     
-    <xsl:template mode="system_cache__dita__x3A__svg:openHiLoCloseYaxis__x3A__horizontal" match="system_cache__dita__x3A__svg:data.current-group[@system_cache__dita__x3A__svg:data.name='relation_DateRangeElements' ]">
+    <xsl:template mode="system_cache__dita__x3A__svg:openHiLoCloseYaxis__x3A__horizontal" match="system_cache__dita__x3A__svg:data.current-group[@system_cache__dita__x3A__svg:data.name='relation_DateRangeElements' or 1=1 ]">
         
         
         <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.id" tunnel="yes" required="yes"/>

+ 9 - 2
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.Xaxis.xsl

@@ -255,14 +255,20 @@
                                     <xsl:with-param name="system_cache__dita__x3A__svg:x.count__x3A__read" select="$system_cache__dita__x3A__svg:x.count__x3A__read" tunnel="yes"/>
                                 </xsl:apply-templates>
                         </xsl:variable>
-                    <xsl:message>#240CC now will system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate</xsl:message>
+                    <xsl:message>#240CC now will system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate
+                        [count[$xAxis__x3A__plot][<xsl:value-of select="count($system_cache__dita__x3A__svg:xAxis__x3A__plot//*)"/>]]
+                    </xsl:message>
                     <!--<xsl:copy-of select="$system_cache__dita__x3A__svg:xAxis__x3A__plot"/>-->
-                    <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate">
+                    <!--<DEBUG_AFTER_ELIMINATED_EMPTY></DEBUG_AFTER_ELIMINATED_EMPTY>-->
+                    <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate__x3A__sort">
                         <xsl:with-param name="system_cache__dita__x3A__svg:plot" select="$system_cache__dita__x3A__svg:xAxis__x3A__plot"/>
                     </xsl:call-template>
                     
                 </svg:g>
             </xsl:when>
+            <xsl:otherwise>
+                <xsl:message>#267[OTHERWISE][NOT[$system_cache__dita__x3A__svg:x.count[gt]0]=<xsl:value-of select="$system_cache__dita__x3A__svg:x.count"/>]</xsl:message>
+            </xsl:otherwise>
         </xsl:choose>
         
         
@@ -290,6 +296,7 @@
         <xsl:param name="system_cache__dita__x3A__svg:offsetY.minY" required="yes" tunnel="yes"/>
         
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name.value" required="yes" tunnel="yes"/>
+        
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name" required="yes" tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.label" required="yes" tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.value" required="yes" tunnel="yes"/>

+ 36 - 33
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.complex.test.xsl

@@ -529,6 +529,7 @@
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.label" select="'system_cache__dita__x3A__svg:data.position'"/><!-- system_cache__dita__x3A__svg:data.y1.label -->
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.name" select="'system_cache__dita__x3A__svg:data.name'"/><!-- system_cache__dita__x3A__svg:data.y2.name -->
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.value" select="'system_cache__dita__x3A__svg:data.position'"/><!-- system_cache__dita__x3A__svg:data.y2.value -->
+                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.y.value.bounds" select="'TODO'"/>-->
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="'system_cache__dita__x3A__svg:data.position'"/><!-- system_cache__dita__x3A__svg:data.y2.label -->
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="'system_cache__dita__x3A__svg:data.name'"/>
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="'BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object'"/>
@@ -548,6 +549,38 @@
                                         </xsl:call-template>
                                     </xsl:variable>
                                     
+                                    <xsl:variable name="system_cache__dita__x3A__svg:cursor">
+                                        <xsl:call-template name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object">
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
+                                            <xsl:with-param name="id" select="system_cache__dita__x3A__svg:resolution.coordinate.block.horizontal-time-activity()"/>
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region">system_cache__dita__x3A__svg:esolution.coordinate.region.start</xsl:with-param>
+                                            
+                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.Ydata" select="'Volume'" />-->
+                                            
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.apply-template.mode" select="'system_cache__dita__x3A__svg:openHiLoCloseYaxis__x3A__horizontal'" />
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.apply-template.select.param" select="'system_cache__dita__x3A__svg:data__x3A__assign'" />
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.labelMajor" select="true()"  />
+                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.openData" select="'Open'"/>-->            
+                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.y.value.bounds" select="'TODO'"/>-->
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.name" select="'system_cache__dita__x3A__svg:data.name'"/><!-- 'system_cache__dita__x3A__svg:data.y1.name' -->
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.value" select="'system_cache__dita__x3A__svg:data.position'"/><!-- 'system_cache__dita__x3A__svg:data.position' -->
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.label" select="'system_cache__dita__x3A__svg:data.position'"/><!-- 'system_cache__dita__x3A__svg:data.y1.label' -->
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.name" select="'system_cache__dita__x3A__svg:data.name'"/><!-- 'system_cache__dita__x3A__svg:data.y2.name' -->
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.value" select="'system_cache__dita__x3A__svg:data.position'"/>
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="'system_cache__dita__x3A__svg:data.y2.label'"/><!-- 'system_cache__dita__x3A__svg:data.y2.label' -->
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="'system_cache__dita__x3A__svg:data.name'"/>
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="'BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object'"/>
+                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="'system_cache__dita__x3A__svg:data.position'"/>-->
+                                            
+                                            
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.value" select="'system_cache__dita__x3A__svg:data.y1.value'"/>
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.label" select="'default_db__x3A__BI_audit_BENFORD:NameField.foreign.value'"/>
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.value" select="'system_cache__dita__x3A__svg:data.y1.value'"/><!-- todo cos z lewej zawsze'system_cache__dita__x3A__svg:data.y2.value' -->
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.label" select="'default_db__x3A__BI_audit_BENFORD:NameField.foreign.value'"/>
+                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.closeData" select="'Close'"/>-->
+                                            <!--<xsl:with-param name=""></xsl:with-param>-->
+                                        </xsl:call-template>
+                                    </xsl:variable>
                                     
                                     <xsl:variable name="system_cache__dita__x3A__svg:cursor">
                                         <xsl:call-template name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object">
@@ -566,6 +599,7 @@
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.label" select="'system_cache__dita__x3A__svg:data.y1.label'"/>
                                             <!-- <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.name" select="'system_cache__dita__x3A__svg:data.y2.name'"/>
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.value" select="'system_cache__dita__x3A__svg:data.y2.value'"/>-->
+                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.y.value.bounds" select="'TODO'"/>-->
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="'system_cache__dita__x3A__svg:data.y.BI_audit_ENERGA_RUM_UMOWY.current-grouping-key'"/>
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="'system_cache__dita__x3A__svg:data.y.BI_audit_ENERGA_RUM_UMOWY.data.name'"/>
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="'BI_audit_ENERGA_RUM_UMOWY'"/>
@@ -580,38 +614,7 @@
                                         </xsl:call-template>
                                     </xsl:variable>
                                     
-                                    <xsl:variable name="system_cache__dita__x3A__svg:cursor">
-                                        <xsl:call-template name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object">
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
-                                            <xsl:with-param name="id" select="system_cache__dita__x3A__svg:resolution.coordinate.block.horizontal-time-activity()"/>
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.region">system_cache__dita__x3A__svg:esolution.coordinate.region.start</xsl:with-param>
-                                            
-                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.Ydata" select="'Volume'" />-->
-                                            
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.apply-template.mode" select="'system_cache__dita__x3A__svg:openHiLoCloseYaxis__x3A__horizontal'" />
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.apply-template.select.param" select="'system_cache__dita__x3A__svg:data__x3A__assign'" />
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.labelMajor" select="true()"  />
-                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.openData" select="'Open'"/>-->            
-                                            
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.name" select="'system_cache__dita__x3A__svg:data.name'"/><!-- 'system_cache__dita__x3A__svg:data.y1.name' -->
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.value" select="'system_cache__dita__x3A__svg:data.position'"/><!-- 'system_cache__dita__x3A__svg:data.position' -->
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.label" select="'system_cache__dita__x3A__svg:data.position'"/><!-- 'system_cache__dita__x3A__svg:data.y1.label' -->
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.name" select="'system_cache__dita__x3A__svg:data.name'"/><!-- 'system_cache__dita__x3A__svg:data.y2.name' -->
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.value" select="'system_cache__dita__x3A__svg:data.position'"/>
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x.label" select="'system_cache__dita__x3A__svg:data.y2.label'"/><!-- 'system_cache__dita__x3A__svg:data.y2.label' -->
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="'system_cache__dita__x3A__svg:data.name'"/>
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="'BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object'"/>
-                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="'system_cache__dita__x3A__svg:data.position'"/>-->
-                                            
-                                            
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.value" select="'system_cache__dita__x3A__svg:data.y1.value'"/>
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.label" select="'default_db__x3A__BI_audit_BENFORD:NameField.foreign.value'"/>
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.value" select="'system_cache__dita__x3A__svg:data.y2.value'"/>
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.label" select="'default_db__x3A__BI_audit_BENFORD:NameField.foreign.value'"/>
-                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object.closeData" select="'Close'"/>-->
-                                            <!--<xsl:with-param name=""></xsl:with-param>-->
-                                        </xsl:call-template>
-                                    </xsl:variable>
+                                    
                                     
                                     <!--X07<xsl:variable name="system_cache__dita__x3A__svg:cursor">
                                         <xsl:call-template name="system_cache__dita__x3A__svg:cursor.commit.region.instream-foreign-object">
@@ -670,7 +673,7 @@
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="'BI_audit_ENERGA_FAKTURY'"/>
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="'system_cache__dita__x3A__svg:data.x.BI_audit_ENERGA_FAKTURY.leadingTimeYear-month.value'"/>
                                             <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value.bounds" select="'system_cache__dita__x3A__svg:data.y.bounds.data.value.leadingTimeYear-month.bounds'"/>
-                                            
+                                            <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.y.value.bounds" select="'TODO'"/>-->
                                             <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.y.position" select="system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),system_cache__dita__x3A__svg:resolution.coordinate.data.position())"/>-->
                                             <xsl:with-param name="system_cache__dita__x3A__svg:bars-color" select="'green'"/>
                                             <!--<xsl:with-param name=""></xsl:with-param>-->

+ 2 - 1
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.utils.cursor.region.plot.xsl

@@ -239,6 +239,7 @@
         <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.id" tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.region.position" tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data__x3A__assign" required="yes" tunnel="yes"/>
+       
         <xsl:message>#40-mode-B system_cache__dita__x3A__svg:cursor.region.plot</xsl:message>
         <xsl:comment>#40-mode-B system_cache__dita__x3A__svg:cursor.region.plot
             [<xsl:value-of select="parent::*/parent::*/name()"/>]
@@ -252,7 +253,7 @@
             @system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate = <xsl:value-of select="../@system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate"/>
             @system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate = <xsl:value-of select="../@system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate"/>
             @system_cache__dita__x3A__svg:data.y2.bounds.max.length = <xsl:value-of select="../@system_cache__dita__x3A__svg:data.y2.bounds.max.length"/>
-            
+          
                         
             |[ <xsl:value-of select="../@system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate"/> ] -[ <xsl:value-of select="../@system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate"/> ]
             ########[[ <xsl:value-of select="../@system_cache__dita__x3A__svg:data.x2.bounds.max.length"/> ]]#########

+ 69 - 15
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.utils.data__x3A__read.xsl

@@ -36,7 +36,18 @@
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name" required="yes" tunnel="yes"/>
         <!--<xsl:param name="system_cache__dita__x3A__svg:data.x1.value" tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x2.value" tunnel="yes"/>-->
-        <xsl:value-of select="count(descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name] = $system_cache__dita__x3A__svg:data.x.name.value ])"/>
+        <xsl:variable name="system_cache__dita__x3A__svg:x.count__x3A__read">
+            <xsl:value-of select="count(descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name] = $system_cache__dita__x3A__svg:data.x.name.value ])"/>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$system_cache__dita__x3A__svg:x.count__x3A__read = ''">
+                <xsl:message>#45[ERROR][COUNT][X][data.x.name.value=[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.name.value"/>][$data.x.name=[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.name"/>]]]</xsl:message>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message>#455[OK][COUNT][X][data.x.name.value=[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.name.value"/>][$data.x.name=[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.name"/>]]]==[<xsl:value-of select="$system_cache__dita__x3A__svg:x.count__x3A__read"/>]</xsl:message>
+                <xsl:value-of select="$system_cache__dita__x3A__svg:x.count__x3A__read"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
     
     
@@ -132,13 +143,31 @@
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name" required="yes"  tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x1.value" tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.value.bounds" tunnel="yes"/>
+        
+        
+        
         <xsl:variable name="system_cache__dita__x3A__svg:x.min__x3A__read">
             <xsl:choose>
                 <xsl:when test="$system_cache__dita__x3A__svg:data.x.value.bounds">
-                    <xsl:message>DEB#931[bounds][OVR][X1][MIN][[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>]]</xsl:message>
-                    <xsl:call-template name="system_cache__dita__x3A__svg:bounds.x.min__x3A__read__x3A__tunnel">
-                        <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value.bounds" select="$system_cache__dita__x3A__svg:data.x.value.bounds" tunnel="yes"/>
-                    </xsl:call-template>
+                    <xsl:message>DEB#931[bounds][OVR][X1][MIN][[bounds/n=[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>]]]</xsl:message>
+                    <xsl:variable name="system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read">
+                        <xsl:call-template name="system_cache__dita__x3A__svg:bounds.x.min__x3A__read__x3A__tunnel">
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value.bounds" select="$system_cache__dita__x3A__svg:data.x.value.bounds" tunnel="yes"/>
+                        </xsl:call-template>
+                    </xsl:variable>
+                    <xsl:variable name="system_cache__dita__x3A__svg:x.min__x3A__read">
+                                <xsl:value-of select="min(descendant-or-self::*[ @*[. = $system_cache__dita__x3A__svg:data.x.name.value] ]//@*[ name() = $system_cache__dita__x3A__svg:data.x1.value ])"/>
+                    </xsl:variable>
+                    <xsl:choose>
+                        <xsl:when test="(number($system_cache__dita__x3A__svg:x.min__x3A__read) or $system_cache__dita__x3A__svg:x.min__x3A__read=0 ) and number($system_cache__dita__x3A__svg:x.min__x3A__read) &lt; number($system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read)">
+                            <xsl:message>[X1[WINS=[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read"/>][LESS]][OVER]BONDS]=[<xsl:value-of select="$system_cache__dita__x3A__svg:x.min__x3A__read"/>]</xsl:message>
+                            <xsl:value-of select="$system_cache__dita__x3A__svg:x.min__x3A__read"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:message>[X1[LOST=[<xsl:value-of select="$system_cache__dita__x3A__svg:x.min__x3A__read"/>][LARGER]][OVER][BONDS]]=[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read"/>]</xsl:message>
+                            <xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:choose>
@@ -167,7 +196,8 @@
                         [NOT X and X1 value!]</xsl:text></xsl:otherwise>
                     </xsl:choose>]]</xsl:message>
             </xsl:when>
-            <xsl:otherwise><xsl:value-of select="$system_cache__dita__x3A__svg:x.min__x3A__read"/></xsl:otherwise>
+            <xsl:otherwise><xsl:message>=[<xsl:value-of select="$system_cache__dita__x3A__svg:x.min__x3A__read"/>]</xsl:message>
+                <xsl:value-of select="$system_cache__dita__x3A__svg:x.min__x3A__read"/></xsl:otherwise>
         </xsl:choose>
     </xsl:template>
     
@@ -297,7 +327,23 @@
         <xsl:param name="system_cache__dita__x3A__svg:data.x.value.bounds" tunnel="yes"/>
         <xsl:choose>
             <xsl:when test="$system_cache__dita__x3A__svg:data.x.value.bounds">
-                <xsl:call-template name="system_cache__dita__x3A__svg:bounds.x.max__x3A__read__x3A__tunel"/>
+                <xsl:message>[x2][BOUNDS][OWR]</xsl:message>
+                <xsl:variable name="system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read">
+                    <xsl:call-template name="system_cache__dita__x3A__svg:bounds.x.max__x3A__read__x3A__tunel"/>
+                </xsl:variable>
+                <xsl:variable name="system_cache__dita__x3A__svg:x2.max__x3A__read">
+                            <xsl:value-of select="max(descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name] ]//@*[ name() = $system_cache__dita__x3A__svg:data.x2.value and number(.) and not(.='') ])"/>
+                </xsl:variable>
+                <xsl:choose>
+                    <xsl:when test="(number($system_cache__dita__x3A__svg:x2.max__x3A__read) or $system_cache__dita__x3A__svg:x2.max__x3A__read=0 ) and number($system_cache__dita__x3A__svg:x2.max__x3A__read) &gt; number($system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read)">
+                        <xsl:message>[X2[WINS=[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read"/>][LARGER]][OVER]BONDS]=[<xsl:value-of select="$system_cache__dita__x3A__svg:x2.max__x3A__read"/>]</xsl:message>
+                        <xsl:value-of select="$system_cache__dita__x3A__svg:x2.max__x3A__read"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:message>[X2[LOST=[<xsl:value-of select="$system_cache__dita__x3A__svg:x2.max__x3A__read"/>][SMALLER]][OVER][BONDS]]=[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read"/>]</xsl:message>
+                        <xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds__x3A__read"/>
+                    </xsl:otherwise>
+                </xsl:choose>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:variable name="system_cache__dita__x3A__svg:x2.max__x3A__read">
@@ -846,16 +892,17 @@
             
             <xsl:choose>
                 <xsl:when test="$system_cache__dita__x3A__svg:data.x.value.bounds">
-                    <xsl:text>[F][EXTEND][BOUNDS][data.x.value.bounds][ACTIVE]
-                        [</xsl:text><xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds"/><xsl:text>]</xsl:text>
+                    <xsl:text>
+                        [F][EXTEND][BOUNDS][data.x.value.bounds][ACTIVE]
+                        Bx=[</xsl:text><xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds"/><xsl:text>]</xsl:text>
                 </xsl:when>
             </xsl:choose>
             
             <xsl:choose>
                 <xsl:when test="not($system_cache__dita__x3A__svg:data.x.value='') and $system_cache__dita__x3A__svg:data.x.value">
                     [OK]minX[<xsl:call-template name="system_cache__dita__x3A__svg:x.min__x3A__read__x3A__tunnel">
-                        <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value.bounds" select="$system_cache__dita__x3A__svg:data.x.value.bounds" tunnel="yes"/>
-                    </xsl:call-template>]/()maxX[<xsl:call-template name="system_cache__dita__x3A__svg:x.max__x3A__read__x3A__tunnel"/>]
+                    </xsl:call-template>]/()maxX[<xsl:call-template name="system_cache__dita__x3A__svg:x.max__x3A__read__x3A__tunnel">
+                    </xsl:call-template>]
                 </xsl:when>
             </xsl:choose>
             <xsl:choose>
@@ -880,11 +927,14 @@
                 <xsl:when test="$system_cache__dita__x3A__svg:data.y1__x3A__disabled">
                     <xsl:text>[F][DISABLED][Y1]</xsl:text>
                 </xsl:when>
-                
+                <xsl:when test="not($system_cache__dita__x3A__svg:data.y1.value='')">
+                    <xsl:text>[OK]$data.y1.value[</xsl:text><xsl:value-of select="$system_cache__dita__x3A__svg:data.y1.value"/>]
+                    [INF]minY1[<xsl:call-template name="system_cache__dita__x3A__svg:y1.min__x3A__read__x3A__tunnel"/>]
+                    [INF]y1.count__x3A__read[<xsl:call-template name="system_cache__dita__x3A__svg:y1.count__x3A__read__x3A__tunnel"/>]
+                </xsl:when>
                 <xsl:otherwise>
                     <xsl:text>[INF][NO]$data.y1.value[</xsl:text><xsl:value-of select="$system_cache__dita__x3A__svg:data.y1.value"/>]
-                    [INF]minY1[<xsl:call-template name="system_cache__dita__x3A__svg:y1.min__x3A__read__x3A__tunnel"/>]/
-                    ()y1.count__x3A__read[<xsl:call-template name="system_cache__dita__x3A__svg:y1.count__x3A__read__x3A__tunnel"/>]
+                    
                 </xsl:otherwise>
             </xsl:choose>
             
@@ -902,8 +952,12 @@
                 <xsl:when test="$system_cache__dita__x3A__svg:data.y2__x3A__disabled and $system_cache__dita__x3A__svg:data.y2__x3A__disabled=true()">
                     <xsl:text>[F][DISABLED][Y2]</xsl:text>
                 </xsl:when>
+                <xsl:when test="not($system_cache__dita__x3A__svg:data.y1.value='')">
+                    <xsl:text>[OK]$data.y2.value[</xsl:text><xsl:value-of select="$system_cache__dita__x3A__svg:data.y2.value"/>]
+                    [OK]maxY2[<xsl:call-template name="system_cache__dita__x3A__svg:y2.max__x3A__read__x3A__tunnel"/>]
+                </xsl:when>
                 <xsl:otherwise >
-                    [INF]maxY2[<xsl:call-template name="system_cache__dita__x3A__svg:y2.max__x3A__read__x3A__tunnel"/>]
+                    [INF]maxY2[EMPTY]
                 </xsl:otherwise>
             </xsl:choose>
             

+ 19 - 3
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.utils.translate.xsl

@@ -608,14 +608,15 @@
         <xsl:variable name="system_cache__dita__x3A__svg:plot">
             <xsl:choose>
                 <xsl:when test="$system_cache__dita__x3A__svg:plot/*/system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@xValue__x3A__context.translated.maxX">
-                    
+                        <xsl:message>#500[OK][COLISION][SORT][FOUND[@xValue__x3A__context.translated.maxX]]</xsl:message>
                         <xsl:for-each select="$system_cache__dita__x3A__svg:plot/*">
                             <xsl:sort select="number(system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@xValue__x3A__context.translated)" data-type="number" order="ascending" />
                             <xsl:copy-of select="."/>
+                            <xsl:if test="last()">[last()=[<xsl:value-of select="position()"/>]][SORT]</xsl:if>
                         </xsl:for-each>
-                    
                 </xsl:when>
                 <xsl:otherwise>
+                    <xsl:message>#500[WARN][COLISION][SORT][[NOT]FOUND[@xValue__x3A__context.translated.maxX]]</xsl:message>
                     <xsl:copy-of select="$system_cache__dita__x3A__svg:plot"/>
                 </xsl:otherwise>
             </xsl:choose>
@@ -646,23 +647,36 @@
         <xsl:param name="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position" select="1"/>
         <xsl:choose>
             <xsl:when test="$system_cache__dita__x3A__svg:plot//system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@xValue__x3A__context.translated.maxX">
+                <xsl:message>#500-5[OK][COLISTION][ANAL[FROM[#<xsl:value-of select="$system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position"/>]]]</xsl:message>
                 <xsl:for-each select="$system_cache__dita__x3A__svg:plot/*[ position() = $system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position]">
                     <xsl:variable name="xValue__x3A__context.translated" select="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@xValue__x3A__context.translated/number()"/>
                     <xsl:variable name="xValue__x3A__context.translated.maxX" select="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@xValue__x3A__context.translated.maxX/number()"/>
                     <xsl:variable name="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position__x3A__not_collide" >
+                        <xsl:message>[COL][xValue][T]=[<xsl:value-of select="$xValue__x3A__context.translated"/>]__[xValue[T]maxX==[<xsl:value-of select="$xValue__x3A__context.translated.maxX"/>]]</xsl:message>
                         <system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position__x3A__not_collide>
                             <xsl:for-each select="$system_cache__dita__x3A__svg:plot/*">
                                 <xsl:choose>
-                                    <xsl:when test="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@xValue__x3A__context.translated &gt; $xValue__x3A__context.translated.maxX and position() &gt; $system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position">
+                                    <xsl:when test="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/number(@xValue__x3A__context.translated) &gt; number($xValue__x3A__context.translated.maxX) and position() &gt; number($system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position)">
                                         <position>
                                             <xsl:value-of select="position()"/>
+                                            <!--<xsl:message>#62[OK][COL][FOUND][#<xsl:value-of select="position()"/>][@xValue[T]=[<xsl:value-of select="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@xValue__x3A__context.translated"/>]]</xsl:message>-->
                                         </position>
                                     </xsl:when>
+                                    <xsl:otherwise><!--<xsl:message>#63B[INF][TRIED[[@xValue[T]=[<xsl:value-of select="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@xValue__x3A__context.translated"/>]][#<xsl:value-of select="position()"/>]]</xsl:message>--></xsl:otherwise>
                                 </xsl:choose>
                             </xsl:for-each>
                         </system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position__x3A__not_collide>
                     </xsl:variable>
                     <xsl:variable name="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position__x3A__not_collide" select="$system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position__x3A__not_collide/system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position__x3A__not_collide/position[1]"/>
+                    <xsl:choose>
+                        <xsl:when test="$system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position__x3A__not_collide=''">
+                            <xsl:message>#671E[ERROR][COL][NOT[COLLIDE[[NOT_FOUND]NEXT]=[<xsl:value-of select="$system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position__x3A__not_collide"/>]][FIX[SORT]]]</xsl:message>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:message>#671[INF][COL][NOT[COLLIDE[NEXT]=[<xsl:value-of select="$system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position__x3A__not_collide"/>]]]</xsl:message>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                    
                     <xsl:copy-of select="svg:rect"/>
                     <xsl:copy-of select="svg:line"/>
                     <xsl:copy>
@@ -683,6 +697,8 @@
             <xsl:when test="$system_cache__dita__x3A__svg:plot/*/system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@yValue__x3A__context.translated.maxY">
                 <xsl:comment>#579 mode collisiony pos=<xsl:value-of select="$system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position"/>;
                 </xsl:comment>
+                <xsl:message>#579 mode collisiony pos=<xsl:value-of select="$system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position"/>;
+                </xsl:message>
                 <xsl:for-each select="$system_cache__dita__x3A__svg:plot/*[ system_cache__dita__x3A__svg:transform.translate.text__x3A__collision][ position() = $system_cache__dita__x3A__svg:transform.translate.text__x3A__collision__x3A__eliminate.position]">
                     <xsl:sort select="number(system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@yValue__x3A__context.translated)" data-type="number" order="ascending" />                                      
                     <xsl:variable name="yValue__x3A__context.translated" select="system_cache__dita__x3A__svg:transform.translate.text__x3A__collision/@yValue__x3A__context.translated/number()"/>