git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #1357 from jkr/bottomUpStrNormalize
1a2a0a3John MacFarlane
src/Text/Pandoc/Readers/Docx.hs+5−5
compare with master
unifiedsplit
@@ -159,14 +159,14 @@ stripSpaces ils =
159 reverse $ dropWhile (Space ==) $ reverse $ dropWhile (Space ==) ils
159 reverse $ dropWhile (Space ==) $ reverse $ dropWhile (Space ==) ils
160
160
161blockNormalize :: Block -> Block
161blockNormalize :: Block -> Block
162−blockNormalize (Plain ils) = Plain $ strNormalize $ stripSpaces ils
162+blockNormalize (Plain ils) = Plain $ bottomUp strNormalize $ stripSpaces ils
163−blockNormalize (Para ils) = Para $ strNormalize $ stripSpaces ils
163+blockNormalize (Para ils) = Para $ bottomUp strNormalize $ stripSpaces ils
164blockNormalize (Header n attr ils) =
164blockNormalize (Header n attr ils) =
165− Header n attr $ strNormalize $ stripSpaces ils
165+ Header n attr $ bottomUp strNormalize $ stripSpaces ils
166blockNormalize (Table ils align width hdr cells) =
166blockNormalize (Table ils align width hdr cells) =
167− Table (strNormalize $ stripSpaces ils) align width hdr cells
167+ Table (bottomUp strNormalize $ stripSpaces ils) align width hdr cells
168blockNormalize (DefinitionList pairs) =
168blockNormalize (DefinitionList pairs) =
169− DefinitionList $ map (\(ils, blklsts) -> (strNormalize (stripSpaces ils), blklsts)) pairs
169+ DefinitionList $ map (\(ils, blklsts) -> (bottomUp strNormalize (stripSpaces ils), blklsts)) pairs
170blockNormalize blk = blk
170blockNormalize blk = blk
171
171
172runToInlines :: ReaderOptions -> Docx -> Run -> [Inline]
172runToInlines :: ReaderOptions -> Docx -> Run -> [Inline]