X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/59b07af4cf3bc6acabafba826f3261c201d5e1bd..90de84b44240de36f1bfbc97e24e2c4dbdf3c559:/IkiWiki/Plugin/table.pm?ds=inline diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index 0501020ab..892ea182e 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -3,8 +3,8 @@ package IkiWiki::Plugin::table; use warnings; use strict; - -use IkiWiki; +use Encode; +use IkiWiki 2.00; sub import { #{{{ hook(type => "preprocess", id => "table", call => \&preprocess); @@ -19,9 +19,10 @@ sub preprocess (@) { #{{{ if (exists $params{file}) { if (! $pagesources{$params{file}}) { - return "[[table ".gettext("cannot find file")."]]"; + error gettext("cannot find file"); } $params{data} = readfile(srcfile($params{file})); + add_depends($params{page}, $params{file}); } if (lc $params{format} eq 'auto') { @@ -36,13 +37,31 @@ 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")."]]"; + error gettext("unknown data format"); } my $header; @@ -50,30 +69,19 @@ sub preprocess (@) { #{{{ $header=shift @data; } if (! @data) { - return "[[table ".gettext("empty data")."]]"; + error gettext("empty data"); } my @lines; push @lines, defined $params{class} ? "' : '
'; - push @lines, "\t","\t\t", - (map { - "\t\t\t" - } @$header), - "\t\t", "\t" if defined $header; - push @lines, "\t"; - foreach my $record (@data) { - push @lines, "\t\t", - (map { - "\t\t\t" - } @$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, '
". - htmlize($params{page}, $params{destpage}, $_). - "
". - htmlize($params{page}, $params{destpage}, $_). - "
'; my $html = join("\n", @lines); @@ -102,8 +110,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; @@ -111,7 +120,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'), @@ -129,26 +138,45 @@ 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 $text = 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" + } + else { + push @ret, "\t\t\t<$elt>$cell" + } + } + push @ret, "\t\t"; - $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!^

!!; - $text=~s!

$!!; - chomp $text; +sub htmlize ($$$) { #{{{ + my $page = shift; + my $destpage = shift; - return $text; + return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}), + IkiWiki::preprocess($page, $destpage, shift)); } 1