git.iko.soy/typeable/pandoc
on master help sign in
Powerpoint writer: Another attempt at avoiding compiler warnings.
5741048Jesse Rosenthal
pandoc.cabal+2−1
@@ -143,7 +143,8 @@ data-files:
143 data/pptx/ppt/notesMasters/notesMaster1.xml
143 data/pptx/ppt/notesMasters/notesMaster1.xml
144 data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels
144 data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels
145 data/pptx/ppt/notesSlides/notesSlide1.xml
145 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
147 data/pptx/ppt/theme/theme2.xml
148 data/pptx/ppt/theme/theme2.xml
148 data/pptx/[Content_Types].xml
149 data/pptx/[Content_Types].xml
149 -- stylesheet for EPUB writer
150 -- stylesheet for EPUB writer
src/Text/Pandoc/Writers/Powerpoint/Output.hs+2−4
@@ -1268,8 +1268,6 @@ speakerNotesSlideNumber pgNum fieldId =
1268
1268
1269slideToSpeakerNotesElement :: PandocMonad m => Slide -> P m (Maybe Element)
1269slideToSpeakerNotesElement :: PandocMonad m => Slide -> P m (Maybe Element)
1270slideToSpeakerNotesElement slide
1270slideToSpeakerNotesElement slide
1271− | Slide _ _ mbNotes <- slide
1272− , Nothing <- mbNotes = return Nothing
1273 | Slide _ _ mbNotes <- slide
1271 | Slide _ _ mbNotes <- slide
1274 , Just (SpeakerNotes paras) <- mbNotes = do
1272 , Just (SpeakerNotes paras) <- mbNotes = do
1275 master <- getNotesMaster
1273 master <- getNotesMaster
@@ -1304,6 +1302,7 @@ slideToSpeakerNotesElement slide
1304 ]
1302 ]
1305 ]
1303 ]
1306 ]
1304 ]
1305+slideToSpeakerNotesElement _ = return Nothing
1307
1306
1308-----------------------------------------------------------------------
1307-----------------------------------------------------------------------
1309
1308
@@ -1465,8 +1464,6 @@ slideToSpeakerNotesEntry slide = do
1465
1464
1466slideToSpeakerNotesRelElement :: PandocMonad m => Slide -> P m (Maybe Element)
1465slideToSpeakerNotesRelElement :: PandocMonad m => Slide -> P m (Maybe Element)
1467slideToSpeakerNotesRelElement slide
1466slideToSpeakerNotesRelElement slide
1468− | Slide _ _ mbNotes <- slide
1469− , Nothing <- mbNotes = return Nothing
1470 | Slide _ _ mbNotes <- slide
1467 | Slide _ _ mbNotes <- slide
1471 , Just _ <- mbNotes = do
1468 , Just _ <- mbNotes = do
1472 idNum <- slideNum slide
1469 idNum <- slideNum slide
@@ -1482,6 +1479,7 @@ slideToSpeakerNotesRelElement slide
1482 , ("Target", "../notesMasters/notesMaster1.xml")
1479 , ("Target", "../notesMasters/notesMaster1.xml")
1483 ] ()
1480 ] ()
1484 ]
1481 ]
1482+slideToSpeakerNotesRelElement _ = return Nothing
1485
1483
1486slideToSpeakerNotesRelEntry :: PandocMonad m => Slide -> P m (Maybe Entry)
1484slideToSpeakerNotesRelEntry :: PandocMonad m => Slide -> P m (Maybe Entry)
1487slideToSpeakerNotesRelEntry slide = do
1485slideToSpeakerNotesRelEntry slide = do