git.iko.soy/typeable/pandoc
on master help sign in
Fixed bug in LaTeX writer: autolinks would not cause

'\usepackage{url}' to be put in the document header. Also, changes to state in enumerated list items would be overwritten. git-svn-id: https://pandoc.googlecode.com/svn/trunk@947 788f1e2b-df1e-0410-8736-df70ead52e1b

commit902d6c7115c46858580fedb5cb785a1d58941ca4 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateWed 29 Aug 2007, 00:03 (19 years ago) parent5bafe2c
2 files changed+6−5
src/Text/Pandoc/Writers/LaTeX.hs+5−5 tests/writer.latex+1
src/Text/Pandoc/Writers/LaTeX.hs+5−5
@@ -142,7 +142,7 @@ blockToLaTeX (OrderedList (start, numstyle, numdelim) lst) = do
142142 let oldlevel = stOLLevel st
143143 put $ st {stOLLevel = oldlevel + 1}
144144 items <- mapM listItemToLaTeX lst
145− put $ st {stOLLevel = oldlevel}
145+ modify (\st -> st {stOLLevel = oldlevel})
146146 exemplar <- if numstyle /= DefaultStyle || numdelim /= DefaultDelim
147147 then do addToHeader "\\usepackage{enumerate}"
148148 return $ "[" ++ head (orderedListMarkers (1, numstyle, numdelim)) ++ "]"
@@ -262,11 +262,12 @@ inlineToLaTeX (TeX str) = return str
262262inlineToLaTeX (HtmlInline str) = return ""
263263inlineToLaTeX (LineBreak) = return "\\\\\n"
264264inlineToLaTeX Space = return " "
265−inlineToLaTeX (Link text (src, tit)) = do
265+inlineToLaTeX (Link text (src, _)) = do
266266 addToHeader "\\usepackage[breaklinks=true]{hyperref}"
267267 case text of
268268 [Code x] | x == src -> -- autolink
269− return $ "\\url{" ++ x ++ "}"
269+ do addToHeader "\\usepackage{url}"
270+ return $ "\\url{" ++ x ++ "}"
270271 _ -> do contents <- inlineListToLaTeX $ deVerb text
271272 return $ "\\href{" ++ src ++ "}{" ++ contents ++ "}"
272273inlineToLaTeX (Image alternate (source, tit)) = do
@@ -276,8 +277,7 @@ inlineToLaTeX (Note contents) = do
276277 st <- get
277278 put (st {stInNote = True})
278279 contents' <- blockListToLaTeX contents
279− st <- get
280− put (st {stInNote = False})
280+ modify (\st -> st {stInNote = False})
281281 return $ "\\footnote{" ++ stripTrailingNewlines contents' ++ "\n}"
282282 -- note: the \n before } is important; removing it causes problems
283283 -- if a Verbatim environment occurs at the end of the footnote.
tests/writer.latex+1
@@ -9,6 +9,7 @@
99\usepackage{enumerate}
1010\usepackage{fancyvrb}
1111\usepackage{graphicx}
12+\usepackage{url}
1213\setcounter{secnumdepth}{0}
1314\VerbatimFootnotes % allows verbatim text in footnotes
1415\title{Pandoc Test Suite}