X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cfb2da268b323f55d7e742d0a42eb8fe6ef32ca6..ae493178cf58cf5d7edfa30ccabe758b06febcb4:/IkiWiki/Plugin/table.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index dfa595812..96d63f455 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -3,69 +3,110 @@ package IkiWiki::Plugin::table; use warnings; use strict; +use Encode; +use IkiWiki 3.00; -use IkiWiki; -use IkiWiki::Plugin::mdwn; +sub import { + hook(type => "getsetup", id => "table", call => \&getsetup); + hook(type => "preprocess", id => "table", call => \&preprocess, scan => 1); +} -sub import { #{{{ - hook(type => "preprocess", id => "table", call => \&preprocess); -} # }}} +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + }, +} -sub preprocess (@) { #{{{ +sub preprocess (@) { my %params =( - format => 'auto', - header => 'yes', - sep_char => { - 'csv' => ',', - 'dsv' => '|', - }, + format => 'auto', + header => 'row', @_ ); - if (exists $params{delimiter}) { - $params{sep_char}->{$params{format}} = $params{delimiter}; - } if (exists $params{file}) { - if (! $pagesources{$params{file}}) { - return "[[table ".gettext("cannot find file")."]]"; + if (! exists $pagesources{$params{file}}) { + error gettext("cannot find file"); } $params{data} = readfile(srcfile($params{file})); + add_depends($params{page}, $params{file}); + } + + if (! defined wantarray) { + # scan mode -- if the table uses an external file, need to + # scan that file too. + return unless exists $params{file}; + + IkiWiki::run_hooks(scan => sub { + shift->( + page => $params{page}, + content => $params{data}, + ); + }); + + # Preprocess in scan-only mode. + IkiWiki::preprocess($params{page}, $params{page}, $params{data}, 1); + + return; } if (lc $params{format} eq 'auto') { # first try the more simple format if (is_dsv_data($params{data})) { $params{format} = 'dsv'; - $params{sep_char}->{dsv} = '|'; } else { $params{format} = 'csv'; - $params{sep_char}->{csv} = ','; } } my @data; if (lc $params{format} eq 'csv') { - @data=read_csv(\%params); + @data=split_csv($params{data}, + defined $params{delimiter} ? $params{delimiter} : ",",); + # linkify after parsing since html link quoting can + # confuse CSV parsing + @data=map { + [ map { + IkiWiki::linkify($params{page}, + $params{destpage}, $_); + } @$_ ] + } @data; } elsif (lc $params{format} eq 'dsv') { - @data=read_dsv(\%params); + # linkify before parsing since wikilinks can contain the + # delimiter + $params{data} = IkiWiki::linkify($params{page}, + $params{destpage}, $params{data}); + @data=split_dsv($params{data}, + defined $params{delimiter} ? $params{delimiter} : "|",); } else { - return "[[table ".gettext("unknown data format")."]]"; + error gettext("unknown data format"); } - + my $header; - if (lc($params{header}) eq "yes") { + if (lc($params{header}) eq "row" || IkiWiki::yesno($params{header})) { $header=shift @data; } if (! @data) { - return "[[table ".gettext("empty data")."]]"; + error gettext("empty data"); } - my $html = tidy_up(open_table(\%params, $header), - build_rows(\%params, @data), - close_table(\%params, $header)); + my @lines; + push @lines, defined $params{class} + ? "
".htmlize($params, $_)." | " } @$header), - '
---|
".htmlize($params, $_)." | " } @$record), - '
!!; - $text=~s!
$!!; - chomp $text; + if ($colspan > 1) { + push @ret, "\t\t\t<$e colspan=\"$colspan\">$cell$e>" + } + else { + push @ret, "\t\t\t<$e>$cell$e>" + } + } + push @ret, "\t\t