From 40edbd1a04173ee748a58a791efdb235969b3fc4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 May 2024 20:14:53 +0000 Subject: thuthesis (20may24) git-svn-id: svn://tug.org/texlive/trunk@71311 c570f23f-e606-0410-a88d-b1316a301751 --- .../bibtex/bst/thuthesis/thuthesis-author-year.bst | 24 ++++++++++---------- .../bibtex/bst/thuthesis/thuthesis-bachelor.bst | 24 ++++++++++---------- .../bibtex/bst/thuthesis/thuthesis-numeric.bst | 24 ++++++++++---------- Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md | 14 +++++++++++- .../doc/latex/thuthesis/thuthesis-example.pdf | Bin 408220 -> 407055 bytes .../texmf-dist/doc/latex/thuthesis/thuthesis.pdf | Bin 1188909 -> 1190791 bytes .../source/latex/thuthesis/thuthesis.dtx | 25 +++++++++++++-------- .../texmf-dist/tex/latex/thuthesis/thuthesis.cls | 19 +++++++++++----- 8 files changed, 78 insertions(+), 52 deletions(-) diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst index 9a46a4e461e..03d02861f48 100644 --- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst +++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst @@ -1314,7 +1314,7 @@ FUNCTION {extract.after.slash} FUNCTION {format.year} { year empty$ not - { year extract.before.slash extra.label * } + { year extra.label * } { date empty$ not { date extract.before.dash extra.label * } { entry.is.electronic not @@ -1494,7 +1494,7 @@ FUNCTION {format.periodical.year.volume.number} FUNCTION {check.url} { url empty$ not - { "\url{" url * "}" * 'entry.url := + { url 'entry.url := #1 'entry.is.electronic := } { howpublished empty$ not @@ -1525,7 +1525,11 @@ FUNCTION {output.url} { show.url is.pure.electronic or entry.url empty$ not and { new.block - entry.url output + entry.url #1 #5 substring$ "\url{" = + { entry.url } + { "\url{" entry.url * "}" * } + if$ + output } 'skip$ if$ @@ -1545,8 +1549,8 @@ FUNCTION {is.in.url} { entry.url empty$ { #0 } { s text.length$ 'len := - entry.url text.length$ 'charptr := - { entry.url charptr len substring$ s = not + entry.url "l" change.case$ text.length$ 'charptr := + { entry.url "l" change.case$ charptr len substring$ s "l" change.case$ = not charptr #0 > and } @@ -2073,7 +2077,7 @@ FUNCTION {map} FUNCTION {manual} { monograph } -FUNCTION {thesis} +FUNCTION {mastersthesis} { "D" set.entry.mark monograph } @@ -2088,9 +2092,7 @@ FUNCTION {online} electronic } -FUNCTION {mastersthesis} { thesis } - -FUNCTION {phdthesis} { thesis } +FUNCTION {phdthesis} { mastersthesis } FUNCTION {proceedings} { "C" set.entry.mark @@ -2107,13 +2109,11 @@ FUNCTION {standard} misc } -FUNCTION {report} +FUNCTION {techreport} { "R" set.entry.mark misc } -FUNCTION {techreport} { report } - FUNCTION {unpublished} { misc } FUNCTION {default.type} { misc } diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst index 67e1f7eeb33..aea8c151bf8 100644 --- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst +++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst @@ -1304,7 +1304,7 @@ FUNCTION {extract.after.slash} FUNCTION {format.year} { year empty$ not - { year extract.before.slash extra.label * } + { year extra.label * } { date empty$ not { date extract.before.dash extra.label * } { entry.is.electronic not @@ -1484,7 +1484,7 @@ FUNCTION {format.periodical.year.volume.number} FUNCTION {check.url} { url empty$ not - { "\url{" url * "}" * 'entry.url := + { url 'entry.url := #1 'entry.is.electronic := } { howpublished empty$ not @@ -1515,7 +1515,11 @@ FUNCTION {output.url} { show.url is.pure.electronic or entry.url empty$ not and { new.block - entry.url output + entry.url #1 #5 substring$ "\url{" = + { entry.url } + { "\url{" entry.url * "}" * } + if$ + output } 'skip$ if$ @@ -1535,8 +1539,8 @@ FUNCTION {is.in.url} { entry.url empty$ { #0 } { s text.length$ 'len := - entry.url text.length$ 'charptr := - { entry.url charptr len substring$ s = not + entry.url "l" change.case$ text.length$ 'charptr := + { entry.url "l" change.case$ charptr len substring$ s "l" change.case$ = not charptr #0 > and } @@ -2063,7 +2067,7 @@ FUNCTION {map} FUNCTION {manual} { monograph } -FUNCTION {thesis} +FUNCTION {mastersthesis} { "D" set.entry.mark monograph } @@ -2078,9 +2082,7 @@ FUNCTION {online} electronic } -FUNCTION {mastersthesis} { thesis } - -FUNCTION {phdthesis} { thesis } +FUNCTION {phdthesis} { mastersthesis } FUNCTION {proceedings} { "C" set.entry.mark @@ -2097,13 +2099,11 @@ FUNCTION {standard} misc } -FUNCTION {report} +FUNCTION {techreport} { "R" set.entry.mark misc } -FUNCTION {techreport} { report } - FUNCTION {unpublished} { misc } FUNCTION {default.type} { misc } diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst index b27da61efc1..6d24c4465ea 100644 --- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst +++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst @@ -1304,7 +1304,7 @@ FUNCTION {extract.after.slash} FUNCTION {format.year} { year empty$ not - { year extract.before.slash extra.label * } + { year extra.label * } { date empty$ not { date extract.before.dash extra.label * } { entry.is.electronic not @@ -1484,7 +1484,7 @@ FUNCTION {format.periodical.year.volume.number} FUNCTION {check.url} { url empty$ not - { "\url{" url * "}" * 'entry.url := + { url 'entry.url := #1 'entry.is.electronic := } { howpublished empty$ not @@ -1515,7 +1515,11 @@ FUNCTION {output.url} { show.url is.pure.electronic or entry.url empty$ not and { new.block - entry.url output + entry.url #1 #5 substring$ "\url{" = + { entry.url } + { "\url{" entry.url * "}" * } + if$ + output } 'skip$ if$ @@ -1535,8 +1539,8 @@ FUNCTION {is.in.url} { entry.url empty$ { #0 } { s text.length$ 'len := - entry.url text.length$ 'charptr := - { entry.url charptr len substring$ s = not + entry.url "l" change.case$ text.length$ 'charptr := + { entry.url "l" change.case$ charptr len substring$ s "l" change.case$ = not charptr #0 > and } @@ -2063,7 +2067,7 @@ FUNCTION {map} FUNCTION {manual} { monograph } -FUNCTION {thesis} +FUNCTION {mastersthesis} { "D" set.entry.mark monograph } @@ -2078,9 +2082,7 @@ FUNCTION {online} electronic } -FUNCTION {mastersthesis} { thesis } - -FUNCTION {phdthesis} { thesis } +FUNCTION {phdthesis} { mastersthesis } FUNCTION {proceedings} { "C" set.entry.mark @@ -2097,13 +2099,11 @@ FUNCTION {standard} misc } -FUNCTION {report} +FUNCTION {techreport} { "R" set.entry.mark misc } -FUNCTION {techreport} { report } - FUNCTION {unpublished} { misc } FUNCTION {default.type} { misc } diff --git a/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md b/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md index 9864c944bc1..fb293105fc3 100644 --- a/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md @@ -6,6 +6,17 @@ ## [Unreleased] +## [v7.5.1] - 2024-05-20 + +### Changed + +- 更新 `student-id` 选项的处理逻辑,非 `proposal` 类型默认忽略,并增加警告([#945](https://github.com/tuna/thuthesis/issues/945))。 + +### Fixed + +- 修复参考文献 URL 中带有 DOI 时,重复打印 DOI 的问题([#952](https://github.com/tuna/thuthesis/discussions/952))。 +- 修复文档中的部分错别字。 + ## [v7.5.0] - 2024-03-29 ### Added @@ -977,7 +988,8 @@ -[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.5.0...HEAD +[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.5.1...HEAD +[v7.5.1]: https://github.com/tuna/thuthesis/compare/v7.5.0...v7.5.1 [v7.5.0]: https://github.com/tuna/thuthesis/compare/v7.4.0...v7.5.0 [v7.4.0]: https://github.com/tuna/thuthesis/compare/v7.3.2...v7.4.0 [v7.3.2]: https://github.com/tuna/thuthesis/compare/v7.3.1...v7.3.2 diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf index 1a4d6b72b00..2c48ce2ef57 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.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf index 9f55312fdd5..daa32de045d 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 6e25d0cdfbd..ea4ac03f229 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}[2024/03/29 7.5.0 Tsinghua University Thesis Template] +\ProvidesFile{thuthesis.dtx}[2024/05/20 7.5.1 Tsinghua University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -1243,8 +1243,8 @@ % include-spine = true, % } % \end{latex} -% 打开此选项后,书籍会出现在中文封面后面的第一个空白页。如果有英文封面,则在英文封面之前。 -% 如果需要书籍出现在其他位置,请手工使用 \cs{spine} 生成,不要使用此选项。 +% 打开此选项后,书脊会出现在中文封面后面的第一个空白页。如果有英文封面,则在英文封面之前。 +% 如果需要书脊出现在其他位置,请手工使用 \cs{spine} 生成,不要使用此选项。 % % \section{致谢} % \label{sec:thanks} @@ -1269,7 +1269,7 @@ % \begin{macrocode} %\NeedsTeXFormat{LaTeX2e}[2017/04/15] %\ProvidesClass{thuthesis} -%[2024/03/29 7.5.0 Tsinghua University Thesis Template] +%[2024/05/20 7.5.1 Tsinghua University Thesis Template] % \end{macrocode} % % 报错 @@ -1330,7 +1330,7 @@ %<*cls> \hyphenation{Thu-Thesis} \def\thuthesis{ThuThesis} -\def\version{7.5.0} +\def\version{7.5.1} \RequirePackage{kvdefinekeys} \RequirePackage{kvsetkeys} \RequirePackage{kvoptions} @@ -4584,14 +4584,15 @@ \restoregeometry } \newcommand\thu@set@student@id{% - \ifthu@thesis@type@proposal - \ifx\thu@student@id\@empty - \thusetup{student-id=2000310000}% + \ifthu@thesis@type@proposal\else + \ifx\thu@student@id\@empty\else + \thu@warning{`student-id' in "\protect\thusetup" would be ignored when `thesis-type' is not proposal.}% \fi \fi } \thu@set@student@id \thu@option@hook{thesis-type}{\thu@set@student@id} +\thu@option@hook{student-id}{\thu@set@student@id} % \end{macrocode} % % 涉密信息 @@ -4656,7 +4657,13 @@ \thu@info@item{工程领域}{}{\thu@engineering@field}% \thu@info@item{申请人}{\thu@name@title}{\thu@author}% \fi - \thu@info@item{学号}{}{\thu@student@id}% + \ifthu@thesis@type@proposal + \ifx\thu@student@id\@empty + \thu@warning{Missing option `student-id' in "\protect\thusetup", ID will not appear on cover.} + \else + \thu@info@item{学号}{}{\thu@student@id}% + \fi + \fi \thu@info@item{指导教师}{\thu@name@title}{\thu@supervisor}% \thu@info@item{副指导教师}{\thu@name@title}{\thu@associate@supervisor}% \thu@info@item{联合指导教师}{\thu@name@title}{\thu@co@supervisor}% diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls index 21ba7d4aee8..bd8d4dd3eaf 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} -[2024/03/29 7.5.0 Tsinghua University Thesis Template] +[2024/05/20 7.5.1 Tsinghua University Thesis Template] \newcommand\thu@error[1]{% \ClassError{thuthesis}{#1}{}% } @@ -61,7 +61,7 @@ } \hyphenation{Thu-Thesis} \def\thuthesis{ThuThesis} -\def\version{7.5.0} +\def\version{7.5.1} \RequirePackage{kvdefinekeys} \RequirePackage{kvsetkeys} \RequirePackage{kvoptions} @@ -2441,14 +2441,15 @@ \restoregeometry } \newcommand\thu@set@student@id{% - \ifthu@thesis@type@proposal - \ifx\thu@student@id\@empty - \thusetup{student-id=2000310000}% + \ifthu@thesis@type@proposal\else + \ifx\thu@student@id\@empty\else + \thu@warning{`student-id' in "\protect\thusetup" would be ignored when `thesis-type' is not proposal.}% \fi \fi } \thu@set@student@id \thu@option@hook{thesis-type}{\thu@set@student@id} +\thu@option@hook{student-id}{\thu@set@student@id} \newcommand\thu@titlepage@secret{% \sffamily\sanhao \ifx\thu@secret@level\@empty @@ -2500,7 +2501,13 @@ \thu@info@item{工程领域}{}{\thu@engineering@field}% \thu@info@item{申请人}{\thu@name@title}{\thu@author}% \fi - \thu@info@item{学号}{}{\thu@student@id}% + \ifthu@thesis@type@proposal + \ifx\thu@student@id\@empty + \thu@warning{Missing option `student-id' in "\protect\thusetup", ID will not appear on cover.} + \else + \thu@info@item{学号}{}{\thu@student@id}% + \fi + \fi \thu@info@item{指导教师}{\thu@name@title}{\thu@supervisor}% \thu@info@item{副指导教师}{\thu@name@title}{\thu@associate@supervisor}% \thu@info@item{联合指导教师}{\thu@name@title}{\thu@co@supervisor}% -- cgit v1.2.3