diff options
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | doc/bugs/aggregateinline_planets_wrongly_link_to_posts.mdwn | 13 | ||||
| -rw-r--r-- | doc/plugins/aggregate.mdwn | 10 | ||||
| -rw-r--r-- | doc/todo/aggregate_to_internal_pages.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/pedigree_plugin.mdwn | 13 | ||||
| -rwxr-xr-x | t/html.t | 2 |
6 files changed, 43 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 3c535fd5f..9039829ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,17 +15,24 @@ ikiwiki (2.54) UNRELEASED; urgency=low * Change deb dependencies to list Text::Markdown before markdown, since the former, while slower, has a much better html parser that avoids numerous bugs. - * meta, inline: Support guid options, to allow forcing a particular url or - uuid in feeds. (smcv) * Move yesno function out of inline and into IkiWiki core, not exported. - * meta: fix title() PageSpec (smcv) - * Some footer style changes. (smcv) * Error handling improvement for preprocess hooks. It's now safe to call error() from such hooks; it will cause a nicely formatted error message to be inserted into the page. * Cut the size of the binary package in half by excluding pages for bugs and todo items from the html shipped in it. + [ Simon McVittie ] + * meta, inline: Support guid options, to allow forcing a particular url or + uuid in feeds. + * meta: fix title() PageSpec + * Some footer style changes. + * aggregate: Add an `aggregateinternal` option, which allows storing + aggregated data to internal-use files, rather than wiki pages. This + can save disk space, and be faster. + * ikiwiki-transition: Add a `aggregateinternal` transition to rename + the aggregated files. + -- Josh Triplett <josh@freedesktop.org> Wed, 09 Jul 2008 21:30:33 -0700 ikiwiki (2.53) unstable; urgency=low diff --git a/doc/bugs/aggregateinline_planets_wrongly_link_to_posts.mdwn b/doc/bugs/aggregateinline_planets_wrongly_link_to_posts.mdwn index e722e9d73..58c247631 100644 --- a/doc/bugs/aggregateinline_planets_wrongly_link_to_posts.mdwn +++ b/doc/bugs/aggregateinline_planets_wrongly_link_to_posts.mdwn @@ -1,6 +1,17 @@ [[!meta title="aggregate/inline planets wrongly link to posts"]] Please see -<http://vcs-pkg.org/planet/>. The headers of posts link to the HTML pages, which ikiwiki scraped. Also, the `\[[meta]]` titles and author directives aren't processed, but included inline. I believe that the headers should link to the posts directly, not the "cached" copies ikiwiki keeps around. +<http://vcs-pkg.org/planet/>. The headers of posts link to the HTML pages, which ikiwiki scraped. +I believe that the headers should link to the posts directly, not the "cached" copies ikiwiki keeps around. + +> As far as I can see, that problem no longer exists. + +Also, the `\[[meta]]` titles and author directives aren't processed, but included inline. + +> Hmm, I don't see that either. What's also not ideal is that the cached copies can be edited. Any edits there will never make it to the VCS and thus won't show up in recentchanges. + +> That can be disabled now by enabling `aggreageinternal` --[[Joey]] + +> Calling this [[done]], please let me know if I missed something. diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn index 8c2e7b076..ecca0232e 100644 --- a/doc/plugins/aggregate.mdwn +++ b/doc/plugins/aggregate.mdwn @@ -100,8 +100,8 @@ you should follow this process: in those PageSpecs. For example, if the PageSpec was `foo/*`, it should be changed to `internal(foo/*)`. This has to be done because internal pages are not matched by regular globs. -2. Use [[ikiwiki-transition]] to rename all existing aggregated `.html` - files in the input directory, and delete the corresponding files from - the output directory. The command to run is - `ikiwiki-transition aggregateinternal $setupfile` -3. Turn on `aggregateinternal` in the setup file and rebuild the wiki. +2. Turn on `aggregateinternal` in the setup file. +3. Use [[ikiwiki-transition]] to rename all existing aggregated `.html` + files in the srcdir. The command to run is + `ikiwiki-transition aggregateinternal $setupfile`, +4. Refresh the wiki. (`ikiwiki -setup your.setup -refresh`) diff --git a/doc/todo/aggregate_to_internal_pages.mdwn b/doc/todo/aggregate_to_internal_pages.mdwn index ee3aee17a..38427133f 100644 --- a/doc/todo/aggregate_to_internal_pages.mdwn +++ b/doc/todo/aggregate_to_internal_pages.mdwn @@ -56,4 +56,4 @@ change their pagespecs to use `internal()`. > "ikiwiki-transition aggregateinternal $setupfile" moves the pages around, > although it doesn't update the pagespecs (I wouldn't know how...) --[[smcv]] -[[patch]] +[[tag patch done]] diff --git a/doc/todo/pedigree_plugin.mdwn b/doc/todo/pedigree_plugin.mdwn index d1eb6fdf9..120820d03 100644 --- a/doc/todo/pedigree_plugin.mdwn +++ b/doc/todo/pedigree_plugin.mdwn @@ -73,6 +73,14 @@ Any opinions on the idea/design/implementation? >>> Javascript might do the trick, but if it's getting so complicated, I'll >>> just style my parentlinks another way. +>>>> Perhaps I misunderstood what `is_grand_mother` is supposed to do. The +>>>> docs were not very clear to me. If it's supposed to be 2 down from +>>>> the page, (and not from the root), this could be achieved by reversing +>>>> the `depth_n` variables. So the page gets `depth_1` set, its parent gets +>>>> `depth_2` set, etc. If you want to be able to include/exclude +>>>> from both ends, you could also have a `height_n` that is 1 for the +>>>> root, and counts upwards. --[[Joey]] + >>> In my understanding, your suggestion gives us little more than can already >>> be achieved anyway with `HTML::Template`'s `loop_context_vars` (i.e. >>> `__first__`, `__last__` and `__counter__`). The only added bonus is doing @@ -119,6 +127,11 @@ Any opinions on the idea/design/implementation? >>> bare minimum. Let's say it is my up-to-date proposal. (Well, if the various >>> shortcuts don't really annoy you, I'd be glad to keep them ;) +>>>> This sounds fairly similar to what I just described above. (I called +>>>> DISTANCE "height".) I don't know about the CSS tricks; seems like if +>>>> `DEPTH_n` and `DISTANCE_n` are provided, you can test for them inside +>>>> the loop using HTML::Template's lame testing, and isolate any page or +>>>> range of pages. --[[Joey]] (I'll try never to rebase this branch, but writing this plugin has been a pretext for me to start learning Git, so...) @@ -6,7 +6,7 @@ use Test::More; my @pages; BEGIN { - @pages=qw(index todo features news plugins/map security); + @pages=qw(index features news plugins/map security); if (! -x "/usr/bin/validate") { plan skip_all => "/usr/bin/validate html validator not present"; } |