git.iko.soy/typeable/pandoc
on master help sign in
Merge branch 'jlduran-latex-tightlist'
aaf5e67John MacFarlane
data/templates+1−1
compare with master
unifiedsplit

Submodule changed.

src/Text/Pandoc/Writers/LaTeX.hs+3−3
@@ -416,7 +416,7 @@ blockToLaTeX (BulletList lst) = do
416 let inc = if incremental then "[<+->]" else ""
416 let inc = if incremental then "[<+->]" else ""
417 items <- mapM listItemToLaTeX lst
417 items <- mapM listItemToLaTeX lst
418 let spacing = if isTightList lst
418 let spacing = if isTightList lst
419− then text "\\itemsep1pt\\parskip0pt\\parsep0pt"
419+ then text "\\tightlist"
420 else empty
420 else empty
421 return $ text ("\\begin{itemize}" ++ inc) $$ spacing $$ vcat items $$
421 return $ text ("\\begin{itemize}" ++ inc) $$ spacing $$ vcat items $$
422 "\\end{itemize}"
422 "\\end{itemize}"
@@ -451,7 +451,7 @@ blockToLaTeX (OrderedList (start, numstyle, numdelim) lst) = do
451 else "\\setcounter" <> braces enum <>
451 else "\\setcounter" <> braces enum <>
452 braces (text $ show $ start - 1)
452 braces (text $ show $ start - 1)
453 let spacing = if isTightList lst
453 let spacing = if isTightList lst
454− then text "\\itemsep1pt\\parskip0pt\\parsep0pt"
454+ then text "\\tightlist"
455 else empty
455 else empty
456 return $ text ("\\begin{enumerate}" ++ inc)
456 return $ text ("\\begin{enumerate}" ++ inc)
457 $$ stylecommand
457 $$ stylecommand
@@ -465,7 +465,7 @@ blockToLaTeX (DefinitionList lst) = do
465 let inc = if incremental then "[<+->]" else ""
465 let inc = if incremental then "[<+->]" else ""
466 items <- mapM defListItemToLaTeX lst
466 items <- mapM defListItemToLaTeX lst
467 let spacing = if all isTightList (map snd lst)
467 let spacing = if all isTightList (map snd lst)
468− then text "\\itemsep1pt\\parskip0pt\\parsep0pt"
468+ then text "\\tightlist"
469 else empty
469 else empty
470 return $ text ("\\begin{description}" ++ inc) $$ spacing $$ vcat items $$
470 return $ text ("\\begin{description}" ++ inc) $$ spacing $$ vcat items $$
471 "\\end{description}"
471 "\\end{description}"
tests/Tests/Writers/LaTeX.hs+1−1
@@ -42,7 +42,7 @@ tests = [ testGroup "code blocks"
42 , testGroup "definition lists"
42 , testGroup "definition lists"
43 [ "with internal link" =: definitionList [(link "#go" "" (str "testing"),
43 [ "with internal link" =: definitionList [(link "#go" "" (str "testing"),
44 [plain (text "hi there")])] =?>
44 [plain (text "hi there")])] =?>
45− "\\begin{description}\n\\itemsep1pt\\parskip0pt\\parsep0pt\n\\item[{\\hyperref[go]{testing}}]\nhi there\n\\end{description}"
45+ "\\begin{description}\n\\tightlist\n\\item[{\\hyperref[go]{testing}}]\nhi there\n\\end{description}"
46 ]
46 ]
47 , testGroup "math"
47 , testGroup "math"
48 [ "escape |" =: para (math "\\sigma|_{\\{x\\}}") =?>
48 [ "escape |" =: para (math "\\sigma|_{\\{x\\}}") =?>
tests/lhs-test.latex+2
@@ -64,6 +64,8 @@
64\setlength{\parindent}{0pt}
64\setlength{\parindent}{0pt}
65\setlength{\parskip}{6pt plus 2pt minus 1pt}
65\setlength{\parskip}{6pt plus 2pt minus 1pt}
66\setlength{\emergencystretch}{3em} % prevent overfull lines
66\setlength{\emergencystretch}{3em} % prevent overfull lines
67+\newcommand{\tightlist}{%
68+ \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
67\setcounter{secnumdepth}{0}
69\setcounter{secnumdepth}{0}
68
70
69\date{}
71\date{}
tests/lhs-test.latex+lhs+2
@@ -45,6 +45,8 @@
45\setlength{\parindent}{0pt}
45\setlength{\parindent}{0pt}
46\setlength{\parskip}{6pt plus 2pt minus 1pt}
46\setlength{\parskip}{6pt plus 2pt minus 1pt}
47\setlength{\emergencystretch}{3em} % prevent overfull lines
47\setlength{\emergencystretch}{3em} % prevent overfull lines
48+\newcommand{\tightlist}{%
49+ \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
48\setcounter{secnumdepth}{0}
50\setcounter{secnumdepth}{0}
49
51
50\date{}
52\date{}
tests/writer.latex+31−29
@@ -57,6 +57,8 @@
57\setlength{\parindent}{0pt}
57\setlength{\parindent}{0pt}
58\setlength{\parskip}{6pt plus 2pt minus 1pt}
58\setlength{\parskip}{6pt plus 2pt minus 1pt}
59\setlength{\emergencystretch}{3em} % prevent overfull lines
59\setlength{\emergencystretch}{3em} % prevent overfull lines
60+\newcommand{\tightlist}{%
61+ \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
60\setcounter{secnumdepth}{0}
62\setcounter{secnumdepth}{0}
61\VerbatimFootnotes % allows verbatim text in footnotes
63\VerbatimFootnotes % allows verbatim text in footnotes
62
64
@@ -141,7 +143,7 @@ A list:
141
143
142\begin{enumerate}
144\begin{enumerate}
143\def\labelenumi{\arabic{enumi}.}
145\def\labelenumi{\arabic{enumi}.}
144−\itemsep1pt\parskip0pt\parsep0pt
146+\tightlist
145\item
147\item
146 item one
148 item one
147\item
149\item
@@ -196,7 +198,7 @@ These should not be escaped: \$ \\ \> \[ \{
196Asterisks tight:
198Asterisks tight:
197
199
198\begin{itemize}
200\begin{itemize}
199−\itemsep1pt\parskip0pt\parsep0pt
201+\tightlist
200\item
202\item
201 asterisk 1
203 asterisk 1
202\item
204\item
@@ -219,7 +221,7 @@ Asterisks loose:
219Pluses tight:
221Pluses tight:
220
222
221\begin{itemize}
223\begin{itemize}
222−\itemsep1pt\parskip0pt\parsep0pt
224+\tightlist
223\item
225\item
224 Plus 1
226 Plus 1
225\item
227\item
@@ -242,7 +244,7 @@ Pluses loose:
242Minuses tight:
244Minuses tight:
243
245
244\begin{itemize}
246\begin{itemize}
245−\itemsep1pt\parskip0pt\parsep0pt
247+\tightlist
246\item
248\item
247 Minus 1
249 Minus 1
248\item
250\item
@@ -268,7 +270,7 @@ Tight:
268
270
269\begin{enumerate}
271\begin{enumerate}
270\def\labelenumi{\arabic{enumi}.}
272\def\labelenumi{\arabic{enumi}.}
271−\itemsep1pt\parskip0pt\parsep0pt
273+\tightlist
272\item
274\item
273 First
275 First
274\item
276\item
@@ -281,7 +283,7 @@ and:
281
283
282\begin{enumerate}
284\begin{enumerate}
283\def\labelenumi{\arabic{enumi}.}
285\def\labelenumi{\arabic{enumi}.}
284−\itemsep1pt\parskip0pt\parsep0pt
286+\tightlist
285\item
287\item
286 One
288 One
287\item
289\item
@@ -331,17 +333,17 @@ Multiple paragraphs:
331\subsection{Nested}\label{nested}
333\subsection{Nested}\label{nested}
332
334
333\begin{itemize}
335\begin{itemize}
334−\itemsep1pt\parskip0pt\parsep0pt
336+\tightlist
335\item
337\item
336 Tab
338 Tab
337
339
338 \begin{itemize}
340 \begin{itemize}
339− \itemsep1pt\parskip0pt\parsep0pt
341+ \tightlist
340 \item
342 \item
341 Tab
343 Tab
342
344
343 \begin{itemize}
345 \begin{itemize}
344− \itemsep1pt\parskip0pt\parsep0pt
346+ \tightlist
345 \item
347 \item
346 Tab
348 Tab
347 \end{itemize}
349 \end{itemize}
@@ -352,14 +354,14 @@ Here's another:
352
354
353\begin{enumerate}
355\begin{enumerate}
354\def\labelenumi{\arabic{enumi}.}
356\def\labelenumi{\arabic{enumi}.}
355−\itemsep1pt\parskip0pt\parsep0pt
357+\tightlist
356\item
358\item
357 First
359 First
358\item
360\item
359 Second:
361 Second:
360
362
361 \begin{itemize}
363 \begin{itemize}
362− \itemsep1pt\parskip0pt\parsep0pt
364+ \tightlist
363 \item
365 \item
364 Fee
366 Fee
365 \item
367 \item
@@ -381,7 +383,7 @@ Same thing but with paragraphs:
381 Second:
383 Second:
382
384
383 \begin{itemize}
385 \begin{itemize}
384− \itemsep1pt\parskip0pt\parsep0pt
386+ \tightlist
385 \item
387 \item
386 Fee
388 Fee
387 \item
389 \item
@@ -424,7 +426,7 @@ Same thing but with paragraphs:
424 \begin{enumerate}
426 \begin{enumerate}
425 \def\labelenumii{\roman{enumii}.}
427 \def\labelenumii{\roman{enumii}.}
426 \setcounter{enumii}{3}
428 \setcounter{enumii}{3}
427− \itemsep1pt\parskip0pt\parsep0pt
429+ \tightlist
428 \item
430 \item
429 sublist with roman numerals, starting with 4
431 sublist with roman numerals, starting with 4
430 \item
432 \item
@@ -432,7 +434,7 @@ Same thing but with paragraphs:
432
434
433 \begin{enumerate}
435 \begin{enumerate}
434 \def\labelenumiii{(\Alph{enumiii})}
436 \def\labelenumiii{(\Alph{enumiii})}
435− \itemsep1pt\parskip0pt\parsep0pt
437+ \tightlist
436 \item
438 \item
437 a subsublist
439 a subsublist
438 \item
440 \item
@@ -445,27 +447,27 @@ Nesting:
445
447
446\begin{enumerate}
448\begin{enumerate}
447\def\labelenumi{\Alph{enumi}.}
449\def\labelenumi{\Alph{enumi}.}
448−\itemsep1pt\parskip0pt\parsep0pt
450+\tightlist
449\item
451\item
450 Upper Alpha
452 Upper Alpha
451
453
452 \begin{enumerate}
454 \begin{enumerate}
453 \def\labelenumii{\Roman{enumii}.}
455 \def\labelenumii{\Roman{enumii}.}
454− \itemsep1pt\parskip0pt\parsep0pt
456+ \tightlist
455 \item
457 \item
456 Upper Roman.
458 Upper Roman.
457
459
458 \begin{enumerate}
460 \begin{enumerate}
459 \def\labelenumiii{(\arabic{enumiii})}
461 \def\labelenumiii{(\arabic{enumiii})}
460 \setcounter{enumiii}{5}
462 \setcounter{enumiii}{5}
461− \itemsep1pt\parskip0pt\parsep0pt
463+ \tightlist
462 \item
464 \item
463 Decimal start with 6
465 Decimal start with 6
464
466
465 \begin{enumerate}
467 \begin{enumerate}
466 \def\labelenumiv{\alph{enumiv})}
468 \def\labelenumiv{\alph{enumiv})}
467 \setcounter{enumiv}{2}
469 \setcounter{enumiv}{2}
468− \itemsep1pt\parskip0pt\parsep0pt
470+ \tightlist
469 \item
471 \item
470 Lower alpha with paren
472 Lower alpha with paren
471 \end{enumerate}
473 \end{enumerate}
@@ -476,14 +478,14 @@ Nesting:
476Autonumbering:
478Autonumbering:
477
479
478\begin{enumerate}
480\begin{enumerate}
479−\itemsep1pt\parskip0pt\parsep0pt
481+\tightlist
480\item
482\item
481 Autonumber.
483 Autonumber.
482\item
484\item
483 More.
485 More.
484
486
485 \begin{enumerate}
487 \begin{enumerate}
486− \itemsep1pt\parskip0pt\parsep0pt
488+ \tightlist
487 \item
489 \item
488 Nested.
490 Nested.
489 \end{enumerate}
491 \end{enumerate}
@@ -502,7 +504,7 @@ B. Williams
502Tight using spaces:
504Tight using spaces:
503
505
504\begin{description}
506\begin{description}
505−\itemsep1pt\parskip0pt\parsep0pt
507+\tightlist
506\item[apple]
508\item[apple]
507red fruit
509red fruit
508\item[orange]
510\item[orange]
@@ -514,7 +516,7 @@ yellow fruit
514Tight using tabs:
516Tight using tabs:
515
517
516\begin{description}
518\begin{description}
517−\itemsep1pt\parskip0pt\parsep0pt
519+\tightlist
518\item[apple]
520\item[apple]
519red fruit
521red fruit
520\item[orange]
522\item[orange]
@@ -556,7 +558,7 @@ orange block quote
556Multiple definitions, tight:
558Multiple definitions, tight:
557
559
558\begin{description}
560\begin{description}
559−\itemsep1pt\parskip0pt\parsep0pt
561+\tightlist
560\item[apple]
562\item[apple]
561red fruit
563red fruit
562
564
@@ -592,7 +594,7 @@ orange fruit
592
594
593\begin{enumerate}
595\begin{enumerate}
594\def\labelenumi{\arabic{enumi}.}
596\def\labelenumi{\arabic{enumi}.}
595−\itemsep1pt\parskip0pt\parsep0pt
597+\tightlist
596\item
598\item
597 sublist
599 sublist
598\item
600\item
@@ -718,7 +720,7 @@ Ellipses\ldots{}and\ldots{}and\ldots{}.
718\section{LaTeX}\label{latex}
720\section{LaTeX}\label{latex}
719
721
720\begin{itemize}
722\begin{itemize}
721−\itemsep1pt\parskip0pt\parsep0pt
723+\tightlist
722\item
724\item
723 \cite[22-23]{smith.1899}
725 \cite[22-23]{smith.1899}
724\item
726\item
@@ -741,7 +743,7 @@ Ellipses\ldots{}and\ldots{}and\ldots{}.
741These shouldn't be math:
743These shouldn't be math:
742
744
743\begin{itemize}
745\begin{itemize}
744−\itemsep1pt\parskip0pt\parsep0pt
746+\tightlist
745\item
747\item
746 To get the famous equation, write \texttt{\$e\ =\ mc\^{}2\$}.
748 To get the famous equation, write \texttt{\$e\ =\ mc\^{}2\$}.
747\item
749\item
@@ -768,7 +770,7 @@ Cat & 1 \\ \hline
768Here is some unicode:
770Here is some unicode:
769
771
770\begin{itemize}
772\begin{itemize}
771−\itemsep1pt\parskip0pt\parsep0pt
773+\tightlist
772\item
774\item
773 I hat: Î
775 I hat: Î
774\item
776\item
@@ -892,7 +894,7 @@ Here's an \href{/script?foo=1\&bar=2}{inline link in pointy braces}.
892With an ampersand: \url{http://example.com/?foo=1\&bar=2}
894With an ampersand: \url{http://example.com/?foo=1\&bar=2}
893
895
894\begin{itemize}
896\begin{itemize}
895−\itemsep1pt\parskip0pt\parsep0pt
897+\tightlist
896\item
898\item
897 In a list?
899 In a list?
898\item
900\item
@@ -958,7 +960,7 @@ Notes can go in quotes.\footnote{In quote.}
958
960
959\begin{enumerate}
961\begin{enumerate}
960\def\labelenumi{\arabic{enumi}.}
962\def\labelenumi{\arabic{enumi}.}
961−\itemsep1pt\parskip0pt\parsep0pt
963+\tightlist
962\item
964\item
963 And in list items.\footnote{In list.}
965 And in list items.\footnote{In list.}
964\end{enumerate}
966\end{enumerate}