From 4142c02f738ac119086509aa979ead5146b32a52 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 28 Aug 2007 23:06:24 +0000 Subject: * Tables containing links with a link text were misparsed, because the "|" in the wikilink looked like a table field separator. Avoid this ambiguity by linkifying the data before parsing it as a table. * Turn on allow_loose_quotes in the table plugin's Text::CSV object, so that links from wikilinks don't confuse the parser. --- IkiWiki/Plugin/table.pm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'IkiWiki/Plugin/table.pm') diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index 698f9c9b6..c7b664052 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -22,6 +22,10 @@ sub preprocess (@) { #{{{ } $params{data} = readfile(srcfile($params{file})); } + else { + $params{data} = IkiWiki::linkify($params{page}, + $params{destpage}, $params{data}); + } if (lc $params{format} eq 'auto') { # first try the more simple format @@ -92,6 +96,7 @@ sub split_csv ($$) { #{{{ my $csv = Text::CSV->new({ sep_char => defined $delimiter ? $delimiter : ",", binary => 1, + allow_loose_quotes => 1, }) || error("could not create a Text::CSV object"); my $l=0; -- cgit v1.2.3