Mercurial > hg > ooxml
diff html.xsl @ 44:5b2333e59d91
updated html, ascii output to new raw doctype
| author | Henry S. Thompson <ht@markup.co.uk> |
|---|---|
| date | Sun, 07 May 2017 11:56:02 +0100 |
| parents | 93fd0d532754 |
| children | 01a7c2ebd3d1 |
line wrap: on
line diff
--- a/html.xsl Sun May 07 11:55:50 2017 +0100 +++ b/html.xsl Sun May 07 11:56:02 2017 +0100 @@ -48,14 +48,23 @@ <xsl:template match="e:c"> <td> <xsl:choose> - <xsl:when test="e:t"> + <xsl:when test="@t|text()"> <xsl:attribute name="class"> - <xsl:value-of select="(e:t, - if (@f) then 'formula' else (), - if (e:r) then 'reffed' else ())"/> + <xsl:value-of select="(if (@t) then @t else text(), + if (e:f) then 'formula' else (), + if (e:i) then 'reffed' else ())"/> </xsl:attribute> - <xsl:attribute name="title"><xsl:value-of select="e:n2a(@c)"/><xsl:value-of select="../@r"/><xsl:if test="e:r">: <xsl:value-of select="e:r"/></xsl:if></xsl:attribute> - <xsl:value-of select="if (e:t/@c) then e:t/@c else e:t"/></xsl:when> + <xsl:attribute name="title"> + <xsl:choose> + <xsl:when test="e:i"> + <xsl:value-of select="e:i/@r"/>: <xsl:value-of select="e:i/e:r"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="e:n2a(@c)"/><xsl:value-of select="../@r"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:value-of select="if (@t) then @t else text()"/></xsl:when> <xsl:otherwise></xsl:otherwise> </xsl:choose> </td>