Mercurial > hg > ooxml
diff rect.xsl @ 40:ac6d1ca099f7
simplified rect output, refs (not refs2) working again
author | Henry S. Thompson <ht@markup.co.uk> |
---|---|
date | Tue, 02 May 2017 09:20:13 +0100 |
parents | 4c6a341e75da |
children | 6f448ac67778 |
line wrap: on
line diff
--- a/rect.xsl Wed Apr 26 18:51:34 2017 +0100 +++ b/rect.xsl Tue May 02 09:20:13 2017 +0100 @@ -1,16 +1,12 @@ <?xml version='1.0'?> <!DOCTYPE doc SYSTEM "../../../lib/xml/xsl.dtd" > -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0" xmlns:s="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:e="http://markup.co.uk/excel" exclude-result-prefixes="xs s xpf" xmlns="http://markup.co.uk/excel" xmlns:xpf="http://www.w3.org/2005/xpath-functions"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0" xmlns:s="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:e="http://markup.co.uk/excel" exclude-result-prefixes="xs s xpf e" xmlns="http://markup.co.uk/excel" xmlns:xpf="http://www.w3.org/2005/xpath-functions"> <xsl:strip-space elements="s:sheetData"/> <xsl:include href="a2n.xsl"/> <xsl:include href="n2a.xsl"/> <xsl:include href="tokenise.xsl"/> - <xsl:variable name="refs" select="document('sample2/empty_refs.xml')/*"/><!--collection()[2]/*--> - - <xsl:key name="ref" match="e:i" use="@r"/> - <xsl:variable name="dim" select="//s:dimension/@ref"/> <xsl:template match="/"> @@ -34,21 +30,17 @@ <xsl:variable name="col" select="."/> <xsl:variable name="r" select="concat(e:n2a($col),string($row))"/> <xsl:variable name="c" select="$cells[@r=$r]"/> - <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: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:class"><xsl:attribute name="t"><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:if test="$c/s:f"> <f> <xsl:copy-of select="e:tokenise($c/s:f,$row,$col)"/> </f></xsl:if> - <xsl:value-of select="substring($c/@e:type,1,1)"/> - </t> + <xsl:value-of select="substring($c/@e:type,1,1)"/> </xsl:if> - <xsl:if test="$reffed"><xsl:copy-of select="$reffed/e:r"/></xsl:if> </c> </xsl:for-each></xsl:if> </r>