From 7d12aa3abfed48004f4fb8fa84ee757b6f900726 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 3 Nov 2020 03:02:09 +0000 Subject: CTAN sync 202011030302 --- macros/latex/contrib/pkuthss/doc/example.pdf | Bin 92605 -> 93675 bytes macros/latex/contrib/pkuthss/doc/example/Makefile | 42 --------------------- .../pkuthss/doc/example/ctex-fontset-pkuthss.def | 2 +- macros/latex/contrib/pkuthss/doc/pkuthss.pdf | Bin 401774 -> 315791 bytes .../latex/contrib/pkuthss/doc/readme/ChangeLog.txt | 18 +++++++++ .../pkuthss/doc/readme/chap/pkuthss-abs.tex | 1 + .../pkuthss/doc/readme/chap/pkuthss-ack.tex | 1 + .../pkuthss/doc/readme/chap/pkuthss-chap1.tex | 3 +- .../pkuthss/doc/readme/chap/pkuthss-chap2.tex | 5 ++- .../pkuthss/doc/readme/chap/pkuthss-chap3.tex | 1 + .../pkuthss/doc/readme/chap/pkuthss-concl.tex | 1 + .../pkuthss/doc/readme/chap/pkuthss-copy.tex | 1 + .../pkuthss/doc/readme/chap/pkuthss-encl1.tex | 1 + .../pkuthss/doc/readme/chap/pkuthss-intro.tex | 1 + .../pkuthss/doc/readme/pkuthss-english.patch | 18 ++++----- .../latex/contrib/pkuthss/doc/readme/pkuthss.bib | 29 ++++++++++++++ .../latex/contrib/pkuthss/doc/readme/pkuthss.tex | 5 ++- macros/latex/contrib/pkuthss/tex/pkulogo.pdf | Bin 3828 -> 3530 bytes macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def | 2 +- macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def | 2 +- macros/latex/contrib/pkuthss/tex/pkuthss.cls | 8 ++-- macros/latex/contrib/pkuthss/tex/pkuword.pdf | Bin 6579 -> 6280 bytes 22 files changed, 78 insertions(+), 63 deletions(-) delete mode 100644 macros/latex/contrib/pkuthss/doc/example/Makefile (limited to 'macros/latex/contrib/pkuthss') diff --git a/macros/latex/contrib/pkuthss/doc/example.pdf b/macros/latex/contrib/pkuthss/doc/example.pdf index b996c5d1b9..ea1a631bda 100644 Binary files a/macros/latex/contrib/pkuthss/doc/example.pdf and b/macros/latex/contrib/pkuthss/doc/example.pdf differ diff --git a/macros/latex/contrib/pkuthss/doc/example/Makefile b/macros/latex/contrib/pkuthss/doc/example/Makefile deleted file mode 100644 index 7437115a33..0000000000 --- a/macros/latex/contrib/pkuthss/doc/example/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) 2008-2009 solvethis -# Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector -# Public domain. - -# 被编译的主文件的文件名,不包括扩展名。 -JOB = thesis -# 这个变量的值可以为 latex、pdflatex 或 xelatex。 -LATEX = latex -BIBTEX = biber -l zh__pinyin --output-safechars -DVIPDF = dvipdfmx - -# 如果用 LaTeX 编译,则使用 dvipdfmx 将 dvi 转成 pdf。 -ifeq ($(LATEX), latex) - DODVIPDF = $(DVIPDF) $(JOB) -endif - -# 区分是 Windows 环境还是类 UNIX 环境。 -# 如果是后者,则 GNU make 将可以检测到已经定义 PATH 环境变量。 -ifdef PATH - MAKE = make - RM = rm -f -else - MAKE = mingw32-make - RM = del -endif - -doc: - $(LATEX) $(JOB) - $(BIBTEX) $(JOB) - $(LATEX) $(JOB) - $(LATEX) $(JOB) - $(DODVIPDF) - -clean: - $(RM) $(JOB).aux $(JOB).bbl $(JOB).bcf $(JOB).blg $(JOB).dvi \ - $(JOB).lof $(JOB).log $(JOB).lot $(JOB).run.xml $(JOB).toc \ - $(JOB).out $(JOB).out.bak missfont.log texput.log chap/*.aux - -distclean: clean - $(RM) $(JOB).pdf - -# vim:ts=4:sw=4 diff --git a/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def b/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def index b503fc729a..4b8d75c4f8 100644 --- a/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def +++ b/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def @@ -22,7 +22,7 @@ \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei } } { - \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts } + \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 } diff --git a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf index 97a7442140..837e526455 100644 Binary files a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf and b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf differ diff --git a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt index 820daecd54..aaf026bf9f 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt +++ b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt @@ -1,3 +1,21 @@ +2020-11-02, v1.8.3 + + * Changes to example template: + - ctex-fontset-pkuthss.def: update `\ctex_load_zhmap' usage. + - Remove Makefile. + + * Changes to package code: + - pkuthss.cls: do not let ulem mess with `\emph'. + - pkuthss.cls: make `ugly' title page more compliant. + + * Changes to documentation: + - pkuthss-chap[12].tex: `须'/`需' typo. + - Remove space around `\zhdigits' in date. + - Add pkuthss.bib to copyright lines. + + * Misc: + - Minor fixes and cosmetics. + 2019-11-17, v1.8.2 * Misc: diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-abs.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-abs.tex index 5dc80d5285..453d56bb69 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-abs.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-abs.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-ack.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-ack.tex index 0fd606b7b0..2859463747 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-ack.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-ack.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex 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 2e5152ece5..232f427558 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex @@ -55,7 +56,7 @@ 我们建议用户使用最新、完全版的 \hologo{TeX} 系统和各宏包。% } -中文字体须要用户自行获得。\myemph{% +中文字体需要用户自行获得。\myemph{% 注:一些中文字体的字库不全,只有 GB2312 字符集内字符的字体信息。 这种情况通常会造成编译生成的 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 4455b376b7..c7c1c75c18 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex @@ -252,7 +253,7 @@ \texttt{\bfseries\string\setpdfproperties} 命令 用于根据用户设定的文档信息自动设定生成的 pdf 文档的属性。 此命令会在用户调用 \verb|\maketitle| 命令时被自动调用, -因此通常不须要用户自己使用; +因此通常不需要用户自己使用; 但用户有时可能不须要输出封面,从而不会调用 \verb|\maketitle| 命令, 此时就须要在设定完文档信息之后调用 \verb|\setpdfproperties|。% \myemph{注意:须要启用 \texttt{pdfprop} 选项才能使用此命令。} @@ -324,7 +325,7 @@ $TEXMFDIST/tex/latex/pkuthss/ \end{Verbatim} 如果的确须要修改 pkuthss 文档类的源文件,\myemph{% - 建议用户将 \texttt{pkuthss.cls} 或其它需要修改的文件 + 建议用户将 \texttt{pkuthss.cls} 或其它须要修改的文件 复制到被编译的主文件所在的目录, 然后对此副本进行修改% }\footnote{% 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 77de4b0461..0fbd72bd47 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex index 4d71382198..93fb141f4c 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex index 736ee4c298..68d86f34de 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex index f87f67472f..e085ba1497 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex 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 c5485c2a3f..396f9fe6c3 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch index 67174bdfbc..ee9cadcad2 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch +++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch @@ -100,12 +100,12 @@ index ac5b0c9..9d2ad60 100644 - % vim:ts=4:sw=4 diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex -index 30e05de..4d6ee53 100644 +index 9c5f042..a54d01f 100644 --- a/doc/example/thesis.tex +++ b/doc/example/thesis.tex -@@ -16,54 +16,44 @@ +@@ -12,54 +12,44 @@ + \documentclass[UTF8]{pkuthss} % 如果的确须要使脚注按页编号的话,可以去掉后面 footmisc 包的注释。 - % 注意:在启用此设定的情况下,可能要多编译一次以产生正确的脚注编号。 %\usepackage[perpage]{footmisc} - -% 使用 biblatex 排版参考文献,并规定其格式(详见 biblatex-caspervector 的文档)。 @@ -182,11 +182,11 @@ index 30e05de..4d6ee53 100644 % 以下为正文之前的部分,默认不进行章节编号。 \frontmatter diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def -index b699685..e4e58b6 100644 +index 9bc6000..7650e53 100644 --- a/tex/pkuthss-utf8.def +++ b/tex/pkuthss-utf8.def @@ -25,13 +25,13 @@ - [2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding + [2019/11/17 v1.8.2 Labels and captions in UTF-8 encoding for the pkuthss document class] -\def\label@ctitle{题目:} @@ -207,10 +207,10 @@ index b699685..e4e58b6 100644 \def\label@ckeywords{关键词:} \def\label@ekeywords{KEYWORDS:\ } diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls -index 9e68dc3..4b8cb00 100644 +index e34fe2d..477b3f4 100644 --- a/tex/pkuthss.cls +++ b/tex/pkuthss.cls -@@ -301,7 +301,7 @@ +@@ -304,7 +304,7 @@ \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp} \fancyfoot[C]{\zihao{5}\normalfont{\thepage}} \if@twoside @@ -219,7 +219,7 @@ index 9e68dc3..4b8cb00 100644 \fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}} \else \fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}} -@@ -347,13 +347,13 @@ +@@ -350,13 +350,13 @@ \zihao{1}% \includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}% \raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em] @@ -235,7 +235,7 @@ index 9e68dc3..4b8cb00 100644 } \vfill % Information about the author. -@@ -361,19 +361,19 @@ +@@ -364,19 +364,19 @@ % 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 a85359a66e..3404e2a59a 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib +++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib @@ -1,3 +1,32 @@ +% Documentation for pkuthss. +% +% Copyright (c) 2008-2009 solvethis +% Copyright (c) 2010-2019 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.tex +% pkuthss.bib +% chap/pkuthss-copy.tex +% chap/pkuthss-abs.tex +% chap/pkuthss-intro.tex +% chap/pkuthss-chap1.tex +% chap/pkuthss-chap2.tex +% chap/pkuthss-chap3.tex +% chap/pkuthss-concl.tex +% chap/pkuthss-encl1.tex +% chap/pkuthss-ack.tex + @online{amsthm, author = {{Publications Technical Group, American Mathematical Society}}, title = {Using the amsthm Package}, diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex index 2e8b081f48..522ebd9d54 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex @@ -16,6 +16,7 @@ % % This work consists of the following files: % pkuthss.tex +% pkuthss.bib % chap/pkuthss-copy.tex % chap/pkuthss-abs.tex % chap/pkuthss-intro.tex @@ -49,7 +50,7 @@ tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi} } -\newcommand*{\docversion}{v1.8.2} +\newcommand*{\docversion}{v1.8.3} \pkuthssinfo{ cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, ctitle = {北京大学学位论文模版\\pkuthss \docversion}, @@ -60,7 +61,7 @@ cauthor = {盖茨波·钛·维克托}, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {\zhdigits{2019} 年 \zhnumber{11} 月}, + date = {\zhdigits{2020}年\zhnumber{11}月}, school = {化学与分子工程学院}, cmajor = {化学(?)}, emajor = {Chemistry ... ?}, direction = {据说 Casper 自己也不知道}, diff --git a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf index 0d70935c6a..03850ac253 100644 Binary files a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf and b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf differ diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def index 02e885da95..caf9986940 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def +++ b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def @@ -22,7 +22,7 @@ % pkuword.eps \ProvidesFile{pkuthss-gbk.def} - [2019/11/17 v1.8.2 Labels and captions in GBK encoding + [2020/11/02 v1.8.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 9bc6000ac1..a5f2722160 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def +++ b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def @@ -22,7 +22,7 @@ % pkuword.eps \ProvidesFile{pkuthss-utf8.def} - [2019/11/17 v1.8.2 Labels and captions in UTF-8 encoding + [2020/11/02 v1.8.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 7f75114da4..0a021b8bd7 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss.cls +++ b/macros/latex/contrib/pkuthss/tex/pkuthss.cls @@ -23,7 +23,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2019/11/17 v1.8.2 Peking University dissertation document class] + [2020/11/02 v1.8.3 Peking University dissertation document class] % eg. `\thss@int@boolopt{spacing}{true}' will expand to: % \newif\ifthss@opt@spacing \thss@opt@spacingtrue @@ -80,8 +80,8 @@ \RequirePackage{geometry} % fancyhdr provides utilities for setting up headers and footers. \RequirePackage{fancyhdr} -% Provides `\uline' used in `\maketitle'. -\RequirePackage{ulem} +% Provides `\uline' used in `\maketitle' (but do not mess with `\emph'). +\RequirePackage[normalem]{ulem} % `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace. \AtEndOfClass{\RequirePackage{hyperref}} @@ -381,7 +381,7 @@ } \vfill % Date. - {\zihao{-2}\@date} + {\ifthss@opt@ugly\zihao{3}\else\zihao{-2}\fi\@date} \par\endgroup\end{titlepage}% } diff --git a/macros/latex/contrib/pkuthss/tex/pkuword.pdf b/macros/latex/contrib/pkuthss/tex/pkuword.pdf index 762067f759..5884b8efd3 100644 Binary files a/macros/latex/contrib/pkuthss/tex/pkuword.pdf and b/macros/latex/contrib/pkuthss/tex/pkuword.pdf differ -- cgit v1.2.3