summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx8
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin576732 -> 576755 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex14
-rw-r--r--macros/latex/contrib/pkuthss/doc/example.pdfbin95861 -> 102629 bytes
-rw-r--r--macros/latex/contrib/pkuthss/doc/example/chap/copy.tex4
-rw-r--r--macros/latex/contrib/pkuthss/doc/example/chap/origin.tex4
-rw-r--r--macros/latex/contrib/pkuthss/doc/example/thesis.tex13
-rw-r--r--macros/latex/contrib/pkuthss/doc/pkuthss.pdfbin325590 -> 326524 bytes
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt19
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex2
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex18
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex6
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch51
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex9
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkulogo.eps1
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkulogo.pdfbin3530 -> 3530 bytes
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def9
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def9
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss.cls23
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss.def57
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuword.eps1
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuword.pdfbin6280 -> 6280 bytes
-rw-r--r--macros/latex/contrib/projlib/ProjLib-doc-cn.pdfbin319918 -> 319844 bytes
-rw-r--r--macros/latex/contrib/projlib/ProjLib-doc-en.pdfbin199267 -> 199135 bytes
-rw-r--r--macros/latex/contrib/projlib/ProjLib-doc-fr.pdfbin200190 -> 200073 bytes
-rw-r--r--macros/latex/contrib/projlib/ProjLib-doc.dtx12
-rw-r--r--macros/latex/contrib/projlib/ProjLib.dtx51
-rw-r--r--macros/latex/contrib/spbmark/spbmark.pdfbin66119 -> 66032 bytes
-rw-r--r--macros/latex/contrib/spbmark/spbmark.sty10
-rw-r--r--macros/latex/contrib/spbmark/spbmark.tex6
30 files changed, 209 insertions, 118 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index de0745cb46..7b8737e4b5 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/10/12}{1.3I}
+\ProvidesExplClass{easybook}{2021/10/16}{1.3L}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -319,7 +319,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/10/12}{1.3I}
+\ProvidesExplPackage{easybase}{2021/10/16}{1.3L}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1358,7 +1358,7 @@
\tl_use:c { the#1 }
}
}
-\NewDocumentCommand{\UseCounter}{soD(){arabic}mmO{.}d()}
+\NewDocumentCommand{\counteruse}{soD(){arabic}mmO{.}d()}
{
\IfBooleanF{#1}{\stepcounter{#4}}
\IfValueT{#7}{\setcounter{#4}{#7}}
@@ -2385,7 +2385,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/12}{1.3I}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/16}{1.3L}
{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 70e56cf528..deb50a382d 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 6989848387..89fc89201a 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.3I,
- date = 2021/10/12,
+ version = v1.3L,
+ date = 2021/10/16,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = q1jx@foxmail.com,
@@ -945,7 +945,7 @@
\meta{键值列表2} 包括 \pkg*{tcolorbox} 的盒子样式选项,例如 \option*{boxsep} 和 \option*{fontupper} 等,也可以使用下述 \option{tcolorbox} 选项。在这里可以使用 \cs{addtcbstyle} 命令设置标题选项 \meta{键值列表2} 的值,第一个参数为 \code{tc-exercise}。
\begin{ctexexam}
- \tcphantomifname{\markright{\UseCounter{tcbcounter}{\quad 习题}}}{}
+ \tcphantomifname{\markright{\counteruse{tcbcounter}{\quad 习题}}}{}
\addtcbstyle{tc-exercise}{boxsep = 5pt}
\exerprologue{习题前的一段文本}
\begin{exercise}+[color = LightSkyBlue](after skip = 2pc)[itemsep = 1ex]
@@ -1074,13 +1074,13 @@
\subsection{计数器}
\begin{commands}\noitemsep
\command{newcounter}[\marg{计数器}\oarg{父计数器}]\default{}
- \command{UseCounter}[\sarg\oarg{父计数器}\darg{编号}\marg{计数器}\marg{内容}\oarg{分隔符}]
- 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令,命令 \cs{UseCounter} 以一定的格式使用由它创建的计数器,将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器}\meta{内容} 输出当前内容。注意 \cs{UseCounter} 仅具有\textbf{输出功能},并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加 1,带有星号的命令使 \meta{计数器} 值保持不变,\meta{编号} 为 \code{arabic} 或 \code{alpha} 等形式,\meta{数值} 可以手动将 \meta{计数器} 设为指定值。
+ \command{counteruse}[\sarg\oarg{父计数器}\darg{编号}\marg{计数器}\marg{内容}\oarg{分隔符}]
+ 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令,命令 \cs{counteruse} 以一定的格式使用由它创建的计数器,将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器}\meta{内容} 输出当前内容。注意 \cs{counteruse} 仅具有\textbf{输出功能},并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加 1,带有星号的命令使 \meta{计数器} 值保持不变,\meta{编号} 为 \code{arabic} 或 \code{alpha} 等形式,\meta{数值} 可以手动将 \meta{计数器} 设为指定值。
- 在一定的场合下可能用到 \cs{UseCounter} 命令,比如通过新建快捷命令在一些位置使用定理环境的计数器,使用 \cs{labelformat} 设置计数器的引用标签需添加 \code{eb@}:
+ 在一定的场合下可能用到 \cs{counteruse} 命令,比如通过新建快捷命令在一些位置使用定理环境的计数器,使用 \cs{labelformat} 设置计数器的引用标签需添加 \code{eb@}:
\begin{ctexexam}
\labelformat{eb@theorem}{定理 #1}
- \newcommand{\theoremhead}[1]{定理 \UseCounter[chapter]{theorem}{\hspace{1em}#1}}
+ \newcommand{\theoremhead}[1]{定理 \counteruse[chapter]{theorem}{\hspace{1em}#1}}
\theoremhead{定理内容}\label{thm:theorem}
\end{ctexexam}
\end{commands}
diff --git a/macros/latex/contrib/pkuthss/doc/example.pdf b/macros/latex/contrib/pkuthss/doc/example.pdf
index a548fbcc13..2c5c82ee3a 100644
--- a/macros/latex/contrib/pkuthss/doc/example.pdf
+++ b/macros/latex/contrib/pkuthss/doc/example.pdf
Binary files differ
diff --git a/macros/latex/contrib/pkuthss/doc/example/chap/copy.tex b/macros/latex/contrib/pkuthss/doc/example/chap/copy.tex
index 8204715289..4dd05b3b07 100644
--- a/macros/latex/contrib/pkuthss/doc/example/chap/copy.tex
+++ b/macros/latex/contrib/pkuthss/doc/example/chap/copy.tex
@@ -1,5 +1,5 @@
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2017 Casper Ti. Vector
+% Copyright (c) 2010-2017,2021 Casper Ti. Vector
% All rights reserved.
%
% Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
任何收存和保管本论文各种版本的单位和个人,
未经本论文作者同意,不得将本论文转借他人,
亦不得随意复制、抄录、拍照或以任何方式传播。
-否则一旦引起有碍作者著作权之问题,将可能承担法律责任。
+否则,引起有碍作者著作权之问题,将可能承担法律责任。
% 若须排版二维码,请将二维码图片重命名为“barcode”,
% 转为合适的图片格式,并放在当前目录下,然后去掉下面 2 行的注释。
diff --git a/macros/latex/contrib/pkuthss/doc/example/chap/origin.tex b/macros/latex/contrib/pkuthss/doc/example/chap/origin.tex
index b4103f1bf4..bf0cc33ef3 100644
--- a/macros/latex/contrib/pkuthss/doc/example/chap/origin.tex
+++ b/macros/latex/contrib/pkuthss/doc/example/chap/origin.tex
@@ -64,9 +64,9 @@
并提供目录检索与阅览服务,在校园网上提供服务;
\item 学校可以采用影印、缩印、数字化或其它复制手段保存论文;
\item 因某种特殊原因须要延迟发布学位论文电子版,
- 授权学校在 $\Box$\nobreakspace{}一年 /
+ 授权学校 $\Box$\nobreakspace{}一年 /
$\Box$\nobreakspace{}两年 /
- $\Box$\nobreakspace{}三年以后在校园网上全文发布。
+ $\Box$\nobreakspace{}三年以后,在校园网上全文发布。
\end{itemize}
\centerline{(保密论文在解密后遵守此规定)}
\vskip 1em
diff --git a/macros/latex/contrib/pkuthss/doc/example/thesis.tex b/macros/latex/contrib/pkuthss/doc/example/thesis.tex
index 30bc89d1aa..dbfd37994d 100644
--- a/macros/latex/contrib/pkuthss/doc/example/thesis.tex
+++ b/macros/latex/contrib/pkuthss/doc/example/thesis.tex
@@ -42,8 +42,9 @@
cauthor = {某某}, eauthor = {Test}, date = {某年某月},
studentid = {0123456789}, school = {某某学院},
cmajor = {某某专业}, emajor = {Some Major},
- direction = {某某方向},
- cmentor = {某某教授}, ementor = {Prof.\ Somebody},
+ direction = {某某方向}, mentorlines = {2},
+ cmentor = {某甲教授\\某乙教授},
+ ementor = {Prof.\ Somebody and Prof.\ Someone},
ckeywords = {其一,其二},
ekeywords = {First, Second},
% 以下两项无双盲评审需求的用户可保持原状。
@@ -64,6 +65,14 @@
未格式化的、带方括号的和上标且带方括号的引用标记:%
\cite{test-en},\parencite{test-zh}、\supercite{test-en, test-zh}。
+ 若格式审查时提示字号或其它格式细节问题,请启用 pkuthss 的 \texttt{ugly}
+ 选项,同时可以考虑启用 biblatex-caspervector 的 \texttt{ugly} 选项
+ 或者换用 biblatex-gb7714-2015,详见 \texttt{thesis.tex} 中相关注释。
+
+ 生成的 PDF 文件中标记链接的彩色框不会出现在打印版论文中。
+ 如仍须去掉,可在 \texttt{thesis.tex} 导言区加入
+ \texttt{\string\hypersetup\{hidelinks\}}。
+
若要避免章末空白页,请在调用 pkuthss 文档类时加入 \texttt{openany} 选项。
如果编译时不出参考文献,
diff --git a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
index 9d172c6554..63264f30d1 100644
--- a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
+++ b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
Binary files differ
diff --git a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
index 1d7835cf92..20a12257a5 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
+++ b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
@@ -1,4 +1,21 @@
-2010-03-29, v1.9.0
+2021-10-16, v1.9.1
+
+ * API changes:
+ - Support `mentorlines' like casthss.
+
+ * Changes to example template:
+ - thesis.tex: more obvious hints on `ugly', new note on `hidelinks'.
+ - copy.tex, origin.tex: minor update according to school requirements.
+
+ * Changes to package code:
+ - Merge common parts from pkuthss-*.def into pkuthss.def.
+ - Also "uglify" the keywords label.
+
+ * Misc:
+ - ChangeLog.txt: typo (thank @fjn308).
+ - Minor fixes and cosmetics.
+
+2021-03-29, v1.9.0
* API changes:
- Add support for double-blind review (thank @Kurapikov).
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex
index 232f427558..9d8e56ec33 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex
@@ -72,7 +72,7 @@
\begin{Verbatim}
texdoc pkuthss
\end{Verbatim}
-所打开的 pdf 文件所在的同一目录中包含两个子目录和相应的两个 pdf 文件,
+打开的 pdf 文件所在目录中包含两个子目录和相应的两个 pdf 文件,
其中 \verb|readme/| 为说明文档(即本文档)的源代码,%
\verb|example/| 为文档模版的源代码,%
\verb|pkuthss.pdf| 和 \verb|example.pdf|
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
index 5d2f91185b..bdc6af316f 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
@@ -207,6 +207,7 @@
出于兼容性的考虑,如果 \texttt{\string\thesiscover} 为空,
那么封面将显示 \texttt{\string\cthesisname}。%
}。
+ \item \texttt{\bfseries\string\mentorlines}:封面“导师”部分的行数。
\item \texttt{\bfseries\string\cabstractname}:摘要的中文标题。
\item \texttt{\bfseries\string\eabstractname}:摘要的西文标题。
\end{itemize}
@@ -353,20 +354,7 @@ $TEXMFDIST/tex/latex/pkuthss/
一个常见的需求是封面中部分内容(特别是论文的标题、专业和研究方向)太长,
超出了在预设的空间。
此时,用户可以修改 \verb|pkuthss.cls| 里 \verb|\maketitle| 定义中
-\verb|\thss@int@fillinblank| 宏的参数来改变
-带下划线的空白的行数和行宽,其语法为:
-\begin{Verbatim}
-\thss@int@fillinblank{行数}{行宽}{内容}
-\end{Verbatim}
-例如,如果“研究方向”一栏需要两行的空白,
-可以将 \verb|pkuthss.cls| 里的
-\begin{Verbatim}
-\thss@int@fillinblank{1}{\thss@tmp@len}{\kaishu\@direction}
-\end{Verbatim}
-改为
-\begin{Verbatim}
-\thss@int@fillinblank{2}{\thss@tmp@len}{\kaishu\@direction}
-\end{Verbatim}
-当然,为了美观,可以将多于一行的部分移到封面中作者信息部分的最下方。
+\verb|\thss@int@fillinblank| 宏的参数来改变带下划线的空白的行数和行宽,
+具体方法可以参考该文件中和 \verb|\mentorlines| 相关的代码。
% vim:ts=4:sw=4
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
index b5482a08eb..7dcf4ff855 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
@@ -71,6 +71,12 @@ hyperref\cupercite{hyperref} 宏包和一些宏包可能发生冲突。
可以参考 hyperref 宏包 README 文件中的“Package Compatibility”一节。
此文件通常和执行 \verb|texdoc hyperref|
时打开的 pdf 文件位于同一目录中。
+hyperref 默认会在输出的 pdf 文件中用彩色框来标记链接,
+这些彩色框只会显示在屏幕上,不会被打印出来;
+如有特殊需求,也可以在文章的导言区加入以下代码以完全去掉彩色框:
+\begin{Verbatim}
+\hypersetup{hidelinks}
+\end{Verbatim}
biber 运行时有一定概率出现形如(目录名可能稍有不同)
\begin{Verbatim}
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
index 40b508c77c..c405437e53 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
@@ -1,5 +1,5 @@
diff --git a/doc/example/chap/abs.tex b/doc/example/chap/abs.tex
-index dcffe0e..8fd046f 100644
+index ea215a8..8ad4294 100644
--- a/doc/example/chap/abs.tex
+++ b/doc/example/chap/abs.tex
@@ -2,7 +2,7 @@
@@ -100,10 +100,10 @@ index ac5b0c9..9d2ad60 100644
-
% vim:ts=4:sw=4
diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex
-index 0009fe6..3f2d945 100644
+index dbfd379..6a8767a 100644
--- a/doc/example/thesis.tex
+++ b/doc/example/thesis.tex
-@@ -14,36 +14,42 @@
+@@ -14,36 +14,43 @@
\documentclass[UTF8]{pkuthss}
% 如果的确须要使脚注按页编号的话,可以去掉后面 footmisc 包的注释。
%\usepackage[perpage]{footmisc}
@@ -152,18 +152,19 @@ index 0009fe6..3f2d945 100644
- cauthor = {某某}, eauthor = {Test}, date = {某年某月},
- studentid = {0123456789}, school = {某某学院},
- cmajor = {某某专业}, emajor = {Some Major},
-- direction = {某某方向},
-- cmentor = {某某教授}, ementor = {Prof.\ Somebody},
+- direction = {某某方向}, mentorlines = {2},
+- cmentor = {某甲教授\\某乙教授},
+ eauthor = {Test},
+ date = {Month Year}, studentid = {0123456789},
+ school = {Some School},
+ emajor = {Some Major},
-+ direction = {Some Direction},
-+ ementor = {Prof.\ Somebody},
++ direction = {Some Research Division},
++ mentorlines = {2},
++ cmentor = {Prof.\ Somebody\\Prof.\ Someone},
+ ementor = {Prof.\ Somebody and Prof.\ Someone},
ckeywords = {其一,其二},
ekeywords = {First, Second},
- % 以下两项无双盲评审需求的用户可保持原状。
-@@ -53,26 +59,6 @@
+@@ -54,34 +61,6 @@
% 载入参考文献数据库(注意不要省略“.bib”)。
\addbibresource{thesis.bib}
@@ -178,6 +179,14 @@ index 0009fe6..3f2d945 100644
- 未格式化的、带方括号的和上标且带方括号的引用标记:%
- \cite{test-en},\parencite{test-zh}、\supercite{test-en, test-zh}。
-
+- 若格式审查时提示字号或其它格式细节问题,请启用 pkuthss 的 \texttt{ugly}
+- 选项,同时可以考虑启用 biblatex-caspervector 的 \texttt{ugly} 选项
+- 或者换用 biblatex-gb7714-2015,详见 \texttt{thesis.tex} 中相关注释。
+-
+- 生成的 PDF 文件中标记链接的彩色框不会出现在打印版论文中。
+- 如仍须去掉,可在 \texttt{thesis.tex} 导言区加入
+- \texttt{\string\hypersetup\{hidelinks\}}。
+-
- 若要避免章末空白页,请在调用 pkuthss 文档类时加入 \texttt{openany} 选项。
-
- 如果编译时不出参考文献,
@@ -191,11 +200,11 @@ index 0009fe6..3f2d945 100644
% 以下为正文之前的部分,默认不进行章节编号。
\frontmatter
diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def
-index d968f90..f99a891 100644
+index afed37b..e74e4bf 100644
--- a/tex/pkuthss-utf8.def
+++ b/tex/pkuthss-utf8.def
-@@ -26,13 +26,13 @@
- [2020/11/02 v1.8.3 Labels and captions in UTF-8 encoding
+@@ -27,13 +27,13 @@
+ [2021/03/29 v1.9.0 Labels and captions in UTF-8 encoding
for the pkuthss document class]
-\def\label@ctitle{题目:}
@@ -212,14 +221,14 @@ index d968f90..f99a891 100644
+\def\label@cmajor{Major}
+\def\label@direction{Research Division}
+\def\label@cmentor{Supervisor}
- \def\label@ementor{Directed by\ }
\def\label@ckeywords{关键词:}
- \def\label@ekeywords{KEYWORDS:\ }
+ \def\label@blindcover{(匿名评阅论文封面)}
+ \def\label@blindctitle{中文题目:}
diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls
-index 4499528..e6311cb 100644
+index 6ee4e69..5f782f6 100644
--- a/tex/pkuthss.cls
+++ b/tex/pkuthss.cls
-@@ -317,7 +317,7 @@
+@@ -305,7 +305,7 @@
\fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
\fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
\if@twoside
@@ -228,7 +237,7 @@ index 4499528..e6311cb 100644
\fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
\else
\fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
-@@ -367,14 +367,14 @@
+@@ -355,14 +355,14 @@
\zihao{1}\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
\fi%
@@ -245,7 +254,7 @@ index 4499528..e6311cb 100644
}
\vfill
% Information about the author.
-@@ -382,19 +382,19 @@
+@@ -370,18 +370,18 @@
% Slightly adjust the line skip when using new font size.
\zihao{3}\linespread{1.75}\selectfont
\def\thss@tmp@len{0.56\textwidth}
@@ -269,9 +278,7 @@ index 4499528..e6311cb 100644
+ {\bfseries\label@direction} & : &
\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction} \\
- {\bfseries\label@cmentor} &
-- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor} \\
+ {\bfseries\label@cmentor} & : &
-+ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@ementor} \\
+ \thss@int@fillinblank{\mentorlines}%
+ {\thss@tmp@len}{\fangsong\@cmentor} \\
\end{tabular}%
- }
- \vfill
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
index 8305720841..9a8e1de8c9 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
@@ -51,7 +51,7 @@
}
\newif\ifblind\blindfalse
-\newcommand*{\docversion}{v1.9.0}
+\newcommand*{\docversion}{v1.9.1}
\pkuthssinfo{
cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
ctitle = {北京大学学位论文模版{\thssnl}pkuthss \docversion},
@@ -60,11 +60,12 @@
\texorpdfstring{\thssnl}{: }pkuthss \docversion%
},
cauthor = {盖茨波·钛·维克托}, eauthor = {Casper Ti.\ Vector},
- date = {\zhdigits{2021}年\zhnumber{3}月},
+ date = {\zhdigits{2021}年\zhnumber{10}月},
studentid = {00910???}, school = {化学与分子工程学院},
cmajor = {应用化学}, emajor = {Applied Chemistry},
- direction = {据说 Casper 自己也不知道},
- cmentor = {XX 教授}, ementor = {Prof.\ XX},
+ direction = {据说 Casper 自己也不知道}, mentorlines = {2},
+ cmentor = {XX 教授\\YY 教授},
+ ementor = {Prof.\ XX and Prof.\ YY},
ckeywords = {\hologo{LaTeX},排版,文档类,\CTeX{}},
ekeywords = {\hologo{LaTeX}, Typesetting, Document class, \CTeX{}},
blindid = {???01900}, discipline = {化学}
diff --git a/macros/latex/contrib/pkuthss/tex/pkulogo.eps b/macros/latex/contrib/pkuthss/tex/pkulogo.eps
index 35c1a90dfb..e5b6fd6c54 100644
--- a/macros/latex/contrib/pkuthss/tex/pkulogo.eps
+++ b/macros/latex/contrib/pkuthss/tex/pkulogo.eps
@@ -21,6 +21,7 @@
%
% This work consists of the following files:
% pkuthss.cls
+% pkuthss.def
% pkuthss-gbk.def
% pkuthss-utf8.def
% pkulogo.eps
diff --git a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
index bf9659a692..9d539c707d 100644
--- a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
+++ b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
Binary files differ
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
index 28eb1ade7e..500b3bb4cb 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
@@ -17,13 +17,14 @@
%
% This work consists of the following files:
% pkuthss.cls
+% pkuthss.def
% pkuthss-gbk.def
% pkuthss-utf8.def
% pkulogo.eps
% pkuword.eps
\ProvidesFile{pkuthss-gbk.def}
- [2021/03/29 v1.9.0 Labels and captions in GBK encoding
+ [2021/10/16 v1.9.1 Labels and captions in GBK encoding
for the pkuthss document class]
\def\label@ctitle{Ŀ}
@@ -33,9 +34,7 @@
\def\label@cmajor{ר\hphantom{}ҵ}
\def\label@direction{о}
\def\label@cmentor{\hphantom{}ʦ}
-\def\label@ementor{Directed by\ }
\def\label@ckeywords{ؼʣ}
-\def\label@ekeywords{KEYWORDS:\ }
\def\label@blindcover{ķ棩}
\def\label@blindctitle{Ŀ}
\def\label@blindetitle{ӢĿ}
@@ -45,12 +44,8 @@
\def\titlepagename{}
\def\cuniversity{ѧ}
-\def\euniversity{Peking University}
\def\cthesisname{ʿѧλ}
-\def\ethesisname{Doctor Thesis}
-\def\thesiscover{}
\def\cabstractname{ժҪ}
-\def\eabstractname{ABSTRACT}
\endinput
% vim:ft=tex:ts=2:sw=2
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
index 6ab9dc0ec8..e1d9566ed6 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
@@ -17,13 +17,14 @@
%
% This work consists of the following files:
% pkuthss.cls
+% pkuthss.def
% pkuthss-gbk.def
% pkuthss-utf8.def
% pkulogo.eps
% pkuword.eps
\ProvidesFile{pkuthss-utf8.def}
- [2021/03/29 v1.9.0 Labels and captions in UTF-8 encoding
+ [2021/10/16 v1.9.1 Labels and captions in UTF-8 encoding
for the pkuthss document class]
\def\label@ctitle{题目:}
@@ -33,9 +34,7 @@
\def\label@cmajor{专\hphantom{汉字}业:}
\def\label@direction{研究方向:}
\def\label@cmentor{导\hphantom{汉字}师:}
-\def\label@ementor{Directed by\ }
\def\label@ckeywords{关键词:}
-\def\label@ekeywords{KEYWORDS:\ }
\def\label@blindcover{(匿名评阅论文封面)}
\def\label@blindctitle{中文题目:}
\def\label@blindetitle{英文题目:}
@@ -45,12 +44,8 @@
\def\titlepagename{封面}
\def\cuniversity{北京大学}
-\def\euniversity{Peking University}
\def\cthesisname{博士学位论文}
-\def\ethesisname{Doctor Thesis}
-\def\thesiscover{}
\def\cabstractname{摘要}
-\def\eabstractname{ABSTRACT}
\endinput
% vim:ft=tex:ts=2:sw=2
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.cls b/macros/latex/contrib/pkuthss/tex/pkuthss.cls
index 2abf2d72fb..e03a7bd4e4 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss.cls
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss.cls
@@ -17,6 +17,7 @@
%
% This work consists of the following files:
% pkuthss.cls
+% pkuthss.def
% pkuthss-gbk.def
% pkuthss-utf8.def
% pkulogo.eps
@@ -24,7 +25,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2021/03/29 v1.9.0 Peking University dissertation document class]
+ [2021/10/16 v1.9.1 Peking University dissertation document class]
% eg. `\thss@int@boolopt{spacing}{true}' will expand to:
% \newif\ifthss@opt@spacing \thss@opt@spacingtrue
@@ -85,21 +86,7 @@
\RequirePackage[normalem]{ulem}
% `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace.
\AtEndOfClass{\RequirePackage{hyperref}}
-
-\ifthss@opt@gbk
- \input{pkuthss-gbk.def}
- \ifxetex
- % No support for XeLaTeX compilation in non-unicode encoding, i.e. GBK.
- \ClassError{pkuthss}%
- {XeLaTeX compilation is not supported without UTF-8}%
- {%
- XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak
- Therefore please use UTF-8 encoding for the LaTeX code.%
- }
- \fi
-\else
- \input{pkuthss-utf8.def}
-\fi
+\input{pkuthss.def}
\ifthss@opt@pkufont
% Use Times New Roman / Arial according to school regulation.
@@ -248,6 +235,7 @@
\thss@int@infoitemb{cthesisname}
\thss@int@infoitemb{ethesisname}
\thss@int@infoitemb{thesiscover}
+\thss@int@infoitemb{mentorlines}
\thss@int@infoitemb{cabstractname}
\thss@int@infoitemb{eabstractname}
% Set up document information using the `key = value' grammar.
@@ -394,7 +382,8 @@
{\bfseries\label@direction} &
\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction} \\
{\bfseries\label@cmentor} &
- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor} \\
+ \thss@int@fillinblank{\mentorlines}%
+ {\thss@tmp@len}{\fangsong\@cmentor} \\
\end{tabular}%
}
\vfill
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.def b/macros/latex/contrib/pkuthss/tex/pkuthss.def
new file mode 100644
index 0000000000..3ffe3008ad
--- /dev/null
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss.def
@@ -0,0 +1,57 @@
+% Peking University dissertation document class
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2013,2015,2021 Casper Ti. Vector
+%
+% 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
+% https://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 Casper Ti. Vector.
+%
+% This work consists of the following files:
+% pkuthss.cls
+% pkuthss.def
+% pkuthss-gbk.def
+% pkuthss-utf8.def
+% pkulogo.eps
+% pkuword.eps
+
+\ProvidesFile{pkuthss.def}
+ [2021/10/16 v1.9.1 Labels and captions for the pkuthss document class]
+
+\def\label@ementor{Directed by\ }
+\def\euniversity{Peking University}
+\def\ethesisname{Doctor Thesis}
+\def\thesiscover{}
+\def\mentorlines{1}
+\def\eabstractname{ABSTRACT}
+
+\ifthss@opt@ugly
+ \def\label@ekeywords{KEY WORDS:\ }
+\else
+ \def\label@ekeywords{KEYWORDS:\ }
+\fi
+
+\ifthss@opt@gbk
+ \input{pkuthss-gbk.def}
+ \ifxetex
+ % No support for XeLaTeX compilation in non-unicode encoding, i.e. GBK.
+ \ClassError{pkuthss}%
+ {XeLaTeX compilation is not supported without UTF-8}%
+ {%
+ XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak
+ Therefore please use UTF-8 encoding for the LaTeX code.%
+ }
+ \fi
+\else
+ \input{pkuthss-utf8.def}
+\fi
+
+\endinput
+% vim:ft=tex:ts=2:sw=2
diff --git a/macros/latex/contrib/pkuthss/tex/pkuword.eps b/macros/latex/contrib/pkuthss/tex/pkuword.eps
index 88bbca5d12..0d6cc95a1e 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuword.eps
+++ b/macros/latex/contrib/pkuthss/tex/pkuword.eps
@@ -21,6 +21,7 @@
%
% This work consists of the following files:
% pkuthss.cls
+% pkuthss.def
% pkuthss-gbk.def
% pkuthss-utf8.def
% pkulogo.eps
diff --git a/macros/latex/contrib/pkuthss/tex/pkuword.pdf b/macros/latex/contrib/pkuthss/tex/pkuword.pdf
index 58b5193f46..919d1faf40 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuword.pdf
+++ b/macros/latex/contrib/pkuthss/tex/pkuword.pdf
Binary files differ
diff --git a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
index dbadeb94d7..a04f15a286 100644
--- a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
+++ b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
Binary files differ
diff --git a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf
index f41e7621f7..01e1ac5682 100644
--- a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf
+++ b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf
index 868b604e6a..092e9a985e 100644
--- a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf
+++ b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf
Binary files differ
diff --git a/macros/latex/contrib/projlib/ProjLib-doc.dtx b/macros/latex/contrib/projlib/ProjLib-doc.dtx
index c5d10d507c..62ba754afc 100644
--- a/macros/latex/contrib/projlib/ProjLib-doc.dtx
+++ b/macros/latex/contrib/projlib/ProjLib-doc.dtx
@@ -107,25 +107,25 @@
%<*ProjLib-doc-cn>
\title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南}
\author{许锦文}
-\thanks{对应版本.~~\texttt{\ProjLib{}~2021/08/19}}
+\thanks{对应版本.~~\texttt{\ProjLib{}~2021/10/16}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
-\date{2021年8月,北京}
+\date{2021年10月,巴黎}
%</ProjLib-doc-cn>
%
%<*ProjLib-doc-en>
\title{\ProjLib{}~\,Toolkit\\[.3\baselineskip]\normalsize User Manual}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\ProjLib{}~2021/08/19}}
+\thanks{Corresponding to: \texttt{\ProjLib{}~2021/10/16}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
-\date{August 2021, Beijing}
+\date{October 2021, Paris}
%</ProjLib-doc-en>
%
%<*ProjLib-doc-fr>
\title{La boîte à outils~\,\ProjLib{}\\[.3\baselineskip]\normalsize Manuel d'utilisation}
\author{Jinwen XU}
-\thanks{Correspondant à : \texttt{\ProjLib{}~2021/08/19}}
+\thanks{Correspondant à : \texttt{\ProjLib{}~2021/10/16}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
-\date{Août 2021, à Pékin}
+\date{Octobre 2021, à Paris}
%</ProjLib-doc-fr>
\maketitle
diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx
index fd3b252e1f..2d3f53d48b 100644
--- a/macros/latex/contrib/projlib/ProjLib.dtx
+++ b/macros/latex/contrib/projlib/ProjLib.dtx
@@ -18,47 +18,47 @@
%
%<*ProjLib>
\ProvidesPackage{ProjLib}
- [2021/08/19 The collective interface of ProjLib toolkit]
+ [2021/10/16 The collective interface of ProjLib toolkit]
%</ProjLib>
%
%<*PJLauthor>
\ProvidesPackage{PJLauthor}
- [2021/08/19 Enhanced author information block]
+ [2021/10/16 Enhanced author information block]
%</PJLauthor>
%
%<*PJLdate>
\ProvidesPackage{PJLdate}
- [2021/08/19 Convert yyyy-mm-dd to normal datetime format]
+ [2021/10/16 Convert yyyy-mm-dd to normal datetime format]
%</PJLdate>
%
%<*PJLdraft>
\ProvidesPackage{PJLdraft}
- [2021/08/19 Some useful macros for the draft stage]
+ [2021/10/16 Some useful macros for the draft stage]
%</PJLdraft>
%
%<*PJLlang>
\ProvidesPackage{PJLlang}
- [2021/08/19 Multi-language configuration]
+ [2021/10/16 Multi-language configuration]
%</PJLlang>
%
%<*PJLlogo>
\ProvidesPackage{PJLlogo}
- [2021/08/19 The ProjLib logo]
+ [2021/10/16 The ProjLib logo]
%</PJLlogo>
%
%<*PJLmath>
\ProvidesPackage{PJLmath}
- [2021/08/19 Useful math macros and shortcuts]
+ [2021/10/16 Useful math macros and shortcuts]
%</PJLmath>
%
%<*PJLpaper>
\ProvidesPackage{PJLpaper}
- [2021/08/19 Paper style configuration]
+ [2021/10/16 Paper style configuration]
%</PJLpaper>
%
%<*PJLthm>
\ProvidesPackage{PJLthm}
- [2021/08/19 Theorem setup and configuration]
+ [2021/10/16 Theorem setup and configuration]
%</PJLthm>
%
%# 下面两行引入宏包的代码是所有文件共用的。
@@ -67,10 +67,6 @@
\RequirePackage{etoolbox}
%
%<*PJLauthor>
-%# 在 AMS 文档类中不执行任何操作
-%# Do nothing if AMS class detected
-\ifdefined\subjclass\endinput\fi
-
%# 这段代码定义了宏包中的选项。
%# This code defines the options in the package.
\SetupKeyvalOptions{
@@ -84,6 +80,10 @@
%# Process options
\ProcessKeyvalOptions*\relax
+%# 在 AMS 文档类中不执行任何操作
+%# Do nothing if AMS class detected
+\ifdefined\subjclass\endinput\fi
+
%%================================
%% Font and style
%%================================
@@ -776,6 +776,20 @@
\if@PJLlang@enable@FR
\frenchsetup{PartNameFull=false}
\fi
+ \if@PJLlang@enable@PT
+ \let\PJL@babelord\ord
+ \let\ord\relax
+ \AtBeginDocument{
+ \@ifundefined{ord}{}
+ {
+ \let\PJL@userord\ord
+ \let\ord\relax
+ \newcommand{\ord}{%
+ \ifmmode\expandafter\PJL@userord\else\expandafter\PJL@babelord\fi%
+ }
+ }
+ }
+ \fi
\babelprovide{schinese}
\babelprovide{tchinese}
@@ -2234,6 +2248,7 @@
\DeclareBoolOption[true]{regionalref}
\DeclareBoolOption[false]{originalref}
\DeclareBoolOption[false]{useosf}
+\DeclareBoolOption[false]{lmodern}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -2305,6 +2320,16 @@
% A message can then be shown as: Font "(font name)" has been set
\ifdefined\PJL@font@alreadyset\else
+\if@ProjLib@lmodern
+ \RequirePackage{amssymb}
+ \if@ProjLib@useosf
+ \RequirePackage{cfr-lm}
+ \else
+ \RequirePackage{lmodern}
+ \fi
+ \PJLsetlinespacing{\setstretch{1.00}}
+\fi
+
\if@ProjLib@palatino
% \RequirePackage{amssymb}
\RequirePackage{mathpazo}
diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf
index b230768d68..f42d42ea4a 100644
--- a/macros/latex/contrib/spbmark/spbmark.pdf
+++ b/macros/latex/contrib/spbmark/spbmark.pdf
Binary files differ
diff --git a/macros/latex/contrib/spbmark/spbmark.sty b/macros/latex/contrib/spbmark/spbmark.sty
index cf81b1c8ef..5a887c2f99 100644
--- a/macros/latex/contrib/spbmark/spbmark.sty
+++ b/macros/latex/contrib/spbmark/spbmark.sty
@@ -1,7 +1,7 @@
%
% ***************** THE SPBMARK PACKAGE *****************
%
-% Copyright (C) 2021 by Qu Yi <quee123@foxmail.com>
+% Copyright (C) 2021 by Qu Yi <q1jx@foxmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the CC-BY 4.0 License.
@@ -9,7 +9,7 @@
% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2018/12/31]
\RequirePackage{xparse,l3keys2e}
-\ProvidesExplPackage{spbmark}{2021/08/10}{1.1c}
+\ProvidesExplPackage{spbmark}{2021/10/16}{1.1D}
{Customize superscripts and subscripts}
\cs_new_protected:Npn \spb_define:n { \keys_define:nn { spbmark } }
@@ -269,9 +269,9 @@
\cs_set_eq:NN \spb \supersub
\cs_set:Npn \@makefnmark
{ \hbox:n { \fnmarkfont\super{\@thefnmark}[0pt] } }
-\cs_if_exist:NTF \ftntm@font
- { \cs_new:Npn \fnmarkfont { \ftntm@font } }
- { \cs_new:Npn \fnmarkfont { \normalfont } }
+\tl_if_exist:NTF \ftntm@font
+ { \tl_set_eq:NN \fnmarkfont \ftntm@font }
+ { \tl_set_eq:NN \fnmarkfont \normalfont }
\endinput
%
% End of file `spbmark.sty'. \ No newline at end of file
diff --git a/macros/latex/contrib/spbmark/spbmark.tex b/macros/latex/contrib/spbmark/spbmark.tex
index 297274d83c..fc6071aedd 100644
--- a/macros/latex/contrib/spbmark/spbmark.tex
+++ b/macros/latex/contrib/spbmark/spbmark.tex
@@ -6,11 +6,11 @@
{
package = spbmark,
title = the spbmark package,
- version = v1.1c,
- date = 2021/08/10,
+ version = v1.1D,
+ date = 2021/10/16,
authors = Qu Yi,
info = Customize superscript and subscript,
- email = quee123@foxmail.com,
+ email = q1jx@foxmail.com,
url = https://github.com/texl3/spbmark,
abstract =
{