Merge pull request #1510 from jkr/spacefix

Docx reader: Fix spacing issue.

1 files changed, 12 insertions, 10 deletions

diff --git a/src/Text/Pandoc/Readers/Docx/Reducible.hs b/src/Text/Pandoc/Readers/Docx/Reducible.hs
index e8e407844..2dbef4131 100644
--- a/src/Text/Pandoc/Readers/Docx/Reducible.hs
+++ b/src/Text/Pandoc/Readers/Docx/Reducible.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings, PatternGuards #-}
 
 {-
 Copyright (C) 2014 Jesse Rosenthal <jrosenthal@jhu.edu>
@@ -87,13 +87,17 @@ combineReducibles r s =
       remaining' = conts' \\ shared
   in
    case null shared of
-       True -> case (not . null) rs && isSpace (last rs) of
-         True -> rebuild conts (init rs) ++ [last rs, s]
-         False -> [r,s]
-       False -> rebuild
-                shared $
-                reduceList $
-                (rebuild remaining rs) ++ (rebuild remaining' ss)
+     True | (x : xs) <- reverse rs
+          , isSpace x ->
+             rebuild conts (reverse xs) ++ [x, s]
+          | (x : xs) <- ss
+          , isSpace x ->
+             [r, x] ++ rebuild conts' (xs)
+     True  -> [r,s]
+     False -> rebuild
+              shared $
+              reduceList $
+              (rebuild remaining rs) ++ (rebuild remaining' ss)
 
 instance Reducible Inline where
   s1@(Span (id1, classes1, kvs1) ils1) <++> s2@(Span (id2, classes2, kvs2) ils2) =
@@ -177,5 +181,3 @@ rebuild :: [Container a] -> [a] -> [a]
 rebuild [] xs = xs
 rebuild ((Container f) : cs) xs = rebuild cs $ [f xs]
 rebuild (NullContainer : cs) xs = rebuild cs $ xs
-
-