From f2e3cdf5f7fa6b162de98630ca07969e149f18eb Mon Sep 17 00:00:00 2001
From: Greg Torbenson <gregory.torbenson@ryansg.com>
Date: Wed, 9 May 2018 12:07:32 -0400
Subject: [PATCH] Modify valparse to recurse into the RHS.

---
 src/current/c1map/valparse.xsl | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/current/c1map/valparse.xsl b/src/current/c1map/valparse.xsl
index cd8aba6d..e84b25dc 100644
--- a/src/current/c1map/valparse.xsl
+++ b/src/current/c1map/valparse.xsl
@@ -61,6 +61,13 @@
       <xsl:call-template name="lvmp:gen-val">
         <xsl:with-param name="name" select="$val" />
       </xsl:call-template>
+      <xsl:if test="$post">
+        <xsl:text> . </xsl:text>
+          <!-- TODO: escape -->
+          <xsl:call-template name="lvm:valparse">
+            <xsl:with-param name="str" select="$post" />
+          </xsl:call-template>
+      </xsl:if>
     </xsl:when>
 
     <!-- static value; no variable -->
@@ -68,15 +75,15 @@
       <xsl:text>'</xsl:text>
         <xsl:value-of select="$str" />
       <xsl:text>'</xsl:text>
+      <xsl:if test="$post">
+        <xsl:text> . '</xsl:text>
+        <!-- TODO: escape -->
+        <xsl:value-of select="$post" />
+        <xsl:text>'</xsl:text>
+      </xsl:if>
     </xsl:otherwise>
   </xsl:choose>
 
-  <xsl:if test="$post">
-    <xsl:text> . '</xsl:text>
-      <!-- TODO: escape -->
-      <xsl:value-of select="$post" />
-    <xsl:text>'</xsl:text>
-  </xsl:if>
 </xsl:template>