fix: fix first line indent for multiple elements

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

Author: jtchen2k

layouts/mainmatter.typ

@@ -18,7 +18,7 @@
   justify: true,
   first-line-indent: 2em,
   // 浮动于页顶或页底的上下间距
-  figure-clearance: 32pt,
+  figure-clearance: 24pt,
   figure-caption-spacing: 0.4em,
   numbering: custom-numbering.with(first-level: "第一章 ", depth: 4, "1.1 "),
   // 正文字体与字号参数
@@ -27,8 +27,8 @@
   heading-font: auto,
   heading-size: (字号.三号, 字号.四号,),
   heading-weight: ("regular",),
-  heading-above: (2 * 15.6pt - 0.7em, 2 * 15.6pt - 0.7em),
-  heading-below: (2 * 15.6pt, 2 * 15.6pt - 0.7em),
+  heading-above: (1.0em, 2.0em, 1.5em),
+  heading-below: (1.5em, 1.5em, 1.25em),
   heading-pagebreak: (true, false),
   heading-align: (center, auto),
   // 页眉
@@ -110,29 +110,26 @@
   show figure: show-figure
   // 3.4 设置 equation 的编号和假段落首行缩进
   show math.equation.where(block: true): show-equation
-  show math.equation.where(block: true): it => {
-    it
-    fake-par
-  }
   // 3.5 表格表头置顶 + 不用冒号用空格分割 + 样式
   show figure.where(
     kind: table
   ): set figure.caption(position: top)
   set figure.caption(separator: separator)
   show figure.caption: caption-style
   show figure.caption: set text(size: caption-size, font: fonts.楷体)
-  show figure.caption: set par(leading: 1.25em)
+  show figure.caption: set par(leading: 1em)
 
   show figure.caption: c => block(inset: (top: figure-caption-spacing, bottom: figure-caption-spacing))[
-    #text(font: fonts.黑体, weight: "bold", style: "normal")[
+    #set align(left)
+    #text(font: fonts.黑体, weight: "regular", style: "normal")[
       #c.supplement #context c.counter.display(c.numbering)
       ]
       #h(0.3em)#c.body
   ]
   show figure.where(placement: none): it => {
     v(figure-clearance / 6)
     it
-    fake-par
+    v(figure-clearance / 6)
   }
   set place(clearance: figure-clearance)
    // 3.6 优化列表显示
@@ -170,7 +167,6 @@
       below: array-at(heading-below, it.level),
     )
     it
-    fake-par
   }
   // 4.3 标题居中与自动换页
   show heading: it => context {
@@ -231,6 +227,24 @@
 
   set underline(stroke: 0.5pt + black, offset: 0.35em)
 
+  // 处理一些元素后第一段文本的首行缩进
+  show selector.or(heading, figure, list, enum, quote, terms): it => {
+    it
+    fake-par
+  }
+
+  // 处理一级标题的引用格式
+  show ref: it => {
+    let el = it.element
+    if (el != none and el.func() == heading and el.level == 1) {
+      link(el.location(), text(fill: color.black,
+        numbering(..counter(heading).at(el.location())).trim()
+      ))
+    } else {
+      it
+    }
+  }
+
   // 字数统计（正文 + 附录）
   //   typst query main.typ '<total-words>' 2>/dev/null --field value --one
   context [

typst.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 entrypoint = "lib.typ"
 authors = ["Juntong Chen <@jtchen2k>"]
 license = "MIT"
-description = "华东师范大学学位论文模板。Modern East China Normal University Thesis Template."
+description = "华东师范大学本科 / 研究生学位论文模板。Modern East China Normal University Thesis Template."
 repository = "https://github.com/jtchen2k/modern-ecnu-thesis"
 keywords = ["East China Normal University", "thesis"]
 categories = ["thesis"]

utils/fix-cjk-linebreak.typ

@@ -4,7 +4,7 @@
  * @project: modern-ecnu-thesis
  * @author: Juntong Chen ([email protected])
  * @created: 2025-01-12 15:12:15
- * @modified: 2025-01-12 22:12:32
+ * @modified: 2025-01-14 20:27:32
  *
  * Copyright (c) 2025 Juntong Chen. All rights reserved.
  */
@@ -13,7 +13,7 @@
 //    详见：https://github.com/typst/typst/issues/792#issuecomment-2310139085
 #let fix-cjk-linebreak(body, debug: false) = [
   // 不去除章后的字符
-  #let cjk-char = "[\p{Han}，。；：！？‘’“”（）「」【】…—&&[^章节]]"
+  #let cjk-char = "[\p{Han}，。；：！？‘’“”（）「」『』【】…—&&[^章节]]"
   // 没有使用 \s 来匹配空白字符的原因是为了保留全角空格。
   #let cjk-re = regex("(" + cjk-char + ")([ \\t\\r]+(" + cjk-char + ")+)+")
   #show cjk-re: it => {