# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1491943419 -7200
# Node ID efbfd277cd3525d2326647239dbbd0339bb95bf5
# Parent  4b12b86d2e82a1acbfe67c6f8e3f3f7ef14e283d
Updated the notugly.xsl stylesheet to incorporate recent fixes.

diff -r 4b12b86d2e82 -r efbfd277cd35 resources/notugly.xsl
--- a/resources/notugly.xsl	Sun Nov 01 23:29:48 2015 +0100
+++ b/resources/notugly.xsl	Tue Apr 11 22:43:39 2017 +0200
@@ -268,6 +268,8 @@
             </xsl:call-template>
           </xsl:copy>
         </xsl:for-each>
+        <!-- Handle labels. -->
+        <xsl:apply-templates select="svg:text" />
       </xsl:when>
       <!-- Handle bare groups. -->
       <xsl:otherwise>
@@ -291,7 +293,6 @@
       <xsl:call-template name="node-outline">
         <xsl:with-param name="current" select="*[1]"/>
         <xsl:with-param name="style">shadow</xsl:with-param>
-        <xsl:with-param name="first" select="true()"/>
       </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>
@@ -308,21 +309,10 @@
 
   <xsl:choose>
     <!-- Rewrite node outlines. -->
-    <xsl:when test="$class='node' and svg:path">
-      <xsl:for-each select="svg:path">
-        <xsl:call-template name="node-outline">
-          <xsl:with-param name="current" select="."/>
-          <xsl:with-param name="first" select="true()"/>
-        </xsl:call-template>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:when test="$class='node' and svg:polyline">
-      <xsl:for-each select="svg:polyline">
-        <xsl:call-template name="node-outline">
-          <xsl:with-param name="current" select="."/>
-          <xsl:with-param name="first" select="true()"/>
-        </xsl:call-template>
-      </xsl:for-each>
+    <xsl:when test="$class='node' and svg:path|svg:polyline">
+      <xsl:call-template name="node-outline">
+        <xsl:with-param name="current" select="*[1]"/>
+      </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>
       <xsl:for-each select="svg:path">
@@ -331,6 +321,7 @@
     </xsl:otherwise>
   </xsl:choose>
 
+  <!-- Handle labels. -->
   <xsl:apply-templates select="svg:text" />
 </xsl:template>
 
@@ -338,7 +329,6 @@
   <xsl:param name="path-so-far"/>
   <xsl:param name="current"/>
   <xsl:param name="style"/>
-  <xsl:param name="first" select="false()"/>
 
   <xsl:choose>
     <!-- Visit each child element, collecting the path details. -->
@@ -351,7 +341,6 @@
             <xsl:with-param name="points" select="concat('C', substring-after($current/@d, 'C'))"/>
             <xsl:with-param name="current" select="$current"/>
             <xsl:with-param name="style" select="$style"/>
-            <xsl:with-param name="include" select="$first"/>
           </xsl:call-template>
         </xsl:when>
         <xsl:when test="local-name($current) = 'polyline'">
@@ -361,7 +350,6 @@
             <xsl:with-param name="points" select="substring-after($current/@points, ' ')"/>
             <xsl:with-param name="current" select="$current"/>
             <xsl:with-param name="style" select="$style"/>
-            <xsl:with-param name="include" select="$first"/>
           </xsl:call-template>
         </xsl:when>
         <xsl:otherwise>
@@ -369,7 +357,6 @@
             <xsl:with-param name="path-so-far" select="$path-so-far"/>
             <xsl:with-param name="current" select="$current/following-sibling::*[1]"/>
             <xsl:with-param name="style" select="$style"/>
-            <xsl:with-param name="first" select="$first"/>
           </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
@@ -408,7 +395,6 @@
   <xsl:param name="points"/>
   <xsl:param name="current"/>
   <xsl:param name="style"/>
-  <xsl:param name="include" select="true()"/>
 
   <xsl:variable name="next" select="substring-before($points, ' ')"/>
   <xsl:variable name="remaining" select="substring-after($points, ' ')"/>
@@ -417,46 +403,23 @@
     <!-- With path points remaining, include the current point if appropriate
          and visit those remaining. -->
     <xsl:when test="$remaining">
