Merge pull request #152 from BITNP/latex3

Suppress harmless warnings.
BITNP · Jul 9, 2022 · 6a4e80e · 6a4e80e
2 parents 20a455d + 17c5cee
commit 6a4e80e
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 72 deletions.
diff --git a/bithesis.dtx b/bithesis.dtx
@@ -1016,6 +1016,7 @@
   type .initial:n = bachelor,
   twoside .bool_gset:N = \g_@@_twoside_bool,
   blindPeerReview .bool_gset:N = \g_@@_blind_mode_bool,
+  ctex .tl_set:N = \l_@@_options_to_ctex_tl,
 }
 
 \keys_define:nn { bithesis / cover }
@@ -1105,9 +1106,10 @@
   \PassOptionsToClass{oneside,openany}{ctexbook}
 }
 
+
 % Any extra option passed by user will be passed to ctexbook.
 \DeclareOption*{
-  \PassOptionsToClass{\CurrentOption}{ctexbook}
+  \PassOptionsToClass{\l_@@_options_to_ctex_tl}{ctexbook}
 }
 % Executes the code for each option.
 \ProcessOptions\relax
@@ -1137,6 +1139,11 @@
 \RequirePackage{enumitem}
 \RequirePackage{environ}
 
+% Suppress warning for \hskip by hyperref.
+\pdfstringdefDisableCommands{%
+  \let\quad\empty  
+}
+
 \@@_if_graduate:TF {
   \int_set:Nn \g_@@_head_zihao_int {5}
   \geometry{
@@ -2433,9 +2440,31 @@
 
 \PassOptionsToPackage{AutoFakeBold,AutoFakeSlant}{xeCJK}
 
+\keys_define:nn { bitreport }
+  {
+    option .meta:nn = {bitreport / option } {#1},
+    cover .meta:nn = { bitreport / cover  } {#1},
+    info .meta:nn = { bitreport / info } {#1},
+    misc .meta:nn = { bitreport / misc } {#1}
+  }
+
+\keys_define:nn { bitreport / option }
+  {
+    type .choice:,
+    type .value_required:n = true,
+    type .choices:Vn =
+      \c_@@_report_type_clist
+      { 
+        \int_set_eq:NN \g_@@_report_type_int \l_keys_choice_int 
+      },
+    type .initial:n = common,
+    ctex .tl_set:N = \l_@@_options_to_ctex_tl,
+  }
+
+
 % Pass every option not explicitly defined to `ctexbeamer`.
 \DeclareOption*{
-  \PassOptionsToClass{\CurrentOption}{ctexart}
+  \PassOptionsToClass{\l_@@_options_to_ctex_tl}{ctexart}
 }
 % Executes the code for each option.
 \ProcessOptions\relax
@@ -2450,14 +2479,6 @@
 \RequirePackage{pdfpages}
 
 
-\keys_define:nn { bitreport }
-  {
-    option .meta:nn = {bitreport / option } {#1},
-    cover .meta:nn = { bitreport / cover  } {#1},
-    info .meta:nn = { bitreport / info } {#1},
-    misc .meta:nn = { bitreport / misc } {#1}
-  }
-
 \keys_define:nn { bitreport / cover }
   {
     imagePath .tl_set:N = \l_bit_coverimagepath_tl,
@@ -2490,19 +2511,6 @@
     studentId .tl_set:N = \l_@@_value_student_id_tl,
   }
 
-\keys_define:nn { bitreport / option }
-{
-  type .choice:,
-  type .value_required:n = true,
-  type .choices:Vn =
-    \c_@@_report_type_clist
-    { 
-      \int_set_eq:NN \g_@@_report_type_int \l_keys_choice_int 
-    },
-  type .initial:n = common,
-
-}
-
 \keys_define:nn { bitreport / misc }
   {
     reviewTable .tl_set:N = \l_bit_reviewtable_tl,

diff --git a/templates/graduate-thesis/bithesis.cls b/templates/graduate-thesis/bithesis.cls
@@ -224,6 +224,7 @@
   type .initial:n = bachelor,
   twoside .bool_gset:N = \g__bithesis_twoside_bool,
   blindPeerReview .bool_gset:N = \g__bithesis_blind_mode_bool,
+  ctex .tl_set:N = \l__bithesis_options_to_ctex_tl,
 }
 
 \keys_define:nn { bithesis / cover }
@@ -314,7 +315,7 @@
 }
 
 \DeclareOption*{
-  \PassOptionsToClass{\CurrentOption}{ctexbook}
+  \PassOptionsToClass{\l__bithesis_options_to_ctex_tl}{ctexbook}
 }
 \ProcessOptions\relax
 \LoadClass[zihao=-4,]{ctexbook}
@@ -342,6 +343,10 @@
 \RequirePackage{enumitem}
 \RequirePackage{environ}
 
+\pdfstringdefDisableCommands{%
+  \let\quad\empty
+}
+
 \__bithesis_if_graduate:TF {
   \int_set:Nn \g__bithesis_head_zihao_int {5}
   \geometry{

diff --git a/templates/lab-report/bitreport.cls b/templates/lab-report/bitreport.cls
@@ -41,8 +41,29 @@
 
 \PassOptionsToPackage{AutoFakeBold,AutoFakeSlant}{xeCJK}
 
+\keys_define:nn { bitreport }
+  {
+    option .meta:nn = {bitreport / option } {#1},
+    cover .meta:nn = { bitreport / cover  } {#1},
+    info .meta:nn = { bitreport / info } {#1},
+    misc .meta:nn = { bitreport / misc } {#1}
+  }
+
+\keys_define:nn { bitreport / option }
+  {
+    type .choice:,
+    type .value_required:n = true,
+    type .choices:Vn =
+      \c__bithesis_report_type_clist
+      {
+        \int_set_eq:NN \g__bithesis_report_type_int \l_keys_choice_int
+      },
+    type .initial:n = common,
+    ctex .tl_set:N = \l__bithesis_options_to_ctex_tl,
+  }
+
 \DeclareOption*{
-  \PassOptionsToClass{\CurrentOption}{ctexart}
+  \PassOptionsToClass{\l__bithesis_options_to_ctex_tl}{ctexart}
 }
 \ProcessOptions\relax
 \LoadClass[zihao=-4]{ctexart}
@@ -54,14 +75,6 @@
 \RequirePackage{booktabs}
 \RequirePackage{pdfpages}
 
-\keys_define:nn { bitreport }
-  {
-    option .meta:nn = {bitreport / option } {#1},
-    cover .meta:nn = { bitreport / cover  } {#1},
-    info .meta:nn = { bitreport / info } {#1},
-    misc .meta:nn = { bitreport / misc } {#1}
-  }
-
 \keys_define:nn { bitreport / cover }
   {
     imagePath .tl_set:N = \l_bit_coverimagepath_tl,
@@ -94,19 +107,6 @@
     studentId .tl_set:N = \l__bithesis_value_student_id_tl,
   }
 
-\keys_define:nn { bitreport / option }
-{
-  type .choice:,
-  type .value_required:n = true,
-  type .choices:Vn =
-    \c__bithesis_report_type_clist
-    {
-      \int_set_eq:NN \g__bithesis_report_type_int \l_keys_choice_int
-    },
-  type .initial:n = common,
-
-}
-
 \keys_define:nn { bitreport / misc }
   {
     reviewTable .tl_set:N = \l_bit_reviewtable_tl,

diff --git a/templates/paper-translation/bithesis.cls b/templates/paper-translation/bithesis.cls
@@ -224,6 +224,7 @@
   type .initial:n = bachelor,
   twoside .bool_gset:N = \g__bithesis_twoside_bool,
   blindPeerReview .bool_gset:N = \g__bithesis_blind_mode_bool,
+  ctex .tl_set:N = \l__bithesis_options_to_ctex_tl,
 }
 
 \keys_define:nn { bithesis / cover }
@@ -314,7 +315,7 @@
 }
 
 \DeclareOption*{
-  \PassOptionsToClass{\CurrentOption}{ctexbook}
+  \PassOptionsToClass{\l__bithesis_options_to_ctex_tl}{ctexbook}
 }
 \ProcessOptions\relax
 \LoadClass[zihao=-4,]{ctexbook}
@@ -342,6 +343,10 @@
 \RequirePackage{enumitem}
 \RequirePackage{environ}
 
+\pdfstringdefDisableCommands{%
+  \let\quad\empty
+}
+
 \__bithesis_if_graduate:TF {
   \int_set:Nn \g__bithesis_head_zihao_int {5}
   \geometry{

diff --git a/templates/undergraduate-proposal-report/bitreport.cls b/templates/undergraduate-proposal-report/bitreport.cls
@@ -41,8 +41,29 @@
 
 \PassOptionsToPackage{AutoFakeBold,AutoFakeSlant}{xeCJK}
 
+\keys_define:nn { bitreport }
+  {
+    option .meta:nn = {bitreport / option } {#1},
+    cover .meta:nn = { bitreport / cover  } {#1},
+    info .meta:nn = { bitreport / info } {#1},
+    misc .meta:nn = { bitreport / misc } {#1}
+  }
+
+\keys_define:nn { bitreport / option }
+  {
+    type .choice:,
+    type .value_required:n = true,
+    type .choices:Vn =
+      \c__bithesis_report_type_clist
+      {
+        \int_set_eq:NN \g__bithesis_report_type_int \l_keys_choice_int
+      },
+    type .initial:n = common,
+    ctex .tl_set:N = \l__bithesis_options_to_ctex_tl,
+  }
+
 \DeclareOption*{
-  \PassOptionsToClass{\CurrentOption}{ctexart}
+  \PassOptionsToClass{\l__bithesis_options_to_ctex_tl}{ctexart}
 }
 \ProcessOptions\relax
 \LoadClass[zihao=-4]{ctexart}
@@ -54,14 +75,6 @@
 \RequirePackage{booktabs}
 \RequirePackage{pdfpages}
 
-\keys_define:nn { bitreport }
-  {
-    option .meta:nn = {bitreport / option } {#1},
-    cover .meta:nn = { bitreport / cover  } {#1},
-    info .meta:nn = { bitreport / info } {#1},
-    misc .meta:nn = { bitreport / misc } {#1}
-  }
-
 \keys_define:nn { bitreport / cover }
   {
     imagePath .tl_set:N = \l_bit_coverimagepath_tl,
@@ -94,19 +107,6 @@
     studentId .tl_set:N = \l__bithesis_value_student_id_tl,
   }
 
-\keys_define:nn { bitreport / option }
-{
-  type .choice:,
-  type .value_required:n = true,
-  type .choices:Vn =
-    \c__bithesis_report_type_clist
-    {
-      \int_set_eq:NN \g__bithesis_report_type_int \l_keys_choice_int
-    },
-  type .initial:n = common,
-
-}
-
 \keys_define:nn { bitreport / misc }
   {
     reviewTable .tl_set:N = \l_bit_reviewtable_tl,

diff --git a/templates/undergraduate-thesis-en/bithesis.cls b/templates/undergraduate-thesis-en/bithesis.cls
@@ -224,6 +224,7 @@
   type .initial:n = bachelor,
   twoside .bool_gset:N = \g__bithesis_twoside_bool,
   blindPeerReview .bool_gset:N = \g__bithesis_blind_mode_bool,
+  ctex .tl_set:N = \l__bithesis_options_to_ctex_tl,
 }
 
 \keys_define:nn { bithesis / cover }
@@ -314,7 +315,7 @@
 }
 
 \DeclareOption*{
-  \PassOptionsToClass{\CurrentOption}{ctexbook}
+  \PassOptionsToClass{\l__bithesis_options_to_ctex_tl}{ctexbook}
 }
 \ProcessOptions\relax
 \LoadClass[zihao=-4,]{ctexbook}
@@ -342,6 +343,10 @@
 \RequirePackage{enumitem}
 \RequirePackage{environ}
 
+\pdfstringdefDisableCommands{%
+  \let\quad\empty
+}
+
 \__bithesis_if_graduate:TF {
   \int_set:Nn \g__bithesis_head_zihao_int {5}
   \geometry{

diff --git a/templates/undergraduate-thesis/bithesis.cls b/templates/undergraduate-thesis/bithesis.cls
@@ -224,6 +224,7 @@
   type .initial:n = bachelor,
   twoside .bool_gset:N = \g__bithesis_twoside_bool,
   blindPeerReview .bool_gset:N = \g__bithesis_blind_mode_bool,
+  ctex .tl_set:N = \l__bithesis_options_to_ctex_tl,
 }
 
 \keys_define:nn { bithesis / cover }
@@ -314,7 +315,7 @@
 }
 
 \DeclareOption*{
-  \PassOptionsToClass{\CurrentOption}{ctexbook}
+  \PassOptionsToClass{\l__bithesis_options_to_ctex_tl}{ctexbook}
 }
 \ProcessOptions\relax
 \LoadClass[zihao=-4,]{ctexbook}
@@ -342,6 +343,10 @@
 \RequirePackage{enumitem}
 \RequirePackage{environ}
 
+\pdfstringdefDisableCommands{%
+  \let\quad\empty
+}
+
 \__bithesis_if_graduate:TF {
   \int_set:Nn \g__bithesis_head_zihao_int {5}
   \geometry{

diff --git a/templates/undergraduate-thesis/misc/3_reference.tex b/templates/undergraduate-thesis/misc/3_reference.tex
@@ -23,7 +23,11 @@
 
 \begin{bibprint}
 
-% -------------------------------- 示例内容（使用时请删除） ------------------------------------- %
+% -------------------------------- 示例内容（正式使用时请删除） ------------------------------------- %
+
+% 抑制多次调用 \printbibliography 的 warning，只有示例代码会需要此语句。
+\BiblatexSplitbibDefernumbersWarningOff
+
 \textcolor{blue}{参考文献书写规范}
 
 \textcolor{blue}{参考国家标准《信息与文献参考文献著录规则》【GB/T 7714—2015】，参考文献书写规范如下：}