From f1a43465b3d649afe807e92d21a8212da6776fd2 Mon Sep 17 00:00:00 2001 From: Everett Hildenbrandt Date: Fri, 27 Apr 2018 09:04:32 -0600 Subject: [PATCH] hakyll-std/TableOfContents: better variable names --- site/hakyll-std/TableOfContents.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/hakyll-std/TableOfContents.hs b/site/hakyll-std/TableOfContents.hs index 730222172..38d9e2044 100644 --- a/site/hakyll-std/TableOfContents.hs +++ b/site/hakyll-std/TableOfContents.hs @@ -36,8 +36,8 @@ headerLevel (Header level _ _) = level headerLevel _ = error "not a header" ignoreTOC :: Block -> Block -ignoreTOC (Header level (ident, classes, params) inline) = - Header level (ident, "notoc" : classes, params) inline +ignoreTOC (Header level (ident, classes, params) inlines) = + Header level (ident, "notoc" : classes, params) inlines ignoreTOC x = x collectHeaders :: Block -> [Block] @@ -51,14 +51,14 @@ groupByHierarchy :: [Block] -> Forest Block groupByHierarchy = map (\(x:xs) -> Node x (groupByHierarchy xs)) . groupBy ((<) `on` headerLevel) markupHeader :: Tree Block -> H.Html -markupHeader n@(Node (Header _ (ident, _, keyvals) inline) headers) +markupHeader n@(Node (Header _ (ident, _, keyvals) inlines) headers) | headers == [] = H.li $ link | otherwise = H.li $ link <> (H.ol $ markupHeaders headers) where render x = case runPure $ writeHtml5String def (Pandoc nullMeta [(Plain x)]) of Left _ -> error $ "Error building header.\n" ++ " saw: " ++ show n Right txt -> txt - section = fromMaybe (unpack $ render inline) (lookup "toc" keyvals) + section = fromMaybe (unpack $ render inlines) (lookup "toc" keyvals) link = H.a ! A.href (H.toValue $ "#" ++ ident) $ preEscapedToHtml section markupHeader n = error $ "'markupHeader' should only be passed a 'Node $ Header'\n" ++ " saw: " ++ show n