git.iko.soy/typeable/pandoc
on master help sign in
Fixes in LaTeX writer:
453dc53fiddlosopher
src/Text/Pandoc/Writers/LaTeX.hs+5−5
@@ -91,8 +91,8 @@ latexHeader options (Meta title authors date) = do
91 else "\\setcounter{secnumdepth}{0}\n"
91 else "\\setcounter{secnumdepth}{0}\n"
92 let baseHeader = writerHeader options
92 let baseHeader = writerHeader options
93 let header = baseHeader ++ extras
93 let header = baseHeader ++ extras
94− return $ header ++ secnumline ++ titletext ++ authorstext ++ datetext ++
94+ return $ header ++ secnumline ++ verbatim ++ titletext ++ authorstext ++
95− "\\begin{document}\n" ++ maketitle ++ verbatim ++ "\n"
95+ datetext ++ "\\begin{document}\n" ++ maketitle ++ "\n"
96
96
97-- escape things as needed for LaTeX
97-- escape things as needed for LaTeX
98
98
@@ -112,7 +112,7 @@ stringToLaTeX = escapeStringUsing latexEscapes
112deVerb :: [Inline] -> [Inline]
112deVerb :: [Inline] -> [Inline]
113deVerb [] = []
113deVerb [] = []
114deVerb ((Code str):rest) =
114deVerb ((Code str):rest) =
115− (Str $ "\\texttt{" ++ stringToLaTeX str ++ "}"):(deVerb rest)
115+ (Str $ stringToLaTeX str):(deVerb rest)
116deVerb (other:rest) = other:(deVerb rest)
116deVerb (other:rest) = other:(deVerb rest)
117
117
118-- | Convert Pandoc block element to LaTeX.
118-- | Convert Pandoc block element to LaTeX.
@@ -179,9 +179,9 @@ tableRowToLaTeX cols =
179listItemToLaTeX lst = blockListToLaTeX lst >>= (return . ("\\item "++))
179listItemToLaTeX lst = blockListToLaTeX lst >>= (return . ("\\item "++))
180
180
181defListItemToLaTeX (term, def) = do
181defListItemToLaTeX (term, def) = do
182− term' <- inlineListToLaTeX term
182+ term' <- inlineListToLaTeX (deVerb term)
183 def' <- blockListToLaTeX def
183 def' <- blockListToLaTeX def
184− return $ "\\item[" ++ substitute "]" "\\]" term' ++ "] " ++ def'
184+ return $ "\\item[" ++ term' ++ "] " ++ def'
185
185
186-- | Convert list of inline elements to LaTeX.
186-- | Convert list of inline elements to LaTeX.
187inlineListToLaTeX :: [Inline] -- ^ Inlines to convert
187inlineListToLaTeX :: [Inline] -- ^ Inlines to convert
tests/writer.latex+2−3
@@ -3,14 +3,13 @@
3\usepackage[utf8x]{inputenc}
3\usepackage[utf8x]{inputenc}
4\setlength{\parindent}{0pt}
4\setlength{\parindent}{0pt}
5\setlength{\parskip}{6pt plus 2pt minus 1pt}
5\setlength{\parskip}{6pt plus 2pt minus 1pt}
6−% This is needed for code blocks in footnotes:
7−\usepackage{fancyvrb}
8−\VerbatimFootnotes
9\newcommand{\textsubscript}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}}
6\newcommand{\textsubscript}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}}
10\usepackage[breaklinks=true]{hyperref}
7\usepackage[breaklinks=true]{hyperref}
11\usepackage[normalem]{ulem}
8\usepackage[normalem]{ulem}
9+\usepackage{fancyvrb}
12\usepackage{graphicx}
10\usepackage{graphicx}
13\setcounter{secnumdepth}{0}
11\setcounter{secnumdepth}{0}
12+\VerbatimFootnotes % allows verbatim text in footnotes
14\title{Pandoc Test Suite}
13\title{Pandoc Test Suite}
15\author{John MacFarlane\\Anonymous}
14\author{John MacFarlane\\Anonymous}
16\date{July 17, 2006}
15\date{July 17, 2006}