From b1b25ae75db0114523bd5e88ae7cf38af04083fc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 Jun 2022 21:09:08 +0000 Subject: xduts (28jun22) git-svn-id: svn://tug.org/texlive/trunk@63751 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/xelatex/xduts/xdufont.sty | 2 +- .../texmf-dist/tex/xelatex/xduts/xdupgthesis.cls | 487 +++++++++++++++------ .../texmf-dist/tex/xelatex/xduts/xduugthesis.cls | 79 ++-- 3 files changed, 413 insertions(+), 155 deletions(-) (limited to 'Master/texmf-dist/tex/xelatex') diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty index 06324233c65..3dbc2a3e0fb 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty +++ b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{xdufont} - {2022/06/21}{2.0.0.0} + {2022/06/28}{2.10.3.0} {Xidian University Font package} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls index cf4fbea89c4..bb0a63f820a 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xdupgthesis} - {2022/06/21}{2.0.0.0} + {2022/06/28}{2.10.3.0} {Xidian University Postgraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -527,6 +527,8 @@ \str_new:N \l__xdu_secret_lv_str \str_new:N \l__xdu_secret_year_str \str_new:N \l__xdu_submit_date_str +\str_new:N \l__xdu_statement_scan_str +\clist_new:N \l__xdu_statement_sign_clist \str_new:N \l__xdu_los_str \str_new:N \l__xdu_loa_str \str_new:N \l__xdu_bio_str @@ -554,6 +556,8 @@ { \tl_set_eq:NN \l__xdu_secret_lv_str \l_keys_choice_tl }, secret-year .tl_set:N = \l__xdu_secret_year_str, submit-date .tl_set:N = \l__xdu_submit_date_str, + statement-scan .tl_set:N = \l__xdu_statement_scan_str, + statement-sign .clist_set:N = \l__xdu_statement_sign_clist, los .tl_set:N = \l__xdu_los_str, loa .tl_set:N = \l__xdu_loa_str, bio .tl_set:N = \l__xdu_bio_str @@ -579,6 +583,8 @@ info / secret-level = { 公开 }, info / secret-year = { }, info / submit-date = { }, + info / statement-scan = { }, + info / statement-sign = { }, info / los = { }, info / loa = { }, info / bio = { } @@ -604,6 +610,71 @@ \str_set:Nx \l__xdu_supv_ii_t_en_str { \clist_item:Nn \l__xdu_supv_t_en_clist { 2 } } } +\clist_new:N \l__xdu_rm_page_clist +\bool_new:N \l__xdu_rm_header_bool +\bool_new:N \l__xdu_rm_footer_bool +\keys_define:nn { xdu / style } + { + remove-page .clist_set:N = \l__xdu_rm_page_clist, + remove-header .bool_set:N = \l__xdu_rm_header_bool, + remove-footer .bool_set:N = \l__xdu_rm_footer_bool + } +\keys_set:nn { xdu } + { + style / remove-page = { }, + style / remove-header = { false }, + style / remove-footer = { false } + } +\bool_new:N \l__xdu_rm_cover_bool +\bool_new:N \l__xdu_rm_title_page_bool +\bool_new:N \l__xdu_rm_statement_bool +\bool_new:N \l__xdu_rm_abstract_bool +\bool_new:N \l__xdu_rm_loft_bool +\bool_new:N \l__xdu_rm_losa_bool +\bool_new:N \l__xdu_rm_toc_bool +\bool_new:N \l__xdu_rm_appendix_bool +\bool_new:N \l__xdu_rm_ref_bool +\bool_new:N \l__xdu_rm_ack_bool +\bool_new:N \l__xdu_rm_bio_bool +\ctex_at_end_preamble:n + { + \clist_if_in:NnT \l__xdu_rm_page_clist { 封面 } + { \bool_set_true:N \l__xdu_rm_cover_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 提名页 } + { \bool_set_true:N \l__xdu_rm_title_page_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 声明页 } + { \bool_set_true:N \l__xdu_rm_statement_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 摘要 } + { \bool_set_true:N \l__xdu_rm_abstract_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 索引 } + { \bool_set_true:N \l__xdu_rm_loft_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 对照表 } + { \bool_set_true:N \l__xdu_rm_losa_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 目录 } + { \bool_set_true:N \l__xdu_rm_toc_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 附录 } + { \bool_set_true:N \l__xdu_rm_appendix_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 参考文献 } + { \bool_set_true:N \l__xdu_rm_ref_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 致谢 } + { \bool_set_true:N \l__xdu_rm_ack_bool } + \clist_if_in:NnT \l__xdu_rm_page_clist { 作者简介 } + { \bool_set_true:N \l__xdu_rm_bio_bool } + } +\bool_new:N \l__xdu_anon_bool +\keys_define:nn { xdu / style } + { + anonymous .bool_set:N = \l__xdu_anon_bool + } +\keys_set:nn { xdu } + { + style / anonymous = { false } + } +\NewDocumentCommand \anon { O { XXX } m } + { + \bool_if:NTF \l__xdu_anon_bool + { #1 } { #2 } + } \cs_set:Npn \figurename { \__xdu_lang_switch:nn { 图 } { Figure } } \cs_new_eq:NN \figname \figurename \cs_set:Npn \tablename { \__xdu_lang_switch:nn { 表 } { Table } } @@ -615,6 +686,7 @@ \tl_new:N \l__xdu_ref_add_space \tl_new:N \l__xdu_cap_label_sep_tl \bool_new:N \l__xdu_tab_small_bool +\bool_new:N \l__xdu_alg_small_cap_bool \bool_new:N \l__xdu_alg_small_bool \clist_new:N \l__xdu_before_skip_clist \clist_new:N \l__xdu_after_skip_clist @@ -637,6 +709,7 @@ ref-add-space .bool_set:N = \l__xdu_ref_add_space, caption-label-sep .tl_set:N = \l__xdu_cap_label_sep_tl, table-small-font .bool_set:N = \l__xdu_tab_small_bool, + algorithm-small-caption .bool_set:N = \l__xdu_alg_small_cap_bool, algorithm-small-font .bool_set:N = \l__xdu_alg_small_bool, before-skip .clist_set:N = \l__xdu_before_skip_clist, after-skip .clist_set:N = \l__xdu_after_skip_clist, @@ -651,18 +724,19 @@ } \keys_set:nn { xdu } { - style / en-cjk-font = false, - style / language = zh, - style / bib-backend = biblatex, - style / biblatex-option = { }, - style / ref-add-space = false, - style / caption-label-sep = { 0.75em }, - style / table-small-font = true, - style / algorithm-small-font = true, - style / before-skip = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt }, - style / after-skip = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt }, - style / symmetric-margin = false, - style / page-vertical-align = { 顶部对齐 } + style / en-cjk-font = false, + style / language = zh, + style / bib-backend = biblatex, + style / biblatex-option = { }, + style / ref-add-space = false, + style / caption-label-sep = { 0.75em }, + style / table-small-font = true, + style / algorithm-small-caption = true, + style / algorithm-small-font = true, + style / before-skip = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt }, + style / after-skip = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt }, + style / symmetric-margin = false, + style / page-vertical-align = { 顶部对齐 } } \bool_new:N \l__xdu_customize_los_bool \bool_new:N \l__xdu_customize_loa_bool @@ -683,8 +757,8 @@ { style / customize-los = { true }, style / customize-loa = { true }, - style / colspec-los = { Q[l,m]X[l,m] }, - style / colspec-loa = { Q[l,m]X[l,m]X[l,m] }, + style / colspec-los = { Q[l,h]X[l,h] }, + style / colspec-loa = { Q[l,h]X[l,h]X[l,h] }, style / title-row-los = { false }, style / title-row-loa = { false } } @@ -890,6 +964,8 @@ outer = 2.5cm } \savegeometry { cover } +\newgeometry { margin = 0cm } +\savegeometry { nomargin } \cs_new:Npn \__xdu_load_main_geometry: { \bool_if:NTF \l__xdu_sym_mgn_bool @@ -925,26 +1001,35 @@ { \pagestyle { fancy } \fancyhf { } - \fancyhead [ CE ] { \__xdu_rm_family: \zihao { 5 } \l__xdu_header_str } - \fancyhead [ CO ] { \__xdu_rm_family: \zihao { 5 } \leftmark } - \fancyfoot [ CE ] { \__xdu_rm_family: \zihao { -5 } \thepage } - \fancyfoot [ CO ] { \__xdu_rm_family: \zihao { -5 } \thepage } + \bool_if:NF \l__xdu_rm_header_bool + { + \fancyhead [ CE ] { \__xdu_rm_family: \zihao { 5 } \l__xdu_header_str } + \fancyhead [ CO ] { \__xdu_rm_family: \zihao { 5 } \leftmark } + } + \bool_if:NTF \l__xdu_rm_footer_bool + { \fancyfoot [ C ] { } } + { \fancyfoot [ C ] { \__xdu_rm_family: \zihao { -5 } \thepage } } \cs_set:Npn \headrulewidth { 0.5pt } - \cs_set:Npn \headrule + \bool_if:NTF \l__xdu_rm_header_bool + { \cs_set:Npn \headrule { } } { - \hrule \@height 0pt - \skip_vertical:N 2pt - \hrule \@height \headrulewidth - \skip_vertical:N \headrulewidth - \hrule \@height \headrulewidth - \skip_vertical:N -\headrulewidth + \cs_set:Npn \headrule + { + \hrule \@height 0pt + \skip_vertical:N 2pt + \hrule \@height \headrulewidth + \skip_vertical:N \headrulewidth + \hrule \@height \headrulewidth + \skip_vertical:N -\headrulewidth + } } } \fancypagestyle { front } { \pagestyle { plain } - \fancyfoot [ CE ] { \rmfamily \zihao { -5 } \thepage } - \fancyfoot [ CO ] { \rmfamily \zihao { -5 } \thepage } + \bool_if:NTF \l__xdu_rm_footer_bool + { \fancyfoot [ C ] { } } + { \fancyfoot [ C ] { \rmfamily \zihao { -5 } \thepage } } } \ctex_at_end_preamble:n { @@ -1115,7 +1200,14 @@ } \RequirePackage { caption } \DeclareCaptionLabelSeparator { customskip } { \hskip \l__xdu_cap_label_sep_tl } -\DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } } +\DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } } +\DeclareCaptionFont { algcustomfont } + { + \__xdu_rm_family: + \bool_if:NTF \l__xdu_alg_small_cap_bool + { \zihao { 5 } } + { \zihao { -4 } } + } \captionsetup { labelsep = customskip, @@ -1124,16 +1216,23 @@ \captionsetup [ algorithm ] { labelsep = customskip, - labelfont = customfont, - font = customfont + labelfont = algcustomfont, + font = algcustomfont } \ctex_at_end_preamble:n { \cs_if_exist:NT \thealgocf { \SetAlgoCaptionSeparator { \hbox_to_wd:nn { \l__xdu_cap_label_sep_tl } { } } - \SetAlCapNameFnt { \__xdu_rm_family: \zihao { 5 } } - \SetAlCapFnt { \__xdu_rm_family: \zihao { 5 } } + \bool_if:NTF \l__xdu_alg_small_cap_bool + { + \SetAlCapNameFnt { \__xdu_rm_family: \zihao { 5 } } + \SetAlCapFnt { \__xdu_rm_family: \zihao { 5 } } + } + { + \SetAlCapNameFnt { \__xdu_rm_family: \zihao { -4 } } + \SetAlCapFnt { \__xdu_rm_family: \zihao { -4 } } + } \SetAlCapSty { } } } @@ -1251,6 +1350,9 @@ { \RequirePackage { gbt7714 } \bibliographystyle { gbt7714-numerical } + \cs_set:Npn \@biblabel #1 { \hfill [ #1 ] } + \cs_set:Npn \bibsection { } + \dim_set:Nn \bibsep { 0pt } \NewDocumentCommand \parencite { m } { \group_begin: \citestyle { numbers } \cite { #1 } \group_end: } } @@ -1258,6 +1360,21 @@ \PassOptionsToPackage { \l__xdu_biblatex_option_tl } { biblatex } \RequirePackage { biblatex } \clist_map_inline:Nn \l__xdu_bib_file_clist { \addbibresource { #1 } } + \defbibheading { bibliography } [ ] { } + \dim_set:Nn \biblabelsep { 1ex } + \dim_set:Nn \bibitemsep { 0pt } + \cs_set_eq:NN \SlashFont \rmfamily + } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_rm_ref_bool + { \RequirePackage { bibentry } } + } + \cs_set:Npn \bibfont + { + \rmfamily + \zihao { 5 } + \dim_set:Nn \baselineskip { 20pt } } } \RequirePackage { environ } @@ -1275,6 +1392,11 @@ { \cs_set:Npn \thealgocf { \thechapter \arabic { algocf } } } \BODY } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_rm_appendix_bool + { \RenewEnviron { appendixes } { } } + } \bool_new:N \l__xdu_ac_master \bool_new:N \l__xdu_pro_master \bool_new:N \l__xdu_ac_phd @@ -1709,6 +1831,34 @@ } \cleardoublepage } +\cs_new:Npn \__xdu_statement_scan_sign_uline:n #1 + { + \__xdu_uline:n + { + \vbox_to_ht:nn { 17.5pt } + { + \vfil + \hbox_to_wd:nn { 10em } + { + \hfil + \includegraphics [ width = 10em, height = 25pt, keepaspectratio ] { #1 } + \hfil + } + } + } + } +\cs_new:Npn \__xdu_statement_scan_sign:nnnn #1#2#3#4 + { + \vbox_to_ht:nn { 30pt } + { + \vfil + #1: + \__xdu_statement_scan_sign_uline:n { #2 } + \hfill + #3: + \__xdu_statement_scan_sign_uline:n { #4 } + } + } \cs_new:Npn \__xdu_statement: { \vbox:n { } @@ -1720,7 +1870,7 @@ 西安电子科技大学\\ 学位论文独创性(或创新性)声明 } - \vbox_to_ht:nn { 140pt } + \vbox_to_ht:nn { 120pt } { \rmfamily \zihao { -4 } \dim_set:Nn \parindent { 2em } @@ -1734,15 +1884,27 @@ 学位论文若有不实之处,本人承担一切法律责任。 \vfil } + \clist_if_empty:NT \l__xdu_statement_sign_clist + { \skip_vertical:n { 20pt } } \vbox_to_ht:nn { 175pt } { \rmfamily \zihao { -4 } \dim_set:Nn \parindent { 2em } \dim_set:Nn \baselineskip { 20pt } - 本人签名:\__xdu_uline:n { \skip_horizontal:n { 10em } } - \hfill - 日\qquad{}期:\__xdu_uline:n { \skip_horizontal:n { 10em } } + \clist_if_empty:NTF \l__xdu_statement_sign_clist + { + 本人签名:\__xdu_uline:n { \skip_horizontal:n { 10em } } + \hfill + 日\qquad{}期:\__xdu_uline:n { \skip_horizontal:n { 10em } } + } + { + \__xdu_statement_scan_sign:nnnn + { 本人签名 } { \clist_item:Nn \l__xdu_statement_sign_clist { 1 } } + { 日\qquad{}期 } { \clist_item:Nn \l__xdu_statement_sign_clist { 2 } } + } } + \clist_if_empty:NF \l__xdu_statement_sign_clist + { \skip_vertical:n { 20pt } } \vbox_to_ht:nn { 60pt } { \rmfamily \zihao { 4 } \bfseries \centering @@ -1750,7 +1912,7 @@ 西安电子科技大学\\ 关于论文使用授权的说明 } - \vbox_to_ht:nn { 140pt } + \vbox_to_ht:nn { 120pt } { \rmfamily \zihao { -4 } \dim_set:Nn \parindent { 2em } @@ -1772,18 +1934,32 @@ 年解密后适用本授权书。 \vfil } + \clist_if_empty:NT \l__xdu_statement_sign_clist + { \skip_vertical:n { 20pt } } \vbox:n { \rmfamily \zihao { -4 } \dim_set:Nn \parindent { 2em } \dim_set:Nn \baselineskip { 40pt } - 本人签名:\__xdu_uline:n { \skip_horizontal:n { 10em } } - \hfill - 导师签名:\__xdu_uline:n { \skip_horizontal:n { 10em } } - \par - 日\qquad{}期:\__xdu_uline:n { \skip_horizontal:n { 10em } } - \hfill - 日\qquad{}期:\__xdu_uline:n { \skip_horizontal:n { 10em } } + \clist_if_empty:NTF \l__xdu_statement_sign_clist + { + 本人签名:\__xdu_uline:n { \skip_horizontal:n { 10em } } + \hfill + 导师签名:\__xdu_uline:n { \skip_horizontal:n { 10em } } + \par + 日\qquad{}期:\__xdu_uline:n { \skip_horizontal:n { 10em } } + \hfill + 日\qquad{}期:\__xdu_uline:n { \skip_horizontal:n { 10em } } + } + { + \__xdu_statement_scan_sign:nnnn + { 本人签名 } { \clist_item:Nn \l__xdu_statement_sign_clist { 3 } } + { 导师签名 } { \clist_item:Nn \l__xdu_statement_sign_clist { 5 } } + \par + \__xdu_statement_scan_sign:nnnn + { 日\qquad{}期 } { \clist_item:Nn \l__xdu_statement_sign_clist { 4 } } + { 日\qquad{}期 } { \clist_item:Nn \l__xdu_statement_sign_clist { 6 } } + } } \cleardoublepage } @@ -1920,6 +2096,8 @@ } \cs_generate_variant:Nn \__tblr_parse_colrow_spec:nn { nV } } +\dim_new:N \l__xdu_losa_add_skip_dim +\dim_set:Nn \l__xdu_losa_add_skip_dim { 1.2098pt } \cs_new:Npn \__xdu_symbols_list: { \__xdu_n_chapter_head_toc:n @@ -1945,6 +2123,7 @@ [ evaluate = \fileIfExistInput, expand = \l__xdu_los_head_tl, + entry = none, theme = losloatheme ] } @@ -1952,13 +2131,15 @@ colspec = { \exp_not:V \l__xdu_colspec_los_tl }, \exp_not:n { - rowhead = \int_compare:nNnTF - { \value { rowcount } } > { 1 } - { \l__xdu_los_rowhead_tl } { 0 }, - rows = { font = \rmfamily \zihao { -4 } }, - stretch = 0, - rowsep = { 3pt }, - rows = { ht = 14pt } + rowhead = \int_compare:nNnTF + { \value { rowcount } } > { 1 } + { \l__xdu_los_rowhead_tl } { 0 }, + cells = { + font = \rmfamily \zihao { -4 } + \dim_add:Nn \baselineskip { \l__xdu_losa_add_skip_dim } + }, + abovesep = 0pt, + belowsep = \l__xdu_losa_add_skip_dim } } } @@ -1999,6 +2180,7 @@ [ evaluate = \fileIfExistInput, expand = \l__xdu_loa_head_tl, + entry = none, theme = losloatheme ] } @@ -2006,13 +2188,15 @@ colspec = { \exp_not:V \l__xdu_colspec_loa_tl }, \exp_not:n { - rowhead = \int_compare:nNnTF - { \value { rowcount } } > { 1 } - { \l__xdu_loa_rowhead_tl } { 0 }, - rows = { font = \rmfamily \zihao { -4 } }, - stretch = 0, - rowsep = { 3pt }, - rows = { ht = 14pt } + rowhead = \int_compare:nNnTF + { \value { rowcount } } > { 1 } + { \l__xdu_loa_rowhead_tl } { 0 }, + cells = { + font = \rmfamily \zihao { -4 } + \dim_add:Nn \baselineskip { \l__xdu_losa_add_skip_dim } + }, + abovesep = 0pt, + belowsep = \l__xdu_losa_add_skip_dim } } } @@ -2034,44 +2218,79 @@ \pagestyle { empty } \dim_set:Nn \parindent { 0pt } \dim_set:Nn \baselineskip { 20pt } - \__xdu_add_bookmark:n { \__xdu_lang_switch:nn { 封面 } { Cover } } - \vbox:n { } - \skip_vertical:n { 435pt } - \vbox_to_ht:nn { 120pt } + \bool_if:NF \l__xdu_rm_cover_bool { - \rmfamily \zihao { 2 } \bfseries \centering - \dim_set:Nn \baselineskip { 30pt } - \l__xdu_title_str + \__xdu_add_bookmark:n { \__xdu_lang_switch:nn { 封面 } { Cover } } + \vbox:n { } + \skip_vertical:n { 435pt } + \vbox_to_ht:nn { 120pt } + { + \rmfamily \zihao { 2 } \bfseries \centering + \dim_set:Nn \baselineskip { 30pt } + \l__xdu_title_str + } + \__xdu_cover_author_info: + \cleardoublepage + } + \bool_if:NF \l__xdu_rm_title_page_bool + { + \__xdu_lang_switch:nn + { \__xdu_zh_title_page: \__xdu_en_title_page: } + { \__xdu_en_title_page: \__xdu_zh_title_page: } + } + \bool_if:NF \l__xdu_rm_statement_bool + { + \file_if_exist:nTF { \l__xdu_statement_scan_str } + { + \loadgeometry { nomargin } + \vbox_to_ht:nn { \textheight } + { + \vfil + \centering + \includegraphics + [ width = \textwidth, height = \textheight, keepaspectratio ] + { \l__xdu_statement_scan_str } + \vfil + } + \cleardoublepage + } + { \__xdu_statement: } } - \__xdu_cover_author_info: - \cleardoublepage - \__xdu_lang_switch:nn - { \__xdu_zh_title_page: \__xdu_en_title_page: } - { \__xdu_en_title_page: \__xdu_zh_title_page: } - \__xdu_statement: \__xdu_load_main_geometry: \pagestyle { front } \pagenumbering { Roman } \dim_set:Nn \baselineskip { 20pt } - \__xdu_lang_switch:nn - { \__xdu_zh_abstract_keywords: \__xdu_en_abstract_keywords: } - { \__xdu_en_abstract_keywords: \__xdu_zh_abstract_keywords: } - \__xdu_list_of_figure: - \__xdu_list_of_table: - \__xdu_symbols_list: - \__xdu_abbreviations_list: - \setcounter { tocdepth } { 2 } - \__xdu_n_chapter_head:nn - { \__xdu_lang_switch:nn { 目录 } { Contents } } - { \__xdu_lang_switch:nn { 目 { \quad } 录 } { Contents } } - \@starttoc { toc } - \cleardoublepage - \__xdu_lang_switch:nn { } + \bool_if:NF \l__xdu_rm_abstract_bool + { + \__xdu_lang_switch:nn + { \__xdu_zh_abstract_keywords: \__xdu_en_abstract_keywords: } + { \__xdu_en_abstract_keywords: \__xdu_zh_abstract_keywords: } + } + \bool_if:NF \l__xdu_rm_loft_bool + { + \__xdu_list_of_figure: + \__xdu_list_of_table: + } + \bool_if:NF \l__xdu_rm_losa_bool + { + \__xdu_symbols_list: + \__xdu_abbreviations_list: + } + \bool_if:NF \l__xdu_rm_toc_bool { \setcounter { tocdepth } { 2 } - \__xdu_n_chapter_head:nn { 目录 } { \__xdu_sf_family: 目 { \quad } 录 } - \@starttoc { zh.toc } + \__xdu_n_chapter_head:nn + { \__xdu_lang_switch:nn { 目录 } { Contents } } + { \__xdu_lang_switch:nn { 目 { \quad } 录 } { Contents } } + \@starttoc { toc } \cleardoublepage + \__xdu_lang_switch:nn { } + { + \setcounter { tocdepth } { 2 } + \__xdu_n_chapter_head:nn { 目录 } { \__xdu_sf_family: 目 { \quad } 录 } + \@starttoc { zh.toc } + \cleardoublepage + } } } \renewcommand { \mainmatter } @@ -2104,6 +2323,10 @@ \__xdu_add_zh_toc:nn { subsection } { \numberline { \thesubsection } ##2 } } } + \dim_set:Nn \abovedisplayskip { 12bp } + \dim_set:Nn \belowdisplayskip { 12bp } + \dim_set:Nn \abovedisplayshortskip { 0bp } + \dim_set:Nn \belowdisplayshortskip { 12bp } } \ctex_at_end_preamble:n { @@ -2153,56 +2376,62 @@ \cs_set_eq:NN \section \__xdu_org_section:n \cs_set_eq:NN \subsection \__xdu_org_subsection:n } - \cs_set:Npn \bibname { \__xdu_lang_switch:nn { 参考文献 } { Bibliography } } - \__xdu_n_chapter_head_toc:n { \bibname } - \__xdu_lang_switch:nn { } { \__xdu_add_zh_toc:nn { chapter } { 参考文献 } } + \bool_if:NF \l__xdu_rm_ref_bool + { + \cs_set:Npn \bibname { \__xdu_lang_switch:nn { 参考文献 } { Bibliography } } + \__xdu_n_chapter_head_toc:n { \bibname } + \__xdu_lang_switch:nn { } { \__xdu_add_zh_toc:nn { chapter } { 参考文献 } } + } \group_begin: \tl_if_eq:NnTF \l__xdu_bib_tool_tl { bibtex } { - \cs_set:Npn \bibsection { } - \rmfamily \zihao { 5 } - \dim_set:Nn \baselineskip { 20pt } - \bibliography { \l__xdu_bib_file_clist } - } - { - \defbibheading { bibliography } [ ] { } - \cs_set:Npn \bibfont + \bool_if:NTF \l__xdu_rm_ref_bool + { \nobibliography { \l__xdu_bib_file_clist } } { - \rmfamily \zihao { 5 } - \dim_set:Nn \baselineskip { 20pt } + \dim_set:Nn \labelsep { 1ex } + \bibliography { \l__xdu_bib_file_clist } } - \printbibliography } - \group_end: - \__xdu_n_chapter_head_toc:nn - { \__xdu_lang_switch:nn { 致谢 } { Acknowledgements } } - { \__xdu_lang_switch:nn { 致 { \quad } 谢 } { Acknowledgements } } - \__xdu_lang_switch:nn { } { \__xdu_add_zh_toc:nn { chapter } { 致谢 } } - \group_begin: - \dim_set:Nn \parindent { 2 \ccwd } - \rmfamily \zihao { -4 } - \dim_set:Nn \baselineskip { 20pt } - \file_if_exist_input:n { \l__xdu_ack_tl } - \group_end: - \__xdu_n_chapter_head_toc:n - { \__xdu_lang_switch:nn { 作者简介 } { Author~Biography } } - \__xdu_lang_switch:nn { } { \__xdu_add_zh_toc:nn { chapter } { 作者简介 } } - \group_begin: - \dim_set:Nn \parindent { 2 \ccwd } - \rmfamily \zihao { -4 } - \dim_set:Nn \baselineskip { 20pt } - \ctexset { - section / number = { \arabic { section } . }, - section / format = { \rmfamily \zihao { -3 } \bfseries \raggedright }, - subsection / number = { \arabic { section } . \arabic { subsection } }, - subsection / format = { \rmfamily \zihao { 4 } \bfseries \raggedright }, - subsection / indent = { \l__xdu_bio_indent_dim } + \bool_if:NF \l__xdu_rm_ref_bool + { \printbibliography } } - \setcounter { section } { 0 } - \addtocontents { toc } { \setcounter { tocdepth } { 0 } } - \file_if_exist_input:n { \l__xdu_bio_str } \group_end: + \bool_if:NF \l__xdu_rm_ack_bool + { + \__xdu_n_chapter_head_toc:nn + { \__xdu_lang_switch:nn { 致谢 } { Acknowledgements } } + { \__xdu_lang_switch:nn { 致 { \quad } 谢 } { Acknowledgements } } + \__xdu_lang_switch:nn { } { \__xdu_add_zh_toc:nn { chapter } { 致谢 } } + \group_begin: + \dim_set:Nn \parindent { 2 \ccwd } + \rmfamily \zihao { -4 } + \dim_set:Nn \baselineskip { 20pt } + \file_if_exist_input:n { \l__xdu_ack_tl } + \group_end: + } + \bool_if:NF \l__xdu_rm_bio_bool + { + \__xdu_n_chapter_head_toc:n + { \__xdu_lang_switch:nn { 作者简介 } { Author~Biography } } + \__xdu_lang_switch:nn { } { \__xdu_add_zh_toc:nn { chapter } { 作者简介 } } + \group_begin: + \dim_set:Nn \parindent { 2 \ccwd } + \rmfamily \zihao { -4 } + \dim_set:Nn \baselineskip { 20pt } + \ctexset + { + section / number = { \arabic { section } . }, + section / format = { \rmfamily \zihao { -3 } \bfseries \raggedright }, + subsection / number = { \arabic { section } . \arabic { subsection } }, + subsection / format = { \rmfamily \zihao { 4 } \bfseries \raggedright }, + subsection / indent = { \l__xdu_bio_indent_dim } + } + \setcounter { section } { 0 } + \addtocontents { toc } { \setcounter { tocdepth } { 0 } } + \file_if_exist_input:n { \l__xdu_bio_str } + \group_end: + } } %% %% diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls index f4b9664ab22..37f26c0881e 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xduugthesis} - {2022/06/21}{2.0.0.0} + {2022/06/28}{2.10.3.0} {Xidian University Undergraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -535,6 +535,7 @@ \tl_new:N \l__xdu_ref_add_space \tl_new:N \l__xdu_cap_label_sep_tl \bool_new:N \l__xdu_tab_small_bool +\bool_new:N \l__xdu_alg_small_cap_bool \bool_new:N \l__xdu_alg_small_bool \clist_new:N \l__xdu_before_skip_clist \clist_new:N \l__xdu_after_skip_clist @@ -557,6 +558,7 @@ ref-add-space .bool_set:N = \l__xdu_ref_add_space, caption-label-sep .tl_set:N = \l__xdu_cap_label_sep_tl, table-small-font .bool_set:N = \l__xdu_tab_small_bool, + algorithm-small-caption .bool_set:N = \l__xdu_alg_small_cap_bool, algorithm-small-font .bool_set:N = \l__xdu_alg_small_bool, before-skip .clist_set:N = \l__xdu_before_skip_clist, after-skip .clist_set:N = \l__xdu_after_skip_clist, @@ -571,18 +573,19 @@ } \keys_set:nn { xdu } { - style / en-cjk-font = false, - style / language = zh, - style / bib-backend = biblatex, - style / biblatex-option = { }, - style / ref-add-space = false, - style / caption-label-sep = { 0.75em }, - style / table-small-font = true, - style / algorithm-small-font = true, - style / before-skip = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt }, - style / after-skip = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt }, - style / symmetric-margin = false, - style / page-vertical-align = { 顶部对齐 } + style / en-cjk-font = false, + style / language = zh, + style / bib-backend = biblatex, + style / biblatex-option = { }, + style / ref-add-space = false, + style / caption-label-sep = { 0.75em }, + style / table-small-font = true, + style / algorithm-small-caption = true, + style / algorithm-small-font = true, + style / before-skip = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt }, + style / after-skip = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt }, + style / symmetric-margin = false, + style / page-vertical-align = { 顶部对齐 } } \NewDocumentCommand \xdusetup { m } { \keys_set:nn { xdu } { #1 } } @@ -999,7 +1002,14 @@ } \RequirePackage { caption } \DeclareCaptionLabelSeparator { customskip } { \hskip \l__xdu_cap_label_sep_tl } -\DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } } +\DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } } +\DeclareCaptionFont { algcustomfont } + { + \__xdu_rm_family: + \bool_if:NTF \l__xdu_alg_small_cap_bool + { \zihao { 5 } } + { \zihao { -4 } } + } \captionsetup { labelsep = customskip, @@ -1008,16 +1018,23 @@ \captionsetup [ algorithm ] { labelsep = customskip, - labelfont = customfont, - font = customfont + labelfont = algcustomfont, + font = algcustomfont } \ctex_at_end_preamble:n { \cs_if_exist:NT \thealgocf { \SetAlgoCaptionSeparator { \hbox_to_wd:nn { \l__xdu_cap_label_sep_tl } { } } - \SetAlCapNameFnt { \__xdu_rm_family: \zihao { 5 } } - \SetAlCapFnt { \__xdu_rm_family: \zihao { 5 } } + \bool_if:NTF \l__xdu_alg_small_cap_bool + { + \SetAlCapNameFnt { \__xdu_rm_family: \zihao { 5 } } + \SetAlCapFnt { \__xdu_rm_family: \zihao { 5 } } + } + { + \SetAlCapNameFnt { \__xdu_rm_family: \zihao { -4 } } + \SetAlCapFnt { \__xdu_rm_family: \zihao { -4 } } + } \SetAlCapSty { } } } @@ -1135,6 +1152,9 @@ { \RequirePackage { gbt7714 } \bibliographystyle { gbt7714-numerical } + \cs_set:Npn \@biblabel #1 { \hfill [ #1 ] } + \cs_set:Npn \bibsection { } + \dim_set:Nn \bibsep { 0pt } \NewDocumentCommand \parencite { m } { \group_begin: \citestyle { numbers } \cite { #1 } \group_end: } } @@ -1142,6 +1162,20 @@ \PassOptionsToPackage { \l__xdu_biblatex_option_tl } { biblatex } \RequirePackage { biblatex } \clist_map_inline:Nn \l__xdu_bib_file_clist { \addbibresource { #1 } } + \defbibheading { bibliography } [ ] { } + \dim_set:Nn \biblabelsep { 1ex } + \dim_set:Nn \bibitemsep { 0pt } + \cs_set_eq:NN \SlashFont \rmfamily + } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_rm_ref_bool + { \RequirePackage { bibentry } } + } + \cs_set:Npn \bibfont + { + \__xdu_rm_family: + \zihao { 5 } } } \RequirePackage { environ } @@ -1345,15 +1379,10 @@ \group_begin: \tl_if_eq:NnTF \l__xdu_bib_tool_tl { bibtex } { - \cs_set:Npn \bibsection { } - \__xdu_rm_family: \zihao { 5 } + \dim_set:Nn \labelsep { 1ex } \bibliography { \l__xdu_bib_file_clist } } - { - \defbibheading { bibliography } [ ] { } - \cs_set:Npn \bibfont { \__xdu_rm_family: \zihao { 5 } } - \printbibliography - } + { \printbibliography } \group_end: } %% -- cgit v1.2.3