From 986c1f9deec5acf01fbb594db00b2ec174296c77 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Sun, 26 Nov 2006 07:01:37 +0000 Subject: Pandoc bug fixes: + LaTeX reader did not parse metadata correctly. Now the title, author, and date are parsed correctly, and everything else in the preamble is skipped. + Simplified parsing of LaTeX command arguments and options. The function commandArgs now returns a list of arguments OR options (in whatever order they appear). The brackets are included, and a new stripFirstAndLast function is provided to strip them off when needed. This fixes a problem in dealing with \newcommand, etc. + Added a "try" before "parser" in definition of notFollowedBy' combinator. Adjusted the code using this combinator accordingly. + Changed handling of code blocks. Previously, some readers allowed trailing newlines, while others stripped them. Now, all readers strip trailing newlines in code blocks; writers insert a newline at the end of code blocks as needed. + Changed test suite to reflect these changes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@137 788f1e2b-df1e-0410-8736-df70ead52e1b --- src/Text/ParserCombinators/Pandoc.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Text/ParserCombinators/Pandoc.hs') diff --git a/src/Text/ParserCombinators/Pandoc.hs b/src/Text/ParserCombinators/Pandoc.hs index 9bf0a76f7..a78b776d3 100644 --- a/src/Text/ParserCombinators/Pandoc.hs +++ b/src/Text/ParserCombinators/Pandoc.hs @@ -82,9 +82,8 @@ many1Till p end = try (do -- | A more general form of @notFollowedBy@. This one allows any type of parser to -- be specified, and succeeds only if that parser fails. It does not consume any input. notFollowedBy' :: Show b => GenParser a st b -> GenParser a st () -notFollowedBy' parser = try (do{ c <- parser; unexpected (show c) } - <|> return () - ) +notFollowedBy' parser = try (do { c <- try parser; unexpected (show c) } + <|> return ()) -- | The inverse of @notFollowedBy'@. Fails if parser will fail, otherwise -- returns @()@ (but does not consume any input). -- cgit v1.2.3