diff options
author | John MacFarlane <fiddlosopher@gmail.com> | 2012-04-30 07:46:38 -0700 |
---|---|---|
committer | John MacFarlane <fiddlosopher@gmail.com> | 2012-04-30 07:46:38 -0700 |
commit | 8201257b5c13f90f14aa529fac1b341fd1a900eb (patch) | |
tree | 3efbb91c78758764962ecc5d8da5cf88809f9813 | |
parent | 8d64109c8058ec3a06ee88aa6f2d7fcbe8de4ff5 (diff) | |
download | pandoc-8201257b5c13f90f14aa529fac1b341fd1a900eb.tar.gz |
LaTeX writer: Fixed spacing in quote environments.
Closes #502. Previously you'd get:
~~~
hi
\begin{quote}
hi
\end{quote}
hi
~~~
Now we get:
~~~
hi
\begin{quote}
hi
\end{quote}
hi
~~~
-rw-r--r-- | src/Text/Pandoc/Writers/LaTeX.hs | 3 | ||||
-rw-r--r-- | tests/lhs-test.latex | 1 | ||||
-rw-r--r-- | tests/lhs-test.latex+lhs | 1 | ||||
-rw-r--r-- | tests/writer.latex | 12 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index 923d8361b..b114e4444 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -278,7 +278,8 @@ blockToLaTeX (BlockQuote lst) = do return result _ -> do contents <- blockListToLaTeX lst - return $ "\\begin{quote}" $$ contents $$ "\\end{quote}" + return $ "\\begin{quote}" $$ chomp contents $$ "\\end{quote}" + <> blankline blockToLaTeX (CodeBlock (_,classes,keyvalAttr) str) = do opts <- gets stOptions case () of diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex index aeebe30fd..286bb4b83 100644 --- a/tests/lhs-test.latex +++ b/tests/lhs-test.latex @@ -86,7 +86,6 @@ Block quote: \begin{quote} foo bar - \end{quote} \end{document} diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs index 4f8260ac3..b537e6eea 100644 --- a/tests/lhs-test.latex+lhs +++ b/tests/lhs-test.latex+lhs @@ -66,7 +66,6 @@ Block quote: \begin{quote} foo bar - \end{quote} \end{document} diff --git a/tests/writer.latex b/tests/writer.latex index 761567e02..708d3ed70 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -119,8 +119,8 @@ E-mail style: \begin{quote} This is a block quote. It is pretty short. - \end{quote} + \begin{quote} Code in a block quote: @@ -141,13 +141,13 @@ Nested block quotes: \begin{quote} nested - \end{quote} + \begin{quote} nested - \end{quote} \end{quote} + This should not be a block quote: 2 \textgreater{} 1. And a following paragraph. @@ -476,8 +476,8 @@ orange fruit \end{verbatim} \begin{quote} orange block quote - \end{quote} + \end{description} Multiple definitions, tight: @@ -809,8 +809,8 @@ An e-mail address: \begin{quote} Blockquoted: \url{http://example.com/} - \end{quote} + Auto-links should not occur here: \texttt{\textless{}http://example.com/\textgreater{}} @@ -855,8 +855,8 @@ note.\footnote{This is \emph{easier} to type. Inline notes may contain \begin{quote} Notes can go in quotes.\footnote{In quote.} - \end{quote} + \begin{enumerate}[1.] \item And in list items.\footnote{In list.} |