Update .orgconfig

2 files changed, 12 insertions, 9 deletions

diff --git a/docs/.orgconfig b/docs/.orgconfig
index b7bc0e4..bdaba4a 100644
--- a/docs/.orgconfig
+++ b/docs/.orgconfig
@@ -1,15 +1,18 @@
 # -*- mode:org -*-
+# Copyright (C) 2021-2024 Jonas Bernoulli
+# SPDX-License-Identifier: GPL-3.0-or-later
+# URL: https://github.com/emacscollective/org-macros
+# Visit that to see these macros in a human-readable format.
+
+#+language: en
 
 #+options: H:4 num:3 toc:2 compact-itemx:t
 #+property: header-args :eval never
 
-#+macro: kbd (eval (let ((case-fold-search nil) (regexp (regexp-opt '("SPC" "RET" "LFD" "TAB" "BS" "ESC" "DELETE" "SHIFT" "Ctrl" "Meta" "Alt" "Cmd" "Super" "UP" "LEFT" "RIGHT" "DOWN") 'words))) (format "@@texinfo:@kbd{@@%s@@texinfo:}@@" (replace-regexp-in-string regexp "@@texinfo:@key{@@\\&@@texinfo:}@@" $1 t))))
 #+macro: year (eval (format-time-string "%Y"))
-#+macro: version (eval (if-let ((tag (ignore-errors (car (process-lines "git" "describe" "--exact-match"))))) (concat "version " (substring tag 1)) (or (ignore-errors (car (process-lines "git" "describe"))) "version (unknown)")))
-
+#+macro: version (eval (if-let ((tag (ignore-errors (car (process-lines "git" "describe" "--exact-match"))))) (concat "version " (substring tag 1)) (or (ignore-errors (car (process-lines "git" "describe"))) (concat "version " (or $1 "<unknown>")))))
+#+macro: kbd (eval (format "@@texinfo:@kbd{@@%s@@texinfo:}@@" (let (case-fold-search) (replace-regexp-in-string (regexp-opt '("BS" "TAB" "RET" "ESC" "SPC" "DEL" "LFD" "DELETE" "SHIFT" "Ctrl" "Meta" "Alt" "Cmd" "Super" "UP" "LEFT" "RIGHT" "DOWN") 'words) "@@texinfo:@key{@@\\&@@texinfo:}@@" $1 t))))
+#+macro: kbdvar (eval (format "@@texinfo:@kbd{@@%s@@texinfo:}@@" (let (case-fold-search) (replace-regexp-in-string "<\\([a-zA-Z-]+\\)>" "@@texinfo:@var{@@\\1@@texinfo:}@@" (replace-regexp-in-string (regexp-opt '("BS" "TAB" "RET" "ESC" "SPC" "DEL" "LFD" "DELETE" "SHIFT" "Ctrl" "Meta" "Alt" "Cmd" "Super" "UP" "LEFT" "RIGHT" "DOWN") 'words) "@@texinfo:@key{@@\\&@@texinfo:}@@" $1 t) t))))
+#+macro: codevar (eval (format "@@texinfo:@code{@@%s@@texinfo:}@@" (let (case-fold-search) (replace-regexp-in-string "\\([A-Z][A-Z-]+\\)" "@@texinfo:@var{@@\\&@@texinfo:}@@" $1 t))))
 #+macro: var @@texinfo:@var{@@$1@@texinfo:}@@
-#+macro: kbdvar (eval (format "@@texinfo:@kbd{@@%s@@texinfo:}@@" (let (case-fold-search) (replace-regexp-in-string "<\\([a-zA-Z-]+\\)>" "@@texinfo:@var{@@\\1@@texinfo:}@@" (replace-regexp-in-string "\\<\\(Alt\\|BS\\|C\\(?:md\\|trl\\)\\|D\\(?:EL\\(?:ETE\\)?\\|OWN\\)\\|ESC\\|L\\(?:EFT\\|FD\\)\\|Meta\\|R\\(?:\\(?:E\\|IGH\\)T\\)\\|S\\(?:HIFT\\|PC\\|uper\\)\\|TAB\\|UP\\)\\>" "@@texinfo:@key{@@\\&@@texinfo:}@@" $1 t) t))))
-#+macro: codevar (eval (let (case-fold-search) (format "@@texinfo:@code{@@%s@@texinfo:}@@" (replace-regexp-in-string "\\([A-Z][A-Z-]+\\)" "@@texinfo:@var{@@\\&@@texinfo:}@@" $1 t))))
 #+macro: dfn @@texinfo:@dfn{@@$1@@texinfo:}@@
-
-#+language: en
diff --git a/docs/transient.org b/docs/transient.org
index 8dadc66..d3b157f 100644
--- a/docs/transient.org
+++ b/docs/transient.org
@@ -7,7 +7,7 @@
 #+texinfo_dir_category: Emacs misc features
 #+texinfo_dir_title: Transient: (transient).
 #+texinfo_dir_desc: Transient Commands
-#+subtitle: for {{{version}}}
+#+subtitle: for {{{version(0.7.4)}}}
 
 #+setupfile: .orgconfig
 
@@ -20,7 +20,7 @@ resource to get over that hurdle is Psionic K's interactive tutorial,
 available at https://github.com/positron-solutions/transient-showcase.
 
 #+texinfo: @noindent
-This manual is for Transient {{{version}}}.
+This manual is for Transient {{{version(0.7.4)}}}.
 
 #+texinfo: @insertcopying
 :END: