Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions TeXmacs/progs/text/cyrillic/cp1251-kbd.scm
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(texmacs-module (text cyrillic cp1251-kbd)
(:use (text text-kbd)))
(texmacs-module (text cyrillic cp1251-kbd) (:use (text text-kbd)))

(kbd-map
(:mode in-cyrillic-cp1251?)
("�" "<#451>")
("accent:umlaut <#435>" "<#451>")
("�" "<#401>")
("accent:umlaut <#415>" "<#401>"))
(kbd-map (:mode in-cyrillic-cp1251?)
("�" "<#451>")
("accent:umlaut <#435>" "<#451>")
("�" "<#401>")
("accent:umlaut <#415>" "<#401>")
) ;kbd-map
9 changes: 4 additions & 5 deletions TeXmacs/progs/text/cyrillic/jcuken-kbd.scm
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(texmacs-module (text cyrillic jcuken-kbd)
(:use (text text-kbd)))
(texmacs-module (text cyrillic jcuken-kbd) (:use (text text-kbd)))

(kbd-map
(:mode in-cyrillic-jcuken?)
(kbd-map (:mode in-cyrillic-jcuken?)

("q" "<#439>")
("w" "<#446>")
Expand Down Expand Up @@ -93,4 +91,5 @@
("*" ";")

("accent:umlaut t" "<#451>")
("accent:umlaut T" "<#401>"))
("accent:umlaut T" "<#401>")
) ;kbd-map
9 changes: 4 additions & 5 deletions TeXmacs/progs/text/cyrillic/koi8-kbd.scm
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(texmacs-module (text cyrillic koi8-kbd)
(:use (text text-kbd)))
(texmacs-module (text cyrillic koi8-kbd) (:use (text text-kbd)))

(kbd-map
(:mode in-cyrillic-koi8?)
(kbd-map (:mode in-cyrillic-koi8?)

("<#411>" "<#430>")
("<#412>" "<#431>")
Expand Down Expand Up @@ -85,4 +83,5 @@
("<#430>" "<#42E>")
("<#441>" "<#42F>")
("�" "<#401>")
("accent:umlaut <#435>" "<#401>"))
("accent:umlaut <#435>" "<#401>")
) ;kbd-map
9 changes: 4 additions & 5 deletions TeXmacs/progs/text/cyrillic/translit-kbd.scm
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(texmacs-module (text cyrillic translit-kbd)
(:use (text text-kbd)))
(texmacs-module (text cyrillic translit-kbd) (:use (text text-kbd)))

(kbd-map
(:mode in-cyrillic-translit?)
(kbd-map (:mode in-cyrillic-translit?)

("a" "<#430>")
("b" "<#431>")
Expand Down Expand Up @@ -116,4 +114,5 @@
("Y i" "<#407>")
("Y I" "<#407>")
("accent:umlaut E" "<#401>")
("accent:umlaut I" "<#407>"))
("accent:umlaut I" "<#407>")
) ;kbd-map
9 changes: 4 additions & 5 deletions TeXmacs/progs/text/cyrillic/yawerty-kbd.scm
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(texmacs-module (text cyrillic yawerty-kbd)
(:use (text text-kbd)))
(texmacs-module (text cyrillic yawerty-kbd) (:use (text text-kbd)))

(kbd-map
(:mode in-cyrillic-yawerty?)
(kbd-map (:mode in-cyrillic-yawerty?)

("q" "<#44F>")
("w" "<#432>")
Expand Down Expand Up @@ -103,4 +101,5 @@
("& var" "&")

("accent:umlaut e" "<#451>")
("accent:umlaut E" "<#401>"))
("accent:umlaut E" "<#401>")
) ;kbd-map
65 changes: 65 additions & 0 deletions devel/1099.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# [1099] 格式化 TeXmacs/progs/text/cyrillic 目录下的 .scm 文件

## 1 相关文档
- [dddd.md](dddd.md) - 任务文档模板
- [1098.md](1098.md) - 上一批次:格式化 `TeXmacs/progs/utils/automate` 目录

