Template find-matrix-column return value is not correct for td with colspan in h2d.xsl

[cnj125]

When I tried to convert html to dita by using h2d.xsl, I found that the namest and nameend are not correct for td with colspan. After tracing the code, I found that the error may be related the template "find-matrix-column". For the variable "next-col-count", it may need some changes. Original:

<xsl:when test="@colspan"><xsl:value-of select="$col-count + number(@colspan) - 1"/></xsl:when>

Modified:

<xsl:when test="@colspan"><xsl:value-of select="$col-count + number(@colspan)"/></xsl:when>

Please feel free to correct me if i am wrong. Thanks for your great effort.

Ben