Made spacing at end of output more consistent.

Previously some of the writers added spurious whitespace.
This has been removed, resolving Issue #232.

NOTE: If your application combines pandoc's output with other
text, for example in a template, you may need to add spacing.
For example, a pandoc-generated markdown file will not have
a blank line after the final block element.  If you are inserting
it into another markdown file, you will need to make sure there
is a blank line between it and the next block element.

src/Text/Pandoc/Writers/ConTeXt.hs

@@ -64,7 +64,7 @@ pandocToConTeXt options (Pandoc (Meta title authors date) blocks) = do
                   then return ""
                   else liftM render $ inlineListToConTeXt date
   body <- blockListToConTeXt blocks 
-  let main = render body
+  let main = render $ body $$ text ""
   let context  = writerVariables options ++
                  [ ("toc", if writerTableOfContents options then "yes" else "")
                  , ("body", main)

src/Text/Pandoc/Writers/Man.hs

@@ -63,7 +63,7 @@ pandocToMan opts (Pandoc (Meta title authors date) blocks) = do
   body <- blockListToMan opts blocks
   notes <- liftM stNotes get
   notes' <- notesToMan opts (reverse notes)
-  let main = render $ body $$ notes'
+  let main = render $ body $$ notes' $$ text ""
   hasTables <- liftM stHasTables get
   let context  = writerVariables opts ++
                  [ ("body", main)

src/Text/Pandoc/Writers/Markdown.hs

@@ -96,7 +96,7 @@ pandocToMarkdown opts (Pandoc (Meta title authors date) blocks) = do
   notes' <- notesToMarkdown opts (reverse $ stNotes st)
   st' <- get  -- note that the notes may contain refs
   refs' <- refsToMarkdown opts (reverse $ stRefs st')
-  let main = render $ body $+$ text "" $+$ notes' $+$ text "" $+$ refs'
+  let main = render $ foldl ($+$) empty $ [body, notes', refs']
   let context  = writerVariables opts ++
                  [ ("toc", render toc)
                  , ("body", main)

src/Text/Pandoc/Writers/RST.hs

@@ -70,7 +70,7 @@ pandocToRST (Pandoc (Meta tit auth dat) blocks) = do
   refs <- liftM (reverse . stLinks) get >>= refsToRST
   pics <- liftM (reverse . stImages) get >>= pictRefsToRST
   hasMath <- liftM stHasMath get
-  let main = render $ body $+$ notes $+$ text "" $+$ refs $+$ pics
+  let main = render $ foldl ($+$) empty $ [body, notes, refs, pics]
   let context = writerVariables opts ++
                 [ ("body", main)
                 , ("title", render title)

src/pandoc.hs

@@ -833,5 +833,5 @@ main = do
   writerOutput <- writer writerOptions doc''
 
   if outputFile == "-"
-     then B.putStrLn writerOutput
+     then B.putStr writerOutput
      else B.writeFile outputFile writerOutput

templates/docbook.template

@@ -25,4 +25,3 @@ $for(include-after)$
 $include-after$
 $endfor$
 </article>
-

tests/html-reader.native

@@ -344,4 +344,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA
 , Para [Str "Caret",Space,Str "characters",Space,Str "are",Space,Str "used",Space,Str "to",Space,Str "indicate",Space,Str "that",Space,Str "the",Space,Str "blocks",Space,Str "all",Space,Str "belong",Space,Str "to",Space,Str "a",Space,Str "single",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "block",Space,Str "quotes)."]
 , CodeBlock ("",[],[]) "  { <code> }"
 , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "use",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",Space,Str "of",Space,Str "every",Space,Str "line,",Space,Str "as",Space,Str "with",Space,Str "blockquotes,",Space,Str "but",Space,Str "all",Space,Str "that",Space,Str "you",Space,Str "need",Space,Str "is",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",Space,Str "of",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "the",Space,Str "block",Space,Str "and",Space,Str "any",Space,Str "preceding",Space,Str "blank",Space,Str "lines."] ]
-

tests/latex-reader.native

@@ -375,4 +375,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA
   [ [ Para [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",Note [Para [Str "In",Space,Str "list."]]] ]
  ]
 , Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."] ]
-

tests/lhs-test.fragment.html+lhs

@@ -36,4 +36,4 @@
 ><p
   >foo bar</p
   ></blockquote
->
+>

tests/lhs-test.html

@@ -66,4 +66,3 @@ pre.sourceCode span.er { color: red; font-weight: bold; }
 >
 </body>
 </html>
-

tests/lhs-test.html+lhs

@@ -66,4 +66,3 @@ pre.sourceCode span.er { color: red; font-weight: bold; }
 >
 </body>
 </html>
-

tests/lhs-test.latex

@@ -35,4 +35,3 @@ foo bar
 \end{quote}
 
 \end{document}
-

tests/lhs-test.latex+lhs

@@ -37,4 +37,3 @@ foo bar
 \end{quote}
 
 \end{document}
-

tests/lhs-test.markdown

@@ -16,6 +16,3 @@ and one arrow on the second item of the pair).
 Block quote:
 
 > foo bar
-
-
-

tests/lhs-test.markdown+lhs

@@ -17,6 +17,3 @@ and one arrow on the second item of the pair).
 Block quote:
 
  > foo bar
-
-
-

tests/lhs-test.native

@@ -8,4 +8,3 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
 , BlockQuote
   [ Para [Str "foo",Space,Str "bar"] ]
  ]
