From 145a39e04453778529fb4d40c028d000b1784177 Mon Sep 17 00:00:00 2001 From: divyansharma001 Date: Mon, 16 Mar 2026 01:54:32 +0530 Subject: [PATCH] =?UTF-8?q?[201=5F96]=20fix:=20accent=20marks=20tooltip=20?= =?UTF-8?q?shows=20option=20key=20=E2=8C=A5=20on=20macOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devel/201_96.md | 28 ++++++++++++++++++++++++++++ src/Texmacs/Server/tm_config.cpp | 13 +------------ 2 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 devel/201_96.md diff --git a/devel/201_96.md b/devel/201_96.md new file mode 100644 index 0000000000..7d08db14ff --- /dev/null +++ b/devel/201_96.md @@ -0,0 +1,28 @@ +# [201_96] fix: accent marks tooltip shows option key ⌥ on macOS + +## How to Test + +1. Open Mogan on macOS. +2. Enter math mode and open the accent insert popup (click the `~` accent button in the toolbar). +3. Hover over any accent button (e.g., the tilde accent `tm_tilda.xpm`). +4. The tooltip should display `等效快捷键: (⌥ ~)` — the Option key symbol ⌥ followed by `~`. +5. Previously it showed a wrong symbol (⊙) instead of ⌥. + +## 2026/03/16 Fix macOS accent tooltip displaying ⊙ instead of ⌥ + +### What +Remove the `A-` → `escape` conversion in `kbd_system_prevails` in +`src/Texmacs/Server/tm_config.cpp`. + +### Why +On macOS, `kbd_system_prevails` was converting `"A-~"` (Option+~) to +`"escape ~"` for tooltip display. The Escape key symbol (⎋, U+238B) was +then shown instead of the Option key symbol (⌥, U+2325), appearing as ⊙ +in the apple-lucida font rendering at small size. Since Mogan on macOS +uses the Option key (A-) as the accent modifier, the tooltip should show +⌥ directly. + +### How +Simplified `kbd_system_prevails` to return the input string unchanged. +Now `"A-~"` is decoded by `system_kbd_initialize` as `"<#2325>"` (⌥), +giving the correct tooltip `(⌥ ~)`. diff --git a/src/Texmacs/Server/tm_config.cpp b/src/Texmacs/Server/tm_config.cpp index 9310799e05..57410c0118 100644 --- a/src/Texmacs/Server/tm_config.cpp +++ b/src/Texmacs/Server/tm_config.cpp @@ -326,18 +326,7 @@ kbd_render (tree t) { } static string -kbd_system_prevails (string s) { - string laf= get_preference ("look and feel"); - bool mac= os_macos () && (laf == "default" || laf == "macos"); - if (mac && starts (s, "A-")) { - string ss= s (2, N (s)); - string r = "escape " * ss; - if (starts (ss, "S-")) ss= ss (2, N (ss)); - if (N (ss) == 1) return r; - else return s; - } - else return s; -} +kbd_system_prevails (string s) { return s; } tree tm_config_rep::kbd_system_rewrite (string s) {