Skip to content

Commit

Permalink
fix: 补回研究生摘要封面上的下划线 (#166)
Browse files Browse the repository at this point in the history
- 修复 \njusetname 命令的可选参数问题
- 修复研究生英文封面的双导师问题
  • Loading branch information
atxy-blip committed Dec 12, 2022
1 parent 9468d74 commit 9d0d5aa
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 19 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

### 修复

- 补回研究生英文摘要页的下划线 - [#166]
- 修复研究生封面上第二导师的显示问题 - [#172]
- 修复 `\njusetname` 的可选参数问题

## [1.1.1] - 2022-12-04

Expand Down
43 changes: 24 additions & 19 deletions source/njuthesis.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@
% for those people who are interested.
%
%<*internal>
\iffalse
%</internal>
%
%<*internal>
\fi
\begingroup
\def\NameOfLaTeXe{LaTeX2e}
\expandafter\endgroup\ifx\NameOfLaTeXe\fmtname\else
Expand Down Expand Up @@ -4227,11 +4222,12 @@ To produce the documentation run the original source files ending with
%
% \begin{macro}{\njusetname,\njusetname*,\njusettext,\njusettext*}
% \changes{v0.17}{2022/04/01}{提供修改固定文本的接口。}
% \changes{v1.1}{2022/12/12}{修复 \tn{njusetname} 和 \tn{njusettext} 的可选参数问题。}
% 定义修改固定文本的接口。
% \begin{macrocode}
\NewDocumentCommand \njusetname { s m o m }
\NewDocumentCommand \njusetname { s m O{} m }
{ \@@_set_tokenlist:nnnnn {#1} {#2} {#3} {#4} { name } }
\NewDocumentCommand \njusettext { s m o m }
\NewDocumentCommand \njusettext { s m O{} m }
{ \@@_set_tokenlist:nnnnn {#1} {#2} {#3} {#4} { text } }
% \end{macrocode}
% \end{macro}
Expand Down Expand Up @@ -4801,7 +4797,7 @@ To produce the documentation run the original source files ending with
% 这是 macOS 预装的字体版本较旧导致的。
% \begin{macrocode}
\fontspec_if_small_caps:F
{
{
\msg_warning:nn { njuthesis } { no-small-caps }
\__fontspec_main_setmainfont:nn
{ \c_@@_name_gyrefeature_clist } { texgyretermes }
Expand Down Expand Up @@ -4834,13 +4830,13 @@ To produce the documentation run the original source files ending with
% 用于 \pkg{fontspec} 的 \TeX Gyre 字体特性列表。
% \begin{macrocode}
\clist_const:Nn \c_@@_name_gyrefeature_clist
{
Extension = .otf,
UprightFont = *-regular,
BoldFont = *-bold,
ItalicFont = *-italic,
BoldItalicFont = *-bolditalic
}
{
Extension = .otf,
UprightFont = *-regular,
BoldFont = *-bold,
ItalicFont = *-italic,
BoldItalicFont = *-bolditalic
}
% \end{macrocode}
% \end{variable}
%
Expand Down Expand Up @@ -4977,7 +4973,7 @@ To produce the documentation run the original source files ending with
\setCJKfamilyfont { zhhei } { Noto~Sans~CJK~SC }
\setCJKfamilyfont { zhfs } { FZFangSong-Z02 }
\setCJKfamilyfont { zhkai } { FZKai-Z03 }
[AutoFakeBold=2.17]
[ \c__nju_name_fakebold_tl ]
}
% \end{macrocode}
% \end{macro}
Expand Down Expand Up @@ -6689,7 +6685,8 @@ To produce the documentation run the original source files ending with
\skip_vertical:n { .5 cm }
{ Supervised~ by }
\skip_vertical:N \c_zero_skip
\textsf { \g_@@_info_supvfull_en_tl },
\textsf { \g_@@_info_supv_en_tl
\tex_par:D \g_@@_info_supvii_en_tl },
format = \zihao { 4 },
bottom-skip = 0 pt plus 1.2 fil
}
Expand Down Expand Up @@ -7756,15 +7753,23 @@ To produce the documentation run the original source files ending with
%
% \begin{macro}{\@@_abs_info_en_g:N}
% \changes{v1.0}{2022/07/01}{移除研究生英文摘要的下划线。}
% \changes{v1.1}{2022/12/12}{恢复研究生英文摘要的下划线。}
% 绘制研究生英文摘要信息栏。
% \begin{arguments}
% \item 分隔符
% \end{arguments}
% \begin{macrocode}
\cs_new_protected:Npn \@@_abs_info_en_g:N #1
{
\clist_map_inline:nn { title, major, author, supvfull }
{ \@@_name:n { ##1 _en } #1 \@@_info:n { ##1 _en } \\ }
\@@_uline_list:NNx \g_@@_info_title_en_tl \g_@@_abs_title_left_skip
{ \c_@@_name_title_en_tl #1 }
\clist_map_inline:nn { major, author, supvfull }
{
\tex_par:D
\@@_get_width_print:Nx \l_@@_tmpa_dim
{ \@@_name:n { ##1 _en } #1 }
\@@_box_ulined_info:Nn \l_@@_tmpa_dim { ##1 _en }
}
}
%</def-g>
% \end{macrocode}
Expand Down

0 comments on commit 9d0d5aa

Please sign in to comment.