diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-12-13 20:29:13 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-12-13 20:29:13 -0800 |
| commit | f3133a8e9ee9095daed3261056e9bc2f4b129dfb (patch) | |
| tree | 0d2af2e95727ad26609c37db649062790e422c17 /tests | |
| parent | a924a3f43d25b34ddd46da2100732ee077779785 (diff) | |
| parent | df68f254592566ed2ed5dc258f0e645a0a6e5f8e (diff) | |
Merge pull request #2570 from mb21/rst-reader-imgattrs
Image attributes
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/docx/image_no_embed.native | 2 | ||||
| -rw-r--r-- | tests/docx/image_no_embed_writer.native | 2 | ||||
| -rw-r--r-- | tests/docx/inline_images.native | 4 | ||||
| -rw-r--r-- | tests/docx/inline_images_writer.native | 4 | ||||
| -rw-r--r-- | tests/rst-reader.native | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/tests/docx/image_no_embed.native b/tests/docx/image_no_embed.native index 9af018a0d..28eb918aa 100644 --- a/tests/docx/image_no_embed.native +++ b/tests/docx/image_no_embed.native @@ -1,2 +1,2 @@ [Para [Str "An",Space,Str "image:"] -,Para [Image ("",[],[]) [] ("media/image1.jpg","")]] +,Para [Image ("",[],[("width","6.5in"),("height","5.508333333333334in")]) [] ("media/image1.jpg","")]] diff --git a/tests/docx/image_no_embed_writer.native b/tests/docx/image_no_embed_writer.native index fb0f4f0a1..6f1914743 100644 --- a/tests/docx/image_no_embed_writer.native +++ b/tests/docx/image_no_embed_writer.native @@ -1,2 +1,2 @@ [Para [Str "An",Space,Str "image:"] -,Para [Image ("",[],[]) [] ("media/rId25.jpg","")]] +,Para [Image ("",[],[("width","0.4166666666666667in"),("height","0.4166666666666667in")]) [] ("media/rId25.jpg","")]] diff --git a/tests/docx/inline_images.native b/tests/docx/inline_images.native index aa7231d97..a361dc68c 100644 --- a/tests/docx/inline_images.native +++ b/tests/docx/inline_images.native @@ -1,2 +1,2 @@ -[Para [Str "This",Space,Str "picture",Space,Image ("",[],[]) [] ("media/image1.jpg",""),Space,Str "is",Space,Str "an",Space,Str "identicon."] -,Para [Str "Here",Space,Str "is",Space,Link ("",[],[]) [Str "one",Space,Image ("",[],[]) [] ("media/image2.jpg",""),Space,Str "that"] ("http://www.google.com",""),Space,Str "links."]] +[Para [Str "This",Space,Str "picture",Space,Image ("",[],[("width","0.8888888888888888in"),("height","0.8888888888888888in")]) [] ("media/image1.jpg",""),Space,Str "is",Space,Str "an",Space,Str "identicon."] +,Para [Str "Here",Space,Str "is",Space,Link ("",[],[]) [Str "one",Space,Image ("",[],[("width","0.8888888888888888in"),("height","0.8888888888888888in")]) [] ("media/image2.jpg",""),Space,Str "that"] ("http://www.google.com",""),Space,Str "links."]] diff --git a/tests/docx/inline_images_writer.native b/tests/docx/inline_images_writer.native index afefe0ebc..e5dfa5b58 100644 --- a/tests/docx/inline_images_writer.native +++ b/tests/docx/inline_images_writer.native @@ -1,2 +1,2 @@ -[Para [Str "This",Space,Str "picture",Space,Image ("",[],[]) [] ("media/rId26.jpg",""),Space,Str "is",Space,Str "an",Space,Str "identicon."] -,Para [Str "Here",Space,Str "is",Space,Link ("",[],[]) [Str "one",Space,Image ("",[],[]) [] ("media/rId27.jpg",""),Space,Str "that"] ("http://www.google.com",""),Space,Str "links."]] +[Para [Str "This",Space,Str "picture",Space,Image ("",[],[("width","0.4166666666666667in"),("height","0.4166666666666667in")]) [] ("media/rId26.jpg",""),Space,Str "is",Space,Str "an",Space,Str "identicon."] +,Para [Str "Here",Space,Str "is",Space,Link ("",[],[]) [Str "one",Space,Image ("",[],[("width","0.4166666666666667in"),("height","0.4166666666666667in")]) [] ("media/rId26.jpg",""),Space,Str "that"] ("http://www.google.com",""),Space,Str "links."]] diff --git a/tests/rst-reader.native b/tests/rst-reader.native index 0178f28a8..4752d76ff 100644 --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -221,7 +221,7 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa ,Header 1 ("images",[],[]) [Str "Images"] ,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"] ,Para [Image ("",[],[]) [Str "image"] ("lalune.jpg","")] -,Para [Image ("",[],[]) [Str "Voyage dans la Lune"] ("lalune.jpg","")] +,Para [Image ("",[],[("height","2343")]) [Str "Voyage dans la Lune"] ("lalune.jpg","")] ,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image ("",[],[]) [Str "movie"] ("movie.jpg",""),Space,Str "icon."] ,Para [Str "And",Space,Str "an",Space,Link ("",[],[]) [Image ("",[],[]) [Str "A movie"] ("movie.jpg","")] ("/url",""),Str "."] ,Header 1 ("comments",[],[]) [Str "Comments"] |