-

tests/lhs-test.rst

@@ -22,5 +22,3 @@ Block quote:
 
     foo bar
 
-
-

tests/lhs-test.rst+lhs

@@ -20,5 +20,3 @@ Block quote:
 
     foo bar
 
-
-

tests/markdown-reader-more.native

@@ -40,4 +40,3 @@ Pandoc (Meta {docTitle = [Str "Title",Space,Str "spanning",Space,Str "multiple",
 , OrderedList (3,Example,TwoParens)
   [ [ Plain [Str "Third",Space,Str "example",Str "."] ]
  ] ]
-

tests/rst-reader.native

@@ -309,4 +309,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":
       [ [ Plain [Str "b"] ]
       , [ Plain [Str "b",Space,Str "2"] ]
       , [ Plain [Str "b",Space,Str "2"] ] ] ], [ Plain [Str "c",Space,Str "c",Space,Str "2",Space,Str "c",Space,Str "2"] ] ] ] ]
-

tests/s5.basic.html

@@ -316,4 +316,3 @@
 </div>
 </body>
 </html>
-

tests/s5.fancy.html

@@ -517,4 +517,3 @@
 </div>
 </body>
 </html>
-

tests/s5.fragment.html

@@ -14,4 +14,4 @@
     >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span
     ></li
   ></ul
->
+>

tests/s5.inserts.html

@@ -33,4 +33,3 @@ STUFF INSERTED
 STUFF INSERTED
 </body>
 </html>
-

tests/tables-rstsubset.native

