git.iko.soy/typeable/pandoc
on master help sign in
Powerpoint writer: Import reference-doc images properly.
f79a6f1Jesse Rosenthal
src/Text/Pandoc/Writers/Powerpoint/Output.hs+2−2
compare with master
unifiedsplit
@@ -38,7 +38,7 @@ import Control.Monad.Except (throwError, catchError)
38import Control.Monad.Reader
38import Control.Monad.Reader
39import Control.Monad.State
39import Control.Monad.State
40import Codec.Archive.Zip
40import Codec.Archive.Zip
41−import Data.List (intercalate, stripPrefix, nub, union)
41+import Data.List (intercalate, stripPrefix, nub, union, isPrefixOf)
42import Data.Default
42import Data.Default
43import Data.Time.Clock (UTCTime)
43import Data.Time.Clock (UTCTime)
44import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds, posixSecondsToUTCTime)
44import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds, posixSecondsToUTCTime)
@@ -68,7 +68,7 @@ import Text.Pandoc.Writers.Powerpoint.Presentation
68initialGlobalIds :: Archive -> Archive -> M.Map FilePath Int
68initialGlobalIds :: Archive -> Archive -> M.Map FilePath Int
69initialGlobalIds refArchive distArchive =
69initialGlobalIds refArchive distArchive =
70 let archiveFiles = filesInArchive refArchive `union` filesInArchive distArchive
70 let archiveFiles = filesInArchive refArchive `union` filesInArchive distArchive
71− mediaPaths = filter (match (compile "ppt/media/image")) archiveFiles
71+ mediaPaths = filter (isPrefixOf "ppt/media/image") archiveFiles
72
72
73 go :: FilePath -> Maybe (FilePath, Int)
73 go :: FilePath -> Maybe (FilePath, Int)
74 go fp = do
74 go fp = do