|
|
@@ -19,34 +19,53 @@
|
|
|
</xsl:template>
|
|
|
|
|
|
|
|
|
-
|
|
|
<xsl:template mode="system_cache__dita__x3A__svg:bars" match="*">
|
|
|
+ <xsl:message>#BARS 23 ERROR - expected to parse only system_cache__dita__x3A__svg:data.current-group
|
|
|
+ but matched/n= <xsl:value-of select="name()"/>;
|
|
|
+ </xsl:message>
|
|
|
+ </xsl:template>
|
|
|
+
|
|
|
+ <xsl:template mode="system_cache__dita__x3A__svg:bars" match="system_cache__dita__x3A__svg:data.current-group">
|
|
|
<!--<xsl:param name="system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal" />-->
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.id"/>
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.block"/>
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:cursor"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.id" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.block" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:cursor" tunnel="yes"/>
|
|
|
+
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" required="yes" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" required="yes" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" required="yes" tunnel="yes"/><!-- select="500" -->
|
|
|
+
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" required="yes" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" required="yes" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" required="yes" tunnel="yes"/>
|
|
|
+
|
|
|
+
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y1.name" tunnel="yes" required="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y1.value" tunnel="yes" required="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y1.label" tunnel="yes" required="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y2__x3A__disabled" select="true()" tunnel="yes"/>
|
|
|
+ <!-- <xsl:param name="system_cache__dita__x3A__svg:data.y2.name" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y2.value" tunnel="yes"/>-->
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.x.label" 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:data.x.name.value" tunnel="yes" required="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.x.value" tunnel="yes" required="yes"/>
|
|
|
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" required="yes" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" required="yes" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" required="yes" /><!-- select="500" -->
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.x.value.bounds" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:bars-color" tunnel="yes"/>
|
|
|
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" required="yes" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" required="yes" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" required="yes" />
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:x__x3A__read">
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:x__x3A__read__x3A__tunnel"/>
|
|
|
+ </xsl:param>
|
|
|
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:y__x3A__read">
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:y1__x3A__read__x3A__tunnel"/>
|
|
|
+ </xsl:param>
|
|
|
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y1.name" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y1.value" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y1.label" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y2.name" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y2.value" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x.label" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x.name" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x.name.value" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x.value" />
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:y.count__x3A__read">
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:y1.count__x3A__read__x3A__tunnel"/>
|
|
|
+ </xsl:param>
|
|
|
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x.value.bounds" tunnel="yes"/>
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:bars-color"/>
|
|
|
<xsl:variable name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate + $system_cache__dita__x3A__svg:offsetX.default "/>
|
|
|
<xsl:variable name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate - $system_cache__dita__x3A__svg:offsetY.default "/>
|
|
|
<xsl:variable name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.length - ( 2 * $system_cache__dita__x3A__svg:offsetY.default )"/>
|
|
|
@@ -71,88 +90,107 @@
|
|
|
system_cache__dita__x3A__svg:data.x.name="system_cache__dita__x3A__svg:data.y.BI_audit_ENERGA_RUM_UMOWY.data.name"
|
|
|
system_cache__dita__x3A__svg:data.x.name.value="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object"
|
|
|
system_cache__dita__x3A__svg:data.x.value="system_cache__dita__x3A__svg:data.x.BI_audit_ENERGA_RUM_UMOWY.leadingTimeYear-month.valueY"/>-->
|
|
|
-
|
|
|
- <xsl:variable name="minX">
|
|
|
- <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.min__x3A__read">
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x.bounds.name.value" select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>
|
|
|
- </xsl:call-template>
|
|
|
- </xsl:when>
|
|
|
- <xsl:otherwise >
|
|
|
- <xsl:call-template name="system_cache__dita__x3A__svg:x.min__x3A__read">
|
|
|
- <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" select="$system_cache__dita__x3A__svg:data.x.name"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="$system_cache__dita__x3A__svg:data.x.value"/>
|
|
|
- </xsl:call-template>
|
|
|
- </xsl:otherwise>
|
|
|
-
|
|
|
- </xsl:choose>
|
|
|
+ <xsl:message>#D98 bounmds[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>]</xsl:message>
|
|
|
+ <xsl:variable name="system_cache__dita__x3A__svg:offsetX.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>
|
|
|
</xsl:variable>
|
|
|
+ <xsl:message>#D98[EFO] bounmds[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>]</xsl:message>
|
|
|
|
|
|
+ <xsl:variable name="system_cache__dita__x3A__svg:offsetX.maxX">
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:x.max__x3A__read__x3A__tunnel"/>
|
|
|
+ </xsl:variable>
|
|
|
|
|
|
+ <xsl:variable name="system_cache__dita__x3A__svg:offsetY.minY">
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:y1.min__x3A__read__x3A__tunnel"/>
|
|
|
+ </xsl:variable>
|
|
|
+ <xsl:variable name="system_cache__dita__x3A__svg:offsetY.maxY">
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:y1.max__x3A__read__x3A__tunnel"/>
|
|
|
+ </xsl:variable>
|
|
|
|
|
|
- <xsl:variable name="maxX">
|
|
|
- <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">
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x.bounds.name.value" select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>
|
|
|
- </xsl:call-template>
|
|
|
- </xsl:when>
|
|
|
- <xsl:otherwise >
|
|
|
- <xsl:call-template name="system_cache__dita__x3A__svg:x.max__x3A__read">
|
|
|
- <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" select="$system_cache__dita__x3A__svg:data.x.name"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="$system_cache__dita__x3A__svg:data.x.value"/>
|
|
|
- </xsl:call-template>
|
|
|
- </xsl:otherwise>
|
|
|
+ <xsl:variable name="xScale">
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__extract__scale">
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__extract__scale.x" select="true()"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate"/>
|
|
|
|
|
|
- </xsl:choose>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$system_cache__dita__x3A__svg:offsetX.minX"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$system_cache__dita__x3A__svg:offsetX.maxX"/>
|
|
|
+
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$system_cache__dita__x3A__svg:offsetY.minY"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$system_cache__dita__x3A__svg:offsetY.maxY"/>
|
|
|
+
|
|
|
+ </xsl:call-template>
|
|
|
</xsl:variable>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
<xsl:comment>#58 mode="system_cache__dita__x3A__svg:bars" todo
|
|
|
- $system_cache__dita__x3A__svg:data.x.value.bounds = "<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>"
|
|
|
- T:system_cache__dita__x3A__svg:data.x.name = <xsl:value-of select="concat('system_cache__dita__x3A__svg:data.x.',$system_cache__dita__x3A__svg:data.x.value.bounds,'.data.name')"/>
|
|
|
- T:system_cache__dita__x3A__svg:data.y.name = <xsl:value-of select="concat('system_cache__dita__x3A__svg:data.y.',$system_cache__dita__x3A__svg:data.x.value.bounds,'.data.name')"/>
|
|
|
- T:system_cache__dita__x3A__svg:data.x.value = <xsl:value-of select="concat('system_cache__dita__x3A__svg:data.x.',$system_cache__dita__x3A__svg:data.x.value.bounds,'.value')"/>
|
|
|
-
|
|
|
- $system_cache__dita__x3A__svg:data.x.name.value = <xsl:value-of select="$system_cache__dita__x3A__svg:data.x.name.value"/>
|
|
|
- $system_cache__dita__x3A__svg:data.x.name = <xsl:value-of select="$system_cache__dita__x3A__svg:data.x.name"/>
|
|
|
- $system_cache__dita__x3A__svg:data.x.value = <xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value"/>
|
|
|
- $system_cache__dita__x3A__svg:data.y1.value = <xsl:value-of select="$system_cache__dita__x3A__svg:data.y1.value"/>
|
|
|
- $minX = <xsl:value-of select="$minX"/> ;
|
|
|
- $maxX = <xsl:value-of select="$maxX"/> ;
|
|
|
- count(dataX)=[<xsl:value-of select="count(descendant-or-self::*[ @*[ name()=$system_cache__dita__x3A__svg:data.x.name and . = $system_cache__dita__x3A__svg:data.x.name.value]]/@*[ name() = $system_cache__dita__x3A__svg:data.x.value])"/>]
|
|
|
- count(dataY)=[<xsl:value-of select="count(descendant-or-self::*[ @*[ name()=$system_cache__dita__x3A__svg:data.x.name and . = $system_cache__dita__x3A__svg:data.x.name.value]]/@*[ name() = $system_cache__dita__x3A__svg:data.y1.value])"/>]
|
|
|
+ $xScale = [<xsl:value-of select="$xScale"/>]
|
|
|
+ $system_cache__dita__x3A__svg:y.count__x3A__read = <xsl:value-of select="$system_cache__dita__x3A__svg:y.count__x3A__read"/>
|
|
|
|
|
|
</xsl:comment>
|
|
|
|
|
|
- <xsl:message>#101 bars $minX = <xsl:value-of select="$minX"/>; count(dataX)=[<xsl:value-of select="count(descendant-or-self::*[ @*[ name()=$system_cache__dita__x3A__svg:data.x.name and . = $system_cache__dita__x3A__svg:data.x.name.value]]/@*[ name() = $system_cache__dita__x3A__svg:data.x.value])"/>]</xsl:message>
|
|
|
+
|
|
|
+
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:data.debug">
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.y2__x3A__disabled" select="$system_cache__dita__x3A__svg:data.y2__x3A__disabled" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$system_cache__dita__x3A__svg:offsetX.minX" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$system_cache__dita__x3A__svg:offsetX.maxX" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$system_cache__dita__x3A__svg:offsetY.minY" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$system_cache__dita__x3A__svg:offsetY.maxY" tunnel="yes"/>
|
|
|
+ </xsl:call-template>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<xsl:choose>
|
|
|
<xsl:when test="descendant-or-self::*[ @*[ name()=$system_cache__dita__x3A__svg:data.x.name and . = $system_cache__dita__x3A__svg:data.x.name.value]]/@*[ name() = $system_cache__dita__x3A__svg:data.y1.value]">
|
|
|
- <xsl:call-template name="system_cache__dita__x3A__svg:bars">
|
|
|
+
|
|
|
+
|
|
|
+ <svg:g
|
|
|
+ system_cache__dita__x3A__svg:debug="svgu:bars.63 $maxY={$system_cache__dita__x3A__svg:offsetY.maxY} $width={$system_cache__dita__x3A__svg:data.x2.bounds.max.length} cursor.current.height={$system_cache__dita__x3A__svg:data.y2.bounds.max.length} "
|
|
|
+ >
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.bounds">
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate"/>
|
|
|
+
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$system_cache__dita__x3A__svg:offsetX.minX"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$system_cache__dita__x3A__svg:offsetX.maxX"/>
|
|
|
+
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$system_cache__dita__x3A__svg:offsetY.minY"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$system_cache__dita__x3A__svg:offsetY.maxY"/>
|
|
|
+
|
|
|
+ </xsl:call-template>
|
|
|
+
|
|
|
+ <xsl:apply-templates mode="system_cache__dita__x3A__svg:bars">
|
|
|
<!--<xsl:with-param name="system_cache__dita__x3A__svg:openHiLoClose__x3A__horizontal" select="true()" tunnel="yes"/>-->
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.id" select="$system_cache__dita__x3A__svg:resolution.coordinate.id"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.block" select="$system_cache__dita__x3A__svg:resolution.coordinate.block"/>
|
|
|
+ <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.id" select="$system_cache__dita__x3A__svg:resolution.coordinate.id"/>-->
|
|
|
+ <!--<xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.block" select="$system_cache__dita__x3A__svg:resolution.coordinate.block"/>-->
|
|
|
<!--<xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>-->
|
|
|
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" />
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" />
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.length" /><!-- select="500" -->
|
|
|
+ <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" />-->
|
|
|
+ <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" />-->
|
|
|
+ <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.length" />--><!-- select="500" -->
|
|
|
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" />
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" />
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.length" />
|
|
|
- <xsl:with-param name="dataY" select="descendant-or-self::*[ @*[ name()=$system_cache__dita__x3A__svg:data.x.name and . = $system_cache__dita__x3A__svg:data.x.name.value]]/@*[ name() = $system_cache__dita__x3A__svg:data.y1.value]"/>
|
|
|
- <xsl:with-param name="dataX" select="descendant-or-self::*[ @*[ name()=$system_cache__dita__x3A__svg:data.x.name and . = $system_cache__dita__x3A__svg:data.x.name.value]]/@*[ name() = $system_cache__dita__x3A__svg:data.x.value]"/>
|
|
|
+ <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" />
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" />-->
|
|
|
+ <!--<xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.length" />-->
|
|
|
+ <xsl:with-param name="dataY" select="$system_cache__dita__x3A__svg:y__x3A__read" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="dataX" select="$system_cache__dita__x3A__svg:x__x3A__read" tunnel="yes"/>
|
|
|
|
|
|
- <xsl:with-param name="minX" select="$minX"/>
|
|
|
- <xsl:with-param name="maxX" select="$maxX"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:bars-color" select="$system_cache__dita__x3A__svg:bars-color"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$system_cache__dita__x3A__svg:offsetX.minX" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$system_cache__dita__x3A__svg:offsetX.maxX" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$system_cache__dita__x3A__svg:offsetY.maxY" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$system_cache__dita__x3A__svg:offsetY.minY" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="xScale" select="$xScale" tunnel="yes"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:y.count__x3A__read" select="$system_cache__dita__x3A__svg:y.count__x3A__read" tunnel="yes"/>
|
|
|
+ <!--<xsl:with-param name="system_cache__dita__x3A__svg:bars-color" select="$system_cache__dita__x3A__svg:bars-color"/>-->
|
|
|
|
|
|
- </xsl:call-template>
|
|
|
+ </xsl:apply-templates>
|
|
|
+ </svg:g>
|
|
|
</xsl:when>
|
|
|
<xsl:otherwise>
|
|
|
<xsl:comment>E95 empty set for descendant-or-self::*[ @*[ name()=$system_cache__dita__x3A__svg:data.x.name and . = $system_cache__dita__x3A__svg:data.x.name.value]]/@*[ name() = $system_cache__dita__x3A__svg:data.y1.value] </xsl:comment>
|
|
|
@@ -170,123 +208,97 @@
|
|
|
</xsl:template>
|
|
|
|
|
|
|
|
|
- <xsl:template name="system_cache__dita__x3A__svg:bars">
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.block" required="no"/>
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.id" required="no"/>
|
|
|
+ <xsl:template mode="system_cache__dita__x3A__svg:bars" match="*">
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.block" tunnel="yes" required="no"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:resolution.coordinate.id" required="no" tunnel="yes"/>
|
|
|
<!--<xsl:param name="dataX" required="yes" />--> <!-- x values select="/.." -->
|
|
|
- <xsl:param name="dataY" required="yes" /><!-- select="/.." -->
|
|
|
+ <xsl:param name="dataY" required="yes" tunnel="yes"/><!-- select="/.." -->
|
|
|
<xsl:param name="context" select="'bars_context_unset'"/>
|
|
|
- <xsl:param name="dataX"/>
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" required="yes" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" required="yes" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" required="yes" /><!-- select="500" -->
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y2__x3A__disabled" tunnel="yes" select="true()"/>
|
|
|
+ <xsl:param name="dataX" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" required="yes" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" required="yes" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" required="yes" tunnel="yes"/><!-- select="500" -->
|
|
|
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" required="yes" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" required="yes" />
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" required="yes" />
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" required="yes" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" required="yes" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" required="yes" tunnel="yes"/>
|
|
|
|
|
|
<!--<xsl:param name="height" required="yes"/>--><!-- select="500" -->
|
|
|
<xsl:param name="boundingBox" select="false( )"/>
|
|
|
<xsl:param name="barLabel" select="false( )"/>
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:colors" select="$system_cache__dita__x3A__svg:colors.default"></xsl:param>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:colors" select="$system_cache__dita__x3A__svg:colors.default" tunnel="yes"></xsl:param>
|
|
|
<xsl:param name="system_cache__dita__x3A__svg:data.x.value.bounds" tunnel="yes"/>
|
|
|
- <xsl:param name="system_cache__dita__x3A__svg:bars-color"/>
|
|
|
- <xsl:param name="minX" >
|
|
|
- <xsl:choose>
|
|
|
- <xsl:when test="$dataX">
|
|
|
- <xsl:call-template name="system_cache__dita__x3A__svg:emath.min">
|
|
|
- <xsl:with-param name="nodes" select="$dataX"/>
|
|
|
- </xsl:call-template>
|
|
|
- </xsl:when>
|
|
|
- <xsl:otherwise><xsl:value-of select="0"/></xsl:otherwise>
|
|
|
- </xsl:choose>
|
|
|
- </xsl:param>
|
|
|
-
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:bars-color" tunnel="yes"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:offsetX.minX" tunnel="yes" required="yes"/>
|
|
|
+
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:offsetY.minY" select="0" tunnel="yes"/>
|
|
|
|
|
|
|
|
|
+
|
|
|
+ <xsl:param name="barWidth" select="5" tunnel="yes"/>
|
|
|
+ <xsl:param name="orientation" select="0" tunnel="yes"/>
|
|
|
|
|
|
- <xsl:param name="minY" select="0">
|
|
|
- <!--<xsl:call-template name="system_cache__dita__x3A__svg:emath.min">
|
|
|
- <xsl:with-param name="nodes" select="$dataY"/>
|
|
|
- </xsl:call-template>-->
|
|
|
- </xsl:param>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- <xsl:param name="barWidth" select="5"/>
|
|
|
|
|
|
- <xsl:param name="orientation" select="0"/>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- <!--<xsl:param name="maxX" select="count($dataY)"/>-->
|
|
|
-
|
|
|
-
|
|
|
- <xsl:param name="maxX" >
|
|
|
- <xsl:choose>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:offsetX.maxX" tunnel="yes" required="yes">
|
|
|
+ <!--<xsl:choose>
|
|
|
<xsl:when test="$dataX">
|
|
|
<xsl:call-template name="system_cache__dita__x3A__svg:emath.max">
|
|
|
<xsl:with-param name="nodes" select="$dataX"/>
|
|
|
</xsl:call-template>
|
|
|
</xsl:when>
|
|
|
<xsl:otherwise><xsl:value-of select="(number($system_cache__dita__x3A__svg:data.x2.bounds.max.length) div (count($dataY) + 1)) * count($dataY)"/></xsl:otherwise>
|
|
|
- </xsl:choose>
|
|
|
+ </xsl:choose>-->
|
|
|
|
|
|
</xsl:param>
|
|
|
|
|
|
- <!--<xsl:variable name="Yrange" select="$maxY - $minY"/>-->
|
|
|
|
|
|
-
|
|
|
|
|
|
- <xsl:param name="maxY">
|
|
|
- <xsl:call-template name="system_cache__dita__x3A__svg:emath.max">
|
|
|
- <xsl:with-param name="nodes" select="$dataY"/>
|
|
|
- </xsl:call-template>
|
|
|
- </xsl:param>
|
|
|
-
|
|
|
-
|
|
|
- <xsl:variable name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate + $system_cache__dita__x3A__svg:offsetX.default "/>
|
|
|
- <xsl:variable name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate - $system_cache__dita__x3A__svg:offsetY.default "/>
|
|
|
- <xsl:variable name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.length - ( 2 * $system_cache__dita__x3A__svg:offsetY.default )"/>
|
|
|
+
|
|
|
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:offsetY.maxY" tunnel="yes" required="yes"/>
|
|
|
+
|
|
|
|
|
|
- <xsl:variable name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate + $system_cache__dita__x3A__svg:offsetY.default "/>
|
|
|
- <xsl:variable name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate - $system_cache__dita__x3A__svg:offsetY.default "/>
|
|
|
- <xsl:variable name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.length - ( 2 * $system_cache__dita__x3A__svg:offsetY.default )"/>
|
|
|
|
|
|
- <!--<xsl:variable name="Yrange" select="$maxY - $minY"/>-->
|
|
|
|
|
|
<!--<xsl:param name="barWidth" select="5"/>-->
|
|
|
- <xsl:variable name="numBars" select="count($dataY)"/>
|
|
|
- <xsl:variable name="spacing" select="number($system_cache__dita__x3A__svg:data.x2.bounds.max.length) div (count($dataY) + 1)"/><!-- select="$width div ($numBars + 1)" -->
|
|
|
- <xsl:variable name="xScale">
|
|
|
- <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__extract__scale">
|
|
|
+
|
|
|
+ <xsl:param name="xScale" required="yes" tunnel="yes">
|
|
|
+ <!--<xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__extract__scale">
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__extract__scale.x" select="true()"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate"/>
|
|
|
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$minX"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$maxX"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$system_cache__dita__x3A__svg:offsetX.minX"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$system_cache__dita__x3A__svg:offsetX.maxX"/>
|
|
|
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$minY"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$maxY"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$system_cache__dita__x3A__svg:offsetY.minY"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$system_cache__dita__x3A__svg:offsetY.maxY"/>
|
|
|
|
|
|
- </xsl:call-template>
|
|
|
- </xsl:variable>
|
|
|
+ </xsl:call-template>-->
|
|
|
+ </xsl:param>
|
|
|
+
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:y.count__x3A__read" required="yes" tunnel="yes" /><!-- select="count($dataY)" -->
|
|
|
+
|
|
|
+
|
|
|
+ <xsl:variable name="spacing" select="number($system_cache__dita__x3A__svg:data.x2.bounds.max.length) div (count($dataY) + 1)"/><!-- select="$width div ($numBars + 1)" -->
|
|
|
+
|
|
|
<xsl:variable name="barWidth" select="$barWidth div $xScale"/>
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:data.debug__x3A__row"/>
|
|
|
+ <xsl:message>#326 debug $system_cache__dita__x3A__svg:offsetX.minX[<xsl:value-of select="$system_cache__dita__x3A__svg:offsetX.minX"/>]
|
|
|
+ $system_cache__dita__x3A__svg:offsetX.maxX[<xsl:value-of select="$system_cache__dita__x3A__svg:offsetX.maxX"/>]</xsl:message>
|
|
|
<xsl:comment>
|
|
|
- #184 $numBars = <xsl:value-of select="$numBars"/>
|
|
|
- $maxY = <xsl:value-of select="$maxY"/> ; $minY = <xsl:value-of select="$minY"/> ;
|
|
|
- $maxX = <xsl:value-of select="$maxX"/> ; $minX = <xsl:value-of select="$minX"/> ;
|
|
|
+ #184 $system_cache__dita__x3A__svg:y.count__x3A__read = <xsl:value-of select="$system_cache__dita__x3A__svg:y.count__x3A__read"/>
|
|
|
+ $system_cache__dita__x3A__svg:offsetY.maxY = <xsl:value-of select="$system_cache__dita__x3A__svg:offsetY.maxY"/> ; $system_cache__dita__x3A__svg:offsetY.minY = <xsl:value-of select="$system_cache__dita__x3A__svg:offsetY.minY"/> ;
|
|
|
+ $system_cache__dita__x3A__svg:offsetX.maxX = <xsl:value-of select="$system_cache__dita__x3A__svg:offsetX.maxX"/> ; $system_cache__dita__x3A__svg:offsetX.minX = <xsl:value-of select="$system_cache__dita__x3A__svg:offsetX.minX"/> ;
|
|
|
$dataY[1]/n = <xsl:value-of select="$dataY[1]/name()"/> /v =<xsl:value-of select="$dataY[1]"/>
|
|
|
$barWidth = <xsl:value-of select="$barWidth"/> - propos <xsl:value-of select="$barWidth div $xScale"/>
|
|
|
- $spacing = <xsl:value-of select="$spacing"/> ; $numBars = <xsl:value-of select="$numBars"/>
|
|
|
+ $spacing = <xsl:value-of select="$spacing"/> ; $system_cache__dita__x3A__svg:y.count__x3A__read = <xsl:value-of select="$system_cache__dita__x3A__svg:y.count__x3A__read"/>
|
|
|
$xScale = <xsl:value-of select="$xScale"/>
|
|
|
$system_cache__dita__x3A__svg:data.x.value.bounds = <xsl:value-of select="$system_cache__dita__x3A__svg:data.x.value.bounds"/>
|
|
|
|
|
|
@@ -305,7 +317,7 @@
|
|
|
</xsl:comment>
|
|
|
|
|
|
|
|
|
- <!-- select="$width div ($numBars + 1)" -->
|
|
|
+ <!-- select="$width div ($system_cache__dita__x3A__svg:y.count__x3A__read + 1)" -->
|
|
|
|
|
|
|
|
|
<xsl:if test="number($system_cache__dita__x3A__svg:debug.level) > 10">
|
|
|
@@ -324,63 +336,24 @@
|
|
|
</xsl:if>
|
|
|
<!-- We change the data order to compensate for rotation -->
|
|
|
<!-- See sort below -->
|
|
|
- <xsl:variable name="data-order">
|
|
|
- <xsl:choose>
|
|
|
- <xsl:when test="number($orientation) mod 360 >= 180">ascending</xsl:when>
|
|
|
- <xsl:otherwise>descending</xsl:otherwise>
|
|
|
- </xsl:choose>
|
|
|
- </xsl:variable>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- <svg:g
|
|
|
- system_cache__dita__x3A__svg:debug="svgu:bars.63 $maxY={$maxY} $width={$system_cache__dita__x3A__svg:data.x2.bounds.max.length} cursor.current.height={$system_cache__dita__x3A__svg:data.y2.bounds.max.length} "
|
|
|
- >
|
|
|
- <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.bounds">
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate"/>
|
|
|
-
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$minX"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$maxX"/>
|
|
|
-
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$minY"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$maxY"/>
|
|
|
-
|
|
|
- </xsl:call-template>
|
|
|
- <!-- transform="translate({$offsetX},{$offsetY})
|
|
|
- translate({number($width) div 2},{number($system_cache__dita__x3A__svg:cursor.current.height) div 2})
|
|
|
- rotate({number($orientation) - 180})
|
|
|
- translate({-number($width) div 2},{-number($system_cache__dita__x3A__svg:cursor.current.height) div 2})
|
|
|
- scale(1,-{number($system_cache__dita__x3A__svg:cursor.current.height) div $maxY})" -->
|
|
|
- <xsl:for-each select="$dataY">
|
|
|
+
|
|
|
+ <!--<xsl:for-each select="$dataY">-->
|
|
|
<!-- We use a sort on position to traverse the data in reverse -->
|
|
|
<!-- when necessary. -->
|
|
|
<!--<xsl:sort select="position( )" data-type="number"
|
|
|
order="{$data-order}"/>-->
|
|
|
|
|
|
- <xsl:variable name="pos" select="position( )"/>
|
|
|
+ <!--<xsl:variable name="pos" select="position( )"/>-->
|
|
|
<xsl:variable name="x1Value">
|
|
|
- <xsl:choose>
|
|
|
- <xsl:when test="$dataX and count($dataY) = count($dataX)">
|
|
|
- <xsl:value-of select="$dataX[$pos]"/>
|
|
|
- </xsl:when>
|
|
|
- <xsl:otherwise>
|
|
|
- <xsl:value-of select="$spacing * $pos"/>
|
|
|
- </xsl:otherwise>
|
|
|
- </xsl:choose>
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:x__x3A__read__x3A__tunnel"/>
|
|
|
</xsl:variable>
|
|
|
- <xsl:variable name="x2Value">
|
|
|
- <xsl:choose>
|
|
|
- <xsl:when test="$dataX and count($dataY) = count($dataX)">
|
|
|
- <xsl:value-of select="$dataX[$pos] "/>
|
|
|
- </xsl:when>
|
|
|
- <xsl:otherwise>
|
|
|
- <xsl:value-of select="$spacing * $pos"/>
|
|
|
- </xsl:otherwise>
|
|
|
- </xsl:choose>
|
|
|
+ <xsl:variable name="x2Value"><!-- TODO CALCULATE TEMPLATE SINGLE -->
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:x__x3A__read__x3A__tunnel"/>
|
|
|
+ </xsl:variable>
|
|
|
+
|
|
|
+ <xsl:variable name="yValue">
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:y1__x3A__read__x3A__tunnel"/>
|
|
|
</xsl:variable>
|
|
|
|
|
|
|
|
|
@@ -392,49 +365,34 @@
|
|
|
><!--y2="{system_cache__dita__x3A__svg:format-number(current( ))}" id="{$system_cache__dita__x3A__svg:resolution.coordinate.block}_bar_{$pos}" -->
|
|
|
<xsl:attribute name="y2">
|
|
|
<xsl:call-template name="system_cache__dita__x3A__svg:format-number">
|
|
|
- <xsl:with-param name="number" select="current()"/>
|
|
|
+ <xsl:with-param name="number" select="$yValue"/>
|
|
|
</xsl:call-template>
|
|
|
</xsl:attribute>
|
|
|
<xsl:attribute name="style">
|
|
|
<xsl:value-of select="concat('stroke-width: ',$barWidth,'; ')"/>
|
|
|
<xsl:call-template name="svgu:barStyle">
|
|
|
- <xsl:with-param name="pos" select="$pos"/>
|
|
|
+ <!--<xsl:with-param name="pos" select="$pos"/>--><!-- different color set -->
|
|
|
<!--<xsl:with-param name="context" select="$context"/>-->
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:colors" select="$system_cache__dita__x3A__svg:colors" tunnel="yes"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:bars-color" select="$system_cache__dita__x3A__svg:bars-color"/>
|
|
|
</xsl:call-template>
|
|
|
</xsl:attribute>
|
|
|
<xsl:attribute name="system_cache__dita__x3A__svg:transform.validate.y.{current( )}">
|
|
|
- <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__debug">
|
|
|
- <xsl:with-param name="yValue" select="current( )"/>
|
|
|
+ <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__debug__x3A__tunnel">
|
|
|
+ <xsl:with-param name="yValue" select="$yValue"/>
|
|
|
<xsl:with-param name="xValue" select="$x1Value"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__debug.write" select="true()"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__debug.y" select="true()"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$minX"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$maxX"/>
|
|
|
-
|
|
|
-
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate"/>
|
|
|
-
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.length"/>
|
|
|
-
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$minY"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$maxY"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.length"/>
|
|
|
-
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate"/>
|
|
|
</xsl:call-template>
|
|
|
</xsl:attribute>
|
|
|
- <xsl:attribute name="system_cache__dita__x3A__svg:transform.validate.x.{current( )}">
|
|
|
+ <!--<xsl:attribute name="system_cache__dita__x3A__svg:transform.validate.x.{current( )}">
|
|
|
<xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__debug">
|
|
|
- <xsl:with-param name="yValue" select="current( )"/>
|
|
|
+ <xsl:with-param name="yValue" select="$yValue"/>
|
|
|
<xsl:with-param name="xValue" select="$x1Value"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__debug.write" select="true()"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:transform.translate.bounds__x3A__debug.x" select="true()"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$minX"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$maxX"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$system_cache__dita__x3A__svg:offsetX.minX"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$system_cache__dita__x3A__svg:offsetX.maxX"/>
|
|
|
|
|
|
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate"/>
|
|
|
@@ -442,14 +400,14 @@
|
|
|
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.length"/>
|
|
|
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$minY"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$maxY"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$system_cache__dita__x3A__svg:offsetY.minY"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$system_cache__dita__x3A__svg:offsetY.maxY"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.length"/>
|
|
|
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate"/>
|
|
|
</xsl:call-template>
|
|
|
- </xsl:attribute>
|
|
|
+ </xsl:attribute>-->
|
|
|
</svg:line>
|
|
|
|
|
|
<!-- If user requests bar labels we position a text value -->
|
|
|
@@ -457,15 +415,15 @@
|
|
|
<!-- transformations is used to make the text display correctly -->
|
|
|
<!-- despite the rotations and scalings to the coordinate system -->
|
|
|
<xsl:if test="$barLabel">
|
|
|
- <svg:text x="{number($pos)}"
|
|
|
- y="{number(current( )) * (number($system_cache__dita__x3A__svg:data.y2.bounds.max.length) div number($maxY))}"
|
|
|
- transform="scale(1,{number($maxY) div number($system_cache__dita__x3A__svg:data.y2.bounds.max.length)})
|
|
|
+ <!--<svg:text x="{number($pos)}"
|
|
|
+ y="{number(current( )) * (number($system_cache__dita__x3A__svg:data.y2.bounds.max.length) div number($system_cache__dita__x3A__svg:offsetY.maxY))}"
|
|
|
+ transform="scale(1,{number($system_cache__dita__x3A__svg:offsetY.maxY) div number($system_cache__dita__x3A__svg:data.y2.bounds.max.length)})
|
|
|
translate(0,10)
|
|
|
translate({number($pos)},{current( ) *
|
|
|
- (number($system_cache__dita__x3A__svg:data.y2.bounds.max.length) div number($maxY))})
|
|
|
+ (number($system_cache__dita__x3A__svg:data.y2.bounds.max.length) div number($system_cache__dita__x3A__svg:offsetY.maxY))})
|
|
|
rotate({180 - number($orientation)})
|
|
|
translate({- number($pos)},
|
|
|
- {-current( ) * (number($system_cache__dita__x3A__svg:data.y2.bounds.max.length) div number($maxY))})"
|
|
|
+ {-current( ) * (number($system_cache__dita__x3A__svg:data.y2.bounds.max.length) div number($system_cache__dita__x3A__svg:offsetY.maxY))})"
|
|
|
id="{$context}_barLabel_{$pos}">
|
|
|
<xsl:attribute name="style">
|
|
|
<xsl:call-template name="svgu:barLabelStyle">
|
|
|
@@ -474,16 +432,16 @@
|
|
|
</xsl:call-template>
|
|
|
</xsl:attribute>
|
|
|
<xsl:value-of select="."/>
|
|
|
- </svg:text>
|
|
|
+ </svg:text>-->
|
|
|
</xsl:if>
|
|
|
- </xsl:for-each>
|
|
|
- </svg:g>
|
|
|
+ <!--</xsl:for-each>-->
|
|
|
+
|
|
|
|
|
|
</xsl:template>
|
|
|
|
|
|
|
|
|
- <xsl:template name="svgu:bars">
|
|
|
- <xsl:param name="data" required="yes" /> <!--select="/.." data to chart -->
|
|
|
+ <!--<xsl:template name="svgu:bars">
|
|
|
+ <xsl:param name="data" required="yes" /> <!-\-select="/.." data to chart -\->
|
|
|
<xsl:param name="width" required="yes"/>
|
|
|
<xsl:param name="system_cache__dita__x3A__svg:cursor.current.height" required="yes"/>
|
|
|
<xsl:param name="orientation" select="0"/>
|
|
|
@@ -492,11 +450,11 @@
|
|
|
<xsl:param name="offsetY" select="0"/>
|
|
|
<xsl:param name="boundingBox" select="false( )"/>
|
|
|
<xsl:param name="barLabel" select="false( )"/>
|
|
|
- <!--<xsl:param name="max">
|
|
|
+ <!-\-<xsl:param name="max">
|
|
|
<xsl:call-template name="system_cache__dita__x3A__svg:emath.max">
|
|
|
<xsl:with-param name="nodes" select="$data"/>
|
|
|
</xsl:call-template>
|
|
|
- </xsl:param>-->
|
|
|
+ </xsl:param>-\->
|
|
|
<xsl:param name="context"/>
|
|
|
<xsl:param name="system_cache__dita__x3A__svg:colors" select="$system_cache__dita__x3A__svg:colors.default" tunnel="yes"/>
|
|
|
<xsl:param name="system_cache__dita__x3A__svg:cursor" required="yes"/>
|
|
|
@@ -515,13 +473,13 @@
|
|
|
</xsl:param>
|
|
|
|
|
|
|
|
|
- <xsl:param name="minX" select="0"/>
|
|
|
- <xsl:param name="maxX" select="(number($width) div (count($data) + 1)) * count($data)"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:offsetX.minX" select="0"/>
|
|
|
+ <xsl:param name="system_cache__dita__x3A__svg:offsetX.maxX" select="(number($width) div (count($data) + 1)) * count($data)"/>
|
|
|
|
|
|
- <!--<xsl:variable name="Yrange" select="$maxY - $minY"/>-->
|
|
|
+ <!-\-<xsl:variable name="Yrange" select="$maxY - $minY"/>-\->
|
|
|
|
|
|
<xsl:variable name="numBars" select="count($data)"/>
|
|
|
- <xsl:variable name="spacing" select="number($width) div (count($data) + 1)"/><!-- select="$width div ($numBars + 1)" -->
|
|
|
+ <xsl:variable name="spacing" select="number($width) div (count($data) + 1)"/><!-\- select="$width div ($numBars + 1)" -\->
|
|
|
|
|
|
|
|
|
|
|
|
@@ -533,18 +491,18 @@
|
|
|
rotate({number($orientation) - 180})
|
|
|
translate({-number($width) div 2},{-number($system_cache__dita__x3A__svg:cursor.current.height) div 2})"
|
|
|
system_cache__dita__x3A__svg:debug="svgu:bars.43 $maxY={$maxY} $width={$width} $cursor.current.height={$system_cache__dita__x3A__svg:cursor.current.height} $orientation={$orientation}">
|
|
|
- <!-- transform="translate({$offsetX},{$offsetY})
|
|
|
+ <!-\- transform="translate({$offsetX},{$offsetY})
|
|
|
translate({number($width) div 2},{number($system_cache__dita__x3A__svg:cursor.current.height) div 2})
|
|
|
rotate({number($orientation) - 180})
|
|
|
- translate({-number($width) div 2},{-number($system_cache__dita__x3A__svg:cursor.current.height) div 2})" -->
|
|
|
+ translate({-number($width) div 2},{-number($system_cache__dita__x3A__svg:cursor.current.height) div 2})" -\->
|
|
|
<svg:rect x="0" y="0"
|
|
|
height="{$system_cache__dita__x3A__svg:cursor.current.height}" width="{$width}"
|
|
|
style="stroke: black;
|
|
|
stroke-width:0.5;stroke-opacity:0.5;fill:none"/>
|
|
|
</svg:g>
|
|
|
</xsl:if>
|
|
|
- <!-- We change the data order to compensate for rotation -->
|
|
|
- <!-- See sort below -->
|
|
|
+ <!-\- We change the data order to compensate for rotation -\->
|
|
|
+ <!-\- See sort below -\->
|
|
|
<xsl:variable name="data-order">
|
|
|
<xsl:choose>
|
|
|
<xsl:when test="number($orientation) mod 360 >= 180">ascending</xsl:when>
|
|
|
@@ -554,35 +512,17 @@
|
|
|
|
|
|
|
|
|
<xsl:comment>svgu:bars.89
|
|
|
- $minX = <xsl:value-of select="$minX"/> ; $maxX = <xsl:value-of select="$maxX"/> $width = <xsl:value-of select="$width"/>
|
|
|
+ $system_cache__dita__x3A__svg:offsetX.minX = <xsl:value-of select="$system_cache__dita__x3A__svg:offsetX.minX"/> ; $system_cache__dita__x3A__svg:offsetX.maxX = <xsl:value-of select="$system_cache__dita__x3A__svg:offsetX.maxX"/> $width = <xsl:value-of select="$width"/>
|
|
|
$spacing = <xsl:value-of select="$spacing"/> $spacing*$numBars==<xsl:value-of select="$spacing * $numBars"/>
|
|
|
$numBars = <xsl:value-of select="$numBars"/>
|
|
|
$minY = <xsl:value-of select="$minY"/> ; $maxxY= <xsl:value-of select="$maxY"/> $height = <xsl:value-of select="$system_cache__dita__x3A__svg:cursor.current.height"/>
|
|
|
- -- cursor.current.Y = <xsl:value-of select="$system_cache__dita__x3A__svg:cursor.current.Y"/>
|
|
|
+ -\- cursor.current.Y = <xsl:value-of select="$system_cache__dita__x3A__svg:cursor.current.Y"/>
|
|
|
</xsl:comment>
|
|
|
|
|
|
- <svg:g
|
|
|
- system_cache__dita__x3A__svg:debug="svgu:bars.63 $maxY={$maxY} $width={$width} cursor.current.height={$system_cache__dita__x3A__svg:cursor.current.height} "
|
|
|
- >
|
|
|
- <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.basic">
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$minX"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$maxX"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.width" select="$width"/>
|
|
|
-
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$minY"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$maxY"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.height" select="$system_cache__dita__x3A__svg:cursor.current.height"/>
|
|
|
-
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:cursor.current.Y" select="$system_cache__dita__x3A__svg:cursor.current.Y"/><!-- $system_cache__dita__x3A__svg:cursor.current.Y -->
|
|
|
- </xsl:call-template>
|
|
|
- <!-- transform="translate({$offsetX},{$offsetY})
|
|
|
- translate({number($width) div 2},{number($system_cache__dita__x3A__svg:cursor.current.height) div 2})
|
|
|
- rotate({number($orientation) - 180})
|
|
|
- translate({-number($width) div 2},{-number($system_cache__dita__x3A__svg:cursor.current.height) div 2})
|
|
|
- scale(1,-{number($system_cache__dita__x3A__svg:cursor.current.height) div $maxY})" -->
|
|
|
+
|
|
|
<xsl:for-each select="$data">
|
|
|
- <!-- We use a sort on position to traverse the data in reverse -->
|
|
|
- <!-- when necessary. -->
|
|
|
+ <!-\- We use a sort on position to traverse the data in reverse -\->
|
|
|
+ <!-\- when necessary. -\->
|
|
|
<xsl:sort select="position( )" data-type="number"
|
|
|
order="{$data-order}"/>
|
|
|
|
|
|
@@ -591,7 +531,7 @@
|
|
|
<svg:line x1="{$spacing * $pos}" system_cache__dita__x3A__svg:debug="svgu:bars.115_562"
|
|
|
y1="0"
|
|
|
x2="{$spacing * $pos}"
|
|
|
- y2="{current()}" ><!-- id="{$context}_bar_{$pos}" <xsl:value-of select="format-number($yMajor1,'#0.0')"/>-->
|
|
|
+ y2="{current()}" ><!-\- id="{$context}_bar_{$pos}" <xsl:value-of select="format-number($yMajor1,'#0.0')"/>-\->
|
|
|
<xsl:attribute name="style">
|
|
|
<xsl:value-of select="concat('stroke-width: ',$barWidth,'; ')"/>
|
|
|
<xsl:call-template name="svgu:barStyle">
|
|
|
@@ -604,23 +544,23 @@
|
|
|
<xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.basic__x3A__height__x3A__limit__x3A__validate">
|
|
|
<xsl:with-param name="yValue" select="current( )"/>
|
|
|
<xsl:with-param name="xValue" select="$spacing * $pos"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$minX"/>
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$maxX"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$system_cache__dita__x3A__svg:offsetX.minX"/>
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$system_cache__dita__x3A__svg:offsetX.maxX"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:offsetX.width" select="$width"/>
|
|
|
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$minY"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$maxY"/>
|
|
|
<xsl:with-param name="system_cache__dita__x3A__svg:offsetY.height" select="$system_cache__dita__x3A__svg:cursor.current.height"/>
|
|
|
|
|
|
- <xsl:with-param name="system_cache__dita__x3A__svg:cursor.current.Y" select="$system_cache__dita__x3A__svg:cursor.current.Y"/><!-- $system_cache__dita__x3A__svg:cursor.current.Y -->
|
|
|
+ <xsl:with-param name="system_cache__dita__x3A__svg:cursor.current.Y" select="$system_cache__dita__x3A__svg:cursor.current.Y"/><!-\- $system_cache__dita__x3A__svg:cursor.current.Y -\->
|
|
|
</xsl:call-template>
|
|
|
</xsl:attribute>
|
|
|
</svg:line>
|
|
|
|
|
|
- <!-- If user requests bar labels we position a text value -->
|
|
|
- <!-- of the data point above the bar. The complex series of -->
|
|
|
- <!-- transformations is used to make the text display correctly -->
|
|
|
- <!-- despite the rotations and scalings to the coordinate system -->
|
|
|
+ <!-\- If user requests bar labels we position a text value -\->
|
|
|
+ <!-\- of the data point above the bar. The complex series of -\->
|
|
|
+ <!-\- transformations is used to make the text display correctly -\->
|
|
|
+ <!-\- despite the rotations and scalings to the coordinate system -\->
|
|
|
<xsl:if test="$barLabel">
|
|
|
<svg:text x="{number($spacing) * number($pos)}"
|
|
|
y="{number(current( )) * (number($system_cache__dita__x3A__svg:cursor.current.height) div number($maxY))}"
|
|
|
@@ -642,9 +582,9 @@
|
|
|
</svg:text>
|
|
|
</xsl:if>
|
|
|
</xsl:for-each>
|
|
|
- </svg:g>
|
|
|
|
|
|
- </xsl:template>
|
|
|
+
|
|
|
+ </xsl:template>-->
|
|
|
|
|
|
<xsl:template name="svgu:barStyle">
|
|
|
<xsl:param name="pos"/>
|
