X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/59b07af4cf3bc6acabafba826f3261c201d5e1bd..cf35ee04cddd7b9b39636499dd24b689443c0e97:/IkiWiki/Plugin/table.pm?ds=inline
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 0501020ab..698f9c9b6 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -3,8 +3,7 @@ package IkiWiki::Plugin::table;
use warnings;
use strict;
-
-use IkiWiki;
+use IkiWiki 2.00;
sub import { #{{{
hook(type => "preprocess", id => "table", call => \&preprocess);
@@ -57,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);
@@ -129,12 +117,39 @@ 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 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;