ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

generalize linebreak splitter in org-sql

This commit is contained in:
ndwarshuis 2018-12-26 12:32:12 -05:00
parent 82e6e8b198
commit 8fa83bf189
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
conf.org
View File

@ -2843,6 +2843,20 @@ TYPE is an org element type symbol and OBJ is a list of elements/objects."
parent parent
(nd/org-element-get-parent-type type parent))))) (nd/org-element-get-parent-type type parent)))))
(defun nd/org-element-split-by-type (type contents &optional right)
"Split org-element sequence of objects CONTENTS by first instance of TYPE.
If RIGHT is t, get the right half instead of the left."
(let ((scan
(lambda (c &optional acc)
(if c
(let ((cur (car c))
(rem (cdr c)))
(if (equal type (org-element-type cur))
(if right rem acc)
(funcall scan rem (append acc (list cur)))))
(unless right acc)))))
(funcall scan contents)))
(defun nd/org-element-get-parent-headline (obj) (defun nd/org-element-get-parent-headline (obj)
"Get the parent headline element (if any) of org-element OBJ." "Get the parent headline element (if any) of org-element OBJ."
(when obj (when obj
@ -2885,19 +2899,6 @@ parent until found or return nil if unfruitful."
(let ((parent (org-element-property :parent obj))) (let ((parent (org-element-property :parent obj)))
(nd/org-element-property-inherited prop parent)))))) (nd/org-element-property-inherited prop parent))))))
(defun nd/org-element-split-linebreak (contents &optional right)
"Split org-element sequence of objects CONTENTS by a linebreak.
If RIGHT is t, get the right half instead of the left."
(let ((scan
(lambda (c &optional acc)
(if c
(let ((cur (car c))
(rem (cdr c)))
(if (equal 'line-break (org-element-type cur))
(if right rem acc)
(funcall scan rem (append acc (list cur)))))
(unless right acc)))))
(funcall scan contents)))
#+END_SRC #+END_SRC
**** org sql constants and variables **** org sql constants and variables
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -3138,8 +3139,8 @@ ARCHIVE-FILE-PATH is the path to the archive file."
(paragraph (nd/org-element-find-type 'paragraph item)) (paragraph (nd/org-element-find-type 'paragraph item))
(contents (org-element-contents paragraph)) (contents (org-element-contents paragraph))
;; split entry into right / left components via linebreak ;; split entry into right / left components via linebreak
(left (nd/org-element-split-linebreak contents)) (left (nd/org-element-split-by-type 'line-break contents))
(right (nd/org-element-split-linebreak contents t)) (right (nd/org-element-split-by-type 'line-break contents t))
(note (string-trim (substring-no-properties (note (string-trim (substring-no-properties
(org-element-interpret-data right)))) (org-element-interpret-data right))))
(entry-str (string-trim (substring-no-properties (entry-str (string-trim (substring-no-properties