summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-21 21:44:49 +0000
committerKarl Berry <karl@freefriends.org>2021-03-21 21:44:49 +0000
commitbe19a973422c106c368feba7f09be5809fefe13f (patch)
tree9508be13061c79946d5677efe6ad5ab5206a7c61 /Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
parent3bc8fda089714cc77da9c8a0fe9e06050e9de3b1 (diff)
thuthesis (21mar21) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58600 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls')
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls428
1 files changed, 245 insertions, 183 deletions
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
index ef40653f444..16029f60363 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2017/04/15]
\ProvidesClass{thuthesis}
-[2021/03/12 7.2.0 Tsinghua University Thesis Template]
+[2021/03/21 7.2.1 Tsinghua University Thesis Template]
\newcommand\thu@error[1]{%
\ClassError{thuthesis}{#1}{}%
}
@@ -56,7 +56,7 @@
}
\hyphenation{Thu-Thesis}
\def\thuthesis{ThuThesis}
-\def\version{7.2.0}
+\def\version{7.2.1}
\RequirePackage{kvdefinekeys}
\RequirePackage{kvsetkeys}
\RequirePackage{kvoptions}
@@ -69,7 +69,6 @@
\let\thu@setup@hook\@empty
\kvsetkeys{thu}{#1}%
\thu@setup@hook
- \thu@setup@hook
}
\newcommand\thu@define@key[1]{%
\kvsetkeys{thu@key}{#1}%
@@ -213,8 +212,8 @@
name = math@font,
choices = {
auto,
- xits,
stix,
+ xits,
libertinus,
newcm,
lm,
@@ -272,6 +271,13 @@
AMS,
},
},
+ real-part = {
+ name = real@part,
+ choices = {
+ roman,
+ fraktur,
+ },
+ },
output = {
choices = {
print,
@@ -349,7 +355,7 @@
\thu@error{The "#2" package is incompatible with "#1"}%
}%
}%
- }
+}
\thu@package@conflict{biblatex}{bibunits}
\thu@package@conflict{biblatex}{chapterbib}
\thu@package@conflict{biblatex}{cite}
@@ -378,6 +384,16 @@
\thu@package@conflict{newtxmath}{amssymb}
\thu@package@conflict{newtxmath}{unicode-math}
\thu@package@conflict{newtxmath}{upgreek}
+\AtBeginOfPackageFile*{mathtools}{
+ \@ifpackageloaded{unicode-math}{
+ \thu@error{The "mathtools" package should be loaded before setting "math-font"}
+ }{}
+}%
+\AtBeginOfPackageFile*{amsthm}{
+ \@ifpackageloaded{newtxmath}{
+ \thu@error{The "amsthm" package should be loaded before setting "newtxmath"}
+ }{}
+}%
\geometry{
paper = a4paper, % 210 * 297mm
marginparwidth = 2cm,
@@ -566,6 +582,65 @@
}
\thu@set@punctuations
\thu@option@hook{language}{\thu@set@punctuations}
+\renewcommand\normalsize{%
+ \@setfontsize\normalsize{12bp}{20bp}%
+ \abovedisplayskip 6bp%
+ \abovedisplayshortskip 6bp%
+ \belowdisplayshortskip 6bp%
+ \belowdisplayskip \abovedisplayskip
+}
+\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
+\DeclareRobustCommand\small{%
+ \@setfontsize\small{10.5bp}{17.5bp}%
+ \abovedisplayskip 6bp%
+ \abovedisplayshortskip 6bp%
+ \belowdisplayshortskip 6bp%
+ \def\@listi{\leftmargin\leftmargini
+ \topsep \z@skip
+ \parsep \z@skip
+ \itemsep \z@skip}%
+ \belowdisplayskip \abovedisplayskip
+}
+\DeclareRobustCommand\footnotesize{%
+ \@setfontsize\footnotesize{9bp}{15bp}%
+ \abovedisplayskip 6bp%
+ \abovedisplayshortskip 6bp%
+ \belowdisplayshortskip 6bp%
+ \def\@listi{\leftmargin\leftmargini
+ \topsep \z@skip
+ \parsep \z@skip
+ \itemsep \z@skip}%
+ \belowdisplayskip \abovedisplayskip
+}
+\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize{7.5bp}{12.5bp}}
+\DeclareRobustCommand\tiny{\@setfontsize\tiny{6.5bp}{10.83bp}}
+\DeclareRobustCommand\large{\@setfontsize\large{15bp}{25bp}}
+\DeclareRobustCommand\Large{\@setfontsize\Large{18bp}{30bp}}
+\DeclareRobustCommand\LARGE{\@setfontsize\LARGE{22bp}{36.67bp}}
+\DeclareRobustCommand\huge{\@setfontsize\huge{24bp}{40bp}}
+\DeclareRobustCommand\Huge{\@setfontsize\Huge{26bp}{43.33bp}}
+\def\thu@def@fontsize#1#2{%
+ \expandafter\newcommand\csname #1\endcsname[1][1.3]{%
+ \fontsize{#2}{##1\dimexpr #2}\selectfont}}
+\thu@def@fontsize{chuhao}{42bp}
+\thu@def@fontsize{xiaochu}{36bp}
+\thu@def@fontsize{yihao}{26bp}
+\thu@def@fontsize{xiaoyi}{24bp}
+\thu@def@fontsize{erhao}{22bp}
+\thu@def@fontsize{xiaoer}{18bp}
+\thu@def@fontsize{sanhao}{16bp}
+\thu@def@fontsize{xiaosan}{15bp}
+\thu@def@fontsize{sihao}{14bp}
+\thu@def@fontsize{xiaosi}{12bp}
+\thu@def@fontsize{wuhao}{10.5bp}
+\thu@def@fontsize{xiaowu}{9bp}
+\thu@def@fontsize{liuhao}{7.5bp}
+\thu@def@fontsize{xiaoliu}{6.5bp}
+\thu@def@fontsize{qihao}{5.5bp}
+\thu@def@fontsize{bahao}{5bp}
\ifthu@system@auto
\IfFileExists{/System/Library/Fonts/Menlo.ttc}{
\thusetup{system = mac}
@@ -611,60 +686,6 @@
\fi
\fi
\fi
-\let\thu@font@family@stix\@empty
-\newcommand\thu@set@stix@names{%
- \ifx\thu@font@family@stix\@empty
- \IfFontExistsTF{STIXTwoText-Regular.otf}{%
- \gdef\thu@font@family@stix{STIXTwoText}%
- \gdef\thu@font@name@stix@math{STIXTwoMath-Regular}%
- }{%
- \gdef\thu@font@family@stix{STIX2Text}%
- \gdef\thu@font@name@stix@math{STIX2Math}%
- }%
- \fi
-}
-\let\thu@font@family@xits\@empty
-\newcommand\thu@set@xits@names{%
- \ifx\thu@font@family@xits\@empty
- \IfFontExistsTF{XITSMath-Regular.otf}{%
- \gdef\thu@font@family@xits{XITS}%
- \gdef\thu@font@style@xits@rm{Regular}%
- \gdef\thu@font@style@xits@bf{Bold}%
- \gdef\thu@font@style@xits@it{Italic}%
- \gdef\thu@font@style@xits@bfit{BoldItalic}%
- \gdef\thu@font@name@xits@math{XITSMath-Regular}%
- }{%
- \gdef\thu@font@family@xits{xits}%
- \gdef\thu@font@style@xits@rm{regular}%
- \gdef\thu@font@style@xits@bf{bold}%
- \gdef\thu@font@style@xits@it{italic}%
- \gdef\thu@font@style@xits@bfit{bolditalic}%
- \gdef\thu@font@name@xits@math{xits-math}%
- }%
- \fi
-}
-\let\thu@font@family@libertinus\@empty
-\newcommand\thu@set@libertinus@names{%
- \ifx\thu@font@family@libertinus\@empty
- \IfFontExistsTF{LibertinusSerif-Regular.otf}{%
- \gdef\thu@font@family@libertinus@serif{LibertinusSerif}%
- \gdef\thu@font@family@libertinus@sans{LibertinusSans}%
- \gdef\thu@font@name@libertinus@math{LibertinusMath-Regular}%
- \gdef\thu@font@style@libertinus@rm{Regular}%
- \gdef\thu@font@style@libertinus@bf{Bold}%
- \gdef\thu@font@style@libertinus@it{Italic}%
- \gdef\thu@font@style@libertinus@bfit{BoldItalic}%
- }{%
- \gdef\thu@font@family@libertinus@serif{libertinusserif}%
- \gdef\thu@font@family@libertinus@sans{libertinussans}%
- \gdef\thu@font@name@libertinus@math{libertinusmath-regular}%
- \gdef\thu@font@style@libertinus@rm{regular}%
- \gdef\thu@font@style@libertinus@bf{bold}%
- \gdef\thu@font@style@libertinus@it{italic}%
- \gdef\thu@font@style@libertinus@bfit{bolditalic}%
- }%
- \fi
-}
\newcommand\thu@set@font@times{%
\setmainfont{Times New Roman}%
\setsansfont{Arial}%
@@ -698,9 +719,22 @@
BoldFont = *-bold,
ItalicFont = *-italic,
BoldItalicFont = *-bolditalic,
+ Scale = MatchLowercase,
Ligatures = CommonOff,
]%
}
+\let\thu@font@family@stix\@empty
+\newcommand\thu@set@stix@names{%
+ \ifx\thu@font@family@stix\@empty
+ \IfFontExistsTF{STIXTwoText-Regular.otf}{%
+ \gdef\thu@font@family@stix{STIXTwoText}%
+ \gdef\thu@font@name@stix@math{STIXTwoMath-Regular}%
+ }{%
+ \gdef\thu@font@family@stix{STIX2Text}%
+ \gdef\thu@font@name@stix@math{STIX2Math}%
+ }%
+ \fi
+}
\newcommand\thu@set@font@stix{%
\thu@set@stix@names
\setmainfont{\thu@font@family@stix}[
@@ -712,6 +746,26 @@
]%
\thu@set@texgyre@sans@mono
}
+\let\thu@font@family@xits\@empty
+\newcommand\thu@set@xits@names{%
+ \ifx\thu@font@family@xits\@empty
+ \IfFontExistsTF{XITSMath-Regular.otf}{%
+ \gdef\thu@font@family@xits{XITS}%
+ \gdef\thu@font@style@xits@rm{Regular}%
+ \gdef\thu@font@style@xits@bf{Bold}%
+ \gdef\thu@font@style@xits@it{Italic}%
+ \gdef\thu@font@style@xits@bfit{BoldItalic}%
+ \gdef\thu@font@name@xits@math{XITSMath-Regular}%
+ }{%
+ \gdef\thu@font@family@xits{xits}%
+ \gdef\thu@font@style@xits@rm{regular}%
+ \gdef\thu@font@style@xits@bf{bold}%
+ \gdef\thu@font@style@xits@it{italic}%
+ \gdef\thu@font@style@xits@bfit{bolditalic}%
+ \gdef\thu@font@name@xits@math{xits-math}%
+ }%
+ \fi
+}
\newcommand\thu@set@font@xits{%
\thu@set@xits@names
\setmainfont{\thu@font@family@xits}[
@@ -723,6 +777,28 @@
]%
\thu@set@texgyre@sans@mono
}
+\let\thu@font@family@libertinus\@empty
+\newcommand\thu@set@libertinus@names{%
+ \ifx\thu@font@family@libertinus\@empty
+ \IfFontExistsTF{LibertinusSerif-Regular.otf}{%
+ \gdef\thu@font@family@libertinus@serif{LibertinusSerif}%
+ \gdef\thu@font@family@libertinus@sans{LibertinusSans}%
+ \gdef\thu@font@name@libertinus@math{LibertinusMath-Regular}%
+ \gdef\thu@font@style@libertinus@rm{Regular}%
+ \gdef\thu@font@style@libertinus@bf{Bold}%
+ \gdef\thu@font@style@libertinus@it{Italic}%
+ \gdef\thu@font@style@libertinus@bfit{BoldItalic}%
+ }{%
+ \gdef\thu@font@family@libertinus@serif{libertinusserif}%
+ \gdef\thu@font@family@libertinus@sans{libertinussans}%
+ \gdef\thu@font@name@libertinus@math{libertinusmath-regular}%
+ \gdef\thu@font@style@libertinus@rm{regular}%
+ \gdef\thu@font@style@libertinus@bf{bold}%
+ \gdef\thu@font@style@libertinus@it{italic}%
+ \gdef\thu@font@style@libertinus@bfit{bolditalic}%
+ }%
+ \fi
+}
\newcommand\thu@set@font@libertinus{%
\thu@set@libertinus@names
\setmainfont{\thu@font@family@libertinus@serif}[
@@ -747,21 +823,21 @@
]%
}
\newcommand\thu@set@font@newcm{%
- \setmathrm{NewCM10}[
+ \setmainfont{NewCM10}[
Extension = .otf,
UprightFont = *-Book,
BoldFont = *-Bold,
ItalicFont = *-BookItalic,
BoldItalicFont = *-BoldItalic,
]%
- \setmathsf{NewCMSans10}[
+ \setsansfont{NewCMSans10}[
Extension = .otf,
UprightFont = *-Book,
BoldFont = *-Bold,
ItalicFont = *-BookOblique,
BoldItalicFont = *-BoldOblique,
]%
- \setmathtt{NewCMMono10}[
+ \setmonofont{NewCMMono10}[
Extension = .otf,
UprightFont = *-Book,
ItalicFont = *-BookItalic,
@@ -816,7 +892,6 @@
\fi
\fi
\newcommand\thu@set@cjk@font@windows{%
- \defaultCJKfontfeatures{Script=CJK}%
\xeCJKsetup{EmboldenFactor=3}%
\setCJKmainfont{SimSun}[
AutoFakeBold = true,
@@ -834,25 +909,31 @@
\setCJKmainfont{Songti SC}[
UprightFont = * Light,
BoldFont = * Bold,
- ItalicFont = Kaiti SC,
+ ItalicFont = Kaiti SC Regular,
BoldItalicFont = Kaiti SC Bold,
]%
- \setCJKsansfont{Heiti SC}[BoldFont=* Medium]%
+ \setCJKsansfont{Heiti SC}[
+ UprightFont = * Light,
+ BoldFont = * Medium,
+ ]%
\setCJKmonofont{STFangsong}
\setCJKfamilyfont{zhsong}{Songti SC}[
- UprightFont = * Light,
- BoldFont = * Bold,
+ UprightFont = * Light,
+ BoldFont = * Bold,
]%
\setCJKfamilyfont{zhhei}{Heiti SC}[
- UprightFont = * Light,
- BoldFont = * Medium,
+ UprightFont = * Light,
+ BoldFont = * Medium,
]%
\setCJKfamilyfont{zhfs}{STFangsong}%
- \setCJKfamilyfont{zhkai}{Kaiti SC}[BoldFont = * Bold]%
+ \setCJKfamilyfont{zhkai}{Kaiti SC}[
+ UprightFont = * Regular,
+ BoldFont = * Bold,
+ ]%
\setCJKfamilyfont{zhli}{Baoli SC}%
\setCJKfamilyfont{zhyuan}{Yuanyi SC}[
- UprightFont = * Light,
- BoldFont = * Bold,
+ UprightFont = * Light,
+ BoldFont = * Bold,
]%
}
\newcommand\thu@set@cjk@font@noto{%
@@ -896,6 +977,7 @@
UprightFont = *-Regular,
BoldFont = *-Bold,
ItalicFont = FandolKai-Regular,
+ ItalicFeatures = {Extension = .otf},
]%
\setCJKsansfont{FandolHei}[
Extension = .otf,
@@ -945,6 +1027,7 @@
integral-limits = false,
partial = italic,
math-ellipsis = AMS,
+ real-part = fraktur,
}%
\else
\thusetup{
@@ -952,19 +1035,20 @@
integral = upright,
integral-limits = true,
partial = upright,
+ real-part = roman,
}%
\ifthu@math@style@ISO
\thusetup{
less-than-or-equal = horizontal,
math-ellipsis = lower,
- }%
- \else
+ }%
+ \else
\ifthu@math@style@GB
\thusetup{
less-than-or-equal = slanted,
math-ellipsis = centered,
- }%
- \fi
+ }%
+ \fi
\fi
\fi
}
@@ -1041,6 +1125,19 @@
\DeclareRobustCommand\mathellipsis{\mathinner{\unicodeellipsis}}%
\fi
}
+\newcommand\thu@set@unimath@real@part{%
+ \ifthu@real@part@roman
+ \AtBeginDocument{%
+ \def\Re{\operatorname{Re}}%
+ \def\Im{\operatorname{Im}}%
+ }%
+ \else
+ \AtBeginDocument{%
+ \let\Re\thu@save@Re
+ \let\Im\thu@save@Im
+ }%
+ \fi
+}
\newcommand\thu@set@unimath@style{%
\ifthu@uppercase@greek@upright
\unimathsetup{math-style = TeX}%
@@ -1064,6 +1161,7 @@
\fi
\fi
\thu@set@unimath@ellipsis
+ \thu@set@unimath@real@part
}
\newcommand\thu@qed{\rule{1ex}{1ex}}
\newcommand\thu@load@unimath{%
@@ -1072,6 +1170,8 @@
\AtBeginDocument{%
\let\thu@save@leq\leq
\let\thu@save@geq\geq
+ \let\thu@save@Re\Re
+ \let\thu@save@Im\Im
}%
\DeclareRobustCommand\bm[1]{{\symbfit{##1}}}%
\DeclareRobustCommand\boldsymbol[1]{{\symbfit{##1}}}%
@@ -1083,6 +1183,18 @@
\renewcommand\thu@qed{\ensuremath{\QED}}%
}%
}
+\newcommand\thu@set@math@font@stix{%
+ \thu@set@stix@names
+ \setmathfont{\thu@font@name@stix@math}[
+ Extension = .otf,
+ StylisticSet = \thu@xits@integral@stylistic@set,
+ ]%
+ \setmathfont{\thu@font@name@stix@math}[
+ Extension = .otf,
+ StylisticSet = 1,
+ range = {scr,bfscr},
+ ]%
+}
\newcommand\thu@xits@integral@stylistic@set{%
\ifthu@integral@upright
8%
@@ -1100,49 +1212,16 @@
range = {cal,bfcal},
]%
}
-\newcommand\thu@set@math@font@stix{%
- \thu@set@stix@names
- \setmathfont{\thu@font@name@stix@math}[
- Extension = .otf,
- StylisticSet = \thu@xits@integral@stylistic@set,
- ]%
- \setmathfont{\thu@font@name@stix@math}[
- Extension = .otf,
- StylisticSet = 1,
- range = {scr,bfscr},
- ]%
-}
\newcommand\thu@libertinus@integral@stylistic@set{%
- \ifthu@integral@italic
+ \ifthu@integral@slanted
8%
\fi
}
\newcommand\thu@set@math@font@libertinus{%
\thu@set@libertinus@names
- \setmathfont{\thu@font@name@libertinus@math .otf}%
-}
-\newcommand\thu@set@math@font@lm{%
- \setmathfont{latinmodern-math}[Extension=.otf]%
- \setmathrm{lmroman10}[
- Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
- ]%
- \setmathsf{lmsans10}[
- Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-oblique,
- BoldItalicFont = *-boldoblique,
- ]%
- \setmathtt{lmmonolt10}[
- Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-oblique,
- BoldItalicFont = *-boldoblique,
+ \setmathfont{\thu@font@name@libertinus@math}[
+ Extension = .otf,
+ StylisticSet = \thu@libertinus@integral@stylistic@set,
]%
}
\newcommand\thu@newcm@integral@stylistic@set{%
@@ -1182,6 +1261,30 @@
BoldItalicFont = *-BoldOblique,
]%
}
+\newcommand\thu@set@math@font@lm{%
+ \setmathfont{latinmodern-math}[Extension=.otf]%
+ \setmathrm{lmroman10}[
+ Extension = .otf,
+ UprightFont = *-regular,
+ BoldFont = *-bold,
+ ItalicFont = *-italic,
+ BoldItalicFont = *-bolditalic,
+ ]%
+ \setmathsf{lmsans10}[
+ Extension = .otf,
+ UprightFont = *-regular,
+ BoldFont = *-bold,
+ ItalicFont = *-oblique,
+ BoldItalicFont = *-boldoblique,
+ ]%
+ \setmathtt{lmmonolt10}[
+ Extension = .otf,
+ UprightFont = *-regular,
+ BoldFont = *-bold,
+ ItalicFont = *-oblique,
+ BoldItalicFont = *-boldoblique,
+ ]%
+}
\newcommand\thu@set@math@font@newtx{%
\ifthu@font@newtx\else
\let\thu@save@encodingdefault\encodingdefault
@@ -1220,6 +1323,12 @@
\else
\DeclareRobustCommand\mathellipsis{\mathinner{\ldotp\ldotp\ldotp}}%
\fi
+ \let\thu@save@Re\Re
+ \let\thu@save@Im\Im
+ \ifthu@real@part@roman
+ \def\Re{\operatorname{Re}}%
+ \def\Im{\operatorname{Im}}%
+ \fi
\RequirePackage{bm}%
\ifthu@font@newtx\else
\let\encodingdefault\thu@save@encodingdefault
@@ -1251,65 +1360,6 @@
}
\AtBeginOfPackageFile*{siunitx}{\thu@set@math@font@auto}
\AtEndPreamble{\thu@set@math@font@auto}
-\renewcommand\normalsize{%
- \@setfontsize\normalsize{12bp}{20bp}%
- \abovedisplayskip 6bp%
- \abovedisplayshortskip 6bp%
- \belowdisplayshortskip 6bp%
- \belowdisplayskip \abovedisplayskip
-}
-\normalsize
-\ifx\MakeRobust\@undefined \else
- \MakeRobust\normalsize
-\fi
-\DeclareRobustCommand\small{%
- \@setfontsize\small{10.5bp}{17.5bp}%
- \abovedisplayskip 6bp%
- \abovedisplayshortskip 6bp%
- \belowdisplayshortskip 6bp%
- \def\@listi{\leftmargin\leftmargini
- \topsep \z@skip
- \parsep \z@skip
- \itemsep \z@skip}%
- \belowdisplayskip \abovedisplayskip
-}
-\DeclareRobustCommand\footnotesize{%
- \@setfontsize\footnotesize{9bp}{15bp}%
- \abovedisplayskip 6bp%
- \abovedisplayshortskip 6bp%
- \belowdisplayshortskip 6bp%
- \def\@listi{\leftmargin\leftmargini
- \topsep \z@skip
- \parsep \z@skip
- \itemsep \z@skip}%
- \belowdisplayskip \abovedisplayskip
-}
-\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize{7.5bp}{12.5bp}}
-\DeclareRobustCommand\tiny{\@setfontsize\tiny{6.5bp}{10.83bp}}
-\DeclareRobustCommand\large{\@setfontsize\large{15bp}{25bp}}
-\DeclareRobustCommand\Large{\@setfontsize\Large{18bp}{30bp}}
-\DeclareRobustCommand\LARGE{\@setfontsize\LARGE{22bp}{36.67bp}}
-\DeclareRobustCommand\huge{\@setfontsize\huge{24bp}{40bp}}
-\DeclareRobustCommand\Huge{\@setfontsize\Huge{26bp}{43.33bp}}
-\def\thu@def@fontsize#1#2{%
- \expandafter\newcommand\csname #1\endcsname[1][1.3]{%
- \fontsize{#2}{##1\dimexpr #2}\selectfont}}
-\thu@def@fontsize{chuhao}{42bp}
-\thu@def@fontsize{xiaochu}{36bp}
-\thu@def@fontsize{yihao}{26bp}
-\thu@def@fontsize{xiaoyi}{24bp}
-\thu@def@fontsize{erhao}{22bp}
-\thu@def@fontsize{xiaoer}{18bp}
-\thu@def@fontsize{sanhao}{16bp}
-\thu@def@fontsize{xiaosan}{15bp}
-\thu@def@fontsize{sihao}{14bp}
-\thu@def@fontsize{xiaosi}{12bp}
-\thu@def@fontsize{wuhao}{10.5bp}
-\thu@def@fontsize{xiaowu}{9bp}
-\thu@def@fontsize{liuhao}{7.5bp}
-\thu@def@fontsize{xiaoliu}{6.5bp}
-\thu@def@fontsize{qihao}{5.5bp}
-\thu@def@fontsize{bahao}{5bp}
\def\cleardoublepage{%
\clearpage
\if@twoside
@@ -1500,9 +1550,9 @@
\allowdisplaybreaks[4]
\def\fps@figure{h}
\def\fps@table{h}
-\setlength{\floatsep}{6bp}
-\setlength{\textfloatsep}{6bp}
-\setlength{\intextsep}{6bp}
+\setlength{\floatsep}{12\p@ \@plus 2\p@ \@minus 2\p@}
+\setlength{\textfloatsep}{12\p@ \@plus 2\p@ \@minus 2\p@}
+\setlength{\intextsep}{12\p@ \@plus 2\p@ \@minus 2\p@}
\setlength{\@fptop}{0bp \@plus1.0fil}
\setlength{\@fpsep}{12bp \@plus2.0fil}
\setlength{\@fpbot}{0bp \@plus1.0fil}
@@ -1584,7 +1634,7 @@
font = thu,
labelsep = quad,
aboveskip = 6bp,
- belowskip = 6bp,
+ belowskip = 0bp,
figureposition = bottom,
tableposition = top,
}
@@ -2857,10 +2907,11 @@
statement-page-style = {
name = statement@page@style,
choices = {
+ auto,
empty,
plain,
},
- default = empty,
+ default = auto,
},
statement-page-number = {
name = statement@page@number,
@@ -2901,6 +2952,21 @@
\fi
}%
\kvsetkeys{thu@statement}{#1}%
+ \ifthu@statement@page@style@auto
+ \ifx\thu@statement@file\@empty
+ \ifthu@degree@bachelor
+ \thusetup{statement-page-style = empty}%
+ \else
+ \thusetup{statement-page-style = plain}%
+ \fi
+ \else
+ \ifthu@degree@bachelor
+ \thusetup{statement-page-style = plain}%
+ \else
+ \thusetup{statement-page-style = empty}%
+ \fi
+ \fi
+ \fi
\ifx\thu@statement@file\@empty
\thusetup{language=chinese}%
\begingroup
@@ -2913,9 +2979,7 @@
\fi
\thu@chapter*{\thu@statement@name}%
\endgroup
- \ifthu@degree@bachelor
- \thispagestyle{\thu@statement@page@style}%
- \fi
+ \thispagestyle{\thu@statement@page@style}%
\thu@statement@text\par
\ifthu@degree@graduate
\vskip 2cm%
@@ -2930,9 +2994,7 @@
\markboth{\thu@statement@name}{}%
\thu@phantomsection
\addcontentsline{toc}{chapter}{\thu@statement@name}%
- \ifthu@degree@bachelor\else
- \thispagestyle{empty}%
- \fi
+ \thispagestyle{\thu@statement@page@style}%
}]{\thu@statement@file}%
\fi
\ifthu@degree@bachelor