git.iko.soy/typeable/pandoc
on master help sign in
Fixed bug in LaTeX writer: autolinks would not cause
902d6c7fiddlosopher
src/Text/Pandoc/Writers/LaTeX.hs+5−5
@@ -142,7 +142,7 @@ blockToLaTeX (OrderedList (start, numstyle, numdelim) lst) = do
142 let oldlevel = stOLLevel st
142 let oldlevel = stOLLevel st
143 put $ st {stOLLevel = oldlevel + 1}
143 put $ st {stOLLevel = oldlevel + 1}
144 items <- mapM listItemToLaTeX lst
144 items <- mapM listItemToLaTeX lst
145− put $ st {stOLLevel = oldlevel}
145+ modify (\st -> st {stOLLevel = oldlevel})
146 exemplar <- if numstyle /= DefaultStyle || numdelim /= DefaultDelim
146 exemplar <- if numstyle /= DefaultStyle || numdelim /= DefaultDelim
147 then do addToHeader "\\usepackage{enumerate}"
147 then do addToHeader "\\usepackage{enumerate}"
148 return $ "[" ++ head (orderedListMarkers (1, numstyle, numdelim)) ++ "]"
148 return $ "[" ++ head (orderedListMarkers (1, numstyle, numdelim)) ++ "]"
@@ -262,11 +262,12 @@ inlineToLaTeX (TeX str) = return str
262inlineToLaTeX (HtmlInline str) = return ""
262inlineToLaTeX (HtmlInline str) = return ""
263inlineToLaTeX (LineBreak) = return "\\\\\n"
263inlineToLaTeX (LineBreak) = return "\\\\\n"
264inlineToLaTeX Space = return " "
264inlineToLaTeX Space = return " "
265−inlineToLaTeX (Link text (src, tit)) = do
265+inlineToLaTeX (Link text (src, _)) = do
266 addToHeader "\\usepackage[breaklinks=true]{hyperref}"
266 addToHeader "\\usepackage[breaklinks=true]{hyperref}"
267 case text of
267 case text of
268 [Code x] | x == src -> -- autolink
268 [Code x] | x == src -> -- autolink
269+ do addToHeader "\\usepackage{url}"
269− return $ "\\url{" ++ x ++ "}"
270+ return $ "\\url{" ++ x ++ "}"
270 _ -> do contents <- inlineListToLaTeX $ deVerb text
271 _ -> do contents <- inlineListToLaTeX $ deVerb text
271 return $ "\\href{" ++ src ++ "}{" ++ contents ++ "}"
272 return $ "\\href{" ++ src ++ "}{" ++ contents ++ "}"
272inlineToLaTeX (Image alternate (source, tit)) = do
273inlineToLaTeX (Image alternate (source, tit)) = do
@@ -276,8 +277,7 @@ inlineToLaTeX (Note contents) = do
276 st <- get
277 st <- get
277 put (st {stInNote = True})
278 put (st {stInNote = True})
278 contents' <- blockListToLaTeX contents
279 contents' <- blockListToLaTeX contents
279− st <- get
280− put (st {stInNote = False})
280+ modify (\st -> st {stInNote = False})
281 return $ "\\footnote{" ++ stripTrailingNewlines contents' ++ "\n}"
281 return $ "\\footnote{" ++ stripTrailingNewlines contents' ++ "\n}"
282 -- note: the \n before } is important; removing it causes problems
282 -- note: the \n before } is important; removing it causes problems
283 -- if a Verbatim environment occurs at the end of the footnote.
283 -- if a Verbatim environment occurs at the end of the footnote.
tests/writer.latex+1
@@ -9,6 +9,7 @@
9\usepackage{enumerate}
9\usepackage{enumerate}
10\usepackage{fancyvrb}
10\usepackage{fancyvrb}
11\usepackage{graphicx}
11\usepackage{graphicx}
12+\usepackage{url}
12\setcounter{secnumdepth}{0}
13\setcounter{secnumdepth}{0}
13\VerbatimFootnotes % allows verbatim text in footnotes
14\VerbatimFootnotes % allows verbatim text in footnotes
14\title{Pandoc Test Suite}
15\title{Pandoc Test Suite}