bithesis (16mar23)

git-svn-id: svn://tug.org/texlive/trunk@66622 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 38 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls b/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls
index d8b2aae6aa8..2800a210a8b 100644
--- a/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls
+++ b/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls
@@ -27,7 +27,7 @@
 %% 
 \RequirePackage{expl3,l3keys2e}
 \ProvidesExplClass{bitbeamer}
-{2023-03-05}{3.4.2}{BIT Thesis Templates}
+{2023-03-16}{3.4.3}{BIT Thesis Templates}
 \keys_define:nn { bitbeamer }
   {
     titlegraphic .tl_set:N = \l_bit_titlegraphic_tl,
diff --git a/Master/texmf-dist/tex/latex/bithesis/bithesis.cls b/Master/texmf-dist/tex/latex/bithesis/bithesis.cls
index 27fc7312310..923d18aedb5 100644
--- a/Master/texmf-dist/tex/latex/bithesis/bithesis.cls
+++ b/Master/texmf-dist/tex/latex/bithesis/bithesis.cls
@@ -27,7 +27,7 @@
 %% 
 \RequirePackage{expl3,l3keys2e}
 \ProvidesExplClass{bithesis}
-{2023-03-05}{3.4.2}{BIT Thesis Templates}
+{2023-03-16}{3.4.3}{BIT Thesis Templates}
 \int_new:N \g__bithesis_thesis_type_int
 \int_new:N \g__bithesis_head_zihao_int
 \bool_new:N \g__bithesis_twoside_bool
@@ -37,6 +37,16 @@
 \tl_new:N \g__bithesis_label_divide_char_tl
 \seq_new:N \l__bithesis_right_seq
 \seq_new:N \l__bithesis_left_seq
+\cs_new:Npn \__bithesis_get_const:N #1 {
+  \__bithesis_if_thesis_english:TF {
+    \use:c {c__bithesis_label_ #1 _en_tl}
+  } {
+    \use:c {c__bithesis_label_ #1 _tl}
+  }
+}
+\cs_new:Npn \__bithesis_set_english_mode: {
+  \bool_gset_true:N \g__bithesis_thesis_type_english_bool
+}
 \cs_generate_variant:Nn \tl_if_empty:nTF {x}
 \cs_generate_variant:Nn \seq_set_split:Nnn {Nnx}
 \cs_new:Npn \__bithesis_same_page: {
@@ -217,8 +227,8 @@
     {publications} {攻读学位期间发表论文与研究成果清单}
       {Publications~During~Studies},
     % TODO: Not so sure about the translation.
-    {resume} {作者简介} {},
-    {symbols} {主要符号对照表} {},
+    {resume} {作者简介} {Author~Biography},
+    {symbols} {主要符号对照表} {Nomenclature},
   }
   {\__bithesis_define_label:nnn #1}
 \clist_const:Nn \c__bithesis_bachelor_thesis_header_clist
@@ -254,7 +264,7 @@
       \int_set_eq:NN \g__bithesis_thesis_type_int \l_keys_choice_int
       \int_case:nn {\l_keys_choice_int} {
         % 本科全英文也是英文模板。
-        {3} {\bool_set_true:N \g__bithesis_thesis_type_english_bool}
+        {3} {\__bithesis_set_english_mode:}
       }
     },
   type .initial:n = bachelor,
@@ -262,6 +272,12 @@
   blindPeerReview .bool_gset:N = \g__bithesis_blind_mode_bool,
   ctex .tl_set:N = \l__bithesis_options_to_ctex_tl,
   quirks .bool_gset:N = \g__bithesis_quirks_mode_bool,
+  % xeCJK
+  autoFakeBold .tl_set:N = \g__bithesis_auto_fake_bold_tl,
+  autoFakeBold .initial:n = {3},
+  % 是否开启英文模式。目前在设计上，这个选项仅对研究生模板生效。
+  % 本科生模板的英文模式是根据 |type| 选项自动判断的。
+  english .code:n = { \__bithesis_set_english_mode: } ,
 }
 \keys_define:nn { bithesis / cover }
   {
@@ -414,7 +430,7 @@
 \DeclareOption*{
   \PassOptionsToClass{\l__bithesis_options_to_ctex_tl}{ctexbook}
 }
-\PassOptionsToPackage{quiet}{xeCJK}
+\PassOptionsToPackage{quiet,AutoFakeBold=\g__bithesis_auto_fake_bold_tl,AutoFakeSlant}{xeCJK}
 \ProcessOptions\relax
 \LoadClass[zihao=-4,]{ctexbook}
 \RequirePackage{geometry}
@@ -437,7 +453,6 @@
 \RequirePackage{amssymb}
 \RequirePackage{pifont}
 \RequirePackage{amsthm}
-\RequirePackage{unicode-math}
 \RequirePackage{pdfpages}
 \RequirePackage{listings}
 \RequirePackage{enumitem}
@@ -511,6 +526,14 @@
     \DeclareBibliographyCategory{mypub}
   }
 
+  % Define biblatex strings if it was imported.
+  % 这部分是给研究生模板中的
+  % gbpunctin = false 时使用的。
+  \cs_if_exist:NT \DefineBibliographyStrings {
+    \DefineBibliographyStrings{english}{in={}}
+    \DefineBibliographyStrings{english}{incn={}}
+  }
+
   % 修改 biblatex 中「专利」（patent）部分的著录格式。
   % 主要根据北理工自定义的规范，参考 biblatex 和
   % biblatex-gb7714-2015 的实现修改而成。
@@ -798,12 +821,8 @@
     tabsize=2
 }
 \lstset{style=examplestyle}
