[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - swext/mediawiki

[Julien Nabet]

 swext/mediawiki/src/filter/odt2mediawiki.xsl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1684ef2146dce6c132e3472b38b932d99f22b41c
Author: Julien Nabet <serval2...@yahoo.fr>
Date:   Sun Jun 11 21:57:14 2017 +0200

    tdf#80671: mediawiki, no superscript tags allowed in footnotes
    
    Change-Id: I54c2cc0fc6b2a9c631fc83f59c2204dd5e374d2c
    Reviewed-on: https://gerrit.libreoffice.org/38666
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    (cherry picked from commit 6a24160894e91c007d4a2f8ef193eed670909ea5)
    Reviewed-on: https://gerrit.libreoffice.org/38669
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 4aada97afd75..25fa68fddca2 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -1431,7 +1431,7 @@
                                <value-of select="'}'"/>
                                 -->
 
-                               <if test="$superscript and 
not($superscript-left)">
+                               <if test="$superscript and 
not($superscript-left) and not(boolean(ancestor::text:note))">
                                        <text>&lt;sup&gt;</text>
                                </if>
                                <if test="$subscript and not($subscript-left)">
@@ -1469,7 +1469,7 @@
                                <if test="$subscript and not($subscript-right)">
                                        <text>&lt;/sub&gt;</text>
                                </if>
-                               <if test="$superscript and 
not($superscript-right)">
+                               <if test="$superscript and 
not($superscript-right) and not(boolean(ancestor::text:note))">
                                        <text>&lt;/sup&gt;</text>
                                </if>
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits