git.iko.soy/typeable/pandoc
on master help sign in
Muse reader: don't return link title from linkText parser
828bfc7Alexander Krotov
src/Text/Pandoc/Readers/Muse.hs+6−6
@@ -897,13 +897,13 @@ link = try $ do
897 st <- getState
897 st <- getState
898 guard $ not $ museInLink st
898 guard $ not $ museInLink st
899 setState $ st{ museInLink = True }
899 setState $ st{ museInLink = True }
900− (url, title, content) <- linkText
900+ (url, content) <- linkText
901 updateState (\state -> state { museInLink = False })
901 updateState (\state -> state { museInLink = False })
902 return $ case stripPrefix "URL:" url of
902 return $ case stripPrefix "URL:" url of
903 Nothing -> if isImageUrl url
903 Nothing -> if isImageUrl url
904− then B.image url title <$> fromMaybe (return mempty) content
904+ then B.image url "" <$> fromMaybe (return mempty) content
905− else B.link url title <$> fromMaybe (return $ B.str url) content
905+ else B.link url "" <$> fromMaybe (return $ B.str url) content
906− Just url' -> B.link url' title <$> fromMaybe (return $ B.str url') content
906+ Just url' -> B.link url' "" <$> fromMaybe (return $ B.str url') content
907 where -- Taken from muse-image-regexp defined in Emacs Muse file lisp/muse-regexps.el
907 where -- Taken from muse-image-regexp defined in Emacs Muse file lisp/muse-regexps.el
908 imageExtensions = [".eps", ".gif", ".jpg", ".jpeg", ".pbm", ".png", ".tiff", ".xbm", ".xpm"]
908 imageExtensions = [".eps", ".gif", ".jpg", ".jpeg", ".pbm", ".png", ".tiff", ".xbm", ".xpm"]
909 isImageUrl = (`elem` imageExtensions) . takeExtension
909 isImageUrl = (`elem` imageExtensions) . takeExtension
@@ -911,10 +911,10 @@ link = try $ do
911linkContent :: PandocMonad m => MuseParser m (F Inlines)
911linkContent :: PandocMonad m => MuseParser m (F Inlines)
912linkContent = char '[' >> trimInlinesF . mconcat <$> manyTill inline (string "]")
912linkContent = char '[' >> trimInlinesF . mconcat <$> manyTill inline (string "]")
913
913
914−linkText :: PandocMonad m => MuseParser m (String, String, Maybe (F Inlines))
914+linkText :: PandocMonad m => MuseParser m (String, Maybe (F Inlines))
915linkText = do
915linkText = do
916 string "[["
916 string "[["
917 url <- many1Till anyChar $ char ']'
917 url <- many1Till anyChar $ char ']'
918 content <- optionMaybe linkContent
918 content <- optionMaybe linkContent
919 char ']'
919 char ']'
920− return (url, "", content)
920+ return (url, content)