From 8dfbe3bbe8155c82123028985b380ce9abdc4fa9 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 6 Feb 2013 08:36:29 -0800 Subject: Implement `--default-image-extension` for LaTeX reader. --- src/Text/Pandoc/Readers/LaTeX.hs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 253e50ef2..1eba22251 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -51,6 +51,7 @@ import System.FilePath (replaceExtension, ()) import Data.List (intercalate) import qualified Data.Map as M import qualified Control.Exception as E +import System.FilePath (takeExtension, addExtension) -- | Parse LaTeX from string and return 'Pandoc' document. readLaTeX :: ReaderOptions -- ^ Reader options @@ -430,8 +431,7 @@ inlineCommands = M.fromList $ , ("href", (unescapeURL <$> braced <* optional sp) >>= \url -> tok >>= \lab -> pure (link url "" lab)) - , ("includegraphics", skipopts *> (unescapeURL <$> braced) >>= - (\src -> pure (image src "" (str "image")))) + , ("includegraphics", skipopts *> (unescapeURL <$> braced) >>= mkImage) , ("enquote", enquote) , ("cite", citation "cite" AuthorInText False) , ("citep", citation "citep" NormalCitation False) @@ -488,6 +488,14 @@ inlineCommands = M.fromList $ -- in which case they will appear as raw latex blocks: [ "noindent", "index", "nocite" ] +mkImage :: String -> LP Inlines +mkImage src = + case takeExtension src of + "" -> do + defaultExt <- getOption readerDefaultImageExtension + return $ image (addExtension src defaultExt) "" (str "image") + _ -> return $ image src "" (str "image") + inNote :: Inlines -> Inlines inNote ils = note $ para $ ils <> str "." -- cgit v1.2.3