summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-03-04 21:58:24 +0000
committerKarl Berry <karl@freefriends.org>2022-03-04 21:58:24 +0000
commit99cd5a37d15604b901ace5499ca4a8c04b43c84d (patch)
tree1ebd5b784d760b81a688c9571b3edb7f8152eaff
parentd90be970e6807d00cb78aa17f44b799f8870eb63 (diff)
shtthesis (4mar22)
git-svn-id: svn://tug.org/texlive/trunk@62413 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/shtthesis/CHANGELOG.md7
-rw-r--r--Master/texmf-dist/doc/latex/shtthesis/DEPENDS.txt26
-rw-r--r--Master/texmf-dist/doc/latex/shtthesis/LICENSE4
-rw-r--r--Master/texmf-dist/doc/latex/shtthesis/README.md12
-rw-r--r--Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.pdfbin2173716 -> 2130652 bytes
-rw-r--r--Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.tex16
-rw-r--r--Master/texmf-dist/tex/latex/shtthesis/shtthesis.cls27
-rw-r--r--Master/tlpkg/tlpsrc/shtthesis.tlpsrc27
8 files changed, 97 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/shtthesis/CHANGELOG.md b/Master/texmf-dist/doc/latex/shtthesis/CHANGELOG.md
index 73356830a7a..f9973d5e87b 100644
--- a/Master/texmf-dist/doc/latex/shtthesis/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/shtthesis/CHANGELOG.md
@@ -2,6 +2,13 @@
`sht-thesis` 项目派生于 `ucasthesis`,一个在 GPLv3 License 下分发的项目。根据该许可证条款,`sht-thesis` 项目列出基于 `ucasthesis` (commit `faad94b` 之后) 的所有修改条目:
+## 2022-03-03
+> Release: v0.3.3
+
+1. Issue [#4](https://github.com/lirundong/shtthesis/issues/4): 增加三级标题(subsubsection)格式定义;
+2. Issue [#5](https://github.com/lirundong/shtthesis/issues/5): 确保引用排版顺序与源文档顺序一致;
+3. 修正「申请或已获得的专利」章节对应的环境及匿名环境名称为 `patents` 及 `patents*`(学渣捂脸);
+
## 2021-02-14
> Release: v0.3.2
diff --git a/Master/texmf-dist/doc/latex/shtthesis/DEPENDS.txt b/Master/texmf-dist/doc/latex/shtthesis/DEPENDS.txt
new file mode 100644
index 00000000000..f20ebe73907
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/shtthesis/DEPENDS.txt
@@ -0,0 +1,26 @@
+alphalph
+biber
+biblatex
+biblatex-gb7714-2015
+booktabs
+caption
+colortbl
+ctex
+datetime
+enumitem
+fancyhdr
+fmtcount
+lastpage
+latexmk
+listings
+lua-alt-getopt
+lualatex-math
+mathtools
+ntheorem
+tex-gyre
+tocvsec2
+transparent
+undolabl
+unicode-math
+xits
+xstring
diff --git a/Master/texmf-dist/doc/latex/shtthesis/LICENSE b/Master/texmf-dist/doc/latex/shtthesis/LICENSE
index 633be1564f5..da54465f8ed 100644
--- a/Master/texmf-dist/doc/latex/shtthesis/LICENSE
+++ b/Master/texmf-dist/doc/latex/shtthesis/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
shtthesis, an unofficial LaTeX thesis template for ShanghaiTech University.
- Copyright (C) 2021 Li Rundong <rundong.001@gmail.com>
+ Copyright (C) 2022 Li Rundong <rundong.001@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- shtthesis Copyright (C) 2021 Li Rundong <rundong.001@gmail.com>
+ shtthesis Copyright (C) 2022 Li Rundong <rundong.001@gmail.com>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/Master/texmf-dist/doc/latex/shtthesis/README.md b/Master/texmf-dist/doc/latex/shtthesis/README.md
index 48ef2f9c5f0..9035aa3878b 100644
--- a/Master/texmf-dist/doc/latex/shtthesis/README.md
+++ b/Master/texmf-dist/doc/latex/shtthesis/README.md
@@ -1,5 +1,5 @@
# ShangHaiTech university THESIS (shtthesis)
-[![Action status](https://github.com/lirundong/sht-thesis/workflows/build/badge.svg)](https://github.com/lirundong/shtthesis/actions)
+[![Action status](https://github.com/lirundong/shtthesis/workflows/build/badge.svg?branch=v0.3)](https://github.com/lirundong/shtthesis/actions)
[![GitHub release](https://img.shields.io/github/v/release/lirundong/shtthesis?style=flat&logo=GitHub)](https://github.com/lirundong/shtthesis/releases/latest)
[![CTAN version](https://img.shields.io/ctan/v/shtthesis?style=flat&logo=LaTeX)](https://ctan.org/pkg/shtthesis)
[![Overleaf](https://img.shields.io/badge/overleaf-shtthesis-green?style=flat&logo=Overleaf&color=1C890F)](https://www.overleaf.com/latex/templates/shanghaitech-university-thesis-template/mskbxkmfxqpt)
@@ -22,24 +22,24 @@
## Get the Template
- Stable version: Install or download with any of following methods
- - CTAN (**strongly recommended**): [`shtthesis`](https://ctan.org/pkg/shtthesis) package on CTAN can be installed via `tlmgr` for TeX Live and MacTeX users:
+ - CTAN (**highly recommended**): [`shtthesis`](https://ctan.org/pkg/shtthesis) package on CTAN can be installed via `tlmgr` for TeX Live and MacTeX users:
```bash
tlmgr install shtthesis
```
- If your distribution has already installed `shtthesis`, please update it to the latest version:
+ If your distribution already contains `shtthesis`, please update it to the latest version:
```bash
tlmgr update shtthesis
```
- **Note**: `shtthesis` package on CTAN does not include the university logo file. Please download [`shanghaitech-emblem.pdf`](https://github.com/lirundong/shtthesis/raw/master/shanghaitech-emblem.pdf) from this repository and put it in the root of your project directory.
+ **Note**: `shtthesis` package on CTAN does not include the university logo file. Please download [`shanghaitech-emblem.pdf`](https://github.com/lirundong/shtthesis/raw/v0.3/shanghaitech-emblem.pdf) from this repository and put it in the root of your project directory.
- [Overleaf](https://www.overleaf.com/latex/templates/shanghaitech-university-thesis-template/mskbxkmfxqpt): Please compile with XeLaTeX. Since compilation time for Overleaf free-plan is limited to *1 minute*, you might encounter with timeout issue if compiling with LuaLaTeX
- - GitHub Release: Please refer to the [release](https://github.com/lirundong/sht-thesis/releases) page and download required files based on release information
+ - GitHub Release: Please refer to the [release](https://github.com/lirundong/shtthesis/releases) page and download required files based on release information
- Develop version: Directly clone the GitHub repo
```bash
git clone https://github.com/lirundong/shtthesis.git
```
-Please, read through [the user's guide](shtthesis-user-guide.pdf) before continuing.
+Please, read through [the user's guide](http://mirrors.ctan.org/macros/latex/contrib/shtthesis/shtthesis-user-guide.pdf) before continuing.
## Get Started
After cloning or downloading this template, please
diff --git a/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.pdf b/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.pdf
index 5a51b6aa2de..9dd88189ca8 100644
--- a/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.pdf
+++ b/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.tex b/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.tex
index ae0ff1d4c00..8f145aaa0df 100644
--- a/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.tex
+++ b/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.tex
@@ -1,5 +1,5 @@
% shtthesis, an unofficial LaTeX thesis template for ShanghaiTech University.
-% Copyright (C) 2021 Li Rundong <rundong.001@gmail.com>
+% Copyright (C) 2022 Li Rundong <rundong.001@gmail.com>
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -293,7 +293,7 @@
`\prompt' tlmgr update shtthesis
\end{shell}
-为避免版权问题,上传至 CTAN 的 \shtthesis{} 并不包含校徽文件,需要至项目主页下载 shanghaitech-emblem.pdf\footnote{\url{https://github.com/lirundong/shtthesis/raw/master/shanghaitech-emblem.pdf}}。假设用户的论文文档为 thesis.tex,参考文献数据库为 reference.bib (本文档的 bib 数据库由 \jobname.tex 自动生成),则需要将下载的校徽文件与它们放在同一目录下,下文称为\emph{工作目录}。工作目录中必要的文件包括:
+为避免版权问题,上传至 CTAN 的 \shtthesis{} 并不包含校徽文件,需要至项目主页下载 shanghaitech-emblem.pdf\footnote{\url{https://github.com/lirundong/shtthesis/raw/v0.3/shanghaitech-emblem.pdf}}。假设用户的论文文档为 thesis.tex,参考文献数据库为 reference.bib (本文档的 bib 数据库由 \jobname.tex 自动生成),则需要将下载的校徽文件与它们放在同一目录下,下文称为\emph{工作目录}。工作目录中必要的文件包括:
\begin{center}
\begin{tabular}{ll}
\toprule
@@ -762,7 +762,7 @@ P(A|B) &= \frac{P(A)P(B|A)}{P(B)} \label{eq::bayesian}
% ...
\end{latex}
-《规范》要求在文末依此列出致谢、作者简历、攻读学位期间发表的论文与研究成果。用户可使用 \shtthesis{} 提供的相应环境 acknowledgement、resume、publications、patterns 和 projects 进行排版。同时为了生成符合盲审要求的论文,\shtthesis{} 也提供了对应的\emph{匿名环境} publications*、patterns* 和 projects*。在打开 \verb|anonymous| 选项(第~\ref{sec::option_anonymous} 节)后,论文中不出现“致谢”一节,作者简历内容替换为匿名字符串,其他小节使用匿名环境内容排版。注意在第一次使用任一上述环境前,需要使用 \verb|\backmatter| 切换至后记模式。
+《规范》要求在文末依此列出致谢、作者简历、攻读学位期间发表的论文与研究成果。用户可使用 \shtthesis{} 提供的相应环境 acknowledgement、resume、publications、patents 和 projects 进行排版。同时为了生成符合盲审要求的论文,\shtthesis{} 也提供了对应的\emph{匿名环境} publications*、patents* 和 projects*。在打开 \verb|anonymous| 选项(第~\ref{sec::option_anonymous} 节)后,论文中不出现“致谢”一节,作者简历内容替换为匿名字符串,其他小节使用匿名环境内容排版。注意在第一次使用任一上述环境前,需要使用 \verb|\backmatter| 切换至后记模式。
\subsection{致谢}
在 acknowledgement 环境内书写致谢,致谢内容在匿名模式下不显示。
@@ -773,7 +773,7 @@ P(A|B) &= \frac{P(A)P(B|A)}{P(B)} \label{eq::bayesian}
\end{latex}
\subsection{简历及科研成果}
-此部分需要依此书写个人简历(resume 环境)、已发表(或正式接受)的学术论文(publications 和 publications* 环境)、申请或已获得的专利(patterns 和 patterns* 环境)、参加的研究项目及获奖情况(projects 和 projects*)。根据是否匿名分别显示非匿名环境内容和匿名环境内容。
+此部分需要依此书写个人简历(resume 环境)、已发表(或正式接受)的学术论文(publications 和 publications* 环境)、申请或已获得的专利(patents 和 patents* 环境)、参加的研究项目及获奖情况(projects 和 projects*)。根据是否匿名分别显示非匿名环境内容和匿名环境内容。
\begin{latex}
\begin{resume}
个人简历…… (仅非匿名环境显示)
@@ -856,13 +856,13 @@ P(A|B) &= \frac{P(A)P(B|A)}{P(B)} \label{eq::bayesian}
论文发表…… (匿名环境)
\end{publications*}
-\begin{patterns}
+\begin{patents}
专利申请或授权记录…… (非匿名环境)
-\end{patterns}
+\end{patents}
-\begin{patterns*}
+\begin{patents*}
专利申请或授权记录…… (匿名环境)
-\end{patterns*}
+\end{patents*}
\begin{projects}
个人参与的科研项目、获奖情况…… (仅非匿名环境显示)
diff --git a/Master/texmf-dist/tex/latex/shtthesis/shtthesis.cls b/Master/texmf-dist/tex/latex/shtthesis/shtthesis.cls
index d1bcc8fcdc4..566c3839993 100644
--- a/Master/texmf-dist/tex/latex/shtthesis/shtthesis.cls
+++ b/Master/texmf-dist/tex/latex/shtthesis/shtthesis.cls
@@ -1,5 +1,5 @@
% shtthesis, an unofficial LaTeX thesis template for ShanghaiTech University.
-% Copyright (C) 2021 Li Rundong <rundong.001@gmail.com>
+% Copyright (C) 2022 Li Rundong <rundong.001@gmail.com>
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
% Identification
% ==============================================================================
\NeedsTeXFormat{LaTeX2e}
-\newcommand\version{0.3.2}
-\newcommand\versiondate{2021/01/23}
+\newcommand\version{0.3.3}
+\newcommand\versiondate{2022/03/03}
\ProvidesClass{shtthesis}[%
\versiondate\space%
v\version\space%
@@ -299,6 +299,7 @@
backend = biber,
gbpub = false,
gbcitelocal = chinese,
+ sortcites = false,
}{biblatex}
\LoadClass{ctexbook}
\RequirePackage{expl3}
@@ -372,7 +373,7 @@
\def\figurename{图}
\definecolor{ShtRed}{RGB}{146,46,23}
\def\school@logo@missing{%
- 校徽文件缺失,请至\href{https://github.com/lirundong/shtthesis/raw/master/%
+ 校徽文件缺失,请至\href{https://github.com/lirundong/shtthesis/raw/v0.3/%
shanghaitech-emblem.pdf}{项目主页}下载!%
}
% ------------------------------------------------------------------------------
@@ -980,6 +981,15 @@
beforeskip = {12pt},
afterskip = {6pt},
},
+ subsubsection = {
+ format = \heiti\normalsize\linespread{1.0}\raggedright,
+ nameformat = {},
+ numberformat = \rmfamily,
+ titleformat = {},
+ aftername = \hspace{0.75\ccwd},
+ beforeskip = {12pt},
+ afterskip = {6pt},
+ },
paragraph = {
indent = 2\ccwd,
beforeskip = {0pt},
@@ -1018,6 +1028,11 @@
format = \sht@subsection@fmt,
numberformat = {},
indent = \sht@section@indent,
+ },
+ subsubsection = {
+ format = \sht@subsection@fmt,
+ numberformat = {},
+ indent = \sht@section@indent,
}
}
\fi
@@ -1741,7 +1756,7 @@
\endcomment
}{}
}
-\renewenvironment{patterns}{%
+\newenvironment{patents}{%
\sht@check@resume@title
\ifsht@anonymous
\comment
@@ -1752,7 +1767,7 @@
\endcomment
\fi
}
-\newenvironment{patterns*}{%
+\newenvironment{patents*}{%
\sht@check@resume@title
\ifthenelse{\not \boolean{sht@anonymous}}{
\comment
diff --git a/Master/tlpkg/tlpsrc/shtthesis.tlpsrc b/Master/tlpkg/tlpsrc/shtthesis.tlpsrc
index e69de29bb2d..e8884206f9a 100644
--- a/Master/tlpkg/tlpsrc/shtthesis.tlpsrc
+++ b/Master/tlpkg/tlpsrc/shtthesis.tlpsrc
@@ -0,0 +1,27 @@
+depend alphalph
+depend biber
+depend biblatex
+depend biblatex-gb7714-2015
+depend booktabs
+depend caption
+depend colortbl
+depend ctex
+depend datetime
+depend enumitem
+depend fancyhdr
+depend fmtcount
+depend lastpage
+depend latexmk
+depend listings
+depend lua-alt-getopt
+depend lualatex-math
+depend mathtools
+depend ntheorem
+depend tex-gyre
+depend tocvsec2
+depend transparent
+depend undolabl
+depend unicode-math
+depend xits
+depend xstring
+