nwafuthesis (29may22)

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

4 files changed, 299 insertions, 153 deletions

diff --git a/Master/texmf-dist/doc/latex/nwafuthesis/nwafudoc.cls b/Master/texmf-dist/doc/latex/nwafuthesis/nwafudoc.cls
index 02ac5c3c0bb..55893f90c6f 100644
--- a/Master/texmf-dist/doc/latex/nwafuthesis/nwafudoc.cls
+++ b/Master/texmf-dist/doc/latex/nwafuthesis/nwafudoc.cls
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo $Id: nwafuthesis.dtx 1.14 2022-05-28 Nan Geng <nangeng@nwafu.edu.cn> $
+\GetIdInfo $Id: nwafuthesis.dtx 1.15 2022-05-29 Nan Geng <nangeng@nwafu.edu.cn> $
   {Documentation class for nwafuthesis}
 \ProvidesExplClass{nwafudoc}
   {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/doc/latex/nwafuthesis/nwafuthesis.pdf b/Master/texmf-dist/doc/latex/nwafuthesis/nwafuthesis.pdf
index dce2ecb8f5a..9b7bd35d2da 100644
--- a/Master/texmf-dist/doc/latex/nwafuthesis/nwafuthesis.pdf
+++ b/Master/texmf-dist/doc/latex/nwafuthesis/nwafuthesis.pdf
diff --git a/Master/texmf-dist/source/latex/nwafuthesis/nwafuthesis.dtx b/Master/texmf-dist/source/latex/nwafuthesis/nwafuthesis.dtx
index 9ece7e75afc..720524e68b4 100644
--- a/Master/texmf-dist/source/latex/nwafuthesis/nwafuthesis.dtx
+++ b/Master/texmf-dist/source/latex/nwafuthesis/nwafuthesis.dtx
@@ -110,7 +110,7 @@
 %<class|doc>\NeedsTeXFormat{LaTeX2e}
 %<class|doc>\RequirePackage{expl3}
 %<*!(driver|install)>
-%<!readme>\GetIdInfo $Id: nwafuthesis.dtx 1.14 2022-05-28 Nan Geng <nangeng@nwafu.edu.cn> $
+%<!readme>\GetIdInfo $Id: nwafuthesis.dtx 1.15 2022-05-29 Nan Geng <nangeng@nwafu.edu.cn> $
 %<class>  {Thesis template for Northwest A\&F University}
 %<class>\ProvidesExplClass{\ExplFileName}
 %<definition>  {Definition file for nwafuthesis}
@@ -143,12 +143,12 @@
   \textbf{\nwafuthesis: 西北农林科技大学学位论文
           \xpinyin[font=\sffamily,format=\color{MaterialIndigo800}]{模}{mu2}板}}}
 \author{耿楠}
-\date{\today\quad v1.14%
+\date{\today\quad v1.15%
   \thanks{\url{https://gitee.com/nwafu_nan/nwafuthesis-l3}.}}
 
 \begin{document}
 %<!--CODEDOC-->  \DisableImplementation
- \EnableImplementation
+\EnableImplementation
 %<!--CODEDOC-->  \def\nwafuCODEDOC{}
   \DocInput{nwafuthesis.dtx}
   \DocInput{nwafuthesis-doc.dtx}
@@ -375,7 +375,6 @@
 %     \textbf{文件} & \textbf{功能说明} \\
 %     \midrule
 %     \file{nwafuthesis.cls} & 模板文档类 \\
-%     \file{nwafudoc.cls}    & 编译该用户手册时需要的文档类 \\
 %     \file{nwafuthesis.pdf} & 用户手册 \\
 %     \bottomrule
 %   \end{tabular}
@@ -806,6 +805,13 @@
 %   选择论文章标题格式为章格式（如：第1章 绪论）还是报告格式（如：1 绪论），默认为章格式。
 % \end{function}
 %
+% \begin{function}[added=2022-05-29]{style/withsig}
+%   \begin{nwafusyntax}[emph={[1]withsig}]
+%     withsig = (*<\TFF>*)
+%   \end{nwafusyntax}
+%   题名页是否需要签名。
+% \end{function}
+%
 % \begin{function}[added=2022-05-24]{style/chapnum}
 %   \begin{nwafusyntax}[emph={[1]chapnum}]
 %     chapnum = (*<zh|(en)>*)
@@ -1800,6 +1806,15 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \changes{v1.15}{2022/05/29}{添加研究生题名页签字判断变量。}
+%
+% \begin{variable}{\l_@@_withsignature_bool}
+% 研究生题名页中的作者、指导教师和答辩委员会姓名是否需要签名。
+%    \begin{macrocode}
+\bool_new:N \l_@@_withsignature_bool
+%    \end{macrocode}
+% \end{variable}
+%
 % \changes{v1.12}{2022/05/24}{添加本科生中文章编号处理。}
 %
 % \begin{variable}{\g_@@_chapnum_int}
@@ -3879,6 +3894,10 @@
     withchapter .default:n  = true,
     withchapter .initial:n  = true,
 
+    withsig .bool_set:N = \l_@@_withsignature_bool,
+    withsig .default:n  = true,
+    withsig .initial:n  = false,
+
     chapnum .choice:,
     chapnum .value_required:n = true,
     chapnum .choices:nn =
@@ -5639,9 +5658,10 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v1.15}{2022/05/29}{为研究生题名页签字位置留空位。}
+%
 % \begin{macro}{\@@_cover_instructors:}
-% 标题内页作者、指导教师、指导小组签名，仅对研究生有效。
-% 此处应该是签名，在此直接设计为打印出姓名。
+% 题名页作者、指导教师、指导小组签名，仅对研究生有效。
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_cover_instructors:
   {
@@ -5666,52 +5686,62 @@
 %    \begin{macrocode}
           \tl_set:Nn \l_@@_tmpa_tl {\clist_use:Nn \l_@@_info_instructors_clist {\@@_quad: }}
 %    \end{macrocode}
-% 作者、导师、指导小组信息变量值，并取得最宽宽度。
+% 判断是否需要签名。
+%    \begin{macrocode}
+          \bool_if:NTF \l_@@_withsignature_bool
+%    \end{macrocode}
+% 不输出姓名，输出下划线，留作签名空间。
 %    \begin{macrocode}
-          \clist_set:Nx \l_@@_tmpb_clist
             {
-              {\l_@@_info_author_tl     },
-              {\l_@@_info_supervisor_tl },
-              {\l_@@_tmpa_tl            },
-            }
-          \@@_get_max_text_width:NN \l_@@_tmpb_dim \l_@@_tmpb_clist
+              \begin{minipage} [ c ] { 17em }
+                \flushleft
+                \c_@@_name_author_tl
+                \c_@@_fwid_colon_tl
+                \@@_blank_underline:n{ 12em }
+                \skip_vertical:n { 1.6 ex }
+                \c_@@_name_supervisor_tl
+                \c_@@_fwid_colon_tl
+                \@@_blank_underline:n{ 12em }
+                \skip_vertical:n { 1.6 ex }
+                \c_@@_name_instructors_tl
+                \c_@@_fwid_colon_tl
+                \@@_blank_underline:n{ 12em }
+                \skip_vertical:n { 1 ex }
+              \end{minipage}
+            }{
 %    \end{macrocode}
-% 计算小页环境宽度。
+% 作者、导师、指导小组信息变量值，并取得最宽宽度。
 %    \begin{macrocode}
-          \dim_set_eq:NN \l_@@_tmpt_dim \l_@@_tmpa_dim
-          \dim_add:Nn \l_@@_tmpt_dim { \l_@@_tmpb_dim }
-          \dim_add:Nn \l_@@_tmpt_dim {2.5em}
-          \begin{minipage} [ c ] { \l_@@_tmpt_dim }
-            \centering
+              \clist_set:Nx \l_@@_tmpb_clist
+                {
+                  {\l_@@_info_author_tl     },
+                  {\l_@@_info_supervisor_tl },
+                  {\l_@@_tmpa_tl            },
+                }
+              \@@_get_max_text_width:NN \l_@@_tmpb_dim \l_@@_tmpb_clist
 %    \end{macrocode}
-% 用循环输出各字段。
+% 计算小页宽度。
 %    \begin{macrocode}
-            \bool_until_do:nn
-              { \clist_if_empty_p:N \l_@@_tmpa_clist }
-              {
-                \clist_pop:NN \l_@@_tmpa_clist \l_@@_tmpa_tl
-                \clist_pop:NN \l_@@_tmpb_clist \l_@@_tmpb_tl
-                \l_@@_tmpa_tl
-                \c_@@_fwid_colon_tl
-                \@@_center_box:Vn \l_@@_tmpb_dim { \l_@@_tmpb_tl }
-                \skip_vertical:n { 1 ex }
-              }
+              \dim_set_eq:NN \l_@@_tmpt_dim \l_@@_tmpa_dim
+              \dim_add:Nn \l_@@_tmpt_dim { \l_@@_tmpb_dim }
+              \dim_add:Nn \l_@@_tmpt_dim {2.5em}
 %    \end{macrocode}
-% 不输出姓名，输出下划线，留作签名空间(暂未启用)。
+% 循环输出作者、导师、指导小组姓名。
 %    \begin{macrocode}
-            % \c_@@_name_author_tl
-            % \c_@@_fwid_colon_tl
-            % \@@_blank_underline:n{ 12em }
-            % \skip_vertical:n { 1 ex }
-            % \c_@@_name_supervisor_tl
-            % \c_@@_fwid_colon_tl
-            % \@@_blank_underline:n{ 12em }
-            % \skip_vertical:n { 1 ex }
-            % \c_@@_name_instructors_tl
-            % \c_@@_fwid_colon_tl
-            % \@@_blank_underline:n{ 12em }
-            % \skip_vertical:n { 1 ex }
-          \end{minipage}
+              \begin{minipage} [ c ] { \l_@@_tmpt_dim }
+                \centering
+                  \bool_until_do:nn { \clist_if_empty_p:N \l_@@_tmpa_clist }
+                    {
+                      \clist_pop:NN \l_@@_tmpa_clist \l_@@_tmpa_tl
+                      \clist_pop:NN \l_@@_tmpb_clist \l_@@_tmpb_tl
+                      \l_@@_tmpa_tl
+                      \c_@@_fwid_colon_tl
+                      \@@_center_box:Vn \l_@@_tmpb_dim { \l_@@_tmpb_tl }
+                      \skip_vertical:n { 1.6 ex }
+                    }
+                  \skip_vertical:n { -0.6 ex }
+              \end{minipage}
+            }
         }
 %    \end{macrocode}
 % 硕士生，仅需作者和导师。
@@ -5727,50 +5757,55 @@
             }
           \@@_get_max_text_width:NN \l_@@_tmpa_dim \l_@@_tmpa_clist
 %    \end{macrocode}
-% 作者、导师信息，并取得最宽宽度。
-%    \begin{macrocode}
-          \clist_set:Nx \l_@@_tmpb_clist
-            {
-              {\l_@@_info_author_tl     },
-              {\l_@@_info_supervisor_tl },
-            }
-          \@@_get_max_text_width:NN \l_@@_tmpb_dim \l_@@_tmpb_clist
-          \dim_add:Nn \l_@@_tmpb_dim { \l_@@_tmpb_dim }
-%    \end{macrocode}
-% 计算小页环境宽度。
+% 判断是否需要签名。
 %    \begin{macrocode}
-          \dim_set_eq:NN \l_@@_tmpt_dim \l_@@_tmpa_dim
-          \dim_add:Nn \l_@@_tmpt_dim { \l_@@_tmpb_dim }
-          \dim_add:Nn \l_@@_tmpt_dim {2.5em}
-          \begin{minipage} [ c ] { \l_@@_tmpt_dim }
-            \centering
+          \bool_if:NTF \l_@@_withsignature_bool
 %    \end{macrocode}
-% 用循环输出各字段。
+% 不输出姓名，输出下划线，留作签名空间(暂未启用)。
 %    \begin{macrocode}
-            \bool_until_do:nn
-              { \clist_if_empty_p:N \l_@@_tmpa_clist }
-              {
-                \clist_pop:NN \l_@@_tmpa_clist \l_@@_tmpa_tl
-                \clist_pop:NN \l_@@_tmpb_clist \l_@@_tmpb_tl
-                \l_@@_tmpa_tl
+            {
+              \begin{minipage} [ c ] { 17em }
+                \flushleft
+                \c_@@_name_author_tl
+                \c_@@_fwid_colon_tl
+                \@@_blank_underline:n{ 12em }
+                \skip_vertical:n { 1.6 ex }
+                \c_@@_name_supervisor_tl
                 \c_@@_fwid_colon_tl
-                \@@_center_box:Vn \l_@@_tmpb_dim { \l_@@_tmpb_tl }
+                \@@_blank_underline:n{ 12em }
                 \skip_vertical:n { 1 ex }
-              }
+              \end{minipage}
+            }{
 %    \end{macrocode}
-% 不输出姓名，输出下划线，留作签名空间(暂未启用)。
+% 作者、导师信息，并取得最宽宽度。
 %    \begin{macrocode}
-          % \begin{minipage} [ c ] { 17em }
-          %   \flushleft
-          %   \c_@@_name_author_tl
-          %   \c_@@_fwid_colon_tl
-          %   \@@_blank_underline:n{ 12em }
-          %   \skip_vertical:n { 1 ex }
-          %   \c_@@_name_supervisor_tl
-          %   \c_@@_fwid_colon_tl
-          %   \@@_blank_underline:n{ 12em }
-          %   \skip_vertical:n { 1 ex }
-          \end{minipage}
+              \clist_set:Nx \l_@@_tmpb_clist
+                {
+                  {\l_@@_info_author_tl     },
+                  {\l_@@_info_supervisor_tl },
+                }
+              \@@_get_max_text_width:NN \l_@@_tmpb_dim \l_@@_tmpb_clist
+              \dim_add:Nn \l_@@_tmpb_dim { \l_@@_tmpb_dim }
+%    \end{macrocode}
+% 计算小页环境宽度后，用循环输出各姓名字段。
+%    \begin{macrocode}
+              \dim_set_eq:NN \l_@@_tmpt_dim \l_@@_tmpa_dim
+              \dim_add:Nn \l_@@_tmpt_dim { \l_@@_tmpb_dim }
+              \dim_add:Nn \l_@@_tmpt_dim {2.5em}
+              \begin{minipage} [ c ] { \l_@@_tmpt_dim }
+                \centering
+                \bool_until_do:nn { \clist_if_empty_p:N \l_@@_tmpa_clist }
+                  {
+                    \clist_pop:NN \l_@@_tmpa_clist \l_@@_tmpa_tl
+                    \clist_pop:NN \l_@@_tmpb_clist \l_@@_tmpb_tl
+                    \l_@@_tmpa_tl
+                    \c_@@_fwid_colon_tl
+                    \@@_center_box:Vn \l_@@_tmpb_dim { \l_@@_tmpb_tl }
+                    \skip_vertical:n { 1.6 ex }
+                  }
+                \skip_vertical:n { -0.6 ex }
+              \end{minipage}
+            }
         }
       }
   }
