X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dd87d82fbe2bf09abe634caef044474d5b24502e..651cdd4b2a85f4e5f9d298a7eea7d0e6d94442b1:/doc/todo/format_escape.mdwn diff --git a/doc/todo/format_escape.mdwn b/doc/todo/format_escape.mdwn index 315b2d88f..762f16646 100644 --- a/doc/todo/format_escape.mdwn +++ b/doc/todo/format_escape.mdwn @@ -97,7 +97,7 @@ I've created an updated [patch](http://www.idletheme.org/code/patches/ikiwiki-fo --Ryan Koppenhaver ## Original patch -[[!tag patch]] +[[!tag patch patch/core plugins/rst]]

 Index: debian/changelog
@@ -141,13 +141,13 @@ Index: IkiWiki/Plugin/rst.pm
  print html[html.find('')+6:html.find('')].strip();
  ";
  
- sub import { #{{{
+ sub import {
  	hook(type => "htmlize", id => "rst", call => \&htmlize);
 +	hook(type => "htmlescape", id => "rst", call => \&htmlescape);
 +	hook(type => "htmlescapelink", id => "rst", call => \&htmlescapelink);
- } # }}}
+ }
  
-+sub htmlescapelink ($$;@) { #{{{
++sub htmlescapelink ($$;@) {
 +	my $url = shift;
 +	my $text = shift;
 +	my %params = @_;
@@ -158,15 +158,15 @@ Index: IkiWiki/Plugin/rst.pm
 +	else {
 +		return "`$text <$url>`_";
 +	}
-+} # }}}
++}
 +
-+sub htmlescape ($) { #{{{
++sub htmlescape ($) {
 +	my $html=shift;
 +	$html=~s/^/  /mg;
 +	return ".. raw:: html\n\n".$html;
-+} # }}}
++}
 +
- sub htmlize (@) { #{{{
+ sub htmlize (@) {
  	my %params=@_;
  	my $content=$params{content};
 Index: doc/plugins/write.mdwn
@@ -219,7 +219,7 @@ Index: doc/plugins/rst.mdwn
 -* reStructuredText does not allow raw html to be inserted into
 -  documents, but ikiwiki does so in many cases, including
 -  [[WikiLinks|ikiwiki/WikiLink]] and many
--  [[PreprocessorDirectives|ikiwiki/PreprocessorDirective]].
+-  [[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
@@ -272,7 +272,7 @@ Index: IkiWiki.pm
 +	  return $hooks{htmlescapelink}{$type}{call}->($bestlink, $linktext);
 +	}
  	return "$linktext";
- } #}}}
+ }
  
 @@ -628,6 +640,14 @@
  				preview => $preprocess_preview,