]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/table.pm
Fix link from meta plugin to tips/howto_stop_flooding_aggregators
[git.ikiwiki.info.git] / IkiWiki / Plugin / table.pm
index be97137ededae7e099906cad459f26a41c1eb395..11474c8f08412c701a58f60ce350888f84a1057a 100644 (file)
@@ -22,10 +22,7 @@ sub preprocess (@) { #{{{
                        return "[[table ".gettext("cannot find 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') {
@@ -42,8 +39,24 @@ sub preprocess (@) { #{{{
        if (lc $params{format} eq 'csv') {
                @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') {
+               # 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} : "|",);
        }
@@ -66,7 +79,7 @@ sub preprocess (@) { #{{{
        push @lines, "\t<thead>",
                genrow($params{page}, $params{destpage}, "th", @$header),
                "\t</thead>" if defined $header;
-       push @lines, "\t<tbody>";
+       push @lines, "\t<tbody>" if defined $header;
        push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
                foreach @data;
        push @lines, "\t</tbody>" if defined $header;
@@ -161,17 +174,9 @@ sub genrow ($$$@) { #{{{
 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