CTAN sync 202111170301

84 files changed, 996 insertions, 285 deletions

diff --git a/macros/latex/contrib/beamer-contrib/themes/thubeamer/Makefile b/macros/latex/contrib/beamer-contrib/themes/thubeamer/Makefile
index 28ec55e5e5..1afaa07717 100644
--- a/macros/latex/contrib/beamer-contrib/themes/thubeamer/Makefile
+++ b/macros/latex/contrib/beamer-contrib/themes/thubeamer/Makefile
@@ -4,15 +4,21 @@ beamer:
 	pdflatex -synctex=1 -interaction=nonstopmode main
 	pdflatex -synctex=1 -interaction=nonstopmode main
 
+beamer-en:
+	pdflatex -synctex=1 -interaction=nonstopmode main-en
+	bibtex main-en
+	pdflatex -synctex=1 -interaction=nonstopmode main-en
+	pdflatex -synctex=1 -interaction=nonstopmode main-en
+
 doc:
-	xelatex hitszbeamer.dtx
-	makeindex -s gind.ist -o hitszbeamer.ind hitszbeamer.idx
-	makeindex -s gglo.ist -o hitszbeamer.gls hitszbeamer.glo
-	xelatex hitszbeamer.dtx
-	xelatex hitszbeamer.dtx
+	xelatex thubeamer.dtx
+	makeindex -s gind.ist -o thubeamer.ind thubeamer.idx
+	makeindex -s gglo.ist -o thubeamer.gls thubeamer.glo
+	xelatex thubeamer.dtx
+	xelatex thubeamer.dtx
 
 clean:
 	rm -f *.toc *.bbl *.blg *.out *.aux *.log *.bak *.thm *.synctex.gz *.fdb_latexmk *.fls *.glo *.gls *.idx *.ilg *.ind *.nav *.snm *.hd
 
 cleanall:
-	rm -f *.toc *.bbl *.blg *.out *.aux *.log *.bak *.thm *.synctex.gz *.fdb_latexmk *.fls *.glo *.gls *.idx *.ilg *.ind *.nav *.snm *.hd *.sty *.ins
\ No newline at end of file
+	rm -f *.toc *.bbl *.blg *.out *.aux *.log *.bak *.thm *.synctex.gz *.fdb_latexmk *.fls *.glo *.gls *.idx *.ilg *.ind *.nav *.snm *.hd *.sty *.ins
diff --git a/macros/latex/contrib/beamer-contrib/themes/thubeamer/README.md b/macros/latex/contrib/beamer-contrib/themes/thubeamer/README.md
index 99ac44a9bd..989c037b66 100644
--- a/macros/latex/contrib/beamer-contrib/themes/thubeamer/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/thubeamer/README.md
@@ -5,18 +5,26 @@
 
 # thubeamer：清华大学 Beamer 模板
 
