Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 01ba5e5042360d218d422e56296a6161552ff8fe..e782fc238dbd40b628f8675fefa36942d9be520c 100644 (file)
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -7,25 +7,31 @@ 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',

                @_
        );
 
        if (exists $params{file}) {
                if (! $pagesources{$params{file}}) {
                @_
        );
 
        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}));
                }
                $params{data} = readfile(srcfile($params{file}));

-       }
-       else {
-               $params{data} = IkiWiki::linkify($params{page},
-                       $params{destpage}, $params{data});
+               add_depends($params{page}, $params{file});

        }
 
        if (lc $params{format} eq 'auto') {
        }
 
        if (lc $params{format} eq 'auto') {


@@ -40,21 +46,39 @@ sub preprocess (@) { #{{{
 
        my @data;
        if (lc $params{format} eq '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') {
        }
        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 {
        }
        else {

-               return "[[table ".gettext("unknown data format")."]]";
+               error gettext("unknown data format");

        }
 
        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) {

-               return "[[table ".gettext("empty data")."]]";
+               error gettext("empty data");

        }
 
        my @lines;
        }
 
        my @lines;


@@ -62,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;
                "\t</thead>" if defined $header;

-       push @lines, "\t<tbody>";
-       push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
-               foreach @data;
+       push @lines, "\t<tbody>" if defined $header;
+       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);


@@ -95,7 +118,7 @@ sub split_csv ($$) { #{{{
        eval q{use Text::CSV};
        error($@) if $@;
        my $csv = Text::CSV->new({ 
        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");
                binary          => 1,
                allow_loose_quotes => 1,
        }) || error("could not create a Text::CSV object");


@@ -129,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<$elt colspan=\"$colspan\">$cell</$elt>"
+                       push @ret, "\t\t\t<$e colspan=\"$colspan\">$cell</$e>"

                }
                else {
                }
                else {

-                       push @ret, "\t\t\t<$elt>$cell</$elt>"
+                       push @ret, "\t\t\t<$e>$cell</$e>"

                }
        }
        push @ret, "\t\t</tr>";
                }
        }
        push @ret, "\t\t</tr>";


@@ -156,20 +192,4 @@ sub genrow ($$$@) { #{{{
        return @ret;
 } #}}}
 
        return @ret;
 } #}}}
 

-sub htmlize ($$$) { #{{{
-       my $page = shift;
-       my $destpage = shift;
-       my $text = shift;
-
-       $text=IkiWiki::htmlize($page, pagetype($pagesources{$page}),
-               IkiWiki::preprocess($page, $destpage, $text));
-
-       # hack to get rid of enclosing junk added by markdown
-       $text=~s!^<p>!!;
-       $text=~s!</p>$!!;
-       chomp $text;
-
-       return $text;
-}
-

 1
 1