From be4c3810ad560402a6ccee8b2c7eabbe71497989 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 17 Mar 2016 01:05:56 +0100
Subject: XHTML to ODT: put table caption on top

---
 xhtml2odt/xsl/document-content/tables.xsl | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/xhtml2odt/xsl/document-content/tables.xsl b/xhtml2odt/xsl/document-content/tables.xsl
index a063f6bfd..f17354455 100644
--- a/xhtml2odt/xsl/document-content/tables.xsl
+++ b/xhtml2odt/xsl/document-content/tables.xsl
@@ -57,16 +57,6 @@
 </xsl:template>
 
 <xsl:template match="h:table">
-    <table:table table:style-name="table-default">
-        <table:table-column>
-            <xsl:attribute name="table:number-columns-repeated">
-                <xsl:value-of select="count(descendant::h:tr[1]/h:th|descendant::h:tr[1]/h:td)"/>
-            </xsl:attribute>
-        </table:table-column>
-        <!--<xsl:attribute name="table:name"></xsl:attribute>-->
-        <xsl:apply-templates/>
-        <xsl:apply-templates select="h:tfoot/*"/>
-    </table:table>
     <xsl:if test="h:caption">
         <xsl:variable name="number">
             <xsl:call-template name="table.number"/>
@@ -80,6 +70,16 @@
             <xsl:text>: </xsl:text><xsl:value-of select="h:caption"/>
         </text:p>
     </xsl:if>
+    <table:table table:style-name="table-default">
+        <table:table-column>
+            <xsl:attribute name="table:number-columns-repeated">
+                <xsl:value-of select="count(descendant::h:tr[1]/h:th|descendant::h:tr[1]/h:td)"/>
+            </xsl:attribute>
+        </table:table-column>
+        <!--<xsl:attribute name="table:name"></xsl:attribute>-->
+        <xsl:apply-templates/>
+        <xsl:apply-templates select="h:tfoot/*"/>
+    </table:table>
 </xsl:template>
 
 <xsl:template match="h:table/h:caption"/>
-- 
cgit v1.2.3