Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

ODT writer: calculate aspect ratio for percentage-sized images (#3478)

Browse source 
closes #3239
This commit is contained in:
Mauro Bieg 2017-03-01 12:13:45 +01:00 committed by John MacFarlane
parent d1b50a6c5d
commit d0fc2f1573
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Text/Pandoc/Writers/ODT.hs
View file

@ -156,8 +156,8 @@ transformPicMath opts (Image attr@(id', cls, _) lab (src,t)) = catchError
let dims =
case (getDim Width, getDim Height) of
(Just w, Just h) -> [("width", show w), ("height", show h)]
(Just w@(Percent _), Nothing) -> [("width", show w), ("style:rel-height", "scale")]
(Nothing, Just h@(Percent _)) -> [("style:rel-width", "scale"), ("height", show h)]
(Just w@(Percent p), Nothing) -> [("width", show w), ("height", show (p / ratio) ++ "%")]
(Nothing, Just h@(Percent p)) -> [("width", show (p * ratio) ++ "%"), ("height", show h)]
(Just w@(Inch i), Nothing) -> [("width", show w), ("height", show (i / ratio) ++ "in")]
(Nothing, Just h@(Inch i)) -> [("width", show (i * ratio) ++ "in"), ("height", show h)]
_ -> [("width", show ptX ++ "pt"), ("height", show ptY ++ "pt")]

2
src/Text/Pandoc/Writers/OpenDocument.hs
View file

@ -476,8 +476,6 @@ inlineToOpenDocument o ils
let getDims [] = []
getDims (("width", w) :xs) = ("svg:width", w) : getDims xs
getDims (("height", h):xs) = ("svg:height", h) : getDims xs
getDims (x@("style:rel-width", _) :xs) = x : getDims xs
getDims (x@("style:rel-height", _):xs) = x : getDims xs
getDims (_:xs) = getDims xs
return $ inTags False "draw:frame"
(("draw:name", "img" ++ show id') : getDims kvs) $