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);
sub preprocess (@) { #{{{
my %params =(
- format => 'auto',
- header => 'yes',
+ format => 'auto',
+ header => 'yes',
@_
);
return "[[table ".gettext("cannot find file")."]]";
}
$params{data} = readfile(srcfile($params{file}));
+ add_depends($params{page}, $params{file});
}
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=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")."]]";
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);
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;
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'),
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 $text = 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>";
- $text=IkiWiki::htmlize($page, pagetype($pagesources{$page}),
- IkiWiki::preprocess($page, $destpage, $text));
+ return @ret;
+} #}}}
- # hack to get rid of enclosing junk added by markdown
- $text=~s!^<p>!!;
- $text=~s!</p>$!!;
- chomp $text;
+sub htmlize ($$$) { #{{{
+ my $page = shift;
+ my $destpage = shift;
- return $text;
+ return IkiWiki::htmlize($page, pagetype($pagesources{$page}),
+ IkiWiki::preprocess($page, $destpage, shift));
}
1