branch: elpa/casual
commit 80dcd656c1508882e39c60dce9318708efb7a533
Merge: a762521e06 b87046c0de
Author: Charles Choi <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #481 from kickingvegas/402-redo-unicode-symbols-for-info
Redo Info Menu Unicode Symbols
---
docs/casual.texi | 7 ++++-
docs/images/casual-info-screenshot.png | Bin 140737 -> 101470 bytes
docs/images/casual-info-unicode-screenshot.png | Bin 0 -> 72140 bytes
docs/info.org | 7 ++++-
lisp/casual-info-utils.el | 18 +++++++-----
lisp/casual-info.el | 39 ++++++++++++-------------
tests/test-casual-info-utils.el | 35 ++++++++++++----------
7 files changed, 60 insertions(+), 46 deletions(-)
diff --git a/docs/casual.texi b/docs/casual.texi
index 31bedafe93..f2e75ae2b3 100644
--- a/docs/casual.texi
+++ b/docs/casual.texi
@@ -4078,8 +4078,13 @@ Command related to structurally navigating an Info
document. Note that these com
Miscellaneous commands for working with an Info document. Included are
commands for bookmarks@comma{} copying the current node name@comma{} and
cloning the buffer.
@end table
+
@subsubheading Info Unicode Symbol Support
-By enabling “@kbd{u} Use Unicode Symbols” from the Settings menu@comma{}
Casual Info will use Unicode symbols as appropriate in its menus.
+
+@image{images/casual-info-unicode-screenshot,,,,png}
+
+
+By enabling “@kbd{u} Use Unicode Symbols” from the Settings menu@comma{}
Casual Info will use Unicode symbols as appropriate in its menus.
For more info on using Unicode symbols@comma{} please refer to @ref{UX
Conventions, , UX Conventions}.
diff --git a/docs/images/casual-info-screenshot.png
b/docs/images/casual-info-screenshot.png
index ada840ef10..de14051cec 100644
Binary files a/docs/images/casual-info-screenshot.png and
b/docs/images/casual-info-screenshot.png differ
diff --git a/docs/images/casual-info-unicode-screenshot.png
b/docs/images/casual-info-unicode-screenshot.png
new file mode 100644
index 0000000000..b6dab3161e
Binary files /dev/null and b/docs/images/casual-info-unicode-screenshot.png
differ
diff --git a/docs/info.org b/docs/info.org
index ea5d59668d..20fe166377 100644
--- a/docs/info.org
+++ b/docs/info.org
@@ -68,7 +68,12 @@ The main menu for Casual Info is organized into the
following sections:
- Quick :: Miscellaneous commands for working with an Info document. Included
are commands for bookmarks, copying the current node name, and cloning the
buffer.
+
#+TEXINFO: @subsubheading Info Unicode Symbol Support
-By enabling “{{{kbd(u)}}} Use Unicode Symbols” from the Settings menu, Casual
Info will use Unicode symbols as appropriate in its menus.
+
+[[file:images/casual-info-unicode-screenshot.png]]
+
+
+By enabling “{{{kbd(u)}}} Use Unicode Symbols” from the Settings menu, Casual
Info will use Unicode symbols as appropriate in its menus.
For more info on using Unicode symbols, please refer to [[#ux-conventions][UX
Conventions]].
diff --git a/lisp/casual-info-utils.el b/lisp/casual-info-utils.el
index ac70dec54a..ab3d850eaa 100644
--- a/lisp/casual-info-utils.el
+++ b/lisp/casual-info-utils.el
@@ -1,6 +1,6 @@
;;; casual-info-utils.el --- Casual Info Utils -*- lexical-binding: t; -*-
-;; Copyright (C) 2024-2025 Charles Y. Choi
+;; Copyright (C) 2024-2026 Charles Y. Choi
;; Author: Charles Choi <[email protected]>
;; Keywords: tools
@@ -30,13 +30,15 @@
(require 'casual-info-variables)
(defconst casual-info-unicode-db
- '((:fast-forward . '("⏩️" "Next"))
- (:rewind . '("⏪️" "Prev"))
- (:fast-forward-or-down . '("⏩️⤵️" "Next/Down"))
- (:rewind-or-up . '("⏪️⤴️" "Prev/Up"))
- (:up . '("⏫️" "Up"))
- (:first . '("⏮️" "First"))
- (:last . '("⏭️" "Last"))
+ '((:history-back . '("⟨" "Prev"))
+ (:history-forward . '("⟩" "Next"))
+ (:backward-node . '("⟪" "Back"))
+ (:forward-node . '("⟫" "Forward"))
+ (:previous . '("←" "Prev"))
+ (:next . '("→" "Next"))
+ (:top-node . '("⤒" "Top"))
+ (:final-node . '("⤓" "Final"))
+ (:up-node . '("^" "Up"))
(:up-arrow . '("↑" "Prev"))
(:down-arrow . '("↓" "Next"))
(:scroll-up . '("📄↓" "Up"))
diff --git a/lisp/casual-info.el b/lisp/casual-info.el
index 6d4fcca4c6..1a03301df8 100644
--- a/lisp/casual-info.el
+++ b/lisp/casual-info.el
@@ -69,11 +69,11 @@
["History"
:pad-keys t
("L" "History" Info-history :transient nil)
- ("M-[" "⏪️" Info-history-back
- :description (lambda () (casual-info-unicode-get :rewind))
+ ("M-[" "←" Info-history-back
+ :description (lambda () (casual-info-unicode-get :history-back))
:transient t)
- ("M-]" "⏩️" Info-history-forward
- :description (lambda () (casual-info-unicode-get :fast-forward))
+ ("M-]" "→" Info-history-forward
+ :description (lambda () (casual-info-unicode-get :history-forward))
:transient t)]
["Scroll"
@@ -115,38 +115,37 @@
:transient t)]
["All Nodes"
- ("[" "⏪️⤴️" Info-backward-node
+ ("[" "Back" Info-backward-node
:description (lambda ()
- (casual-info-unicode-get :rewind-or-up))
+ (casual-info-unicode-get :backward-node))
:transient t)
- ("]" "⏩️⤵️" Info-forward-node
+ ("]" "Forward" Info-forward-node
:description (lambda ()
- (casual-info-unicode-get :fast-forward-or-down))
+ (casual-info-unicode-get :forward-node))
:transient t)]
["Peer Nodes"
- ("h" "⏪️" Info-prev
- :description (lambda () (casual-info-unicode-get :rewind))
+ ("h" "Prev" Info-prev
+ :description (lambda () (casual-info-unicode-get :previous))
:transient t)
- ("l" "⏩️" Info-next
- :description (lambda () (casual-info-unicode-get :fast-forward))
+ ("l" "Next" Info-next
+ :description (lambda () (casual-info-unicode-get :next))
:transient t)]
[""
- ("<" "⏮️" Info-top-node
- :description (lambda () (casual-info-unicode-get :first))
+ ("<" "Top" Info-top-node
+ :description (lambda () (casual-info-unicode-get :top-node))
:transient nil)
- (">" "⏭️" Info-final-node
- :description (lambda () (casual-info-unicode-get :last))
+ (">" "Final" Info-final-node
+ :description (lambda () (casual-info-unicode-get :final-node))
:transient nil)]
[""
:pad-keys t
- ("^" "⏫️" Info-up
- :description (lambda () (casual-info-unicode-get :up))
+ ("^" "Up" Info-up
+ :description (lambda () (casual-info-unicode-get :up-node))
:transient t)
- ("RET" "Open" Info-follow-nearest-node :transient t)
- ]]
+ ("RET" "Open" Info-follow-nearest-node :transient t)]]
["Quick"
[("J" "Jump to bookmark…" bookmark-jump :transient nil)
diff --git a/tests/test-casual-info-utils.el b/tests/test-casual-info-utils.el
index 8f29d8d21c..590976e922 100644
--- a/tests/test-casual-info-utils.el
+++ b/tests/test-casual-info-utils.el
@@ -1,6 +1,6 @@
;;; test-casual-info-utils.el --- Casual Info Utils Tests -*-
lexical-binding: t; -*-
-;; Copyright (C) 2024-2025 Charles Y. Choi
+;; Copyright (C) 2024-2026 Charles Y. Choi
;; Author: Charles Choi <[email protected]>
;; Keywords: tools
@@ -30,13 +30,15 @@
(ert-deftest test-casual-info-unicode-get ()
(let ((casual-info-use-unicode-symbols nil))
- (should (string-equal (casual-info-unicode-get :fast-forward) "Next"))
- (should (string-equal (casual-info-unicode-get :rewind) "Prev"))
- (should (string-equal (casual-info-unicode-get :fast-forward-or-down)
"Next/Down"))
- (should (string-equal (casual-info-unicode-get :rewind-or-up) "Prev/Up"))
- (should (string-equal (casual-info-unicode-get :up) "Up"))
- (should (string-equal (casual-info-unicode-get :first) "First"))
- (should (string-equal (casual-info-unicode-get :last) "Last"))
+ (should (string-equal (casual-info-unicode-get :history-back) "Prev"))
+ (should (string-equal (casual-info-unicode-get :history-forward) "Next"))
+ (should (string-equal (casual-info-unicode-get :backward-node) "Back"))
+ (should (string-equal (casual-info-unicode-get :forward-node) "Forward"))
+ (should (string-equal (casual-info-unicode-get :previous) "Prev"))
+ (should (string-equal (casual-info-unicode-get :next) "Next"))
+ (should (string-equal (casual-info-unicode-get :top-node) "Top"))
+ (should (string-equal (casual-info-unicode-get :final-node) "Final"))
+ (should (string-equal (casual-info-unicode-get :up-node) "Up"))
(should (string-equal (casual-info-unicode-get :up-arrow) "Prev"))
(should (string-equal (casual-info-unicode-get :down-arrow) "Next"))
(should (string-equal (casual-info-unicode-get :scroll-up) "Up"))
@@ -44,15 +46,16 @@
(should (string-equal (casual-info-unicode-get :paragraph) "Paragraph"))
(should (string-equal (casual-info-unicode-get :link) "Link")))
-
(let ((casual-info-use-unicode-symbols t))
- (should (string-equal (casual-info-unicode-get :fast-forward) "⏩️"))
- (should (string-equal (casual-info-unicode-get :rewind) "⏪️"))
- (should (string-equal (casual-info-unicode-get :fast-forward-or-down)
"⏩️⤵️"))
- (should (string-equal (casual-info-unicode-get :rewind-or-up) "⏪️⤴️"))
- (should (string-equal (casual-info-unicode-get :up) "⏫️"))
- (should (string-equal (casual-info-unicode-get :first) "⏮️"))
- (should (string-equal (casual-info-unicode-get :last) "⏭️"))
+ (should (string-equal (casual-info-unicode-get :history-back) "⟨"))
+ (should (string-equal (casual-info-unicode-get :history-forward) "⟩"))
+ (should (string-equal (casual-info-unicode-get :backward-node) "⟪"))
+ (should (string-equal (casual-info-unicode-get :forward-node) "⟫"))
+ (should (string-equal (casual-info-unicode-get :previous) "←"))
+ (should (string-equal (casual-info-unicode-get :next) "→"))
+ (should (string-equal (casual-info-unicode-get :top-node) "⤒"))
+ (should (string-equal (casual-info-unicode-get :final-node) "⤓"))
+ (should (string-equal (casual-info-unicode-get :up-node) "^"))
(should (string-equal (casual-info-unicode-get :up-arrow) "↑"))
(should (string-equal (casual-info-unicode-get :down-arrow) "↓"))
(should (string-equal (casual-info-unicode-get :scroll-up) "📄↓"))
