Update font settings #49

TheNetAdmin · Mar 30, 2020 · 22f9745 · 22f9745
1 parent 4b8979d
commit 22f9745
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git 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}
diff --git 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
diff --git 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}
diff --git 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
@@ -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     = 姓名,