diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-03 17:30:58 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-03 17:30:58 +0200 |
| commit | 95c2cf33370ac73cfab6963d54d2a5bc8728d7a8 (patch) | |
| tree | a9d415d60bb689c6af40c4427d40c9ca8177f3ca /xhtml2odt/xsl/document-content/tables.xsl | |
| parent | 4f4ea768d9d72b96bcf826c525ed1b066191b11b (diff) | |
| parent | c50c0e4e5701b9926fbdad82b4ae54964a9283bb (diff) | |
| download | Ishtar-95c2cf33370ac73cfab6963d54d2a5bc8728d7a8.tar.bz2 Ishtar-95c2cf33370ac73cfab6963d54d2a5bc8728d7a8.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'xhtml2odt/xsl/document-content/tables.xsl')
| -rw-r--r-- | xhtml2odt/xsl/document-content/tables.xsl | 20 |
1 files 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"/> |