From 8f657991c60e3567495c2403a20d67d9f2d0224a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Mar 2016 21:34:25 +0000 Subject: pkuthss (17mar16) git-svn-id: svn://tug.org/texlive/trunk@40057 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/pkuthss/example/Make.bat | 3 +- .../texmf-dist/doc/latex/pkuthss/example/Makefile | 3 +- .../doc/latex/pkuthss/example/chap/abstract.tex | 7 ++--- .../doc/latex/pkuthss/example/chap/acknowledge.tex | 7 ++--- .../doc/latex/pkuthss/example/chap/chap1.tex | 7 ++--- .../doc/latex/pkuthss/example/chap/conclusion.tex | 7 ++--- .../doc/latex/pkuthss/example/chap/copyright.tex | 10 ++++--- .../doc/latex/pkuthss/example/chap/encl1.tex | 7 ++--- .../latex/pkuthss/example/chap/introduction.tex | 7 ++--- .../doc/latex/pkuthss/example/chap/originauth.tex | 7 +++-- .../pkuthss/example/misc/ctex-fontset-pkuthss.def | 4 +-- .../pkuthss/example/misc/ctex-xecjk-winfonts.def | 4 +-- .../doc/latex/pkuthss/example/misc/ctexopts.cfg | 4 +-- .../doc/latex/pkuthss/example/thesis.bib | 3 +- .../doc/latex/pkuthss/example/thesis.tex | 34 ++++++++-------------- 15 files changed, 46 insertions(+), 68 deletions(-) (limited to 'Master/texmf-dist/doc/latex/pkuthss/example') diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat index fc0314ce851..2794c7c502a 100755 --- a/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat @@ -1,7 +1,5 @@ @echo off -@rem vim:ts=4:sw=4 -@rem @rem Copyright (c) 2008-2009 solvethis @rem Copyright (c) 2010-2012 Casper Ti. Vector @rem Public domain. @@ -38,3 +36,4 @@ goto end :end pause +@rem vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/Makefile b/Master/texmf-dist/doc/latex/pkuthss/example/Makefile index f02f519daad..d0425ee541b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/Makefile +++ b/Master/texmf-dist/doc/latex/pkuthss/example/Makefile @@ -1,5 +1,3 @@ -# vim:ts=4:sw=4 -# # Copyright (c) 2008-2009 solvethis # Copyright (c) 2010-2012 Casper Ti. Vector # Public domain. @@ -40,3 +38,4 @@ clean: distclean: clean $(RM) $(JOBNAME).pdf +# vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex index 8f3a0286ac2..b93065422d3 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex @@ -1,13 +1,12 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector +% Copyright (c) 2014,2016 Casper Ti. Vector % Public domain. \begin{cabstract} - % 中文测试文字。 - \pkuthssffaq + \pkuthssffaq % 中文测试文字 \end{cabstract} \begin{eabstract} Test of the English abstract. \end{eabstract} +% vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex index 2a0d65c5675..4af4d39cd82 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex @@ -1,8 +1,7 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector +% Copyright (c) 2014,2016 Casper Ti. Vector % Public domain. \chapter{致谢} -% 中文测试文字。 -\pkuthssffaq +\pkuthssffaq % 中文测试文字。 +% vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex index 275b02acf0f..85f70084a8d 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex @@ -1,8 +1,7 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector +% Copyright (c) 2014,2016 Casper Ti. Vector % Public domain. \chapter{章节} -% 中文测试文字。 -\pkuthssffaq +\pkuthssffaq % 中文测试文字。 +% vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex index 6b0ccd90c2a..93941bc4e72 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex @@ -1,8 +1,7 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector +% Copyright (c) 2014,2016 Casper Ti. Vector % Public domain. \specialchap{结论} -% 中文测试文字。 -\pkuthssffaq +\pkuthssffaq % 中文测试文字。 +% vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex index 9f5ae00ed30..47d55d533f7 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex @@ -1,7 +1,5 @@ -% vim:ts=4:sw=4 -% % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2015 Casper Ti. Vector +% Copyright (c) 2010-2016 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -29,7 +27,10 @@ % NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -\specialchap{版权声明} +% 此处不用 \specialchap,因为学校要求目录不包括其自己及其之前的内容。 +\chapter*{版权声明} +% 综合学校的书面要求及 Word 模版来看,版权声明页不需加页眉、页脚。 +\thispagestyle{empty} 任何收存和保管本论文各种版本的单位和个人, 未经本论文作者同意,不得将本论文转借他人, @@ -41,3 +42,4 @@ %\vfill\noindent %\includegraphics[height = 5em]{barcode} +% vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/encl1.tex index f7fd04cb136..9834829098c 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/encl1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/encl1.tex @@ -1,8 +1,7 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector +% Copyright (c) 2014,2016 Casper Ti. Vector % Public domain. \chapter{附件} -% 中文测试文字。 -\pkuthssffaq +\pkuthssffaq % 中文测试文字。 +% vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex index eae329b6720..c0e033ed85b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex @@ -1,8 +1,7 @@ -% vim:ts=4:sw=4 -% Copyright (c) 2014 Casper Ti. Vector +% Copyright (c) 2014,2016 Casper Ti. Vector % Public domain. \specialchap{序言} -% 中文测试文字。 -\pkuthssffaq +\pkuthssffaq % 中文测试文字。 +% vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex index 921fcd06b8a..c0c62d42a8b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex @@ -1,7 +1,5 @@ -% vim:ts=4:sw=4 -% % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2015 Casper Ti. Vector +% Copyright (c) 2010-2016 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -34,6 +32,8 @@ format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp} ]{section} + % 学校书面要求本页面不要页码,但在给出的 Word 模版中又有页码且编入了目录。 + % 此处以 Word 模版为实际标准进行设定。 \specialchap{北京大学学位论文原创性声明和使用授权说明} \mbox{}\vspace*{-3em} \section*{原创性声明} @@ -79,3 +79,4 @@ %\includegraphics[height = 5em]{barcode} } +% vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def index 1a7802ca718..8ca79f75ba5 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def +++ b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def @@ -1,5 +1,3 @@ -% vim:ft=tex:ts=2:sw=2:et - \ProvidesExplFile{\ExplFileName}{}{}{} \pdftex_if_engine:TF @@ -57,4 +55,4 @@ %\NewDocumentCommand \youyuan { } { \CJKfamily { zhyou } } \endinput - +% vim:ft=tex:ts=2:sw=2:et diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-xecjk-winfonts.def b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-xecjk-winfonts.def index f3c5bc742e1..6c0c8173910 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-xecjk-winfonts.def +++ b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-xecjk-winfonts.def @@ -1,5 +1,3 @@ -% vim:ft=tex - \setCJKmainfont[BoldFont={SimHei},ItalicFont={[simkai.ttf]}]{SimSun} \setCJKsansfont{SimHei} \setCJKmonofont{[simfang.ttf]} @@ -19,4 +17,4 @@ %\newcommand*{\youyuan}{\CJKfamily{zhyou}} \endinput - +% vim:ft=tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctexopts.cfg b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctexopts.cfg index 7c9aa6708ac..0dc8094ed5e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctexopts.cfg +++ b/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctexopts.cfg @@ -1,6 +1,4 @@ -% vim:ft=tex - \ProvidesExplFile{\ExplFileName}{}{}{} \keys_set:nn { ctex / option } { fontset = pkuthss } \endinput - +% vim:ft=tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.bib b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.bib index 4e8d0fd3e0e..ac5b0c99788 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.bib @@ -1,5 +1,3 @@ -% vim:ts=4:sw=4 - @article{test-en, author = {Author}, title = {Title}, @@ -18,3 +16,4 @@ language = {chinese}, } +% vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex index c2b16d2e702..f46610aeff6 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex @@ -1,7 +1,5 @@ -% vim:ts=4:sw=4 -% % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2015 Casper Ti. Vector +% Copyright (c) 2010-2016 Casper Ti. Vector % Public domain. % % 使用前请先仔细阅读 pkuthss 和 biblatex-caspervector 的文档, @@ -20,7 +18,8 @@ % 这里按照英文文献在前,中文文献在后排序(“sorting = ecnty”); % 若需按照中文文献在前,英文文献在后排序,请设置“sorting = centy”; % 若需按照引用顺序排序,请设置“sorting = none”。 -\usepackage[backend = biber, style = caspervector, utf8, sorting = none]{biblatex} +% 若需在排序中实现更复杂的需求,请参考 biblatex-caspervector 的文档。 +\usepackage[backend = biber, style = caspervector, utf8, sorting = ecnty]{biblatex} % 按学校要求设定参考文献列表中的条目之内及之间的距离。 \setlength{\bibitemsep}{3bp} @@ -44,7 +43,8 @@ % 载入参考文献数据库(注意不要省略“.bib”)。 \addbibresource{thesis.bib} -% 普通用户可删除此段。 +% 普通用户可删除此段,并相应地删除 chap/*.tex 中的 +% “\pkuthssffaq % 中文测试文字。”一行。 \usepackage{color} \def\pkuthssffaq{% \emph{\textcolor{red}{pkuthss 文档模版最常见问题:}} @@ -68,17 +68,16 @@ \pagestyle{empty} % 自动生成封面。 \maketitle + % 版权声明。封面要求单面打印,故需新开右页。 + \cleardoublepage + \include{chap/copyright} % 此后到下一 \pagestyle 命令之前正常排版页眉和页脚。 - % 封面要求单面打印,故需新开右页,此处已一并实现。 \cleardoublepage \pagestyle{plain} % 重置页码计数器,用大写罗马数字排版此部分页码。 \setcounter{page}{0} \pagenumbering{Roman} - - % 版权声明。 - \include{chap/copyright} % 中英文摘要。 \include{chap/abstract} % 自动生成目录。 @@ -96,19 +95,9 @@ % 正文中的附录部分。 \appendix % 排版参考文献列表。 - \printbibliography[ - % 使“参考文献”出现在目录中;如果同时要使参考文献列表参与章节编号, - % 可将“bibintoc”改为“bibnumbered”。 - heading = bibintoc, - % 单独设定排序方案。此设定会局部覆盖之前的全局设置。 - % 注:只有同时使用 2.x 或之后版本的 biblatex 和相应兼容版本的 biber, - % 才能对每个 \printbibliography 命令采用不同的排序方案, - % 否则只能在载入 biblatex 宏包时就(全局)指定排序方案。 - % 在这样的情况下,请去掉所有的 sorting 选项,否则可能出错。 - % 此外,biblatex 3.0 中 \printbibliography 的 sorting 选项失效, - % 详见 biblatex-caspervector 的文档。 - sorting = ecnty - ] + % 以下选项使“参考文献”出现在目录中;如果同时要使参考文献列表参与章节编号, + % 可将“bibintoc”改为“bibnumbered”。 + \printbibliography[heading = bibintoc] % 各附录。 \include{chap/encl1} @@ -120,3 +109,4 @@ \include{chap/originauth} \end{document} +% vim:ts=4:sw=4 -- cgit v1.2.3