Merge pull request #1 from jtchen2k/dev/0.2.0

0.2.0

Author: jtchen2k

Diff for: README.md

@@ -36,7 +36,13 @@ Typst 是一个基于 Rust 的现代化的排版引擎。它具备类似 Markdow
 
 ### 在 VSCode 中本地编辑（推荐）
 
-请确保本地安装的 typst 版本 >= 0.12.0。
+请确保本地已安装 Typst，推荐使用最新版本。这里是 Typst 与模板版本的对应关系：
+
+| typst 版本 | 模板版本 |
+| ---------- | -------- |
+| <0.12.0    | 不支持   |
+| 0.12.0     | 0.1.0    |
+| 0.13.0     | 0.2.0    |
 
 #### 从 Typst Universe 获取模板
 
@@ -138,6 +144,21 @@ context state("total-characters").final()
 - **研究生**
   - 暂无
 
+## Changelog
+
+### 0.2.0 (2025.2.19)
+
+- feat: 适配 Typst 0.13.0，重新处理首行缩进的逻辑
+- fix: 修复等宽字体的大小问题
+- fix: 修复连续标题的重复间距问题
+- fix: 去除对 `anti-matter` 和 `outrageous` 的依赖
+- fix: 更稳定的中文断行处理
+- fix: 调整多处细节和间距
+
+### 0.1.0 (2025.1.13)
+
+- 初始版本
+
 ## References
 
 - [modern-nju-thesis](https://github.com/nju-lug/modern-nju-thesis) by [OrangeX4](https://github.com/Orangex4)

Diff for: layouts/mainmatter.typ

@@ -98,13 +98,14 @@
     leading: leading,
     justify: justify,
     linebreaks: "optimized",
-    first-line-indent: first-line-indent
+    first-line-indent: (amount: first-line-indent, all: true),
   )
   // show par: set block(spacing: spacing)
   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: 字号.五号)
+  show footnote.entry: set par(leading: 1em)
   // 3.3 设置 figure 的编号
   show heading: i-figured.reset-counters
   show figure: show-figure
@@ -167,7 +168,7 @@
       above: array-at(heading-above, it.level),
       below: array-at(heading-below, it.level),
     )
