diff options
50 files changed, 351 insertions, 666 deletions
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Makefile b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Makefile deleted file mode 100644 index 27cd5e3ade5..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# vim:ts=4:sw=4 -# -# Copyright (c) 2008-2009 solvethis -# Copyright (c) 2010-2012 Casper Ti. Vector -# Public domain. - -# 被编译的主文件的文件名，不包括扩展名。 -JOBNAME = thesis -# 这个变量的值可以为 latex、pdflatex 或 xelatex。 -LATEX = latex -# 如果无法使用 biber，可以改为“bibtex”。 -BIBTEX = biber -l zh__pinyin -DVIPDF = dvipdfmx - -# 如果用 LaTeX 编译，则使用 dvipdfmx 将 dvi 转成 pdf。 -ifeq ($(LATEX), latex) - DODVIPDF = $(DVIPDF) $(JOBNAME) -endif - -# 区分是 Windows 环境还是类 UNIX 环境。 -# 如果是后者，则 GNU make 将可以检测到已经定义 PATH 环境变量。 -ifdef PATH - MAKE = make - RM = rm -f -else - MAKE = mingw32-make - RM = del -endif - -doc: - $(LATEX) $(JOBNAME) - $(BIBTEX) $(JOBNAME) - $(LATEX) $(JOBNAME) - $(LATEX) $(JOBNAME) - $(DODVIPDF) - -clean: - $(RM) $(JOBNAME).{aux,bbl,bcf,blg,dvi,lof,log,lot,run.xml,toc,out{,.bak}} \ - {missfont,texput}.log chap/*.aux - -distclean: clean - $(RM) $(JOBNAME).pdf - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/abstract.tex deleted file mode 100644 index 4a40f3e415e..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/abstract.tex +++ /dev/null @@ -1,13 +0,0 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector -% Public domain. - -\begin{cabstract} - % 中文测试文字。 - \pkuthssffaq -\end{cabstract} - -\begin{eabstract} - Test of the English abstract. -\end{eabstract} - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/acknowledge.tex deleted file mode 100644 index 3c41379b7e8..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/acknowledge.tex +++ /dev/null @@ -1,8 +0,0 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector -% Public domain. - -\chapter{致谢} -% 中文测试文字。 -\pkuthssffaq - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/chap1.tex deleted file mode 100644 index 326698b75c1..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/chap1.tex +++ /dev/null @@ -1,8 +0,0 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector -% Public domain. - -\chapter{章节} -% 中文测试文字。 -\pkuthssffaq - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/conclusion.tex deleted file mode 100644 index 0394566970d..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/conclusion.tex +++ /dev/null @@ -1,8 +0,0 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector -% Public domain. - -\specialchap{结论} -% 中文测试文字。 -\pkuthssffaq - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/copyright.tex deleted file mode 100644 index 4b1a7923dcf..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/copyright.tex +++ /dev/null @@ -1,44 +0,0 @@ -% vim:ts=4:sw=4 -% -% Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2015 Casper Ti. Vector -% All rights reserved. -% -% Redistribution and use in source and binary forms, with or without -% modification, are permitted provided that the following conditions are -% met: -% -% * Redistributions of source code must retain the above copyright notice, -% this list of conditions and the following disclaimer. -% * Redistributions in binary form must reproduce the above copyright -% notice, this list of conditions and the following disclaimer in the -% documentation and/or other materials provided with the distribution. -% * Neither the name of Peking University nor the names of its contributors -% may be used to endorse or promote products derived from this software -% without specific prior written permission. -% -% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -% IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -% THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -% PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -% CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -% EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -% PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -% PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -% LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -% NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -% SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -\chapter*{版权声明} -\thispagestyle{empty} - -任何收存和保管本论文各种版本的单位和个人， -未经本论文作者同意，不得将本论文转借他人， -亦不得随意复制、抄录、拍照或以任何方式传播。 -否则一旦引起有碍作者著作权之问题，将可能承担法律责任。 - -% 若需排版二维码，请将二维码图片重命名为“barcode”， -% 转为合适的图片格式，并放在当前目录下，然后去掉下面 3 行的注释。 -%\vfill\noindent -%\includegraphics[height = 5em]{barcode} - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/encl1.tex deleted file mode 100644 index a28631e9057..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/encl1.tex +++ /dev/null @@ -1,8 +0,0 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector -% Public domain. - -\chapter{附件} -% 中文测试文字。 -\pkuthssffaq - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/introduction.tex deleted file mode 100644 index 5e448d3b897..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/introduction.tex +++ /dev/null @@ -1,8 +0,0 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector -% Public domain. - -\specialchap{序言} -% 中文测试文字。 -\pkuthssffaq - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/originauth.tex deleted file mode 100644 index a41e5944e3e..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/originauth.tex +++ /dev/null @@ -1,86 +0,0 @@ -% vim:ts=4:sw=4 -% -% Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2015 Casper Ti. Vector -% All rights reserved. -% -% Redistribution and use in source and binary forms, with or without -% modification, are permitted provided that the following conditions are -% met: -% -% * Redistributions of source code must retain the above copyright notice, -% this list of conditions and the following disclaimer. -% * Redistributions in binary form must reproduce the above copyright -% notice, this list of conditions and the following disclaimer in the -% documentation and/or other materials provided with the distribution. -% * Neither the name of Peking University nor the names of its contributors -% may be used to endorse or promote products derived from this software -% without specific prior written permission. -% -% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -% IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -% THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -% PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -% CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -% EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -% PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -% PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -% LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -% NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -% SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -% 原创性声明和使用授权说明页不需要装订到论文中，故不显示页码。 -\cleardoublepage\thispagestyle{empty} -{ - \vspace*{\fill}\linespread{1.5}\selectfont - \centerline{\bfseries\zihao{-2}北京大学学位论文原创性声明和使用授权说明} - - \vskip 4em - \centerline{\bfseries\zihao{-3}原创性声明} - \vskip 1em - - 本人郑重声明： - 所呈交的学位论文，是本人在导师的指导下，独立进行研究工作所取得的成果。 - 除文中已经注明引用的内容外， - 本论文不含任何其他个人或集体已经发表或撰写过的作品或成果。 - 对本文的研究做出重要贡献的个人和集体，均已在文中以明确方式标明。 - 本声明的法律结果由本人承担。 - \vskip 1em - \rightline - {% - 论文作者签名：\hspace{5em}% - 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日% - } - - \vskip 4em - \centerline{\bfseries\zihao{-3}学位论文使用授权说明} - \centerline{\zihao{5}（必须装订在提交学校图书馆的印刷本）} - \vskip 1em - - 本人完全了解北京大学关于收集、保存、使用学位论文的规定，即： - \begin{itemize} - \item 按照学校要求提交学位论文的印刷本和电子版本； - \item 学校有权保存学位论文的印刷本和电子版， - 并提供目录检索与阅览服务，在校园网上提供服务； - \item 学校可以采用影印、缩印、数字化或其它复制手段保存论文； - \item 因某种特殊原因需要延迟发布学位论文电子版， - 授权学校在 $\square$\nobreakspace{}一年 / % - $\square$\nobreakspace{}两年 / % - $\square$\nobreakspace{}三年以后在校园网上全文发布。 - \end{itemize} - \centerline{（保密论文在解密后遵守此规定）} - \vskip 1em - \rightline - {% - 论文作者签名：\hspace{5em}导师签名：\hspace{5em}% - 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日% - } - - % 若需排版二维码，请将二维码图片重命名为“barcode”， - % 转为合适的图片格式，并放在当前目录下，然后去掉下面 2 行的注释。 - %\vskip 4em \noindent - %\includegraphics[height = 5em]{barcode} - - \vspace*{\fill}\par -} - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.bib b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.bib deleted file mode 100644 index c8b9ea2dbef..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.bib +++ /dev/null @@ -1,20 +0,0 @@ -% vim:ts=4:sw=4 - -@article{test-en, - author = {Author}, - title = {Title}, - type = {J}, - journal = {Journal}, - date = {2014-04-01}, - language = {english}, -} - -@article{test-zh, - author = {作者}, - title = {标题}, - type = {J}, - journal = {期刊}, - date = {2014-04-01}, - language = {chinese}, -} - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex deleted file mode 100644 index 25826ce5f2e..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex +++ /dev/null @@ -1,146 +0,0 @@ -% vim:ts=4:sw=4 -% -% Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2015 Casper Ti. Vector -% Public domain. -% -% 使用前请先仔细阅读 pkuthss 和 biblatex-caspervector 的文档， -% 特别是其中的 FAQ 部分和用红色强调的部分。 -% 两者可在终端/命令提示符中用 -% texdoc pkuthss -% texdoc biblatex-caspervector -% 调出。 - -% 采用了自定义的（包括大小写不同于原文件的）字体文件名， -% 并改动 ctex.cfg 等配置文件的用户请自行加入 nofonts 选项； -% 其它用户不用加入 nofonts 选项，加入之后反而会产生错误。 -% -% 图书馆要求电子版论文的目录必须为黑色， -% 且某些教务要求打印版论文的文字部分为纯黑色而非灰度打印， -% 【因此最终打印和提交论文前，请将“colorlinks”改为“nocolorlinks”。】 -\documentclass[GBK, colorlinks]{pkuthss} - -% 使用 biblatex 排版参考文献，并规定其格式。 -% -% 如果无法使用 biber，可以把“backend = biber”改为“backend = bibtex”， -% 并改用 bibtex 产生参考文献，详见 pkuthss 的文档。 -% 使用 biber 时，请去掉所有的 sorting 选项，否则会出错。 -% -% 默认按照引用顺序排序（“sorting = none”），详见 biblatex-caspervector 的文档 -% （因为是默认设置所以其实不用写，不过出于完备性的考虑仍然在这里列出）。 -% 若需要按照英文文献在前，中文文献在后排序，请设置“sorting = ecnty”； -% 若需要按照中文文献在前，英文文献在后排序，请设置“sorting = centy”。 -\usepackage[backend = biber, style = caspervector, gbk, sorting = none]{biblatex} -% 提供近似于学校所要求的 Times New Roman / Arial 的字体。 -\usepackage[defaultsups]{newtxtext} -\usepackage{newtxmath} -% 产生 originauth.tex 里的 \square。 -\usepackage{amssymb} - -% 按学校要求设定参考文献列表中的条目之内及之间的距离。 -\setlength{\bibitemsep}{3bp} -% 对于 linespread 值的计算过程有兴趣的同学可以参考 pkuthss-extra.sty。 -\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont} - -% 设定文档的基本信息。 -\pkuthssinfo{ - cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, - ctitle = {测试文档}, etitle = {Test Document}, - cauthor = {某某}, - eauthor = {Test}, - studentid = {0123456789}, - date = {某年某月}, - school = {某某学院}, - cmajor = {某某专业}, emajor = {Some Major}, - direction = {某某方向}, - cmentor = {某某教授}, ementor = {Prof.\ Somebody}, - ckeywords = {其一，其二}, ekeywords = {First, Second} -} -% 导入参考文献数据库（注意不要省略“.bib”）。 -\addbibresource{thesis.bib} - -% 普通用户可删除此段。 -\usepackage{color} -\def\pkuthssffaq{% - \emph{\textcolor{red}{pkuthss 文档模版最常见问题：}} - - 在最终打印和提交论文之前， - 请将 pkuthss 文档类选项中的 % - \texttt{colorlinks} 改为 \texttt{nocolorlinks}， - 因为图书馆要求电子版论文的目录必须为黑色， - 且某些教务要求打印版论文的文字部分为纯黑色而非灰度打印。 - - \texttt{\string\cite}、\texttt{\string\parencite} % - 和 \texttt{\string\supercite} 三个命令分别产生% - 未格式化的、带方括号的和上标且带方括号的引用标记：% - \cite{test-en}，\parencite{test-zh}、\supercite{test-en, test-zh}。 - - 若要避免章末空白页，请在调用 pkuthss 文档类时加入 \texttt{openany} 选项。 - - 如果编译时不出参考文献， - 请参考 \texttt{texdoc pkuthss}“问题及其解决”一章 - “其它可能存在的问题”一节中关于 biber 的说明。 -} - -\begin{document} - % 以下为正文之前的部分，默认不进行章节编号。 - \frontmatter - % 此后到下一 \pagestyle 命令之前不排版页眉或页脚。 - \pagestyle{empty} - - % 自动生成标题页。 - \maketitle - % 版权声明。 - \include{chap/copyright} - - % 此后到下一 \pagestyle 命令之前正常排版页眉和页脚。 - \cleardoublepage - \pagestyle{plain} - % 重置页码计数器，用大写罗马数字排版此部分页码。 - \setcounter{page}{0} - \pagenumbering{Roman} - - % 中英文摘要。 - \include{chap/abstract} - % 自动生成目录。 - \tableofcontents - - % 以下为正文部分，默认要进行章节编号。 - \mainmatter - % 序言。 - \include{chap/introduction} - % 各章节。 - \include{chap/chap1} - % 结论。 - \include{chap/conclusion} - - % 正文中的附录部分。 - \appendix - % 排版参考文献列表。 - \printbibliography[ - % 使“参考文献”出现在目录中；如果同时要使参考文献列表参与章节编号， - % 可将“bibintoc”改为“bibnumbered”。 - heading = bibintoc, - % 单独设定排序方案。此设定会局部覆盖之前的全局设置。 - % 注：只有同时使用 2.x 或之后版本的 biblatex 和相应兼容版本的 biber， - % 才能对每个 \printbibliography 命令采用不同的排序方案， - % 否则只能在导入 biblatex 宏包时就（全局）指定排序方案。 - % 在这样的情况下，请去掉所有的 sorting 选项，否则可能出错。 - sorting = ecnty - ] - % 各附录。 - \include{chap/encl1} - - % 以下为正文之后的部分，默认不进行章节编号。 - \backmatter - % 致谢。 - \include{chap/acknowledge} - - % 此后不排版页眉或页脚。 - \cleardoublepage - \pagestyle{empty} - - % 原创性声明和使用授权说明。 - \include{chap/originauth} -\end{document} - diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Make.bat deleted file mode 100755 index a32a482514d..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Make.bat +++ /dev/null @@ -1,40 +0,0 @@ -@echo off
-
-@rem vim:ts=4:sw=4
-@rem
-@rem Copyright (c) 2008-2009 solvethis
-@rem Copyright (c) 2010-2012 Casper Ti. Vector
-@rem Public domain.
-
-set JOBNAME=thesis
-@rem 这个变量的值可以为 latex 或 pdflatex。
-set LATEX=latex
-@rem 如果无法使用 biber，可以改为“bibtex”。
-set BIBTEX=biber -l zh__pinyin
-set DVIPDF=dvipdfmx
-
-if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOBNAME%
-) else (set DODVIPDF=echo No need to run %DVIPDF%.)
-if "%1"=="" goto doc
-if "%1"=="doc" goto doc
-if "%1"=="clear" (goto clear) else (goto usage)
-
-:doc
-%LATEX% %JOBNAME%
-%BIBTEX% %JOBNAME%
-%LATEX% %JOBNAME%
-%LATEX% %JOBNAME%
-%DODVIPDF%
-goto end
-
-:clear
-del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out
-del missfont.log chap\*.aux
-goto end
-
-:usage
-echo %0 [doc] [clear]
-goto end
-
-:end
-
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf Binary files differindex ced4f4b6fa0..7be74754a80 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/example.pdf diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat index a32a482514d..fc0314ce851 100755 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat @@ -9,7 +9,6 @@ set JOBNAME=thesis
@rem 这个变量的值可以为 latex 或 pdflatex。
set LATEX=latex
-@rem 如果无法使用 biber，可以改为“bibtex”。
set BIBTEX=biber -l zh__pinyin
set DVIPDF=dvipdfmx
@@ -17,7 +16,7 @@ if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOBNAME% ) else (set DODVIPDF=echo No need to run %DVIPDF%.)
if "%1"=="" goto doc
if "%1"=="doc" goto doc
-if "%1"=="clear" (goto clear) else (goto usage)
+if "%1"=="clean" (goto clean) else (goto usage)
:doc
%LATEX% %JOBNAME%
@@ -27,14 +26,15 @@ if "%1"=="clear" (goto clear) else (goto usage) %DODVIPDF%
goto end
-:clear
+:clean
del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out
del missfont.log chap\*.aux
goto end
:usage
-echo %0 [doc] [clear]
+echo %0 [doc] [clean]
goto end
:end
+pause
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Makefile b/Master/texmf-dist/doc/latex/pkuthss/example/Makefile index addafb49f9c..f02f519daad 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Makefile +++ b/Master/texmf-dist/doc/latex/pkuthss/example/Makefile @@ -8,7 +8,6 @@ JOBNAME = thesis # 杩欎釜鍙橀噺鐨勫煎彲浠ヤ负 latex銆乸dflatex 鎴 xelatex銆 LATEX = latex -# 濡傛灉鏃犳硶浣跨敤 biber锛屽彲浠ユ敼涓衡渂ibtex鈥濄 BIBTEX = biber -l zh__pinyin DVIPDF = dvipdfmx diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex index 8f3a0286ac2..8f3a0286ac2 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/abstract.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex index 2a0d65c5675..2a0d65c5675 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/acknowledge.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex index 275b02acf0f..275b02acf0f 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex index 6b0ccd90c2a..6b0ccd90c2a 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/conclusion.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex index 2a25655c264..af97642fa54 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex @@ -30,7 +30,7 @@ % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \chapter*{鐗堟潈澹版槑} -\thispagestyle{empty} +\markboth{鐗堟潈澹版槑}{} 浠讳綍鏀跺瓨鍜屼繚绠℃湰璁烘枃鍚勭鐗堟湰鐨勫崟浣嶅拰涓汉锛 鏈粡鏈鏂囦綔鑰呭悓鎰忥紝涓嶅緱灏嗘湰璁烘枃杞熶粬浜猴紝 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/encl1.tex index f7fd04cb136..f7fd04cb136 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/encl1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/encl1.tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex index eae329b6720..eae329b6720 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex index 747728d7dde..f94544a6bc4 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex @@ -29,15 +29,14 @@ % NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -% 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑椤典笉闇瑕佽璁㈠埌璁烘枃涓紝鏁呬笉鏄剧ず椤电爜銆 -\cleardoublepage\thispagestyle{empty} { - \vspace*{\fill}\linespread{1.5}\selectfont - \centerline{\bfseries\zihao{-2}鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} + \CTEXsetup[ + format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp} + ]{section} - \vskip 4em - \centerline{\bfseries\zihao{-3}鍘熷垱鎬у０鏄巬 - \vskip 1em + \specialchap{鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} + \mbox{}\vspace*{-3em} + \section*{鍘熷垱鎬у０鏄巬 鏈汉閮戦噸澹版槑锛 鎵鍛堜氦鐨勫浣嶈鏂囷紝鏄湰浜哄湪瀵煎笀鐨勬寚瀵间笅锛岀嫭绔嬭繘琛岀爺绌跺伐浣滄墍鍙栧緱鐨勬垚鏋溿 @@ -46,16 +45,15 @@ 瀵规湰鏂囩殑鐮旂┒鍋氬嚭閲嶈璐＄尞鐨勪釜浜哄拰闆嗕綋锛屽潎宸插湪鏂囦腑浠ユ槑纭柟寮忔爣鏄庛 鏈０鏄庣殑娉曞緥缁撴灉鐢辨湰浜烘壙鎷呫 \vskip 1em - \rightline - {% + \rightline{% 璁烘枃浣滆呯鍚嶏細\hspace{5em}% 鏃ユ湡锛歕hspace{2em}骞碶hspace{2em}鏈圽hspace{2em}鏃% } - \vskip 4em - \centerline{\bfseries\zihao{-3}瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑} - \centerline{\zihao{5}锛堝繀椤昏璁㈠湪鎻愪氦瀛︽牎鍥句功棣嗙殑鍗板埛鏈級} - \vskip 1em + \section*{% + 瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑\\[-0.33em] + \textmd{\zihao{5}锛堝繀椤昏璁㈠湪鎻愪氦瀛︽牎鍥句功棣嗙殑鍗板埛鏈級}% + } 鏈汉瀹屽叏浜嗚В鍖椾含澶у鍏充簬鏀堕泦銆佷繚瀛樸佷娇鐢ㄥ浣嶈鏂囩殑瑙勫畾锛屽嵆锛 \begin{itemize} @@ -70,17 +68,14 @@ \end{itemize} \centerline{锛堜繚瀵嗚鏂囧湪瑙ｅ瘑鍚庨伒瀹堟瑙勫畾锛墋 \vskip 1em - \rightline - {% + \rightline{% 璁烘枃浣滆呯鍚嶏細\hspace{5em}瀵煎笀绛惧悕锛歕hspace{5em}% 鏃ユ湡锛歕hspace{2em}骞碶hspace{2em}鏈圽hspace{2em}鏃% } % 鑻ラ渶鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 % 杞负鍚堥傜殑鍥剧墖鏍煎紡锛屽苟鏀惧湪褰撳墠鐩綍涓嬶紝鐒跺悗鍘绘帀涓嬮潰 2 琛岀殑娉ㄩ噴銆 - %\vskip 4em \noindent + %\vfill\noindent %\includegraphics[height = 5em]{barcode} - - \vspace*{\fill}\par } 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 new file mode 100644 index 00000000000..086e31b0e3f --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def @@ -0,0 +1,60 @@ +% vim:ft=tex:ts=2:sw=2:et + +\ProvidesExplFile{\ExplFileName}{}{}{} + +\pdftex_if_engine: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 } { zhwindowsfonts } + \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 = [ simkai.ttf ] ] { SimSun } + \setCJKsansfont { SimHei } + \setCJKmonofont { [ simfang.ttf ] } + \setCJKfamilyfont { zhsong } { SimSun } + \setCJKfamilyfont { zhhei } { SimHei } + \setCJKfamilyfont { zhkai } { [ simkai.ttf ] } + \setCJKfamilyfont { zhfs } { [ simfang.ttf ] } + \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 + diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-xecjk-winfonts.def b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-xecjk-winfonts.def new file mode 100644 index 00000000000..f3c5bc742e1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-xecjk-winfonts.def @@ -0,0 +1,22 @@ +% vim:ft=tex + +\setCJKmainfont[BoldFont={SimHei},ItalicFont={[simkai.ttf]}]{SimSun} +\setCJKsansfont{SimHei} +\setCJKmonofont{[simfang.ttf]} + +\setCJKfamilyfont{zhsong}{SimSun} +\setCJKfamilyfont{zhhei}{SimHei} +\setCJKfamilyfont{zhkai}{[simkai.ttf]} +\setCJKfamilyfont{zhfs}{[simfang.ttf]} +%\setCJKfamilyfont{zhli}{LiSu} +%\setCJKfamilyfont{zhyou}{YouYuan} + +\newcommand*{\songti}{\CJKfamily{zhsong}} +\newcommand*{\heiti}{\CJKfamily{zhhei}} +\newcommand*{\kaishu}{\CJKfamily{zhkai}} +\newcommand*{\fangsong}{\CJKfamily{zhfs}} +%\newcommand*{\lishu}{\CJKfamily{zhli}} +%\newcommand*{\youyuan}{\CJKfamily{zhyou}} + +\endinput + diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctexopts.cfg b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctexopts.cfg new file mode 100644 index 00000000000..7c9aa6708ac --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctexopts.cfg @@ -0,0 +1,6 @@ +% vim:ft=tex + +\ProvidesExplFile{\ExplFileName}{}{}{} +\keys_set:nn { ctex / option } { fontset = pkuthss } +\endinput + diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.bib b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.bib index 4e8d0fd3e0e..4e8d0fd3e0e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.bib diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex index e854db16d05..802dc7b2f27 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex @@ -20,22 +20,16 @@ % 銆愬洜姝ゆ渶缁堟墦鍗板拰鎻愪氦璁烘枃鍓嶏紝璇峰皢鈥渃olorlinks鈥濇敼涓衡渘ocolorlinks鈥濄傘 \documentclass[UTF8, colorlinks]{pkuthss} -% 浣跨敤 biblatex 鎺掔増鍙傝冩枃鐚紝骞惰瀹氬叾鏍煎紡銆 -% -% 濡傛灉鏃犳硶浣跨敤 biber锛屽彲浠ユ妸鈥渂ackend = biber鈥濇敼涓衡渂ackend = bibtex鈥濓紝 -% 骞舵敼鐢 bibtex 浜х敓鍙傝冩枃鐚紝璇﹁ pkuthss 鐨勬枃妗ｃ -% 浣跨敤 biber 鏃讹紝璇峰幓鎺夋墍鏈夌殑 sorting 閫夐」锛屽惁鍒欎細鍑洪敊銆 -% -% 榛樿鎸夌収寮曠敤椤哄簭鎺掑簭锛堚渟orting = none鈥濓級锛岃瑙 biblatex-caspervector 鐨勬枃妗 -% 锛堝洜涓烘槸榛樿璁剧疆鎵浠ュ叾瀹炰笉鐢ㄥ啓锛屼笉杩囧嚭浜庡畬澶囨х殑鑰冭檻浠嶇劧鍦ㄨ繖閲屽垪鍑猴級銆 -% 鑻ラ渶瑕佹寜鐓ц嫳鏂囨枃鐚湪鍓嶏紝涓枃鏂囩尞鍦ㄥ悗鎺掑簭锛岃璁剧疆鈥渟orting = ecnty鈥濓紱 -% 鑻ラ渶瑕佹寜鐓т腑鏂囨枃鐚湪鍓嶏紝鑻辨枃鏂囩尞鍦ㄥ悗鎺掑簭锛岃璁剧疆鈥渟orting = centy鈥濄 +% 浣跨敤 biblatex 鎺掔増鍙傝冩枃鐚紝骞惰瀹氬叾鏍煎紡锛堣瑙 biblatex-caspervector 鐨勬枃妗ｏ級銆 +% 杩欓噷鎸夌収鑻辨枃鏂囩尞鍦ㄥ墠锛屼腑鏂囨枃鐚湪鍚庢帓搴忥紙鈥渟orting = ecnty鈥濓級锛 +% 鑻ラ渶鎸夌収涓枃鏂囩尞鍦ㄥ墠锛岃嫳鏂囨枃鐚湪鍚庢帓搴忥紝璇疯缃渟orting = centy鈥濓紱 +% 鑻ラ渶鎸夌収寮曠敤椤哄簭鎺掑簭锛岃璁剧疆鈥渟orting = none鈥濄 \usepackage[backend = biber, style = caspervector, utf8, sorting = none]{biblatex} % 鎻愪緵杩戜技浜庡鏍℃墍瑕佹眰鐨 Times New Roman / Arial 鐨勫瓧浣撱 \usepackage[defaultsups]{newtxtext} \usepackage{newtxmath} % 浜х敓 originauth.tex 閲岀殑 \square銆 -\usepackage{amssymb} +\usepackage{latexsym} % 鎸夊鏍¤姹傝瀹氬弬鑰冩枃鐚垪琛ㄤ腑鐨勬潯鐩箣鍐呭強涔嬮棿鐨勮窛绂汇 \setlength{\bibitemsep}{3bp} @@ -44,7 +38,7 @@ % 璁惧畾鏂囨。鐨勫熀鏈俊鎭 \pkuthssinfo{ - cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis}, + cthesisname = {鍗氬＋鐮旂┒鐢熷浣嶈鏂噠, ethesisname = {Doctor Thesis}, ctitle = {娴嬭瘯鏂囨。}, etitle = {Test Document}, cauthor = {鏌愭煇}, eauthor = {Test}, @@ -56,7 +50,7 @@ cmentor = {鏌愭煇鏁欐巿}, ementor = {Prof.\ Somebody}, ckeywords = {鍏朵竴锛屽叾浜寎, ekeywords = {First, Second} } -% 瀵煎叆鍙傝冩枃鐚暟鎹簱锛堟敞鎰忎笉瑕佺渷鐣モ.bib鈥濓級銆 +% 杞藉叆鍙傝冩枃鐚暟鎹簱锛堟敞鎰忎笉瑕佺渷鐣モ.bib鈥濓級銆 \addbibresource{thesis.bib} % 鏅氱敤鎴峰彲鍒犻櫎姝ゆ銆 @@ -66,7 +60,7 @@ 鍦ㄦ渶缁堟墦鍗板拰鎻愪氦璁烘枃涔嬪墠锛 璇峰皢 pkuthss 鏂囨。绫婚夐」涓殑 % - \texttt{colorlinks} 鏀逛负 \texttt{nocolorlinks}锛 + \texttt{colorlinks} 鏇挎崲涓 \texttt{nocolorlinks}锛 鍥犱负鍥句功棣嗚姹傜數瀛愮増璁烘枃鐨勭洰褰曞繀椤讳负榛戣壊锛 涓旀煇浜涙暀鍔¤姹傛墦鍗扮増璁烘枃鐨勬枃瀛楅儴鍒嗕负绾粦鑹茶岄潪鐏板害鎵撳嵃銆 @@ -87,19 +81,19 @@ \frontmatter % 姝ゅ悗鍒颁笅涓 \pagestyle 鍛戒护涔嬪墠涓嶆帓鐗堥〉鐪夋垨椤佃剼銆 \pagestyle{empty} - - % 鑷姩鐢熸垚鏍囬椤点 + % 鑷姩鐢熸垚灏侀潰銆 \maketitle - % 鐗堟潈澹版槑銆 - \include{chap/copyright} % 姝ゅ悗鍒颁笅涓 \pagestyle 鍛戒护涔嬪墠姝ｅ父鎺掔増椤电湁鍜岄〉鑴氥 + % 灏侀潰瑕佹眰鍗曢潰鎵撳嵃锛屾晠闇鏂板紑鍙抽〉锛屾澶勫凡涓骞跺疄鐜般 \cleardoublepage \pagestyle{plain} % 閲嶇疆椤电爜璁℃暟鍣紝鐢ㄥぇ鍐欑綏椹暟瀛楁帓鐗堟閮ㄥ垎椤电爜銆 \setcounter{page}{0} \pagenumbering{Roman} + % 鐗堟潈澹版槑銆 + \include{chap/copyright} % 涓嫳鏂囨憳瑕併 \include{chap/abstract} % 鑷姩鐢熸垚鐩綍銆 @@ -124,8 +118,10 @@ % 鍗曠嫭璁惧畾鎺掑簭鏂规銆傛璁惧畾浼氬眬閮ㄨ鐩栦箣鍓嶇殑鍏ㄥ眬璁剧疆銆 % 娉細鍙湁鍚屾椂浣跨敤 2.x 鎴栦箣鍚庣増鏈殑 biblatex 鍜岀浉搴斿吋瀹圭増鏈殑 biber锛 % 鎵嶈兘瀵规瘡涓 \printbibliography 鍛戒护閲囩敤涓嶅悓鐨勬帓搴忔柟妗堬紝 - % 鍚﹀垯鍙兘鍦ㄥ鍏 biblatex 瀹忓寘鏃跺氨锛堝叏灞锛夋寚瀹氭帓搴忔柟妗堛 + % 鍚﹀垯鍙兘鍦ㄨ浇鍏 biblatex 瀹忓寘鏃跺氨锛堝叏灞锛夋寚瀹氭帓搴忔柟妗堛 % 鍦ㄨ繖鏍风殑鎯呭喌涓嬶紝璇峰幓鎺夋墍鏈夌殑 sorting 閫夐」锛屽惁鍒欏彲鑳藉嚭閿欍 + % 姝ゅ锛宐iblatex 3.0 涓 \printbibliography 鐨 sorting 閫夐」澶辨晥锛 + % 璇﹁ biblatex-caspervector 鐨勬枃妗ｃ sorting = ecnty ] % 鍚勯檮褰曘 @@ -135,11 +131,6 @@ \backmatter % 鑷磋阿銆 \include{chap/acknowledge} - - % 姝ゅ悗涓嶆帓鐗堥〉鐪夋垨椤佃剼銆 - \cleardoublepage - \pagestyle{empty} - % 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑銆 \include{chap/originauth} \end{document} diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf Binary files differindex e9a48fd4b99..5304c7af7f4 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog-upto-1.3.txt b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog-upto-1.3.txt index 7f3d30b4d58..7f3d30b4d58 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog-upto-1.3.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog-upto-1.3.txt diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt index 875952908b6..53e9360b66b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt @@ -1,4 +1,40 @@ -2014-04-28, v1.6.0 +2015-05-30, v1.6.2 + + * Changes to example template: + - Template in GBK no longer provided because of UTF-8 popularisation. + - Add font configuration files. + - Previously overlooked format update about `copyright' and `originauth'. + - Make.bat: add `pause' to ease debugging; `clear' -> `clean'. + + * Changes to package code: + - pkuthss.cls: refine `beforeskip' for `\chapter'. + + * Changes to documentation: + - Makefile: default to the latex/biber/xelatex/xelatex procedure. + - acknowledge.tex: Casper was here. + + * Misc: + - Adapt to ctex 2.x. + - Somehow alleviate the sorting issue with biblatex 3.0. + - Minor fixes and cosmetics. + +2015-05-16, v1.6.1 + + * Changes to example template: + - Fix support for `openany'. + - Use more lightweight `latexsym' instead of `amssymb' for `\Box'. + + * Changes to package code: + - Fix support for `openany'. + + * Changes to documentation: + - Add note (and rant) about required format of bibliographies. + + * Misc: + - Remove bibtex support because of upstream changes. + - Minor fixes and cosmetics. + +2015-04-28, v1.6.0 * API Changes: - New package option: `footfmt' and `pkuspace'. @@ -6,7 +42,7 @@ * Changes to example template: - Some changes regarding updates in school regulation. - - thesis.tex: add color package for \pkuthssffaq with noncolorlinks. + - thesis.tex: add color package for `\pkuthssffaq' with noncolorlinks. - chap/: again try to make enca(1) happy. * Changes to package code: @@ -17,8 +53,8 @@ * Misc: - Update URL of project homepage. + - Fixes to packaging scripts regarding CTAN requirements. - Minor fixes and aesthetic improvements. - - dist: remove version string from file name of TDS archive. 2014-07-07, v1.5.5 @@ -27,7 +63,7 @@ - Revert the black TOC, considering the new sample text. * Changes to package code: - - pkuthss.cls: use `PassOptionsToPackage' for *packages*. + - pkuthss.cls: use `\PassOptionsToPackage' for *packages*. - pkuthss-extra.sty: `hidelinks' does not hold a value. * Changes to documentation: @@ -42,21 +78,21 @@ - Make TOC black, as stupidly required by PKU Library. * Changes to documentation: - - re-sort and re-organise common problems. + - Re-sort and re-organise common problems. * Misc: - Minor fixes and improvements. 2014-05-23, v1.5.3 - * Changes to package code: - - Use `\newcommand*'/`\renewcommand*' when appropriate. - - Fix bookmarks in pdflatex/gbk compilation by introducing xCJK2uni. - * Changes to example template: - No longer require gbk2uni. - Exemplify `\cite', `\parencite' and `\supercite'. + * Changes to package code: + - Use `\newcommand*'/`\renewcommand*' when appropriate. + - Fix bookmarks in pdflatex/gbk compilation by introducing xCJK2uni. + * Changes to documentation: - No longer recommend the CTeX Suite. - Remove install hints (already included in TeX Live). @@ -84,6 +120,9 @@ * Changes to package code: - Improve eps-to-pdf related script. + * Changes to documentation: + - Remove now legacy package code listings. + * Misc: - qa: fix whitespace check. - Minor improvements. diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/Makefile b/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile index 13d068a9067..be9db6d636f 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/Makefile +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile @@ -5,21 +5,28 @@ # Public domain. JOBNAME = pkuthss -LATEX = latex BIBTEX = biber -l zh__pinyin DVIPDF = dvipdfmx MAKE = make RM = rm -f +ifndef LATEX + LATEX1 = latex + LATEX2 = xelatex +else + LATEX1 = $(LATEX) + LATEX2 = $(LATEX) +endif + ifeq ($(LATEX), latex) DODVIPDF = $(DVIPDF) $(JOBNAME) endif doc: - $(LATEX) $(JOBNAME) + $(LATEX1) $(JOBNAME) $(BIBTEX) $(JOBNAME) - $(LATEX) $(JOBNAME) - $(LATEX) $(JOBNAME) + $(LATEX2) $(JOBNAME) + $(LATEX2) $(JOBNAME) $(DODVIPDF) clean: diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/abstract.tex index d327c6686a9..84d0cb64ef1 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/abstract.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/abstract.tex @@ -33,7 +33,7 @@ \end{cabstract} \begin{eabstract} - This paper describes the the functions provided by + This document describes the the functions provided by the pkuthss document template. \end{eabstract} diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/acknowledge.tex index 845b12952a7..39a388cfd66 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/acknowledge.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/acknowledge.tex @@ -30,7 +30,7 @@ \chapter{鑷磋阿} -鎰熻阿鍖楀ぇ鏈悕 BBS 鐨 MathTools 鐗堝拰 Thesis 鐗堣浣嶅悓瀛︾殑鏀寔銆 +鎰熻阿鍖楀ぇ鏈悕 BBS 涓 MathTools 鐗堝拰 Thesis 鐗堣浣嶅悓瀛︾殑鏀寔銆 鐗瑰埆鎰熻阿 pkuthss 妯＄増鐨勬渶鍒濆垱浣滆 solvethis 缃戝弸锛 浠ュ強涓嶆柇鍦板 Casper 鎻愬嚭鐨勮澶氶棶棰樹簣浠ヨВ绛旂殑 cauchy 缃戝弸 :) diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap1.tex index d7f1a28649b..2fc48cc968c 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap1.tex @@ -35,15 +35,15 @@ \begin{itemize} \item 涓涓熀鏈殑 \hologo{TeX} 鍙戣鐗堛 \item CJK 鎴 XeCJK锛堜緵 \hologo{XeLaTeX} 浣跨敤锛夊畯鍖呫 - \item ctex 瀹忓寘\supercite{ctex,ctex-faq}锛堟彁渚涗簡 ctexbook 鏂囨。绫伙級銆 + \item ctex\supercite{ctex,ctex-faq} 瀹忓寘锛堟彁渚涗簡 ctexbook 鏂囨。绫伙級銆 \item 涓枃瀛椾綋銆 \item 濡傛灉瑕佷娇鐢 biblatex 杩涜鏂囩尞鍒楄〃鍜屽紩鐢ㄧ殑鎺掔増鐨勮瘽锛 - 杩橀渶瑕 biblatex 瀹忓寘\supercite{biblatex}锛 + 杩橀渶瑕 biblatex\supercite{biblatex} 瀹忓寘锛 \item 濡傛灉闇瑕佸涓枃鏂囩尞杩涜鎸夋眽璇嫾闊崇殑鎺掑簭鐨勮瘽锛 - 杩橀渶瑕 biber 绋嬪簭\supercite{biber}銆 + 杩橀渶瑕 biber\supercite{biber} 绋嬪簭銆 \item 濡傛灉浣跨敤榛樿鐨勬枃鐚垪琛ㄥ拰寮曠敤鏍峰紡鐨勮瘽锛 杩橀渶瑕佷綔鑰呯紪鍐欑殑 biblatex 鏍峰紡 - 锛坆iblatex-caspervector锛塡supercite{biblatex-caspervector}銆 + 锛坆iblatex-caspervector\supercite{biblatex-caspervector}锛夈 \item 濡傛灉闇瑕佷娇鐢 Makefile 鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯紝杩橀渶瑕 Make 宸ュ叿锛 浣嗗鏋滀娇鐢ㄧ敱鎵瑰鐞嗗疄鐜扮殑浼淢akefile鈥濆氨涓嶇敤浜嗐 \end{itemize} @@ -56,7 +56,7 @@ }锛夐兘宸茬粡鍖呭惈闄や腑鏂囧瓧浣撳拰 Make 涔嬪鎵鏈夎姹傜殑椤圭洰銆% \myemph{% 涓轰簡鑾峰緱鏈濂界殑鏀寔锛 - 鎴戜滑寤鸿鐢ㄦ埛浣跨敤鏈鏂板畬鍏ㄧ増鐨 \hologo{TeX} 绯荤粺鍜屽悇瀹忓寘銆% + 鎴戜滑寤鸿鐢ㄦ埛浣跨敤鏈鏂般佸畬鍏ㄧ増鐨 \hologo{TeX} 绯荤粺鍜屽悇瀹忓寘銆% } 涓枃瀛椾綋闇瑕佺敤鎴疯嚜琛岃幏寰椼俓myemph{% @@ -64,7 +64,7 @@ 涓浜涗腑鏂囧瓧浣撶殑瀛楀簱涓嶅叏锛 鍙湁 GB2312 瀛楃闆嗗唴瀛楃鐨勫瓧浣撲俊鎭 杩欑鎯呭喌閫氬父浼氶犳垚缂栬瘧鐢熸垚鐨 pdf 鏂囦欢涓己灏戦儴鍒嗗瓧绗︼紝 - 鍏朵腑涓绉嶅吀鍨嬬棁鐘舵槸灏侀潰鐨勨溿団濆瓧鏄剧ず涓嶅嚭鏉ャ + 鍏朵腑涓绉嶅吀鍨嬬棁鐘舵槸鈥溿団濆瓧鏄剧ず涓嶅嚭鏉ャ 濡傛灉瑕佷娇鐢ㄤ腑鏄撳叕鍙哥殑瀛椾綋锛 鍒欏缓璁娇鐢 Windows Vista 鍙婂叾浠ュ悗鐗堟湰鎻愪緵鐨% 瀹嬩綋銆侀粦浣撱佹シ浣撳拰浠垮畫浣擄紝 @@ -84,17 +84,15 @@ \begin{Verbatim}[frame = single] texdoc pkuthss \end{Verbatim} - 鎵鎵撳紑鐨 pdf 鏂囦欢鎵鍦ㄧ殑鍚屼竴鐩綍涓寘鍚笁涓瓙鐩綍鍜屼袱涓 pdf 鏂囦欢锛 - 鍏朵腑 \verb|doc-src/| 涓鸿鏄庢枃妗ｏ紙鍗虫湰鏂囨。锛夌殑婧愪唬鐮侊紝 - \verb|example-utf8/| 鍜 \verb|example-gbk/| 涓烘ā鐗堟枃妗ｇ殑婧愪唬鐮侊紝 + 鎵鎵撳紑鐨 pdf 鏂囦欢鎵鍦ㄧ殑鍚屼竴鐩綍涓寘鍚袱涓瓙鐩綍鍜岀浉搴旂殑涓や釜 pdf 鏂囦欢锛 + 鍏朵腑 \verb|readme/| 涓鸿鏄庢枃妗ｏ紙鍗虫湰鏂囨。锛夌殑婧愪唬鐮侊紝% + \verb|example/| 涓烘枃妗ｆā鐗堢殑婧愪唬鐮侊紝% \verb|readme.pdf| 鍜 \verb|example.pdf| - 鍒嗗埆涓鸿鏄庢枃妗ｅ拰妯＄増鏂囨。鐨 pdf 鏂囦欢銆 + 鍒嗗埆涓鸿鏄庢枃妗ｅ拰鏂囨。妯＄増鐨 pdf 鏂囦欢銆 - \verb|example-utf8/| 鐩綍涓嬬殑婧愪唬鐮佷娇鐢ㄧ殑鏄 UTF-8 缂栫爜锛 - 閫傚悎绫 UNIX 绯荤粺鐢ㄦ埛鎴栫紪杈戝櫒瀵 UTF-8 鏈夎壇濂芥敮鎸佺殑鐢ㄦ埛浣跨敤锛% - \verb|example-gbk/| 鐩綍涓嬬殑婧愪唬鐮佷娇鐢ㄧ殑鏄 GBK 缂栫爜锛岄傚悎鍏跺畠鐢ㄦ埛浣跨敤銆% - 鐢ㄦ埛鍙互瑙嗘儏鍐靛皢 \verb|example-utf8/| 鎴 \verb|example-gbk/| - 涓殑鎵鏈夊唴瀹瑰鍒跺埌鍚堥傜殑鐩綍锛 + \verb|example/| 鐩綍涓嬬殑婧愪唬鐮佷娇鐢ㄧ殑鏄 UTF-8 缂栫爜锛 + 鍦ㄧ幇鍦 \hologo{TeX} 鐢ㄦ埛甯哥敤鐨勭紪杈戝櫒涓潎宸茬粡鏈変簡鑹ソ鐨勬敮鎸併 + 鐢ㄦ埛鍙互灏 \verb|example/| 涓殑鎵鏈夊唴瀹瑰鍒跺埌鍚堥傜殑鐩綍锛 骞跺湪姝ょ洰褰曚腑鏍规嵁妯＄増淇敼鍑鸿嚜宸辩殑璁烘枃銆 \myemph{% @@ -128,37 +126,42 @@ texdoc pkuthss 璇峰弬鑰 \texttt{copyright.tex} 鍜 \texttt{originauth.tex} 涓殑鐩稿叧娉ㄩ噴銆% } + + \item \verb|misc/|锛 + 鐩綍锛岀洰鍓嶅寘鍚瘮杈冨父鐢ㄧ殑瀛椾綋閰嶇疆锛 + \begin{itemize} + \item \verb|ctexopts.cfg|銆乗verb|ctex-fontset-pkuthss.def|锛 + 閫傜敤浜 2.0 鍙婁互鍚庣増鏈殑 ctex\supercite{ctex} 瀹忓寘銆 + \item \verb|ctex-xecjk-windows.def|锛 + 閫傜敤浜 2.0 浠ュ墠鐗堟湰鐨 ctex 瀹忓寘銆 + \end{itemize} + 浣跨敤鏃讹紝 + 璇峰皢鍜岀敤鎴风郴缁熶腑 ctex 瀹忓寘鐗堟湰鐩稿尮閰嶇殑\myemph{鎵鏈墋閰嶇疆鏂囦欢 + 澶嶅埗鍒版ā鏉跨殑涓荤洰褰曚腑銆 \end{itemize} \section{缂栬瘧鏂瑰紡}\label{sec:compile} + 棣栨缂栬瘧鍓嶏紝 + 璇峰皢 \verb|misc/| 鐩綍涓拰 + 鐢ㄦ埛绯荤粺涓 ctex 瀹忓寘鐗堟湰鐩稿尮閰嶇殑閰嶇疆鏂囦欢澶嶅埗鍒版ā鏉跨殑涓荤洰褰曚腑锛 + 璇﹁绗 \ref{sec:doc-dir} 鑺傘 + pkuthss 鏂囨。妯＄増鏀寔涓夌缂栬瘧鏂瑰紡锛屽嵆 \begin{itemize} \item \hologo{LaTeX} -- dvipdfmx 鏂瑰紡锛歕\ - 渚濇鎵ц \verb|latex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝% + 渚濇鎵ц \verb|latex|锛孿verb|biber|锛% \verb|latex|锛孿verb|latex| 鍜 \verb|dvipdfmx|銆 \item \hologo{pdfLaTeX} 鏂瑰紡锛歕\ - 渚濇鎵ц \verb|pdflatex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝% + 渚濇鎵ц \verb|pdflatex|锛孿verb|biber|锛% \verb|pdflatex| 鍜 \verb|pdflatex|銆 \item \hologo{XeLaTeX} 鏂瑰紡锛歕\ - 渚濇鎵ц \verb|xelatex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝% + 渚濇鎵ц \verb|xelatex|锛孿verb|biber|锛% \verb|xelatex| 鍜 \verb|xelatex|銆 \end{itemize} - \myemph{% - 娉ㄦ剰锛 - \begin{itemize} - \item 闄ら潪鏃犳硶浣跨敤 biber锛屽惁鍒欎笉寤鸿浣跨敤 bibtex銆 - 濡傛灉鐨勭‘瑕佷娇鐢 bibtex锛岃灏 biblatex 瀹忓寘鐨刓texttt{backend} - 閫夐」浠 \texttt{biber} 鏀逛负 \texttt{bibtex}锛 - 鍦 Makefile 涓皢鍙橀噺 \texttt{BIBTEX} 鐨勫兼敼涓 \texttt{bibtex}锛 - 骞跺幓鎺 biblatex 瀹忓寘鍜 \texttt{\string\printbibliography} 鍛戒护 - 鐨 \texttt{sorting} 閫夐」銆% - \item bibtex 瀵 UTF-8 缂栫爜鐨勬敮鎸佷笉濂斤紝 - 鍥犳涓嶅缓璁湪缂栬瘧 UTF-8 缂栫爜鐨勬簮鏂囦欢鏃朵娇鐢 bibtex銆 - \item \hologo{XeLaTeX} 瀵归潪 UTF-8 缂栫爜鐨勬敮鎸佷笉濂斤紝 - 鍥犳 \hologo{XeLaTeX} 鏂瑰紡鐨勭紪璇戜笉鏀寔 GBK 缂栫爜銆 - \end{itemize}% + 娉ㄦ剰锛歕hologo{XeLaTeX} 瀵归潪 UTF-8 缂栫爜鐨勬敮鎸佷笉濂斤紝 + 鍥犳 \hologo{XeLaTeX} 鏂瑰紡鐨勭紪璇戜笉鏀寔 GBK 缂栫爜銆% } pkuthss 鏂囨。妯＄増闄勫甫鐨 Makefile 涓凡缁忓杩欎笁绉嶇紪璇戞柟寮忚繘琛屼簡瀹屾暣鐨勯厤缃 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap2.tex index 6206ae79be4..7bff3bce6b6 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap2.tex @@ -67,7 +67,7 @@ \end{itemize} 渚嬪锛屽鏋滈渶瑕佷娇鐢 UTF-8 缂栫爜鎾板啓璁烘枃锛 - 鍒欓渶瑕佸湪瀵煎叆 pkuthss 鏂囨。绫绘椂鍔犱笂 \verb|UTF8| 閫夐」锛 + 鍒欓渶瑕佸湪杞藉叆 pkuthss 鏂囨。绫绘椂鍔犱笂 \verb|UTF8| 閫夐」锛 \begin{Verbatim}[frame = single] \documentclass[UTF8, ...]{pkuthss} % 鈥...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆 \end{Verbatim} @@ -136,7 +136,7 @@ \item \textbf{\texttt{[no]pdftoc}}\footnote{% 姝ら夐」閮ㄥ垎绛変环浜 1.4 alpha2 鍙婁互鍓嶇増鏈 pkuthss-extra 瀹忓寘% 鐨 \texttt{[no]tocbibind} 閫夐」銆 - 鍥犱负 tocbibind 瀹忓寘鍜 biblatex 瀹忓寘鍐茬獊锛 + 鍥犱负 tocbibind 瀹忓寘鍜 biblatex 瀹忓寘鍐茬獊锛% pkuthss-extra 瀹忓寘涓嶅啀璋冪敤 tocbibind 瀹忓寘銆% }锛 鍚敤 \verb|pdftoc| 閫夐」鍚庯紝 @@ -174,7 +174,7 @@ \end{itemize} 渚嬪锛屽浘涔﹂瑕佹眰鐢靛瓙鐗堣鏂囩殑鐩綍蹇呴』涓洪粦鑹诧紝 - 涓旀煇浜涙暀鍔¤姹傛墦鍗扮増璁烘枃鐨勬枃瀛楅儴鍒嗕负绾粦鑹茶岄潪鐏板害鎵撳嵃銆 + 涓旀煇浜涙暀鍔¤姹傛墦鍗扮増璁烘枃鐨勬枃瀛楅儴鍒嗕负绾粦鑰岄潪鐏板害鎵撳嵃銆 姝ゆ椂鐢ㄦ埛\myemph{% 鍙互鍚敤 pkuthss-extra 瀹忓寘鐨 \texttt{nocolorlinks} 閫夐」锛 浣挎墍鏈夌殑閾炬帴鍙樹负榛戣壊锛屼互鍏嶅奖鍝嶆彁浜% @@ -291,8 +291,7 @@ 鐢ㄤ簬鏍规嵁鐢ㄦ埛璁惧畾鐨勬枃妗ｄ俊鎭嚜鍔ㄨ瀹氱敓鎴愮殑 pdf 鏂囨。鐨勫睘鎬с 姝ゅ懡浠や細鍦ㄧ敤鎴疯皟鐢 \verb|\maketitle| 鍛戒护鏃惰鑷姩璋冪敤锛 鍥犳閫氬父涓嶉渶瑕佺敤鎴疯嚜宸变娇鐢紱 - 浣嗙敤鎴锋湁鏃跺彲鑳戒笉闇瑕佽緭鍑烘爣棰橀〉锛 - 浠庤屼笉浼氳皟鐢 \verb|\maketitle| 鍛戒护锛 + 浣嗙敤鎴锋湁鏃跺彲鑳戒笉闇瑕佽緭鍑哄皝闈紝浠庤屼笉浼氳皟鐢 \verb|\maketitle| 鍛戒护锛 姝ゆ椂灏遍渶瑕佸湪璁惧畾瀹屾枃妗ｄ俊鎭箣鍚庤皟鐢 \verb|\setpdfproperties|銆% \myemph{% 娉ㄦ剰锛 @@ -307,7 +306,12 @@ geometry\supercite{geometry}銆乫ancyhdr\supercite{fancyhdr} % 鍜 graphicx\supercite{graphicx} 绛夊嚑涓畯鍖咃紱 浣跨敤 \hologo{pdfLaTeX} 鏂瑰紡缂栬瘧 GBK 缂栫爜鐨勬簮鏂囦欢鏃惰繕浼氳皟鐢 - xCJK2uni\supercite{xCJK2uni} 瀹忓寘銆 + xCJK2uni\supercite{xCJK2uni} 瀹忓寘\footnote{\ % + ctex 2.x 浼氳嚜琛岃皟鐢 xCJK2uni 瀹忓寘锛 + 涓嶇敤鍦 pkuthss 鏂囨。绫讳腑閲嶅璋冪敤锛 + 杩欓噷璋冪敤 xCJK2un 鏄负浜嗗吋瀹 ctex 1.x 鑰岃繘琛岀殑璁惧畾锛 + 璇ヨ瀹氬皢鍦 2017 骞磋鍘婚櫎銆% + }銆 鍥犳锛宑texbook 鏂囨。绫诲拰杩欎簺瀹忓寘鎵鎻愪緵鐨勫姛鑳藉潎鍙互浣跨敤銆 渚嬪锛岀敤鎴峰鏋滄兂灏嗙洰褰曠殑鏍囬鏀逛负鈥滅洰{\quad\quad}褰曗濓紝 @@ -317,8 +321,8 @@ \end{Verbatim} 鍦ㄩ粯璁ょ殑閰嶇疆涓嬶紝% - pkuthss 鏂囨。妯＄増浣跨敤浣滆呯紪鍐欑殑 % - biblatex\supercite{biblatex} 鏍峰紡\supercite{biblatex-caspervector}% + pkuthss 鏂囨。妯＄増浣跨敤浣滆呯紪鍐欑殑 biblatex\supercite{biblatex} 鏍峰紡% + \mbox{\supercite{biblatex-caspervector}}% 杩涜鍙傝冩枃鐚拰寮曠敤鐨勬帓鐗堬紝 鐢ㄦ埛鍙互浣跨敤瀹冧互鍙 biblatex 鏈韩鎵鎻愪緵鐨勫姛鑳姐 渚嬪锛 @@ -329,7 +333,8 @@ \end{Verbatim} 鍦ㄦ湰鏂囦腑灏嗕骇鐢熲淺cite{ctex}锛孿parencite{ctex}锛孿supercite{ctex}鈥濄 - 閫氳繃鏇村鏉傜殑璁剧疆锛岃繕鍙互婊¤冻渚嬪琚紩鐢ㄧ殑鏂囩尞鎸夌収寮曠敤椤哄簭鎺掑簭锛 + 灏辩洰鍓嶈岃█锛屽湪 biblatex 2.x 涓紝閫氳繃鏇村鏉傜殑璁剧疆锛 + 杩樺彲浠ユ弧瓒充緥濡傝寮曠敤鐨勬枃鐚寜鐓у紩鐢ㄩ『搴忔帓搴忥紝 鑰屾湭寮曠敤鐨勬枃鐚寜鐓ц嫳鏂囨枃鐚湪鍓嶃佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇姹傦紝 璇﹁ biblatex-caspervector 鐨勬枃妗supercite{biblatex-caspervector}銆 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap3.tex index 34691632912..10252d661cc 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap3.tex @@ -38,8 +38,6 @@ 閫氳繃涓浜涜缃紝杩樺彲浠ユ弧瓒充緥濡傝寮曠敤鐨勬枃鐚寜鐓у紩鐢ㄩ『搴忔帓搴忥紝 鑰屾湭寮曠敤鐨勬枃鐚寜鐓ц嫳鏂囨枃鐚湪鍓嶃佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇姹傦紝 瑙佺 \ref{ssec:thirdparty} 灏忚妭銆 - 鏃犳硶浣跨敤 biber 鐨勭敤鎴峰彲浠ヤ娇鐢 bibtex锛岃繖绉嶆儏鍐典笅寤鸿浣跨敤 GBK 缂栫爜锛 - 鍏蜂綋璁剧疆鏂瑰紡璇疯绗 \ref{sec:compile} 鑺傘 涓浜涢珮绾ц缃紝 濡傚皝闈腑閮ㄥ垎鍐呭闀垮害瓒呰繃棰勮绌洪棿瀹归噺鏃剁殑璁剧疆锛 @@ -62,7 +60,7 @@ \section{涓婃父瀹忓寘鍙兘寮曡捣鐨勯棶棰榼 - biblatex 瀹忓寘\supercite{biblatex}浼氳嚜琛岃瀹 \verb|\bibname|锛 + biblatex\supercite{biblatex} 瀹忓寘浼氳嚜琛岃瀹 \verb|\bibname|锛 鏁呬細瑕嗙洊閫氳繃 \verb|\CTEXoptions| 璁惧畾鐨勫弬鑰冩枃鐚垪琛ㄦ爣棰樸 浣跨敤 biblatex 鐨勭敤鎴峰彲浠ヤ娇鐢 \verb|\printbibliography| 鐨 \verb|title| 閫夐」鏉ユ墜鍔ㄨ瀹氬弬鑰冩枃鐚垪琛ㄧ殑鏍囬锛屼緥濡傦細 @@ -70,7 +68,7 @@ \printbibliography[title = {鏂囩尞}, ...] % 鈥...鈥濅负鍏跺畠閫夐」銆 \end{Verbatim} - hyperref 瀹忓寘\supercite{hyperref}鍜屼竴浜涘畯鍖呭彲鑳藉彂鐢熷啿绐併 + hyperref\supercite{hyperref} 瀹忓寘鍜屼竴浜涘畯鍖呭彲鑳藉彂鐢熷啿绐併 鍏充簬濡備綍閬垮厤杩欎簺鍐茬獊锛 鍙互鍙傝 hyperref 瀹忓寘鐨 README 鏂囦欢涓殑鈥淧ackage Compatibility鈥濅竴鑺傘 姝ゆ枃浠堕氬父鍜屾墽琛 \verb|texdoc hyperref| % @@ -87,9 +85,9 @@ 鐨勯敊璇 杩欑閿欒涓鑸槸锛堜富瑕佹槸闈 Windows 骞冲彴鐨勶級鐢ㄦ埛閲囩敤浜嗚嚜瀹氫箟鐨勶紙鍖呮嫭澶у皬鍐 涓嶅悓浜庡師鏂囦欢鐨勶級瀛椾綋鏂囦欢鍚嶏紝 - 骞舵敼鍔 ctex.cfg 绛夐厤缃枃浠朵箣鍚庢病鏈夊湪璋冪敤 pkuthss 鏂囨。绫绘椂鍔犲叆 - \verb|nofonts| 閫夐」锛 - 鍙堜娇鐢 \hologo{XeLaTeX} 缂栬瘧閫犳垚鐨勶紝浣跨敤 + 骞舵敼鍔 \verb|ctex.cfg| 绛夐厤缃枃浠朵箣鍚庢病鏈夊湪璋冪敤 % + pkuthss 鏂囨。绫绘椂鍔犲叆 \verb|nofonts| 閫夐」锛 + 鍙堜娇鐢 \verb|xelatex| 缂栬瘧閫犳垚鐨勶紝浣跨敤 \begin{Verbatim}[frame = single] \documentclass[nofonts, ...]{pkuthss} % 鈥...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆 \end{Verbatim} @@ -106,7 +104,7 @@ data source .../par-xxxxxxxx/cache-xxxxxxxx/ 閬囧埌杩欑鎯呭喌鏃讹紝鍒犻櫎鎺変笂杩颁复鏃剁洰褰曞強鍏舵墍鏈夊唴瀹癸紝 鍐嶉噸鏂拌繍琛 biber 閫氬父渚垮彲瑙ｅ喅闂銆 - caption 瀹忓寘\supercite{caption}瀵逛簬鍏朵笉璁よ瘑鐨勫畯鍖呭潎浼氭彁绀 + caption\supercite{caption} 瀹忓寘瀵逛簬鍏朵笉璁よ瘑鐨勫畯鍖呭潎浼氭彁绀 \begin{Verbatim}[frame = single, fontsize = {\small}] Package caption Warning: Unsupported document class (or package) detected, (caption) usage of the caption package is not recommended. @@ -127,7 +125,7 @@ See the caption package documentation for explanation. biblatex-caspervector\supercite{biblatex-caspervector} 鎵瀹炵幇鐨勬牸寮忓拰 % \parencite{pku-thesisstyle} 鐨勮瀹氬苟涓嶄竴鑷达紝 - 浣嗗叾浣滆呮殏鏃舵病鏈夌簿鍔涘幓瀹炵幇鍚庤呮墍瑙勫畾鐨勬牸寮忋 + 浣嗗叾浣滆呮殏鏃舵病鏈夌簿鍔涗篃涓嶆効鎰忓幓瀹炵幇鍚庤呮墍瑙勫畾鐨勬瘮鍘熸牸寮忔洿涓戦檵寰楀鐨勬牸寮忋 \section{鍙嶉鎰忚鍜屽缓璁畗 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/conclusion.tex index 50d93d09641..50d93d09641 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/conclusion.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/conclusion.tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/copyright.tex index 49856cf6cb9..1774784d248 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/copyright.tex @@ -29,7 +29,7 @@ % chap/acknowledge.tex \chapter*{鐗堟潈澹版槑} -\thispagestyle{empty} +\markboth{鐗堟潈澹版槑}{} 鐗堟潈鎵鏈 \copyright\ 2008--2009 solvethis \par @@ -45,5 +45,5 @@ pkuthss 鏂囨。绫汇乸kuthss-extra 瀹忓寘鍙婂叾璇存槑鏂囨。鍧囦互 % \end{itemize} 浠 New BSD License 鍙戝竷锛 浠ュ強鍙傝冩枃鐚拰寮曠敤浣跨敤鐨勬牱寮忔枃浠剁増鏉冨０鏄庤鐩稿簲鏂囦欢涓鏄庝互澶栵紝 -鍏朵綑閮ㄥ垎鏂囦欢鍙戝竷鍦ㄥ叕鏈夐鍩燂紙public domain锛夈 +鍏朵綑鎵鏈夋枃浠跺彂甯冨湪鍏湁棰嗗煙锛坧ublic domain锛夈 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/encl1.tex index ea0e17a7db4..ea0e17a7db4 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/encl1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/encl1.tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/introduction.tex index 36406bf08b6..36406bf08b6 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/introduction.tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex index 747728d7dde..f94544a6bc4 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex @@ -29,15 +29,14 @@ % NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -% 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑椤典笉闇瑕佽璁㈠埌璁烘枃涓紝鏁呬笉鏄剧ず椤电爜銆 -\cleardoublepage\thispagestyle{empty} { - \vspace*{\fill}\linespread{1.5}\selectfont - \centerline{\bfseries\zihao{-2}鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} + \CTEXsetup[ + format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp} + ]{section} - \vskip 4em - \centerline{\bfseries\zihao{-3}鍘熷垱鎬у０鏄巬 - \vskip 1em + \specialchap{鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} + \mbox{}\vspace*{-3em} + \section*{鍘熷垱鎬у０鏄巬 鏈汉閮戦噸澹版槑锛 鎵鍛堜氦鐨勫浣嶈鏂囷紝鏄湰浜哄湪瀵煎笀鐨勬寚瀵间笅锛岀嫭绔嬭繘琛岀爺绌跺伐浣滄墍鍙栧緱鐨勬垚鏋溿 @@ -46,16 +45,15 @@ 瀵规湰鏂囩殑鐮旂┒鍋氬嚭閲嶈璐＄尞鐨勪釜浜哄拰闆嗕綋锛屽潎宸插湪鏂囦腑浠ユ槑纭柟寮忔爣鏄庛 鏈０鏄庣殑娉曞緥缁撴灉鐢辨湰浜烘壙鎷呫 \vskip 1em - \rightline - {% + \rightline{% 璁烘枃浣滆呯鍚嶏細\hspace{5em}% 鏃ユ湡锛歕hspace{2em}骞碶hspace{2em}鏈圽hspace{2em}鏃% } - \vskip 4em - \centerline{\bfseries\zihao{-3}瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑} - \centerline{\zihao{5}锛堝繀椤昏璁㈠湪鎻愪氦瀛︽牎鍥句功棣嗙殑鍗板埛鏈級} - \vskip 1em + \section*{% + 瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑\\[-0.33em] + \textmd{\zihao{5}锛堝繀椤昏璁㈠湪鎻愪氦瀛︽牎鍥句功棣嗙殑鍗板埛鏈級}% + } 鏈汉瀹屽叏浜嗚В鍖椾含澶у鍏充簬鏀堕泦銆佷繚瀛樸佷娇鐢ㄥ浣嶈鏂囩殑瑙勫畾锛屽嵆锛 \begin{itemize} @@ -70,17 +68,14 @@ \end{itemize} \centerline{锛堜繚瀵嗚鏂囧湪瑙ｅ瘑鍚庨伒瀹堟瑙勫畾锛墋 \vskip 1em - \rightline - {% + \rightline{% 璁烘枃浣滆呯鍚嶏細\hspace{5em}瀵煎笀绛惧悕锛歕hspace{5em}% 鏃ユ湡锛歕hspace{2em}骞碶hspace{2em}鏈圽hspace{2em}鏃% } % 鑻ラ渶鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 % 杞负鍚堥傜殑鍥剧墖鏍煎紡锛屽苟鏀惧湪褰撳墠鐩綍涓嬶紝鐒跺悗鍘绘帀涓嬮潰 2 琛岀殑娉ㄩ噴銆 - %\vskip 4em \noindent + %\vfill\noindent %\includegraphics[height = 5em]{barcode} - - \vspace*{\fill}\par } diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib index 067e853011a..98a8affeaf4 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib @@ -42,11 +42,11 @@ @online{ctex, author = {{ctex.org}}, - title = {ctex 瀹忓寘璇存槑锛坴1.02c锛墋, + title = {\CTeX 濂椾欢鎵嬪唽锛坴2.0.2锛墋, type = {M/OL}, - date = {2011-03-11}, + date = {2015-05-16}, url = {http://mirror.ctan.org/language/chinese/ctex/}, - urldate = {2012-08-01}, + urldate = {2015-06-10}, language = {chinese}, } @@ -112,7 +112,7 @@ @online{scrextend, author = {Kohm, Markus and Morawski, Jens-Uwe}, - title = {KOMA-Script: a versatile \LaTeX2e{} bundle}, + title = {KOMA-Script: a versatile \hologo{LaTeX2e} bundle}, type = {M/OL}, date = {2015-02-07}, url = {http://mirror.ctan.org/macros/latex/contrib/koma-script/}, diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex index eb7d71a5281..7d5a38852d3 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex @@ -30,24 +30,25 @@ \documentclass[UTF8, colorlinks]{pkuthss} -\usepackage[backend = biber, style = caspervector, utf8, sorting = none]{biblatex} +\usepackage[backend = biber, style = caspervector, utf8, sorting = ecnty]{biblatex} \usepackage[defaultsups]{newtxtext} \usepackage{newtxmath} -\usepackage{amssymb} +\usepackage{latexsym} \usepackage{fancyvrb} \usepackage{hologo} \setlength{\hfuzz}{3pt} +\ctexset{linestretch = 2\ccwd} \setlength{\bibitemsep}{3bp} \renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont} \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} \newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}} -\newcommand{\docversion}{v1.6.0} +\newcommand{\docversion}{v1.6.2} \pkuthssinfo{ cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis}, - ctitle = {鍖椾含澶у璁烘枃鏂囨。妯＄増\\pkuthss \docversion}, + ctitle = {鍖椾含澶у瀛︿綅璁烘枃妯＄増\\pkuthss \docversion}, etitle = {% PKU dissertation document class\texorpdfstring{\\}{: }% pkuthss \docversion% @@ -55,28 +56,27 @@ cauthor = {鐩栬尐娉⒙烽挍路缁村厠鎵榼, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {浜屻囦竴浜斿勾鍥涙湀}, + date = {浜屻囦竴浜斿勾鍏湀}, school = {鍖栧涓庡垎瀛愬伐绋嬪闄, cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry ... ?}, direction = {鎹 Casper 鑷繁涔熶笉鐭ラ亾}, cmentor = {XX 鏁欐巿}, ementor = {Prof.\ XX}, - ckeywords = {\LaTeX2e{}锛屾帓鐗堬紝鏂囨。绫伙紝\CTeX{}}, - ekeywords = {\LaTeX2e{}, Typesetting, Document class, \CTeX{}} + ckeywords = {\hologo{LaTeX2e}锛屾帓鐗堬紝鏂囨。绫伙紝\CTeX{}}, + ekeywords = {\hologo{LaTeX2e}, Typesetting, Document class, \CTeX{}} } \addbibresource{pkuthss.bib} \begin{document} \frontmatter \pagestyle{empty} - \maketitle - \include{chap/copyright} \cleardoublepage \pagestyle{plain} \setcounter{page}{0} \pagenumbering{Roman} + \include{chap/copyright} \include{chap/abstract} \tableofcontents @@ -93,10 +93,6 @@ \backmatter \include{chap/acknowledge} - - \cleardoublepage - \pagestyle{empty} - \include{chap/originauth} \end{document} diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf Binary files differindex 44dda8154c8..5eab5a8443c 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf +++ b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty index 570f8c48bb0..2f10ec27956 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty @@ -26,7 +26,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{pkuthss-extra} - [2015/04/28 v1.6.0 Common extra settings for the pkuthss document class] + [2015/06/18 v1.6.2 Common extra settings for the pkuthss document class] % Check the dependency of pkuthss. \@ifclassloaded{pkuthss}{}{ @@ -124,22 +124,18 @@ \ifpkuthssextra@opt@pdftoc % Add PDF bookmark for table of contents. \let\pkuthssextra@tmp@tableofcontents\tableofcontents - \renewcommand{\tableofcontents}{ - % Make the `Contents' bookmark point correctly to the title of the table of - % contents. - \cleardoublepage - % Actually add the PDF bookmark. - \pdfbookmark[1]{\contentsname}{contents} - \pkuthssextra@tmp@tableofcontents + \renewcommand{\tableofcontents}{% + \pkuthss@int@pdfmark{\contentsname}{contents} + \pkuthssextra@tmp@tableofcontents% } \fi \ifpkuthssextra@opt@spechap % This command is used to start a chapter without numbering, and correctly set % up the headers and footers in the chapter. - \newcommand\specialchap[1]{ + \newcommand\specialchap[1]{% \chapter*{#1}\addcontentsline{toc}{chapter}{#1} - \markboth{#1}{}\phantomsection + \markboth{#1}{}\phantomsection% } \fi @@ -159,11 +155,11 @@ \ifpkuthssextra@opt@pdfprop % Automatically generate properties for generated PDF. % Use English properties to avoid problems with character encodings. - \newcommand*{\setpdfproperties}{ + \newcommand*{\setpdfproperties}{% \hypersetup{ pdfauthor = {\@eauthor}, pdftitle = {\@etitle}, pdfsubject = {\euniversity\ \ethesisname}, pdfkeywords = {\@ekeywords} - } + }% } % Set up the properties when generating the title page because the document % information should have been all defined before this. diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def index 20e95a6644f..d9bc8899e7b 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def @@ -25,7 +25,7 @@ % pkuword.eps \ProvidesFile{pkuthss-gbk.def} - [2015/04/28 v1.6.0 Labels and captions in GBK encoding + [2015/06/18 v1.6.2 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 f2b8c671b1e..215cad5de1c 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def @@ -25,7 +25,7 @@ % pkuword.eps \ProvidesFile{pkuthss-utf8.def} - [2015/04/28 v1.6.0 Labels and captions in UTF-8 encoding + [2015/06/18 v1.6.2 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 cf9edac2f87..606bf2406a1 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls @@ -26,7 +26,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2015/04/28 v1.6.0 Peking University dissertation document class] + [2015/06/18 v1.6.2 Peking University dissertation document class] % Process the encoding options. \newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue @@ -86,8 +86,8 @@ } \else\ifpdf % Fix garbled text in bookmarks for pdfLaTeX compilation in GBK. - % Temporary fix until release of ctex 2.x, which will by itself - % load xCJK2uni when necessary. + % Compatibility settings for ctex 1.x, to be removed in 2017; ctex 2.x + % loads xCJK2uni by itself when necessary. \RequirePackage{xCJK2uni} \fi\fi \fi @@ -99,6 +99,42 @@ \fi } +% eg. `\pkuthss@int@infoitema{ctitle}' will expand to: +% \def\ctitle#1{\def\@ctitle{#1}} +% \define@key{pkuthss@info}{ctitle}{\ctitle{#1}} +\def\pkuthss@int@infoitema#1{ + \@namedef{#1}##1{\@namedef{@#1}{##1}} + \define@key{pkuthss@info}{#1}{\@nameuse{#1}{##1}} +} +% eg. `\pkuthss@int@infoitemb{cuniversity}' will expand to: +% \define@key{pkuthss@info}{cuniversity}{\def\cuniversity{#1}} +\def\pkuthss@int@infoitemb#1{ + \define@key{pkuthss@info}{#1}{\@namedef{#1}{##1}} +} +% Set up document information entries. +\pkuthss@int@infoitema{ctitle} +\pkuthss@int@infoitema{etitle} +\pkuthss@int@infoitema{cauthor} +\pkuthss@int@infoitema{eauthor} +\pkuthss@int@infoitema{studentid} +\pkuthss@int@infoitema{date} +\pkuthss@int@infoitema{school} +\pkuthss@int@infoitema{cmajor} +\pkuthss@int@infoitema{emajor} +\pkuthss@int@infoitema{direction} +\pkuthss@int@infoitema{cmentor} +\pkuthss@int@infoitema{ementor} +\pkuthss@int@infoitema{ckeywords} +\pkuthss@int@infoitema{ekeywords} +\pkuthss@int@infoitemb{cuniversity} +\pkuthss@int@infoitemb{euniversity} +\pkuthss@int@infoitemb{cthesisname} +\pkuthss@int@infoitemb{ethesisname} +\pkuthss@int@infoitemb{cabstractname} +\pkuthss@int@infoitemb{eabstractname} +% Set up document information using the `key = value' grammar. +\newcommand*{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}} + % Set up page layout. \geometry{ a4paper, includefoot, hmargin = 2.6cm, top = 3cm, bottom = 2.5cm, @@ -115,21 +151,21 @@ \CTEXsetup[ nameformat = {\zihao{-2}\bfseries}, titleformat = {\zihao{-2}\bfseries}, - beforeskip = {20bp}, afterskip = {18bp} + beforeskip = {0bp}, afterskip = {18bp} ]{chapter} \CTEXsetup[ format = {\zihao{-3}\bfseries}, - beforeskip = {-20bp plus -1ex minus -0.2ex}, + beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex} ]{section} \CTEXsetup[ format = {\zihao{4}\bfseries}, - beforeskip = {-12bp plus -1ex minus -0.2ex}, + beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex} ]{subsection} \CTEXsetup[ format = {\bfseries}, - beforeskip = {-12bp plus -1ex minus -0.2ex}, + beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex} ]{subsubsection} @@ -167,44 +203,16 @@ \pkuthss@int@setpagestyle \fi -% eg. `\pkuthss@int@infoitema{ctitle}' will expand to: -% \def\ctitle#1{\def\@ctitle{#1}} -% \define@key{pkuthss@info}{ctitle}{\ctitle{#1}} -\def\pkuthss@int@infoitema#1{ - \@namedef{#1}##1{\@namedef{@#1}{##1}} - \define@key{pkuthss@info}{#1}{\@nameuse{#1}{##1}} -} -% eg. `\pkuthss@int@infoitemb{cuniversity}' will expand to: -% \define@key{pkuthss@info}{cuniversity}{\def\cuniversity{#1}} -\def\pkuthss@int@infoitemb#1{ - \define@key{pkuthss@info}{#1}{\@namedef{#1}{##1}} +% This places a bookmark pointing to somewhere near the page header; +% Result of simple `\chapter{...} \pdfbookmark{...}' does not look nice, +% because the bookmark will point to somewhere below the chapter mark. +\def\pkuthss@int@pdfmark#1#2{% + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[1]{#1}{#2}% } -% Set up document information entries. -\pkuthss@int@infoitema{ctitle} -\pkuthss@int@infoitema{etitle} -\pkuthss@int@infoitema{cauthor} -\pkuthss@int@infoitema{eauthor} -\pkuthss@int@infoitema{studentid} -\pkuthss@int@infoitema{date} -\pkuthss@int@infoitema{school} -\pkuthss@int@infoitema{cmajor} -\pkuthss@int@infoitema{emajor} -\pkuthss@int@infoitema{direction} -\pkuthss@int@infoitema{cmentor} -\pkuthss@int@infoitema{ementor} -\pkuthss@int@infoitema{ckeywords} -\pkuthss@int@infoitema{ekeywords} -\pkuthss@int@infoitemb{cuniversity} -\pkuthss@int@infoitemb{euniversity} -\pkuthss@int@infoitemb{cthesisname} -\pkuthss@int@infoitemb{ethesisname} -\pkuthss@int@infoitemb{cabstractname} -\pkuthss@int@infoitemb{eabstractname} -% Set up document information using the `key = value' grammar. -\newcommand*{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}} % Usage: \pkuthss@int@fillinblank{(number of lines)}{(line width)}{(contents)} -\def\pkuthss@int@fillinblank#1#2#3{ +\def\pkuthss@int@fillinblank#1#2#3{% \makebox[0pt][l]{\parbox[t]{#2}{\centering{#3}}}\mbox{}% \parbox[t]{#2}{% \newcount\pkuthss@tmp@linecount @@ -222,71 +230,68 @@ \repeat% }% } -% Set format of the title page (cover). -\renewcommand{\maketitle}{ - \cleardoublepage - % Add PDF bookmark for the title page. - \pdfbookmark[1]{\titlepagename}{titlepage} + +% Set up format of the title page (cover). +\renewcommand{\maketitle}{% + \pkuthss@int@pdfmark{\titlepagename}{titlepage} \begin{titlepage} % It will be nicer to use this line skip level in the title page. \linespread{1.6}\selectfont % Make the title page centered. \begin{center} % Emblem and inscription of the university, and type of thesis. - { + {% \zihao{1}% \includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}% \raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em] - {\bfseries{\cthesisname}} + {\bfseries{\cthesisname}}% } \vfill % Title of the thesis. - { + {% \zihao{2}{\label@ctitle}% - \pkuthss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}} + \pkuthss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}% } \vfill % Information about the author. - { + {% % Slightly adjust the line skip when using new font size. \zihao{3}\linespread{1.75}\selectfont \def\pkuthss@tmp@len{0.56\textwidth} \begin{tabular}{l@{\extracolsep{0.2em}}c} - {\heiti\label@cauthor} & + {\bfseries\label@cauthor} & \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cauthor} \\ - {\heiti\label@studentid} & + {\bfseries\label@studentid} & \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@studentid} \\ - {\heiti\label@school} & + {\bfseries\label@school} & \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@school} \\ - {\heiti\label@cmajor} & + {\bfseries\label@cmajor} & \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmajor} \\ - {\heiti\label@direction} & + {\bfseries\label@direction} & \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@direction} \\ - {\heiti\label@cmentor} & + {\bfseries\label@cmentor} & \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmentor} \\ - \end{tabular} + \end{tabular}% } \vfill % Date. {\zihao{-2}\@date} \end{center} - \end{titlepage} + \end{titlepage}% } % Typeset the Chinese abstract. -\newenvironment{cabstract}{ - \cleardoublepage - \pdfbookmark[1]{\cabstractname}{cabstract} +\newenvironment{cabstract}{% + \pkuthss@int@pdfmark{\cabstractname}{cabstract} \chapter*{\cabstractname} - \markboth{\cabstractname}{} + \markboth{\cabstractname}{}% }{% Keywords at the bottom of the page. - \vfill\noindent\textbf{\label@ckeywords}{\@ckeywords} + \vfill\noindent\textbf{\label@ckeywords}{\@ckeywords}% } % Typeset the English abstract. -\newenvironment{eabstract}{ - \cleardoublepage - \pdfbookmark[1]{\eabstractname}{eabstract} +\newenvironment{eabstract}{% + \pkuthss@int@pdfmark{\eabstractname}{eabstract} \chapter*{\sffamily\@etitle} \markboth{\eabstractname}{} \begin{center} @@ -294,9 +299,9 @@ {\label@ementor}{\@ementor}\\[2em] \textbf{\sffamily\eabstractname} \end{center} - \par + \par% }{% Keywords at the bottom of the page. - \vfill\noindent\textbf{\label@ekeywords}{\@ekeywords} + \vfill\noindent\textbf{\label@ekeywords}{\@ekeywords}% } \endinput diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf Binary files differindex c6d5dfae2f6..02ad319a882 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf |