summaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers/LaTeX.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Text/Pandoc/Readers/LaTeX.hs')
-rw-r--r--src/Text/Pandoc/Readers/LaTeX.hs13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index a2df27c07..36940fab0 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -738,7 +738,7 @@ url :: GenParser Char ParserState Inline
url = try $ do
string "\\url"
url' <- charsInBalanced '{' '}'
- return $ Link [Code url'] (url', "")
+ return $ Link [Code url'] (escapeURI url', "")
link :: GenParser Char ParserState Inline
link = try $ do
@@ -746,17 +746,16 @@ link = try $ do
url' <- manyTill anyChar (char '}')
char '{'
label' <- manyTill inline (char '}')
- return $ Link (normalizeSpaces label') (url', "")
+ return $ Link (normalizeSpaces label') (escapeURI url', "")
image :: GenParser Char ParserState Inline
image = try $ do
("includegraphics", _, args) <- command
let args' = filter isArg args -- filter out options
- let src = if null args' then
- ("", "")
- else
- (stripFirstAndLast (head args'), "")
- return $ Image [Str "image"] src
+ let (src,tit) = case args' of
+ [] -> ("", "")
+ (x:_) -> (stripFirstAndLast x, "")
+ return $ Image [Str "image"] (escapeURI src, tit)
footnote :: GenParser Char ParserState Inline
footnote = try $ do