[Latex Reader] Table cell parser not consuming spaces correctly (#6597)

* Added test to replicate (#6596) * Table cell reader not consuming spaces correctly (#6596)
jgm · Aug 8, 2020 · 499fc11 · 499fc11
1 parent bed62fc
commit 499fc11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -2387,9 +2387,11 @@ parseTableRow envname prefsufs = do
 
 parseTableCell :: PandocMonad m => LP m Cell
 parseTableCell = do
+  spaces
   updateState $ \st -> st{ sInTableCell = True }
   cell' <- parseMultiCell <|> parseSimpleCell
   updateState $ \st -> st{ sInTableCell = False }
+  spaces
   return cell'
 
 cellAlignment :: PandocMonad m => LP m Alignment

diff --git a/test/Tests/Readers/LaTeX.hs b/test/Tests/Readers/LaTeX.hs
@@ -148,6 +148,13 @@ tests = [ testGroup "tokenization"
                                   , simpleCell (plain "Two")
                                   ]
                    ]
+          , "table with multicolumn item (#6596)" =:
+            "\\begin{tabular}{l c r}One & \\multicolumn{2}{c}{Two} & \\\\ \\end{tabular}" =?>
+            table' [AlignLeft, AlignCenter, AlignRight]
+                   [ Row nullAttr [ simpleCell (plain "One")
+                                  , cell AlignCenter (RowSpan 1) (ColSpan 2) (plain "Two")
+                                  ]
+                   ]
           , "Table with multirow item" =:
             T.unlines ["\\begin{tabular}{c}"
                       ,"\\multirow{2}{c}{One}\\\\Two\\\\"