X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6bcc3339d911cd6c0095a3ed3eacf8560c458d01..ceffae8af1c797a715ad8bc375ee3f233703b03d:/IkiWiki/Plugin/table.pm?ds=inline

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index be97137ed..ddc2f68be 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -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;