Skip to content

[201_35] 修复在 frame、solution 等环境内的公式编号错位的问题 #2897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AXeonV wants to merge 1 commit into
base: main
Choose a base branch
from
+71 −21
Open

[201_35] 修复在 frame、solution 等环境内的公式编号错位的问题 #2897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 37 additions & 15 deletions TeXmacs/tests/tmu/201_35.tmu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
<TMU|<tuple|1.1.0|2025.2.2>>
<TMU|<tuple|1.1.0|2026.2.0>>

<style|<tuple|generic|number-europe|smart-ref>>

<\body>
<\frame>
<\equation>
A x=B<label|eq1>
</equation>

<\equation>
x=A<rsup|-1>B<label|eq2>
</equation>
</frame>

\;

<\align>
<tformat|<table|<row|<cell|f<around*|(|x|)>\<leq\>>|<cell|<around*|\<\|\|\>|g<around*|(|x|)>-h<around*|(|x|)>|\<\|\|\>><label|l1a><eq-number><label|l1b>>>|<row|<cell|\<leq\>>|<cell|<around*|\<\|\|\>|g<around*|(|x|)>-z<around*|(|x|)>|\<\|\|\>>+<around*|\<\|\|\>|z<around*|(|x|)>-h<around*|(|x|)>|\<\|\|\>><label|l2a><eq-number><label|l2b><with|math-display|false|<with|math-display|true|>>>>>>
</align>
Expand All @@ -17,30 +29,38 @@
sin<around*|(|x|)>=cos<around*|(|<frac|\<pi\>|2>-x|)><label|l4>
</equation>

\;

<with|font-series|bold|reference>:

<\itemize>
<item>in align, line1 label before eq-number: <reference|l1a>, label after eq-number: <reference|l1b>
<item>in frame, line1 label: <reference|eq1>, line2 label: <reference|eq2>
</itemize>

<item>in align, line2 label before eq-number: <reference|l2a>, label after eq-number: <reference|l2b>
<\itemize>
<item>in align, line3 label before eq-number: <reference|l1a>, label after eq-number: <reference|l1b>

<item>in equation, line3 label: <reference|l3>
<item>in align, line4 label before eq-number: <reference|l2a>, label after eq-number: <reference|l2b>

<item>in equation, line4 label: <reference|l4>
<item>in equation, line5 label: <reference|l3>

<item>in equation, line6 label: <reference|l4>
</itemize>

\;

<with|font-series|bold|smart-ref>:

<\itemize>
<item>in align line1 label before eq-number:<smart-ref|l1a>, label after eq-number: <smart-ref|l1b>
<item>in frame, line1 label: <smart-ref|eq1>, line2 label: <smart-ref|eq2>

<item>in align line3 label before eq-number:<smart-ref|l1a>, label after eq-number: <smart-ref|l1b>

<item>in align line2 label before eq-number:<smart-ref|l2a>, label after eq-number: <smart-ref|l2b>
<item>in align line4 label before eq-number:<smart-ref|l2a>, label after eq-number: <smart-ref|l2b>

<item>in equation, line3 label: <smart-ref|l3>
<item>in equation, line5 label: <smart-ref|l3>

<item>in equation, line4 label: <smart-ref|l4>
<item>in equation, line6 label: <smart-ref|l4>
</itemize>

\;
Expand All @@ -55,11 +75,13 @@

<\references>
<\collection>
<associate|l1a|<tuple|1|1>>
<associate|l1b|<tuple|1|1>>
<associate|l2a|<tuple|2|1>>
<associate|l2b|<tuple|2|1>>
<associate|l3|<tuple|3|1>>
<associate|l4|<tuple|4|?>>
<associate|eq1|<tuple|1|1>>
<associate|eq2|<tuple|2|1>>
<associate|l1a|<tuple|3|1>>
<associate|l1b|<tuple|3|1>>
<associate|l2a|<tuple|4|1>>
<associate|l2b|<tuple|4|1>>
<associate|l3|<tuple|5|1>>
<associate|l4|<tuple|6|1>>
</collection>
</references>
25 changes: 23 additions & 2 deletions devel/201_35.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,31 @@
## 如何测试
打开 `TeXmacs\tests\tmu\201_35.tmu` ，查看 smart-ref 和 reference 的公式编号是否正确

- line1 的 label 编号应该都是1
- line2 的 label 编号应该都是2
- line1 的 label 编号应该都是1（这一次修改的修复样例）
- line2 的 label 编号应该都是2（这一次修改的修复样例）
- line3 的 label 编号应该都是3
- line4 的 label 编号应该都是4
- line5 的 label 编号应该都是5
- line6 的 label 编号应该都是6

## 2026/2/28
### What
修复在 frame、solution 等环境内的公式编号错位的问题

### Why
之前的实现把 `defer-tags=row` 放在 `table_rep::typeset_row` 行入口处，导致**所有**走 table row 的场景都可能触发延迟绑定

但 `defer-tags` 的设计初衷仅是服务多行公式（align/eqnarray/gather 等）中“`label` 先于 `eq-number`”的时序修正。像 frame、solution 这类外层环境内部也会进入 `typeset_row`，从而把本不该延迟重绑的 label 键加入 `the-tags`，最终在后续 `set-binding`（1参）时被错误覆盖，表现为编号错位

### How
将 `typeset_row` 中 `defer-tags/the-tags` 的行级作用域从“无条件开启”改为“仅在多行显示公式场景开启”：

1. `hyphen == "y"`：仅处理可按行拆分的数学表格（多行公式结构信号）
2. `mode == "math"`：仅在数学语义环境生效
3. `math-display == "true"`：仅在陈列公式模式生效

满足三条件时才 `local_begin ("defer-tags", "row")` 与 `local_begin ("the-tags", tuple)`；否则不进入 defer 逻辑。`exec_set_binding` 中已有的 `defer-tags=="row"` 判定逻辑保持不变，因此修复后既保留 align 场景的正确重绑，也避免 frame/solution 等环境误触发


## 2025/12/12
### What
Expand Down
15 changes: 11 additions & 4 deletions src/Typeset/Table/table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,13 @@ table_rep::typeset_row (int i, tree fm, tree t, path ip) {
T[i] = tm_new_array<cell> (nr_cols);
STACK_NEW_ARRAY (subformat, tree, nr_cols);
extract_format (fm, subformat, nr_cols);
tree old_defer= env->local_begin ("defer-tags", string ("row"));
tree old_tags = env->local_begin ("the-tags", tree (TUPLE));
bool can_make_tags= (hyphen == "y" && env->read (MODE) == "math" &&
env->read (MATH_DISPLAY) == "true");
tree old_defer, old_tags;
if (can_make_tags) {
old_defer= env->local_begin ("defer-tags", string ("row"));
old_tags = env->local_begin ("the-tags", tree (TUPLE));
}
for (j= 0; j < nr_cols; j++) {
cell& C= T[i][j];
C = cell (env);
Expand All @@ -127,8 +132,10 @@ table_rep::typeset_row (int i, tree fm, tree t, path ip) {
C->col_span= min (C->col_span, nr_cols - j);
if (hyphen == "y") C->row_span= 1;
}
env->local_end ("the-tags", old_tags);
env->local_end ("defer-tags", old_defer);
if (can_make_tags) {
env->local_end ("the-tags", old_tags);
env->local_end ("defer-tags", old_defer);
}
STACK_DELETE_ARRAY (subformat);
}

Expand Down