diff options
author | Karl Berry <karl@freefriends.org> | 2023-02-23 21:14:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-02-23 21:14:04 +0000 |
commit | 18e382932b47e0378bd6c8cf442497e75081c7d6 (patch) | |
tree | 624086113818af1bec10f846592c1683b5986486 /Master/texmf-dist/tex | |
parent | af3daade8258fda5c0065d43952c4db91fd1edce (diff) |
xduts (23feb23)
git-svn-id: svn://tug.org/texlive/trunk@66096 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xduts/xdufont.sty | 42 | ||||
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls | 46 | ||||
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls | 46 | ||||
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls | 42 |
4 files changed, 168 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty index afe08f01f71..9cec03a6ba3 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty +++ b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{xdufont} - {2023/02/20}{5.1.0.0} + {2023/02/23}{5.4.0.1} {Xidian University Font package} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -55,7 +55,7 @@ { \tl_set_eq:NN \l__xdu_latin_sans_scale_tl \l_keys_choice_tl }, latin-mono-scale .choices:nn = { upper, lower, off } { \tl_set_eq:NN \l__xdu_latin_mono_scale_tl \l_keys_choice_tl }, - latin-font .choices:nn = { tac, tacn, thcs, gyre, none } + latin-font .choices:nn = { gyre, tac, tacn, tcc, thcs, tll, none } { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { @@ -374,6 +374,25 @@ \__xdu_set_latin_mono_font:nnnnn { Courier~New } { cour.ttf } { courbd.ttf } { couri.ttf } { courbi.ttf } } +\cs_new:Npn \__xdu_load_latin_font_tcc: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } + { times.ttf } + { timesbd.ttf } + { timesi.ttf } + { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnn + { cmunss.otf } + { cmunsx.otf } + { cmunsi.otf } + { cmunso.otf } + \__xdu_set_latin_mono_font:nnnn + { cmuntt.otf } + { cmuntb.otf } + { cmunit.otf } + { cmuntx.otf } + } \cs_new:Npn \__xdu_load_latin_font_thcs: { \__xdu_set_latin_main_font:nnnnn @@ -395,6 +414,25 @@ { CourierStd-Oblique.otf } { CourierStd-BoldOblique.otf } } +\cs_new:Npn \__xdu_load_latin_font_tll: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } + { times.ttf } + { timesbd.ttf } + { timesi.ttf } + { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnn + { LinBiolinum_R.otf } + { LinBiolinum_RB.otf } + { LinBiolinum_RI.otf } + { LinBiolinum_RBO.otf } + \__xdu_set_latin_mono_font:nnnn + { LinLibertine_M.otf } + { LinLibertine_MB.otf } + { LinLibertine_MO.otf } + { LinLibertine_MBO.otf } + } \cs_new:Npn \__xdu_load_latin_font_gyre: { \__xdu_set_latin_main_font:nnnn diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls index 5682e9451c9..309a66380fc 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xdupgthesis} - {2023/02/20}{5.1.0.0} + {2023/02/23}{5.4.0.1} {Xidian University Postgraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -68,7 +68,7 @@ { \tl_set_eq:NN \l__xdu_latin_sans_scale_tl \l_keys_choice_tl }, latin-mono-scale .choices:nn = { upper, lower, off } { \tl_set_eq:NN \l__xdu_latin_mono_scale_tl \l_keys_choice_tl }, - latin-font .choices:nn = { tac, tacn, thcs, gyre, none } + latin-font .choices:nn = { gyre, tac, tacn, tcc, thcs, tll, none } { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { @@ -387,6 +387,25 @@ \__xdu_set_latin_mono_font:nnnnn { Courier~New } { cour.ttf } { courbd.ttf } { couri.ttf } { courbi.ttf } } +\cs_new:Npn \__xdu_load_latin_font_tcc: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } + { times.ttf } + { timesbd.ttf } + { timesi.ttf } + { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnn + { cmunss.otf } + { cmunsx.otf } + { cmunsi.otf } + { cmunso.otf } + \__xdu_set_latin_mono_font:nnnn + { cmuntt.otf } + { cmuntb.otf } + { cmunit.otf } + { cmuntx.otf } + } \cs_new:Npn \__xdu_load_latin_font_thcs: { \__xdu_set_latin_main_font:nnnnn @@ -408,6 +427,25 @@ { CourierStd-Oblique.otf } { CourierStd-BoldOblique.otf } } +\cs_new:Npn \__xdu_load_latin_font_tll: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } + { times.ttf } + { timesbd.ttf } + { timesi.ttf } + { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnn + { LinBiolinum_R.otf } + { LinBiolinum_RB.otf } + { LinBiolinum_RI.otf } + { LinBiolinum_RBO.otf } + \__xdu_set_latin_mono_font:nnnn + { LinLibertine_M.otf } + { LinLibertine_MB.otf } + { LinLibertine_MO.otf } + { LinLibertine_MBO.otf } + } \cs_new:Npn \__xdu_load_latin_font_gyre: { \__xdu_set_latin_main_font:nnnn @@ -1351,9 +1389,11 @@ \DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } } \captionsetup { + strut = off, labelsep = customskip, font = customfont } +\dim_set_eq:NN \intextsep \abovecaptionskip \ctex_at_end_preamble:n { \tl_if_eq:NnTF \l__xdu_ft_cap_format_tl { hang } @@ -1508,6 +1548,8 @@ { \@ifpackageloaded { tabularray } { + \SetTblrOuter [ tblr, longtblr, talltblr ] + { presep = \belowcaptionskip + \intextsep, headsep = \abovecaptionskip } \SetTblrStyle { head } { font = \__xdu_rm_family: \zihao { 5 } } \DefTblrTemplate { caption-sep } { default } { \hskip \l__xdu_cap_label_sep_tl } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls index 1c57302738b..2a2e3f36ecc 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xduugthesis} - {2023/02/20}{5.1.0.0} + {2023/02/23}{5.4.0.1} {Xidian University Undergraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -69,7 +69,7 @@ { \tl_set_eq:NN \l__xdu_latin_sans_scale_tl \l_keys_choice_tl }, latin-mono-scale .choices:nn = { upper, lower, off } { \tl_set_eq:NN \l__xdu_latin_mono_scale_tl \l_keys_choice_tl }, - latin-font .choices:nn = { tac, tacn, thcs, gyre, none } + latin-font .choices:nn = { gyre, tac, tacn, tcc, thcs, tll, none } { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { @@ -388,6 +388,25 @@ \__xdu_set_latin_mono_font:nnnnn { Courier~New } { cour.ttf } { courbd.ttf } { couri.ttf } { courbi.ttf } } +\cs_new:Npn \__xdu_load_latin_font_tcc: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } + { times.ttf } + { timesbd.ttf } + { timesi.ttf } + { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnn + { cmunss.otf } + { cmunsx.otf } + { cmunsi.otf } + { cmunso.otf } + \__xdu_set_latin_mono_font:nnnn + { cmuntt.otf } + { cmuntb.otf } + { cmunit.otf } + { cmuntx.otf } + } \cs_new:Npn \__xdu_load_latin_font_thcs: { \__xdu_set_latin_main_font:nnnnn @@ -409,6 +428,25 @@ { CourierStd-Oblique.otf } { CourierStd-BoldOblique.otf } } +\cs_new:Npn \__xdu_load_latin_font_tll: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } + { times.ttf } + { timesbd.ttf } + { timesi.ttf } + { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnn + { LinBiolinum_R.otf } + { LinBiolinum_RB.otf } + { LinBiolinum_RI.otf } + { LinBiolinum_RBO.otf } + \__xdu_set_latin_mono_font:nnnn + { LinLibertine_M.otf } + { LinLibertine_MB.otf } + { LinLibertine_MO.otf } + { LinLibertine_MBO.otf } + } \cs_new:Npn \__xdu_load_latin_font_gyre: { \__xdu_set_latin_main_font:nnnn @@ -1120,9 +1158,11 @@ \DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } } \captionsetup { + strut = off, labelsep = customskip, font = customfont } +\dim_set_eq:NN \intextsep \abovecaptionskip \ctex_at_end_preamble:n { \tl_if_eq:NnTF \l__xdu_ft_cap_format_tl { hang } @@ -1277,6 +1317,8 @@ { \@ifpackageloaded { tabularray } { + \SetTblrOuter [ tblr, longtblr, talltblr ] + { presep = \belowcaptionskip + \intextsep, headsep = \abovecaptionskip } \SetTblrStyle { head } { font = \__xdu_rm_family: \zihao { 5 } } \DefTblrTemplate { caption-sep } { default } { \hskip \l__xdu_cap_label_sep_tl } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls index b891f9d9bfe..1c4f66b7761 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xduugtp} - {2023/02/20}{5.1.0.0} + {2023/02/23}{5.4.0.1} {Xidian University Undergraduate Thesis Proposal class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -65,7 +65,7 @@ { \tl_set_eq:NN \l__xdu_latin_sans_scale_tl \l_keys_choice_tl }, latin-mono-scale .choices:nn = { upper, lower, off } { \tl_set_eq:NN \l__xdu_latin_mono_scale_tl \l_keys_choice_tl }, - latin-font .choices:nn = { tac, tacn, thcs, gyre, none } + latin-font .choices:nn = { gyre, tac, tacn, tcc, thcs, tll, none } { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { @@ -384,6 +384,25 @@ \__xdu_set_latin_mono_font:nnnnn { Courier~New } { cour.ttf } { courbd.ttf } { couri.ttf } { courbi.ttf } } +\cs_new:Npn \__xdu_load_latin_font_tcc: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } + { times.ttf } + { timesbd.ttf } + { timesi.ttf } + { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnn + { cmunss.otf } + { cmunsx.otf } + { cmunsi.otf } + { cmunso.otf } + \__xdu_set_latin_mono_font:nnnn + { cmuntt.otf } + { cmuntb.otf } + { cmunit.otf } + { cmuntx.otf } + } \cs_new:Npn \__xdu_load_latin_font_thcs: { \__xdu_set_latin_main_font:nnnnn @@ -405,6 +424,25 @@ { CourierStd-Oblique.otf } { CourierStd-BoldOblique.otf } } +\cs_new:Npn \__xdu_load_latin_font_tll: + { + \__xdu_set_latin_main_font:nnnnn + { Times~New~Roman } + { times.ttf } + { timesbd.ttf } + { timesi.ttf } + { timesbi.ttf } + \__xdu_set_latin_sans_font:nnnn + { LinBiolinum_R.otf } + { LinBiolinum_RB.otf } + { LinBiolinum_RI.otf } + { LinBiolinum_RBO.otf } + \__xdu_set_latin_mono_font:nnnn + { LinLibertine_M.otf } + { LinLibertine_MB.otf } + { LinLibertine_MO.otf } + { LinLibertine_MBO.otf } + } \cs_new:Npn \__xdu_load_latin_font_gyre: { \__xdu_set_latin_main_font:nnnn |