From a28f0d3f8812e15505bea2798299236ac4f2e4eb Mon Sep 17 00:00:00 2001 From: Alexara Wu Date: Wed, 29 Nov 2023 13:07:39 +0800 Subject: [PATCH] refactor: better control for baselineskips (#45) --- sjtutex/source/sjtutex.dtx | 255 ++++++++++++++++++++++++------------- 1 file changed, 169 insertions(+), 86 deletions(-) diff --git a/sjtutex/source/sjtutex.dtx b/sjtutex/source/sjtutex.dtx index 3bcf54d8..f7901a2d 100644 --- a/sjtutex/source/sjtutex.dtx +++ b/sjtutex/source/sjtutex.dtx @@ -1065,10 +1065,7 @@ % float-font = (*\marg{字体设置}*) % \end{sjtusyntax} % 图、表等浮动体的额外字体设置。 -% 默认为 |\zihao{5}\fixedlineskip{15.6bp}|，五号字、固定行距 15.6 磅。 -% 若英文学位模板使用者希望符合 Word 英文模板规则，可以将该项改为 -% |\normalsize\fixedlineskip{15.6bp}| 正常字号、固定行距 15.6 磅。 -% 其中 15.6 磅的固定行距为 Microsoft Word 文档网格的默认固定行间距。 +% 默认为 |\zihao{5}|，五号字。 % \end{function} % % \begin{function}[added=2022-12-20]{style/caption-font} @@ -1375,11 +1372,11 @@ % \end{tabular} % \end{table} % -% \begin{function}[added=2022-12-27]{\fixedlineskip} -% \begin{sjtusyntax}[morekeywords={\fixedlineskip}] -% \fixedlineskip(*\marg{长度}*) +% \begin{function}[added=2023-10-24]{\setbaselineskip} +% \begin{sjtusyntax}[morekeywords={\setbaselineskip}] +% \setbaselineskip(*\marg{长度}*) % \end{sjtusyntax} -% 设置固定值行距。通过当前字体大小计算行距倍数，在字号命令之后使用。 +% 设置基本行距，在字号命令之后使用。 % \end{function} % % \begin{function}{\appendix} @@ -1544,14 +1541,15 @@ % \end{variable} % % \begin{variable} -% {\g_@@_zihao_tl,\g_@@_font_size_dim,\g_@@_line_skip_dim, -% \g_@@_default_line_skip_dim,\g_@@_line_spread_fp} +% {\g_@@_zihao_tl,\g_@@_font_size_int,\g_@@_font_size_dim, +% \g_@@_baseline_skip_dim,\g_@@_fixed_baselineskip_bool,\g_@@_line_spread_fp} % 字号大小与行距。 % \begin{macrocode} \tl_new:N \g_@@_zihao_tl +\int_new:N \g_@@_font_size_int \dim_new:N \g_@@_font_size_dim -\dim_new:N \g_@@_line_skip_dim -\dim_new:N \g_@@_default_line_skip_dim +\dim_new:N \g_@@_baseline_skip_dim +\bool_new:N \g_@@_fixed_baselineskip_bool \fp_new:N \g_@@_line_spread_fp % \end{macrocode} % \end{variable} @@ -1715,26 +1713,45 @@ % \begin{macrocode} zihao .choice: , zihao .value_required:n = true , - zihao / -4 .code:n = + zihao / 5 .code:n = { \tl_gset:Nn \g_@@_zihao_tl {#1} - \dim_gset:Nn \g_@@_font_size_dim { 12 bp } - \dim_gset:Nn \g_@@_default_line_skip_dim { 20 bp } + \int_gset:Nn \g_@@_font_size_int { 1 } + \dim_gset:Nn \g_@@_font_size_dim { 10.5 bp } } , - zihao / 5 .code:n = + zihao / -4 .code:n = { \tl_gset:Nn \g_@@_zihao_tl {#1} - \dim_gset:Nn \g_@@_font_size_dim { 10.5 bp } - \dim_gset:Nn \g_@@_default_line_skip_dim { 15.6 bp } + \int_gset:Nn \g_@@_font_size_int { 2 } + \dim_gset:Nn \g_@@_font_size_dim { 12 bp } } , % zihao .initial:n = { -4 } , %
zihao .initial:n = { 5 } , % \end{macrocode} % -% \changes{v2.0}{2022/12/03}{添加 \opt{lineskip} 文档类选项。} -% 行间距。 +% 行距倍数。 % \begin{macrocode} - lineskip .dim_gset:N = \g_@@_line_skip_dim , + linespread .fp_gset:N = \g_@@_line_spread_fp , + linespread .initial:n = { \c_nan_fp } , + linespread .value_required:n = true , +% \end{macrocode} +% +% \changes{v2.0}{2022/12/03}{添加 \opt{lineskip} 文档类选项。} +% \changes{unreleased}{2023/10/24}{添加 \opt{baselineskip} 文档类选项， +% 替换原 \opt{lineskip} 选项。} +% 基础行距。 +% \begin{macrocode} + baselineskip .choice: , + baselineskip .value_required:n = true , + baselineskip / false .code:n = + { \bool_gset_false:N \g_@@_fixed_baselineskip_bool } , + baselineskip / unknown .code:n = + { + \bool_gset_true:N \g_@@_fixed_baselineskip_bool + \dim_gset:Nn \g_@@_baseline_skip_dim {#1} + } , +% baselineskip .initial:n = { 20 bp } , +% baselineskip .initial:n = { false } , % \end{macrocode} % % 字体配置。 @@ -1867,15 +1884,18 @@ \ProcessKeysOptions { sjtu / option } } % \end{macrocode} -% -% 计算行距倍数。 +% \cls{sjtureport} 和 \cls{sjtuarticle} 文档类默认使用 1.3 行距倍数。 % \begin{macrocode} -\dim_compare:nNnT \g_@@_line_skip_dim < \g_@@_font_size_dim - { \dim_set_eq:NN \g_@@_line_skip_dim \g_@@_default_line_skip_dim } -\fp_set:Nn \g_@@_line_spread_fp - { \dim_ratio:nn { \g_@@_line_skip_dim } { \g_@@_font_size_dim } / 1.2 } +%<*!thesis> +\bool_if:NF \g_@@_fixed_baselineskip_bool + { + \fp_if_nan:nT { \g_@@_line_spread_fp } + { \fp_set:Nn \g_@@_line_spread_fp { 1.3 } } + } +% % \end{macrocode} % +% % 数字字体宏包选项。 % \begin{macrocode} \clist_set:Nx \g_@@_math_font_options_clist @@ -1905,7 +1925,8 @@ \clist_put_right:Nx \g_@@_options_to_ctex_class_clist { zihao = \g_@@_zihao_tl , - linespread = \fp_use:N \g_@@_line_spread_fp , + \fp_if_nan:nF { \g_@@_line_spread_fp } + { linespread = \fp_use:N \g_@@_line_spread_fp } , \bool_if:NTF \g_@@_twoside_bool { twoside } { oneside } , % \bool_if:NTF \g_@@_openright_bool @@ -2071,20 +2092,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\fixedlineskip} -% 设置固定值行距。通过当前字体大小计算行距倍数，在字号命令之后使用。 -% \begin{macrocode} -\cs_new:Npn \@@_fixed_line_skip:n #1 - { - \exp_args:Nx \linespread - { \fp_to_decimal:n { \dim_ratio:nn { #1 } { \f@size pt } / 1.2 } } - \selectfont - } -\NewDocumentCommand \fixedlineskip { m } - { \exp_args:Nx \@@_fixed_line_skip:n {#1} \tex_ignorespaces:D } -% \end{macrocode} -% \end{macro} -% % \changes{v2.0.2}{2023/03/31}{区分 \texttt{dim} 与 \texttt{skip} 类型变量。} % \begin{macro}[int]{\@@_dim_set_to_wd:Nn,\@@_skip_add_to_wd:Nn} % 操作长度变量的辅助函数。 @@ -2276,6 +2283,56 @@ % % \end{macrocode} % +% \subsection{字号行距} +% +% 重定义 \cs{normalsize}，设置正文的基本行距。 +% \begin{macrocode} +\cs_new_protected:Npn \@@_set_font_size:nnNn #1#2#3#4 + { \cs_set_protected:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } } +\tl_set:Ne \l_@@_font_size_tl + { + { \dim_to_decimal:n { \g_@@_font_size_dim } } + { \dim_to_decimal:n { \g_@@_baseline_skip_dim } } + } +\bool_if:NT \g_@@_fixed_baselineskip_bool + { + \int_case:nn { \g_@@_font_size_int } + { + { 1 } { + \exp_after:wN \@@_set_font_size:nnNn \l_@@_font_size_tl + \normalsize + { + \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ + \abovedisplayshortskip \z@ \@plus3\p@ + \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@ + \belowdisplayskip \abovedisplayskip + \let\@listi\@listI + } + } + { 2 } { + \exp_after:wN \@@_set_font_size:nnNn \l_@@_font_size_tl + \normalsize + { + \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@ + \abovedisplayshortskip \z@ \@plus3\p@ + \belowdisplayshortskip 6.5\p@ \@plus3.5\p@ \@minus3\p@ + \belowdisplayskip \abovedisplayskip + \let\@listi\@listI + } + } + } + \normalsize + } +% \end{macrocode} +% +% \begin{macro}{\setbaselineskip} +% 设置基本行距，在字号命令之后使用。 +% \begin{macrocode} +\NewDocumentCommand \setbaselineskip { m } + { \fontsize { \f@size } {#1} \selectfont } +% \end{macrocode} +% \end{macro} +% % \subsection{字体配置} % % \begin{macro}[int]{\@@_fontset_error:nn} @@ -3439,10 +3496,11 @@ \keys_define:nn { sjtu / style } { header-font .tl_set:N = \l_@@_style_header_font_tl , -% header-font .initial:n = \zihao { -5 } , +% header-font .initial:n = \zihao { -5 } \setbaselineskip { 12 bp } , % header-font .initial:n = \zihao { -5 } \sffamily , footer-font .tl_set:N = \l_@@_style_footer_font_tl , - footer-font .initial:n = \zihao { -5 } +% footer-font .initial:n = \zihao { -5 } \setbaselineskip { 12 bp } +% footer-font .initial:n = \zihao { -5 } } \fancyheadinit { \l_@@_style_header_font_tl } \fancyfootinit { \l_@@_style_footer_font_tl } @@ -3604,13 +3662,21 @@ { pagestyle = SJTU@null , fixskip = true , - beforeskip = 24 bp , - afterskip = 18 bp , - lofskip = \c_zero_skip , - lotskip = \c_zero_skip , - format = \zihao { 3 } \bfseries \CJKsffamily \centering , +%<*thesis> + beforeskip = 27 bp , + afterskip = 27 bp , + format = \zihao { 3 } \setbaselineskip{ 20 bp } \bfseries + \CJKsffamily \centering , +% +%<*report> + beforeskip = 30 pt , + afterskip = 24 pt , + format = \Large \bfseries \CJKsffamily \centering , +% nameformat = , titleformat = , + lofskip = \c_zero_skip , + lotskip = \c_zero_skip , aftername = \quad , afterindent = true } @@ -3626,23 +3692,34 @@ %<*class> \ctex_set:nn { section } { +%<*thesis> beforeskip = 24 bp , afterskip = 6 bp , - format = \zihao { 4 } \bfseries \CJKsffamily , + format = \zihao { 4 } \setbaselineskip { 18 bp } \bfseries + \CJKsffamily , +% +% format = \large \bfseries \CJKsffamily , afterindent = true } \ctex_set:nn { subsection } { +%<*thesis> beforeskip = 12 bp , afterskip = 6 bp , - format = \zihao { -4 } \bfseries \CJKsffamily , + format = \zihao { -4 } \setbaselineskip { 16 bp } \bfseries + \CJKsffamily , +% +% format = \normalsize \bfseries \CJKsffamily , afterindent = true } \ctex_set:nn { subsubsection } { +%<*thesis> beforeskip = 6 bp , afterskip = 6 bp , - format = \zihao { -4 } \normalfont , + format = \zihao { -4 } \setbaselineskip { 16 bp } \normalfont , +% +% format = \normalsize \normalfont , afterindent = true } \ctex_set:nn { paragraph } @@ -3731,7 +3808,8 @@ \keys_define:nn { sjtu / style } { float-font .tl_set:N = \SJTU@style@float@font , - float-font .initial:n = \zihao { 5 } \fixedlineskip { 15.6 bp } +% float-font .initial:n = \zihao { 5 } \setbaselineskip { 14 bp } +% float-font .initial:n = \zihao { 5 } } \ctex_patch_cmd:Nnn \@floatboxreset { \normalsize } { \SJTU@style@float@font } @@ -3743,10 +3821,14 @@ { caption-font .code:n = { \DeclareCaptionFont { SJTU@font } {#1} } , - caption-font .initial:n = \zihao { 5 } \bfseries , +% caption-font .initial:n = \zihao { 5 } \setbaselineskip { 14 bp } +% \bfseries , +% caption-font .initial:n = \zihao { 5 } \bfseries , subcaption-font .code:n = { \DeclareCaptionFont { SJTU@sub@font } {#1} } , - subcaption-font .initial:n = \zihao { 5 } \normalfont +% subcaption-font .initial:n = \zihao { 5 } \setbaselineskip { 14 bp } +% \normalfont +% subcaption-font .initial:n = \zihao { 5 } \normalfont } \DeclareCaptionLabelSeparator { enskip } { \enskip } \captionsetup @@ -4466,19 +4548,19 @@ }, { subject } { - format = \zihao { -2 } \fixedlineskip { 31.2 bp } , + format = \zihao { -2 } \setbaselineskip { 30 bp } , content = \l_@@_info_subject_zh_tl , - bottom-skip = \c_zero_dim plus 2 fill + bottom-skip = \c_zero_dim plus 1 fill }, { title } { - format = \zihao { 2 } \bfseries \fixedlineskip { 31.2 bp } , + format = \zihao { 2 } \setbaselineskip { 36 bp } \bfseries , content = \l_@@_info_display_title_zh_tl , - bottom-skip = \c_zero_dim plus 3 fill + bottom-skip = 30 bp plus 1 fill }, { info } { - format = \zihao { 4 } \fixedlineskip { 31.2 bp } , + format = \zihao { 4 } \setbaselineskip { 30 bp } , content = { \@@_title_page_info_i:nxn { zh } @@ -4497,13 +4579,12 @@ \@@_left_aligned_box:nn {#2} {#3} } } , - bottom-skip = 31.2 bp + bottom-skip = 30 bp }, { date } { - format = \zihao { 4 } \bfseries \fixedlineskip { 31.2 bp } , + format = \zihao { 4 } \setbaselineskip { 30 bp } \bfseries , content = \l_@@_info_date_zh_tl , - bottom-skip = 15.6 bp } } { @@ -4514,7 +4595,7 @@ bookmark = true , bookmark-text = \c_@@_name_title_page_tl , style = SJTU@fund@zh , - format = \linespread { 1 } \@@_set_language_zh: , + format = \linespread { } \@@_set_language_zh: , prefix = title / zh , components = { logo, subject, title, info, date } } @@ -4524,23 +4605,23 @@ { { subject } { - format = \zihao { 4 } \bfseries \fixedlineskip { 31.2 bp } , + format = \zihao { 4 } \setbaselineskip { 24 bp } \bfseries , % content = \l_@@_info_subject_en_tl , % content = \l_@@_info_subject_de_tl , % content = \l_@@_info_subject_ja_tl , - bottom-skip = \c_zero_dim plus 2 fill + bottom-skip = \c_zero_dim plus 1 fill }, { title } { - format = \zihao { -2 } \bfseries \fixedlineskip { 31.2 bp } , + format = \zihao { -2 } \setbaselineskip { 30 bp } \bfseries , % content = \MakeUppercase \l_@@_info_display_title_en_tl , % content = \MakeUppercase \l_@@_info_display_title_de_tl , % content = \l_@@_info_display_title_ja_tl , - bottom-skip = \c_zero_dim plus 2 fill + bottom-skip = \c_zero_dim plus 1 fill }, { info } { - format = \zihao { 3 } \fixedlineskip { 31.2 bp } , + format = \zihao { 3 } \setbaselineskip { 30 bp } , content = { % \@@_title_page_info_i:nxn { en } @@ -4551,16 +4632,15 @@ % { { \bfseries #1 \c_@@_name_info_sep_de_tl } {#3} } % { { \bfseries #1 \c_@@_name_info_sep_ja_tl } {#3} } } , - bottom-skip = \c_zero_dim plus 3 fill + bottom-skip = 30 bp plus 1 fill }, { date } { - format = \zihao { 3 } \fixedlineskip { 31.2 bp } , + format = \zihao { 3 } \setbaselineskip { 30 bp } , content = % { \@@_title_page_info_ii:n { en } } , % { \@@_title_page_info_ii:n { de } } , % { \@@_title_page_info_ii:n { ja } } , - bottom-skip = 15.6 bp }, } { @@ -4572,7 +4652,7 @@ \@@_declare_page:nn { title / en } { style = SJTU@fund@en , - format = \linespread { 1 } \@@_set_language_en: , + format = \linespread { } \@@_set_language_en: , prefix = title / en , components = { subject, title, info, date } } @@ -4581,7 +4661,7 @@ \@@_declare_page:nn { title / de } { style = SJTU@fund@de , - format = \linespread { 1 } \@@_set_language_de: , + format = \linespread { } \@@_set_language_de: , prefix = title / de , components = { subject, title, info, date } } @@ -4590,7 +4670,7 @@ \@@_declare_page:nn { title / ja } { style = SJTU@fund@ja , - format = \linespread { 1 } \@@_set_language_ja: , + format = \linespread { } \@@_set_language_ja: , prefix = title / ja , components = { subject, title, info, date } } @@ -4630,7 +4710,8 @@ { { orig / title } { - format = \zihao { 3 } \heiti \fixedlineskip { 31.2 bp } , + format = \zihao { 3 } \setbaselineskip { 30 bp } + \bfseries \heiti , content = { \c_@@_name_univ_zh_tl @@ -4638,18 +4719,18 @@ \c_@@_name_thesis_zh_tl \c_@@_name_orig_decl_zh_tl } , - bottom-skip = 15.6 bp + bottom-skip = 12 bp }, { orig / text } { - format = \zihao { -4 } \fixedlineskip { 23.4 bp } , + format = \zihao { -4 } \setbaselineskip { 24 bp } , content = \c_@@_orig_decl_text_zh_tl , - bottom-skip = 15.6 bp , + bottom-skip = 24 bp , align = normal }, { orig / sign } { - format = \zihao { 4 } \fixedlineskip { 31.2 bp } , + format = \zihao { 4 } \setbaselineskip { 30 bp } , content = { \@@_signature:N \c_@@_name_decl_author_zh_tl @@ -4660,7 +4741,8 @@ }, { auth / title } { - format = \zihao { 3 } \heiti \fixedlineskip { 31.2 bp } , + format = \zihao { 3 } \setbaselineskip { 30 bp } + \bfseries \heiti , content = { \c_@@_name_univ_zh_tl @@ -4668,23 +4750,24 @@ \c_@@_name_thesis_zh_tl \c_@@_name_auth_decl_zh_tl } , - bottom-skip = 15.6 bp + bottom-skip = 12 bp }, { auth / text } { - format = \zihao { -4 } \fixedlineskip { 23.4 bp } , + format = \zihao { -4 } \setbaselineskip { 24 bp } , content = \c_@@_auth_decl_text_zh_tl , - bottom-skip = 15.6 bp , + bottom-skip = 24 bp , align = normal }, { auth / sign } { - format = \zihao { 4 } \fixedlineskip { 31.2 bp } , + format = \zihao { 4 } \setbaselineskip { 30 bp } , content = { \@@_signature:N \c_@@_name_decl_author_zh_tl \hfill \@@_signature:N \c_@@_name_decl_supervisor_zh_tl + \skip_horizontal:n { 2 em } \hbox:n { } } , bottom-skip = \c_zero_dim plus 1 fill , align = normal @@ -4697,7 +4780,7 @@ { bookmark = true , bookmark-text = \c_@@_name_declaration_tl , - format = \linespread { 1 } \@@_set_language_zh: , + format = \linespread { } \@@_set_language_zh: , prefix = copyright , components = {