diff rect.xsl @ 27:8309dcfce613

preparing for variable deref
author Henry S. Thompson <ht@markup.co.uk>
date Mon, 10 Apr 2017 17:29:24 +0100
parents d2ca3ea1f5ae
children 93fd0d532754
line wrap: on
line diff
--- a/rect.xsl	Fri Apr 07 18:42:47 2017 +0100
+++ b/rect.xsl	Mon Apr 10 17:29:24 2017 +0100
@@ -39,7 +39,6 @@
  </xsl:template>
 
  <xsl:template match="s:sheetData">
-  <xsl:message><xsl:value-of select="count($refs/*)"/></xsl:message>
   <xsl:if test="s:row">
    <xsl:variable name="dims" select="analyze-string($dim,'([A-Z]+)([0-9]+):([A-Z]+)([0-9]+)')"/> 
    <xsl:variable name="height" select="1+xs:integer($dims//xpf:group[@nr='4'])-xs:integer($dims//xpf:group[@nr='2'])"/>
@@ -59,7 +58,13 @@
         <xsl:variable name="reffed" select="key('ref',$r,$refs)"/>
        <c c="{$col}">
         <xsl:if test="$c/s:f"><xsl:attribute name="f">1</xsl:attribute></xsl:if>
-        <xsl:if test="$c/*"><t><xsl:value-of select="substring($c/@e:type,1,1)"/></t></xsl:if>
+        <xsl:if test="$c/*">
+         <t>
+          <xsl:if test="$c/@e:class"><xsl:attribute name="c"><xsl:value-of select="substring($c/@e:class,1,1)"/></xsl:attribute></xsl:if>
+          <xsl:if test="$c/@e:code"><xsl:attribute name="l"><xsl:value-of select="$c/@e:code"/></xsl:attribute></xsl:if>
+          <xsl:value-of select="substring($c/@e:type,1,1)"/>
+         </t>
+        </xsl:if>
         <xsl:if test="$reffed"><xsl:copy-of select="$reffed/e:r"/></xsl:if>
        </c>
       </xsl:for-each></xsl:if>