Merge branch 'aggregateinternal'

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

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 02a2ba05dacc5aa67ed842489b909a8982a985c4..892ea182e267229531db7e6b64a4067a6294b6a1 100644 (file)
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -19,9 +19,10 @@ 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}));
                }
                $params{data} = readfile(srcfile($params{file}));

+               add_depends($params{page}, $params{file});

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


@@ -60,7 +61,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;


@@ -68,7 +69,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;


@@ -173,17 +174,9 @@ sub genrow ($$$@) { #{{{
 sub htmlize ($$$) { #{{{
        my $page = shift;
        my $destpage = shift;
 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;
+       return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),
+               IkiWiki::preprocess($page, $destpage, shift));

 }
 
 1
 }
 
 1