summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-05-03 20:13:26 +0000
committerKarl Berry <karl@freefriends.org>2023-05-03 20:13:26 +0000
commit3b4de048565a9aa481a4dea2fc7cf33a9049ed68 (patch)
treef60e3ecd152121b25f2a91c5e0a14120b12c4267
parent6f636ea5ad5535ed116b4b5f89a099bf70d6cb9c (diff)
njuthesis (3may23)
git-svn-id: svn://tug.org/texlive/trunk@67004 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/njuthesis/njuthesis.pdfbin1219873 -> 1222131 bytes
-rw-r--r--Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx35
-rw-r--r--Master/texmf-dist/source/latex/njuthesis/njuthesis.ins7
-rw-r--r--Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def15
-rw-r--r--Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def9
-rw-r--r--Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def9
-rw-r--r--Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls10
7 files changed, 69 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/njuthesis/njuthesis.pdf b/Master/texmf-dist/doc/latex/njuthesis/njuthesis.pdf
index b8cb8ebdede..521d6e187b8 100644
--- a/Master/texmf-dist/doc/latex/njuthesis/njuthesis.pdf
+++ b/Master/texmf-dist/doc/latex/njuthesis/njuthesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx b/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx
index 953c94cf323..649ca357dd0 100644
--- a/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx
+++ b/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx
@@ -109,7 +109,7 @@ To produce the documentation run the original source files ending with
%
%<class>\NeedsTeXFormat{LaTeX2e}
%<*!(driver|install)>
-%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.2.0 2023-05-02 16:30:00
+%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.2.1 2023-05-03 13:30:00
%<+!driver> +0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
%<class> {Thesis template for Nanjing University}
%<class>\ProvidesExplClass{njuthesis}
@@ -380,7 +380,7 @@ To produce the documentation run the original source files ending with
% \thanks{E-mail: \href{mailto:git+nju-lug-email-3104-issue-@yaoge123.cn}
% {git+nju-lug-email-3104-issue-@yaoge123.cn}}}
%
-% \date{v1.2.0 \quad 2023-05-02}
+% \date{v1.2.1 \quad 2023-05-03}
%
% \maketitle
%
@@ -1488,13 +1488,14 @@ To produce the documentation run the original source files ending with
% 研究生学位论文封面上的学校代码。\CJKsout{你不会真的想改这个吧?}
% \end{function}
%
-% \begin{function}[added=2023-04-24]{info/degree*}
-% \begin{syntax}
-% \OPT{degree*} = \Arg{英文学位名}
-% \end{syntax}
-% 研究生英文封面上的学位名称。默认会由模板通过 \opt{degree} 和 \opt{type}
-% 文档类选项生成,也可以由本选项自定义名称。
-% \end{function}
+% \begin{function}[added=2023-04-24]{info/degree,info/degree*}
+ % \begin{syntax}
+ % \OPT{degree} = \Arg{中文学位名}
+ % \OPT{degree*} = \Arg{英文学位名}
+ % \end{syntax}
+ % 研究生国家图书馆封面英文封面上的学位名称。默认会由模板通过 \opt{degree}
+ % 和 \opt{type} 文档类选项生成,也可以由本选项自定义名称。
+ % \end{function}
%
%
% \subsubsection{输入示范}
@@ -4697,10 +4698,11 @@ To produce the documentation run the original source files ending with
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{info/degree*}
+% \begin{macro}{info/degree,info/degree*}
% \changes{v1.2}{2023/04/24}{新增学位名称设置项。}
% 覆盖预定义的学位字段。
% \begin{macrocode}
+ degree .tl_set:N = \g_@@_info_degree_tl ,
degree* .tl_set:N = \g_@@_info_degree_en_tl
}
% \end{macrocode}
@@ -4801,6 +4803,16 @@ To produce the documentation run the original source files ending with
% \end{macrocode}
% \end{variable}
%
+% \begin{variable}{\g_@@_info_degree_tl}
+% 学位类型字样。
+% \begin{macrocode}
+\tl_new:N \g_@@_info_degree_tl
+\tl_set_eq:NN \g_@@_info_degree_tl \g_@@_info_type_tl
+\bool_if:NF \g_@@_opt_academic_bool
+ { \tl_put_right:Nn \g_@@_info_degree_tl { 专业 } }
+% \end{macrocode}
+% \end{variable}
+%
% \begin{variable}{\g_@@_info_degree_en_tl}
% 英文的学位字样。
% \begin{macrocode}
@@ -6709,12 +6721,13 @@ To produce the documentation run the original source files ending with
% \end{macro}
%
% \begin{macro}{\@@_g_cover_top:}
+% \changes{v1.2}{2023/05/03}{根据学号长度确定研究生封面顶部的下划线长度。}
% 研究生封面顶部信息栏。
% \begin{macrocode}
\cs_new_protected:Npn \@@_g_cover_top:
{
\dim_set:Nn \l_@@_tmpa_dim { 4 em }
- \dim_set:Nn \l_@@_tmpb_dim { 5 em }
+ \@@_get_width:NV \l_@@_tmpb_dim \g_@@_info_id_tl
\clist_map_inline:nn { code, clc, secretlv, udc, id }
{
\@@_cover_entry:NNNNn \c_@@_name_colon_tl \l_@@_tmpa_dim
diff --git a/Master/texmf-dist/source/latex/njuthesis/njuthesis.ins b/Master/texmf-dist/source/latex/njuthesis/njuthesis.ins
index 9e4fb8aa643..aa1be505040 100644
--- a/Master/texmf-dist/source/latex/njuthesis/njuthesis.ins
+++ b/Master/texmf-dist/source/latex/njuthesis/njuthesis.ins
@@ -78,6 +78,13 @@ To produce the documentation run the original source files ending with
\Msg{*************************************************************}
\endbatchfile
+ % \begin{syntax}
+ % \OPT{degree} = \Arg{中文学位名}
+ % \OPT{degree*} = \Arg{英文学位名}
+ % \end{syntax}
+ % 研究生国家图书馆封面英文封面上的学位名称。默认会由模板通过 \opt{degree}
+ % 和 \opt{type} 文档类选项生成,也可以由本选项自定义名称。
+ % \end{function}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
index 69e70da0184..6aa670fb152 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
@@ -23,11 +23,18 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.2.0 2023-05-02 16:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.2.1 2023-05-03 13:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
{Graduate definition file for njuthesis}
\ProvidesExplFile{njuthesis-graduate.def}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+ % \begin{syntax}
+ % \OPT{degree} = \Arg{中文学位名}
+ % \OPT{degree*} = \Arg{英文学位名}
+ % \end{syntax}
+ % 研究生国家图书馆封面英文封面上的学位名称。默认会由模板通过 \opt{degree}
+ % 和 \opt{type} 文档类选项生成,也可以由本选项自定义名称。
+ % \end{function}
\bool_if:NT \g__nju_opt_decl_bool { \RequirePackage { tabularray } }
\ctex_at_end_preamble:n
@@ -50,6 +57,10 @@
\tl_new:N \g__nju_info_type_tl
\tl_set:Nx \g__nju_info_type_tl
{ \clist_item:Nn \c__nju_name_type_clist { \g__nju_info_type_int } }
+\tl_new:N \g__nju_info_degree_tl
+\tl_set_eq:NN \g__nju_info_degree_tl \g__nju_info_type_tl
+\bool_if:NF \g__nju_opt_academic_bool
+ { \tl_put_right:Nn \g__nju_info_degree_tl { 专业 } }
\tl_new:N \g__nju_info_degree_en_tl
\tl_set:Nx \g__nju_info_degree_en_tl
{ \clist_item:Nn \c__nju_name_type_en_clist { \g__nju_info_type_int } }
@@ -99,7 +110,7 @@
\cs_new_protected:Npn \__nju_g_cover_top:
{
\dim_set:Nn \l__nju_tmpa_dim { 4 em }
- \dim_set:Nn \l__nju_tmpb_dim { 5 em }
+ \__nju_get_width:NV \l__nju_tmpb_dim \g__nju_info_id_tl
\clist_map_inline:nn { code, clc, secretlv, udc, id }
{
\__nju_cover_entry:NNNNn \c__nju_name_colon_tl \l__nju_tmpa_dim
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
index 288ee7d87b0..e2d0f0bff0f 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
@@ -23,11 +23,18 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.2.0 2023-05-02 16:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.2.1 2023-05-03 13:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
{Postdoctoral definition file for njuthesis}
\ProvidesExplFile{njuthesis-postdoctoral.def}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+ % \begin{syntax}
+ % \OPT{degree} = \Arg{中文学位名}
+ % \OPT{degree*} = \Arg{英文学位名}
+ % \end{syntax}
+ % 研究生国家图书馆封面英文封面上的学位名称。默认会由模板通过 \opt{degree}
+ % 和 \opt{type} 文档类选项生成,也可以由本选项自定义名称。
+ % \end{function}
\ctex_at_end_preamble:n
{
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
index 11b94bfab80..3430def33a6 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
@@ -23,11 +23,18 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.2.0 2023-05-02 16:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.2.1 2023-05-03 13:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
{Undergraduate definition file for njuthesis}
\ProvidesExplFile{njuthesis-undergraduate.def}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+ % \begin{syntax}
+ % \OPT{degree} = \Arg{中文学位名}
+ % \OPT{degree*} = \Arg{英文学位名}
+ % \end{syntax}
+ % 研究生国家图书馆封面英文封面上的学位名称。默认会由模板通过 \opt{degree}
+ % 和 \opt{type} 文档类选项生成,也可以由本选项自定义名称。
+ % \end{function}
\ctex_at_end_preamble:n
{
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls b/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
index 48fc2fa6da5..496d6753cba 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
@@ -24,11 +24,18 @@
%% `.dtx' through XeTeX.
%%
\NeedsTeXFormat{LaTeX2e}
-\GetIdInfo $Id: njuthesis.dtx 1.2.0 2023-05-02 16:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.2.1 2023-05-03 13:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
{Thesis template for Nanjing University}
\ProvidesExplClass{njuthesis}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+ % \begin{syntax}
+ % \OPT{degree} = \Arg{中文学位名}
+ % \OPT{degree*} = \Arg{英文学位名}
+ % \end{syntax}
+ % 研究生国家图书馆封面英文封面上的学位名称。默认会由模板通过 \opt{degree}
+ % 和 \opt{type} 文档类选项生成,也可以由本选项自定义名称。
+ % \end{function}
\RequirePackage { xtemplate, l3keys2e }
\msg_new:nnn { njuthesis } { l3-too-old }
@@ -801,6 +808,7 @@
email .tl_set:N = \g__nju_info_email_tl ,
school-code .tl_set:N = \g__nju_info_code_tl ,
school-code .initial:n = { 10284 } ,
+ degree .tl_set:N = \g__nju_info_degree_tl ,
degree* .tl_set:N = \g__nju_info_degree_en_tl
}
\clist_map_inline:Nn \c__nju_name_anon_clist