diff options
| author | Andrew Dunning <adunning@users.noreply.github.com> | 2017-09-08 07:06:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 07:06:50 +0100 |
| commit | 51bb7453e41e5e7e28a60cb22cb4f4d082b7fbdf (patch) | |
| tree | bbcd5f299fa513065e3bcb3f274f1b895a899301 /src/Text/Pandoc/Writers/HTML.hs | |
| parent | 3654c4373a2f4db8d4ab771937ad318a6921ac37 (diff) | |
| parent | 732005456e2b28150943a5a4e11bca6e1566f309 (diff) | |
| download | pandoc-51bb7453e41e5e7e28a60cb22cb4f4d082b7fbdf.tar.gz | |
Merge branch 'master' into patch-1
Diffstat (limited to 'src/Text/Pandoc/Writers/HTML.hs')
| -rw-r--r-- | src/Text/Pandoc/Writers/HTML.hs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 9ac37a0ba..1641b991c 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -47,7 +47,7 @@ import Control.Monad.State.Strict import Data.Char (ord, toLower) import Data.Text (Text) import qualified Data.Text.Lazy as TL -import Data.List (intersperse, isPrefixOf) +import Data.List (intersperse, isPrefixOf, partition, intercalate) import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing) import Data.Monoid ((<>)) import qualified Data.Set as Set @@ -569,8 +569,15 @@ imgAttrsToHtml opts attr = do isNotDim _ = True dimensionsToAttrList :: Attr -> [(String, String)] -dimensionsToAttrList attr = (go Width) ++ (go Height) +dimensionsToAttrList attr = consolidateStyles $ go Width ++ go Height where + consolidateStyles :: [(String, String)] -> [(String, String)] + consolidateStyles xs = + case partition isStyle xs of + ([], _) -> xs + (ss, rest) -> ("style", intercalate ";" $ map snd ss) : rest + isStyle ("style", _) = True + isStyle _ = False go dir = case (dimension dir attr) of (Just (Pixel a)) -> [(show dir, show a)] (Just x) -> [("style", show dir ++ ":" ++ show x)] |