@@ -83,7 +83,7 @@ import Data.Default (Default)
8383import Data.List (delete, intersect)
8484import qualified Data.Map as M
8585import Data.Sequence (ViewL (..), viewl)
86−import qualified Data.Sequence as Seq (null)
86+import qualified Data.Sequence as Seq
8787import qualified Data.Set as Set
8888import Text.Pandoc.Builder
8989-- import Text.Pandoc.Definition
@@ -476,12 +476,13 @@ rowToBlocksList (Row cells) = do
476476 blksList <- mapM cellToBlocks cells
477477 return $ map singleParaToPlain blksList
478478
479−trimLineBreaks :: [Inline] -> [Inline]
480−trimLineBreaks [] = []
481−trimLineBreaks (LineBreak : ils) = trimLineBreaks ils
482−trimLineBreaks ils
483− | (LineBreak : ils') <- reverse ils = trimLineBreaks (reverse ils')
484−trimLineBreaks ils = ils
479+-- like trimInlines, but also take out linebreaks
480+trimSps :: Inlines -> Inlines
481+trimSps (Many ils) = Many $ Seq.dropWhileL isSp $ Seq.dropWhileR isSp $ ils
482+ where isSp Space = True
483+ isSp SoftBreak = True
484+ isSp LineBreak = True
485+ isSp _ = False
485486
486487parStyleToTransform :: ParagraphStyle -> (Blocks -> Blocks)
487488parStyleToTransform pPr
@@ -534,8 +535,7 @@ bodyPartToBlocks (Paragraph pPr parparts)
534535 makeHeaderAnchor $
535536 headerWith ("", delete style (pStyle pPr), []) n ils
536537 | otherwise = do
537− ils <- smushInlines <$> mapM parPartToInlines parparts >>=
538− (return . fromList . trimLineBreaks . normalizeSpaces . toList)
538+ ils <- (trimSps . smushInlines) <$> mapM parPartToInlines parparts
539539 dropIls <- gets docxDropCap
540540 let ils' = dropIls <> ils
541541 if dropCap pPr