diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/HTML.hs | 41 | ||||
| -rw-r--r-- | tests/lhs-test.html+lhs | 6 | ||||
| -rw-r--r-- | tests/s5.basic.html | 4 | ||||
| -rw-r--r-- | tests/s5.fancy.html | 4 |
4 files changed, 29 insertions, 26 deletions
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index db2ab201e..427edcde3 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -250,9 +250,10 @@ showSecNum = concat . intersperse "." . map show -- | Converts an Element to a list item for a table of contents, -- retrieving the appropriate identifier from state. elementToListItem :: WriterOptions -> Element -> State WriterState (Maybe Html) -elementToListItem opts (Sec lev num (id',classes,keyvals) headerText subsecs) +elementToListItem opts (Sec lev num (id',classes,_) headerText subsecs) | lev <= writerTOCDepth opts = do - let sectnum = if writerNumberSections opts && not (null num) + let sectnum = if writerNumberSections opts && not (null num) && + "unnumbered" `notElem` classes then (H.span ! A.class_ "toc-section-number" $ toHtml $ showSecNum num) >> preEscapedString " " else mempty @@ -287,22 +288,24 @@ elementToHtml slideLevel opts (Sec level num (id',classes,keyvals) title' elemen -- title slides have no content of their own then filter isSec elements else elements - let header'' = if (writerSectionDivs opts || - writerSlideVariant opts == S5Slides || - slide) - then header' - else header' ! prefixedId opts id' let inNl x = mconcat $ nl opts : intersperse (nl opts) x ++ [nl opts] - let classes = ["titleslide" | titleSlide] ++ ["slide" | slide] ++ - ["level" ++ show level] + let classes' = ["titleslide" | titleSlide] ++ ["slide" | slide] ++ + ["section" | (slide || writerSectionDivs opts) && + not (writerHtml5 opts) ] ++ + ["level" ++ show level | slide || writerSectionDivs opts ] + ++ classes let secttag = if writerHtml5 opts - then H5.section ! A.class_ (toValue $ unwords classes) - else H.div ! A.class_ (toValue $ unwords ("section":classes)) + then H5.section + else H.div + let attr = (id',classes',keyvals) return $ if titleSlide - then mconcat $ (secttag ! prefixedId opts id' $ header'') : innerContents + then mconcat $ + (addAttrs opts attr $ secttag $ header') : innerContents else if writerSectionDivs opts || slide - then secttag ! prefixedId opts id' $ inNl $ header'' : innerContents - else mconcat $ intersperse (nl opts) $ header'' : innerContents + then addAttrs opts attr + $ secttag $ inNl $ header' : innerContents + else mconcat $ intersperse (nl opts) + $ addAttrs opts attr header' : innerContents -- | Convert list of Note blocks to a footnote <div>. -- Assumes notes are sorted. @@ -376,8 +379,8 @@ addAttrs opts attr h = foldl (!) h (attrsToHtml opts attr) attrsToHtml :: WriterOptions -> Attr -> [Attribute] attrsToHtml opts (id',classes',keyvals) = - [A.class_ (toValue $ unwords classes') | not (null classes')] ++ [prefixedId opts id' | not (null id')] ++ + [A.class_ (toValue $ unwords classes') | not (null classes')] ++ map (\(x,y) -> customAttribute (fromString x) (toValue y)) keyvals imageExts :: [String] @@ -423,11 +426,11 @@ blockToHtml opts (CodeBlock (id',classes,keyvals) rawCode) = do then map (\c -> if map toLower c == "haskell" then "literatehaskell" else c) classes - else filter (/= "literate") classes + else classes adjCode = if tolhs then unlines . map ("> " ++) . lines $ rawCode else rawCode - case highlight formatHtmlBlock (id',classes,keyvals) adjCode of + case highlight formatHtmlBlock (id',classes',keyvals) adjCode of Nothing -> return $ addAttrs opts (id',classes,keyvals) $ H.pre $ H.code $ toHtml adjCode Just h -> modify (\st -> st{ stHighlighting = True }) >> @@ -461,14 +464,14 @@ blockToHtml opts (Header level (ident,_,_) lst) = do then H.a ! A.href (toValue $ '#' : writerIdentifierPrefix opts ++ ident) $ contents' else contents' - return $ (case level of + return $ case level of 1 -> H.h1 contents'' 2 -> H.h2 contents'' 3 -> H.h3 contents'' 4 -> H.h4 contents'' 5 -> H.h5 contents'' 6 -> H.h6 contents'' - _ -> H.p contents'') + _ -> H.p contents'' blockToHtml opts (BulletList lst) = do contents <- mapM (blockListToHtml opts) lst let lst' = unordList opts contents diff --git a/tests/lhs-test.html+lhs b/tests/lhs-test.html+lhs index 9be283671..487a8a26b 100644 --- a/tests/lhs-test.html+lhs +++ b/tests/lhs-test.html+lhs @@ -29,9 +29,9 @@ code > span.er { color: #ff0000; font-weight: bold; } <body> <h1>lhs test</h1> <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p> -<pre class="sourceCode literate haskell"><code class="sourceCode haskell"><span class="fu">></span><span class="ot"> unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=></span> (b <span class="ot">-></span> c <span class="ot">-></span> d) <span class="ot">-></span> a (b, c) d -<span class="fu">></span> unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span> -<span class="fu">></span> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></code></pre> +<pre class="sourceCode literate literatehaskell"><code class="sourceCode literatehaskell"><span class="ot">> unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=></span> (b <span class="ot">-></span> c <span class="ot">-></span> d) <span class="ot">-></span> a (b, c) d +<span class="ot">></span> unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span> +<span class="ot">></span> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></code></pre> <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p> <pre><code>f *** g = first f >>> second g</code></pre> <p>Block quote:</p> diff --git a/tests/s5.basic.html b/tests/s5.basic.html index f4e93eb6d..ceb896b8e 100644 --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -36,14 +36,14 @@ <h2>Sam Smith<br/>Jen Jones</h2> <h3>July 15, 2006</h3> </div> -<div class="section slide level1" id="first-slide"> +<div id="first-slide" class="slide section level1"> <h1>First slide</h1> <ul> <li>first bullet</li> <li>second bullet</li> </ul> </div> -<div class="section slide level1" id="math"> +<div id="math" class="slide section level1"> <h1>Math</h1> <ul> <li><span class="math">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li> diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html index c62fcb3db..818cca04a 100644 --- a/tests/s5.fancy.html +++ b/tests/s5.fancy.html @@ -237,14 +237,14 @@ <h2>Sam Smith<br/>Jen Jones</h2> <h3>July 15, 2006</h3> </div> -<div class="section slide level1" id="first-slide"> +<div id="first-slide" class="slide section level1"> <h1>First slide</h1> <ul class="incremental"> <li>first bullet</li> <li>second bullet</li> </ul> </div> -<div class="section slide level1" id="math"> +<div id="math" class="slide section level1"> <h1>Math</h1> <ul class="incremental"> <li><span class="LaTeX">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li> |