From 76b2562231f7881a59b6558674caa6de218c1f2b Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 9 Feb 2012 06:13:37 +0000
Subject: [PATCH] In svg.properties template, handle the case where there is no
 next.chunk.

---
 xsl/epub3/epub3-element-mods.xsl | 47 +++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/xsl/epub3/epub3-element-mods.xsl b/xsl/epub3/epub3-element-mods.xsl
index 83066ec85..0246399ce 100644
--- a/xsl/epub3/epub3-element-mods.xsl
+++ b/xsl/epub3/epub3-element-mods.xsl
@@ -1290,22 +1290,37 @@ article  toc,title,figure,table,example,equation
   <!-- get the element corresponding to the next chunk -->
   <xsl:variable name="next.chunk" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
 
-  <xsl:variable name="this.imagedata"
-                select="$this.chunk//imagedata"/>
-  <xsl:variable name="before.next"
-                select="$next.chunk/preceding::imagedata"/>
-  
-  <!-- select for an SVG imagedata in the intersection of them -->
-  <xsl:variable name="intersection"
-      select="$this.imagedata[count(.|$before.next) = count($before.next)]"/>
-
-  <xsl:variable name="svg.imagedata"
-      select="$intersection[contains(
-                  substring(@fileref, string-length(@fileref)-3,4), '.svg')]"/>
-
-  <xsl:if test="count($svg.imagedata) != 0">
-    <xsl:text>svg</xsl:text>
- </xsl:if>
+  <xsl:choose>
+    <xsl:when test="$next.chunk">
+      <xsl:variable name="this.imagedata"
+                    select="$this.chunk//imagedata"/>
+      <xsl:variable name="before.next"
+                    select="$next.chunk/preceding::imagedata"/>
+      
+      <!-- select for an SVG imagedata in the intersection of them -->
+      <xsl:variable name="intersection"
+          select="$this.imagedata[count(.|$before.next) = count($before.next)]"/>
+    
+      <xsl:variable name="svg.imagedata"
+          select="$intersection[contains(
+                      substring(@fileref, string-length(@fileref)-3,4), '.svg')]"/>
+    
+      <xsl:if test="count($svg.imagedata) != 0">
+        <xsl:text>svg</xsl:text>
+     </xsl:if>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:variable name="this.imagedata"
+                    select="$this.chunk//imagedata"/>
+      <xsl:variable name="svg.imagedata"
+          select="$this.imagedata[contains(
+                      substring(@fileref, string-length(@fileref)-3,4), '.svg')]"/>
+      <xsl:if test="count($svg.imagedata) != 0">
+        <xsl:text>svg</xsl:text>
+     </xsl:if>
+    
+    </xsl:otherwise>
+  </xsl:choose>
 </xsl:template>
 
 <xsl:template name="mathml.property">
-- 
2.40.0