From 04cb602d79df5ee386107c27107cb9c8d09b1665 Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Sun, 23 Apr 2017 13:58:16 +0200 Subject: Org reader: allow multi-word arguments to src block params The reader now correctly parses src block parameter list even if parameter arguments contain multiple words. Closes: #3477 --- src/Text/Pandoc/Readers/Org/Blocks.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs index 3cb9c7ed8..fb942608d 100644 --- a/src/Text/Pandoc/Readers/Org/Blocks.hs +++ b/src/Text/Pandoc/Readers/Org/Blocks.hs @@ -589,9 +589,12 @@ blockOption = try $ do orgParamValue :: Monad m => OrgParser m String orgParamValue = try $ skipSpaces - *> notFollowedBy (char ':' ) - *> many1 nonspaceChar + *> notFollowedBy orgArgKey + *> noneOf "\n\r" `many1Till` endOfValue <* skipSpaces + where + endOfValue = lookAhead $ (try $ skipSpaces <* oneOf "\n\r") + <|> (try $ skipSpaces1 <* orgArgKey) -- -- cgit v1.2.3