swext/mediawiki/src/filter/odt2mediawiki.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 6b04e7073a707633531df85ce15d4ad9f3202a2d Author: Julien Nabet <[email protected]> Date: Tue Jun 6 23:15:20 2017 +0200 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 <[email protected]> Tested-by: Julien Nabet <[email protected]> (cherry picked from commit 8a400cfa468655142103f18f722adf1d5cbda9c7) Reviewed-on: https://gerrit.libreoffice.org/38484 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"/> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
