git.iko.soy/typeable/pandoc
on master help sign in
Shared: Fixed bug in normalize revealed by tests!
commit387a2b365ea4b3e7181d60a0636d0f593e7f3b19 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 29 Jan 2011, 10:03 (16 years ago) parent0833daf
1 file changed+5−4
src/Text/Pandoc/Shared.hs+5−4
src/Text/Pandoc/Shared.hs+5−4
@@ -257,10 +257,10 @@ normalizeSpaces = cleanup . dropWhile isSpaceOrEmpty
257257-- | Normalize @Pandoc@ document, consolidating doubled 'Space's,
258258-- combining adjacent 'Str's and 'Emph's, remove 'Null's and
259259-- empty elements, etc.
260−normalize :: Data a => a -> a
261−normalize = topDown consolidateInlines .
262− bottomUp removeEmptyInlines .
263− topDown removeEmptyBlocks
260+normalize :: (Eq a, Data a) => a -> a
261+normalize = topDown removeEmptyBlocks .
262+ topDown consolidateInlines .
263+ bottomUp removeEmptyInlines
264264
265265removeEmptyBlocks :: [Block] -> [Block]
266266removeEmptyBlocks (Null : xs) = removeEmptyBlocks xs
@@ -280,6 +280,7 @@ removeEmptyInlines (SmallCaps [] : zs) = removeEmptyInlines zs
280280removeEmptyInlines (Strikeout [] : zs) = removeEmptyInlines zs
281281removeEmptyInlines (RawInline _ [] : zs) = removeEmptyInlines zs
282282removeEmptyInlines (Code _ [] : zs) = removeEmptyInlines zs
283+removeEmptyInlines (Str "" : zs) = removeEmptyInlines zs
283284removeEmptyInlines (x : xs) = x : removeEmptyInlines xs
284285removeEmptyInlines [] = []
285286