summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-24 17:52:14 +0000
committerKarl Berry <karl@freefriends.org>2023-10-24 17:52:14 +0000
commitea592f6f6b83928cea5ce5ce9d498abd4ff160c8 (patch)
treefaed07bc08353ef8109a562954faaf9bd5bfafd4
parent6926b2074aeca8e401bc82773bdb0f324d0b6841 (diff)
bithesis (23oct23)
git-svn-id: svn://tug.org/texlive/trunk@68634 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/bithesis/bithesis.pdfbin556835 -> 731548 bytes
-rw-r--r--Master/texmf-dist/source/latex/bithesis/bithesis.dtx43
-rw-r--r--Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls2
-rw-r--r--Master/texmf-dist/tex/latex/bithesis/bithesis.cls41
-rw-r--r--Master/texmf-dist/tex/latex/bithesis/bitreport.cls2
5 files changed, 55 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/bithesis/bithesis.pdf b/Master/texmf-dist/doc/latex/bithesis/bithesis.pdf
index 7803e14a814..30446bfc259 100644
--- a/Master/texmf-dist/doc/latex/bithesis/bithesis.pdf
+++ b/Master/texmf-dist/doc/latex/bithesis/bithesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/bithesis/bithesis.dtx b/Master/texmf-dist/source/latex/bithesis/bithesis.dtx
index f930ad8eede..10374a0ad42 100644
--- a/Master/texmf-dist/source/latex/bithesis/bithesis.dtx
+++ b/Master/texmf-dist/source/latex/bithesis/bithesis.dtx
@@ -21,10 +21,10 @@
%<thesis>\ProvidesExplClass{bithesis}
%<report>\ProvidesExplClass{bitreport}
%<beamer>\ProvidesExplClass{bitbeamer}
-%<cls>{2023-10-01}{3.6.0}{BIT Thesis Templates}
+%<cls>{2023-10-24}{3.6.1}{BIT Thesis Templates}
%
%<*driver>
-\ProvidesFile{bithesis.dtx}[2023/10/01 3.6.0 BIT Thesis Templates]
+\ProvidesFile{bithesis.dtx}[2023/10/24 3.6.1 BIT Thesis Templates]
\documentclass[letterpaper]{l3doc}
\usepackage{dtx-style}
@@ -772,6 +772,11 @@
% 控制英文是否使用 hyphen 进行换行
hyphen .bool_set:N = \l_@@_style_hyphen_bool,
hyphen .initial:n = {true},
+ % 控制公式和上下文的距离
+ mathAboveDisplaySkip .dim_set:N = \l_@@_style_math_above_display_skip_dim,
+ mathAboveDisplaySkip .initial:n = {3pt},
+ mathBelowDisplaySkip .dim_set:N = \l_@@_style_math_below_display_skip_dim,
+ mathBelowDisplaySkip .initial:n = {3pt},
}
% \end{macrocode}
%
@@ -878,11 +883,10 @@
\RequirePackage[table,xcdraw]{xcolor}
\RequirePackage{xeCJK}
\RequirePackage{titletoc}
-\RequirePackage{setspace}
\RequirePackage{graphicx}
\RequirePackage{fancyhdr}
\RequirePackage{pdfpages}
-\RequirePackage{setspace}
+\RequirePackage[nodisplayskipstretch]{setspace}
\RequirePackage{booktabs}
\RequirePackage{multirow}
\RequirePackage{tikz}
@@ -1281,8 +1285,8 @@
nameformat = {},
titleformat = {},
aftername = \hspace{8bp},
- beforeskip = 20bp plus 1ex minus .2ex,
- afterskip = 18bp plus .2ex,
+ beforeskip = 20bp,
+ afterskip = 17bp,
fixskip = true,
}
}
@@ -1299,8 +1303,8 @@
nameformat = {},
titleformat = {},
aftername = \hspace{7bp},
- beforeskip = 17bp plus 1ex minus .2ex,
- afterskip = 14bp plus .2ex,
+ beforeskip = 17bp,
+ afterskip = 17bp,
fixskip = true,
}
}
@@ -1320,8 +1324,8 @@
format={\l_@@_title_font_cs:n \raggedright \zihao{-4}},
nameformat = {},
titleformat = {},
- beforeskip=14bp plus 1ex minus .2ex,
- afterskip=14bp plus .2ex,
+ beforeskip=14bp,
+ afterskip=14bp,
fixskip=true,
}
}
@@ -1385,7 +1389,7 @@
numbering = false,
}
}
- \setstretch{1.53}
+ \linespread{1.53}\selectfont
\pagestyle{BIThesis}
% 表格内容默认使用五号字。
@@ -1420,7 +1424,7 @@
\pagestyle{BIThesis}
% 正文 22 磅的行距
\setlength{\parskip}{0em}
- \setstretch{1.53}
+ \linespread{1.53}\selectfont
% 修复脚注出现跨页的问题
\interfootnotelinepenalty=10000
}
@@ -1498,6 +1502,13 @@
\AtBeginDocument{
\cs_gset:Npn \thelstlisting {\thechapter\g_@@_label_divide_char_tl\arabic{lstlisting}}
\cs_gset:Npn \lstlistingname {\c_@@_label_code_tl}
+
+ % 默认的情况下,保留公式和上下文的一定间距。(会比 Word 稍宽一些)
+ \setlength{\abovedisplayskip}{\l_@@_style_math_above_display_skip_dim}
+ \setlength{\abovedisplayshortskip}{\l_@@_style_math_above_display_skip_dim}
+ \setlength{\belowdisplayskip}{\l_@@_style_math_below_display_skip_dim}
+ \setlength{\belowdisplayshortskip}{\l_@@_style_math_below_display_skip_dim}
+ %
}
\captionsetup[lstlisting]{font=small,labelsep=space}
% \end{macrocode}
@@ -1767,7 +1778,7 @@
\begin{titlepage}
\vskip 5cm
\begin{center}
- \setstretch{1.1}
+ \linespread{1.1}\selectfont
\begin{minipage}[t][19.7cm]{2em}
\begin{center}
{
@@ -2357,7 +2368,7 @@
\newpage
}
{3} {
- \setstretch{1.26}
+ \linespread{1.26}\selectfont
% 原创性声明部分
\begin{center}
\vspace*{-2bp}
@@ -2482,7 +2493,7 @@
{
\cleardoublepage
- \setstretch{1.53}
+ \linespread{1.53}\selectfont
\@@_if_bachelor_thesis:T {
\begin{center}
@@ -2552,7 +2563,7 @@
% \begin{macrocode}
\NewDocumentEnvironment {abstractEn} {}
{
- \setstretch{1.53}
+ \linespread{1.53}\selectfont
\@@_if_bachelor_thesis:T {
\begin{spacing}{0.95}
diff --git a/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls b/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls
index c401a4c6e0b..b54bb8b8793 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-10-01}{3.6.0}{BIT Thesis Templates}
+{2023-10-24}{3.6.1}{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 5950a62aad3..5f3a464a240 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-10-01}{3.6.0}{BIT Thesis Templates}
+{2023-10-24}{3.6.1}{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
@@ -520,6 +520,11 @@
% 控制英文是否使用 hyphen 进行换行
hyphen .bool_set:N = \l__bithesis_style_hyphen_bool,
hyphen .initial:n = {true},
+ % 控制公式和上下文的距离
+ mathAboveDisplaySkip .dim_set:N = \l__bithesis_style_math_above_display_skip_dim,
+ mathAboveDisplaySkip .initial:n = {3pt},
+ mathBelowDisplaySkip .dim_set:N = \l__bithesis_style_math_below_display_skip_dim,
+ mathBelowDisplaySkip .initial:n = {3pt},
}
\keys_define:nn { bithesis / TOC }
{
@@ -577,11 +582,10 @@
\RequirePackage[table,xcdraw]{xcolor}
\RequirePackage{xeCJK}
\RequirePackage{titletoc}
-\RequirePackage{setspace}
\RequirePackage{graphicx}
\RequirePackage{fancyhdr}
\RequirePackage{pdfpages}
-\RequirePackage{setspace}
+\RequirePackage[nodisplayskipstretch]{setspace}
\RequirePackage{booktabs}
\RequirePackage{multirow}
\RequirePackage{tikz}
@@ -875,8 +879,8 @@
nameformat = {},
titleformat = {},
aftername = \hspace{8bp},
- beforeskip = 20bp plus 1ex minus .2ex,
- afterskip = 18bp plus .2ex,
+ beforeskip = 20bp,
+ afterskip = 17bp,
fixskip = true,
}
}
@@ -893,8 +897,8 @@
nameformat = {},
titleformat = {},
aftername = \hspace{7bp},
- beforeskip = 17bp plus 1ex minus .2ex,
- afterskip = 14bp plus .2ex,
+ beforeskip = 17bp,
+ afterskip = 17bp,
fixskip = true,
}
}
@@ -914,8 +918,8 @@
format={\l__bithesis_title_font_cs:n \raggedright \zihao{-4}},
nameformat = {},
titleformat = {},
- beforeskip=14bp plus 1ex minus .2ex,
- afterskip=14bp plus .2ex,
+ beforeskip=14bp,
+ afterskip=14bp,
fixskip=true,
}
}
@@ -968,7 +972,7 @@
numbering = false,
}
}
- \setstretch{1.53}
+ \linespread{1.53}\selectfont
\pagestyle{BIThesis}
% 表格内容默认使用五号字。
@@ -997,7 +1001,7 @@
\pagestyle{BIThesis}
% 正文 22 磅的行距
\setlength{\parskip}{0em}
- \setstretch{1.53}
+ \linespread{1.53}\selectfont
% 修复脚注出现跨页的问题
\interfootnotelinepenalty=10000
}
@@ -1051,6 +1055,13 @@
\AtBeginDocument{
\cs_gset:Npn \thelstlisting {\thechapter\g__bithesis_label_divide_char_tl\arabic{lstlisting}}
\cs_gset:Npn \lstlistingname {\c__bithesis_label_code_tl}
+
+ % 默认的情况下,保留公式和上下文的一定间距。(会比 Word 稍宽一些)
+ \setlength{\abovedisplayskip}{\l__bithesis_style_math_above_display_skip_dim}
+ \setlength{\abovedisplayshortskip}{\l__bithesis_style_math_above_display_skip_dim}
+ \setlength{\belowdisplayskip}{\l__bithesis_style_math_below_display_skip_dim}
+ \setlength{\belowdisplayshortskip}{\l__bithesis_style_math_below_display_skip_dim}
+ %
}
\captionsetup[lstlisting]{font=small,labelsep=space}
\bool_if:NF \l__bithesis_style_hyphen_bool {
@@ -1215,7 +1226,7 @@
\begin{titlepage}
\vskip 5cm
\begin{center}
- \setstretch{1.1}
+ \linespread{1.1}\selectfont
\begin{minipage}[t][19.7cm]{2em}
\begin{center}
{
@@ -1727,7 +1738,7 @@
\newpage
}
{3} {
- \setstretch{1.26}
+ \linespread{1.26}\selectfont
% 原创性声明部分
\begin{center}
\vspace*{-2bp}
@@ -1828,7 +1839,7 @@
{
\cleardoublepage
- \setstretch{1.53}
+ \linespread{1.53}\selectfont
\__bithesis_if_bachelor_thesis:T {
\begin{center}
@@ -1892,7 +1903,7 @@
}
\NewDocumentEnvironment {abstractEn} {}
{
- \setstretch{1.53}
+ \linespread{1.53}\selectfont
\__bithesis_if_bachelor_thesis:T {
\begin{spacing}{0.95}
diff --git a/Master/texmf-dist/tex/latex/bithesis/bitreport.cls b/Master/texmf-dist/tex/latex/bithesis/bitreport.cls
index 3268ffc6974..59f7513e661 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-10-01}{3.6.0}{BIT Thesis Templates}
+{2023-10-24}{3.6.1}{BIT Thesis Templates}
\int_new:N \g__bithesis_report_type_int
\clist_const:Nn \c__bithesis_report_type_clist
{ common, undergraduate_proposal}