@@ -1041,7 +1041,7 @@ multilineTableHeader headless = try $ do
1041 let aligns = zipWith alignType rawHeadsList lengths
1041 let aligns = zipWith alignType rawHeadsList lengths
1042 let rawHeads = if headless
1042 let rawHeads = if headless
1043 then replicate (length dashes) ""
1043 then replicate (length dashes) ""
1044− else map (intercalate " ") rawHeadsList
1044+ else map unwords rawHeadsList
1045 heads <- fmap sequence $
1045 heads <- fmap sequence $
1046 mapM (parseFromString (mconcat <$> many plain)) $
1046 mapM (parseFromString (mconcat <$> many plain)) $
1047 map trim rawHeads
1047 map trim rawHeads
@@ -1098,10 +1098,9 @@ gridTableHeader headless = try $ do
1098 -- RST does not have a notion of alignments
1098 -- RST does not have a notion of alignments
1099 let rawHeads = if headless
1099 let rawHeads = if headless
1100 then replicate (length dashes) ""
1100 then replicate (length dashes) ""
1101− else map (intercalate " ") $ transpose
1101+ else map unwords $ transpose
1102 $ map (gridTableSplitLine indices) rawContent
1102 $ map (gridTableSplitLine indices) rawContent
1103− heads <- fmap sequence $ mapM (parseFromString parseBlocks) $
1103+ heads <- fmap sequence $ mapM (parseFromString parseBlocks . trim) rawHeads
1105 return (heads, aligns, indices)
1104 return (heads, aligns, indices)
1107gridTableRawLine :: [Int] -> MarkdownParser [String]
1106gridTableRawLine :: [Int] -> MarkdownParser [String]
@@ -1622,9 +1621,9 @@ rawHtmlInline = do
1622 guardEnabled Ext_raw_html
1621 guardEnabled Ext_raw_html
1623 mdInHtml <- option False $
1622 mdInHtml <- option False $
1624 guardEnabled Ext_markdown_in_html_blocks >> return True
1623 guardEnabled Ext_markdown_in_html_blocks >> return True
1625− (_,result) <- if mdInHtml
1624+ (_,result) <- htmlTag $ if mdInHtml
1626− then htmlTag isInlineTag
1625+ then isInlineTag
1627− else htmlTag (not . isTextTag)
1626+ else not . isTextTag
1628 return $ return $ B.rawInline "html" result
1627 return $ return $ B.rawInline "html" result
1630-- Citations
1629-- Citations