diff options
| author | Yan Pas <yanp.bugz@gmail.com> | 2018-10-07 18:10:01 +0300 |
|---|---|---|
| committer | Yan Pas <yanp.bugz@gmail.com> | 2018-10-07 18:10:01 +0300 |
| commit | 27467189ab184c5d098e244e01f7d1bfdb0d4d45 (patch) | |
| tree | d1fb96ebbc49ee0c4e73ef354feddd521690d545 /src/Text/Pandoc/Writers/ODT.hs | |
| parent | 4f3dd3b1af7217214287ab886147c5e33a54774d (diff) | |
| parent | bd8a66394bc25b52dca9ffd963a560a4ca492f9c (diff) | |
| download | pandoc-27467189ab184c5d098e244e01f7d1bfdb0d4d45.tar.gz | |
Merge branch 'master' into groff_reader
Diffstat (limited to 'src/Text/Pandoc/Writers/ODT.hs')
| -rw-r--r-- | src/Text/Pandoc/Writers/ODT.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/ODT.hs b/src/Text/Pandoc/Writers/ODT.hs index 7aecb3da5..1c9481630 100644 --- a/src/Text/Pandoc/Writers/ODT.hs +++ b/src/Text/Pandoc/Writers/ODT.hs @@ -189,8 +189,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 p), Nothing) -> [("width", show w), ("height", show (p / ratio) ++ "%")] - (Nothing, Just h@(Percent p)) -> [("width", show (p * ratio) ++ "%"), ("height", show h)] + (Just w@(Percent _), Nothing) -> [("rel-width", show w),("rel-height", "scale"),("width", show ptX ++ "pt"),("height", show ptY ++ "pt")] + (Nothing, Just h@(Percent _)) -> [("rel-width", "scale"),("rel-height", show h),("width", show ptX ++ "pt"),("height", show ptY ++ "pt")] (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")] |