X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9f87bd8d7d801ba29687c68349a5c56e9947948f..97e21ae21caa2418015ae512755e8078a0bc5ccf:/IkiWiki/Plugin/table.pm?ds=inline

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index e8df17487..892ea182e 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -19,9 +19,10 @@ sub preprocess (@) { #{{{
 
 	if (exists $params{file}) {
 		if (! $pagesources{$params{file}}) {
-			return "[[table ".gettext("cannot find file")."]]";
+			error gettext("cannot find file");
 		}
 		$params{data} = readfile(srcfile($params{file}));
+		add_depends($params{page}, $params{file});
 	}
 
 	if (lc $params{format} eq 'auto') {
@@ -60,7 +61,7 @@ sub preprocess (@) { #{{{
 			defined $params{delimiter} ? $params{delimiter} : "|",);
 	}
 	else {
-		return "[[table ".gettext("unknown data format")."]]";
+		error gettext("unknown data format");
 	}
 
 	my $header;
@@ -68,7 +69,7 @@ sub preprocess (@) { #{{{
 		$header=shift @data;
 	}
 	if (! @data) {
-		return "[[table ".gettext("empty data")."]]";
+		error gettext("empty data");
 	}
 
 	my @lines;
@@ -78,7 +79,7 @@ sub preprocess (@) { #{{{
 	push @lines, "\t<thead>",
 		genrow($params{page}, $params{destpage}, "th", @$header),
 	        "\t</thead>" if defined $header;
-	push @lines, "\t<tbody>";
+	push @lines, "\t<tbody>" if defined $header;
 	push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
 		foreach @data;
 	push @lines, "\t</tbody>" if defined $header;
@@ -173,17 +174,9 @@ sub genrow ($$$@) { #{{{
 sub htmlize ($$$) { #{{{
 	my $page = shift;
 	my $destpage = shift;
-	my $text = shift;
-
-	$text=IkiWiki::htmlize($page, pagetype($pagesources{$page}),
-		IkiWiki::preprocess($page, $destpage, $text));
-
-	# hack to get rid of enclosing junk added by markdown
-	$text=~s!^<p>!!;
-	$text=~s!</p>$!!;
-	chomp $text;
 
-	return $text;
+	return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),
+		IkiWiki::preprocess($page, $destpage, shift));
 }
 
 1