From 7492d9c7cb75960ca48f2427e1858363cf9e2dcd Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 1 Feb 2012 16:35:08 +0000
Subject: [PATCH] When merging styles, handle <b>, <i> in addition to
 <strong>,<em>

---
 etemplate/templates/default/msoffice.xslt   | 10 +++-------
 etemplate/templates/default/openoffice.xslt |  2 +-
 etemplate/templates/default/wordml.xslt     |  6 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/etemplate/templates/default/msoffice.xslt b/etemplate/templates/default/msoffice.xslt
index d39af698c1..2386ba1385 100644
--- a/etemplate/templates/default/msoffice.xslt
+++ b/etemplate/templates/default/msoffice.xslt
@@ -86,17 +86,13 @@ Breakers
 	</xsl:template>
 -->
 
-	<xsl:template match="w:r[descendant::strong|descendant::em|descendant::u|descendant::span]">
-		<xsl:call-template name="apply-styles"/>
-	</xsl:template>
-
-	<xsl:template name="apply-styles">
+	<xsl:template name="apply-styles" match="w:r[descendant::strong|descendant::b|descendant::i|descendant::em|descendant::u|descendant::span]">
 		<xsl:for-each select="node()|@*[not(w:rPr)]">
 			<xsl:choose>
-			<xsl:when test="descendant::strong|descendant::em|descendant::u|descendant::span" >
+			<xsl:when test="descendant::strong|descendant::b|descendant::i|descendant::em|descendant::u|descendant::span" >
 				<xsl:for-each select="node()|@*">
 					<xsl:choose>
-					<xsl:when test="descendant-or-self::strong|descendant-or-self::em|descendant-or-self::u|descendant-or-self::span" >
+					<xsl:when test="descendant-or-self::strong|descendant-or-self::b|descendant-or-self::i|descendant-or-self::em|descendant-or-self::u|descendant-or-self::span" >
 						<w:r>
 							<w:rPr>
 								<xsl:apply-templates select=".|child::*" />
diff --git a/etemplate/templates/default/openoffice.xslt b/etemplate/templates/default/openoffice.xslt
index 147631eedf..e9b2efe61d 100644
--- a/etemplate/templates/default/openoffice.xslt
+++ b/etemplate/templates/default/openoffice.xslt
@@ -211,7 +211,7 @@
 	</xsl:template>
 
 	<!-- Simple, use known styles -->
-	<xsl:template match="strong">
+	<xsl:template match="strong|b">
 		<text:span text:style-name="Tbold"><xsl:apply-templates/></text:span>
 	</xsl:template>
 	<xsl:template match="em|i">
diff --git a/etemplate/templates/default/wordml.xslt b/etemplate/templates/default/wordml.xslt
index d4be265251..37f6e63a41 100644
--- a/etemplate/templates/default/wordml.xslt
+++ b/etemplate/templates/default/wordml.xslt
@@ -87,13 +87,13 @@ Breakers
 	</xsl:template>
 -->
 
-	<xsl:template match="w:r[descendant::strong|descendant::em|descendant::u|descendant::span]" name="apply-styles">
+	<xsl:template match="w:r[descendant::strong|descendant::b|descendant::em|descendant::i|descendant::u|descendant::span]" name="apply-styles">
 		<xsl:for-each select="node()|@*[not(w:rPr)]">
 			<xsl:choose>
-			<xsl:when test="descendant::strong|descendant::em|descendant::u|descendant::span" >
+			<xsl:when test="descendant::strong|descendant::b|descendant::em|descendant::i|descendant::u|descendant::span" >
 				<xsl:for-each select="node()|@*">
 					<xsl:choose>
-					<xsl:when test="descendant-or-self::strong|descendant-or-self::em|descendant-or-self::u|descendant-or-self::span" >
+					<xsl:when test="descendant-or-self::strong|descendant-or-self::b|descendant-or-self::em|descendant-or-self::i|descendant-or-self::u|descendant-or-self::span" >
 						<w:r>
 							<w:rPr>
 								<xsl:apply-templates select=".|child::*" />