summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2021-04-05 01:43:33 +0000
committerNorbert Preining <preining@logic.at>2021-04-05 01:43:33 +0000
commita0c34b582e3f057d294123f01f48c36394602785 (patch)
tree8860ec4f46c34d0e188d0b02fa6d654a4d2c12a5 /Master/texmf-dist/tex/latex
parent2e5fcbba355cdc61c85c2d0c67db185c51d462f0 (diff)
thuthesis (5apr21)
git-svn-id: svn://tug.org/texlive/trunk@58750 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis-author-year.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis-bachelor.cbx8
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.cbx8
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls201
5 files changed, 130 insertions, 91 deletions
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis-author-year.bbx b/Master/texmf-dist/tex/latex/thuthesis/thuthesis-author-year.bbx
index ebaa95d168e..47ec9ea8154 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis-author-year.bbx
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis-author-year.bbx
@@ -18,5 +18,3 @@
\setlength{\parsep}{\bibparsep}}}
{\endlist}
{\item}
-
-\renewcommand*{\bibpagespunct}{\addcolon\addthinspace}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis-bachelor.cbx b/Master/texmf-dist/tex/latex/thuthesis/thuthesis-bachelor.cbx
index acb8a10c949..f791bbc3f65 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis-bachelor.cbx
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis-bachelor.cbx
@@ -2,3 +2,11 @@
citation style]
\RequireCitationStyle{gb7714-2015}
+
+\renewrobustcmd{\mkbibsuperscript}[1]{%
+ \unspace\allowhyphens\textsuperscript{%
+ \begingroup
+ \protected\long\def\mkbibsuperscript##1{%
+ \blx@warning{Nested superscript}%
+ \mkbibbrackets{##1}}%
+ #1\endgroup}\kern\z@}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.bbx b/Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.bbx
index c732471bfed..f0d6234effa 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.bbx
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.bbx
@@ -25,5 +25,3 @@
\renewcommand*{\makelabel}[1]{\hss##1}}
{\endlist}
{\item}
-
-\renewcommand*{\bibpagespunct}{\addcolon}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.cbx b/Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.cbx
index d13887bf262..249cec7203b 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.cbx
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis-numeric.cbx
@@ -2,3 +2,11 @@
citation style]
\RequireCitationStyle{gb7714-2015}
+
+\renewrobustcmd{\mkbibsuperscript}[1]{%
+ \unspace\allowhyphens\textsuperscript{%
+ \begingroup
+ \protected\long\def\mkbibsuperscript##1{%
+ \blx@warning{Nested superscript}%
+ \mkbibbrackets{##1}}%
+ #1\endgroup}\kern\z@}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
index 16029f60363..e0169b3c931 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/21 7.2.1 Tsinghua University Thesis Template]
+[2021/04/03 7.2.2 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.1}
+\def\version{7.2.2}
\RequirePackage{kvdefinekeys}
\RequirePackage{kvsetkeys}
\RequirePackage{kvoptions}
@@ -593,35 +593,6 @@
\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}}
@@ -1556,6 +1527,32 @@
\setlength{\@fptop}{0bp \@plus1.0fil}
\setlength{\@fpsep}{12bp \@plus2.0fil}
\setlength{\@fpbot}{0bp \@plus1.0fil}
+\patchcmd{\@addtocurcol}%
+ {\vskip \intextsep}%
+ {\edef\save@first@penalty{\the\lastpenalty}\unpenalty
+ \ifnum \lastpenalty = \@M % hopefully the OR penalty
+ \unpenalty
+ \else
+ \penalty \save@first@penalty \relax % put it back
+ \fi
+ \ifnum\outputpenalty <-\@Mii
+ \addvspace\intextsep
+ \vskip\parskip
+ \else
+ \addvspace\intextsep
+ \fi}%
+ {}{\thu@patch@error{\@addtocurcol}}
+\patchcmd{\@addtocurcol}%
+ {\vskip\intextsep \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi}%
+ {\ifnum\outputpenalty <-\@Mii
+ \aftergroup\vskip\aftergroup\intextsep
+ \aftergroup\nointerlineskip
+ \else
+ \vskip\intextsep
+ \fi}%
+ {}{\thu@patch@error{\@addtocurcol}}
+\patchcmd{\@getpen}{\@M}{\@Mi}
+ {}{\thu@patch@error{\@getpen}}
\renewcommand{\textfraction}{0.15}
\renewcommand{\topfraction}{0.85}
\renewcommand{\bottomfraction}{0.65}
@@ -1605,42 +1602,52 @@
\let\thu@equation@number@separator\thu@number@separator
}
\thu@option@hook{number-separator}{\thu@set@number@separator}
-\patchcmd\@floatboxreset{%
- \normalsize
-}{%
- \ifthu@language@chinese
- \fontsize{11bp}{20.3bp}\selectfont
- \else
- \fontsize{11bp}{18.65bp}\selectfont
- \fi
-}{}{\thu@patch@error{\@floatboxreset}}
-\AtEndOfPackageFile*{longtable}{
- \AtBeginEnvironment{longtable}{%
- \ifthu@language@chinese
- \fontsize{11bp}{20.3bp}\selectfont
- \else
- \fontsize{11bp}{18.65bp}\selectfont
- \fi
- }
-}
\DeclareCaptionFont{thu}{%
\ifthu@degree@bachelor
\fontsize{11bp}{15bp}\selectfont
\else
- \fontsize{11bp}{14.3bp}\selectfont
+ \ifthu@language@chinese
+ \fontsize{11bp}{14.3bp}\selectfont
+ \else
+ \fontsize{11bp}{12.65bp}\selectfont
+ \fi
\fi
}
\captionsetup{
font = thu,
labelsep = quad,
- aboveskip = 6bp,
- belowskip = 0bp,
+ skip = 6bp,
figureposition = bottom,
tableposition = top,
}
\captionsetup[sub]{font=thu}
\renewcommand{\thesubfigure}{(\alph{subfigure})}
\renewcommand{\thesubtable}{(\alph{subtable})}
+\newcommand\thu@set@table@font{
+ \ifthu@language@chinese
+ \def\thu@table@font{%
+ \fontsize{11bp}{14.3bp}\selectfont
+ \renewcommand\arraystretch{1.42}%
+ }%
+ \else
+ \def\thu@table@font{%
+ \fontsize{11bp}{12.65bp}\selectfont
+ \renewcommand\arraystretch{1.47}%
+ }%
+ \fi
+}
+\thu@set@table@font
+\thu@option@hook{language}{\thu@set@table@font}
+\patchcmd\@floatboxreset{%
+ \normalsize
+}{%
+ \thu@table@font
+}{}{\thu@patch@error{\@floatboxreset}}
+\AtEndOfPackageFile*{longtable}{
+ \AtBeginEnvironment{longtable}{%
+ \thu@table@font
+ }
+}
\heavyrulewidth=1.5bp
\lightrulewidth=1bp
\AtEndOfPackageFile*{threeparttable}{
@@ -2713,52 +2720,45 @@
\newcommand{\thu@authorization@frontdate}{%
日\ifthu@degree@bachelor\hspace{1em}\else\hspace{2em}\fi 期:}
\newcommand\thu@copyright@page@graduate{%
- \newgeometry{
- vmargin = 3.8cm,
- hmargin = 3.2cm,
- }%
\begingroup
\ctexset{
chapter = {
format = {\centering\sffamily\erhao},
- beforeskip = 18bp,
- afterskip = 6bp,
+ beforeskip = 40bp,
+ afterskip = 36bp,
},
}%
\thu@chapter*[]{关于学位论文使用授权的说明}%
\thispagestyle{empty}%
\endgroup
- \vskip 50bp%
+ \vskip 13bp%
\begingroup
\fontsize{14bp}{26bp}\selectfont
本人完全了解清华大学有关保留、使用学位论文的规定,即:\par
清华大学拥有在著作权法规定范围内学位论文的使用权,其中包括:%
- (1)已获学位的研究生必须按学校规定提交学位论文,%
- 学校可以采用影印、缩印或其他复制手段保存研究生上交的学位论文;%
+ (1)\nobreak 已获学位的研究生必须按学校规定提交学位论文,%
+ 学校可以采用影印、缩印或其他复制手段保存研究生上交的学位论文;\allowbreak
(2)\nobreak 为教学和科研目的,学校可以将公开的学位论文作为资料在图书馆、资料室等场所供校内师生阅读,%
- 或在校园网上供校内师生浏览部分内容;%
+ 或在校园网上供校内师生浏览部分内容;\allowbreak
\ifthu@degree@doctor
- (3)根据《中华人民共和国学位条例暂行实施办法》及上级教育主管部门具体要求,向国家图书馆报送相应的学位论文。%
+ (3)\nobreak 根据《中华人民共和国学位条例暂行实施办法》及上级教育主管部门具体要求,向国家图书馆报送相应的学位论文。%
\else
- (3)按照上级教育主管部门督导、抽查等要求,报送相应的学位论文。%
+ (3)\nobreak 按照上级教育主管部门督导、抽查等要求,报送相应的学位论文。%
\fi
\par
本人保证遵守上述规定。\par
- \vskip 6bp%
- \textbf{(保密的论文在解密后遵守此规定)}\par
\endgroup
- \vskip1.2cm%
+ \vskip 33bp%
\begingroup
- \noindent\xiaosi
- \hspace*{1.5cm}%
- 作者签名:\thu@underline[7em]\relax\hfill
- 导师签名:\thu@underline[7em]\relax\hspace*{1cm}\\[3pt]%
- \hspace*{1.5cm}%
- 日\hspace{2em}期:\thu@underline[7em]\relax\hfill
- 日\hspace{2em}期:\thu@underline[7em]\relax\hspace*{1cm}%
+ \fontsize{12bp}{23.4bp}\selectfont
+ \parindent\z@
+ \leftskip 43bp%
+ 作者签名:\hspace{4bp}\thu@underline[7em]{}\hspace{47bp}%
+ 导师签名:\hspace{4bp}\thu@underline[7em]{}\par
+ \vskip 6bp%
+ 日\hspace{2em}期:\hspace{4bp}\thu@underline[7em]{}\hspace{47bp}%
+ 日\hspace{2em}期:\hspace{4bp}\thu@underline[7em]{}\par
\endgroup
- \clearpage
- \restoregeometry
}
\newcommand\thu@copyright@page@bachelor{%
\begingroup
@@ -3066,16 +3066,40 @@
\@namedef{bibstyle@thuthesis-author-year}{\citestyle{author-year}}
\@namedef{bibstyle@thuthesis-bachelor}{\citestyle{super}}
\@namedef{bibstyle@thuthesis-inline}{\citestyle{inline}}
- \renewcommand\NAT@citesuper[3]{\ifNAT@swa
- \if*#2*\else#2\NAT@spacechar\fi
- % \unskip\kern\p@\textsuperscript{\NAT@@open#1\NAT@@close}%
- % \if*#3*\else\NAT@spacechar#3\fi\else #1\fi\endgroup}
- \unskip\kern\p@\textsuperscript{\NAT@@open#1\NAT@@close\if*#3*\else#3\fi}%
- \else #1\fi\endgroup}
- \renewcommand\NAT@citenum%
- [3]{\ifNAT@swa\NAT@@open\if*#2*\else#2\NAT@spacechar\fi
- % #1\if*#3*\else\NAT@cmt#3\fi\NAT@@close\else#1\fi\endgroup}
- #1\NAT@@close\textsuperscript{\if*#3*\else#3\fi}\else#1\fi\endgroup}
+ \renewcommand\NAT@citesuper[3]{%
+ \ifNAT@swa
+ \if*#2*\else
+ #2\NAT@spacechar
+ \fi
+ % \unskip\kern\p@\textsuperscript{\NAT@@open#1\NAT@@close}%
+ % \if*#3*\else\NAT@spacechar#3\fi\else #1\fi\endgroup}
+ \unskip\kern\p@
+ \textsuperscript{%
+ \NAT@@open#1\NAT@@close
+ \if*#3*\else#3\fi
+ }%
+ \kern\p@
+ \else
+ #1%
+ \fi
+ \endgroup
+ }
+ \renewcommand\NAT@citenum[3]{%
+ \ifNAT@swa
+ \NAT@@open
+ \if*#2*\else
+ #2\NAT@spacechar
+ \fi
+ % #1\if*#3*\else\NAT@cmt#3\fi\NAT@@close
+ #1\NAT@@close
+ \if*#3*\else
+ \textsuperscript{#3}%
+ \fi
+ \else
+ #1%
+ \fi
+ \endgroup
+ }
\def\NAT@citexnum[#1][#2]#3{%
\NAT@reset@parser
\NAT@sort@cites{#3}%
@@ -3156,8 +3180,11 @@
% }{}%
\NAT@mbox{\NAT@@close}%
\@ifnum{\NAT@ctype=\z@}{%
- \if*#2*\else\textsuperscript{#2}\fi
+ \if*#2*\else
+ \textsuperscript{#2}%
+ \fi
}{}%
+ \NAT@super@kern
\fi
}{#1}{#2}%
}%