make taglink support the same method for specifying link text as a regular

wikilink
master
joey 2007-09-22 17:07:51 +00:00
parent 622b866f3e
commit c1474d795c
2 changed files with 19 additions and 5 deletions

View File

@ -57,12 +57,25 @@ sub preprocess_taglink (@) { #{{{
if (! @_) { if (! @_) {
return ""; return "";
} }
preprocess_tag(@_);
my %params=@_; my %params=@_;
delete $params{page}; return join(" ", map {
delete $params{destpage}; if (/(.*)\|(.*)/) {
delete $params{preview}; my $tag=IkiWiki::linkpage($2);
return join(" ", map { "[[$_]]" } keys %params); $tags{$params{page}}{$tag}=1;
return htmllink($params{page}, $params{destpage},
tagpage($tag),
linktext => IkiWiki::pagetitle($1));
}
else {
my $tag=IkiWiki::linkpage($_);
$tags{$params{page}}{$tag}=1;
return htmllink($params{page}, $params{destpage},
tagpage($tag));
}
}
grep {
$_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
} keys %params);
} # }}} } # }}}
sub pagetemplate (@) { #{{{ sub pagetemplate (@) { #{{{

View File

@ -14,6 +14,7 @@ feeds.
If you want a visible [[WikiLink]] along with the tag, use taglink instead: If you want a visible [[WikiLink]] along with the tag, use taglink instead:
\[[taglink foo]] \[[taglink foo]]
\[[taglink tagged_as_foo|foo]]
This plugin has a configuration option. Set --tagbase=tags and links to tags This plugin has a configuration option. Set --tagbase=tags and links to tags
will be located under the specified base page. If ikiwiki is configured will be located under the specified base page. If ikiwiki is configured