Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / doc / todo / nested_preprocessor_directives.mdwn

diff --git a/doc/todo/nested_preprocessor_directives.mdwn b/doc/todo/nested_preprocessor_directives.mdwn
index 0799810540bb8806095f4e8466da908f68f4c919..433fc6f37bc2cdf50f16b1c6fcbbeb6ae419f226 100644 (file)
--- a/doc/todo/nested_preprocessor_directives.mdwn
+++ b/doc/todo/nested_preprocessor_directives.mdwn
@@ -20,13 +20,16 @@ nesting, a new syntax would be needed. Maybe something xml-like?
 >> 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.
 >> 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.

+>> 
+>> [[!template id=gitbranch branch=timonator/heredoc_triplequote author="\[[timonator]]"]]

 >>
 >> In the meantime, this is an interesting approach:
 >>
 >> In the meantime, this is an interesting approach:

->> <https://github.com/timo/ikiwiki/commit/a73837a8f26147e42a0bb2dde38b4890b27822b3>
+>> <https://github.com/timo/ikiwiki/commit/410bbaf141036164f92009599ae12790b1530886>
+>> (the link has since been fixed twice)

 >> 
 >> 

->>     \[[!directive text=\<\<FOO
->>     ...
->>     FOO]]
+>>     \[[!directive text=<<FOO 
+>>     ...
+>>     FOO]]

 >> 
 >> Since that's implemented, I will probably just merge it,
 >> once I satisfy myself it doesn't blow up in any edge cases.
 >> 
 >> Since that's implemented, I will probably just merge it,
 >> once I satisfy myself it doesn't blow up in any edge cases.


@@ -51,8 +54,16 @@ nesting, a new syntax would be needed. Maybe something xml-like?
 >> I apparently missed copying it over as well. Should have been doing this
 >> in a git repo all along. Look at the new commit I put atop it that has
 >> the rest as well:
 >> I apparently missed copying it over as well. Should have been doing this
 >> in a git repo all along. Look at the new commit I put atop it that has
 >> the rest as well:

->> <https://github.com/timo/ikiwiki/commit/a4e33d9654404acff71344cd5d3672bcdf3f3ce5>
+>> (redacted: is now part of the commit linked to from above)

 >> Also: I'm not sure any more, why I added the m modifier. It was very
 >> late at night and I was getting a bit desperate (turned out, the next
 >> morning, I put my extra regexes after the "unquoted value" one. heh.)
 >> So, feel free to fix that. --Timo
 >> Also: I'm not sure any more, why I added the m modifier. It was very
 >> late at night and I was getting a bit desperate (turned out, the next
 >> morning, I put my extra regexes after the "unquoted value" one. heh.)
 >> So, feel free to fix that. --Timo

+>>
+>> I've fixed the patch by rebasing, fixed the link above. I'm still not
+>> sure if the m modifier for the regex is still needed (apparently I
+>> didn't put it in the other regexes. Not completely sure about the
+>> implications.) Am now trying to wrap my head around a test case to
+>> test the new formats for a bit. --Timo
+
+[[done]]!!! --[[Joey]]