diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-03-08 10:37:29 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-03-08 10:37:29 -0700 |
| commit | c7c45918dc5cc34fe47186c62027802bcd6b3b9a (patch) | |
| tree | f129ab7d9f3abfd74f7f3a0d833dcf4dee569c46 /src/Text | |
| parent | efdc1691fa4ebcbb3e76abd91c6703f4b3e53d0e (diff) | |
| parent | 12bf0ff3e528464cfc4173544bb9b4a0057c671e (diff) | |
| download | pandoc-c7c45918dc5cc34fe47186c62027802bcd6b3b9a.tar.gz | |
Merge pull request #1999 from synsem/latex-reader-tables
LaTeX reader: minor table parsing improvements
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/Readers/LaTeX.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index a071578fe..1df2d4caf 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -1275,7 +1275,7 @@ complexNatbibCitation mode = try $ do parseAligns :: LP [Alignment] parseAligns = try $ do char '{' - let maybeBar = skipMany $ sp <|> () <$ char '|' <|> () <$ try (string "@{}") + let maybeBar = skipMany $ sp <|> () <$ char '|' <|> () <$ (char '@' >> braced) maybeBar let cAlign = AlignCenter <$ char 'c' let lAlign = AlignLeft <$ char 'l' @@ -1314,7 +1314,7 @@ parseTableRow cols = try $ do simpTable :: Bool -> LP Blocks simpTable hasWidthParameter = try $ do when hasWidthParameter $ () <$ (spaces >> tok) - spaces + skipopts aligns <- parseAligns let cols = length aligns optional hline |