summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-30 21:12:56 +0000
committerKarl Berry <karl@freefriends.org>2020-08-30 21:12:56 +0000
commitb3ce6bf1f797b134ca88af1975d9bcfa3a71f162 (patch)
tree0176a5f6937204ab34acfd9e0ee7222cd80652e7 /Master/texmf-dist/tex
parent5474b1b43c3b0b1c86af620a938589c42e9cd01e (diff)
fduthesis (30aug20)
git-svn-id: svn://tug.org/texlive/trunk@56216 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/fduthesis/fdudoc.cls16
-rw-r--r--Master/texmf-dist/tex/latex/fduthesis/fdulogo.sty4
-rw-r--r--Master/texmf-dist/tex/latex/fduthesis/fduthesis-en.cls182
-rw-r--r--Master/texmf-dist/tex/latex/fduthesis/fduthesis.cls191
-rw-r--r--Master/texmf-dist/tex/latex/fduthesis/fduthesis.def8
5 files changed, 281 insertions, 120 deletions
diff --git a/Master/texmf-dist/tex/latex/fduthesis/fdudoc.cls b/Master/texmf-dist/tex/latex/fduthesis/fdudoc.cls
index 84a51a436a0..5cd9eaac778 100644
--- a/Master/texmf-dist/tex/latex/fduthesis/fdudoc.cls
+++ b/Master/texmf-dist/tex/latex/fduthesis/fdudoc.cls
@@ -7,7 +7,7 @@
%% fduthesis.dtx (with options: `doc')
%% fduthesis-doc.dtx (with options: `doc')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -46,7 +46,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
{Documentation class for fduthesis}
\ProvidesExplClass{fdudoc}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -853,12 +853,12 @@
\def\indexname{代码索引}
\GlossaryPrologue{\section{\glossaryname}}
\def\glossaryname{修订记录}
-\setmainfont{libertinusserif}[%
+\setmainfont{LibertinusSerif}[%
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic,
Scale = 1.1]
\setsansfont{IBMPlexSansCondensed}[%
Extension = .otf,
@@ -870,7 +870,7 @@
UprightFont = * Light,
BoldFont = * Semibold,
Scale = MatchLowercase]
-\setmathfont{libertinusmath-regular.otf}
+\setmathfont{LibertinusMath-Regular.otf}
\setCJKmainfont{Source Han Serif SC}[%
ItalicFont = FZKai-Z03,
RawFeature = +fwid]
diff --git a/Master/texmf-dist/tex/latex/fduthesis/fdulogo.sty b/Master/texmf-dist/tex/latex/fduthesis/fdulogo.sty
index 3d8d6d1aef9..f0be7068e66 100644
--- a/Master/texmf-dist/tex/latex/fduthesis/fdulogo.sty
+++ b/Master/texmf-dist/tex/latex/fduthesis/fdulogo.sty
@@ -7,7 +7,7 @@
%% fduthesis.dtx (with options: `logo')
%% fduthesis-logo.dtx (with options: `logo')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -46,7 +46,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
{Fudan University's Visual Identity}
\ProvidesExplPackage{fdulogo}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/fduthesis/fduthesis-en.cls b/Master/texmf-dist/tex/latex/fduthesis/fduthesis-en.cls
index c2b6c2b66ff..b42dd5b2517 100644
--- a/Master/texmf-dist/tex/latex/fduthesis/fduthesis-en.cls
+++ b/Master/texmf-dist/tex/latex/fduthesis/fduthesis-en.cls
@@ -6,7 +6,7 @@
%%
%% fduthesis.dtx (with options: `class-en')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -45,7 +45,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
{Thesis template for Fudan University (English version)}
\ProvidesExplClass{\ExplFileName-en}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -251,12 +251,12 @@
headheight = 15 pt
}
\bool_if:NT \g__fdu_draft_bool { \geometry { showframe } }
-\tl_new:N \g__fdu_font_set_tl
+\tl_new:N \g__fdu_fontset_tl
\keys_define:nn { fdu / style }
{
font .choices:nn =
{ garamond, libertinus, lm, palatino, times, times*, none }
- { \tl_set_eq:NN \g__fdu_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g__fdu_fontset_tl \l_keys_choice_tl }
}
\cs_new_protected:Npn \__fdu_setmainfont:nn #1#2
{ \__fontspec_main_setmainfont:nn {#2} {#1} }
@@ -275,6 +275,72 @@
}
}
\clist_map_inline:nn { main, sans, mono, math } { \__fdu_set_font_helper:n {#1} }
+\tl_new:N \g__fdu_font_family_libertinus_serif_tl
+\tl_new:N \g__fdu_font_family_libertinus_sans_tl
+\tl_new:N \g__fdu_font_style_libertinus_rm_tl
+\tl_new:N \g__fdu_font_style_libertinus_bf_tl
+\tl_new:N \g__fdu_font_style_libertinus_it_tl
+\tl_new:N \g__fdu_font_style_libertinus_bfit_tl
+\tl_new:N \g__fdu_font_style_libertinus_bfsl_tl
+\tl_new:N \g__fdu_font_family_xits_tl
+\tl_new:N \g__fdu_font_style_xits_rm_tl
+\tl_new:N \g__fdu_font_style_xits_bf_tl
+\tl_new:N \g__fdu_font_style_xits_it_tl
+\tl_new:N \g__fdu_font_style_xits_bfit_tl
+\tl_new:N \g__fdu_font_name_libertinus_serif_tl
+\tl_new:N \g__fdu_font_name_libertinus_sans_tl
+\tl_new:N \g__fdu_font_name_libertinus_math_tl
+\tl_new:N \g__fdu_font_name_xits_tl
+\tl_new:N \g__fdu_font_name_xits_math_rm_tl
+\tl_new:N \g__fdu_font_name_xits_math_bf_tl
+\fontspec_font_if_exist:nTF { LibertinusSerif-Regular.otf }
+ {
+ \tl_set:Nn \g__fdu_font_family_libertinus_serif_tl { LibertinusSerif }
+ \tl_set:Nn \g__fdu_font_family_libertinus_sans_tl { LibertinusSans }
+ \tl_set:Nn \g__fdu_font_family_libertinus_math_tl { LibertinusMath }
+ \tl_set:Nn \g__fdu_font_style_libertinus_rm_tl { Regular }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bf_tl { Bold }
+ \tl_set:Nn \g__fdu_font_style_libertinus_it_tl { Italic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfit_tl { BoldItalic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfsl_tl { BoldOblique }
+ }
+ {
+ \tl_set:Nn \g__fdu_font_family_libertinus_serif_tl { libertinusserif }
+ \tl_set:Nn \g__fdu_font_family_libertinus_sans_tl { libertinussans }
+ \tl_set:Nn \g__fdu_font_family_libertinus_math_tl { libertinusmath }
+ \tl_set:Nn \g__fdu_font_style_libertinus_rm_tl { regular }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bf_tl { bold }
+ \tl_set:Nn \g__fdu_font_style_libertinus_it_tl { italic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfit_tl { bolditalic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfsl_tl { bolditalic }
+ }
+\fontspec_font_if_exist:nTF { XITS-Regular.otf }
+ {
+ \tl_set:Nn \g__fdu_font_family_xits_tl { XITS }
+ \tl_set:Nn \g__fdu_font_style_xits_rm_tl { Regular }
+ \tl_set:Nn \g__fdu_font_style_xits_bf_tl { Bold }
+ \tl_set:Nn \g__fdu_font_style_xits_it_tl { Italic }
+ \tl_set:Nn \g__fdu_font_style_xits_bfit_tl { BoldItalic }
+ \tl_set:Nn \g__fdu_font_name_xits_math_rm_tl { XITSMath-Regular }
+ \tl_set:Nn \g__fdu_font_name_xits_math_bf_tl { XITSMath-Bold }
+ }
+ {
+ \tl_set:Nn \g__fdu_font_family_xits_tl { xits }
+ \tl_set:Nn \g__fdu_font_style_xits_rm_tl { regular }
+ \tl_set:Nn \g__fdu_font_style_xits_bf_tl { bold }
+ \tl_set:Nn \g__fdu_font_style_xits_it_tl { italic }
+ \tl_set:Nn \g__fdu_font_style_xits_bfit_tl { bolditalic }
+ \tl_set:Nn \g__fdu_font_name_xits_math_rm_tl { xits-math }
+ \tl_set:Nn \g__fdu_font_name_xits_math_bf_tl { xits-mathbold }
+ }
+\tl_set:Nx \g__fdu_font_name_libertinus_serif_tl
+ { \g__fdu_font_family_libertinus_serif_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_libertinus_sans_tl
+ { \g__fdu_font_family_libertinus_sans_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_libertinus_math_tl
+ { \g__fdu_font_family_libertinus_math_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_xits_tl
+ { \g__fdu_font_family_xits_tl - \g__fdu_font_style_xits_rm_tl }
\cs_new_protected:Npn \__fdu_load_font_garamond:
{
\__fdu_setmainfont:nn { EBGaramond }
@@ -285,13 +351,13 @@
ItalicFont = *-Italic,
BoldItalicFont = *-BoldItalic
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl
}
\__fdu_setmonofont:nn { lmmonolt10 }
{
@@ -305,21 +371,21 @@
}
\cs_new_protected:Npn \__fdu_load_font_libertinus:
{
- \__fdu_setmainfont:nn { libertinusserif }
+ \__fdu_setmainfont:nn { \g__fdu_font_family_libertinus_serif_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfit_tl
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl
}
\__fdu_setmonofont:nn { lmmonolt10 }
{
@@ -329,7 +395,7 @@
ItalicFont = *-oblique,
BoldItalicFont = *-boldoblique
}
- \__fdu_setmathfont:nn { libertinusmath-regular.otf } { }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_libertinus_math_tl .otf } { }
}
\cs_new_protected:Npn \__fdu_load_font_lm:
{ \__fdu_setmathfont:nn { latinmodern-math.otf } { } }
@@ -343,13 +409,13 @@
ItalicFont = *-italic,
BoldItalicFont = *-bolditalic
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl,
Scale = MatchUppercase
}
\__fdu_setmonofont:nn { lmmonolt10 }
@@ -364,17 +430,13 @@
}
\cs_new_protected:Npn \__fdu_load_font_times:
{
- \__fdu_setmainfont:nn { XITS }
+ \__fdu_setmainfont:nn { \g__fdu_font_family_xits_tl }
{
Extension = .otf,
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic,
- UprightFeatures = { SmallCapsFont = *-Regular },
- BoldFeatures = { SmallCapsFont = *-Bold },
- ItalicFeatures = { SmallCapsFont = *-Italic },
- BoldItalicFeatures = { SmallCapsFont = *-BoldItalic }
+ UprightFont = *-\g__fdu_font_style_xits_rm_tl,
+ BoldFont = *-\g__fdu_font_style_xits_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_xits_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_xits_bfit_tl
}
\__fdu_setsansfont:nn { texgyreheros }
{
@@ -393,14 +455,16 @@
BoldItalicFont = *-bolditalic,
Ligatures = CommonOff
}
- \__fdu_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g__fdu_font_name_xits_math_bf_tl .otf }
}
\cs_new_protected:cpn { __fdu_load_font_ times* : }
{
\__fdu_setmainfont:nn { Times~ New~ Roman } { }
\__fdu_setsansfont:nn { Arial } { }
\__fdu_setmonofont:nn { Courier~ New } { }
- \__fdu_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g__fdu_font_name_xits_math_bf_tl .otf }
}
\cs_new_protected:Npn \__fdu_load_cjk_font_adobe:
{
@@ -512,7 +576,7 @@
}
\cs_new_protected:Npn \__fdu_load_font:
{
- \use:c { __fdu_load_font_ \g__fdu_font_set_tl : }
+ \use:c { __fdu_load_font_ \g__fdu_fontset_tl : }
}
\ctex_at_end_preamble:n { \__fdu_load_font: }
\keys_set:nn { unicode-math }
@@ -668,8 +732,7 @@
{ \__fdu_symbol:n { \int_eval:n { "24EB - 11 + #1 } } }
{ \__fdu_symbol:n { \int_eval:n { "2776 - 1 + #1 } } }
}
-\cs_new_eq:NN \__fdu_fn_symbol_libertinus_sans:n
- \__fdu_fn_symbol_libertinus:n
+\cs_new_eq:NN \__fdu_fn_symbol_libertinus_sans:n \__fdu_fn_symbol_libertinus:n
\cs_new:Npn \__fdu_fn_symbol_pifont:n #1
{ \ding { \int_eval:n { 171 + #1 } } }
\cs_new:Npn \__fdu_fn_symbol_pifont_neg:n #1
@@ -701,17 +764,17 @@
{ \int_use:N #1 }
\c__fdu_fn_style_libertinus_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_serif_tl .otf }
\__fdu_fn_symbol_libertinus:n {#1}
}
\c__fdu_fn_style_libertinus_neg_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_serif_tl .otf }
\__fdu_fn_symbol_libertinus_neg:n {#1}
}
\c__fdu_fn_style_libertinus_sans_tl
{
- \fontspec { libertinussans-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_sans_tl .otf }
\__fdu_fn_symbol_libertinus_sans:n {#1}
}
\c__fdu_fn_style_pifont_tl
@@ -724,17 +787,17 @@
{ \__fdu_fn_symbol_pifont_sans_neg:n {#1} }
\c__fdu_fn_style_xits_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits:n {#1}
}
\c__fdu_fn_style_xits_sans_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits_sans:n {#1}
}
\c__fdu_fn_style_xits_sans_neg_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits_sans_neg:n {#1}
}
}
@@ -1256,9 +1319,9 @@
authorization-decl-sig / content =
\__fdu_cover_signature:N \c__fdu_auth_decl_sign_clist,
originality-decl-name / format =
- \__fdu_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \__fdu_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
authorization-decl-name / format =
- \__fdu_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \__fdu_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
originality-decl-name / bottom-skip = 0.4 cm,
originality-decl-text / bottom-skip = 0.4 cm,
originality-decl-sig / bottom-skip = 0 pt plus 2.5 fill,
@@ -1288,7 +1351,6 @@
{ \bool_if:NT \l__fdu_auto_make_cover_bool { \makecoveriii } }
\keys_set:nn { ctex }
{
- contentsname = \c__fdu_name_toc_en_tl,
chapter / tocline =
{
\bfseries
@@ -1307,10 +1369,24 @@
\__fdu_patch_cmd:Nnn \tableofcontents
{
\chapter*{\contentsname
- \@mkboth{%
- \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+ \@mkboth{\MakeUppercase\contentsname}
+ {\MakeUppercase\contentsname}}
}
{ \__fdu_chapter_no_toc:V \contentsname }
+\__fdu_patch_cmd:Nnn \listoffigures
+ {
+ \chapter*{\listfigurename}
+ \@mkboth{\MakeUppercase\listfigurename}
+ {\MakeUppercase\listfigurename}
+ }
+ { \__fdu_chapter:V \listfigurename }
+\__fdu_patch_cmd:Nnn \listoftables
+ {
+ \chapter*{\listtablename}
+ \@mkboth{\MakeUppercase\listtablename}
+ {\MakeUppercase\listtablename}
+ }
+ { \__fdu_chapter:V \listtablename }
\__fdu_patch_cmd:Nnn \@starttoc
{ \begingroup }
{
@@ -1424,13 +1500,13 @@
{
\tl_if_eq:VnTF \l__fdu_bib_gb_style_tl { numerical }
{
- \bibliographystyle { gbt7714-unsrt }
+ \bibliographystyle { gbt7714-numerical }
\__fdu_set_cite_style_numerical:
}
{
\tl_if_eq:VnT \l__fdu_bib_gb_style_tl { author-year }
{
- \bibliographystyle { gbt7714-plain }
+ \bibliographystyle { gbt7714-author-year }
\__fdu_set_cite_style_author_year:
\cs_set_eq:NN \cite \citep
}
@@ -1561,6 +1637,8 @@
\hypersetup
{
bookmarksnumbered = true,
+ psdextra = true,
+ unicode = true,
pdftitle = \l__fdu_info_title_en_tl,
pdfauthor = \l__fdu_info_author_en_tl,
pdfkeywords = \l__fdu_info_keywords_en_clist,
diff --git a/Master/texmf-dist/tex/latex/fduthesis/fduthesis.cls b/Master/texmf-dist/tex/latex/fduthesis/fduthesis.cls
index 201d345de8a..6c6cca06149 100644
--- a/Master/texmf-dist/tex/latex/fduthesis/fduthesis.cls
+++ b/Master/texmf-dist/tex/latex/fduthesis/fduthesis.cls
@@ -6,7 +6,7 @@
%%
%% fduthesis.dtx (with options: `class')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -45,7 +45,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
{Thesis template for Fudan University}
\ProvidesExplClass{\ExplFileName}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -251,19 +251,19 @@
headheight = 15 pt
}
\bool_if:NT \g__fdu_draft_bool { \geometry { showframe } }
-\tl_new:N \g__fdu_font_set_tl
-\tl_new:N \g__fdu_cjk_font_set_tl
+\tl_new:N \g__fdu_fontset_tl
+\tl_new:N \g__fdu_cjk_fontset_tl
\keys_define:nn { fdu / style }
{
font .choices:nn =
{ garamond, libertinus, lm, palatino, times, times*, none }
- { \tl_set_eq:NN \g__fdu_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g__fdu_fontset_tl \l_keys_choice_tl }
}
\keys_define:nn { fdu / style }
{
cjk-font .choices:nn =
{ adobe, fandol, founder, mac, sinotype, sourcehan, windows, none }
- { \tl_set_eq:NN \g__fdu_cjk_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g__fdu_cjk_fontset_tl \l_keys_choice_tl }
}
\cs_new_protected:Npn \__fdu_setmainfont:nn #1#2
{ \__fontspec_main_setmainfont:nn {#2} {#1} }
@@ -312,6 +312,72 @@
}
\clist_map_inline:nn { main, sans, mono, math } { \__fdu_set_font_helper:n {#1} }
\clist_map_inline:nn { CJKmain, CJKsans, CJKmono } { \__fdu_set_font_helper:n {#1} }
+\tl_new:N \g__fdu_font_family_libertinus_serif_tl
+\tl_new:N \g__fdu_font_family_libertinus_sans_tl
+\tl_new:N \g__fdu_font_style_libertinus_rm_tl
+\tl_new:N \g__fdu_font_style_libertinus_bf_tl
+\tl_new:N \g__fdu_font_style_libertinus_it_tl
+\tl_new:N \g__fdu_font_style_libertinus_bfit_tl
+\tl_new:N \g__fdu_font_style_libertinus_bfsl_tl
+\tl_new:N \g__fdu_font_family_xits_tl
+\tl_new:N \g__fdu_font_style_xits_rm_tl
+\tl_new:N \g__fdu_font_style_xits_bf_tl
+\tl_new:N \g__fdu_font_style_xits_it_tl
+\tl_new:N \g__fdu_font_style_xits_bfit_tl
+\tl_new:N \g__fdu_font_name_libertinus_serif_tl
+\tl_new:N \g__fdu_font_name_libertinus_sans_tl
+\tl_new:N \g__fdu_font_name_libertinus_math_tl
+\tl_new:N \g__fdu_font_name_xits_tl
+\tl_new:N \g__fdu_font_name_xits_math_rm_tl
+\tl_new:N \g__fdu_font_name_xits_math_bf_tl
+\fontspec_font_if_exist:nTF { LibertinusSerif-Regular.otf }
+ {
+ \tl_set:Nn \g__fdu_font_family_libertinus_serif_tl { LibertinusSerif }
+ \tl_set:Nn \g__fdu_font_family_libertinus_sans_tl { LibertinusSans }
+ \tl_set:Nn \g__fdu_font_family_libertinus_math_tl { LibertinusMath }
+ \tl_set:Nn \g__fdu_font_style_libertinus_rm_tl { Regular }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bf_tl { Bold }
+ \tl_set:Nn \g__fdu_font_style_libertinus_it_tl { Italic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfit_tl { BoldItalic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfsl_tl { BoldOblique }
+ }
+ {
+ \tl_set:Nn \g__fdu_font_family_libertinus_serif_tl { libertinusserif }
+ \tl_set:Nn \g__fdu_font_family_libertinus_sans_tl { libertinussans }
+ \tl_set:Nn \g__fdu_font_family_libertinus_math_tl { libertinusmath }
+ \tl_set:Nn \g__fdu_font_style_libertinus_rm_tl { regular }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bf_tl { bold }
+ \tl_set:Nn \g__fdu_font_style_libertinus_it_tl { italic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfit_tl { bolditalic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfsl_tl { bolditalic }
+ }
+\fontspec_font_if_exist:nTF { XITS-Regular.otf }
+ {
+ \tl_set:Nn \g__fdu_font_family_xits_tl { XITS }
+ \tl_set:Nn \g__fdu_font_style_xits_rm_tl { Regular }
+ \tl_set:Nn \g__fdu_font_style_xits_bf_tl { Bold }
+ \tl_set:Nn \g__fdu_font_style_xits_it_tl { Italic }
+ \tl_set:Nn \g__fdu_font_style_xits_bfit_tl { BoldItalic }
+ \tl_set:Nn \g__fdu_font_name_xits_math_rm_tl { XITSMath-Regular }
+ \tl_set:Nn \g__fdu_font_name_xits_math_bf_tl { XITSMath-Bold }
+ }
+ {
+ \tl_set:Nn \g__fdu_font_family_xits_tl { xits }
+ \tl_set:Nn \g__fdu_font_style_xits_rm_tl { regular }
+ \tl_set:Nn \g__fdu_font_style_xits_bf_tl { bold }
+ \tl_set:Nn \g__fdu_font_style_xits_it_tl { italic }
+ \tl_set:Nn \g__fdu_font_style_xits_bfit_tl { bolditalic }
+ \tl_set:Nn \g__fdu_font_name_xits_math_rm_tl { xits-math }
+ \tl_set:Nn \g__fdu_font_name_xits_math_bf_tl { xits-mathbold }
+ }
+\tl_set:Nx \g__fdu_font_name_libertinus_serif_tl
+ { \g__fdu_font_family_libertinus_serif_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_libertinus_sans_tl
+ { \g__fdu_font_family_libertinus_sans_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_libertinus_math_tl
+ { \g__fdu_font_family_libertinus_math_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_xits_tl
+ { \g__fdu_font_family_xits_tl - \g__fdu_font_style_xits_rm_tl }
\cs_new_protected:Npn \__fdu_load_font_garamond:
{
\__fdu_setmainfont:nn { EBGaramond }
@@ -322,13 +388,13 @@
ItalicFont = *-Italic,
BoldItalicFont = *-BoldItalic
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl
}
\__fdu_setmonofont:nn { lmmonolt10 }
{
@@ -342,21 +408,21 @@
}
\cs_new_protected:Npn \__fdu_load_font_libertinus:
{
- \__fdu_setmainfont:nn { libertinusserif }
+ \__fdu_setmainfont:nn { \g__fdu_font_family_libertinus_serif_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfit_tl
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl
}
\__fdu_setmonofont:nn { lmmonolt10 }
{
@@ -366,7 +432,7 @@
ItalicFont = *-oblique,
BoldItalicFont = *-boldoblique
}
- \__fdu_setmathfont:nn { libertinusmath-regular.otf } { }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_libertinus_math_tl .otf } { }
}
\cs_new_protected:Npn \__fdu_load_font_lm:
{ \__fdu_setmathfont:nn { latinmodern-math.otf } { } }
@@ -380,13 +446,13 @@
ItalicFont = *-italic,
BoldItalicFont = *-bolditalic
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl,
Scale = MatchUppercase
}
\__fdu_setmonofont:nn { lmmonolt10 }
@@ -401,17 +467,13 @@
}
\cs_new_protected:Npn \__fdu_load_font_times:
{
- \__fdu_setmainfont:nn { XITS }
+ \__fdu_setmainfont:nn { \g__fdu_font_family_xits_tl }
{
Extension = .otf,
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic,
- UprightFeatures = { SmallCapsFont = *-Regular },
- BoldFeatures = { SmallCapsFont = *-Bold },
- ItalicFeatures = { SmallCapsFont = *-Italic },
- BoldItalicFeatures = { SmallCapsFont = *-BoldItalic }
+ UprightFont = *-\g__fdu_font_style_xits_rm_tl,
+ BoldFont = *-\g__fdu_font_style_xits_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_xits_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_xits_bfit_tl
}
\__fdu_setsansfont:nn { texgyreheros }
{
@@ -430,14 +492,16 @@
BoldItalicFont = *-bolditalic,
Ligatures = CommonOff
}
- \__fdu_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g__fdu_font_name_xits_math_bf_tl .otf }
}
\cs_new_protected:cpn { __fdu_load_font_ times* : }
{
\__fdu_setmainfont:nn { Times~ New~ Roman } { }
\__fdu_setsansfont:nn { Arial } { }
\__fdu_setmonofont:nn { Courier~ New } { }
- \__fdu_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g__fdu_font_name_xits_math_bf_tl .otf }
}
\cs_new_protected:Npn \__fdu_load_cjk_font_adobe:
{
@@ -549,8 +613,8 @@
}
\cs_new_protected:Npn \__fdu_load_font:
{
- \use:c { __fdu_load_font_ \g__fdu_font_set_tl : }
- \use:c { __fdu_load_cjk_font_ \g__fdu_cjk_font_set_tl : }
+ \use:c { __fdu_load_font_ \g__fdu_fontset_tl : }
+ \use:c { __fdu_load_cjk_font_ \g__fdu_cjk_fontset_tl : }
}
\ctex_at_end_preamble:n { \__fdu_load_font: }
\keys_set:nn { unicode-math }
@@ -733,8 +797,7 @@
{ \__fdu_symbol:n { \int_eval:n { "24EB - 11 + #1 } } }
{ \__fdu_symbol:n { \int_eval:n { "2776 - 1 + #1 } } }
}
-\cs_new_eq:NN \__fdu_fn_symbol_libertinus_sans:n
- \__fdu_fn_symbol_libertinus:n
+\cs_new_eq:NN \__fdu_fn_symbol_libertinus_sans:n \__fdu_fn_symbol_libertinus:n
\cs_new:Npn \__fdu_fn_symbol_pifont:n #1
{ \ding { \int_eval:n { 171 + #1 } } }
\cs_new:Npn \__fdu_fn_symbol_pifont_neg:n #1
@@ -766,17 +829,17 @@
{ \int_use:N #1 }
\c__fdu_fn_style_libertinus_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_serif_tl .otf }
\__fdu_fn_symbol_libertinus:n {#1}
}
\c__fdu_fn_style_libertinus_neg_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_serif_tl .otf }
\__fdu_fn_symbol_libertinus_neg:n {#1}
}
\c__fdu_fn_style_libertinus_sans_tl
{
- \fontspec { libertinussans-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_sans_tl .otf }
\__fdu_fn_symbol_libertinus_sans:n {#1}
}
\c__fdu_fn_style_pifont_tl
@@ -789,17 +852,17 @@
{ \__fdu_fn_symbol_pifont_sans_neg:n {#1} }
\c__fdu_fn_style_xits_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits:n {#1}
}
\c__fdu_fn_style_xits_sans_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits_sans:n {#1}
}
\c__fdu_fn_style_xits_sans_neg_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits_sans_neg:n {#1}
}
}
@@ -1319,9 +1382,9 @@
authorization-decl-sig / content =
\__fdu_cover_signature:N \c__fdu_auth_decl_sign_clist,
originality-decl-name / format =
- \__fdu_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \__fdu_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
authorization-decl-name / format =
- \__fdu_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \__fdu_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
originality-decl-name / bottom-skip = 0.4 cm,
originality-decl-text / bottom-skip = 0.4 cm,
originality-decl-sig / bottom-skip = 0 pt plus 2.5 fill,
@@ -1351,7 +1414,9 @@
{ \bool_if:NT \l__fdu_auto_make_cover_bool { \makecoveriii } }
\keys_set:nn { ctex }
{
- contentsname = \c__fdu_name_toc_tl,
+ contentsname = \c__fdu_name_toc_tl,
+ listfigurename = \c__fdu_name_lof_tl,
+ listtablename = \c__fdu_name_lot_tl,
chapter / tocline =
{
\normalfont \sffamily
@@ -1370,10 +1435,24 @@
\__fdu_patch_cmd:Nnn \tableofcontents
{
\chapter*{\contentsname
- \@mkboth{%
- \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+ \@mkboth{\MakeUppercase\contentsname}
+ {\MakeUppercase\contentsname}}
}
{ \__fdu_chapter_no_toc:V \contentsname }
+\__fdu_patch_cmd:Nnn \listoffigures
+ {
+ \chapter*{\listfigurename}
+ \@mkboth{\MakeUppercase\listfigurename}
+ {\MakeUppercase\listfigurename}
+ }
+ { \__fdu_chapter:V \listfigurename }
+\__fdu_patch_cmd:Nnn \listoftables
+ {
+ \chapter*{\listtablename}
+ \@mkboth{\MakeUppercase\listtablename}
+ {\MakeUppercase\listtablename}
+ }
+ { \__fdu_chapter:V \listtablename }
\NewDocumentEnvironment { abstract } { }
{ \__fdu_abstract_begin: } { \__fdu_abstract_end: }
\NewDocumentEnvironment { abstract* } { }
@@ -1493,13 +1572,13 @@
{
\tl_if_eq:VnTF \l__fdu_bib_gb_style_tl { numerical }
{
- \bibliographystyle { gbt7714-unsrt }
+ \bibliographystyle { gbt7714-numerical }
\__fdu_set_cite_style_numerical:
}
{
\tl_if_eq:VnT \l__fdu_bib_gb_style_tl { author-year }
{
- \bibliographystyle { gbt7714-plain }
+ \bibliographystyle { gbt7714-author-year }
\__fdu_set_cite_style_author_year:
\cs_set_eq:NN \cite \citep
}
@@ -1633,6 +1712,8 @@
\hypersetup
{
bookmarksnumbered = true,
+ psdextra = true,
+ unicode = true,
pdftitle = \l__fdu_info_title_tl,
pdfauthor = \l__fdu_info_author_tl,
pdfkeywords = \l__fdu_info_keywords_clist,
diff --git a/Master/texmf-dist/tex/latex/fduthesis/fduthesis.def b/Master/texmf-dist/tex/latex/fduthesis/fduthesis.def
index 50492e0c90e..13aafde1483 100644
--- a/Master/texmf-dist/tex/latex/fduthesis/fduthesis.def
+++ b/Master/texmf-dist/tex/latex/fduthesis/fduthesis.def
@@ -6,7 +6,7 @@
%%
%% fduthesis.dtx (with options: `definition')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -43,7 +43,7 @@
%% fduthesis-code.pdf,
%% and README.md.
%%
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
{Definition file for fduthesis}
\ProvidesExplFile{\ExplFileName.def}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -102,6 +102,9 @@
{ author_sign } { 作者签名 },
{ supervisor_sign } { 导师签名 },
{ sign_date } { 日期 },
+ { toc } { 目 \quad 录 },
+ { lof } { 插图目录 },
+ { lot } { 表格目录 },
{ bib_en } { Bibliography },
{ pdf_creator } { LaTeX~ with~ fduthesis~ class },
{ orig_decl } { \c__fdu_name_simp_tl \\ 学位论文独创性声明 },
@@ -113,7 +116,6 @@
{ abstract } { 摘 \quad 要 } { Abstract },
{ keywords } { 关键字 } { Keywords: },
{ clc } { 中图分类号 } { CLC~ number: },
- { toc } { 目 \quad 录 } { Contents },
{ notation } { 符号表 } { List~ of~ Symbols }
}
{ \__fdu_define_name:nnn #1 }