Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1357 from jkr/bottomUpStrNormalize

Browse source 
Make strNormalize go bottomUp.
This commit is contained in:
John MacFarlane 2014-06-20 10:00:08 -07:00
commit 1a2a0a3a85
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Text/Pandoc/Readers/Docx.hs
View file

@ -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]