From 22f974564518c5de3201668db0a354017f34f95c Mon Sep 17 00:00:00 2001
From: TheNetAdmin <zxwang42@gmail.com>
Date: Sun, 29 Mar 2020 18:50:20 -0700
Subject: [PATCH] Update font settings #49

---
 config/format/general/fonts.tex     | 15 ++++++++++++++-
 config/format/major/cs/fonts.tex    |  2 +-
 config/format/major/isee/fonts.tex  |  1 -
 config/format/major/isee/format.tex |  1 -
 config/packages.tex                 |  2 +-
 zjuthesis.tex                       | 11 ++++++++++-
 6 files changed, 26 insertions(+), 6 deletions(-)
 delete mode 100644 config/format/major/isee/fonts.tex

diff --git a/config/format/general/fonts.tex b/config/format/general/fonts.tex
index 832b5d13..88354aaf 100644
--- a/config/format/general/fonts.tex
+++ b/config/format/general/fonts.tex
@@ -1,3 +1,16 @@
-\setCJKmainfont{FangSong}
+\newcommand{\FangSongFontName}{FangSong}
+\ExplSyntaxOn
+\cs_generate_variant:Nn \tl_if_eq:nnTF {Vn}
+
+\tl_if_eq:VnTF \g__ctex_fontset_tl {mac}
+    { % macOS
+        \renewcommand{\FangSongFontName}{STFangsong}
+    }
+    { % Windows or Linux or Other OS
+        \renewcommand{\FangSongFontName}{FangSong}
+    }
+\ExplSyntaxOff
+
+\setCJKmainfont{\FangSongFontName}
 \setmainfont{Times New Roman}
 \renewcommand{\bibfont}{\zihao{5}\songti}
\ No newline at end of file
diff --git a/config/format/major/cs/fonts.tex b/config/format/major/cs/fonts.tex
index a6a1519b..f12be160 100644
--- a/config/format/major/cs/fonts.tex
+++ b/config/format/major/cs/fonts.tex
@@ -1,4 +1,4 @@
-\setCJKmainfont{FangSong}
+\setCJKmainfont{\FangSongFontName}
 
 % CS master thesis use SongTi as default font, weird...
 \ifthenelse{\equal{\Degree}{graduate} \AND \equal{\GradLevel}{master}}
diff --git a/config/format/major/isee/fonts.tex b/config/format/major/isee/fonts.tex
deleted file mode 100644
index d327209b..00000000
--- a/config/format/major/isee/fonts.tex
+++ /dev/null
@@ -1 +0,0 @@
-\setCJKmainfont{FangSong}
diff --git a/config/format/major/isee/format.tex b/config/format/major/isee/format.tex
index 634cf36b..07e7597e 100644
--- a/config/format/major/isee/format.tex
+++ b/config/format/major/isee/format.tex
@@ -1,4 +1,3 @@
 \input{config/format/major/isee/packages}
 
-\input{config/format/major/isee/fonts}
 \input{config/format/major/isee/code}
\ No newline at end of file
diff --git a/config/packages.tex b/config/packages.tex
index 0136d248..71fa0b0b 100644
--- a/config/packages.tex
+++ b/config/packages.tex
@@ -12,7 +12,7 @@
 \usepackage{ulem}
 \usepackage{pdfpages}
 \usepackage[
-    style=gb7714-2015
+    style=gb7714-2015,
     % gbpub=false,         % Uncomment if you do NOT want '[S.l. : s.n.]' in reference entries, GitHub Issue (#47)
     % gbnamefmt=lowercase, % Uncomment if you do NOT want uppercase author names in reference entries, GitHub Issue (#23)
 ]{biblatex}
diff --git a/zjuthesis.tex b/zjuthesis.tex
index 465f9f5d..9afa8a04 100644
--- a/zjuthesis.tex
+++ b/zjuthesis.tex
@@ -3,7 +3,16 @@
 % Email     : zxwang42 [at] gmail.com
 % Update    : https://github.com/TheNetAdmin/zjuthesis/releases
 % Chat Room : https://gitter.im/zjuthesis/community
-% Document  : https://thenetadmin.github.io/zjuthesis
+% Documents : https://thenetadmin.github.io/zjuthesis
+
+% If you have trouble using this template, please:
+%   1. First go through the online documentations mentioned above, to see if 
+%      there're already solutions.
+%   2. Go through GitHub Issue list, to see if there're discussions on similar
+%      problems
+%   3. Open a new GitHub Issue to discuss with developers
+%   4. If you don't know how to use GitHub, you can visit the online chat room 
+%      or send me an email
 
 \documentclass[
     StudentName     = 姓名,