bf15258 · typeable/pandoc

git.iko.soy/typeable/pandoc

Powerpoint writer: Set default slidelevel correctly.

We had previously defaulted to slideLevel 2. Now we use the correct behavior of defaulting to the highest level header followed by content. We change an expected test result to match this behavior.

commitbf15258d3b18bd2a7daae803b52a9b851eb204eb authorJesse Rosenthal <jrosenthal@jhu.edu> dateWed 3 Jan 2018, 21:58 (9 years ago) parent41dc65b

2 files changed+3−2

compare with master

unifiedsplit

src/Text/Pandoc/Writers/Powerpoint.hs+2−1 test/Tests/Writers/Powerpoint.hs+1−1

src/Text/Pandoc/Writers/Powerpoint.hs+2−1

@@ -47,6 +47,7 @@ import Text.Pandoc.Definition

4747import qualified Text.Pandoc.UTF8 as UTF8

4848import Text.Pandoc.Class (PandocMonad)

4949import Text.Pandoc.Error (PandocError(..))

50+import Text.Pandoc.Slides (getSlideLevel)

5051import qualified Text.Pandoc.Class as P

5152import Text.Pandoc.Options

5253import Text.Pandoc.MIME

@@ -86,7 +87,7 @@ writePowerpoint opts (Pandoc meta blks) = do

8687 , envOpts = opts

8788 , envSlideLevel = case writerSlideLevel opts of

8889 Just n -> n

89− Nothing -> 2

90+ Nothing -> getSlideLevel blks'

9091 }

9192 runP env def $ do pres <- blocksToPresentation blks'

9293 archv <- presentationToArchive pres

test/Tests/Writers/Powerpoint.hs+1−1

@@ -52,7 +52,7 @@ numSlideTests = testGroup "Number of slides in output"

5252 def

5353 (setTitle "My Title" $ doc $ para "foo")

5454 , testNumberOfSlides

55− "With h1 slide (using default slide-level)" 2

55+ "With h1 slide (using default slide-level)" 1

5656 def

5757 (doc $ header 1 "Header" <> para "foo")

5858 , testNumberOfSlides