From 418009d3a363c5b15f39b7a52c22aa0ba84b6a66 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 30 Oct 2022 20:43:48 +0000 Subject: pkuthss (30oct22) git-svn-id: svn://tug.org/texlive/trunk@64869 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pkuthss/example.pdf | Bin 103792 -> 103719 bytes .../texmf-dist/doc/latex/pkuthss/example/spine.tex | 9 ++-- .../doc/latex/pkuthss/example/thesis.tex | 4 +- Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf | Bin 439556 -> 348380 bytes .../doc/latex/pkuthss/readme/ChangeLog.txt | 9 ++++ .../latex/pkuthss/readme/chap/pkuthss-chap2.tex | 5 +- .../latex/pkuthss/readme/chap/pkuthss-chap3.tex | 17 +----- .../latex/pkuthss/readme/chap/pkuthss-intro.tex | 4 +- .../latex/pkuthss/readme/ctex-fontset-pkuthss.def | 58 +++++++++++++++++++++ .../doc/latex/pkuthss/readme/ctexopts.cfg | 4 ++ .../doc/latex/pkuthss/readme/pkuthss.bib | 20 +++---- .../doc/latex/pkuthss/readme/pkuthss.tex | 4 +- Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf | Bin 3530 -> 3530 bytes .../texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def | 2 +- .../texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def | 2 +- Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls | 24 ++++----- Master/texmf-dist/tex/latex/pkuthss/pkuthss.def | 2 +- Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf | Bin 6280 -> 6280 bytes 18 files changed, 110 insertions(+), 54 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/pkuthss/readme/ctex-fontset-pkuthss.def create mode 100644 Master/texmf-dist/doc/latex/pkuthss/readme/ctexopts.cfg (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf index a435dc0541d..18b82d1f723 100644 Binary files a/Master/texmf-dist/doc/latex/pkuthss/example.pdf and b/Master/texmf-dist/doc/latex/pkuthss/example.pdf differ diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex b/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex index 005e4c3950f..8bcb77dd58a 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/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/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex index dbfd37994db..f12e379affc 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/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/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf index 7e96dbb735a..d81143c6420 100644 Binary files a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf and b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf differ diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt index 665120151a3..89e7fcb8996 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/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/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex index 4b5073b08ab..de7aa296ee2 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/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/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex index 7dcf4ff8553..c39ea13268c 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/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/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex index 396f9fe6c30..70f4bf53609 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/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/Master/texmf-dist/doc/latex/pkuthss/readme/ctex-fontset-pkuthss.def b/Master/texmf-dist/doc/latex/pkuthss/readme/ctex-fontset-pkuthss.def new file mode 100644 index 00000000000..4b8d75c4f8c --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ctex-fontset-pkuthss.def @@ -0,0 +1,58 @@ +\ProvidesExplFile{\ExplFileName}{}{}{} + +\sys_if_engine_pdftex:TF + { + \ctex_zhmap_case:nnn + { + \ctex_punct_set:n { windows } + \setCJKmainfont + [ BoldFont = simhei.ttf , ItalicFont = simkai.ttf ] { simsun.ttc } + \setCJKsansfont { simhei.ttf } + \setCJKmonofont { simfang.ttf } + \setCJKfamilyfont { zhkai } { simkai.ttf } + \setCJKfamilyfont { zhfs } { simfang.ttf } + \setCJKfamilyfont { zhsong } { simsun.ttc } + \setCJKfamilyfont { zhhei } { simhei.ttf } + %\setCJKfamilyfont { zhli } { simli.ttf } + %\setCJKfamilyfont { zhyou } { simyou.ttf } + \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } + \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei } + \ctex_punct_map_family:nn { \CJKttdefault } { zhfs } + \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai } + \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei } + } + { + \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { windows } + \ctex_punct_set:n { windows } + \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } + \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei } + \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai } + } + { + \tl_set:Nn \CJKrmdefault { rm } + \tl_set:Nn \CJKsfdefault { sf } + \tl_set:Nn \CJKttdefault { tt } + } + } + { + \setCJKmainfont + [ BoldFont = SimHei , ItalicFont = KaiTi ] { SimSun } + \setCJKsansfont { SimHei } + \setCJKmonofont { FangSong } + \setCJKfamilyfont { zhsong } { SimSun } + \setCJKfamilyfont { zhhei } { SimHei } + \setCJKfamilyfont { zhkai } { KaiTi } + \setCJKfamilyfont { zhfs } { FangSong } + %\setCJKfamilyfont { zhli } { LiSu } + %\setCJKfamilyfont { zhyou } { YouYuan } + } + +\NewDocumentCommand \songti { } { \CJKfamily { zhsong } } +\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } } +\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } } +\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } } +%\NewDocumentCommand \lishu { } { \CJKfamily { zhli } } +%\NewDocumentCommand \youyuan { } { \CJKfamily { zhyou } } + +\endinput +% vim:ft=tex:ts=2:sw=2:et diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/ctexopts.cfg b/Master/texmf-dist/doc/latex/pkuthss/readme/ctexopts.cfg new file mode 100644 index 00000000000..0dc8094ed5e --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ctexopts.cfg @@ -0,0 +1,4 @@ +\ProvidesExplFile{\ExplFileName}{}{}{} +\keys_set:nn { ctex / option } { fontset = pkuthss } +\endinput +% vim:ft=tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib index 9e1770056e5..6f7e3d323c5 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/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/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex index 0bccb1a29bd..2def8ad843a 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/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/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf index 7789b318aa6..8160a065648 100644 Binary files a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf and b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf differ diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def index 0633806021a..46b20d974dc 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def +++ b/Master/texmf-dist/tex/latex/pkuthss/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/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def index 5d0e25905ea..e0358eb18ee 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def +++ b/Master/texmf-dist/tex/latex/pkuthss/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/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls index 22bdde1209e..ad3945afba0 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls +++ b/Master/texmf-dist/tex/latex/pkuthss/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. . \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/Master/texmf-dist/tex/latex/pkuthss/pkuthss.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.def index 80239cf01cc..c4b26817459 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.def +++ b/Master/texmf-dist/tex/latex/pkuthss/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/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf index 8021172ab7c..e608ef5defa 100644 Binary files a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf and b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf differ -- cgit v1.2.3