# HG changeset patch
# User Henry S. Thompson <ht@markup.co.uk>
# Date 1494958143 -3600
# Node ID 8000dbed09df36f5b321b55cdd3e1cd7b7628309
# Parent  9bb415e0adc9ce6d40d97f0c378db3a28d2a5649
better, now failing on [1]\!'AES,DIVIDEND'

diff -r 9bb415e0adc9 -r 8000dbed09df tokenise.xsl
--- a/tokenise.xsl	Tue May 16 17:28:52 2017 +0100
+++ b/tokenise.xsl	Tue May 16 19:09:03 2017 +0100
@@ -49,7 +49,7 @@
   <xsl:param name="col" required="yes" as="xs:integer"/>
   <xsl:param name="soFar" as="element(*)*"/>
   <xsl:variable name="last" select="$soFar[count($soFar)]"></xsl:variable>
-  <xsl:if test="$row=5 and $col=1"><xsl:message>tok1: <xsl:value-of select="$n"/>|<xsl:value-of select="$i"/>|<xsl:value-of select="if ($i=1) then string-join($tokens,'\') else $tokens[$i]"/>|<xsl:value-of select="if ($last instance of element()) then name($last) else 'bogus'"/>|<xsl:value-of select="string($last)"/></xsl:message></xsl:if>
+  <xsl:if test="false()"><xsl:message>tok1@<xsl:value-of select="$row"/>,<xsl:value-of select="$col"/>: <xsl:value-of select="$n"/>|<xsl:value-of select="$i"/>|<xsl:value-of select="if ($i=1) then string-join($tokens,'\') else string-join(($tokens[$i],':',$tokens[$i]/@nr,',',$tokens[$i+1],':',$tokens[$i+1]/@nr,',',$tokens[$i+2],':',$tokens[$i+2]/@nr),'')"/>|<xsl:value-of select="if ($last instance of element()) then name($last) else 'bogus'"/>|<xsl:value-of select="string($last)"/></xsl:message></xsl:if>
   <!-- Tail-recursion incrementing index $i into $tokens -->
   <xsl:sequence select="
     if ($i gt $n)
@@ -119,10 +119,10 @@
   <xsl:param name="i" as="xs:integer"/>
   <xsl:param name="soFar" as="xs:string"/><!-- Will always be a lonely ' -->
   <!-- Amalgamate bits of type 9 and 10 as <v> for wrapping in <e> -->
-  <xsl:variable name="content" select="e:amalgamate($tokens,$i,$soFar,10,$soFar)"/>
+  <xsl:variable name="content" select="e:amalgamate($tokens,$i,$soFar,(10,9),$soFar)"/>
   <xsl:variable name="x"><v><xsl:value-of select="
     if ($tokens[$content?1]=$soFar)
-    then $content?2
+    then concat($content?2,$soFar)
     else e:shouldnt('oddx',$tokens[$content?1])"/></v></xsl:variable>
   <xsl:sequence select="[$content?1+1,$x/*]"/>
  </xsl:function>