Fix option

Author: zepinglee

ustcthesis.cls

@@ -106,6 +106,14 @@
           { \bool_set_true:N \l__ustc_degree_graduate_bool }
         \l__ustc_degree_hook_tl
       } ,
+    fontset .choices:nn =
+      { auto , windows , mac , ubuntu , fandol , none }
+      { \str_set:NV \l__ustc_fontset_str \l_keys_choice_tl } ,
+    output .choice: ,
+    output / print .code:n =
+      { \bool_set_false:N \l__ustc_output_electronic_bool } ,
+    output / electronic .code:n =
+      { \bool_set_true:N \l__ustc_output_electronic_bool } ,
     degree-type .choices:nn =
       { academic , professional , engineering }
       { \str_set:NV \l__ustc_degree_type_str \l_keys_choice_tl } ,
@@ -120,9 +128,6 @@
       } ,
     review .bool_set:N = \l__ustc_review_bool ,
     reviewer .bool_set:N = \l__ustc_reviewer_bool ,
-    fontset .choices:nn =
-      { auto , windows , mac , ubuntu , fandol , none }
-      { \str_set:NV \l__ustc_fontset_str \l_keys_choice_tl } ,
     font .choices:nn =
       { auto , times , termes , stix , xits , libertinus , newcm , lm , newtx , cm , none }
       {
@@ -182,11 +187,6 @@
         \str_set:NV \l__ustc_cite_style_str \l_keys_choice_tl
         \l__ustc_cite_style_hook_tl
       } ,
-    output .choice: ,
-    output / print .code:n =
-      { \bool_set_false:N \l__ustc_output_electronic_bool } ,
-    output / electronic .code:n =
-      { \bool_set_true:N \l__ustc_output_electronic_bool } ,
     section-style .choice: ,
     section-style / chinese .code:n =
       { \bool_set_true:N \l__ustc_section_style_chinese_bool } ,
@@ -202,18 +202,18 @@
       { \bool_set_true:N \l__ustc_eqn_paren_style_full_bool } ,
     eqn-paren-style / half .code:n =
       { \bool_set_false:N \l__ustc_eqn_paren_style_full_bool } ,
-    unknown .code:n =
-      { \PassOptionsToClass { \CurrentOption } { ctexbook } } ,
+    unknown .code:n = { \PassOptionsToClass { \CurrentOption } { ctexbook } } ,
   }
 
 \keys_set:nn { ustc }
   {
     degree      = doctor ,
+    fontset     = auto ,
+    output      = print ,
     degree-type = academic ,
     language    = chinese ,
     review      = false ,
     reviewer    = false ,
-    fontset     = auto ,
     font        = auto ,
     cjk-font    = auto ,
     math-font   = auto ,
@@ -264,11 +264,19 @@
     \ProcessKeysOptions { ustc }
   }
 
-\keys_set:nn { ustc }
-  { unknown .undefine: }
+\clist_map_inline:nn { degree , fontset , output }
+  {
+    \keys_define:nn { ustc }
+      {
+        #1 .code:n = { \msg_error:nnnn { ustcthesis } { load-only } {##1} } ,
+      }
+  }
 
-\bool_if:NT \l__ustc_output_electronic_bool
-  { \PassOptionsToClass { oneside } { ctexbook } }
+\msg_new:nnn { ustcthesis } { load-only }
+  { The~ '#1'~ option~ can~ only~ be~ used~ when~ loading~ the~ class. }
+
+\keys_define:nn { ustc }
+  { unknown .undefine: }
 
 \PassOptionsToPackage { no-math } { fontspec }
 
@@ -283,7 +291,7 @@
 % 建议在模板开始处载入全部宏包，不要轻易改变加载顺序。
 % \pkg{hyperref} 一般在最后加载。
 \RequirePackage { amsmath }
-\RequirePackage { fontspec } [ 2017/03/31 ]
+\RequirePackage { fontspec }
 \RequirePackage { geometry }
 \RequirePackage { graphicx }
 \RequirePackage { fancyhdr }
@@ -604,14 +612,14 @@
 \str_if_eq:VnT \l__ustc_fontset_str { auto }
   {
     \sys_if_platform_windows:TF
-      { \ustcsetup { fontset = windows } }
+      { \str_set:Nn \l__ustc_fontset_str { windows } }
       {
         \fontspec_font_if_exist:nTF { SimSun }
-          { \ustcsetup { fontset = windows} }
+          { \str_set:Nn \l__ustc_fontset_str { windows } }
           {
             \__ustc_if_platform_mac:TF
-              { \ustcsetup { fontset = mac } }
-              { \ustcsetup { fontset = fandol } }
+              { \str_set:Nn \l__ustc_fontset_str { mac } }
+              { \str_set:Nn \l__ustc_fontset_str { fandol } }
           }
       }
   }