From 55077a0550cfd3a9702cecc7e365440d2ebb3183 Mon Sep 17 00:00:00 2001 From: Yuki Date: Thu, 30 Apr 2026 10:41:16 +0800 Subject: [PATCH 1/2] paragraph --- TeXmacs/packages/section/section-article.ts | 4 ++-- TeXmacs/packages/section/section-base.ts | 20 +++++--------------- TeXmacs/packages/section/section-book.ts | 4 ++-- TeXmacs/packages/section/section-generic.ts | 4 ++-- TeXmacs/progs/text/text-menu.scm | 2 -- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/TeXmacs/packages/section/section-article.ts b/TeXmacs/packages/section/section-article.ts index b8e06ab93d..db1a9dab17 100644 --- a/TeXmacs/packages/section/section-article.ts +++ b/TeXmacs/packages/section/section-article.ts @@ -61,9 +61,9 @@ - >>>> + >>>> - >>>> + >>>> \; diff --git a/TeXmacs/packages/section/section-base.ts b/TeXmacs/packages/section/section-base.ts index 81ec40b3ad..24033ad224 100644 --- a/TeXmacs/packages/section/section-base.ts +++ b/TeXmacs/packages/section/section-base.ts @@ -1,4 +1,4 @@ - + @@ -42,10 +42,6 @@ - - - - @@ -74,10 +70,6 @@ - - - - <\active*> <\src-comment> Names of special sections. @@ -104,7 +96,8 @@ >> - >> + >> <\active*> <\src-comment> @@ -143,10 +136,6 @@ |>>> - |>>> - - |>>> - |>>> >> @@ -295,7 +284,8 @@ >>>> - |>>|| |>>>>>> + |>>|| + |>>>>>> |>>|||>>>>>>> diff --git a/TeXmacs/packages/section/section-book.ts b/TeXmacs/packages/section/section-book.ts index a314f98c3c..6419acace6 100644 --- a/TeXmacs/packages/section/section-book.ts +++ b/TeXmacs/packages/section/section-book.ts @@ -73,9 +73,9 @@ - >>>> + >>>> - >>>> + >>>> \; diff --git a/TeXmacs/packages/section/section-generic.ts b/TeXmacs/packages/section/section-generic.ts index 5a374286fc..134100abda 100644 --- a/TeXmacs/packages/section/section-generic.ts +++ b/TeXmacs/packages/section/section-generic.ts @@ -54,9 +54,9 @@ - >>>> + >>>> - >>>> + >>>> \; diff --git a/TeXmacs/progs/text/text-menu.scm b/TeXmacs/progs/text/text-menu.scm index b633d6d52f..7b0beb8cd9 100644 --- a/TeXmacs/progs/text/text-menu.scm +++ b/TeXmacs/progs/text/text-menu.scm @@ -965,8 +965,6 @@ ((in? l '(section section*)) "section-title-style") ((in? l '(subsection subsection*)) "subsection-title-style") ((in? l '(subsubsection subsubsection*)) "subsubsection-title-style") - ((in? l '(paragraph paragraph*)) "paragraph-title-style") - ((in? l '(subparagraph subparagraph*)) "subparagraph-title-style") (else #f)))) (tm-define (focus-has-preferences? t) From 7b22be2590af40abaceec88166bcf9389c8c5ac7 Mon Sep 17 00:00:00 2001 From: Yuki Date: Thu, 30 Apr 2026 10:44:34 +0800 Subject: [PATCH 2/2] devel --- devel/222_79.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 devel/222_79.md diff --git a/devel/222_79.md b/devel/222_79.md new file mode 100644 index 0000000000..8a0c6ec9c3 --- /dev/null +++ b/devel/222_79.md @@ -0,0 +1,50 @@ +# 222_79 简化 paragraph/subparagraph 标题样式机制 + +## 如何测试 + +1. 编译：`xmake b stem` +2. 启动 Mogan，新建空白文档。 +3. 依次插入 **Paragraph** 和 **Subparagraph**（通过 `Structure → Section` 菜单或快捷键）。 +4. 确认 paragraph/subparagraph 标题显示为**粗体短标题样式**（`sectional-short-bold`），上下保留原有间距（`0.5fn` / `0.25fn`）。 +5. 将光标置于 paragraph 或 subparagraph 标题内，打开右侧 **Focus** 菜单，确认**无 "Title style" 选项**（此前存在）。 +6. 分别切换文档类型为 **Article**、**Book**、**Generic**，重复步骤 3-5，确认表现一致。 +7. 确认 section、subsection、subsubsection 的 title-style 切换功能**不受影响**。 + +## 2026/04/30 实现说明 + +### What + +移除 paragraph 和 subparagraph 独立的 `title-style` 样式切换机制，将其标题渲染统一为 `sectional-short-bold`，不再支持与其他章节标题一样的 "left/centered" 样式偏好设置。 + +#### 修改文件 + +**TeXmacs/packages/section/section-base.ts** +- 移除 `paragraph-title-style` 和 `subparagraph-title-style` 的默认值赋值（原为 `left`）。 +- 移除对应的 `drd-props` 声明。 +- 移除 `paragraph-title-render` 和 `subparagraph-title-render` 宏定义（原通过 `sectional-select-bold` 根据 `title-style` 选择渲染方式）。 + +**TeXmacs/packages/section/section-article.ts** +- `paragraph-title` 宏：由 `` 改为 ``。 +- `subparagraph-title` 宏：由 `` 改为 ``。 + +**TeXmacs/packages/section/section-book.ts** +- 同上，paragraph/subparagraph 标题渲染改为 `sectional-short-bold`。 + +**TeXmacs/packages/section/section-generic.ts** +- 同上，paragraph/subparagraph 标题渲染改为 `sectional-short-bold`。 + +**TeXmacs/progs/text/text-menu.scm** +- 在 `focus-get-preferences` 函数中移除 paragraph 和 subparagraph 对应的 `"paragraph-title-style"` 和 `"subparagraph-title-style"` 偏好设置入口。 + +### Why + +1. **职责精简**：paragraph 和 subparagraph 是最底层的小节标题，在实际使用中几乎不需要与其他章节（section/subsection）同等级别的 "left/center" 样式切换能力。 +2. **代码简化**：移除两套专用的 `*-title-style` 环境变量、drd-props 和 render 宏定义，降低 section-base.ts 的维护复杂度。 +3. **行为统一**：统一使用 `sectional-short-bold` 渲染，与短标题风格的视觉层级保持一致，避免底层小节标题因样式切换导致版面不协调。 +4. **菜单降噪**：Focus 菜单中不再显示对 paragraph/subparagraph 无实际意义的 "Title style" 偏好选项。 + +### How + +- 在 `section-base.ts` 中清理 `paragraph-title-style`、`subparagraph-title-style` 及其相关宏定义，将其从样式注册体系中彻底移除。 +- 在 `section-article.ts`、`section-book.ts`、`section-generic.ts` 三个文档类型包中，将 paragraph/subparagraph 标题宏直接绑定到 `sectional-short-bold`，保留原有的 `vspace` 间距控制不变。 +- 在 `text-menu.scm` 的 `focus-get-preferences` 分发逻辑中移除对应的两个分支，确保 Focus 菜单不再暴露已废弃的偏好项。