[201_64] 支持 Around 多种括号类型的切换 (#2646)

Author: AXeonV

TeXmacs/plugins/lang/dic/en_US/zh_CN.scm

@@ -3,20 +3,28 @@
 ("Advanced header" "高级页眉")
 ("Advanced page numbering" "高级页码")
 ("Allow multiple spaces" "允许多个空格")
+("Angle brackets ⟨ ⟩" "尖括号 ⟨ ⟩")
 ("Applying from" "起始于")
 ("Applying to" "结束于")
 ("As" "作为")
+("Backslash \\ /" "反斜线 \\ /")
 ("BibTeX command" "BibTeX命令")
 ("Bitmap export resolution (dpi):" "Bitmap 导出分辨率（dpi）：")
+("Braces { }" "大括号 { }")
+("Brackets [ ]" "中括号 [ ]")
 ("Buy Now!" "现在购买！")
+("Ceiling brackets ⌈ ⌉" "上取整括号 ⌈ ⌉")
 ("CJK" "中日韩")
 ("CSS stylesheet:" "CSS 样式表：")
 ("Clipboard image format:" "剪贴板图片格式：")
 ("Conservative conversion options" "保守的转换选项")
 ("Correction" "纠正")
 ("Default document style" "默认文档样式")
 ("Delete::keyboard" "Delete")
+("Double brackets ⟦ ⟧" "双括号 ⟦ ⟧")
+("Double vertical bars ‖ ‖" "双竖线 ‖ ‖")
 ("Documents in separate windows" "单个文档独立窗口")
+("Empty brackets . ." "空括号 . .")
 ("End::keyboard" "End")
 ("Expand TeXmacs macros with no LaTeX equivalents" "展开没有 LaTeX 等价项的 TeXmacs 宏")
 ("Experimental features (to be used with care)" "实验性功能（请谨慎使用）")
@@ -26,6 +34,7 @@
 ("Export mathematical formulas as MathML" "将数学公式导出为MathML")
 ("Exporting" "导出中")
 ("Failed to save" "无法保存")
+("Floor brackets ⌊ ⌋" "下取整括号 ⌊ ⌋")
 ("GNU FDL" "GNU自由文档许可证")
 ("GNU TeXmacs comes without any form of legal warranty" "GNU TeXmacs 无任何形式的法律保证")
 ("GNU TeXmacs falls under the GNU general public license" "GNU TeXmacs 使用 GNU 通用公共许可授权")
@@ -44,6 +53,7 @@
 ("Open Pdf?" "打开 Pdf？")
 ("PageDown::keyboard" "PageDown")
 ("PageUp::keyboard" "PageUp")
+("Parentheses ( )" "小括号 ( )")
 ("Pause" "暂停")
 ("Plain::theme" "浅色")
 ("Play" "播放")
@@ -67,6 +77,7 @@
 ("SimHei" "黑体")
 ("SimKai" "楷体")
 ("SimSun" "宋体")
+("Slash / \\" "斜线 / \\")
 ("Slovak" "斯洛伐克语")
 ("Slovenian" "斯洛维尼亚语")
 ("Space::format" "空白")
@@ -99,6 +110,7 @@
 ("Windows Bitmap" "Windows位图")
 ("You do not have read access to" "你没有权限读取")
 ("You can save the document using Save as." "可通过另存为保存文档。")
+("Vertical bars | |" "竖线 | |")
 ("a series" "A系列")
 ("abbreviation" "缩写")
 ("about menu" "关于菜单")

TeXmacs/progs/math/math-edit.scm

@@ -437,13 +437,13 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define lbrackets
-  '("(" "[" "{" "<langle>" "|" "<||>" "<lfloor>" "<lceil>" "<llbracket>"))
+  '("(" "[" "{" "<langle>" "<llbracket>" "<lfloor>" "<lceil>" "|" "<||>" "/" "\\" "<nobracket>"))
 
 (define mbrackets
   '("|" "<||>" "/" "\\"))
 
 (define rbrackets
-  '(")" "]" "}" "<rangle>" "|" "<||>" "<rfloor>" "<rceil>" "<rrbracket>"))
+  '(")" "]" "}" "<rangle>" "<rrbracket>" "<rfloor>" "<rceil>" "|" "<||>" "\\" "/" "<nobracket>"))
 
 (define (bracket-circulate t forward? brackets)
   (cond ((and (tree-in? t '(around around*))
@@ -1039,6 +1039,137 @@ list
         (noop))
     (noop))
 
+(define bracket-variant-alist
+  ;; 括号变体统一映射表和辅助函数
+  ;; 定义统一的变体映射表：每个变体对应左右括号符号
+  '((parentheses      "(" ")")
+    (brackets         "[" "]")
+    (braces           "{" "}")
+    (angle            "<langle>" "<rangle>")
+    (double           "<llbracket>" "<rrbracket>")
+    (floor            "<lfloor>" "<rfloor>")
+    (ceiling          "<lceil>" "<rceil>")
+    (vertical         "|" "|")
+    (double-vertical  "<||>" "<||>")
+    (slash            "/" "\\")
+    (backslash        "\\" "/")
+    (empty            "<nobracket>" "<nobracket>")))
+
+(define (get-bracket-node child)
+  ;; 获取括号节点中的实际符号节点
+  (cond ((tree-atomic? child) child)
+        ((and (tree-in? child '(left right))
+              (> (tree-arity child) 1))
+         (tree-ref child 0))
+        (else #f)))
+
+;; 辅助函数：
+(define (set-bracket-node! child sym)
+  ;; 设置括号节点中的符号
+  (with node (get-bracket-node child)
+    (when node (tree-assign node sym))))
+
+(define (bracket-set-pair t lb rb)
+  ;; 括号设置函数
+  ;; 实际修改 around/around* 节点的左右括号符号
+  (when (== (tree-arity t) 3)
+    (set-bracket-node! (tree-ref t 0) lb)
+    (set-bracket-node! (tree-ref t 2) rb)))
+
+(define (get-bracket-symbol child)
+  ;; 括号符号提取器
+  ;; 从子节点中提取括号符号字符串
+  (with node (get-bracket-node child)
+    (if node (tree->string node) "")))
+
+(define (bracket-pair->variant lb rb)
+  ;; 符号到标识的映射器
+  ;; 将具体的括号符号对映射到伪变体标识符
+  (let loop ((alist bracket-variant-alist))
+    (cond ((null? alist) #f)
+          ((and (== lb (cadar alist))
+                (== rb (caddar alist)))
+           (caar alist))
+          (else (loop (cdr alist))))))
+
+#|
+get-bracket-variant
+从 around/around* 节点检测当前括号类型，返回伪变体标识
+
+语法
+----
+(get-bracket-variant t)
+
+参数
+----
+t : tree
+必须是 around 或 around* 节点，表示一个括号结构
+
+返回值
+----
+symbol | boolean
+- 成功时：返回对应的变体标识符（如 parentheses, brackets, braces 等）
+- 失败时：返回 #f（当 t 不是 around/around* 节点或 arity 不为 3 时）
+
+逻辑
+----
+1. 检查 t 是否为 around 或 around* 节点（通过 :require 条件）
+2. 验证节点的 arity 是否为 3（左括号、内容、右括号）
+3. 通过 get-bracket-symbol 提取左右括号的实际符号字符串
+4. 调用 bracket-pair->variant 将符号对映射到预定义的变体标识
+
+注意
+----
+此函数是括号变体系统的一部分，用于检测当前括号的显示样式。
+变体标识定义在 bracket-variant-alist 中，如 parentheses, brackets, braces 等
+|#
+(tm-define (get-bracket-variant t)
+  ;; 当前括号类型检测器
+  ;; 从 around 节点检测当前括号类型，返回伪变体标识
+  (:require (tree-in? t '(around around*)))
+  (if (== (tree-arity t) 3)
+      (with lb (get-bracket-symbol (tree-ref t 0))
+        (with rb (get-bracket-symbol (tree-ref t 2))
+          (bracket-pair->variant lb rb)))
+      #f))
+
+#|
+variant-set
+变体切换系统的重载函数，将伪变体标识映射到具体的括号符号对
+
+语法
+----
+(variant-set t v)
+
+参数
+----
+t : tree
+必须是 around 或 around* 节点，表示一个括号结构
+v : symbol
+变体标识符，如 parentheses, brackets, braces 等（定义在 bracket-variant-alist 中）
+
+返回值
+----
+不返回
+
+逻辑
+----
+1. 在 bracket-variant-alist 中查找变体标识 v
+2. 如果找到对应的括号符号对，调用 bracket-set-pair 设置节点的左右括号
+
+注意
+----
+此函数是括号变体系统的一部分，用于切换括号的显示样式。
+是通用变体系统 variant-set 针对 around/around* 节点的重载实现
+|#
+(tm-define (variant-set t v)
+  ;; 变体切换系统的重载函数
+  ;; 将伪变体标识映射到具体的括号符号对，调用 bracket-set-pair
+  (:require (tree-in? t '(around around*)))
+  (let ((pair (assoc v bracket-variant-alist)))
+    (when pair
+      (bracket-set-pair t (cadr pair) (caddr pair)))))
+
 (tm-define (kbd-paste)
   (:require (in-math?))
   ;; 在数学模式下粘贴

TeXmacs/progs/math/math-menu.scm

@@ -12,7 +12,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (texmacs-module (math math-menu)
-  (:use (table table-edit)))
+  (:use (table table-edit)
+        (math math-edit)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Inserting mathematical markup
@@ -1465,12 +1466,35 @@
   (list "math-brackets"))
 
 (tm-define (focus-tag-name l)
+  ;; 在 around 环境中时
+  ;; get-bracket-variant 如果能获取到伪变体则走伪变体 focus-tag-name
+  ;; 否则返回默认的 "Around"
   (:require (in? l '(around around*)))
-  "Around")
+  (with t (focus-tree)
+    (if (and t (tree-in? t '(around around*)))
+        (with v (get-bracket-variant t)
+          (if v (focus-tag-name v) "Around"))
+        "Around")))
+
+(tm-define (focus-tag-name l)
+  ;; 具体括号类型伪变体表
+  (:require (in? l '(parentheses brackets braces angle double floor ceiling vertical double-vertical slash backslash empty)))
+  (cond ((== l 'parentheses) "Parentheses ( )")
+        ((== l 'brackets) "Brackets [ ]")
+        ((== l 'braces) "Braces { }")
+        ((== l 'angle) "Angle brackets ⟨ ⟩")
+        ((== l 'double) "Double brackets ⟦ ⟧")
+        ((== l 'floor) "Floor brackets ⌊ ⌋")
+        ((== l 'ceiling) "Ceiling brackets ⌈ ⌉")
+        ((== l 'vertical) "Vertical bars | |")
+        ((== l 'double-vertical) "Double vertical bars ‖ ‖")
+        ((== l 'slash) "Slash / \\")
+        ((== l 'backslash) "Backslash \\ /")
+        ((== l 'empty) "Empty brackets . .")))
 
 (tm-define (focus-variants-of t)
   (:require (tree-in? t '(around around*)))
-  '(around))
+  '(parentheses brackets braces angle double floor ceiling vertical double-vertical slash backslash empty))
 
 (tm-menu (focus-toggle-menu t)
   (:require (tree-in? t '(around around*)))

devel/201_64.md

@@ -0,0 +1,17 @@
+# [201_64] 支持 Around 多种括号类型的切换
+
+## 如何测试
+1. 进入数学模式，输入括号（如 `(` 或 `[`）进入 around 环境
+2. 观察顶部菜单栏，原来显示是 `Around` 标签且不可点击，现在是具体括号类型名且可以点击进去
+3. 点击这个括号类型标签，会出现 12 种括号类型，应该可正常选择与切换
+4. 使用 `Shift+Alt+上下键` 循环切换括号类型，确认切换顺序与菜单列表一致
+
+## 2026/1/22
+### What
+为 around 环境实现完整的括号类型切换功能，支持通过菜单选择和 `Shift+Alt+上下键` 快捷键循环 切换 12 种常见括号类型
+
+### How
+1. 扩展 `lbrackets` 和 `rbrackets` 列表，补全斜线、反斜线和空括号类型，使 `Shift+Alt+上下键` 支持全部 12 种括号循环
+2. 定义伪变体系统：`focus-variants-of` 返回 12 个伪变体标识，使 around 菜单标签自动显示为可点击的下拉箭头并生成变体选择菜单
+3. 实现 `variant-set` 函数重载，将伪变体标识映射到具体的括号符号对，并处理括号尺寸信息的保留
+4. **实现动态标签显示**：修改 `focus-tag-name` 函数，根据当前括号符号动态显示具体括号类型名称（如 "Parentheses ( )"、"Brackets [ ]" 等）