1 files changed, 14 insertions, 1 deletions

diff --git a/bbcode/src/BBCode.hs b/bbcode/src/BBCode.hs
index 3071db6..118aed7 100644
--- a/bbcode/src/BBCode.hs
+++ b/bbcode/src/BBCode.hs
@@ -55,7 +55,20 @@ make' (Cooked c) = c
 make' (Raw _) = error "Cannot transform block containing raw data to bbcode"
 
 parse :: String -> Either String (Block String)
-parse input = (remerge . blockify <$> (tokenize input >>= treeify)) >>= semantics
+parse input = (remerge . massage . blockify <$> (tokenize input >>= treeify)) >>= semantics
+
+massage :: [Decorated String] -> [Decorated String]
+massage [] = []
+massage (x@(Decorated _ tags) : x'@(Decorated wSpace []) : xs)
+  | any $ map isSpace wSpace
+  , any $ map isBlock tags = (x:Decorated (massage' wSpace) []:xs)
+  | otherwise = x : massage (x':xs)
+  where
+    massage' [] = []
+    massage' l@(x:xs)
+      | isSpace x = massage' xs
+      | otherwise = l
+massage (x:xs) = x : massage xs
 
 blockify :: ContentForest -> [Decorated String]
 blockify = map sortDeco . concat . map (blockify' [])