-\cs_set:Npn \listfigurename {\c__bithesis_label_figure_tl}
-\cs_set:Npn \listtablename {\c__bithesis_label_table_tl}
-\unimathsetup{
-  math-style = ISO,
-  bold-style = ISO,
-}
+\cs_set:Npn \listfigurename {\__bithesis_get_const:N {figure}}
+\cs_set:Npn \listtablename {\__bithesis_get_const:N {table}}
 \theoremstyle{plain}
   \newtheorem{algo}{算法}[chapter]
   \newtheorem{them}{定理}[chapter]
@@ -818,7 +837,7 @@
   \newtheorem{case}{情形}
 \theoremstyle{remark}
   \newtheorem{rem}{注}
-  \renewcommand{\qedsymbol}{\ensuremath{\QED}}
+  \renewcommand{\qedsymbol}{\ensuremath{\blacksquare}}
 \cs_new:Npn \__bithesis_dunderline:nnn #1#2#3 {
   {\setbox0=\hbox{#3}\ooalign{\copy0\cr\rule[\dimexpr#1-#2\relax]{\wd0}{#2}}}
 }
@@ -1976,7 +1995,7 @@
         \l__bithesis_publications_minbibnames_int
       }
 
-      \chapter{\c__bithesis_label_publications_tl}
+      \chapter{\__bithesis_get_const:N {publications}}
       #1
     \end{blindPeerReview}
   }
@@ -1993,7 +2012,7 @@
         subsection/number = \arabic{section}. \arabic{subsection},
         subsubsection/number = \arabic{section}. \arabic{subsection}. \arabic{subsubsection},
       }
-      \chapter{\c__bithesis_label_resume_tl}
+      \chapter{\__bithesis_get_const:N{resume}}
       #1
     \end{blindPeerReview}
   }
@@ -2003,9 +2022,9 @@
 \NewDocumentEnvironment {symbols} {}
   {
     \bool_if:NTF \l__bithesis_add_symbols_to_toc_bool {
-      \chapter{\c__bithesis_label_symbols_tl}
+      \chapter{\__bithesis_get_const:N {symbols}}
     } {
-      \chapter*{\c__bithesis_label_symbols_tl}
+      \chapter*{\__bithesis_get_const:N {symbols}}
       \currentpdfbookmark{\c__bithesis_label_symbols_tl}{ch:symbols}
     }
     \zihao{-4}
diff --git a/Master/texmf-dist/tex/latex/bithesis/bitreport.cls b/Master/texmf-dist/tex/latex/bithesis/bitreport.cls
index eccb18f3087..49153004166 100644
--- a/Master/texmf-dist/tex/latex/bithesis/bitreport.cls
+++ b/Master/texmf-dist/tex/latex/bithesis/bitreport.cls
@@ -27,7 +27,7 @@
 %% 
 \RequirePackage{expl3,l3keys2e}
 \ProvidesExplClass{bitreport}
-{2023-03-05}{3.4.2}{BIT Thesis Templates}
+{2023-03-16}{3.4.3}{BIT Thesis Templates}
 \int_new:N \g__bithesis_report_type_int
 \clist_const:Nn \c__bithesis_report_type_clist
     { common, undergraduate_proposal}