inline, trail: The pagenames parameter is now a list of absolute pagenames, not relative wikilink type names. This is necessary to fix a bug, and makes pagenames more consistent with the pagespec used in the pages parameter. (smcv)

master
Joey Hess 2012-04-08 16:07:17 -04:00
parent fc5c938b19
commit ab1ebf1ec6
3 changed files with 10 additions and 3 deletions

4
debian/changelog vendored
View File

@ -17,6 +17,10 @@ ikiwiki (3.20120204) UNRELEASED; urgency=low
* rename: Allow rename to be started not from the edit page; return to * rename: Allow rename to be started not from the edit page; return to
the renamed page in this case. the renamed page in this case.
* remove: Support removing of pages in the transient underlay. (smcv) * remove: Support removing of pages in the transient underlay. (smcv)
* inline, trail: The pagenames parameter is now a list of absolute
pagenames, not relative wikilink type names. This is necessary to fix
a bug, and makes pagenames more consistent with the pagespec used
in the pages parameter. (smcv)
-- Joey Hess <joeyh@debian.org> Wed, 21 Mar 2012 14:33:14 -0400 -- Joey Hess <joeyh@debian.org> Wed, 21 Mar 2012 14:33:14 -0400

View File

@ -40,3 +40,5 @@ I think the presence dependency is probably the cleanest approach?
>> semantics, my `ready/literal-pagenames` branch does that. For >> semantics, my `ready/literal-pagenames` branch does that. For
>> my main use-case for `pagenames` ([[plugins/contrib/album]]) >> my main use-case for `pagenames` ([[plugins/contrib/album]])
>> it's fine either way. --[[smcv]] >> it's fine either way. --[[smcv]]
>>> Ok, [[merged|done]]. I think it's more consistent this way. --[[Joey]]

View File

@ -12,9 +12,10 @@ Options are similar to [[!iki ikiwiki/directive/inline desc=inline]]:
* `pages`: adds pages that match a [[ikiwiki/PageSpec]] to the trail * `pages`: adds pages that match a [[ikiwiki/PageSpec]] to the trail
(cannot be used with `pagenames`) (cannot be used with `pagenames`)
* `pagenames`: adds a space-separated list of pages to the trail, * `pagenames`: if used instead of `pages`, this is interpreted as a
with the same [[ikiwiki/SubPage/LinkingRules]] as for a [[ikiwiki/WikiLink]] space-separated list of absolute page names
(cannot be used with `pages`) ([[SubPage/LinkingRules]] are not taken into account)
to add to the trail
* `sort`: add the pages matched by `pages` to the trail in this * `sort`: add the pages matched by `pages` to the trail in this
[[ikiwiki/pagespec/sorting]] order (cannot be used with `pagenames`) [[ikiwiki/pagespec/sorting]] order (cannot be used with `pagenames`)