From d320c2eac5d44392597f1d769568c7fae426e4b4 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Wed, 27 Jun 2012 14:46:46 -0700
Subject: MediaWiki writer: Avoid extra blank lines after sublists.

Thanks to Gavin Beatty.
---
 src/Text/Pandoc/Writers/MediaWiki.hs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/Text/Pandoc/Writers/MediaWiki.hs')

diff --git a/src/Text/Pandoc/Writers/MediaWiki.hs b/src/Text/Pandoc/Writers/MediaWiki.hs
index f31a2c2d1..b32c5327d 100644
--- a/src/Text/Pandoc/Writers/MediaWiki.hs
+++ b/src/Text/Pandoc/Writers/MediaWiki.hs
@@ -149,6 +149,7 @@ blockToMediaWiki opts (Table capt aligns widths headers rows') = do
 
 blockToMediaWiki opts x@(BulletList items) = do
   oldUseTags <- get >>= return . stUseTags
+  listLevel <- get >>= return . stListLevel
   let useTags = oldUseTags || not (isSimpleList x)
   if useTags
      then do
@@ -160,10 +161,11 @@ blockToMediaWiki opts x@(BulletList items) = do
         modify $ \s -> s { stListLevel = stListLevel s ++ "*" }
         contents <- mapM (listItemToMediaWiki opts) items
         modify $ \s -> s { stListLevel = init (stListLevel s) }
-        return $ vcat contents ++ "\n"
+        return $ vcat contents ++ if null listLevel then "\n" else ""
 
 blockToMediaWiki opts x@(OrderedList attribs items) = do
   oldUseTags <- get >>= return . stUseTags
+  listLevel <- get >>= return . stListLevel
   let useTags = oldUseTags || not (isSimpleList x)
   if useTags
      then do
@@ -175,10 +177,11 @@ blockToMediaWiki opts x@(OrderedList attribs items) = do
         modify $ \s -> s { stListLevel = stListLevel s ++ "#" }
         contents <- mapM (listItemToMediaWiki opts) items
         modify $ \s -> s { stListLevel = init (stListLevel s) }
-        return $ vcat contents ++ "\n"
+        return $ vcat contents ++ if null listLevel then "\n" else ""
 
 blockToMediaWiki opts x@(DefinitionList items) = do
   oldUseTags <- get >>= return . stUseTags
+  listLevel <- get >>= return . stListLevel
   let useTags = oldUseTags || not (isSimpleList x)
   if useTags
      then do
@@ -190,7 +193,7 @@ blockToMediaWiki opts x@(DefinitionList items) = do
         modify $ \s -> s { stListLevel = stListLevel s ++ ";" }
         contents <- mapM (definitionListItemToMediaWiki opts) items
         modify $ \s -> s { stListLevel = init (stListLevel s) }
-        return $ vcat contents ++ "\n"
+        return $ vcat contents ++ if null listLevel then "\n" else ""
 
 -- Auxiliary functions for lists:
 
-- 
cgit v1.2.3