generate valid xhtml in all cases, including nesting

master
joey 2006-08-18 22:22:47 +00:00
parent 7f58a84dea
commit eea9f5053a
1 changed files with 11 additions and 6 deletions

View File

@ -4,7 +4,7 @@
# #
# By Alessandro Dotti Contra <alessandro@hyboria.org> # By Alessandro Dotti Contra <alessandro@hyboria.org>
# #
# Revision: 0.1 # Revision: 0.2
package IkiWiki::Plugin::map; package IkiWiki::Plugin::map;
use warnings; use warnings;
@ -34,25 +34,30 @@ sub preprocess (@) { #{{{
# Create the map. # Create the map.
my $indent=0; my $indent=0;
my $openli=0;
my $map = "<div class='map'>\n"; my $map = "<div class='map'>\n";
$map .= "<ul>\n";
foreach my $item (sort @mapitems) { foreach my $item (sort @mapitems) {
my $depth = ($item =~ tr/\//\//) + 1; my $depth = ($item =~ tr/\//\//);
while ($depth < $indent) { while ($depth < $indent) {
$indent--; $indent--;
$map.="</ul>\n"; $map.="</li></ul>\n";
} }
while ($depth > $indent) { while ($depth > $indent) {
$indent++; $indent++;
$map.="<ul>\n"; $map.="<ul>\n";
$openli=0;
} }
$map .= "</li>\n" if $openli;
$map .= "<li>" $map .= "<li>"
.IkiWiki::htmllink($params{page}, $params{destpage}, $item) .IkiWiki::htmllink($params{page}, $params{destpage}, $item) ."\n";
."</li>\n"; $openli=1;
} }
while ($indent > 0) { while ($indent > 0) {
$indent--; $indent--;
$map.="</ul>\n"; $map.="</li></ul>\n";
} }
$map .= "</li></ul>\n";
$map .= "</div>\n"; $map .= "</div>\n";
return $map; return $map;
} # }}} } # }}}