diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Writers/LaTeX.hs | 32 | ||||
| -rw-r--r-- | src/headers/LaTeXHeader | 1 | ||||
| -rw-r--r-- | src/wrappers/markdown2pdf.in | 6 |
3 files changed, 19 insertions, 20 deletions
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index cc2da8338..c9c923dae 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -34,6 +34,7 @@ import Text.Pandoc.Definition import Text.Pandoc.Shared import Text.Printf ( printf ) import Data.List ( (\\), isInfixOf ) +import Data.Char ( isAlphaNum ) import qualified Data.Set as S import Control.Monad.State @@ -81,15 +82,12 @@ latexHeader options (Meta title authors date) = do then "" else "\\date{" ++ stringToLaTeX date ++ "}\n" let maketitle = if null title then "" else "\\maketitle\n" - let verbatim = if "\\usepackage{fancyvrb}" `isInfixOf` extras - then "\\VerbatimFootnotes % allows verbatim text in footnotes\n" - else "" let secnumline = if (writerNumberSections options) then "" else "\\setcounter{secnumdepth}{0}\n" let baseHeader = writerHeader options let header = baseHeader ++ extras - return $ header ++ secnumline ++ verbatim ++ titletext ++ authorstext ++ + return $ header ++ secnumline ++ titletext ++ authorstext ++ datetext ++ "\\begin{document}\n" ++ maketitle ++ "\n" -- escape things as needed for LaTeX @@ -106,11 +104,11 @@ stringToLaTeX = escapeStringUsing latexEscapes ] -- | Remove all code elements from list of inline elements --- (because it's illegal to have a \\verb inside a command argument) +-- (because it's illegal to have verbatim inside some command arguments) deVerb :: [Inline] -> [Inline] deVerb [] = [] deVerb ((Code str):rest) = - (Str $ stringToLaTeX str):(deVerb rest) + (TeX $ "\\texttt{" ++ stringToLaTeX str ++ "}"):(deVerb rest) deVerb (other:rest) = other:(deVerb rest) -- | Convert Pandoc block element to LaTeX. @@ -155,7 +153,7 @@ blockToLaTeX (Table caption aligns widths heads rows) = do AlignCenter -> "\\centering" AlignDefault -> "\\raggedright") ++ "\\hspace{0pt}}p{" ++ width ++ - "\\textwidth}") + "\\columnwidth}") colWidths aligns let tableBody = "\\begin{tabular}{" ++ colDescriptors ++ "}\n" ++ headers ++ "\\hline\n" ++ concat rows' ++ "\\end{tabular}\n" @@ -177,7 +175,7 @@ tableRowToLaTeX cols = listItemToLaTeX lst = blockListToLaTeX lst >>= (return . ("\\item "++)) defListItemToLaTeX (term, def) = do - term' <- inlineListToLaTeX (deVerb term) + term' <- inlineListToLaTeX term def' <- blockListToLaTeX def return $ "\\item[" ++ term' ++ "] " ++ def' @@ -196,27 +194,28 @@ isQuoted _ = False inlineToLaTeX :: Inline -- ^ Inline to convert -> State WriterState String inlineToLaTeX (Emph lst) = do - contents <- inlineListToLaTeX (deVerb lst) + contents <- inlineListToLaTeX lst return $ "\\emph{" ++ contents ++ "}" inlineToLaTeX (Strong lst) = do - contents <- inlineListToLaTeX (deVerb lst) + contents <- inlineListToLaTeX lst return $ "\\textbf{" ++ contents ++ "}" inlineToLaTeX (Strikeout lst) = do - contents <- inlineListToLaTeX (deVerb lst) + contents <- inlineListToLaTeX lst addToHeader "\\usepackage[normalem]{ulem}" return $ "\\sout{" ++ contents ++ "}" inlineToLaTeX (Superscript lst) = do - contents <- inlineListToLaTeX (deVerb lst) + contents <- inlineListToLaTeX lst return $ "\\textsuperscript{" ++ contents ++ "}" inlineToLaTeX (Subscript lst) = do - contents <- inlineListToLaTeX (deVerb lst) + contents <- inlineListToLaTeX lst -- oddly, latex includes \textsuperscript but not \textsubscript -- so we have to define it: addToHeader "\\newcommand{\\textsubscript}[1]{\\ensuremath{_{\\scriptsize\\textrm{#1}}}}" return $ "\\textsubscript{" ++ contents ++ "}" -inlineToLaTeX (Code str) = return $ "\\verb" ++ [chr] ++ stuffing ++ [chr] - where stuffing = str - chr = (('`':(enumFromTo '!' '~')) \\ stuffing) !! 0 +inlineToLaTeX (Code str) = return $ "\\Q{" ++ stuffing ++ "}" + where stuffing = concatMap (\c -> if isAlphaNum c + then [c] + else ['\\',c]) str inlineToLaTeX (Quoted SingleQuote lst) = do contents <- inlineListToLaTeX lst let s1 = if (not (null lst)) && (isQuoted (head lst)) then "\\," else "" @@ -244,7 +243,6 @@ inlineToLaTeX (Image alternate (source, tit)) = do addToHeader "\\usepackage{graphicx}" return $ "\\includegraphics{" ++ source ++ "}" inlineToLaTeX (Note contents) = do - addToHeader "\\usepackage{fancyvrb}" contents' <- blockListToLaTeX contents return $ "\\footnote{" ++ stripTrailingNewlines contents' ++ "}" diff --git a/src/headers/LaTeXHeader b/src/headers/LaTeXHeader index 095848adf..125ab258e 100644 --- a/src/headers/LaTeXHeader +++ b/src/headers/LaTeXHeader @@ -1,5 +1,6 @@ \documentclass{article} \usepackage{ucs} \usepackage[utf8x]{inputenc} +\usepackage[Q=yes,verbatimenv=yes,pverb-linebreak=no]{examplep} \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} diff --git a/src/wrappers/markdown2pdf.in b/src/wrappers/markdown2pdf.in index c9a01fa16..7347fd7d7 100644 --- a/src/wrappers/markdown2pdf.in +++ b/src/wrappers/markdown2pdf.in @@ -40,9 +40,9 @@ fi err "${THIS}: Please install the 'unicode' package from CTAN:" err " http://www.ctan.org/tex-archive/macros/latex/contrib/unicode/" fi - if grep -q "File \`fancyvrb.sty' not found" $texname.log; then - err "${THIS}: Please install the 'fancyvrb' package from CTAN:" - err " http://www.ctan.org/tex-archive/macros/latex/contrib/fancyvrb/" + if grep -q "File \`examplep.sty' not found" $texname.log; then + err "${THIS}: Please install the 'examplep' package from CTAN:" + err " http://www.ctan.org/tex-archive/macros/latex/contrib/examplep/" fi if grep -q "File \`ulem.sty' not found" $texname.log; then err "${THIS}: Please install the 'ulem' package from CTAN:" |