From f7e5c5650d2264718d6352ea78e3b5251354b2f1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 14 Jun 2020 22:17:29 +0000 Subject: thuthesis (15jun20) git-svn-id: svn://tug.org/texlive/trunk@55547 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/thuthesis/thuthesis.cls | 96 +++++++++++++-------- .../tex/latex/thuthesis/tsinghua-name-bachelor.pdf | Bin 0 -> 14186 bytes 2 files changed, 62 insertions(+), 34 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/thuthesis/tsinghua-name-bachelor.pdf (limited to 'Master/texmf-dist/tex/latex/thuthesis') diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls index a1f76838a0b..b5e3501b42a 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} -[2020/06/12 6.1.1 Tsinghua University Thesis Template] +[2020/06/14 6.1.2 Tsinghua University Thesis Template] \newcommand\thu@error[1]{% \ClassError{thuthesis}{#1}{}% } @@ -38,7 +38,7 @@ \fi \hyphenation{Thu-Thesis} \def\thuthesis{ThuThesis} -\def\version{6.1.1} +\def\version{6.1.2} \RequirePackage{kvdefinekeys} \RequirePackage{kvsetkeys} \RequirePackage{kvoptions} @@ -298,7 +298,7 @@ \ifodd\c@page \else \thispagestyle{empty}% - \hbox{} + \hbox{}% \newpage \if@twocolumn \hbox{}\newpage @@ -309,11 +309,6 @@ } \renewcommand\frontmatter{% \cleardoublepage - \ifthu@degree@bachelor - \pagestyle{thu@plain} - \else - \pagestyle{thu@headings} - \fi \@mainmatterfalse \pagenumbering{Roman}% \let\@tabular\thu@tabular @@ -321,10 +316,14 @@ \renewcommand\mainmatter{% \cleardoublepage \@mainmattertrue - \pagenumbering{arabic} - \ifthu@degree@bachelor\pagestyle{thu@plain}\else\pagestyle{thu@headings}\fi} + \pagenumbering{arabic}% +} \renewcommand\backmatter{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openright + \cleardoublepage + \else + \clearpage + \fi \@mainmattertrue} \ifthu@fontset@mac \thusetup{ @@ -841,22 +840,29 @@ } \thu@set@punctuations \thu@option@hook{language}{\thu@set@punctuations} -\fancypagestyle{thu@empty}{% - \fancyhf{} - \renewcommand{\headrulewidth}{0pt} - \renewcommand{\footrulewidth}{0pt}} -\fancypagestyle{thu@plain}{% - \fancyhead{} - \fancyfoot[C]{\xiaowu\thepage} - \renewcommand{\headrulewidth}{0pt} - \renewcommand{\footrulewidth}{0pt}} -\fancypagestyle{thu@headings}{% - \fancyhead{} - \fancyhead[C]{\wuhao\normalfont\leftmark} - \fancyfoot{} - \fancyfoot[C]{\wuhao\thepage} - \renewcommand{\headrulewidth}{0.4pt} - \renewcommand{\footrulewidth}{0pt}} +\pagestyle{fancy} +\fancypagestyle{plain}{% + \fancyhf{}% + \renewcommand\footrulewidth{0pt}% + \ifthu@degree@bachelor + \renewcommand\headrulewidth{0pt}% + \fancyfoot[C]{\xiaowu\thepage}% + \let\@mkboth\@gobbletwo + \else + \renewcommand\headrulewidth{0.75bp}% + \fancyhead[C]{\wuhao\leftmark}% + \fancyfoot[C]{\wuhao\thepage}% + \let\@mkboth\markboth + \fi + \def\chaptermark##1{% + \markboth{\CTEXifname{\CTEXthechapter\hskip\ccwd}{}##1}{}% + }% +} +\pagestyle{plain} +\fancypagestyle{nofooter}{% + \fancyfoot{}% +} +\ctexset{chapter/pagestyle = plain} \ctexset{% punct=quanjiao, space=auto, @@ -986,9 +992,6 @@ \newcommand{\thu@abstract@name}{摘\hspace{\ccwd}要} \newcommand{\thu@abstract@name@en}{Abstract} \fi -\AtBeginDocument{% - \pagestyle{thu@empty} - \renewcommand{\chaptermark}[1]{\@mkboth{\CTEXthechapter\hskip\ccwd#1}{}}} \newcommand\thu@chapter@titleformat[1]{% \ifthu@degree@bachelor #1\else% \ifthenelse% @@ -999,7 +1002,6 @@ \ctexset{% chapter={ afterindent=true, - pagestyle={\ifthu@degree@bachelor thu@plain\else thu@headings\fi}, beforeskip={\ifthu@degree@bachelor 15bp\else 9bp\fi}, aftername=\hskip\ccwd, afterskip={\ifthu@degree@bachelor 20bp\else 24bp\fi}, @@ -1274,7 +1276,6 @@ } \renewcommand\maketitle{% \cleardoublepage - \pagestyle{thu@empty}% \pagenumbering{Alph}% \thu@pdfbookmark{-1}{\thu@title}% \thu@titlepage @@ -1316,6 +1317,7 @@ bottom = 6cm, hmargin = 3.5cm, }% + \thispagestyle{empty}% \null\vskip 0.2cm% \begingroup \centering @@ -1340,6 +1342,7 @@ bottom = 6cm, hmargin = 3.5cm, }% + \thispagestyle{empty}% \null\vskip 0.45cm% \begingroup \centering @@ -1468,6 +1471,7 @@ bottom = 5cm, hmargin = 3.6cm, }% + \thispagestyle{empty}% \ifthu@degree@type@academic \thu@titlepage@en@graduate@academic \else @@ -1574,6 +1578,7 @@ vmargin = 2.54cm, hmargin = 3.17cm, }% + \thispagestyle{empty}% \null\vskip 0.44cm% \begingroup \centering @@ -1635,6 +1640,7 @@ \restoregeometry } \newcommand\thu@cover@postdoc{% + \thispagestyle{empty}% \begin{center}% \renewcommand\ULthickness{0.7pt}% \vspace*{0.35cm}% @@ -1673,6 +1679,7 @@ \end{center}% } \newcommand\thu@titlepage@postdoc{% + \thispagestyle{empty}% \begin{center}% \vspace*{1.5cm}% \parbox[t][3cm][c]{\textwidth}{% @@ -1729,6 +1736,7 @@ \newcommand\copyrightpage[1][]{% \ifthu@degree@postdoc\relax\else \cleardoublepage + \thispagestyle{empty}% \thu@pdfbookmark{0}{\thu@authorization@title}% \def\thu@@tmp{#1} \ifx\thu@@tmp\@empty @@ -1743,6 +1751,7 @@ \end{list}% \fi% \else + \thu@phantomsection \includepdf{#1}% \fi \fi @@ -1862,6 +1871,16 @@ \cleardoublepage \fi } +\thu@define@key{ + statement-page-number = { + name = statement@page@number, + choices = { + false, + true, + }, + default = false, + }, +} \newcommand\statement[1][]{% \ifthu@degree@bachelor \cleardoublepage @@ -1869,6 +1888,9 @@ \def\thu@@tmp{#1}% \ifx\thu@@tmp\@empty \thu@chapter*{\thu@statement@name}% + \ifthu@statement@page@number@false + \thispagestyle{nofooter}% + \fi \thu@statement@text\par \ifthu@degree@graduate \vskip 2cm% @@ -1878,7 +1900,8 @@ {\hfill\thu@signature\thu@underline[2.5cm]\relax \thu@backdate\thu@underline[2.5cm]\relax}% \else - \includepdf[pagecommand={\thispagestyle{thu@empty}% + \includepdf[pagecommand={% + \thu@phantomsection \addcontentsline{toc}{chapter}{\thu@statement@name}% }]{#1}% \fi @@ -1999,7 +2022,7 @@ \g@addto@macro\appendix{% \thusetup{ toc-depth = 0, - } + }% } \newenvironment{survey}{% \chapter{外文资料的调研阅读报告}% @@ -2105,6 +2128,11 @@ \setlist[achievements]{label=[\arabic*],align=left,nosep,itemsep=8bp, leftmargin=10mm,labelsep=!,before=\xiaosi[1.26]} \def\publicationskip{\bigskip\bigskip} +\newcommand{\record}[1]{% + \clearpage + \thu@pdfbookmark{0}{综合论文训练记录表}% + \includepdf[pages=-]{#1}% +} \AtEndOfPackageFile*{hyperref}{ \hypersetup{ linktoc = all, diff --git a/Master/texmf-dist/tex/latex/thuthesis/tsinghua-name-bachelor.pdf b/Master/texmf-dist/tex/latex/thuthesis/tsinghua-name-bachelor.pdf new file mode 100644 index 00000000000..ac5b3582597 Binary files /dev/null and b/Master/texmf-dist/tex/latex/thuthesis/tsinghua-name-bachelor.pdf differ -- cgit v1.2.3