@@ -226,18 +226,20 @@ prefixedId opts s =
226226
227227toList :: (Html -> Html) -> WriterOptions -> ([Html] -> Html)
228228toList listop opts items = do
229− let items' = toListItems opts items
230229 if (writerIncremental opts)
231230 then if (writerSlideVariant opts /= RevealJsSlides)
232− then (listop $ mconcat items') ! A.class_ "incremental"
233− else listop $ mconcat $ map (! A.class_ "fragment") items'
234− else listop $ mconcat items'
231+ then (listop $ mconcat items) ! A.class_ "incremental"
232+ else listop $ mconcat $ map (! A.class_ "fragment") items
233+ else listop $ mconcat items
235234
236235unordList :: WriterOptions -> [Html] -> Html
237−unordList = toList H.ul
236+unordList opts = toList H.ul opts . toListItems opts
238237
239238ordList :: WriterOptions -> [Html] -> Html
240−ordList = toList H.ol
239+ordList opts = toList H.ol opts . toListItems opts
240+
241+defList :: WriterOptions -> [Html] -> Html
242+defList opts items = toList H.dl opts (items ++ [nl opts])
241243
242244-- | Construct table of contents from list of elements.
243245tableOfContents :: WriterOptions -> [Element] -> State WriterState (Maybe Html)
@@ -456,6 +458,9 @@ blockToHtml opts (BlockQuote blocks) =
456458 [OrderedList attribs lst] ->
457459 blockToHtml (opts {writerIncremental = inc})
458460 (OrderedList attribs lst)
461+ [DefinitionList lst] ->
462+ blockToHtml (opts {writerIncremental = inc})
463+ (DefinitionList lst)
459464 _ -> do contents <- blockListToHtml opts blocks
460465 return $ H.blockquote
461466 $ nl opts >> contents >> nl opts
@@ -513,11 +518,7 @@ blockToHtml opts (DefinitionList lst) = do
513518 blockListToHtml opts) defs
514519 return $ mconcat $ nl opts : term' : nl opts :
515520 intersperse (nl opts) defs') lst
516− let lst' = H.dl $ mconcat contents >> nl opts
517− let lst'' = if writerIncremental opts
518− then lst' ! A.class_ "incremental"
519− else lst'
520− return lst''
521+ return $ defList opts contents
521522blockToHtml opts (Table capt aligns widths headers rows') = do
522523 captionDoc <- if null capt
523524 then return mempty