From 2878d1099c90e50e01d60eb44ab1fe8479d9adb7 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@rtspecialty.com>
Date: Tue, 5 Dec 2017 15:07:29 -0500
Subject: [PATCH] Defer inline-templates with sym-set until symtable is
 available

Other code relied on expand-sequence, but this really should be implicit,
since it is deceptively useless otherwise.

* src/current/include/preproc/template.xsl (preproc:macros): Defer
    processing of inline-template with sym-set until symbol table is
    available.
---
 src/current/include/preproc/template.xsl | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/current/include/preproc/template.xsl b/src/current/include/preproc/template.xsl
index 14868e95..0b6d2486 100644
--- a/src/current/include/preproc/template.xsl
+++ b/src/current/include/preproc/template.xsl
@@ -328,6 +328,20 @@
 </xsl:function>
 
 
+<!--
+  Inline templates depending on the symbol table must not be expanded
+  until the symbol table is actually available
+-->
+<xsl:template mode="preproc:macros" priority="6"
+              match="lv:inline-template[ lv:for-each/lv:sym-set
+                                         and not( root(.)/preproc:symtable ) ]">
+  <lv:expand-sequence>
+    <xsl:sequence select="." />
+  </lv:expand-sequence>
+
+  <xsl:message select="'[preproc] deferring inline-template waiting for symbol table'" />
+</xsl:template>
+
 
 <!--
   An inline template implicitly defines and then immediately applies a template