diff --git a/CHANGELOG.md b/CHANGELOG.md index cb34ceb8e6cc9ec0183c0fe69e530ec3d718fd62..79cd0dc4f8666445a32273a4ec6fa7522ae1c314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ ## [鏈彂甯僝 +## [1.3.2] - 2023-12-05 + +### 鍙樺姩 + +- 璋冩暣涓撲笟鍨嬪浣嶅皝闈㈢殑 `info/major` 椤瑰~鍐欓€昏緫 - [#232] + - 鎰熻阿 [@liudongmiao]锛� + ### 淇 - 淇鍙屽甯堝懡浠ら棶棰� - [#230] @@ -520,6 +527,7 @@ [鏈彂甯僝: https://github.com/nju-lug/NJUThesis/compare/v1.3.1...HEAD +[1.3.2]: https://github.com/nju-lug/NJUThesis/compare/v1.3.1...v1.3.2 [1.3.1]: https://github.com/nju-lug/NJUThesis/compare/v1.3.0...v1.3.1 [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 @@ -604,6 +612,7 @@ [#227]: https://github.com/nju-lug/NJUThesis/issues/227 [#229]: https://github.com/nju-lug/NJUThesis/discussions/229 [#230]: https://github.com/nju-lug/NJUThesis/issues/230 +[#232]: https://github.com/nju-lug/NJUThesis/issues/232 [CTeX-org/ctex-kit#678]: https://github.com/CTeX-org/ctex-kit/pull/678 @@ -619,3 +628,4 @@ [@note286]: https://github.com/note286 [@AlphaZTX]: https://github.com/AlphaZTX [@stone-zeng]: https://github.com/stone-zeng +[@liudongmiao]: https://github.com/liudongmiao diff --git a/docs/njuthesis-sample.tex b/docs/njuthesis-sample.tex index 9be8e19a1a5bbef1cb64c7b21b87a664c8e15a55..4e8cb7636f3b7c05a370020e5096d41b38618935 100644 --- a/docs/njuthesis-sample.tex +++ b/docs/njuthesis-sample.tex @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% njuthesis 绀轰緥妯℃澘 v1.3.0 2023-06-06 +% njuthesis 绀轰緥妯℃澘 v1.3.2 2023-12-05 % https://github.com/nju-lug/NJUThesis % % 璐$尞鑰� diff --git a/docs/njuthesis-setup.def b/docs/njuthesis-setup.def index 8b06eea5a56276b13d86eba39bc3af517f4bf529..b83d79a58cef12945e10694bce31f838205d2609 100644 --- a/docs/njuthesis-setup.def +++ b/docs/njuthesis-setup.def @@ -1,4 +1,4 @@ -% njuthesis 鍙傛暟璁剧疆鏂囦欢 v1.3.0 2023-06-06 +% njuthesis 鍙傛暟璁剧疆鏂囦欢 v1.3.2 2023-12-05 % 涓€浜涙彁閱掞細 % 1. \njusetup 鍐呴儴鍗冧竾涓嶈鏈夌┖琛� @@ -50,8 +50,8 @@ major* = {Chemistry}, % 涓撲笟 % - % major = {杞欢宸ョ▼锛岃蒋浠跺伐绋媫, - % 涓撲笟鍨嬪浣嶅彲浠ョ敤绗簩涓€艰鐩栧皝闈笂鐨勯粯璁よˉ鍏ㄧ増鏈� + % major = {灏侀潰涓撲笟,鎽樿涓撲笟}, + % 鐮旂┒鐢熶笓涓氬瀷瀛︿綅鍙兘閬囧埌涓ゅ鍐呭涓嶄竴鑷寸殑鎯呭喌 % supervisor = {瀵煎笀濮撳悕,鏁欐巿}, supervisor*= {Professor My Supervisor}, diff --git a/source/njuthesis.dtx b/source/njuthesis.dtx index ab20f76435653e4eb0846527146f09872e5bdf19..fde426c1d8aedef307180768b7b874d950e5c2c3 100644 --- a/source/njuthesis.dtx +++ b/source/njuthesis.dtx @@ -112,7 +112,7 @@ To produce the documentation run the original source files ending with % %<class>\NeedsTeXFormat{LaTeX2e} %<*!(driver|install)> -%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.3.1 2023-11-14 11:30:00 +%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.3.2 2023-12-05 16:30:00 %<+!driver> +0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$ %<class> {Thesis template for Nanjing University} %<class>\ProvidesExplClass{njuthesis} @@ -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.1 \quad 2023-11-14} +% \date{v1.3.2 \quad 2023-12-05} % % \changes{v0.1}{2021/09/04}{寮€濮嬪紑鍙戙€倉 % \changes{v0.2}{2021/09/07}{鍒濇鎼缓浜嗗彲鐢ㄧ殑妯℃澘銆倉 @@ -1192,15 +1192,14 @@ To produce the documentation run the original source files ending with % 闄㈢郴銆� % \end{function} % -% \begin{function}[updated=2023-05-11]{info/major,info/major*} +% \begin{function}[updated=2023-12-05]{info/major,info/major*} % \begin{syntax} % \OPT{major} = \Arg{涓撲笟} -% \OPT{major} = \Arg{涓撲笟,涓撲笟鍏ㄧО} +% \OPT{major} = \Arg{灏侀潰涓撲笟, 鎽樿涓撲笟} % \OPT{major*} = \Arg{涓撲笟} % \end{syntax} -% 涓撲笟銆傜爺绌剁敓鐨勪笓涓氬瀷瀛︿綅灏侀潰涓婏紝鈥滀笓涓氬浣嶇被鍒�(棰嗗煙)鈥濅竴鏍忛粯璁や細琛ュ叏涓� -% 鈥滀笓涓氱/鍗氬+锛圽meta{涓撲笟}锛夆€濄€傚鏋滃笇鏈涜鐩栨ā鏉跨殑鑷姩澶勭悊锛� -% 鍙互濉啓 \opt{info/major} 绗簩绉嶅啓娉曠殑鈥滀笓涓氬叏绉扳€濆瓧娈点€� +% 涓撲笟銆傜爺绌剁敓鐨勪笓涓氬瀷瀛︿綅灏侀潰涓婏紝鈥滀笓涓氬浣嶇被鍒�(棰嗗煙)鈥濅竴鏍忕殑 +% 濉啓鍐呭鍙兘涓庢憳瑕侀〉涓嶄竴鑷达紝鍙互浣跨敤鍗婅閫楀彿鍒嗛殧涓や釜鍊笺€� % \end{function} % % \begin{function}[updated=2021-10-01]{info/field,info/field*} @@ -4450,15 +4449,17 @@ To produce the documentation run the original source files ending with % % \begin{macro}{info/major} % \changes{v1.3}{2023/05/11}{涓撲笟鍨嬬爺绌剁敓灏侀潰鍙澶栦慨鏀逛笓涓氬悕绉般€倉 -% 涓撲笟銆� +% \changes{v1.3}{2023/12/05}{璋冩暣涓撲笟鍨嬪浣嶇殑濉啓鏂瑰紡銆倉 +% 涓撲笟銆傜爺绌剁敓涓撲笟鍨嬪浣嶅彲浠ュ彇灏侀潰鍜屾憳瑕佺殑涓や釜鍊硷紝姝ゅ閮藉彇绗竴涓€笺€� % \begin{macrocode} major .code:n = { - \clist_pop:NN \l_keys_value_tl \g_@@_info_major_tl - \clist_pop:NNF \l_keys_value_tl \g_@@_info_majorc_tl + \bool_if:NTF \g_@@_opt_academic_bool + { \clist_pop:NN \l_keys_value_tl \g_@@_info_major_tl } { - \tl_set:Nn \g_@@_info_majorc_tl - { 宸ョ▼ \g_@@_info_type_tl锛� \g_@@_info_major_tl 锛� } + \clist_pop:NN \l_keys_value_tl \g_@@_info_majorc_tl + \clist_pop:NNF \l_keys_value_tl \g_@@_info_major_tl + { \tl_set_eq:NN \g_@@_info_major_tl \g_@@_info_majorc_tl } } }, % \end{macrocode} @@ -6648,7 +6649,7 @@ To produce the documentation run the original source files ending with \cs_new:Npn \@@_g_cover_info: { \tl_set:Nn \l_@@_tmpa_tl { \skip_horizontal:n { .7 cm } } - \@@_g_cover_info:NNNNN \l_@@_tmpa_clist \l_@@_tmpa_tl + \@@_g_cover_info:NNNNN \l_@@_tmp_clist \l_@@_tmpa_tl \c_@@_clabelwd_dim \c_@@_crulewd_dim \c_@@_fmt_coverlabel_tl } % \end{macrocode}