From f6ae644831aa40f7199ecfc9a1631880639b6312 Mon Sep 17 00:00:00 2001 From: Jesse Rosenthal Date: Fri, 20 Jun 2014 12:31:36 -0400 Subject: Make strNormalize go bottomUp. This was how it used to be before it was folded into blockNormalize. --- src/Text/Pandoc/Readers/Docx.hs | 10 +++++----- 1 file 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] -- cgit v1.2.3