summaryrefslogtreecommitdiff
path: root/swext
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2017-06-06 23:15:20 +0200
committerJulien Nabet <serval2412@yahoo.fr>2017-06-07 07:13:54 +0200
commit8a400cfa468655142103f18f722adf1d5cbda9c7 (patch)
treeb096dc9756692fac98030c078a32bbf8da8c3557 /swext
parent9d6bf9d45d43a00f6dc87b9c83d28b93450ec51d (diff)
tdf#98888: mediawiki inserts redundant emptylines in <ref>
There's a newline in case of heading, table or bibliography following text:p ok but only if we're not in text:note node Change-Id: I71172751a51e29abdd770e758d27b1bc8f15cb0d Reviewed-on: https://gerrit.libreoffice.org/38470 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'swext')
-rw-r--r--swext/mediawiki/src/filter/odt2mediawiki.xsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 1b41b712cf5e..bf186ef6723a 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -874,7 +874,7 @@
</otherwise>
</choose>
</when>
- <when test="boolean(./following::*[1]/self::text:h) or boolean(./following::*[1]/self::table:table) or boolean(./following::*[1]/self::text:bibliography)">
+ <when test="not(boolean(ancestor::text:note)) and (boolean(./following::*[1]/self::text:h) or boolean(./following::*[1]/self::table:table) or boolean(./following::*[1]/self::text:bibliography))">
<!-- Newline before following heading or table. -->
<value-of select="$NL"/>
<value-of select="$NL"/>