@@ -116,4 +116,3 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
   , [ Plain [Str "row"] ]
   , [ Plain [Str "5.0"] ]
   , [ Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."] ] ] ] ]
-

tests/tables.docbook

@@ -399,4 +399,4 @@
       </td>
     </tr>
   </tbody>
-</informaltable>
+</informaltable>

tests/tables.html

@@ -298,4 +298,4 @@
       ></tr
     ></tbody
   ></table
->
+>

tests/tables.latex

@@ -175,4 +175,3 @@ Second
 \\
 \end{tabular}
 \end{center}
-

tests/tables.markdown

@@ -74,6 +74,3 @@ Multiline table without column headers:
                                       the blank line between
                                       rows.
   ----------- ---------- ------------ --------------------------
-
-
-

tests/tables.mediawiki

@@ -209,4 +209,3 @@ Multiline table without column headers:
 </tr>
 </tbody>
 </table>
-

tests/tables.native

@@ -113,4 +113,3 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
   , [ Plain [Str "row"] ]
   , [ Plain [Str "5",Str ".",Str "0"] ]
   , [ Plain [Str "Here",Str "'",Str "s",Space,Str "another",Space,Str "one",Str ".",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows",Str "."] ] ] ] ]
-

tests/tables.opendocument

@@ -381,4 +381,4 @@
       <text:p text:style-name="Table_20_Contents">Here's another one. Note the blank line between rows.</text:p>
     </table:table-cell>
   </table:table-row>
-</table:table>
+</table:table>

tests/tables.plain

@@ -74,6 +74,3 @@ Multiline table without column headers:
                                       the blank line between
                                       rows.
   ----------- ---------- ------------ --------------------------
-
-
-

tests/tables.rst

@@ -88,5 +88,3 @@ Multiline table without column headers:
 |             |            |              | the blank line between     |
 |             |            |              | rows.                      |
 +-------------+------------+--------------+----------------------------+
-
-

tests/tables.rtf

@@ -357,4 +357,3 @@
 }
 \intbl\row}
 {\pard \ql \f0 \sa180 \li0 \fi0 \par}
-

tests/tables.texinfo

@@ -156,4 +156,3 @@ Second
  @tab 5.0
  @tab Here's another one. Note the blank line between rows.
 @end multitable
-

tests/testsuite.native

@@ -415,4 +415,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA
   [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",Note [Para [Str "In",Space,Str "list",Str "."]]] ]
  ]
 , Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented",Str "."] ]
-

tests/writer.context

@@ -906,4 +906,3 @@ This paragraph should not be part of the note, as it is not
 indented.
 
 \stoptext
-

tests/writer.docbook

@@ -1462,5 +1462,3 @@ or here: <http://example.com/>
   </para>
 </section>
 </article>
-
-

tests/writer.html

@@ -1163,4 +1163,3 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'<code>'+e+'</code>'+'<\/'+
 >
 </body>
 </html>
-

tests/writer.latex

@@ -864,4 +864,3 @@ This paragraph should not be part of the note, as it is not
 indented.
 
 \end{document}
-

tests/writer.man

@@ -798,4 +798,3 @@ In quote.
 In list.
 .SH AUTHORS
 John MacFarlane; Anonymous.
-

tests/writer.markdown

@@ -715,7 +715,6 @@ note] Here is an inline note.[^3]
 This paragraph should not be part of the note, as it is not
 indented.
 
-
 [^1]:
     Here is the footnote. It can go anywhere after the footnote
     reference. It need not be placed at the end of the document.
@@ -741,5 +740,3 @@ indented.
 
 [^5]:
     In list.
-
-

tests/writer.mediawiki

@@ -660,4 +660,3 @@ If you want, you can indent every line, but you can also be lazy and just indent
 This paragraph should not be part of the note, as it is not indented.
 
 <references />
-

tests/writer.native

@@ -415,4 +415,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA
   [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",Note [Para [Str "In",Space,Str "list",Str "."]]] ]
  ]
 , Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented",Str "."] ]
-

tests/writer.opendocument

@@ -1452,4 +1452,3 @@ Cat <text:s text:c="3" />&amp; 1 <text:s text:c="5" />\\ \hline
 </office:text>
 </office:body>
 </office:document-content>
-

tests/writer.plain

@@ -669,7 +669,6 @@ Here is an inline note.[^3]
 This paragraph should not be part of the note, as it is not
 indented.
 
-
 [^1]:
     Here is the footnote. It can go anywhere after the footnote
     reference. It need not be placed at the end of the document.
@@ -694,5 +693,3 @@ indented.
 
 [^5]:
     In list.
-
-

tests/writer.rst

@@ -888,6 +888,4 @@ indented.
 .. [5]
    In list.
 
-
 .. |movie| image:: movie.jpg
-

tests/writer.rtf

@@ -450,4 +450,3 @@ links
 }\sa180\par}
 {\pard \ql \f0 \sa180 \li0 \fi0 This paragraph should not be part of the note, as it is not indented.\par}
 }
-

tests/writer.texinfo

@@ -1014,4 +1014,3 @@ And in list items.@footnote{In list.}
 This paragraph should not be part of the note@comma{} as it is not indented.
 
 @bye
-