summaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorJesse Rosenthal <jrosenthal@jhu.edu>2014-06-20 12:31:36 -0400
committerJesse Rosenthal <jrosenthal@jhu.edu>2014-06-20 12:31:36 -0400
commitf6ae644831aa40f7199ecfc9a1631880639b6312 (patch)
tree56f5c6f18d8bfafd44832251c3054715ee5a472f /src/Text
parentd587558859d85d1006606b280f3592343096966e (diff)
Make strNormalize go bottomUp.
This was how it used to be before it was folded into blockNormalize.
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Readers/Docx.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs
index 8a8bc46a6..479a88161 100644
--- a/src/Text/Pandoc/Readers/Docx.hs
+++ b/src/Text/Pandoc/Readers/Docx.hs
@@ -159,14 +159,14 @@ stripSpaces ils =
reverse $ dropWhile (Space ==) $ reverse $ dropWhile (Space ==) ils
blockNormalize :: Block -> Block
-blockNormalize (Plain ils) = Plain $ strNormalize $ stripSpaces ils
-blockNormalize (Para ils) = Para $ strNormalize $ stripSpaces ils
+blockNormalize (Plain ils) = Plain $ bottomUp strNormalize $ stripSpaces ils
+blockNormalize (Para ils) = Para $ bottomUp strNormalize $ stripSpaces ils
blockNormalize (Header n attr ils) =
- Header n attr $ strNormalize $ stripSpaces ils
+ Header n attr $ bottomUp strNormalize $ stripSpaces ils
blockNormalize (Table ils align width hdr cells) =
- Table (strNormalize $ stripSpaces ils) align width hdr cells
+ Table (bottomUp strNormalize $ stripSpaces ils) align width hdr cells
blockNormalize (DefinitionList pairs) =
- DefinitionList $ map (\(ils, blklsts) -> (strNormalize (stripSpaces ils), blklsts)) pairs
+ DefinitionList $ map (\(ils, blklsts) -> (bottomUp strNormalize (stripSpaces ils), blklsts)) pairs
blockNormalize blk = blk
runToInlines :: ReaderOptions -> Docx -> Run -> [Inline]