diff options
author | Karl Berry <karl@freefriends.org> | 2023-04-14 20:31:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-04-14 20:31:00 +0000 |
commit | e62212e5cd60dc33c52e1a635570407f99ec099f (patch) | |
tree | 5f0568125489e26877995c2702b6f750a13d4f2f /Master/texmf-dist/tex | |
parent | db8bc0b6f5708407c17023d40e21370b354fc185 (diff) |
bithesis (14apr23)
git-svn-id: svn://tug.org/texlive/trunk@66849 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bithesis/bithesis.cls | 43 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bithesis/bitreport.cls | 2 |
3 files changed, 35 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls b/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls index f87524da327..7d3a8b47017 100644 --- a/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls +++ b/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls @@ -27,7 +27,7 @@ %% \RequirePackage{expl3,l3keys2e} \ProvidesExplClass{bitbeamer} -{2023-04-04}{3.5.0}{BIT Thesis Templates} +{2023-04-14}{3.5.2}{BIT Thesis Templates} \keys_define:nn { bitbeamer } { titlegraphic .tl_set:N = \l_bit_titlegraphic_tl, diff --git a/Master/texmf-dist/tex/latex/bithesis/bithesis.cls b/Master/texmf-dist/tex/latex/bithesis/bithesis.cls index a1d5d7e0f28..74ff491627e 100644 --- a/Master/texmf-dist/tex/latex/bithesis/bithesis.cls +++ b/Master/texmf-dist/tex/latex/bithesis/bithesis.cls @@ -27,7 +27,7 @@ %% \RequirePackage{expl3,l3keys2e} \ProvidesExplClass{bithesis} -{2023-04-04}{3.5.0}{BIT Thesis Templates} +{2023-04-14}{3.5.2}{BIT Thesis Templates} \int_new:N \g__bithesis_thesis_type_int \int_new:N \g__bithesis_head_zihao_int \bool_new:N \g__bithesis_twoside_bool @@ -219,8 +219,8 @@ {conclusion} {结\label_space: 论} {Conclusions}, {appendix} {附\label_space: 录} {Appendices}, {ack} {致\label_space: 谢} {Acknowledgement}, - {figure} {插\quad 图} {Illustrations}, - {table} {表\quad 格} {Tables}, + {figure} {插\label_space: 图} {Illustrations}, + {table} {表\label_space: 格} {Tables}, {appendix_prefix} {附录} {Appendix}, {reference} {参考文献} {References}, {university} {北京理工大学} {Beijing~Institute~of~Technology}, @@ -462,7 +462,7 @@ \RequirePackage{etoolbox} \RequirePackage[hidelinks,bookmarksnumbered]{hyperref} \RequirePackage{xcolor} -\RequirePackage{caption} +\RequirePackage[strut=off]{caption} \RequirePackage{array} \RequirePackage{amsmath} \RequirePackage{amssymb} @@ -505,7 +505,7 @@ } } \__bithesis_if_bachelor_thesis:T { - \setlength{\intextsep}{2\baselineskip plus 0.2\baselineskip minus 0.2\baselineskip} + \setlength{\intextsep}{1.80\baselineskip plus 0.2\baselineskip minus 0.2\baselineskip} } \setmainfont{Times~New~Roman} \setromanfont{Times~New~Roman} @@ -774,8 +774,8 @@ format={\l__bithesis_title_font_cs:n \bfseries \raggedright \zihao{-4}}, nameformat = {}, titleformat = {}, - beforeskip=28bp plus 1ex minus .2ex, - afterskip=24bp plus .2ex, + beforeskip=14bp plus 1ex minus .2ex, + afterskip=14bp plus .2ex, fixskip=true, } } @@ -818,9 +818,12 @@ numbering = false, } } + \setstretch{1.53} \pagestyle{BIThesis} } \RenewDocumentCommand \mainmatter {} { + % 另起一个空页,以便于后续的章节标题编号。 + \clearpage % 这部分的章节标题进行编号。 \ctexset{ chapter = { @@ -853,7 +856,23 @@ } } \setlength{\abovecaptionskip}{11pt} -\setlength{\belowcaptionskip}{9pt} +\__bithesis_if_bachelor_thesis:TF { + \__bithesis_if_thesis_english:TF { + \setlength{\belowcaptionskip}{9pt} + } { + % 为了满足 “前后一行空白的问题”,需要删除 Caption 下方的间距。 + % 详见 `caption` 宏包手册和 + % https://github.com/CTeX-org/forum/issues/86 + % + % 这里实际的 skip 在 15pt 左右,但是全部移除会导致当图片置于页面顶部时, + % 图片与上方的间距过小,因此这里只移除 5pt。 + % 当然,这样会导致文本间的图片的 Caption 下方的间距微微大于一行。 + \captionsetup{belowskip=-5pt} + } +} { + % 而研究生模板不存在这个问题。 + \setlength{\belowcaptionskip}{9pt} +} \__bithesis_if_graduate:TF { \tl_set:Nn \g__bithesis_label_divide_char_tl {.} } { @@ -863,12 +882,13 @@ \captionsetup[figure]{font=small,labelsep=space} \cs_set:Npn \thetable {\thechapter\g__bithesis_label_divide_char_tl\arabic{table}} -\captionsetup[table]{font=small,labelsep=space,skip=2pt} +\captionsetup[table]{font=small,labelsep=space} \cs_set:Npn \theequation {\thechapter\g__bithesis_label_divide_char_tl\arabic{equation}} \cs_set:Npn \thelstlisting {\thechapter\g__bithesis_label_divide_char_tl\arabic{lstlisting}} \cs_set:Npn \lstlistingname {\c__bithesis_label_code_tl} +\captionsetup[listing]{font=small,labelsep=space} \tolerance=1 \emergencystretch=\maxdimen \hyphenpenalty=10000 @@ -1999,6 +2019,8 @@ \DeclareDelimFormat[bib,biblist]{finalnamedelim}{} % 如果自己不是第一个作者,不修改此项的话,会在最开始有逗号。 \DeclareDelimFormat{multinamedelim}{} + % 如果覆盖的是英文作者,不修改此项的话,会在最开始有空格。 + \DeclareDelimFormat{bibnamedelimd}{} } % ===== 上方定义与「参考文献」部分相同 @@ -2108,7 +2130,8 @@ labelsep=0.5cm, leftmargin=3cm, itemindent=0cm, - itemsep=0cm + % 不再在两项之间增加额外的间距(1.5 倍的行间距已经够宽了)(未来可以提供一个接口以供用户手动设置间距) + itemsep=-0.5ex, ] \cs_set:Npn \makelabel ##1 {##1\hfil} } diff --git a/Master/texmf-dist/tex/latex/bithesis/bitreport.cls b/Master/texmf-dist/tex/latex/bithesis/bitreport.cls index 730bcd40f63..3cf21962e9d 100644 --- a/Master/texmf-dist/tex/latex/bithesis/bitreport.cls +++ b/Master/texmf-dist/tex/latex/bithesis/bitreport.cls @@ -27,7 +27,7 @@ %% \RequirePackage{expl3,l3keys2e} \ProvidesExplClass{bitreport} -{2023-04-04}{3.5.0}{BIT Thesis Templates} +{2023-04-14}{3.5.2}{BIT Thesis Templates} \int_new:N \g__bithesis_report_type_int \clist_const:Nn \c__bithesis_report_type_clist { common, undergraduate_proposal} |