From e2a5038be681f8610b3cc3621cbf66647de14322 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 28 Jan 2011 20:01:47 -0800 Subject: [PATCH] Fixed extractSection in MakeManPage. --- MakeManPage.hs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/MakeManPage.hs b/MakeManPage.hs index 117c1e9f1..47b284380 100644 --- a/MakeManPage.hs +++ b/MakeManPage.hs @@ -79,17 +79,19 @@ capitalize x = x removeSect :: [Inline] -> [Block] -> [Block] removeSect ils (Header 1 x:xs) | normalize x == normalize ils = - dropWhile notLevelOneHeader xs - where notLevelOneHeader (Header 1 _) = False - notLevelOneHeader _ = True + dropWhile (not . isHeader1) xs removeSect ils (x:xs) = x : removeSect ils xs removeSect _ [] = [] extractSect :: [Inline] -> [Block] -> [Block] -extractSect ils (Header 1 x:xs) | normalize x == normalize ils = - bottomUp promoteHeader xs +extractSect ils (Header 1 z:xs) | normalize z == normalize ils = + bottomUp promoteHeader $ takeWhile (not . isHeader1) xs where promoteHeader (Header n x) = Header (n-1) x promoteHeader x = x extractSect ils (x:xs) = extractSect ils xs extractSect _ [] = [] +isHeader1 :: Block -> Bool +isHeader1 (Header 1 _) = True +isHeader1 _ = False +