texlive[57740] Master/texmf-dist: shtthesis (14feb21)

Sun Feb 14 23:32:36 CET 2021

Revision: 57740
          http://tug.org/svn/texlive?view=revision&revision=57740
Author:   karl
Date:     2021-02-14 23:32:36 +0100 (Sun, 14 Feb 2021)
Log Message:
-----------
shtthesis (14feb21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/shtthesis/CHANGELOG.md
    trunk/Master/texmf-dist/doc/latex/shtthesis/LICENSE
    trunk/Master/texmf-dist/doc/latex/shtthesis/README.md
    trunk/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.pdf
    trunk/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.tex
    trunk/Master/texmf-dist/tex/latex/shtthesis/shtthesis.cls

Modified: trunk/Master/texmf-dist/doc/latex/shtthesis/CHANGELOG.md
===================================================================

--- trunk/Master/texmf-dist/doc/latex/shtthesis/CHANGELOG.md	2021-02-14 22:32:10 UTC (rev 57739)
+++ trunk/Master/texmf-dist/doc/latex/shtthesis/CHANGELOG.md	2021-02-14 22:32:36 UTC (rev 57740)
@@ -2,6 +2,13 @@
 
 `sht-thesis` 项目派生于 `ucasthesis`，一个在 GPLv3 License 下分发的项目。根据该许可证条款，`sht-thesis` 项目列出基于 `ucasthesis` (commit `faad94b` 之后) 的所有修改条目：
 
+## 2021-02-14
+> Release: v0.3.2
+
+1. 修复 TexLive 2020 宏包升级后 ulem 的兼容性问题，使用更为鲁棒的 lastpage 实现本科生论文*第X页 共Y页*的排版需求；
+2. 更新文档内校徽文件下载链接；
+3. 修复 issue [#1](https://github.com/lirundong/shtthesis/issues/1) 关于本科生论文格式的问题；
+
 ## 2020-06-30
 > Release: v0.3.1
 

Modified: trunk/Master/texmf-dist/doc/latex/shtthesis/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/latex/shtthesis/LICENSE	2021-02-14 22:32:10 UTC (rev 57739)
+++ trunk/Master/texmf-dist/doc/latex/shtthesis/LICENSE	2021-02-14 22:32:36 UTC (rev 57740)
@@ -632,7 +632,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
     shtthesis, an unofficial LaTeX thesis template for ShanghaiTech University.
-    Copyright (C) 2020 Li Rundong <rundong.001 at gmail.com>
+    Copyright (C) 2021 Li Rundong <rundong.001 at 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 @@
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    shtthesis Copyright (C) 2020 Li Rundong <rundong.001 at gmail.com>
+    shtthesis Copyright (C) 2021 Li Rundong <rundong.001 at 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.

Modified: trunk/Master/texmf-dist/doc/latex/shtthesis/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/shtthesis/README.md	2021-02-14 22:32:10 UTC (rev 57739)
+++ trunk/Master/texmf-dist/doc/latex/shtthesis/README.md	2021-02-14 22:32:36 UTC (rev 57740)
@@ -31,7 +31,7 @@
     tlmgr update shtthesis
     ```
 
-    **Note**: `shtthesis` package on CTAN does not include the university logo file. Please download [`shanghaitech-logo.pdf`](https://github.com/lirundong/shtthesis/raw/master/shanghaitech-logo.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/master/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
 - Develop version: Directly clone the GitHub repo
@@ -57,5 +57,5 @@
 2. Open the document source file [shtthesis-user-guide.tex](shtthesis-user-guide.tex) and enjoy TeXing :smirk:
 
 ## License
-- The copyright of ShanghaiTech University logo (`shanghaitech-logo.pdf`) is owned by ShanghaiTech University
+- The copyright of ShanghaiTech University logo (`shanghaitech-emblem.pdf`) is owned by ShanghaiTech University
 - The rest of `shtthesis` project is licensed under GNU Public License v3, see [LICENSE](LICENSE) for details

Modified: trunk/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.tex	2021-02-14 22:32:10 UTC (rev 57739)
+++ trunk/Master/texmf-dist/doc/latex/shtthesis/shtthesis-user-guide.tex	2021-02-14 22:32:36 UTC (rev 57740)
@@ -1,5 +1,5 @@
 % shtthesis, an unofficial LaTeX thesis template for ShanghaiTech University.
-% Copyright (C) 2020 Li Rundong <rundong.001 at gmail.com>
+% Copyright (C) 2021 Li Rundong <rundong.001 at 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
@@ -44,8 +44,8 @@
 %   title* = {A~User's~Guide~to\\\ShtThesis{}~v\version{}},
 %   keywords = {上海科技大学，学位论文，\LaTeX{}},
 %   keywords* = {ShanghaiTech~University, Thesis, \LaTeX{}},
-%   date = {2020~年~06~月},
-%   date* = {06~/~2020},
+%   date = {2021~年~02~月},
+%   date* = {02~/~2021},
 %   author = {李润东},
 %   author* = {Rundong~Li},
 %   author-id = {36273800},
@@ -268,7 +268,7 @@
 
 本文档将尽量详细地阐释 \shtthesis{} 的使用方法和技巧。同时本文档直接使用 \shtthesis{} 排版，其源代码文件 \jobname.tex 也可以作为一个实际样例以供读者参考使用。
 
-我们计划在 \shtthesis{} 后续版本中加入本科学位论文的排版选项，因此亟需有上海科技大学本科论文排版经验的同学参与到 \shtthesis{} 项目中。我们也计划将该使用说明和模板文件 shtthesis.cls 使用 \textsf{DocStrip} 统一重构，并逐步向 \LaTeX3 迁移。我们非常希望得到用户宝贵的反馈和建议，若您有意为 \shtthesis{} 贡献 issues 和 pull requests，请移步至项目主页 \url{https://github.com/lirundong/shtthesis}。
+目前 \shtthesis{} 已\emph{试验性地}加入对本科学位论文的支持，但仍亟需有上海科技大学本科论文排版经验的同学参与到 \shtthesis{} 项目中。我们也计划将该使用说明和模板文件 shtthesis.cls 使用 \textsf{DocStrip} 统一重构，并逐步向 \LaTeX3 迁移。我们非常希望得到用户宝贵的反馈和建议，若您有意为 \shtthesis{} 贡献 issues 和 pull requests，请移步至项目主页 \url{https://github.com/lirundong/shtthesis}。
 
 \section*{文档排版样式说明}
 本文档针对各部分不同内容使用不同的排版样式：文档正文使用宋体和英文衬线体（serif），\emph{强调部分}使用\emph{楷体}和英文意大利体（\emph{italic}），宏包名称使用英文无衬线体（\textsf{sans serif}，例如 \textsf{hyperref}），代码及选项使用英文等宽体（\texttt{typewriter}）和\texttt{仿宋体}排版。
@@ -293,7 +293,7 @@
 `\prompt' tlmgr update shtthesis
 \end{shell}
 
-为避免版权问题，上传至 CTAN 的 \shtthesis{} 并不包含校徽文件，需要至项目主页下载 shanghaitech-logo.pdf\footnote{\url{https://github.com/lirundong/shtthesis/raw/master/shanghaitech-logo.pdf}}。假设用户的论文文档为 thesis.tex，参考文献数据库为 reference.bib （本文档的 bib 数据库由 \jobname.tex 自动生成），则需要将下载的校徽文件与它们放在同一目录下，下文称为\emph{工作目录}。工作目录中必要的文件包括：
+为避免版权问题，上传至 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{工作目录}。工作目录中必要的文件包括：
 \begin{center}
   \begin{tabular}{ll}
     \toprule
@@ -301,7 +301,7 @@
     \midrule 
     thesis.tex & 论文文档 \\
     reference.bib & 参考文献数据库 \\
-    shanghaitech-logo.pdf & 上海科技大学校徽 \\
+    shanghaitech-emblem.pdf & 上海科技大学校徽 \\
     \bottomrule
   \end{tabular}
 \end{center}
@@ -604,7 +604,7 @@
 \end{align}
 同时重载了 \verb|\eqref|，使得公式编号格式修改后，其引用格式仍与 \textsf{amsmath} 无异：贝叶斯定理~\eqref{eq::bayesian}。排版本科生论文时不修改公式编号格式。
 
-\shtthesis{} 使用 \textsf{unicode-math} 宏包进行公式排版，因此在数学环境内既可以用标准 \LaTeX{} 宏，也可以直接输入 Unicode 符号。例如 $\oiint$ 符号可以通过 \verb|\oiint| 宏录入，也可以通过 Unicode 符号 $∯$ （对应 \verb|U+0222F| 码点） 录入。以下测试公式来自 \citet{clerkma2013unicode}，其中所有字符均直接使用对应 Unicode 符号录入。
+\shtthesis{} 使用 \textsf{unicode-math} 宏包进行公式排版，因此在数学环境内既可以用标准 \LaTeX{} 宏，也可以直接输入 Unicode 符号。例如 $\oiint$ 符号可以通过 \verb|$\oiint$| 录入，也可以直接使用 Unicode 符号 \verb|$|$∯$\verb|$| （对应 \verb|U+0222F| 码点） 录入。以下测试公式来自 \citet{clerkma2013unicode}，其中所有字符均直接使用对应 Unicode 符号录入。
 \begin{align}
 & ⊢ ∀x[(Fx ∨ Gx) → \mathord{∼}Hx] \\
 & ⊨ ¬∃y∀x[x∈y ↔ x∉x]  \\
@@ -733,13 +733,13 @@
 《规范》要求正文中所有图形、表格标题使用中英双语。此需求可以通过 \textsf{bicaption} 宏包实现，如图~\ref{img::sht_logo} 所示。
 \begin{figure}[htb]
   \centering
-  \IfFileExists{shanghaitech-logo.pdf}{%
-    \includegraphics[width=0.5\columnwidth]{shanghaitech-logo.pdf}%
+  \IfFileExists{shanghaitech-emblem.pdf}{%
+    \includegraphics[width=0.5\columnwidth]{shanghaitech-emblem.pdf}%
   }{%
     \fbox{%
       \begin{minipage}[b][2.5cm][c]{0.75\columnwidth}%
         \centering\zihao{-5}\bfseries\sffamily\color{ShtRed}%
-        校徽文件 \texttt{shanghaitech-logo.pdf} 缺失%
+        校徽文件 \texttt{shanghaitech-emblem.pdf} 缺失%
       \end{minipage}%
     }%
   }%

Modified: trunk/Master/texmf-dist/tex/latex/shtthesis/shtthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/shtthesis/shtthesis.cls	2021-02-14 22:32:10 UTC (rev 57739)
+++ trunk/Master/texmf-dist/tex/latex/shtthesis/shtthesis.cls	2021-02-14 22:32:36 UTC (rev 57740)
@@ -1,5 +1,5 @@
 % shtthesis, an unofficial LaTeX thesis template for ShanghaiTech University.
-% Copyright (C) 2020 Li Rundong <rundong.001 at gmail.com>
+% Copyright (C) 2021 Li Rundong <rundong.001 at 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.1}
-\newcommand\versiondate{2020/06/30}
+\newcommand\version{0.3.2}
+\newcommand\versiondate{2021/01/23}
 \ProvidesClass{shtthesis}[%
   \versiondate\space%
   v\version\space%
@@ -313,7 +313,7 @@
 \RequirePackage{indentfirst}
 \RequirePackage[normalem]{ulem}
 \RequirePackage{fancyhdr}
-\RequirePackage{pageslts}
+\RequirePackage{lastpage}
 \RequirePackage{tocvsec2}
 \RequirePackage{letltxmacro}
 \RequirePackage{fontspec}
@@ -373,7 +373,7 @@
 \definecolor{ShtRed}{RGB}{146,46,23}
 \def\school at logo@missing{%
   校徽文件缺失，请至\href{https://github.com/lirundong/shtthesis/raw/master/%
-  shanghaitech-logo.pdf}{项目主页}下载！%
+  shanghaitech-emblem.pdf}{项目主页}下载！%
 }
 % ------------------------------------------------------------------------------
 %   Geometry and layouts
@@ -418,11 +418,14 @@
 % ------------------------------------------------------------------------------
 %   Headers and footers
 % ------------------------------------------------------------------------------
-\def\sht at flat@title{\renewcommand\\{\space} \@title}
-\def\sht at flat@title at en{\renewcommand\\{\space} \sht at title@en}
+\def\sht at flat@title{\renewcommand\\{\space} \sht at title}
+\def\sht at flat@title at upper@en{%
+  \renewcommand\\{\space}%
+  \MakeUppercase{\sht at title@en}%
+}
 \newcommand\sht at head@logo{%
-  \IfFileExists{shanghaitech-logo.pdf}{%
-    \includegraphics[height=\sht at head@logo at height]{shanghaitech-logo.pdf}%
+  \IfFileExists{shanghaitech-emblem.pdf}{%
+    \includegraphics[height=\sht at head@logo at height]{shanghaitech-emblem.pdf}%
   }{%
     \fbox{%
       \begin{minipage}[b][\sht at head@logo at height][c]{0.4\columnwidth}%
@@ -475,7 +478,7 @@
   \fancyhead[R]{\zihao{-5}\sffamily\sht at flat@title}
   \fancyfoot[C]{%
     \footnotesize%
-    第~\thepage~页\hspace*{1\ccwd}共~\lastpageref*{VeryLastPage}~页%
+    第~\thepage~页\hspace*{1\ccwd}共~\pageref*{LastPage}~页%
   }
   \renewcommand{\headrulewidth}{0.8pt}
   \renewcommand{\footrulewidth}{0pt}
@@ -494,17 +497,15 @@
 \LetLtxMacro{\TmpMainmatter}{\mainmatter}
 \renewcommand{\mainmatter}{%
   \TmpMainmatter%
+  \renewcommand{\chaptermark}[1]{%
+    \markboth{第~\thechapter~章\hspace{1\ccwd}##1}{}%
+  }%
   \ifsht at undergraduate%
     \pagestyle{MNNumberedWithLogo}%
   \else%
     \pagestyle{LRNumbered}%
   \fi%
-  \pagenumbering{arabic}%
-  \setcounter{page}{1}%
 }
-\AtBeginDocument{%
-  \pagenumbering{arabic}%
-}
 % ------------------------------------------------------------------------------
 %   Font utilities
 % ------------------------------------------------------------------------------
@@ -1095,8 +1096,8 @@
 }
 \ExplSyntaxOff
 \newcommand\sht at schoollogo{%
-  \IfFileExists{shanghaitech-logo.pdf}{%
-    \includegraphics[width=10.48cm]{shanghaitech-logo.pdf}%
+  \IfFileExists{shanghaitech-emblem.pdf}{%
+    \includegraphics[width=10.48cm]{shanghaitech-emblem.pdf}%
   }{%
     \begin{center}%
       \fbox{%
@@ -1109,8 +1110,8 @@
 }
 \newcommand\sht at schoollogo@undergraduate{%
   \noindent%
-  \IfFileExists{shanghaitech-logo.pdf}{%
-    \includegraphics[width=5.39cm]{shanghaitech-logo.pdf}%
+  \IfFileExists{shanghaitech-emblem.pdf}{%
+    \includegraphics[width=5.39cm]{shanghaitech-emblem.pdf}%
   }{%
     \fbox{%
       \begin{minipage}[t][1.45cm][c]{0.75\columnwidth}%
@@ -1517,7 +1518,7 @@
     毕业论文（设计）。
 
     \hspace*{6\ccwd}\textbf{保\hspace*{1\ccwd}密}$\square$，%
-    在\uline{\hspace*{2\ccwd}}年解密后适用本授权书。
+    在\uline{\mbox{\hspace*{2\ccwd}}}年解密后适用本授权书。
 
     本论文属于
 
@@ -1565,8 +1566,15 @@
     \end{center}%
     \vspace*{\baselineskip}%
     \ctexset{chapter/format += \zihao{4}, chapter/beforeskip = 0pt}%
+    \ifsht at comfort%
+      \def\sht at abstract@name{摘\hspace{1\ccwd}要}
+    \else%
+      \def\sht at abstract@name{摘要}
+    \fi
+  \else%
+    \def\sht at abstract@name{摘\hspace{1\ccwd}要}
   \fi
-  \intobmk\chapter*{摘\hspace{1\ccwd}要}%
+  \intobmk\chapter*{\sht at abstract@name}%
 }{%
   \vspace{\baselineskip}%
   \ifsht at undergraduate%
@@ -1582,7 +1590,7 @@
 \newenvironment{abstract*}[1][\sht at null@arg]{%
   \cleardoublepage%
   \ifthenelse{\equal{#1}{flattitle}}{%
-    \def\sht at abs@title at en{\sht at flat@title at en}%
+    \def\sht at abs@title at en{\sht at flat@title at upper@en}%
   }{%
     \def\sht at abs@title at en{\sht at title@en}%
   }%
@@ -1594,8 +1602,10 @@
     \end{center}%
     \vspace*{\baselineskip}%
     \ctexset{chapter/format += \zihao{4}\rmfamily, chapter/beforeskip = 0pt}%
+    \intobmk\chapter*{ABSTRACT}%
+  \else
+    \intobmk\chapter*{Abstract}%
   \fi
-  \intobmk\chapter*{Abstract}%
 }{%
   \vspace{\baselineskip}%
   \ifsht at undergraduate%
@@ -1676,6 +1686,9 @@
 \renewcommand{\backmatter}{%
   \origin at backmatter%
   \settocdepth{chapter}%
+  \renewcommand{\chaptermark}[1]{%
+    \markboth{##1}{}%
+  }%
   \ifsht at undergraduate%
     \pagestyle{MNNumberedWithLogo}%
   \else%

