@@ -16,6 +16,7 @@ Conversion from CSV to a 'Pandoc' table.
1616-}
1717module Text.Pandoc.Readers.CSV ( readCSV ) where
1818import Prelude
19+import Control.Monad (guard)
1920import Data.Text (Text)
2021import qualified Data.Text as T
2122import Text.Pandoc.Definition
@@ -25,23 +26,20 @@ import Text.Parsec.Text (Parser)
2526import Text.Pandoc.Class (PandocMonad)
2627import Text.Pandoc.Shared (crFilter)
2728import Text.Pandoc.Error
28−import Text.Pandoc.Options (ReaderOptions(..))
29+import Text.Pandoc.Options (ReaderOptions)
2930import Control.Monad.Except (throwError)
3031
3132readCSV :: PandocMonad m
3233 => ReaderOptions -- ^ Reader options
3334 -> Text -- ^ Text to parse (assuming @'\n'@ line endings)
3435 -> m Pandoc
35−readCSV opts s = do
36− let columns = readerColumns opts
36+readCSV _opts s = do
3737 case parse pCSV "input" (crFilter s) of
3838 Right (r:rs) -> return $ B.doc $ B.table capt (zip aligns widths) hdrs rows
3939 where capt = mempty
4040 numcols = length r
4141 hdrs = map (B.plain . B.text) r
4242 rows = map (map (B.plain . B.text)) rs
43− maximum' [] = 0
44− maximum' xs = maximum xs
4543 aligns = replicate numcols AlignDefault
4644 widths = replicate numcols 0
4745 Right [] -> return $ B.doc mempty
@@ -85,7 +83,7 @@ pRecord :: Parser [Text]
8583pRecord = do
8684 x <- pField
8785 xs <- many $ pComma >> pField
88− () <$ newline <|> eof
86+ () <$ newline <|> (guard (not (T.null x) || not (null xs)) >> eof)
8987 return (x:xs)
9088
9189pField :: Parser Text
@@ -95,7 +93,7 @@ pComma :: Parser Char
9593pComma = char ','
9694
9795pUnescaped :: Parser Text
98−pUnescaped = T.strip . T.pack <$> many1 (noneOf "\n\r\",")
96+pUnescaped = T.strip . T.pack <$> many (noneOf "\n\r\",")
9997
10098pEscaped :: Parser Text
10199pEscaped = do