X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9f87bd8d7d801ba29687c68349a5c56e9947948f..4f872b563300e4a277cac3d7ea2a999bcf75d1ff:/IkiWiki/Plugin/table.pm diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index e8df17487..20c71e1c7 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -22,6 +22,7 @@ sub preprocess (@) { #{{{ return "[[table ".gettext("cannot find file")."]]"; } $params{data} = readfile(srcfile($params{file})); + add_depends($params{page}, $params{file}); } if (lc $params{format} eq 'auto') { @@ -78,7 +79,7 @@ sub preprocess (@) { #{{{ push @lines, "\t", genrow($params{page}, $params{destpage}, "th", @$header), "\t" if defined $header; - push @lines, "\t"; + push @lines, "\t" if defined $header; push @lines, genrow($params{page}, $params{destpage}, "td", @$_) foreach @data; push @lines, "\t" 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!^

!!; - $text=~s!

$!!; - chomp $text; - return $text; + return IkiWiki::htmlize($page, pagetype($pagesources{$page}), + IkiWiki::preprocess($page, $destpage, shift)); } 1