From 1ffaeb8ab37985c2ddaed6f685e56ca213b291b3 Mon Sep 17 00:00:00 2001
From: xdyy <kangweixia_xdyy@163.com>
Date: Sun, 17 Apr 2022 17:20:18 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D`\mathcal`=20=E5=92=8C=20?=
 =?UTF-8?q?`\mathscr`=20=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md   |  6 ++++++
 whu-thesis.cls | 10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbe793d..3855b45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,12 @@
 
 * 添加 `none` 的字体设置。[#72]
 
+## v0.6e
+
+### Fixed
+
+- 修复`\mathcal` 和 `\mathscr` 的问题 ([#125](https://github.com/whutug/whu-thesis/issues/125))
+
 ## v0.6d
 
 ### 删除
diff --git a/whu-thesis.cls b/whu-thesis.cls
index f3492db..9328812 100644
--- a/whu-thesis.cls
+++ b/whu-thesis.cls
@@ -11,6 +11,7 @@
 \ProvidesExplClass{whu-thesis}{2021/05/20}{0.6d}
   {Wuhan University Thesis Template}
 
+% TODO 引擎处理修改为英文
 \msg_new:nnn { whu-thesis } { 引擎不支持 }
   {
     whu-thesis ~ 不支持 ~ #1 ~ 引擎。\\\\
@@ -95,6 +96,7 @@
   }
 \ProcessKeysOptions { whu / option }
 
+% TODO 直接改为 keys_set
 \tl_if_eq:NnT \g__whu_option_type_tl { master }
   {
     \keys_define:nn { whu / option }
@@ -119,7 +121,7 @@
     \clist_gput_right:Nn \g__whu_option_to_class_clist
       { punct = \g__whu_option_punct_tl }
   }
-% 判断是否有 chinese-jfm，若有则使用 chinese-jfm
+
 
 \sys_if_engine_xetex:T { \RequirePackage { etoolbox } }
 % 在载入文档类之前引入 etoolbox
@@ -634,8 +636,10 @@
 % 数学字体
 \cs_new_protected:Npn \__whu_set_math_font_xits:
   {
-    \setmathfont { XITSMath-Regular.otf }
-      [ BoldFont = XITSMath-Bold.otf ]
+    % \setmathfont { XITSMath-Regular.otf }
+      % [ BoldFont = XITSMath-Bold.otf ]
+    \setmathfont{STIXTwoMath-Regular.otf}
+    \setmathfont{STIXTwoMath-Regular.otf}[range={scr,bfscr},StylisticSet=01]
   }
 
 \cs_new_protected:Npn \__whu_set_math_font_termes: