Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Muse reader: parse links starting with "URL:" explicitly

Browse source 
instead of trying to strip "URL:" prefix after parsing.
This commit is contained in:
Alexander Krotov 2018-05-27 23:57:19 +03:00
parent 6907985e82
commit 91aceeeff3
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Text/Pandoc/Readers/Muse.hs
View file

@ -46,7 +46,7 @@ import Control.Monad.Except (throwError)
import Data.Bifunctor import Data.Bifunctor
import Data.Char (isLetter) import Data.Char (isLetter)
import Data.Default import Data.Default
import Data.List (stripPrefix, intercalate) import Data.List (intercalate)
import Data.List.Split (splitOn) import Data.List.Split (splitOn)
import qualified Data.Map as M import qualified Data.Map as M
import qualified Data.Set as Set import qualified Data.Set as Set
@ -947,24 +947,31 @@ link = try $ do
st <- getState st <- getState
guard $ not $ museInLink st guard $ not $ museInLink st
setState $ st{ museInLink = True } setState $ st{ museInLink = True }
(url, content) <- linkText res <- explicitLink <|> linkText
updateState (\state -> state { museInLink = False }) updateState (\state -> state { museInLink = False })
return $ case stripPrefix "URL:" url of return res
Nothing -> if isImageUrl url
then B.image url "" <$> fromMaybe (return mempty) content
else B.link url "" <$> fromMaybe (return $ B.str url) content
Just url' -> B.link url' "" <$> fromMaybe (return $ B.str url') content
where -- Taken from muse-image-regexp defined in Emacs Muse file lisp/muse-regexps.el
imageExtensions = [".eps", ".gif", ".jpg", ".jpeg", ".pbm", ".png", ".tiff", ".xbm", ".xpm"]
isImageUrl = (`elem` imageExtensions) . takeExtension
linkContent :: PandocMonad m => MuseParser m (F Inlines) linkContent :: PandocMonad m => MuseParser m (F Inlines)
linkContent = char '[' >> trimInlinesF . mconcat <$> manyTill inline (string "]") linkContent = char '[' >> trimInlinesF . mconcat <$> manyTill inline (string "]")
linkText :: PandocMonad m => MuseParser m (String, Maybe (F Inlines)) -- | Parse a link starting with @URL:@
explicitLink :: PandocMonad m => MuseParser m (F Inlines)
explicitLink = try $ do
string "[[URL:"
url <- manyTill anyChar $ char ']'
content <- option (pure $ B.str url) linkContent
char ']'
return $ B.link url "" <$> content
linkText :: PandocMonad m => MuseParser m (F Inlines)
linkText = do linkText = do
string "[[" string "[["
url <- manyTill anyChar $ char ']' url <- manyTill anyChar $ char ']'
content <- optionMaybe linkContent content <- optionMaybe linkContent
char ']' char ']'
return (url, content) return $ if isImageUrl url
then B.image url "" <$> fromMaybe (return mempty) content
else B.link url "" <$> fromMaybe (return $ B.str url) content
where -- Taken from muse-image-regexp defined in Emacs Muse file lisp/muse-regexps.el
imageExtensions = [".eps", ".gif", ".jpg", ".jpeg", ".pbm", ".png", ".tiff", ".xbm", ".xpm"]
isImageUrl = (`elem` imageExtensions) . takeExtension