From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 12 Jun 2013 17:37:44 +0000 (+0000)
Subject: Fix bug where merge was not processed for a structure
X-Git-Tag: release/1.79.1~6^2~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca42e3fb20503564a87a022d2768d98e5573a24f;p=docbook-dsssl

Fix bug where merge was not processed for a structure
element without resourceref.
---

diff --git a/xsl/assembly/assemble.xsl b/xsl/assembly/assemble.xsl
index 4f251934a..8f2fb1622 100644
--- a/xsl/assembly/assemble.xsl
+++ b/xsl/assembly/assemble.xsl
@@ -126,6 +126,10 @@
     </xsl:attribute>
     <xsl:copy-of select="@xml:id"/>
 
+    <xsl:call-template name="merge.info">
+      <xsl:with-param name="merge.element" select="d:merge"/>
+    </xsl:call-template>
+
     <xsl:apply-templates> 
       <xsl:with-param name="parent" select="$output.root.element"/>
     </xsl:apply-templates>