texlive[69051] Master/texmf-dist: njuthesis (6dec23)
commits+karl at tug.org
commits+karl at tug.org
Wed Dec 6 22:14:52 CET 2023
Revision: 69051
https://tug.org/svn/texlive?view=revision&revision=69051
Author: karl
Date: 2023-12-06 22:14:52 +0100 (Wed, 06 Dec 2023)
Log Message:
-----------
njuthesis (6dec23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/njuthesis/njuthesis.pdf
trunk/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
Modified: trunk/Master/texmf-dist/doc/latex/njuthesis/njuthesis.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx 2023-12-06 21:14:42 UTC (rev 69050)
+++ trunk/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx 2023-12-06 21:14:52 UTC (rev 69051)
@@ -112,7 +112,7 @@
%
%<class>\NeedsTeXFormat{LaTeX2e}
%<*!(driver|install)>
-%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.3.2 2023-12-05 16:30:00
%<+!driver> +0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
%<class> {Thesis template for Nanjing University}
%<class>\ProvidesExplClass{njuthesis}
@@ -148,7 +148,7 @@
% \thanks{E-mail: \href{mailto:git+nju-lug-email-3104-issue- at yaoge123.cn}
% {git+nju-lug-email-3104-issue- at yaoge123.cn}}}
%
-% \date{v1.3.1 \quad 2023-11-14}
+% \date{v1.3.2 \quad 2023-12-05}
%
% \changes{v0.1}{2021/09/04}{开始开发。}
% \changes{v0.2}{2021/09/07}{初步搭建了可用的模板。}
@@ -1192,15 +1192,14 @@
% 院系。
% \end{function}
%
-% \begin{function}[updated=2023-05-11]{info/major,info/major*}
+% \begin{function}[updated=2023-12-05]{info/major,info/major*}
% \begin{syntax}
% \OPT{major} = \Arg{专业}
-% \OPT{major} = \Arg{专业,专业全称}
+% \OPT{major} = \Arg{封面专业, 摘要专业}
% \OPT{major*} = \Arg{专业}
% \end{syntax}
-% 专业。研究生的专业型学位封面上，“专业学位类别(领域)”一栏默认会补全为
-% “专业硕/博士（\meta{专业}）”。如果希望覆盖模板的自动处理，
-% 可以填写 \opt{info/major} 第二种写法的“专业全称”字段。
+% 专业。研究生的专业型学位封面上，“专业学位类别(领域)”一栏的
+% 填写内容可能与摘要页不一致，可以使用半角逗号分隔两个值。
% \end{function}
%
% \begin{function}[updated=2021-10-01]{info/field,info/field*}
@@ -2637,8 +2636,9 @@
% \begin{macrocode}
\@ifpackagelater { expl3 } { 2023/10/10 } { }
{
- \cs_generate_variant:Nn \tl_set:Nn { Ne }
- \cs_generate_variant:Nn \tl_const:Nn { Ne }
+ \cs_generate_variant:Nn \tl_set:Nn { Ne }
+ \cs_generate_variant:Nn \tl_const:Nn { Ne }
+ \cs_generate_variant:Nn \tl_gput_right:Nn { Ne }
}
% \end{macrocode}
%
@@ -4449,15 +4449,17 @@
%
% \begin{macro}{info/major}
% \changes{v1.3}{2023/05/11}{专业型研究生封面可额外修改专业名称。}
-% 专业。
+% \changes{v1.3}{2023/12/05}{调整专业型学位的填写方式。}
+% 专业。研究生专业型学位可以取封面和摘要的两个值，此外都取第一个值。
% \begin{macrocode}
major .code:n =
{
- \clist_pop:NN \l_keys_value_tl \g_@@_info_major_tl
- \clist_pop:NNF \l_keys_value_tl \g_@@_info_majorc_tl
+ \bool_if:NTF \g_@@_opt_academic_bool
+ { \clist_pop:NN \l_keys_value_tl \g_@@_info_major_tl }
{
- \tl_set:Nn \g_@@_info_majorc_tl
- { 工程 \g_@@_info_type_tl（ \g_@@_info_major_tl ） }
+ \clist_pop:NN \l_keys_value_tl \g_@@_info_majorc_tl
+ \clist_pop:NNF \l_keys_value_tl \g_@@_info_major_tl
+ { \tl_set_eq:NN \g_@@_info_major_tl \g_@@_info_majorc_tl }
}
},
% \end{macrocode}
@@ -6647,7 +6649,7 @@
\cs_new:Npn \@@_g_cover_info:
{
\tl_set:Nn \l_@@_tmpa_tl { \skip_horizontal:n { .7 cm } }
- \@@_g_cover_info:NNNNN \l_@@_tmpa_clist \l_@@_tmpa_tl
+ \@@_g_cover_info:NNNNN \l_@@_tmp_clist \l_@@_tmpa_tl
\c_@@_clabelwd_dim \c_@@_crulewd_dim \c_@@_fmt_coverlabel_tl
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls 2023-12-06 21:14:42 UTC (rev 69050)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls 2023-12-06 21:14:52 UTC (rev 69051)
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.2 2023-12-05 16:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Documentation style for njuthesis}
\ProvidesExplFile{njuthesis-doc.cls}
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def 2023-12-06 21:14:42 UTC (rev 69050)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def 2023-12-06 21:14:52 UTC (rev 69051)
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.2 2023-12-05 16:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Graduate definition file for njuthesis}
\ProvidesExplFile{njuthesis-graduate.def}
@@ -113,7 +113,7 @@
\cs_new:Npn \__nju_g_cover_info:
{
\tl_set:Nn \l__nju_tmpa_tl { \skip_horizontal:n { .7 cm } }
- \__nju_g_cover_info:NNNNN \l__nju_tmpa_clist \l__nju_tmpa_tl
+ \__nju_g_cover_info:NNNNN \l__nju_tmp_clist \l__nju_tmpa_tl
\c__nju_clabelwd_dim \c__nju_crulewd_dim \c__nju_fmt_coverlabel_tl
}
\__nju_declare_element:nn { g / cover-back / info }
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def 2023-12-06 21:14:42 UTC (rev 69050)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def 2023-12-06 21:14:52 UTC (rev 69051)
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.2 2023-12-05 16:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Postdoctoral definition file for njuthesis}
\ProvidesExplFile{njuthesis-postdoctoral.def}
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def 2023-12-06 21:14:42 UTC (rev 69050)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def 2023-12-06 21:14:52 UTC (rev 69051)
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.2 2023-12-05 16:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Undergraduate definition file for njuthesis}
\ProvidesExplFile{njuthesis-undergraduate.def}
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls 2023-12-06 21:14:42 UTC (rev 69050)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls 2023-12-06 21:14:52 UTC (rev 69051)
@@ -24,7 +24,7 @@
%% `.dtx' through XeTeX.
%%
\NeedsTeXFormat{LaTeX2e}
-\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.2 2023-12-05 16:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Thesis template for Nanjing University}
\ProvidesExplClass{njuthesis}
@@ -45,8 +45,9 @@
}
\@ifpackagelater { expl3 } { 2023/10/10 } { }
{
- \cs_generate_variant:Nn \tl_set:Nn { Ne }
- \cs_generate_variant:Nn \tl_const:Nn { Ne }
+ \cs_generate_variant:Nn \tl_set:Nn { Ne }
+ \cs_generate_variant:Nn \tl_const:Nn { Ne }
+ \cs_generate_variant:Nn \tl_gput_right:Nn { Ne }
}
\msg_new:nnn { njuthesis } { unsupported-engine }
{
@@ -794,11 +795,12 @@
field* .tl_set:N = \g__nju_info_field_en_tl ,
major .code:n =
{
- \clist_pop:NN \l_keys_value_tl \g__nju_info_major_tl
- \clist_pop:NNF \l_keys_value_tl \g__nju_info_majorc_tl
+ \bool_if:NTF \g__nju_opt_academic_bool
+ { \clist_pop:NN \l_keys_value_tl \g__nju_info_major_tl }
{
- \tl_set:Nn \g__nju_info_majorc_tl
- { 工程 \g__nju_info_type_tl（ \g__nju_info_major_tl ） }
+ \clist_pop:NN \l_keys_value_tl \g__nju_info_majorc_tl
+ \clist_pop:NNF \l_keys_value_tl \g__nju_info_major_tl
+ { \tl_set_eq:NN \g__nju_info_major_tl \g__nju_info_majorc_tl }
}
},
supervisor .clist_set:N = \g__nju_info_supv_clist ,
More information about the tex-live-commits
mailing list.