X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9747c47670064f206189eb3c36a8e7fcfe08e172..bd8198fb77ed5cf77ddeb860ca1ac983bfaacbbd:/IkiWiki/Plugin/linkmap.pm

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 28acbda32..b5ef1a137 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -5,11 +5,11 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use IPC::Open2;
+use HTML::Entities;
 
 sub import {
 	hook(type => "getsetup", id => "linkmap", call => \&getsetup);
 	hook(type => "preprocess", id => "linkmap", call => \&preprocess);
-	hook(type => "format", id => "linkmap", call => \&format);
 }
 
 sub getsetup () {
@@ -17,38 +17,30 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
 my $mapnum=0;
-my %maps;
+
+sub pageescape {
+	my $item = shift;
+	# encoding explicitly in case ikiwiki is configured to accept <> or &
+	# in file names
+	my $title = pagetitle($item, 1);
+	# it would not be necessary to encode *all* the html entities (<> would
+	# be sufficient, &" probably a good idea), as dot accepts utf8, but it
+	# isn't bad either
+	$title = encode_entities($title);
+	return("<$title>");
+}
 
 sub preprocess (@) {
 	my %params=@_;
 
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Can't just return the linkmap here, since the htmlscrubber
-	# scrubs out all <object> tags (with good reason!)
-	# Instead, insert a placeholder tag, which will be expanded during
-	# formatting.
 	$mapnum++;
-	$maps{$mapnum}=\%params;
-	return "<div class=\"linkmap$mapnum\"></div>";
-}
-
-sub format (@) {
-        my %params=@_;
-
-	$params{content}=~s/<div class=\"linkmap(\d+)"><\/div>/genmap($1)/eg;
-
-        return $params{content};
-}
-
-sub genmap ($) {
-	my $mapnum=shift;
-	return "" unless exists $maps{$mapnum};
-	my %params=%{$maps{$mapnum}};
 	my $connected=IkiWiki::yesno($params{connected});
 
 	# Get all the items to map.
@@ -84,7 +76,7 @@ sub genmap ($) {
 	my $show=sub {
 		my $item=shift;
 		if (! $shown{$item}) {
-			print OUT "\"$item\" [shape=box,href=\"$mapitems{$item}\"];\n";
+			print OUT pageescape($item)." [shape=box,href=\"$mapitems{$item}\"];\n";
 			$shown{$item}=1;
 		}
 	};
@@ -95,17 +87,17 @@ sub genmap ($) {
 			foreach my $endpoint ($item, $link) {
 				$show->($endpoint);
 			}
-			print OUT "\"$item\" -> \"$link\";\n";
+			print OUT pageescape($item)." -> ".pageescape($link).";\n";
 		}
 	}
 	print OUT "}\n";
 	close OUT || error gettext("failed to run dot");
 
 	local $/=undef;
-	my $ret="<object data=\"".urlto($dest, $params{destpage}).
-	       "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
-	        <IN>.
-	        "</object>";
+	my $ret="<img src=\"".urlto($dest, $params{destpage}).
+	       "\" alt=\"".gettext("linkmap").
+	       "\" usemap=\"#linkmap$mapnum\" />\n".
+	        <IN>;
 	close IN || error gettext("failed to run dot");
 	
 	waitpid $pid, 0;