dbo/.emacs.d
dbo
/
.emacs.d
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: dbo:159c8c0eb692878751af8ce30ff7bd697bbc4c08
Branches Tags
dbo:master
...
compare: dbo:eafebe1cb960ef05da7b48eaaf3d6aeb3ae71a3a
Branches Tags
dbo:master

2 Commits
159c8c0eb6 ... eafebe1cb9

Author SHA1 Message Date
Daniel - eafebe1cb9
Add simple function to directly render html from a file 
This is simpler than opening the file in a buffer and calling shr-render-buffer,
with some buffer maneuvring afterwards.
 2021-12-13 21:17:45 +01:00
Daniel - cedaae00e8
Make template copy function more robust 
Instead of going upward from the end, we now just start from the beginning and
skip all drawers we may encounter.  This should also allow to copy subtrees in
templates, although adjustments to the headline indentations might be necessary
if the template and point are on different levels.
 2021-12-13 21:17:18 +01:00
2 changed files with 24 additions and 11 deletions
Show Stats Expand all files Collapse all files

27
site-lisp/db-org.el
View File

@ -603,18 +603,23 @@ query for it."
(save-mark-and-excursion (save-mark-and-excursion
(let ((template-element (org-with-point-at pom (let ((template-element (org-with-point-at pom
(org-element-at-point)))) (org-element-at-point))))
;; Starting from the end of the last element in the subtree,
;; we go up until we find a drawer or a headline; everything
;; in between is considered to be the body.
(let ((content-end (org-element-property :contents-end template-element)) (let ((content-end (org-element-property :contents-end template-element))
content-begin current-element) current-element
(goto-char content-end) content-begin)
(while (progn ;; Start finding the beginning of the template contents from the top …
(setq current-element (org-element-at-point)) (goto-char (org-element-property :contents-begin template-element))
(not (memq (org-element-type current-element) ;; … but skip any drawers we may find.
'(drawer property-drawer headline)))) (setq current-element (org-element-at-point))
(setq content-begin (org-element-property :begin current-element)) (while (memq (org-element-type current-element)
(goto-char (1- content-begin))) '(drawer property-drawer))
(goto-char (org-element-property :end current-element))
(setq current-element (org-element-at-point)))
;; Now we are at the beginning of the contents, let's copy
;; that, but only if it exists and is not empty.
(setq content-begin (org-element-property :begin current-element))
(unless (and content-begin
(< content-begin content-end))
(user-error "Cannot find content in template, or content is empty"))
(string-trim-right (string-trim-right
(buffer-substring-no-properties content-begin content-end)))))))) (buffer-substring-no-properties content-begin content-end))))))))
(insert body) (insert body)

8
site-lisp/db-utils.el
View File

@ -20,6 +20,7 @@
(require 'calc-forms) (require 'calc-forms)
(require 'ert) (require 'ert)
(require 's) (require 's)
(require 'shr)
(autoload 'async-start "async") (autoload 'async-start "async")
(autoload 'lispy-mode "lispy") (autoload 'lispy-mode "lispy")
@ -454,6 +455,13 @@ Does not replace CRLF with CRCRLF, and so on."
(file-exists-p (concat project "/.git")))) (file-exists-p (concat project "/.git"))))
projectile-known-projects)))) projectile-known-projects))))
(defun db/shr-render-file (file)
"Display the HTML rending of the contents of FILE."
(interactive "f")
(unless (file-readable-p file)
(user-error "Cannot read file: %s" file))
(shr-render-buffer (find-file-noselect file)))
;; Base45 Decoding ;; Base45 Decoding