checkboxes back

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

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 20c71e1c72c23272275d7b1ab219d2fa9a5ab228..1302646b130084fefd87456d2f905b8c4c2cfea6 100644 (file)
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -7,9 +7,18 @@ 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',


@@ -19,7 +28,7 @@ sub preprocess (@) { #{{{
 
        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}));
                add_depends($params{page}, $params{file});
                }
                $params{data} = readfile(srcfile($params{file}));
                add_depends($params{page}, $params{file});


@@ -61,7 +70,7 @@ sub preprocess (@) { #{{{
                        defined $params{delimiter} ? $params{delimiter} : "|",);
        }
        else {
                        defined $params{delimiter} ? $params{delimiter} : "|",);
        }
        else {

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

        }
 
        my $header;
        }
 
        my $header;


@@ -69,7 +78,7 @@ sub preprocess (@) { #{{{
                $header=shift @data;
        }
        if (! @data) {
                $header=shift @data;
        }
        if (! @data) {

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

        }
 
        my @lines;
        }
 
        my @lines;


@@ -175,7 +184,7 @@ sub htmlize ($$$) { #{{{
        my $page = shift;
        my $destpage = shift;
 
        my $page = shift;
        my $destpage = shift;
 

-       return IkiWiki::htmlize($page, pagetype($pagesources{$page}),
+       return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),

                IkiWiki::preprocess($page, $destpage, shift));
 }
 
                IkiWiki::preprocess($page, $destpage, shift));
 }