--- a/refs.xsl	Sun May 07 11:56:02 2017 +0100
+++ b/refs.xsl	Sun May 07 19:21:53 2017 +0100
@@ -8,12 +8,14 @@
   <refs><xsl:apply-templates select="//e:c"/></refs>
  </xsl:template>
  
- <xsl:template match="e:c[e:f/(e:s|e:r)]">
+ <xsl:template match="e:c[e:f]">
   <xsl:variable name="r" select="../@r"/>
   <xsl:variable name="c" select="@c"/>
+  <xsl:variable name="i" select="concat(e:n2a($c),$r)"/>
   <xsl:if test="@r='xxx' and @c='1'"><xsl:message><xsl:value-of select="count(e:f/*)"/>|</xsl:message>
   </xsl:if>
-  <ref r="{e:n2a($c)}{$r}"><xsl:apply-templates select="e:f/(e:s|e:r)"/></ref>
+  <nf r="{$i}"><xsl:value-of select="e:fnf(e:f/*)"/></nf>
+  <xsl:if test="e:f[e:s|e:r]"><ref r="{$i}"><xsl:apply-templates select="e:f[e:s|e:r]"/></ref></xsl:if>
  </xsl:template>
  
  <xsl:template match="e:c"/>