fix: repetitive heading spacing

Signed-off-by: Juntong Chen <[email protected]>

Author: jtchen2k

Diff for: layouts/mainmatter.typ

@@ -1,7 +1,7 @@
 #import "@preview/i-figured:0.2.4"
 #import "../utils/style.typ": 字号, 字体
 #import "../utils/custom-numbering.typ": custom-numbering
-#import "../utils/custom-heading.typ": heading-display, active-heading, current-heading, heading-content
+#import "../utils/custom-heading.typ": heading-content
 #import "../utils/indent.typ": fake-par
 #import "../utils/unpairs.typ": unpairs
 #import "../utils/pagebreak-from-odd.typ": pagebreak-from-odd
@@ -25,10 +25,10 @@
   text-args: auto,
   // 标题字体与字号
   heading-font: auto,
-  heading-size: (字号.三号, 字号.四号,),
+  heading-size: (字号.三号, 字号.四号, 字号.四号, 字号.小四),
   heading-weight: ("regular",),
-  heading-above: (1.0em, 2.0em, 1.5em),
-  heading-below: (1.5em, 1.5em, 1.25em),
+  heading-above: (1.5em, 2.5em),
+  heading-below: (2.0em, 1.5em),
   heading-pagebreak: (true, false),
   heading-align: (center, auto),
   // 页眉
@@ -101,7 +101,7 @@
     first-line-indent: first-line-indent
   )
   // show par: set block(spacing: spacing)
-  show raw: set text(font: fonts.等宽)
+  show raw: set text(font: fonts.等宽, size: text-args.size)
   show raw.where(block: true): set par(leading: 1em)
   // 3.2 脚注样式
   show footnote.entry: set text(font: fonts.宋体, size: 字号.五号)
@@ -110,6 +110,7 @@
   show figure: show-figure
   // 3.4 设置 equation 的编号和假段落首行缩进
   show math.equation.where(block: true): show-equation
+  show math.equation.where(block: true): set block(inset: (y: 0.3em, x: 0em))
   // 3.5 表格表头置顶 + 不用冒号用空格分割 + 样式
   show figure.where(
     kind: table
@@ -166,7 +167,7 @@
       above: array-at(heading-above, it.level),
       below: array-at(heading-below, it.level),
     )
-    it
+    it + fake-par + v(-0.15em)
   }
   // 4.3 标题居中与自动换页
   show heading: it => context {
@@ -183,6 +184,26 @@
       it
     }
   }
