Merge branch 'mathscr-mathcal-issue'

xkwxdyy · xkwxdyy · commit 61ae4a1609c2 · 2022-04-17T17:20:35.000+08:00
diff --git 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
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`\ProvidesExplClass{whu-thesis}{2021/05/20}{0.6d}`
`12`	`12`	`{Wuhan University Thesis Template}`
`13`	`13`
	`14`	`+% TODO 引擎处理修改为英文`
`14`	`15`	`\msg_new:nnn { whu-thesis } { 引擎不支持 }`
`15`	`16`	`{`
`16`	`17`	`whu-thesis ~ 不支持 ~ #1 ~ 引擎。\\\\`
`@@ -95,6 +96,7 @@`
`95`	`96`	`}`
`96`	`97`	`\ProcessKeysOptions { whu / option }`
`97`	`98`
	`99`	`+% TODO 直接改为 keys_set`
`98`	`100`	`\tl_if_eq:NnT \g__whu_option_type_tl { master }`
`99`	`101`	`{`
`100`	`102`	`\keys_define:nn { whu / option }`
`@@ -119,7 +121,7 @@`
`119`	`121`	`\clist_gput_right:Nn \g__whu_option_to_class_clist`
`120`	`122`	`{ punct = \g__whu_option_punct_tl }`
`121`	`123`	`}`
`122`		`-% 判断是否有 chinese-jfm，若有则使用 chinese-jfm`
	`124`	`+`
`123`	`125`
`124`	`126`	`\sys_if_engine_xetex:T { \RequirePackage { etoolbox } }`
`125`	`127`	`% 在载入文档类之前引入 etoolbox`
`@@ -634,8 +636,10 @@`
`634`	`636`	`% 数学字体`
`635`	`637`	`\cs_new_protected:Npn \__whu_set_math_font_xits:`
`636`	`638`	`{`
`637`		`- \setmathfont { XITSMath-Regular.otf }`
`638`		`- [ BoldFont = XITSMath-Bold.otf ]`
	`639`	`+ % \setmathfont { XITSMath-Regular.otf }`
	`640`	`+ % [ BoldFont = XITSMath-Bold.otf ]`
	`641`	`+ \setmathfont{STIXTwoMath-Regular.otf}`
	`642`	`+ \setmathfont{STIXTwoMath-Regular.otf}[range={scr,bfscr},StylisticSet=01]`
`639`	`643`	`}`
`640`	`644`
`641`	`645`	`\cs_new_protected:Npn \__whu_set_math_font_termes:`