texlive[64628] Master/texmf-dist: thuthesis (5oct22)
commits+karl at tug.org
commits+karl at tug.org
Wed Oct 5 21:51:26 CEST 2022
Revision: 64628
http://tug.org/svn/texlive?view=revision&revision=64628
Author: karl
Date: 2022-10-05 21:51:26 +0200 (Wed, 05 Oct 2022)
Log Message:
-----------
thuthesis (5oct22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/thuthesis/data/comments.tex
trunk/Master/texmf-dist/doc/latex/thuthesis/spine.pdf
trunk/Master/texmf-dist/doc/latex/thuthesis/thusetup.tex
trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf
trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex
trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
trunk/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
trunk/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md 2022-10-05 19:50:51 UTC (rev 64627)
+++ trunk/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md 2022-10-05 19:51:26 UTC (rev 64628)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/data/comments.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/thuthesis/data/comments.tex 2022-10-05 19:50:51 UTC (rev 64627)
+++ trunk/Master/texmf-dist/doc/latex/thuthesis/data/comments.tex 2022-10-05 19:51:26 UTC (rev 64628)
@@ -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}]
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/spine.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/thusetup.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/thuthesis/thusetup.tex 2022-10-05 19:50:51 UTC (rev 64627)
+++ trunk/Master/texmf-dist/doc/latex/thuthesis/thusetup.tex 2022-10-05 19:51:26 UTC (rev 64628)
@@ -116,7 +116,7 @@
%
% 数学字体
% math-style = GB, % GB | ISO | TeX
- math-font = xits, % sitx | xits | libertinus
+ math-font = xits, % stix | xits | libertinus
}
% 可以使用 nomencl 生成符号和缩略语说明
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex 2022-10-05 19:50:51 UTC (rev 64627)
+++ trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex 2022-10-05 19:51:26 UTC (rev 64628)
@@ -87,7 +87,7 @@
% 本科生可以附个人简历，也可以不附个人简历
\input{data/resume}
-% 指导教师/指导小组学术评语
+% 指导教师/指导小组评语
% 本科生不需要
\input{data/comments}
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx 2022-10-05 19:50:51 UTC (rev 64627)
+++ trunk/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx 2022-10-05 19:51:26 UTC (rev 64628)
@@ -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}
%<cls>\NeedsTeXFormat{LaTeX2e}[2017/04/15]
%<cls>\ProvidesClass{thuthesis}
-%<cls>[2022/05/17 7.3.0 Tsinghua University Thesis Template]
+%<cls>[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 at set@chapter at names{%
\ifthu at main@language at chinese
- \def\thu at comments@name{指导教师学术评语}%
+ \def\thu at 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 at committee}{#1}%
\ifx\thu at committee@file\@empty
\begingroup
- \ifthu at main@language at 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 at chapter*[]{\thu at committee@name}%
+ \thispagestyle{empty}%
+ \thusetup{language=chinese}%
+ \BODY\clearpage
+ \thu at reset@main at language
\endgroup
\else
\thu at pdfbookmark{0}{\thu at committee@name}%
\includepdf{\thu at committee@file}%
\fi
- \thispagestyle{empty}%
- \ctexset{
- section = {
- format += {\centering},
- numbering = false,
- afterindent = false,
- },
- }%
- \thusetup{language=chinese}
- \BODY\clearpage
- \thu at reset@main at language
\fi
}
% \end{macrocode}
@@ -5965,14 +5968,15 @@
% 造成 \env{survey} 的子目录中 |tocdepth| 为 0。
% \begin{macrocode}
\thu at option@hook{toc-depth}{%
- \protected at write\@auxout{}{%
- \string\ttl at writefile{toc}{%
- \protect\setcounter{tocdepth}{\thu at toc@depth}%
+ \ifx\@begindocumenthook\@undefined
+ \protected at write\@auxout{}{%
+ \string\ttl at writefile{toc}{%
+ \protect\setcounter{tocdepth}{\thu at toc@depth}%
+ }%
}%
- }%
- \addtocontents{lof}{\string\let\string\contentsline\string\ttl at gobblecontents}
- \addtocontents{lot}{\string\let\string\contentsline\string\ttl at gobblecontents}
- \addtocontents{loe}{\string\let\string\contentsline\string\ttl at gobblecontents}
+ \else
+ \setcounter{tocdepth}{\thu at toc@depth}%
+ \fi
}
\g at addto@macro\appendix{%
\thusetup{
@@ -5981,6 +5985,36 @@
}
% \end{macrocode}
%
+% 附录中的图、表不列入插图清单/附表清单。
+% \begin{macrocode}
+\thu at define@key{
+ appendix-figure-in-lof = {
+ name = appendix at figure@in at lof,
+ choices = {
+ true,
+ false,
+ },
+ default = false,
+ },
+}
+\thu at option@hook{appendix-figure-in-lof}{%
+ \ifthu at appendix@figure at in@lof at true
+ \addtocontents{lof}{\string\let\string\contentsline\string\ttl at contentsline}%
+ \addtocontents{lot}{\string\let\string\contentsline\string\ttl at contentsline}%
+ \addtocontents{loe}{\string\let\string\contentsline\string\ttl at contentsline}%
+ \else
+ \addtocontents{lof}{\string\let\string\contentsline\string\ttl at gobblecontents}%
+ \addtocontents{lot}{\string\let\string\contentsline\string\ttl at gobblecontents}%
+ \addtocontents{loe}{\string\let\string\contentsline\string\ttl at gobblecontents}%
+ \fi
+}
+\g at addto@macro\appendix{%
+ \thusetup{
+ appendix-figure-in-lof = false,
+ }%
+}
+% \end{macrocode}
+%
% 本科生《写作指南》有独特的要求：附录 A 为外文资料的调研阅读报告或书面翻译，
% 并且要分别附上独立的参考文献和外文资料的原文索引。
% 所以这里定义 \env{survey} 和 \env{translation} 专门处理这两种情况，
Modified: trunk/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls 2022-10-05 19:50:51 UTC (rev 64627)
+++ trunk/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls 2022-10-05 19:51:26 UTC (rev 64628)
@@ -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 at 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 at set@chapter at names{%
\ifthu at main@language at chinese
- \def\thu at comments@name{指导教师学术评语}%
+ \def\thu at 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 at committee}{#1}%
\ifx\thu at committee@file\@empty
\begingroup
- \ifthu at main@language at 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 at chapter*[]{\thu at committee@name}%
+ \thispagestyle{empty}%
+ \thusetup{language=chinese}%
+ \BODY\clearpage
+ \thu at reset@main at language
\endgroup
\else
\thu at pdfbookmark{0}{\thu at committee@name}%
\includepdf{\thu at committee@file}%
\fi
- \thispagestyle{empty}%
- \ctexset{
- section = {
- format += {\centering},
- numbering = false,
- afterindent = false,
- },
- }%
- \thusetup{language=chinese}
- \BODY\clearpage
- \thu at reset@main at language
\fi
}
\newcommand\copyrightpage[1][]{%
@@ -3545,14 +3548,15 @@
},
}
\thu at option@hook{toc-depth}{%
- \protected at write\@auxout{}{%
- \string\ttl at writefile{toc}{%
- \protect\setcounter{tocdepth}{\thu at toc@depth}%
+ \ifx\@begindocumenthook\@undefined
+ \protected at write\@auxout{}{%
+ \string\ttl at writefile{toc}{%
+ \protect\setcounter{tocdepth}{\thu at toc@depth}%
+ }%
}%
- }%
- \addtocontents{lof}{\string\let\string\contentsline\string\ttl at gobblecontents}
- \addtocontents{lot}{\string\let\string\contentsline\string\ttl at gobblecontents}
- \addtocontents{loe}{\string\let\string\contentsline\string\ttl at gobblecontents}
+ \else
+ \setcounter{tocdepth}{\thu at toc@depth}%
+ \fi
}
\g at addto@macro\appendix{%
\thusetup{
@@ -3559,6 +3563,32 @@
toc-depth = 0,
}%
}
+\thu at define@key{
+ appendix-figure-in-lof = {
+ name = appendix at figure@in at lof,
+ choices = {
+ true,
+ false,
+ },
+ default = false,
+ },
+}
+\thu at option@hook{appendix-figure-in-lof}{%
+ \ifthu at appendix@figure at in@lof at true
+ \addtocontents{lof}{\string\let\string\contentsline\string\ttl at contentsline}%
+ \addtocontents{lot}{\string\let\string\contentsline\string\ttl at contentsline}%
+ \addtocontents{loe}{\string\let\string\contentsline\string\ttl at contentsline}%
+ \else
+ \addtocontents{lof}{\string\let\string\contentsline\string\ttl at gobblecontents}%
+ \addtocontents{lot}{\string\let\string\contentsline\string\ttl at gobblecontents}%
+ \addtocontents{loe}{\string\let\string\contentsline\string\ttl at gobblecontents}%
+ \fi
+}
+\g at addto@macro\appendix{%
+ \thusetup{
+ appendix-figure-in-lof = false,
+ }%
+}
\@ifpackagelater{titletoc}{2019/07/14}{
\newcommand\thu at print@contents[5]{%
\printcontents[#1]{#2}{#3}[#4]{}%
More information about the tex-live-commits
mailing list.