diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c8df7c810ca3beb6570cf9050127d6c376da1bf..3dec9c6994d01265f5a6b5e69ec93f0c3e7339dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,41 @@ # 鏂板 +- 鏂板鍗氬+鍚庡嚭绔欐姤鍛婃ā鏉� +- 鏂板鏁板瀛椾綋閫夐」 `math-font` +- 鏂板榛樿瀛楀彿閫夐」 `zihao` +- 鏂板琛岃窛閫夐」 `linespread` +- 鏂板鏈€灏忓寲妯″紡閫夐」 `minimal` +- 鏂板绂佺敤鑻ュ共鍐呯疆瀹忓寘鐨勯€夐」 +- `\njusetup` 鎻愪緵鏇村閫夐」杈撳叆妯″紡 +- 鏂板涓€绯诲垪鏁板绗﹀彿閫夐」 `math` +- 鏂板缂栧彿杩炴帴绗﹁缃� `label-sep` - [#134] - 鍙娇鐢� `\njusetlength` 淇敼涓嬪垝绾跨殑瀹藉害鍜屽亸绉� - [#155] - 鍙娇鐢� `\njusetformat` 淇敼鏈鎽樿鏍囩鏍煎紡 - [#155] +- 涓洪〉闈㈠璞℃坊鍔犱功绛惧睘鎬� + +## 淇 + +- 淇鍏冪礌瀵硅薄鐨勫簳閮ㄩ棿璺濊缃� ## 鍙樺姩 +- 璋冩暣 `type` 鍜� `degree` 鏂囨。绫婚€夐」鐨勫畾涔� - [#117] +- 绉婚櫎姣曚笟璁捐灏侀潰 +- `nlcover` 閫夐」鏇村悕涓� `nl-cover` +- `blind` 閫夐」鏇村悕涓� `anonymous` +- 鍒犻櫎瀹氱悊绫荤幆澧冮€夐」 `theorem` +- 浣跨敤 `create-theorem` 杩涜榛樿鐨勫畾鐞嗙被鐜閰嶇疆 +- 鎽樿銆佺洰褰曘€侀〉鐪夐〉鑴氳缃」鏇村悕 - 璋冩暣鐮旂┒鐢熸ā鏉跨殑灏侀潰甯冨眬 - [#144] +- 绉婚櫎鐮旂┒鐢熻嫳鏂囨憳瑕佺殑涓嬪垝绾� +- 绉婚櫎鍐呯疆鐨� `mathtools` +- 鍐呴儴鍙橀噺涓庡嚱鏁伴噸鏂板懡鍚� + +### 鏉傞」 + +- 鍒犻櫎鎵嬪唽涓殑鍩虹鏁欏鍐呭 +- 鍦ㄦ墜鍐屼腑浠ヤ笉鍚岄鑹叉寚绀轰笉鍚屾ā鍧� ## [0.20.0] - 2022-06-10 @@ -401,12 +430,15 @@ [#107]: https://github.com/nju-lug/NJUThesis/issues/107 [#111]: https://github.com/nju-lug/NJUThesis/issues/111 [#116]: https://github.com/nju-lug/NJUThesis/issues/116 +[#117]: https://github.com/nju-lug/NJUThesis/issues/117 [#119]: https://github.com/nju-lug/NJUThesis/issues/119 [#121]: https://github.com/nju-lug/NJUThesis/issues/121 [#130]: https://github.com/nju-lug/NJUThesis/issues/130 [#131]: https://github.com/nju-lug/NJUThesis/issues/131 +[#134]: https://github.com/nju-lug/NJUThesis/discussions/134 [#137]: https://github.com/nju-lug/NJUThesis/issues/137 [#139]: https://github.com/nju-lug/NJUThesis/discussions/139 +[#144]: https://github.com/nju-lug/NJUThesis/issues/144 [#147]: https://github.com/nju-lug/NJUThesis/discussions/147 [#148]: https://github.com/nju-lug/NJUThesis/issues/148 [#150]: https://github.com/nju-lug/NJUThesis/discussions/150 diff --git a/source/njuthesis.dtx b/source/njuthesis.dtx index 25272f4b6a55f4706bd6d66071e8660a217c029f..ebb553844d70c31ff8749519ff3ab046ccb4e638 100644 --- a/source/njuthesis.dtx +++ b/source/njuthesis.dtx @@ -4074,7 +4074,13 @@ To produce the documentation run the original source files ending with % \begin{macrocode} \@@_loadpkg_enit: \@@_loadpkg_fm: -\@@_loadpkg_um: +% \end{macrocode} +% 涓轰繚璇� \pkg{cleveref} 鍦� \pkg{unicode-math} +% 缂哄け鐨勬儏鍐典笅涔熻兘姝e父宸ヤ綔锛岃浇鍏ヤ簡 \pkg{amsmath}銆� +% \begin{macrocode} +\bool_if:NTF \g_@@_opt_load_um_bool + { \RequirePackage { unicode-math } } + { \RequirePackage { amsmath } } % \end{macrocode} % % 杞藉叆鍚勭瀹忓寘銆� @@ -4085,11 +4091,6 @@ To produce the documentation run the original source files ending with fancyhdr, setspace, % \end{macrocode} -% 涓轰繚璇� \pkg{cleveref} 鍦� \pkg{unicode-math} -% 缂哄け鐨勬儏鍐典笅涔熻兘姝e父宸ヤ綔锛岃繖閲岄噸澶嶈浇鍏ヤ簡 \pkg{amsmath}銆� -% \begin{macrocode} - amsmath, -% \end{macrocode} % \changes{v0.14}{2021/12/21}{绉婚櫎鍐呯疆鐨� \pkg{multirow}銆乗pkg{subcaption} % 鍜� \pkg{wrapfig}銆倉 % 鍥剧墖涓庤〃鏍笺€� @@ -5677,7 +5678,7 @@ To produce the documentation run the original source files ending with % \end{macro} % % \begin{macro}{label-sep/figure,label-sep/table,label-sep/equation} -% \changes{v0.18}{2022/07/31}{娣诲姞缂栧彿杩炴帴绗﹁缃」銆倉 +% \changes{1.0}{2022/07/31}{娣诲姞缂栧彿杩炴帴绗﹁缃」銆倉 % 淇敼鍥剧墖銆佽〃鏍笺€佸叕寮忕紪鍙蜂腑鐨勮繛鎺ョ銆� % \footnote{\url{https://tex.stackexchange.com/q/61756/}} % \begin{macrocode} @@ -5774,14 +5775,6 @@ To produce the documentation run the original source files ending with % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_loadfont_math:} -% 鍔犺浇閫夊畾鏁板瀛椾綋銆� -% \begin{macrocode} -\cs_new_eq:Nc \@@_loadfont_math: - { @@_loadfont_math_ \g_@@_font_math_tl : } -% \end{macrocode} -% \end{macro} -% % ^^A 閫夐」鍚嶇О鏉ヨ嚜 thuthesis % \begin{macrocode} \keys_define:nn { nju / math } @@ -5897,7 +5890,6 @@ To produce the documentation run the original source files ending with uppercase-greek = upright } \@@_um_setup:n { bold-style = TeX } - \@@_loadfont_math: }, style / ISO .code:n = { @@ -5929,17 +5921,18 @@ To produce the documentation run the original source files ending with uppercase-greek = italic } \@@_um_setup:n { bold-style = ISO } - \@@_loadfont_math: }, style .initial:n = GB } % \end{macrocode} % \end{macro} % -% 鍦� |\begin{document}| 澶勮缃皬浜庣瓑浜庡彿鍜屽疄閮ㄧ鍙风瓑鐨勬牱寮忋€� +% 鍦� |\begin{document}| 澶勮浇鍏ュ瓧浣撲互鍏煎 \pkg{mathtools}锛� +% 骞惰缃皬浜庣瓑浜庡彿鍜屽疄閮ㄧ鍙风瓑鐨勬牱寮忋€� % \begin{macrocode} \@@_at_begin_document:n { + \use:c { @@_loadfont_math_ \g_@@_font_math_tl : } \bool_if:NT \g_@@_opt_math_leq_bool { \cs_set_eq:NN \le \leslant @@ -7246,7 +7239,7 @@ To produce the documentation run the original source files ending with % % \paragraph{鏈鐢焳 % \changes{v0.13}{2021/12/12}{浣跨敤 \LaTeX3 璇硶閲嶆瀯鏈鐢熸憳瑕併€倉 -% \changes{v0.21}{2022/06/16}{缁熶竴鏈鐢熸憳瑕侀〉鐨勬爣绛炬牸寮忋€倉 +% \changes{v1.0}{2022/06/16}{缁熶竴鏈鐢熸憳瑕侀〉鐨勬爣绛炬牸寮忋€倉 % % \begin{macro}{\@@_abs_info_u:,\@@_abs_info_en_u:} % 灏佽濂界殑鏈鐢熸憳瑕佷俊鎭爮銆� @@ -7912,7 +7905,7 @@ To produce the documentation run the original source files ending with % \label{subsubsec:constant-length} % % \changes{v0.17}{2022/04/09}{灏嗛暱搴﹀€煎垎绂诲埌 \file{.def} 鏂囦欢銆倉 -% \changes{v0.21}{2022/06/11}{鍙互鍗曠嫭鎸囧畾涓嬪垝绾跨殑瀹藉害鍜屽亸绉汇€倉 +% \changes{v1.0}{2022/06/11}{鍙互鍗曠嫭鎸囧畾涓嬪垝绾跨殑瀹藉害鍜屽亸绉汇€倉 % 榛樿鍥哄畾闀垮害鍊笺€� % \begin{macrocode} \clist_map_inline:nn diff --git a/test/test-xetex-graduate-nlcover.tex b/test/test-xetex-graduate-nlcover.tex index fefa62916e2b059db159c92abeb9402fcdfd72d4..304b729be55ad59f953530b815e643afdc65c28e 100644 --- a/test/test-xetex-graduate-nlcover.tex +++ b/test/test-xetex-graduate-nlcover.tex @@ -1,3 +1,3 @@ \def\TEST{} -\documentclass[degree=phd,nlcover]{njuthesis} +\documentclass[type=doctor,nl-cover,minimal]{njuthesis} \input{test.tex} diff --git a/test/test-xetex-graduate.tex b/test/test-xetex-graduate.tex index c917e3c28896f6e741f7f7fdffe1407649514850..fa9b8d0696b01d1bf7da1675ec0338c750dcd84c 100644 --- a/test/test-xetex-graduate.tex +++ b/test/test-xetex-graduate.tex @@ -1,3 +1,3 @@ \def\TEST{} -\documentclass[degree=mg,decl-page]{njuthesis} +\documentclass[type=master,decl-page,minimal]{njuthesis} \input{test.tex} diff --git a/test/test.tex b/test/test.tex index 5ad1a2f7d7c1782b3ad25b34a1fa00e45f0bad43..04e7b2143e3f71372a261de3a239fdfa58a738ee 100644 --- a/test/test.tex +++ b/test/test.tex @@ -6,9 +6,10 @@ \ifdefined\TEST\else % 鑷缂栬瘧鍓嶉渶鍙嶆敞閲婁互涓嬩换鎰忓懡浠� % \documentclass{njuthesis} + \documentclass[create-theorem=true]{njuthesis} % \documentclass[type=master]{njuthesis} % \documentclass[type=doctor]{njuthesis} - \documentclass[type=postdoc]{njuthesis} + % \documentclass[type=postdoc]{njuthesis} % \documentclass[oneside]{njuthesis} % \documentclass[cjk-font=noto,latin-font=gyre]{njuthesis} % \documentclass[cjk-font=source,latin-font=gyre]{njuthesis} @@ -17,55 +18,51 @@ % \documentclass[draft]{njuthesis} \fi -\njusetup { - info = { - title = {涓€绉嶄娇鐢ㄥ崡浜ぇ瀛� \hologo{LaTeX} 妯℃澘\\缂栧啓姣曚笟璁烘枃鐨勭粡楠屾€ф柟娉晑, - title* = {An Empirical Way of Composing Thesis with NJU \hologo{LaTeX} Template}, - keywords = {鎴�,灏辨槸,鍏呮暟鐨�,鍏抽敭璇峿, - keywords* = {Dummy,Keywords,Here,{it is}}, - grade = {2018}, - % student-id = {DZ18114514}, - student-id = {189114514}, - author = {鍛ㄧ厹鍗巬, - author* = {Zhou~Yuhua}, - department = {鎷夊お璧瀛︿笌鎶€鏈闄, - department* = {School~of~\hologo{LaTeX}}, - major = {鎷夊お璧瑷€瀛, - major* = {\hologo{LaTeX}~Linguistics}, - field = {鎷夊お璧瑷€鍦ㄧ幇褰撲唬鐨勪娇鐢▆, - field* = {Contemporary~Usage~of~the~\hologo{LaTeX}~Language}, - supervisor = {鏉庢垚娈�,鏁欐巿}, - supervisor* = {Professor Li Chengdian}, - % supervisor-ii = {瀛欒但寮�,鍓暀鎺坿, - % supervisor-ii* = {Associate~professor~Sun~Hemi}, - % submit-date = {2021-08-10}, - % defend-date = {2021-09-19}, - chairman = {寮犳檽灞眫鏁欐巿}, - reviewer = {鐜嬬憺甯寏鏁欐巿,閮痉绾瞺鍓暀鎺�,鍗庤妶搴搤鏁欐巿,鎴磋彶鑿瞺鏁欐巿}, - clc = {0175.2}, - secret-level = {闄愬埗}, - udc = {004.72}, - supervisor-contact = {鎷夊お璧瀛︿笌鎶€鏈闄鏋濇睙甯傜粨涓樿矾~19~鍙穨114514}, - email={git+nju-lug-email-3104-issue-@yaoge123.cn} - }, - bib = { - % style = author-year, - resource = {test.bib}, - option = {doi=false, isbn=false, url=false, eprint=false} - }, - style = { - emblem-img = {wug}, - name-img = {name}, - abstract-in-toc = false, - toc-in-toc = false, - header = { - {OR}{\thepage},{EL}{\thepage}, - {ER}{\leftmark},{OL}{\rightmark}}, - % header = {}, - footer = {}, - footnote-style=pifont - } - } +\njusetup[info]{ + title = {涓€绉嶄娇鐢ㄥ崡浜ぇ瀛� \hologo{LaTeX} 妯℃澘\\缂栧啓姣曚笟璁烘枃鐨勭粡楠屾€ф柟娉晑, + title* = {An Empirical Way of Composing Thesis with NJU \hologo{LaTeX} Template}, + keywords = {鎴�,灏辨槸,鍏呮暟鐨�,鍏抽敭璇峿, + keywords* = {Dummy,Keywords,Here,{it is}}, + grade = {2018}, + % student-id = {DZ18114514}, + student-id = {189114514}, + author = {鍛ㄧ厹鍗巬, + author* = {Zhou~Yuhua}, + department = {鎷夊お璧瀛︿笌鎶€鏈闄, + department* = {School~of~\hologo{LaTeX}}, + major = {鎷夊お璧瑷€瀛, + major* = {\hologo{LaTeX}~Linguistics}, + field = {鎷夊お璧瑷€鍦ㄧ幇褰撲唬鐨勪娇鐢▆, + field* = {Contemporary~Usage~of~the~\hologo{LaTeX}~Language}, + supervisor = {鏉庢垚娈�,鏁欐巿}, + supervisor* = {Professor Li Chengdian}, + % supervisor-ii = {瀛欒但寮�,鍓暀鎺坿, + % supervisor-ii* = {Associate~professor~Sun~Hemi}, + % submit-date = {2021-08-10}, + % defend-date = {2021-09-19}, + chairman = {寮犳檽灞眫鏁欐巿}, + reviewer = {鐜嬬憺甯寏鏁欐巿,閮痉绾瞺鍓暀鎺�,鍗庤妶搴搤鏁欐巿,鎴磋彶鑿瞺鏁欐巿}, + clc = {0175.2}, + secret-level = {闄愬埗}, + udc = {004.72}, + supervisor-contact = {鎷夊お璧瀛︿笌鎶€鏈闄鏋濇睙甯傜粨涓樿矾~19~鍙穨114514}, + email={git+nju-lug-email-3104-issue-@yaoge123.cn} +} +\njusetup[bib]{ + % style = author-year, + resource = {test.bib}, + option = {doi=false, isbn=false, url=false, eprint=false} +} +\njusetup[ext-image]{ + emblem = {wug}, + name = {name} +} +\njusetup[abstract/title-style]{natural} +\njusetup{ + abstract/toc-entry = false, + tableofcontents/toc-entry = false, + math/style = ISO +} % \addbibresource{test.bib} @@ -79,6 +76,7 @@ \njusetname{tableofcontents}{鐩甛qquad{}娆 \njusetname{listoffigures}{鎻掑浘娓呭崟} \njusetname{listoftables}{琛ㄦ牸娓呭崟} +\njusetname{abstract}[b]{鎴戞槸鎽樿} \njusetname*{abstract}[b]{Abstract} % \njusetlength{coveruline}{330pt} \njusetformat{chapter}{\raggedleft\kaishu\zihao{-1}} @@ -131,12 +129,8 @@ % https://tex.stackexchange.com/questions/33264/span-as-a-math-operator \DeclareMathOperator{\spn}{span} -\renewcommand{\vec}[1]{\mathbf{#1}} -% \RenewDocumentCommand\vec{m}{\mathbf{#1}} \NewDocumentCommand\mathbi{m}{\textbf{\em #1}} -\njusetname{abstract}[b]{璋佺殑濮撳悕} - \begin{document} % \frontmatter @@ -163,7 +157,6 @@ \end{abstract*} \raggedbottom -% \flushbottom \tableofcontents \listoffigures @@ -254,10 +247,7 @@ \input{chapters/Mathematics} \input{chapters/Bibliography} -% \bgroup -% \sloppy - \printbibliography -% \egroup +\printbibliography \begin{acknowledgement} 鎰熻阿\href{https://git.nju.edu.cn/nju-lug/lug-introduction}{NJU Linux User Group}銆