From 91fab7dd48a26d89257762f2cdd48c874e2345f4 Mon Sep 17 00:00:00 2001 From: Everett Hildenbrandt Date: Fri, 27 Apr 2018 10:46:11 -0600 Subject: [PATCH] hakyll-std/TableOfContents: build ordered list in `markupHeaders` directly --- site/hakyll-std/TableOfContents.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/hakyll-std/TableOfContents.hs b/site/hakyll-std/TableOfContents.hs index b6516868d..e4d14db6b 100644 --- a/site/hakyll-std/TableOfContents.hs +++ b/site/hakyll-std/TableOfContents.hs @@ -61,20 +61,20 @@ markupLink (headerId, _, headerProperties) headerText markupHeader :: Tree Block -> H.Html markupHeader n@(Node (Header _ hAttr hText) headers) | headers == [] = H.li $ link - | otherwise = H.li $ link <> (H.ol $ markupHeaders headers) + | otherwise = H.li $ link <> markupHeaders headers where link = fromRight mempty . runPure . writeHtml5 def $ Pandoc nullMeta [Plain [markupLink hAttr hText]] markupHeader n = error $ "'markupHeader' should only be passed a 'Node $ Header'\n" ++ " saw: " ++ show n markupHeaders :: Forest Block -> H.Html -markupHeaders = mconcat . map markupHeader +markupHeaders = H.ol . mconcat . map markupHeader createTable :: TOCAlignment -> Forest Block -> Block createTable _ [] = Null createTable alignment headers = render $ (H.nav ! (A.id "toc" <> alignmentAttr)) $ do H.p "Contents" - H.ol $ markupHeaders headers + markupHeaders headers where render = (RawBlock "html") . renderHtml alignmentAttr = case alignment of TOCRight -> A.class_ "right-toc"