diff --git a/CHANGELOG.md b/CHANGELOG.md index 9445c7877234c8908e4994cfc79c1193dc27f08a..76c30476861ba08af88a04c1db71595b7b41b210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### 鏂板 - 鐩插妯″紡涓嬩笉鏄剧ず鑷磋阿 +- 鏂板鑴氭敞鐨勬偓鎸傜缉杩涢€夐」 `hang` - [#129] ### 淇 @@ -19,8 +20,9 @@ ### 鍙樺姩 -- 鑴氭敞涓甫鍦堟暟瀛楅€夐」淇敼涓� `circled` - [#129] +- 鑴氭敞涓甫鍦堢紪鍙烽€夐」淇敼涓� `circled` - [#129] - 鍒犻櫎 `pifont` 閫夐」 +- 鑴氭敞榛樿杩涜鎮寕缂╄繘 ### 鏉傞」 diff --git a/docs/njuthesis-setup.def b/docs/njuthesis-setup.def index 3b021b350d9568b3caead3167507c4c979c2db42..efa02a1e8399a03b9c873fc33777c5445906f950 100644 --- a/docs/njuthesis-setup.def +++ b/docs/njuthesis-setup.def @@ -212,7 +212,13 @@ } % footnote 绫荤敤浜庤缃剼娉ㄦ牱寮忥紝鍔熻兘璇﹁鎵嬪唽 -% \njusetup[footnote/style]{circled} +\njusetup[footnote]{ + % style = circled, + % 浣跨敤鍦堢爜缂栧彿 + % + % hang = false, + % 涓嶄娇鐢ㄦ偓鎸傜缉杩� +} % 椤电湁椤佃剼鍐呭璁剧疆 \njusetup{ diff --git a/source/njuthesis.dtx b/source/njuthesis.dtx index 147514d20e7c4295150523d09d162cd841fc6245..d70f44c1cb55cc4786a5f3b117552a51cd85915d 100644 --- a/source/njuthesis.dtx +++ b/source/njuthesis.dtx @@ -118,7 +118,7 @@ To produce the documentation run the original source files ending with %<*!(driver|install)> % ^^A 璇氳€€鐧惧豢锛岄泟鍒涗竴娴� % ^^A 鍗椾含澶у涓€鐧句簩鍗佸懆骞村崕璇為個鎮ㄥ叡瑗勭洓涓撅紒 -%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.0.1 2022-08-20 00:00:00 +%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.1.0 2022-10-16 15:00:00 %<+!driver> +0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$ %<class> {Thesis template for Nanjing University} %<class>\ProvidesExplClass{njuthesis} @@ -354,7 +354,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.0.1 \quad 2022-08-10} +% \date{v1.1.0 \quad 2022-10-16} % % \changes{v0.1}{2021/09/04}{寮€濮嬪紑鍙戙€倉 % \changes{v0.2}{2021/09/07}{鍒濇鎼缓浜嗗彲鐢ㄧ殑妯℃澘銆倉 @@ -1678,6 +1678,13 @@ To produce the documentation run the original source files ending with % 鍙娇鐢ㄦ湰閫夐」杞藉叆鏇村瀹氬埗璁剧疆锛岃瑙佸叾鎵嬪唽銆� % \end{function} % +% \begin{function}[added=2022-10-16]{footnote/hang} +% \begin{syntax} +% \OPT{hang} = \TTF +% \end{syntax} +% 鏄惁杩涜鎮寕缂╄繘銆傞粯璁や负鏄紝缂╄繘瀹藉害涓� \qty{1.5}{em}銆� +% \end{function} +% % 鑴氭敞鏍峰紡鐨勮皟鏁翠緷璧� \pkg{footmisc}銆傚鏋滃笇鏈涗娇鐢� \LaTeX 鐨勯粯璁ゆ牱寮忥紝 % 鍙互閫氳繃绗� \ref{subsubsec:optional-pkg} 鑺傛彁渚涚殑閫夐」绂佺敤璇ュ畯鍖呫€� % @@ -5725,8 +5732,8 @@ To produce the documentation run the original source files ending with { % \end{macrocode} % \begin{macro}{footnote/style} -% \changes{v1.1}{2022/10/16}{灏嗙敓鎴愯剼娉ㄥ湀鐮佺殑 \pkg{pifont} 鏇挎崲涓� \pkg{circledtext}銆倉 -% 鑴氭敞缂栧彿鐨勬牱寮忋€� + % \changes{v1.1}{2022/10/16}{灏� \opt{pifont} 閫夐」淇敼涓� \pkg{circled}銆倉 + % 鑴氭敞缂栧彿鐨勬牱寮忋€� % \begin{macrocode} style .choices:nn = { plain, circled, circled* } { @@ -5753,10 +5760,20 @@ To produce the documentation run the original source files ending with % \end{macro} % % \begin{macro}{footnote/circledtext-option} +% \changes{v1.1}{2022/10/16}{灏嗙敓鎴愯剼娉ㄥ湀鐮佺殑 \pkg{pifont} 鏇挎崲涓� \pkg{circledtext}銆倉 % \pkg{circledtext} 瀹忓寘閫夐」銆� % \begin{macrocode} circledtext-option .code:n = - { \clist_gput_right:Nn \g_@@_fn_ctext_option_clist {#1} } + { \clist_gput_right:Nn \g_@@_fn_ctext_option_clist {#1} }, +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{footnote/hang} +% \changes{v1.1}{2022/10/16}{鏂板鎮寕缂╄繘閫夐」銆倉 +% 鏄惁鎮寕缂╄繘銆� +% \begin{macrocode} + hang .bool_gset:N = \g_@@_fn_hang_bool, + hang .initial:n = true } % \end{macrocode} % \end{macro} @@ -5795,14 +5812,21 @@ To produce the documentation run the original source files ending with % \subsubsection{鏁翠綋鏍峰紡} % % \begin{macro}[int]{\@makefntext} -% 閲嶅畾涔夊唴閮ㄨ剼娉ㄦ枃瀛楀懡浠わ紝浣胯剼娉ㄧ紪鍙蜂笉浣跨敤涓婃爣锛屽搴︿负 \qty{1.5}{em}銆� +% 閲嶅畾涔夊唴閮ㄨ剼娉ㄦ枃瀛楀懡浠わ紝浣胯剼娉ㄧ紪鍙蜂笉浣跨敤涓婃爣锛屽搴︿负 \qty{1.5}{em} % \footnote{\url{http://tex.stackexchange.com/q/19844}, -% \url{https://www.zhihu.com/question/53030087}} +% \url{https://www.zhihu.com/question/53030087}}锛� +% 骞惰嚜琛屽疄鐜版偓鎸傜缉杩涖€傛敞鎰忚繖涓搷浣滀細浣� \pkg{footmisc} 瀹忓寘鍐呭缓鐨� \opt{hang} 閫夐」澶辨晥銆� % \begin{macrocode} \cs_set:Npn \@makefntext #1 { \mode_leave_vertical: - \hbox_to_wd:nn { 1.5 em } { \@thefnmark \tex_hfil:D } + \hbox_to_wd:nn { \c_@@_fnhang_dim } { \@thefnmark \tex_hfil:D } + \tex_penalty:D \@M + \bool_if:NT \g_@@_fn_hang_bool + { + \int_set:Nn \tex_hangafter:D { 1 } + \dim_set_eq:NN \tex_hangindent:D \c_@@_fnhang_dim + } #1 } } @@ -8283,7 +8307,11 @@ To produce the documentation run the original source files ending with % 绔犺妭鏍囬鍓嶅悗闂磋窛銆� % \begin{macrocode} { chapter before } { 10 pt }, - { chapter after } { 60 pt } + { chapter after } { 60 pt }, +% \end{macrocode} +% 鑴氭敞缂栧彿瀹藉害銆� +% \begin{macrocode} + { fn hang } { 13.5 pt } } { \@@_define_dim:nn #1 } % \end{macrocode}