@@ -7522,6 +7557,7 @@
 %
 % \changes{v1.10}{2022/03/17}{直接使用胡振震制定的gb7714-NWAFU实现参考文献样式控制。}
 % \changes{v1.14}{2022/05/26}{调整作者姓在前名在后，缩写不加点。}
+% \changes{v1.15}{2022/05/28}{调整姓在前名在后缩写标点符号。}
 %
 % \subsection{参考文献著录与引用}
 %
@@ -7570,16 +7606,16 @@
 %    \end{macrocode}
 % 其它参数。
 %    \begin{macrocode}
-    \@@_pass_options_to_biblatex:n
-      {
+    % \@@_pass_options_to_biblatex:n
+    %   {
     %     backend = biber,
     %     sortlocale=zh__pinyin, gbtype=false,
     %     maxbibnames=99, maxcitenames=2, mincitenames=1,
     %     gbpub=false, uniquename=false, uniquelist=false,
-        gbnamefmt=lowercase,
+        % gbnamefmt=lowercase,
     %     doi=false, isbn=false,
     %     gbfieldtype=true, gbpunctin=false,
-      }
+      % }
   }
 \cs_new_protected:Npn \@@_biblatex_post_setup:
   {
@@ -7608,6 +7644,54 @@
         }
       }
     }
