|
|
@@ -29,14 +29,14 @@
|
|
|
<xsl:param name="graph.fill.style" required="yes"/>
|
|
|
<xsl:param name="graph.color.name" required="yes"/>
|
|
|
<xsl:param name="graph.color.variable" required="yes"/>
|
|
|
- <xsl:param name="graph.yaxis" required="yes"/>
|
|
|
+ <xsl:param name="graph.yaxis" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="p5gnuplot:font__x3A__size" required="yes"/>
|
|
|
<xsl:param name="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" required="yes"/>
|
|
|
<xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes"/>
|
|
|
- <xsl:param name="graph.data" required="yes"/>
|
|
|
+ <xsl:param name="graph.data" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="graph.headers" required="yes"/>
|
|
|
<xsl:param name="graph.title" required="yes"/>
|
|
|
- <xsl:param name="ytics" required="yes"/>
|
|
|
+ <xsl:param name="ytics" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="system_cache__dita:graph.ytics_detect_row" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="p5gnuplot:logscale.y1" required="yes" tunnel="yes"/>
|
|
|
@@ -49,6 +49,8 @@
|
|
|
<text pos="{position()}" count="{count(current-group())}" >
|
|
|
<!--<xsl:copy-of select="@stentry.pow"/>-->
|
|
|
<xsl:copy-of select="@audience"/>
|
|
|
+ <xsl:copy-of select="@platform"/>
|
|
|
+ <xsl:copy-of select="@props"/>
|
|
|
<xsl:copy-of select="@col"/>
|
|
|
<xsl:copy-of select="@current-grouping-key"/>
|
|
|
|
|
|
@@ -57,7 +59,8 @@
|
|
|
<xsl:attribute name="current-grouping-col.list" select="current-group()/@col"/>
|
|
|
<xsl:copy-of select="parent::strow/@strow.pos"/>
|
|
|
<xsl:for-each select="current-group()/@current-grouping-key">
|
|
|
- <current-grouping-key pos="{position()}" col="{../@col}">
|
|
|
+ <current-grouping-key pos="{position()}" col="{../@col}" xtics="axis">
|
|
|
+ <xsl:copy-of select="../@platform"/>
|
|
|
<xsl:value-of select="."/>
|
|
|
</current-grouping-key>
|
|
|
</xsl:for-each>
|
|
|
@@ -99,7 +102,10 @@
|
|
|
</xsl:otherwise>
|
|
|
</xsl:choose>
|
|
|
<xsl:attribute name="debug.116">foreach group @group by [@audience=<xsl:value-of select="@audience"/>]</xsl:attribute>
|
|
|
- <xsl:for-each-group select="current-group()" group-by="@audience">
|
|
|
+ <!--<xsl:call-template name="p5gnuplot:xtics.axis.list__x3A__detect">
|
|
|
+ <xsl:with-param name="xtics" select="$xtics"/>
|
|
|
+ </xsl:call-template>-->
|
|
|
+ <xsl:for-each-group select="current-group()" group-by="@audience" >
|
|
|
<audience audience="{current-grouping-key()}" current-grouping-key.list="{@current-grouping-key.list}">
|
|
|
<xsl:attribute name="current-grouping-key.foreign" select="false()"/>
|
|
|
<xsl:for-each select="$xtics//text[@audience = current()/@audience]" >
|
|
|
@@ -121,11 +127,13 @@
|
|
|
<xsl:for-each select="tokenize(current-grouping-key(),' ')">
|
|
|
<!--<xsl:text>[[[</xsl:text><xsl:value-of select="."/><xsl:text>]]]</xsl:text>-->
|
|
|
<xsl:for-each-group select="$system_cache__dita:graph.title//stentry[contains(@audience,current())]" group-by="text()">
|
|
|
- <current-grouping-key col="{@col}" audience="{@audience}" current-grouping-key="{@current-grouping-key}" system_cache__dita:graph.ytics_detect_row="{system_cache__dita:graph.ytics_detect_row($system_cache__dita:graph.ytics_detect_row,@col)}">
|
|
|
+ <current-grouping-key col="{@col}" audience="{@audience}" current-grouping-key="{@current-grouping-key}" system_cache__dita:graph.ytics_detect_row="{system_cache__dita:graph.ytics_detect_row($system_cache__dita:graph.ytics_detect_row,@col)}" xtics="row">
|
|
|
<xsl:attribute name="debug.149.cols" select="current-group()/@col"/>
|
|
|
<xsl:attribute name="xtics.pos__x3A__old_debug_to_off" select="$xtics//text[@col = current()/@col]/@pos"/>
|
|
|
<xsl:attribute name="group" select="$ytics/ytics/ytics.row/stentry[@col = current()/@col]/@group"/>
|
|
|
<xsl:attribute name="xtics.pos" select="system_cache__dita:graph.yaxis.pos($graph.title,$ytics,@current-grouping-key,@col)"/>
|
|
|
+ <!--X3<xsl:copy-of select="@props"/>-->
|
|
|
+ <!--X3<xsl:copy-of select="@platform"/>-->
|
|
|
<xsl:choose>
|
|
|
<!--<xsl:when test="$xtics//text[@col = current()/@col]"/>-->
|
|
|
|
|
|
@@ -147,6 +155,15 @@
|
|
|
<xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>
|
|
|
<xsl:with-param name="col" select="current()/@col"/>
|
|
|
</xsl:call-template>
|
|
|
+ <xsl:for-each select="$xtics//text[@pos = $graph.newhistogram.position]">
|
|
|
+ <p5gnuplot:current-grouping-key.xtics>
|
|
|
+ <xsl:copy-of select="@platform"/>
|
|
|
+ </p5gnuplot:current-grouping-key.xtics>
|
|
|
+ </xsl:for-each>
|
|
|
+ <xsl:call-template name="system_cache__dita:graph.col__x3A__if_not_empty">
|
|
|
+ <xsl:with-param name="xtics.pos" select="current()/@col"/>
|
|
|
+ </xsl:call-template>
|
|
|
+
|
|
|
<xsl:value-of select="@current-grouping-key"/>
|
|
|
</current-grouping-key>
|
|
|
</xsl:for-each-group>
|
|
|
@@ -180,9 +197,9 @@
|
|
|
<xsl:with-param name="p5gnuplot:logscale.y2" select="$p5gnuplot:logscale.y2" tunnel="yes"/>
|
|
|
<xsl:with-param name="system_cache__dita:graph.separate.outputs.auto" select="''" tunnel="yes"/>
|
|
|
</xsl:apply-templates>
|
|
|
- <xsl:call-template name="p5gnuplot:set.graph.output">
|
|
|
+ <!--<xsl:call-template name="p5gnuplot:set.graph.output">
|
|
|
<xsl:with-param name="fileindex" select="$fileindex"/>
|
|
|
- </xsl:call-template>
|
|
|
+ </xsl:call-template>-->
|
|
|
</xsl:when>
|
|
|
</xsl:choose>
|
|
|
<xsl:apply-templates mode="p5gnuplot:graph.newhistogram" select="$p5gnuplot:graph.newhistogram__x3A__to_analyze">
|
|
|
@@ -242,21 +259,20 @@
|
|
|
<xsl:call-template name="p5gnuplot:set.logscale.y1"/>
|
|
|
<xsl:call-template name="p5gnuplot:set.logscale.y2"/>
|
|
|
|
|
|
- <xsl:choose>
|
|
|
+ <!--<xsl:choose>
|
|
|
<xsl:when test="string-length($system_cache__dita:graph.separate.outputs.auto) >0">
|
|
|
<xsl:call-template name="p5gnuplot:set.graph.separate.outputs.auto">
|
|
|
<xsl:with-param name="fileindex" select="$fileindex"/>
|
|
|
<xsl:with-param name="position" select="0"/>
|
|
|
</xsl:call-template>
|
|
|
</xsl:when>
|
|
|
- </xsl:choose>
|
|
|
-
|
|
|
+ </xsl:choose>-->
|
|
|
|
|
|
|
|
|
<p5gnuplot:graph.newhistogram.child>
|
|
|
- <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
|
|
|
+ <!--<xsl:attribute name="p5gnuplot:text.join"><xsl:text>
|
|
|
</xsl:text></xsl:attribute>
|
|
|
- <xsl:attribute name="p5gnuplot:text">plot</xsl:attribute>
|
|
|
+ <xsl:attribute name="p5gnuplot:text">plot</xsl:attribute>-->
|
|
|
<xsl:apply-templates mode="#current"/>
|
|
|
</p5gnuplot:graph.newhistogram.child>
|
|
|
</p5gnuplot:graph.newhistogram>
|
|
|
@@ -286,7 +302,7 @@
|
|
|
<xsl:param name="p5gnuplot:logscale.y2" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="system_cache__dita:graph.separate.outputs.auto" required="yes" tunnel="yes"/>
|
|
|
<xsl:comment>#72 @pos=<xsl:value-of select="@pos"/></xsl:comment>
|
|
|
- <p5gnuplot:plot p5gnuplot:text.join=" ">
|
|
|
+ <p5gnuplot:plot p5gnuplot:text.join=" " debug="match graph.newhistogram">
|
|
|
<xsl:variable name="current.current-grouping-key">
|
|
|
<current.current-grouping-key>
|
|
|
<xsl:for-each-group select="audience/current-grouping-key" group-by="@audience">
|
|
|
@@ -333,6 +349,32 @@
|
|
|
</xsl:for-each>
|
|
|
</xsl:variable>
|
|
|
<xsl:attribute name="test.following.current-grouping-key_x3A__different" select="$test.following.current-grouping-key_x3A__different"/>
|
|
|
+
|
|
|
+ <xsl:choose>
|
|
|
+ <xsl:when test="preceding::graph.newhistogram"/>
|
|
|
+ <xsl:otherwise>
|
|
|
+ <xsl:choose>
|
|
|
+ <xsl:when test="$system_cache__dita:graph.separate.outputs.auto">
|
|
|
+ <xsl:call-template name="p5gnuplot:set.logscale.y2"/>
|
|
|
+ <xsl:call-template name="p5gnuplot:all_points_y2_value_undefined__x3A__detect"/>
|
|
|
+ <!--<xsl:call-template name="p5gnuplot:set.graph.output">
|
|
|
+ <xsl:with-param name="fileindex" select="$fileindex"/>
|
|
|
+ </xsl:call-template>-->
|
|
|
+ <xsl:call-template name="p5gnuplot:set.graph.separate.outputs.auto">
|
|
|
+ <xsl:with-param name="fileindex" select="$fileindex"/>
|
|
|
+ <xsl:with-param name="position" select="count(preceding::graph.newhistogram)"/>
|
|
|
+ </xsl:call-template>
|
|
|
+ </xsl:when>
|
|
|
+ </xsl:choose>
|
|
|
+ <p5gnuplot:plot.text >
|
|
|
+ <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
|
|
|
+</xsl:text></xsl:attribute>
|
|
|
+ <xsl:attribute name="p5gnuplot:text">plot</xsl:attribute>
|
|
|
+ </p5gnuplot:plot.text>
|
|
|
+ </xsl:otherwise>
|
|
|
+ </xsl:choose>
|
|
|
+
|
|
|
+
|
|
|
<xsl:choose>
|
|
|
<!--<xsl:when test="1=1 and audience[@current-grouping-key.foreign='false'] and @pos='1'">
|
|
|
<xsl:variable name="newhistogram.text"><xsl:value-of select="@graph.newhistogram.text"/><xsl:text> </xsl:text><xsl:for-each select="following-sibling::graph.newhistogram"> oraz: <xsl:value-of select="@graph.newhistogram.text"/></xsl:for-each></xsl:variable>
|
|
|
@@ -361,15 +403,18 @@
|
|
|
<xsl:otherwise>
|
|
|
<xsl:choose>
|
|
|
<xsl:when test="$system_cache__dita:graph.separate.outputs.auto">
|
|
|
- <xsl:attribute name="debug">#324 due to $system_cache__dita:graph.separate.outputs.auto bypassed (,,,)</xsl:attribute>
|
|
|
+ <!--<xsl:attribute name="debug">#324 due to $system_cache__dita:graph.separate.outputs.auto bypassed (,,,)</xsl:attribute>-->
|
|
|
<xsl:choose>
|
|
|
<xsl:when test="preceding::graph.newhistogram">
|
|
|
+
|
|
|
<xsl:call-template name="p5gnuplot:set.graph.separate.outputs.auto">
|
|
|
<xsl:with-param name="fileindex" select="$fileindex"/>
|
|
|
<xsl:with-param name="position" select="count(preceding::graph.newhistogram)"/>
|
|
|
</xsl:call-template>
|
|
|
</xsl:when>
|
|
|
- <xsl:otherwise/>
|
|
|
+ <xsl:otherwise>
|
|
|
+ <!--<xsl:call-template name="p5gnuplot:all_points_y2_value_undefined__x3A__detect"/>-->
|
|
|
+ </xsl:otherwise>
|
|
|
</xsl:choose>
|
|
|
|
|
|
</xsl:when>
|
|
|
@@ -394,7 +439,7 @@
|
|
|
<xsl:param name="graph.color.name" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="graph.color.variable" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="xtics" tunnel="yes"/>
|
|
|
- <xsl:param name="graph.yaxis" tunnel="yes"/>
|
|
|
+ <xsl:param name="graph.yaxis" tunnel="yes" required="yes"/>
|
|
|
<xsl:param name="p5gnuplot:font__x3A__size" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes" tunnel="yes"/>
|
|
|
@@ -406,7 +451,7 @@
|
|
|
<xsl:param name="p5gnuplot:logscale.y1" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="p5gnuplot:logscale.y2" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="system_cache__dita:graph.separate.outputs.auto" required="yes" tunnel="yes"/>
|
|
|
- <p5gnuplot:newhistogram p5gnuplot:text.join=" " debug="#281 matched: {name()}">
|
|
|
+ <p5gnuplot:newhistogram p5gnuplot:text.join=" " debug="#281 matched: {name()}" audience="{@audience}" current-grouping-key.list="{@current-grouping-key.list}" >
|
|
|
<!--<xsl:choose>
|
|
|
<xsl:when test="preceding::audience">-->
|
|
|
<!--<xsl:attribute name="p5gnuplot:text">"<xsl:value-of select="system_cache__dita:audience__x3A__unescape(@audience)"/>"</xsl:attribute>-->
|
|
|
@@ -422,7 +467,7 @@
|
|
|
<xsl:param name="graph.color.name" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="graph.color.variable" required="yes" tunnel="yes"/>
|
|
|
<xsl:param name="xtics" tunnel="yes"/>
|
|
|
- <xsl:param name="graph.yaxis" tunnel="yes"/>
|
|
|
+ <xsl:param name="graph.yaxis" tunnel="yes" required="yes"/>
|
|
|
<xsl:param name="p5gnuplot:graph.gnuplot.dat__x3A__suffix">.gnuplot.dat</xsl:param>
|
|
|
<xsl:param name="xtics.data.column__x3A__offset" select="p5gnuplot:xtics.data.column__x3A__offset()" tunnel="yes" />
|
|
|
<xsl:param name="p5gnuplot:font__x3A__size" required="yes" tunnel="yes"/>
|
|
|
@@ -437,7 +482,7 @@
|
|
|
<!--<xsl:if test="preceding::current-grouping-key">
|
|
|
<xsl:attribute name="p5gnuplot:text.join"> , </xsl:attribute>
|
|
|
</xsl:if>-->
|
|
|
-
|
|
|
+ <xsl:copy-of select="p5gnuplot:current-grouping-key.xtics"/>
|
|
|
<p5gnuplot:file p5gnuplot:text.join=" , " p5gnuplot:text=""{$fileindex}{$p5gnuplot:graph.gnuplot.dat__x3A__suffix}"" debug="file is used; input @col={@col}; @xtics.pos={@xtics.pos}; @system_cache__dita:graph.ytics_detect_row={@system_cache__dita:graph.ytics_detect_row}; "/>
|
|
|
|
|
|
|
|
|
@@ -457,8 +502,10 @@
|
|
|
</p5gnuplot:file.row.y.color.column>
|
|
|
</xsl:when>
|
|
|
</xsl:choose>
|
|
|
-
|
|
|
- <p5gnuplot:file.row.y p5gnuplot:text="{number(@system_cache__dita:graph.ytics_detect_row)}" p5gnuplot:value="{@system_cache__dita:graph.ytics_detect_row}" debug="cond color columns"/><!-- $xtics.data.column__x3A__offset -->
|
|
|
+ <xsl:call-template name="p5gnuplot:file.row.y"/>
|
|
|
+ <xsl:call-template name="p5gnuplot:file.row.platform"/>
|
|
|
+ <xsl:call-template name="p5gnuplot:file.row.props"/>
|
|
|
+ <!--<p5gnuplot:file.row.y p5gnuplot:text="{number(@system_cache__dita:graph.ytics_detect_row)}" p5gnuplot:value="{@system_cache__dita:graph.ytics_detect_row}" debug="cond color columns"/>--><!-- $xtics.data.column__x3A__offset -->
|
|
|
<xsl:choose>
|
|
|
<xsl:when test="number(@graph.color.variable) >0">
|
|
|
<p5gnuplot:file.row.y.color.column p5gnuplot:text=":(column(-{system_cache__dita:graph.xtics.color.column($xtics)}))" debug="which row is used for color and unless todo graph.fill.style/text() col={@col}">
|