From 7d9ae891a17df11a1799ad02b069d9575d8a9608 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 26 Oct 2012 20:44:10 +0000
Subject: [PATCH] Fix bug #3297553 error in Word metadata elements from
 including WordML markup instead of just text.

---
 xsl/roundtrip/dbk2wordml.xsl | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/xsl/roundtrip/dbk2wordml.xsl b/xsl/roundtrip/dbk2wordml.xsl
index d5077f012..04c548b45 100644
--- a/xsl/roundtrip/dbk2wordml.xsl
+++ b/xsl/roundtrip/dbk2wordml.xsl
@@ -61,21 +61,27 @@
         <o:Author>
           <xsl:choose>
             <xsl:when test='$authors'>
-              <xsl:apply-templates select='$authors[1]' mode='doc:docprop.author'/>
+              <xsl:variable name="content">
+                <xsl:apply-templates select='$authors[1]' mode='doc:docprop.author'/>
+              </xsl:variable>
+              <xsl:value-of select="$content"/>
             </xsl:when>
             <xsl:otherwise>Unknown</xsl:otherwise>
           </xsl:choose>
         </o:Author>
         <o:LastAuthor>
-          <xsl:choose>
-            <xsl:when test='$info/revhistory/revision[1]/*[self::author|self::authorinitials]'>
-              <xsl:apply-templates select='$info/revhistory/revision[1]/*[self::author|self::authorinitials]' mode='doc:docprop.author'/>
-            </xsl:when>
-            <xsl:when test='$authors'>
-              <xsl:apply-templates select='$authors[1]' mode='doc:docprop.author'/>
-            </xsl:when>
-            <xsl:otherwise>Unknown</xsl:otherwise>
-          </xsl:choose>
+          <xsl:variable name="content">
+            <xsl:choose>
+              <xsl:when test='$info/revhistory/revision[1]/*[self::author|self::authorinitials]'>
+                <xsl:apply-templates select='$info/revhistory/revision[1]/*[self::author|self::authorinitials]' mode='doc:docprop.author'/>
+              </xsl:when>
+              <xsl:when test='$authors'>
+                <xsl:apply-templates select='$authors[1]' mode='doc:docprop.author'/>
+              </xsl:when>
+              <xsl:otherwise>Unknown</xsl:otherwise>
+            </xsl:choose>
+          </xsl:variable>
+          <xsl:value-of select="$content"/>
         </o:LastAuthor>
         <o:Revision>1</o:Revision>
         <o:TotalTime></o:TotalTime>
-- 
2.50.1