Skip to content

Commit

Permalink
Merge pull request #176 from BITNP/hotfix/175
Browse files Browse the repository at this point in the history
hotfix: typo on doctor
  • Loading branch information
fky2015 authored Sep 29, 2022
2 parents 62f9e8c + 31bf162 commit 5026f2b
Show file tree
Hide file tree
Showing 26 changed files with 758 additions and 17 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ Acronyms:

**Bolded text highlights its importance.**

## [3.0.3] - 2022-09-29

[62f9e8c](62f9e8c8e0ba0450306255e6728543d6213e34d3)...[a21ce51](a21ce5108a19241c1c0b917fe098b4e0498550cc)

### Hotfix

- Typo on doctor ([a21ce51](a21ce5108a19241c1c0b917fe098b4e0498550cc))

## [3.0.2] - 2022-09-17

[685afa3](685afa3d8f02fb898ca4fe995a5d89ae935d6fcf)...[0358a58](0358a58dd5e3a5d9084e2d6ef4a910f34c358f27)
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CLSFILE = dtx-style.sty bitart.cls bitbook.cls bitgrad.cls bitreport.cls bithesi
LATEXMK = latexmk

SCAFFOLDDIR = ./templates
TESTDIR = ./tests

# make deletion work on Windows
ifdef SystemRoot
Expand All @@ -33,7 +34,7 @@ viewdoc: doc

clean:
$(LATEXMK) -c $(PACKAGE).dtx
-@$(RM) -r *.glo $(CLSFILE) _minted-bithesis
-@$(RM) -r *.glo $(CLSFILE)

clean-dist:
-@$(RM) -r $(PACKAGE).pdf
Expand All @@ -48,6 +49,7 @@ test: doc copy FORCE_MAKE
cd $(SCAFFOLDDIR)/graduate-thesis && latexmk && cd ..
cd $(SCAFFOLDDIR)/lab-report && latexmk && cd ..
cd $(SCAFFOLDDIR)/presentation-slide && latexmk && cd ..
cd $(TESTDIR)/doctor-thesis && latexmk && cd ..

regression-test: cls
zsh ./scripts/regression-testing.zsh
Expand All @@ -57,6 +59,7 @@ copy: cls
cp bithesis.cls $(SCAFFOLDDIR)/undergraduate-thesis-en
cp bithesis.cls $(SCAFFOLDDIR)/paper-translation
cp bithesis.cls $(SCAFFOLDDIR)/graduate-thesis
cp bithesis.cls $(TESTDIR)/doctor-thesis
cp bitreport.cls $(SCAFFOLDDIR)/undergraduate-proposal-report
cp bitreport.cls $(SCAFFOLDDIR)/lab-report
cp bitbeamer.cls $(SCAFFOLDDIR)/presentation-slide
Expand Down
10 changes: 5 additions & 5 deletions bithesis.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
%<thesis>\ProvidesExplClass{bithesis}
%<report>\ProvidesExplClass{bitreport}
%<beamer>\ProvidesExplClass{bitbeamer}
%<cls>{2022-09-15}{3.0.1}{BIT Thesis Templates}
%<cls>{2022-09-29}{3.0.3}{BIT Thesis Templates}
%
%<oldcls>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
%<book>\ProvidesClass{bitbook}
Expand All @@ -30,7 +30,7 @@
%<oldcls> [2022/05/09 v2.1.1 BIT Thesis Templates]
%
%<*driver>
\ProvidesFile{bithesis.dtx}[2022/09/15 3.0.1 BIT Thesis Templates]
\ProvidesFile{bithesis.dtx}[2022/09/29 3.0.3 BIT Thesis Templates]
\documentclass[letterpaper]{l3doc}
\usepackage{dtx-style}

Expand Down Expand Up @@ -264,7 +264,7 @@
%
% \begin{function}{type}
% \begin{bitsyntax}[emph={[1]type}]
% type = (*<(bachelor)|\mbox{bachelor_translation}|\mbox{bachelor_english}|master|docter>*)
% type = (*<(bachelor)|\mbox{bachelor_translation}|\mbox{bachelor_english}|master|doctor>*)
% \end{bitsyntax}
% 选择论文类型,它们分别对应:
% \begin{itemize}
Expand Down Expand Up @@ -1380,7 +1380,7 @@
% 定义论文类型的列表。
% \begin{macrocode}
\clist_const:Nn \c_@@_thesis_type_clist
{ bachelor, bachelor_translation, bachelor_english, master, docter}
{ bachelor, bachelor_translation, bachelor_english, master, doctor}
% \end{macrocode}
% \end{variable}

