git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #1357 from jkr/bottomUpStrNormalize

Make strNormalize go bottomUp.

commit1a2a0a3a856cc8cba9be2b565787ea08585da7f1 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 20 Jun 2014, 10:00 (12 years ago) parentd587558f6ae644
1 file changed+5−5
compare with master
unifiedsplit
src/Text/Pandoc/Readers/Docx.hs+5−5
src/Text/Pandoc/Readers/Docx.hs+5−5
@@ -159,14 +159,14 @@ stripSpaces ils =
159159 reverse $ dropWhile (Space ==) $ reverse $ dropWhile (Space ==) ils
160160
161161blockNormalize :: Block -> Block
162−blockNormalize (Plain ils) = Plain $ strNormalize $ stripSpaces ils
163−blockNormalize (Para ils) = Para $ strNormalize $ stripSpaces ils
162+blockNormalize (Plain ils) = Plain $ bottomUp strNormalize $ stripSpaces ils
163+blockNormalize (Para ils) = Para $ bottomUp strNormalize $ stripSpaces ils
164164blockNormalize (Header n attr ils) =
165− Header n attr $ strNormalize $ stripSpaces ils
165+ Header n attr $ bottomUp strNormalize $ stripSpaces ils
166166blockNormalize (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
168168blockNormalize (DefinitionList pairs) =
169− DefinitionList $ map (\(ils, blklsts) -> (strNormalize (stripSpaces ils), blklsts)) pairs
169+ DefinitionList $ map (\(ils, blklsts) -> (bottomUp strNormalize (stripSpaces ils), blklsts)) pairs
170170blockNormalize blk = blk
171171
172172runToInlines :: ReaderOptions -> Docx -> Run -> [Inline]