Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/todo/format_escape.mdwn b/doc/todo/format_escape.mdwn
index ebee558fbb1bc2757182daf957863fe1b58a6c99..8dfe05581fcb3492bcf627100745ff98386a387f 100644 (file)
--- a/doc/todo/format_escape.mdwn
+++ b/doc/todo/format_escape.mdwn
@@ -88,8 +88,16 @@ which aren't used as real extensions but provide useful intermediate types.
 > will be processed as a chunk of raw html.
 > --[[Joey]]
 
 > will be processed as a chunk of raw html.
 > --[[Joey]]
 

+### Updated patch
+
+I've created an updated [patch](http://www.idletheme.org/code/patches/ikiwiki-format-escapes-rlk-2007-09-24.diff) against the current revision.  No real functionality changes, except for a small test script, one minor bugfix (put a "join" around a scalar-context "map" in convert_link), and some wrangling to get it merged properly; I thought it might be helpful for anyone else who wants to work on the code.
+
+(With that out of the way, I think I'm going to take a stab at Jeremie's plan to use marks which would be replaced post-htmlization.  I've also got an eye towards [[todo/multiple_output_formats]].)
+
+--Ryan Koppenhaver
+

 ## Original patch
 ## Original patch

-[[tag patch]]
+[[!tag patch]]

 
 <pre>
 Index: debian/changelog
 
 <pre>
 Index: debian/changelog


@@ -210,8 +218,8 @@ Index: doc/plugins/rst.mdwn
  
 -* reStructuredText does not allow raw html to be inserted into
 -  documents, but ikiwiki does so in many cases, including
  
 -* reStructuredText does not allow raw html to be inserted into
 -  documents, but ikiwiki does so in many cases, including

--  [[WikiLinks|WikiLink]] and many
--  [[PreprocessorDirectives|PreprocessorDirective]].
+-  [[WikiLinks|ikiwiki/WikiLink]] and many
+-  [[Directives|ikiwiki/Directive]].

 +* Some bits of ikiwiki may still assume that markdown is used or embed html
 +  in ways that break reStructuredText. (Report bugs if you find any.)
  * It's slow; it forks a copy of python for each page. While there is a
 +* Some bits of ikiwiki may still assume that markdown is used or embed html
 +  in ways that break reStructuredText. (Report bugs if you find any.)
  * It's slow; it forks a copy of python for each page. While there is a