From: Joey Hess Date: Sat, 30 Apr 2011 20:51:46 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/05b55f06fa36f45a80231bd43a9e1503c445ca2a?hp=6606c348a4ee37ccefd4a7c9a1efb41e373ce326 Merge remote-tracking branch 'origin/master' --- diff --git a/debian/changelog b/debian/changelog index 07b1161fb..ff60062b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ ikiwiki (3.20110329) UNRELEASED; urgency=low * tag: Avoid autocreating multiple tag pages that vary only in capitalization. The first capitalization seen of a tag will be used for the tag page. + * Fix yaml build dep. Closes: #624712 -- Joey Hess Mon, 28 Mar 2011 13:08:23 -0400 diff --git a/doc/todo/nested_preprocessor_directives.mdwn b/doc/todo/nested_preprocessor_directives.mdwn index b5080dc3c..1d44cea88 100644 --- a/doc/todo/nested_preprocessor_directives.mdwn +++ b/doc/todo/nested_preprocessor_directives.mdwn @@ -16,3 +16,19 @@ nesting, a new syntax would be needed. Maybe something xml-like? > """]] > > --[[JoshTriplett]] + +>> Yes it's definitely possible to do something like that. I'm not 100% +>> sure if it can be done in perl regexp or needs a real recursive descent +>> parser though. +>> +>> In the meantime, this is an interesting approach: +>> +>> +>> \[[!directive text=<> ... +>> <> +>> Since that's implemented, I will probably just merge it, +>> once I satisfy myself it doesn't blow up in any edge cases. +>> (It also adds triple single quotes as a third, distinct type of quotes, +>> which feels a bit redundant given the here docs.) --[[Joey]]