-diff -urNX ignorepats ikiwiki/IkiWiki/Plugin/shortcut.pm ikidev/IkiWiki/Plugin/shortcut.pm
---- ikiwiki/IkiWiki/Plugin/shortcut.pm 2007-02-15 00:38:48.000000000 -0800
-+++ ikidev/IkiWiki/Plugin/shortcut.pm 2007-02-27 22:09:31.536088000 -0800
-@@ -13,6 +13,7 @@
- sub checkconfig () { #{{{
- # Preprocess the shortcuts page to get all the available shortcuts
- # defined before other pages are rendered.
-+ $pagesources{"shortcuts"} = "shortcuts.mdwn";
- IkiWiki::preprocess("shortcuts", "shortcuts",
- readfile(srcfile("shortcuts.mdwn")));
- } # }}}
-diff -urNX ignorepats ikiwiki/IkiWiki.pm ikidev/IkiWiki.pm
---- ikiwiki/IkiWiki.pm 2007-02-25 15:01:27.211170000 -0800
-+++ ikidev/IkiWiki.pm 2007-03-01 18:20:39.910925000 -0800
-@@ -580,6 +577,17 @@
- destpage => $destpage,
- );
- $preprocessing{$page}--;
-+ if ($ret =~ /[<>]/){
-+ if ($pagesources{$page}) {
-+ my $type=pagetype($pagesources{$page});
-+ if ($hooks{htmlize}{$type}{escape}) {
-+ $ret = $hooks{htmlize}{$type}{escape}->(
-+ $ret,
-+ );
-+ }
-+ }
-+ }
+ my %params=@_;
+ my $content=$params{content};
+Index: doc/plugins/write.mdwn
+===================================================================
+--- doc/plugins/write.mdwn (revision 3157)
++++ doc/plugins/write.mdwn (working copy)
+@@ -121,6 +121,16 @@
+ The function is passed named parameters: "page" and "content" and should
+ return the htmlized content.
+
++### htmlescape
++
++ hook(type => "htmlescape", id => "ext", call => \&htmlescape);
++
++Some markup languages do not allow raw html to be mixed in with the markup
++language, and need it to be escaped in some way. This hook is a companion
++to the htmlize hook, and is called when ikiwiki detects that a preprocessor
++directive is inserting raw html. It is passed the chunk of html in
++question, and should return the escaped chunk.
++
+ ### pagetemplate
+
+ hook(type => "pagetemplate", id => "foo", call => \&pagetemplate);
+Index: doc/plugins/rst.mdwn
+===================================================================
+--- doc/plugins/rst.mdwn (revision 3157)
++++ doc/plugins/rst.mdwn (working copy)
+@@ -10,10 +10,8 @@
+ Note that this plugin does not interoperate very well with the rest of
+ ikiwiki. Limitations include:
+
+-* 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]].
++* 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
+ perl version of the reStructuredText processor, it is not being kept in
+ sync with the standard version, so is not used.
+Index: IkiWiki.pm
+===================================================================
+--- IkiWiki.pm (revision 3158)
++++ IkiWiki.pm (working copy)
+@@ -550,11 +550,11 @@
+ $content =~ s{(\\?)$config{wiki_link_regexp}}{
+ defined $2
+ ? ( $1
+- ? "[[$2|$3".(length $4 ? "#$4" : "")."]]"
++ ? "[[$2|$3".($4 ? "#$4" : "")."]]"
+ : htmllink($lpage, $page, linkpage($3),
+ anchor => $4, linktext => pagetitle($2)))
+ : ( $1
+- ? "[[$3".(length $4 ? "#$4" : "")."]]"
++ ? "[[$3".($4 ? "#$4" : "")."]]"
+ : htmllink($lpage, $page, linkpage($3),
+ anchor => $4))
+ }eg;
+@@ -628,6 +628,14 @@
+ preview => $preprocess_preview,
+ );
+ $preprocessing{$page}--;