Mercurial > hg > ooxml

diff merge.xsl @ 48:5d9806f90896

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
basic integration of shared, but copying <f> is wrong, should reconstruct by denormalising <nf> for new home
author Henry S. Thompson <ht@markup.co.uk>
date Wed, 10 May 2017 16:52:04 +0100
parents 3e9a3e51627e
children f90bbd38b8f6
line wrap: on
line diff
--- a/merge.xsl	Tue May 09 23:08:18 2017 +0100
+++ b/merge.xsl	Wed May 10 16:52:04 2017 +0100
@@ -18,7 +18,7 @@
  <xsl:key name="ref" match="e:i" use="@r"/>
  <xsl:key name="nf" match="e:nf" use="text()"/>
  
- <xsl:template match="/"><a><xsl:copy-of select="$nfs"/>|<xsl:value-of select="count($refs/e:i)"/>|<xsl:value-of select="count($nfs/e:nf)"/>|<xsl:value-of select="count(key('nf','SUM(&#170;2&#170;7:&#170;3&#170;7)',$nfs))"/>|<xsl:value-of select="count($nfs/e:nf[.='SUM(&#170;2&#170;7:&#170;3&#170;7)'])"/>
+ <xsl:template match="/xxx"><a><xsl:copy-of select="$nfs"/>|<xsl:value-of select="count($refs/e:i)"/>|<xsl:value-of select="count($nfs/e:nf)"/>|<xsl:value-of select="count(key('nf','SUM(&#170;2&#170;7:&#170;3&#170;7)',$nfs))"/>|<xsl:value-of select="count($nfs/e:nf[.='SUM(&#170;2&#170;7:&#170;3&#170;7)'])"/>
   <xsl:apply-templates/></a>
  </xsl:template>
 
@@ -29,7 +29,6 @@
   <c>
    <xsl:apply-templates select="@*"/>
    <xsl:if test="e:f">
-    <xsl:message><xsl:value-of select="e:f"/></xsl:message>
     <xsl:attribute name="fi"><xsl:value-of select="key('nf',e:nf/text(),$nfs)/@i"/></xsl:attribute>
    </xsl:if>
   <xsl:if test="$reffed"><xsl:copy-of select="$reffed"/></xsl:if>