txt: Fix display when used inside a format directive.

txt's use of a format hook can't work in that case, so it needs to use a
htmlizeformat hook in this case to handle wrapping the text in pre tags.

1 files changed, 13 insertions, 11 deletions

diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index d54e71131..b596bc0a1 100644
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -29,22 +29,24 @@ sub preprocess (@) {
 	if (! defined $format || ! defined $text) {
 		error(gettext("must specify format and text"));
 	}
+		
+	# Other plugins can register htmlizeformat hooks to add support
+	# for page types not suitable for htmlize, or that need special
+	# processing when included via format. Try them until one succeeds.
+	my $ret;
+	IkiWiki::run_hooks(htmlizeformat => sub {
+		$ret=shift->($format, $text)
+			unless defined $ret;
+	});
+
+	if (defined $ret) {
+		return $ret;
+	}
 	elsif (exists $IkiWiki::hooks{htmlize}{$format}) {
 		return IkiWiki::htmlize($params{page}, $params{destpage},
 		                        $format, $text);
 	}
 	else {
-		# Other plugins can register htmlizefallback
-		# hooks to add support for page types
-		# not suitable for htmlize. Try them until
-		# one succeeds.
-		my $ret;
-		IkiWiki::run_hooks(htmlizefallback => sub {
-			$ret=shift->($format, $text)
-				unless defined $ret;
-		});
-		return $ret if defined $ret;
-
 		error(sprintf(gettext("unsupported page format %s"), $format));
 	}
 }