From b627b6b13cf860df11efc8d1b0df75ed129f361a Mon Sep 17 00:00:00 2001
From: defanor <defanor@uberspace.net>
Date: Mon, 25 Dec 2017 19:20:40 +0300
Subject: Provide absolute URIs for pancake.el

---
 Pancake/Printing.hs | 10 ++++++----
 pancake.el          | 13 +++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Pancake/Printing.hs b/Pancake/Printing.hs
index 5ef3a81..6778ac8 100644
--- a/Pancake/Printing.hs
+++ b/Pancake/Printing.hs
@@ -110,10 +110,12 @@ showSexps uri ro =
                                  , showDenotation d
                                  , showSexp s]
     showDenotation :: Denotation -> String
-    showDenotation (Link u) = list ["link", ".", encodeSexpStr $ show u]
-    showDenotation (Image u) = list ["image", ".", encodeSexpStr $ show u]
-    showDenotation (Math m) = list ["math", ".", encodeSexpStr m]
-    showDenotation (Heading l) = list ["heading", ".", show l]
+    showDenotation (Link u) = list [ "link", encodeSexpStr $ show u
+                                   , encodeSexpStr $ show $ relativeTo u uri]
+    showDenotation (Image u) = list [ "image", encodeSexpStr $ show u
+                                    , encodeSexpStr $ show $ relativeTo u uri]
+    showDenotation (Math m) = list ["math", encodeSexpStr m]
+    showDenotation (Heading l) = list ["heading", show l]
 
 -- | Merge elements with the same styling.
 mergeStyled :: [Styled] -> [Styled]
diff --git a/pancake.el b/pancake.el
index c0fb9b6..e2f2855 100644
--- a/pancake.el
+++ b/pancake.el
@@ -200,8 +200,7 @@ while avoiding code duplication."
 
 (defun pancake-button-action (button)
   "An action to be invoked on button activation."
-  (funcall 'browse-url (or (button-get button 'pancake-link)
-                           (button-get button 'pancake-image))))
+  (funcall 'browse-url (button-get button 'pancake-absolute-uri)))
 
 (defun pancake-print-elem (element)
   "Translate ELEMENT into a string."
@@ -225,23 +224,25 @@ while avoiding code duplication."
         (`(superscript . ,rest)
          (pancake-print-line rest)
          (add-text-properties start (point) '(display (raise 0.2))))
-        (`(denotation (math . ,_formula) . ,rest)
+        (`(denotation (math ,_formula) . ,rest)
          (pancake-print-line rest))
-        (`(denotation (link . ,uri) . ,rest)
+        (`(denotation (link ,uri ,absolute-uri) . ,rest)
          (pancake-print-line rest)
          (make-text-button start (point)
                            'pancake-link uri
+                           'pancake-absolute-uri absolute-uri
                            'help-echo uri
                            'follow-link t
                            'action #'pancake-button-action))
-        (`(denotation (image . ,uri) . ,rest)
+        (`(denotation (image ,uri ,absolute-uri) . ,rest)
          (pancake-print-line rest)
          (make-text-button start (point)
                            'pancake-image uri
+                           'pancake-absolute-uri absolute-uri
                            'help-echo uri
                            'follow-link t
                            'action #'pancake-button-action))
-        (`(denotation (heading . ,level) . ,rest)
+        (`(denotation (heading ,level) . ,rest)
          (pancake-print-line rest)
          (add-to-list 'pancake-headings (cons (line-number-at-pos) level))
          (add-text-properties start (point)
-- 
cgit v1.2.3