emacs/protesilaos.denote
1
0
Fork 0
mirror of https://github.com/protesilaos/denote.git synced 2026-09-10 07:16:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make Org export correctly add the search to the anchor

Browse source 
This is relevant when the 'denote:' link has an optional search
extension to jump to a location (same as with the standard Org 'file:'
link type). Denote uses this facility with the command
'denote-org-extras-link-to-heading', which is part of the new optional
extension 'denote-org-extras.el'.

Thanks to @fingerknight for noting that the search extension for not
part of the exported link anchor. This was done in issue 250:
<https://github.com/protesilaos/denote/issues/250>.
This commit is contained in:
Protesilaos Stavrou 2024-02-14 09:46:48 +02:00
parent 37d24168ba
commit b0eee438c1
No known key found for this signature in database
GPG key ID: 99BD6459CD5CA3EA
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.org
View file

@ -5054,8 +5054,8 @@ Denote is meant to be a collective effort. Every bit of help matters.
Niall Dooley, Paul van Gelder, Peter Prevos, Peter Smith, Suhail
Singh, Shreyas Ragavan, Stefan Thesing, Summer Emacs, Sven Seebeck,
Taoufik, TJ Stankus, Viktor Haag, Wade Mealing, Yi Liu, Ypot,
atanasj, babusri, doolio, drcxd, hpgisler, pRot0ta1p, rbenit68,
relict007, sienic, sundar bp.
atanasj, babusri, doolio, drcxd, fingerknight, hpgisler, pRot0ta1p,
rbenit68, relict007, sienic, sundar bp.
Special thanks to Peter Povinec who helped refine the file-naming
scheme, which is the cornerstone of this project.

32
denote.el
View file

@ -4047,10 +4047,9 @@ This command is meant to be used from a Dired buffer."
(declare-function org-link-open-as-file "ol" (path arg))
(defun denote-link--ol-resolve-link-to-target (link &optional path-id)
"Resolve LINK into the appropriate target.
With optional PATH-ID return a cons cell consisting of the path
and the identifier."
(defun denote-link--ol-resolve-link-to-target (link &optional full-data)
"Resolve LINK to target file, with or without additioanl search terms.
With optional FULL-DATA return a list in the form of (path id search)."
(let* ((search (and (string-match "::\\(.*\\)\\'" link)
(match-string 1 link)))
(id (if (and search (not (string-empty-p search)))
@ -4058,8 +4057,8 @@ and the identifier."
link))
(path (denote-get-path-by-id id)))
(cond
(path-id
(cons (format "%s" path) (format "%s" id)))
(full-data
(list path id search))
((and search (not (string-empty-p search)))
(concat path "::" search))
(path))))
@ -4141,17 +4140,24 @@ Also see the user option `denote-org-store-link-to-heading'."
"Export a `denote:' link from Org files.
The LINK, DESCRIPTION, and FORMAT are handled by the export
backend."
(let* ((path-id (denote-link--ol-resolve-link-to-target link :path-id))
(path (file-relative-name (car path-id)))
(p (file-name-sans-extension path))
(id (cdr path-id))
(desc (or description (concat "denote:" id))))
(let* ((path-id (denote-link--ol-resolve-link-to-target link :full-data))
(path (file-relative-name (nth 0 path-id)))
(id (nth 1 path-id))
(search (nth 2 path-id))
(anchor (file-name-sans-extension path))
(desc (cond
(description)
(search (format "denote:%s::%s" id search))
(t (concat "denote:" id)))))
(cond
((eq format 'html) (format "<a href=\"%s.html\">%s</a>" p desc))
((eq format 'html)
(if search
(format "<a href=\"%s.html%s\">%s</a>" anchor search desc)
(format "<a href=\"%s.html\">%s</a>" anchor desc)))
((eq format 'latex) (format "\\href{%s}{%s}" (replace-regexp-in-string "[\\{}$%&_#~^]" "\\\\\\&" path) desc))
((eq format 'texinfo) (format "@uref{%s,%s}" path desc))
((eq format 'ascii) (format "[%s] <denote:%s>" desc path)) ; NOTE 2022-06-16: May be tweaked further
((eq format 'md) (format "[%s](%s.md)" desc p))
((eq format 'md) (format "[%s](%s.md)" desc anchor))
(t path))))
;; The `eval-after-load' part with the quoted lambda is adapted from