git.iko.soy/typeable/pandoc
on master help sign in
Fixes in LaTeX writer:

+ put \VerbatimFootnotes right before \title block, to avoid bad interactions. + added deVerb in description list. + removed \texttt{} from deVerb, because it cannot go in description lists. git-svn-id: https://pandoc.googlecode.com/svn/trunk@802 788f1e2b-df1e-0410-8736-df70ead52e1b

commit453dc5345792530eb719df57158419eb61c70677 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateThu 26 Jul 2007, 03:15 (19 years ago) parent00b69e4
2 files changed+7−8
src/Text/Pandoc/Writers/LaTeX.hs+5−5 tests/writer.latex+2−3
src/Text/Pandoc/Writers/LaTeX.hs+5−5
@@ -91,8 +91,8 @@ latexHeader options (Meta title authors date) = do
9191 else "\\setcounter{secnumdepth}{0}\n"
9292 let baseHeader = writerHeader options
9393 let header = baseHeader ++ extras
94− return $ header ++ secnumline ++ titletext ++ authorstext ++ datetext ++
95− "\\begin{document}\n" ++ maketitle ++ verbatim ++ "\n"
94+ return $ header ++ secnumline ++ verbatim ++ titletext ++ authorstext ++
95+ datetext ++ "\\begin{document}\n" ++ maketitle ++ "\n"
9696
9797-- escape things as needed for LaTeX
9898
@@ -112,7 +112,7 @@ stringToLaTeX = escapeStringUsing latexEscapes
112112deVerb :: [Inline] -> [Inline]
113113deVerb [] = []
114114deVerb ((Code str):rest) =
115− (Str $ "\\texttt{" ++ stringToLaTeX str ++ "}"):(deVerb rest)
115+ (Str $ stringToLaTeX str):(deVerb rest)
116116deVerb (other:rest) = other:(deVerb rest)
117117
118118-- | Convert Pandoc block element to LaTeX.
@@ -179,9 +179,9 @@ tableRowToLaTeX cols =
179179listItemToLaTeX lst = blockListToLaTeX lst >>= (return . ("\\item "++))
180180
181181defListItemToLaTeX (term, def) = do
182− term' <- inlineListToLaTeX term
182+ term' <- inlineListToLaTeX (deVerb term)
183183 def' <- blockListToLaTeX def
184− return $ "\\item[" ++ substitute "]" "\\]" term' ++ "] " ++ def'
184+ return $ "\\item[" ++ term' ++ "] " ++ def'
185185
186186-- | Convert list of inline elements to LaTeX.
187187inlineListToLaTeX :: [Inline] -- ^ Inlines to convert
tests/writer.latex+2−3
@@ -3,14 +3,13 @@
33\usepackage[utf8x]{inputenc}
44\setlength{\parindent}{0pt}
55\setlength{\parskip}{6pt plus 2pt minus 1pt}
6−% This is needed for code blocks in footnotes:
7−\usepackage{fancyvrb}
8−\VerbatimFootnotes
96\newcommand{\textsubscript}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}}
107\usepackage[breaklinks=true]{hyperref}
118\usepackage[normalem]{ulem}
9+\usepackage{fancyvrb}
1210\usepackage{graphicx}
1311\setcounter{secnumdepth}{0}
12+\VerbatimFootnotes % allows verbatim text in footnotes
1413\title{Pandoc Test Suite}
1514\author{John MacFarlane\\Anonymous}
1615\date{July 17, 2006}