-    it + fake-par + v(-0.15em)
+    it // fake-par + v(-0.15em) // no longer needed since 0.13.0
   }
   // 4.3 标题居中与自动换页
   show heading: it => context {
@@ -239,7 +240,7 @@
 
   // 列表样式
   set enum(indent: 0.9em, body-indent: 0.35em)
-  set list(indent: 2em, body-indent: 0.55em)
+  set list(indent: 1.2em, body-indent: 0.6em)
 
   // 引述文本样式
   set quote(block: true)
@@ -248,10 +249,10 @@
 
   set underline(stroke: 0.5pt + black, offset: 0.35em)
 
-  // 处理其他元素后第一段文本的首行缩进
-  show selector.or(figure, list, enum, quote, terms): it => {
-    it + fake-par
-  }
+  // 处理其他元素后第一段文本的首行缩进 (0.13.0 后不再需要)
+  // show selector.or(figure, list, enum, quote, terms): it => {
+  //   it + fake-par
+  // }
 
   // 处理一级标题的引用格式
   show ref: it => {

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-23 04:45:57
+ * @modified: 2025-02-09 22:02:03
 *
  * 华东师范大学学位论文模板
  *    Repo: https://github.com/jtchen2k/modern-ecnu-thesis
@@ -267,7 +267,7 @@
         bachelor-outline-page(
           twoside: twoside,
           title-text-args: (font: 字体.黑体, size: 字号.三号, weight: "bold"),
-          vspace: (1.35em, 1.2em),
+          vspace: (1.2em,),
           weight: ("regular", "regular"),
           indent: (0em, 2.38em, 2em, 2.8em),
           doctype: doctype,

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

@@ -1,4 +1,3 @@
-#import "@preview/outrageous:0.3.0"
 #import "../utils/invisible-heading.typ": invisible-heading
 #import "../utils/style.typ": 字号, 字体
 #import "../utils/custom-heading.typ": heading-content
@@ -59,39 +58,39 @@
 
   {
     set align(center)
-    text(..title-text-args, title)
     // 标记一个不可见的标题用于目录生成
     invisible-heading(level: 1, outlined: outlined, title)
+    text(..title-text-args, title)
+
   }
 
   v(title-vspace)
 
-  show outline.entry: outrageous.show-entry.with(
-    // 保留 Typst 基础样式
-    ..outrageous.presets.typst,
-    body-transform: (level, it) => {
-      // 设置字体和字号
-      set text(
-        font: font.at(calc.min(level, font.len()) - 1),
-        size: size.at(calc.min(level, size.len()) - 1),
-      )
-      // 计算缩进
-      let indent-list = indent + range(level - indent.len()).map((it) => indent.last())
-      let indent-length = indent-list.slice(0, count: level).sum()
-      if "children" in it.fields() and it.children.len() > 2 {
-        set text(weight: weight.at(calc.min(level, weight.len()) - 1))
-        let (number, space, ..text) = it.children
-        [#h(indent-length) #box[#number] #h(if level > 1 {3pt} else {2pt}) #text.join()]
-      } else {
-        set text(weight: weight.at(calc.min(level, weight.len()) - 1))
-        h(indent-length) + it
-      }
-    },
-    vspace: vspace,
-    fill: fill,
-    ..args,
+  let array-at(arr, pos) = {
+    arr.at(calc.min(pos, arr.len()) - 1)
+  }
+
+  show outline.entry.where(level: 1): it => link(
+    it.element.location(),
+    it.indented(
+      if it.prefix() != none and repr(it.prefix()).len() > 2 {
+        text(font: fonts.黑体, size: array-at(size, 0), it.prefix())
+      } else { none },
+      {
+      text(font: fonts.黑体, size: array-at(size, 0), it.body())
+      [ ]
+      box(width: 1fr, it.fill)
+      [ ]
+      it.page()
+    })
   )
 
+  show outline.entry: it => {
+    set block(spacing: array-at(vspace, it.level - 1))
+    // if it.prefix() != none {it.prefix()} else { block(it) }
+    it
+  }
+
   // 显示目录
-  outline(title: none, depth: depth)
+  outline(title: none, depth: depth, indent: auto)
 }

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

@@ -51,32 +51,20 @@
   set text(font: font, size: size)
 
   {
-    set align(center)
-    text(..title-text-args, title)
     // 标记一个不可见的标题用于目录生成
     invisible-heading(level: 1, outlined: outlined, title)
+    set align(center)
+    text(..title-text-args, title)
   }
 
   v(title-vspace)
 
-  show outline.entry: outrageous.show-entry.with(
-    // 保留 Typst 基础样式
-    ..outrageous.presets.typst,
-    body-transform: (level, it) => {
-      // 因为好像没找到 separator 的参数，所以这里就手动寻找替换了
-      if (it.has("children") and it.children.at(3, default: none) == [#": "]) {
-        it.children.slice(0, 3).sum() + separator + it.children.slice(4).sum()
-      } else {
-        it
-      }
-    },
-    vspace: (vspace,),
-    fill: (fill,),
-  )
+  show outline.entry: it => {
+    set block(spacing: vspace)
+    it
+  }
 
   // 显示目录
   i-figured.outline(target-kind: image, title: none)
 
-
-
 }

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

@@ -51,28 +51,18 @@
   set text(font: font, size: size)
 
   {
-    set align(center)
-    text(..title-text-args, title)
     // 标记一个不可见的标题用于目录生成
     invisible-heading(level: 1, outlined: outlined, title)
+    set align(center)
+    text(..title-text-args, title)
   }
 
   v(title-vspace)
 
-  show outline.entry: outrageous.show-entry.with(
-    // 保留 Typst 基础样式
-    ..outrageous.presets.typst,
-    body-transform: (level, it) => {
-      // 因为好像没找到 separator 的参数，所以这里就手动寻找替换了
-      if (it.has("children") and it.children.at(3, default: none) == [#": "]) {
-        it.children.slice(0, 3).sum() + separator + it.children.slice(4).sum()
-      } else {
-        it
-      }
-    },
-    vspace: (vspace,),
-    fill: (fill,),
-  )
+  show outline.entry: it => {
+    set block(spacing: vspace)
+    it
+  }
 
   // 显示目录
   i-figured.outline(target-kind: table, title: none)

Diff for: pages/master-abstract-en.typ

@@ -63,14 +63,16 @@
     // #show par: set block(spacing: spacing)
     #set block(spacing: spacing)
 
+    // 标记一个不可见的标题用于目录生成
+    #invisible-heading(level: 1, outlined: outlined, outline-title)
+
     #set align(center)
     #block[
         #set text(font: fonts.黑体, size: 字号.小三, weight: "bold")
         Abstract
     ]
 
-    // 标记一个不可见的标题用于目录生成
-    #invisible-heading(level: 1, outlined: outlined, outline-title)
+
 
     #set align(left)
 

Diff for: pages/master-abstract.typ

@@ -60,21 +60,23 @@
   )
 
   [
+
     #set text(font: fonts.楷体, size: 字号.四号)
     #set par(leading: leading, justify: true)
 
     // #show par: set block(spacing: spacing)
     #set block(spacing: spacing)
 
+
+    // 标记一个不可见的标题用于目录生成
+    #invisible-heading(level: 1, outlined: outlined, outline-title)
+
     #set align(center)
     #block[
         #set text(font: fonts.黑体, size: 字号.小三, weight: "bold")
         摘#h(2em)要
     ]
 
-    // 标记一个不可见的标题用于目录生成
-    #invisible-heading(level: 1, outlined: outlined, outline-title)
-
     #set align(left)
 
     #set text(font: fonts.宋体, size: 字号.小四)

Diff for: pages/notation.typ

@@ -42,10 +42,10 @@
   set text(font: font, size: size)
 
   {
-    set align(center)
-    text(..title-text-args, title)
     // 标记一个不可见的标题用于目录生成
     invisible-heading(level: 1, outlined: outlined, title)
+    set align(center)
+    text(..title-text-args, title)
   }
 
   v(title-vspace)

Diff for: template/thesis.typ

@@ -1,4 +1,4 @@
-#import "@preview/modern-ecnu-thesis:0.1.0": documentclass, indent, no-indent, word-count-cjk, total-words
+#import "@preview/modern-ecnu-thesis:0.2.0": documentclass, indent, no-indent, word-count-cjk, total-words
 
 // 模板用到的主要字体：https://github.com/jtchen2k/modern-ecnu-thesis/tree/main/fonts/
 // 如果是在 Web App 上编辑，你应该手动上传上述字体文件，否则不能正常使用「楷体」和「仿宋」。

Diff for: typst.toml

@@ -1,6 +1,6 @@
 [package]
 name = "modern-ecnu-thesis"
-version = "0.1.0"
+version = "0.2.0"
 entrypoint = "lib.typ"
 authors = ["Juntong Chen <@jtchen2k>"]
 license = "MIT"

Diff for: utils/bilingual-bibliography.typ

@@ -1,5 +1,7 @@
 // Authors: csimide, OrangeX4
 // Tested only on GB-7714-2015-Numeric
+#import "./style.typ": 字号
+
 #let bilingual-bibliography(
   bibliography: none,
   title: "参考文献",
@@ -9,6 +11,7 @@
   extra-comma-before-et-al-trans: false,
   // 用于控制多位译者时表现为 `et al. tran`(false) 还是 `et al., tran`(true)
   allow-comma-in-name: false,
+  font-size: 字号.小四,
   // 如果使用的 CSL 中，英文姓名中会出现逗号，请设置为 true
 ) = {
   assert(bibliography != none, message: "请传入带有 source 的 bibliography 函数。")
@@ -139,6 +142,8 @@
 
   context state("in-mainmatter").update(false)
 
+  set text(size: font-size)
+
   bibliography(
     title: title,
     full: full,