* Allow html5 video and audio tags and their attributes in the htmlscrubber.

[git.ikiwiki.info.git] / IkiWiki / Plugin / table.pm

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index c5404aa85b015eea63bd519c10cfd0127cf3c3cc..02a2ba05dacc5aa67ed842489b909a8982a985c4 100644 (file)
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -3,9 +3,8 @@ package IkiWiki::Plugin::table;
 
 use warnings;
 use strict;
-
-use IkiWiki;
-use IkiWiki::Plugin::mdwn;
+use Encode;
+use IkiWiki 2.00;
 
 sub import { #{{{
        hook(type => "preprocess", id => "table", call => \&preprocess);
@@ -13,8 +12,8 @@ sub import { #{{{
 
 sub preprocess (@) { #{{{
        my %params =(
-               format          => 'auto',
-               header          => 'yes',
+               format  => 'auto',
+               header  => 'yes',
                @_
        );
 
@@ -29,20 +28,36 @@ sub preprocess (@) { #{{{
                # 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=split_csv($params{data}, $params{delimiter});
+               @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') {
-               @data=split_dsv($params{data}, $params{delimiter});
+               # 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} : "|",);
        }
        else {
                return "[[table ".gettext("unknown data format")."]]";
@@ -60,23 +75,12 @@ sub preprocess (@) { #{{{
        push @lines, defined $params{class}
                        ? "<table class=\"".$params{class}.'">'
                        : '<table>';
-       push @lines, "\t<thead>","\t\t<tr>",
-               (map {
-                       "\t\t\t<th>".
-                       htmlize($params{page}, $params{destpage}, $_).
-                       "</th>"
-               } @$header),
-               "\t\t</tr>", "\t</thead>" if defined $header;
-       push @lines, "\t<tbody>";
-       foreach my $record (@data) {
-               push @lines, "\t\t<tr>",
-                       (map {
-                               "\t\t\t<td>".
-                               htmlize($params{page}, $params{destpage}, $_).
-                               "</td>"
-                       } @$record),
-                       "\t\t</tr>";
-       }
+       push @lines, "\t<thead>",
+               genrow($params{page}, $params{destpage}, "th", @$header),
+               "\t</thead>" if defined $header;
+       push @lines, "\t<tbody>" if defined $header;
+       push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
+               foreach @data;
        push @lines, "\t</tbody>" if defined $header;
        push @lines, '</table>';
        my $html = join("\n", @lines);
@@ -105,8 +109,9 @@ sub split_csv ($$) { #{{{
        eval q{use Text::CSV};
        error($@) if $@;
        my $csv = Text::CSV->new({ 
-               sep_char        => defined $delimiter ? $delimiter : ",",
+               sep_char        => $delimiter,
                binary          => 1,
+               allow_loose_quotes => 1,
        }) || error("could not create a Text::CSV object");
        
        my $l=0;
@@ -114,7 +119,7 @@ sub split_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'), 
@@ -132,13 +137,40 @@ sub split_dsv ($$) { #{{{
 
        my @data;
        foreach my $line (@text_lines) {
-               push @data, [ split(/\Q$delimiter\E/, $line) ];
+               push @data, [ split(/\Q$delimiter\E/, $line, -1) ];
        }
     
        return @data;
 } #}}}
 
-sub htmlize ($$$){ #{{{
+sub genrow ($$$@) { #{{{
+       my $page = shift;
+       my $destpage = shift;
+       my $elt = shift;
+       my @data = @_;
+
+       my @ret;
+       push @ret, "\t\t<tr>";
+       for (my $x=0; $x < @data; $x++) {
+               my $cell=htmlize($page, $destpage, $data[$x]);
+               my $colspan=1;
+               while ($x+1 < @data && $data[$x+1] eq '') {
+                       $x++;
+                       $colspan++;
+               }
+               if ($colspan > 1) {
+                       push @ret, "\t\t\t<$elt colspan=\"$colspan\">$cell</$elt>"
+               }
+               else {
+                       push @ret, "\t\t\t<$elt>$cell</$elt>"
+               }
+       }
+       push @ret, "\t\t</tr>";
+
+       return @ret;
+} #}}}
+
+sub htmlize ($$$) { #{{{
        my $page = shift;
        my $destpage = shift;
        my $text = shift;