diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/LaTeX.hs | 10 | ||||
| -rw-r--r-- | tests/writer.latex | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index dfbbc8f58..d9982cb69 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -91,8 +91,8 @@ latexHeader options (Meta title authors date) = do else "\\setcounter{secnumdepth}{0}\n" let baseHeader = writerHeader options let header = baseHeader ++ extras - return $ header ++ secnumline ++ titletext ++ authorstext ++ datetext ++ - "\\begin{document}\n" ++ maketitle ++ verbatim ++ "\n" + return $ header ++ secnumline ++ verbatim ++ titletext ++ authorstext ++ + datetext ++ "\\begin{document}\n" ++ maketitle ++ "\n" -- escape things as needed for LaTeX @@ -112,7 +112,7 @@ stringToLaTeX = escapeStringUsing latexEscapes deVerb :: [Inline] -> [Inline] deVerb [] = [] deVerb ((Code str):rest) = - (Str $ "\\texttt{" ++ stringToLaTeX str ++ "}"):(deVerb rest) + (Str $ stringToLaTeX str):(deVerb rest) deVerb (other:rest) = other:(deVerb rest) -- | Convert Pandoc block element to LaTeX. @@ -179,9 +179,9 @@ tableRowToLaTeX cols = listItemToLaTeX lst = blockListToLaTeX lst >>= (return . ("\\item "++)) defListItemToLaTeX (term, def) = do - term' <- inlineListToLaTeX term + term' <- inlineListToLaTeX (deVerb term) def' <- blockListToLaTeX def - return $ "\\item[" ++ substitute "]" "\\]" term' ++ "] " ++ def' + return $ "\\item[" ++ term' ++ "] " ++ def' -- | Convert list of inline elements to LaTeX. inlineListToLaTeX :: [Inline] -- ^ Inlines to convert diff --git a/tests/writer.latex b/tests/writer.latex index 5c52a4cd7..03ae0377c 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -3,14 +3,13 @@ \usepackage[utf8x]{inputenc} \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} -% This is needed for code blocks in footnotes: -\usepackage{fancyvrb} -\VerbatimFootnotes \newcommand{\textsubscript}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}} \usepackage[breaklinks=true]{hyperref} \usepackage[normalem]{ulem} +\usepackage{fancyvrb} \usepackage{graphicx} \setcounter{secnumdepth}{0} +\VerbatimFootnotes % allows verbatim text in footnotes \title{Pandoc Test Suite} \author{John MacFarlane\\Anonymous} \date{July 17, 2006} |