summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/pkuthss
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-05-05 03:00:42 +0000
committerNorbert Preining <norbert@preining.info>2022-05-05 03:00:42 +0000
commitc8185bb3cd55c24b45c9b19c4ea36b8c7057199d (patch)
tree535e9e16b0c9a32c17440df0effa8967b91bbf76 /macros/latex/contrib/pkuthss
parentdd0a2658308068128f378c4b6af1bb37aa60621f (diff)
CTAN sync 202205050300
Diffstat (limited to 'macros/latex/contrib/pkuthss')
-rw-r--r--macros/latex/contrib/pkuthss/doc/example.pdfbin102629 -> 103792 bytes
-rw-r--r--macros/latex/contrib/pkuthss/doc/pkuthss.pdfbin326524 -> 439556 bytes
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt5
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex9
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch12
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib39
-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.cls43
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss.def2
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuword.pdfbin6280 -> 6280 bytes
13 files changed, 84 insertions, 34 deletions
diff --git a/macros/latex/contrib/pkuthss/doc/example.pdf b/macros/latex/contrib/pkuthss/doc/example.pdf
index 2c5c82ee3a..a435dc0541 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/pkuthss.pdf b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
index 63264f30d1..7e96dbb735 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 20a12257a5..665120151a 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
+++ b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
@@ -1,3 +1,8 @@
+2022-05-04, v1.9.2
+
+ * Changes to package code:
+ - Support pkufont via unicode-math instead of newtx when using xelatex.
+
2021-10-16, v1.9.1
* API changes:
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 bdc6af316f..4b5073b08a 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.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
@@ -306,9 +306,10 @@ pkuthss 文档模版使用作者编写的 biblatex\cupercite{biblatex} 样式%
除此之外,pkuthss 文档类还可能调用以下这些宏包:
\begin{itemize}
- \item 启用 \verb|pkufont| 选项时会调用
- newtxtext 和 newtxmath\cupercite{newtx} 宏包,
- 否则会调用 latexsym\cupercite{latexsym} 宏包。
+ \item 启用 \verb|pkufont| 选项时会调用 unicode-math
+ \cupercite{unicode-math} 宏包(\hologo{XeLaTeX} 编译)或
+ newtxtext/newtxmath\cupercite{newtx} 宏包(非 \hologo{XeLaTeX}
+ 编译),否则会调用 latexsym\cupercite{latexsym} 宏包。
\item 启用 \verb|pkufoot| 选项时会调用
tikz\cupercite{tikz} 和 scrextend\cupercite{scrextend} 宏包。
\item 启用 \verb|pkuspace| 选项时会调用
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
index c405437e53..384a33ea55 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
@@ -200,11 +200,11 @@ index dbfd379..6a8767a 100644
% 以下为正文之前的部分,默认不进行章节编号。
\frontmatter
diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def
-index afed37b..e74e4bf 100644
+index e1d9566..7cfbd32 100644
--- a/tex/pkuthss-utf8.def
+++ b/tex/pkuthss-utf8.def
@@ -27,13 +27,13 @@
- [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{题目:}
@@ -225,10 +225,10 @@ index afed37b..e74e4bf 100644
\def\label@blindcover{(匿名评阅论文封面)}
\def\label@blindctitle{中文题目:}
diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls
-index 6ee4e69..5f782f6 100644
+index 5aaf3ae..68bc3a4 100644
--- a/tex/pkuthss.cls
+++ b/tex/pkuthss.cls
-@@ -305,7 +305,7 @@
+@@ -332,7 +332,7 @@
\fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
\fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
\if@twoside
@@ -237,7 +237,7 @@ index 6ee4e69..5f782f6 100644
\fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
\else
\fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
-@@ -355,14 +355,14 @@
+@@ -382,14 +382,14 @@
\zihao{1}\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
\fi%
@@ -254,7 +254,7 @@ index 6ee4e69..5f782f6 100644
}
\vfill
% Information about the author.
-@@ -370,18 +370,18 @@
+@@ -397,18 +397,18 @@
% Slightly adjust the line skip when using new font size.
\zihao{3}\linespread{1.75}\selectfont
\def\thss@tmp@len{0.56\textwidth}
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
index 3f4adbe05f..9e1770056e 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2021 Casper Ti. Vector
+% Copyright (c) 2010-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
@@ -85,10 +85,11 @@
@online{caption,
author = {Sommerfeldt, Alex},
title = {Customizing captions of floating environments},
+ edition = {Ver.~3.6},
type = {M/OL},
- date = {2011-11-02},
+ date = {2022-02-20},
url = {https://ctan.org/pkg/caption},
- urldate = {2017-03-01},
+ urldate = {2022-05-04},
language = {english},
}
@@ -105,7 +106,8 @@
@online{enumitem,
author = {Bezos, Javier},
- title = {Customizing lists with the enumitem package (Version 3.5.2)},
+ title = {Customizing lists with the enumitem package},
+ edition = {Ver.~3.5.2},
type = {M/OL},
date = {2011-09-28},
url = {https://ctan.org/pkg/enumitem},
@@ -138,10 +140,11 @@
@online{graphicx,
author = {Carlisle, D. P.},
title = {Packages in the `graphics' bundle},
+ edition = {Ver.~1.2d},
type = {M/OL},
- date = {2016-12-23},
+ date = {2021-09-16},
url = {https://ctan.org/pkg/graphicx},
- urldate = {2017-03-01},
+ urldate = {2022-05-04},
language = {english},
}
@@ -170,20 +173,22 @@
@online{newtx,
author = {Sharpe, Michael},
title = {New TX font package},
+ edition = {Ver.~1.71},
type = {M/OL},
- date = {2017-01-30},
+ date = {2022-03-02},
url = {https://ctan.org/pkg/newtx},
- urldate = {2017-03-01},
+ urldate = {2022-05-04},
language = {english},
}
@online{scrextend,
author = {Kohm, Markus},
title = {KOMA-Script: a versatile \hologo{LaTeX2e} bundle},
+ edition = {Ver.~3.35},
type = {M/OL},
- date = {2017-01-02},
+ date = {2021-11-13},
url = {https://ctan.org/pkg/koma-script},
- urldate = {2017-03-01},
+ urldate = {2022-05-04},
language = {english},
}
@@ -200,7 +205,8 @@
@online{tikz,
author = {Till Tantau},
- title = {The TikZ and PGF Packages: Manual for version 3.0.1a},
+ title = {The TikZ and PGF Packages},
+ edition = {Ver.~3.0.1a},
type = {M/OL},
date = {2015-08-29},
url = {https://ctan.org/pkg/pgf},
@@ -229,6 +235,17 @@
language = {english},
}
+@online{unicode-math,
+ author = {Robertson, Will and Stephani, Philipp and Wright, Joseph and Hosny, Khaled},
+ title = {Experimental Unicode mathematical typesetting: The unicode-math package},
+ edition = {Ver.~0.8q},
+ type = {M/OL},
+ date = {2020-01-31},
+ url = {https://ctan.org/pkg/unicode-math},
+ urldate = {2022-05-04},
+ language = {english},
+}
+
@online{dypang,
author = {dypang},
title = {北京大学硕博论文模版(测试版)},
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
index 9a8e1de8c9..0bccb1a29b 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.1}
+\newcommand*{\docversion}{v1.9.2}
\pkuthssinfo{
cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
ctitle = {北京大学学位论文模版{\thssnl}pkuthss \docversion},
@@ -60,7 +60,7 @@
\texorpdfstring{\thssnl}{: }pkuthss \docversion%
},
cauthor = {盖茨波·钛·维克托}, eauthor = {Casper Ti.\ Vector},
- date = {\zhdigits{2021}年\zhnumber{10}月},
+ date = {\zhdigits{2022}年\zhnumber{5}月},
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 9d539c707d..7789b318aa 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 500b3bb4cb..0633806021 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}
- [2021/10/16 v1.9.1 Labels and captions in GBK encoding
+ [2022/05/05 v1.9.2 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 e1d9566ed6..5d0e25905e 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}
- [2021/10/16 v1.9.1 Labels and captions in UTF-8 encoding
+ [2022/05/05 v1.9.2 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 e03a7bd4e4..22bdde1209 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss.cls
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss.cls
@@ -1,7 +1,7 @@
% Peking University dissertation document class
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2021 Casper Ti. Vector
+% Copyright (c) 2010-2022 Casper Ti. Vector
% Copyright (c) 2021 Kurapica
%
% This work may be distributed and/or modified under the conditions of the
@@ -25,7 +25,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2021/10/16 v1.9.1 Peking University dissertation document class]
+ [2022/05/05 v1.9.2 Peking University dissertation document class]
% eg. `\thss@int@boolopt{spacing}{true}' will expand to:
% \newif\ifthss@opt@spacing \thss@opt@spacingtrue
@@ -65,8 +65,6 @@
% Process all class options now.
\ProcessOptions\relax
-% Prevent fontspec (loaded by xeCJK) from interfering with newtxmath.
-\ifthss@opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi
% Work around the `\lvert already defined' error.
% cf. <https://github.com/CTeX-org/ctex-kit/issues/454>.
\ifthss@opt@pkufont\RequirePackage{amsmath}\fi
@@ -90,11 +88,40 @@
\ifthss@opt@pkufont
% Use Times New Roman / Arial according to school regulation.
- % Option used to prevent newtxtext from manipulating footnote marks.
- \RequirePackage[defaultsups]{newtxtext}
- \RequirePackage[cmintegrals, varg]{newtxmath}
+ \ifxetex
+ \RequirePackage{unicode-math}
+ \setmathfont[
+ Extension = .otf,
+ BoldFont = XITSMath-Bold
+ ]{XITSMath-Regular}
+ \DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}
+ \let\sumop\relax\let\prodop\relax
+ \DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
+ \DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
+ \renewcommand{\Box}{\mdlgwhtsquare}
+
+ \setmainfont[
+ Extension = .otf,
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic
+ ]{XITS}
+ \setsansfont[
+ Extension = .otf,
+ UprightFont = *-regular,
+ BoldFont = *-bold,
+ ItalicFont = *-italic,
+ BoldItalicFont = *-bolditalic
+ ]{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}
+ \fi
\else
- % Provides `\Box' for originauth.tex if newtx is absent.
+ % Provides `\Box' for originauth.tex if XITSMath/newtx is absent.
\RequirePackage{latexsym}
\fi
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.def b/macros/latex/contrib/pkuthss/tex/pkuthss.def
index 3ffe3008ad..80239cf01c 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}
- [2021/10/16 v1.9.1 Labels and captions for the pkuthss document class]
+ [2022/05/05 v1.9.2 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 919d1faf40..8021172ab7 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuword.pdf
+++ b/macros/latex/contrib/pkuthss/tex/pkuword.pdf
Binary files differ