diff --git a/MANUAL.txt b/MANUAL.txt index ddb4d2fa5..7b2ad9720 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -7018,6 +7018,11 @@ These layouts are chosen from the default pptx reference doc included with pandoc, unless an alternative reference doc is specified using `--reference-doc`. +When reading pptx, each slide becomes a level-2 heading with the +identifier `slide-N`, followed by the slide's content. Slides hidden +from the slide show are read too, with the class `hidden` on their +heading. + ## Incremental lists By default, these writers produce lists that display "all at once." diff --git a/src/Text/Pandoc/Readers/Pptx/Slides.hs b/src/Text/Pandoc/Readers/Pptx/Slides.hs index 2456d9488..6ff8222ab 100644 --- a/src/Text/Pandoc/Readers/Pptx/Slides.hs +++ b/src/Text/Pandoc/Readers/Pptx/Slides.hs @@ -55,7 +55,11 @@ slideToBlocks archive slide = do headerText = if T.null title then "Slide " <> T.pack (show n) else title - header = Header 2 (slideIdent, [], []) (B.toList (B.text headerText)) + -- A slide hidden from the slide show (show="0") is still read, + -- with a "hidden" class on its header. + classes = ["hidden" | findAttr (unqual "show") slideElem == Just "0"] + header = Header 2 (slideIdent, classes, []) + (B.toList (B.text headerText)) -- Parse shapes and convert to blocks case findChildByName ns "p" "cSld" slideElem >>= diff --git a/test/Tests/Readers/Pptx.hs b/test/Tests/Readers/Pptx.hs index 57e68da07..588995cb3 100644 --- a/test/Tests/Readers/Pptx.hs +++ b/test/Tests/Readers/Pptx.hs @@ -53,4 +53,10 @@ tests = [ testGroup "basic" "pptx-reader/runs.pptx" "pptx-reader/runs.native" ] + , testGroup "slides" + [ testCompare + "hidden slides" + "pptx-reader/hidden.pptx" + "pptx-reader/hidden.native" + ] ] diff --git a/test/pptx-reader/hidden.native b/test/pptx-reader/hidden.native new file mode 100644 index 000000000..31bce3b1b --- /dev/null +++ b/test/pptx-reader/hidden.native @@ -0,0 +1,21 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Header 2 ( "slide-1" , [] , [] ) [ Str "Shown" ] + , Header + 2 ( "slide-2" , [ "hidden" ] , [] ) [ Str "Hidden" ] + , Para + [ Str "Body" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "hidden" + , Space + , Str "slide" + ] + , Header + 2 + ( "slide-3" , [] , [] ) + [ Str "Shown" , Space , Str "explicitly" ] + ] diff --git a/test/pptx-reader/hidden.pptx b/test/pptx-reader/hidden.pptx new file mode 100644 index 000000000..fee70fcb0 Binary files /dev/null and b/test/pptx-reader/hidden.pptx differ