@@ -688,8 +688,6 @@ getDefaultReferencePptx = do
688688 , "ppt/presProps.xml"
689689 , "ppt/presentation.xml"
690690 , "ppt/slideLayouts/_rels/slideLayout1.xml.rels"
691− , "ppt/slideLayouts/_rels/slideLayout10.xml.rels"
692− , "ppt/slideLayouts/_rels/slideLayout11.xml.rels"
693691 , "ppt/slideLayouts/_rels/slideLayout2.xml.rels"
694692 , "ppt/slideLayouts/_rels/slideLayout3.xml.rels"
695693 , "ppt/slideLayouts/_rels/slideLayout4.xml.rels"
@@ -698,6 +696,8 @@ getDefaultReferencePptx = do
698696 , "ppt/slideLayouts/_rels/slideLayout7.xml.rels"
699697 , "ppt/slideLayouts/_rels/slideLayout8.xml.rels"
700698 , "ppt/slideLayouts/_rels/slideLayout9.xml.rels"
699+ , "ppt/slideLayouts/_rels/slideLayout10.xml.rels"
700+ , "ppt/slideLayouts/_rels/slideLayout11.xml.rels"
701701 , "ppt/slideLayouts/slideLayout1.xml"
702702 , "ppt/slideLayouts/slideLayout10.xml"
703703 , "ppt/slideLayouts/slideLayout11.xml"
@@ -713,6 +713,8 @@ getDefaultReferencePptx = do
713713 , "ppt/slideMasters/slideMaster1.xml"
714714 , "ppt/slides/_rels/slide1.xml.rels"
715715 , "ppt/slides/slide1.xml"
716+ , "ppt/slides/_rels/slide2.xml.rels"
717+ , "ppt/slides/slide2.xml"
716718 , "ppt/tableStyles.xml"
717719 , "ppt/theme/theme1.xml"
718720 , "ppt/viewProps.xml"
@@ -766,13 +768,6 @@ readDefaultDataFile fname =
766768 getDataFileName fname' >>= checkExistence >>= readFileStrict
767769 where fname' = if fname == "MANUAL.txt" then fname else "data" </> fname
768770
769−makeCanonical :: FilePath -> FilePath
770−makeCanonical = Posix.joinPath . transformPathParts . splitDirectories
771− where transformPathParts = reverse . foldl go []
772− go as "." = as
773− go (_:as) ".." = as
774− go as x = x : as
775−
776771checkExistence :: PandocMonad m => FilePath -> m FilePath
777772checkExistence fn = do
778773 exists <- fileExists fn
@@ -781,6 +776,13 @@ checkExistence fn = do
781776 else throwError $ PandocCouldNotFindDataFileError fn
782777#endif
783778
779+makeCanonical :: FilePath -> FilePath
780+makeCanonical = Posix.joinPath . transformPathParts . splitDirectories
781+ where transformPathParts = reverse . foldl go []
782+ go as "." = as
783+ go (_:as) ".." = as
784+ go as x = x : as
785+
784786withPaths :: PandocMonad m => [FilePath] -> (FilePath -> m a) -> FilePath -> m a
785787withPaths [] _ fp = throwError $ PandocResourceNotFound fp
786788withPaths (p:ps) action fp =