diff options
author | Robert Antoni Buj Gelonch <robert.buj@gmail.com> | 2015-04-23 18:13:06 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-30 12:20:11 +0000 |
commit | 9c054bb47127559513a40b0df4a5e3f6d8dcc1d7 (patch) | |
tree | 59597228ba5f19759094a972ee2b4c2b9a1f7942 | |
parent | 14db5836544b4de6878d762a0d9c83d70f6d4e3f (diff) |
Change-Id: I7b6c9c76102fe22fdae6e62472b717358bfcee8b
Reviewed-on: https://gerrit.libreoffice.org/15497
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | swext/mediawiki/src/filter/odt2mediawiki.xsl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 1205536bac42..7d03510666db 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -285,6 +285,7 @@ <text> </text> <value-of select="$token"/> <value-of select="$NL"/> + <value-of select="$NL"/> </if> </template> @@ -293,6 +294,7 @@ <apply-templates/> <text> ==</text> <value-of select="$NL"/> + <value-of select="$NL"/> </template> <!-- @@ -554,7 +556,7 @@ == Paragraphs == --> - <template match="text:p[string-length(.) > 0]"> + <template match="text:p"> <variable name="style"> <call-template name="mk-style-set"> <with-param name="node" select="."/> @@ -602,7 +604,7 @@ --> <choose> <when test="boolean(ancestor::text:list-item)"> - <text><br/> </text> + <text><br/></text> </when> <when test="$code"> <variable name="style-right"> @@ -640,12 +642,13 @@ </otherwise> </choose> </when> - <when test="boolean(./following-sibling::*[1]/self::text:h) or boolean(./following-sibling::*[1]/self::table:table) or boolean(./following-sibling::*[1]/self::text:bibliography)"> + <when test="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"/> </when> - <when test="./following-sibling::*[1]/self::text:list and not(ancestor::text:list-item)"> + <when test="not(./following-sibling::*[1]) and name(./following::*[1])='text:p' and ancestor::text:list-item"> + <!-- End of the list --> <value-of select="$NL"/> <value-of select="$NL"/> </when> |