texlive[70966] Master/texmf-dist: bithesis (16apr24)

[commits+karl at tug.org]

Revision: 70966
          https://tug.org/svn/texlive?view=revision&revision=70966
Author:   karl
Date:     2024-04-16 21:59:10 +0200 (Tue, 16 Apr 2024)
Log Message:
-----------
bithesis (16apr24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/bithesis/bithesis.pdf
    trunk/Master/texmf-dist/source/latex/bithesis/bithesis.dtx
    trunk/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls
    trunk/Master/texmf-dist/tex/latex/bithesis/bithesis.cls
    trunk/Master/texmf-dist/tex/latex/bithesis/bitreport.cls

Modified: trunk/Master/texmf-dist/doc/latex/bithesis/bithesis.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/bithesis/bithesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/bithesis/bithesis.dtx	2024-04-16 19:58:47 UTC (rev 70965)
+++ trunk/Master/texmf-dist/source/latex/bithesis/bithesis.dtx	2024-04-16 19:59:10 UTC (rev 70966)
@@ -21,10 +21,10 @@
 %<thesis>\ProvidesExplClass{bithesis}
 %<report>\ProvidesExplClass{bitreport}
 %<beamer>\ProvidesExplClass{bitbeamer}
-%<cls>{2024-04-11}{3.7.3}{BIT Thesis Templates}
+%<cls>{2024-04-16}{3.7.4}{BIT Thesis Templates}
 %
 %<*driver>
-\ProvidesFile{bithesis.dtx}[2024/04/11 3.7.3 BIT Thesis Templates]
+\ProvidesFile{bithesis.dtx}[2024/04/16 3.7.4 BIT Thesis Templates]
 \documentclass[letterpaper]{l3doc}
 \usepackage{dtx-style}
 
@@ -692,11 +692,16 @@
     tabularFontSize .initial:n = {5},
     arialFont .tl_set:N = \l_@@_misc_arial_font_path_tl,
     autoref / algo .code:n = {
-      % 定义算法的 autoref
-      \tl_set:Nn \algorithmautorefname {#1}
-      % 定义算法标题
       \AtBeginDocument{
+        % 定义算法标题
+        % 针对 algorithm 宏包
         \tl_set:Nn \ALG at name {#1}
+        % 针对 algorithm2e 宏包
+        \tl_set:Nn \algorithmcfname {#1}
+
+        % 定义算法的 autoref
+        % algorithm2e 宏包会覆写它，所以我们必须AtBeginDocument时再修改
+        \tl_set:Nn \algorithmautorefname {#1}
       }
     },
     autoref / algo .initial:n = {\g_@@_const_autoref_algo_tl},
@@ -1596,8 +1601,16 @@
   \cs_gset:Npn \lstlistingname {\c_@@_label_code_tl}
   
   % 算法变成「章节号-序号」
+  % 针对 algorithm 宏包
   \cs_gset:Npn \thealgorithm
   {\thechapter\g__bithesis_label_divide_char_tl\arabic{algorithm}}
+  % 针对 algorithm2e 宏包
+  % 为了减少修改，我们只适配按章编号（algochapter）的情况。
+  \@ifpackagewith{algorithm2e}{algochapter}{
+    % 名字中的“cf”是指其作者 Christophe Fiorio。
+    \cs_gset:Npn \thealgocf
+    {\thechapter\g__bithesis_label_divide_char_tl\arabic{algocf}}
+  }{}
   
   % 默认的情况下，保留公式和上下文的一定间距。（会比 Word 稍宽一些）
   \setlength{\abovedisplayskip}{\l_@@_style_math_above_display_skip_dim}

Modified: trunk/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls	2024-04-16 19:58:47 UTC (rev 70965)
+++ trunk/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls	2024-04-16 19:59:10 UTC (rev 70966)
@@ -27,7 +27,7 @@
 %% 
 \RequirePackage{expl3,l3keys2e}
 \ProvidesExplClass{bitbeamer}
-{2024-04-11}{3.7.3}{BIT Thesis Templates}
+{2024-04-16}{3.7.4}{BIT Thesis Templates}
 \keys_define:nn { bitbeamer }
   {
     titlegraphic .tl_set:N = \l_bit_titlegraphic_tl,

Modified: trunk/Master/texmf-dist/tex/latex/bithesis/bithesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bithesis/bithesis.cls	2024-04-16 19:58:47 UTC (rev 70965)
+++ trunk/Master/texmf-dist/tex/latex/bithesis/bithesis.cls	2024-04-16 19:59:10 UTC (rev 70966)
@@ -27,7 +27,7 @@
 %% 
 \RequirePackage{expl3,l3keys2e}
 \ProvidesExplClass{bithesis}
-{2024-04-11}{3.7.3}{BIT Thesis Templates}
+{2024-04-16}{3.7.4}{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
@@ -436,11 +436,16 @@
     tabularFontSize .initial:n = {5},
     arialFont .tl_set:N = \l__bithesis_misc_arial_font_path_tl,
     autoref / algo .code:n = {
-      % 定义算法的 autoref
-      \tl_set:Nn \algorithmautorefname {#1}
-      % 定义算法标题
       \AtBeginDocument{
+        % 定义算法标题
+        % 针对 algorithm 宏包
         \tl_set:Nn \ALG at name {#1}
+        % 针对 algorithm2e 宏包
+        \tl_set:Nn \algorithmcfname {#1}
+
+        % 定义算法的 autoref
+        % algorithm2e 宏包会覆写它，所以我们必须AtBeginDocument时再修改
+        \tl_set:Nn \algorithmautorefname {#1}
       }
     },
     autoref / algo .initial:n = {\g__bithesis_const_autoref_algo_tl},
@@ -1137,8 +1142,16 @@
   \cs_gset:Npn \lstlistingname {\c__bithesis_label_code_tl}
 
   % 算法变成「章节号-序号」
+  % 针对 algorithm 宏包
   \cs_gset:Npn \thealgorithm
   {\thechapter\g__bithesis_label_divide_char_tl\arabic{algorithm}}
+  % 针对 algorithm2e 宏包
+  % 为了减少修改，我们只适配按章编号（algochapter）的情况。
+  \@ifpackagewith{algorithm2e}{algochapter}{
+    % 名字中的“cf”是指其作者 Christophe Fiorio。
+    \cs_gset:Npn \thealgocf
+    {\thechapter\g__bithesis_label_divide_char_tl\arabic{algocf}}
+  }{}
 
   % 默认的情况下，保留公式和上下文的一定间距。（会比 Word 稍宽一些）
   \setlength{\abovedisplayskip}{\l__bithesis_style_math_above_display_skip_dim}

Modified: trunk/Master/texmf-dist/tex/latex/bithesis/bitreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bithesis/bitreport.cls	2024-04-16 19:58:47 UTC (rev 70965)
+++ trunk/Master/texmf-dist/tex/latex/bithesis/bitreport.cls	2024-04-16 19:59:10 UTC (rev 70966)
@@ -27,7 +27,7 @@
 %% 
 \RequirePackage{expl3,l3keys2e}
 \ProvidesExplClass{bitreport}
-{2024-04-11}{3.7.3}{BIT Thesis Templates}
+{2024-04-16}{3.7.4}{BIT Thesis Templates}
 \int_new:N \g__bithesis_report_type_int
 \clist_const:Nn \c__bithesis_report_type_clist
     { common, undergraduate_proposal}