+  // 4.4 防止标题间距重复 https://github.com/typst/typst/issues/2953#issuecomment-1858823455
+  show heading : it => context {
+    // Finds all previous headings, inclusive
+    let elems = query(selector(heading).before(here()))
+    if elems.len() > 1 { // If there are at least 2
+      let prev-heading = elems.at(-2)
+      if (
+        prev-heading.level > 1 and
+        prev-heading.location().page() == it.location().page() and
+        prev-heading.location().position().y + 60pt > it.location().position().y
+      ) [
+        #v(-calc.abs(array-at(heading-above, it.level) - array-at(heading-below, it.level)))
+        #it
+      ] else [
+        #it
+      ]
+    } else [
+      #it
+    ]
+  }
 
   // 重置 footnote 计数器
   if reset-footnote {
@@ -218,7 +239,7 @@
 
   // 列表样式
   set enum(indent: 0.9em, body-indent: 0.35em)
-  set list(indent: 1em, body-indent: 0.55em)
+  set list(indent: 2em, body-indent: 0.55em)
 
   // 引述文本样式
   set quote(block: true)
@@ -227,10 +248,9 @@
 
   set underline(stroke: 0.5pt + black, offset: 0.35em)
 
-  // 处理一些元素后第一段文本的首行缩进
-  show selector.or(heading, figure, list, enum, quote, terms): it => {
-    it
-    fake-par
+  // 处理其他元素后第一段文本的首行缩进
+  show selector.or(figure, list, enum, quote, terms): it => {
+    it + fake-par
   }
 
   // 处理一级标题的引用格式

Diff for: lib.typ

@@ -4,7 +4,7 @@
  * @project: modern-ecnu-thesis
  * @author: OrangeX4, Juntong Chen ([email protected])
  * @created: 2025-01-06 22:37:34
- * @modified: 2025-01-12 14:38:55
+ * @modified: 2025-01-23 04:45:57
 *
  * 华东师范大学学位论文模板
  *    Repo: https://github.com/jtchen2k/modern-ecnu-thesis
@@ -35,7 +35,6 @@
 #import "utils/custom-cuti.typ": *
 #import "utils/bilingual-bibliography.typ": bilingual-bibliography
 #import "utils/custom-numbering.typ": custom-numbering
-#import "utils/custom-heading.typ": heading-display, active-heading, current-heading
 #import "utils/indent.typ": indent, fake-par, no-indent
 #import "utils/panic-page.typ": panic-page
 #import "utils/word-counter.typ": *

Diff for: pages/bachelor-outline-page.typ

@@ -1,4 +1,4 @@
-#import "@preview/outrageous:0.1.0"
+#import "@preview/outrageous:0.3.0"
 #import "../utils/invisible-heading.typ": invisible-heading
 #import "../utils/style.typ": 字号, 字体
 #import "../utils/custom-heading.typ": heading-content

Diff for: pages/list-of-figures.typ

@@ -1,5 +1,5 @@
 #import "@preview/i-figured:0.2.4"
-#import "@preview/outrageous:0.1.0"
+#import "@preview/outrageous:0.3.0"
 #import "../utils/invisible-heading.typ": invisible-heading
 #import "../utils/style.typ": 字号, 字体
 #import "../utils/custom-heading.typ": heading-content

Diff for: pages/list-of-tables.typ

@@ -1,5 +1,5 @@
 #import "@preview/i-figured:0.1.0"
-#import "@preview/outrageous:0.1.0"
+#import "@preview/outrageous:0.3.0"
 #import "../utils/invisible-heading.typ": invisible-heading
 #import "../utils/style.typ": 字号, 字体
 #import "../utils/custom-heading.typ": heading-content

Diff for: utils/custom-heading.typ

@@ -1,4 +1,6 @@
 #import "style.typ": 字号
+#import "@preview/hydra:0.5.2": hydra
+
 // 展示一个标题
 #let heading-display(it) = {
   if it != none {
@@ -12,44 +14,6 @@
   }
 }
 
-// 获取当前激活的 heading，参数 prev 用于标志优先使用之前页面的 heading
-#let active-heading(level: 1, prev: true) = {
-  // 之前页面的标题
-  let prev-headings = query(selector(heading.where(level: level)).before(here()))
-  // 当前页面的标题
-  let cur-headings = query(selector(heading.where(level: level)).after(here()))
-  .filter(it => it.location().page() == here().page())
-  if prev-headings.len() == 0 and cur-headings.len() == 0 {
-    return none
-  } else {
-    if prev {
-      if prev-headings.len() != 0 {
-        return prev-headings.last()
-      } else {
-        return cur-headings.first()
-      }
-    } else {
-      if cur-headings.len() != 0 {
-        return cur-headings.first()
-      } else {
-        return prev-headings.last()
-      }
-    }
-  }
-}
-
-// 获取当前页面的标题
-#let current-heading(level: 1) = {
-  // 当前页面的标题
-  let cur-headings = query(selector(heading.where(level: level)).after(here()))
-  .filter(it => it.location().page() == here().page())
-  if cur-headings.len() != 0 {
-    return cur-headings.first()
-  } else {
-    return none
-  }
-}
-
 // 页眉内容
 #let heading-content(
     twoside: false,
@@ -69,8 +33,7 @@
     context {
       let page = counter(page).get().at(0)
       // 获取当前页面的一级标题
-      let cur-heading = current-heading(level: 1)
-      let first-level-heading = if cur-heading != none { heading-display(cur-heading) } else { heading-display(active-heading(level: 1)) }
+      let first-level-heading = hydra(1, skip-starting: false)
       let docinfo = "华东师范大学" + if doctype == "master" { "硕士" } else { "博士" } + "学位论文"
       set text(font: fonts.宋体, size: 字号.五号)
       if twoside {