From 1927ebbe0621fbca8bf2c12796dc99cfeafdeb25 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 1 Mar 2017 22:31:29 +0000 Subject: pkuthss (1mar17) git-svn-id: svn://tug.org/texlive/trunk@43374 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pkuthss/example.pdf | Bin 95190 -> 91904 bytes .../doc/latex/pkuthss/example/chap/copyright.tex | 4 ++-- .../doc/latex/pkuthss/example/chap/originauth.tex | 6 +++--- .../pkuthss/example/misc/ctex-fontset-pkuthss.def | 2 +- Master/texmf-dist/doc/latex/pkuthss/readme.pdf | Bin 402855 -> 399718 bytes .../doc/latex/pkuthss/readme/ChangeLog.txt | 17 +++++++++++++++++ .../doc/latex/pkuthss/readme/chap/originauth.tex | 6 +++--- .../latex/pkuthss/readme/chap/pkuthss-chap2.tex | 19 ++++++------------- .../latex/pkuthss/readme/chap/pkuthss-chap3.tex | 4 ++-- .../pkuthss/readme/chap/pkuthss-copyright.tex | 2 +- .../doc/latex/pkuthss/readme/pkuthss.bib | 14 +++++++------- .../doc/latex/pkuthss/readme/pkuthss.tex | 9 ++++----- 12 files changed, 46 insertions(+), 37 deletions(-) (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf index 2fe6104c540..ce9feee2439 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/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex index 47d55d533f7..6e0f2781c5e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex @@ -1,5 +1,5 @@ % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016 Casper Ti. Vector +% Copyright (c) 2010-2017 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ 否则一旦引起有碍作者著作权之问题,将可能承担法律责任。 % 若需排版二维码,请将二维码图片重命名为“barcode”, -% 转为合适的图片格式,并放在当前目录下,然后去掉下面 3 行的注释。 +% 转为合适的图片格式,并放在当前目录下,然后去掉下面 2 行的注释。 %\vfill\noindent %\includegraphics[height = 5em]{barcode} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex index c0c62d42a8b..db9f7354982 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex @@ -1,5 +1,5 @@ % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016 Casper Ti. Vector +% Copyright (c) 2010-2017 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -28,9 +28,9 @@ % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. { - \CTEXsetup[ + \ctexset{section = { format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp} - ]{section} + }} % 学校书面要求本页面不要页码,但在给出的 Word 模版中又有页码且编入了目录。 % 此处以 Word 模版为实际标准进行设定。 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def index 8ca79f75ba5..2febb6122d5 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def +++ b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def @@ -1,6 +1,6 @@ \ProvidesExplFile{\ExplFileName}{}{}{} -\pdftex_if_engine:TF +\sys_if_engine_pdftex:TF { \ctex_zhmap_case:nnn { diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf index 0f348112b26..3ca347843b9 100644 Binary files a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf and b/Master/texmf-dist/doc/latex/pkuthss/readme.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 cc9e535e3f6..e29c893068a 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt @@ -1,3 +1,20 @@ +2017-03-01, v1.7.4 + + * API changes: + - pkuthss.cls: provide undocumented option for uglification. + + * Changes to example template: + - ctex-fontset-pkuthss.def: follow LaTeX3 change. + - copyright.tex: fix now inaccurate comment. + + * Changes to package code: + - Remove support for ctex < v2.x. + - Replace CJKfntef's `\CJKunderline' with ulem's `\uline'. + - pkuthss.cls: tweak newtxmath setup. + + * Misc: + - Minor fixes and cosmetics. + 2016-05-24, v1.7.3 * Changes to package code: diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex index c0c62d42a8b..db9f7354982 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex @@ -1,5 +1,5 @@ % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016 Casper Ti. Vector +% Copyright (c) 2010-2017 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -28,9 +28,9 @@ % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. { - \CTEXsetup[ + \ctexset{section = { format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp} - ]{section} + }} % 学校书面要求本页面不要页码,但在给出的 Word 模版中又有页码且编入了目录。 % 此处以 Word 模版为实际标准进行设定。 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 e49f1fc040f..71d44beb6e3 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 @@ -1,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016 Casper Ti. Vector +% Copyright (c) 2010-2017 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 @@ -261,22 +261,15 @@ \section{从其它文档类和宏包继承的功能}\label{sec:thirdparty} pkuthss 文档类建立在 ctexbook\supercite{ctex} 文档类之上, -并调用了 CJKfntef、hyperref\supercite{hyperref}、% -geometry\supercite{geometry}、fancyhdr\supercite{fancyhdr} -和 graphicx\supercite{graphicx} 等几个宏包; -使用 \hologo{pdfLaTeX} 方式编译 GBK 编码的源文件时还会调用 -xCJK2uni\supercite{xCJK2uni} 宏包\footnote{% - ctex 2.x 会自行调用 xCJK2uni 宏包, - 不用在 pkuthss 文档类中重复调用; - 这里调用 xCJK2un 是为了兼容 ctex 1.x 而进行的设定, - 该设定将在 2017 年被去除。% -}。 +并调用了 geometry\supercite{geometry}、fancyhdr\supercite{fancyhdr}、% +hyperref\supercite{hyperref}、graphicx\supercite{graphicx} +和 ulem\supercite{ulem} 等几个宏包。 因此,ctexbook 文档类和这些宏包所提供的功能均可以使用。 例如,用户如果想将目录的标题改为“目{\quad\quad}录”, -则可以使用 ctexbook 文档类提供的 \verb|\CTEXoptions| 命令: +则可以使用 ctexbook 文档类提供的 \verb|\ctexset| 命令: \begin{Verbatim}[frame = single] -\CTEXoptions[contentsname = {目{\quad\quad}录}] +\ctexset[contentsname = {目{\quad\quad}录}] \end{Verbatim} 在默认的配置下,% 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 bef65cd4f69..6ed6273abde 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-2015 Casper Ti. Vector +% Copyright (c) 2010-2017 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 @@ -55,7 +55,7 @@ Windows 的“记事本”程序在查看 LF(\texttt{\string\n}) \section{上游宏包可能引起的问题} biblatex\supercite{biblatex} 宏包会自行设定 \verb|\bibname|, -故会覆盖通过 \verb|\CTEXoptions| 设定的参考文献列表标题。 +故会覆盖通过 \verb|\ctexset| 设定的参考文献列表标题。 使用 biblatex 的用户可以使用 \verb|\printbibliography| 的 \verb|title| 选项来手动设定参考文献列表的标题,例如: \begin{Verbatim}[frame = single] diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex index e602963a8c9..b646a1cb3a7 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex @@ -31,7 +31,7 @@ 版权所有 \copyright\ 2008--2009 solvethis \par -版权所有 \copyright\ 2010--2016 Casper Ti. Vector +版权所有 \copyright\ 2010--2017 Casper Ti. Vector \vskip 1em pkuthss 文档类及其说明文档均以 \hologo{LaTeX} Project Public License 发布。 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib index 3b5ba98fe3e..bf6a9f3b2f5 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib @@ -158,14 +158,14 @@ language = {english}, } -@online{xCJK2uni, - author = {李清}, - title = {xCJK2uni 宏包(v0.1)}, +@online{ulem, + author = {Arseneau, Donald}, + title = {The ulem package: underlining for emphasis}, type = {M/OL}, - date = {2013-08-17}, - url = {http://mirror.ctan.org/macros/latex/contrib/xcjk2uni/}, - urldate = {2014-05-10}, - language = {chinese}, + date = {2011-03-18}, + url = {http://mirror.ctan.org/macros/latex/contrib/ulem/}, + urldate = {2016-06-22}, + language = {english}, } @online{dypang, diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex index d3ad431ace5..e1396306b73 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex @@ -27,10 +27,9 @@ % chap/pkuthss-acknowledge.tex \documentclass[UTF8]{pkuthss} - \usepackage[ - backend = biber, style = caspervector, utf8, sorting = ecnty, - giveninits = true, sortgiveninits = true + backend = biber, style = caspervector, utf8, + sorting = ecnty, giveninits = true, sortgiveninits = true ]{biblatex} \usepackage{fancyvrb} \usepackage{hologo} @@ -43,7 +42,7 @@ \hypersetup{colorlinks = true, allcolors = blue} \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} \newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}} -\newcommand{\docversion}{v1.7.3} +\newcommand{\docversion}{v1.7.4} \pkuthssinfo{ cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, @@ -55,7 +54,7 @@ cauthor = {盖茨波·钛·维克托}, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {二〇一六年五月}, + date = {二〇一七年三月}, school = {化学与分子工程学院}, cmajor = {化学(?)}, emajor = {Chemistry ... ?}, direction = {据说 Casper 自己也不知道}, -- cgit v1.2.3