Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / linkmap.pm

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index ac26e072e9dc7afa18ad33d5fa2049d347f291bb..b5ef1a137beb26e3e66aee89f468c33fd6e1865a 100644 (file)
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -5,6 +5,7 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use IPC::Open2;
 use strict;
 use IkiWiki 3.00;
 use IPC::Open2;

+use HTML::Entities;

 
 sub import {
        hook(type => "getsetup", id => "linkmap", call => \&getsetup);
 
 sub import {
        hook(type => "getsetup", id => "linkmap", call => \&getsetup);


@@ -22,6 +23,18 @@ sub getsetup () {
 
 my $mapnum=0;
 
 
 my $mapnum=0;
 

+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=@_;
 
 sub preprocess (@) {
        my %params=@_;
 


@@ -63,7 +76,7 @@ sub preprocess (@) {
        my $show=sub {
                my $item=shift;
                if (! $shown{$item}) {
        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;
                }
        };
                        $shown{$item}=1;
                }
        };


@@ -74,7 +87,7 @@ sub preprocess (@) {
                        foreach my $endpoint ($item, $link) {
                                $show->($endpoint);
                        }
                        foreach my $endpoint ($item, $link) {
                                $show->($endpoint);
                        }

-                       print OUT "\"$item\" -> \"$link\";\n";
+                       print OUT pageescape($item)." -> ".pageescape($link).";\n";

                }
        }
        print OUT "}\n";
                }
        }
        print OUT "}\n";