From c78e5eef91783026e96f25500c13e5ddc0847aec Mon Sep 17 00:00:00 2001 From: atXY Date: Tue, 6 Jun 2023 11:38:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A0=94=E7=A9=B6?= =?UTF-8?q?=E7=94=9F=E5=87=BA=E7=89=88=E6=8E=88=E6=9D=83=E4=B9=A6=E7=9A=84?= =?UTF-8?q?=E6=89=93=E5=8B=BE=E6=9C=BA=E5=88=B6=20(#223)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 8 ++++++-- docs/njuthesis-sample.tex | 2 +- docs/njuthesis-setup.def | 5 ++++- source/njuthesis.dtx | 35 ++++++++++++++++++++++++----------- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f316d72..6d4f3a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ ## [未发布] +## [1.3.0] - 2023-06-06 + ### 新增 - 新增定理类环境共享计数器选项 `theorem/share-counter` - [#207] @@ -18,6 +20,7 @@ - 修复禁用 `unicode-math` 时仍会配置数学字体的问题 - [#216] - 修复非研究生类型时调用 `nl-cover` 选项的错误 - 将本科生封面信息恢复至 v1.1 的宋体格式 +- 修复研究生出版授权书的打勾机制 - [#223] ### 杂项 @@ -494,11 +497,11 @@ - 模板上传至 CTAN -[未发布]: https://github.com/nju-lug/NJUThesis/compare/v1.2.1...HEAD +[未发布]: https://github.com/nju-lug/NJUThesis/compare/v1.3.0...HEAD +[1.3.0]: https://github.com/nju-lug/NJUThesis/compare/v1.2.1...v1.3.0 [1.2.1]: https://github.com/nju-lug/NJUThesis/compare/v1.2.0...v1.2.1 [1.2.0]: https://github.com/nju-lug/NJUThesis/compare/v1.1.2...v1.2.0 - [1.1.2]: https://github.com/nju-lug/NJUThesis/compare/v1.1.1...v1.1.2 [1.1.1]: https://github.com/nju-lug/NJUThesis/compare/v1.1.0...v1.1.1 [1.1.0]: https://github.com/nju-lug/NJUThesis/compare/v1.0.0...v1.1.0 @@ -573,6 +576,7 @@ [#208]: https://github.com/nju-lug/NJUThesis/issues/208 [#213]: https://github.com/nju-lug/NJUThesis/issues/213 [#216]: https://github.com/nju-lug/NJUThesis/issues/216 +[#223]: https://github.com/nju-lug/NJUThesis/issues/223 [更新日志]: https://keepachangelog.com/zh-CN/1.0.0/ [语义化版本]: https://semver.org/lang/zh-CN/ diff --git a/docs/njuthesis-sample.tex b/docs/njuthesis-sample.tex index 0479e12..9be8e19 100644 --- a/docs/njuthesis-sample.tex +++ b/docs/njuthesis-sample.tex @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% njuthesis 示例模板 v1.2.1 2023-05-03 +% njuthesis 示例模板 v1.3.0 2023-06-06 % https://github.com/nju-lug/NJUThesis % % 贡献者 diff --git a/docs/njuthesis-setup.def b/docs/njuthesis-setup.def index 7d347f1..e304861 100644 --- a/docs/njuthesis-setup.def +++ b/docs/njuthesis-setup.def @@ -1,4 +1,4 @@ -% njuthesis 参数设置文件 v1.3.0 2023-05-07 +% njuthesis 参数设置文件 v1.3.0 2023-06-06 % 一些提醒： % 1. \njusetup 内部千万不要有空行 @@ -50,6 +50,9 @@ major* = {Chemistry}, % 专业 % + % major = {软件工程，软件工程}, + % 专业型学位可以用第二个值覆盖封面上的默认补全版本 + % supervisor = {导师姓名,教授}, supervisor*= {Professor My Supervisor}, % 导师全称 diff --git a/source/njuthesis.dtx b/source/njuthesis.dtx index 19c4057..c2bae8e 100644 --- a/source/njuthesis.dtx +++ b/source/njuthesis.dtx @@ -112,7 +112,7 @@ To produce the documentation run the original source files ending with % %\NeedsTeXFormat{LaTeX2e} %<*!(driver|install)> -%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.3.0 2023-05-07 19:00:00 +%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.3.0 2023-06-06 11:30:00 %<+!driver> +0800 NJU LUG $ % {Thesis template for Nanjing University} %\ProvidesExplClass{njuthesis} @@ -131,7 +131,7 @@ To produce the documentation run the original source files ending with % %<*driver> \ProvidesFile{njuthesis.dtx} - \PassOptionsToClass{codehigh}{njuthesis-doc} +\PassOptionsToClass{codehigh}{njuthesis-doc} \documentclass{njuthesis-doc} \begin{document} \DocInput{njuthesis.dtx} @@ -148,7 +148,7 @@ To produce the documentation run the original source files ending with % \thanks{E-mail: \href{mailto:git+nju-lug-email-3104-issue-@yaoge123.cn} % {git+nju-lug-email-3104-issue-@yaoge123.cn}}} % -% \date{v1.3.0 \quad 2023-05-07} +% \date{v1.3.0 \quad 2023-06-06} % % \changes{v0.1}{2021/09/04}{开始开发。} % \changes{v0.2}{2021/09/07}{初步搭建了可用的模板。} @@ -7031,13 +7031,14 @@ To produce the documentation run the original source files ending with % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_degree_checkbox:Nn} +% \begin{macro}{\@@_degree_checkbox:nn} +% \changes{v1.3}{2023/06/04}{修复研究生出版授权书的打勾机制。} % 信息栏的学位复选框。打勾符号对应 |U+2713|。 % \begin{macrocode} -\cs_new_protected:Npn \@@_degree_checkbox:Nn #1#2 +\cs_new_protected:Npn \@@_degree_checkbox:nn #1#2 { \bool_lazy_and:nnTF - { \g_@@_opt_academic_bool && #1 } + { #1 \g_@@_opt_academic_bool } { \int_compare_p:n { \g_@@_info_type_int = #2 } } { \makebox [ 0 pt ] [l] { \ensuremath { \mdwhtsquare } } @@ -7068,10 +7069,10 @@ To produce the documentation run the original source files ending with \tl_range:Nnn \g_@@_info_submitdate_tl {1} {4} \\ \c_@@_name_degreea_tl & { - \@@_degree_checkbox:Nn \c_true_bool { 2 } 学术学位硕士 \qquad - \@@_degree_checkbox:Nn \c_false_bool { 2 } 专业学位硕士 \\ - \@@_degree_checkbox:Nn \c_true_bool { 3 } 学术学位博士 \qquad - \@@_degree_checkbox:Nn \c_false_bool { 3 } 专业学位博士 + \@@_degree_checkbox:nn { } { 2 } 学术学位硕士 \qquad + \@@_degree_checkbox:nn { ! } { 2 } 专业学位硕士 \\ + \@@_degree_checkbox:nn { } { 3 } 学术学位博士 \qquad + \@@_degree_checkbox:nn { ! } { 3 } 专业学位博士 } \\ \c_@@_name_email_tl & \g_@@_info_email_tl \\ \c_@@_name_supvb_tl & @@ -8453,15 +8454,27 @@ To produce the documentation run the original source files ending with % { cover label } { \kaishu }, % { cover label } { \bfseries }, % { cover label } { }, +% \end{macrocode} +% 调用 \pkg{njuvisual} 时的校徽颜色。 +% \begin{macrocode} { emblem color } { black }, { name color } { black }, +% \end{macrocode} +% 各级标题样式。 +% \begin{macrocode} { section } { \bigger \normalfont \sffamily }, { chapter } { \c_@@_fmt_section_tl \centering }, - { chapterintoc } { \c_@@_fmt_section_tl }, { subsection } { \c_@@_fmt_section_tl }, { subsubsection } { \c_@@_fmt_section_tl }, { paragraph } { \c_@@_fmt_section_tl }, { subparagraph } { \c_@@_fmt_section_tl }, +% \end{macrocode} +% 目录中的章标题样式。 +% \begin{macrocode} + { chapterintoc } { \c_@@_fmt_section_tl }, +% \end{macrocode} +% “目录”二字的样式。 +% \begin{macrocode} { toc title } { \centering \zihao { 3 } \bfseries }, { header } { \small \kaishu }, { footer } { \small \rmfamily }