branch: externals/org-real
commit 435f6361207cf98bb1c5f4c8e8a987005ba21d41
Author: Tyler Grinn <tylergr...@gmail.com>
Commit: Tyler Grinn <tylergr...@gmail.com>
Added post-jump-hook
After jumping to the location of a marker, org-reveal will be called.
---
deps/boxy | 2 +-
org-real.el | 5 +++--
tests/edge-cases.org | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/margin.org | 4 ++++
tests/padding.org | 4 ++++
tests/smoke-test.org | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 121 insertions(+), 3 deletions(-)
diff --git a/deps/boxy b/deps/boxy
index 888e78ce58..68b1c6db7b 160000
--- a/deps/boxy
+++ b/deps/boxy
@@ -1 +1 @@
-Subproject commit 888e78ce58c5f217c84345b02a5aafd4c9a871b5
+Subproject commit 68b1c6db7bb585e5942ab2e12765cf80cfcfb619
diff --git a/org-real.el b/org-real.el
index 7d3326c0eb..1b6754c876 100644
--- a/org-real.el
+++ b/org-real.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2021 Free Software Foundation, Inc.
;; Author: Tyler Grinn <tylergr...@gmail.com>
-;; Version: 1.0.4
+;; Version: 1.0.5
;; File: org-real.el
;; Package-Requires: ((emacs "26.1") (boxy "1.0") (org "9.3"))
;; Keywords: tools
@@ -498,7 +498,8 @@ level."
(let* ((container (pop containers))
(name (plist-get container :name))
(box (boxy-box :name name
- :markers (list (plist-get container :loc)))))
+ :markers (list (plist-get container :loc))
+ :post-jump-hook 'org-reveal)))
(when-let* ((rel (plist-get container :rel))
(rel-name (and (slot-boundp prev :name) (with-slots (name)
prev name)))
(verb (if (org-real--is-plural name) " are " " is "))
diff --git a/tests/edge-cases.org b/tests/edge-cases.org
index 7ba56a1341..4ae47cfdca 100644
--- a/tests/edge-cases.org
+++ b/tests/edge-cases.org
@@ -3,6 +3,12 @@
* Opening links
** PASS [[real://1-2/1-1?rel=on top of/1-0?rel=above][Is above an on top]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 1-0 is above the 1-1 on top of the 1-2.
@@ -25,6 +31,12 @@
#+end_example
** PASS [[real://6-4/6-3?rel=on top of/6-2?rel=on top of/6-1?rel=above][Is
above an on top of an on top]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 6-1 is above the 6-2 on top of the 6-3 on top of the 6-4.
@@ -51,6 +63,12 @@
#+end_example
** PASS [[real://7-3/7-2?rel=on top of/7-1?rel=below][Is below an on top]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 7-1 is below the 7-2 on top of the 7-3.
@@ -72,6 +90,12 @@
#+end_example
** PASS [[real://2-4/2-3?rel=on top of/2-2?rel=on top of/2-1?rel=below][Is
below an on top of an on top]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 2-1 is below the 2-2 on top of the 2-3 on top of the 2-4.
@@ -97,6 +121,13 @@
#+end_example
** PASS [[real://3-3?rel=in/3-2?rel=in front of/3-1?rel=above][Is above an in
front]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
+
#+begin_example
The 3-1 is above the 3-2 in front of the 3-3.
@@ -119,6 +150,12 @@
#+end_example
** PASS [[real://5-4/5-3?rel=in front of/5-2?rel=in front of/5-1?rel=above][Is
above an in front of an in front]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 5-1 is above the 5-2 in front of the 5-3 in front of the 5-4.
@@ -145,6 +182,12 @@
#+end_example
** PASS [[real://4-3/4-2?rel=in front of/4-1?rel=below][Is below an in front]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 4-1 is below the 4-2 in front of the 4-3.
@@ -167,6 +210,12 @@
#+end_example
** PASS [[real://8-4/8-3?rel=in front of/8-2?rel=in front of/8-1?rel=below][Is
below an in front of an in front]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 8-1 is below the 8-2 in front of the 8-3 in front of the 8-4.
@@ -194,6 +243,12 @@
* Merging links
** PASS Merges a box on top of a box
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_src org
- [[real://thing2/thing1?rel=on top of]]
- [[real://thing2/thing1?rel=on top of/above?rel=above]]
diff --git a/tests/margin.org b/tests/margin.org
index 3fc3edd56b..2336b17d92 100644
--- a/tests/margin.org
+++ b/tests/margin.org
@@ -6,6 +6,8 @@
:PROPERTIES:
:MARGIN-Y: 0
:MARGIN-X: 0
+ :PADDING-X: 2
+ :PADDING-Y: 1
:END:
*** PASS [[real://5-2/5-1?rel=above][above]]
#+begin_example
@@ -61,6 +63,8 @@ The 8-1 is to the right of the 8-2.
:PROPERTIES:
:MARGIN-Y: 2
:MARGIN-X: 3
+ :PADDING-X: 2
+ :PADDING-Y: 1
:END:
*** PASS [[real://1-2/1-1][in]]
#+begin_example
diff --git a/tests/padding.org b/tests/padding.org
index a7a05ef510..0b1870b465 100644
--- a/tests/padding.org
+++ b/tests/padding.org
@@ -6,6 +6,8 @@
:PROPERTIES:
:PADDING-Y: 0
:PADDING-X: 0
+ :MARGIN-X: 2
+ :MARGIN-Y: 1
:END:
*** PASS [[real://1-2/1-1][in]]
#+begin_example
@@ -122,6 +124,8 @@
:PROPERTIES:
:PADDING-Y: 2
:PADDING-X: 3
+ :MARGIN-X: 2
+ :MARGIN-Y: 1
:END:
*** PASS [[real://1-2/1-1][in]]
#+begin_example
diff --git a/tests/smoke-test.org b/tests/smoke-test.org
index 7fd198e937..9bac14b7a3 100644
--- a/tests/smoke-test.org
+++ b/tests/smoke-test.org
@@ -3,6 +3,12 @@
* Opening links
** PASS [[real://1-2/1-1][in]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 1-1 is in the 1-2.
@@ -20,6 +26,12 @@
#+end_example
** PASS [[real://2-2/2-1?rel=on][on]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 2-1 is on the 2-2.
@@ -37,6 +49,12 @@
#+end_example
** PASS [[real://3-2/3-1?rel=behind][behind]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 3-1 is behind the 3-2.
@@ -54,6 +72,12 @@
#+end_example
** PASS [[real://4-2/4-1?rel=in front of][in front of]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 4-1 is in front of the 4-2.
@@ -70,6 +94,12 @@
#+end_example
** PASS [[real://5-2/5-1?rel=above][above]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 5-1 is above the 5-2.
@@ -88,6 +118,12 @@
#+end_example
** PASS [[real://6-2/6-1?rel=below][below]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 6-1 is below the 6-2.
@@ -107,6 +143,12 @@
** PASS [[real://7-2/7-1?rel=to the left of][left]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 7-1 is to the left of the 7-2.
@@ -119,6 +161,12 @@
#+end_example
** PASS [[real://8-2/8-1?rel=to the right of][right]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 8-1 is to the right of the 8-2.
@@ -131,6 +179,12 @@
#+end_example
** PASS [[real://9-2/9-1?rel=on top of][on top]]
+ :PROPERTIES:
+ :MARGIN-Y: 1
+ :MARGIN-X: 2
+ :PADDING-Y: 1
+ :PADDING-X: 2
+ :END:
#+begin_example
The 9-1 is on top of the 9-2.
