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

Shared: Fixed bug in normalize revealed by tests!

Browse source
This commit is contained in:
John MacFarlane 2011-01-29 10:03:31 -08:00
parent 0833daff4a
commit 387a2b365e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Text/Pandoc/Shared.hs
View file

@ -257,10 +257,10 @@ normalizeSpaces = cleanup . dropWhile isSpaceOrEmpty
-- | Normalize @Pandoc@ document, consolidating doubled 'Space's, -- | Normalize @Pandoc@ document, consolidating doubled 'Space's,
-- combining adjacent 'Str's and 'Emph's, remove 'Null's and -- combining adjacent 'Str's and 'Emph's, remove 'Null's and
-- empty elements, etc. -- empty elements, etc.
normalize :: Data a => a -> a normalize :: (Eq a, Data a) => a -> a
normalize = topDown consolidateInlines . normalize = topDown removeEmptyBlocks .
bottomUp removeEmptyInlines . topDown consolidateInlines .
topDown removeEmptyBlocks bottomUp removeEmptyInlines
removeEmptyBlocks :: [Block] -> [Block] removeEmptyBlocks :: [Block] -> [Block]
removeEmptyBlocks (Null : xs) = removeEmptyBlocks xs removeEmptyBlocks (Null : xs) = removeEmptyBlocks xs
@ -280,6 +280,7 @@ removeEmptyInlines (SmallCaps [] : zs) = removeEmptyInlines zs
removeEmptyInlines (Strikeout [] : zs) = removeEmptyInlines zs removeEmptyInlines (Strikeout [] : zs) = removeEmptyInlines zs
removeEmptyInlines (RawInline _ [] : zs) = removeEmptyInlines zs removeEmptyInlines (RawInline _ [] : zs) = removeEmptyInlines zs
removeEmptyInlines (Code _ [] : zs) = removeEmptyInlines zs removeEmptyInlines (Code _ [] : zs) = removeEmptyInlines zs
removeEmptyInlines (Str "" : zs) = removeEmptyInlines zs
removeEmptyInlines (x : xs) = x : removeEmptyInlines xs removeEmptyInlines (x : xs) = x : removeEmptyInlines xs
removeEmptyInlines [] = [] removeEmptyInlines [] = []