git.iko.soy/typeable/pandoc
on master help sign in
Powerpoint writer: Another attempt at avoiding compiler warnings.
commit574104861f13997effb36f8e3483dfd7c7d01cd7 authorJesse Rosenthal <jrosenthal@jhu.edu> dateSun 18 Feb 2018, 18:42 (9 years ago) parentb4f43f8
2 files changed+4−5
pandoc.cabal+2−1 src/Text/Pandoc/Writers/Powerpoint/Output.hs+2−4
pandoc.cabal+2−1
@@ -143,7 +143,8 @@ data-files:
143143 data/pptx/ppt/notesMasters/notesMaster1.xml
144144 data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels
145145 data/pptx/ppt/notesSlides/notesSlide1.xml
146− data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels
146+ data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels
147+ data/pptx/ppt/notesSlides/notesSlide2.xml
147148 data/pptx/ppt/theme/theme2.xml
148149 data/pptx/[Content_Types].xml
149150 -- stylesheet for EPUB writer
src/Text/Pandoc/Writers/Powerpoint/Output.hs+2−4
@@ -1268,8 +1268,6 @@ speakerNotesSlideNumber pgNum fieldId =
12681268
12691269slideToSpeakerNotesElement :: PandocMonad m => Slide -> P m (Maybe Element)
12701270slideToSpeakerNotesElement slide
1271− | Slide _ _ mbNotes <- slide
1272− , Nothing <- mbNotes = return Nothing
12731271 | Slide _ _ mbNotes <- slide
12741272 , Just (SpeakerNotes paras) <- mbNotes = do
12751273 master <- getNotesMaster
@@ -1304,6 +1302,7 @@ slideToSpeakerNotesElement slide
13041302 ]
13051303 ]
13061304 ]
1305+slideToSpeakerNotesElement _ = return Nothing
13071306
13081307-----------------------------------------------------------------------
13091308
@@ -1465,8 +1464,6 @@ slideToSpeakerNotesEntry slide = do
14651464
14661465slideToSpeakerNotesRelElement :: PandocMonad m => Slide -> P m (Maybe Element)
14671466slideToSpeakerNotesRelElement slide
1468− | Slide _ _ mbNotes <- slide
1469− , Nothing <- mbNotes = return Nothing
14701467 | Slide _ _ mbNotes <- slide
14711468 , Just _ <- mbNotes = do
14721469 idNum <- slideNum slide
@@ -1482,6 +1479,7 @@ slideToSpeakerNotesRelElement slide
14821479 , ("Target", "../notesMasters/notesMaster1.xml")
14831480 ] ()
14841481 ]
1482+slideToSpeakerNotesRelElement _ = return Nothing
14851483
14861484slideToSpeakerNotesRelEntry :: PandocMonad m => Slide -> P m (Maybe Entry)
14871485slideToSpeakerNotesRelEntry slide = do