+![CTAN Version](https://img.shields.io/ctan/v/thubeamer.svg)
+![GitHub Version](https://img.shields.io/github/release/YangLaTeX/thubeamer.svg)
+![Repo Size](https://img.shields.io/github/repo-size/YangLaTeX/thubeamer.svg)
+![License](https://img.shields.io/ctan/l/thubeamer.svg)
+
 [GitHub](https://github.com/YangLaTeX/thubeamer) | [Download](https://github.com/YangLaTeX/thubeamer/releases) | [Wiki](https://github.com/YangLaTeX/thubeamer/wiki) | [CTAN](https://www.ctan.org/pkg/thubeamer)
 
 # Introduction to thubeamer
 
-**thubeamer** is a **beamer theme** designed for Tsinghua University (THU). Current version is 1.0.0, updated on 2021/07/07.
+**thubeamer** is a **beamer theme** designed for Tsinghua University (THU). Current version is 1.1.0, updated on 2021/11/15.
 
 ```latex
   |- figures
     |- thulogo.pdf
   |- macros.tex
+  |- main-en.tex
+  |- main-en.pdf
   |- main.tex
   |- main.pdf
+  |- makebeamer-en.bat
   |- makebeamer.bat
   |- makeclean.bat
   |- makecleanall.bat
@@ -31,7 +39,7 @@
 
 # thubeamer 简介
 
-thubeamer 是清华大学风格 Beamer 模板，当前版本1.0.0，更新于2021年07月07日。
+thubeamer 是清华大学风格 Beamer 模板，当前版本1.1.0，更新于2021年11月15日。
 
 # Documentation
 
@@ -82,6 +90,7 @@ To use Makefile, you should have GNU `make` tool installed.
 ```bash
 make doc       # compile documentation (required before compiling the beamer)
 make beamer    # compile beamer
+make beamer-en # compile beamer prepared in English
 make clean     # clean auxiliary files
 make cleanall  # clean auxiliary files and style files
 ```
@@ -93,6 +102,7 @@ make cleanall  # clean auxiliary files and style files
 ```bash
 make doc       # 编译说明文档（在编译 beamer之前必须编译说明文档）
 make beamer    # 编译 beamer
+make beamer-en # 编译英文 beamer
 make clean     # 清除辅助文件
 make cleanall  # 清除辅助文件与样式文件
 ```
@@ -104,6 +114,7 @@ make cleanall  # 清除辅助文件与样式文件
 ```bash
 makedoc       # compile documentation (required before compiling the beamer)
 makebeamer    # compile beamer
+makebeamer-en # compile beamer prepared in English
 makeclean     # clean auxiliary files
 makecleanall  # clean auxiliary files and style files
 ```
@@ -115,6 +126,7 @@ makecleanall  # clean auxiliary files and style files
 ```bash
 makedoc       # 编译说明文档（在编译 beamer之前必须编译说明文档）
 makebeamer    # 编译 beamer
+makebeamer-en # 编译英文 beamer
 makeclean     # 清除辅助文件
 makecleanall  # 清除辅助文件与样式文件
 ```
diff --git a/macros/latex/contrib/beamer-contrib/themes/thubeamer/makebeamer-en.bat b/macros/latex/contrib/beamer-contrib/themes/thubeamer/makebeamer-en.bat
new file mode 100644
index 0000000000..e76f5e12ab
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/thubeamer/makebeamer-en.bat
@@ -0,0 +1,5 @@
+latexmk -c main-en

+pdflatex -synctex=1 -interaction=nonstopmode main-en

+bibtex main-en

+pdflatex -synctex=1 -interaction=nonstopmode main-en

+pdflatex -synctex=1 -interaction=nonstopmode main-en
\ No newline at end of file
diff --git a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example-en.pdf b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example-en.pdf
new file mode 100644
index 0000000000..7d732e7a5a
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example-en.pdf
diff --git a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example-en.tex b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example-en.tex
new file mode 100644
index 0000000000..cd437ff9c3
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example-en.tex
@@ -0,0 +1,222 @@
+%%=======================================================================
+% !Mode:: "TeX:UTF-8"
+% !TEX program  = PdfLaTeX
+%%=======================================================================
+% 模板名称：thubeamer
+% 模板版本：V1.1.0
+% 模板作者：杨敬轩（Jingxuan Yang）
+% 联系作者：yangjx20@mails.tsinghua.edu.cn & yanglatex2e@gmail.com
+% 模板适用：清华大学风格 Beamer 模板
+% 模板编译：手动编译方法参看 README.md 或 thubeamer.pdf
+%          编译 beamer 之前必须编译说明文档：make doc 或双击 makedoc.bat
+%          编译说明文档同时分离出四个样式文件 *thubeamer.sty
+%          GNU make 工具：make beamer
+%          Windows 批处理脚本：双击 makebeamer.bat 自动编译 beamer
+%          更多编译细节详见说明文档：thubeamer.pdf
+% 更新时间：2021/11/15
+% 模板帮助：请**务必务必务必**阅读 thubeamer.pdf 说明文档，文档查看方法：
+%          下载模板文件夹里就有，如果是从 CTAN 上安装更新本模板，则通过
+%          cmd 命令行：texdoc thubeamer 查看文档
+%          推荐前往模板的 GitHub 仓库获取最新文件，地址：
+%          https://github.com/YangLaTeX/thubeamer
+%%=======================================================================
+
+% 设置文档类别为 <beamer>
+% \documentclass[aspectratio=169]{beamer} % 设置长宽比为 16:9
+\documentclass{beamer}
+
+% 使用 <thubeamer> 主题
+\usetheme[en]{thubeamer}
+
+% 模板选项如下
+% (a.1) smoothbars: 页面顶端单行显示目录，默认选项
+% (a.2) sidebar: 页面左侧分栏显示目录
+% \usetheme[sidebar]{thubeamer}
+
+% (b) sectiontoc: 在每节（section）前显示目录，并高亮显示当前节，默认不显示
+
+% (c) subsectiontoc: 在每小节（subsection）前显示目录，并高亮显示当前节和当前小节，默认不显示
+
+% (d) en: 仅使用英文来制作 beamer，应用此选项后，汉字将全部无法编译
+
+% 图片存放路径
+\graphicspath{{figures/}}
+
+\include{macros}
+
+% 封面信息，方括号内容是显示在左侧边栏的内容（当选择 sidebar 主题时有效）
+\title[Title]{Title\\[2mm] Presentation}
+\author[Jingxuan Yang]{Student: Jingxuan Yang\\[5mm] Supervisor: Prof. XX}
+\institute[Tsinghua University]{\small Tsinghua University}
+\date{\small \vskip -10pt \today}
+
+% 开始写文章
+\begin{document}
+
+% 标题页
+\begin{frame}
+	\maketitle
+\end{frame}
+
+% 目录页
+\section*{Contents}
+\frame{
+  \frametitle{\secname}
+  \tableofcontents[hideallsubsections]
+}
+
+\section{Research Contents}
+
+\subsection{Research Contents of This Project}
+
+\begin{frame}{Research Contents of This Project}
+  \begin{figure}
+    \includegraphics[width=0.4\linewidth]{thulogo}
+    \caption{Research Contents of This Project}
+  \end{figure}
+\end{frame}
+
+\subsection{Research progress}
+
+\begin{frame}{Research progress}
+  \begin{figure}
+    \includegraphics[width=0.4\linewidth]{thulogo}
+    \caption{Research progress}
+  \end{figure}
+\end{frame}
+
+\section{Results}
+
+\begin{frame}{Results}
+  \begin{block}{Results}
+    \begin{itemize}
+      \setlength{\itemsep}{6pt}
+      \item XXXX
+      \item XXXX
+      \item XXXX
+      \item XXXX
+      \item XXXX
+      \item XXXX
+    \end{itemize}
+  \end{block}
+\end{frame}
+
+\subsection{Case 1}
+
+\begin{frame}{Case 1}
+  \begin{block}{Unnumbered equation}
+    Example of unnumbered equation:
+    $$
+      k:[-\pi,\pi] \rightarrow [0,1]
+    $$
+  \end{block}
+\end{frame}
+
+\subsection{Case 2}
+
+\begin{frame}{Case 2}
+  \begin{block}{numbered equation}
+    \begin{itemize}
+      \item Example of numbered equation: the input is an image
+      \begin{equation}
+        \vx\in\reals^{C_{\text{in}}\times H\times W}
+      \end{equation}
+      where $C_{\text{in}}$ represents number of input channels, $H$ is the height of image, and $W$ is the width of image.
+    \end{itemize}
+  \end{block}
+\end{frame}
+
+\subsection{Case 3}
+
+\begin{frame}{Case 3}
+  \begin{block}{Table}
+    Example of tables, shown in \ref{tab:unique_values}. 
+
+    \begin{table}[htbp]
+      \small
+      \centering
+      \caption{Unique elements in train.csv }
+      \label{tab:unique_values}
+      \begin{tabular}{lc}
+        \toprule
+        column & \# unique values \\
+        \midrule
+        posting\_id & 34250 \\
+        image & 32412 \\
+        image\_phash & 28735 \\
+        title & 33117 \\
+        label\_group & 11014 \\
+        \bottomrule
+      \end{tabular}
+    \end{table}
+  \end{block}
+\end{frame}
+
+\subsection{Case 4}
+
+\begin{frame}{Case 4}
+  \begin{block}{Parallel figures}
+    Example of parallel figures.
+  \end{block}
+  \begin{figure}[htbp]
+    \centering
+    \begin{minipage}[t]{0.48\textwidth}
+      \centering
+      \includegraphics[width=3cm]{thulogo.pdf}
+      \caption{Example figure 1}
+      \label{fig:left_side}
+    \end{minipage}
+    \begin{minipage}[t]{0.48\textwidth}
+      \centering
+      \includegraphics[width=3cm]{thulogo.pdf}
+      \caption{Example figure 2}
+      \label{fig:right_side}
+    \end{minipage}
+  \end{figure}
+\end{frame}
+
+\section{Future Work}
+
+\subsection{Future Work}
+
+\begin{frame}{Future work}
+  \begin{block}{Future work}
+    \begin{itemize}
+      \setlength{\itemsep}{6pt}
+      \item XXXX
+      \item XXXX
+      \item XXXX
+      \item XXXX
+    \end{itemize}
+  \end{block}
+\end{frame}
+
+\subsection{Scheduling}
+
+\begin{frame}{Scheduling}
+  \begin{block}{Scheduling}
+    \begin{itemize}
+      \setlength{\itemsep}{6pt}
+      \item XXXX\cite{webster2010}
+      \item XXXX\cite{jones2006}
+      \item XXXX\cite{mcmahan2005}
+      \item XXXX\cite{Gravagne2003}
+    \end{itemize}
+  \end{block}
+\end{frame}
+
+\begin{frame}[allowframebreaks]{Bibliography}
+  \bibliographystyle{thubeamer}
+  \bibliography{reference}
+\end{frame}
+
+\begin{frame}
+	\begin{center}
+    {\Huge\calligra Thanks for your attention!}
+    \vspace{1cm}
+
+    {\Huge Q \& A}
+  \end{center}
+\end{frame}
+
+\end{document}
diff --git a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example.pdf b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example.pdf
index ff2c2d75a6..3682907ee3 100644
--- a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example.pdf
diff --git a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example.tex b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example.tex
index 2d856187b9..1da65479c9 100644
--- a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example.tex
+++ b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer-example.tex
@@ -3,7 +3,7 @@
 % !TEX program  = PdfLaTeX
 %%=======================================================================
 % 模板名称：thubeamer
-% 模板版本：V1.0.0
+% 模板版本：V1.1.0
 % 模板作者：杨敬轩（Jingxuan Yang）
 % 联系作者：yangjx20@mails.tsinghua.edu.cn & yanglatex2e@gmail.com
 % 模板适用：清华大学风格 Beamer 模板
@@ -13,7 +13,7 @@
 %          GNU make 工具：make beamer
 %          Windows 批处理脚本：双击 makebeamer.bat 自动编译 beamer
 %          更多编译细节详见说明文档：thubeamer.pdf
-% 更新时间：2021/07/07
+% 更新时间：2021/11/15
 % 模板帮助：请**务必务必务必**阅读 thubeamer.pdf 说明文档，文档查看方法：
 %          下载模板文件夹里就有，如果是从 CTAN 上安装更新本模板，则通过
 %          cmd 命令行：texdoc thubeamer 查看文档
@@ -37,6 +37,8 @@
 
 % (c) subsectiontoc: 在每小节（subsection）前显示目录，并高亮显示当前节和当前小节，默认不显示
 
+% (d) en: 仅使用英文来制作 beamer，应用此选项后，汉字将全部无法编译
+
 % 图片存放路径
 \graphicspath{{figures/}}
 
diff --git a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer.dtx b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer.dtx
index 8cbdd0c505..7ae1a2d3db 100644
--- a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer.dtx
@@ -108,10 +108,10 @@ This package consists of the file  thubeamer.dtx,
 %<thucolorstyle>\ProvidesPackage{beamercolorthemethubeamer}
 %<thuinnerstyle>\ProvidesPackage{beamerinnerthemethubeamer}
 %<thuouterstyle>\ProvidesPackage{beamerouterthemethubeamer}
-%<thubeamer|thucolorstyle|thuinnerstyle|thuouterstyle>[2021/07/07 v1.0.0 A Beamer Theme for Tsinghua University (THU)]
+%<thubeamer|thucolorstyle|thuinnerstyle|thuouterstyle>[2021/11/15 v1.1.0 A Beamer Theme for Tsinghua University (THU)]
 %
 %<*driver>
-\ProvidesFile{thubeamer.dtx}[2021/07/07 v1.0.0 A Beamer Theme for Tsinghua University (THU)]
+\ProvidesFile{thubeamer.dtx}[2021/11/15 v1.1.0 A Beamer Theme for Tsinghua University (THU)]
 \documentclass{ltxdoc}
 \usepackage{dtx-style}
 
@@ -335,7 +335,6 @@ This package consists of the file  thubeamer.dtx,
 \RequirePackage{multicol}
 \RequirePackage{multimedia}
 \RequirePackage{calc}
-\RequirePackage{ctex}
 \RequirePackage{amsmath}
 \RequirePackage{amsthm}
 \RequirePackage{amssymb}
@@ -380,6 +379,9 @@ This package consists of the file  thubeamer.dtx,
 \DeclareOptionBeamer{subsectiontoc}{
   \PassOptionsToPackage{subsectiontoc}{beamerinnerthemethubeamer}
 }
+\DeclareOptionBeamer{en}{
+  \PassOptionsToPackage{en}{beamerinnerthemethubeamer}
+}
 \ProcessOptionsBeamer
 %    \end{macrocode}
 %
@@ -490,11 +492,14 @@ This package consists of the file  thubeamer.dtx,
 %    \end{macrocode}
 %
 % 参数设置
+% \changes{v1.1.0}{2021/11/15}{add option `en' for preparing beamer in English}
 %    \begin{macrocode}
+\DeclareOptionBeamer{en}{\def\beamer@thulang{english}}
 \DeclareOptionBeamer{sectiontoc}{\def\beamer@thusectoc{sectiontoc}}
 \DeclareOptionBeamer{subsectiontoc}{\def\beamer@thusubsectoc{subsectiontoc}}
 \ProcessOptionsBeamer
 
+\def\beamer@thulanguage{english}
 \def\beamer@thusectiontoc{sectiontoc}
 \def\beamer@thusubsectiontoc{subsectiontoc}
 %    \end{macrocode}
@@ -503,6 +508,12 @@ This package consists of the file  thubeamer.dtx,
 %    \begin{macrocode}
 \mode<presentation>
 
+\ifx\beamer@thulang\beamer@thulanguage
+  \relax
+\else
+  \RequirePackage{ctex}
+\fi
+
 \useinnertheme{circles}
 % \usefonttheme{structurebold}
 \setbeamertemplate{caption}[numbered]{}
diff --git a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer.pdf b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer.pdf
index 0cda53aa81..6af7227136 100644
--- a/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/thubeamer/thubeamer.pdf
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 14c53c6608..2e023285a0 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/11/12}{1.40P}
+\ProvidesExplClass{easybook}{2021/11/16}{1.40Q}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/12}{1.40P}
+\ProvidesExplPackage{easybase}{2021/11/16}{1.40Q}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -923,8 +923,7 @@
   {
     \group_begin:
     \footnotesize
-    \exp_args:Nx
-    \setspread{ \fp_use:N \l__eb_spread_footnote_fp }
+    \setspread{\fp_use:N \l__eb_spread_footnote_fp}
     \exp_args:NNNo \group_end:
     \dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox }
     \bool_if:NT \l__eb_chap_counter_withpart_bool
@@ -1279,7 +1278,7 @@
     lolskip .skip_set:N       = \eb@toc@lolskip,
     lolskip .initial:n        = 10pt,
     main-voffset .skip_set:N  = \l__eb_toc_main_voffset_skip,
-    main-voffset .initial:n   = \bool_if:NTF \l__eb_class_book_bool { 1pc } { 0.35pc },
+    main-voffset .initial:n   = \bool_if:NTF \l__eb_class_book_bool { 1pc } { 0.2pc },
     line-align .bool_set:N    = \l__eb_toc_line_align_bool,
     line-align .default:n     = true,
     line-align .initial:n     = true,
@@ -1332,7 +1331,7 @@
     chapter/tocindent     = 0em,
     chapter/tocrule       = \tocrule{$\cdot$}[\bfseries],
     chapter/tocline       = \CTEXnumberline{#1}#2,
-    section/tocformat = \addvspace{0.35pc}\bool_if:NF \l__eb_class_book_bool { \sffamily },
+    section/tocformat = \addvspace{0.2pc}\bool_if:NF \l__eb_class_book_bool { \sffamily },
     section/tocindent = \bool_if:NTF \l__eb_class_book_bool { 1.5em } { 0em },
     section/tocrule       =
       {
@@ -1341,7 +1340,7 @@
           { \tocrule{$\cdot$}[\bfseries] }
       },
     section/tocline       = \CTEXnumberline{#1}#2,
-    subsection/tocformat  = \addvspace{0.35pc},
+    subsection/tocformat  = \addvspace{0.2pc},
     subsection/tocindent  = \bool_if:NTF \l__eb_class_book_bool { 3.8em } { 1.4em },
     subsection/tocrule    = \tocrule{$\cdot$},
     subsection/tocline    = \CTEXnumberline{#1}#2,
@@ -1467,10 +1466,7 @@
     \eb_appto_cmd:Nn \@chapter
       {
         \skip_if_eq:nnF { \eb@toc@lolskip } { \c_zero_skip }
-          {
-            \addtocontents{lol}
-              {\protect\addvspace{\skip_use:N \eb@toc@lolskip}}
-          }
+          { \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lolskip}} }
       }
   }
 
@@ -1721,7 +1717,7 @@
 \ctex_define:nn { spread }
   {
     line .code:n        = \AfterPreamble{\setspread{#1}},
-    line .initial:n     = 1.3,
+    line .initial:n     = 1.354,
     table .fp_set:N     = \l__eb_spread_table_fp,
     table .initial:n    = 1.2,
     math .fp_set:N      = \l__eb_spread_math_fp,
@@ -1769,10 +1765,7 @@
     \SetTblrInner{stretch = \fp_use:N \l__eb_spread_table_fp}
   }{}
 \eb_at_begin_environment:nn { tabular,tabularx }
-  {
-    \exp_args:Nx
-    \setspread { \fp_use:N \l__eb_spread_table_fp }
-  }
+  { \setspread{\fp_use:N \l__eb_spread_table_fp} }
 
 \bool_if:NF \l__eb_float_page_bool
   {
@@ -1799,9 +1792,9 @@
 \tl_gset:Nn \ULthickness { \l__eb_rule_width_dim }
 \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
 
-\cs_new_protected:Npn \hangpara #1#2
+\cs_set_protected:Npn \hangpara #1#2
   { \hangindent #1\hangafter #2\noindent\ignorespaces }
-\NewDocumentEnvironment{hangparas}{mm+b}
+\DeclareDocumentEnvironment{hangparas}{mm+b}
   {
     \dim_zero:N \parindent
     \everypar{\hangpara{#1}{#2}}#3\par
@@ -1984,8 +1977,8 @@
   }
 \ctex_set:nn { thmset }
   {
-    spaceabove    = 0.75ex plus .1ex,
-    spacebelow    = 0.75ex plus .1ex,
+    spaceabove    = 0ex plus .1ex,
+    spacebelow    = 0ex plus .1ex,
     headindent    = 0em,
     headfont      = \color{ctex@emph}\sffamily,
     postheadspace = 1em,
@@ -2401,7 +2394,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/12}{1.40P}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/16}{1.40Q}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 37b9add116..d949277b01 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index cde1c710e8..661175447e 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -20,8 +20,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.40P,
-    date            = 2021/11/12,
+    version         = v1.40Q,
+    date            = 2021/11/16,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = q1jx@foxmail.com,
@@ -488,7 +488,7 @@
 \label{subsec:spacing}
 行距因子用于设置各种行距倍数，\meta{数值} 是不带有长度单位的浮点数。各类行距既可以在导言区全局设置，也可以在正文中设置对后面生效。
 \begin{options}
-  \keyval-{line}{数值}\Module{spread}\Default{1.3}
+  \keyval-{line}{数值}\Module{spread}\Default{1.354}
   正文行距因子，C\TeX 原有的行距选项 \option*{linespread} 失效。
   \keyval-{table}{数值}\Default{1.2}
   表格行距因子，对传统表格环境 \env*{tabular}、\env*{tabularx} 以及 \pkg*{tabularray} 宏包的 \env{tblr} 环境生效，同时 \env{tblr} 也自带有 \option*{stretch} 选项设置行距。
@@ -580,9 +580,9 @@
   定理标题部分的字体，包括字体族、字体系列、字体尺寸和字体形状命令。
   \keyval-{headindent}{刚性长度}\Default{0em}
   定理标题的缩进，默认无缩进，可用 \cs*{parindent} 命令设置为段落缩进。
-  \keyval-{spaceabove}{弹性长度}\Default{0.75ex plus .1ex}
+  \keyval-{spaceabove}{弹性长度}\Default{0ex plus .1ex}
   定理环境前的间距，使用 \pkg*{tcolorbox} 的盒子环境包装后被覆盖。
-  \keyval-{spacebelow}{弹性长度}\Default{0.75ex plus .1ex}
+  \keyval-{spacebelow}{弹性长度}\Default{0ex plus .1ex}
   定理环境后的间距，使用 \pkg*{tcolorbox} 的盒子环境包装后被覆盖。
   \keyval-{postheadspace}{刚性长度}\Default{1em}
   定理标题后与定理第一段内容的间距。
diff --git a/macros/latex/contrib/hitszthesis/License b/macros/latex/contrib/hitszthesis/License
new file mode 100644
index 0000000000..2244313901
--- /dev/null
+++ b/macros/latex/contrib/hitszthesis/License
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c  2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+    Everyone is allowed to distribute verbatim copies of this
+    license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute.  This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but 
+it is written in such a way that you can use it even if your work is 
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work.  If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+   `Work'
+    Any work being distributed under this License.
+    
+   `Derived Work'
+    Any work that under any applicable law is derived from the Work.
+
+   `Modification' 
+    Any procedure that produces a Derived Work under any applicable
+    law -- for example, the production of a file containing an
+    original file associated with the Work or a significant portion of
+    such a file, either verbatim or with modifications and/or
+    translated into another language.
+
+   `Modify'
+    To apply any procedure that produces a Derived Work under any
+    applicable law.
+    
+   `Distribution'
+    Making copies of the Work available from one person to another, in
+    whole or in part.  Distribution includes (but is not limited to)
+    making any electronic components of the Work accessible by
+    file transfer protocols such as FTP or HTTP or by shared file
+    systems such as Sun's Network File System (NFS).
+
+   `Compiled Work'
+    A version of the Work that has been processed into a form where it
+    is directly usable on a computer system.  This processing may
+    include using installation facilities provided by the Work,
+    transformations of the Work, copying of components of the Work, or
+    other activities.  Note that modification of any installation
+    facilities provided by the Work constitutes modification of the Work.
+
+   `Current Maintainer'
+    A person or persons nominated as such within the Work.  If there is
+    no such explicit nomination then it is the `Copyright Holder' under
+    any applicable law.
+
+   `Base Interpreter' 
+    A program or process that is normally needed for running or
+    interpreting a part or the whole of the Work.    
+
+    A Base Interpreter may depend on external components but these
+    are not considered part of the Base Interpreter provided that each
+    external component clearly identifies itself whenever it is used
+    interactively.  Unless explicitly specified when applying the
+    license to the Work, the only applicable Base Interpreter is a
+    `LaTeX-Format' or in the case of files belonging to the 
+    `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1.  Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope.  In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2.  You may distribute a complete, unmodified copy of the Work as you
+received it.  Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3.  You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4.  If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work.  You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work.  Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5.  If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6.  If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition.  Only
+the Current Maintainer is allowed to add such statements of exemption 
+to a component of the Work. 
+
+  a. If a component of this Derived Work can be a direct replacement
+     for a component of the Work when that component is used with the
+     Base Interpreter, then, wherever this component of the Work
+     identifies itself to the user when used interactively with that
+     Base Interpreter, the replacement component of this Derived Work
+     clearly and unambiguously identifies itself as a modified version
+     of this component to the user when used interactively with that
+     Base Interpreter.
+     
+  b. Every component of the Derived Work contains prominent notices
+     detailing the nature of the changes to that component, or a
+     prominent reference to another file that is distributed as part
+     of the Derived Work and that contains a complete and accurate log
+     of the changes.
+  
+  c. No information in the Derived Work implies that any persons,
+     including (but not limited to) the authors of the original version
+     of the Work, provide any support, including (but not limited to)
+     the reporting and handling of errors, to recipients of the
+     Derived Work unless those persons have stated explicitly that
+     they do provide such support for the Derived Work.
+
+  d. You distribute at least one of the following with the Derived Work:
+
+       1. A complete, unmodified copy of the Work; 
+          if your distribution of a modified component is made by
+          offering access to copy the modified component from a
+          designated place, then offering equivalent access to copy
+          the Work from the same or some similar place meets this
+          condition, even though third parties are not compelled to
+          copy the Work along with the modified component;
+
+       2. Information that is sufficient to obtain a complete,
+          unmodified copy of the Work.
+
+7.  If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8.  The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9.  Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+     
+10. a. A Derived Work may be distributed under a different license
+       provided that license itself honors the conditions listed in
+       Clause 6 above, in regard to the Work, though it does not have
+       to honor the rest of the conditions in this license.
+      
+    b. If a Derived Work is distributed under a different license, that
+       Derived Work must provide sufficient documentation as part of
+       itself to allow each recipient of that Derived Work to honor the 
+       restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12.  Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work.  Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose.  The entire risk as to the quality and performance
+of the Work is with you.  Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1.  Make a reasonable attempt to trace the Current Maintainer (and
+     the Copyright Holder, if the two differ) through the means of
+     an Internet or similar search.
+
+ 2.  If this search is successful, then enquire whether the Work
+     is still maintained.
+
+  a. If it is being maintained, then ask the Current Maintainer
+     to update their communication data within one month.
+     
+  b. If the search is unsuccessful or no action to resume active
+     maintenance is taken by the Current Maintainer, then announce
+     within the pertinent community your intention to take over
+     maintenance.  (If the Work is a LaTeX work, this could be
+     done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+     maintenance of the Work to you, then this takes effect
+     immediately upon announcement.
+     
+  b. If the Current Maintainer is not reachable and the Copyright
+     Holder agrees that maintenance of the Work be passed to you,
+     then this takes effect immediately upon announcement.  
+    
+ 4.  If you make an `intention announcement' as described in 2b. above
+     and after three months your intention is challenged neither by
+     the Current Maintainer nor by the Copyright Holder nor by other
+     people, then you may arrange for the Work to be changed so as
+     to name you as the (new) Current Maintainer.
+     
+ 5.  If the previously unreachable Current Maintainer becomes
+     reachable once more within three months of a change completed
+     under the terms of 3b) or 4), then that Current Maintainer must
+     become or remain the Current Maintainer upon request provided
+     they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer.  You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license.  These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license.  You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license.  It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate.  Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component.  While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community.  It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one.  Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified.  Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+  %% pig.dtx
+  %% Copyright 2005 M. Y. Name
+  %
+  % 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 M. Y. Name.
+  %
+  % This work consists of the files pig.dtx and pig.ins
+  % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.  
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+   The LPPL requires that distributions of the Work contain all the
+   files of the Work.  It is therefore important that you provide a
+   way for the licensee to determine which files constitute the Work.
+   This could, for example, be achieved by explicitly listing all the
+   files of the Work near the copyright notice of each file or by
+   using a line such as:
+
+    % This work consists of all files listed in manifest.txt.
+   
+   in that place.  In the absence of an unequivocal list it might be
+   impossible for the licensee to determine what is considered by you
+   to comprise the Work and, in such a case, the licensee would be
+   entitled to make reasonable conjectures as to which files comprise
+   the Work.
+
diff --git a/macros/latex/contrib/hitszthesis/Makefile b/macros/latex/contrib/hitszthesis/Makefile
index 4ebf11aee3..af98b1a736 100644
--- a/macros/latex/contrib/hitszthesis/Makefile
+++ b/macros/latex/contrib/hitszthesis/Makefile
@@ -4,6 +4,8 @@
 METHOD = xelatex
 # Set opts for latexmk if you use it
 LATEXMKOPTS = -xelatex
+# Set opts for xelatex if you use it
+XELATEXOPTS = -shell-escape
 # Basename of thesis
 THESISMAIN = main
 
@@ -48,24 +50,28 @@ thesis: $(THESISMAIN).pdf
 
 ifeq ($(METHOD),latexmk)
 
+LATEXCMD := $(METHOD) $(LATEXMKOPTS)
+
 $(PACKAGE).pdf: $(CLSFILES) FORCE_MAKE
-	$(METHOD) $(LATEXMKOPTS) $(PACKAGE).dtx
+	$(LATEXCMD) $(LATEXMKOPTS) $(PACKAGE).dtx
 
 $(THESISMAIN).pdf: $(CLSFILES) FORCE_MAKE
-	$(METHOD) $(LATEXMKOPTS) $(THESISMAIN)
+	$(LATEXCMD) $(LATEXMKOPTS) $(THESISMAIN)
 
 else ifeq ($(METHOD),xelatex)
 
+LATEXCMD := $(METHOD) $(XELATEXOPTS)
+
 $(PACKAGE).pdf: $(CLSFILES)
-	$(METHOD) $(PACKAGE).dtx
+	$(LATEXCMD) $(PACKAGE).dtx
 	makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
 	makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
-	$(METHOD) $(PACKAGE).dtx
-	$(METHOD) $(PACKAGE).dtx
+	$(LATEXCMD) $(PACKAGE).dtx
+	$(LATEXCMD) $(PACKAGE).dtx
 
 $(THESISMAIN).idx: $(THESISMAIN).bbl
-	$(METHOD) $(THESISMAIN)
-	$(METHOD) $(THESISMAIN)
+	$(LATEXCMD) $(THESISMAIN)
+	$(LATEXCMD) $(THESISMAIN)
 
 
 $(THESISMAIN)_china.idx : $(CLSFILES) $(THESISMAIN).bbl $(THESISMAIN).idx
@@ -74,12 +80,12 @@ $(THESISMAIN)_china.idx : $(CLSFILES) $(THESISMAIN).bbl $(THESISMAIN).idx
 $(THESISMAIN)_english.ind $(THESISMAIN)_china.ind $(THESISMAIN)_english.idx : $(THESISMAIN)_china.idx
 
 $(THESISMAIN).pdf: $(CLSFILES) $(THESISCONTENTS) $(THESISMAIN)_china.ind $(THESISMAIN)_china.idx $(THESISMAIN)_english.ind $(THESISMAIN)_english.idx $(THESISMAIN).bbl
-	$(METHOD) $(THESISMAIN)
+	$(LATEXCMD) $(THESISMAIN)
 	splitindex $(THESISMAIN) -- -s $(PACKAGE).ist
-	$(METHOD) $(THESISMAIN)
+	$(LATEXCMD) $(THESISMAIN)
 
 $(THESISMAIN).bbl: $(BIBFILE)
-	$(METHOD) $(THESISMAIN)
+	$(LATEXCMD) $(THESISMAIN)
 	-bibtex $(THESISMAIN)
 	$(RM) $(THESISMAIN).pdf
 
diff --git a/macros/latex/contrib/hitszthesis/README.md b/macros/latex/contrib/hitszthesis/README.md
index acd4d49b73..47f31127e8 100644
--- a/macros/latex/contrib/hitszthesis/README.md
+++ b/macros/latex/contrib/hitszthesis/README.md
@@ -14,7 +14,7 @@
 
 # Introduction to hitszthesis
 
-HITSZThesis is a **dissertation** LaTeX template for **Harbin Institute of Technology, ShenZhen** (HITSZ), including bachelor, master and doctor dissertations. Current version is 3.2, updated on 2020/06/23. Note that 3.x version is not compatible with 2.x version. Please join QQ group: 1039392552 to report issues. If using `Makefile` or `compile.bat` to automatically compile thesis, please first rename the file `hitszthesis-example.tex` to `main.tex`.
+HITSZThesis is a **dissertation** LaTeX template for **Harbin Institute of Technology, ShenZhen** (HITSZ), including bachelor, master and doctor dissertations. Current version is 3.2.1, updated on 2021/11/15. Note that 3.x version is not compatible with 2.x version. Please join QQ group: 1039392552 to report issues.
 
 ```latex
   |- front
@@ -36,7 +36,7 @@ HITSZThesis is a **dissertation** LaTeX template for **Harbin Institute of Techn
     |- appendixB.tex
     |- ceindex.tex
     |- conclusion.tex
-    |- publication.tex
+    |- publications.tex
     |- resume.tex
   |- figures
     |- bthesistitle.eps
@@ -44,16 +44,16 @@ HITSZThesis is a **dissertation** LaTeX template for **Harbin Institute of Techn
     |- hitlogo.eps
   |- compile.bat
   |- ctex-fontset-siyuan.def
+  |- hitszthesis-bachelor.pdf
+  |- hitszthesis-doctor.pdf
+  |- hitszthesis-master.pdf
   |- hitszthesis.bst
   |- hitszthesis.dtx
   |- hitszthesis.ins
   |- hitszthesis.pdf
   |- hitszthesis.sty
   |- latexmkrc
-  |- hitszthesis-bachelor.pdf
-  |- hitszthesis-doctor.pdf
-  |- hitszthesis-master.pdf
-  |- hitszthesis-example.tex
+  |- main.tex
   |- Makefile
   |- README.md
   |- reference.bib
@@ -61,7 +61,7 @@ HITSZThesis is a **dissertation** LaTeX template for **Harbin Institute of Techn
 
 # hitszthesis 模板简介
 
-hitszthesis 是哈尔滨工业大学（深圳）本硕博学位论文模板，当前版本为3.2，更新于2020年6月23日。注意3.x版本不兼容2.x版本。请加入QQ群：1039392552反馈模板使用过程中遇到的问题。如果要使用`Makefile`或者`compile.bat`自动编译论文，请先把文件`hitszthesis-example.tex`重命名为`main.tex`。
+hitszthesis 是哈尔滨工业大学（深圳）本硕博学位论文模板，当前版本为3.2.1，更新于2021年11月15日。注意3.x版本不兼容2.x版本。请加入QQ群：1039392552反馈模板使用过程中遇到的问题。
 
 # Documentation
 
@@ -149,7 +149,7 @@ Please follow the procedure below:
 
 * QQ group: 1039392552
 * [GitHub Issues](https://github.com/YangLaTeX/hitszthesis/issues)
-* [Educational Email](mailto:yangjingxuan@stu.hit.edu.cn)
+* [Educational Email](mailto:yangjx20@mails.tsinghua.edu.cn)
 * [Gmail](mailto:yanglatex2e@gmail.com)
 
 # 模板问题反馈
@@ -158,7 +158,7 @@ Please follow the procedure below:
 
 * QQ group: 1039392552
 * [GitHub 问题反馈](https://github.com/YangLaTeX/hitszthesis/issues)
-* [教育邮箱](mailto:yangjingxuan@stu.hit.edu.cn)
+* [教育邮箱](mailto:yangjx20@mails.tsinghua.edu.cn)
 * [Gmail 邮箱](mailto:yanglatex2e@gmail.com)
 
 # Makefile Usage
diff --git a/macros/latex/contrib/hitszthesis/back/publications.tex b/macros/latex/contrib/hitszthesis/back/publications.tex
index 56fc04fbcd..615d165338 100644
--- a/macros/latex/contrib/hitszthesis/back/publications.tex
+++ b/macros/latex/contrib/hitszthesis/back/publications.tex
@@ -4,23 +4,23 @@
 \begin{publication}
   \noindent\songti\textbf{（一）发表的学术论文}
   \begin{publist}
-    \item	XXX，XXX. Static Oxidation Model of Al-Mg/C Dissipation Thermal Protection Materials[J]. Rare Metal Materials and Engineering, 2010, 39(Suppl. 1): 520-524.（SCI~收录，IDS号为~669JS，IF=0.16）
-    \item XXX，XXX. 精密超声振动切削单晶铜的计算机仿真研究[J]. 系统仿真学报，2007，19（4）：738-741，753.（EI~收录号：20071310514841）
-    \item XXX，XXX. 局部多孔质气体静压轴向轴承静态特性的数值求解[J]. 摩擦学学报，2007（1）：68-72.（EI~收录号：20071510544816）
-    \item XXX，XXX. 硬脆光学晶体材料超精密切削理论研究综述[J]. 机械工程学报，2003，39（8）：15-22.（EI~收录号：2004088028875）
-    \item XXX，XXX. 基于遗传算法的超精密切削加工表面粗糙度预测模型的参数辨识以及切削参数优化[J]. 机械工程学报，2005，41（11）：158-162.（EI~收录号：2006039650087）
-    \item XXX，XXX. Discrete Sliding Mode Cintrok with Fuzzy Adaptive Reaching Law on 6-PEES Parallel Robot[C]. Intelligent System Design and Applications, Jinan, 2006: 649-652.（EI~收录号：20073210746529）
+    \item	XXX，XXX. Static Oxidation Model of Al-Mg/C Dissipation Thermal Protection Materials［J］. Rare Metal Materials and Engineering，2010，39(Suppl. 1)：520-524.（SCI~收录，IDS号为~669JS，IF=0.16）
+    \item XXX，XXX. 精密超声振动切削单晶铜的计算机仿真研究［J］. 系统仿真学报，2007，19（4）：738-741，753.（EI~收录号：20071310514841）
+    \item XXX，XXX. 局部多孔质气体静压轴向轴承静态特性的数值求解［J］. 摩擦学学报，2007（1）：68-72.（EI~收录号：20071510544816）
+    \item XXX，XXX. 硬脆光学晶体材料超精密切削理论研究综述［J］. 机械工程学报，2003，39（8）：15-22.（EI~收录号：2004088028875）
+    \item XXX，XXX. 基于遗传算法的超精密切削加工表面粗糙度预测模型的参数辨识以及切削参数优化［J］. 机械工程学报，2005，41（11）：158-162.（EI~收录号：2006039650087）
+    \item XXX，XXX. Discrete Sliding Mode Cintrok with Fuzzy Adaptive Reaching Law on 6-PEES Parallel Robot［C］. Intelligent System Design and Applications，Jinan，2006：649-652.（EI~收录号：20073210746529）
   \end{publist}
 
   \noindent\songti\textbf{（二）申请及已获得的专利（无专利时此项不必列出）}
   \begin{publist}
-    \item XXX，XXX. 一种温热外敷药制备方案：中国，88105607.3[P]. 1989-07-26.
+    \item XXX，XXX. 一种温热外敷药制备方案：中国，88105607.3［P］. 1989-07-26.
   \end{publist}
 
   \noindent\songti\textbf{（三）参与的科研项目及获奖情况}
   \begin{publist}
-    \item	XXX，XXX. XX~气体静压轴承技术研究, XX~省自然科学基金项目.课题编号：XXXX.
-    \item XXX，XXX. XX~静载下预应力混凝土房屋结构设计统一理论. 黑江省科学技术二等奖, 2007.
+    \item	XXX，XXX. XX~气体静压轴承技术研究，XX~省自然科学基金项目.课题编号：XXXX.
+    \item XXX，XXX. XX~静载下预应力混凝土房屋结构设计统一理论. 黑江省科学技术二等奖，2007.
   \end{publist}
   %\vfill
   %\hangafter=1\hangindent=2em\noindent
diff --git a/macros/latex/contrib/hitszthesis/body/chapter02.tex b/macros/latex/contrib/hitszthesis/body/chapter02.tex
index ae7392bd51..d972f1d8d3 100644
--- a/macros/latex/contrib/hitszthesis/body/chapter02.tex
+++ b/macros/latex/contrib/hitszthesis/body/chapter02.tex
@@ -171,15 +171,15 @@ Times New Roman字体，字号尽量采用5号字（当字数较多时可用小5
 \begin{minipage}[t]{0.3\textwidth}
 \wuhao \setlist[description]{font=\normalfont}
 	\begin{description}
-		\item[a)]子图图题
+		\item[(a)]子图图题
 	\end{description}
  \end{minipage}
  \hspace{2em}
  \begin{minipage}[t]{0.3\textwidth}
 \wuhao \setlist[description]{font=\normalfont}
 	\begin{description}
-		\item[b)]子图图题
-		\item[b)]Subfigure caption
+		\item[(b)]子图图题
+		\item[(b)]Subfigure caption
 	\end{description}
 \end{minipage}
 \end{figure}
diff --git a/macros/latex/contrib/hitszthesis/front/coverinformation.tex b/macros/latex/contrib/hitszthesis/front/coverinformation.tex
index 6a766b0977..ef769fc391 100644
--- a/macros/latex/contrib/hitszthesis/front/coverinformation.tex
+++ b/macros/latex/contrib/hitszthesis/front/coverinformation.tex
@@ -17,12 +17,13 @@
   %=========
   % 中文信息
   %=========
-  ctitleone={基于神经网络的机器人},%本科生封面使用
-  ctitletwo={智能抓取研究},%本科生封面使用
-  ctitlecover={基于神经网络的机器人智能抓取研究},%放在封面中使用，自由断行
-  ctitle={基于神经网络的机器人智能抓取研究},%放在原创性声明中使用
-  csubtitle={一条副标题}, %一般情况没有，可以注释掉
+  ctitleone={基于神经网络的机器人}, % 本科生封面使用
+  ctitletwo={智能抓取研究}, % 本科生封面使用
+  ctitlecover={基于神经网络的机器人智能抓取研究}, % 放在封面中使用，自由断行
+  ctitle={基于神经网络的机器人智能抓取研究}, % 放在原创性声明中使用
+  csubtitle={一条副标题}, % 一般情况没有，可以注释掉
   cxueke={工学},
+  cpostgraduatetype={学术}, % 学术或专业
   csubject={机械设计制造及其自动化},
   % csubject={机械工程},
   caffil={机电工程与自动化学院},
@@ -33,10 +34,10 @@
   % ccosupervisor={某某某 教授}, % 联合指导老师
   % 日期自动使用当前时间，若需指定按如下方式修改：
   cdate={2020年6月},
-  % 指定本科第二页封面的日期，即答辩日期
+  % 指定第二页封面的日期，即答辩日期
   cdatesecond={2020年06月09日},
   cstudentid={SZ160310217},
-  cstudenttype={同等学力人员}, %非全日制教育申请学位者
+  cstudenttype={同等学力人员}, % 非全日制教育申请学位者
   %（同等学力人员）、（工程硕士）、（工商管理硕士）、
   %（高级管理人员工商管理硕士）、（公共管理硕士）、（中职教师）、（高校教师）等
   %
diff --git a/macros/latex/contrib/hitszthesis/hitszthesis-bachelor.pdf b/macros/latex/contrib/hitszthesis/hitszthesis-bachelor.pdf
index 185db04f52..a58cce38bb 100644
--- a/macros/latex/contrib/hitszthesis/hitszthesis-bachelor.pdf
+++ b/macros/latex/contrib/hitszthesis/hitszthesis-bachelor.pdf
diff --git a/macros/latex/contrib/hitszthesis/hitszthesis-doctor.pdf b/macros/latex/contrib/hitszthesis/hitszthesis-doctor.pdf
index ac53374d4f..43f6d93643 100644
--- a/macros/latex/contrib/hitszthesis/hitszthesis-doctor.pdf
+++ b/macros/latex/contrib/hitszthesis/hitszthesis-doctor.pdf
diff --git a/macros/latex/contrib/hitszthesis/hitszthesis-example.tex b/macros/latex/contrib/hitszthesis/hitszthesis-example.tex
index 6dc0c868f9..998b816562 100644
--- a/macros/latex/contrib/hitszthesis/hitszthesis-example.tex
+++ b/macros/latex/contrib/hitszthesis/hitszthesis-example.tex
@@ -3,16 +3,16 @@
 % !TEX program  = XeLaTeX
 %%=============================================
 % 模板名称：hitszthesis
-% 模板版本：V3.2
+% 模板版本：V3.2.1
 % 模板作者：杨敬轩（Jingxuan Yang）
-% 联系作者：yangjingxuan@stu.hit.edu.cn & yanglatex2e@gmail.com
+% 联系作者：yangjx20@mails.tsinghua.edu.cn & yanglatex2e@gmail.com
 % 模板交流：QQ群：1039392552，加群请备注LaTeX、hitszthesis相关说明
 % 模板适用：哈尔滨工业大学（深圳）本、硕、博学位论文
 % 模板编译：手动编译方法参看 README.md 或 hitszthesis.pdf
 %          GNU make 工具：make thesis
 %          Windows批处理脚本：双击 compile.bat 自动编译论文
 %          更多编译细节详见说明文档：hitszthesis.pdf
-% 更新时间：2020/06/23
+% 更新时间：2021/11/15
 % 模板帮助：请**务必务必务必**阅读 hitszthesis.pdf 说明文档，文档查看方法：
 %          cmd 命令行：texdoc hitszthesis
 %          推荐前往模板的 GitHub 仓库获取最新文件，地址：
@@ -113,6 +113,9 @@
 \input{back/conclusion}
 
 % 参考文献
+% 按需选择 <gbt7714-numerical> 或 <hitszthesis> 样式
+% 二者主要区别在于括号和标点采用中文还是英文
+% \bibliographystyle{gbt7714-numerical}
 \bibliographystyle{hitszthesis}
 \bibliography{reference}
 
diff --git a/macros/latex/contrib/hitszthesis/hitszthesis-master.pdf b/macros/latex/contrib/hitszthesis/hitszthesis-master.pdf
index fad23a367a..b1f8319669 100644
--- a/macros/latex/contrib/hitszthesis/hitszthesis-master.pdf
+++ b/macros/latex/contrib/hitszthesis/hitszthesis-master.pdf
diff --git a/macros/latex/contrib/hitszthesis/hitszthesis.bst b/macros/latex/contrib/hitszthesis/hitszthesis.bst
index 7b01cb29b9..b187ddba7c 100644
--- a/macros/latex/contrib/hitszthesis/hitszthesis.bst
+++ b/macros/latex/contrib/hitszthesis/hitszthesis.bst
@@ -2,10 +2,10 @@
 %     FileName: hitszthesis.bst
 %       Author: 杨敬轩（Jingxuan Yang）
 %        Email: yanglatex2e@gmail.com
-%      Version: 0.0.1
+%      Version: 0.0.2
 %     Modified: 杨敬轩（Jingxuan Yang）
 %      History: Yanshuo Chu，胡海星
-%   LastChange: 2020-03-12 12:39:30
+%   LastChange: 2021-11-15 17:42:30
 %=============================================================================
                                                   %
 ENTRY                                             % class Entry {
@@ -82,12 +82,12 @@ FUNCTION {cap.edition.en} 		{"~ed"}
 FUNCTION {cap.edition.zh} 		{"版"}
 FUNCTION {cap.anonymous.en} 	{"Anon"}
 FUNCTION {cap.anonymous.zh} 	{"佚名"}
-FUNCTION {cap.no.address.en} 	{"[S.l.]"}
-FUNCTION {cap.no.address.zh} 	{"[出版地不详]"}
-FUNCTION {cap.no.publisher.en} 	{"[s.n.]"}
-FUNCTION {cap.no.publisher.zh} 	{"[出版者不详]"}
-FUNCTION {cap.et.al.en} 		{", et~al"}
-FUNCTION {cap.et.al.zh} 		{", 等"}
+FUNCTION {cap.no.address.en} 	{"［S.l.］"}
+FUNCTION {cap.no.address.zh} 	{"［出版地不详］"}
+FUNCTION {cap.no.publisher.en} 	{"［s.n.］"}
+FUNCTION {cap.no.publisher.zh} 	{"［出版者不详］"}
+FUNCTION {cap.et.al.en} 		{"，et~al"}
+FUNCTION {cap.et.al.zh} 		{"，等"}
 FUNCTION {cap.translate.en} 	{"~trans"}
 FUNCTION {cap.translate.zh} 	{"译"}
 FUNCTION {cap.doi.url} 			{"http://dx.doi.org/"}
@@ -98,8 +98,8 @@ FUNCTION {cap.th.en} 			{"th"}
 
 FUNCTION {cap.space}      {" "}
 FUNCTION {cap.period} 		{"\@. "}
-FUNCTION {cap.comma} 			{"\@, "}
-FUNCTION {cap.colon} 			{"\thinspace{}\textnormal{: }"}
+FUNCTION {cap.comma} 			{"\@，"}
+FUNCTION {cap.colon} 			{"\thinspace{}\textnormal{：}"}
 FUNCTION {cap.double.slash} 	{" //\thinspace{}"}
 FUNCTION {cap.dash} 			{"\textnormal{-}"}
 
@@ -332,13 +332,13 @@ FUNCTION {add.brace} {                            % String Entry::add_brace(Stri
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                                                   %
 FUNCTION {add.bracket} {                          % String Entry::bracket(String str) {
-  "(" swap$ * ")" *                               %   return "(" + str + ")";
+  "（" swap$ * "）\!\!" *                               %   return "（" + str + "）\!\!";
 }                                                 % }
                                                   %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                                                   %
 FUNCTION {add.squarebracket} {                    % String Entry::add_squarebracket(String str) {
-  "[" swap$ * "]" *                               %   return "[" + str + "]";
+  "［" swap$ * "］" *                               %   return "［" + str + "］";
 }                                                 % }
                                                   %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -602,9 +602,9 @@ FUNCTION {format.names} {                         % String Entry::format_names(S
     remove.dots 'jrname :=                        %     jrname = remove_dots(tmp);
     namelist nameindex "{f}" format.name$         %     tmp = format_name(namelist, nameindex, "{f}");
     remove.dots                                   %     tmp = remove_dots(tmp);
-    'firstname :=                                 %     firstname = change_case(tmp, "u");
+    "u" change.case$ 'firstname :=                %     firstname = change_case(tmp, "u");
     namelist nameindex "{ll}" format.name$        %     tmp = format_name(namelist, nameindex, "{ll}");
-    'lastname :=                                  %     lastname = change_case(tmp, "u");
+    "u" change.case$ 'lastname :=                 %     lastname = change_case(tmp, "u");
     jrname empty$ not {                           %     if (! empty(jrname)) {
       jrname * " " *                              %       result = result + jrname + " "
     } 'skip$ if$                                  %     }
@@ -697,7 +697,7 @@ FUNCTION {format.booktitle} {                     % String Emtry::format_booktit
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                                                   %
 FUNCTION {format.mark} {                          % String Emtry::format_mark(String mark) {
-  "[" swap$ * "]" *                               %   mark = "[" + mark + "]";
+  "\,［" swap$ * "］" *                               %   mark = " ［" + mark + "］";
   "mark" format.bibinfo                           %   return format_bibinfo(mark, "mark");
 }                                                 % }
                                                   %
diff --git a/macros/latex/contrib/hitszthesis/hitszthesis.dtx b/macros/latex/contrib/hitszthesis/hitszthesis.dtx
index 5cf1c8adaf..4943e3feae 100644
--- a/macros/latex/contrib/hitszthesis/hitszthesis.dtx
+++ b/macros/latex/contrib/hitszthesis/hitszthesis.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2019-2020 by Jingxuan Yang <yanglatex2e@gmail.com>
+% Copyright (C) 2019-2021 by Jingxuan Yang <yanglatex2e@gmail.com>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
@@ -16,7 +16,7 @@
 %
 % \iffalse
 %<*driver>
-\ProvidesFile{hitszthesis.dtx}[2020/06/23 3.2 Dissertation Template for Harbin Institute of Technology, ShenZhen (HITSZ)]
+\ProvidesFile{hitszthesis.dtx}[2021/11/15 3.2.1 Dissertation Template for Harbin Institute of Technology, ShenZhen (HITSZ)]
 \documentclass{ltxdoc}
 \usepackage{dtx-style}
 
@@ -937,7 +937,7 @@
 %<cls>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<cls>\ProvidesClass{hitszthesis}
 %<cfg>\ProvidesFile{hitszthesis.cfg}
-%<cls|cfg>[2020/06/23 3.2 Dissertation Template for Harbin Institute of Technology, ShenZhen (HITSZ)]
+%<cls|cfg>[2021/11/15 3.2.1 Dissertation Template for Harbin Institute of Technology, ShenZhen (HITSZ)]
 %    \end{macrocode}
 %
 % \subsection{定义选项}
@@ -1278,10 +1278,11 @@
 \fi
 %    \end{macrocode}
 %
-% 利用 \pkg{CJKfntef} 实现汉字的下划线和盒子内两段对齐，并可以避免
+% 利用 \pkg{xeCJKfntef} 实现汉字的下划线和盒子内两段对齐，并可以避免
 % \cs{makebox}\oarg{width}\oarg{s} 可能产生的 underful boxes。
+% \changes{v3.2.1}{2021/11/14}{CJKfntef包不再自动加载xeCJKfntef}
 %    \begin{macrocode}
-\RequirePackage{CJKfntef}
+\RequirePackage{xeCJKfntef}
 %    \end{macrocode}
 %
 % 表格控制
@@ -1295,7 +1296,9 @@
 %    \end{macrocode}
 %
 % 参考文献引用宏包。
+% \changes{v3.2.1}{2021/11/15}{add package \pkg{gbt7714}}
 %    \begin{macrocode}
+\RequirePackage{gbt7714}
 \RequirePackage[sort&compress]{natbib}
 %    \end{macrocode}
 %
@@ -1931,10 +1934,11 @@ delim_1 "\\hspace*{\\fill}"
 %    \end{macro}
 %
 %    图表名称及格式。
+% \changes{v3.2.1}{2021/11/15}{change `thesubfigure' with both brackets}
 %    \begin{macrocode}
 \renewcommand{\thesubtable}{(\alph{subtable})}
 \renewcommand{\thefigure}{\arabic{chapter}-\arabic{figure}}%使图编号为 7-1 的格式 %\protect{~}
-\renewcommand{\thesubfigure}{\alph{subfigure})}%使子图编号为 a)的格式
+\renewcommand{\thesubfigure}{(\alph{subfigure})}%使子图编号为 a)的格式
 \renewcommand{\p@subfigure}{\thefigure~} %使子图引用为 7-1 a) 的格式，母图编号和子图编号之间用~加一个空格
 \renewcommand{\thetable}{\arabic{chapter}-\arabic{table}}%使表编号为 7-1 的格式
 %    \end{macrocode}
@@ -1969,10 +1973,10 @@ delim_1 "\\hspace*{\\fill}"
 % 自定义项目列表标签及格式 \begin{publist} 列表项 \end{publist}
 \newcounter{pubctr} %自定义新计数器
 \newenvironment{publist}{%%%%%定义新环境
-\begin{list}{[\arabic{pubctr}]} %%标签格式
+\begin{list}{［\arabic{pubctr}］} %%标签格式
     {
      \usecounter{pubctr}
-     \setlength{\leftmargin}{1.7em}     % 左边界 \leftmargin =\itemindent + \labelwidth + \labelsep
+     \setlength{\leftmargin}{2.2em}     % 左边界 \leftmargin =\itemindent + \labelwidth + \labelsep
      \setlength{\itemindent}{0em}     % 标号缩进量
      \setlength{\labelsep}{0.5em}       % 标号和列表项之间的距离,默认0.5em
      \setlength{\rightmargin}{0em}    % 右边界
@@ -2329,6 +2333,7 @@ delim_1 "\\hspace*{\\fill}"
 % \label{sec:cov}
 %
 % 封面信息。
+% \changes{v3.2.1}{2021/11/15}{add key `cpostgraduatetype'}
 %    \begin{macrocode}
 \def\hitsz@def@term#1{%
   \define@key{hitsz}{#1}{\csname #1\endcsname{##1}}
@@ -2344,6 +2349,7 @@ delim_1 "\\hspace*{\\fill}"
 \hitsz@def@term{ctitle} % 中文标题
 \hitsz@def@term{csubtitle} % 中文副标题
 \hitsz@def@term{cxueke} % 中文学科
+\hitsz@def@term{cpostgraduatetype} % 中文学位类型：学术，专业
 \hitsz@def@term{cauthor} % 中文作者
 \hitsz@def@term{csupervisor} % 中文导师
 \hitsz@def@term{cassosupervisor} % 中文副导师
@@ -2437,6 +2443,8 @@ delim_1 "\\hspace*{\\fill}"
 %    \end{macrocode}
 %
 % 此处添加深圳校区设置
+% \changes{v3.2.1}{2021/11/14}{Change 'Defence' to 'Defense'}
+% \changes{v3.2.1}{2021/11/14}{Change '发表的论文及其他成果' to '取得创新性成果'}
 %    \begin{macrocode}
 %<*cfg>
 \def\hitsz@shenzhencampus{（深圳）}
@@ -2457,7 +2465,7 @@ delim_1 "\\hspace*{\\fill}"
 \def\hitsz@edegreetitle{Academic Degree Applied for}
 \def\hitsz@esubjecttitle{Specialty}
 \def\hitsz@eaffiltitle{Affiliation}
-\def\hitsz@edatetitle{Date of Defence}
+\def\hitsz@edatetitle{Date of Defense}
 \def\hitsz@eschoolnametitle{Degree-Conferring-Institution}
 \def\hitsz@eschoolname{Harbin Institute of Technology}
 \def\hitsz@title@esep{:}
@@ -2518,7 +2526,7 @@ delim_1 "\\hspace*{\\fill}"
 \newcommand{\hitsz@declaretext}{%
 本人郑重声明：此处所提交的学位论文《\hitsz@ctitle》，是本人在导师指导下，在哈尔滨工业大学攻读学位期间独立进行研究工作所取得的成果，且学位论文中除已标注引用文献的部分外不包含他人完成或已发表的研究成果。对本学位论文的研究工作做出重要贡献的个人和集体，均已在文中以明确方式注明。}
 \newcommand{\hitsz@datefill}{\hspace{2.5em}年\hspace{1.5em}月\hspace{1.5em}日}
-\newcommand{\hitsz@publication@ctitle}{攻读\hitsz@cxuewei 学位期间发表的论文及其他成果}
+\newcommand{\hitsz@publication@ctitle}{攻读\hitsz@cxuewei 学位期间取得创新性成果}
 \newcommand{\hitsz@publication@etitle}{Papers published in the period of Ph.D. education}
 \def\hitsz@index@etitle{Index}
 \def\hitsz@dummyrow{哈深hitszthesis}
@@ -2695,13 +2703,15 @@ delim_1 "\\hspace*{\\fill}"
  \vspace*{1.2cm}
 \begin{center}
   \begin{center}\xiaoyi[1]\songti\textbf{\hitsz@cxuewei\hitsz@cthesisname}\end{center}
-    \ifhitsz@fulltime\vspace{1.4cm}\else%
+    \vspace{1cm}
+    \begin{center}\xiaoer[1]\songti\textbf{（\hitsz@cpostgraduatetype\hitsz@cthesisname）}\end{center}
+    \ifhitsz@fulltime\vspace{1cm}\else%
       \begin{center}
         \xiaoyi[1]\songti
         \textbf{\hitsz@cbraceleft\hitsz@cstudenttype\hitsz@cbraceright}
       \end{center}
     \fi%
-    \parbox[t][7.8cm][t]{\textwidth}{%
+    \parbox[t][7.3cm][t]{\textwidth}{%
   \begin{center}\erhao\heiti\hitsz@ctitlecover\end{center}
   \ifhitsz@subtitle%
     \begin{center}
@@ -2717,10 +2727,12 @@ delim_1 "\\hspace*{\\fill}"
       \hitsz@title@esep\MakeUppercase{\hitsz@esubtitle}
     \fi}\end{center}}
 
-    \parbox[t][7.4cm][t]{\textwidth}{
-  \begin{center}\xiaoer\songti\textbf{\hitsz@cauthor}\end{center}}
-    \parbox[t][1.4cm][t]{\textwidth}{
-  \begin{center}\kaishu\xiaoer\textbf{\hitsz@cschoolname}\end{center}}
+    \parbox[t][5.4cm][t]{\textwidth}{%
+      \begin{center}\xiaoer\songti\textbf{\hitsz@cauthor}\end{center}
+    }
+    \parbox[t][1.4cm][t]{\textwidth}{%
+      \begin{center}\kaishu\xiaoer\textbf{\hitsz@cschoolname}\end{center}
+    }
     {\songti\xiaoer\textbf{\hitsz@cdate}}
 \end{center}
 }
@@ -3106,7 +3118,7 @@ delim_1 "\\hspace*{\\fill}"
     \bfseries\xiaosi #1
   \end{center}}
 \newlist{translationbib}{enumerate}{1}
-\setlist[translationbib]{label=[\arabic*],align=left,nosep,itemsep=6bp,
+\setlist[translationbib]{label=［\arabic*］,align=left,nosep,itemsep=6bp,
   leftmargin=10mm,labelsep=!,before=\vspace{0.5\baselineskip}\wuhao[1.3]
 }
 \newenvironment{conclusions}{%
@@ -3214,12 +3226,14 @@ delim_1 "\\hspace*{\\fill}"
 \newcommand\bibstyle@numerical{\bibpunct{[}{]}{,}{s}{,}{\textsuperscript{,}}}
 \newcommand\bibstyle@authoryear{\bibpunct{(}{)}{;}{a}{,}{,}}
 %    \end{macrocode}
+% \changes{v3.2.1}{2021/11/15}{Redefine `biblabel' with full-width square brackets}
 %    \begin{macrocode}
 \newcommand\bibstyle@inline{\bibpunct{[}{]}{,}{n}{,}{\hitsz@inline@sep}}
 \citestyle{numerical}
 \DeclareRobustCommand\inlinecite{\@inlinecite}
 \def\@inlinecite#1{\begingroup\citestyle{inline}\let\@cite\NAT@citenum\citep{#1}\endgroup}
 \let\onlinecite\inlinecite
+\def\@biblabel#1{［#1］}
 \renewenvironment{thebibliography}[1]{%
   \ifhitsz@openright\cleardoublepage\else\clearpage\fi\phantomsection%
   \hitsz@appendix@chapter*{\bibname}[\hitsz@bibname@etitle]
@@ -3227,6 +3241,7 @@ delim_1 "\\hspace*{\\fill}"
   \list{\@biblabel{\@arabic\c@enumiv}}%
   {\renewcommand{\makelabel}[1]{##1\hfill}
     \settowidth{\labelwidth}{\@biblabel{#1}}
+    \addtolength{\labelwidth}{0.5em}
     \setlength{\labelsep}{0.5em}
     \setlength{\itemindent}{0pt}
     \setlength{\leftmargin}{\labelsep+\labelwidth}
diff --git a/macros/latex/contrib/hitszthesis/hitszthesis.ins b/macros/latex/contrib/hitszthesis/hitszthesis.ins
index 7ea7581114..fb9a959b8a 100644
--- a/macros/latex/contrib/hitszthesis/hitszthesis.ins
+++ b/macros/latex/contrib/hitszthesis/hitszthesis.ins
@@ -1,18 +1,18 @@
 %%
-%% Copyright (C) 2019-2020 by Jingxuan Yang <yanglatex2e@gmail.com>
+% Copyright (C) 2019-2021 by Jingxuan Yang <yanglatex2e@gmail.com>
 %%
 %% This file is part of the hitszthesis package project.
 %% ---------------------------------------------------
 %%
 %% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% conditions of the LaTeX Project Public License, either version 1.3a
 %% 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.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
+%% and version 1.3a or later is part of all distributions of LaTeX
+%% version 2004/10/01 or later.
 %%
 
 \input docstrip
@@ -28,17 +28,17 @@
 
 This is a generated file.
 
-Copyright (C) 2019-2020 by Jingxuan Yang <yanglatex2e@gmail.com>
+Copyright (C) 2019-2021 by Jingxuan Yang <yanglatex2e@gmail.com>
 
 This file may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3c
+conditions of the LaTeX Project Public License, either version 1.3a
 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.3c or later is part of all distributions of LaTeX
-version 2008/05/04 or later.
+and version 1.3a or later is part of all distributions of LaTeX
+version 2004/10/01 or later.
 
 To produce the documentation run the original source files ending with `.dtx'
 through LaTeX.
@@ -49,17 +49,17 @@ through LaTeX.
 
 This is a generated file.
 
-Copyright (C) 2019-2020 by Jingxuan Yang <yanglatex2e@gmail.com>
+Copyright (C) 2019-2021 by Jingxuan Yang <yanglatex2e@gmail.com>
 
 This file may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3c
+conditions of the LaTeX Project Public License, either version 1.3a
 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.3c or later is part of all distributions of LaTeX
-version 2008/05/04 or later.
+and version 1.3a or later is part of all distributions of LaTeX
+version 2004/10/01 or later.
 
 This is the configuration file of the hitszthesis package with LaTeX2e.
 
@@ -68,17 +68,17 @@ This is the configuration file of the hitszthesis package with LaTeX2e.
 
 This is a generated file.
 
-Copyright (C) 2019-2020 by Jingxuan Yang <yanglatex2e@gmail.com>
+Copyright (C) 2019-2021 by Jingxuan Yang <yanglatex2e@gmail.com>
 
 This file may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3c
+conditions of the LaTeX Project Public License, either version 1.3a
 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.3c or later is part of all distributions of LaTeX
-version 2008/05/04 or later.
+and version 1.3a or later is part of all distributions of LaTeX
+version 2004/10/01 or later.
 
 This is the configuration file of the hitszthesis package with LaTeX2e.
 
diff --git a/macros/latex/contrib/hitszthesis/hitszthesis.pdf b/macros/latex/contrib/hitszthesis/hitszthesis.pdf
index ff78df1e39..34a9a93080 100644
--- a/macros/latex/contrib/hitszthesis/hitszthesis.pdf
+++ b/macros/latex/contrib/hitszthesis/hitszthesis.pdf
diff --git a/macros/latex/contrib/hitszthesis/hitszthesis.sty b/macros/latex/contrib/hitszthesis/hitszthesis.sty
index 137d01e272..568a01b14f 100644
--- a/macros/latex/contrib/hitszthesis/hitszthesis.sty
+++ b/macros/latex/contrib/hitszthesis/hitszthesis.sty
@@ -1,5 +1,5 @@
 %
-% Copyright (C) 2019-2020 by Jingxuan Yang <yanglatex2e@gmail.com>
+% Copyright (C) 2019-2021 by Jingxuan Yang <yanglatex2e@gmail.com>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
@@ -7,7 +7,7 @@
 % The latest version of this license is in
 %      http://www.latex-project.org/lppl.txt
 % and version 1.3c or later is part of all distributions of LaTeX
-% version 2008/05/04 or later.
+% version 2005/12/01 or later.
 %
 % This work has the LPPL1.3c maintenance status `maintained'.
 %
@@ -61,9 +61,9 @@
 \SetAlgoSkip{1pt}
 \renewcommand{\algocf@captiontext}[2]{\wuhao#1\algocf@typo~\AlCapFnt{}#2} % text of caption
 \expandafter\ifx\csname algocf@within\endcsname\relax% if \algocf@within doesn't exist
-  \renewcommand\thealgocf{\@arabic\c@algocf} % and the way it is printed
+\renewcommand\thealgocf{\@arabic\c@algocf} % and the way it is printed
 \else%                                    else
-  \renewcommand\thealgocf{\csname the\algocf@within\endcsname-\@arabic\c@algocf}
+\renewcommand\thealgocf{\csname the\algocf@within\endcsname-\@arabic\c@algocf}
 \fi
 \renewcommand{\algocf@makecaption}[2]{%中英文双标题一定多于一行，因此去掉单行时的判断，并将\parbox中标题设置为居中
   \addtolength{\hsize}{\algomargin}%
diff --git a/macros/latex/contrib/hitszthesis/reference.bib b/macros/latex/contrib/hitszthesis/reference.bib
index 0e7299739f..fc47e535a6 100644
--- a/macros/latex/contrib/hitszthesis/reference.bib
+++ b/macros/latex/contrib/hitszthesis/reference.bib
@@ -32,7 +32,7 @@
 }
 
 @ARTICLE{Gravagne2003,
-	author={I A {Gravagne} and C D {Rahn} and I D {Walker}},
+	author={Gravagne, I A and Rahn, C D and Walker, I D},
 	journal={IEEE/ASME Transactions on Mechatronics},
 	title={Large Deflection Dynamics and Control for Planar Continuum Robots},
 	year={2003},
@@ -113,7 +113,7 @@
   title={Design and Analysis of a Novel Pneumatic Manipulator},
   author={Jones, Bryan A and McMahan, William and Walker, Ian},
   booktitle={IFAC Symposium on Mechatronic Systems},
-  address={Hanburg, German},
+  address={Hanburg，German},
   pages={745--750},
   year={2004},
 }
diff --git a/macros/latex/contrib/hologo/README.md b/macros/latex/contrib/hologo/README.md
index ab6a141e0b..854664e194 100644
--- a/macros/latex/contrib/hologo/README.md
+++ b/macros/latex/contrib/hologo/README.md
@@ -2,6 +2,14 @@
 
 hologo package for LaTeX
 
+Version: 2021-11-16 v1.15
+
 This package starts a collection of logos with support for bookmarks
 strings.
 
+## Copyright (C)
+*    2010-2012 Heiko Oberdiek
+*    2016-2021 Oberdiek Package Support Group
+
+## License
+LATEX Project Public License, version 1.3c or later.
diff --git a/macros/latex/contrib/hologo/hologo.dtx b/macros/latex/contrib/hologo/hologo.dtx
index a8a8260c8a..0c14b7f010 100644
--- a/macros/latex/contrib/hologo/hologo.dtx
+++ b/macros/latex/contrib/hologo/hologo.dtx
@@ -1,12 +1,12 @@
 % \iffalse meta-comment
 %
 % File: hologo.dtx
-% Version: 2019/12/05 v1.14
+% Version: 2021-11-16 v1.15
 % Info: A logo collection with bookmark support
 %
 % Copyright (C)
 %    2010-2012 Heiko Oberdiek
-%    2016-2019 Oberdiek Package Support Group
+%    2016-2021 Oberdiek Package Support Group
 %    https://github.com/ho-tex/hologo/issues
 %
 % This work may be distributed and/or modified under the
@@ -85,7 +85,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: hologo 2019/12/05 v1.14 A logo collection with bookmark support (HO)}
+\Msg{* Package: hologo 2021-11-16 v1.15 A logo collection with bookmark support (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -97,11 +97,11 @@
 This is a generated file.
 
 Project: hologo
-Version: 2019/12/05 v1.14
+Version: 2021-11-16 v1.15
 
 Copyright (C)
    2010-2012 Heiko Oberdiek
-   2016-2019 Oberdiek Package Support Group
+   2016-2021 Oberdiek Package Support Group
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -165,7 +165,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{hologo.drv}%
-  [2019/12/05 v1.14 A logo collection with bookmark support (HO)]%
+  [2021-11-16 v1.15 A logo collection with bookmark support (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \usepackage{hologo}[2019/12/05]
@@ -185,7 +185,7 @@ and the derived files
 % \GetFileInfo{hologo.drv}
 %
 % \title{The \xpackage{hologo} package}
-% \date{2019/12/05 v1.14}
+% \date{2021-11-16 v1.15}
 % \author{Heiko Oberdiek\thanks
 % {Please report any issues at \url{https://github.com/ho-tex/hologo/issues}}}
 %
@@ -650,7 +650,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@hologo.sty\endcsname
 \ProvidesPackage{hologo}%
-  [2019/12/05 v1.14 A logo collection with bookmark support (HO)]%
+  [2021-11-16 v1.15 A logo collection with bookmark support (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -2135,7 +2135,7 @@ $ \string ^^^^0395%
 \def\HoLogoBkm@LaTeXe#1{%
   \hologo{LaTeX}%
   2%
-  \HOLOGO@PdfdocUnicode{e}{\textepsilon}%
+  \HOLOGO@PdfdocUnicode{e}{\83\265}%\textepsilon
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -2308,7 +2308,7 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 %    \begin{macro}{\HoLogoBkm@eTeX}
 %    \begin{macrocode}
 \def\HoLogoBkm@eTeX#1{%
-  \HOLOGO@PdfdocUnicode{#1{e}{E}}{\textepsilon}%
+  \HOLOGO@PdfdocUnicode{#1{e}{E}}{\83\265}%\textepsilon
   -%
   \hologo{TeX}%
 }
@@ -2667,9 +2667,9 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
         \directlua{%
            if luaotfload and luaotfload.aux then
              if luaotfload.aux.font_has_glyph(%
-                    font.current(), \number#1) then % 	 
-	       tex.print("1") % 	 
-	     end % 	 
+                    font.current(), \number#1) then % 	
+	       tex.print("1") % 	
+	     end % 	
 	   elseif font and font.fonts and font.current then %
             local f = font.fonts[font.current()]%
             if f.characters and f.characters[\number#1] then %
@@ -3459,7 +3459,7 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 %    \begin{macro}{\HoLogoBkm@ExTeX}
 %    \begin{macrocode}
 \def\HoLogoBkm@ExTeX#1{%
-  \HOLOGO@PdfdocUnicode{#1{e}{E}x}{\textepsilon\textchi}%
+  \HOLOGO@PdfdocUnicode{#1{e}{E}x}{\83\265\83\247}%\textepsilon\textchi
   \hologo{TeX}%
 }
 %    \end{macrocode}
@@ -4772,6 +4772,9 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 %   \item
 %     Documentation updates.
 %   \end{Version}
+%   \begin{Version}{2021-11-16 v1.15}
+%   \item use PU directly for textepsilon and textchi, issue \#4
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/macros/latex/contrib/hologo/hologo.pdf b/macros/latex/contrib/hologo/hologo.pdf
index a5f4b321a4..701d02fc6d 100644
--- a/macros/latex/contrib/hologo/hologo.pdf
+++ b/macros/latex/contrib/hologo/hologo.pdf
diff --git a/macros/latex/contrib/hypdoc/README.md b/macros/latex/contrib/hypdoc/README.md
new file mode 100644
index 0000000000..96e1aa6fe3
--- /dev/null
+++ b/macros/latex/contrib/hypdoc/README.md
@@ -0,0 +1,16 @@
+# hypdoc
+
+Version: 2021-11-15 v1.15
+
+This package adds hyper features to the package
+doc that is used in the documentation
+system of LaTeX2e. Bookmarks are added and references
+are linked as far as possible.
+
+
+## Copyright (C)
+* 2002, 2006, 2007, 2009-2011 Heiko Oberdiek
+* 2016-2021        Oberdiek Package Support Group
+
+## License
+LATEX Project Public License, version 1.3c or later.
diff --git a/macros/latex/contrib/oberdiek/hypdoc.dtx b/macros/latex/contrib/hypdoc/hypdoc.dtx
index 481a53d852..91fef651b0 100644
--- a/macros/latex/contrib/oberdiek/hypdoc.dtx
+++ b/macros/latex/contrib/hypdoc/hypdoc.dtx
@@ -1,13 +1,13 @@
 % \iffalse meta-comment
 %
 % File: hypdoc.dtx
-% Version: 2018/09/07 v1.14
+% Version: 2021-11-15 v1.15
 % Info: Hyper extensions for doc.sty
 %
 % Copyright (C)
 %    2002, 2006, 2007, 2009-2011 Heiko Oberdiek
-%    2016-2019 Oberdiek Package Support Group
-%    https://github.com/ho-tex/oberdiek/issues
+%    2016-2021 Oberdiek Package Support Group
+%    https://github.com/ho-tex/hypdoc/issues
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -23,15 +23,15 @@
 %
 % The Current Maintainers of this work are
 % Heiko Oberdiek and the Oberdiek Package Support Group
-% https://github.com/ho-tex/oberdiek/issues
+% https://github.com/ho-tex/hypdoc/issues
 %
 % This work consists of the main source file hypdoc.dtx
 % and the derived files
 %    hypdoc.sty, hypdoc.pdf, hypdoc.ins, hypdoc.drv.
 %
 % Distribution:
-%    CTAN:macros/latex/contrib/oberdiek/hypdoc.dtx
-%    CTAN:macros/latex/contrib/oberdiek/hypdoc.pdf
+%    CTAN:macros/latex/contrib/hypdoc/hypdoc.dtx
+%    CTAN:macros/latex/contrib/hypdoc/hypdoc.pdf
 %
 % Unpacking:
 %    (a) If hypdoc.ins is present:
@@ -60,9 +60,9 @@
 %       pdflatex hypdoc.dtx
 %
 % Installation:
-%    TDS:tex/latex/oberdiek/hypdoc.sty
-%    TDS:doc/latex/oberdiek/hypdoc.pdf
-%    TDS:source/latex/oberdiek/hypdoc.dtx
+%    TDS:tex/latex/hypdoc/hypdoc.sty
+%    TDS:doc/latex/hypdoc/hypdoc.pdf
+%    TDS:source/latex/hypdoc/hypdoc.dtx
 %
 %<*ignore>
 \begingroup
@@ -79,7 +79,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: hypdoc 2018/09/07 v1.14 Hyper extensions for doc.sty (HO)}
+\Msg{* Package: hypdoc 2021-11-15 v1.15 Hyper extensions for doc.sty (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -91,11 +91,11 @@
 This is a generated file.
 
 Project: hypdoc
-Version: 2018/09/07 v1.14
+Version: 2021-11-15 v1.15
 
 Copyright (C)
    2002, 2006, 2007, 2009-2011 Heiko Oberdiek
-   2016-2019 Oberdiek Package Support Group
+   2016-2021 Oberdiek Package Support Group
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -111,7 +111,7 @@ This work has the LPPL maintenance status "maintained".
 
 The Current Maintainers of this work are
 Heiko Oberdiek and the Oberdiek Package Support Group
-https://github.com/ho-tex/oberdiek/issues
+https://github.com/ho-tex/hypdoc/issues
 
 
 This work consists of the main source file hypdoc.dtx
@@ -124,7 +124,7 @@ and the derived files
 \generate{%
   \file{hypdoc.ins}{\from{hypdoc.dtx}{install}}%
   \file{hypdoc.drv}{\from{hypdoc.dtx}{driver}}%
-  \usedir{tex/latex/oberdiek}%
+  \usedir{tex/latex/hypdoc}%
   \file{hypdoc.sty}{\from{hypdoc.dtx}{package}}%
 }
 
@@ -152,7 +152,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{hypdoc.drv}%
-  [2018/09/07 v1.14 Hyper extensions for doc.sty (HO)]%
+  [2021-11-15 v1.15 Hyper extensions for doc.sty (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \begin{document}
@@ -166,9 +166,9 @@ and the derived files
 % \GetFileInfo{hypdoc.drv}
 %
 % \title{The \xpackage{hypdoc} package}
-% \date{2018/09/07 v1.14}
+% \date{2021-11-15 v1.15}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
+% {Please report any issues at \url{https://github.com/ho-tex/hypdoc/issues}}}
 %
 % \maketitle
 %
@@ -344,7 +344,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hypdoc}%
-  [2018/09/07 v1.14 Hyper extensions for doc.sty (HO)]%
+  [2021-11-15 v1.15 Hyper extensions for doc.sty (HO)]%
 %    \end{macrocode}
 %    The package identification is done at the top of the |.dtx| file
 %    in order to use only one identification string.
@@ -424,24 +424,6 @@ and the derived files
 }
 %    \end{macrocode}
 %
-% \subsubsection{Patch for bug latex/4096}
-%
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname mod@math@codes\endcsname\relax
-\else
-  \def\HD@ModFix#1{%
-    \mathcode`#1=`#1\relax
-  }%
-  \g@addto@macro\mod@math@codes{%
-    \HD@ModFix\-%
-    \HD@ModFix\+%
-    \HD@ModFix\:%
-    \HD@ModFix\=%
-    \HD@ModFix\*%
-  }%
-\fi
-%    \end{macrocode}
 %
 % \subsection{Bookmarks}
 %
@@ -1027,6 +1009,7 @@ and the derived files
     \endgroup
     \@esphack
   }%
+\pdfstringdefDisableCommands{\let\autoindex\@gobble }
 \fi
 %    \end{macrocode}
 %    \end{macro}
@@ -1133,33 +1116,16 @@ and the derived files
 % \paragraph{Package.} This package is available on
 % CTAN\footnote{\CTANpkg{hypdoc}}:
 % \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/hypdoc.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/hypdoc.pdf}] Documentation.
+% \item[\CTAN{macros/latex/contrib/hypdoc/hypdoc.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/hypdoc/hypdoc.pdf}] Documentation.
 % \end{description}
 %
 %
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTANpkg{tds}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-%   |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
 % \subsection{Package installation}
 %
+% The best is to install the package with the package manager of your \TeX{}
+% distribution. If a manual installation is needed:
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -1173,9 +1139,9 @@ and the derived files
 % \begin{quote}
 % \def\t{^^A
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-%   hypdoc.sty & tex/latex/oberdiek/hypdoc.sty\\
-%   hypdoc.pdf & doc/latex/oberdiek/hypdoc.pdf\\
-%   hypdoc.dtx & source/latex/oberdiek/hypdoc.dtx\\
+%   hypdoc.sty & tex/latex/hypdoc/hypdoc.sty\\
+%   hypdoc.pdf & doc/latex/hypdoc/hypdoc.pdf\\
+%   hypdoc.dtx & source/latex/hypdoc/hypdoc.dtx\\
 % \end{tabular}^^A
 % }^^A
 % \sbox0{\t}^^A
@@ -1360,6 +1326,10 @@ and the derived files
 %   \item
 %     Do not load \xpackage{thumpdf}.
 %   \end{Version}
+%   \begin{Version}{2021-11-15 v1.15}
+%   \item removed an old, unneeded patch for latex/4096
+%   \item added a \cs{pdfstringdefDisableCommands} setting for \cs{autoindex}
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/macros/latex/contrib/hypdoc/hypdoc.pdf b/macros/latex/contrib/hypdoc/hypdoc.pdf
new file mode 100644
index 0000000000..f890ea3a1e
--- /dev/null
+++ b/macros/latex/contrib/hypdoc/hypdoc.pdf
diff --git a/macros/latex/contrib/oberdiek/README.md b/macros/latex/contrib/oberdiek/README.md
index 825d268512..682184dc81 100644
--- a/macros/latex/contrib/oberdiek/README.md
+++ b/macros/latex/contrib/oberdiek/README.md
@@ -1,6 +1,6 @@
 # Oberdiek bundle
 
-Version: 2020-09-02
+Version: 2021-11-15
 
 This file describes the directory
   CTAN:macros/latex/contrib/oberdiek/
@@ -49,7 +49,6 @@ Other files in the CTAN directory:
 * holtxdoc: extra documentation macros;
 * hypbmsec: bookmarks in sectioning commands;
 * hypcap: anjusting anchors of captions;
-* hypdoc: hyper-references in the LaTeX standard doc package;
 * hypgotoe: experimental package for links to embedded files;
 * hyphsubst: substitute hyphenation patterns;
 * ifdraft: switch for option draft;
diff --git a/macros/latex/contrib/oberdiek/aliascnt.pdf b/macros/latex/contrib/oberdiek/aliascnt.pdf
index 99508dc8bf..3d37bde0a6 100644
--- a/macros/latex/contrib/oberdiek/aliascnt.pdf
+++ b/macros/latex/contrib/oberdiek/aliascnt.pdf
diff --git a/macros/latex/contrib/oberdiek/bmpsize.pdf b/macros/latex/contrib/oberdiek/bmpsize.pdf
index 7c435f524f..f551dcd1d6 100644
--- a/macros/latex/contrib/oberdiek/bmpsize.pdf
+++ b/macros/latex/contrib/oberdiek/bmpsize.pdf
diff --git a/macros/latex/contrib/oberdiek/centernot.pdf b/macros/latex/contrib/oberdiek/centernot.pdf
index f4ceda8550..1c365a0a29 100644
--- a/macros/latex/contrib/oberdiek/centernot.pdf
+++ b/macros/latex/contrib/oberdiek/centernot.pdf
diff --git a/macros/latex/contrib/oberdiek/chemarr.pdf b/macros/latex/contrib/oberdiek/chemarr.pdf
index 6ed193a216..3be586e5ed 100644
--- a/macros/latex/contrib/oberdiek/chemarr.pdf
+++ b/macros/latex/contrib/oberdiek/chemarr.pdf
diff --git a/macros/latex/contrib/oberdiek/classlist.pdf b/macros/latex/contrib/oberdiek/classlist.pdf
index 63a575742e..8ff7733158 100644
--- a/macros/latex/contrib/oberdiek/classlist.pdf
+++ b/macros/latex/contrib/oberdiek/classlist.pdf
diff --git a/macros/latex/contrib/oberdiek/colonequals.pdf b/macros/latex/contrib/oberdiek/colonequals.pdf
index 50265fa311..8668c34d3d 100644
--- a/macros/latex/contrib/oberdiek/colonequals.pdf
+++ b/macros/latex/contrib/oberdiek/colonequals.pdf
diff --git a/macros/latex/contrib/oberdiek/dvipscol.pdf b/macros/latex/contrib/oberdiek/dvipscol.pdf
index 9d98daddba..cf0e002b7d 100644
--- a/macros/latex/contrib/oberdiek/dvipscol.pdf
+++ b/macros/latex/contrib/oberdiek/dvipscol.pdf
diff --git a/macros/latex/contrib/oberdiek/engord.pdf b/macros/latex/contrib/oberdiek/engord.pdf
index 403ec71aac..067fbca25b 100644
--- a/macros/latex/contrib/oberdiek/engord.pdf
+++ b/macros/latex/contrib/oberdiek/engord.pdf
diff --git a/macros/latex/contrib/oberdiek/enparen.pdf b/macros/latex/contrib/oberdiek/enparen.pdf
index 0c604fc3b1..e085b3062e 100644
--- a/macros/latex/contrib/oberdiek/enparen.pdf
+++ b/macros/latex/contrib/oberdiek/enparen.pdf
diff --git a/macros/latex/contrib/oberdiek/eolgrab.pdf b/macros/latex/contrib/oberdiek/eolgrab.pdf
index 61b21d1985..c1b38c591e 100644
--- a/macros/latex/contrib/oberdiek/eolgrab.pdf
+++ b/macros/latex/contrib/oberdiek/eolgrab.pdf
diff --git a/macros/latex/contrib/oberdiek/fibnum.pdf b/macros/latex/contrib/oberdiek/fibnum.pdf
index 1f5e6a2245..b471eb5ef9 100644
--- a/macros/latex/contrib/oberdiek/fibnum.pdf
+++ b/macros/latex/contrib/oberdiek/fibnum.pdf
diff --git a/macros/latex/contrib/oberdiek/flags.pdf b/macros/latex/contrib/oberdiek/flags.pdf
index 5f561e1b33..4f476fc931 100644
--- a/macros/latex/contrib/oberdiek/flags.pdf
+++ b/macros/latex/contrib/oberdiek/flags.pdf
diff --git a/macros/latex/contrib/oberdiek/holtxdoc.pdf b/macros/latex/contrib/oberdiek/holtxdoc.pdf
index d88cbae03d..72f5ebe9bd 100644
--- a/macros/latex/contrib/oberdiek/holtxdoc.pdf
+++ b/macros/latex/contrib/oberdiek/holtxdoc.pdf
diff --git a/macros/latex/contrib/oberdiek/hopatch.pdf b/macros/latex/contrib/oberdiek/hopatch.pdf
deleted file mode 100644
index 2b36643cc1..0000000000
--- a/macros/latex/contrib/oberdiek/hopatch.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/oberdiek/hypbmsec.pdf b/macros/latex/contrib/oberdiek/hypbmsec.pdf
index b6fcb731c5..e0aa81018e 100644
--- a/macros/latex/contrib/oberdiek/hypbmsec.pdf
+++ b/macros/latex/contrib/oberdiek/hypbmsec.pdf
diff --git a/macros/latex/contrib/oberdiek/hypcap.pdf b/macros/latex/contrib/oberdiek/hypcap.pdf
index 334f67bf9e..0417e6f54f 100644
--- a/macros/latex/contrib/oberdiek/hypcap.pdf
+++ b/macros/latex/contrib/oberdiek/hypcap.pdf
diff --git a/macros/latex/contrib/oberdiek/hypdoc.pdf b/macros/latex/contrib/oberdiek/hypdoc.pdf
deleted file mode 100644
index 82eb5d5195..0000000000
--- a/macros/latex/contrib/oberdiek/hypdoc.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/oberdiek/hypgotoe.pdf b/macros/latex/contrib/oberdiek/hypgotoe.pdf
index 87858187c4..cfbc9e8f11 100644
--- a/macros/latex/contrib/oberdiek/hypgotoe.pdf
+++ b/macros/latex/contrib/oberdiek/hypgotoe.pdf
diff --git a/macros/latex/contrib/oberdiek/hyphsubst.pdf b/macros/latex/contrib/oberdiek/hyphsubst.pdf
index a553d7ba51..318eb95edc 100644
--- a/macros/latex/contrib/oberdiek/hyphsubst.pdf
+++ b/macros/latex/contrib/oberdiek/hyphsubst.pdf
diff --git a/macros/latex/contrib/oberdiek/ifdraft.pdf b/macros/latex/contrib/oberdiek/ifdraft.pdf
index 55042d429c..799e8b9c25 100644
--- a/macros/latex/contrib/oberdiek/ifdraft.pdf
+++ b/macros/latex/contrib/oberdiek/ifdraft.pdf
diff --git a/macros/latex/contrib/oberdiek/iflang.pdf b/macros/latex/contrib/oberdiek/iflang.pdf
index fd72a8cb91..b7f3a56530 100644
--- a/macros/latex/contrib/oberdiek/iflang.pdf
+++ b/macros/latex/contrib/oberdiek/iflang.pdf
diff --git a/macros/latex/contrib/oberdiek/oberdiek-bundle.bib b/macros/latex/contrib/oberdiek/oberdiek-bundle.bib
index fd2b6229a7..5639fc952c 100644
--- a/macros/latex/contrib/oberdiek/oberdiek-bundle.bib
+++ b/macros/latex/contrib/oberdiek/oberdiek-bundle.bib
@@ -103,13 +103,6 @@
   version={1.12},
   url={https://ctan.org/pkg/hypcap},
 }
-@manual{oberdiek:hypdoc,
-  title={The hypdoc package},
-  author={Heiko Oberdiek},
-  date={2018-09-07},
-  version={1.14},
-  url={https://ctan.org/pkg/hypdoc},
-}
 @manual{oberdiek:hypgotoe,
   title={The hypgotoe package},
   author={Heiko Oberdiek},
diff --git a/macros/latex/contrib/oberdiek/oberdiek.ins b/macros/latex/contrib/oberdiek/oberdiek.ins
index 8914f4a7e5..81ee3c264b 100644
--- a/macros/latex/contrib/oberdiek/oberdiek.ins
+++ b/macros/latex/contrib/oberdiek/oberdiek.ins
@@ -41,7 +41,6 @@
 \batchinput{holtxdoc.dtx}
 \batchinput{hypbmsec.dtx}
 \batchinput{hypcap.dtx}
-\batchinput{hypdoc.dtx}
 \batchinput{hypgotoe.dtx}
 \batchinput{hyphsubst.dtx}
 \batchinput{ifdraft.dtx}
diff --git a/macros/latex/contrib/oberdiek/oberdiek.pdf b/macros/latex/contrib/oberdiek/oberdiek.pdf
index 482d935da6..ae33dcf68a 100644
--- a/macros/latex/contrib/oberdiek/oberdiek.pdf
+++ b/macros/latex/contrib/oberdiek/oberdiek.pdf
diff --git a/macros/latex/contrib/oberdiek/oberdiek.tex b/macros/latex/contrib/oberdiek/oberdiek.tex
index 9b7cb6857f..83bbce0aba 100644
--- a/macros/latex/contrib/oberdiek/oberdiek.tex
+++ b/macros/latex/contrib/oberdiek/oberdiek.tex
@@ -10,7 +10,7 @@
 \newcommand*{\Author}{Heiko Oberdiek}
 
 \newcommand*{\Email}{ho-tex at tug.org}
-\newcommand*{\Date}{2020/09/02}
+\newcommand*{\Date}{2021/11/15}
 
 % Copyright (C) 2006-2016 by
 %    Heiko Oberdiek
@@ -204,8 +204,6 @@
 [\entrysep]
 \entry{hypcap}{Adjusting the anchors of captions}%
 [\entrysep]
-\entry{hypdoc}{Hyper extensions for doc.sty}%
-[\entrysep]
 \entry{hypgotoe}{Links to embedded files}%
 [\entrysep]
 \entry{hyphsubst}{Substitute hyphenation patterns}%
@@ -414,17 +412,6 @@ the rest in the \cs{caption} command.
 \tocinclude{hypcap}
 
 \newpage
-\subsection{\pkgsectformat{hypdoc}}
-\label{hypdoc}
-\begin{abstract}
-This package adds hyper features to the package
-\xpackage{doc} that is used in the documentation
-system of \LaTeXe. Bookmarks are added and references
-are linked as far as possible.
-\end{abstract}
-\tocinclude{hypdoc}
-
-\newpage
 \subsection{\pkgsectformat{hypgotoe}}
 \label{hypgotoe}
 \begin{abstract}
diff --git a/macros/latex/contrib/oberdiek/pagegrid.pdf b/macros/latex/contrib/oberdiek/pagegrid.pdf
index 1aefe9f9d6..b5ea088818 100644
--- a/macros/latex/contrib/oberdiek/pagegrid.pdf
+++ b/macros/latex/contrib/oberdiek/pagegrid.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcol.pdf b/macros/latex/contrib/oberdiek/pdfcol.pdf
index b09e4f602d..cfc5d41d3b 100644
--- a/macros/latex/contrib/oberdiek/pdfcol.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcol.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcolfoot.pdf b/macros/latex/contrib/oberdiek/pdfcolfoot.pdf
index 899ac9d9fc..d611ba65d2 100644
--- a/macros/latex/contrib/oberdiek/pdfcolfoot.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolfoot.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcolparallel.pdf b/macros/latex/contrib/oberdiek/pdfcolparallel.pdf
index 5032716ee8..51c9014324 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparallel.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolparallel.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf b/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
index 29730a96bd..56a69feb08 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcrypt.pdf b/macros/latex/contrib/oberdiek/pdfcrypt.pdf
index 03e5ce1f8f..79740fa651 100644
--- a/macros/latex/contrib/oberdiek/pdfcrypt.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcrypt.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfrender.pdf b/macros/latex/contrib/oberdiek/pdfrender.pdf
index 212dc3664b..ae0d3a5b51 100644
--- a/macros/latex/contrib/oberdiek/pdfrender.pdf
+++ b/macros/latex/contrib/oberdiek/pdfrender.pdf
diff --git a/macros/latex/contrib/oberdiek/protecteddef.pdf b/macros/latex/contrib/oberdiek/protecteddef.pdf
index 1a640fb01e..52d39ec04c 100644
--- a/macros/latex/contrib/oberdiek/protecteddef.pdf
+++ b/macros/latex/contrib/oberdiek/protecteddef.pdf
diff --git a/macros/latex/contrib/oberdiek/resizegather.pdf b/macros/latex/contrib/oberdiek/resizegather.pdf
index 04356d885a..97a1ff7f44 100644
--- a/macros/latex/contrib/oberdiek/resizegather.pdf
+++ b/macros/latex/contrib/oberdiek/resizegather.pdf
diff --git a/macros/latex/contrib/oberdiek/rotchiffre.pdf b/macros/latex/contrib/oberdiek/rotchiffre.pdf
index f10a2e887d..15262166fd 100644
--- a/macros/latex/contrib/oberdiek/rotchiffre.pdf
+++ b/macros/latex/contrib/oberdiek/rotchiffre.pdf
diff --git a/macros/latex/contrib/oberdiek/scrindex.pdf b/macros/latex/contrib/oberdiek/scrindex.pdf
index 725e81f60d..d6a80e564c 100644
--- a/macros/latex/contrib/oberdiek/scrindex.pdf
+++ b/macros/latex/contrib/oberdiek/scrindex.pdf
diff --git a/macros/latex/contrib/oberdiek/setouterhbox.pdf b/macros/latex/contrib/oberdiek/setouterhbox.pdf
index 53bf65cac2..d63d0f6f4b 100644
--- a/macros/latex/contrib/oberdiek/setouterhbox.pdf
+++ b/macros/latex/contrib/oberdiek/setouterhbox.pdf
diff --git a/macros/latex/contrib/oberdiek/settobox.pdf b/macros/latex/contrib/oberdiek/settobox.pdf
index 4e4cabfb46..97e9a8862f 100644
--- a/macros/latex/contrib/oberdiek/settobox.pdf
+++ b/macros/latex/contrib/oberdiek/settobox.pdf
diff --git a/macros/latex/contrib/oberdiek/stackrel.pdf b/macros/latex/contrib/oberdiek/stackrel.pdf
index a10c1ca7e4..c28caf4522 100644
--- a/macros/latex/contrib/oberdiek/stackrel.pdf
+++ b/macros/latex/contrib/oberdiek/stackrel.pdf
diff --git a/macros/latex/contrib/oberdiek/stampinclude.pdf b/macros/latex/contrib/oberdiek/stampinclude.pdf
index a465d1468c..1df073bb3a 100644
--- a/macros/latex/contrib/oberdiek/stampinclude.pdf
+++ b/macros/latex/contrib/oberdiek/stampinclude.pdf
diff --git a/macros/latex/contrib/oberdiek/tabularht.pdf b/macros/latex/contrib/oberdiek/tabularht.pdf
index 1fa8dbc47e..7ef081099d 100644
--- a/macros/latex/contrib/oberdiek/tabularht.pdf
+++ b/macros/latex/contrib/oberdiek/tabularht.pdf
diff --git a/macros/latex/contrib/oberdiek/tabularkv.pdf b/macros/latex/contrib/oberdiek/tabularkv.pdf
index 7746fdb439..25560a6b56 100644
--- a/macros/latex/contrib/oberdiek/tabularkv.pdf
+++ b/macros/latex/contrib/oberdiek/tabularkv.pdf
diff --git a/macros/latex/contrib/oberdiek/telprint.pdf b/macros/latex/contrib/oberdiek/telprint.pdf
index 58d1577101..0b8e6808b5 100644
--- a/macros/latex/contrib/oberdiek/telprint.pdf
+++ b/macros/latex/contrib/oberdiek/telprint.pdf
diff --git a/macros/latex/contrib/oberdiek/thepdfnumber.pdf b/macros/latex/contrib/oberdiek/thepdfnumber.pdf
index 3e4e1da4af..8efaa9e500 100644
--- a/macros/latex/contrib/oberdiek/thepdfnumber.pdf
+++ b/macros/latex/contrib/oberdiek/thepdfnumber.pdf
diff --git a/macros/latex/contrib/oberdiek/twoopt.pdf b/macros/latex/contrib/oberdiek/twoopt.pdf
index 32de2441fc..5a1292e804 100644
--- a/macros/latex/contrib/oberdiek/twoopt.pdf
+++ b/macros/latex/contrib/oberdiek/twoopt.pdf
diff --git a/macros/latex/contrib/utf8add/utf8add.pdf b/macros/latex/contrib/utf8add/utf8add.pdf
index 7b9b8919f5..965028ef97 100644
--- a/macros/latex/contrib/utf8add/utf8add.pdf
+++ b/macros/latex/contrib/utf8add/utf8add.pdf
diff --git a/macros/latex/contrib/utf8add/utf8add.sty b/macros/latex/contrib/utf8add/utf8add.sty
index 90ce4b5675..4610c63830 100644
--- a/macros/latex/contrib/utf8add/utf8add.sty
+++ b/macros/latex/contrib/utf8add/utf8add.sty
@@ -1,4 +1,4 @@
-% Copyright 2020 Palle Jorgensen, hamselv@pallej.dk
+% Copyright 2020-21 Palle Jorgensen, hamselv@pallej.dk
 %
 % This file is part of utf8add.
 %
@@ -14,7 +14,7 @@
 %
 % You should have received a copy of the GNU General Public License
 % along with utf8add. If not, see <https://www.gnu.org/licenses/>.
-\ProvidesPackage{utf8add}[2020/05/26 Palle Jorgensen]
+\ProvidesPackage{utf8add}[2021/11/16 Palle Jorgensen]
 
 %% Package dependencies
 \RequirePackage[utf8]{inputenc}
@@ -24,13 +24,18 @@
 \RequirePackage{gensymb}
 \RequirePackage{nicefrac}
 
+\newif\if@greek@
+\@greek@true
+
 %% Options
+%% Disable greek overall?
+\DeclareOptionX{nogreek}{\@greek@false}
+
 %% Choosing the uppercase greek style :-/
 \newif\if@uppercasegreek@default@
 \newif\if@uppercasegreek@upright@
 \newif\if@uppercasegreek@italic@
 \@uppercasegreek@default@true
-
 \DeclareOptionX{uppercasegreek}[default]{%
   \csname @uppercasegreek@#1@true\endcsname}
 
@@ -105,70 +110,75 @@
   \providecommand*\Upzeta{\mathrm{Z}}
 }
 
+\def\auto@superior#1{\ifmmode^{#1}\else\textsuperscript{#1}\fi}
+\def\auto@inferior#1{\ifmmode^{#1}\else\textsubcript{#1}\fi}
 \if@math@superior@
 \AtBeginDocument{%
-  \def\textonesuperior{\ensuremath{^{1}}}
-  \def\texttwosuperior{\ensuremath{^{2}}}
-  \def\textthreesuperior{\ensuremath{^{3}}}
-  \def\textfoursuperior{\ensuremath{^{4}}}
-  \def\textfivesuperior{\ensuremath{^{5}}}
-  \def\textsixsuperior{\ensuremath{^{6}}}
-  \def\textsevensuperior{\ensuremath{^{7}}}
-  \def\texteightsuperior{\ensuremath{^{8}}}
-  \def\textninesuperior{\ensuremath{^{9}}}
-  \def\textzerosuperior{\ensuremath{^{0}}}
+  \def\textonesuperior{\auto@superior{1}}
+  \def\texttwosuperior{\auto@superior{2}}
+  \def\textthreesuperior{\auto@superior{3}}
+  \def\textfoursuperior{\auto@superior{4}}
+  \def\textfivesuperior{\auto@superior{5}}
+  \def\textsixsuperior{\auto@superior{6}}
+  \def\textsevensuperior{\auto@superior{7}}
+  \def\texteightsuperior{\auto@superior{8}}
+  \def\textninesuperior{\auto@superior{9}}
+  \def\textzerosuperior{\auto@superior{0}}
 }
 \else
 \AtBeginDocument{%
-  \providecommand*\textonesuperior{\ensuremath{^{1}}}
-  \providecommand*\texttwosuperior{\ensuremath{^{2}}}
-  \providecommand*\textthreesuperior{\ensuremath{^{3}}}
-  \providecommand*\textfoursuperior{\ensuremath{^{4}}}
-  \providecommand*\textfivesuperior{\ensuremath{^{5}}}
-  \providecommand*\textsixsuperior{\ensuremath{^{6}}}
-  \providecommand*\textsevensuperior{\ensuremath{^{7}}}
-  \providecommand*\texteightsuperior{\ensuremath{^{8}}}
-  \providecommand*\textninesuperior{\ensuremath{^{9}}}
-  \providecommand*\textzerosuperior{\ensuremath{^{0}}}}
+  \providecommand*\textonesuperior{\auto@superior{1}}
+  \providecommand*\texttwosuperior{\auto@superior{2}}
+  \providecommand*\textthreesuperior{\auto@superior{3}}
+  \providecommand*\textfoursuperior{\auto@superior{4}}
+  \providecommand*\textfivesuperior{\auto@superior{5}}
+  \providecommand*\textsixsuperior{\auto@superior{6}}
+  \providecommand*\textsevensuperior{\auto@superior{7}}
+  \providecommand*\texteightsuperior{\auto@superior{8}}
+  \providecommand*\textninesuperior{\auto@superior{9}}
+  \providecommand*\textzerosuperior{\auto@superior{0}}}
 \fi
 
 \if@math@inferior@
 \AtBeginDocument{%
-  \def\textoneinferior{\ensuremath{_{1}}}
-  \def\texttwoinferior{\ensuremath{_{2}}}
-  \def\textthreeinferior{\ensuremath{_{3}}}
-  \def\textfourinferior{\ensuremath{_{4}}}
-  \def\textfiveinferior{\ensuremath{_{5}}}
-  \def\textsixinferior{\ensuremath{_{6}}}
-  \def\textseveninferior{\ensuremath{_{7}}}
-  \def\texteightinferior{\ensuremath{_{8}}}
-  \def\textnineinferior{\ensuremath{_{9}}}
-  \def\textzeroinferior{\ensuremath{_{0}}}
-}
+  \def\textoneinferior{\auto@inferior{1}}
+  \def\texttwoinferior{\auto@inferior{2}}
+  \def\textthreeinferior{\auto@inferior{3}}
+  \def\textfourinferior{\auto@inferior{4}}
+  \def\textfiveinferior{\auto@inferior{5}}
+  \def\textsixinferior{\auto@inferior{6}}
+  \def\textseveninferior{\auto@inferior{7}}
+  \def\texteightinferior{\auto@inferior{8}}
+  \def\textnineinferior{\auto@inferior{9}}
+  \def\textzeroinferior{\auto@inferior{0}}}
 \else
 \AtBeginDocument{%
-  \providecommand*\textoneinferior{\ensuremath{_{1}}}
-  \providecommand*\texttwoinferior{\ensuremath{_{2}}}
-  \providecommand*\textthreeinferior{\ensuremath{_{3}}}
-  \providecommand*\textfourinferior{\ensuremath{_{4}}}
-  \providecommand*\textfiveinferior{\ensuremath{_{5}}}
-  \providecommand*\textsixinferior{\ensuremath{_{6}}}
-  \providecommand*\textseveninferior{\ensuremath{_{7}}}
-  \providecommand*\texteightinferior{\ensuremath{_{8}}}
-  \providecommand*\textnineinferior{\ensuremath{_{9}}}
-  \providecommand*\textzeroinferior{\ensuremath{_{0}}}
-}
+  \providecommand*\textoneinferior{\auto@inferior{1}}
+  \providecommand*\texttwoinferior{\auto@inferior{2}}
+  \providecommand*\textthreeinferior{\auto@inferior{3}}
+  \providecommand*\textfourinferior{\auto@inferior{4}}
+  \providecommand*\textfiveinferior{\auto@inferior{5}}
+  \providecommand*\textsixinferior{\auto@inferior{6}}
+  \providecommand*\textseveninferior{\auto@inferior{7}}
+  \providecommand*\texteightinferior{\auto@inferior{8}}
+  \providecommand*\textnineinferior{\auto@inferior{9}}
+  \providecommand*\textzeroinferior{\auto@inferior{0}}}
 \fi
 
 \def\@autofrac#1#2{%
-  \@ifstar{\ensuremath{\tfrac{#1}{#2}}}{%
+  \@ifstar{%
+    \ifmmode
+    \tfrac{#1}{#2}
+    \else
+    $\frac{\text{#1}}{\text{#2}}$
+    \fi}{%
     \ifmmode
     \frac{#1}{#2}
     \else
     \if@nicefrac@
     \nicefrac{#1}{#2}
     \else
-    \ensuremath{\tfrac{#1}{#2}}\fi\fi}}
+    $\tfrac{\text{#1}}{\text{#2}}$\fi\fi}}
 
 %% Fractions
 \if@math@fractions@
@@ -259,6 +269,15 @@
 \DeclareUnicodeCharacter{2152}{\textonetenth}
 \DeclareUnicodeCharacter{2189}{\textzerothirds}
 
+
+\if@greek@
+
+\@ifundefined{ver@lgrenc.def}{} {\PackageWarning{utf8add}{LGR font
+    encoding loaded. Output will be poor.}}
+
+\@ifpackageloaded{textalpha}{\PackageWarning{utf8add}{Package
+    'textalpha' loaded. Output will be poor.}{}}
+
 %% Lowercase Greek Letters
 \if@lowercasegreek@upright@
 \DeclareUnicodeCharacter{03B1}{\ensuremath{\upalpha}}
@@ -399,7 +418,7 @@
 \DeclareUnicodeCharacter{03A7}{\ensuremath{\Chi}}
 \DeclareUnicodeCharacter{03A8}{\ensuremath{\Psi}}
 \DeclareUnicodeCharacter{03A9}{\ensuremath{\Omega}}
-\fi\fi\fi
+\fi\fi\fi\fi
 
 %% Superior numbers 4-0
 \DeclareUnicodeCharacter{2074}{\textfoursuperior}
@@ -448,10 +467,12 @@
 \DeclareUnicodeCharacter{2016}{\ifmmode\Vert\else\textbardbl\fi}
 
 %% Other miscelaneous symbols
-\DeclareUnicodeCharacter{207A}{\ensuremath{^{+}}}
-\DeclareUnicodeCharacter{207B}{\ensuremath{^{-}}}
+\DeclareUnicodeCharacter{207A}{\auto@superior{+}}
+\DeclareUnicodeCharacter{207B}{\ifmmode^{-}\else\textsuperscript{\textminus}\fi}
 \DeclareUnicodeCharacter{2213}{\ensuremath{\mp}}
 \DeclareUnicodeCharacter{2212}{\ifmmode-\else--\fi}
 \DeclareUnicodeCharacter{0127}{\ensuremath{\hbar}}
 
+\providecommand*\molar{\textsc{m}}
+\DeclareUnicodeCharacter{1D0D}{\molar}
 \endinput
\ No newline at end of file
diff --git a/macros/latex/contrib/utf8add/utf8add.tex b/macros/latex/contrib/utf8add/utf8add.tex
index 2521455308..6896d99090 100644
--- a/macros/latex/contrib/utf8add/utf8add.tex
+++ b/macros/latex/contrib/utf8add/utf8add.tex
@@ -1,4 +1,4 @@
-% Copyright 2020 Palle Jorgensen, hamselv@pallej.dk
+% Copyright 2020-21 Palle Jorgensen, hamselv@pallej.dk
 %
 % This file is part of utf8add.
 %
@@ -19,6 +19,7 @@
 \usepackage[utf8]{inputenc} %
 \usepackage[math,nicefrac]{utf8add} %
 \usepackage{babel} %
+\usepackage[sc]{mathpazo} %
 \usepackage{tgpagella} %
 \usepackage{listings} %
 \usepackage[scaled]{luximono} %
@@ -47,6 +48,21 @@ The main purpose of this package is to make the text parts of \LaTeX\
 document source more readable for non-\LaTeX\ users and to make more
 use of the possibilities with UTF-8 encoded input.
 
+One major issue with this package is that it does \emph{not} map input
+and output correct with respekt to the Unicode standards. However it
+makes some \emph{available} UTF-8 input provide some \emph{desired}
+outout.
+
+As the applied support for say the mathemathical greek letters of
+Unicode still is scarse this is more of a workaround than a decent,
+native support.
+
+The package is \emph{hack}-ish by nature. Thus the use of this
+package is somewhat (quite) incompatible with documents written in
+greek using e.g. the LGR input encoding.
+
+Thus puritans should not use this package.
+
 \section{Loading the package}
 \label{sec:loading-package}
 \begin{lstlisting}
@@ -84,6 +100,8 @@ use of the possibilities with UTF-8 encoded input.
   However; don't use this.
 \item[lowercasegreek] The same story as for the
   `\texttt{uppercasegreek}' option. Don't use this either.
+\item[nogreek] disable the mapping of greek input. This is for
+  compatibility with greek texts.
 
 \end{description}
 
@@ -108,6 +126,7 @@ support. This is the same case as for fractions.
   mode. View section~\ref{sec:fractions} for details.
 \end{description}
 
+\clearpage
 \section{Using the package}
 \label{sec:using-package}
 
@@ -120,7 +139,8 @@ your UTF-8 characters into your document.
 The default behaviour of the math support of the fractions is to
 typeset fractions in the default \LaTeX\ way, that is small fractions,
 $\tfrac12$, in text mode and larger fractions, $\dfrac12$, in display
-mode.
+mode. The fractions are set with the math font in math mode and text
+font in text mode.
 
 Starring the fractions forces the fractions to be in text mode style. I
 find it useful in some cases such as
@@ -141,6 +161,9 @@ details.
 The support for the \texttt{verbatim} environment and other source
 displaying features is not that good. In fact it probably won't work.
 
+The imcompatibility with support for the greek language makes the use
+of this package less desirable for users writing in greek.
+
 \section{Copyright and license}
 \label{sec:copyright-license}
 
diff --git a/macros/latex/contrib/utf8add/utf8hax.pdf b/macros/latex/contrib/utf8add/utf8hax.pdf
index ea37008c54..fb6b2b9dd7 100644
--- a/macros/latex/contrib/utf8add/utf8hax.pdf
+++ b/macros/latex/contrib/utf8add/utf8hax.pdf