0a7650f · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Muse reader internals: merge link and explicit link parsers into one function

0a7650fAlexander Krotov8 years ago

src/Text/Pandoc/Readers/Muse.hs+5−13

@@ -909,17 +909,17 @@ linkOrImage :: PandocMonad m => MuseParser m (F Inlines)

909linkOrImage = try $ do

910 inLink <- asks museInLink

911 guard $ not inLink

912− local (\s -> s { museInLink = True }) (explicitLink <|> image <|> link)

912+ local (\s -> s { museInLink = True }) (link "URL:" <|> image <|> link "")

913

914linkContent :: PandocMonad m => MuseParser m (F Inlines)

915linkContent = trimInlinesF . mconcat

916 <$ char '['

917 <*> manyTill inline (char ']')

918

919−-- | Parse a link starting with @URL:@

919+-- | Parse a link starting with (possibly null) prefix

920−explicitLink :: PandocMonad m => MuseParser m (F Inlines)

920+link :: PandocMonad m => String -> MuseParser m (F Inlines)

921−explicitLink = try $ do

921+link prefix = try $ do

922− string "[[URL:"

922+ string $ "[[" ++ prefix

923 url <- manyTill anyChar $ char ']'

924 content <- option (pure $ B.str url) linkContent

925 char ']'

@@ -952,11 +952,3 @@ image = try $ do

952 <*> optionMaybe (many1 digit)

953 <* many spaceChar

954 <*> optionMaybe (oneOf "rlf")

955−

956−link :: PandocMonad m => MuseParser m (F Inlines)

957−link = try $ do

958− string "[["

959− url <- manyTill anyChar $ char ']'

960− content <- optionMaybe linkContent

961− char ']'

962− return $ B.link url "" <$> fromMaybe (return $ B.str url) content