Merge pull request #1524 from jkr/dropCap3

Docx reader: move dropcap combining logic to Reducible

2 files changed, 11 insertions, 3 deletions

diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs
index 10dc45581..9943ebeb8 100644
--- a/src/Text/Pandoc/Readers/Docx.hs
+++ b/src/Text/Pandoc/Readers/Docx.hs
@@ -462,9 +462,7 @@ bodyPartToBlocks (Paragraph pPr parparts)
 bodyPartToBlocks (Paragraph pPr parparts) = do
   ils <- parPartsToInlines parparts >>= (return . normalizeSpaces)
   dropIls <- gets docxDropCap
-  let ils' = case ils of
-        (x:xs) -> reduceList (dropIls ++ [x]) ++ xs
-        []     -> dropIls
+  let ils' = concatR dropIls ils
   if dropCap pPr
     then do modify $ \s -> s { docxDropCap = ils' }
             return []
diff --git a/src/Text/Pandoc/Readers/Docx/Reducible.hs b/src/Text/Pandoc/Readers/Docx/Reducible.hs
index a852e25bf..39a93d988 100644
--- a/src/Text/Pandoc/Readers/Docx/Reducible.hs
+++ b/src/Text/Pandoc/Readers/Docx/Reducible.hs
@@ -39,6 +39,7 @@ module Text.Pandoc.Readers.Docx.Reducible ((<++>),
                                            innards,
                                            reduceList,
                                            reduceListB,
+                                           concatR,
                                            rebuild)
        where
 
@@ -78,6 +79,15 @@ reduceList' as (x:xs) = reduceList' (init as ++ (last as <++> x) ) xs
 reduceList :: (Reducible a) => [a] -> [a]
 reduceList = reduceList' []
 
+concatR :: (Reducible a) => [a] -> [a] -> [a]
+concatR [] [] = []
+concatR [] ss = ss
+concatR rs [] = rs
+concatR rs ss = let (x:xs) = reverse rs
+                    (y:ys) = ss
+                in
+                 reverse xs ++ ( x <++> y ) ++ ys
+
 combineReducibles :: (Reducible a, Eq a) => a -> a -> [a]
 combineReducibles r s =
   let (conts, rs) = topLevelContainers r