-      <xsl:choose>
-        <xsl:when test="$include">
-          <xsl:call-template name="filter-path">
-            <xsl:with-param name="path-so-far" select="concat($path-so-far, ' ', $point)"/>
-            <xsl:with-param name="point" select="$next"/>
-            <xsl:with-param name="points" select="$remaining"/>
-            <xsl:with-param name="current" select="$current"/>
-            <xsl:with-param name="style" select="$style"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="filter-path">
-            <xsl:with-param name="path-so-far" select="$path-so-far"/>
-            <xsl:with-param name="point" select="$next"/>
-            <xsl:with-param name="points" select="$remaining"/>
-            <xsl:with-param name="current" select="$current"/>
-            <xsl:with-param name="style" select="$style"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:call-template name="filter-path">
+        <xsl:with-param name="path-so-far" select="concat($path-so-far, ' ', $point)"/>
+        <xsl:with-param name="point" select="$next"/>
+        <xsl:with-param name="points" select="$remaining"/>
+        <xsl:with-param name="current" select="$current"/>
+        <xsl:with-param name="style" select="$style"/>
+      </xsl:call-template>
     </xsl:when>
     <!-- With up to one remaining after this point, include the current point,
          if appropriate, and the one remaining. -->
     <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$include">
-          <xsl:call-template name="node-outline">
-            <xsl:with-param name="path-so-far" select="concat($path-so-far, ' ', $point, ' ', $points)"/>
-            <xsl:with-param name="current" select="$current/following-sibling::*[1]"/>
-            <xsl:with-param name="style" select="$style"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="node-outline">
-            <xsl:with-param name="path-so-far" select="concat($path-so-far, ' ', $points)"/>
-            <xsl:with-param name="current" select="$current/following-sibling::*[1]"/>
-            <xsl:with-param name="style" select="$style"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:call-template name="node-outline">
+        <xsl:with-param name="path-so-far" select="concat($path-so-far, ' ', $point, ' ', $points)"/>
+        <xsl:with-param name="current" select="$current/following-sibling::*[1]"/>
+        <xsl:with-param name="style" select="$style"/>
+        <xsl:with-param name="last" select="$current"/>
+      </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
@@ -467,7 +430,6 @@
   <xsl:param name="points"/>
   <xsl:param name="current"/>
   <xsl:param name="style"/>
-  <xsl:param name="include" select="true()"/>
 
   <xsl:variable name="next" select="substring-before($points, ' ')"/>
   <xsl:variable name="remaining" select="substring-after($points, ' ')"/>
@@ -476,46 +438,23 @@
     <!-- With path points remaining, include the current point if appropriate
          and visit those remaining. -->
     <xsl:when test="$remaining">
-      <xsl:choose>
-        <xsl:when test="$include">
-          <xsl:call-template name="polyline-to-path">
-            <xsl:with-param name="path-so-far" select="concat($path-so-far, ' ', $point)"/>
-            <xsl:with-param name="point" select="concat('L', $next)"/>
-            <xsl:with-param name="points" select="$remaining"/>
-            <xsl:with-param name="current" select="$current"/>
-            <xsl:with-param name="style" select="$style"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="polyline-to-path">
-            <xsl:with-param name="path-so-far" select="$path-so-far"/>
-            <xsl:with-param name="point" select="concat('L', $next)"/>
-            <xsl:with-param name="points" select="$remaining"/>
-            <xsl:with-param name="current" select="$current"/>
-            <xsl:with-param name="style" select="$style"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:call-template name="polyline-to-path">
+        <xsl:with-param name="path-so-far" select="concat($path-so-far, ' ', $point)"/>
+        <xsl:with-param name="point" select="concat('L', $next)"/>
+        <xsl:with-param name="points" select="$remaining"/>
+        <xsl:with-param name="current" select="$current"/>
+        <xsl:with-param name="style" select="$style"/>
+      </xsl:call-template>
     </xsl:when>
     <!-- With up to one remaining after this point, include the current point,
          if appropriate, and the one remaining. -->
     <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$include">
-          <xsl:call-template name="node-outline">
-            <xsl:with-param name="path-so-far" select="concat($path-so-far, ' ', $point, ' L', $points)"/>
-            <xsl:with-param name="current" select="$current/following-sibling::*[2]"/>
-            <xsl:with-param name="style" select="$style"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="node-outline">
-            <xsl:with-param name="path-so-far" select="concat($path-so-far, ' L', $points)"/>
-            <xsl:with-param name="current" select="$current/following-sibling::*[1]"/>
-            <xsl:with-param name="style" select="$style"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:call-template name="node-outline">
+        <xsl:with-param name="path-so-far" select="concat($path-so-far, ' ', $point, ' L', $points)"/>
+        <xsl:with-param name="current" select="$current/following-sibling::*[1]"/>
+        <xsl:with-param name="style" select="$style"/>
+        <xsl:with-param name="last" select="$current"/>
+      </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>