web commit by http://adam.shand.net/

[git.ikiwiki.info.git] / IkiWiki / Plugin / table.pm

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 26e434b1fa2264fdb9c24ceb8031775bf49f64fe..2ed60ab4604b3193b15914c6732568012c3a328d 100644 (file)
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -5,7 +5,6 @@ use warnings;
 use strict;
 
 use IkiWiki;
 use strict;
 
 use IkiWiki;

-use IkiWiki::Plugin::mdwn;

 
 sub import { #{{{
        hook(type => "preprocess", id => "table", call => \&preprocess);
 
 sub import { #{{{
        hook(type => "preprocess", id => "table", call => \&preprocess);


@@ -58,23 +57,12 @@ sub preprocess (@) { #{{{
        push @lines, defined $params{class}
                        ? "<table class=\"".$params{class}.'">'
                        : '<table>';
        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<thead>",
+               genrow($params{page}, $params{destpage}, "th", @$header),
+               "\t</thead>" if defined $header;

        push @lines, "\t<tbody>";
        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, genrow($params{page}, $params{destpage}, "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);


@@ -130,13 +118,40 @@ sub split_dsv ($$) { #{{{
 
        my @data;
        foreach my $line (@text_lines) {
 
        my @data;
        foreach my $line (@text_lines) {

-               push @data, [ split(/\Q$delimiter\E/, $line) ];
+               push @data, [ split(/\Q$delimiter\E/, $line, -1) ];

        }
     
        return @data;
 } #}}}
 
        }
     
        return @data;
 } #}}}
 

-sub htmlize ($$$){ #{{{
+sub genrow ($$$@) { #{{{
+       my $page = shift;
+       my $destpage = 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>";
+
+       return @ret;
+} #}}}
+
+sub htmlize ($$$) { #{{{

        my $page = shift;
        my $destpage = shift;
        my $text = shift;
        my $page = shift;
        my $destpage = shift;
        my $text = shift;