diff --git a/profile/font.sty b/profile/font.sty
index f0488643731a7d28bb39d3fa0cfc026c24ae98bd..ae07d43051b17749d518ff366beb92fce988e85e 100644
--- a/profile/font.sty
+++ b/profile/font.sty
@@ -1,14 +1,17 @@
%\ProvidesExplPackage{profile/font}{-9-4}{0.1}{SomethingsIwrote}
-% 瑕嗙洊 ctex 瀛椾綋璁剧疆
\RequireXeTeX
-% 璁剧疆瑗挎枃瀛椾綋
-\setmainfont{Times~New~Roman}
-\setsansfont{Arial}
-\setmonofont{Courier~New}[Scale=MatchLowercase]
-% 鎬濇簮瀹嬩綋 https://www.google.com/get/noto/#serif-hans
-\setCJKmainfont[
+% 瑕嗙洊 ctex 瀛椾綋璁剧疆
+\newcommand\use_fontset_windows{
+ % 璁剧疆瑗挎枃瀛椾綋
+ \setmainfont{Times~New~Roman}
+ \setsansfont{Arial}
+ \setmonofont{Courier~New}[Scale=MatchLowercase]
+
+ % 璁剧疆涓枃瀛椾綋
+ % 鎬濇簮瀹嬩綋 https://www.google.com/get/noto/#serif-hans
+ \setCJKmainfont[
UprightFont=NotoSerifCJKsc-Regular,
BoldFont=NotoSerifCJKsc-Bold,
ItalicFont=NotoSerifCJKsc-Regular,
@@ -16,8 +19,8 @@
ItalicFeatures=FakeSlant,
BoldItalicFeatures=FakeSlant]{Noto~Serif~CJK~SC}
-% 鎬濇簮榛戜綋 https://www.google.com/get/noto/#sans-hans
-\setCJKsansfont[
+ % 鎬濇簮榛戜綋 https://www.google.com/get/noto/#sans-hans
+ \setCJKsansfont[
UprightFont=NotoSansCJKsc-Regular,
BoldFont=NotoSansCJKsc-Bold,
ItalicFont=NotoSansCJKsc-Regular,
@@ -25,7 +28,8 @@
ItalicFeatures=FakeSlant,
BoldItalicFeatures=FakeSlant]{Noto~Sans~CJK~SC}
-\setCJKmonofont[
+ % 鍖呭惈浜庝笂杩版€濇簮榛戜綋
+ \setCJKmonofont[
UprightFont=NotoSansMonoCJKsc-Regular,
BoldFont=NotoSansMonoCJKsc-Bold,
ItalicFont=NotoSansMonoCJKsc-Regular,
@@ -33,99 +37,80 @@
ItalicFeatures=FakeSlant,
BoldItalicFeatures=FakeSlant]{Noto~Sans~Mono~SC}
-\setCJKfamilyfont{zhsong}{Noto~Serif~CJK~SC}
-\setCJKfamilyfont{zhhei}{Noto~Sans~CJK~SC}
-% \setCJKfamilyfont{zhfs}{FangSong}
-\setCJKfamilyfont{zhfs}{FandolFang-Regular}[Extension=.otf]
-\setCJKfamilyfont{zhkai}{FandolKai-Regular}[Extension=.otf]}
-% 妤蜂綋浣跨敤鏂规妤蜂綋绠€浣擄紝涓哄厤璐瑰晢鐢ㄥ瓧浣擄紝涓旀敮鎸丆JK瀛楃闆�
-% http://www.foundertype.com/index.php/FontInfo/index/id/137.html
-% \setCJKfamilyfont{zhkai}{FZKTJW--GB1-0}[AutoFakeBold=2.17]
-% \setCJKfamilyfont{zhnewhei}{Microsoft~YaHei}[BoldFont=Microsoft~YaHei~Bold]
-
-
-
-% \newcommand\use_fontset_windows{
-% % 璁剧疆瑗挎枃瀛椾綋
-% \setmainfont{Times~New~Roman}
-% \setsansfont{Arial}
-% \setmonofont{Courier~New}[Scale=MatchLowercase]
-% % 璁剧疆涓枃瀛椾綋
-% \setCJKmainfont{SimSun}[AutoFakeBold=true, ItalicFont=KaiTi]
-% \setCJKsansfont{SimHei}
-% \setCJKmonofont{FangSong}
-% \setCJKfamilyfont{zhsong}{SimSun}[AutoFakeBold=2.17]
-% \setCJKfamilyfont{zhhei}{SimHei}
-% \setCJKfamilyfont{zhfs}{FangSong}
-% \setCJKfamilyfont{zhkai}{KaiTi}[AutoFakeBold=2.17]
-% \setCJKfamilyfont{zhnewhei}{Microsoft~YaHei}[BoldFont=Microsoft~YaHei~Bold]
-% }
+ \setCJKfamilyfont{zhsong}{Noto~Serif~CJK~SC}
+ \setCJKfamilyfont{zhhei}{Noto~Sans~CJK~SC}
+ \setCJKfamilyfont{zhfs}{FangSong}
+ % 妤蜂綋浣跨敤鏂规妤蜂綋绠€浣擄紝涓哄厤璐瑰晢鐢ㄥ瓧浣擄紝涓旀敮鎸丆JK瀛楃闆�
+ % http://www.foundertype.com/index.php/FontInfo/index/id/137.html
+ \setCJKfamilyfont{zhkai}{FZKTJW--GB1-0}[AutoFakeBold=2.17]
+ \setCJKfamilyfont{zhnewhei}{Microsoft~YaHei}[BoldFont=Microsoft~YaHei~Bold]
+}
-% \newcommand\use_fontset_macos{
-% % 璁剧疆瑗挎枃瀛椾綋
-% \setmainfont{Times~New~Roman}
-% \setsansfont{Arial}
-% \setmonofont{Menlo}[Scale=MatchLowercase]
-% % 璁剧疆涓枃瀛椾綋
-% \setCJKmainfont{Songti~SC~Light}[BoldFont=Songti~SC~Bold, ItalicFont=Kaiti~SC, BoldItalicFont=Kaiti~SC~Bold]
-% \setCJKsansfont{Heiti~SC~Light}[BoldFont=Heiti~SC~Medium]
-% \setCJKmonofont{STFangsong}
-% \setCJKfamilyfont{zhsong}{Songti~SC~Light}[BoldFont=Songti~SC~Bold]
-% \setCJKfamilyfont{zhhei}{Heiti~SC~Light}[BoldFont=Heiti~SC~Medium]
-% \setCJKfamilyfont{zhfs}{STFangsong}
-% \setCJKfamilyfont{zhkai}{Kaiti~SC}[BoldFont=Kaiti~SC~Bold]
-% \setCJKfamilyfont{zhnewhei}{PingFang~SC}
-% }
+\newcommand\use_fontset_macos{
+ % 璁剧疆瑗挎枃瀛椾綋
+ \setmainfont{Times~New~Roman}
+ \setsansfont{Arial}
+ \setmonofont{Menlo}[Scale=MatchLowercase]
+ % 璁剧疆涓枃瀛椾綋
+ \setCJKmainfont{Songti~SC~Light}[BoldFont=Songti~SC~Bold, ItalicFont=Kaiti~SC, BoldItalicFont=Kaiti~SC~Bold]
+ \setCJKsansfont{Heiti~SC~Light}[BoldFont=Heiti~SC~Medium]
+ \setCJKmonofont{STFangsong}
+ \setCJKfamilyfont{zhsong}{Songti~SC~Light}[BoldFont=Songti~SC~Bold]
+ \setCJKfamilyfont{zhhei}{Heiti~SC~Light}[BoldFont=Heiti~SC~Medium]
+ \setCJKfamilyfont{zhfs}{STFangsong}
+ \setCJKfamilyfont{zhkai}{Kaiti~SC}[BoldFont=Kaiti~SC~Bold]
+ \setCJKfamilyfont{zhnewhei}{PingFang~SC}
+}
-% \newcommand\use_fontset_linux{
-% % 绉婚櫎 does not contain script "CJK" 璀﹀憡
-% \msg_redirect_name:nnn {fontspec} {no-script} {info}
-% % 璁剧疆瑗挎枃瀛椾綋
-% \setmainfont{texgyretermes}[
-% Extension=.otf,
-% UprightFont=*-regular,
-% BoldFont=*-bold,
-% ItalicFont=*-italic,
-% BoldItalicFont=*-bolditalic]
-% \setsansfont{texgyreheros}[
-% Extension=.otf,
-% UprightFont=*-regular,
-% BoldFont=*-bold,
-% ItalicFont=*-italic,
-% BoldItalicFont=*-bolditalic]
-% \setmonofont{texgyrecursor}[
-% Extension=.otf,
-% UprightFont=*-regular,
-% BoldFont=*-bold,
-% ItalicFont=*-italic,
-% BoldItalicFont=*-bolditalic,
-% Scale=MatchLowercase,
-% Ligatures=CommonOff]
-% % 璁剧疆涓枃瀛椾綋
-% \setCJKmainfont{FandolSong-Regular}[Extension=.otf,BoldFont=FandolSong-Bold,ItalicFont=FandolKai-Regular]
-% \setCJKsansfont{FandolHei-Regular}[Extension=.otf,BoldFont=FandolHei-Bold]
-% \setCJKmonofont{FandolFang-Regular}[Extension=.otf]
-% \setCJKfamilyfont{zhsong}{FandolSong-Regular}[Extension=.otf,BoldFont=FandolSong-Bold]
-% \setCJKfamilyfont{zhhei}{FandolHei-Regular}[Extension=.otf,BoldFont=FandolHei-Bold]
-% \setCJKfamilyfont{zhfs}{FandolFang-Regular}[Extension=.otf]
-% \setCJKfamilyfont{zhkai}{FandolKai-Regular}[Extension=.otf]}
+\newcommand\use_fontset_linux{
+ % 绉婚櫎 does not contain script "CJK" 璀﹀憡
+ \msg_redirect_name:nnn {fontspec} {no-script} {info}
+ % 璁剧疆瑗挎枃瀛椾綋
+ \setmainfont{texgyretermes}[
+ Extension=.otf,
+ UprightFont=*-regular,
+ BoldFont=*-bold,
+ ItalicFont=*-italic,
+ BoldItalicFont=*-bolditalic]
+ \setsansfont{texgyreheros}[
+ Extension=.otf,
+ UprightFont=*-regular,
+ BoldFont=*-bold,
+ ItalicFont=*-italic,
+ BoldItalicFont=*-bolditalic]
+ \setmonofont{texgyrecursor}[
+ Extension=.otf,
+ UprightFont=*-regular,
+ BoldFont=*-bold,
+ ItalicFont=*-italic,
+ BoldItalicFont=*-bolditalic,
+ Scale=MatchLowercase,
+ Ligatures=CommonOff]
+ % 璁剧疆涓枃瀛椾綋
+ \setCJKmainfont{FandolSong-Regular}[Extension=.otf,BoldFont=FandolSong-Bold,ItalicFont=FandolKai-Regular]
+ \setCJKsansfont{FandolHei-Regular}[Extension=.otf,BoldFont=FandolHei-Bold]
+ \setCJKmonofont{FandolFang-Regular}[Extension=.otf]
+ \setCJKfamilyfont{zhsong}{FandolSong-Regular}[Extension=.otf,BoldFont=FandolSong-Bold]
+ \setCJKfamilyfont{zhhei}{FandolHei-Regular}[Extension=.otf,BoldFont=FandolHei-Bold]
+ \setCJKfamilyfont{zhfs}{FandolFang-Regular}[Extension=.otf]
+ \setCJKfamilyfont{zhkai}{FandolKai-Regular}[Extension=.otf]}
-% % 妫€娴嬫槸鍚︽槸 Windows
-% \sys_if_platform_windows:TF
-% {
-% \use_fontset_windows
-% }
-% {
-% % 妫€娴嬫槸鍚︽槸 MacOS
-% \ctex_if_platform_macos:TF
-% {
-% \use_fontset_macos
-% }
-% % 鍏朵綑绯荤粺涓€寰嬭瘑鍒负 Linux
-% {
-% \use_fontset_linux
-% }
-% }
+% 妫€娴嬫槸鍚︽槸 Windows
+\sys_if_platform_windows:TF
+{
+ \use_fontset_windows
+}
+{
+ % 妫€娴嬫槸鍚︽槸 MacOS
+ \ctex_if_platform_macos:TF
+ {
+ \use_fontset_macos
+ }
+ % 鍏朵綑绯荤粺涓€寰嬭瘑鍒负 Linux
+ {
+ \use_fontset_linux
+ }
+}
\NewDocumentCommand\songti{}{\CJKfamily{zhsong}}
\NewDocumentCommand\heiti{}{\CJKfamily{zhhei}}