From 3f361ab80efdef52ed3d3d70447f26e927d6aa7b Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 17 Aug 2011 15:15:48 +0100 Subject: [PATCH 01/16] allow site-wide meta definitions: new patch --- .../allow_site-wide_meta_definitions.mdwn | 132 +++--------------- 1 file changed, 18 insertions(+), 114 deletions(-) diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index 82670250e..23967b1d4 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -60,75 +60,7 @@ definitions essentially. >>> I'm not necessarily saying that's a good idea. Indeed, my memory >>> concerns below invalidate this idea pretty well. --[[Joey]] - diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm - index 6fe9cda..2f8c098 100644 - --- a/IkiWiki/Plugin/meta.pm - +++ b/IkiWiki/Plugin/meta.pm - @@ -13,6 +13,8 @@ sub import { - hook(type => "needsbuild", id => "meta", call => \&needsbuild); - hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1); - hook(type => "pagetemplate", id => "meta", call => \&pagetemplate); - + hook(type => "scan", id => "meta", call => \&scan) - + if $config{"meta_defaults"}; - } - - sub getsetup () { - @@ -305,6 +307,15 @@ sub match { - } - } - - +sub scan() { - + my %params = @_; - + my $page = $params{page}; - + foreach my $default (@{$config{"meta_defaults"}}) { - + preprocess(%$default, page => $page, - + destpage => $page, preview => 0); - + } - +} - + - package IkiWiki::PageSpec; - - sub match_title ($$;@) { - diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm - index 8a25ecc..e4d50c9 100644 - --- a/IkiWiki/Setup.pm - +++ b/IkiWiki/Setup.pm - @@ -51,7 +51,13 @@ sub merge ($) { - $config{$c}=$setup{$c}; - } - else { - - $config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}] - + $config{$c}=[map { - + if(ref $_ eq 'HASH') { - + $_ - + } else { - + IkiWiki::possibly_foolish_untaint($_) - + } - + } @{$setup{$c}}]; - } - } - elsif (ref $setup{$c} eq 'HASH') { - diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn - index 000f461..8d34ee4 100644 - --- a/doc/ikiwiki/directive/meta.mdwn - +++ b/doc/ikiwiki/directive/meta.mdwn - @@ -12,6 +12,16 @@ also specifies some additional sub-parameters. - The field values are treated as HTML entity-escaped text, so you can include - a quote in the text by writing `"` and so on. - - +You can also define site-wide defaults for meta values by including them - +in your setup file. The key used is `meta_defaults` and the value is a list - +of hashes, one per meta directive. e.g.: - + - + meta_defaults = [ - + { copyright => "Copyright 2007 by Joey Hess" }, - + { license => "GPL v2+" }, - + { link => "somepage", rel => "site entrypoint", }, - + ], - + - Supported fields: - - * title + -- [[Jon]] @@ -159,51 +91,7 @@ definitions essentially. >> >> Is this merge-worthy? - diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm - index b229592..3132257 100644 - --- a/IkiWiki/Plugin/meta.pm - +++ b/IkiWiki/Plugin/meta.pm - @@ -13,6 +13,7 @@ sub import { - hook(type => "needsbuild", id => "meta", call => \&needsbuild); - hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1); - hook(type => "pagetemplate", id => "meta", call => \&pagetemplate); - + hook(type => "scan", id => "meta", call => \&scan); - } - - sub getsetup () { - @@ -302,6 +303,15 @@ sub match { - } - } - - +sub scan() { - + my %params = @_; - + my $page = $params{page}; - + foreach my $type (map { s/^meta_//; $_ } grep /^meta_/, keys %config) { - + $pagestate{$page}{meta}{$type} = $config{"meta_$type"} - + unless defined $pagestate{$page}{meta}{$type}; - + } - +} - + - package IkiWiki::PageSpec; - - sub match_title ($$;@) { - diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn - index 000f461..200c4b2 100644 - --- a/doc/ikiwiki/directive/meta.mdwn - +++ b/doc/ikiwiki/directive/meta.mdwn - @@ -12,6 +12,12 @@ also specifies some additional sub-parameters. - The field values are treated as HTML entity-escaped text, so you can include - a quote in the text by writing `"` and so on. - - +You can also define site-wide defaults for meta values by including them - +in your setup file, e.g. - + - + meta_copyright => "Copyright 2007 by Joey Hess", - + meta_license => "GPL v2+", - + - Supported fields: - - * title + -- [[Jon]] @@ -244,3 +132,19 @@ definitions essentially. >>> metadata of the given type is present. --[[Joey]] >>>> >>>> that should be easy enough to do. I will work on a patch. -- [[Jon]] +>>>>> Hi — I've written a new patch which I hope addresses the concerns raised +>>>>> with the previous ones. The new approach is to hard-code in `scan()` +>>>>> which of the meta types are supported in the setup file. If one is +>>>>> defined, then `scan()` calls `preprocess()`, as [[smcv]] suggested, +>>>>> rather than stuffing redundant data into ikiwiki's data structures. +>>>>> +>>>>> Two types supported in the setup file have optional arguments: `author` +>>>>> and `title`. These are supported by having special-cased setup keys +>>>>> `meta_author_sortas` and `meta_title_sortas`. Future expansion of the +>>>>> number of supported types, or addition of arguments to existing ones, +>>>>> can similarly be special-cased. +>>>>> +>>>>> The setup data structure is no longer complicated with an +>>>>> array-of-hashes, which means this is suitable for exposing via websetup. +>>>>> A future iteration of the patch will implement this. — [[Jon]] + From 0334519208e84e26e6035e2fc57b37cb90dd1fe1 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 17 Aug 2011 15:24:16 +0100 Subject: [PATCH 02/16] defaultmeta: where you can find the patch --- doc/todo/allow_site-wide_meta_definitions.mdwn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index 23967b1d4..4b7068901 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -146,5 +146,8 @@ definitions essentially. >>>>> >>>>> The setup data structure is no longer complicated with an >>>>> array-of-hashes, which means this is suitable for exposing via websetup. ->>>>> A future iteration of the patch will implement this. — [[Jon]] - +>>>>> A future iteration of the patch will implement this. +>>>>> +>>>>> The patch can be found at +>>>>> [[!template id=gitbranch branch=jmtd/defaultmeta author="[[jon]]"]] +>>>>> — [[Jon]] From 7cc4b77c98c765ac22fa4eda6bb891aeafefbb74 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 17 Aug 2011 15:44:52 +0100 Subject: [PATCH 03/16] defaultmeta: implement getsetup() changes --- doc/todo/allow_site-wide_meta_definitions.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index 4b7068901..c0da9323b 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -146,7 +146,7 @@ definitions essentially. >>>>> >>>>> The setup data structure is no longer complicated with an >>>>> array-of-hashes, which means this is suitable for exposing via websetup. ->>>>> A future iteration of the patch will implement this. +>>>>> `getsetup()` has been adjusted accordingly. >>>>> >>>>> The patch can be found at >>>>> [[!template id=gitbranch branch=jmtd/defaultmeta author="[[jon]]"]] From 4718111301a291f10f50a9ec745c91d493c8a24c Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Sun, 21 Aug 2011 15:02:52 +0100 Subject: [PATCH 04/16] defaultmeta: tweak definition of git branch --- doc/todo/allow_site-wide_meta_definitions.mdwn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index c0da9323b..a308e0d8c 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -148,6 +148,5 @@ definitions essentially. >>>>> array-of-hashes, which means this is suitable for exposing via websetup. >>>>> `getsetup()` has been adjusted accordingly. >>>>> ->>>>> The patch can be found at ->>>>> [[!template id=gitbranch branch=jmtd/defaultmeta author="[[jon]]"]] +>>>>> The patch can be found at the git branch described above. >>>>> — [[Jon]] From b7e628c6f7c3ca74bf2372d9afce57b27137ec29 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Sun, 21 Aug 2011 15:07:45 +0100 Subject: [PATCH 05/16] pagespec aliases: new code --- doc/todo/pagespec_aliases.mdwn | 69 ++++++---------------------------- 1 file changed, 11 insertions(+), 58 deletions(-) diff --git a/doc/todo/pagespec_aliases.mdwn b/doc/todo/pagespec_aliases.mdwn index 43714dc50..472526389 100644 --- a/doc/todo/pagespec_aliases.mdwn +++ b/doc/todo/pagespec_aliases.mdwn @@ -1,3 +1,4 @@ +[[!template id=gitbranch branch=jon/pagespec_alias author="[[Jon]]"]] [[!tag patch wishlist]]I quite often find myself repeating a boiler-plate [[ikiwiki/pagespec]] chunk, e.g. @@ -10,64 +11,7 @@ pagespec "alias", and instead write I wrote the following plugin to achieve this: - commit f3a9dd113338fe5d2b717de1dc69679ff74e2f8d - Author: Jon Dowland - Date: Tue May 3 17:40:16 2011 +0100 - - new plugin: alias.pm - pagespec aliases - - diff --git a/IkiWiki/Plugin/alias.pm b/IkiWiki/Plugin/alias.pm - new file mode 100644 - index 0000000..b8d4574 - --- /dev/null - +++ b/IkiWiki/Plugin/alias.pm - @@ -0,0 +1,47 @@ - +package IkiWiki::Plugin::alias; - + - +use warnings; - +use strict; - +use IkiWiki '3.00'; - + - +sub import { - + hook(type => "getsetup", id=> "alias", call => \&getsetup); - + hook(type => "checkconfig", id=> "alias", call => \&checkconfig); - +} - + - +sub getsetup () { - + return - + plugin => { - + description => "allows the definition of pagespec aliases", - + safe => 1, - + rebuild => 1, - + section => "misc", - + }, - + pagespec_aliases => { - + type => "string", - + example => {"image" => "*jpg or *jpeg or *png or *gif or *ico" }, - + description => "a set of mappings from alias name to pagespec", - + safe => 1, - + rebuild => 0, - + }, - +} - + - +sub checkconfig () { - + no strict 'refs'; - + no warnings 'redefine'; - + - + if ($config{pagespec_aliases}) { - + foreach my $key (keys %{$config{pagespec_aliases}}) { - + my $value = ${$config{pagespec_aliases}}{$key}; - + # XXX: validate key? - + my $subname = "IkiWiki::PageSpec::match_$key"; - + *{ $subname } = sub { - + my $path = shift; - + return IkiWiki::pagespec_match($path, $value); - + } - + } - + } - +} - + - +1; + I need to reflect on this a bit more before I send a pull request. In particular I imagine the strict/warnings stuff will make you puke. Also, I'm @@ -136,6 +80,15 @@ however, to add ' or internal()' to `boring`, for some reason. >> Useful indeed! --[[Joey]] + +>>> I've tweaked my patch in light of your above feedback: The plugin has +>>> been renamed, and I now validate keys. I've also added documentation to +>>> the branch. I haven't read rubykat's code properly yet, and don't have +>>> access at the time of writing (I'm on a beach in Greece ☺), but I expect +>>> it would be possible to extend what I've got here to support defining the +>>> aliases in a PageSpec, once the dependency stuff has been reasoned out +>>> properly. — [[Jon]] + --------------------------- Based on the above, I have written an experimental plugin called "subset". From e74f9ba459c3b24f8282b5d198cc2722579b493b Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Sun, 21 Aug 2011 15:14:43 +0100 Subject: [PATCH 06/16] pagespec_aliases: future websetup enhancements --- doc/todo/pagespec_aliases.mdwn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/todo/pagespec_aliases.mdwn b/doc/todo/pagespec_aliases.mdwn index 472526389..c5b8504b0 100644 --- a/doc/todo/pagespec_aliases.mdwn +++ b/doc/todo/pagespec_aliases.mdwn @@ -87,7 +87,11 @@ however, to add ' or internal()' to `boring`, for some reason. >>> access at the time of writing (I'm on a beach in Greece ☺), but I expect >>> it would be possible to extend what I've got here to support defining the >>> aliases in a PageSpec, once the dependency stuff has been reasoned out ->>> properly. — [[Jon]] +>>> properly. +>>> +>>> I'd like to solve the issue of this not being web-configurable by +>>> implementing support for more nested datatypes in [[plugins/websetup]]. — +>>> [[Jon]] --------------------------- From 60856916f49273af0517e5bdd21b95b8ee2cd57b Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Sat, 27 Aug 2011 10:55:06 +0100 Subject: [PATCH 07/16] pagespec aliases: respond to rubykat --- doc/todo/pagespec_aliases.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/todo/pagespec_aliases.mdwn b/doc/todo/pagespec_aliases.mdwn index c5b8504b0..b9bcd109e 100644 --- a/doc/todo/pagespec_aliases.mdwn +++ b/doc/todo/pagespec_aliases.mdwn @@ -141,3 +141,13 @@ Unfortunately I haven't figured out how to do the dependencies - I'd really appr >>> As for the name "subset"... well, it's even less like an alias now, and "alias" is already a reserved name. What other names would you suggest? >>>--[[KathrynAndersen]] + +>>>> Regarding my comments: I wasn't clear what you are/were intending to +>>>> achieve with your modifications. I've aimed for a self-contained plugin +>>>> which could be merged with ikiwiki proper. I think I initially took your +>>>> developments as being an evolution of that with the same goal, which is +>>>> why I commented on the (change of) name. However, I guess your work is +>>>> more of a fork than a continuation, in which case you can call it +>>>> whatever you like ☺ I like some of the enhancements you've made, but +>>>> having the aliases/subsets/"things" work in any pagespec (inside map, or +>>>> inline) is a deal-breaker for me. — [[Jon]] From 6e8a4a83abe398ee7183e6997fccad5b1a345185 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Sat, 27 Aug 2011 11:50:51 +0100 Subject: [PATCH 08/16] pagespec_alias: tests --- doc/todo/pagespec_aliases.mdwn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/todo/pagespec_aliases.mdwn b/doc/todo/pagespec_aliases.mdwn index b9bcd109e..e6e9635ad 100644 --- a/doc/todo/pagespec_aliases.mdwn +++ b/doc/todo/pagespec_aliases.mdwn @@ -81,11 +81,11 @@ however, to add ' or internal()' to `boring`, for some reason. >> Useful indeed! --[[Joey]] ->>> I've tweaked my patch in light of your above feedback: The plugin has ->>> been renamed, and I now validate keys. I've also added documentation to ->>> the branch. I haven't read rubykat's code properly yet, and don't have ->>> access at the time of writing (I'm on a beach in Greece ☺), but I expect ->>> it would be possible to extend what I've got here to support defining the +>>> I've tweaked my patch in light of your above feedback: The plugin has been +>>> renamed, and I now validate keys. I've also added documentation and tests +>>> to the branch. I haven't read rubykat's code properly yet, and don't have +>>> access at the time of writing (I'm on a beach in Greece ☺), but I expect it +>>> would be possible to extend what I've got here to support defining the >>> aliases in a PageSpec, once the dependency stuff has been reasoned out >>> properly. >>> From e727297764c64dfb2d369d786f17dcddeeab01fe Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Sat, 27 Aug 2011 22:11:55 +0100 Subject: [PATCH 09/16] support dicts in setup At the moment, setup values cannot be hashes and also be edited via the web interface. --- doc/todo/support_dicts_in_setup.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/todo/support_dicts_in_setup.mdwn diff --git a/doc/todo/support_dicts_in_setup.mdwn b/doc/todo/support_dicts_in_setup.mdwn new file mode 100644 index 000000000..c89158e21 --- /dev/null +++ b/doc/todo/support_dicts_in_setup.mdwn @@ -0,0 +1,19 @@ +It would be nice for some plugins to use hashes as setup data structures +(which ones? pagespec aliases for one. Any others?), but these cannot +currently be adequately described in `getsetup()`, nor represented in +`websetup()`. It would be nice to extend ikiwiki to support this. + +I've had an initial go at how to represent this in a nice way within a HTML +page. An initial mock up is available at +. The +approach taken is to use a javascript hash/dictionary as the canonical copy of +the data; to express that in the form elements, and to capture all relevant +events to update the main data structure (and the HTML representations +thereof). + +I imagine packing the js structure into a form element which is posted, and +ignoring the other form element data. + +This would mean mandating javascript support for editing such hashes. + +— [[Jon]] From b3f8532036cbd2db8182b12d15f4b67cbff9d736 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Sat, 27 Aug 2011 22:18:09 +0100 Subject: [PATCH 10/16] fix indenting --- doc/todo/pagespec_aliases.mdwn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/todo/pagespec_aliases.mdwn b/doc/todo/pagespec_aliases.mdwn index e6e9635ad..8d51ffc14 100644 --- a/doc/todo/pagespec_aliases.mdwn +++ b/doc/todo/pagespec_aliases.mdwn @@ -20,9 +20,8 @@ an existing wishlist item. > I think it would make sense to have "pagespec" in the name somehow. -> > Good idea, how about `pagespecalias`? — [[Jon]] +>> Good idea, how about `pagespecalias`? — [[Jon]] -> > No, the strict/warnings does not make me puke. Have you read my perl > code? :-P > From 92edd32e3186412dc3adcc955962be35371c8d4e Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sun, 28 Aug 2011 21:42:01 -0400 Subject: [PATCH 11/16] response to Jon --- doc/todo/pagespec_aliases.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/pagespec_aliases.mdwn b/doc/todo/pagespec_aliases.mdwn index 8d51ffc14..afb655bc2 100644 --- a/doc/todo/pagespec_aliases.mdwn +++ b/doc/todo/pagespec_aliases.mdwn @@ -150,3 +150,7 @@ Unfortunately I haven't figured out how to do the dependencies - I'd really appr >>>> whatever you like ☺ I like some of the enhancements you've made, but >>>> having the aliases/subsets/"things" work in any pagespec (inside map, or >>>> inline) is a deal-breaker for me. — [[Jon]] + +>>>>> I'm a bit confused by your statement "having the aliases/subsets/"things" work in any pagespec (inside map, or inline) is a deal-breaker for me". +>>>>> Do you mean that you want them to work in any pagespec, or that you *don't* want them to work in any pagespec? -- [[KathrynAndersen]] + From 17f782039251a7d2c6ab8206bc47a27f42ae92ac Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 29 Aug 2011 14:58:10 -0400 Subject: [PATCH 12/16] --- doc/forum/Setting_template_variable_from_config_file__63__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Setting_template_variable_from_config_file__63__.mdwn diff --git a/doc/forum/Setting_template_variable_from_config_file__63__.mdwn b/doc/forum/Setting_template_variable_from_config_file__63__.mdwn new file mode 100644 index 000000000..ac7631e60 --- /dev/null +++ b/doc/forum/Setting_template_variable_from_config_file__63__.mdwn @@ -0,0 +1 @@ +Is ist possible to set a template variable from the config file? From 4ff13b1890fa35dda9155a1585a9519c19b9205a Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Mon, 29 Aug 2011 19:05:01 -0400 Subject: [PATCH 13/16] update info about field_allow_config --- doc/plugins/contrib/field.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/field.mdwn b/doc/plugins/contrib/field.mdwn index dce2d891c..e57f91362 100644 --- a/doc/plugins/contrib/field.mdwn +++ b/doc/plugins/contrib/field.mdwn @@ -54,7 +54,7 @@ The following options can be set in the ikiwiki setup file. field_allow_config => 1, Allow the $config hash to be queried like any other field; the -keys of the config hash are the field names. +keys of the config hash are the field names, with a prefix of "CONFIG-". **field_register** From b21dc2cf6705326a2a276dc5b666b4bd62aeca5c Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Mon, 29 Aug 2011 19:07:21 -0400 Subject: [PATCH 14/16] Added a comment --- .../comment_1_bb4b5a7a49f33d660b5116fc0ce3c92d._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Setting_template_variable_from_config_file__63__/comment_1_bb4b5a7a49f33d660b5116fc0ce3c92d._comment diff --git a/doc/forum/Setting_template_variable_from_config_file__63__/comment_1_bb4b5a7a49f33d660b5116fc0ce3c92d._comment b/doc/forum/Setting_template_variable_from_config_file__63__/comment_1_bb4b5a7a49f33d660b5116fc0ce3c92d._comment new file mode 100644 index 000000000..6dddb1f21 --- /dev/null +++ b/doc/forum/Setting_template_variable_from_config_file__63__/comment_1_bb4b5a7a49f33d660b5116fc0ce3c92d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://kerravonsen.dreamwidth.org/" + ip="202.173.183.92" + subject="comment 1" + date="2011-08-29T23:07:21Z" + content=""" +With the [[plugins/contrib/field]] plugin one can; set the `field_allow_config` config value to 1, and the config variables are accessible with a \"CONFIG-\" prefix. That is, if you set a value \"foo\" in the config file, then you would access it in in the template as ``. +"""]] From 331c16a6054050879cc5c718e8960d704df75564 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Tue, 30 Aug 2011 03:23:50 -0400 Subject: [PATCH 15/16] --- doc/forum/Define_custom_commands.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Define_custom_commands.mdwn diff --git a/doc/forum/Define_custom_commands.mdwn b/doc/forum/Define_custom_commands.mdwn new file mode 100644 index 000000000..c8ac00eed --- /dev/null +++ b/doc/forum/Define_custom_commands.mdwn @@ -0,0 +1 @@ +Is it possible to define custom "commands" in ikiwiki? For example if I write &%test&% in the source of a wiki-page in markdown, the word "test" should be displayed red, bold and italic. From 2e1fa14a737312d852fd33d7c8518da01695c7da Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 30 Aug 2011 06:20:15 -0400 Subject: [PATCH 16/16] same dependency problem as plugins/contrib/trail :-( --- doc/bugs/conditional_preprocess_during_scan.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/bugs/conditional_preprocess_during_scan.mdwn b/doc/bugs/conditional_preprocess_during_scan.mdwn index 896998bf8..baa430e19 100644 --- a/doc/bugs/conditional_preprocess_during_scan.mdwn +++ b/doc/bugs/conditional_preprocess_during_scan.mdwn @@ -8,3 +8,12 @@ I've written a simple [[patch]] to fix the issue, currently hosted on the scanif branch of my repository. The patch also passes the preview option back to the Ikiwiki::preprocess call, making sure that whatever is being reprocessed is done so in the same conditions as the original call. + +> One problem with this is that it has the same dependency-ordering problems +> as inline-based or pagespec-based trails with my [[plugins/contrib/trail]] +> plugin: `if` takes a pagespec, but pagespecs aren't guaranteed to match +> correctly until everything has been scanned (for instance, `link()` might +> give the wrong results because a page that added or deleted a link hasn't +> been scanned yet). If you have a clever idea for how to fix this, I'd love +> to hear it - being able to specify a [[plugins/contrib/trail]] in terms +> of a sorted pagespec would be useful. --[[smcv]]