summaryrefslogtreecommitdiff
path: root/swext/mediawiki/src/filter/odt2mediawiki.xsl
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2017-06-06 23:15:20 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-06-13 12:14:59 +0200
commit509fb27b9b630f8506af6104f8230b0efa2ebaaa (patch)
treef09d473576057100e57328304c91c4984d5fe08d /swext/mediawiki/src/filter/odt2mediawiki.xsl
parentd2353a5a8afa5aa0a760b0e6412c2f77aa3a6df6 (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> (cherry picked from commit 8a400cfa468655142103f18f722adf1d5cbda9c7) Reviewed-on: https://gerrit.libreoffice.org/38485 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'swext/mediawiki/src/filter/odt2mediawiki.xsl')
-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 f3da0651bbeb..4aada97afd75 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"/>