branch: externals/org-real
commit c5fc5a2a979a3f47d0b8336f18dcb6d58c9e0f6d
Merge: da816c2 7d5574d
Author: Tyler Grinn <ty...@tygr.info>
Commit: Tyler Grinn <ty...@tygr.info>
Merge branch 'next' into 'main'
0.4.2
Added more tests, fixed some issues with padding, margin, and the "behind"
preposition. Using rounded corners for boxes. Only adjusting necessary boxes
when a box is expanded or collapsed.
See merge request tygrdev/org-real!8
---
Eldev | 59 +++++++---
org-real.el | 217 +++++++++++++++++++------------------
tests/edge-cases.org | 298 +++++++++++++++++++++++++-------------------------
tests/margin.org | 153 ++++++++++++++++++++++++++
tests/padding.org | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++
tests/smoke-test.org | 147 +++++++++++++++++++++++++
6 files changed, 903 insertions(+), 271 deletions(-)
diff --git a/Eldev b/Eldev
index de0ac6c..5991ac1 100644
--- a/Eldev
+++ b/Eldev
@@ -43,6 +43,7 @@
(current-buffer)
nil t))
(with-current-buffer (get-buffer "*Diff*")
+ (message "@@ -actual +expected @@")
(message
(string-join
(butlast
@@ -67,29 +68,53 @@
(org-element-map (org-element-parse-buffer) 'link
(lambda (link)
(goto-char (org-element-property :begin link))
- (let ((title (and (org-in-regexp org-link-bracket-re)
- (match-string 2)))
- (result (catch 'result
- (save-window-excursion
- (condition-case nil
- (org-open-at-point)
- (error (throw 'result nil))))
- (string= (get-expected) (get-actual)))))
+ (let* ((title (and (org-in-regexp org-link-bracket-re)
+ (match-string 2)))
+ (org-real-margin-y (if (org-entry-get nil "MARGIN-Y" t)
+ (string-to-number (org-entry-get
nil "MARGIN-Y" t))
+ org-real-margin-y))
+ (org-real-margin-x (if (org-entry-get nil "MARGIN-X" t)
+ (string-to-number (org-entry-get
nil "MARGIN-X" t))
+ org-real-margin-x))
+ (org-real-padding-y (if (org-entry-get nil "PADDING-Y" t)
+ (string-to-number (org-entry-get
nil "PADDING-Y" t))
+ org-real-padding-y))
+ (org-real-padding-x (if (org-entry-get nil "PADDING-X" t)
+ (string-to-number (org-entry-get
nil "PADDING-X" t))
+ org-real-padding-x))
+ (result (catch 'result
+ (save-window-excursion
+ (condition-case nil
+ (org-open-at-point)
+ (error (throw 'result nil))))
+ (string= (get-expected) (get-actual)))))
(print-result title result)
(set-result result))))
(message "\n Merging links:\n")
(org-babel-map-src-blocks nil
(goto-char beg-block)
- (let ((title (org-entry-get nil "ITEM"))
- (result (catch 'result
- (save-window-excursion
- (condition-case nil
- (progn
- (org-edit-special)
- (org-real-world))
- (error (throw 'result nil))))
- (string= (get-expected) (get-actual)))))
+ (let* ((title (org-entry-get nil "ITEM"))
+ (org-real-margin-y (if (org-entry-get nil "MARGIN-Y")
+ (string-to-number (org-entry-get nil
"MARGIN-Y" t))
+ org-real-margin-y))
+ (org-real-margin-x (if (org-entry-get nil "MARGIN-X" t)
+ (string-to-number (org-entry-get nil
"MARGIN-X" t))
+ org-real-margin-x))
+ (org-real-padding-y (if (org-entry-get nil "PADDING-Y" t)
+ (string-to-number (org-entry-get
nil "PADDING-Y" t))
+ org-real-padding-y))
+ (org-real-padding-x (if (org-entry-get nil "PADDING-X" t)
+ (string-to-number (org-entry-get
nil "PADDING-X" t))
+ org-real-padding-x))
+ (result (catch 'result
+ (save-window-excursion
+ (condition-case nil
+ (progn
+ (org-edit-special)
+ (org-real-world))
+ (error (throw 'result nil))))
+ (string= (get-expected) (get-actual)))))
(print-result title result)
(set-result result)))))
(directory-files "tests" t "\\.org\\'"))
diff --git a/org-real.el b/org-real.el
index b8c14f2..941d14c 100644
--- a/org-real.el
+++ b/org-real.el
@@ -1,7 +1,7 @@
;;; org-real.el --- Keep track of real things as org-mode links -*-
lexical-binding: t -*-
;; Author: Tyler Grinn <tylergr...@gmail.com>
-;; Version: 0.4.1
+;; Version: 0.4.2
;; File: org-real.el
;; Package-Requires: ((emacs "26.1"))
;; Keywords: tools
@@ -226,9 +226,13 @@
"Current containers the buffer is displaying.")
(make-variable-buffer-local 'org-real--current-containers)
-(defvar org-real--current-offset 0
- "Current offset for the box diagram.")
-(make-variable-buffer-local 'org-real--current-offset)
+(defvar org-real--current-offset-y 0
+ "Current offset rows for the box diagram.")
+(make-variable-buffer-local 'org-real--current-offset-y)
+
+(defvar org-real--current-offset-x 0
+ "Current offset columns for the box diagram.")
+(make-variable-buffer-local 'org-real--current-offset-x)
(defvar org-real--visibility org-real-default-visibility
"Visibility of children in the current org real diagram.")
@@ -304,24 +308,24 @@
((= 2 org-real--visibility) (message "CONTENTS"))
((= 3 org-real--visibility) (message "MORE CONTENTS")))
(org-real--update-visibility org-real--current-box)
+ (org-real--flex-adjust org-real--current-box org-real--current-box)
(org-real-mode-redraw))
(defun org-real-mode-redraw ()
"Redraw `org-real--current-box' in the current buffer."
- (org-real--make-dirty org-real--current-box)
- (org-real--flex-adjust org-real--current-box org-real--current-box)
(let ((inhibit-read-only t))
(erase-buffer)
(if org-real--current-containers
(org-real--pp-text org-real--current-containers))
- (setq org-real--current-offset (- (line-number-at-pos)
- org-real-margin-y
- (* 2 org-real-padding-y)))
+ (setq org-real--current-offset-y (- (line-number-at-pos)
+ 2
+ (* 2 org-real-padding-y)))
+ (setq org-real--current-offset-x (- 0 1 org-real-padding-x))
(org-real--draw org-real--current-box)
(org-real-mode-recalculate-box-ring)
(goto-char (point-max))
(insert "\n")
- (goto-char 0)))
+ (goto-char (point-min))))
(defun org-real-mode-recalculate-box-ring ()
"Recalculate the position of all boxes in `org-real--current-box'."
@@ -384,14 +388,7 @@ The following commands are available:
(org-real-box :name (plist-get (pop containers)
:name))
world)))
(when match
- (let ((top (org-real--get-top match))
- (left (org-real--get-left match)))
- (run-with-timer
- 0 nil
- (lambda ()
- (forward-line (- (+ org-real--current-offset top 1
org-real-padding-y)
- (line-number-at-pos)))
- (move-to-column (+ left 1 org-real-padding-x))))))))))
+ (run-with-timer 0 nil (lambda () (org-real--jump-to-box
match))))))))
(defun org-real-headlines ()
"View all org headlines as an org real diagram.
@@ -405,14 +402,7 @@ MAX-LEVEL is the maximum level to show headlines for."
(while (and path (or (not match) (not (org-real--is-visible match t))))
(setq match (org-real--find-matching (org-real-box :name (pop path))
world)))
(when match
- (let ((top (org-real--get-top match))
- (left (org-real--get-left match)))
- (run-with-timer
- 0 nil
- (lambda ()
- (forward-line (- (+ org-real--current-offset top 1
org-real-padding-y)
- (line-number-at-pos)))
- (move-to-column (+ left 1 org-real-padding-x))))))))
+ (run-with-timer 0 nil (lambda () (org-real--jump-to-box match))))))
(defun org-real-apply ()
"Apply any change from the real link at point to the current buffer."
@@ -523,6 +513,7 @@ visibility."
(setq org-real--visibility (or visibility org-real-default-visibility))
(setq org-real--max-visibility (or max-visibility 3))
(org-real--update-visibility box)
+ (org-real--flex-adjust box box)
(org-real-mode-redraw)
(let* ((width (apply 'max (mapcar 'length (split-string (buffer-string)
"\n"))))
(height (count-lines (point-min) (point-max)))
@@ -539,8 +530,8 @@ visibility."
(let* ((reversed (reverse containers))
(container (pop reversed))
(primary-name (plist-get container :name)))
- (dotimes (_ org-real-padding-y) (insert "\n"))
- (insert (make-string org-real-padding-x ?\s))
+ (dotimes (_ org-real-margin-y) (insert "\n"))
+ (insert (make-string org-real-margin-x ?\s))
(insert "The ")
(put-text-property 0 (length primary-name) 'face 'org-real-primary
primary-name)
@@ -823,13 +814,12 @@ non-nil, skip setting :primary slot on the last box."
(org-real--primary-boxes from))
(unless match-found
(let ((all-from-children (org-real--get-children from 'all)))
- (with-slots ((to-children children) (to-behind behind)) to
- (if (= 1 (length all-from-children))
- (progn
- (oset (car all-from-children) :flex t)
- (org-real--add-child to (car all-from-children)))
- (oset from :flex t)
- (org-real--add-child to from)))))))
+ (if (= 1 (length all-from-children))
+ (progn
+ (oset (car all-from-children) :flex t)
+ (org-real--add-child to (car all-from-children)))
+ (oset from :flex t)
+ (org-real--add-child to from))))))
(cl-defmethod org-real--update-visibility ((box org-real-box))
"Update visibility of BOX and all of its children."
@@ -854,19 +844,47 @@ non-nil, skip setting :primary slot on the last box."
(org-real--get-all children))))))
(mapc 'org-real--update-visibility (org-real--get-children box 'all)))
+(cl-defmethod org-real--is-visible ((box org-real-box) &optional calculate)
+ "Determine if BOX is visible according to `org-real--visibility'.
+
+If CALCULATE, determine if the box has been expanded manually."
+ (if calculate
+ (with-slots (parent) box
+ (seq-find
+ (lambda (sibling) (eq sibling box))
+ (org-real--get-children parent)))
+ (with-slots (level) box
+ (or (= 0 org-real--visibility)
+ (<= level org-real--visibility)))))
+
(cl-defmethod org-real--get-positions ((box org-real-box))
"Get the buffer position of the names of BOX and its children."
- (if-let ((pos (and (slot-boundp box :name)
- (let ((top (org-real--get-top box))
- (left (org-real--get-left box)))
- (forward-line (- (+ org-real--current-offset 1 top
org-real-padding-y)
- (line-number-at-pos)))
- (move-to-column (+ 1 left org-real-padding-x))
- (point)))))
- (apply 'append (list pos) (mapcar 'org-real--get-positions
(org-real--get-children box)))
+ (if (slot-boundp box :name)
+ (progn
+ (org-real--jump-to-box box)
+ (apply 'append (list (point)) (mapcar 'org-real--get-positions
(org-real--get-children box))))
(apply 'append (mapcar 'org-real--get-positions (org-real--get-children
box)))))
+(cl-defmethod org-real--jump-to-box ((box org-real-box))
+ "Jump cursor to the first character in the label of BOX."
+ (let ((top (org-real--get-top box))
+ (left (org-real--get-left box)))
+ (forward-line (- (+ org-real--current-offset-y top 1 org-real-padding-y)
+ (line-number-at-pos)))
+ (move-to-column (+ org-real--current-offset-x left 1 org-real-padding-x))))
+
+(cl-defmethod org-real--find-matching ((search-box org-real-box) (world
org-real-box))
+ "Find a box in WORLD with a matching name as SEARCH-BOX."
+ (when (slot-boundp search-box :name)
+ (with-slots ((search-name name)) search-box
+ (seq-find
+ (lambda (box)
+ (and (slot-boundp box :name)
+ (string= search-name
+ (with-slots (name) box name))))
+ (org-real--expand world)))))
+
;;;; Drawing
(cl-defmethod org-real--draw ((box org-real-box) &optional arg)
@@ -878,7 +896,8 @@ border using the `org-real-selected' face. If ARG is 'rel,
draw
the border using `org-real-rel' face, else use `org-real-default'
face.
-Uses `org-real--current-offset' to determine row offset.
+Uses `org-real--current-offset-y' and
+`org-real--current-offset-x' to determine row and column offsets.
Adds to list `org-real--box-ring' the buffer position of each
button drawn."
@@ -894,8 +913,8 @@ button drawn."
hidden-children)
box
(when (slot-boundp box :name)
- (let* ((top (+ org-real--current-offset (org-real--get-top box)))
- (left (org-real--get-left box))
+ (let* ((top (+ org-real--current-offset-y (org-real--get-top box)))
+ (left (+ org-real--current-offset-x (org-real--get-left box)))
(width (org-real--get-width box))
(height (org-real--get-height box))
(double (or (org-real--get-all hidden-children)
@@ -945,23 +964,37 @@ button drawn."
(current-column))))
(delete-char (min (length str)
remaining-chars)))))))
(draw (cons top left)
- (concat (if double "╔" "┌")
- (make-string (- width 2) (cond (dashed #x254c)
+ (concat (cond ((and double dashed) "┏")
+ (double "╔")
+ (t "╭"))
+ (make-string (- width 2) (cond ((and double dashed)
#x2505)
+ (dashed #x254c)
(double #x2550)
(t #x2500)))
- (if double "╗" "┐")))
+ (cond ((and double dashed) "┓")
+ (double "╗")
+ (t "╮"))))
(if align-bottom
(draw (cons (+ top height) left)
- (concat (if double "╨" "┴")
+ (concat (cond ((and double dashed) "┸")
+ (double "╨")
+ (t "┴"))
(make-string (- width 2) (cond (dashed #x254c)
(t #x2500)))
- (if double "╨" "┴")))
+ (cond ((and double dashed) "┸")
+ (double "╨")
+ (t "┴"))))
(draw (cons (+ top height -1) left)
- (concat (if double "╚" "└")
- (make-string (- width 2) (cond (dashed #x254c)
+ (concat (cond ((and double dashed) "┗")
+ (double "╚")
+ (t "╰"))
+ (make-string (- width 2) (cond ((and double
dashed) #x2505)
+ (dashed #x254c)
(double #x2550)
(t #x2500)))
- (if double "╝" "┘"))))
+ (cond ((and double dashed) "┛")
+ (double "╝")
+ (t "╯")))))
(draw-name (cons (+ top 1 org-real-padding-y)
(+ left 1 org-real-padding-x))
name
@@ -970,10 +1003,12 @@ button drawn."
(c1 left)
(c2 (+ left width -1)))
(dotimes (_ (- height (if align-bottom 1 2)))
- (draw (cons r c1) (cond (dashed "╎")
+ (draw (cons r c1) (cond ((and double dashed) "┇")
+ (dashed "╎")
(double "║")
(t "│")))
- (draw (cons r c2) (cond (dashed "╎")
+ (draw (cons r c2) (cond ((and double dashed) "┇")
+ (dashed "╎")
(double "║")
(t "│")))
(setq r (+ r 1))))))))
@@ -1077,7 +1112,7 @@ If INCLUDE-ON-TOP is non-nil, also include height on top
of box."
children)))
(children-height (seq-reduce
(lambda (sum row)
- (+ sum org-real-padding-y row))
+ (+ sum org-real-margin-y row))
(mapcar
(lambda (r)
(apply 'max 0
@@ -1088,7 +1123,7 @@ If INCLUDE-ON-TOP is non-nil, also include height on top
of box."
(with-slots (y-order) child
(= r y-order)))
children))))
row-indices)
- (* -1 org-real-padding-y))))
+ (* -1 org-real-margin-y))))
(setq stored-height (+ height children-height))
(+ stored-height on-top-height))))))))
@@ -1101,13 +1136,13 @@ If INCLUDE-ON-TOP is non-nil, also include height on
top of box."
(t
(let ((on-top-height (org-real--get-on-top-height box)))
(if (not (slot-boundp box :parent))
- (setq stored-top on-top-height)
+ (setq stored-top (+ on-top-height org-real-margin-y))
(let* ((siblings (seq-filter
(lambda (sibling)
(with-slots (on-top in-front) sibling
(not (or on-top in-front))))
(org-real--get-children parent)))
- (offset (+ 2 org-real-padding-y org-real-margin-y))
+ (offset (+ 2 (* 2 org-real-padding-y)))
(top (+ on-top-height offset (org-real--get-top
parent))))
(if-let* ((directly-above (seq-reduce
(lambda (above sibling)
@@ -1140,7 +1175,7 @@ If INCLUDE-ON-TOP is non-nil, also include height on top
of box."
(if (slot-boundp box :left)
stored-left
(if (not (slot-boundp box :parent))
- (setq stored-left 0)
+ (setq stored-left org-real-margin-x)
(let* ((left (+ 1
org-real-padding-x
(org-real--get-left parent)))
@@ -1208,8 +1243,12 @@ If INCLUDE-ON-TOP is non-nil, also include height on top
of box."
(org-real--draw rel-box 'rel)))
(org-real--draw box 'selected))
(if tooltip-timer (cancel-timer tooltip-timer))
- (if (slot-boundp box :rel-box)
- (org-real--draw rel-box t))
+ (if (slot-boundp box :display-rel)
+ (if (org-real--is-visible display-rel t)
+ (org-real--draw display-rel-box t))
+ (if (and (slot-boundp box :rel-box)
+ (org-real--is-visible rel-box t))
+ (org-real--draw rel-box t)))
(org-real--draw box t))))))))
(cl-defmethod org-real--jump-other-window ((box org-real-box))
@@ -1261,13 +1300,9 @@ If INCLUDE-ON-TOP is non-nil, also include height on top
of box."
(with-slots (rel-box) box
(if (not (slot-boundp box :rel-box))
(lambda () (interactive))
- (let ((left (org-real--get-left rel-box))
- (top (org-real--get-top rel-box)))
- (lambda ()
- (interactive)
- (forward-line (- (+ org-real--current-offset top 1
org-real-padding-y)
- (line-number-at-pos)))
- (move-to-column (+ left 1 org-real-padding-x)))))))
+ (lambda ()
+ (interactive)
+ (org-real--jump-to-box box)))))
(cl-defmethod org-real--create-button-keymap ((box org-real-box))
"Create a keymap for a button in Org Real mode.
@@ -1286,19 +1321,6 @@ BOX is the box the button is being made for."
;;;; Private class methods
-(cl-defmethod org-real--is-visible ((box org-real-box) &optional calculate)
- "Determine if BOX is visible according to `org-real--visibility'.
-
-If CALCULATE, determine if the box has been expanded manually."
- (if calculate
- (with-slots (parent) box
- (seq-find
- (lambda (sibling) (eq sibling box))
- (org-real--get-children parent)))
- (with-slots (level) box
- (or (= 0 org-real--visibility)
- (<= level org-real--visibility)))))
-
(cl-defmethod org-real--get-children ((box org-real-box) &optional arg)
"Get all visible children of BOX.
@@ -1465,17 +1487,6 @@ PREV must already exist in PARENT."
(org-real--make-instance-helper containers parent box
skip-primary)
(unless skip-primary (oset box :primary t))))))))
-(cl-defmethod org-real--find-matching ((search-box org-real-box) (world
org-real-box))
- "Find a box in WORLD with a matching name as SEARCH-BOX."
- (when (slot-boundp search-box :name)
- (with-slots ((search-name name)) search-box
- (seq-find
- (lambda (box)
- (and (slot-boundp box :name)
- (string= search-name
- (with-slots (name) box name))))
- (org-real--expand world)))))
-
(cl-defmethod org-real--add-matching ((box org-real-box) (match org-real-box))
"Add relatives of BOX to MATCH."
(oset match :primary (or (with-slots (primary) match primary)
@@ -1544,8 +1555,9 @@ NEXT."
((or next-on-top next-in-front)
(setq next-level (+ 1 prev-level))
(setq next-behind prev-behind))
- ((member rel '("in" "on" "behind"))
+ ((member rel '("in" "on"))
(setq flex t)
+ (setq next-behind prev-behind)
(setq next-level (+ 1 prev-level)))
((string= rel "behind")
(setq flex t)
@@ -1649,8 +1661,6 @@ characters if possible."
max)))))
all-siblings
(org-real-box :y-order -1.0e+INF)))))
- (oset box :flex t)
- (oset box :behind parent-behind)
(org-real--apply-level box level)
(org-real--add-child parent box t)
(org-real--flex-adjust box world)
@@ -1777,7 +1787,7 @@ characters if possible."
"Cycle visibility of children of BOX."
(lambda ()
(interactive)
- (with-slots (children hidden-children expand-children expanded) box
+ (with-slots (children hidden-children expand-children expanded parent) box
(if (slot-boundp box :expand-children)
(progn
(funcall expand-children box)
@@ -1795,13 +1805,10 @@ characters if possible."
(setq fully-expanded nil)
(funcall expand-siblings child)
(slot-makeunbound child :expand-siblings))))
- (org-real--get-all children)))))
+ (org-real--get-all children))))
+ (org-real--flex-adjust parent (org-real--get-world parent)))
(org-real-mode-redraw)
- (let ((top (org-real--get-top box))
- (left (org-real--get-left box)))
- (forward-line (- (+ org-real--current-offset top 1 org-real-padding-y)
- (line-number-at-pos)))
- (move-to-column (+ left 1 org-real-padding-x)))))
+ (org-real--jump-to-box box)))
;;;; Utility expressions
@@ -1854,7 +1861,7 @@ characters if possible."
(truncate-string-to-width str org-real-tooltip-max-width
nil nil t)))
(when (= 0 remaining-chars)
(save-excursion (goto-char pos) (let ((inhibit-read-only t)) (insert
" ")))
- (setq remaining-chars (+ 1 remaining-chars)))
+ (setq remaining-chars 1))
(setq overlay (make-overlay pos (+ pos (min remaining-chars width))))
(overlay-put overlay 'face 'org-real-popup)
(overlay-put overlay 'display `((margin nil) ,str))
diff --git a/tests/edge-cases.org b/tests/edge-cases.org
index 0d41305..7ba56a1 100644
--- a/tests/edge-cases.org
+++ b/tests/edge-cases.org
@@ -7,21 +7,21 @@
The 1-0 is above the 1-1 on top of the 1-2.
- ┌───────┐
- │ │
- │ 1-0 │
- │ │
- └───────┘
-
- ┌───────┐
- │ │
- │ 1-1 │
- │ │
- ┌──┴───────┴──┐
- │ │
- │ 1-2 │
- │ │
- └─────────────┘
+ ╭───────╮
+ │ │
+ │ 1-0 │
+ │ │
+ ╰───────╯
+
+ ╭───────╮
+ │ │
+ │ 1-1 │
+ │ │
+ ╭──┴───────┴──╮
+ │ │
+ │ 1-2 │
+ │ │
+ ╰─────────────╯
#+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]]
@@ -29,25 +29,25 @@
The 6-1 is above the 6-2 on top of the 6-3 on top of the 6-4.
- ┌───────┐
- │ │
- │ 6-1 │
- │ │
- └───────┘
-
- ┌───────┐
- │ │
- │ 6-2 │
- │ │
- ┌──┴───────┴──┐
- │ │
- │ 6-3 │
- │ │
- ┌──┴─────────────┴──┐
- │ │
- │ 6-4 │
- │ │
- └───────────────────┘
+ ╭───────╮
+ │ │
+ │ 6-1 │
+ │ │
+ ╰───────╯
+
+ ╭───────╮
+ │ │
+ │ 6-2 │
+ │ │
+ ╭──┴───────┴──╮
+ │ │
+ │ 6-3 │
+ │ │
+ ╭──┴─────────────┴──╮
+ │ │
+ │ 6-4 │
+ │ │
+ ╰───────────────────╯
#+end_example
** PASS [[real://7-3/7-2?rel=on top of/7-1?rel=below][Is below an on top]]
@@ -55,20 +55,20 @@
The 7-1 is below the 7-2 on top of the 7-3.
- ┌───────┐
- │ │
- │ 7-2 │
- │ │
- ┌──┴───────┴──┐
- │ │
- │ 7-3 │
- │ │
- │ ┌───────┐ │
- │ │ │ │
- │ │ 7-1 │ │
- │ │ │ │
- │ └───────┘ │
- └─────────────┘
+ ╭───────╮
+ │ │
+ │ 7-2 │
+ │ │
+ ╭──┴───────┴──╮
+ │ │
+ │ 7-3 │
+ │ │
+ │ ╭───────╮ │
+ │ │ │ │
+ │ │ 7-1 │ │
+ │ │ │ │
+ │ ╰───────╯ │
+ ╰─────────────╯
#+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]]
@@ -76,24 +76,24 @@
The 2-1 is below the 2-2 on top of the 2-3 on top of the 2-4.
- ┌───────┐
- │ │
- │ 2-2 │
- │ │
- ┌──┴───────┴──┐
- │ │
- │ 2-3 │
- │ │
- │ ┌───────┐ │
- │ │ │ │
- │ │ 2-1 │ │
- │ │ │ │
- │ └───────┘ │
- ┌──┴─────────────┴──┐
- │ │
- │ 2-4 │
- │ │
- └───────────────────┘
+ ╭───────╮
+ │ │
+ │ 2-2 │
+ │ │
+ ╭──┴───────┴──╮
+ │ │
+ │ 2-3 │
+ │ │
+ │ ╭───────╮ │
+ │ │ │ │
+ │ │ 2-1 │ │
+ │ │ │ │
+ │ ╰───────╯ │
+ ╭──┴─────────────┴──╮
+ │ │
+ │ 2-4 │
+ │ │
+ ╰───────────────────╯
#+end_example
** PASS [[real://3-3?rel=in/3-2?rel=in front of/3-1?rel=above][Is above an in
front]]
@@ -101,21 +101,21 @@
The 3-1 is above the 3-2 in front of the 3-3.
- ┌─────────────┐
- │ │
- │ 3-3 │
- │ │
- │ ┌───────┐ │
- │ │ │ │
- │ │ 3-1 │ │
- │ │ │ │
- │ └───────┘ │
- │ │
- │ ┌───────┐ │
- │ │ │ │
- │ │ 3-2 │ │
- │ │ │ │
- └──┴───────┴──┘
+ ╭─────────────╮
+ │ │
+ │ 3-3 │
+ │ │
+ │ ╭───────╮ │
+ │ │ │ │
+ │ │ 3-1 │ │
+ │ │ │ │
+ │ ╰───────╯ │
+ │ │
+ │ ╭───────╮ │
+ │ │ │ │
+ │ │ 3-2 │ │
+ │ │ │ │
+ ╰──┴───────┴──╯
#+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]]
@@ -123,25 +123,25 @@
The 5-1 is above the 5-2 in front of the 5-3 in front of the 5-4.
- ┌───────────────────┐
- │ │
- │ 5-4 │
- │ │
- │ ┌─────────────┐ │
- │ │ │ │
- │ │ 5-3 │ │
- │ │ │ │
- │ │ ┌───────┐ │ │
- │ │ │ │ │ │
- │ │ │ 5-1 │ │ │
- │ │ │ │ │ │
- │ │ └───────┘ │ │
- │ │ │ │
- │ │ ┌───────┐ │ │
- │ │ │ │ │ │
- │ │ │ 5-2 │ │ │
- │ │ │ │ │ │
- └──┴──┴───────┴──┴──┘
+ ╭───────────────────╮
+ │ │
+ │ 5-4 │
+ │ │
+ │ ╭─────────────╮ │
+ │ │ │ │
+ │ │ 5-3 │ │
+ │ │ │ │
+ │ │ ╭───────╮ │ │
+ │ │ │ │ │ │
+ │ │ │ 5-1 │ │ │
+ │ │ │ │ │ │
+ │ │ ╰───────╯ │ │
+ │ │ │ │
+ │ │ ╭───────╮ │ │
+ │ │ │ │ │ │
+ │ │ │ 5-2 │ │ │
+ │ │ │ │ │ │
+ ╰──┴──┴───────┴──┴──╯
#+end_example
** PASS [[real://4-3/4-2?rel=in front of/4-1?rel=below][Is below an in front]]
@@ -149,21 +149,21 @@
The 4-1 is below the 4-2 in front of the 4-3.
- ┌─────────────┐
- │ │
- │ 4-3 │
- │ │
- │ ┌───────┐ │
- │ │ │ │
- │ │ 4-2 │ │
- │ │ │ │
- └──┴───────┴──┘
-
- ┌───────┐
- │ │
- │ 4-1 │
- │ │
- └───────┘
+ ╭─────────────╮
+ │ │
+ │ 4-3 │
+ │ │
+ │ ╭───────╮ │
+ │ │ │ │
+ │ │ 4-2 │ │
+ │ │ │ │
+ ╰──┴───────┴──╯
+
+ ╭───────╮
+ │ │
+ │ 4-1 │
+ │ │
+ ╰───────╯
#+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]]
@@ -171,25 +171,25 @@
The 8-1 is below the 8-2 in front of the 8-3 in front of the 8-4.
- ┌───────────────────┐
- │ │
- │ 8-4 │
- │ │
- │ ┌─────────────┐ │
- │ │ │ │
- │ │ 8-3 │ │
- │ │ │ │
- │ │ ┌───────┐ │ │
- │ │ │ │ │ │
- │ │ │ 8-2 │ │ │
- │ │ │ │ │ │
- └──┴──┴───────┴──┴──┘
-
- ┌───────┐
- │ │
- │ 8-1 │
- │ │
- └───────┘
+ ╭───────────────────╮
+ │ │
+ │ 8-4 │
+ │ │
+ │ ╭─────────────╮ │
+ │ │ │ │
+ │ │ 8-3 │ │
+ │ │ │ │
+ │ │ ╭───────╮ │ │
+ │ │ │ │ │ │
+ │ │ │ 8-2 │ │ │
+ │ │ │ │ │ │
+ ╰──┴──┴───────┴──┴──╯
+
+ ╭───────╮
+ │ │
+ │ 8-1 │
+ │ │
+ ╰───────╯
#+end_example
* Merging links
@@ -200,21 +200,21 @@
#+end_src
#+begin_example
- ┌─────────┐
- │ │
- │ above │
- │ │
- └─────────┘
-
- ┌──────────┐
- │ │
- │ thing1 │
- │ │
- ┌──┴──────────┴──┐
- │ │
- │ thing2 │
- │ │
- └────────────────┘
+ ╭─────────╮
+ │ │
+ │ above │
+ │ │
+ ╰─────────╯
+
+ ╭──────────╮
+ │ │
+ │ thing1 │
+ │ │
+ ╭──┴──────────┴──╮
+ │ │
+ │ thing2 │
+ │ │
+ ╰────────────────╯
#+end_example
diff --git a/tests/margin.org b/tests/margin.org
new file mode 100644
index 0000000..3fc3edd
--- /dev/null
+++ b/tests/margin.org
@@ -0,0 +1,153 @@
+#+TODO: FAIL | PASS
+
+* Opening links
+
+** Margin 0
+ :PROPERTIES:
+ :MARGIN-Y: 0
+ :MARGIN-X: 0
+ :END:
+*** PASS [[real://5-2/5-1?rel=above][above]]
+ #+begin_example
+The 5-1 is above the 5-2.
+╭───────╮
+│ │
+│ 5-1 │
+│ │
+╰───────╯
+╭───────╮
+│ │
+│ 5-2 │
+│ │
+╰───────╯
+ #+end_example
+
+*** PASS [[real://6-2/6-1?rel=below][below]]
+ #+begin_example
+The 6-1 is below the 6-2.
+╭───────╮
+│ │
+│ 6-2 │
+│ │
+╰───────╯
+╭───────╮
+│ │
+│ 6-1 │
+│ │
+╰───────╯
+ #+end_example
+
+*** PASS [[real://7-2/7-1?rel=to the left of][left]]
+ #+begin_example
+The 7-1 is to the left of the 7-2.
+╭───────╮╭───────╮
+│ ││ │
+│ 7-1 ││ 7-2 │
+│ ││ │
+╰───────╯╰───────╯
+ #+end_example
+
+*** PASS [[real://8-2/8-1?rel=to the right of][right]]
+ #+begin_example
+The 8-1 is to the right of the 8-2.
+╭───────╮╭───────╮
+│ ││ │
+│ 8-2 ││ 8-1 │
+│ ││ │
+╰───────╯╰───────╯
+ #+end_example
+
+** Margin x: 3, y: 2
+ :PROPERTIES:
+ :MARGIN-Y: 2
+ :MARGIN-X: 3
+ :END:
+*** PASS [[real://1-2/1-1][in]]
+ #+begin_example
+
+
+ The 1-1 is in the 1-2.
+
+
+ ╭─────────────╮
+ │ │
+ │ 1-2 │
+ │ │
+ │ ╭───────╮ │
+ │ │ │ │
+ │ │ 1-1 │ │
+ │ │ │ │
+ │ ╰───────╯ │
+ ╰─────────────╯
+ #+end_example
+
+*** PASS [[real://5-2/5-1?rel=above][above]]
+ #+begin_example
+
+
+ The 5-1 is above the 5-2.
+
+
+ ╭───────╮
+ │ │
+ │ 5-1 │
+ │ │
+ ╰───────╯
+
+
+ ╭───────╮
+ │ │
+ │ 5-2 │
+ │ │
+ ╰───────╯
+ #+end_example
+
+*** PASS [[real://6-2/6-1?rel=below][below]]
+ #+begin_example
+
+
+ The 6-1 is below the 6-2.
+
+
+ ╭───────╮
+ │ │
+ │ 6-2 │
+ │ │
+ ╰───────╯
+
+
+ ╭───────╮
+ │ │
+ │ 6-1 │
+ │ │
+ ╰───────╯
+ #+end_example
+
+*** PASS [[real://7-2/7-1?rel=to the left of][left]]
+ #+begin_example
+
+
+ The 7-1 is to the left of the 7-2.
+
+
+ ╭───────╮ ╭───────╮
+ │ │ │ │
+ │ 7-1 │ │ 7-2 │
+ │ │ │ │
+ ╰───────╯ ╰───────╯
+ #+end_example
+
+*** PASS [[real://8-2/8-1?rel=to the right of][right]]
+ #+begin_example
+
+
+ The 8-1 is to the right of the 8-2.
+
+
+ ╭───────╮ ╭───────╮
+ │ │ │ │
+ │ 8-2 │ │ 8-1 │
+ │ │ │ │
+ ╰───────╯ ╰───────╯
+ #+end_example
+
diff --git a/tests/padding.org b/tests/padding.org
new file mode 100644
index 0000000..a7a05ef
--- /dev/null
+++ b/tests/padding.org
@@ -0,0 +1,300 @@
+#+TODO: FAIL | PASS
+
+* Opening links
+
+** Padding 0
+ :PROPERTIES:
+ :PADDING-Y: 0
+ :PADDING-X: 0
+ :END:
+*** PASS [[real://1-2/1-1][in]]
+ #+begin_example
+
+ The 1-1 is in the 1-2.
+
+ ╭─────╮
+ │1-2 │
+ │╭───╮│
+ ││1-1││
+ │╰───╯│
+ ╰─────╯
+ #+end_example
+
+*** PASS [[real://2-2/2-1?rel=on][on]]
+ #+begin_example
+
+ The 2-1 is on the 2-2.
+
+ ╭─────╮
+ │2-2 │
+ │╭───╮│
+ ││2-1││
+ │╰───╯│
+ ╰─────╯
+ #+end_example
+
+*** PASS [[real://3-2/3-1?rel=behind][behind]]
+ #+begin_example
+
+ The 3-1 is behind the 3-2.
+
+ ╭─────╮
+ │3-2 │
+ │╭╌╌╌╮│
+ │╎3-1╎│
+ │╰╌╌╌╯│
+ ╰─────╯
+ #+end_example
+
+*** PASS [[real://4-2/4-1?rel=in front of][in front of]]
+ #+begin_example
+
+ The 4-1 is in front of the 4-2.
+
+ ╭─────╮
+ │4-2 │
+ │╭───╮│
+ ││4-1││
+ ╰┴───┴╯
+ #+end_example
+
+*** PASS [[real://5-2/5-1?rel=above][above]]
+ #+begin_example
+
+ The 5-1 is above the 5-2.
+
+ ╭───╮
+ │5-1│
+ ╰───╯
+
+ ╭───╮
+ │5-2│
+ ╰───╯
+ #+end_example
+
+*** PASS [[real://6-2/6-1?rel=below][below]]
+ #+begin_example
+
+ The 6-1 is below the 6-2.
+
+ ╭───╮
+ │6-2│
+ ╰───╯
+
+ ╭───╮
+ │6-1│
+ ╰───╯
+ #+end_example
+
+*** PASS [[real://7-2/7-1?rel=to the left of][left]]
+ #+begin_example
+
+ The 7-1 is to the left of the 7-2.
+
+ ╭───╮ ╭───╮
+ │7-1│ │7-2│
+ ╰───╯ ╰───╯
+ #+end_example
+
+*** PASS [[real://8-2/8-1?rel=to the right of][right]]
+ #+begin_example
+
+ The 8-1 is to the right of the 8-2.
+
+ ╭───╮ ╭───╮
+ │8-2│ │8-1│
+ ╰───╯ ╰───╯
+ #+end_example
+
+*** PASS [[real://9-2/9-1?rel=on top of][on top]]
+ #+begin_example
+
+ The 9-1 is on top of the 9-2.
+
+ ╭───╮
+ │9-1│
+ ╭┴───┴╮
+ │9-2 │
+ ╰─────╯
+ #+end_example
+
+** Padding x: 3, y: 2
+ :PROPERTIES:
+ :PADDING-Y: 2
+ :PADDING-X: 3
+ :END:
+*** PASS [[real://1-2/1-1][in]]
+ #+begin_example
+
+ The 1-1 is in the 1-2.
+
+ ╭─────────────────╮
+ │ │
+ │ │
+ │ 1-2 │
+ │ │
+ │ │
+ │ ╭─────────╮ │
+ │ │ │ │
+ │ │ │ │
+ │ │ 1-1 │ │
+ │ │ │ │
+ │ │ │ │
+ │ ╰─────────╯ │
+ ╰─────────────────╯
+ #+end_example
+
+*** PASS [[real://2-2/2-1?rel=on][on]]
+ #+begin_example
+
+ The 2-1 is on the 2-2.
+
+ ╭─────────────────╮
+ │ │
+ │ │
+ │ 2-2 │
+ │ │
+ │ │
+ │ ╭─────────╮ │
+ │ │ │ │
+ │ │ │ │
+ │ │ 2-1 │ │
+ │ │ │ │
+ │ │ │ │
+ │ ╰─────────╯ │
+ ╰─────────────────╯
+ #+end_example
+
+*** PASS [[real://3-2/3-1?rel=behind][behind]]
+ #+begin_example
+
+ The 3-1 is behind the 3-2.
+
+ ╭─────────────────╮
+ │ │
+ │ │
+ │ 3-2 │
+ │ │
+ │ │
+ │ ╭╌╌╌╌╌╌╌╌╌╮ │
+ │ ╎ ╎ │
+ │ ╎ ╎ │
+ │ ╎ 3-1 ╎ │
+ │ ╎ ╎ │
+ │ ╎ ╎ │
+ │ ╰╌╌╌╌╌╌╌╌╌╯ │
+ ╰─────────────────╯
+ #+end_example
+
+*** PASS [[real://4-2/4-1?rel=in front of][in front of]]
+ #+begin_example
+
+ The 4-1 is in front of the 4-2.
+
+ ╭─────────────────╮
+ │ │
+ │ │
+ │ 4-2 │
+ │ │
+ │ │
+ │ ╭─────────╮ │
+ │ │ │ │
+ │ │ │ │
+ │ │ 4-1 │ │
+ │ │ │ │
+ │ │ │ │
+ ╰───┴─────────┴───╯
+ #+end_example
+
+*** PASS [[real://5-2/5-1?rel=above][above]]
+ #+begin_example
+
+ The 5-1 is above the 5-2.
+
+ ╭─────────╮
+ │ │
+ │ │
+ │ 5-1 │
+ │ │
+ │ │
+ ╰─────────╯
+
+ ╭─────────╮
+ │ │
+ │ │
+ │ 5-2 │
+ │ │
+ │ │
+ ╰─────────╯
+ #+end_example
+
+*** PASS [[real://6-2/6-1?rel=below][below]]
+ #+begin_example
+
+ The 6-1 is below the 6-2.
+
+ ╭─────────╮
+ │ │
+ │ │
+ │ 6-2 │
+ │ │
+ │ │
+ ╰─────────╯
+
+ ╭─────────╮
+ │ │
+ │ │
+ │ 6-1 │
+ │ │
+ │ │
+ ╰─────────╯
+ #+end_example
+
+*** PASS [[real://7-2/7-1?rel=to the left of][left]]
+ #+begin_example
+
+ The 7-1 is to the left of the 7-2.
+
+ ╭─────────╮ ╭─────────╮
+ │ │ │ │
+ │ │ │ │
+ │ 7-1 │ │ 7-2 │
+ │ │ │ │
+ │ │ │ │
+ ╰─────────╯ ╰─────────╯
+ #+end_example
+
+*** PASS [[real://8-2/8-1?rel=to the right of][right]]
+ #+begin_example
+
+ The 8-1 is to the right of the 8-2.
+
+ ╭─────────╮ ╭─────────╮
+ │ │ │ │
+ │ │ │ │
+ │ 8-2 │ │ 8-1 │
+ │ │ │ │
+ │ │ │ │
+ ╰─────────╯ ╰─────────╯
+ #+end_example
+
+*** PASS [[real://9-2/9-1?rel=on top of][on top]]
+ #+begin_example
+
+ The 9-1 is on top of the 9-2.
+
+ ╭─────────╮
+ │ │
+ │ │
+ │ 9-1 │
+ │ │
+ │ │
+ ╭───┴─────────┴───╮
+ │ │
+ │ │
+ │ 9-2 │
+ │ │
+ │ │
+ ╰─────────────────╯
+ #+end_example
+
diff --git a/tests/smoke-test.org b/tests/smoke-test.org
new file mode 100644
index 0000000..7fd198e
--- /dev/null
+++ b/tests/smoke-test.org
@@ -0,0 +1,147 @@
+#+TODO: FAIL | PASS
+
+* Opening links
+
+** PASS [[real://1-2/1-1][in]]
+ #+begin_example
+
+ The 1-1 is in the 1-2.
+
+ ╭─────────────╮
+ │ │
+ │ 1-2 │
+ │ │
+ │ ╭───────╮ │
+ │ │ │ │
+ │ │ 1-1 │ │
+ │ │ │ │
+ │ ╰───────╯ │
+ ╰─────────────╯
+ #+end_example
+
+** PASS [[real://2-2/2-1?rel=on][on]]
+ #+begin_example
+
+ The 2-1 is on the 2-2.
+
+ ╭─────────────╮
+ │ │
+ │ 2-2 │
+ │ │
+ │ ╭───────╮ │
+ │ │ │ │
+ │ │ 2-1 │ │
+ │ │ │ │
+ │ ╰───────╯ │
+ ╰─────────────╯
+ #+end_example
+
+** PASS [[real://3-2/3-1?rel=behind][behind]]
+ #+begin_example
+
+ The 3-1 is behind the 3-2.
+
+ ╭─────────────╮
+ │ │
+ │ 3-2 │
+ │ │
+ │ ╭╌╌╌╌╌╌╌╮ │
+ │ ╎ ╎ │
+ │ ╎ 3-1 ╎ │
+ │ ╎ ╎ │
+ │ ╰╌╌╌╌╌╌╌╯ │
+ ╰─────────────╯
+ #+end_example
+
+** PASS [[real://4-2/4-1?rel=in front of][in front of]]
+ #+begin_example
+
+ The 4-1 is in front of the 4-2.
+
+ ╭─────────────╮
+ │ │
+ │ 4-2 │
+ │ │
+ │ ╭───────╮ │
+ │ │ │ │
+ │ │ 4-1 │ │
+ │ │ │ │
+ ╰──┴───────┴──╯
+ #+end_example
+
+** PASS [[real://5-2/5-1?rel=above][above]]
+ #+begin_example
+
+ The 5-1 is above the 5-2.
+
+ ╭───────╮
+ │ │
+ │ 5-1 │
+ │ │
+ ╰───────╯
+
+ ╭───────╮
+ │ │
+ │ 5-2 │
+ │ │
+ ╰───────╯
+ #+end_example
+
+** PASS [[real://6-2/6-1?rel=below][below]]
+ #+begin_example
+
+ The 6-1 is below the 6-2.
+
+ ╭───────╮
+ │ │
+ │ 6-2 │
+ │ │
+ ╰───────╯
+
+ ╭───────╮
+ │ │
+ │ 6-1 │
+ │ │
+ ╰───────╯
+ #+end_example
+
+
+** PASS [[real://7-2/7-1?rel=to the left of][left]]
+ #+begin_example
+
+ The 7-1 is to the left of the 7-2.
+
+ ╭───────╮ ╭───────╮
+ │ │ │ │
+ │ 7-1 │ │ 7-2 │
+ │ │ │ │
+ ╰───────╯ ╰───────╯
+ #+end_example
+
+** PASS [[real://8-2/8-1?rel=to the right of][right]]
+ #+begin_example
+
+ The 8-1 is to the right of the 8-2.
+
+ ╭───────╮ ╭───────╮
+ │ │ │ │
+ │ 8-2 │ │ 8-1 │
+ │ │ │ │
+ ╰───────╯ ╰───────╯
+ #+end_example
+
+** PASS [[real://9-2/9-1?rel=on top of][on top]]
+ #+begin_example
+
+ The 9-1 is on top of the 9-2.
+
+ ╭───────╮
+ │ │
+ │ 9-1 │
+ │ │
+ ╭──┴───────┴──╮
+ │ │
+ │ 9-2 │
+ │ │
+ ╰─────────────╯
+ #+end_example
