Commit 521eda1

HPCesia <me@hpcesia.com>
2025-03-19 14:50:45
fix: 修复参数传入错误和页码字号
1 parent 6a7133d
Changed files (3)
layouts/mainmatter.typ
@@ -45,10 +45,8 @@
   it,
 ) = {
   // 0.  标志前言结束
-  set page(numbering: none)
+  set page(footer: none)
   pagebreak(weak: true, to: if twoside { "odd" })
-  set page(numbering: "1")
-  counter(page).update(1)
 
   // 1.  默认参数
   fonts = 字体 + fonts
@@ -163,5 +161,10 @@
     },
   ))
 
+  set page(footer: context {
+    set text(font: fonts.宋体, size: 字号.小五)
+    align(center, counter(page).display("1"))
+  })
+  counter(page).update(1)
   it
 }
layouts/preface.typ
@@ -1,15 +1,26 @@
+#import "../utils/style.typ": 字号, 字体
+
 #let preface(
   // documentclass 传入的参数
   twoside: false,
+  fonts: (:),
   // 其他参数
   ..args,
   it,
 ) = {
-  // 分页
+  // 1.  默认参数
+  fonts = 字体 + fonts
+
+  // 2.  分页
   if twoside {
     pagebreak() + " "
   }
+
+  // 3.  处理页脚
   counter(page).update(0)
-  set page(numbering: "I")
+  set page(footer: context {
+    set text(font: fonts.宋体, size: 字号.小五)
+    align(center, counter(page).display("I"))
+  })
   it
 }
lib.typ
@@ -42,13 +42,25 @@
     info: info,
     // 页面布局
     doc: (..args) => {
-      doc(..args, info: info + args.named().at("info", default: (:)))
+      doc(
+        ..args,
+        info: info + args.named().at("info", default: (:)),
+      )
     },
     preface: (..args) => {
-      preface(twoside: twoside, ..args)
+      preface(
+        twoside: twoside,
+        ..args,
+        fonts: fonts + args.named().at("fonts", default: (:)),
+      )
     },
     mainmatter: (..args) => {
-      mainmatter(twoside: twoside, ..args)
+      mainmatter(
+        twoside: twoside,
+        ..args,
+        info: info + args.named().at("info", default: (:)),
+        fonts: fonts + args.named().at("fonts", default: (:)),
+      )
     },
     // 封面页
     cover: (..args) => bachelor-cover(