diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-07-30 10:55:29 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-07-30 10:55:29 -0700 |
| commit | b12d2ea20a8b914ed2d6ee111eee5a25ad989597 (patch) | |
| tree | ccf89e4668affc8ee0bf16089f6eadc2c3a427ad /tests | |
| parent | 02c79ea4f6c050e9e610825e8b462382beae2b5a (diff) | |
| parent | f733b50150c3e7bf445d0d7c71e1f34e62ddf61a (diff) | |
| download | pandoc-b12d2ea20a8b914ed2d6ee111eee5a25ad989597.tar.gz | |
Merge pull request #1468 from jkr/mediabag
Mediabag
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Tests/Readers/Docx.hs | 3 | ||||
| -rw-r--r-- | tests/docx.image_no_embed.native | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/Tests/Readers/Docx.hs b/tests/Tests/Readers/Docx.hs index b1a966969..e8dd6b72e 100644 --- a/tests/Tests/Readers/Docx.hs +++ b/tests/Tests/Readers/Docx.hs @@ -37,7 +37,8 @@ compareOutput :: ReaderOptions compareOutput opts docxFile nativeFile = do df <- B.readFile docxFile nf <- Prelude.readFile nativeFile - return $ (noNorm (readDocx opts df), noNorm (readNative nf)) + let (p, _) = readDocx opts df + return $ (noNorm p, noNorm (readNative nf)) testCompareWithOptsIO :: ReaderOptions -> String -> FilePath -> FilePath -> IO Test testCompareWithOptsIO opts name docxFile nativeFile = do diff --git a/tests/docx.image_no_embed.native b/tests/docx.image_no_embed.native index 063958bc7..aa0f65d27 100644 --- a/tests/docx.image_no_embed.native +++ b/tests/docx.image_no_embed.native @@ -1,2 +1,2 @@ [Header 2 ("an-image",[],[]) [Str "An",Space,Str "image"] -,Para [Image [] ("word/media/image1.jpeg","")]] +,Para [Image [] ("media/image1.jpeg","")]] |