branch: externals/boxy-headings commit 01968c5a072f9e82c5f922222a714ebacc4c8560 Merge: 0dee4d712b d92ffd14df Author: Amy Grinn <grinn....@gmail.com> Commit: Amy Grinn <grinn....@gmail.com>
Merge branch 'next' into 'main' NEWS + siblings - Added NEWS file - Fixed bug where sibling relationships were not being added to child headlines. See merge request tygrdev/boxy-headings!6 --- Eldev | 15 +++++++++++++++ NEWS | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ boxy-headings.el | 4 ++-- tests/smoke.org | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 2 deletions(-) diff --git a/Eldev b/Eldev index 7a223580b6..144de0eedd 100644 --- a/Eldev +++ b/Eldev @@ -99,3 +99,18 @@ (kill-buffer)) (directory-files "tests" t "\\.org\\'")) (and (> failures 0) (error "Test run had failures"))))) + +(eldev-defcommand + boxy_headings-news (&rest _) + "Build NEWS file from gitlab releases." + (with-current-buffer + (url-retrieve-synchronously "https://gitlab.com/api/v4/projects/30139198/releases") + (delete-region (point-min) (point)) + (let ((response (json-parse-buffer :object-type 'plist :array-type 'list :null-object nil))) + (with-temp-file "NEWS" + (insert "# -*- mode: org -*-") + (dolist (release response) + (when-let ((name (plist-get release :tag_name)) + (description (plist-get release :description))) + (insert (format "\n\n* %s\n" name)) + (insert description))))))) diff --git a/NEWS b/NEWS new file mode 100644 index 0000000000..9e59406534 --- /dev/null +++ b/NEWS @@ -0,0 +1,53 @@ +# -*- mode: org -*- + +* 2.1.2 + +- Added NEWS file +- Fixed bug where sibling relationships were not being added + +* 2.1.1 + +v2.1.1 + +Fix typo that caused 'left' and 'right' to not be valid REL property values. + +See merge request tygrdev/boxy-headings!5 + +* 2.1.0 + +v2.1.0 + +Bug fixes +- Added org 9.3 dependency for emacs 26. + +Improvements +- Generalized `REL` property using regex to match, for example, all of "in front" "in front of" and "in-front". +- Added max visibility option + +Fixes #2 + +See merge request tygrdev/boxy-headings!4 + +* 2.0.0 + +2.0.0 + +- Renamed boxy-headlines to boxy-headings +- Standardized defface calls + +See merge request tygrdev/boxy-headings!3 + +* 1.0.2 + +Updated elpaignore + +See merge request tygrdev/boxy-headlines!2 + +* 1.0.1 + +1.0.1 + +- Added changes from Stefan Monnier +- Changed from cl-defmethod to defun + +See merge request tygrdev/boxy-headlines!1 diff --git a/boxy-headings.el b/boxy-headings.el index e0193b0bd1..67604837d4 100644 --- a/boxy-headings.el +++ b/boxy-headings.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2021 Free Software Foundation, Inc. ;; Author: Tyler Grinn <tylergr...@gmail.com> -;; Version: 2.1.1 +;; Version: 2.1.2 ;; File: boxy-headings.el ;; Package-Requires: ((emacs "26.1") (boxy "1.0") (org "9.3")) ;; Keywords: tools @@ -296,7 +296,7 @@ diagram." `(lambda (box) (mapc (lambda (h) (boxy-headings--add-heading h box)) - ',children)))))))) + ',siblings)))))))) ;;;; Utility expressions diff --git a/tests/smoke.org b/tests/smoke.org index d843e9667c..89ab0d7f70 100644 --- a/tests/smoke.org +++ b/tests/smoke.org @@ -123,3 +123,56 @@ │ │ ╰─────────╯ #+end_example + +* PASS Children test + #+begin_src org + ,* test + ,** Above + :PROPERTIES: + :REL: above + :END: + ,** Below + :PROPERTIES: + :REL: below + :END: + ,** Left + :PROPERTIES: + :REL: left + :END: + ,** Right + :PROPERTIES: + :REL: right + :END: + ,** In + ,** Behind + :PROPERTIES: + :REL: behind + :END: + ,** On top + :PROPERTIES: + :REL: on-top + :END: + ,** In front + :PROPERTIES: + :REL: in-front + :END: + #+end_src + #+begin_example + + ╭───────────────────────────────────────╮ + │ │ + │ *Org Src smoke.org[ org ]* │ + │ │ + │ ╭────────╮ ╔════════╗ ╭─────────╮ │ + │ │ │ ║ ║ │ │ │ + │ │ Left │ ║ test ║ │ Right │ │ + │ │ │ ║ ║ │ │ │ + │ ╰────────╯ ╚════════╝ ╰─────────╯ │ + │ │ + │ ╭─────────╮ │ + │ │ │ │ + │ │ Below │ │ + │ │ │ │ + │ ╰─────────╯ │ + ╰───────────────────────────────────────╯ + #+end_example