diff options
| author | defanor <defanor@uberspace.net> | 2017-11-26 08:52:32 +0300 |
|---|---|---|
| committer | defanor <defanor@uberspace.net> | 2017-11-26 08:52:32 +0300 |
| commit | 53d7b8175ff897391fda84eb3dc71af31d364f7e (patch) | |
| tree | c9c046631f79e33ee0a5cc1aee899193f372ece6 /Pancake | |
| parent | 9285ad522bdaf72bbcefdca3807ece0194eae84b (diff) | |
Distinguish image denotations from those for links
Some kind of image support can be introduced in the future, and it's
not quite correct to present images as links.
Diffstat (limited to 'Pancake')
| -rw-r--r-- | Pancake/Printing.hs | 1 | ||||
| -rw-r--r-- | Pancake/Rendering.hs | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Pancake/Printing.hs b/Pancake/Printing.hs index c16e820..bace403 100644 --- a/Pancake/Printing.hs +++ b/Pancake/Printing.hs @@ -89,6 +89,7 @@ showSexps uri ro = , showSexp s] showDenotation :: Denotation -> String showDenotation (Link u) = list ["link", ".", encodeStr $ show u] + showDenotation (Image u) = list ["image", ".", encodeStr $ show u] showDenotation (Math m) = list ["math", ".", encodeStr m] showDenotation (Heading l) = list ["heading", ".", show l] diff --git a/Pancake/Rendering.hs b/Pancake/Rendering.hs index 5393b77..e5c5ae4 100644 --- a/Pancake/Rendering.hs +++ b/Pancake/Rendering.hs @@ -42,6 +42,7 @@ data Listing = Bulleted -- | Denotations: information that can be ignored, but can also be -- used to improve the UI. data Denotation = Link URI + | Image URI | Math String | Heading Int deriving (Show, Eq) @@ -336,7 +337,7 @@ readInline (P.Link attr alt (url, title)) = do (URI "" Nothing "" "" ('#':_)) -> Magenta _ -> Cyan st <- get - pure $ (map $ Denote (Link uri) . Fg color) t ++ + pure $ map (Denote (Link uri) . Fg color) t ++ [Fg Blue $ fromString (concat ["[", showRef (referenceDigits $ rsConf st) cnt, "]"])] Nothing -> pure [fromString title] @@ -353,7 +354,7 @@ readInline (P.Image attr alt (url, title)) = do (_, alt') -> alt' cnt <- storeLink uri st <- get - pure $ (map $ Denote (Link uri) . Fg Cyan) t ++ + pure $ map (Denote (Image uri) . Fg Cyan) t ++ [Fg Blue $ fromString (concat ["[", showRef (referenceDigits $ rsConf st) cnt, "]"])] readInline (P.Note bs) = do |