From 114103d67fcb100dda8edde45fa3eee680cdd678 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 9 Oct 2015 14:39:42 -0700 Subject: LaTeX reader: don't eat excess whitespace after macros. Really close #2446. --- src/Text/Pandoc/Readers/LaTeX.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 6efa64ec8..0e144dd0d 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -234,8 +234,8 @@ blocks = mconcat <$> many block getRawCommand :: String -> LP String getRawCommand name' = do - rawargs <- withRaw (opt `sepBy` (optional sp) *> - option "" (optional sp *> dimenarg) *> + rawargs <- withRaw (many (try (optional sp *> opt)) *> + option "" (try (optional sp *> dimenarg)) *> many braced) return $ '\\' : name' ++ snd rawargs @@ -818,10 +818,10 @@ tok :: LP Inlines tok = try $ grouped inline <|> inlineCommand <|> str <$> count 1 inlineChar opt :: LP Inlines -opt = bracketed inline <* optional sp +opt = bracketed inline skipopts :: LP () -skipopts = skipMany opt +skipopts = skipMany (opt *> optional sp) inlineText :: LP Inlines inlineText = str <$> many1 inlineChar -- cgit v1.2.3