git.iko.soy/typeable/pandoc
on master help sign in
Really fix #1394.

This closes #1394, which actually wasn't fixed by the earlier commit. This ensures that lists in speaker notes don't add "fragment" classes, which can cause additional keypresses to be needed to advance a slide.

commit967c13560e26dcca60261737a8f30bf7297ea4ea authorJohn MacFarlane <jgm@berkeley.edu> dateSat 14 Mar 2015, 23:32 (12 years ago) parent3b962a5
1 file changed+6−5
src/Text/Pandoc/Writers/HTML.hs+6−5
src/Text/Pandoc/Writers/HTML.hs+6−5
@@ -446,13 +446,14 @@ blockToHtml opts (Para lst) = do
446446 contents <- inlineListToHtml opts lst
447447 return $ H.p contents
448448blockToHtml opts (Div attr@(_,classes,_) bs) = do
449− contents <- blockListToHtml opts bs
449+ let speakerNotes = "notes" `elem` classes
450+ -- we don't want incremental output inside speaker notes, see #1394
451+ let opts' = if speakerNotes then opts{ writerIncremental = False } else opts
452+ contents <- blockListToHtml opts' bs
450453 let contents' = nl opts >> contents >> nl opts
451454 return $
452− if "notes" `elem` classes
453− then let opts' = opts{ writerIncremental = False } in
454− -- we don't want incremental output inside speaker notes
455− case writerSlideVariant opts of
455+ if speakerNotes
456+ then case writerSlideVariant opts of
456457 RevealJsSlides -> addAttrs opts' attr $ H5.aside $ contents'
457458 NoSlides -> addAttrs opts' attr $ H.div $ contents'
458459 _ -> mempty