summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls4
-rw-r--r--Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def30
-rw-r--r--Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def3
-rw-r--r--Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def3
-rw-r--r--Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls47
5 files changed, 53 insertions, 34 deletions
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls
index d5f9ff816f0..f34581a101e 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.3.0 2023-06-06 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
{Documentation style for njuthesis}
\ProvidesExplFile{njuthesis-doc.cls}
@@ -61,6 +61,8 @@
\NewDocumentCommand \CJKsout { o m }
{ \textcolor { black!50 } {#1} }
}
+\cs_if_exist:NF \__codedoc_get_hyper_target:xN
+ { \cs_new_eq:NN \__codedoc_get_hyper_target:xN \__codedoc_get_hyper_target:eN }
\backgroundsetup{
contents={\njuemblem[white!85!gray]{22cm}{!}},
scale=1, angle=0, hshift=-4cm
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
index 1292bef9a24..fa7fb7fc388 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.3.0 2023-06-06 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
{Graduate definition file for njuthesis}
\ProvidesExplFile{njuthesis-graduate.def}
@@ -39,16 +39,16 @@
\g__nju_info_conferdate_tl
}
\tl_new:N \g__nju_info_type_tl
-\tl_set:Nx \g__nju_info_type_tl
+\tl_set:Ne \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
+\tl_set:Ne \g__nju_info_degree_en_tl
{ \clist_item:Nn \c__nju_name_type_en_clist { \g__nju_info_type_int } }
-\ctex_at_end:n { \__nju_loadfont_stzhongs: }
+\ctex_at_end_preamble:n { \__nju_loadfont_stzhongs: }
\cs_new_protected:Npn \__nju_decl_sign:
{
\clist_map_inline:nn { origsign, date }
@@ -160,7 +160,7 @@
{
content = \g__nju_info_title_en_tl,
format = \bf \sffamily \zihao { 2 },
- bottom-skip = 2 cm
+ bottom-skip = 1 cm plus 1 fil minus .5 cm
}
\__nju_declare_element:nn { g / cover-en / top }
{
@@ -174,7 +174,7 @@
\textsf { \g__nju_info_supv_en_tl
\tex_par:D \g__nju_info_supvii_en_tl },
format = \zihao { 4 },
- bottom-skip = 0 pt plus 1.2 fil minus 1 cm
+ bottom-skip = 1 cm plus 1 fil minus .5 cm
}
\__nju_declare_element:nn { g / cover-en / middle }
{
@@ -182,12 +182,12 @@
\c__nju_text_cover_en_tl \__nju_vskip:
\group_begin: \scshape \g__nju_info_degree_en_tl \group_end:
\__nju_vskip: { in } \__nju_vskip: \g__nju_info_major_en_tl,
- bottom-skip = 2 cm
+ bottom-skip = .5 cm plus 1 fil
}
\__nju_declare_element:nn { g / cover-en / emblem-img }
{
content = \__nju_emblem:N \c__nju_emblemwdii_dim,
- bottom-skip = 1.5 cm
+ bottom-skip = 1 cm minus .5 cm
}
\__nju_declare_element:nn { g / cover-en / bottom }
{
@@ -257,7 +257,7 @@
}
\cs_new_protected:Npn \__nju_cover_info_nl:
{
- \tl_set:Nx \l__nju_tmpa_tl
+ \tl_set:Ne \l__nju_tmpa_tl
{
\clist_use:Nn \g__nju_info_supv_clist { ~ }
\clist_use:Nn \g__nju_info_supvii_clist { ~ }
@@ -499,9 +499,9 @@
{ \__nju_abs_info_en_g:N \c__nju_name_colon_en_tl }
\cs_new_protected:Npn \__nju_abs_info_g:N #1
{
- \__nju_uline_list:NNx \g__nju_info_title_tl \g__nju_abs_title_left_skip
+ \__nju_uline_list:NNe \g__nju_info_title_tl \g__nju_abs_title_left_skip
{ \c__nju_name_titlea_tl #1 }
- \__nju_get_width_print:Nx \l__nju_tmp_skip
+ \__nju_get_width_print:Ne \l__nju_tmp_skip
{
\dim_set:Nn \l__nju_tmpa_dim { 11 em }
\dim_set:Nn \l__nju_tmpb_dim { 4 em }
@@ -511,19 +511,19 @@
\c__nju_name_grade_tl \c__nju_name_authora_tl #1
}
\__nju_box_ulined_info:Nn \l__nju_tmp_skip { author } \tex_par:D
- \__nju_get_width_print:Nx \l__nju_tmpa_dim { \c__nju_name_supva_tl #1 }
+ \__nju_get_width_print:Ne \l__nju_tmpa_dim { \c__nju_name_supva_tl #1 }
\__nju_box_ulined_info:Nn \l__nju_tmpa_dim { supvfull }
}
\cs_new_protected:Npn \__nju_abs_info_en_g:N #1
{
\bool_if:NTF \g__nju_abs_underline_bool
{
- \__nju_uline_list:NNx \g__nju_info_title_en_tl
+ \__nju_uline_list:NNe \g__nju_info_title_en_tl
\g__nju_abs_title_left_skip { \c__nju_name_title_en_tl #1 }
\clist_map_inline:nn { major, author, supvfull }
{
\tex_par:D
- \__nju_get_width_print:Nx \l__nju_tmpa_dim
+ \__nju_get_width_print:Ne \l__nju_tmpa_dim
{ \__nju_name:n { ##1 _en } #1 }
\__nju_box_ulined_info:Nn \l__nju_tmpa_dim { ##1 _en }
}
@@ -587,6 +587,7 @@
{ sign } { (签字) },
{ sign a } { 研究生签名 },
{ sign b } { 导师签名 },
+ { stzhongs file } { STZHONGS.TTF },
{ submit date } { 论文提交日期 },
{ subtitle } { (题名和副题名) },
{ supv } { 导师 },
@@ -694,6 +695,7 @@
{ paragraph } { \c__nju_fmt_section_tl },
{ subparagraph } { \c__nju_fmt_section_tl },
{ chapterintoc } { \c__nju_fmt_section_tl },
+ { tabular } { \zihao { 5 } },
{ toc title } { \centering \zihao { 3 } \bfseries },
{ header } { \small \kaishu },
{ footer } { \small \rmfamily }
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
index a1a6dd88e3f..87719d9bed4 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.3.0 2023-06-06 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
{Postdoctoral definition file for njuthesis}
\ProvidesExplFile{njuthesis-postdoctoral.def}
@@ -273,6 +273,7 @@
{ paragraph } { \c__nju_fmt_section_tl },
{ subparagraph } { \c__nju_fmt_section_tl },
{ chapterintoc } { \c__nju_fmt_section_tl },
+ { tabular } { \zihao { 5 } },
{ toc title } { \centering \zihao { 3 } \bfseries },
{ header } { \small \kaishu },
{ footer } { \small \rmfamily }
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
index a48cb5de066..4719bdf4072 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.3.0 2023-06-06 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
{Undergraduate definition file for njuthesis}
\ProvidesExplFile{njuthesis-undergraduate.def}
@@ -267,6 +267,7 @@
{ paragraph } { \c__nju_fmt_section_tl },
{ subparagraph } { \c__nju_fmt_section_tl },
{ chapterintoc } { \c__nju_fmt_section_tl },
+ { tabular } { \zihao { 5 } },
{ toc title } { \centering \zihao { 3 } \bfseries },
{ header } { \small \kaishu },
{ footer } { \small \rmfamily }
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls b/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
index 2cbeec2104d..a785fe4fd51 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
@@ -24,7 +24,7 @@
%% `.dtx' through XeTeX.
%%
\NeedsTeXFormat{LaTeX2e}
-\GetIdInfo $Id: njuthesis.dtx 1.3.0 2023-06-06 11:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
{Thesis template for Nanjing University}
\ProvidesExplClass{njuthesis}
@@ -43,6 +43,11 @@
\@ifpackagelater {#1} { 2020/10/01 }
{ } { \msg_error:nnn { njuthesis } { l3-too-old } {#1} }
}
+\@ifpackagelater { expl3 } { 2023/10/10 } { }
+ {
+ \cs_generate_variant:Nn \tl_set:Nn { Ne }
+ \cs_generate_variant:Nn \tl_const:Nn { Ne }
+ }
\msg_new:nnn { njuthesis } { unsupported-engine }
{
The~ njuthesis~ class~ requires~ either~
@@ -54,7 +59,7 @@
\bool_lazy_or:nnF
{ \sys_if_engine_xetex_p: }
{ \sys_if_engine_luatex_p: }
- { \msg_fatal:nnx { njuthesis } { unsupported-engine } { \c_sys_engine_str } }
+ { \msg_fatal:nne { njuthesis } { unsupported-engine } { \c_sys_engine_str } }
\box_new:N \l__nju_tmpa_box
\box_new:N \l__nju_tmpb_box
\box_new:N \l__nju_tmpc_box
@@ -79,7 +84,7 @@
\tl_new:N \g__nju_font_path_tl
\bool_new:N \g__nju_font_path_bool
\tl_new:N \g__nju_config_tl
-\tl_const:Nx \c__nju_name_today_tl
+\tl_const:Ne \c__nju_name_today_tl
{
\int_to_arabic:n { \c_sys_year_int } -
\int_to_arabic:n { \c_sys_month_int } -
@@ -176,7 +181,7 @@
}
\cs_new:Npn \__nju_box_spread:NNn { \__nju_box_spread:NNNn \l__nju_tmp_skip }
\cs_generate_variant:Nn \__nju_box_spread:NNn { NNv }
-\cs_generate_variant:Nn \__nju_box_spread:NNn { NNx }
+\cs_generate_variant:Nn \__nju_box_spread:NNn { NNe }
\cs_new_protected:Npn \__nju_box_spread_name:Nn #1#2
{ \__nju_box_spread:NNv #1 \c_empty_tl { c__nju_name_ #2 _tl } }
\cs_new_protected:Npn \__nju_box_spread_name:NNn #1#2#3
@@ -232,7 +237,7 @@
\dim_set:Nn #1 { \textwidth - #1 } #2
}
\cs_generate_variant:Nn \__nju_get_width_print:Nn { Nv }
-\cs_generate_variant:Nn \__nju_get_width_print:Nn { Nx }
+\cs_generate_variant:Nn \__nju_get_width_print:Nn { Ne }
\cs_new_protected:Npn \__nju_uline_entry:Nn #1#2
{
\__nju_get_width_print:Nv #1 { c__nju_name_ #2 _tl }
@@ -391,7 +396,7 @@
}
}
}
-\cs_generate_variant:Nn \__nju_uline_list:NNn { NNx }
+\cs_generate_variant:Nn \__nju_uline_list:NNn { NNe }
\DeclareObjectType { nju } { \c_zero_int }
\DeclareTemplateInterface { nju } { element } { \c_zero_int }
{
@@ -488,7 +493,7 @@
You~ have~ not~ selected~ local~ files~
for~ emblem~ and~ name~ images.\\
It~ seems~ that~ you~ haven't~ fill~ in~ both~
- "image/nju-emblem"~ and~ "image/nju-name",~ therefore
+ "image/nju-emblem"~ and~ "image/nju-name",~ therefore~
I~ am~ using~ the~ package~ "njuvisual"~ instead,~
which~ may~ slow~ down~ the~ compilation.
}
@@ -671,7 +676,7 @@
{ \tl_clear:N \l__nju_tmpb_tl }
\tl_gset:cn { c__nju_ #5 _ #2 #3 \l__nju_tmpb_tl _tl } {#4}
}
-\exp_args:Nx \PassOptionsToClass
+\exp_args:Ne \PassOptionsToClass
{
a4paper,
UTF8,
@@ -753,7 +758,7 @@
}
{ \__nju_check_pkg_conflict:nn { unicode-math } {#1} }
}
-\exp_args:Nx \file_input:n
+\exp_args:Ne \file_input:n
{
njuthesis-
\int_case:nn { \g__nju_info_type_int }
@@ -826,18 +831,18 @@
{ \keys_define:nn { nju / info } { #1 * .groups:n = { anonymous } } }
\__nju_at_begin_document:n
{
- \tl_set:Nx \g__nju_info_supvfull_tl
+ \tl_set:Ne \g__nju_info_supvfull_tl
{ \clist_use:Nn \g__nju_info_supv_clist { \__nju_hskip: } }
\clist_if_empty:NF \g__nju_info_supvii_clist
{
\bool_gset_true:N \g__nju_opt_supvii_bool
- \tl_gput_right:Nx \g__nju_info_supvfull_tl
+ \tl_gput_right:Ne \g__nju_info_supvfull_tl
{ \__nju_quad: \clist_use:Nn \g__nju_info_supvii_clist { \__nju_hskip: } }
}
\tl_set_eq:NN \g__nju_info_supvfull_en_tl \g__nju_info_supv_en_tl
\tl_if_empty:NF \g__nju_info_supvii_en_tl
{
- \tl_gput_right:Nx \g__nju_info_supvfull_en_tl
+ \tl_gput_right:Ne \g__nju_info_supvfull_en_tl
{ \__nju_quad: \g__nju_info_supvii_en_tl }
}
}
@@ -1016,8 +1021,15 @@
[ \c__nju_name_fakebold_tl ]
}
{
- \cs_set_eq:NN \__nju_stzhongs: \rmfamily
- \msg_warning:nn { njuthesis } { missing-stzhongs }
+ \bool_if:NTF \g__nju_font_path_bool
+ {
+ \newCJKfontfamily \__nju_stzhongs: { \c__nju_name_stzhongsfile_tl }
+ [ Path = \g__nju_font_path_tl, \c__nju_name_fakebold_tl ]
+ }
+ {
+ \cs_set_eq:NN \__nju_stzhongs: \rmfamily
+ \msg_warning:nn { njuthesis } { missing-stzhongs }
+ }
}
}
\cs_new:Npn \__nju_define_math_font:nn #1#2
@@ -1457,12 +1469,12 @@
}
\keys_define:nn { nju / image } { path .code:n = { \graphicspath {#1} } }
\DeclareGraphicsExtensions { .pdf, .eps, .jpg, .png }
-\BeforeBeginEnvironment { tabular } { \centering \zihao {5} }
+\BeforeBeginEnvironment { tabular } { \centering \c__nju_fmt_tabular_tl }
\ctex_at_end_package:nn { tabularray }
{
\__tblr_use_lib_booktabs:
\tl_set:Nn \l__nju_tmpb_tl
- { , abovesep = 4 pt, stretch = 0.8, cells = { font = \small } }
+ { , abovesep = 4 pt, stretch = 0.8, cells = { font = \c__nju_fmt_tabular_tl } }
\tl_put_right:NV \l__tblr_default_tblr_inner_tl \l__nju_tmpb_tl
\tl_put_right:NV \l__tblr_default_talltblr_inner_tl \l__nju_tmpb_tl
\tl_put_right:Nn \l__tblr_default_talltblr_outer_tl { , headsep = -4 pt }
@@ -1737,7 +1749,6 @@
\pagenumbering { gobble }
\__nju_make_cover:
}
- \tl_remove_all:Nn \g__nju_info_title_tl { \\ }
\bool_if:NF \g__nju_opt_draft_bool
{
\bool_if:NT \g__nju_opt_decl_bool
@@ -1800,6 +1811,7 @@
\cleardoublepage
\thispagestyle { plain }
\__nju_abs_bookmark:Vn \c__nju_name_abstracta_tl { abstract }
+ \tl_gremove_all:Nn \g__nju_info_title_tl { \\ }
\__nju_make_abstract:
\group_begin: \kaishu \zihao { -4 } #1
}
@@ -1809,6 +1821,7 @@
\cleardoublepage
\thispagestyle { plain }
\__nju_abs_bookmark:Vn \c__nju_name_abstracta_en_tl { abstract-en }
+ \tl_gremove_all:Nn \g__nju_info_title_en_tl { \\ }
\__nju_make_abstract_en:
\group_begin: \zihao { -4 } #1
}