extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

When merging styles, handle <b>, <i> in addition to <strong>,<em>

Browse Source
This commit is contained in:
Nathan Gray 2012-02-01 15:37:49 +00:00
parent 625a125e83
commit 3874ec6084
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/templates/default/msoffice.xslt
View File

@ -86,13 +86,13 @@ Breakers
</xsl:template> </xsl:template>
--> -->
<xsl:template name="apply-styles" match="w:r[descendant::strong|descendant::em|descendant::u|descendant::span]"> <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:for-each select="node()|@*[not(w:rPr)]">
<xsl:choose> <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:for-each select="node()|@*">
<xsl:choose> <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:r>
<w:rPr> <w:rPr>
<xsl:apply-templates select=".|child::*" /> <xsl:apply-templates select=".|child::*" />

2
etemplate/templates/default/openoffice.xslt
View File

@ -211,7 +211,7 @@
</xsl:template> </xsl:template>
<!-- Simple, use known styles --> <!-- Simple, use known styles -->
<xsl:template match="strong"> <xsl:template match="strong|b">
<text:span text:style-name="Tbold"><xsl:apply-templates/></text:span> <text:span text:style-name="Tbold"><xsl:apply-templates/></text:span>
</xsl:template> </xsl:template>
<xsl:template match="em|i"> <xsl:template match="em|i">

6
etemplate/templates/default/wordml.xslt
View File

@ -87,13 +87,13 @@ Breakers
</xsl:template> </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:for-each select="node()|@*[not(w:rPr)]">
<xsl:choose> <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:for-each select="node()|@*">
<xsl:choose> <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:r>
<w:rPr> <w:rPr>
<xsl:apply-templates select=".|child::*" /> <xsl:apply-templates select=".|child::*" />