Merge remote branch 'smcv/ready/link-types'

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 25e9247b2e99d81ad72929dfae8a6cd771e12893..2415307d456b1f0b2aabcdaa569666e33337475c 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1164,7 +1164,7 @@ sub htmlize ($$$$) {
        my $content=shift;
        
        my $oneline = $content !~ /\n/;
-
+       
        if (exists $hooks{htmlize}{$type}) {
                $content=$hooks{htmlize}{$type}{call}->(
                        page => $page,
@@ -1185,10 +1185,9 @@ sub htmlize ($$$$) {
        
        if ($oneline) {
                # hack to get rid of enclosing junk added by markdown
-               # and other htmlizers
+               # and other htmlizers/sanitizers
                $content=~s/^<p>//i;
-               $content=~s/<\/p>$//i;
-               chomp $content;
+               $content=~s/<\/p>\n*$//i;
        }
 
        return $content;
@@ -2259,17 +2258,6 @@ sub match_link ($$;@) {
        return IkiWiki::FailReason->new("$page does not link to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
 }
 
-sub match_typedlink($$;@) {
-       my $page = shift;
-       my $args = shift;
-
-       if ($args =~ /^(\w+)\s+(.*)$/) {
-               return match_link($page, $2, @_, linktype => $1);
-       }
-
-       return IkiWiki::ErrorReason->new("typedlink expects e.g. 'tag *' but got: $args");
-}
-
 sub match_backlink ($$;@) {
        my $ret=match_link($_[1], $_[0], @_);
        $ret->influences($_[1] => $IkiWiki::DEPEND_LINKS);