From 0586e04639d54cd9b58844efbbf7f8d5aa81e253 Mon Sep 17 00:00:00 2001
From: atXY <y-xiong22@mails.tsinghua.edu.cn>
Date: Tue, 16 Jan 2024 15:52:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9A=E7=90=86?=
=?UTF-8?q?=E7=B1=BB=E7=8E=AF=E5=A2=83=E5=9C=A8=E5=85=B1=E4=BA=AB=E8=AE=A1?=
=?UTF-8?q?=E6=95=B0=E5=99=A8=E6=97=B6=E7=9A=84=20cleveref=20=E5=BC=95?=
=?UTF-8?q?=E7=94=A8=E5=90=8D=E9=97=AE=E9=A2=98=20(#234)=20-=20=E8=B7=9F?=
=?UTF-8?q?=E8=BF=9B=202024=20=E5=B1=8A=E6=9C=AC=E7=A7=91=E6=AF=95?=
=?UTF-8?q?=E4=B8=9A=E8=AE=BA=E6=96=87=E8=A7=84=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 13 ++++++++++-
README-CTAN.md | 2 +-
docs/njuthesis-setup.def | 4 ++--
source/njuthesis.dtx | 48 +++++++++++++++++++---------------------
4 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47e9615..27b59a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,19 @@
## [鏈彂甯僝
+### 鏂板
+
- 澧炲姞 `macoffice` 瀛椾綋閰嶇疆 - [#164],[#169]
- 鎰熻阿 [@liudongmiao]锛�
+### 淇
+
+- 淇瀹氱悊绫荤幆澧冨湪鍏变韩璁℃暟鍣ㄦ椂鐨� `cleveref` 寮曠敤鍚嶉棶棰� - [#234]
+
+### 鏉傞」
+
+- 璺熻繘 2024 灞婃湰绉戞瘯涓氳鏂囪瀹�
+
## [1.3.2] - 2023-12-05
### 鍙樺姩
@@ -101,7 +111,7 @@
### 鏉傞」
-- 璺熻繘 2023 骞存湰绉戞瘯涓氳鏂囪瀹�
+- 璺熻繘 2023 灞婃湰绉戞瘯涓氳鏂囪瀹�
- 璺熻繘鏂扮増鍗楀ぇ TeX 缃戠珯
## [1.1.1] - 2022-12-04
@@ -617,6 +627,7 @@
[#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
+[#234]: https://github.com/nju-lug/NJUThesis/issues/234
[CTeX-org/ctex-kit#678]: https://github.com/CTeX-org/ctex-kit/pull/678
diff --git a/README-CTAN.md b/README-CTAN.md
index a0f6cf8..99173cd 100644
--- a/README-CTAN.md
+++ b/README-CTAN.md
@@ -46,4 +46,4 @@ version.
-----
-Copyright (C) 2021 - 2023 by NJU LUG.
+Copyright (C) 2021 - 2024 by NJU LUG.
diff --git a/docs/njuthesis-setup.def b/docs/njuthesis-setup.def
index b83d79a..2095d38 100644
--- a/docs/njuthesis-setup.def
+++ b/docs/njuthesis-setup.def
@@ -174,7 +174,7 @@
% abstract 绫荤敤浜庤缃憳瑕佹牱寮�
\njusetup[abstract]{
- % toc-entry = false,
+ toc-entry = false,
% 鎽樿鏄惁鏄剧ず鍦ㄧ洰褰曟潯鐩腑
%
% underline = false,
@@ -186,7 +186,7 @@
% 鐩綍鑷韩鏄惁鏄剧ず鍦ㄧ洰褰曟潯鐩腑
\njusetup{
- % tableofcontents/toc-entry = false,
+ tableofcontents/toc-entry = false,
% 鍏抽棴鏈」鐩稿綋浜庡悓鏃跺叧闂笁涓€夐」
%
% listoffigures/toc-entry = false,
diff --git a/source/njuthesis.dtx b/source/njuthesis.dtx
index e693cf4..e60fa85 100644
--- a/source/njuthesis.dtx
+++ b/source/njuthesis.dtx
@@ -2,7 +2,7 @@
% !TeX program = XeLaTeX
% !TeX encoding = UTF-8
%
-% Copyright (C) 2021 - 2023
+% Copyright (C) 2021 - 2024
% by Nanjing University Linux User Group
% <git+nju-lug-email-3104-issue-@yaoge123.cn>
%
@@ -49,7 +49,7 @@
\preamble
-Copyright (C) 2021 - 2023
+Copyright (C) 2021 - 2024
by Nanjing University Linux User Group
<git+nju-lug-email-3104-issue-@yaoge123.cn>
@@ -232,7 +232,7 @@ To produce the documentation run the original source files ending with
% 鐢ㄦ埛缁勭淮鎶ょ殑锛岀敤浜庡鐞嗘湰鏍″鐢熸瘯涓氳鏂囨帓鐗堥渶姹傜殑 \LaTeX 妯℃澘銆�
%
% 鏈ā鏉夸娇鐢ㄧ殑鏈鐢熸瘯涓氳鏂囨ā鏉挎牸寮忎緷鎹�
-% 銆婂叧浜庡惎鍔ㄥ崡浜ぇ瀛�2023灞婃湰绉戞瘯涓氳鏂囷紙璁捐锛夊伐浣滅殑閫氱煡銆媆cite{nju-bachelor-2023}锛�
+% 銆婂叧浜庡惎鍔ㄥ崡浜ぇ瀛�2024灞婃湰绉戞瘯涓氳鏂囷紙璁捐锛夊伐浣滅殑閫氱煡銆媆cite{nju-bachelor-2024}锛�
% 鐮旂┒鐢熷浣嶈鏂囨牸寮忎緷鎹爺绌剁敓闄㈡彁渚涚殑鏉愭枡鍖匼cite{nju-graduate-2023}銆�
% 鍗氬＋鍚庡嚭绔欐姤鍛婃牸寮忚姹備笌鍗氬＋瀛︿綅璁烘枃涓€鑷碶cite{nju-postdoc-2022}锛�
% 灏侀潰銆佹憳瑕佺殑璁捐鍙傝€冧簡閮ㄥ垎鏃㈡湁鎶ュ憡銆�
@@ -2406,11 +2406,11 @@ To produce the documentation run the original source files ending with
% \newblock \textit{淇℃伅涓庢枃鐚甛quad 鍙傝€冩枃鐚憲褰曡鍒�: GB/T 7714--2015} [S].
% \newblock 鍖椾含: 涓浗鏍囧噯鍑虹増绀�, 2015
%
-% \bibitem{nju-bachelor-2023}
+% \bibitem{nju-bachelor-2024}
% 鍗椾含澶у鏈鐢熼櫌.
-% \newblock \textit{鍏充簬鍚姩鍗椾含澶у2022灞婃湰绉戞瘯涓氳鏂囷紙璁捐锛夊伐浣滅殑閫氱煡} [EB/OL].
-% \newblock (2022-12-19)
-% \urlprefix\url{https://jw.nju.edu.cn/29/d8/c26263a600536/page.htm}
+% \newblock \textit{鍏充簬鍚姩鍗椾含澶у2024灞婃湰绉戞瘯涓氳鏂囷紙璁捐锛夊伐浣滅殑閫氱煡} [EB/OL].
+% \newblock (2023-12-19)
+% \urlprefix\url{https://jw.nju.edu.cn/db/23/c26263a645923/page.htm}
%
% \bibitem{nju-graduate-2023}
% 鍗椾含澶у鐮旂┒鐢熼櫌.
@@ -4235,10 +4235,14 @@ To produce the documentation run the original source files ending with
% \end{macrocode}
% 闅愯棌 |does not contain script "CJK"| 璀﹀憡銆�
% \begin{macrocode}
- { quiet } { xeCJK },
+% { quiet } { xeCJK },
{ no-math } { fontspec },
{ perpage } { footmisc },
- { capitalise, nameinlink, noabbrev } { cleveref }
+ { capitalise, nameinlink, noabbrev } { cleveref },
+% \end{macrocode}
+% \pkg{ntheorem} 渚濊禆 \pkg{amsthm} 鍜� \pkg{thmmarks} 瀹炵幇 QED 绗﹀彿绛夊姛鑳姐€�
+% \begin{macrocode}
+ { amsmath, thmmarks, noconfig } { ntheorem }
}
{ \PassOptionsToPackage #1 }
% \end{macrocode}
@@ -4296,23 +4300,18 @@ To produce the documentation run the original source files ending with
booktabs,
caption,
graphicx,
+ }
+\@@_loadpkg_nthm:
% \end{macrocode}
-% 鎸変互涓嬮『搴忓姞杞戒袱涓叧浜庡紩鐢ㄧ殑鍖呫€�
% \pkg{hyperref} 瑕嗗啓浜嗗ぇ閲忓懡浠わ紝鍥犳闇€瑕佸湪鍏朵粬鍖呮渶鍚庤浇鍏ャ€�
-% 浠呮湁 \pkg{cleveref} 闇€瑕佸湪 \pkg{hyperref} 鍚庤浇鍏ワ紝鍚﹀垯浼氭姤閿欍€�
% \begin{macrocode}
- hyperref
- }
-\@@_loadpkg_cref:
+\RequirePackage { hyperref }
% \end{macrocode}
%
-% \pkg{ntheorem} 渚濊禆 \pkg{amsthm} 鍜� \pkg{thmmarks} 瀹炵幇 QED 绗﹀彿绛夊姛鑳姐€�
+% \changes{v1.3}{2024/01/16}{璋冩暣 \pkg{cleveref} 鍒� \pkg{ntheorem} 鍚庤浇鍏ャ€倉
+% \pkg{cleveref} 闇€瑕佸湪 \pkg{ntheorem} 鍜� \pkg{hyperref} 鍚庤浇鍏ャ€�
% \begin{macrocode}
-\bool_if:NT \g_@@_opt_load_nthm_bool
- {
- \PassOptionsToPackage { amsmath, thmmarks, noconfig } { ntheorem }
- \RequirePackage { ntheorem }
- }
+\@@_loadpkg_cref:
% \end{macrocode}
%
% 鍦ㄥ弻闈㈡ā寮忎笅锛屼娇鐢� \pkg{emptypage} 娓呴櫎绌虹櫧椤电殑椤电湁銆侀〉鑴氬拰椤电爜銆�
@@ -5465,10 +5464,9 @@ To produce the documentation run the original source files ending with
% \begin{macro}{\@@_bookmark_pdf_nosec:nn,\@@_bookmark_pdf:nn}
% 灏佽 \pkg{hyperref} 鐨� PDF 涔︾鍛戒护銆�
% \begin{macrocode}
-\cs_new:Npn \@@_bookmark_pdf_nosec:nn #1#2
- { \pdfbookmark [0] {#1} {#2} }
-\cs_new:Npn \@@_bookmark_pdf:nn #1#2
- { \phantomsection \@@_bookmark_pdf_nosec:nn {#1} {#2} }
+\cs_new:Npn \@@_bookmark_pdf_nosec:nn { \pdfbookmark [0] }
+\cs_new:Npn \@@_bookmark_pdf:nn
+ { \phantomsection \@@_bookmark_pdf_nosec:nn }
% \end{macrocode}
% \end{macro}
%
@@ -5833,7 +5831,7 @@ To produce the documentation run the original source files ending with
% \end{macrocode}
% 淇敼 \pkg{cleveref} 鐨勬爣绛惧悕绉般€�
% \begin{macrocode}
- \clist_map_inline:nn { figure, table, appendix, proof }
+ \clist_map_inline:nn { figure, table, appendix }
{ \@@_cref_name:n {#1} }
}
% \end{macrocode}
--
GitLab