@@ -37,7 +37,7 @@ module Text.Pandoc.Writers.Powerpoint.Presentation ( documentToPresentation
37 , DocProps(..)
37 , DocProps(..)
38 , Slide(..)
38 , Slide(..)
39 , Layout(..)
39 , Layout(..)
40− , Notes(..)
40+ , SpeakerNotes(..)
41 , SlideId(..)
41 , SlideId(..)
42 , Shape(..)
42 , Shape(..)
43 , Graphic(..)
43 , Graphic(..)
@@ -180,7 +180,7 @@ data DocProps = DocProps { dcTitle :: Maybe String
181data Slide = Slide { slideId :: SlideId
181data Slide = Slide { slideId :: SlideId
182 , slideLayout :: Layout
182 , slideLayout :: Layout
183− , slideNotes :: Maybe Notes
183+ , slideSpeakerNotes :: Maybe SpeakerNotes
184 } deriving (Show, Eq)
184 } deriving (Show, Eq)
186newtype SlideId = SlideId String
186newtype SlideId = SlideId String
@@ -189,7 +189,7 @@ newtype SlideId = SlideId String
189-- In theory you could have anything on a notes slide but it seems
189-- In theory you could have anything on a notes slide but it seems
190-- designed mainly for one textbox, so we'll just put in the contents
190-- designed mainly for one textbox, so we'll just put in the contents
191-- of that textbox, to avoid other shapes that won't work as well.
191-- of that textbox, to avoid other shapes that won't work as well.
192−newtype Notes = Notes [Paragraph]
192+newtype SpeakerNotes = SpeakerNotes {fromSpeakerNotes :: [Paragraph]}
193 deriving (Show, Eq)
193 deriving (Show, Eq)
195data Layout = MetadataSlide { metadataSlideTitle :: [ParaElem]
195data Layout = MetadataSlide { metadataSlideTitle :: [ParaElem]
@@ -806,11 +806,11 @@ applyToLayout f (TwoColumnSlide hdr contentL contentR) = do
806applyToSlide :: Monad m => (ParaElem -> m ParaElem) -> Slide -> m Slide
806applyToSlide :: Monad m => (ParaElem -> m ParaElem) -> Slide -> m Slide
807applyToSlide f slide = do
807applyToSlide f slide = do
808 layout' <- applyToLayout f $ slideLayout slide
808 layout' <- applyToLayout f $ slideLayout slide
809− mbNotes' <- case slideNotes slide of
809+ mbNotes' <- case slideSpeakerNotes slide of
810− Just (Notes notes) -> (Just . Notes) <$>
810+ Just (SpeakerNotes notes) -> (Just . SpeakerNotes) <$>
811− mapM (applyToParagraph f) notes
811+ mapM (applyToParagraph f) notes
812 Nothing -> return Nothing
812 Nothing -> return Nothing
813− return slide{slideLayout = layout', slideNotes = mbNotes'}
813+ return slide{slideLayout = layout', slideSpeakerNotes = mbNotes'}
815replaceAnchor :: ParaElem -> Pres ParaElem
815replaceAnchor :: ParaElem -> Pres ParaElem
816replaceAnchor (Run rProps s)
816replaceAnchor (Run rProps s)