X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c79e5f0e5b53470ddbe9478d9f41eebfd3cd0860..c9c0f271b60e4a6ef8392cd3a5339d9c2368b494:/IkiWiki/Plugin/table.pm
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 26e434b1f..02a2ba05d 100644
--- 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);
@@ -37,10 +36,28 @@ sub preprocess (@) { #{{{
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")."]]";
@@ -58,23 +75,12 @@ sub preprocess (@) { #{{{
push @lines, defined $params{class}
? "
'
: '';
- push @lines, "\t","\t\t",
- (map {
- "\t\t\t".
- htmlize($params{page}, $params{destpage}, $_).
- " | "
- } @$header),
- "\t\t
", "\t" if defined $header;
- push @lines, "\t";
- foreach my $record (@data) {
- push @lines, "\t\t",
- (map {
- "\t\t\t".
- htmlize($params{page}, $params{destpage}, $_).
- " | "
- } @$record),
- "\t\t
";
- }
+ push @lines, "\t",
+ genrow($params{page}, $params{destpage}, "th", @$header),
+ "\t" if defined $header;
+ push @lines, "\t" if defined $header;
+ push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
+ foreach @data;
push @lines, "\t" if defined $header;
push @lines, '
';
my $html = join("\n", @lines);
@@ -103,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;
@@ -112,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'),
@@ -130,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";
+ 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
";
+
+ return @ret;
+} #}}}
+
+sub htmlize ($$$) { #{{{
my $page = shift;
my $destpage = shift;
my $text = shift;