X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0d108e74d9b48ba080c128407eed3c787edec1bd..d9a3c2bed29f7ff6f7a12d1d421e4c88fa97b264:/IkiWiki/Plugin/table.pm
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index c5404aa85..698f9c9b6 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -3,9 +3,7 @@ package IkiWiki::Plugin::table;
use warnings;
use strict;
-
-use IkiWiki;
-use IkiWiki::Plugin::mdwn;
+use IkiWiki 2.00;
sub import { #{{{
hook(type => "preprocess", id => "table", call => \&preprocess);
@@ -13,8 +11,8 @@ sub import { #{{{
sub preprocess (@) { #{{{
my %params =(
- format => 'auto',
- header => 'yes',
+ format => 'auto',
+ header => 'yes',
@_
);
@@ -29,11 +27,9 @@ 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} = ',';
}
}
@@ -60,23 +56,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",
+ genrow($params{page}, $params{destpage}, "th", @$header),
+ "\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, genrow($params{page}, $params{destpage}, "td", @$_)
+ foreach @data;
push @lines, "\t" if defined $header;
push @lines, '
';
my $html = join("\n", @lines);
@@ -132,13 +117,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;