+%    \end{macrocode}
+% 修订姓名之间及名缩写后的标点符号。
+%    \begin{macrocode}
+    \def\gbcaselocalset{%
+      \renewrobustcmd*{\bibinitperiod}{}%
+      \renewcommand*{\revsdnamepunct}{}%
+      %\renewrobustcmd*{\bibinitdelim}{}%
+    }
+
+    \renewbibmacro*{name:family-given}[4]{%
+      \gbcaselocalset%
+      \ifuseprefix{%
+        \usebibmacro{name:delim}{##3##1}%
+        \usebibmacro{name:hook}{##3##1}%
+        \mkbibcompletenamefamilygiven{%
+          \ifdefvoid{##3}{}
+          {%
+            \ifcapital
+              {\mkbibnameprefix{\MakeCapital{##3}}\isdot}
+              {\mkbibnameprefix{##3}\isdot}%
+            \ifprefchar{}{\bibnamedelimc}
+          }%
+          \mkbibnamefamily{##1}\isdot
+          \ifdefvoid{##4}{}
+          {\bibnamedelimd\mkbibnamesuffix{##4}\isdot}%
+          \ifdefvoid{##2}{}
+          {\revsdnamepunct\bibnamedelimd\mkbibnamegiven{##2}\isdot}
+        }
+      }{%
+        \usebibmacro{name:delim}{##1}%
+        \usebibmacro{name:hook}{##1}%
+        \mkbibcompletenamefamilygiven{%
+          \mkbibnamefamily{##1}\isdot
+          \ifdefvoid{##4}{}
+            {\bibnamedelimd\mkbibnamesuffix{##4}\isdot}%
+          \ifboolexpe{%
+            test {\ifdefvoid{##2}}
+            and
+            test {\ifdefvoid{##3}}
+          }{}
+          {\revsdnamepunct}%
+          \ifdefvoid{##2}{}
+            {\bibnamedelimd\mkbibnamegiven{##2}\isdot}%
+          \ifdefvoid{##3}{}
+            {\bibnamedelimd\mkbibnameprefix{##3}\isdot}
+        }
+      }
+    }
   }
 \cs_new_protected:Npn \@@_pass_options_to_biblatex:n #1
   { \PassOptionsToPackage {#1} { biblatex } }
diff --git a/Master/texmf-dist/tex/latex/nwafuthesis/nwafuthesis.cls b/Master/texmf-dist/tex/latex/nwafuthesis/nwafuthesis.cls
index 057ec3a74dc..12f70c4c7ac 100644
--- a/Master/texmf-dist/tex/latex/nwafuthesis/nwafuthesis.cls
+++ b/Master/texmf-dist/tex/latex/nwafuthesis/nwafuthesis.cls
@@ -30,7 +30,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo $Id: nwafuthesis.dtx 1.14 2022-05-28 Nan Geng <nangeng@nwafu.edu.cn> $
+\GetIdInfo $Id: nwafuthesis.dtx 1.15 2022-05-29 Nan Geng <nangeng@nwafu.edu.cn> $
   {Thesis template for Northwest A\&F University}
 \ProvidesExplClass{\ExplFileName}
   {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -85,6 +85,7 @@
 \bool_set_true:N \g__nwafu_twoside_bool
 \bool_new:N \g__nwafu_draft_bool
 \bool_new:N \l__nwafu_withchap_bool
+\bool_new:N \l__nwafu_withsignature_bool
 \int_new:N \g__nwafu_chapnum_int
 \cs_generate_variant:Nn \file_input:n           { V  }
 \cs_generate_variant:Nn \int_to_arabic:n        { v  }
@@ -1295,6 +1296,10 @@
     withchapter .default:n  = true,
     withchapter .initial:n  = true,
 
+    withsig .bool_set:N = \l__nwafu_withsignature_bool,
+    withsig .default:n  = true,
+    withsig .initial:n  = false,
+
     chapnum .choice:,
     chapnum .value_required:n = true,
     chapnum .choices:nn =
@@ -2222,41 +2227,48 @@
             }
           \__nwafu_get_max_text_width:NN \l__nwafu_tmpa_dim \l__nwafu_tmpa_clist
           \tl_set:Nn \l__nwafu_tmpa_tl {\clist_use:Nn \l__nwafu_info_instructors_clist {\__nwafu_quad: }}
-          \clist_set:Nx \l__nwafu_tmpb_clist
+          \bool_if:NTF \l__nwafu_withsignature_bool
             {
-              {\l__nwafu_info_author_tl     },
-              {\l__nwafu_info_supervisor_tl },
-              {\l__nwafu_tmpa_tl            },
-            }
-          \__nwafu_get_max_text_width:NN \l__nwafu_tmpb_dim \l__nwafu_tmpb_clist
-          \dim_set_eq:NN \l__nwafu_tmpt_dim \l__nwafu_tmpa_dim
-          \dim_add:Nn \l__nwafu_tmpt_dim { \l__nwafu_tmpb_dim }
-          \dim_add:Nn \l__nwafu_tmpt_dim {2.5em}
-          \begin{minipage} [ c ] { \l__nwafu_tmpt_dim }
-            \centering
-            \bool_until_do:nn
-              { \clist_if_empty_p:N \l__nwafu_tmpa_clist }
-              {
-                \clist_pop:NN \l__nwafu_tmpa_clist \l__nwafu_tmpa_tl
-                \clist_pop:NN \l__nwafu_tmpb_clist \l__nwafu_tmpb_tl
-                \l__nwafu_tmpa_tl
+              \begin{minipage} [ c ] { 17em }
+                \flushleft
+                \c__nwafu_name_author_tl
+                \c__nwafu_fwid_colon_tl
+                \__nwafu_blank_underline:n{ 12em }
+                \skip_vertical:n { 1.6 ex }
+                \c__nwafu_name_supervisor_tl
                 \c__nwafu_fwid_colon_tl
-                \__nwafu_center_box:Vn \l__nwafu_tmpb_dim { \l__nwafu_tmpb_tl }
+                \__nwafu_blank_underline:n{ 12em }
+                \skip_vertical:n { 1.6 ex }
+                \c__nwafu_name_instructors_tl
+                \c__nwafu_fwid_colon_tl
+                \__nwafu_blank_underline:n{ 12em }
                 \skip_vertical:n { 1 ex }
-              }
-            % \c__nwafu_name_author_tl
-            % \c__nwafu_fwid_colon_tl
-            % \__nwafu_blank_underline:n{ 12em }
-            % \skip_vertical:n { 1 ex }
-            % \c__nwafu_name_supervisor_tl
-            % \c__nwafu_fwid_colon_tl
-            % \__nwafu_blank_underline:n{ 12em }
-            % \skip_vertical:n { 1 ex }
-            % \c__nwafu_name_instructors_tl
-            % \c__nwafu_fwid_colon_tl
-            % \__nwafu_blank_underline:n{ 12em }
-            % \skip_vertical:n { 1 ex }
-          \end{minipage}
+              \end{minipage}
+            }{
+              \clist_set:Nx \l__nwafu_tmpb_clist
+                {
+                  {\l__nwafu_info_author_tl     },
+                  {\l__nwafu_info_supervisor_tl },
+                  {\l__nwafu_tmpa_tl            },
+                }
+              \__nwafu_get_max_text_width:NN \l__nwafu_tmpb_dim \l__nwafu_tmpb_clist
+              \dim_set_eq:NN \l__nwafu_tmpt_dim \l__nwafu_tmpa_dim
+              \dim_add:Nn \l__nwafu_tmpt_dim { \l__nwafu_tmpb_dim }
+              \dim_add:Nn \l__nwafu_tmpt_dim {2.5em}
+              \begin{minipage} [ c ] { \l__nwafu_tmpt_dim }
+                \centering
+                  \bool_until_do:nn { \clist_if_empty_p:N \l__nwafu_tmpa_clist }
+                    {
+                      \clist_pop:NN \l__nwafu_tmpa_clist \l__nwafu_tmpa_tl
+                      \clist_pop:NN \l__nwafu_tmpb_clist \l__nwafu_tmpb_tl
+                      \l__nwafu_tmpa_tl
+                      \c__nwafu_fwid_colon_tl
+                      \__nwafu_center_box:Vn \l__nwafu_tmpb_dim { \l__nwafu_tmpb_tl }
+                      \skip_vertical:n { 1.6 ex }
+                    }
+                  \skip_vertical:n { -0.6 ex }
+              \end{minipage}
+            }
         }
         {2}{
           \clist_set:Nx \l__nwafu_tmpa_clist
@@ -2265,39 +2277,44 @@
               {\c__nwafu_name_supervisor_tl  },
             }
           \__nwafu_get_max_text_width:NN \l__nwafu_tmpa_dim \l__nwafu_tmpa_clist
-          \clist_set:Nx \l__nwafu_tmpb_clist
+          \bool_if:NTF \l__nwafu_withsignature_bool
             {
-              {\l__nwafu_info_author_tl     },
-              {\l__nwafu_info_supervisor_tl },
-            }
-          \__nwafu_get_max_text_width:NN \l__nwafu_tmpb_dim \l__nwafu_tmpb_clist
-          \dim_add:Nn \l__nwafu_tmpb_dim { \l__nwafu_tmpb_dim }
-          \dim_set_eq:NN \l__nwafu_tmpt_dim \l__nwafu_tmpa_dim
-          \dim_add:Nn \l__nwafu_tmpt_dim { \l__nwafu_tmpb_dim }
-          \dim_add:Nn \l__nwafu_tmpt_dim {2.5em}
-          \begin{minipage} [ c ] { \l__nwafu_tmpt_dim }
-            \centering
-            \bool_until_do:nn
-              { \clist_if_empty_p:N \l__nwafu_tmpa_clist }
-              {
-                \clist_pop:NN \l__nwafu_tmpa_clist \l__nwafu_tmpa_tl
-                \clist_pop:NN \l__nwafu_tmpb_clist \l__nwafu_tmpb_tl
-                \l__nwafu_tmpa_tl
+              \begin{minipage} [ c ] { 17em }
+                \flushleft
+                \c__nwafu_name_author_tl
                 \c__nwafu_fwid_colon_tl
-                \__nwafu_center_box:Vn \l__nwafu_tmpb_dim { \l__nwafu_tmpb_tl }
+                \__nwafu_blank_underline:n{ 12em }
+                \skip_vertical:n { 1.6 ex }
+                \c__nwafu_name_supervisor_tl
+                \c__nwafu_fwid_colon_tl
+                \__nwafu_blank_underline:n{ 12em }
                 \skip_vertical:n { 1 ex }
-              }
-          % \begin{minipage} [ c ] { 17em }
-          %   \flushleft
-          %   \c__nwafu_name_author_tl
-          %   \c__nwafu_fwid_colon_tl
-          %   \__nwafu_blank_underline:n{ 12em }
-          %   \skip_vertical:n { 1 ex }
-          %   \c__nwafu_name_supervisor_tl
-          %   \c__nwafu_fwid_colon_tl
-          %   \__nwafu_blank_underline:n{ 12em }
-          %   \skip_vertical:n { 1 ex }
-          \end{minipage}
+              \end{minipage}
+            }{
+              \clist_set:Nx \l__nwafu_tmpb_clist
+                {
+                  {\l__nwafu_info_author_tl     },
+                  {\l__nwafu_info_supervisor_tl },
+                }
+              \__nwafu_get_max_text_width:NN \l__nwafu_tmpb_dim \l__nwafu_tmpb_clist
+              \dim_add:Nn \l__nwafu_tmpb_dim { \l__nwafu_tmpb_dim }
+              \dim_set_eq:NN \l__nwafu_tmpt_dim \l__nwafu_tmpa_dim
+              \dim_add:Nn \l__nwafu_tmpt_dim { \l__nwafu_tmpb_dim }
+              \dim_add:Nn \l__nwafu_tmpt_dim {2.5em}
+              \begin{minipage} [ c ] { \l__nwafu_tmpt_dim }
+                \centering
+                \bool_until_do:nn { \clist_if_empty_p:N \l__nwafu_tmpa_clist }
+                  {
+                    \clist_pop:NN \l__nwafu_tmpa_clist \l__nwafu_tmpa_tl
+                    \clist_pop:NN \l__nwafu_tmpb_clist \l__nwafu_tmpb_tl
+                    \l__nwafu_tmpa_tl
+                    \c__nwafu_fwid_colon_tl
+                    \__nwafu_center_box:Vn \l__nwafu_tmpb_dim { \l__nwafu_tmpb_tl }
+                    \skip_vertical:n { 1.6 ex }
+                  }
+                \skip_vertical:n { -0.6 ex }
+              \end{minipage}
+            }
         }
       }
   }
@@ -3315,16 +3332,16 @@
 \cs_new_protected:Npn \__nwafu_biblatex_pre_setup:
   {
     \__nwafu_pass_options_to_biblatex:n { style = gb7714-NWAFU }
-    \__nwafu_pass_options_to_biblatex:n
-      {
+    % \__nwafu_pass_options_to_biblatex:n
+    %   {
     %     backend = biber,
     %     sortlocale=zh__pinyin, gbtype=false,
     %     maxbibnames=99, maxcitenames=2, mincitenames=1,
     %     gbpub=false, uniquename=false, uniquelist=false,
-        gbnamefmt=lowercase,
+        % gbnamefmt=lowercase,
     %     doi=false, isbn=false,
     %     gbfieldtype=true, gbpunctin=false,
-      }
+      % }
   }
 \cs_new_protected:Npn \__nwafu_biblatex_post_setup:
   {
@@ -3341,6 +3358,51 @@
         }
       }
     }
+    \def\gbcaselocalset{%
+      \renewrobustcmd*{\bibinitperiod}{}%
+      \renewcommand*{\revsdnamepunct}{}%
+      %\renewrobustcmd*{\bibinitdelim}{}%
+    }
+
+    \renewbibmacro*{name:family-given}[4]{%
+      \gbcaselocalset%
+      \ifuseprefix{%
+        \usebibmacro{name:delim}{##3##1}%
+        \usebibmacro{name:hook}{##3##1}%
+        \mkbibcompletenamefamilygiven{%
+          \ifdefvoid{##3}{}
+          {%
+            \ifcapital
+              {\mkbibnameprefix{\MakeCapital{##3}}\isdot}
+              {\mkbibnameprefix{##3}\isdot}%
+            \ifprefchar{}{\bibnamedelimc}
+          }%
+          \mkbibnamefamily{##1}\isdot
+          \ifdefvoid{##4}{}
+          {\bibnamedelimd\mkbibnamesuffix{##4}\isdot}%
+          \ifdefvoid{##2}{}
+          {\revsdnamepunct\bibnamedelimd\mkbibnamegiven{##2}\isdot}
+        }
+      }{%
+        \usebibmacro{name:delim}{##1}%
+        \usebibmacro{name:hook}{##1}%
+        \mkbibcompletenamefamilygiven{%
+          \mkbibnamefamily{##1}\isdot
+          \ifdefvoid{##4}{}
+            {\bibnamedelimd\mkbibnamesuffix{##4}\isdot}%
+          \ifboolexpe{%
+            test {\ifdefvoid{##2}}
+            and
+            test {\ifdefvoid{##3}}
+          }{}
+          {\revsdnamepunct}%
+          \ifdefvoid{##2}{}
+            {\bibnamedelimd\mkbibnamegiven{##2}\isdot}%
+          \ifdefvoid{##3}{}
+            {\bibnamedelimd\mkbibnameprefix{##3}\isdot}
+        }
+      }
+    }
   }
 \cs_new_protected:Npn \__nwafu_pass_options_to_biblatex:n #1
   { \PassOptionsToPackage {#1} { biblatex } }