From 3f6c88f0ae04d33dead60f1e4533b3a51e0fb35a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 20:11:35 +0530
Subject: [PATCH] FB2 Input: Fix paras with both id and style

FB2 Input: Fix a regression that broke conversion of FB2 files with
paragraphs having both a style and an id attribute. Fixes #1243709 [xls:attribute error in FB2 files](https://bugs.launchpad.net/calibre/+bug/1243709)
---
 resources/templates/fb2.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/templates/fb2.xsl b/resources/templates/fb2.xsl
index 84fdd323bd..474c7c0045 100644
--- a/resources/templates/fb2.xsl
+++ b/resources/templates/fb2.xsl
@@ -223,14 +223,14 @@
     <xsl:template match="fb:p">
         <xsl:element name="div">
             <xsl:attribute name="class">paragraph</xsl:attribute>
+            <xsl:if test="@style">
+                <xsl:attribute name="style"><xsl:value-of select="@style"/></xsl:attribute>
+            </xsl:if>
             <xsl:if test="@id">
                 <xsl:element name="a">
                     <xsl:attribute name="name"><xsl:value-of select="@id"/></xsl:attribute>
                 </xsl:element>
             </xsl:if>
-            <xsl:if test="@style">
-                <xsl:attribute name="style"><xsl:value-of select="@style"/></xsl:attribute>
-            </xsl:if>
             <xsl:apply-templates/>
         </xsl:element>
     </xsl:template>