diff options
author | Karl Berry <karl@freefriends.org> | 2022-05-08 20:25:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-05-08 20:25:41 +0000 |
commit | 6fd01e0e4194d0b6c992167beeaf13f858f295a4 (patch) | |
tree | 3be8f6ca7ca196e485ef81647725d762a8d98bd6 /Master/texmf-dist/tex | |
parent | 867593c0625cb9ab8cc42f998dabc55a9724cdf2 (diff) |
xduts (8may22)
git-svn-id: svn://tug.org/texlive/trunk@63264 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xduts/xdufont.sty | 15 | ||||
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xduts/xdulogo.pdf (renamed from Master/texmf-dist/tex/xelatex/xduts/xidian-logo.pdf) | bin | 463660 -> 881135 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls | 278 | ||||
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls | 121 | ||||
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xduts/xidian-text.pdf | bin | 416455 -> 0 bytes |
5 files changed, 364 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty index 935e2dfcd35..6c799297fdd 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty +++ b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty @@ -23,12 +23,12 @@ %% This work consists of the files README.md, xduts.dtx, and xduts.ins %% and the derived files xduts.pdf, xdufont.sty, xdupgthesis.cls, and xduugthesis.cls. %% -%% The copyright of xidian-text.pdf and xidian-logo.pdf is Xidian University. +%% The copyright of xdulogo.pdf is Xidian University. %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{xdufont} - {2022/05/03}{1.8.1.0} + {2022/05/08}{1.13.2.0} {Xidian University Font package} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -48,7 +48,7 @@ { \tl_set_eq:NN \l__xdu_cjk_font_tl \l_keys_choice_tl }, cjk-fake-bold .tl_set:N = \l__xdu_fake_bold_tl, cjk-fake-slant .tl_set:N = \l__xdu_fake_slant_tl, - latin-font .choices:nn = { tacn, thcs, gyre, none } + latin-font .choices:nn = { tac, tacn, thcs, gyre, none } { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { @@ -325,6 +325,15 @@ \__xdu_set_latin_font:nnn { #2 } { #3 } { #4 } ] } +\cs_new:Npn \__xdu_load_latin_font_tac: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } { times.ttf } { timesbd.ttf } { timesi.ttf } { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnnn + { Arial } { arial.ttf } { arialbd.ttf } { ariali.ttf } { arialbi.ttf } + \__xdu_set_latin_mono_font:nnnnn + { Consolas } { consola.ttf } { consolab.ttf } { consolai.ttf } { consolaz.ttf } + } \cs_new:Npn \__xdu_load_latin_font_tacn: { \__xdu_set_latin_main_font:nnnnn diff --git a/Master/texmf-dist/tex/xelatex/xduts/xidian-logo.pdf b/Master/texmf-dist/tex/xelatex/xduts/xdulogo.pdf Binary files differindex 1f676b4fafc..6302258794e 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xidian-logo.pdf +++ b/Master/texmf-dist/tex/xelatex/xduts/xdulogo.pdf diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls index 6cedf7dabd0..c62cf50c5c9 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls @@ -23,12 +23,12 @@ %% This work consists of the files README.md, xduts.dtx, and xduts.ins %% and the derived files xduts.pdf, xdufont.sty, xdupgthesis.cls, and xduugthesis.cls. %% -%% The copyright of xidian-text.pdf and xidian-logo.pdf is Xidian University. +%% The copyright of xdulogo.pdf is Xidian University. %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xdupgthesis} - {2022/05/03}{1.8.1.0} + {2022/05/08}{1.13.2.0} {Xidian University Postgraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -37,7 +37,6 @@ a4paper, zihao=-4, sub4section, - linespread = 1.5, fontset = none } { ctexbook } @@ -62,7 +61,7 @@ { \tl_set_eq:NN \l__xdu_cjk_font_tl \l_keys_choice_tl }, cjk-fake-bold .tl_set:N = \l__xdu_fake_bold_tl, cjk-fake-slant .tl_set:N = \l__xdu_fake_slant_tl, - latin-font .choices:nn = { tacn, thcs, gyre, none } + latin-font .choices:nn = { tac, tacn, thcs, gyre, none } { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { @@ -339,6 +338,15 @@ \__xdu_set_latin_font:nnn { #2 } { #3 } { #4 } ] } +\cs_new:Npn \__xdu_load_latin_font_tac: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } { times.ttf } { timesbd.ttf } { timesi.ttf } { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnnn + { Arial } { arial.ttf } { arialbd.ttf } { ariali.ttf } { arialbi.ttf } + \__xdu_set_latin_mono_font:nnnnn + { Consolas } { consola.ttf } { consolab.ttf } { consolai.ttf } { consolaz.ttf } + } \cs_new:Npn \__xdu_load_latin_font_tacn: { \__xdu_set_latin_main_font:nnnnn @@ -492,14 +500,67 @@ info / acknowledgements = { } } \tl_new:N \l__xdu_gr_type_tl +\tl_new:N \l__xdu_degree_type_tl +\str_new:N \l__xdu_degree_str +\str_new:N \l__xdu_degree_en_str +\str_new:N \l__xdu_author_en_str +\str_new:N \l__xdu_supv_en_str +\str_new:N \l__xdu_supv_ent_en_str +\str_new:N \l__xdu_supv_t_str +\str_new:N \l__xdu_supv_t_en_str +\str_new:N \l__xdu_supv_ent_t_str +\str_new:N \l__xdu_supv_ent_t_en_str +\str_new:N \l__xdu_title_en_str +\str_new:N \l__xdu_major_en_str +\str_new:N \l__xdu_sub_major_str +\str_new:N \l__xdu_domain_str +\str_new:N \l__xdu_clc_str +\str_new:N \l__xdu_secret_lv_str +\str_new:N \l__xdu_submit_date_str \keys_define:nn { xdu / info } { - graduate-type .choices:nn = { master, doctor } - { \tl_set_eq:NN \l__xdu_gr_type_tl \l_keys_choice_tl } + graduate-type .choices:nn = { 硕士, 博士 } + { \tl_set_eq:NN \l__xdu_gr_type_tl \l_keys_choice_tl }, + degree-type .choices:nn = { 学术, 专业 } + { \tl_set_eq:NN \l__xdu_degree_type_tl \l_keys_choice_tl }, + degree .tl_set:N = \l__xdu_degree_str, + degree* .tl_set:N = \l__xdu_degree_en_str, + author* .tl_set:N = \l__xdu_author_en_str, + supervisor* .tl_set:N = \l__xdu_supv_en_str, + supervisor-enterprise* .tl_set:N = \l__xdu_supv_ent_en_str, + supervisor-title .tl_set:N = \l__xdu_supv_t_str, + supervisor-title* .tl_set:N = \l__xdu_supv_t_en_str, + supervisor-enterprise-title .tl_set:N = \l__xdu_supv_ent_t_str, + supervisor-enterprise-title* .tl_set:N = \l__xdu_supv_ent_t_en_str, + title* .tl_set:N = \l__xdu_title_en_str, + major* .tl_set:N = \l__xdu_major_en_str, + sub-major .tl_set:N = \l__xdu_sub_major_str, + domain .tl_set:N = \l__xdu_domain_str, + clc .tl_set:N = \l__xdu_clc_str, + secret-level .choices:nn = { 秘密, 公开 } + { \tl_set_eq:NN \l__xdu_secret_lv_str \l_keys_choice_tl }, + submit-date .tl_set:N = \l__xdu_submit_date_str } \keys_set:nn { xdu } { - info / graduate-type = { master }, + info / graduate-type = { 硕士 }, + info / degree-type = { 学术 }, + info / degree = { }, + info / degree* = { }, + info / author* = { }, + info / supervisor* = { }, + info / supervisor-enterprise* = { }, + info / supervisor-title = { }, + info / supervisor-title* = { }, + info / supervisor-enterprise-title = { }, + info / supervisor-enterprise-title* = { }, + info / title* = { }, + info / major* = { }, + info / sub-major = { }, + info / domain = { }, + info / clc = { }, + info / secret-level = { 公开 }, + info / submit-date = { } } \bool_new:N \l__xdu_en_cjk_font_bool \tl_new:N \l__xdu_lang_tl @@ -518,6 +579,7 @@ \tl_new:N \l__xdu_para_tl \tl_new:N \l__xdu_subpara_tl \bool_new:N \l__xdu_sym_mgn_bool +\tl_new:N \l__xdu_page_v_align_tl \keys_define:nn { xdu / style } { en-cjk-font .bool_set:N = \l__xdu_en_cjk_font_bool, @@ -538,7 +600,8 @@ subsubsec-zihao .tl_set:N = \l__xdu_subsubsec_tl, para-zihao .tl_set:N = \l__xdu_para_tl, subpara-zihao .tl_set:N = \l__xdu_subpara_tl, - symmetric-margin .bool_set:N = \l__xdu_sym_mgn_bool + symmetric-margin .bool_set:N = \l__xdu_sym_mgn_bool, + page-vertical-align .tl_set:N = \l__xdu_page_v_align_tl } \keys_set:nn { xdu } { @@ -552,7 +615,8 @@ 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 / symmetric-margin = false, + style / page-vertical-align = {顶部对齐} } \NewDocumentCommand \xdusetup { m } { \keys_set:nn { xdu } { #1 } } @@ -567,12 +631,12 @@ { \__xdu_lang_switch:nn { - \tl_if_eq:NnTF \l__xdu_gr_type_tl { master } + \tl_if_eq:NnTF \l__xdu_gr_type_tl { 硕士 } { \str_set:Nn \l__xdu_header_str { 西安电子科技大学硕士学位论文 } } { \str_set:Nn \l__xdu_header_str { 西安电子科技大学博士学位论文 } } } { - \tl_if_eq:NnTF \l__xdu_gr_type_tl { master } + \tl_if_eq:NnTF \l__xdu_gr_type_tl { 硕士 } { \str_set:Nn \l__xdu_header_str { Master~Thesis~of~XIDIAN~UNIVERSITY } @@ -757,6 +821,198 @@ \fancyfoot [ CE ] { \rmfamily \zihao { -5 } \thepage } \fancyfoot [ CO ] { \rmfamily \zihao { -5 } \thepage } } +\ctex_at_end_preamble:n + { + \tl_if_eq:NnTF \l__xdu_page_v_align_tl { 顶部对齐 } + { \raggedbottom } + { \flushbottom } + } +\renewcommand { \theequation } { \thechapter - \arabic { equation } } +\ctex_at_end_preamble:n + { + \clist_map_inline:nn + { + { \algorithmname }, + { \ALG@name }, + { \algorithmcfname } + } + { \cs_set:Npn #1 { \__xdu_lang_switch:nn { 算法 } { Algorithm } } } + } +\PassOptionsToPackage { chapter } { algorithm } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { algorithm } + { + \cs_if_exist:NT \thealgorithm + { + \floatplacement { algorithm } { tbp } + \cs_set:Npn \thealgorithm { \thechapter . \arabic { algorithm } } + \bool_if:NT \l__xdu_alg_small_bool + { + \renewenvironment { algorithm } + { + \@nameuse { fst@algorithm } + \@float@setevery { algorithm } + \ctex_gadd_ltxhook:nn + { cmd/@floatboxreset/after } + { \zihao { 5 } } + \@float { algorithm } + } + { \float@end } + } + } + } + { } + } +\PassOptionsToPackage { algochapter } { algorithm2e } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { algorithm2e } + { + \cs_if_exist:NT \thealgocf + { + \cs_set:Npn \thealgocf { \thechapter . \arabic { algocf } } + \renewenvironment { \algocf@envname } [ 1 ] [ tbp ] + { + \setboolean { algocf@algostar } { false } + \setboolean { algocf@procenvironment } { false } + \gdef \algocfautorefname { \algorithmautorefname } + \begin { algocf@algorithm } [ #1 ] \ignorespaces + } + { \end { algocf@algorithm } \ignorespacesafterend } + \bool_if:NT \l__xdu_alg_small_bool + { \SetAlFnt { \zihao { 5 } } } + } + } + { } + } +\RequirePackage { caption } +\DeclareCaptionLabelSeparator { customskip } { \hskip \l__xdu_cap_label_sep_tl } +\DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } } +\captionsetup + { + labelsep = customskip, + font = customfont + } +\captionsetup [ algorithm ] + { + labelsep = customskip, + labelfont = customfont, + font = customfont + } +\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 } } + \SetAlCapSty { } + } + } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { tabularray } + { + \SetTblrStyle { head } { font = \__xdu_rm_family: \zihao { 5 } } + \DefTblrTemplate { caption-sep } { default } + { \hskip \l__xdu_cap_label_sep_tl } + } + { } + } +\PassOptionsToPackage { font = small } { subfig } +\captionsetup [ sub ] { font = customfont } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_tab_small_bool + { + \renewenvironment { table } + { \def\@floatboxreset { \reset@font\small\@setminipage } \@float { table } } + { \end@float } + } + } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { longtable } + { + \bool_if:NT \l__xdu_tab_small_bool + { + \ctex_gadd_ltxhook:nn + { env/longtable/begin } + { \small } + } + } + { } + } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { tabularray } + { + \bool_if:NT \l__xdu_tab_small_bool + { + \ctex_gadd_ltxhook:nn + { env/tblr/begin } + { \small } + \ctex_gadd_ltxhook:nn + { env/longtblr/begin } + { \small } + } + } + { } + } +\RequirePackage{ hyperref } +\hypersetup + { + bookmarksnumbered, + hidelinks + } +\ctex_at_end_preamble:n + { + \hypersetup + { + pdftitle = \l__xdu_pure_title_str, + pdfsubject = \l__xdu_header_str, + pdfcreator = { XeLaTeX~with~xdupgthesis~class~in~XDUTS }, + pdfauthor = \l__xdu_author_str + } + } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_ref_add_space + { + \str_if_eq:NNT { \l__xdu_lang_tl } { zh } + { + \RequirePackage { xspace } + \xspaceaddexceptions { 。?!,、;:“”‘’—….--~·《》<>_ } + \cs_generate_variant:Nn \str_if_in:nnTF { xnTF } + \ctex_after_end_preamble:n + { + \cs_set_eq:NN \__xdu_trad_ref:n \ref + \cs_set:Npn \ref #1 + { + \str_if_in:xnTF { \__hyp_get_anchor:n { #1 } } { chapter } + { \__xdu_trad_ref:n { #1 } } + { \xspace \__xdu_trad_ref:n { #1 } \xspace } + } + } + } + } + } +\cs_new_protected:Npn \__xdu_begin_document:n #1 + { \ctex_gadd_ltxhook:nn { env/document/begin } { #1 } } +\__xdu_begin_document:n + { + \tl_if_eq:NnTF \l__xdu_bib_tool_tl { bibtex } + { + \RequirePackage [ sort&compress,square,super,comma,numbers ] { natbib } + \RequirePackage { gbt7714 } + \bibliographystyle { gbt7714-numerical } + } + { + \RequirePackage [ style = gb7714-2015 ] { biblatex } + \clist_map_inline:Nn \l__xdu_bib_file_clist { \addbibresource { #1 } } + } + } \renewcommand { \frontmatter } { \loadgeometry { cover } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls index 11dfd6d8691..5d4b275af06 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls @@ -23,12 +23,12 @@ %% This work consists of the files README.md, xduts.dtx, and xduts.ins %% and the derived files xduts.pdf, xdufont.sty, xdupgthesis.cls, and xduugthesis.cls. %% -%% The copyright of xidian-text.pdf and xidian-logo.pdf is Xidian University. +%% The copyright of xdulogo.pdf is Xidian University. %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xduugthesis} - {2022/05/03}{1.8.1.0} + {2022/05/08}{1.13.2.0} {Xidian University Undergraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -37,7 +37,7 @@ a4paper, zihao=-4, sub4section, - linespread = 1.5, + linespread = 1.625, fontset = none } { ctexbook } @@ -62,7 +62,7 @@ { \tl_set_eq:NN \l__xdu_cjk_font_tl \l_keys_choice_tl }, cjk-fake-bold .tl_set:N = \l__xdu_fake_bold_tl, cjk-fake-slant .tl_set:N = \l__xdu_fake_slant_tl, - latin-font .choices:nn = { tacn, thcs, gyre, none } + latin-font .choices:nn = { tac, tacn, thcs, gyre, none } { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { @@ -339,6 +339,15 @@ \__xdu_set_latin_font:nnn { #2 } { #3 } { #4 } ] } +\cs_new:Npn \__xdu_load_latin_font_tac: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } { times.ttf } { timesbd.ttf } { timesi.ttf } { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnnn + { Arial } { arial.ttf } { arialbd.ttf } { ariali.ttf } { arialbi.ttf } + \__xdu_set_latin_mono_font:nnnnn + { Consolas } { consola.ttf } { consolab.ttf } { consolai.ttf } { consolaz.ttf } + } \cs_new:Npn \__xdu_load_latin_font_tacn: { \__xdu_set_latin_main_font:nnnnn @@ -523,6 +532,7 @@ \tl_new:N \l__xdu_para_tl \tl_new:N \l__xdu_subpara_tl \bool_new:N \l__xdu_sym_mgn_bool +\tl_new:N \l__xdu_page_v_align_tl \keys_define:nn { xdu / style } { en-cjk-font .bool_set:N = \l__xdu_en_cjk_font_bool, @@ -543,7 +553,8 @@ subsubsec-zihao .tl_set:N = \l__xdu_subsubsec_tl, para-zihao .tl_set:N = \l__xdu_para_tl, subpara-zihao .tl_set:N = \l__xdu_subpara_tl, - symmetric-margin .bool_set:N = \l__xdu_sym_mgn_bool + symmetric-margin .bool_set:N = \l__xdu_sym_mgn_bool, + page-vertical-align .tl_set:N = \l__xdu_page_v_align_tl } \keys_set:nn { xdu } { @@ -557,7 +568,8 @@ 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 / symmetric-margin = false, + style / page-vertical-align = {顶部对齐} } \NewDocumentCommand \xdusetup { m } { \keys_set:nn { xdu } { #1 } } @@ -728,6 +740,12 @@ \fancyhead [ RO ] { \__xdu_rm_family: \zihao { -5 } \thepage } \renewcommand { \headrulewidth } { 0.75pt } } +\ctex_at_end_preamble:n + { + \tl_if_eq:NnTF \l__xdu_page_v_align_tl { 顶部对齐 } + { \raggedbottom } + { \flushbottom } + } \ctexset { secnumdepth=5 } \ctexset { @@ -845,23 +863,14 @@ subparagraph / afterskip = { \clist_item:Nn \l__xdu_after_skip_clist { 6 } } } \RequirePackage [ titles ] { tocloft } -\renewcommand { \cftchapleader } { \bfseries \cftdotfill { \cftdotsep } } +\cs_set:Npn \cftchapleader { \bfseries \cftdotfill { \cftdotsep } } +\dim_set_eq:NN \cftbeforechapskip \cftbeforesecskip \clist_map_inline:nn { - \cftbeforechapskip, - \cftbeforesecskip, - \cftbeforesubsecskip, - \cftbeforesubsubsecskip, - \cftbeforeparaskip, - \cftbeforesubparaskip + \cftchapfont, + \cftchappagefont } - { \dim_set:Nn { #1 } { 5pt } } - \clist_map_inline:nn - { - \cftchapfont, - \cftchappagefont - } - { \renewcommand { #1 } { \__xdu_rm_family: \zihao { -4 } \bfseries } } + { \renewcommand { #1 } { \__xdu_rm_family: \zihao { -4 } \bfseries } } \clist_map_inline:nn { \cftsecfont, @@ -959,6 +968,16 @@ \SetAlCapSty { } } } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { tabularray } + { + \SetTblrStyle { head } { font = \__xdu_rm_family: \zihao { 5 } } + \DefTblrTemplate { caption-sep } { default } + { \hskip \l__xdu_cap_label_sep_tl } + } + { } + } \PassOptionsToPackage { font = small } { subfig } \captionsetup [ sub ] { font = customfont } \ctex_at_end_preamble:n @@ -983,7 +1002,23 @@ } { } } -\RequirePackage{hyperref} +\ctex_at_end_preamble:n + { + \@ifpackageloaded { tabularray } + { + \bool_if:NT \l__xdu_tab_small_bool + { + \ctex_gadd_ltxhook:nn + { env/tblr/begin } + { \small } + \ctex_gadd_ltxhook:nn + { env/longtblr/begin } + { \small } + } + } + { } + } +\RequirePackage{ hyperref } \hypersetup { bookmarksnumbered, @@ -994,7 +1029,8 @@ \hypersetup { pdftitle = \l__xdu_pure_title_str, - pdfsubject = {西安电子科技大学本科毕业设计论文}, + pdfsubject = { 西安电子科技大学本科毕业设计论文 }, + pdfcreator = { XeLaTeX~with~xduugthesis~class~in~XDUTS }, pdfauthor = \l__xdu_author_str } } @@ -1052,14 +1088,14 @@ } \cs_new:Npn \__xdu_cover_i:nn #1#2 { - \vbox_to_ht:nn {12pt} + \vbox_to_ht:nn { 12pt } { \mode_leave_vertical: \hfill \hbox:n { \__xdu_rm_family: \zihao { -4 } \bfseries - \hbox_to_wd:nn { 3em } { #1 } + \hbox_to_wd:nn { 3em } { #1 } \skip_horizontal:n { 1em } \__xdu_uline:n { \hbox_to_wd:nn { 15ex } { \hfil #2 \hfil } } \skip_horizontal:n { 1.5cm } @@ -1068,18 +1104,22 @@ } \cs_new:Npn \__xdu_cover_ii:nnn #1#2#3 { - \vbox_to_ht:nn {#1} + \vbox_to_ht:nn { #1 } { \mode_leave_vertical: \hfil - \file_if_exist:nT { #3 } - { \includegraphics [ height = #2, keepaspectratio ] { #3 } } + \file_if_exist:nT { xdulogo.pdf } + { + \str_if_eq:nnTF { #3 } { text } + { \includegraphics [ page = 1, height = #2 ] { xdulogo.pdf } } + { \includegraphics [ page = 2, height = #2 ] { xdulogo.pdf } } + } \hfil } } \cs_new:Npn \__xdu_cover_iii:nnnnn #1#2#3#4#5 { - \vbox_to_ht:nn {40pt} + \vbox_to_ht:nn { 42.5pt } { \vfill \mode_leave_vertical: @@ -1140,10 +1180,15 @@ \__xdu_cover_i:nn { 班级 } { \l__xdu_class_id_str } \__xdu_cover_i:nn { 学号 } { \l__xdu_student_id_str } \skip_vertical:n { 30pt } - \__xdu_cover_ii:nnn { 65pt } { 35pt } { xidian-text.pdf } - \vbox_to_ht:nn { 75pt } - { \__xdu_sf_family: \zihao { 0 } \centering { 本科毕业设计论文 } } - \__xdu_cover_ii:nnn { 130pt } { 120pt } { xidian-logo.pdf } + \__xdu_cover_ii:nnn { 65pt } { 35pt } { text } + \vbox_to_ht:nn { 90pt } + { + \mode_leave_vertical: + \hfil + \hbox_to_wd:nn { 375pt } { \sffamily \zihao { 0 } 本科毕业设计论文 } + \hfil + } + \__xdu_cover_ii:nnn { 140pt } { 120pt } { icon } \clist_new:N \l__xdu_title_clist \__xdu_split_title:NV \l__xdu_title_clist \l__xdu_title_str \str_set:Nx \l__xdu_title_i_str { \clist_item:Nn \l__xdu_title_clist { 1 } } @@ -1177,7 +1222,7 @@ \cleardoublepage \__xdu_load_main_geometry: \pagestyle { plain } - \pagenumbering { Roman } + \pagenumbering { roman } \__xdu_lang_switch:nn { \__xdu_n_chapter_head:nn { 摘要 } { 摘 { \quad } 要 } } { @@ -1191,12 +1236,15 @@ \rmfamily \zihao { -4 } \file_if_exist_input:n { \l__xdu_abstract_zh_tl } } + \cs_new:Npn \__xdu_keywords_space: { \hspace{ 2em plus 1em minus 1em } } { \sffamily \zihao { -4 } \par - \__xdu_typeout_keywords:nNn { 关键词: } { \l__xdu_keywords_zh_clist } { \qquad } + \__xdu_typeout_keywords:nNn + { 关键词: } { \l__xdu_keywords_zh_clist } { \__xdu_keywords_space: } } \cleardoublepage - \__xdu_n_chapter_head_ii:nn {ABSTRACT} { \rmfamily \zihao { 3 } \bfseries \centering } + \__xdu_n_chapter_head_ii:nn + { ABSTRACT } { \rmfamily \zihao { 3 } \bfseries \centering } { \dim_set:Nn \parindent { 2 \ccwd } \rmfamily \zihao { -4 } @@ -1204,7 +1252,8 @@ } { \rmfamily \zihao { -4 } \bfseries \par - \__xdu_typeout_keywords:nNn { Keywords: } { \l__xdu_keywords_en_clist } { \qquad } + \__xdu_typeout_keywords:nNn + { Keywords: } { \l__xdu_keywords_en_clist } { \__xdu_keywords_space: } } \cleardoublepage \setcounter { tocdepth } { 5 } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xidian-text.pdf b/Master/texmf-dist/tex/xelatex/xduts/xidian-text.pdf Binary files differdeleted file mode 100644 index aca2d6291ad..00000000000 --- a/Master/texmf-dist/tex/xelatex/xduts/xidian-text.pdf +++ /dev/null |