Skip to content

Commit 9693402

Browse files
committed
[fix]: 字体无需安装,直接下载即可
1 parent c91720e commit 9693402

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
zip -r Xidian-LaTeX-Template-macOS.zip . -x "*.git*" -x ".github/*" -x ".gitignore" -x "WINDOWS_README.md" -x "*.zip"
3030
3131
- name: Create Windows Package
32-
# 排除 Git文件、Github配置、macOS字体、MacTeX设置脚本、以及之前生成的 macOS zip 包
32+
# 排除 Git文件、Github配置、MacTeX设置脚本、以及之前生成的 macOS zip 包
3333
run: |
34-
zip -r Xidian-LaTeX-Template-Windows.zip . -x "*.git*" -x ".github/*" -x ".gitignore" -x "Font/*" -x "MacTex_Installation_Settings/*" -x "switch-texlive.sh" -x "*.zip"
34+
zip -r Xidian-LaTeX-Template-Windows.zip . -x "*.git*" -x ".github/*" -x ".gitignore" -x "MacTex_Installation_Settings/*" -x "switch-texlive.sh" -x "*.zip"
3535
3636
- name: Generate Fixed Release Note
3737
# 生成固定的说明信息文件
@@ -44,7 +44,7 @@ jobs:
4444
| 操作系统 / OS | 推荐文件 / Recommended File | 说明 / Note |
4545
| :--- | :--- | :--- |
4646
| **macOS** | \`Xidian-LaTeX-Template-macOS.zip\` | ✅ 内含字体 & 配置脚本 (Includes fonts & scripts) |
47-
| **Windows** | \`Xidian-LaTeX-Template-Windows.zip\` | 🚀 精简版 (Lite version) |
47+
| **Windows** | \`Xidian-LaTeX-Template-Windows.zip\` | ✅ 内含字体 (Includes fonts) |
4848
4949
> ⚠️ **注意 / Warning**: 请勿直接下载 \`Source code\`,除非你熟悉 Git 操作。请下载上方表格中的 \`.zip\` 文件。
5050
> Please download the \`.zip\` files listed above, NOT the \`Source code\`.
@@ -104,4 +104,3 @@ jobs:
104104
# 更新 Release 说明
105105
gh release edit ${{ github.ref_name }} --notes-file full_notes.md
106106
fi
107-

Font/Readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[🇨🇳 中文](#macos-下安装-windows-字体) | [🇺🇸 English](#install-windows-fonts-on-macos)
44

5-
macOS 自带的宋体、黑体等与 Windows 版本在字形和度量上存在差异,直接使用系统字体排版会导致行距、分页和版式不一致,因此需要先安装与 Windows 环境一致的字体文件
5+
macOS 自带的宋体、黑体等与 Windows 版本在字形和度量上存在差异,本模板已通过 `Font/` 目录提供与 Windows 一致的字体并在编译时自动加载,**无需额外安装**。如果你希望在系统其他软件(如 Pages、Word)中也使用这些字体,可按以下步骤自愿安装
66

77
## 安装步骤
88
1. 打开 `Font` 目录,双击以下每个字体文件或将它们全部拖入「字体册」(Font Book):
@@ -22,7 +22,7 @@ macOS 自带的宋体、黑体等与 Windows 版本在字形和度量上存在
2222

2323
[🇨🇳 中文](#macos-下安装-windows-字体) | [🇺🇸 English](#install-windows-fonts-on-macos)
2424

25-
The built-in Song, Hei, and other fonts on macOS differ from Windows versions in glyph shapes and metrics. Using system fonts directly for typesetting will cause inconsistencies in line spacing, pagination, and layout. Therefore, you need to install font files consistent with the Windows environment first.
25+
The built-in Song, Hei, and other fonts on macOS differ from Windows versions in glyph shapes and metrics. The template already bundles Windows-compatible fonts inside the `Font/` directory and loads them automatically during compilation, so **no extra installation is required**. Install them only if you also need these fonts in other macOS apps (Pages, Word, etc.).
2626

2727
## Installation Steps
2828
1. Open the `Font` directory and double-click each of the following font files or drag them all into Font Book:

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
### ✨ 核心工作流
2525

26-
- **macOS**: `安装字体 → 配置 MacTeX 2025 → 更新宏包 → 编译论文`
27-
- **Windows**: `安装 TeX Live → 更新宏包 → 编译论文`
26+
- **macOS**: `解压模板(字体已内置)→ 配置 MacTeX 2025 → 更新宏包 → 编译论文`
27+
- **Windows**: `解压模板(字体已内置)→ 安装 TeX Live → 更新宏包 → 编译论文`
2828

2929
### ⚠️ 重要提示
3030

@@ -41,7 +41,7 @@
4141
| 版本 | 文件名 | 说明 |
4242
| :--- | :--- | :--- |
4343
| **macOS** | `Xidian-LaTeX-Template-macOS.zip` | ✅ 包含字体文件和 MacTeX 配置脚本 |
44-
| **Windows** | `Xidian-LaTeX-Template-Windows.zip` | 🚀 精简版,移除 macOS 专用字体和脚本 |
44+
| **Windows** | `Xidian-LaTeX-Template-Windows.zip` | ✅ 包含字体文件(移除仅 macOS 需要的脚本) |
4545

4646
---
4747

@@ -51,19 +51,19 @@ Windows 用户请直接参考专门的指南:
5151

5252
👉 **[Windows 使用指南 / Windows User Guide](./WINDOWS_README.md)**
5353

54-
> Windows 版本不需要安装 `Font` 目录下的字体,也不需要配置 MacTeX。
54+
> Windows 版本已包含 `Font` 目录字体,解压即可使用,无需额外安装字体或配置 MacTeX。
5555
5656
---
5757

5858
## 🚀 快速开始 (macOS)
5959

60-
### 步骤 1:安装字体
60+
### 步骤 1:字体说明(已内置)
6161

62-
macOS 系统字体与 Windows 版本存在差异,会导致排版不一致
62+
本模板默认使用 `font-type = file` 加载 `Font/` 目录中的 Windows 版宋体/黑体/楷体,因此 **macOS 用户无需手动安装字体即可获得与 Windows 一致的排版**
6363

64-
**操作**:参照 [Font/Readme.md](./Font/Readme.md) 安装 Windows 版宋体/黑体/楷体
64+
如需在系统层面(例如 Pages、Word 等软件)使用这些字体,可参考 [Font/Readme.md](./Font/Readme.md) 进行可选安装
6565

66-
> 💡 安装后字体立即生效,无需重启系统
66+
> 💡 字体仅供论文排版测试使用,请遵循 [Font/Readme.md](./Font/Readme.md) 中的版权提示
6767
6868
---
6969

README_EN.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ This template is designed specifically for **macOS + TeX Live 2025** environment
2222

2323
### ✨ Core Workflow
2424

25-
- **macOS**: `Install Fonts → Configure MacTeX 2025 → Update Packages → Compile Thesis`
26-
- **Windows**: `Install TeX Live → Update Packages → Compile Thesis`
25+
- **macOS**: `Extract template (fonts included) → Configure MacTeX 2025 → Update Packages → Compile Thesis`
26+
- **Windows**: `Extract template (fonts included) → Install TeX Live → Update Packages → Compile Thesis`
2727

2828
### ⚠️ Important Notice
2929

@@ -39,8 +39,8 @@ It is recommended to download the packaged Release version. Choose according to
3939

4040
| Version | Filename | Description |
4141
| :--- | :--- | :--- |
42-
| **macOS** | `Xidian-LaTeX-Template-macOS.zip` | ✅ Includes fonts and MacTeX scripts |
43-
| **Windows** | `Xidian-LaTeX-Template-Windows.zip` | 🚀 Lite version, excludes macOS-specific files |
42+
| **macOS** | `Xidian-LaTeX-Template-macOS.zip` | ✅ Includes fonts plus MacTeX helper scripts |
43+
| **Windows** | `Xidian-LaTeX-Template-Windows.zip` | ✅ Includes fonts (removes macOS-only scripts) |
4444

4545
---
4646

@@ -50,19 +50,19 @@ For Windows users, please refer to the dedicated guide:
5050

5151
👉 **[Windows User Guide](./WINDOWS_README.md)**
5252

53-
> The Windows version does not require fonts from the `Font` directory, nor does it need MacTeX configuration.
53+
> The Windows package already bundles the `Font/` assets, so you can unzip and compile directly with no extra font installation or MacTeX setup.
5454
5555
---
5656

5757
## 🚀 Quick Start (macOS)
5858

59-
### Step 1: Install Fonts
59+
### Step 1: Fonts (Already Bundled)
6060

61-
macOS system fonts differ from Windows versions, which can cause inconsistent typesetting.
61+
The template uses `font-type = file` to load Windows-style Song/Hei/Kai fonts directly from the `Font/` directory, so **no manual font installation is required on macOS**.
6262

63-
**Action**: Follow [Font/Readme.md](./Font/Readme.md) to install Windows-style Song/Hei/Kai fonts.
63+
If you need these fonts at the system level (e.g., for Pages/Word), follow [Font/Readme.md](./Font/Readme.md) for optional installation instructions.
6464

65-
> 💡 Fonts take effect immediately after installation, no system restart required.
65+
> 💡 The fonts are provided for thesis typesetting tests only—please respect the copyright notice in [Font/Readme.md](./Font/Readme.md).
6666
6767
---
6868

WINDOWS_README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[🇨🇳 中文](#windows-使用指南) | [🇺🇸 English](#windows-user-guide)
44

5-
本模板在 Windows 10/11 下经过测试,可正常编译使用。Windows 用户**不需要**安装 `Font` 目录下的字体文件(模板会自动调用系统自带的中文字体)
5+
本模板在 Windows 10/11 下经过测试,可正常编译使用。Windows 版本已打包 `Font/` 目录,模板会自动加载其中的字体文件,无需另外安装
66

77
---
88

@@ -39,7 +39,7 @@ latexmk -xelatex -bibtex -synctex=1 -interaction=nonstopmode main.tex
3939

4040
[🇨🇳 中文](#windows-使用指南) | [🇺🇸 English](#windows-user-guide)
4141

42-
This template has been tested and works correctly on Windows 10/11. Windows users **do NOT** need to install fonts from the `Font` directory (the template automatically uses system-installed Chinese fonts).
42+
This template has been tested and works correctly on Windows 10/11. The Windows package already includes the `Font/` directory, and the template automatically loads those fonts without any extra installation.
4343

4444
---
4545

0 commit comments

Comments
 (0)