change Kaishu, Fangsong to Fandol fonts

lirundong · Feb 26, 2020 · 8fb8f46 · 8fb8f46
1 parent b044665
commit 8fb8f46
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,5 @@ Thesis.pdf
 # ignore font files
 *.TTF
 *.otf
+Fonts/COPYING-Fandol.txt
+Fonts/LICENSE-Source.txt
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 `sht-thesis` 项目派生于 `ucasthesis`，一个在 GPLv3 License 下分发的项目。根据该许可证条款，`sht-thesis` 项目列出基于 `ucasthesis` (commit `faad94b` 之后) 的所有修改条目：
 
+## 2020-02-26
+
+> Release: v0.1.1
+
+1. 将 ctex-fontset-noto.def 中楷书和仿宋字体修改为 Fandol 系列，以避免可能的侵权问题；
+2. 将封面标题 `\bfesries` 修改为 `\heiti`，以确保英文以衬线字体排版；
+
 ## 2020-02-14
 
 1. 在 Style/ucasthesis.cls 中设置 `\paragraph{}` 行首缩进 2 中文字符；

diff --git a/Fonts/README.txt b/Fonts/README.txt
@@ -1,11 +1,11 @@
 将解压后的字体文件放于此处，即：
 
 Fonts
-├── FZFSK.TTF
-├── HYD4GJ.TTF
+├── COPYING-Fandol.txt
+├── FandolFang-Regular.otf
+├── FandolKai-Regular.otf
+├── LICENSE-Source.txt
 ├── README.txt
-├── STKaitiSC-Bold.TTF
-├── STKaitiSC-Regular.TTF
 ├── SourceHanSansSC-Bold.otf
 ├── SourceHanSansSC-Regular.otf
 ├── SourceHanSerifSC-Bold.otf

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@
 
 ## 重要建议
 
-* `sht-thesis` 新增了思源宋体/黑体+方正楷体/仿宋字体配置，以确保跨平台字形一致,以及*正确*的加粗字重。具体请参考[Wiki 页面](https://github.com/CrazyRundong/sht-thesis/wiki#faq)。
+* `sht-thesis` 新增了思源宋体 / 黑体 + Fandol 楷体 / 仿宋字体配置，以确保跨平台字形一致,以及*正确*的加粗字重。具体请参考[Wiki 页面](https://github.com/CrazyRundong/sht-thesis/wiki#faq)。
 * 关于 ucasthesis 编译和设计的问题，请先读[**模板使用说明**](./shanghaitech.pdf)，如发问需遵从[提问流程](https://github.com/mohuangrui/ucasthesis/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98)。
 * 使用邮件传播 ucasthesis 时，请先删除 `artratex.bat` 以防范 Dos 脚本的潜在风险。
 * 开题报告请见：[ucasproposal: 中国科学院大学开题报告 LaTeX 模板](https://github.com/mohuangrui/ucasproposal)。

diff --git a/Tex/Chap_Guide.tex b/Tex/Chap_Guide.tex
@@ -312,7 +312,7 @@ \section{常见使用问题}\label{sec:qa}
             \item 仿宋：{\ttfamily 国科大论文模板ucasthesis} 或 \texttt{国科大论文模板ucasthesis}
             \item 粗仿宋：{\bfseries\ttfamily 国科大论文模板ucasthesis} 或 \texttt{\bfseries 国科大论文模板ucasthesis}
             \item 楷体：{\itshape 国科大论文模板ucasthesis} 或 \textit{国科大论文模板ucasthesis}
-            \item 粗楷体：{\bfseries\itshape 国科大论文模板ucasthesis} 或 \textit{\bfseries 国科大论文模板ucasthesis}
+            \item 粗楷体：{\bfseries \kaishu{国科大论文模板} \textit{ucasthesis}} 或 \kaishu{\bfseries 国科大论文模板} \textit{\bfseries ucasthesis}
         \end{itemize}
 \end{enumerate}
 

diff --git a/ctex-fontset-source.def b/ctex-fontset-source.def
@@ -6,45 +6,43 @@
     \sys_if_engine_uptex:TF
       { \ctex_fontset_error:n { source } }
       {
-        \setCJKmainfont
-          [
-            Path = Fonts/ ,
-            BoldFont = SourceHanSerifSC-Bold.otf ,
-            ItalicFont = STKaitiSC-Regular.TTF ,
-            BoldItalicFont = STKaitiSC-Bold.TTF ,
-          ] { SourceHanSerifSC-Regular.otf }
-        \setCJKsansfont 
-          [
-            Path = Fonts/ ,
-            BoldFont = SourceHanSansSC-Bold.otf
-          ] { SourceHanSansSC-Regular.otf }
-        \setCJKmonofont
-          [
-            Path = Fonts/ ,
-            BoldFont = HYD4GJ.TTF ,
-          ] { FZFSK.TTF }
-        \setCJKfamilyfont { zhsong }
-          [
-            Path = Fonts/ ,
-            BoldFont = SourceHanSerifSC-Bold.otf ,
-            ItalicFont = STKaitiSC-Regular.TTF ,
-            BoldItalicFont = STKaitiSC-Bold.TTF ,
-          ] { SourceHanSerifSC-Regular.otf }
-        \setCJKfamilyfont { zhhei }
-          [
-            Path = Fonts/ ,
-            BoldFont = SourceHanSansSC-Bold.otf
-          ] { SourceHanSansSC-Regular.otf }
-        \setCJKfamilyfont { zhfs }
-          [
-            Path = Fonts/ ,
-            BoldFont = HYD4GJ.TTF ,
-          ] { FZFSK.TTF }
-        \setCJKfamilyfont { zhkai }
-          [
-            Path = Fonts/ ,
-            BoldFont = STKaitiSC-Bold.TTF ,
-          ]  { STKaitiSC-Regular.TTF }
+        \setCJKfamilyfont { zhsong } [
+            Path = Fonts/,
+            Extension = .otf,
+            BoldFont = SourceHanSerifSC-Bold,
+            ItalicFont = FandolKai-Regular,
+        ] { SourceHanSerifSC-Regular }
+        \setCJKfamilyfont { zhhei } [
+            Path = Fonts/,
+            Extension = .otf,
+            BoldFont = SourceHanSansSC-Bold
+        ] { SourceHanSansSC-Regular }
+        \setCJKfamilyfont { zhfs } [
+            AutoFakeBold,
+            Path = Fonts/,
+            Extension = .otf,
+        ] { FandolFang-Regular }
+        \setCJKfamilyfont { zhkai } [
+            AutoFakeBold,
+            Path = Fonts/,
+            Extension = .otf,
+        ] { FandolKai-Regular }
+        \setCJKmainfont [
+            Path = Fonts/,
+            Extension = .otf,
+            BoldFont = SourceHanSerifSC-Bold,
+            ItalicFont = FandolKai-Regular,
+        ] { SourceHanSerifSC-Regular }
+        \setCJKsansfont [
+            Path = Fonts/,
+            Extension = .otf,
+            BoldFont = SourceHanSansSC-Bold
+        ] { SourceHanSansSC-Regular }
+        \setCJKmonofont [
+            AutoFakeBold,
+            Path = Fonts/,
+            Extension = .otf,
+        ] { FandolFang-Regular }
       }
   }
 \NewDocumentCommand \songti   { } { \CJKfamily { zhsong } }

diff --git a/shanghaitech.pdf b/shanghaitech.pdf