@@ -28,7 +28,7 @@ import qualified Data.Text as T
2828import qualified Data.Text.Lazy as TL
2929import qualified Data.ByteString.Lazy as BL
3030import System.FilePath (addExtension, takeExtension)
31−import Text.HTML.TagSoup
31+import Text.HTML.TagSoup hiding (Row)
3232import Text.Pandoc.Builder (Blocks, Inlines)
3333import qualified Text.Pandoc.Builder as B
3434import Text.Pandoc.Class.PandocMonad (PandocMonad (..), report)
@@ -1235,7 +1235,7 @@ tableCaption = try $ do
12351235-- Parse a simple table with '---' header and one line per row.
12361236simpleTable :: PandocMonad m
12371237 => Bool -- ^ Headerless table
1238− -> MarkdownParser m ([Alignment], [Double], F [Pandoc.Row], F [Pandoc.Row])
1238+ -> MarkdownParser m ([Alignment], [Double], F [Row], F [Row])
12391239simpleTable headless = do
12401240 (aligns, _widths, heads', lines') <-
12411241 tableWith (simpleTableHeader headless) tableLine
@@ -1250,7 +1250,7 @@ simpleTable headless = do
12501250-- ending with a footer (dashed line followed by blank line).
12511251multilineTable :: PandocMonad m
12521252 => Bool -- ^ Headerless table
1253− -> MarkdownParser m ([Alignment], [Double], F [Pandoc.Row], F [Pandoc.Row])
1253+ -> MarkdownParser m ([Alignment], [Double], F [Row], F [Row])
12541254multilineTable headless =
12551255 tableWith (multilineTableHeader headless) multilineRow blanklines tableFooter
12561256
@@ -1292,7 +1292,7 @@ multilineTableHeader headless = try $ do
12921292-- which may be grid, separated by blank lines, and
12931293-- ending with a footer (dashed line followed by blank line).
12941294gridTable :: PandocMonad m => Bool -- ^ Headerless table
1295− -> MarkdownParser m ([Alignment], [Double], F [Pandoc.Row], F [Pandoc.Row])
1295+ -> MarkdownParser m ([Alignment], [Double], F [Row], F [Row])
12961296gridTable headless = gridTableWith' parseBlocks headless
12971297
12981298pipeBreak :: PandocMonad m => MarkdownParser m ([Alignment], [Int])
@@ -1307,7 +1307,7 @@ pipeBreak = try $ do
13071307 blankline
13081308 return $ unzip (first:rest)
13091309
1310−pipeTable :: PandocMonad m => MarkdownParser m ([Alignment], [Double], F [Pandoc.Row], F [Pandoc.Row])
1310+pipeTable :: PandocMonad m => MarkdownParser m ([Alignment], [Double], F [Row], F [Row])
13111311pipeTable = try $ do
13121312 nonindentSpaces
13131313 lookAhead nonspaceChar
@@ -1384,7 +1384,7 @@ tableWith :: PandocMonad m
13841384 -> ([Int] -> MarkdownParser m (F [Blocks]))
13851385 -> MarkdownParser m sep
13861386 -> MarkdownParser m end
1387− -> MarkdownParser m ([Alignment], [Double], F [Pandoc.Row], F [Pandoc.Row])
1387+ -> MarkdownParser m ([Alignment], [Double], F [Row], F [Row])
13881388tableWith headerParser rowParser lineParser footerParser = try $ do
13891389 (heads, aligns, indices) <- headerParser
13901390 lines' <- fmap sequence $ rowParser indices `sepEndBy1` lineParser
@@ -2118,8 +2118,8 @@ doubleQuoted = try $ do
21182118 fmap B.doubleQuoted . trimInlinesF . mconcat <$>
21192119 many1Till inline doubleQuoteEnd
21202120
2121−toRow :: [Blocks] -> Pandoc.Row
2121+toRow :: [Blocks] -> Row
21222122toRow = Row nullAttr . map B.simpleCell
21232123
2124−toHeaderRow :: [Blocks] -> [Pandoc.Row]
2124+toHeaderRow :: [Blocks] -> [Row]
21252125toHeaderRow l = if null l then [] else [toRow l]