summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/pkuthss
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-10-31 03:04:01 +0000
committerNorbert Preining <norbert@preining.info>2022-10-31 03:04:01 +0000
commitc7892fe1a11367872de6f3ee0fa074b39824e59c (patch)
tree4879018aece4cb9f7549756ccadbb1808296d19d /macros/latex/contrib/pkuthss
parentb2c88e6cbb5203ec5d33819454f1499cada7e336 (diff)
CTAN sync 202210310303
Diffstat (limited to 'macros/latex/contrib/pkuthss')
-rw-r--r--macros/latex/contrib/pkuthss/doc/example.pdfbin103792 -> 103719 bytes
-rw-r--r--macros/latex/contrib/pkuthss/doc/example/spine.tex9
-rw-r--r--macros/latex/contrib/pkuthss/doc/example/thesis.tex4
-rw-r--r--macros/latex/contrib/pkuthss/doc/pkuthss.pdfbin439556 -> 348380 bytes
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt9
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex5
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex17
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex4
l---------macros/latex/contrib/pkuthss/doc/readme/ctex-fontset-pkuthss.def1
l---------macros/latex/contrib/pkuthss/doc/readme/ctexopts.cfg1
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib20
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex4
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkulogo.pdfbin3530 -> 3530 bytes
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def2
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def2
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss.cls24
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss.def2
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuword.pdfbin6280 -> 6280 bytes
18 files changed, 50 insertions, 54 deletions
diff --git a/macros/latex/contrib/pkuthss/doc/example.pdf b/macros/latex/contrib/pkuthss/doc/example.pdf
index a435dc0541..18b82d1f72 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/spine.tex b/macros/latex/contrib/pkuthss/doc/example/spine.tex
index 005e4c3950..8bcb77dd58 100644
--- a/macros/latex/contrib/pkuthss/doc/example/spine.tex
+++ b/macros/latex/contrib/pkuthss/doc/example/spine.tex
@@ -1,10 +1,11 @@
-% Copyright (c) 2018-2019 Casper Ti. Vector
+% Copyright (c) 2018-2019,2022 Casper Ti. Vector
% Public domain.
\documentclass[UTF8, zihao = -4]{ctexart}
\usepackage{calc, geometry, graphicx}
-\usepackage[defaultsups]{newtxtext}
-\usepackage[cmintegrals, varg]{newtxmath}
+% 如须用 xelatex 编译,请参考 pkuthss.cls 修改字体设置。
+\usepackage{textcomp, mathptmx}
+\usepackage[scaled = 0.95]{helvet}
\pagestyle{empty}
\newlength{\colpad}
\newcommand{\colwidth}{0.99\ccwd}
@@ -37,7 +38,7 @@
\hspace{\colpad}
\begin{minipage}[b][\textheight][b]{\miniwidth}
% thesis.pdf 应事先编译好,此处会自动提取其首页。
- % 因为要插入 pdf 图片,本文档应用 pdflatex 或 xelatex 编译。
+ % 因为要插入 pdf 图片,本文档应用 pdflatex 编译。
\includegraphics[height = \textheight, page = 1]{thesis}
\end{minipage}
\end{document}
diff --git a/macros/latex/contrib/pkuthss/doc/example/thesis.tex b/macros/latex/contrib/pkuthss/doc/example/thesis.tex
index dbfd37994d..f12e379aff 100644
--- a/macros/latex/contrib/pkuthss/doc/example/thesis.tex
+++ b/macros/latex/contrib/pkuthss/doc/example/thesis.tex
@@ -1,5 +1,5 @@
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016,2018-2019,2021 Casper Ti. Vector
+% Copyright (c) 2010-2016,2018-2019,2021-2022 Casper Ti. Vector
% Copyright (c) 2021 Kurapica
% Public domain.
%
@@ -71,7 +71,7 @@
生成的 PDF 文件中标记链接的彩色框不会出现在打印版论文中。
如仍须去掉,可在 \texttt{thesis.tex} 导言区加入
- \texttt{\string\hypersetup\{hidelinks\}}。
+ \texttt{\string\hypersetup\string{hidelinks\string}}。
若要避免章末空白页,请在调用 pkuthss 文档类时加入 \texttt{openany} 选项。
diff --git a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
index 7e96dbb735..d81143c642 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 665120151a..89e7fcb899 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
+++ b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
@@ -1,3 +1,12 @@
+2022-10-30, v1.9.3
+
+ * Changes to package code:
+ - Get rid of newtx completely (thank @CastleStar14654).
+ - pkuthss.cls: fix scrextend, better footnotes (thank @CastleStar14654).
+
+ * Misc:
+ - Minor fixes and cosmetics.
+
2022-05-04, v1.9.2
* Changes to package code:
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 4b5073b08a..de7aa296ee 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
@@ -308,8 +308,9 @@ pkuthss 文档模版使用作者编写的 biblatex\cupercite{biblatex} 样式%
\begin{itemize}
\item 启用 \verb|pkufont| 选项时会调用 unicode-math
\cupercite{unicode-math} 宏包(\hologo{XeLaTeX} 编译)或
- newtxtext/newtxmath\cupercite{newtx} 宏包(非 \hologo{XeLaTeX}
- 编译),否则会调用 latexsym\cupercite{latexsym} 宏包。
+ mathptmx/helvet\cupercite{psnfss} 和 textcomp 宏包(非
+ \hologo{XeLaTeX} 编译),此外在非 \hologo{XeLaTeX} 编译或不启用
+ \verb|pkufont| 选项时均会调用 latexsym\cupercite{latexsym} 宏包。
\item 启用 \verb|pkufoot| 选项时会调用
tikz\cupercite{tikz} 和 scrextend\cupercite{scrextend} 宏包。
\item 启用 \verb|pkuspace| 选项时会调用
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 7dcf4ff855..c39ea13268 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2019,2021 Casper Ti. Vector
+% Copyright (c) 2010-2019,2021-2022 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
@@ -89,21 +89,6 @@ data source .../par-xxxxxxxx/cache-xxxxxxxx/
遇到这种情况时,删除掉上述临时目录及其所有内容,
再重新运行 biber 通常便可解决问题。
-就目前而言,amsthm\cupercite{amsthm} 宏包在后于 newtxmath\cupercite{newtx}
-宏包被调用时会导致以下的错误:
-\begin{Verbatim}
-! LaTeX Error: Command \openbox already defined.
- Or name \end... illegal, see p.192 of the manual.
-\end{Verbatim}
-解决此问题的最简单方法是在通过
-\begin{Verbatim}
-\usepackage{amsthm}
-\end{Verbatim}
-调用 amsthm 宏包之前加入以下命令:
-\begin{Verbatim}
-\let\openbox\relax
-\end{Verbatim}
-
\section{文档格式可能存在的问题}
目前在 \hologo{LaTeX} 中似乎没有一个可以很好地替代其它各类似宏包的
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex
index 396f9fe6c3..70f4bf5360 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2012,2014-2015,2018-2019 Casper Ti. Vector
+% Copyright (c) 2010-2012,2014-2015,2018-2019,2022 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
@@ -63,6 +63,6 @@ pkuthss 文档模版现在的维护者是 Casper Ti. Vector\footnote%
{\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.}。%
pkuthss 文档模版目前托管在 Gitea 上,
其项目主页是:\\
-\hspace*{\parindent}\url{https://gitea.com/CasperVector/pkuthss}
+\hspace*{\parindent}\url{https://gitea.com/CasperVector/pkuthss}。
% vim:ts=4:sw=4
diff --git a/macros/latex/contrib/pkuthss/doc/readme/ctex-fontset-pkuthss.def b/macros/latex/contrib/pkuthss/doc/readme/ctex-fontset-pkuthss.def
new file mode 120000
index 0000000000..bd7e3e362f
--- /dev/null
+++ b/macros/latex/contrib/pkuthss/doc/readme/ctex-fontset-pkuthss.def
@@ -0,0 +1 @@
+../example/ctex-fontset-pkuthss.def \ No newline at end of file
diff --git a/macros/latex/contrib/pkuthss/doc/readme/ctexopts.cfg b/macros/latex/contrib/pkuthss/doc/readme/ctexopts.cfg
new file mode 120000
index 0000000000..7fabe3504d
--- /dev/null
+++ b/macros/latex/contrib/pkuthss/doc/readme/ctexopts.cfg
@@ -0,0 +1 @@
+../example/ctexopts.cfg \ No newline at end of file
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
index 9e1770056e..6f7e3d323c 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
@@ -138,13 +138,13 @@
}
@online{graphicx,
- author = {Carlisle, D. P.},
- title = {Packages in the `graphics' bundle},
+ author = {Carlisle, D. P. and Rahtz, S. P. Q.},
+ title = {The graphicx package},
edition = {Ver.~1.2d},
type = {M/OL},
date = {2021-09-16},
url = {https://ctan.org/pkg/graphicx},
- urldate = {2022-05-04},
+ urldate = {2022-05-06},
language = {english},
}
@@ -170,14 +170,14 @@
language = {english},
}
-@online{newtx,
- author = {Sharpe, Michael},
- title = {New TX font package},
- edition = {Ver.~1.71},
+@online{psnfss,
+ author = {Schmidt, Walter},
+ title = {Using common PostScript fonts with \hologo{LaTeX}},
+ edition = {Ver.~9.3},
type = {M/OL},
- date = {2022-03-02},
- url = {https://ctan.org/pkg/newtx},
- urldate = {2022-05-04},
+ date = {2020-03-25},
+ url = {https://ctan.org/pkg/psnfss},
+ urldate = {2022-05-06},
language = {english},
}
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
index 0bccb1a29b..2def8ad843 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.2}
+\newcommand*{\docversion}{v1.9.3}
\pkuthssinfo{
cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
ctitle = {北京大学学位论文模版{\thssnl}pkuthss \docversion},
@@ -60,7 +60,7 @@
\texorpdfstring{\thssnl}{: }pkuthss \docversion%
},
cauthor = {盖茨波·钛·维克托}, eauthor = {Casper Ti.\ Vector},
- date = {\zhdigits{2022}年\zhnumber{5}月},
+ date = {\zhdigits{2022}年\zhnumber{10}月},
studentid = {00910???}, school = {化学与分子工程学院},
cmajor = {应用化学}, emajor = {Applied Chemistry},
direction = {据说 Casper 自己也不知道}, mentorlines = {2},
diff --git a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
index 7789b318aa..8160a06564 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 0633806021..46b20d974d 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
@@ -24,7 +24,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-gbk.def}
- [2022/05/05 v1.9.2 Labels and captions in GBK encoding
+ [2022/10/30 v1.9.3 Labels and captions in GBK encoding
for the pkuthss document class]
\def\label@ctitle{Ŀ}
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
index 5d0e25905e..e0358eb18e 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
@@ -24,7 +24,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-utf8.def}
- [2022/05/05 v1.9.2 Labels and captions in UTF-8 encoding
+ [2022/10/30 v1.9.3 Labels and captions in UTF-8 encoding
for the pkuthss document class]
\def\label@ctitle{题目:}
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.cls b/macros/latex/contrib/pkuthss/tex/pkuthss.cls
index 22bdde1209..ad3945afba 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss.cls
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss.cls
@@ -25,7 +25,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2022/05/05 v1.9.2 Peking University dissertation document class]
+ [2022/10/30 v1.9.3 Peking University dissertation document class]
% eg. `\thss@int@boolopt{spacing}{true}' will expand to:
% \newif\ifthss@opt@spacing \thss@opt@spacingtrue
@@ -112,16 +112,15 @@
UprightFont = *-regular,
BoldFont = *-bold,
ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ BoldItalicFont = *-bolditalic,
+ Scale = 0.95
]{texgyreheros}
\else
- % `nofontspec' avoids errors like `The font "FangSong" cannot be found'.
- % `defaultsups' prevents newtxtext from manipulating footnote marks.
- \usepackage[nofontspec, defaultsups]{newtxtext}
- \usepackage[varg]{newtxmath}
+ \RequirePackage{textcomp, mathptmx, latexsym}
+ \RequirePackage[scaled = 0.95]{helvet}
\fi
\else
- % Provides `\Box' for originauth.tex if XITSMath/newtx is absent.
+ % Provides `\Box' for originauth.tex if unicode-math is absent.
\RequirePackage{latexsym}
\fi
@@ -133,9 +132,9 @@
% Circled text, cf. <https://tex.stackexchange.com/questions/7032/>.
\RequirePackage{tikz}
\newcommand*{\thss@int@circled}[1]{%
- \scalebox{0.8}{\tikz[baseline = (char.base)]{
+ \scalebox{0.8}{\tikz[baseline = {([yshift = -0.1\ccwd] char.base)}]{
\node[
- shape = circle, draw = black, minimum size = 1.25em, inner sep = 0pt
+ shape = circle, draw = black, minimum size = 1.25\ccwd, inner sep = 0pt
] (char) {#1};
}}%
}
@@ -144,10 +143,9 @@
\renewcommand*{\thefootnote}%
{\protect\thss@int@circled{\arabic{footnote}}}
% Provides utility to modify footnote spacing.
- % Option used to make sure it does not render interleaf pages totally blank.
- \RequirePackage[cleardoublepage = current]{scrextend}
- % Set up footnote spacing: whole paragraph indent 2 ccwd, 0.5 ccwd after mark.
- \deffootnote{2\ccwd}{0pt}{\thefootnotemark\hspace{0.5\ccwd}}
+ \RequirePackage{scrextend}
+ % Set up footnote spacing: whole paragraph indent 1.5 ccwd, 0.5 ccwd after mark.
+ \deffootnote{1.5\ccwd}{0pt}{\thefootnotemark\hspace{0.5\ccwd}}
\fi
\ifthss@opt@pkuspace
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.def b/macros/latex/contrib/pkuthss/tex/pkuthss.def
index 80239cf01c..c4b2681745 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss.def
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss.def
@@ -23,7 +23,7 @@
% pkuword.eps
\ProvidesFile{pkuthss.def}
- [2022/05/05 v1.9.2 Labels and captions for the pkuthss document class]
+ [2022/10/30 v1.9.3 Labels and captions for the pkuthss document class]
\def\label@ementor{Directed by\ }
\def\euniversity{Peking University}
diff --git a/macros/latex/contrib/pkuthss/tex/pkuword.pdf b/macros/latex/contrib/pkuthss/tex/pkuword.pdf
index 8021172ab7..e608ef5def 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuword.pdf
+++ b/macros/latex/contrib/pkuthss/tex/pkuword.pdf
Binary files differ