X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6bcc3339d911cd6c0095a3ed3eacf8560c458d01..aab415481de28a7ca3baa7e7d5ba168e962f61e0:/IkiWiki/Plugin/table.pm diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index be97137ed..11474c8f0 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -22,10 +22,7 @@ sub preprocess (@) { #{{{ return "[[table ".gettext("cannot find file")."]]"; } $params{data} = readfile(srcfile($params{file})); - } - else { - $params{data} = IkiWiki::linkify($params{page}, - $params{destpage}, $params{data}); + add_depends($params{page}, $params{file}); } if (lc $params{format} eq 'auto') { @@ -42,8 +39,24 @@ sub preprocess (@) { #{{{ if (lc $params{format} eq 'csv') { @data=split_csv($params{data}, defined $params{delimiter} ? $params{delimiter} : ",",); + # linkify after parsing since html link quoting can + # confuse CSV parsing + if (! exists $params{file}) { + @data=map { + [ map { + IkiWiki::linkify($params{page}, + $params{destpage}, $_); + } @$_ ] + } @data; + } } elsif (lc $params{format} eq 'dsv') { + # linkify before parsing since wikilinks can contain the + # delimiter + if (! exists $params{file}) { + $params{data} = IkiWiki::linkify($params{page}, + $params{destpage}, $params{data}); + } @data=split_dsv($params{data}, defined $params{delimiter} ? $params{delimiter} : "|",); } @@ -66,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; @@ -161,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, $destpage, pagetype($pagesources{$page}), + IkiWiki::preprocess($page, $destpage, shift)); } 1