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

[Robert Antoni Buj Gelonch]

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   67 ++++++++++++++++++++++-----
 1 file changed, 57 insertions(+), 10 deletions(-)

New commits:
commit 57a283ed3c7a09a75c7a755313a4df8038664e83
Author: Robert Antoni Buj Gelonch <robert.buj at gmail.com>
Date:   Fri Apr 24 12:29:54 2015 +0200

    tdf#75019 bookmarks in exporting to mediawiki
    
    Change-Id: Ieb066d37196a22e67226d59e12c7869c1fc8cc8a
    Reviewed-on: https://gerrit.libreoffice.org/15509
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 7d03510..7198a1f 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -516,12 +516,37 @@
 		<variable name="link-ref" select="@xlink:href"/>
 		<choose>
 			<when test="string-length($link-ref) > 0">
-				<variable name="link-label" select="string(.)"/>
-				<text>[</text>
-				<value-of select="$link-ref"/>
-				<text> </text>
-				<value-of select="$link-label"/>
-				<text>]</text>
+				<choose>
+					<when test="starts-with($link-ref, '#')">
+						<text>[[</text>
+						<choose>
+							<when test="contains($link-ref, '_')">
+								<value-of select="translate($link-ref,'_','')"/>
+							</when>
+							<otherwise>
+								<value-of select="$link-ref"/>
+							</otherwise>
+						</choose>
+						<text>|</text>
+						<choose>
+							<when test="text:tab and ancestor::text:index-body">
+								<value-of select="node()[1]"/>
+							</when>
+							<otherwise>
+								<value-of select="string(.)"/>
+							</otherwise>
+						</choose>
+						<text>]]</text>
+					</when>
+
+                                        <otherwise>
+						<text>[</text>
+						<value-of select="$link-ref"/>
+						<text> </text>
+						<value-of select="string(.)"/>
+						<text>]</text>
+					</otherwise>
+				</choose>
 			</when>
 			
 			<otherwise>
@@ -894,6 +919,25 @@
  		<!-- TODO: Output an anchor. -->
  	</template>
 
+	<template match="text:bookmark-start">
+		<if test="boolean(@text:name)">
+			<variable name="bookmark">
+				<choose>
+					<when test="contains(@text:name,'_')">
+						<value-of select="translate(@text:name,'_','')"/>
+					</when>
+					<otherwise>
+						<value-of select="@text:name"/>
+					</otherwise>
+				</choose>
+			</variable>
+			<text>{{anchor|</text>
+			<value-of select="$bookmark"/>
+			<text>}} </text>
+		</if>
+		<apply-templates/>
+	</template>
+
 	<!-- 
 		== Plain text == 
 	-->
commit 9c054bb47127559513a40b0df4a5e3f6d8dcc1d7
Author: Robert Antoni Buj Gelonch <robert.buj at gmail.com>
Date:   Thu Apr 23 18:13:06 2015 +0200

    tdf#75360 tdf#90474 line breaks in exporting to mediawiki
    
    Change-Id: I7b6c9c76102fe22fdae6e62472b717358bfcee8b
    Reviewed-on: https://gerrit.libreoffice.org/15497
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 1205536..7d03510 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>