Skip to content

Commit

Permalink
allow faked bold (mainly for the title in cover)
Browse files Browse the repository at this point in the history
Close #68.
  • Loading branch information
stone-zeng committed Mar 29, 2019
1 parent f368852 commit 6b76ca7
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 29 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

## [未发布]

- Changed
- 在(中文)字体未提供对应粗体的情况下,允许使用伪粗,并用于封面中文标题 - [#68](https://github.com/stone-zeng/fduthesis/issues/68)
- Fixed
- 修复参考文献不能在目录中显示的问题 - [#65](https://github.com/stone-zeng/fduthesis/issues/65)
- 修复 Unix 下的安装脚本 - [#64](https://github.com/stone-zeng/fduthesis/pull/64)
Expand Down
17 changes: 9 additions & 8 deletions source/fduthesis.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -3116,6 +3116,8 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <[email protected]>.
% \end{macrocode}
% \end{macro}
%
% \changes{v0.7d}{2019/03/29}{在字体未提供对应粗体的情况下,允许使用伪粗。}
%
% \begin{macro}{
% \@@_cjk_font_options:,
% \@@_setCJKmainfont:n,
Expand All @@ -3125,7 +3127,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <[email protected]>.
% 将 bold、italic 和 bold italic 统一按照 roman 设置。
% \begin{macrocode}
\tl_const:Nn \@@_cjk_font_options:
{ UprightFont = *, BoldFont = *, ItalicFont = *, BoldItalicFont = * }
{ UprightFont = *, ItalicFont = *, AutoFakeBold = true }
\cs_new_protected:Npx \@@_setCJKmainfont:n #1
{ \@@_setCJKmainfont:nn {#1} { \@@_cjk_font_options: } }
\cs_new_protected:Npx \@@_setCJKsansfont:n #1
Expand Down Expand Up @@ -5027,12 +5029,13 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <[email protected]>.
}
% \end{macrocode}
%
% \changes{v0.7d}{2019/03/29}{封面中文标题改为加粗宋体(可能使用伪粗)。}
%
% 定义封面的具体配置参数。
% \begin{macrocode}
\DeclareInstance { fdu / cover } { cover-i-default } { cover-i }
{
%<class-en> format =
%<class-en> \@@_line_spread:N \c_@@_line_spread_fp,
%<class-en> format = \@@_line_spread:N \c_@@_line_spread_fp,
bottom-skip = 0 pt plus 1.5 fill,
id / content = \@@_cover_id:,
logo / content = \@@_cover_logo:,
Expand All @@ -5048,9 +5051,8 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <[email protected]>.
id / format = \zihao { -5 },
type / format = \zihao { 2 },
degree / format = \zihao { 4 },
title / format = \zihao { -2 } \sffamily,
title-en / format =
\@@_line_spread:n { 1.2 } \zihao { 4 } \bfseries,
title / format = \zihao { -2 } \bfseries,
title-en / format = \@@_line_spread:n { 1.2 } \zihao { 4 } \bfseries,
id / bottom-skip = 0 pt plus 1.6 fill,
logo / bottom-skip = 0 pt plus 0.3 fill,
type / bottom-skip = -18 pt,
Expand All @@ -5066,8 +5068,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <[email protected]>.
}
\DeclareInstance { fdu / cover } { cover-ii-default } { cover-ii }
{
%<class-en> format =
%<class-en> \@@_line_spread:N \c_@@_line_spread_fp,
%<class-en> format = \@@_line_spread:N \c_@@_line_spread_fp,
title / content =
\@@_spread_box:nn { 7 em } { \c_@@_name_instructors_tl },
name-list / content =
Expand Down
16 changes: 8 additions & 8 deletions testfiles/04-cover.luatex.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -380,29 +380,29 @@ Completed box being shipped out [1]
.........\localrightbox=null
........\hbox(0.0+0.0)x0.0, direction TLT
........\hbox(15.89938+2.1681)x18.06749, direction TLT
.........\LTJY3/FandolHei(0)/m/n/18.06749 这
.........\LTJY3/FandolSong(0)/bx/n/18.06749 这
........\glue 0.0 plus 0.9078
........\hbox(15.89938+2.1681)x18.06749, direction TLT
.........\LTJY3/FandolHei(0)/m/n/18.06749 是
.........\LTJY3/FandolSong(0)/bx/n/18.06749 是
........\glue 0.0 plus 0.9078
........\norule(15.89938+2.1681)x0.0
........\LTJY3/FandolHei(0)/m/n/18.06749 一
........\LTJY3/FandolSong(0)/bx/n/18.06749 一
........\glue 0.0 plus 0.9078
........\hbox(15.89938+2.1681)x18.06749, direction TLT
.........\LTJY3/FandolHei(0)/m/n/18.06749 个
.........\LTJY3/FandolSong(0)/bx/n/18.06749 个
........\glue 0.0 plus 0.9078
........\hbox(15.89938+2.1681)x18.06749, direction TLT
.........\LTJY3/FandolHei(0)/m/n/18.06749 论
.........\LTJY3/FandolSong(0)/bx/n/18.06749 论
........\glue 0.0 plus 0.9078
........\hbox(15.89938+2.1681)x18.06749, direction TLT
.........\LTJY3/FandolHei(0)/m/n/18.06749 文
.........\LTJY3/FandolSong(0)/bx/n/18.06749 文
........\glue 0.0 plus 0.9078
........\hbox(15.89938+2.1681)x18.06749, direction TLT
.........\LTJY3/FandolHei(0)/m/n/18.06749 标
.........\LTJY3/FandolSong(0)/bx/n/18.06749 标
........\penalty 500
........\glue 0.0 plus 0.9078
........\hbox(15.89938+2.1681)x18.06749, direction TLT
.........\LTJY3/FandolHei(0)/m/n/18.06749 题
.........\LTJY3/FandolSong(0)/bx/n/18.06749 题
........\penalty 10000
........\glue(\parfillskip) 0.0
........\glue(\rightskip) 0.0 plus 1.0fil
Expand Down
26 changes: 13 additions & 13 deletions testfiles/04-cover.xetex.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ Completed box being shipped out [1]
....\penalty -51
....\glue 13.0 plus 7.0 minus 8.0
....\glue(\parskip) 0.0 plus 1.0
....\glue(\baselineskip) 16.78308
....\hbox(13.21684+4.18214)x416.54877, glue set 20.82872fil
....\glue(\baselineskip) 17.07216
....\hbox(12.92776+3.89307)x416.54877, glue set 20.82872fil
.....\glue(\leftskip) 0.0 plus 1.0fil
.....\hbox(0.0+0.0)x0.0
......\glue 0.0
Expand All @@ -271,25 +271,25 @@ Completed box being shipped out [1]
......\glue 6.0
.....\penalty 0
.....\mathon
.....\vbox(13.21684+4.18214)x374.89134
......\hbox(14.20105+3.19794)x374.89134, glue set 115.17572fil
.....\vbox(12.92776+3.89307)x374.89134
......\hbox(13.8939+2.92693)x374.89134, glue set 115.17572fil
.......\glue(\leftskip) 0.0 plus 1.0fil
.......\hbox(0.0+0.0)x0.0
.......\TU/FandolHei(0)/m/n/18.06749 这
.......\TU/FandolSong(0)/bx/n/18.06749 这
.......\glue 0.0 plus 0.9078
.......\TU/FandolHei(0)/m/n/18.06749 是
.......\TU/FandolSong(0)/bx/n/18.06749 是
.......\glue 0.0 plus 0.9078
.......\TU/FandolHei(0)/m/n/18.06749 一
.......\TU/FandolSong(0)/bx/n/18.06749 一
.......\glue 0.0 plus 0.9078
.......\TU/FandolHei(0)/m/n/18.06749 个
.......\TU/FandolSong(0)/bx/n/18.06749 个
.......\glue 0.0 plus 0.9078
.......\TU/FandolHei(0)/m/n/18.06749 论
.......\TU/FandolSong(0)/bx/n/18.06749 论
.......\glue 0.0 plus 0.9078
.......\TU/FandolHei(0)/m/n/18.06749 文
.......\TU/FandolSong(0)/bx/n/18.06749 文
.......\glue 0.0 plus 0.9078
.......\TU/FandolHei(0)/m/n/18.06749 标
.......\TU/FandolSong(0)/bx/n/18.06749 标
.......\glue 0.0 plus 0.9078
.......\TU/FandolHei(0)/m/n/18.06749 题
.......\TU/FandolSong(0)/bx/n/18.06749 题
.......\kern -0.00017
.......\kern 0.00017
.......\penalty 10000
Expand All @@ -308,7 +308,7 @@ Completed box being shipped out [1]
....\penalty -51
....\glue 13.0 plus 7.0 minus 8.0
....\glue(\parskip) 0.0 plus 1.0
....\glue(\baselineskip) 7.5864
....\glue(\baselineskip) 7.87547
....\hbox(8.467+1.43999)x416.54877, glue set 20.82872fil
.....\glue(\leftskip) 0.0 plus 1.0fil
.....\hbox(0.0+0.0)x0.0
Expand Down

0 comments on commit 6b76ca7

Please sign in to comment.