Expand Down Expand Up @@ -3480,7 +3480,7 @@
\newif\if@bit@bachelor
\newif\if@bit@docTranslation
\newif\if@bit@master
\newif\if@bit@docter
\newif\if@bit@doctor

\RequirePackage{kvoptions}

Expand Down
4 changes: 2 additions & 2 deletions templates/graduate-thesis/bithesis.cls
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
%%
\RequirePackage{expl3,l3keys2e}
\ProvidesExplClass{bithesis}
{2022-09-15}{3.0.1}{BIT Thesis Templates}
{2022-09-29}{3.0.3}{BIT Thesis Templates}


\int_new:N \g__bithesis_thesis_type_int
Expand Down Expand Up @@ -63,7 +63,7 @@
\cs_new:Npn \__bithesis_if_doctor_thesis:TF #1#2 {\int_compare:nNnTF {\g__bithesis_thesis_type_int} = {5} {#1} {#2}}

\clist_const:Nn \c__bithesis_thesis_type_clist
{ bachelor, bachelor_translation, bachelor_english, master, docter}
{ bachelor, bachelor_translation, bachelor_english, master, doctor}

\cs_new_protected:Npn \__bithesis_define_label:nn #1#2
{ \tl_const:cn { c__bithesis_label_ #1 _tl } {#2} }
Expand Down
2 changes: 1 addition & 1 deletion templates/lab-report/bitreport.cls
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
%%
\RequirePackage{expl3,l3keys2e}
\ProvidesExplClass{bitreport}
{2022-09-15}{3.0.1}{BIT Thesis Templates}
{2022-09-29}{3.0.3}{BIT Thesis Templates}


\int_new:N \g__bithesis_report_type_int
Expand Down
4 changes: 2 additions & 2 deletions templates/paper-translation/bithesis.cls
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
%%
\RequirePackage{expl3,l3keys2e}
\ProvidesExplClass{bithesis}
{2022-09-15}{3.0.1}{BIT Thesis Templates}
{2022-09-29}{3.0.3}{BIT Thesis Templates}


\int_new:N \g__bithesis_thesis_type_int
Expand Down Expand Up @@ -63,7 +63,7 @@
\cs_new:Npn \__bithesis_if_doctor_thesis:TF #1#2 {\int_compare:nNnTF {\g__bithesis_thesis_type_int} = {5} {#1} {#2}}

\clist_const:Nn \c__bithesis_thesis_type_clist
{ bachelor, bachelor_translation, bachelor_english, master, docter}
{ bachelor, bachelor_translation, bachelor_english, master, doctor}

\cs_new_protected:Npn \__bithesis_define_label:nn #1#2
{ \tl_const:cn { c__bithesis_label_ #1 _tl } {#2} }
Expand Down
2 changes: 1 addition & 1 deletion templates/presentation-slide/bitbeamer.cls
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
%%
\RequirePackage{expl3,l3keys2e}
\ProvidesExplClass{bitbeamer}
{2022-09-15}{3.0.1}{BIT Thesis Templates}
{2022-09-29}{3.0.3}{BIT Thesis Templates}


\keys_define:nn { bitbeamer }
Expand Down
2 changes: 1 addition & 1 deletion templates/undergraduate-proposal-report/bitreport.cls
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
%%
\RequirePackage{expl3,l3keys2e}
\ProvidesExplClass{bitreport}
{2022-09-15}{3.0.1}{BIT Thesis Templates}
{2022-09-29}{3.0.3}{BIT Thesis Templates}


\int_new:N \g__bithesis_report_type_int
Expand Down
4 changes: 2 additions & 2 deletions templates/undergraduate-thesis-en/bithesis.cls
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
%%
\RequirePackage{expl3,l3keys2e}
\ProvidesExplClass{bithesis}
{2022-09-15}{3.0.1}{BIT Thesis Templates}
{2022-09-29}{3.0.3}{BIT Thesis Templates}


\int_new:N \g__bithesis_thesis_type_int
Expand Down Expand Up @@ -63,7 +63,7 @@
\cs_new:Npn \__bithesis_if_doctor_thesis:TF #1#2 {\int_compare:nNnTF {\g__bithesis_thesis_type_int} = {5} {#1} {#2}}

\clist_const:Nn \c__bithesis_thesis_type_clist
{ bachelor, bachelor_translation, bachelor_english, master, docter}
{ bachelor, bachelor_translation, bachelor_english, master, doctor}

\cs_new_protected:Npn \__bithesis_define_label:nn #1#2
{ \tl_const:cn { c__bithesis_label_ #1 _tl } {#2} }
Expand Down
4 changes: 2 additions & 2 deletions templates/undergraduate-thesis/bithesis.cls
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
%%
\RequirePackage{expl3,l3keys2e}
\ProvidesExplClass{bithesis}
{2022-09-15}{3.0.1}{BIT Thesis Templates}
{2022-09-29}{3.0.3}{BIT Thesis Templates}


\int_new:N \g__bithesis_thesis_type_int
Expand Down Expand Up @@ -63,7 +63,7 @@
\cs_new:Npn \__bithesis_if_doctor_thesis:TF #1#2 {\int_compare:nNnTF {\g__bithesis_thesis_type_int} = {5} {#1} {#2}}

\clist_const:Nn \c__bithesis_thesis_type_clist
{ bachelor, bachelor_translation, bachelor_english, master, docter}
{ bachelor, bachelor_translation, bachelor_english, master, doctor}

\cs_new_protected:Npn \__bithesis_define_label:nn #1#2
{ \tl_const:cn { c__bithesis_label_ #1 _tl } {#2} }
Expand Down
69 changes: 69 additions & 0 deletions tests/doctor-thesis/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Gruaduate Thesis 研究生学位论文

**请尽可能使用最新版本进行文章撰写,我们的代码仓库是:https://github.com/BITNP/BIThesis**

此文件夹中包含了北京理工大学研究生学位论文的全部内容,有关模板的使用方法更为详细的介绍,请参考:[bithesis 使用手册](./bithesis.pdf)

## 特性

- 符合学校对毕业论文的要求。
- 内容和样式分离,所有的配置可以集中管理。
- 一键导出盲审格式论文。
- 自适应的封面信息下划线长度。
- 由社区驱动,在积极地吸纳新功能、修复现有问题。


## 项目结构

```sh
.
├── README.md # 相关信息
├── bithesis.pdf # bithesis 使用手册
├── chapters
│   ├── abstract.tex
│   ├── chapter1.tex
│   └── chapter2.tex
├── figures
│   └── figure1.png
├── main.pdf
├── main.tex
├── misc
│ ├── 0_symbols.tex
│ ├── 1_conclusion.tex
│ ├── 2_reference.tex
│ ├── 3_appendices.tex
│ ├── 4_pub.tex
│ ├── 5_acknowledgements.tex
│ └── 6_resume.tex
└── reference
├── main.bib # 参考文献
└── pub.bib # 个人成果清单
```

## 编译方式

方式一(推荐):
```
latexmk
```

方式二:
```
-> xelatex
-> biber
-> xelatex
-> xelatex
```

- *不推荐使用 pdflatex 进行编译*

## 其他链接

- Bithesis wiki:https://bithesis.bitnp.net
- 项目地址:https://github.com/BITNP/BIThesis
- Bug report 与 Feature Request:https://github.com/BITNP/BIThesis/issues
- QQ 交流群:737548118

## 排版参考

- 《北京理工大学研究生学位毕业论文排版规范》
25 changes: 25 additions & 0 deletions tests/doctor-thesis/chapters/abstract.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
%%
% The BIThesis Template for Graduate Thesis
%
% Copyright 2020-2022 Yang Yating, BITNP
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
%
% The Current Maintainer of this work is Feng Kaiyu.

\begin{abstract}
本文......。
\textcolor{blue}{(摘要是一篇具有独立性和完整性的短文,应概括而扼要地反映出本论文的主要内容。包括研究目的、研究方法、研究结果和结论等,特别要突出研究结果和结论。中文摘要力求语言精炼准确,博士学位论文建议1000~1200字,硕士学位论文摘要建议500~800字。摘要中不可出现参考文献、图、表、化学结构式、非公知公用的符号和术语。英文摘要与中文摘要的内容应完全一致,在语法、用词上应准确无误,语言简练通顺。留学生的英文版博士学位论文中应有不少于3000字的“详细中文摘要”。)}
\end{abstract}

\begin{abstractEn}
In order to exploit.......
\end{abstractEn}
82 changes: 82 additions & 0 deletions tests/doctor-thesis/chapters/chapter1.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
%%
% The BIThesis Template for Graduate Thesis
%
% Copyright 2020-2022 Yang Yating, BITNP
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
%
% The Current Maintainer of this work is Feng Kaiyu.

\chapter{绪论}

\textcolor{blue}{
正文包括绪论、论文具体研究内容及结论部分。博士学位论文:一般为6~10万字,其中绪论要求为1万字左右。硕士学位论文:一般为3~5万字,其中绪论要求为0.5万字左右。(外语学科:中文、日文不少于3万字,西文2万字左右。)
}

\textcolor{blue}{
绪论一般作为第1章。绪论应包括本研究课题的学术背景及其理论与实际意义;本领域的国内外研究进展及成果、存在的不足或有待深入研究的问题;本研究课题的来源及主要研究内容等。
}


\label{chap:intro}
\section{本论文研究的目的和意义}

近年来,随着人们生活水平的不断提高,人们越来越注重周围环境对身体健康的影响。作为服装是人们时时刻刻最贴近的环境,尤其是内衣,对人体健康有很大的影响。由于合时刻刻最贴近的环境,尤其是内衣,对人体健康有很大的影响。由于合成纤维的衣着舒适性、手感性,天然纤维的发展又成为人们关注的一大热点。

……\cite{Takahashi1996Structure,Xia2002Analysis,Jiang1989,Mao2000Motion,Feng1998}

\section{国内外研究现状及发展趋势}
%\label{sec:***} 可标注label

\subsection{形状记忆聚氨酯的形状记忆机理}
%\label{sec:features}

形状记忆聚合物(SMP)是继形状记忆合金后在80年代发展起来的一种新型形状记忆材料\cite{Jiang2005Size}。形状记忆高分子材料在常温范围内具有塑料的性质,即刚性、形状稳定恢复性;同时在一定温度下(所谓记忆温度下)具有橡胶的特性,主要表现为材料的可变形性和形变恢复性。即“记忆初始态-固定变形-恢复起始态”的循环。

固定相只有物理交联结构的聚氨酯称为热塑性SMPU,而有化学交联结构称为热固性SMPU。热塑性和热固性形状记忆聚氨酯的形状记忆原理示意图如图\ref{fig:diagram}所示

\begin{figure}
\centering
\includegraphics[width=0.75\textwidth]{figures/figure1}
\caption{热塑性形状记忆聚氨酯的形状记忆机理示意图}\label{fig:diagram}
\end{figure}


\subsection{形状记忆聚氨酯的研究进展}
%\label{sec:requirements}
首例SMPU是日本Mitsubishi公司开发成功的……。

\subsection{水系聚氨酯及聚氨酯整理剂}

水系聚氨酯的形态对其流动性,成膜性及加工织物的性能有重要影响,一般分为三种类型\cite{Jiang2005Size} ,如表 \ref{tab:category}所示。

\begin{table}
\centering
\caption{水系聚氨酯分类} \label{tab:category}
\begin{tabular*}{0.9\textwidth}{@{\extracolsep{\fill}}cccc}
\toprule
类别 &水溶型 &胶体分散型 &乳液型 \\
\midrule
状态 &溶解$\sim$胶束 &分散 &白浊 \\
外观 &水溶型 &胶体分散型 &乳液型 \\
粒径$/\mu m$ &$<0.001$ &$0.001-0.1$ &$>0.1$ \\
重均分子量 &$1000\sim 10000$ &数千$\sim 20$ &$>5000$ \\
\bottomrule
\end{tabular*}
\end{table}

\subsubsection{四级节标题}

根据需要,也可设四级节标题

由于它们对纤维织物的浸透性和亲和性不同,因此在纺织品染整加工中的用途也有差别,其中以水溶型和乳液型产品较为常用。另外,水系聚氨酯又有反应性和非反应性之分。虽然它们的共同特点是分子结构中不含异氰酸酯基,但前者是用封闭剂将异氰酸酯基暂时封闭,在纺织品整理时复出。相互交联反应形成三维网状结构而固着在织物表面。
……

Loading

0 comments on commit 5026f2b

Please sign in to comment.