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

Treat all Markdown keywords uniformly

Browse source 
In TOML we were doing this:

    ["one"]

And this:

    ["one", "two", "three"]

Now we do the same for YAML, as the space-separated list did not seem
correct.
This commit is contained in:
Protesilaos Stavrou 2022-07-27 17:57:54 +03:00
parent bb10f74f15
commit cb9af65f28
No known key found for this signature in database
GPG key ID: 99BD6459CD5CA3EA
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
denote.el
View file

@ -552,11 +552,11 @@ which include the starting dot or the return value of
(t
(format "%s%s%s" path id ext)))))
(defun denote--format-markdown-keywords (seq)
"Quote and downcase elements in SEQ."
(mapconcat (lambda (k)
(format "%S" (downcase k)))
seq ", "))
(defun denote--format-markdown-keywords (keywords)
"Quote, downcase, and comma-separate elements in KEYWORDS."
(format "[%s]" (mapconcat (lambda (k)
(format "%S" (downcase k)))
keywords ", ")))
(defun denote--file-meta-keywords (keywords &optional type)
"Prepare KEYWORDS for inclusion in the file's front matter.
@ -568,9 +568,9 @@ With optional TYPE, format the keywords accordingly (this might
be `toml' or, in the future, some other spec that needss special
treatment)."
(let ((kw (denote--sluggify-keywords keywords)))
(pcase type
('markdown-toml (format "[%s]" (denote--format-markdown-keywords kw)))
(_ (mapconcat #'downcase kw " ")))))
(if (or (eq type 'markdown-toml) (eq type 'markdown-yaml) (eq type 'md))
(denote--format-markdown-keywords kw)
(mapconcat #'downcase kw " "))))
(defvar denote-toml-front-matter
"+++
@ -638,10 +638,12 @@ TITLE, DATE, KEYWORDS, FILENAME, ID are all strings which are
Optional FILETYPE is one of the values of `denote-file-type',
else that variable is used."
(let ((kw-space (denote--file-meta-keywords keywords))
(kw-toml (denote--file-meta-keywords keywords 'markdown-toml)))
(kw-md (denote--file-meta-keywords keywords 'md)))
;; TODO 2022-07-27: Rewrite this (and/or related) to avoid
;; duplication with the markdown flavours.
(pcase (or filetype denote-file-type)
('markdown-toml (format denote-toml-front-matter title date kw-toml id))
('markdown-yaml (format denote-yaml-front-matter title date kw-space id))
('markdown-toml (format denote-toml-front-matter title date kw-md id))
('markdown-yaml (format denote-yaml-front-matter title date kw-md id))
('text (format denote-text-front-matter title date kw-space id denote-text-front-matter-delimiter))
(_ (format denote-org-front-matter title date kw-space id)))))