git.iko.soy/typeable/pandoc
on master help sign in
Improved normalize.
commit82903cfaf367a68d53f6a6ab2dfad71c5f8a2502 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 25 Dec 2010, 14:02 (16 years ago) parent10d85f8
1 file changed+15
src/Text/Pandoc/Shared.hs+15
src/Text/Pandoc/Shared.hs+15
@@ -263,6 +263,10 @@ normalize = topDown normalizeInlines .
263263
264264normalizeBlocks :: [Block] -> [Block]
265265normalizeBlocks (Null : xs) = normalizeBlocks xs
266+normalizeBlocks (BulletList [] : xs) = normalizeBlocks xs
267+normalizeBlocks (OrderedList _ [] : xs) = normalizeBlocks xs
268+normalizeBlocks (DefinitionList [] : xs) = normalizeBlocks xs
269+normalizeBlocks (RawHtml [] : xs) = normalizeBlocks xs
266270normalizeBlocks (RawHtml x : RawHtml y : zs) = normalizeBlocks $
267271 RawHtml (x++y) : zs
268272normalizeBlocks (x:xs) = x : normalizeBlocks xs
@@ -286,6 +290,15 @@ normalizeInlines (Space : ys) =
286290 where isSpace Space = True
287291 isSpace _ = False
288292 rest = normalizeInlines $ dropWhile isSpace ys
293+normalizeInlines (Emph [] : zs) = normalizeInlines zs
294+normalizeInlines (Strong [] : zs) = normalizeInlines zs
295+normalizeInlines (Subscript [] : zs) = normalizeInlines zs
296+normalizeInlines (Superscript [] : zs) = normalizeInlines zs
297+normalizeInlines (SmallCaps [] : zs) = normalizeInlines zs
298+normalizeInlines (Strikeout [] : zs) = normalizeInlines zs
299+normalizeInlines (TeX [] : zs) = normalizeInlines zs
300+normalizeInlines (HtmlInline [] : zs) = normalizeInlines zs
301+normalizeInlines (Code [] : zs) = normalizeInlines zs
289302normalizeInlines (Emph xs : Emph ys : zs) = normalizeInlines $
290303 Emph (xs ++ ys) : zs
291304normalizeInlines (Strong xs : Strong ys : zs) = normalizeInlines $
@@ -302,6 +315,8 @@ normalizeInlines (TeX x : TeX y : zs) = normalizeInlines $
302315 TeX (x ++ y) : zs
303316normalizeInlines (HtmlInline x : HtmlInline y : zs) = normalizeInlines $
304317 HtmlInline (x ++ y) : zs
318+normalizeInlines (Code x : Code y : zs) = normalizeInlines $
319+ Code (x ++ y) : zs
305320normalizeInlines (x : xs) = x : normalizeInlines xs
306321normalizeInlines [] = []
307322