## 2 任务相关的代码文件
- `tools/format/liii/goldformat-path.scm` — `scm-dirs` 新增 `TeXmacs/progs/text/cyrillic` 目录
- `TeXmacs/progs/text/cyrillic/cp1251-kbd.scm` — 执行 `gf fmt`,统一缩进与括号风格并补齐尾注释
- `TeXmacs/progs/text/cyrillic/jcuken-kbd.scm` — 同上
- `TeXmacs/progs/text/cyrillic/koi8-kbd.scm` — 同上
- `TeXmacs/progs/text/cyrillic/translit-kbd.scm` — 同上
- `TeXmacs/progs/text/cyrillic/yawerty-kbd.scm` — 同上

> 注:本批次不新增 `gfexclude.json` 条目,`cyrillic/` 下全部 5 个 `.scm` 全量纳入格式化。

## 3 如何测试

### 3.1 确定性测试(单元测试)
本任务为纯格式化 + 配置改动,无对应 C++/Scheme 单元测试。

### 3.2 非确定性测试(脚本与文档验证)
```bash
# 1. 对 cyrillic 目录跑 gf fmt,确认全部 .scm 正常格式化、自动尊重 gfexclude.json
gf fmt TeXmacs/progs/text/cyrillic

# 2. 确认幂等(再次执行 Files updated: 0)
gf fmt TeXmacs/progs/text/cyrillic
git diff --stat TeXmacs/progs/text/cyrillic

# 3. mogan 批量脚本(gf format)也应能覆盖 cyrillic 目录、并尊重 gfexclude.json
gf format

# 4. 编译并启动 MoganSTEM,确认西里尔(Cyrillic)输入法相关功能无回归
xmake b stem
xmake r stem
```

手动验证(启动后逐项检查):
- 五种西里尔输入法切换正常:translit(音译)、jcuken(ЙЦУКЕН 标准布局)、yawerty、cp1251(Windows-1251 编码)、koi8(KOI8-R 编码)
- 各输入法下按键到西里尔字符的映射不变(`*-kbd.scm` 中 `kbd-map` / 转写表条目)
- 输入法切换提示文案行为不变(与 `config-kbd.scm` 中 `notify-cyrillic-input-method` 联动)

## 4 如何提交

提交前执行以下最少步骤:

```bash
gf fmt --changed-since=main
xmake b stem
```

## 5 What
1. 把 `TeXmacs/progs/text/cyrillic` 加入 `goldformat-path.scm` 的 `scm-dirs`。
2. 对 `TeXmacs/progs/text/cyrillic` 目录下全部 5 个 `.scm` 文件执行 `gf fmt`。

## 6 Why
`TeXmacs/progs/text/cyrillic` 是 Mogan 西里尔文字输入法(translit / jcuken / yawerty / cp1251 / koi8 五种布局)的 Scheme 代码目录,此前一直未纳入 `gf fmt` 的格式化路径,目录内 `.scm` 缩进/括号风格不统一、缺少尾注释,diff 噪声大、可读性差。

本批次目录内不存在像 1091 中 `prefix-kbd.scm` 那样需人工紧凑维护的大段平铺条目——各 `*-kbd.scm` 虽含 `kbd-map` 条目,但数量有限、重排后风格清晰且 diff 可控,无需在 `gfexclude.json` 中新增排除项,5 个文件全量格式化即可。

## 7 How
1. 在 `goldformat-path.scm` 的 `scm-dirs` 追加 `"TeXmacs/progs/text/cyrillic"`。
2. 执行 `gf fmt TeXmacs/progs/text/cyrillic`,对全部 5 个 `.scm` 统一缩进与括号风格、补齐尾注释。
3. 校验:对 `cyrillic` 目录再次执行 `gf fmt` 应输出 `Files updated: 0`(幂等);编译并启动应用,切换五种西里尔输入法确认字符映射与提示行为无回归。
1 change: 1 addition & 0 deletions tools/format/liii/goldformat-path.scm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"TeXmacs/progs/texmacs/texmacs"
"TeXmacs/progs/texmacs/menus"
"TeXmacs/progs/texmacs/keyboard"
"TeXmacs/progs/text/cyrillic"
"TeXmacs/progs/utils/automate"
"TeXmacs/progs/utils/plugins"
"TeXmacs/progs/various"
Expand Down
Loading