Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'upstream/master' into prv/po
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
table.pm
diff --git
a/IkiWiki/Plugin/table.pm
b/IkiWiki/Plugin/table.pm
index 892ea182e267229531db7e6b64a4067a6294b6a1..e782fc238dbd40b628f8675fefa36942d9be520c 100644
(file)
--- a/
IkiWiki/Plugin/table.pm
+++ b/
IkiWiki/Plugin/table.pm
@@
-7,13
+7,22
@@
use Encode;
use IkiWiki 2.00;
sub import { #{{{
use IkiWiki 2.00;
sub import { #{{{
+ hook(type => "getsetup", id => "table", call => \&getsetup);
hook(type => "preprocess", id => "table", call => \&preprocess);
} # }}}
hook(type => "preprocess", id => "table", call => \&preprocess);
} # }}}
+sub getsetup () { #{{{
+ return
+ plugin => {
+ safe => 1,
+ rebuild => undef,
+ },
+} #}}}
+
sub preprocess (@) { #{{{
my %params =(
format => 'auto',
sub preprocess (@) { #{{{
my %params =(
format => 'auto',
- header => '
yes
',
+ header => '
row
',
@_
);
@_
);
@@
-65,7
+74,7
@@
sub preprocess (@) { #{{{
}
my $header;
}
my $header;
- if (lc($params{header}) eq "
yes"
) {
+ if (lc($params{header}) eq "
row" || IkiWiki::yesno($params{header})
) {
$header=shift @data;
}
if (! @data) {
$header=shift @data;
}
if (! @data) {
@@
-77,11
+86,10
@@
sub preprocess (@) { #{{{
? "<table class=\"".$params{class}.'">'
: '<table>';
push @lines, "\t<thead>",
? "<table class=\"".$params{class}.'">'
: '<table>';
push @lines, "\t<thead>",
- genrow(
$params{page}, $params{destpage}
, "th", @$header),
+ genrow(
\%params
, "th", @$header),
"\t</thead>" if defined $header;
push @lines, "\t<tbody>" if defined $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, genrow(\%params, "td", @$_) foreach @data;
push @lines, "\t</tbody>" if defined $header;
push @lines, '</table>';
my $html = join("\n", @lines);
push @lines, "\t</tbody>" if defined $header;
push @lines, '</table>';
my $html = join("\n", @lines);
@@
-144,26
+152,39
@@
sub split_dsv ($$) { #{{{
return @data;
} #}}}
return @data;
} #}}}
-sub genrow ($$$@) { #{{{
- my $page = shift;
- my $destpage = shift;
+sub genrow ($@) { #{{{
+ my %params=%{shift()};
my $elt = shift;
my @data = @_;
my $elt = shift;
my @data = @_;
+ my $page=$params{page};
+ my $destpage=$params{destpage};
+ my $type=pagetype($pagesources{$page});
+
my @ret;
push @ret, "\t\t<tr>";
for (my $x=0; $x < @data; $x++) {
my @ret;
push @ret, "\t\t<tr>";
for (my $x=0; $x < @data; $x++) {
- my $cell=htmlize($page, $destpage, $data[$x]);
+ my $cell=IkiWiki::htmlize($page, $destpage, $type,
+ IkiWiki::preprocess($page, $destpage, $data[$x]));
+
+ # automatic colspan for empty cells
my $colspan=1;
while ($x+1 < @data && $data[$x+1] eq '') {
$x++;
$colspan++;
}
my $colspan=1;
while ($x+1 < @data && $data[$x+1] eq '') {
$x++;
$colspan++;
}
+
+ # check if the first column should be a header
+ my $e=$elt;
+ if ($x == 0 && lc($params{header}) eq "column") {
+ $e="th";
+ }
+
if ($colspan > 1) {
if ($colspan > 1) {
- push @ret, "\t\t\t<$e
lt colspan=\"$colspan\">$cell</$elt
>"
+ push @ret, "\t\t\t<$e
colspan=\"$colspan\">$cell</$e
>"
}
else {
}
else {
- push @ret, "\t\t\t<$e
lt>$cell</$elt
>"
+ push @ret, "\t\t\t<$e
>$cell</$e
>"
}
}
push @ret, "\t\t</tr>";
}
}
push @ret, "\t\t</tr>";
@@
-171,12
+192,4
@@
sub genrow ($$$@) { #{{{
return @ret;
} #}}}
return @ret;
} #}}}
-sub htmlize ($$$) { #{{{
- my $page = shift;
- my $destpage = shift;
-
- return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),
- IkiWiki::preprocess($page, $destpage, shift));
-}
-
1
1