From 464ad5ebeaa7bfb53ea98379a2448f53b5045dd3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 5 Oct 2022 19:51:26 +0000 Subject: thuthesis (5oct22) git-svn-id: svn://tug.org/texlive/trunk@64628 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md | 18 ++++- .../doc/latex/thuthesis/data/comments.tex | 2 +- Master/texmf-dist/doc/latex/thuthesis/spine.pdf | Bin 18834 -> 22049 bytes Master/texmf-dist/doc/latex/thuthesis/thusetup.tex | 2 +- .../doc/latex/thuthesis/thuthesis-example.pdf | Bin 377654 -> 405276 bytes .../doc/latex/thuthesis/thuthesis-example.tex | 2 +- .../texmf-dist/doc/latex/thuthesis/thuthesis.pdf | Bin 1017096 -> 1165260 bytes .../source/latex/thuthesis/thuthesis.dtx | 86 ++++++++++++++------- .../texmf-dist/tex/latex/thuthesis/thuthesis.cls | 80 +++++++++++++------ 9 files changed, 135 insertions(+), 55 deletions(-) diff --git a/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md b/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md index e7883b5e175..36394921bd2 100644 --- a/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md @@ -6,6 +6,21 @@ ## [Unreleased] +## [v7.3.1] - 2022-10-05 + +### Added + +- 增加选项 `appendix-figure-in-lof` 控制附录中的图/表是否列入插图清单/附表清单。 + +### Changed + +- 修改“指导教师/小组评语”章节的名称,同步《指南》2022 年 9 月版的修改。 + +### Fixed + +- 修正答辩委员会名单页的行距。 +- 修复导言区中设置 `toc-depth` 导致空白插图清单的 bug。 + ## [v7.3.0] - 2022-05-17 ### Added @@ -902,7 +917,8 @@ -[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.3.0...HEAD +[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.3.1...HEAD +[v7.3.1]: https://github.com/tuna/thuthesis/compare/v7.3.0...v7.3.1 [v7.3.0]: https://github.com/tuna/thuthesis/compare/v7.2.4...v7.3.0 [v7.2.4]: https://github.com/tuna/thuthesis/compare/v7.2.3...v7.2.4 [v7.2.3]: https://github.com/tuna/thuthesis/compare/v7.2.2...v7.2.3 diff --git a/Master/texmf-dist/doc/latex/thuthesis/data/comments.tex b/Master/texmf-dist/doc/latex/thuthesis/data/comments.tex index 832d18dd0e3..a2431be4d30 100644 --- a/Master/texmf-dist/doc/latex/thuthesis/data/comments.tex +++ b/Master/texmf-dist/doc/latex/thuthesis/data/comments.tex @@ -1,7 +1,7 @@ % !TeX root = ../thuthesis-example.tex \begin{comments} -% \begin{comments}[name = {指导小组学术评语}] +% \begin{comments}[name = {指导小组评语}] % \begin{comments}[name = {Comments from Thesis Supervisor}] % \begin{comments}[name = {Comments from Thesis Supervision Committee}] diff --git a/Master/texmf-dist/doc/latex/thuthesis/spine.pdf b/Master/texmf-dist/doc/latex/thuthesis/spine.pdf index de169dda9be..99892546a70 100644 Binary files a/Master/texmf-dist/doc/latex/thuthesis/spine.pdf and b/Master/texmf-dist/doc/latex/thuthesis/spine.pdf differ diff --git a/Master/texmf-dist/doc/latex/thuthesis/thusetup.tex b/Master/texmf-dist/doc/latex/thuthesis/thusetup.tex index 718667f9690..6a21d8c1a0c 100644 --- a/Master/texmf-dist/doc/latex/thuthesis/thusetup.tex +++ b/Master/texmf-dist/doc/latex/thuthesis/thusetup.tex @@ -116,7 +116,7 @@ % % 数学字体 % math-style = GB, % GB | ISO | TeX - math-font = xits, % sitx | xits | libertinus + math-font = xits, % stix | xits | libertinus } % 可以使用 nomencl 生成符号和缩略语说明 diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf index 4345c0a1cc5..67b5ea52b6f 100644 Binary files a/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf and b/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex b/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex index 39edf3af3e7..8c3061a0ed5 100644 --- a/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex +++ b/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex @@ -87,7 +87,7 @@ % 本科生可以附个人简历,也可以不附个人简历 \input{data/resume} -% 指导教师/指导小组学术评语 +% 指导教师/指导小组评语 % 本科生不需要 \input{data/comments} diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf index 57cc881d947..6ad0c57c0ec 100644 Binary files a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf and b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf differ diff --git a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx index d273a1add84..17d61b37e85 100644 --- a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx +++ b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx @@ -14,7 +14,7 @@ % % \iffalse %<*driver> -\ProvidesFile{thuthesis.dtx}[2022/05/17 7.3.0 Tsinghua University Thesis Template] +\ProvidesFile{thuthesis.dtx}[2022/10/05 7.3.1 Tsinghua University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -1248,7 +1248,7 @@ % \begin{macrocode} %\NeedsTeXFormat{LaTeX2e}[2017/04/15] %\ProvidesClass{thuthesis} -%[2022/05/17 7.3.0 Tsinghua University Thesis Template] +%[2022/10/05 7.3.1 Tsinghua University Thesis Template] % \end{macrocode} % % 报错 @@ -1306,7 +1306,7 @@ %<*cls> \hyphenation{Thu-Thesis} \def\thuthesis{ThuThesis} -\def\version{7.3.0} +\def\version{7.3.1} \RequirePackage{kvdefinekeys} \RequirePackage{kvsetkeys} \RequirePackage{kvoptions} @@ -1939,7 +1939,7 @@ % \begin{macrocode} \newcommand\thu@set@chapter@names{% \ifthu@main@language@chinese - \def\thu@comments@name{指导教师学术评语}% + \def\thu@comments@name{指导教师评语}% \def\bibname{参考文献}% \def\appendixname{附录}% \def\indexname{索引}% @@ -2650,7 +2650,7 @@ UprightFont = * Light, UprightFont = * Bold, ]% - \setCJKfamilyfont{zhhei}{Noto Sans CJK SC}[BoldFont * Medium]% + \setCJKfamilyfont{zhhei}{Noto Sans CJK SC}[BoldFont = * Medium]% \setCJKfamilyfont{zhfs}{FandolFang}[ Extension = .otf, UprightFont = *-Regular, @@ -4967,26 +4967,29 @@ \kvsetkeys{thu@committee}{#1}% \ifx\thu@committee@file\@empty \begingroup - \ifthu@main@language@english - \ctexset{chapter/format=\centering\sffamily\fontsize{16bp}{20bp}\selectfont} - \fi + \ctexset{ + chapter = { + format = \centering\sffamily\fontsize{16bp}{20bp}\selectfont, + afterskip = 49bp, + }, + section = { + beforeskip = 26bp, + afterskip = 9.5bp, + format += \centering, + numbering = false, + afterindent = false, + }, + }% \thu@chapter*[]{\thu@committee@name}% + \thispagestyle{empty}% + \thusetup{language=chinese}% + \BODY\clearpage + \thu@reset@main@language \endgroup \else \thu@pdfbookmark{0}{\thu@committee@name}% \includepdf{\thu@committee@file}% \fi - \thispagestyle{empty}% - \ctexset{ - section = { - format += {\centering}, - numbering = false, - afterindent = false, - }, - }% - \thusetup{language=chinese} - \BODY\clearpage - \thu@reset@main@language \fi } % \end{macrocode} @@ -5965,14 +5968,15 @@ % 造成 \env{survey} 的子目录中 |tocdepth| 为 0。 % \begin{macrocode} \thu@option@hook{toc-depth}{% - \protected@write\@auxout{}{% - \string\ttl@writefile{toc}{% - \protect\setcounter{tocdepth}{\thu@toc@depth}% + \ifx\@begindocumenthook\@undefined + \protected@write\@auxout{}{% + \string\ttl@writefile{toc}{% + \protect\setcounter{tocdepth}{\thu@toc@depth}% + }% }% - }% - \addtocontents{lof}{\string\let\string\contentsline\string\ttl@gobblecontents} - \addtocontents{lot}{\string\let\string\contentsline\string\ttl@gobblecontents} - \addtocontents{loe}{\string\let\string\contentsline\string\ttl@gobblecontents} + \else + \setcounter{tocdepth}{\thu@toc@depth}% + \fi } \g@addto@macro\appendix{% \thusetup{ @@ -5981,6 +5985,36 @@ } % \end{macrocode} % +% 附录中的图、表不列入插图清单/附表清单。 +% \begin{macrocode} +\thu@define@key{ + appendix-figure-in-lof = { + name = appendix@figure@in@lof, + choices = { + true, + false, + }, + default = false, + }, +} +\thu@option@hook{appendix-figure-in-lof}{% + \ifthu@appendix@figure@in@lof@true + \addtocontents{lof}{\string\let\string\contentsline\string\ttl@contentsline}% + \addtocontents{lot}{\string\let\string\contentsline\string\ttl@contentsline}% + \addtocontents{loe}{\string\let\string\contentsline\string\ttl@contentsline}% + \else + \addtocontents{lof}{\string\let\string\contentsline\string\ttl@gobblecontents}% + \addtocontents{lot}{\string\let\string\contentsline\string\ttl@gobblecontents}% + \addtocontents{loe}{\string\let\string\contentsline\string\ttl@gobblecontents}% + \fi +} +\g@addto@macro\appendix{% + \thusetup{ + appendix-figure-in-lof = false, + }% +} +% \end{macrocode} +% % 本科生《写作指南》有独特的要求:附录 A 为外文资料的调研阅读报告或书面翻译, % 并且要分别附上独立的参考文献和外文资料的原文索引。 % 所以这里定义 \env{survey} 和 \env{translation} 专门处理这两种情况, diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls index 5bcd3074a8d..3f547053f37 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} -[2022/05/17 7.3.0 Tsinghua University Thesis Template] +[2022/10/05 7.3.1 Tsinghua University Thesis Template] \newcommand\thu@error[1]{% \ClassError{thuthesis}{#1}{}% } @@ -58,7 +58,7 @@ } \hyphenation{Thu-Thesis} \def\thuthesis{ThuThesis} -\def\version{7.3.0} +\def\version{7.3.1} \RequirePackage{kvdefinekeys} \RequirePackage{kvsetkeys} \RequirePackage{kvoptions} @@ -456,7 +456,7 @@ } \newcommand\thu@set@chapter@names{% \ifthu@main@language@chinese - \def\thu@comments@name{指导教师学术评语}% + \def\thu@comments@name{指导教师评语}% \def\bibname{参考文献}% \def\appendixname{附录}% \def\indexname{索引}% @@ -998,7 +998,7 @@ UprightFont = * Light, UprightFont = * Bold, ]% - \setCJKfamilyfont{zhhei}{Noto Sans CJK SC}[BoldFont * Medium]% + \setCJKfamilyfont{zhhei}{Noto Sans CJK SC}[BoldFont = * Medium]% \setCJKfamilyfont{zhfs}{FandolFang}[ Extension = .otf, UprightFont = *-Regular, @@ -2798,26 +2798,29 @@ \kvsetkeys{thu@committee}{#1}% \ifx\thu@committee@file\@empty \begingroup - \ifthu@main@language@english - \ctexset{chapter/format=\centering\sffamily\fontsize{16bp}{20bp}\selectfont} - \fi + \ctexset{ + chapter = { + format = \centering\sffamily\fontsize{16bp}{20bp}\selectfont, + afterskip = 49bp, + }, + section = { + beforeskip = 26bp, + afterskip = 9.5bp, + format += \centering, + numbering = false, + afterindent = false, + }, + }% \thu@chapter*[]{\thu@committee@name}% + \thispagestyle{empty}% + \thusetup{language=chinese}% + \BODY\clearpage + \thu@reset@main@language \endgroup \else \thu@pdfbookmark{0}{\thu@committee@name}% \includepdf{\thu@committee@file}% \fi - \thispagestyle{empty}% - \ctexset{ - section = { - format += {\centering}, - numbering = false, - afterindent = false, - }, - }% - \thusetup{language=chinese} - \BODY\clearpage - \thu@reset@main@language \fi } \newcommand\copyrightpage[1][]{% @@ -3545,20 +3548,47 @@ }, } \thu@option@hook{toc-depth}{% - \protected@write\@auxout{}{% - \string\ttl@writefile{toc}{% - \protect\setcounter{tocdepth}{\thu@toc@depth}% + \ifx\@begindocumenthook\@undefined + \protected@write\@auxout{}{% + \string\ttl@writefile{toc}{% + \protect\setcounter{tocdepth}{\thu@toc@depth}% + }% }% - }% - \addtocontents{lof}{\string\let\string\contentsline\string\ttl@gobblecontents} - \addtocontents{lot}{\string\let\string\contentsline\string\ttl@gobblecontents} - \addtocontents{loe}{\string\let\string\contentsline\string\ttl@gobblecontents} + \else + \setcounter{tocdepth}{\thu@toc@depth}% + \fi } \g@addto@macro\appendix{% \thusetup{ toc-depth = 0, }% } +\thu@define@key{ + appendix-figure-in-lof = { + name = appendix@figure@in@lof, + choices = { + true, + false, + }, + default = false, + }, +} +\thu@option@hook{appendix-figure-in-lof}{% + \ifthu@appendix@figure@in@lof@true + \addtocontents{lof}{\string\let\string\contentsline\string\ttl@contentsline}% + \addtocontents{lot}{\string\let\string\contentsline\string\ttl@contentsline}% + \addtocontents{loe}{\string\let\string\contentsline\string\ttl@contentsline}% + \else + \addtocontents{lof}{\string\let\string\contentsline\string\ttl@gobblecontents}% + \addtocontents{lot}{\string\let\string\contentsline\string\ttl@gobblecontents}% + \addtocontents{loe}{\string\let\string\contentsline\string\ttl@gobblecontents}% + \fi +} +\g@addto@macro\appendix{% + \thusetup{ + appendix-figure-in-lof = false, + }% +} \@ifpackagelater{titletoc}{2019/07/14}{ \newcommand\thu@print@contents[5]{% \printcontents[#1]{#2}{#3}[#4]{}% -- cgit v1.2.3