texlive[48124] Master/texmf-dist: pkuthss (2jul18)
commits+karl at tug.org
commits+karl at tug.org
Mon Jul 2 22:40:31 CEST 2018
Revision: 48124
http://tug.org/svn/texlive?view=revision&revision=48124
Author: karl
Date: 2018-07-02 22:40:31 +0200 (Mon, 02 Jul 2018)
Log Message:
-----------
pkuthss (2jul18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat
trunk/Master/texmf-dist/doc/latex/pkuthss/example/Makefile
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example.pdf
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme.pdf
trunk/Master/texmf-dist/tex/latex/pkuthss/pkulogo.eps
trunk/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
trunk/Master/texmf-dist/tex/latex/pkuthss/pkuword.eps
trunk/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/ack.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap2.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap3.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/copy.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def
trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctexopts.cfg
trunk/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/example/misc/
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abstract.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-acknowledge.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-conclusion.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex
trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-introduction.tex
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat 2018-07-02 20:40:31 UTC (rev 48124)
@@ -4,13 +4,13 @@
@rem Copyright (c) 2010-2012 Casper Ti. Vector
@rem Public domain.
-set JOBNAME=thesis
- at rem \xD5\x{00E2}\x{00F6}\xE4\xC1\xBF\xB5\xC4ֵ\xBF\xC9\xD2\xD4Ϊ latex \xBB\xF2 pdflatex\xA1\xA3
+set JOB=thesis
+ at rem \xD5\x{00E2}\x{00F6}\xE4\xC1\xBF\xB5\xC4ֵ\xBF\xC9\xD2\xD4Ϊ latex\xA1\xA2pdflatex \xBB\xF2 xelatex\xA1\xA3
set LATEX=latex
-set BIBTEX=biber -l zh__pinyin
+set BIBTEX=biber -l zh__pinyin --output-safechars
set DVIPDF=dvipdfmx
-if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOBNAME%
+if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOB%
) else (set DODVIPDF=echo No need to run %DVIPDF%.)
if "%1"=="" goto doc
if "%1"=="doc" goto doc
@@ -17,10 +17,10 @@
if "%1"=="clean" (goto clean) else (goto usage)
:doc
-%LATEX% %JOBNAME%
-%BIBTEX% %JOBNAME%
-%LATEX% %JOBNAME%
-%LATEX% %JOBNAME%
+%LATEX% %JOB%
+%BIBTEX% %JOB%
+%LATEX% %JOB%
+%LATEX% %JOB%
%DODVIPDF%
goto end
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/example/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/Makefile 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/Makefile 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,17 +1,17 @@
# Copyright (c) 2008-2009 solvethis
-# Copyright (c) 2010-2012 Casper Ti. Vector
+# Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector
# Public domain.
# 被编译的主文件的文件名，不包括扩展名。
-JOBNAME = thesis
+JOB = thesis
# 这个变量的值可以为 latex、pdflatex 或 xelatex。
LATEX = latex
-BIBTEX = biber -l zh__pinyin
+BIBTEX = biber -l zh__pinyin --output-safechars
DVIPDF = dvipdfmx
# 如果用 LaTeX 编译，则使用 dvipdfmx 将 dvi 转成 pdf。
ifeq ($(LATEX), latex)
- DODVIPDF = $(DVIPDF) $(JOBNAME)
+ DODVIPDF = $(DVIPDF) $(JOB)
endif
# 区分是 Windows 环境还是类 UNIX 环境。
@@ -25,17 +25,18 @@
endif
doc:
- $(LATEX) $(JOBNAME)
- $(BIBTEX) $(JOBNAME)
- $(LATEX) $(JOBNAME)
- $(LATEX) $(JOBNAME)
+ $(LATEX) $(JOB)
+ $(BIBTEX) $(JOB)
+ $(LATEX) $(JOB)
+ $(LATEX) $(JOB)
$(DODVIPDF)
clean:
- $(RM) $(JOBNAME).{aux,bbl,bcf,blg,dvi,lof,log,lot,run.xml,toc,out{,.bak}} \
- {missfont,texput}.log chap/*.aux
+ $(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) $(JOBNAME).pdf
+ $(RM) $(JOB).pdf
# vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,12 @@
+% Copyright (c) 2014,2016 Casper Ti. Vector
+% Public domain.
+
+\begin{cabstract}
+ \pkuthssffaq % 中文测试文字。
+\end{cabstract}
+
+\begin{eabstract}
+ Test of the English abstract.
+\end{eabstract}
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,12 +0,0 @@
-% Copyright (c) 2014,2016 Casper Ti. Vector
-% Public domain.
-
-\begin{cabstract}
- \pkuthssffaq % 中文测试文字
-\end{cabstract}
-
-\begin{eabstract}
- Test of the English abstract.
-\end{eabstract}
-
-% vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/ack.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/ack.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/ack.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,7 @@
+% Copyright (c) 2014,2016 Casper Ti. Vector
+% Public domain.
+
+\chapter{致谢}
+\pkuthssffaq % 中文测试文字。
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/ack.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,7 +0,0 @@
-% Copyright (c) 2014,2016 Casper Ti. Vector
-% Public domain.
-
-\chapter{致谢}
-\pkuthssffaq % 中文测试文字。
-
-% vim:ts=4:sw=4
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,7 +1,7 @@
-% Copyright (c) 2014,2016 Casper Ti. Vector
+% Copyright (c) 2014,2016,2018 Casper Ti. Vector
% Public domain.
-\chapter{章节}
+\chapter{引言}
\pkuthssffaq % 中文测试文字。
% vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap2.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap2.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,7 @@
+% Copyright (c) 2014,2016 Casper Ti. Vector
+% Public domain.
+
+\chapter{章节}
+\pkuthssffaq % 中文测试文字。
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap2.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap3.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap3.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,7 @@
+% Copyright (c) 2014,2016,2018 Casper Ti. Vector
+% Public domain.
+
+\chapter{结论和展望}
+\pkuthssffaq % 中文测试文字。
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap3.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,7 +0,0 @@
-% Copyright (c) 2014,2016 Casper Ti. Vector
-% Public domain.
-
-\specialchap{结论}
-\pkuthssffaq % 中文测试文字。
-
-% vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/copy.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/copy.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/copy.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,45 @@
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2017 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.
+
+% 此处不用 \specialchap，因为学校要求目录不包括其自己及其之前的内容。
+\chapter*{版权声明}
+% 综合学校的书面要求及 Word 模版来看，版权声明页不用加页眉、页脚。
+\thispagestyle{empty}
+
+任何收存和保管本论文各种版本的单位和个人，
+未经本论文作者同意，不得将本论文转借他人，
+亦不得随意复制、抄录、拍照或以任何方式传播。
+否则一旦引起有碍作者著作权之问题，将可能承担法律责任。
+
+% 若须排版二维码，请将二维码图片重命名为“barcode”，
+% 转为合适的图片格式，并放在当前目录下，然后去掉下面 2 行的注释。
+%\vfill\noindent
+%\includegraphics[height = 5em]{barcode}
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/copy.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,45 +0,0 @@
-% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2017 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.
-
-% 此处不用 \specialchap，因为学校要求目录不包括其自己及其之前的内容。
-\chapter*{版权声明}
-% 综合学校的书面要求及 Word 模版来看，版权声明页不需加页眉、页脚。
-\thispagestyle{empty}
-
-任何收存和保管本论文各种版本的单位和个人，
-未经本论文作者同意，不得将本论文转借他人，
-亦不得随意复制、抄录、拍照或以任何方式传播。
-否则一旦引起有碍作者著作权之问题，将可能承担法律责任。
-
-% 若需排版二维码，请将二维码图片重命名为“barcode”，
-% 转为合适的图片格式，并放在当前目录下，然后去掉下面 2 行的注释。
-%\vfill\noindent
-%\includegraphics[height = 5em]{barcode}
-
-% vim:ts=4:sw=4
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,7 +0,0 @@
-% Copyright (c) 2014,2016 Casper Ti. Vector
-% Public domain.
-
-\specialchap{序言}
-\pkuthssffaq % 中文测试文字。
-
-% vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,82 @@
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2017 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.
+
+{
+ \ctexset{section = {
+ format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp}
+ }}
+
+ % 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码且编入了目录。
+ % 此处以 Word 模版为实际标准进行设定。
+ \specialchap{北京大学学位论文原创性声明和使用授权说明}
+ \mbox{}\vspace*{-3em}
+ \section*{原创性声明}
+
+ 本人郑重声明：
+ 所呈交的学位论文，是本人在导师的指导下，独立进行研究工作所取得的成果。
+ 除文中已经注明引用的内容外，
+ 本论文不含任何其他个人或集体已经发表或撰写过的作品或成果。
+ 对本文的研究做出重要贡献的个人和集体，均已在文中以明确方式标明。
+ 本声明的法律结果由本人承担。
+ \vskip 1em
+ \rightline{%
+ 论文作者签名：\hspace{5em}%
+ 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日%
+ }
+
+ \section*{%
+ 学位论文使用授权说明\\[-0.33em]
+ \textmd{\zihao{5}（必须装订在提交学校图书馆的印刷本）}%
+ }
+
+ 本人完全了解北京大学关于收集、保存、使用学位论文的规定，即：
+ \begin{itemize}
+ \item 按照学校要求提交学位论文的印刷本和电子版本；
+ \item 学校有权保存学位论文的印刷本和电子版，
+ 并提供目录检索与阅览服务，在校园网上提供服务；
+ \item 学校可以采用影印、缩印、数字化或其它复制手段保存论文；
+ \item 因某种特殊原因须要延迟发布学位论文电子版，
+ 授权学校在 $\Box$\nobreakspace{}一年 /
+ $\Box$\nobreakspace{}两年 /
+ $\Box$\nobreakspace{}三年以后在校园网上全文发布。
+ \end{itemize}
+ \centerline{（保密论文在解密后遵守此规定）}
+ \vskip 1em
+ \rightline{%
+ 论文作者签名：\hspace{5em}导师签名：\hspace{5em}%
+ 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日%
+ }
+
+ % 若须排版二维码，请将二维码图片重命名为“barcode”，
+ % 转为合适的图片格式，并放在当前目录下，然后去掉下面 2 行的注释。
+ %\vfill\noindent
+ %\includegraphics[height = 5em]{barcode}
+}
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,82 +0,0 @@
-% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2017 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.
-
-{
- \ctexset{section = {
- format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp}
- }}
-
- % 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码且编入了目录。
- % 此处以 Word 模版为实际标准进行设定。
- \specialchap{北京大学学位论文原创性声明和使用授权说明}
- \mbox{}\vspace*{-3em}
- \section*{原创性声明}
-
- 本人郑重声明：
- 所呈交的学位论文，是本人在导师的指导下，独立进行研究工作所取得的成果。
- 除文中已经注明引用的内容外，
- 本论文不含任何其他个人或集体已经发表或撰写过的作品或成果。
- 对本文的研究做出重要贡献的个人和集体，均已在文中以明确方式标明。
- 本声明的法律结果由本人承担。
- \vskip 1em
- \rightline{%
- 论文作者签名：\hspace{5em}%
- 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日%
- }
-
- \section*{%
- 学位论文使用授权说明\\[-0.33em]
- \textmd{\zihao{5}（必须装订在提交学校图书馆的印刷本）}%
- }
-
- 本人完全了解北京大学关于收集、保存、使用学位论文的规定，即：
- \begin{itemize}
- \item 按照学校要求提交学位论文的印刷本和电子版本；
- \item 学校有权保存学位论文的印刷本和电子版，
- 并提供目录检索与阅览服务，在校园网上提供服务；
- \item 学校可以采用影印、缩印、数字化或其它复制手段保存论文；
- \item 因某种特殊原因需要延迟发布学位论文电子版，
- 授权学校在 $\Box$\nobreakspace{}一年 /
- $\Box$\nobreakspace{}两年 /
- $\Box$\nobreakspace{}三年以后在校园网上全文发布。
- \end{itemize}
- \centerline{（保密论文在解密后遵守此规定）}
- \vskip 1em
- \rightline{%
- 论文作者签名：\hspace{5em}导师签名：\hspace{5em}%
- 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日%
- }
-
- % 若需排版二维码，请将二维码图片重命名为“barcode”，
- % 转为合适的图片格式，并放在当前目录下，然后去掉下面 2 行的注释。
- %\vfill\noindent
- %\includegraphics[height = 5em]{barcode}
-}
-
-% vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def 2018-07-02 20:40:31 UTC (rev 48124)
@@ -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 } { 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
+% vim:ft=tex:ts=2:sw=2:et
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctexopts.cfg (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctexopts.cfg 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,4 @@
+\ProvidesExplFile{\ExplFileName}{}{}{}
+\keys_set:nn { ctex / option } { fontset = pkuthss }
+\endinput
+% vim:ft=tex
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/example/ctexopts.cfg
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,45 @@
+% Copyright (c) 2018 Casper Ti. Vector
+% Public domain.
+
+\documentclass[zihao = -4]{ctexart}
+\usepackage{calc, geometry, graphicx}
+\usepackage[defaultsups]{newtxtext}
+\usepackage[cmintegrals, varg]{newtxmath}
+\pagestyle{empty}
+\newlength{\colpad}
+\newcommand{\colwidth}{\ccwd}
+
+% 设定论文纸尺寸。
+\geometry{paperwidth = 460mm, paperheight = 297mm, margin = 0cm}
+% 设定页面宽度、背面 logo 直径和书脊上下边界宽度。
+\newcommand{\miniwidth}{210mm}
+\newcommand{\logowidth}{64mm}
+\newcommand{\vertmargin}{\fill}
+% 减号前的值为论文厚度。
+\setlength{\colpad}{(10mm - \colwidth) / 2}
+
+\begin{document}
+\centering
+\begin{minipage}[b][\textheight][b]{\miniwidth}
+ \vspace*{\fill}\par
+ \centerline{\includegraphics[width = \logowidth]{pkulogo}}\par
+ \vspace*{\fill}\par
+\end{minipage}
+\hspace{\colpad}
+\begin{minipage}[b][\textheight][b]{\colwidth}
+ \bfseries\linespread{1}\selectfont
+ \vspace*{\vertmargin}\par
+ % 标题、年份和学号。
+ 测试文档\par\vfill
+ \rotatebox{-90}{2018}\par\vfill\rotatebox{-90}{0123456789}\par
+ \vspace*{\vertmargin}\par
+\end{minipage}
+\hspace{\colpad}
+\begin{minipage}[b][\textheight][b]{\miniwidth}
+ % thesis.pdf 应事先编译好，此处会自动提取其首页。
+ % 因为要插入 pdf 图片，本文档应用 pdflatex 或 xelatex 编译。
+ \includegraphics[height = \textheight, page = 1]{thesis}
+\end{minipage}
+\end{document}
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,5 +1,5 @@
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016 Casper Ti. Vector
+% Copyright (c) 2010-2016,2018 Casper Ti. Vector
% Public domain.
%
% 使用前请先仔细阅读 pkuthss 和 biblatex-caspervector 的文档，
@@ -13,18 +13,21 @@
% 并改动 ctex.cfg 等配置文件的用户请自行加入 nofonts 选项；
% 其它用户不用加入 nofonts 选项，加入之后反而会产生错误。
\documentclass[UTF8]{pkuthss}
+% 如果的确须要使脚注按页编号的话，可以去掉后面 footmisc 包的注释。
+% 注意：在启用此设定的情况下，可能要多编译一次以产生正确的脚注编号。
+%\usepackage[perpage]{footmisc}
% 使用 biblatex 排版参考文献，并规定其格式（详见 biblatex-caspervector 的文档）。
-% 这里按照英文文献在前，中文文献在后排序（“sorting = ecnty”）；
-% 若需按照中文文献在前，英文文献在后排序，请设置“sorting = centy”；
-% 若需按照引用顺序排序，请设置“sorting = none”。
-% 若需在排序中实现更复杂的需求，请参考 biblatex-caspervector 的文档。
-\usepackage[backend = biber, style = caspervector, utf8, sorting = ecnty]{biblatex}
+% 这里按照西文文献在前，中文文献在后排序（“sorting = ecnyt”）；
+% 若须按照中文文献在前，西文文献在后排序，请设置“sorting = cenyt”；
+% 若须按照引用顺序排序，请设置“sorting = none”。
+% 若须在排序中实现更复杂的需求，请参考 biblatex-caspervector 的文档。
+\usepackage[backend = biber, style = caspervector, utf8, sorting = ecnyt]{biblatex}
-% 按学校要求设定参考文献列表中的条目之内及之间的距离。
-\setlength{\bibitemsep}{3bp}
% 对于 linespread 值的计算过程有兴趣的同学可以参考 pkuthss.cls。
\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
+% 按学校要求设定参考文献列表的段间距。
+\setlength{\bibitemsep}{3bp}
% 设定文档的基本信息。
\pkuthssinfo{
@@ -58,7 +61,7 @@
如果编译时不出参考文献，
请参考 \texttt{texdoc pkuthss}“问题及其解决”一章
- “其它可能存在的问题”一节中关于 biber 的说明。
+ “上游宏包可能引起的问题”一节中关于 biber 的说明。%
}
\begin{document}
@@ -68,9 +71,9 @@
\pagestyle{empty}
% 自动生成封面。
\maketitle
- % 版权声明。封面要求单面打印，故需新开右页。
+ % 版权声明。封面要求单面打印，故须新开右页。
\cleardoublepage
- \include{chap/copyright}
+ \include{chap/copy}
% 此后到下一 \pagestyle 命令之前正常排版页眉和页脚。
\cleardoublepage
@@ -78,19 +81,17 @@
% 重置页码计数器，用大写罗马数字排版此部分页码。
\setcounter{page}{0}
\pagenumbering{Roman}
- % 中英文摘要。
- \include{chap/abstract}
+ % 中西文摘要。
+ \include{chap/abs}
% 自动生成目录。
\tableofcontents
% 以下为正文部分，默认要进行章节编号。
\mainmatter
- % 序言。
- \include{chap/introduction}
% 各章节。
\include{chap/chap1}
- % 结论。
- \include{chap/conclusion}
+ \include{chap/chap2}
+ \include{chap/chap3}
% 正文中的附录部分。
\appendix
@@ -103,9 +104,9 @@
% 以下为正文之后的部分，默认不进行章节编号。
\backmatter
% 致谢。
- \include{chap/acknowledge}
+ \include{chap/ack}
% 原创性声明和使用授权说明。
- \include{chap/originauth}
+ \include{chap/origin}
\end{document}
% vim:ts=4:sw=4
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,3 +1,61 @@
+2018-07-02, v1.8.0
+
+ * Changes to example template:
+ - Add the spine template.
+
+ * Changes to package code:
+ - Fix footnote format, in multiple aspects.
+ - pkuthss.cls: fix header/footer spacing.
+ - pkuthss.cls: fix displaymath spacing.
+ - pkuthss.cls: adjust list margins.
+ - pkuthss.cls: make chapter pages more tolerant of vertical spacing.
+
+ * Changes to documentation:
+ - pkuthss.bib: use the `edition' field now supported by blx-caspervector.
+ - doc: fix "需"/"须" typo.
+
+ * Misc:
+ - qa: automate the `需'/`须' check, and do not check whitespaces in patches.
+ - Minor fixes and cosmetics.
+
+2018-06-12, v1.7.6
+
+ * Changes to example template:
+ - nty -> nyt sorting following biblatex-caspervector upstream.
+ - doc: shorten chapter filenames.
+ - Assign numbers to `intro' and `concl' by default.
+ - Makefile: `JOBNAME' -> `JOB', saving some typing.
+ - Fix Makefile portability.
+ - doc: "英文" -> "西文".
+
+ * Changes to package code:
+ - pkuthss.cls: fix spacing between chapter mark/name.
+ - pkuthss.cls: fix toc depth and format.
+ - pkuthss.cls: simplify page style setup.
+ - `pkuthss at ...' -> `thss at ...'
+
+ * Misc:
+ - Minor fixes and cosmetics.
+
+2018-05-12, v1.7.5
+
+ * Changes to example template:
+ - doc: Fix missing accented characters with xelatex.
+ - Remove ctex-xecjk-winfonts.def for ctex < v2.x.
+ - Make.bat: support xelatex now that we no longer provide the GBK example.
+ - thesis.tex: fix FAQ subsection reference (thank @peiyangium).
+
+ * Changes to package code:
+ - pkuthss.cls: fix subsubsection captions.
+ - pkuthss.cls: remove kludge for tocloft with ctex < v2.x.
+
+ * Changes to documentation:
+ - Add patch file for English dissertations.
+
+ * Misc:
+ - (A lot?) more HTTPS.
+ - Minor fixes and cosmetics.
+
2017-03-01, v1.7.4
* API changes:
@@ -202,7 +260,7 @@
* Changes to documentation:
- No longer recommend the CTeX Suite.
- - Remove install hints (already included in TeX Live).
+ - Remove installation hints (already included in TeX Live).
- Discourage bibtex usage with UTF-8.
- hologo is back, and now we have proper XeLaTeX logo.
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,9 +1,9 @@
# Copyright (c) 2008-2009 solvethis
-# Copyright (c) 2010-2012,2014 Casper Ti. Vector
+# Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector
# Public domain.
-JOBNAME = pkuthss
-BIBTEX = biber -l zh__pinyin
+JOB = pkuthss
+BIBTEX = biber -l zh__pinyin --output-safechars
DVIPDF = dvipdfmx
MAKE = make
RM = rm -f
@@ -17,21 +17,22 @@
endif
ifeq ($(LATEX), latex)
- DODVIPDF = $(DVIPDF) $(JOBNAME)
+ DODVIPDF = $(DVIPDF) $(JOB)
endif
doc:
- $(LATEX1) $(JOBNAME)
- $(BIBTEX) $(JOBNAME)
- $(LATEX2) $(JOBNAME)
- $(LATEX2) $(JOBNAME)
+ $(LATEX1) $(JOB)
+ $(BIBTEX) $(JOB)
+ $(LATEX2) $(JOB)
+ $(LATEX2) $(JOB)
$(DODVIPDF)
clean:
- $(RM) $(JOBNAME).{aux,bbl,bcf,blg,dvi,lof,log,lot,run.xml,toc,out{,.bak}} \
- {missfont,texput}.log chap/*.aux
+ $(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) $(JOBNAME).pdf
+ $(RM) $(JOB).pdf
# vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,82 @@
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2017 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.
+
+{
+ \ctexset{section = {
+ format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp}
+ }}
+
+ % 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码且编入了目录。
+ % 此处以 Word 模版为实际标准进行设定。
+ \specialchap{北京大学学位论文原创性声明和使用授权说明}
+ \mbox{}\vspace*{-3em}
+ \section*{原创性声明}
+
+ 本人郑重声明：
+ 所呈交的学位论文，是本人在导师的指导下，独立进行研究工作所取得的成果。
+ 除文中已经注明引用的内容外，
+ 本论文不含任何其他个人或集体已经发表或撰写过的作品或成果。
+ 对本文的研究做出重要贡献的个人和集体，均已在文中以明确方式标明。
+ 本声明的法律结果由本人承担。
+ \vskip 1em
+ \rightline{%
+ 论文作者签名：\hspace{5em}%
+ 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日%
+ }
+
+ \section*{%
+ 学位论文使用授权说明\\[-0.33em]
+ \textmd{\zihao{5}（必须装订在提交学校图书馆的印刷本）}%
+ }
+
+ 本人完全了解北京大学关于收集、保存、使用学位论文的规定，即：
+ \begin{itemize}
+ \item 按照学校要求提交学位论文的印刷本和电子版本；
+ \item 学校有权保存学位论文的印刷本和电子版，
+ 并提供目录检索与阅览服务，在校园网上提供服务；
+ \item 学校可以采用影印、缩印、数字化或其它复制手段保存论文；
+ \item 因某种特殊原因须要延迟发布学位论文电子版，
+ 授权学校在 $\Box$\nobreakspace{}一年 /
+ $\Box$\nobreakspace{}两年 /
+ $\Box$\nobreakspace{}三年以后在校园网上全文发布。
+ \end{itemize}
+ \centerline{（保密论文在解密后遵守此规定）}
+ \vskip 1em
+ \rightline{%
+ 论文作者签名：\hspace{5em}导师签名：\hspace{5em}%
+ 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日%
+ }
+
+ % 若须排版二维码，请将二维码图片重命名为“barcode”，
+ % 转为合适的图片格式，并放在当前目录下，然后去掉下面 2 行的注释。
+ %\vfill\noindent
+ %\includegraphics[height = 5em]{barcode}
+}
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,82 +0,0 @@
-% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2017 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.
-
-{
- \ctexset{section = {
- format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp}
- }}
-
- % 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码且编入了目录。
- % 此处以 Word 模版为实际标准进行设定。
- \specialchap{北京大学学位论文原创性声明和使用授权说明}
- \mbox{}\vspace*{-3em}
- \section*{原创性声明}
-
- 本人郑重声明：
- 所呈交的学位论文，是本人在导师的指导下，独立进行研究工作所取得的成果。
- 除文中已经注明引用的内容外，
- 本论文不含任何其他个人或集体已经发表或撰写过的作品或成果。
- 对本文的研究做出重要贡献的个人和集体，均已在文中以明确方式标明。
- 本声明的法律结果由本人承担。
- \vskip 1em
- \rightline{%
- 论文作者签名：\hspace{5em}%
- 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日%
- }
-
- \section*{%
- 学位论文使用授权说明\\[-0.33em]
- \textmd{\zihao{5}（必须装订在提交学校图书馆的印刷本）}%
- }
-
- 本人完全了解北京大学关于收集、保存、使用学位论文的规定，即：
- \begin{itemize}
- \item 按照学校要求提交学位论文的印刷本和电子版本；
- \item 学校有权保存学位论文的印刷本和电子版，
- 并提供目录检索与阅览服务，在校园网上提供服务；
- \item 学校可以采用影印、缩印、数字化或其它复制手段保存论文；
- \item 因某种特殊原因需要延迟发布学位论文电子版，
- 授权学校在 $\Box$\nobreakspace{}一年 /
- $\Box$\nobreakspace{}两年 /
- $\Box$\nobreakspace{}三年以后在校园网上全文发布。
- \end{itemize}
- \centerline{（保密论文在解密后遵守此规定）}
- \vskip 1em
- \rightline{%
- 论文作者签名：\hspace{5em}导师签名：\hspace{5em}%
- 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日%
- }
-
- % 若需排版二维码，请将二维码图片重命名为“barcode”，
- % 转为合适的图片格式，并放在当前目录下，然后去掉下面 2 行的注释。
- %\vfill\noindent
- %\includegraphics[height = 5em]{barcode}
-}
-
-% vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,38 @@
+% Documentation for pkuthss.
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2014 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
+% 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
+
+\begin{cabstract}
+ 本文介绍了 pkuthss 文档模版所提供的功能。
+\end{cabstract}
+
+\begin{eabstract}
+ This document describes the the functions provided by
+ the pkuthss document template.
+\end{eabstract}
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abstract.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abstract.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abstract.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,38 +0,0 @@
-% Documentation for pkuthss.
-%
-% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2014 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
-% http://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
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
-% chap/pkuthss-chap1.tex
-% chap/pkuthss-chap2.tex
-% chap/pkuthss-chap3.tex
-% chap/pkuthss-conclusion.tex
-% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
-
-\begin{cabstract}
- 本文介绍了 pkuthss 文档模版所提供的功能。
-\end{cabstract}
-
-\begin{eabstract}
- This document describes the the functions provided by
- the pkuthss document template.
-\end{eabstract}
-
-% vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,51 @@
+% Documentation for pkuthss.
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2012,2015 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
+% 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
+
+\chapter{致谢}
+
+感谢北大未名 BBS 上 MathTools 版和 Thesis 版诸位同学的支持。
+特别感谢 pkuthss 模版的最初创作者 solvethis 网友，
+以及不断地对 Casper 提出的诸多问题予以解答的 cauchy 网友 :)
+
+此外还要感谢 \parencite{pku-thesisstyle} 的作者，
+让我校在学位论文格式要求的繁复程度上离隔壁更近了一步，
+同时还达成了用 \hologo{TeX} 排版出和 M\$ Word 一样审美水平论文的伟大成就。
+
+最后要感谢 \verb|sed|、\verb|grep|、\verb|sort| 这些 Unix 工具，
+它们每天陪伴 Casper，从不让 Casper 对它们的期望落空，它是 Casper 最好的朋友。
+
+\vspace{1em}
+\begin{quotation}
+\small This series of books is affectionately dedicated to the
+Type 650 computer once installed at Case Institute of Technology,
+in remembrance of many pleasant evenings.
+
+\rightline{--- Donald E.\ Knuth, \emph{The Art of Computer Programming}}
+\end{quotation}
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-acknowledge.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-acknowledge.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-acknowledge.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,51 +0,0 @@
-% Documentation for pkuthss.
-%
-% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2012,2015 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
-% http://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
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
-% chap/pkuthss-chap1.tex
-% chap/pkuthss-chap2.tex
-% chap/pkuthss-chap3.tex
-% chap/pkuthss-conclusion.tex
-% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
-
-\chapter{致谢}
-
-感谢北大未名 BBS 上 MathTools 版和 Thesis 版诸位同学的支持。
-特别感谢 pkuthss 模版的最初创作者 solvethis 网友，
-以及不断地对 Casper 提出的诸多问题予以解答的 cauchy 网友 :)
-
-此外还要感谢 \parencite{pku-thesisstyle} 的作者，
-让我校在学位论文格式要求的繁复程度上离隔壁更近了一步，
-同时还达成了用 \hologo{TeX} 排版出和 M\$ Word 一样审美水平论文的伟大成就。
-
-最后要感谢 \verb|sed|、\verb|grep|、\verb|sort| 这些 Unix 工具，
-它们每天陪伴 Casper，从不让 Casper 对它们的期望落空，它是 Casper 最好的朋友。
-
-\vspace{1em}
-\begin{quotation}
-\small This series of books is affectionately dedicated to the
-Type 650 computer once installed at Case Institute of Technology,
-in remembrance of many pleasant evenings.
-
-\rightline{--- Donald E.\ Knuth, \emph{The Art of Computer Programming}}
-\end{quotation}
-
-% vim:ts=4:sw=4
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,13 +1,13 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2015 Casper Ti. Vector
+% Copyright (c) 2010-2018 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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -16,15 +16,15 @@
%
% This work consists of the following files:
% pkuthss.tex
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
+% 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-conclusion.tex
+% chap/pkuthss-concl.tex
% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
+% chap/pkuthss-ack.tex
\chapter{使用介绍}
\section{系统要求}\label{sec:req}
@@ -37,12 +37,12 @@
\item 中文字体。
\item 如果要使用 biblatex 进行文献列表和引用的排版的话，
还需要 biblatex\supercite{biblatex} 宏包；
- \item 如果需要对中文文献进行按汉语拼音的排序的话，
+ \item 如果要对中文文献进行按汉语拼音的排序的话，
还需要 biber\supercite{biber} 程序。
\item 如果使用默认的文献列表和引用样式的话，还需要作者编写的 biblatex 样式
（biblatex-caspervector\supercite{biblatex-caspervector}），
此样式要求使用 biber 程序。
- \item 如果需要使用 Makefile 来实现自动编译，还需要 Make 工具；
+ \item 如果须要使用 Makefile 来实现自动编译，还需要 Make 工具；
但如果使用由批处理实现的伪“Makefile”就不用了。
\end{itemize}
@@ -49,7 +49,7 @@
\myemph{最新}的\myemph{完全版} \hologo{TeX} Live 系统（\myemph{%
注：某些 Linux 发行版软件仓库中的 \hologo{TeX} Live 有问题，
建议使用独立安装版的 \hologo{TeX} Live%
- \unemph{\footnote{\url{http://www.tug.org/texlive/}.}}。%
+ \unemph{\footnote{\url{https://www.tug.org/texlive/}.}}。%
}）都已经包含除中文字体和 Make 之外所有要求的项目。%
\myemph{%
为了获得最好的支持，
@@ -56,7 +56,7 @@
我们建议用户使用最新、完全版的 \hologo{TeX} 系统和各宏包。%
}
-中文字体需要用户自行获得。\myemph{%
+中文字体须要用户自行获得。\myemph{%
注：一些中文字体的字库不全，只有 GB2312 字符集内字符的字体信息。
这种情况通常会造成编译生成的 pdf 文件中缺少部分字符，
其中一种典型症状是“〇”字显示不出来。
@@ -154,7 +154,7 @@
}
pkuthss 文档模版附带的 Makefile 中已经对这三种编译方式进行了完整的配置。
-用户只需要在 Makefile 中通过设定变量 \verb|JOBNAME| 的值指定被编译的主文件名，
+用户只须要在 Makefile 中通过设定变量 \verb|JOB| 的值指定被编译的主文件名，
并通过设定变量 \verb|LATEX| 的值指定采用哪种编译方式，
即可通过在主文件所在目录调用 Make 工具来实现自动编译：
如果是在类 UNIX 环境下，则用户应该调用的命令名为 \verb|make|：
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,13 +1,13 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2017 Casper Ti. Vector
+% Copyright (c) 2010-2018 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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -16,15 +16,15 @@
%
% This work consists of the following files:
% pkuthss.tex
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
+% 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-conclusion.tex
+% chap/pkuthss-concl.tex
% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
+% chap/pkuthss-ack.tex
\chapter{pkuthss 文档模版提供的功能}
\section{pkuthss 文档类提供的选项}\label{sec:options}
@@ -47,7 +47,7 @@
\item \textbf{\texttt{[no]pkufont}}：
是否根据学校对论文格式的要求\mbox{\supercite{pku-thesisstyle}}%
- 将英文字体改为类似于 Times New Roman / Arial 的字体。
+ 将西文字体改为类似于 Times New Roman / Arial 的字体。
\item \textbf{\texttt{[no]pkufoot}}\footnote{%
此选项等价于 1.6.4 及以前版本 pkuthss-extra 宏包的
@@ -90,7 +90,7 @@
具体地说，启用 \verb|spacing| 选项后会进行以下几项设置：
\begin{itemize}
\item 自动忽略 CJK 文字之间的空白而
- 保留（CJK 文字与英文之间等的）其它空白。
+ 保留（CJK 文字与西文之间等的）其它空白。
\item 调用 setspace 宏包以使某些细节处的空间安排更美观。
\item 采用比 \hologo{LaTeX} 默认设定更加紧密的枚举环境%
\footnote{%
@@ -124,7 +124,7 @@
通常用户在调用 \texttt{\string\maketitle} 前
已经设置好所有的文档信息。
若用户不调用 \texttt{\string\maketitle}，
- 则需在设定完文档信息之后自行调用
+ 则须在设定完文档信息之后自行调用
第 \ref{ssec:misc} 小节中介绍的
\texttt{\string\setpdfproperties} 命令以完成
pdf 文档属性的设定。%
@@ -137,8 +137,8 @@
它们选择源代码使用的字符编码，默认使用 \verb|GBK|。
\end{itemize}
-例如，如果需要使用 UTF-8 编码撰写论文，
-则需要在载入 pkuthss 文档类时加上 \verb|UTF8| 选项：
+例如，如果须要使用 UTF-8 编码撰写论文，
+则应在载入 pkuthss 文档类时加上 \verb|UTF8| 选项：
\begin{Verbatim}[frame = single]
\documentclass[UTF8, ...]{pkuthss} % “...”代表其它的选项。
\end{Verbatim}
@@ -160,19 +160,19 @@
这些命令总结如下：
\begin{itemize}
\item \texttt{\bfseries\string\ctitle}：设定论文中文标题；
- \item \texttt{\bfseries\string\etitle}：设定论文英文标题；
+ \item \texttt{\bfseries\string\etitle}：设定论文西文标题；
\item \texttt{\bfseries\string\cauthor}：设定作者的中文名；
- \item \texttt{\bfseries\string\eauthor}：设定作者的英文名；
+ \item \texttt{\bfseries\string\eauthor}：设定作者的西文名；
\item \texttt{\bfseries\string\studentid}：设定作者的学号；
\item \texttt{\bfseries\string\date}：设定日期；
\item \texttt{\bfseries\string\school}：设定作者的学院名；
\item \texttt{\bfseries\string\cmajor}：设定作者专业的中文名；
- \item \texttt{\bfseries\string\emajor}：设定作者专业的英文名；
+ \item \texttt{\bfseries\string\emajor}：设定作者专业的西文名；
\item \texttt{\bfseries\string\direction}：设定作者的研究方向；
\item \texttt{\bfseries\string\cmentor}：设定导师的中文名；
- \item \texttt{\bfseries\string\ementor}：设定导师的英文名；
+ \item \texttt{\bfseries\string\ementor}：设定导师的西文名；
\item \texttt{\bfseries\string\ckeywords}：设定中文关键词；
- \item \texttt{\bfseries\string\ekeywords}：设定英文关键词。
+ \item \texttt{\bfseries\string\ekeywords}：设定西文关键词。
\end{itemize}
例如，如果要设定专业为“化学”（“Chemistry”），则可以使用以下命令：
@@ -192,11 +192,11 @@
这些命令总结如下：
\begin{itemize}
\item \texttt{\bfseries\string\cuniversity}：大学的中文名。
- \item \texttt{\bfseries\string\euniversity}：大学的英文名。
+ \item \texttt{\bfseries\string\euniversity}：大学的西文名。
\item \texttt{\bfseries\string\cthesisname}：论文类别的中文名。
- \item \texttt{\bfseries\string\ethesisname}：论文类别的英文名。
+ \item \texttt{\bfseries\string\ethesisname}：论文类别的西文名。
\item \texttt{\bfseries\string\cabstractname}：摘要的中文标题。
- \item \texttt{\bfseries\string\eabstractname}：摘要的英文标题。
+ \item \texttt{\bfseries\string\eabstractname}：摘要的西文标题。
\end{itemize}
例如，
@@ -236,13 +236,13 @@
\subsection{其它命令和环境}\label{ssec:misc}
\texttt{\bfseries cabstract} 和 \texttt{\bfseries eabstract}
-环境用于编写中英文摘要。
-用户只需要写摘要的正文；标题、作者、导师、专业等部分会自动生成。
+环境用于编写中西文摘要。
+用户只须要写摘要的正文；标题、作者、导师、专业等部分会自动生成。
\texttt{\bfseries\string\specialchap} 命令
用于开始不进行标号但计入目录的一章，
并合理安排其页眉。\myemph{%
- 注意：需要启用 \texttt{spechap} 选项才能使用此命令。
+ 注意：须要启用 \texttt{spechap} 选项才能使用此命令。
另外，在此章内的节或小节等命令应使用带星号的版本，
例如 \texttt{\string\section\string*} 等，
以免造成章节编号混乱。%
@@ -253,10 +253,10 @@
\texttt{\bfseries\string\setpdfproperties} 命令
用于根据用户设定的文档信息自动设定生成的 pdf 文档的属性。
此命令会在用户调用 \verb|\maketitle| 命令时被自动调用，
-因此通常不需要用户自己使用；
-但用户有时可能不需要输出封面，从而不会调用 \verb|\maketitle| 命令，
-此时就需要在设定完文档信息之后调用 \verb|\setpdfproperties|。%
-\myemph{注意：需要启用 \texttt{pdfprop} 选项才能使用此命令。}
+因此通常不须要用户自己使用；
+但用户有时可能不须要输出封面，从而不会调用 \verb|\maketitle| 命令，
+此时就须要在设定完文档信息之后调用 \verb|\setpdfproperties|。%
+\myemph{注意：须要启用 \texttt{pdfprop} 选项才能使用此命令。}
\section{从其它文档类和宏包继承的功能}\label{sec:thirdparty}
@@ -285,10 +285,10 @@
就目前而言，在\myemph{除 3.0--3.3 之外版本的} biblatex 中，
通过更复杂的设置，还可以满足例如被引用的文献按照引用顺序排序，
-而未引用的文献按照英文文献在前、中文文献在后排序这样的需求，
+而未引用的文献按照西文文献在前、中文文献在后排序这样的需求，
详见 biblatex-caspervector 的文档\supercite{biblatex-caspervector}。
-pkuthss 文档类可能调用以下这些宏包：
+除此之外，pkuthss 文档类还可能调用以下这些宏包：
\begin{itemize}
\item 启用 \verb|pkufont| 选项时会调用
newtxtext 和 newtxmath\supercite{newtx} 宏包，
@@ -313,7 +313,7 @@
假设 pkuthss 的说明文档所在目录具有下述形式的路径：
\begin{Verbatim}[frame = single]
# 说明文档所在目录（$TEXMFDIST 的形式见下面几行）：
-$TEXMFDIST/tex/latex/pkuthss/
+$TEXMFDIST/doc/latex/pkuthss/
# 若用户使用 Windows 下的 TeX Live 系统，则 $TEXMFDIST 一般类似于：
C:\texlive\2015\texmf-dist
# 若用户使用类 Unix 下的 TeX Live 系统，则 $TEXMFDIST 一般类似于：
@@ -321,10 +321,10 @@
\end{Verbatim}
则其源文件所在目录应该位于以下目录：
\begin{Verbatim}[frame = single]
-$TEXMFDIST/doc/latex/pkuthss/
+$TEXMFDIST/tex/latex/pkuthss/
\end{Verbatim}
-如果的确需要修改 pkuthss 文档类的源文件，\myemph{%
+如果的确须要修改 pkuthss 文档类的源文件，\myemph{%
建议用户将 \texttt{pkuthss.cls} 或其它需要修改的文件
复制到被编译的主文件所在的目录，
然后对此副本进行修改%
@@ -332,25 +332,25 @@
能这样做的原因是目前常用的 \hologo{TeX} 系统在读取编译用到的文件时，
会优先考虑工作目录（即主文件所在目录）中的文件。%
}。这样做的目的主要是使用户不必在每次调整文档类文件时都去上述路径修改；
-同时这样也可以在（万一需要）更新 \hologo{TeX} 系统时，
+同时这样也可以在（万一须要）更新 \hologo{TeX} 系统时，
防止用户修改过的文档类文件在更新中被自动覆盖掉。
一个常见的需求是封面中部分内容（特别是论文的标题、专业和研究方向）太长，
超出了在预设的空间。
此时，用户可以修改 \verb|pkuthss.cls| 里 \verb|\maketitle| 定义中
-\verb|\pkuthss at int@fillinblank| 宏的参数来改变
+\verb|\thss at int@fillinblank| 宏的参数来改变
带下划线的空白的行数和行宽，其语法为：
\begin{Verbatim}[frame = single]
-\pkuthss at int@fillinblank{行数}{行宽}{内容}
+\thss at int@fillinblank{行数}{行宽}{内容}
\end{Verbatim}
例如，如果“研究方向”一栏需要两行的空白，
可以将 \verb|pkuthss.cls| 里的
\begin{Verbatim}[frame = single]
-\pkuthss at int@fillinblank{1}{\pkuthss at tmp@len}{\kaishu\@direction}
+\thss at int@fillinblank{1}{\thss at tmp@len}{\kaishu\@direction}
\end{Verbatim}
改为
\begin{Verbatim}[frame = single]
-\pkuthss at int@fillinblank{2}{\pkuthss at tmp@len}{\kaishu\@direction}
+\thss at int@fillinblank{2}{\thss at tmp@len}{\kaishu\@direction}
\end{Verbatim}
当然，为了美观，可以将多于一行的部分移到封面中作者信息部分的最下方。
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,13 +1,13 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2017 Casper Ti. Vector
+% Copyright (c) 2010-2018 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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -16,15 +16,15 @@
%
% This work consists of the following files:
% pkuthss.tex
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
+% 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-conclusion.tex
+% chap/pkuthss-concl.tex
% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
+% chap/pkuthss-ack.tex
\chapter{问题及其解决}
\section{文档中已经提到的常见问题（按重要性排序）}
@@ -33,7 +33,7 @@
解决方式见第 \ref{sec:options} 节。
通过一些设置，还可以满足例如被引用的文献按照引用顺序排序，
-而未引用的文献按照英文文献在前、中文文献在后排序这样的需求，
+而未引用的文献按照西文文献在前、中文文献在后排序这样的需求，
见第 \ref{sec:thirdparty} 节。
一些高级设置，如封面中部分内容长度超过预设空间容量时的设置，
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,34 @@
+% Documentation for pkuthss.
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2012 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
+% 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
+
+\specialchap{结论}
+
+pkuthss 文档模版结构较为简洁、清晰、灵活，较为易于学习和使用。
+希望它能为各位须要使用 \hologo{LaTeX} 撰写学位论文的同学提供一些帮助。
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-conclusion.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-conclusion.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-conclusion.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,34 +0,0 @@
-% Documentation for pkuthss.
-%
-% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2012 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
-% http://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
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
-% chap/pkuthss-chap1.tex
-% chap/pkuthss-chap2.tex
-% chap/pkuthss-chap3.tex
-% chap/pkuthss-conclusion.tex
-% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
-
-\specialchap{结论}
-
-pkuthss 文档模版结构较为简洁、清晰、灵活，较为易于学习和使用。
-希望它能为各位需要使用 \hologo{LaTeX} 撰写学位论文的同学提供一些帮助。
-
-% vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,47 @@
+% Documentation for pkuthss.
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2016 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
+% 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
+
+\chapter*{版权声明}
+\thispagestyle{empty}
+
+版权所有 \copyright\ 2008--2009 solvethis
+\par
+版权所有 \copyright\ 2010--2017 Casper Ti. Vector
+\vskip 1em
+
+pkuthss 文档类及其说明文档均以 \hologo{LaTeX} Project Public License 发布。
+随 pkuthss 提供的模版源代码中，除以下文件
+\begin{itemize}
+ \item \verb|chap/copyright.tex|
+ \item \verb|chap/originauth.tex|
+\end{itemize}
+以 New BSD License 发布，
+以及参考文献和引用列表使用的样式文件版权声明见相应文件中说明以外，
+其余所有文件发布在公有领域（public domain）。
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,47 +0,0 @@
-% Documentation for pkuthss.
-%
-% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016 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
-% http://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
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
-% chap/pkuthss-chap1.tex
-% chap/pkuthss-chap2.tex
-% chap/pkuthss-chap3.tex
-% chap/pkuthss-conclusion.tex
-% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
-
-\chapter*{版权声明}
-\thispagestyle{empty}
-
-版权所有 \copyright\ 2008--2009 solvethis
-\par
-版权所有 \copyright\ 2010--2017 Casper Ti. Vector
-\vskip 1em
-
-pkuthss 文档类及其说明文档均以 \hologo{LaTeX} Project Public License 发布。
-随 pkuthss 提供的模版源代码中，除以下文件
-\begin{itemize}
- \item \verb|chap/copyright.tex|
- \item \verb|chap/originauth.tex|
-\end{itemize}
-以 New BSD License 发布，
-以及参考文献和引用列表使用的样式文件版权声明见相应文件中说明以外，
-其余所有文件发布在公有领域（public domain）。
-
-% vim:ts=4:sw=4
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -7,7 +7,7 @@
% 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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -16,15 +16,15 @@
%
% This work consists of the following files:
% pkuthss.tex
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
+% 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-conclusion.tex
+% chap/pkuthss-concl.tex
% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
+% chap/pkuthss-ack.tex
\chapter{更新记录}
\raggedbottom
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,67 @@
+% Documentation for pkuthss.
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2012,2014-2015,2018 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
+% 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
+
+\specialchap{序言}
+
+本文档是北京大学论文文档模版 pkuthss 的说明文档。
+
+pkuthss 文档模版由三部分构成：
+\begin{itemize}
+ \item \textbf{pkuthss 文档类}：
+ 其中根据学校的格式规范\mbox{\supercite{pku-thesisstyle}}%
+ 实现了学位论文所需的基本格式要求，
+ 主要包括对排版格式的设定和提供设置论文信息的命令；
+ 此外也实现了学位论文中用户可能较多用到的一些额外功能，
+ 例如自动在目录中加入参考文献和索引的条目和
+ 自动根据用户设定的文档信息对所生成 pdf 的作者、标题等属性进行设置等。
+ \item \textbf{说明文档}：
+ 说明文档即本文档，
+ 在安装（见第 \ref{sec:req} 节）之后应该可以用 \hologo{TeX} 系统提供的
+ \verb|texdoc| 命令调出：
+\begin{Verbatim}[frame = single]
+texdoc pkuthss
+\end{Verbatim}
+ \item \textbf{论文模版}：
+ 模版的源代码（及由此生成的 pdf 文档）
+ 和本文档的 pdf 文件处于同一目录下。
+ 用户只须按照模版中的框架修改代码，即可写出自己的论文。
+\end{itemize}
+
+在此之前，包括 dypang\supercite{dypang}、FerretL\supercite{FerretL}、%
+lwolf\supercite{lwolf}、Langpku\supercite{Langpku}、%
+solvethis\supercite{solvethis} 等的数位网友均做过学位论文模版的工作。
+本论文模版是 solvethis 的 pkuthss 模版的更新版本，
+更新的重点是重构和对新文档类、宏包的支持。
+
+pkuthss 文档模版现在的维护者是 Casper Ti. Vector\footnote%
+{\href{mailto:CasperVector at gmail.com}{\texttt{CasperVector at gmail.com}}.}。%
+pkuthss 文档模版目前托管在 GitLab 上，
+其项目主页是：\\
+\hspace*{\parindent}\url{https://gitlab.com/CasperVector/pkuthss}
+
+% vim:ts=4:sw=4
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-introduction.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-introduction.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-introduction.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,67 +0,0 @@
-% Documentation for pkuthss.
-%
-% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2012,2014-2015 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
-% http://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
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
-% chap/pkuthss-chap1.tex
-% chap/pkuthss-chap2.tex
-% chap/pkuthss-chap3.tex
-% chap/pkuthss-conclusion.tex
-% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
-
-\specialchap{序言}
-
-本文档是北京大学论文文档模版 pkuthss 的说明文档。
-
-pkuthss 文档模版由三部分构成：
-\begin{itemize}
- \item \textbf{pkuthss 文档类}：
- 其中根据学校的格式规范\mbox{\supercite{pku-thesisstyle}}%
- 实现了学位论文所需的基本格式要求，
- 主要包括对排版格式的设定和提供设置论文信息的命令；
- 此外也实现了学位论文中用户可能较多用到的一些额外功能，
- 例如自动在目录中加入参考文献和索引的条目和
- 自动根据用户设定的文档信息对所生成 pdf 的作者、标题等属性进行设置等。
- \item \textbf{说明文档}：
- 说明文档即本文档，
- 在安装（见第 \ref{sec:req} 节）之后应该可以用 \hologo{TeX} 系统提供的
- \verb|texdoc| 命令调出：
-\begin{Verbatim}[frame = single]
-texdoc pkuthss
-\end{Verbatim}
- \item \textbf{论文模版}：
- 模版的源代码（及由此生成的 pdf 文档）
- 和本文档的 pdf 文件处于同一目录下。
- 用户只需按照模版中的框架修改代码，即可写出自己的论文。
-\end{itemize}
-
-在此之前，包括 dypang\supercite{dypang}、FerretL\supercite{FerretL}、%
-lwolf\supercite{lwolf}、Langpku\supercite{Langpku}、%
-solvethis\supercite{solvethis} 等的数位网友均做过学位论文模版的工作。
-本论文模版是 solvethis 的 pkuthss 模版的更新版本，
-更新的重点是重构和对新文档类、宏包的支持。
-
-pkuthss 文档模版现在的维护者是 Casper Ti. Vector\footnote%
-{\href{mailto:CasperVector at gmail.com}{\texttt{CasperVector at gmail.com}}.}。%
-pkuthss 文档模版目前托管在 GitLab 上，
-其项目主页是：\\
-\hspace*{\parindent}\url{https://gitlab.com/CasperVector/pkuthss}
-
-% vim:ts=4:sw=4
Added: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch 2018-07-02 20:40:31 UTC (rev 48124)
@@ -0,0 +1,275 @@
+diff --git a/doc/example/chap/abs.tex b/doc/example/chap/abs.tex
+index b930654..cfa6cd3 100644
+--- a/doc/example/chap/abs.tex
++++ b/doc/example/chap/abs.tex
+@@ -2,7 +2,7 @@
+ % Public domain.
+
+ \begin{cabstract}
+- \pkuthssffaq % 中文测试文字
++ 中文摘要。
+ \end{cabstract}
+
+ \begin{eabstract}
+diff --git a/doc/example/chap/ack.tex b/doc/example/chap/ack.tex
+index 4af4d39..09de33d 100644
+--- a/doc/example/chap/ack.tex
++++ b/doc/example/chap/ack.tex
+@@ -1,7 +1,7 @@
+ % Copyright (c) 2014,2016 Casper Ti. Vector
+ % Public domain.
+
+-\chapter{致谢}
+-\pkuthssffaq % 中文测试文字。
++\chapter{Acknowledgements}
++Test text.
+
+ % vim:ts=4:sw=4
+diff --git a/doc/example/chap/chap1.tex b/doc/example/chap/chap1.tex
+index 3d631f3..6e46b13 100644
+--- a/doc/example/chap/chap1.tex
++++ b/doc/example/chap/chap1.tex
+@@ -1,7 +1,7 @@
+ % Copyright (c) 2014,2016,2018 Casper Ti. Vector
+ % Public domain.
+
+-\chapter{引言}
+-\pkuthssffaq % 中文测试文字。
++\chapter{Introduction}
++Test text.
+
+ % vim:ts=4:sw=4
+diff --git a/doc/example/chap/chap2.tex b/doc/example/chap/chap2.tex
+index 85f7008..da8c177 100644
+--- a/doc/example/chap/chap2.tex
++++ b/doc/example/chap/chap2.tex
+@@ -1,7 +1,7 @@
+ % Copyright (c) 2014,2016 Casper Ti. Vector
+ % Public domain.
+
+-\chapter{章节}
+-\pkuthssffaq % 中文测试文字。
++\chapter{Some chapter}
++Test text.
+
+ % vim:ts=4:sw=4
+diff --git a/doc/example/chap/chap3.tex b/doc/example/chap/chap3.tex
+index ed66f12..ae221d6 100644
+--- a/doc/example/chap/chap3.tex
++++ b/doc/example/chap/chap3.tex
+@@ -1,7 +1,7 @@
+ % Copyright (c) 2014,2016,2018 Casper Ti. Vector
+ % Public domain.
+
+-\chapter{结论和展望}
+-\pkuthssffaq % 中文测试文字。
++\chapter{Conclusion}
++Test text.
+
+ % vim:ts=4:sw=4
+diff --git a/doc/example/chap/encl1.tex b/doc/example/chap/encl1.tex
+index 9834829..4296e9a 100644
+--- a/doc/example/chap/encl1.tex
++++ b/doc/example/chap/encl1.tex
+@@ -1,7 +1,7 @@
+ % Copyright (c) 2014,2016 Casper Ti. Vector
+ % Public domain.
+
+-\chapter{附件}
+-\pkuthssffaq % 中文测试文字。
++\chapter{Some appendix}
++Test text.
+
+ % vim:ts=4:sw=4
+diff --git a/doc/example/thesis.bib b/doc/example/thesis.bib
+index ac5b0c9..9d2ad60 100644
+--- a/doc/example/thesis.bib
++++ b/doc/example/thesis.bib
+@@ -7,13 +7,4 @@
+ language = {english},
+ }
+
+- at article{test-zh,
+- author = {作者},
+- title = {标题},
+- type = {J},
+- journal = {期刊},
+- date = {2014-04-01},
+- language = {chinese},
+-}
+-
+ % vim:ts=4:sw=4
+diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex
+index d7a575f..baed091 100644
+--- a/doc/example/thesis.tex
++++ b/doc/example/thesis.tex
+@@ -14,53 +14,44 @@
+ % 其它用户不用加入 nofonts 选项，加入之后反而会产生错误。
+ \documentclass[UTF8]{pkuthss}
+
+-% 使用 biblatex 排版参考文献，并规定其格式（详见 biblatex-caspervector 的文档）。
+-% 这里按照西文文献在前，中文文献在后排序（“sorting = ecnyt”）；
+-% 若须按照中文文献在前，西文文献在后排序，请设置“sorting = cenyt”；
+-% 若须按照引用顺序排序，请设置“sorting = none”。
+-% 若须在排序中实现更复杂的需求，请参考 biblatex-caspervector 的文档。
+-\usepackage[backend = biber, style = caspervector, utf8, sorting = ecnyt]{biblatex}
++% 使用 biblatex 排版参考文献，并规定其格式（详见 biblatex 的文档）。
++\usepackage[backend = biber]{biblatex}
+
+ % 按学校要求设定参考文献列表中的条目之内及之间的距离。
+ \setlength{\bibitemsep}{3bp}
+ % 对于 linespread 值的计算过程有兴趣的同学可以参考 pkuthss.cls。
+ \renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
+
++\ctexset{
++ contentsname = {Contents},
++ listfigurename = {List of Figures},
++ listtablename = {List of Tables},
++ figurename = {Figure},
++ tablename = {Table},
++ indexname = {Index},
++ appendixname = {Appendix},
++ part/name = {\partname\space},
++ part/number = {\thepart},
++ chapter/name = {\chaptername\space},
++ chapter/number = {\thechapter},
++}
++
+ % 设定文档的基本信息。
+ \pkuthssinfo{
+- cthesisname = {博士研究生学位论文}, ethesisname = {Doctor Thesis},
+- ctitle = {测试文档}, etitle = {Test Document},
+- cauthor = {某某},
++ ethesisname = {Doctor Thesis},
++ etitle = {Test Document},
+ eauthor = {Test},
+ studentid = {0123456789},
+- date = {某年某月},
+- school = {某某学院},
+- cmajor = {某某专业}, emajor = {Some Major},
+- direction = {某某方向},
+- cmentor = {某某教授}, ementor = {Prof.\ Somebody},
++ date = {Some Date},
++ school = {Some School},
++ emajor = {Some Major},
++ direction = {Some Direction},
++ ementor = {Prof.\ Somebody},
+ ckeywords = {其一，其二}, ekeywords = {First, Second}
+ }
+ % 载入参考文献数据库（注意不要省略“.bib”）。
+ \addbibresource{thesis.bib}
+
+-% 普通用户可删除此段，并相应地删除 chap/*.tex 中的
+-% “\pkuthssffaq % 中文测试文字。”一行。
+-\usepackage{color}
+-\def\pkuthssffaq{%
+- \emph{\textcolor{red}{pkuthss 文档模版最常见问题：}}
+-
+- \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
+@@ -94,7 +85,7 @@
+ \appendix
+ % 排版参考文献列表。bibintoc 选项使“参考文献”出现在目录中；
+ % 如果同时要使参考文献列表参与章节编号，可将“bibintoc”改为“bibnumbered”。
+- \printbibliography[heading = bibintoc]
++ \printbibliography[heading = bibintoc, title = Reference]
+ % 各附录。
+ \include{chap/encl1}
+
+diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def
+index c2c951b..d453918 100644
+--- a/tex/pkuthss-utf8.def
++++ b/tex/pkuthss-utf8.def
+@@ -25,13 +25,13 @@
+ [2017/03/01 v1.7.4 Labels and captions in UTF-8 encoding
+ for the pkuthss document class]
+
+-\def\label at ctitle{题目：}
+-\def\label at cauthor{姓\hphantom{汉字}名：}
+-\def\label at studentid{学\hphantom{汉字}号：}
+-\def\label at school{院\hphantom{汉字}系：}
+-\def\label at cmajor{专\hphantom{汉字}业：}
+-\def\label at direction{研究方向：}
+-\def\label at cmentor{导\hphantom{汉字}师：}
++\def\label at ctitle{Title: }
++\def\label at cauthor{Name}
++\def\label at studentid{Student ID}
++\def\label at school{Affiliation}
++\def\label at cmajor{Major}
++\def\label at direction{Research Division}
++\def\label at cmentor{Supervisor}
+ \def\label at ementor{Directed by\ }
+ \def\label at ckeywords{关键词：}
+ \def\label at ekeywords{KEYWORDS:\ }
+diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls
+index 6208799..a785d69 100644
+--- a/tex/pkuthss.cls
++++ b/tex/pkuthss.cls
+@@ -300,7 +300,7 @@
+ \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
+ \fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
+ \if at twoside
+- \fancyhead[CE]{\zihao{5}\normalfont{\cuniversity\cthesisname}}
++ \fancyhead[CE]{\zihao{5}\normalfont{{\euniversity} {\ethesisname}}}
+ \fancyhead[CO]{\zihao{5}\normalfont\thss at int@setcase{\leftmark}}
+ \else
+ \fancyhead[C]{\zihao{5}\normalfont\thss at int@setcase{\leftmark}}
+@@ -349,13 +349,13 @@
+ \zihao{1}%
+ \includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
+ \raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
+- {\bfseries{\cthesisname}}%
++ {\bfseries{\ethesisname}}%
+ }
+ \vfill
+ % Title of the thesis.
+ {%
+ \zihao{2}{\label at ctitle}%
+- \thss at int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}%
++ \thss at int@fillinblank{2}{0.64\textwidth}{\textbf{\@etitle}}%
+ }
+ \vfill
+ % Information about the author.
+@@ -363,19 +363,19 @@
+ % Slightly adjust the line skip when using new font size.
+ \zihao{3}\linespread{1.75}\selectfont
+ \def\thss at tmp@len{0.56\textwidth}
+- \begin{tabular}{l@{\extracolsep{0.2em}}c}
+- {\bfseries\label at cauthor} &
+- \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@cauthor} \\
+- {\bfseries\label at studentid} &
++ \begin{tabular}{c@{\extracolsep{0.2em}}c@{\extracolsep{0.2em}}c}
++ {\bfseries\label at cauthor} & : &
++ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@eauthor} \\
++ {\bfseries\label at studentid} & : &
+ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@studentid} \\
+- {\bfseries\label at school} &
++ {\bfseries\label at school} & : &
+ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@school} \\
+- {\bfseries\label at cmajor} &
+- \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@cmajor} \\
+- {\bfseries\label at direction} &
++ {\bfseries\label at cmajor} & : &
++ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@emajor} \\
++ {\bfseries\label at direction} & : &
+ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@direction} \\
+- {\bfseries\label at cmentor} &
+- \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@cmentor} \\
++ {\bfseries\label at cmentor} & : &
++ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@ementor} \\
+ \end{tabular}%
+ }
+ \vfill
Property changes on: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,30 +1,33 @@
@online{biber,
author = {Kime, Philip and Charette, Fran\c{c}ois},
- title = {Biber: A backend bibliography processor for biblatex (Version 1.8)},
+ title = {Biber: A backend bibliography processor for biblatex},
+ edition = {Ver.\ 2.7},
type = {M/OL},
- date = {2013-10-18},
- url = {http://mirror.ctan.org/biblio/biber/},
- urldate = {2014-05-24},
+ date = {2016-12-05},
+ url = {https://ctan.org/pkg/biber},
+ urldate = {2017-03-01},
language = {english},
}
@online{biblatex,
author = {Lehman, Philipp},
- title = {The biblatex Package: Programmable Bibliographies and Citations (Ver.\ 2.8a)},
+ title = {The biblatex Package: Programmable Bibliographies and Citations},
+ edition = {Ver.\ 3.7},
type = {M/OL},
- date = {2013-11-25},
- url = {http://mirror.ctan.org/macros/latex/contrib/biblatex/},
- urldate = {2016-05-24},
+ date = {2016-11-16},
+ url = {https://ctan.org/pkg/biblatex},
+ urldate = {2017-03-01},
language = {english},
}
@online{biblatex-caspervector,
author = {Vector, Casper Ti.},
- title = {biblatex 参考文献和引用样式：caspervector v0.2.5},
+ title = {biblatex 参考文献和引用样式：caspervector},
+ edition = {Ver.\ 0.3.3},
type = {M/OL},
- date = {2016-03-31},
- url = {http://mirror.ctan.org/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/},
- urldate = {2016-05-24},
+ date = {2018-06-29},
+ url = {https://ctan.org/pkg/biblatex-caspervector},
+ urldate = {2018-07-02},
language = {chinese},
}
@@ -33,18 +36,19 @@
title = {Customizing captions of floating environments},
type = {M/OL},
date = {2011-11-02},
- url = {http://mirror.ctan.org/macros/latex/contrib/caption/},
- urldate = {2016-05-24},
+ url = {https://ctan.org/pkg/caption},
+ urldate = {2017-03-01},
language = {english},
}
@online{ctex,
author = {{ctex.org}},
- title = {\CTeX 套件手册（v2.0.2）},
+ title = {\CTeX 宏集手册},
+ edition = {Ver.\ 2.4.8},
type = {M/OL},
- date = {2015-05-16},
- url = {http://mirror.ctan.org/language/chinese/ctex/},
- urldate = {2015-06-10},
+ date = {2017-02-23},
+ url = {https://ctan.org/pkg/ctex},
+ urldate = {2017-03-01},
language = {chinese},
}
@@ -53,8 +57,8 @@
title = {Customizing lists with the enumitem package (Version 3.5.2)},
type = {M/OL},
date = {2011-09-28},
- url = {http://mirror.ctan.org/macros/latex/contrib/enumitem/},
- urldate = {2012-08-01},
+ url = {https://ctan.org/pkg/enumitem},
+ urldate = {2017-03-01},
language = {english},
}
@@ -61,20 +65,22 @@
@online{fancyhdr,
author = {van Oostrum, Piet},
title = {Page layout in \hologo{LaTeX}},
+ edition = {Ver.\ 3.8},
type = {M/OL},
- date = {2004-03-02},
- url = {http://mirror.ctan.org/macros/latex/contrib/fancyhdr/},
- urldate = {2012-08-01},
+ date = {2016-09-06},
+ url = {https://ctan.org/pkg/fancyhdr},
+ urldate = {2017-03-01},
language = {english},
}
@online{geometry,
author = {Umeki, Hideo},
- title = {The geometry package (v5.6)},
+ title = {The geometry package},
+ edition = {Ver.\ 5.6},
type = {M/OL},
date = {2010-09-12},
- url = {http://mirror.ctan.org/macros/latex/contrib/geometry/},
- urldate = {2012-08-01},
+ url = {https://ctan.org/pkg/geometry},
+ urldate = {2017-03-01},
language = {english},
}
@@ -82,29 +88,31 @@
author = {Carlisle, D. P.},
title = {Packages in the `graphics' bundle},
type = {M/OL},
- date = {2005-11-14},
- url = {http://mirror.ctan.org/macros/latex/required/graphics/},
- urldate = {2012-08-01},
+ date = {2016-12-23},
+ url = {https://ctan.org/pkg/graphicx},
+ urldate = {2017-03-01},
language = {english},
}
@online{hyperref,
author = {Rahtz, Sebastian and Oberdiek, Heiko},
- title = {Hypertext marks in \hologo{LaTeX}: a manual for hyperref (v6.82q)},
+ title = {Hypertext marks in \hologo{LaTeX}: a manual for hyperref},
+ edition = {Ver.\ 6.82q},
type = {M/OL},
- date = {2012-05-13},
- url = {http://mirror.ctan.org/macros/latex/contrib/hyperref/},
- urldate = {2012-08-01},
+ date = {2012-11},
+ url = {https://ctan.org/pkg/hyperref},
+ urldate = {2017-03-01},
language = {english},
}
@online{latexsym,
author = {Mittelbach, Frank},
- title = {The \hologo{LaTeX} symbol fonts for use with \hologo{LaTeX2e} (v2.2e)},
+ title = {The \hologo{LaTeX} symbol fonts for use with \hologo{LaTeX2e}},
+ edition = {Ver.\ 2.2e},
type = {M/OL},
date = {1998-08-17},
- url = {http://mirror.ctan.org/macros/latex/base/},
- urldate = {2015-12-15},
+ url = {https://ctan.org/tex-archive/macros/latex/base},
+ urldate = {2017-03-01},
language = {english},
}
@@ -112,49 +120,51 @@
author = {Sharpe, Michael},
title = {New TX font package},
type = {M/OL},
- date = {2015-09-14},
- url = {http://mirror.ctan.org/fonts/newtx/},
- urldate = {2015-12-15},
+ date = {2017-01-30},
+ url = {https://ctan.org/pkg/newtx},
+ urldate = {2017-03-01},
language = {english},
}
@online{scrextend,
- author = {Kohm, Markus and Morawski, Jens-Uwe},
+ author = {Kohm, Markus},
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/},
- urldate = {2015-04-26},
+ date = {2017-01-02},
+ url = {https://ctan.org/pkg/koma-script},
+ urldate = {2017-03-01},
language = {english},
}
@online{subcaption,
author = {Sommerfeldt, Alex},
- title = {The subcaption package (v1.1-75)},
+ title = {The subcaption package},
+ edition = {Ver.\ 1.1-75},
type = {M/OL},
date = {2013-04-16},
- url = {http://mirror.ctan.org/macros/latex/contrib/subcaption/},
- urldate = {2016-05-24},
+ url = {https://ctan.org/pkg/subcaption},
+ urldate = {2017-03-01},
language = {english},
}
@online{tikz,
author = {Till Tantau},
- title = {The TikZ and PGF Packages: Manual for version 3.0.0},
+ title = {The TikZ and PGF Packages: Manual for version 3.0.1a},
type = {M/OL},
- date = {2013-12-20},
- url = {http://mirror.ctan.org/graphics/pgf/},
- urldate = {2015-04-26},
+ date = {2015-08-29},
+ url = {https://ctan.org/pkg/pgf},
+ urldate = {2017-03-01},
language = {english},
}
@online{tocloft,
author = {Robertson, Will},
- title = {The tocloft package (v2.3f)},
+ title = {The tocloft package},
+ edition = {Ver.\ 2.3f},
type = {M/OL},
date = {2013-05-02},
- url = {http://mirror.ctan.org/macros/latex/contrib/tocloft/},
- urldate = {2016-05-24},
+ url = {https://ctan.org/pkg/tocloft},
+ urldate = {2017-03-01},
language = {english},
}
@@ -163,8 +173,8 @@
title = {The ulem package: underlining for emphasis},
type = {M/OL},
date = {2011-03-18},
- url = {http://mirror.ctan.org/macros/latex/contrib/ulem/},
- urldate = {2016-06-22},
+ url = {https://ctan.org/pkg/ulem},
+ urldate = {2017-03-01},
language = {english},
}
@@ -173,8 +183,8 @@
title = {北京大学硕博论文模版（测试版）},
type = {EB/OL},
date = {2005-04-05},
- url = {http://bdwm.net/a.php?b/Thesis/M.1112645491.A/D10F612.rar},
- urldate = {2012-08-01},
+ url = {https://bdwm.net/a.php?b/Thesis/M.1112645491.A/D10F612.rar},
+ urldate = {2017-03-01},
language = {chinese},
}
@@ -183,8 +193,8 @@
title = {新的 pku 博士论文模板},
type = {EB/OL},
date = {2007-03-27},
- url = {http://bdwm.net/a.php?b/Thesis/M.1174982168.A/4270722.rar},
- urldate = {2012-08-01},
+ url = {https://bdwm.net/a.php?b/Thesis/M.1174982168.A/4270722.rar},
+ urldate = {2017-03-01},
language = {chinese},
}
@@ -193,8 +203,8 @@
title = {学士（硕/博）毕业论文模板 [基于 dypang 的模板]},
type = {EB/OL},
date = {2007-05-15},
- url = {http://bdwm.net/a.php?b/MathTools/M.1179239165.A/5A2D5A2.rar},
- urldate = {2012-08-01},
+ url = {https://bdwm.net/a.php?b/MathTools/M.1179239165.A/5A2D5A2.rar},
+ urldate = {2017-03-01},
language = {chinese},
}
@@ -203,8 +213,8 @@
title = {Re: 关于置底模版的问题和一些修改},
type = {EB/OL},
date = {2007-06-01},
- url = {http://bdwm.net/a.php?b/MathTools/M.1180676700.A/DBB7810.zip},
- urldate = {2012-08-01},
+ url = {https://bdwm.net/a.php?b/MathTools/M.1180676700.A/DBB7810.zip},
+ urldate = {2017-03-01},
language = {chinese},
}
@@ -213,8 +223,8 @@
title = {Re: 学位论文模板更新},
type = {EB/OL},
date = {2008-03-13},
- url = {http://bdwm.net/a.php?b/Thesis/M.1205377509.A/9413ED2.rar},
- urldate = {2012-08-01},
+ url = {https://bdwm.net/a.php?b/Thesis/M.1205377509.A/9413ED2.rar},
+ urldate = {2017-03-01},
language = {chinese},
}
@@ -230,10 +240,11 @@
@online{pku-thesisstyle,
author = {北京大学学位办公室},
- title = {北京大学研究生学位论文写作指南 v2.0},
+ title = {北京大学研究生学位论文写作指南},
+ edition = {Ver.\ 2.0},
type = {M/OL},
date = {2015-06-11},
- url = {http://grs.pku.edu.cn/xwyxk/xwsy/sssxwsy/sxwxggd/42758.htm},
+ url = {http://grs.pku.edu.cn/document/20150611115317661150.pdf},
urldate = {2015-12-14},
language = {chinese},
}
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,13 +1,13 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016 Casper Ti. Vector
+% Copyright (c) 2010-2016,2018 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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -16,33 +16,32 @@
%
% This work consists of the following files:
% pkuthss.tex
-% chap/pkuthss-copyright.tex
-% chap/pkuthss-abstract.tex
-% chap/pkuthss-introduction.tex
+% 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-conclusion.tex
+% chap/pkuthss-concl.tex
% chap/pkuthss-encl1.tex
-% chap/pkuthss-acknowledge.tex
+% chap/pkuthss-ack.tex
\documentclass[UTF8]{pkuthss}
\usepackage[
backend = biber, style = caspervector, utf8,
- sorting = ecnty, giveninits = true, sortgiveninits = true
+ sorting = ecnyt, giveninits = true, sortgiveninits = true
]{biblatex}
-\usepackage{fancyvrb}
-\usepackage{hologo}
+\usepackage{fancyvrb, hologo}
\setlength{\hfuzz}{3pt}
\ctexset{linestretch = 2\ccwd}
+\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
\setlength{\bibitemsep}{3bp}
-\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
\hypersetup{colorlinks = true, allcolors = blue}
\newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
\newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}}
-\newcommand{\docversion}{v1.7.4}
+\newcommand{\docversion}{v1.8.0}
\pkuthssinfo{
cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
@@ -54,7 +53,7 @@
cauthor = {盖茨波·钛·维克托},
eauthor = {Casper Ti.\ Vector},
studentid = {00910???},
- date = {二〇一七年三月},
+ date = {\zhdigits{2018}年\zhnumber{7}月},
school = {化学与分子工程学院},
cmajor = {化学（？）}, emajor = {Chemistry ... ?},
direction = {据说 Casper 自己也不知道},
@@ -69,21 +68,21 @@
\pagestyle{empty}
\maketitle
\cleardoublepage
- \include{chap/pkuthss-copyright}
+ \include{chap/pkuthss-copy}
\cleardoublepage
\pagestyle{plain}
\setcounter{page}{0}
\pagenumbering{Roman}
- \include{chap/pkuthss-abstract}
+ \include{chap/pkuthss-abs}
\tableofcontents
\mainmatter
- \include{chap/pkuthss-introduction}
+ \include{chap/pkuthss-intro}
\include{chap/pkuthss-chap1}
\include{chap/pkuthss-chap2}
\include{chap/pkuthss-chap3}
- \include{chap/pkuthss-conclusion}
+ \include{chap/pkuthss-concl}
\appendix
\printbibliography[heading = bibintoc]
@@ -90,8 +89,8 @@
\include{chap/pkuthss-encl1}
\backmatter
- \include{chap/pkuthss-acknowledge}
- \include{chap/originauth}
+ \include{chap/pkuthss-ack}
+ \include{chap/origin}
\end{document}
% vim:ts=4:sw=4
Modified: trunk/Master/texmf-dist/doc/latex/pkuthss/readme.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/pkuthss/pkulogo.eps
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def 2018-07-02 20:40:31 UTC (rev 48124)
@@ -7,7 +7,7 @@
% 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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -22,7 +22,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-gbk.def}
- [2017/03/01 v1.7.4 Labels and captions in GBK encoding
+ [2018/07/02 v1.8.0 Labels and captions in GBK encoding
for the pkuthss document class]
\def\label at ctitle{\xCC\xE2Ŀ\xA3\xBA}
Modified: trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def 2018-07-02 20:40:31 UTC (rev 48124)
@@ -7,7 +7,7 @@
% 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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -22,7 +22,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-utf8.def}
- [2017/03/01 v1.7.4 Labels and captions in UTF-8 encoding
+ [2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding
for the pkuthss document class]
\def\label at ctitle{题目：}
Modified: trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls 2018-07-02 20:40:02 UTC (rev 48123)
+++ trunk/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls 2018-07-02 20:40:31 UTC (rev 48124)
@@ -1,13 +1,13 @@
% Peking University dissertation document class
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2017 Casper Ti. Vector
+% Copyright (c) 2010-2018 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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -23,41 +23,41 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2017/03/01 v1.7.4 Peking University dissertation document class]
+ [2018/07/02 v1.8.0 Peking University dissertation document class]
-% eg. `\pkuthss at int@boolopt{spacing}{true}' will expand to:
-% \newif\ifpkuthss at opt@spacing \pkuthss at opt@spacingtrue
-% \DeclareOption{spacing}{\pkuthss at opt@spacingtrue}
-% \DeclareOption{nospacing}{\pkuthss at opt@spacingfalse}
-\def\pkuthss at int@boolopt#1#2{
- \expandafter\newif\csname ifpkuthss at opt@#1\endcsname
- \@nameuse{pkuthss at opt@#1#2}
- \DeclareOption{#1}{\@nameuse{pkuthss at opt@#1true}}
- \DeclareOption{no#1}{\@nameuse{pkuthss at opt@#1false}}
+% eg. `\thss at int@boolopt{spacing}{true}' will expand to:
+% \newif\ifthss at opt@spacing \thss at opt@spacingtrue
+% \DeclareOption{spacing}{\thss at opt@spacingtrue}
+% \DeclareOption{nospacing}{\thss at opt@spacingfalse}
+\def\thss at int@boolopt#1#2{
+ \expandafter\newif\csname ifthss at opt@#1\endcsname
+ \@nameuse{thss at opt@#1#2}
+ \DeclareOption{#1}{\@nameuse{thss at opt@#1true}}
+ \DeclareOption{no#1}{\@nameuse{thss at opt@#1false}}
}
% Process the encoding options.
-\newif\ifpkuthss at opt@gbk \pkuthss at opt@gbktrue
-\DeclareOption{GBK}{\pkuthss at opt@gbktrue\PassOptionsToClass{GBK}{ctexbook}}
-\DeclareOption{UTF8}{\pkuthss at opt@gbkfalse\PassOptionsToClass{UTF8}{ctexbook}}
+\newif\ifthss at opt@gbk \thss at opt@gbktrue
+\DeclareOption{GBK}{\thss at opt@gbktrue\PassOptionsToClass{GBK}{ctexbook}}
+\DeclareOption{UTF8}{\thss at opt@gbkfalse\PassOptionsToClass{UTF8}{ctexbook}}
% Whether to enable `\Uppercase' (works problematically) in heading marks.
-\pkuthss at int@boolopt{uppermark}{false}
+\thss at int@boolopt{uppermark}{false}
% Whether to modify fonts according to school regulation.
-\pkuthss at int@boolopt{pkufont}{true}
+\thss at int@boolopt{pkufont}{true}
% Whether to modify footnote format according to school regulation.
-\pkuthss at int@boolopt{pkufoot}{true}
+\thss at int@boolopt{pkufoot}{true}
% Whether to modify spacing according to school regulation.
-\pkuthss at int@boolopt{pkuspace}{true}
+\thss at int@boolopt{pkuspace}{true}
% Whether to use some common settings for adjusting spacing.
-\pkuthss at int@boolopt{spacing}{true}
+\thss at int@boolopt{spacing}{true}
% Add PDF bookmark for table of contents.
-\pkuthss at int@boolopt{pdftoc}{true}
+\thss at int@boolopt{pdftoc}{true}
% Whether to enable the `\spacialchap' command.
-\pkuthss at int@boolopt{spechap}{true}
+\thss at int@boolopt{spechap}{true}
% Whether to automatically set up properties for generated PDF from user
% defined document information (author, title, etc.).
-\pkuthss at int@boolopt{pdfprop}{true}
+\thss at int@boolopt{pdfprop}{true}
% Whether to disable some infractions intended to make the style less ugly.
-\pkuthss at int@boolopt{ugly}{false}
+\thss at int@boolopt{ugly}{false}
% Pass all other options to `ctexbook' document class.
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}}
% Process all class options now.
@@ -64,7 +64,7 @@
\ProcessOptions\relax
% Prevent fontspec (loaded by xeCJK) from interfering with newtxmath.
-\ifpkuthss at opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi
+\ifthss at opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi
% pkuthss is based on ctexbook; we use `xiao 4' as default font size.
\LoadClass[zihao = -4]{ctexbook}[2014/03/06]
% ctex 2.x no longer loads ifpdf and ifxetex by itself.
@@ -82,7 +82,7 @@
% `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace.
\AtEndOfClass{\RequirePackage{hyperref}}
-\ifpkuthss at opt@gbk
+\ifthss at opt@gbk
\input{pkuthss-gbk.def}
\ifxetex
% No support for XeLaTeX compilation in non-unicode encoding, i.e. GBK.
@@ -97,7 +97,7 @@
\input{pkuthss-utf8.def}
\fi
-\ifpkuthss at opt@pkufont
+\ifthss at opt@pkufont
% Use Times New Roman / Arial according to school regulation.
% Option used to prevent newtxtext from manipulating footnote marks.
\RequirePackage[defaultsups]{newtxtext}
@@ -107,7 +107,7 @@
\RequirePackage{latexsym}
\fi
-\ifpkuthss at opt@pkufoot
+\ifthss at opt@pkufoot
% Handle the `Unparsed material' issue with latex/dvipdfmx compilation.
\unless\ifxetex\unless\ifpdf
\newcommand*\pgfsysdriver{pgfsys-dvipdfm.def}
@@ -114,7 +114,7 @@
\fi\fi
% Circled text, cf. <https://tex.stackexchange.com/questions/7032/>.
\RequirePackage{tikz}
- \newcommand*\pkuthss at int@circled[1]{%
+ \newcommand*\thss at int@circled[1]{%
\scalebox{0.8}{\tikz[baseline = (char.base)]{
\node[
shape = circle, draw = black, minimum size = 1.25em, inner sep = 0pt
@@ -124,16 +124,15 @@
% Use circled numbers as footnote symbols. Does not affect title page, but
% footnote is rarely used in dissertation covers ;)
\renewcommand\thefootnote%
- {\protect\pkuthss at int@circled{\arabic{footnote}}}
+ {\protect\thss at 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: symbol indent 2 ccwd, paragraph indent 3.5 ccwd,
- % 0.75 ccwd between symbol and paragraph.
- \deffootnote{2\ccwd}{3.5\ccwd}{\thefootnotemark\hspace{0.75\ccwd}}
+ % Set up footnote spacing: whole paragraph indent 2 ccwd, 0.5 ccwd after mark.
+ \deffootnote{2\ccwd}{0pt}{\thefootnotemark\hspace{0.5\ccwd}}
\fi
-\ifpkuthss at opt@pkuspace
+\ifthss at opt@pkuspace
% lineskip / baselineskip = 20 bp / (12 bp * (6 / 5)).
\linespread{1.39}\selectfont
% Provides utilities for setting TOC format; `titles' applied to avoid
@@ -142,6 +141,7 @@
\setlength{\cftbeforechapskip}{6bp plus 1bp}
\setlength{\cftsecindent}{\ccwd}
\setlength{\cftsubsecindent}{2\ccwd}
+ \setlength{\cftsubsubsecindent}{4\ccwd}
% `caption' modifies font size and separator of captions. `subcaption'
% provides functions similar to `subfigure'/`subfig' but does not clash with
% `tocloft'; it clashes with `subfigure'/`subfig', but the error message will
@@ -152,16 +152,19 @@
\captionsetup{font = cfive, labelsep = quad}
\fi
-\ifpkuthss at opt@spacing
+\ifthss at opt@spacing
% Make spacing nicer in some situations (eg. footnotes and verbatims).
\RequirePackage{setspace}
+ % Remove superfluous spacing between footnotes.
+ \setlength{\footnotesep}{0pt}
% Lists often appear to be too sparse when items are just one or two lines
% long. Here we cancel the extra vertical spacing between list items.
+ % The list margin is adjusted due to Chinese typesetting traditions.
\RequirePackage{enumitem}
- \setlist{nolistsep}
+ \setlist{nolistsep, leftmargin = 1.5\parindent}
\fi
-\ifpkuthss at opt@spechap
+\ifthss at 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]{%
@@ -171,28 +174,20 @@
\fi
\AtBeginDocument{
- \ifpkuthss at opt@pkuspace
- % Kludge for `tocloft' used with `ctex'.
- % <http://bbs.ctex.org/forum.php?mod=redirect&goto=findpost&ptid=43535&pid=310238>.
- \renewcommand{\numberline}[1]{%
- \settowidth\@tempdimb{#1\hspace{0.5em}}%
- \ifdim\@tempdima<\@tempdimb%
- \@tempdima=\@tempdimb%
- \fi%
- \hb at xt@\@tempdima{\@cftbsnum #1\@cftasnum\hfil}\@cftasnumb%
- }%
- \fi
+ % Set up spacing for displayed formulae.
+ \setlength{\abovedisplayskip}{\belowdisplayshortskip}
+ \setlength{\belowdisplayskip}{\abovedisplayskip}
- \ifpkuthss at opt@pdftoc
+ \ifthss at opt@pdftoc
% Add PDF bookmark for table of contents.
- \let\pkuthss at tmp@tableofcontents\tableofcontents
+ \let\thss at tmp@tableofcontents\tableofcontents
\renewcommand{\tableofcontents}{%
- \pkuthss at int@pdfmark{\contentsname}{contents}
- \pkuthss at tmp@tableofcontents%
+ \thss at int@pdfmark{\contentsname}{contents}
+ \thss at tmp@tableofcontents%
}
\fi
- \ifpkuthss at opt@pdfprop
+ \ifthss at opt@pdfprop
% Automatically generate properties for generated PDF.
% Use English properties to avoid problems with character encodings.
\newcommand*{\setpdfproperties}{%
@@ -203,69 +198,67 @@
}
% Set up the properties when generating the title page because the document
% information should have been all defined before this.
- \let\pkuthss at tmp@maketitle\maketitle
- % NOTE: `\hypersetup' must appear before `\maketitle', otherwise it might not
- % act as wished.
- \renewcommand\maketitle{\setpdfproperties\pkuthss at tmp@maketitle}
+ \let\thss at tmp@maketitle\maketitle
+ % NOTE: `\hypersetup' must appear before `\maketitle', otherwise it might
+ % not act as expected.
+ \renewcommand\maketitle{\setpdfproperties\thss at tmp@maketitle}
\fi
}
-% eg. `\pkuthss at int@infoitema{ctitle}' will expand to:
+% eg. `\thss at int@infoitema{ctitle}' will expand to:
% \def\ctitle#1{\def\@ctitle{#1}}
-% \define at key{pkuthss at info}{ctitle}{\ctitle{#1}}
-\def\pkuthss at int@infoitema#1{
+% \define at key{thss at info}{ctitle}{\ctitle{#1}}
+\def\thss at int@infoitema#1{
\@namedef{#1}##1{\@namedef{@#1}{##1}}
- \define at key{pkuthss at info}{#1}{\@nameuse{#1}{##1}}
+ \define at key{thss at info}{#1}{\@nameuse{#1}{##1}}
}
-% eg. `\pkuthss at int@infoitemb{cuniversity}' will expand to:
-% \define at key{pkuthss at info}{cuniversity}{\def\cuniversity{#1}}
-\def\pkuthss at int@infoitemb#1{
- \define at key{pkuthss at info}{#1}{\@namedef{#1}{##1}}
+% eg. `\thss at int@infoitemb{cuniversity}' will expand to:
+% \define at key{thss at info}{cuniversity}{\def\cuniversity{#1}}
+\def\thss at int@infoitemb#1{
+ \define at key{thss at info}{#1}{\@namedef{#1}{##1}}
}
% Set up document information entries.
-\pkuthss at int@infoitema{ctitle}
-\pkuthss at int@infoitema{etitle}
-\pkuthss at int@infoitema{cauthor}
-\pkuthss at int@infoitema{eauthor}
-\pkuthss at int@infoitema{studentid}
-\pkuthss at int@infoitema{date}
-\pkuthss at int@infoitema{school}
-\pkuthss at int@infoitema{cmajor}
-\pkuthss at int@infoitema{emajor}
-\pkuthss at int@infoitema{direction}
-\pkuthss at int@infoitema{cmentor}
-\pkuthss at int@infoitema{ementor}
-\pkuthss at int@infoitema{ckeywords}
-\pkuthss at int@infoitema{ekeywords}
-\pkuthss at int@infoitemb{cuniversity}
-\pkuthss at int@infoitemb{euniversity}
-\pkuthss at int@infoitemb{cthesisname}
-\pkuthss at int@infoitemb{ethesisname}
-\pkuthss at int@infoitemb{cabstractname}
-\pkuthss at int@infoitemb{eabstractname}
+\thss at int@infoitema{ctitle}
+\thss at int@infoitema{etitle}
+\thss at int@infoitema{cauthor}
+\thss at int@infoitema{eauthor}
+\thss at int@infoitema{studentid}
+\thss at int@infoitema{date}
+\thss at int@infoitema{school}
+\thss at int@infoitema{cmajor}
+\thss at int@infoitema{emajor}
+\thss at int@infoitema{direction}
+\thss at int@infoitema{cmentor}
+\thss at int@infoitema{ementor}
+\thss at int@infoitema{ckeywords}
+\thss at int@infoitema{ekeywords}
+\thss at int@infoitemb{cuniversity}
+\thss at int@infoitemb{euniversity}
+\thss at int@infoitemb{cthesisname}
+\thss at int@infoitemb{ethesisname}
+\thss at int@infoitemb{cabstractname}
+\thss at int@infoitemb{eabstractname}
% Set up document information using the `key = value' grammar.
-\newcommand*{\pkuthssinfo}[1]{\setkeys{pkuthss at info}{#1}}
+\newcommand*{\pkuthssinfo}[1]{\setkeys{thss at info}{#1}}
% Set up page layout.
\geometry{
- a4paper, includefoot, hmargin = 2.6cm, top = 3cm, bottom = 2.5cm,
- headheight = 1.5cm, headsep = 0.5cm, footskip = 0.75cm
+ a4paper, hmargin = 2.6cm, top = 2.92cm, bottom = 3.03cm,
+ headheight = 0.45cm, headsep = 0.55cm, footskip = 1.05cm
}
-% Set up spacing for displayed formulae.
-\setlength{\abovedisplayskip}{6bp plus 1.5bp minus 3.5bp}
-\setlength{\abovedisplayshortskip}{3bp plus 0.75bp minus 1.75bp}
-\setlength{\belowdisplayshortskip}{3bp plus 0.75bp minus 1.75bp}
-\setlength{\belowdisplayskip}{6bp plus 1.5bp minus 3.5bp}
-
% Set up chapter/section/... captions.
% The `*skip' values are not supposed to be modified by the `ugly' option:
% the actual style of the school's guide and Word template seem to be different
% from the written specification (when applied verbatim in LaTeX), and here the
% actual style is used.
+\setcounter{secnumdepth}{3}
+\setcounter{tocdepth}{2}
\ctexset{
- chapter = {beforeskip = {0bp}, afterskip = {18bp}},
- section =
+ chapter = {
+ beforeskip = {0bp}, afterskip = {18bp plus 0.2ex},
+ nameformat = {}, titleformat = {}
+ }, section =
{beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
subsection =
{beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
@@ -272,19 +265,16 @@
subsubsection =
{beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}}
}
-\ifpkuthss at opt@ugly
+\ifthss at opt@ugly
\ctexset{
- chapter =
- {nameformat = {\zihao{3}\bfseries}, titleformat = {\zihao{3}\bfseries}},
+ chapter = {format = {\zihao{3}\bfseries\centering}},
section = {format = {\zihao{4}\bfseries}},
- subsection =
- {format = {\fontsize{13bp}{15.6bp}\selectfont\bfseries}},
+ subsection = {format = {\fontsize{13bp}{15.6bp}\selectfont\bfseries}},
subsubsection = {format = {\zihao{-4}\bfseries}}
}
\else
\ctexset{
- chapter =
- {nameformat = {\zihao{-2}\bfseries}, titleformat = {\zihao{-2}\bfseries}},
+ chapter = {format = {\zihao{-2}\bfseries\centering}},
section = {format = {\zihao{-3}\bfseries}},
subsection = {format = {\zihao{4}\bfseries}},
subsubsection = {format = {\bfseries}}
@@ -291,64 +281,58 @@
}
\fi
-% Internal command to set up headers and footers.
-\def\pkuthss at int@setpagestyle{
- % The actual setup commands.
- \fancypagestyle{plain}{
- \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
- \fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
- \if at twoside
- \fancyhead[CE]{\zihao{5}\normalfont{\cuniversity\cthesisname}}
- \fancyhead[CO]{\zihao{5}\normalfont\pkuthss at int@setcase{\leftmark}}
- \else
- \fancyhead[C]{\zihao{5}\normalfont\pkuthss at int@setcase{\leftmark}}
- \fi
- }
- \pagestyle{plain}
-}
-
% `\MakeUppercase' works problematically.
% eg. it converts `\cite{ctex}' into `\cite{CTEX}'.
% This option can disable `\MakeUppercase' in left/right heading marks.
-\ifpkuthss at opt@uppermark
- \def\pkuthss at int@setcase#1{#1}
- \pkuthss at int@setpagestyle
+\ifthss at opt@uppermark
+ \def\thss at int@setcase#1{#1}
\else
% Code copied from fancyhdr's `\nouppercase', with the redefinition of
% `\uppercase' dropped to avoid disrupting CJKutf8.
% cf. <https://code.google.com/p/ctex-kit/issues/detail?id=147>.
- \def\pkuthss at int@setcase#1{%
+ \def\thss at int@setcase#1{%
\let\MakeUppercase\relax%
\expandafter\let\csname MakeUppercase \endcsname\relax%
#1%
}
- \pkuthss at int@setpagestyle
\fi
+% The actual page style setup.
+\fancypagestyle{plain}{
+ \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
+ \fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
+ \if at twoside
+ \fancyhead[CE]{\zihao{5}\normalfont{\cuniversity\cthesisname}}
+ \fancyhead[CO]{\zihao{5}\normalfont\thss at int@setcase{\leftmark}}
+ \else
+ \fancyhead[C]{\zihao{5}\normalfont\thss at int@setcase{\leftmark}}
+ \fi
+}
+\pagestyle{plain}
% 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 at int@pdfmark#1#2{%
+\def\thss at int@pdfmark#1#2{%
\if at openright\cleardoublepage\else\clearpage\fi
\pdfbookmark[0]{#1}{#2}%
}
-% Usage: \pkuthss at int@fillinblank{(number of lines)}{(line width)}{(contents)}
-\def\pkuthss at int@fillinblank#1#2#3{%
+% Usage: \thss at int@fillinblank{(number of lines)}{(line width)}{(contents)}
+\def\thss at int@fillinblank#1#2#3{%
\makebox[0pt][l]{\parbox[t]{#2}{\centering{#3}}}\mbox{}%
\parbox[t]{#2}{%
- \newcount\pkuthss at tmp@linecount
- \pkuthss at tmp@linecount=#1
- \loop\ifnum\pkuthss at tmp@linecount>0
+ \newcount\thss at tmp@linecount
+ \thss at tmp@linecount=#1
+ \loop\ifnum\thss at tmp@linecount>0
% Fill specified space with underline on the bottom line. `\underline'
% draws line on the baseline (not the bottom line), and this is why
% `\uline' is used here instead.
- \ifnum\pkuthss at tmp@linecount=1
+ \ifnum\thss at tmp@linecount=1
\uline{\makebox[#2]{}}
\else
\uline{\makebox[#2]{}}\\
\fi
- \advance\pkuthss at tmp@linecount by -1\relax
+ \advance\thss at tmp@linecount by -1\relax
\repeat%
}%
}
@@ -355,58 +339,53 @@
% Set up format of the title page (cover).
\renewcommand{\maketitle}{%
- \pkuthss at 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}}%
- }
- \vfill
- % Title of the thesis.
- {%
- \zihao{2}{\label at ctitle}%
- \pkuthss at 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 at tmp@len{0.56\textwidth}
- \begin{tabular}{l@{\extracolsep{0.2em}}c}
- {\bfseries\label at cauthor} &
- \pkuthss at int@fillinblank{1}{\pkuthss at tmp@len}{\fangsong\@cauthor} \\
- {\bfseries\label at studentid} &
- \pkuthss at int@fillinblank{1}{\pkuthss at tmp@len}{\fangsong\@studentid} \\
- {\bfseries\label at school} &
- \pkuthss at int@fillinblank{1}{\pkuthss at tmp@len}{\fangsong\@school} \\
- {\bfseries\label at cmajor} &
- \pkuthss at int@fillinblank{1}{\pkuthss at tmp@len}{\fangsong\@cmajor} \\
- {\bfseries\label at direction} &
- \pkuthss at int@fillinblank{1}{\pkuthss at tmp@len}{\fangsong\@direction} \\
- {\bfseries\label at cmentor} &
- \pkuthss at int@fillinblank{1}{\pkuthss at tmp@len}{\fangsong\@cmentor} \\
- \end{tabular}%
- }
- \vfill
- % Date.
- {\zihao{-2}\@date}
- \end{center}
- \end{titlepage}%
+ \thss at int@pdfmark{\titlepagename}{titlepage}
+ % Make the title page centered.
+ \begin{titlepage}\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}}%
+ }
+ \vfill
+ % Title of the thesis.
+ {%
+ \zihao{2}{\label at ctitle}\linespread{1.6}\selectfont%
+ \thss at 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\thss at tmp@len{0.56\textwidth}
+ \begin{tabular}{l@{\extracolsep{0.2em}}c}
+ {\bfseries\label at cauthor} &
+ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@cauthor} \\
+ {\bfseries\label at studentid} &
+ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@studentid} \\
+ {\bfseries\label at school} &
+ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@school} \\
+ {\bfseries\label at cmajor} &
+ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@cmajor} \\
+ {\bfseries\label at direction} &
+ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@direction} \\
+ {\bfseries\label at cmentor} &
+ \thss at int@fillinblank{1}{\thss at tmp@len}{\fangsong\@cmentor} \\
+ \end{tabular}%
+ }
+ \vfill
+ % Date.
+ {\zihao{-2}\@date}
+ \end{center}\end{titlepage}%
}
% Typeset the Chinese abstract.
\newenvironment{cabstract}{%
- \pkuthss at int@pdfmark{\cabstractname}{cabstract}
- \chapter*{\cabstractname}
- \markboth{\cabstractname}{}%
+ \thss at int@pdfmark{\cabstractname}{cabstract}
+ \chapter*{\cabstractname}\markboth{\cabstractname}{}%
}{% Keywords at the bottom of the page.
\vfill\noindent\textbf{\label at ckeywords}{\@ckeywords}%
}
@@ -413,15 +392,13 @@
% Typeset the English abstract.
\newenvironment{eabstract}{%
- \pkuthss at int@pdfmark{\eabstractname}{eabstract}
- \chapter*{\sffamily\@etitle}
- \markboth{\eabstractname}{}
+ \thss at int@pdfmark{\eabstractname}{eabstract}
+ \chapter*{\sffamily\@etitle}\markboth{\eabstractname}{}
\begin{center}
{\@eauthor} ({\@emajor})\\
{\label at ementor}{\@ementor}\\[2em]
\textbf{\sffamily\eabstractname}
- \end{center}
- \par%
+ \end{center}\par%
}{% Keywords at the bottom of the page.
\vfill\noindent\textbf{\label at ekeywords}{\@ekeywords}%
}
Modified: trunk/Master/texmf-dist/tex/latex/pkuthss/pkuword.eps
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
===================================================================
(Binary files differ)
More information about the tex-live-commits
mailing list