urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trail, inline: treat pagenames as a list of literal names, not links

master
Simon McVittie 2012-04-06 17:05:26 +01:00
parent 4a4610e66e
commit 258ee1bc3b
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/inline.pm
View File

@ -211,9 +211,7 @@ sub preprocess_inline (@) {
}
}
@list = grep { $_ ne '' }
map { bestlink($params{page}, $_) }
split ' ', $params{pagenames};
@list = split ' ', $params{pagenames};
if (yesno($params{reverse})) {
@list=reverse(@list);
@ -222,6 +220,8 @@ sub preprocess_inline (@) {
foreach my $p (@list) {
add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
}
@list = grep { exists $pagesources{$_} } @list;
}
else {
my $num=0;

19
IkiWiki/Plugin/trail.pm
View File

@ -26,6 +26,8 @@ sub import {
#
# * $pagestate{$T}{trail}{contents}
# Reference to an array of lists each containing either:
# - [pagenames => "page1", "page2"]
# Those literal pages
# - [link => "link"]
# A link specification, pointing to the same page that [[link]]
# would select
@ -148,8 +150,8 @@ sub preprocess_trailitems (@) {
}
if (exists $params{pagenames}) {
my @list = map { [link => $_] } split ' ', $params{pagenames};
push @{$pagestate{$params{page}}{trail}{contents}}, @list;
push @{$pagestate{$params{page}}{trail}{contents}},
[pagenames => (split ' ', $params{pagenames})];
}
return "";
@ -271,6 +273,19 @@ sub prerender {
$c->[1], sort => $c->[2],
reverse => $c->[3]);
}
elsif ($c->[0] eq 'pagenames') {
my @pagenames = @$c;
shift @pagenames;
foreach my $page (@pagenames) {
if (exists $pagesources{$page}) {
push @$members, $page;
}
else {
# rebuild trail if it turns up
add_depends($trail, $page, deptype("presence"));
}
}
}
elsif ($c->[0] eq 'link') {
my $best = bestlink($trail, $c->[1]);
push @$members, $best if length $best;

8
doc/ikiwiki/directive/inline.mdwn
View File

@ -113,10 +113,10 @@ Here are some less often needed parameters:
and/or `page/feed.rss`. This option is not supported if the wiki is
configured not to use `usedirs`.
* `pagenames` - If given instead of `pages`, this is interpreted as a
space-separated list of links to pages (with the same
[[SubPage/LinkingRules]] as in a [[ikiwiki/WikiLink]]), and they are inlined
in exactly the order given: the `sort` and `pages` parameters cannot be used
in conjunction with this one.
space-separated list of absolute page names ([[SubPage/LinkingRules]] are
not taken into account), and they are inlined in exactly the order given:
the `sort` and `pages` parameters cannot be used in conjunction with
this one.
* `trail` - If set to "yes" and the [[!iki plugins/trail desc=trail]] plugin
is enabled, turn the inlined pages into a trail with next/previous links,
by passing the same options to [[ikiwiki/directive/trailitems]]. The `skip`

2
t/trail.t
View File

@ -93,7 +93,7 @@ write_old_file("sorting/linked2.mdwn", "linked2");
write_old_file("sorting.mdwn",
'[[!traillink linked]] ' .
'[[!trailitems pages="sorting/z/a or sorting/a/b or sorting/a/c"]] ' .
'[[!trailitems pagenames="beginning middle end"]] ' .
'[[!trailitems pagenames="sorting/beginning sorting/middle sorting/end"]] ' .
'[[!inline pages="sorting/old or sorting/ancient or sorting/new" trail="yes"]] ' .
'[[!traillink linked2]]');