From 838ddb6e32dd8a7fd99f7df9e8d62e3e4d59198a Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@rtspecialty.com>
Date: Mon, 11 Dec 2017 10:44:31 -0500
Subject: [PATCH] summary: Correct rendering of nested c:let expressions

If nested c:let expressions contained values of the same name, they would
all be rendered, rather than just the one intended.

* src/current/include/display.xsl (do-gen-let-list): Pass let symbol to
    `_gen-let-list-item'.
  (_gen-let-list-item): Render only values part of context let expression.
    [letsym]: New parameter.
---
 src/current/include/display.xsl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/current/include/display.xsl b/src/current/include/display.xsl
index e1e0ee2a..b0fa8130 100644
--- a/src/current/include/display.xsl
+++ b/src/current/include/display.xsl
@@ -493,6 +493,7 @@
         <xsl:call-template name="_gen-let-list-item">
           <xsl:with-param name="context" select="$context" />
           <xsl:with-param name="class" select="'letequ'" />
+          <xsl:with-param name="letsym" select="." />
         </xsl:call-template>
       </xsl:for-each>
     </xsl:variable>
@@ -507,6 +508,7 @@
 <xsl:template name="_gen-let-list-item">
   <xsl:param name="context" />
   <xsl:param name="class" />
+  <xsl:param name="letsym" />
 
   <li>
     <xsl:if test="$class">
@@ -515,14 +517,14 @@
 
     <xsl:choose>
       <xsl:when test="@type='lparam' and $context">
-        <xsl:text>\(</xsl:text>
+        <xsl:text>let \(</xsl:text>
           <preproc:sym-ref name="{@name}" />
           <xsl:text> = </xsl:text>
 
           <xsl:variable name="varname" select="@varname" />
 
           <xsl:apply-templates select="
-              $context//c:let/c:values/c:value[
+              $context//c:let[ @name = $letsym/@lparent ]/c:values/c:value[
                 @name=$varname
               ]/c:*
             " />