X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cfb2da268b323f55d7e742d0a42eb8fe6ef32ca6..ab768a62c66335a96a5791c444e54b8ae3b078b1:/IkiWiki/Plugin/table.pm diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index dfa595812..f3c425a37 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -3,69 +3,111 @@ 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, + section => "widget", + }, +} -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}; + + # Preprocess in scan-only mode. + IkiWiki::preprocess($params{page}, $params{page}, $params{data}, 1); + + IkiWiki::run_hooks(scan => sub { + shift->( + page => $params{page}, + content => $params{data}, + ); + }); + + 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} + ? "' + : '
'; + push @lines, "\t", + genrow(\%params, "th", @$header), + "\t" if defined $header; + push @lines, "\t" if defined $header; + push @lines, genrow(\%params, "td", @$_) foreach @data; + push @lines, "\t" if defined $header; + push @lines, '
'; + my $html = join("\n", @lines); if (exists $params{file}) { return $html."\n\n". @@ -75,38 +117,25 @@ sub preprocess (@) { #{{{ else { return $html; } -} #}}} - -sub tidy_up (@) { #{{{ - my $html=""; - - foreach my $text (@_) { - my $indentation = $text =~ m{thead>|tbody>} ? 0 : - $text =~ m{tr>} ? 4 : - $text =~ m{td>|th>} ? 8 : - 0; - $html .= (' ' x $indentation)."$text\n"; - } - - return $html; -} #}}} +} -sub is_dsv_data ($) { #{{{ +sub is_dsv_data ($) { my $text = shift; my ($line) = split(/\n/, $text); return $line =~ m{.+\|}; } -sub read_csv ($) { #{{{ - my $params=shift; - my @text_lines = split(/\n/, $params->{data}); +sub split_csv ($$) { + my @text_lines = split(/\n/, shift); + my $delimiter = shift; eval q{use Text::CSV}; error($@) if $@; my $csv = Text::CSV->new({ - sep_char => $params->{sep_char}->{csv}, + sep_char => $delimiter, binary => 1, + allow_loose_quotes => 1, }) || error("could not create a Text::CSV object"); my $l=0; @@ -114,7 +143,7 @@ sub read_csv ($) { #{{{ foreach my $line (@text_lines) { $l++; if ($csv->parse($line)) { - push(@data, [ $csv->fields() ]); + push(@data, [ map { decode_utf8 $_ } $csv->fields() ]); } else { debug(sprintf(gettext('parse fail at line %d: %s'), @@ -123,74 +152,59 @@ sub read_csv ($) { #{{{ } return @data; -} #}}} +} -sub read_dsv ($) { #{{{ - my $params = shift; - my @text_lines = split(/\n/, $params->{data}); +sub split_dsv ($$) { + my @text_lines = split(/\n/, shift); + my $delimiter = shift; + $delimiter="|" unless defined $delimiter; my @data; - my $splitter = qr{\Q$params->{sep_char}->{dsv}\E}; foreach my $line (@text_lines) { - push @data, [ split($splitter, $line) ]; + push @data, [ split(/\Q$delimiter\E/, $line, -1) ]; } return @data; -} #}}} - -sub open_table ($$) { #{{{ - my $params = shift; - my $header = shift; - - my @items; - push @items, defined $params->{class} - ? "{class}.'">' - : '
'; - push @items, '','', - (map { "" } @$header), - '','' if defined $header; - push @items, ''; - - return @items; } -sub build_rows ($@) { #{{{ - my $params = shift; - - my @items; - foreach my $record (@_) { - push @items, '', - (map { "" } @$record), - ''; - } - return @items; -} #}}} - -sub close_table ($$) { #{{{ - my $params = shift; - my $header = shift; - - my @items; - push @items, '' if defined $header; - push @items, '
".htmlize($params, $_)."
".htmlize($params, $_)."
'; - return @items; -} #}}} - -sub htmlize { #{{{ - my $params = shift; - my $text = shift; +sub genrow ($@) { + my %params=%{shift()}; + my $elt = shift; + my @data = @_; + + my $page=$params{page}; + my $destpage=$params{destpage}; + my $type=pagetype($pagesources{$page}); + + my @ret; + push @ret, "\t\t"; + for (my $x=0; $x < @data; $x++) { + my $cell=IkiWiki::htmlize($page, $destpage, $type, + IkiWiki::preprocess($page, $destpage, $data[$x])); + + # automatic colspan for empty cells + my $colspan=1; + while ($x+1 < @data && $data[$x+1] eq '') { + $x++; + $colspan++; + } - $text=IkiWiki::preprocess($params->{page}, - $params->{destpage}, $text); - $text=IkiWiki::htmlize($params->{page}, - pagetype($pagesources{$params->{page}}), $text); + # check if the first column should be a header + my $e=$elt; + if ($x == 0 && lc($params{header}) eq "column") { + $e="th"; + } - # hack to get rid of enclosing junk added by markdown - $text=~s!^

!!; - $text=~s!

$!!; - chomp $text; + if ($colspan > 1) { + push @ret, "\t\t\t<$e colspan=\"$colspan\">$cell" + } + else { + push @ret, "\t\t\t<$e>$cell" + } + } + push @ret, "\t\t"; - return $text; + return @ret; } 1