@@ -19,16 +19,15 @@ compareOutput :: Options
1919 -> FilePath
2020 -> FilePath
2121 -> IO (Pandoc, Pandoc)
22−compareOutput opts nativeFileIn nativeFileOut = do
22+compareOutput (wopts, ropts) nativeFileIn nativeFileOut = do
2323 nf <- UTF8.toText <$> BS.readFile nativeFileIn
2424 nf' <- UTF8.toText <$> BS.readFile nativeFileOut
25− let wopts = fst opts
26− df <- runIOorExplode $ do
27− d <- readNative def nf
28− writeDocx wopts{writerUserDataDir = Just (".." </> "data")} d
25+ df <- runIOorExplode $
26+ readNative def nf >>=
27+ writeDocx wopts{writerUserDataDir = Just (".." </> "data")} >>=
28+ readDocx ropts
2929 df' <- runIOorExplode (readNative def nf')
30− p <- runIOorExplode $ readDocx (snd opts) df
31− return (p, df')
30+ return (df, df')
3231
3332testCompareWithOptsIO :: Options -> String -> FilePath -> FilePath -> IO TestTree
3433testCompareWithOptsIO opts name nativeFileIn nativeFileOut = do