X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/15a0a151bf08a2e4a12e6e3bbc6f047b14090979..a9e45d868b721de2edba958a41fafa05c548359c:/IkiWiki/Plugin/map.pm?ds=sidebyside
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 429493b9e..18c584a30 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -80,7 +80,7 @@ sub preprocess (@) { #{{{
my $parent="";
my $indent=0;
my $openli=0;
- my $dummy=0;
+ my $addparent="";
my $map = "
\n
\n";
foreach my $item (sort keys %mapitems) {
my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());
@@ -90,14 +90,14 @@ sub preprocess (@) { #{{{
my $baseitem=IkiWiki::dirname($item);
while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
$parent=IkiWiki::dirname($parent);
- last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/;
+ last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
+ $addparent="";
$indent--;
$map .= "\n";
if ($indent > 0) {
$map .= "
\n";
}
}
- $dummy=0;
while ($depth < $indent) {
$indent--;
$map .= "\n";
@@ -106,22 +106,23 @@ sub preprocess (@) { #{{{
}
}
my @bits=split("/", $item);
+ my $p="";
+ $p.="/".shift(@bits) for 1..$indent;
while ($depth > $indent) {
$indent++;
if ($indent > 1) {
$map .= "
\n";
}
if ($depth > $indent) {
- my $p="";
- $p.="/".shift(@bits) for 1..$indent+1;
- $p=~s/^\///;
+ $p.="/".shift(@bits);
+ $addparent=$p;
+ $addparent=~s/^\///;
$map .= "- "
.htmllink($params{page}, $params{destpage},
- $p, class => "mapparent",
+ "/".$common_prefix.$p, class => "mapparent",
noimageinline => 1)
."\n";
$openli=1;
- $dummy=1;
}
else {
$openli=0;