--- a/refs.xsl	Wed Apr 05 11:57:00 2017 +0100
+++ b/refs.xsl	Thu Apr 06 16:47:53 2017 +0100
@@ -1,11 +1,11 @@
 <?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" xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:xf="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 e xf" xmlns="http://markup.co.uk/excel" xmlns:xf="http://www.w3.org/2005/xpath-functions">
   <xsl:variable name="pat1">("[^"]*")|(\{[^}]+})|(,)|([^=\-+*/();:,.$&lt;>^!]+(?:\.[^=\-+*/();:,.$&lt;>^!]+)*\()|([)])|(^=|\()|((?:'[^']+')|(?:\[[0-9]+\][^!]*))|(\$?[A-Z]+\$?[0-9]+)|([a-zA-Z_\\][a-zA-Z0-9._]*)|(.)</xsl:variable>
  <xsl:param name="pat" select="$pat1"/>
 
  <xsl:template match="/">
-  <e:refs><xsl:apply-templates select="//s:c"/></e:refs>
+  <refs><xsl:apply-templates select="//s:c"/></refs>
  </xsl:template>
  
  <xsl:template match="s:c[s:f]">
@@ -16,9 +16,14 @@
   <xsl:if test="$tokens[@nr=(7,8,9)]">
    <xsl:variable name="n" select="count($tokens)"/>
    <xsl:variable name="singles" select="for $i in (1 to $n)
-       return if ($tokens[$i][@nr=(8,9)] and not($tokens[$i - 1][@nr=10 and .=(':','!')]) and not($tokens[$i + 1][@nr=10 and .=':']))
+       return if ($tokens[$i][@nr=(8,9)] and
+                  not($tokens[$i - 1][@nr=10 and
+                      .=(':','!')]) and
+                  not($tokens[$i + 1][@nr=10 and .=':']))
             then translate($tokens[$i],'$','')
             else ()"/>
+   <!-- Note that we don't bother to treat external ranges as ranges,
+          since we're not going to try to detect cross-document refs -->
    <xsl:variable name="ranges" select="for $i in (1 to count($tokens))
           return if ($tokens[$i][@nr=10 and .=':' and
                                 not($i gt 2 and
@@ -30,11 +35,19 @@
             then 
               let $bit := concat($tokens[$i],'!',
                                  translate($tokens[$i + 2],'$',''))
-              return if ((($i+3) le $n) and $tokens[$i + 3][@nr=10 and .=':'])
+              return if ((($i+3) le $n) and
+                         $tokens[$i + 3][@nr=10 and .=':'])
                 then concat($bit,':',translate($tokens[$i + 4],'$',''))
                 else $bit
             else ()"/>
-   <e:ref c="{@r}" r="{$singles}" rr="{$ranges}" er="{$externals}"/></xsl:if>
+   <ref c="{@r}">
+    <!-- Assumes that space doesn't occur in variable names
+         Might occur in external names (who knows!) but I'm assuming we're
+           never going to split the value of @er back out... -->
+    <xsl:if test="count($singles)>0"><xsl:attribute name="r"><xsl:value-of select="distinct-values($singles)"/></xsl:attribute></xsl:if>
+    <xsl:if test="count($ranges)>0"><xsl:attribute name="rr"><xsl:value-of select="distinct-values($ranges)"/></xsl:attribute></xsl:if>
+    <xsl:if test="count($externals)>0"><xsl:attribute name="er"><xsl:value-of select="distinct-values($externals)"/></xsl:attribute></xsl:if>
+   </ref></xsl:if>
  </xsl:template>
  
  <xsl:template match="s:c"/>