diff options
24 files changed, 509 insertions, 366 deletions
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/copyright.tex index a8d7939f477..4b1a7923dcf 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/copyright.tex @@ -1,7 +1,7 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-2015 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -30,18 +30,15 @@ % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \chapter*{版权声明} -{ - \zihao{3}\linespread{1.5}\selectfont +\thispagestyle{empty} - 任何收存和保管本论文各种版本的单位和个人， - 未经本论文作者同意，不得将本论文转借他人， - 亦不得随意复制、抄录、拍照或以任何方式传播。 - 否则一旦引起有碍作者著作权之问题，将可能承担法律责任。 - \par - % 若需排版二维码，请将二维码图片重命名为“barcode”， - % 转为合适的图片格式，并放在当前目录下，然后去掉下面 3 行的注释。 - %\vfill\noindent - %\includegraphics[height = 5em]{barcode} - %\par -} +任何收存和保管本论文各种版本的单位和个人， +未经本论文作者同意，不得将本论文转借他人， +亦不得随意复制、抄录、拍照或以任何方式传播。 +否则一旦引起有碍作者著作权之问题，将可能承担法律责任。 + +% 若需排版二维码，请将二维码图片重命名为“barcode”， +% 转为合适的图片格式，并放在当前目录下，然后去掉下面 3 行的注释。 +%\vfill\noindent +%\includegraphics[height = 5em]{barcode} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/originauth.tex index 34b4401b9e7..a41e5944e3e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/originauth.tex @@ -1,7 +1,7 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-2015 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -31,13 +31,12 @@ % 原创性声明和使用授权说明页不需要装订到论文中，故不显示页码。 \cleardoublepage\thispagestyle{empty} -\newgeometry{height = 240mm, width = 150mm, ignoreheadfoot, vcentering} { \vspace*{\fill}\linespread{1.5}\selectfont - \centerline{\bfseries\Large 北京大学学位论文原创性声明和使用授权说明} + \centerline{\bfseries\zihao{-2}北京大学学位论文原创性声明和使用授权说明} \vskip 4em - \centerline{\bfseries\Large 原创性声明} + \centerline{\bfseries\zihao{-3}原创性声明} \vskip 1em 本人郑重声明： @@ -54,8 +53,8 @@ } \vskip 4em - \centerline{\bfseries\Large 学位论文使用授权说明} - \centerline{\zihao{-4}（必须装订在提交学校图书馆的印刷本）} + \centerline{\bfseries\zihao{-3}学位论文使用授权说明} + \centerline{\zihao{5}（必须装订在提交学校图书馆的印刷本）} \vskip 1em 本人完全了解北京大学关于收集、保存、使用学位论文的规定，即： @@ -69,7 +68,7 @@ $\square$\nobreakspace{}两年 / % $\square$\nobreakspace{}三年以后在校园网上全文发布。 \end{itemize} - \par（保密论文在解密后遵守此规定） + \centerline{（保密论文在解密后遵守此规定）} \vskip 1em \rightline {% @@ -84,5 +83,4 @@ \vspace*{\fill}\par } -\restoregeometry diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex index dda235d21c6..25826ce5f2e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex @@ -1,7 +1,7 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-2015 Casper Ti. Vector % Public domain. % % 使用前请先仔细阅读 pkuthss 和 biblatex-caspervector 的文档， @@ -31,9 +31,17 @@ % 若需要按照英文文献在前，中文文献在后排序，请设置“sorting = ecnty”； % 若需要按照中文文献在前，英文文献在后排序，请设置“sorting = centy”。 \usepackage[backend = biber, style = caspervector, gbk, sorting = none]{biblatex} +% 提供近似于学校所要求的 Times New Roman / Arial 的字体。 +\usepackage[defaultsups]{newtxtext} +\usepackage{newtxmath} % 产生 originauth.tex 里的 \square。 \usepackage{amssymb} +% 按学校要求设定参考文献列表中的条目之内及之间的距离。 +\setlength{\bibitemsep}{3bp} +% 对于 linespread 值的计算过程有兴趣的同学可以参考 pkuthss-extra.sty。 +\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont} + % 设定文档的基本信息。 \pkuthssinfo{ cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, @@ -46,16 +54,17 @@ cmajor = {某某专业}, emajor = {Some Major}, direction = {某某方向}, cmentor = {某某教授}, ementor = {Prof.\ Somebody}, - ckeywords = {某某}, ekeywords = {Something} + ckeywords = {其一，其二}, ekeywords = {First, Second} } % 导入参考文献数据库（注意不要省略“.bib”）。 \addbibresource{thesis.bib} % 普通用户可删除此段。 +\usepackage{color} \def\pkuthssffaq{% \emph{\textcolor{red}{pkuthss 文档模版最常见问题：}} - 最终打印和提交论文前， + 在最终打印和提交论文之前， 请将 pkuthss 文档类选项中的 % \texttt{colorlinks} 改为 \texttt{nocolorlinks}， 因为图书馆要求电子版论文的目录必须为黑色， @@ -64,27 +73,40 @@ \texttt{\string\cite}、\texttt{\string\parencite} % 和 \texttt{\string\supercite} 三个命令分别产生% 未格式化的、带方括号的和上标且带方括号的引用标记：% - \cite{test-en}，\parencite{test-zh}、\supercite{test-en, test-zh}。% + \cite{test-en}，\parencite{test-zh}、\supercite{test-en, test-zh}。 + + 若要避免章末空白页，请在调用 pkuthss 文档类时加入 \texttt{openany} 选项。 - 若要避免章末空白页，请在调用 pkuthss 文档类时加入 \texttt{oneside} 选项。 + 如果编译时不出参考文献， + 请参考 \texttt{texdoc pkuthss}“问题及其解决”一章 + “其它可能存在的问题”一节中关于 biber 的说明。 } \begin{document} - % 以下为正文之前的部分。 + % 以下为正文之前的部分，默认不进行章节编号。 \frontmatter + % 此后到下一 \pagestyle 命令之前不排版页眉或页脚。 + \pagestyle{empty} % 自动生成标题页。 \maketitle % 版权声明。 \include{chap/copyright} + + % 此后到下一 \pagestyle 命令之前正常排版页眉和页脚。 + \cleardoublepage + \pagestyle{plain} + % 重置页码计数器，用大写罗马数字排版此部分页码。 + \setcounter{page}{0} + \pagenumbering{Roman} + % 中英文摘要。 \include{chap/abstract} % 自动生成目录。 \tableofcontents - % 以下为正文。 + % 以下为正文部分，默认要进行章节编号。 \mainmatter - % 序言。 \include{chap/introduction} % 各章节。 @@ -109,11 +131,15 @@ % 各附录。 \include{chap/encl1} - % 以下为正文之后的部分。 + % 以下为正文之后的部分，默认不进行章节编号。 \backmatter - % 致谢。 \include{chap/acknowledge} + + % 此后不排版页眉或页脚。 + \cleardoublepage + \pagestyle{empty} + % 原创性声明和使用授权说明。 \include{chap/originauth} \end{document} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/copyright.tex index 302ec500e71..2a25655c264 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/copyright.tex @@ -1,7 +1,7 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-2015 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -30,18 +30,15 @@ % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \chapter*{鐗堟潈澹版槑} -{ - \zihao{3}\linespread{1.5}\selectfont +\thispagestyle{empty} - 浠讳綍鏀跺瓨鍜屼繚绠℃湰璁烘枃鍚勭鐗堟湰鐨勫崟浣嶅拰涓汉锛 - 鏈粡鏈鏂囦綔鑰呭悓鎰忥紝涓嶅緱灏嗘湰璁烘枃杞熶粬浜猴紝 - 浜︿笉寰楅殢鎰忓鍒躲佹妱褰曘佹媿鐓ф垨浠ヤ换浣曟柟寮忎紶鎾 - 鍚﹀垯涓鏃﹀紩璧锋湁纰嶄綔鑰呰憲浣滄潈涔嬮棶棰橈紝灏嗗彲鑳芥壙鎷呮硶寰嬭矗浠汇 - \par - % 鑻ラ渶鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 - % 杞负鍚堥傜殑鍥剧墖鏍煎紡锛屽苟鏀惧湪褰撳墠鐩綍涓嬶紝鐒跺悗鍘绘帀涓嬮潰 3 琛岀殑娉ㄩ噴銆 - %\vfill\noindent - %\includegraphics[height = 5em]{barcode} - %\par -} +浠讳綍鏀跺瓨鍜屼繚绠℃湰璁烘枃鍚勭鐗堟湰鐨勫崟浣嶅拰涓汉锛 +鏈粡鏈鏂囦綔鑰呭悓鎰忥紝涓嶅緱灏嗘湰璁烘枃杞熶粬浜猴紝 +浜︿笉寰楅殢鎰忓鍒躲佹妱褰曘佹媿鐓ф垨浠ヤ换浣曟柟寮忎紶鎾 +鍚﹀垯涓鏃﹀紩璧锋湁纰嶄綔鑰呰憲浣滄潈涔嬮棶棰橈紝灏嗗彲鑳芥壙鎷呮硶寰嬭矗浠汇 + +% 鑻ラ渶鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 +% 杞负鍚堥傜殑鍥剧墖鏍煎紡锛屽苟鏀惧湪褰撳墠鐩綍涓嬶紝鐒跺悗鍘绘帀涓嬮潰 3 琛岀殑娉ㄩ噴銆 +%\vfill\noindent +%\includegraphics[height = 5em]{barcode} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/originauth.tex index 8bb2791600e..747728d7dde 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/originauth.tex @@ -1,7 +1,7 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-2015 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -31,13 +31,12 @@ % 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑椤典笉闇瑕佽璁㈠埌璁烘枃涓紝鏁呬笉鏄剧ず椤电爜銆 \cleardoublepage\thispagestyle{empty} -\newgeometry{height = 240mm, width = 150mm, ignoreheadfoot, vcentering} { \vspace*{\fill}\linespread{1.5}\selectfont - \centerline{\bfseries\Large 鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} + \centerline{\bfseries\zihao{-2}鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} \vskip 4em - \centerline{\bfseries\Large 鍘熷垱鎬у０鏄巬 + \centerline{\bfseries\zihao{-3}鍘熷垱鎬у０鏄巬 \vskip 1em 鏈汉閮戦噸澹版槑锛 @@ -54,8 +53,8 @@ } \vskip 4em - \centerline{\bfseries\Large 瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑} - \centerline{\zihao{-4}锛堝繀椤昏璁㈠湪鎻愪氦瀛︽牎鍥句功棣嗙殑鍗板埛鏈級} + \centerline{\bfseries\zihao{-3}瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑} + \centerline{\zihao{5}锛堝繀椤昏璁㈠湪鎻愪氦瀛︽牎鍥句功棣嗙殑鍗板埛鏈級} \vskip 1em 鏈汉瀹屽叏浜嗚В鍖椾含澶у鍏充簬鏀堕泦銆佷繚瀛樸佷娇鐢ㄥ浣嶈鏂囩殑瑙勫畾锛屽嵆锛 @@ -69,7 +68,7 @@ $\square$\nobreakspace{}涓ゅ勾 / % $\square$\nobreakspace{}涓夊勾浠ュ悗鍦ㄦ牎鍥綉涓婂叏鏂囧彂甯冦 \end{itemize} - \par锛堜繚瀵嗚鏂囧湪瑙ｅ瘑鍚庨伒瀹堟瑙勫畾锛 + \centerline{锛堜繚瀵嗚鏂囧湪瑙ｅ瘑鍚庨伒瀹堟瑙勫畾锛墋 \vskip 1em \rightline {% @@ -84,5 +83,4 @@ \vspace*{\fill}\par } -\restoregeometry diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex index 328d76e54cf..e854db16d05 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex @@ -1,7 +1,7 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-2015 Casper Ti. Vector % Public domain. % % 浣跨敤鍓嶈鍏堜粩缁嗛槄璇 pkuthss 鍜 biblatex-caspervector 鐨勬枃妗ｏ紝 @@ -31,9 +31,17 @@ % 鑻ラ渶瑕佹寜鐓ц嫳鏂囨枃鐚湪鍓嶏紝涓枃鏂囩尞鍦ㄥ悗鎺掑簭锛岃璁剧疆鈥渟orting = ecnty鈥濓紱 % 鑻ラ渶瑕佹寜鐓т腑鏂囨枃鐚湪鍓嶏紝鑻辨枃鏂囩尞鍦ㄥ悗鎺掑簭锛岃璁剧疆鈥渟orting = centy鈥濄 \usepackage[backend = biber, style = caspervector, utf8, sorting = none]{biblatex} +% 鎻愪緵杩戜技浜庡鏍℃墍瑕佹眰鐨 Times New Roman / Arial 鐨勫瓧浣撱 +\usepackage[defaultsups]{newtxtext} +\usepackage{newtxmath} % 浜х敓 originauth.tex 閲岀殑 \square銆 \usepackage{amssymb} +% 鎸夊鏍¤姹傝瀹氬弬鑰冩枃鐚垪琛ㄤ腑鐨勬潯鐩箣鍐呭強涔嬮棿鐨勮窛绂汇 +\setlength{\bibitemsep}{3bp} +% 瀵逛簬 linespread 鍊肩殑璁＄畻杩囩▼鏈夊叴瓒ｇ殑鍚屽鍙互鍙傝 pkuthss-extra.sty銆 +\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont} + % 璁惧畾鏂囨。鐨勫熀鏈俊鎭 \pkuthssinfo{ cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis}, @@ -46,16 +54,17 @@ cmajor = {鏌愭煇涓撲笟}, emajor = {Some Major}, direction = {鏌愭煇鏂瑰悜}, cmentor = {鏌愭煇鏁欐巿}, ementor = {Prof.\ Somebody}, - ckeywords = {鏌愭煇}, ekeywords = {Something} + ckeywords = {鍏朵竴锛屽叾浜寎, ekeywords = {First, Second} } % 瀵煎叆鍙傝冩枃鐚暟鎹簱锛堟敞鎰忎笉瑕佺渷鐣モ.bib鈥濓級銆 \addbibresource{thesis.bib} % 鏅氱敤鎴峰彲鍒犻櫎姝ゆ銆 +\usepackage{color} \def\pkuthssffaq{% \emph{\textcolor{red}{pkuthss 鏂囨。妯＄増鏈甯歌闂锛殅} - 鏈缁堟墦鍗板拰鎻愪氦璁烘枃鍓嶏紝 + 鍦ㄦ渶缁堟墦鍗板拰鎻愪氦璁烘枃涔嬪墠锛 璇峰皢 pkuthss 鏂囨。绫婚夐」涓殑 % \texttt{colorlinks} 鏀逛负 \texttt{nocolorlinks}锛 鍥犱负鍥句功棣嗚姹傜數瀛愮増璁烘枃鐨勭洰褰曞繀椤讳负榛戣壊锛 @@ -64,27 +73,40 @@ \texttt{\string\cite}銆乗texttt{\string\parencite} % 鍜 \texttt{\string\supercite} 涓変釜鍛戒护鍒嗗埆浜х敓% 鏈牸寮忓寲鐨勩佸甫鏂规嫭鍙风殑鍜屼笂鏍囦笖甯︽柟鎷彿鐨勫紩鐢ㄦ爣璁帮細% - \cite{test-en}锛孿parencite{test-zh}銆乗supercite{test-en, test-zh}銆% + \cite{test-en}锛孿parencite{test-zh}銆乗supercite{test-en, test-zh}銆 + + 鑻ヨ閬垮厤绔犳湯绌虹櫧椤碉紝璇峰湪璋冪敤 pkuthss 鏂囨。绫绘椂鍔犲叆 \texttt{openany} 閫夐」銆 - 鑻ヨ閬垮厤绔犳湯绌虹櫧椤碉紝璇峰湪璋冪敤 pkuthss 鏂囨。绫绘椂鍔犲叆 \texttt{oneside} 閫夐」銆 + 濡傛灉缂栬瘧鏃朵笉鍑哄弬鑰冩枃鐚紝 + 璇峰弬鑰 \texttt{texdoc pkuthss}鈥滈棶棰樺強鍏惰В鍐斥濅竴绔 + 鈥滃叾瀹冨彲鑳藉瓨鍦ㄧ殑闂鈥濅竴鑺備腑鍏充簬 biber 鐨勮鏄庛 } \begin{document} - % 浠ヤ笅涓烘鏂囦箣鍓嶇殑閮ㄥ垎銆 + % 浠ヤ笅涓烘鏂囦箣鍓嶇殑閮ㄥ垎锛岄粯璁や笉杩涜绔犺妭缂栧彿銆 \frontmatter + % 姝ゅ悗鍒颁笅涓 \pagestyle 鍛戒护涔嬪墠涓嶆帓鐗堥〉鐪夋垨椤佃剼銆 + \pagestyle{empty} % 鑷姩鐢熸垚鏍囬椤点 \maketitle % 鐗堟潈澹版槑銆 \include{chap/copyright} + + % 姝ゅ悗鍒颁笅涓 \pagestyle 鍛戒护涔嬪墠姝ｅ父鎺掔増椤电湁鍜岄〉鑴氥 + \cleardoublepage + \pagestyle{plain} + % 閲嶇疆椤电爜璁℃暟鍣紝鐢ㄥぇ鍐欑綏椹暟瀛楁帓鐗堟閮ㄥ垎椤电爜銆 + \setcounter{page}{0} + \pagenumbering{Roman} + % 涓嫳鏂囨憳瑕併 \include{chap/abstract} % 鑷姩鐢熸垚鐩綍銆 \tableofcontents - % 浠ヤ笅涓烘鏂囥 + % 浠ヤ笅涓烘鏂囬儴鍒嗭紝榛樿瑕佽繘琛岀珷鑺傜紪鍙枫 \mainmatter - % 搴忚█銆 \include{chap/introduction} % 鍚勭珷鑺傘 @@ -109,11 +131,15 @@ % 鍚勯檮褰曘 \include{chap/encl1} - % 浠ヤ笅涓烘鏂囦箣鍚庣殑閮ㄥ垎銆 + % 浠ヤ笅涓烘鏂囦箣鍚庣殑閮ㄥ垎锛岄粯璁や笉杩涜绔犺妭缂栧彿銆 \backmatter - % 鑷磋阿銆 \include{chap/acknowledge} + + % 姝ゅ悗涓嶆帓鐗堥〉鐪夋垨椤佃剼銆 + \cleardoublepage + \pagestyle{empty} + % 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑銆 \include{chap/originauth} \end{document} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf Binary files differindex 04290288127..ced4f4b6fa0 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/example.pdf diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt index 97b952c7ede..875952908b6 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt @@ -1,15 +1,37 @@ +2014-04-28, v1.6.0 + + * API Changes: + - New package option: `footfmt' and `pkuspace'. + - `tightlist' option merged into `spacing'; `caption' option removed. + + * Changes to example template: + - Some changes regarding updates in school regulation. + - thesis.tex: add color package for \pkuthssffaq with noncolorlinks. + - chap/: again try to make enca(1) happy. + + * Changes to package code: + - Major changes regarding updates in school regulation. + + * Changes to documentation: + - Reorganise section tree. + + * Misc: + - Update URL of project homepage. + - Minor fixes and aesthetic improvements. + - dist: remove version string from file name of TDS archive. + 2014-07-07, v1.5.5 * Changes to example template: - Use the most frequently asked questions as the sample text. - - revert the black TOC, considering the new sample text. + - Revert the black TOC, considering the new sample text. * Changes to package code: - pkuthss.cls: use `PassOptionsToPackage' for *packages*. - pkuthss-extra.sty: `hidelinks' does not hold a value. * Changes to documentation: - - update info on `colorlinks'. + - Update info on `colorlinks'. * Misc: - Minor improvements. @@ -17,7 +39,7 @@ 2014-07-04, v1.5.4 * Changes to example template: - - make TOC black, as stupidly required by PKU Library. + - Make TOC black, as stupidly required by PKU Library. * Changes to documentation: - re-sort and re-organise common problems. diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/acknowledge.tex index 84e0304aee7..845b12952a7 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/acknowledge.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/acknowledge.tex @@ -3,7 +3,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2012 Casper Ti. Vector +% 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 @@ -34,3 +34,7 @@ 鐗瑰埆鎰熻阿 pkuthss 妯＄増鐨勬渶鍒濆垱浣滆 solvethis 缃戝弸锛 浠ュ強涓嶆柇鍦板 Casper 鎻愬嚭鐨勮澶氶棶棰樹簣浠ヨВ绛旂殑 cauchy 缃戝弸 :) +姝ゅ杩樿鎰熻阿 \parencite{pku-thesisstyle} 鐨勪綔鑰咃紝 +璁╂垜鏍″湪瀛︿綅璁烘枃鏍煎紡瑕佹眰鐨勭箒澶嶇▼搴︿笂绂婚殧澹佹洿杩戜簡涓姝ワ紝 +鍚屾椂杩樿揪鎴愪簡鐢 \hologo{TeX} 鎺掔増鍑哄拰 M\$ Word 涓鏍峰缇庢按骞宠鏂囩殑浼熷ぇ鎴愬氨銆 + diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex index f5775747b1e..d7f1a28649b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex @@ -3,7 +3,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-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 @@ -41,7 +41,7 @@ 杩橀渶瑕 biblatex 瀹忓寘\supercite{biblatex}锛 \item 濡傛灉闇瑕佸涓枃鏂囩尞杩涜鎸夋眽璇嫾闊崇殑鎺掑簭鐨勮瘽锛 杩橀渶瑕 biber 绋嬪簭\supercite{biber}銆 - \item 濡傛灉榛樿鐨勬枃鐚垪琛ㄥ拰寮曠敤鏍峰紡鐨勮瘽锛 + \item 濡傛灉浣跨敤榛樿鐨勬枃鐚垪琛ㄥ拰寮曠敤鏍峰紡鐨勮瘽锛 杩橀渶瑕佷綔鑰呯紪鍐欑殑 biblatex 鏍峰紡 锛坆iblatex-caspervector锛塡supercite{biblatex-caspervector}銆 \item 濡傛灉闇瑕佷娇鐢 Makefile 鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯紝杩橀渶瑕 Make 宸ュ叿锛 @@ -52,7 +52,7 @@ 娉細 鏌愪簺 Linux 鍙戣鐗堣蒋浠朵粨搴撲腑鐨 \hologo{TeX} Live 鏈夐棶棰橈紝 寤鸿浣跨敤鐙珛瀹夎鐗堢殑 \hologo{TeX} Live% - \footnote{\url{http://www.tug.org/texlive/}.}銆% + \unemph{\footnote{\url{http://www.tug.org/texlive/}.}}銆% }锛夐兘宸茬粡鍖呭惈闄や腑鏂囧瓧浣撳拰 Make 涔嬪鎵鏈夎姹傜殑椤圭洰銆% \myemph{% 涓轰簡鑾峰緱鏈濂界殑鏀寔锛 @@ -192,11 +192,9 @@ make 娉ㄦ剰锛% Windows 鎵瑰鐞嗗浜 LF锛圽texttt{\string\n}锛夋崲琛岀殑鎵瑰鐞嗘枃浠舵敮鎸佹湁闂銆 鍦ㄥ懡浠ゆ彁绀虹锛坈md锛変笅鎵ц杩欎簺鎵瑰鐞嗘枃浠舵椂娌℃湁闂锛 - 浣嗗弻鍑绘枃浠跺浘鏍囨墽琛屾椂灏变細鍑洪敊銆 - 浣滆呭湪 Google Code 鍜屽寳澶ф湭鍚 BBS 涓婂彂甯冪殑鍘嬬缉鍖呬腑 \texttt{Make.bat} - 鍧囨槸 CRLF锛圽texttt{\string\r\string\n}锛夋崲琛岋紝 - 浣 \hologo{TeX} Live 涓畨瑁呯殑 \texttt{Make.bat} 鍜 + 浣嗗弻鍑绘枃浠跺浘鏍囨墽琛屾椂鍙兘灏变細鍑洪敊銆 + \hologo{TeX} Live 涓畨瑁呯殑 \texttt{Make.bat} 鍜 CTAN 涓婃彁渚涚殑鍘嬬缉鍖呴噷鐨 \texttt{Make.bat} - 鍙兘鏄 LF锛圽texttt{\string\n}锛夋崲琛岀殑銆% + 鏈夊彲鑳芥槸 LF锛圽texttt{\string\n}锛夋崲琛岀殑銆% } diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex index acc86ec0319..6206ae79be4 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex @@ -3,7 +3,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-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 @@ -43,14 +43,13 @@ 鏄惁鍦ㄩ〉鐪変腑灏嗙珷鑺傚悕涓殑灏忓啓瀛楁瘝杞崲涓哄ぇ鍐欏瓧姣嶃 灏辩洰鍓嶈岃█锛 杩欐牱鐨勮浆鎹㈠瓨鍦ㄧ潃涓浜涜緝涓轰弗閲嶇殑缂洪櫡\footnote{% - 鍑嗙‘鍦拌鏄 \texttt{\string\MakeUppercase} 瀹忕殑闂锛 + 鍑嗙‘鍦拌鏄 \texttt{\string\MakeUppercase} 瀹忕殑闂锛 鍏跺湪鏌愪簺鍦版柟鐨勮浆鎹笉澶熷仴澹紝 渚嬪 \texttt{\string\cite\string{ctex\string}} 浼氳杞崲鎴 \texttt{\string\cite\string{CTEX\string}}銆% }锛 鍥犳涓嶅缓璁娇鐢ㄣ - 鍩轰簬涓婅堪鑰冭檻锛% - \myemph{% + 鍩轰簬涓婅堪鑰冭檻锛孿myemph{% pkuthss 鏂囨。绫婚粯璁ゅ惎鐢 \texttt{nouppermark} 閫夐」锛 鍗冲湪涓嶅湪椤电湁涓娇鐢ㄥぇ鍐欑殑绔犺妭鍚% }銆 @@ -78,12 +77,6 @@ \begin{Verbatim}[frame = single] \documentclass[openany, ...]{pkuthss} % 姣忕珷浠庝换鎰忛〉寮濮嬨 \end{Verbatim} - 浣嗚繖鏍疯缃椂宸﹀彸锛堝鍋讹級椤电殑椤电湁椤佃剼璁剧疆浠嶇劧鏄笉鍚岀殑銆 - 濡傛灉闇瑕佷娇宸﹀彸椤电殑椤电湁椤佃剼璁剧疆涓鑷达紝鍙互鐩存帴閲囩敤鍗曢潰妯″紡锛 -\begin{Verbatim}[frame = single] -% 浣跨敤 oneside 閫夐」鏃朵笉闇瑕佸啀鎸囧畾 openany 閫夐」銆 -\documentclass[oneside, ...]{pkuthss} -\end{Verbatim} \subsection{pkuthss-extra 瀹忓寘鎻愪緵鐨勯夐」}\label{ssec:extra} @@ -91,36 +84,27 @@ 涓嬮潰鎻愬埌鐨勯夐」涓兘鏄笉甯︹淺verb|no|鈥濈殑鐗堟湰琚惎鐢ㄣ \begin{itemize} - \item \textbf{\texttt{[no]spacing}}锛 - 鏄惁閲囩敤涓浜涘父鐢ㄧ殑瀵圭┖鐧借繘琛岃皟鏁寸殑鐗堝紡璁惧畾銆 - 鍏蜂綋鍦拌锛屽惎鐢 \verb|space| 閫夐」鍚庝細杩涜浠ヤ笅鍑犻」璁剧疆锛 + \item \textbf{\texttt{[no]footfmt}}锛 + 鏄惁鏍规嵁瀛︽牎瀵硅鏂囨牸寮忕殑瑕佹眰\mbox{\supercite{pku-thesisstyle}}% + 淇敼鍜岃剼娉ㄧ浉鍏崇殑涓浜涙牸寮忋 + 鍏蜂綋鍦拌锛屽惎鐢 \verb|footfmt| 閫夐」鍚庝細杩涜浠ヤ笅鍑犻」璁剧疆锛 \begin{itemize} - \item 鑷姩蹇界暐 CJK 鏂囧瓧涔嬮棿鐨勭┖鐧借% - 淇濈暀锛圕JK 鏂囧瓧涓庤嫳鏂囦箣闂寸瓑鐨勶級鍏跺畠绌虹櫧銆 - \item 璋冪敤 setspace 瀹忓寘浠ヤ娇鏌愪簺缁嗚妭澶勭殑绌洪棿瀹夋帓鏇寸編瑙傘 - \item 璁剧疆椤佃姱灞呬腑銆 - \item 璁惧畾琛岃窛涓 1.41\footnote{% - 涓轰粈涔堟槸 1.41锛熷洜涓 $\sqrt{2}\approx1.41$銆% - }銆 - \item 浣胯剼娉ㄧ紪鍙峰拰鑴氭敞鏂囨湰涔嬮棿榛樿闂撮殧涓涓┖鏍笺 + \item 鑴氭敞鍙傜敤甯﹀湀鐨勭紪鍙枫 + \item 椤佃剼涓剼娉ㄧ紪鍙蜂娇鐢ㄦ鏂囷紙鑰岄潪涓婃爣锛夊瓧浣撱 + \item 椤佃剼涓剼娉ㄧ紪鍙峰拰鑴氭敞鏂囨湰涔嬮棿榛樿闂撮殧涓涓┖鏍笺 \end{itemize} - \item \textbf{\texttt{[no]tightlist}}锛 - 鏄惁閲囩敤姣 \hologo{LaTeX} 榛樿璁惧畾鏇村姞绱у瘑鐨勬灇涓剧幆澧冦 - 鍦ㄦ灇涓剧幆澧冿紙itemize銆乪numerate 鍜 description锛変腑锛 - 姣忎釜鏉＄洰鐨勫唴瀹硅緝灏戞椂锛屾潯鐩線寰鏄惧緱绋鐤忥紱 - 鍦ㄥ弬鑰冩枃鐚垪琛ㄤ腑涔熸湁绫讳技鐨勭幇璞° - 鍚敤 \verb|tightlist| 閫夐」鍚庯紝 - 灏嗗幓鎺夎繖浜涚幆澧冧腑棰濆澧炲姞鐨勶紙鍨傜洿锛夐棿闅斻 - - \item \textbf{\texttt{[no]caption}}锛 - 鏄惁浣垮浘琛ㄦ爣棰樹娇鐢ㄥ拰姝ｆ枃涓嶅悓鐨勫瓧浣 - 锛堟澶勮涓轰腑鏂囨シ涔︺佽嫳鏂囨枩浣擄紝 - 濡傚浘 \ref{fig:example} 鎵绀猴級銆 - 鏍规嵁鎺掔増涓父瑙佺殑瀹＄編鍘熷垯锛 - 涓鑸簲浣垮浘琛ㄦ爣棰樼殑瀛椾綋銆佸瓧鍙疯交 - 锛堜緥濡傛シ涔︿箣浜庡畫浣撱佷簲鍙峰瓧涔嬩簬灏忓洓鍙峰瓧锛変簬姝ｆ枃锛 - 鍥捐〃鍐呭鐨勫瓧浣撱佸瓧鍙疯交浜庡浘琛ㄦ爣棰樸 + \item \textbf{\texttt{[no]pkuspace}}锛 + 鏄惁鏍规嵁瀛︽牎瀵硅鏂囨牸寮忕殑瑕佹眰\mbox{\supercite{pku-thesisstyle}}% + 淇敼鎺掔増涓殑涓浜涢棿璺濆強鐩稿叧璁剧疆銆 + 鍏蜂綋鍦拌锛屽惎鐢 \verb|pkuspace| 閫夐」鍚庝細鎸 + \parencite{pku-thesisstyle} 涓殑瑕佹眰淇敼浠ヤ笅鍑犻」璁剧疆锛 + \begin{itemize} + \item 鐩綍涓潯鐩殑缂╄繘鏂瑰紡銆 + \item 鍥捐〃鏍囬鐨勫瓧鍙凤紝 + 浠ュ強鏍囬涓紪鍙峰拰鏍囬鏂囧瓧涔嬮棿鐨勯棿闅旀柟寮 + 锛堜緥濡傚浘 \ref{fig:example} 鎵绀猴級銆 + \end{itemize} \begin{figure}[htbp!] \centering @@ -128,6 +112,27 @@ \caption{绀轰緥鎻掑浘}\label{fig:example} \end{figure} + \item \textbf{\texttt{[no]spacing}}\footnote{% + 鍥犱负浠ｇ爜閲嶆瀯鐨勭紭鏁咃紝 + 姝ら夐」鍚屾椂鎻愪緵 1.5.5 鍙婁互鍓嶇増鏈 pkuthss-extra 瀹忓寘% + 涓 \texttt{[no]tightlist} 閫夐」鎵鎻愪緵鐨勫姛鑳姐% + }锛 + 鏄惁閲囩敤涓浜涘父鐢ㄧ殑璋冩暣闂磋窛鐨勯澶栫増寮忚瀹氥 + 鍏蜂綋鍦拌锛屽惎鐢 \verb|spacing| 閫夐」鍚庝細杩涜浠ヤ笅鍑犻」璁剧疆锛 + \begin{itemize} + \item 鑷姩蹇界暐 CJK 鏂囧瓧涔嬮棿鐨勭┖鐧借% + 淇濈暀锛圕JK 鏂囧瓧涓庤嫳鏂囦箣闂寸瓑鐨勶級鍏跺畠绌虹櫧銆 + \item 璋冪敤 setspace 瀹忓寘浠ヤ娇鏌愪簺缁嗚妭澶勭殑绌洪棿瀹夋帓鏇寸編瑙傘 + \item 閲囩敤姣 \hologo{LaTeX} 榛樿璁惧畾鏇村姞绱у瘑鐨勬灇涓剧幆澧% + \footnote{% + 鍦ㄦ灇涓剧幆澧冿紙itemize銆乪numerate 鍜 description锛変腑锛 + 姣忎釜鏉＄洰鐨勫唴瀹硅緝灏戞椂锛屾潯鐩線寰鏄惧緱绋鐤忥紱 + 鍦ㄥ弬鑰冩枃鐚垪琛ㄤ腑涔熸湁绫讳技鐨勭幇璞° + 鍚敤 \texttt{spacing} 閫夐」鍚庯紝 + 灏嗗幓鎺夎繖浜涚幆澧冧腑棰濆澧炲姞鐨勶紙鍨傜洿锛夐棿闅斻% + }銆 + \end{itemize} + \item \textbf{\texttt{[no]pdftoc}}\footnote{% 姝ら夐」閮ㄥ垎绛変环浜 1.4 alpha2 鍙婁互鍓嶇増鏈 pkuthss-extra 瀹忓寘% 鐨 \texttt{[no]tocbibind} 閫夐」銆 @@ -146,8 +151,7 @@ \item \textbf{\texttt{[no]pdfprop}}锛 鏄惁鑷姩鏍规嵁璁惧畾鐨勮鏂囨枃妗ｄ俊鎭紙濡備綔鑰呫佹爣棰樼瓑锛 - 璁剧疆鐢熸垚鐨 pdf 鏂囨。鐨勭浉搴斿睘鎬с% - \myemph{% + 璁剧疆鐢熸垚鐨 pdf 鏂囨。鐨勭浉搴斿睘鎬с俓myemph{% 娉ㄦ剰锛 璇ラ夐」瀹為檯涓婃槸鍦 \texttt{\string\maketitle} 鏃剁敓鏁堢殑锛 杩欐槸鍥犱负鑰冭檻鍒% @@ -249,9 +253,8 @@ 鎴栬嚜韬瓨鍌ㄦ枃妗ｄ俊鎭殑鍛戒护鍚嶏紙涓嶅甫鍙嶆枩鏉狅級銆 褰撴枃妗ｄ俊鎭殑鍐呭鍖呭惈浜嗛楀彿绛夋湁骞叉壈鐨勫瓧绗︽椂锛 - 鍙互鐢ㄥぇ鎷彿灏嗚繖涓椤规枃妗ｄ俊鎭殑鍏ㄩ儴鍐呭鎷捣鏉ャ% - \myemph{% - 鎴戜滑鎺ㄨ崘鐢ㄦ埛鎬荤敤澶ф嫭鍙峰皢鏂囨。淇℃伅鐨勫唴瀹规嫭璧锋潵锛 + 鍙互鐢ㄥぇ鎷彿灏嗚繖涓椤规枃妗ｄ俊鎭殑鍏ㄩ儴鍐呭鎷捣鏉ャ俓myemph{% + 鎴戜滑寤鸿鐢ㄦ埛鎬荤敤澶ф嫭鍙峰皢鏂囨。淇℃伅鐨勫唴瀹规嫭璧锋潵锛 浠ラ伩鍏嶅緢澶氫笉蹇呰鐨勯夯鐑︺% } @@ -273,8 +276,7 @@ \texttt{\bfseries\string\specialchap} 鍛戒护% 鐢ㄤ簬寮濮嬩笉杩涜鏍囧彿浣嗚鍏ョ洰褰曠殑涓绔狅紝 - 骞跺悎鐞嗗畨鎺掑叾椤电湁銆% - \myemph{% + 骞跺悎鐞嗗畨鎺掑叾椤电湁銆俓myemph{% 娉ㄦ剰锛 闇瑕佸惎鐢 pkuthss-extra 瀹忓寘鐨 \texttt{spechap} 閫夐」% 鎵嶈兘浣跨敤姝ゅ懡浠ゃ @@ -291,7 +293,7 @@ 鍥犳閫氬父涓嶉渶瑕佺敤鎴疯嚜宸变娇鐢紱 浣嗙敤鎴锋湁鏃跺彲鑳戒笉闇瑕佽緭鍑烘爣棰橀〉锛 浠庤屼笉浼氳皟鐢 \verb|\maketitle| 鍛戒护锛 - 姝ゆ椂灏遍渶瑕佸湪璁惧畾瀹屾枃妗ｄ俊鎭箣鍚庤皟鐢 \verb|\setpdfproperties|銆 + 姝ゆ椂灏遍渶瑕佸湪璁惧畾瀹屾枃妗ｄ俊鎭箣鍚庤皟鐢 \verb|\setpdfproperties|銆% \myemph{% 娉ㄦ剰锛 闇瑕佸惎鐢 pkuthss-extra 瀹忓寘鐨 \texttt{pdfprop} 閫夐」% @@ -300,10 +302,10 @@ \subsection{浠庡叾瀹冩枃妗ｇ被鍜屽畯鍖呯户鎵跨殑鍔熻兘}\label{ssec:thirdparty} - pkuthss 鏂囨。绫诲缓绔嬪湪 ctexbook\supercite{ctex} 鏂囨。绫荤殑鍩虹涓婏紝 - 骞惰皟鐢ㄤ簡 CJKfntef銆% - graphicx\supercite{graphicx}銆乬eometry\supercite{geometry} 鍜 % - fancyhdr\supercite{fancyhdr} 绛夊嚑涓畯鍖咃紱 + pkuthss 鏂囨。绫诲缓绔嬪湪 ctexbook\supercite{ctex} 鏂囨。绫讳箣涓婏紝 + 骞惰皟鐢ㄤ簡 CJKfntef銆乭yperref\supercite{hyperref}銆% + geometry\supercite{geometry}銆乫ancyhdr\supercite{fancyhdr} % + 鍜 graphicx\supercite{graphicx} 绛夊嚑涓畯鍖咃紱 浣跨敤 \hologo{pdfLaTeX} 鏂瑰紡缂栬瘧 GBK 缂栫爜鐨勬簮鏂囦欢鏃惰繕浼氳皟鐢 xCJK2uni\supercite{xCJK2uni} 瀹忓寘銆 鍥犳锛宑texbook 鏂囨。绫诲拰杩欎簺瀹忓寘鎵鎻愪緵鐨勫姛鑳藉潎鍙互浣跨敤銆 @@ -333,28 +335,16 @@ pkuthss-extra 瀹忓寘鍙兘璋冪敤浠ヤ笅杩欎簺瀹忓寘锛 \begin{itemize} - \item 鍚敤 \verb|spacing| 閫夐」鏃朵細璋冪敤 % - setspace 鍜 footmisc\supercite{footmisc} 瀹忓寘銆 - \item 鍚敤 \verb|tightlist| 閫夐」鏃朵細璋冪敤 % - enumitem\supercite{enumitem} 瀹忓寘銆 - \item 鍚敤 \verb|caption| 閫夐」鏃朵細璋冪敤 % + \item 鍚敤 \verb|footfmt| 閫夐」鏃朵細璋冪敤 % + tikz\supercite{tikz} 鍜 scrextend\supercite{scrextend} 瀹忓寘銆 + \item 鍚敤 \verb|pkuspace| 閫夐」鏃朵細璋冪敤 % + tocloft\supercite{tocloft}銆乻ubfig\supercite{subfig} 鍜 % caption\supercite{caption} 瀹忓寘銆 + \item 鍚敤 \verb|spacing| 閫夐」鏃朵細璋冪敤 setspace 鍜 % + enumitem\supercite{enumitem} 瀹忓寘銆 \end{itemize} 鍥犳鍦ㄥ惎鐢ㄧ浉搴旈夐」鏃讹紝鐢ㄦ埛鍙互浣跨敤瀵瑰簲瀹忓寘鎵鎻愪緵鐨勫姛鑳姐 - \subsection{涓嶅缓璁洿鏀圭殑璁剧疆} - \myemph{% - pkuthss 鏂囨。绫讳腑鏈変竴浜涗竴鏃︽敼鍔ㄥ氨鏈夊彲鑳界牬鍧忛璁炬帓鐗堣鍒掔殑璁剧疆锛 - 鍥犳涓嶅缓璁洿鏀硅繖浜涜缃紝瀹冧滑鏄細 - \begin{itemize} - \item 绾稿紶绫诲瀷锛欰4锛 - \item 椤佃姱灏哄锛% - $240\,\mathrm{mm}\times150\,\mathrm{mm}$锛 - 鍖呭惈椤电湁銆侀〉鑴氾紱 - \item 榛樿瀛楀彿锛氬皬鍥涘彿銆 - \end{itemize}% - } - \section{楂樼骇璁剧疆}\label{sec:advanced} pkuthss 鏂囨。妯＄増鐨勫疄鐜版槸绠娲併佹竻鏅般佺伒娲荤殑銆 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex index a9dc2f809d2..34691632912 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex @@ -3,7 +3,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-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 @@ -60,87 +60,90 @@ 鍥犳寤鸿鐢ㄦ埛浣跨敤鏀寔 LF 鎹㈣鐨勬枃鏈紪杈戝櫒缂栬緫鏂囦欢锛 璇﹁绗 \ref{sec:doc-dir} 鑺傘 - \section{鍏跺畠鍙兘瀛樺湪鐨勯棶棰榼 - \subsection{涓婃父瀹忓寘鍙兘寮曡捣鐨勯棶棰榼 + \section{涓婃父瀹忓寘鍙兘寮曡捣鐨勯棶棰榼 - biblatex 瀹忓寘\supercite{biblatex}浼氳嚜琛岃瀹 \verb|\bibname|锛 - 鏁呬細瑕嗙洊閫氳繃 \verb|\CTEXoptions| 璁惧畾鐨勫弬鑰冩枃鐚垪琛ㄦ爣棰樸 - 浣跨敤 biblatex 鐨勭敤鎴峰彲浠ヤ娇鐢 \verb|\printbibliography| 鐨 - \verb|title| 閫夐」鏉ユ墜鍔ㄨ瀹氬弬鑰冩枃鐚垪琛ㄧ殑鏍囬锛屼緥濡傦細 + biblatex 瀹忓寘\supercite{biblatex}浼氳嚜琛岃瀹 \verb|\bibname|锛 + 鏁呬細瑕嗙洊閫氳繃 \verb|\CTEXoptions| 璁惧畾鐨勫弬鑰冩枃鐚垪琛ㄦ爣棰樸 + 浣跨敤 biblatex 鐨勭敤鎴峰彲浠ヤ娇鐢 \verb|\printbibliography| 鐨 + \verb|title| 閫夐」鏉ユ墜鍔ㄨ瀹氬弬鑰冩枃鐚垪琛ㄧ殑鏍囬锛屼緥濡傦細 \begin{Verbatim}[frame = single] \printbibliography[title = {鏂囩尞}, ...] % 鈥...鈥濅负鍏跺畠閫夐」銆 \end{Verbatim} - hyperref 瀹忓寘\supercite{hyperref}鍜屼竴浜涘畯鍖呭彲鑳藉彂鐢熷啿绐併 - 鍏充簬濡備綍閬垮厤杩欎簺鍐茬獊锛 - 鍙互鍙傝 hyperref 瀹忓寘鐨 README 鏂囦欢涓殑鈥淧ackage Compatibility鈥濅竴鑺傘 - 姝ゆ枃浠堕氬父鍜屾墽琛 \verb|texdoc hyperref| % - 鏃舵墦寮鐨 pdf 鏂囦欢浣嶄簬鍚屼竴鐩綍涓 + hyperref 瀹忓寘\supercite{hyperref}鍜屼竴浜涘畯鍖呭彲鑳藉彂鐢熷啿绐併 + 鍏充簬濡備綍閬垮厤杩欎簺鍐茬獊锛 + 鍙互鍙傝 hyperref 瀹忓寘鐨 README 鏂囦欢涓殑鈥淧ackage Compatibility鈥濅竴鑺傘 + 姝ゆ枃浠堕氬父鍜屾墽琛 \verb|texdoc hyperref| % + 鏃舵墦寮鐨 pdf 鏂囦欢浣嶄簬鍚屼竴鐩綍涓 - 浣跨敤 \hologo{XeLaTeX} 鐨勭敤鎴峰彲鑳藉湪宸茬粡瀹夎瀛椾綋鐨勬儏鍐典笅閬囧埌褰㈠锛堝叾涓 - \verb|xxxxxxxx| 涓哄叿浣撳瓧浣撳悕锛 + 浣跨敤 \hologo{XeLaTeX} 鐨勭敤鎴峰彲鑳藉湪宸茬粡瀹夎瀛椾綋鐨勬儏鍐典笅閬囧埌褰㈠锛堝叾涓 + \verb|xxxxxxxx| 涓哄叿浣撳瓧浣撳悕锛 \begin{Verbatim}[frame = single, fontsize = {\small}] ! fontspec error: "font-not-found" ! The font "xxxxxxxx" cannot be found. ! See the fontspec documentation for further information. ! For immediate help type H <return>. \end{Verbatim} - 鐨勯敊璇 - 杩欑閿欒涓鑸槸锛堜富瑕佹槸闈 Windows 骞冲彴鐨勶級鐢ㄦ埛閲囩敤浜嗚嚜瀹氫箟鐨勶紙鍖呮嫭澶у皬鍐 - 涓嶅悓浜庡師鏂囦欢鐨勶級瀛椾綋鏂囦欢鍚嶏紝 - 骞舵敼鍔 ctex.cfg 绛夐厤缃枃浠朵箣鍚庢病鏈夊湪璋冪敤 pkuthss 鏂囨。绫绘椂鍔犲叆 - \verb|nofonts| 閫夐」锛 - 鍙堜娇鐢 \hologo{XeLaTeX} 缂栬瘧閫犳垚鐨勶紝浣跨敤 + 鐨勯敊璇 + 杩欑閿欒涓鑸槸锛堜富瑕佹槸闈 Windows 骞冲彴鐨勶級鐢ㄦ埛閲囩敤浜嗚嚜瀹氫箟鐨勶紙鍖呮嫭澶у皬鍐 + 涓嶅悓浜庡師鏂囦欢鐨勶級瀛椾綋鏂囦欢鍚嶏紝 + 骞舵敼鍔 ctex.cfg 绛夐厤缃枃浠朵箣鍚庢病鏈夊湪璋冪敤 pkuthss 鏂囨。绫绘椂鍔犲叆 + \verb|nofonts| 閫夐」锛 + 鍙堜娇鐢 \hologo{XeLaTeX} 缂栬瘧閫犳垚鐨勶紝浣跨敤 \begin{Verbatim}[frame = single] \documentclass[nofonts, ...]{pkuthss} % 鈥...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆 \end{Verbatim} - 鍗冲彲瑙ｅ喅姝ら棶棰樸 + 鍗冲彲瑙ｅ喅姝ら棶棰樸 - biber 杩愯鏃舵湁涓瀹氭鐜囧嚭鐜板舰濡傦紙鐩綍鍚嶅彲鑳界◢鏈変笉鍚岋級 + biber 杩愯鏃舵湁涓瀹氭鐜囧嚭鐜板舰濡傦紙鐩綍鍚嶅彲鑳界◢鏈変笉鍚岋級 \begin{Verbatim}[frame = single, fontsize = {\small}] data source .../par-xxxxxxxx/cache-xxxxxxxx/ inc/lib/Biber/LaTeX/recode_data.xml not found in . \end{Verbatim} - 鐨勯敊璇 - 杩欑閿欒涓鑸槸 biber 鍦ㄨ嚜瑙ｅ帇闃舵琚粓姝箣鍚庯紝 - 鏈垹闄や复鏃剁洰褰 \verb|.../par-xxxxxxxx/| 灏遍噸鏂拌繍琛 biber 鏃跺嚭鐜般 - 閬囧埌杩欑鎯呭喌鏃讹紝鍒犻櫎鎺変笂杩颁复鏃剁洰褰曞強鍏舵墍鏈夊唴瀹癸紝 - 鍐嶉噸鏂拌繍琛 biber 閫氬父渚垮彲瑙ｅ喅闂銆 + 鐨勯敊璇 + 杩欑閿欒涓鑸槸 biber 鍦ㄨ嚜瑙ｅ帇闃舵琚粓姝箣鍚庯紝 + 鏈垹闄 \verb|.../par-xxxxxxxx/| 杩欎釜涓存椂鐩綍灏遍噸鏂拌繍琛 biber 鏃跺嚭鐜般 + 閬囧埌杩欑鎯呭喌鏃讹紝鍒犻櫎鎺変笂杩颁复鏃剁洰褰曞強鍏舵墍鏈夊唴瀹癸紝 + 鍐嶉噸鏂拌繍琛 biber 閫氬父渚垮彲瑙ｅ喅闂銆 - caption 瀹忓寘\supercite{caption}瀵逛簬鍏朵笉璁よ瘑鐨勫畯鍖呭潎浼氭彁绀 + caption 瀹忓寘\supercite{caption}瀵逛簬鍏朵笉璁よ瘑鐨勫畯鍖呭潎浼氭彁绀 \begin{Verbatim}[frame = single, fontsize = {\small}] Package caption Warning: Unsupported document class (or package) detected, (caption) usage of the caption package is not recommended. See the caption package documentation for explanation. \end{Verbatim} - pkuthss 鏂囨。妯＄増鍩轰簬 ctexbook 鏂囨。绫伙紝 - 鑰屽悗鑰呭熀浜庢爣鍑嗙殑 book 鏂囨。绫汇 - 鍥犳锛岃繖涓鍛婂苟涓嶅奖鍝嶇敤鎴锋甯镐娇鐢╘footnote{% - \url{http://bbs.ctex.org/forum.php?mod=redirect&goto=findpost&ptid=63117&pid=402145}.% - }銆 + pkuthss 鏂囨。妯＄増鍩轰簬 ctexbook 鏂囨。绫伙紝 + 鑰屽悗鑰呭熀浜庢爣鍑嗙殑 book 鏂囨。绫汇 + 鍥犳锛岃繖涓鍛婂苟涓嶅奖鍝嶇敤鎴锋甯镐娇鐢╘footnote{% + \url{http://bbs.ctex.org/forum.php?mod=redirect&goto=findpost&ptid=63117&pid=402145}.% + }銆 - \subsection{鏂囨。鏍煎紡鍙兘瀛樺湪鐨勯棶棰榼 + \section{鏂囨。鏍煎紡鍙兘瀛樺湪鐨勯棶棰榼 - 鐮旂┒鐢熸墜鍐屽拰鍏剁數瀛愮増\supercite{pku-thesisstyle}瑕佹眰鐨勮鏂囧皝闈㈠彲鑳藉苟涓嶄竴鑷达紝 - 杩欓噷浠ョ數瀛愮増涓哄噯銆 + 瀛︽牎瀵瑰浣嶈鏂囨牸寮忕殑瑙勫畾\mbox{\supercite{pku-thesisstyle}}% + 鏄剧劧娌℃湁鑰冭檻鍒伴潪 MS Word 绫绘帓鐗堝伐鍏风殑宸ヤ綔鏂瑰紡锛 + 鍥犳 pkuthss 鏂囨。妯℃澘鍙槸瀵瑰叾瑕佹眰鐨勬牸寮忚繘琛屾ā浠匡紝 + 鑰屽湪涓浜涘皬鐨勭粏鑺備笂鍙兘鏈夋墍鍑哄叆銆 + + biblatex-caspervector\supercite{biblatex-caspervector} 鎵瀹炵幇鐨勬牸寮忓拰 % + \parencite{pku-thesisstyle} 鐨勮瀹氬苟涓嶄竴鑷达紝 + 浣嗗叾浣滆呮殏鏃舵病鏈夌簿鍔涘幓瀹炵幇鍚庤呮墍瑙勫畾鐨勬牸寮忋 \section{鍙嶉鎰忚鍜屽缓璁畗 鍏充簬 pkuthss 鏂囨。妯＄増鐨勬剰瑙佸拰寤鸿锛 璇峰湪鍖楀ぇ鏈悕 BBS 鐨 MathTools 鐗堟垨 % - Google Code 涓 pkuthss 椤圭洰鐨 issue tracker% - \footnote{\url{https://code.google.com/p/caspervector/issues/list}.}% + pkuthss 椤圭洰涓婚〉鐨 issue tracker% + \footnote{\url{https://github.com/CasperVector/pkuthss/issues}.}% 涓婃彁鍑猴紝 鎴栭氳繃鐢靛瓙閭欢\footnote% {\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.}% - 鍛婄煡 Casper Ti. Vector銆 + 鍛婄煡妯＄増缁存姢鑰呫 涓婅堪涓夌鍙嶉鏂规硶涓紝寤鸿鐢ㄦ埛灏介噺閲囩敤闈犲墠鐨勬柟娉曘 鍦ㄨ繘琛屽弽棣堟椂锛岃灏介噺纭繚宸茬粡浠旂粏闃呰鏈枃妗ｄ腑鐨勮鏄庛 濡傛灉鏄氳繃 BBS 鎴栫數瀛愰偖浠惰繘琛屽弽棣堬紝 璇峰湪鏍囬涓鏄庢槸鍏充簬 pkuthss 鏂囨。妯＄増鐨勫弽棣堬紱 - 濡傛灉鏄氳繃 Google Code 杩涜鍙嶉锛 - 璇风粰 issue 鍔犱笂 \verb|Proj-Pkuthss| 鏍囩銆 濡傛灉鏄敊璇姤鍛婏紝 璇疯鏄庢墍浣跨敤 pkuthss 妯＄増鐨勭増鏈 鑷繁浣跨敤鐨勬搷浣滅郴缁熷拰 \hologo{TeX} 绯荤粺鐨勭被鍨嬪拰鐗堟湰锛 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex index 8df44c8ce76..49856cf6cb9 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex @@ -3,7 +3,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-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 @@ -29,24 +29,21 @@ % chap/acknowledge.tex \chapter*{鐗堟潈澹版槑} -{ - \zihao{3}\linespread{1.5}\selectfont +\thispagestyle{empty} - 鐗堟潈鎵鏈 \copyright\ 2008--2009 solvethis - \par - 鐗堟潈鎵鏈 \copyright\ 2010--2014 Casper Ti. Vector - \vskip 1em +鐗堟潈鎵鏈 \copyright\ 2008--2009 solvethis +\par +鐗堟潈鎵鏈 \copyright\ 2010--2015 Casper Ti. Vector +\vskip 1em - pkuthss 鏂囨。绫汇乸kuthss-extra 瀹忓寘鍙婂叾璇存槑鏂囨。鍧囦互 % - \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锛夈 - \par -} +pkuthss 鏂囨。绫汇乸kuthss-extra 瀹忓寘鍙婂叾璇存槑鏂囨。鍧囦互 % +\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锛夈 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex index 172e311d561..36406bf08b6 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex @@ -3,7 +3,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2012,2014 Casper Ti. Vector +% 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 @@ -35,17 +35,19 @@ pkuthss 鏂囨。妯＄増鐢卞洓閮ㄥ垎鏋勬垚锛 \begin{itemize} \item \textbf{pkuthss 鏂囨。绫粆锛 - 鍏朵腑杩涜浜嗗浣嶈鏂囨墍闇瑕佺殑涓浜涘熀鏈殑璁惧畾锛 + 鍏朵腑杩涜浜嗗浣嶈鏂囨墍闇瑕佺殑涓浜涙渶鍩烘湰鐨勮瀹氾紝 涓昏鍖呮嫭瀵瑰熀鏈帓鐗堟牸寮忕殑璁惧畾鍜屾彁渚涜缃鏂囦俊鎭殑鍛戒护銆 \item \textbf{pkuthss-extra 瀹忓寘}锛 - 鍏朵腑瀹炵幇浜嗗浣嶈鏂囦腑鐢ㄦ埛鍙兘杈冨鐢ㄥ埌鐨勪竴浜涢澶栧姛鑳斤紝 + 鍏朵腑瀹炵幇浜嗗鏍＄殑瀛︿綅璁烘枃鏍煎紡瑙勮寖\mbox{\supercite{pku-thesisstyle}}% + 涓渶瑕佸熷姪涓浜涢潪鏈甯歌瀹忓寘鏉ュ疄鐜扮殑闇姹傦紱 + 姝ゅ涔熷疄鐜颁簡瀛︿綅璁烘枃涓敤鎴峰彲鑳借緝澶氱敤鍒扮殑涓浜涢澶栧姛鑳斤紝 渚嬪鑷姩鍦ㄧ洰褰曚腑鍔犲叆鍙傝冩枃鐚拰绱㈠紩鐨勬潯鐩拰% 鑷姩鏍规嵁鐢ㄦ埛璁惧畾鐨勬枃妗ｄ俊鎭鎵鐢熸垚 pdf 鐨勪綔鑰呫佹爣棰樼瓑灞炴ц繘琛岃缃瓑銆 \item \textbf{璇存槑鏂囨。}锛 璇存槑鏂囨。鍗虫湰鏂囨。锛 鍦ㄥ畨瑁咃紙瑙佺 \ref{sec:req} 鑺傦級涔嬪悗搴旇鍙互鐢 \hologo{TeX} 绯荤粺鎻愪緵鐨 \verb|texdoc| 鍛戒护璋冨嚭锛 -\begin{Verbatim}[frame=single] +\begin{Verbatim}[frame = single] texdoc pkuthss \end{Verbatim} \item \textbf{鏂囨。妯＄増}锛 @@ -62,7 +64,7 @@ solvethis\supercite{solvethis} 绛夌殑鏁颁綅缃戝弸鍧囧仛杩囧浣嶈鏂囨ā鐗堢殑 pkuthss 鏂囨。妯＄増鐜板湪鐨勭淮鎶よ呮槸 Casper Ti. Vector\footnote% {\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}}銆% -pkuthss 鏂囨。妯＄増鐩墠鎵樼鍦 Google Code 涓婏紝 +pkuthss 鏂囨。妯＄増鐩墠鎵樼鍦 GitHub 涓婏紝 鍏堕」鐩富椤垫槸锛歕\ -\hspace*{\parindent}\url{http://code.google.com/p/caspervector/} +\hspace*{\parindent}\url{https://github.com/CasperVector/pkuthss} diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/originauth.tex index 8bb2791600e..747728d7dde 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/originauth.tex @@ -1,7 +1,7 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-2015 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -31,13 +31,12 @@ % 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑椤典笉闇瑕佽璁㈠埌璁烘枃涓紝鏁呬笉鏄剧ず椤电爜銆 \cleardoublepage\thispagestyle{empty} -\newgeometry{height = 240mm, width = 150mm, ignoreheadfoot, vcentering} { \vspace*{\fill}\linespread{1.5}\selectfont - \centerline{\bfseries\Large 鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} + \centerline{\bfseries\zihao{-2}鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} \vskip 4em - \centerline{\bfseries\Large 鍘熷垱鎬у０鏄巬 + \centerline{\bfseries\zihao{-3}鍘熷垱鎬у０鏄巬 \vskip 1em 鏈汉閮戦噸澹版槑锛 @@ -54,8 +53,8 @@ } \vskip 4em - \centerline{\bfseries\Large 瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑} - \centerline{\zihao{-4}锛堝繀椤昏璁㈠湪鎻愪氦瀛︽牎鍥句功棣嗙殑鍗板埛鏈級} + \centerline{\bfseries\zihao{-3}瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑} + \centerline{\zihao{5}锛堝繀椤昏璁㈠湪鎻愪氦瀛︽牎鍥句功棣嗙殑鍗板埛鏈級} \vskip 1em 鏈汉瀹屽叏浜嗚В鍖椾含澶у鍏充簬鏀堕泦銆佷繚瀛樸佷娇鐢ㄥ浣嶈鏂囩殑瑙勫畾锛屽嵆锛 @@ -69,7 +68,7 @@ $\square$\nobreakspace{}涓ゅ勾 / % $\square$\nobreakspace{}涓夊勾浠ュ悗鍦ㄦ牎鍥綉涓婂叏鏂囧彂甯冦 \end{itemize} - \par锛堜繚瀵嗚鏂囧湪瑙ｅ瘑鍚庨伒瀹堟瑙勫畾锛 + \centerline{锛堜繚瀵嗚鏂囧湪瑙ｅ瘑鍚庨伒瀹堟瑙勫畾锛墋 \vskip 1em \rightline {% @@ -84,5 +83,4 @@ \vspace*{\fill}\par } -\restoregeometry diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib index 822bd9ae32c..067e853011a 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib @@ -12,7 +12,7 @@ @online{biblatex, author = {Lehman, Philipp}, - title = {The biblatex Package: Programmable Bibliographies and Citations (Version 2.8a)}, + title = {The biblatex Package: Programmable Bibliographies and Citations (Ver.\ 2.8a)}, type = {M/OL}, date = {2013-11-25}, url = {http://mirror.ctan.org/macros/latex/exptl/biblatex/}, @@ -22,11 +22,11 @@ @online{biblatex-caspervector, author = {Vector, Casper Ti.}, - title = {biblatex 鍙傝冩枃鐚拰寮曠敤鏍峰紡锛歝aspervector v0.2.0}, + title = {biblatex 鍙傝冩枃鐚拰寮曠敤鏍峰紡锛歝aspervector v0.2.1}, type = {M/OL}, - date = {2014-05-24}, - url = {https://caspervector-dist.googlecode.com/git/biblatex-caspervector/biblatex-caspervector-0.2.0.zip}, - urldate = {2014-05-24}, + date = {2015-04-28}, + url = {https://github.com/CasperVector/biblatex-caspervector/releases/tag/v0.2.1}, + urldate = {2015-04-28}, language = {chinese}, } @@ -80,16 +80,6 @@ language = {english}, } -@online{footmisc, - author = {Fairbairns, Robin}, - title = {footmisc --- a portmanteau package for customising footnotes in \hologo{LaTeX}}, - type = {M/OL}, - date = {2011-07-06}, - url = {http://mirror.ctan.org/macros/latex/contrib/footmisc/}, - urldate = {2012-08-01}, - language = {english}, -} - @online{geometry, author = {Umeki, Hideo}, title = {The geometry package (v5.6)}, @@ -120,6 +110,46 @@ language = {english}, } +@online{scrextend, + author = {Kohm, Markus and Morawski, Jens-Uwe}, + title = {KOMA-Script: a versatile \LaTeX2e{} bundle}, + type = {M/OL}, + date = {2015-02-07}, + url = {http://mirror.ctan.org/macros/latex/contrib/koma-script/}, + urldate = {2015-04-26}, + language = {english}, +} + +@online{subfig, + author = {Cochran, Steven Douglas}, + title = {The Subfig Package (v1.3)}, + type = {M/OL}, + date = {2005-07-05}, + url = {http://mirror.ctan.org/macros/latex/contrib/subfig}, + urldate = {2015-04-26}, + language = {english}, +} + +@online{tikz, + author = {Till Tantau}, + title = {The TikZ and PGF Packages: Manual for version 3.0.0}, + type = {M/OL}, + date = {2013-12-20}, + url = {http://mirror.ctan.org/graphics/pgf/}, + urldate = {2015-04-26}, + language = {english}, +} + +@online{tocloft, + author = {Robertson, Will}, + title = {The tocloft package}, + type = {M/OL}, + date = {2013-12-20}, + url = {http://mirror.ctan.org/macros/latex/contrib/tocloft/}, + urldate = {2013-05-02}, + language = {english}, +} + @online{xCJK2uni, author = {鏉庢竻}, title = {xCJK2uni 瀹忓寘锛坴0.1锛墋, @@ -152,7 +182,7 @@ @online{lwolf, author = {lwolf}, - title = {瀛﹀＋(纭/鍗)姣曚笟璁烘枃妯℃澘 [鍩轰簬 dypang 鐨勬ā鏉縘}, + title = {瀛﹀＋锛堢/鍗氾級姣曚笟璁烘枃妯℃澘 [鍩轰簬 dypang 鐨勬ā鏉縘}, type = {EB/OL}, date = {2007-05-15}, url = {http://bdwm.net/a.php?b/MathTools/M.1179239165.A/5A2D5A2.rar}, @@ -180,37 +210,23 @@ language = {chinese}, } -@online{pku-copyright, - author = {鍖椾含澶у鐮旂┒鐢熼櫌}, - title = {鍖椾含澶у瀛︿綅璁烘枃鐗堟潈澹版槑(棣栭〉)}, - type = {M/OL}, - year = {2014}, - url = {http://grs.pku.edu.cn/document/20140416145103446514.doc}, - urldate = {2014-05-24}, - language = {chinese}, -} - @online{pku-originauth, author = {鍖椾含澶у鐮旂┒鐢熼櫌}, - title = {鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑}, + title = {鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑锛堟湯椤甸檺閲嶆柊鐢宠瀛︿綅浣跨敤锛墋, type = {M/OL}, - year = {2014}, - url = {http://grs.pku.edu.cn/document/20140416145000135438.doc}, - urldate = {2014-05-24}, + date = {2014-04-16}, + url = {http://grs.pku.edu.cn/document/20140416144734027222.doc}, + urldate = {2015-04-26}, language = {chinese}, } -@incollection{pku-thesisstyle, - author = {鍖椾含澶у鐮旂┒鐢熼櫌}, - title = {鍖椾含澶у鐮旂┒鐢熷浣嶈鏂囩殑鍩烘湰瑕佹眰涓庝功鍐欐牸寮忥紙2007 骞 6 鏈堜慨璁級}, - type = {M/OL}, - bookauthor = {鍖椾含澶у鐮旂┒鐢熼櫌}, - booktitle = {鍖椾含澶у鐮旂┒鐢熸墜鍐寎, - publisher = {鍖椾含澶у}, - year = {2013}, - pages = {30-35}, - url = {http://grs.pku.edu.cn/document/20131031200524521428.pdf}, - urldate = {2014-05-24}, +@online{pku-thesisstyle, + author = {鍖椾含澶у瀛︿綅鍔炲叕瀹, + title = {鍖椾含澶у鐮旂┒鐢熷浣嶈鏂囧啓浣滄寚鍗梷, + type = {M/OL}, + date = {2014-05}, + url = {http://grs.pku.edu.cn/document/20140918140526208797.pdf}, + urldate = {2015-04-26}, language = {chinese}, } diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex index 71e8cfdbe30..eb7d71a5281 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex @@ -3,7 +3,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-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 @@ -31,44 +31,56 @@ \documentclass[UTF8, colorlinks]{pkuthss} \usepackage[backend = biber, style = caspervector, utf8, sorting = none]{biblatex} -\usepackage{lmodern} +\usepackage[defaultsups]{newtxtext} +\usepackage{newtxmath} \usepackage{amssymb} \usepackage{fancyvrb} \usepackage{hologo} +\setlength{\hfuzz}{3pt} +\setlength{\bibitemsep}{3bp} +\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont} + \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} -\newcommand{\docversion}{v1.5.5} +\newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}} +\newcommand{\docversion}{v1.6.0} \pkuthssinfo{ cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis}, ctitle = {鍖椾含澶у璁烘枃鏂囨。妯＄増\\pkuthss \docversion}, etitle = {% - The PKU dissertation document class\texorpdfstring{\\}{: }% + PKU dissertation document class\texorpdfstring{\\}{: }% pkuthss \docversion% }, cauthor = {鐩栬尐娉⒙烽挍路缁村厠鎵榼, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {浜屻囦竴鍥涘勾涓冩湀}, + date = {浜屻囦竴浜斿勾鍥涙湀}, school = {鍖栧涓庡垎瀛愬伐绋嬪闄, cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry ... ?}, direction = {鎹 Casper 鑷繁涔熶笉鐭ラ亾}, cmentor = {XX 鏁欐巿}, ementor = {Prof.\ XX}, ckeywords = {\LaTeX2e{}锛屾帓鐗堬紝鏂囨。绫伙紝\CTeX{}}, - ekeywords = {\LaTeX2e{}, typesetting, document class, \CTeX{}} + ekeywords = {\LaTeX2e{}, Typesetting, Document class, \CTeX{}} } \addbibresource{pkuthss.bib} \begin{document} \frontmatter + \pagestyle{empty} \maketitle \include{chap/copyright} + + \cleardoublepage + \pagestyle{plain} + \setcounter{page}{0} + \pagenumbering{Roman} + \include{chap/abstract} \tableofcontents \mainmatter - \include{chap/introduction} \include{chap/chap1} \include{chap/chap2} @@ -76,13 +88,15 @@ \include{chap/conclusion} \appendix - \printbibliography[heading = bibintoc, sorting = ecnty] \include{chap/encl1} \backmatter - \include{chap/acknowledge} + + \cleardoublepage + \pagestyle{empty} + \include{chap/originauth} \end{document} diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf Binary files differindex 0b4c01ef812..e9a48fd4b99 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf Binary files differindex 12281c7f4bb..44dda8154c8 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf +++ b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty index 203978fdfb7..570f8c48bb0 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty @@ -3,7 +3,7 @@ % Peking University dissertation document class % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2013 Casper Ti. Vector +% Copyright (c) 2010-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 @@ -26,7 +26,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{pkuthss-extra} - [2014/07/07 v1.5.5 Common extra settings for the pkuthss document class] + [2015/04/28 v1.6.0 Common extra settings for the pkuthss document class] % Check the dependency of pkuthss. \@ifclassloaded{pkuthss}{}{ @@ -45,54 +45,82 @@ \DeclareOption{#1}{\@nameuse{pkuthssextra@opt@#1true}} \DeclareOption{no#1}{\@nameuse{pkuthssextra@opt@#1false}} } +% Whethet to modify footnote format. +\pkuthssextra@int@boolopt{footfmt}{true} +% Whethet to modify spacing according to school regulation. +\pkuthssextra@int@boolopt{pkuspace}{true} % Whethet to use some common settings for adjusting spacing. \pkuthssextra@int@boolopt{spacing}{true} -% Whether to use list environments that are tighter than LaTeX defaults. -\pkuthssextra@int@boolopt{tightlist}{true} -% Whether to let captions use a different font from the main text. -\pkuthssextra@int@boolopt{caption}{true} % Add PDF bookmark for table of contents. \pkuthssextra@int@boolopt{pdftoc}{true} % Whether to enable the `\spacialchap' command. \pkuthssextra@int@boolopt{spechap}{true} -% Whether to automatically set properties for generated PDF from user defined -% document information (author, title, etc.). +% Whether to automatically set up properties for generated PDF from user +% defined document information (author, title, etc.). \pkuthssextra@int@boolopt{pdfprop}{true} % Whether to use coloured hyperlinks in generated PDF. \pkuthssextra@int@boolopt{colorlinks}{true} % Process all class options now. \ProcessOptions\relax +\ifpkuthssextra@opt@footfmt + % Handle the `Unparsed material' issue with latex/dvipdfmx compilation. + \unless\ifxetex\unless\ifpdf + \newcommand*\pgfsysdriver{pgfsys-dvipdfm.def} + \fi\fi + % Circled text, cf. <https://tex.stackexchange.com/questions/7032/>. + \RequirePackage{tikz} + \newcommand*\pkuthssextra@int@circled[1]{% + \scalebox{0.8}{\tikz[baseline = (char.base)]{ + \node[ + shape = circle, draw = black, minimum size = 1.25em, inner sep = 0pt + ] (char) {#1}; + }}% + } + % Use circled numbers as footnote symbols. Does not affect title page, but + % footnote is rarely used in dissertation covers ;) + \renewcommand\thefootnote% + {\protect\pkuthssextra@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}} +\fi + +\ifpkuthssextra@opt@pkuspace + % lineskip / baselineskip = 20 bp / (12 bp * (6 / 5)). + \linespread{1.39}\selectfont + % Quite harmless and frequently used package. Loaded together with `tocloft' + % plus a compatibility option to avoid package clash. + \RequirePackage{subfig} + % Provides utilities for setting TOC format; `titles' applied to avoid + % interfering with LaTeX's own title mechanism. + \RequirePackage[subfigure, titles]{tocloft} + \setlength{\cftbeforechapskip}{6bp plus 1bp} + \setlength{\cftsecindent}{\ccwd} + \setlength{\cftsubsecindent}{2\ccwd} + % Modify font size and separator of captions. + \RequirePackage{caption} + \DeclareCaptionFont{cfive}{\zihao{5}} + \DeclareCaptionLabelSeparator{quad}{\quad} + \captionsetup{font = cfive, labelsep = quad} +\fi + \ifpkuthssextra@opt@spacing - % Automatically ignore spaces between CJK characters and preserve spaces in other - % situations. XeCJK itself will handle this issue, therefore we do not use + % Automatically ignore spaces between CJK characters, or otherwise preserve + % spaces. XeCJK itself will handle this issue, therefore we do not use % `CJKspace' when using XeLaTeX. \unless\ifxetex\RequirePackage{CJKspace}\fi % Make spacing nicer in some situations (eg. footnotes and verbatims). \RequirePackage{setspace} - % Make the text area centered in the page. - \geometry{centering} - % Set line skip. - \linespread{1.41}\selectfont - % Automatically insert a space between the label and the text in footnotes. - \RequirePackage{footmisc} - \renewcommand*{\footnotelayout}{\ } -\fi - -\ifpkuthssextra@opt@tightlist - % 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. - % Biblatex uses `\itemsep' as default `\bibitemsep', no need to change it. + % 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. \RequirePackage{enumitem} \setlist{nolistsep} \fi -\ifpkuthssextra@opt@caption - % According to common aesthetics of typography, it is nice to make the font of - % captions lighter than main text, and tables lighter than captions. - \RequirePackage[font = it]{caption} -\fi - \ifpkuthssextra@opt@pdftoc % Add PDF bookmark for table of contents. \let\pkuthssextra@tmp@tableofcontents\tableofcontents @@ -108,7 +136,7 @@ \ifpkuthssextra@opt@spechap % This command is used to start a chapter without numbering, and correctly set - % the headers and footers in the chapter. + % up the headers and footers in the chapter. \newcommand\specialchap[1]{ \chapter*{#1}\addcontentsline{toc}{chapter}{#1} \markboth{#1}{}\phantomsection @@ -116,6 +144,18 @@ \fi \AtBeginDocument{ + \ifpkuthssextra@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@xt@\@tempdima{\@cftbsnum #1\@cftasnum\hfil}\@cftasnumb% + }% + \fi + \ifpkuthssextra@opt@pdfprop % Automatically generate properties for generated PDF. % Use English properties to avoid problems with character encodings. @@ -125,7 +165,7 @@ pdfsubject = {\euniversity\ \ethesisname}, pdfkeywords = {\@ekeywords} } } - % Set the properties when generating the title page because the document + % Set up the properties when generating the title page because the document % information should have been all defined before this. \let\pkuthssextra@tmp@maketitle\maketitle % NOTE: `\hypersetup' must appear before `\maketitle', otherwise it might not @@ -137,8 +177,8 @@ % Use coloured hyperlinks in generated PDF. \hypersetup{colorlinks = true, allcolors = blue} \else - % Set hyperlink colour to black in order to prevent hyperlinks from being too - % hard-to-recognise in printed thesis. + % Set hyperlink colour to black in order to prevent hyperlinks from being + % too hard-to-recognise in printed thesis. \hypersetup{hidelinks} \fi } diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def index 6113840e3a3..20e95a6644f 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def @@ -3,7 +3,7 @@ % Peking University dissertation document class % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2013 Casper Ti. Vector +% Copyright (c) 2010-2013,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 @@ -25,7 +25,7 @@ % pkuword.eps \ProvidesFile{pkuthss-gbk.def} - [2014/07/07 v1.5.5 Labels and captions in GBK encoding + [2015/04/28 v1.6.0 Labels and captions in GBK encoding for the pkuthss document class] \def\label@ctitle{题目：} @@ -37,7 +37,7 @@ \def\label@cmentor{导\hphantom{汉字}师：} \def\label@ementor{Directed by\ } \def\label@ckeywords{关键词：} -\def\label@ekeywords{Keywords:\ } +\def\label@ekeywords{KEYWORDS:\ } \def\titlepagename{封面} \def\cuniversity{北京大学} @@ -45,6 +45,6 @@ \def\cthesisname{博士研究生学位论文} \def\ethesisname{Doctor Thesis} \def\cabstractname{摘要} -\def\eabstractname{Abstract} +\def\eabstractname{ABSTRACT} \endinput diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def index 75cc3d0750e..f2b8c671b1e 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def @@ -3,7 +3,7 @@ % Peking University dissertation document class % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2013 Casper Ti. Vector +% Copyright (c) 2010-2013,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 @@ -25,7 +25,7 @@ % pkuword.eps \ProvidesFile{pkuthss-utf8.def} - [2014/07/07 v1.5.5 Labels and captions in UTF-8 encoding + [2015/04/28 v1.6.0 Labels and captions in UTF-8 encoding for the pkuthss document class] \def\label@ctitle{棰樼洰锛殅 @@ -37,7 +37,7 @@ \def\label@cmentor{瀵糪hphantom{姹夊瓧}甯堬細} \def\label@ementor{Directed by\ } \def\label@ckeywords{鍏抽敭璇嶏細} -\def\label@ekeywords{Keywords:\ } +\def\label@ekeywords{KEYWORDS:\ } \def\titlepagename{灏侀潰} \def\cuniversity{鍖椾含澶у} @@ -45,6 +45,6 @@ \def\cthesisname{鍗氬＋鐮旂┒鐢熷浣嶈鏂噠 \def\ethesisname{Doctor Thesis} \def\cabstractname{鎽樿} -\def\eabstractname{Abstract} +\def\eabstractname{ABSTRACT} \endinput diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls index 05b67561f93..cf9edac2f87 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls @@ -3,7 +3,7 @@ % Peking University dissertation document class % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2014 Casper Ti. Vector +% Copyright (c) 2010-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 @@ -26,7 +26,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2014/07/07 v1.5.5 Peking University dissertation document class] + [2015/04/28 v1.6.0 Peking University dissertation document class] % Process the encoding options. \newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue @@ -50,8 +50,9 @@ } % Pass options to `pkuthss-extra'. % See pkuthss-extra.sty for an explanation of the options. +\pkuthss@int@extraopt{footfmt} +\pkuthss@int@extraopt{pkuspace} \pkuthss@int@extraopt{spacing} -\pkuthss@int@extraopt{tightlist} \pkuthss@int@extraopt{pdftoc} \pkuthss@int@extraopt{spechap} \pkuthss@int@extraopt{pdfprop} @@ -61,15 +62,15 @@ % Process all class options now. \ProcessOptions\relax -% pkuthss is based on ctexbook; We use `xiao 4' as default font size. -% CJKfntef provides \CJKunderline used in \maketitle. -% fancyhdr provides utilities for setting headers and footers. +% pkuthss is based on ctexbook; we use `xiao 4' as default font size. +% CJKfntef provides `\CJKunderline' used in `\maketitle'. +% fancyhdr provides utilities for setting up headers and footers. \LoadClass[hyperref, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11] -% Provide support for `key = val' grammar. +% Provides support for `key = val' grammar. \RequirePackage{keyval} % Graphics support. \RequirePackage{graphicx}[1999/02/16] -% Provide utilities for setting page layout. +% Provides utilities for setting up page layout. \RequirePackage{geometry} % Whether to enable the default extra settings. \ifpkuthss@opt@extra\RequirePackage{pkuthss-extra}\fi @@ -92,43 +93,62 @@ \fi \AtEndOfClass{ - % Setting chinese captions and labels. + % Set up chinese captions and labels. \ifpkuthss@opt@gbk\input{pkuthss-gbk.def} \else\input{pkuthss-utf8.def} \fi } -% Set page layout. +% Set up page layout. \geometry{ - a4paper, height = 240mm, width = 150mm, includeheadfoot, headheight = 1.2em + a4paper, includefoot, hmargin = 2.6cm, top = 3cm, bottom = 2.5cm, + headheight = 1.5cm, headsep = 0.5cm, footskip = 0.75cm } -% Internal command to set headers and footers. + +% 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. +\CTEXsetup[ + nameformat = {\zihao{-2}\bfseries}, + titleformat = {\zihao{-2}\bfseries}, + beforeskip = {20bp}, afterskip = {18bp} +]{chapter} +\CTEXsetup[ + format = {\zihao{-3}\bfseries}, + beforeskip = {-20bp plus -1ex minus -0.2ex}, + afterskip = {6bp plus 0.2ex} +]{section} +\CTEXsetup[ + format = {\zihao{4}\bfseries}, + beforeskip = {-12bp plus -1ex minus -0.2ex}, + afterskip = {6bp plus 0.2ex} +]{subsection} +\CTEXsetup[ + format = {\bfseries}, + beforeskip = {-12bp plus -1ex minus -0.2ex}, + afterskip = {6bp plus 0.2ex} +]{subsubsection} + +% Internal command to set up headers and footers. \def\pkuthss@int@setpagestyle{ - % Set the headers and footers on the first page in every chapter. + % The actual setup commands. \fancypagestyle{plain}{ - \fancyhf{}\renewcommand*{\headrulewidth}{0pt} - \if@twoside - \fancyfoot[RO,LE]{\small\normalfont --~\thepage~--} - \else - \fancyfoot[C]{\small\normalfont --~\thepage~--} - \fi - } - % Set the headers and footers on other pages. - \fancypagestyle{pkuthss}{ - \fancyhf{} + \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp} + \fancyfoot[C]{\zihao{5}\normalfont{\thepage}} \if@twoside - \fancyhead[LE]{\small\normalfont\pkuthss@int@setcase{\leftmark}} - \fancyhead[RO]{\small\normalfont\pkuthss@int@setcase{\rightmark}} - \fancyhead[LO,RE]{\small\normalfont\cuniversity\cthesisname} - \fancyfoot[RO,LE]{\small\normalfont --~\thepage~--} + \fancyhead[CE]{\zihao{5}\normalfont{\cuniversity\cthesisname}} + \fancyhead[CO]{\zihao{5}\normalfont\pkuthss@int@setcase{\leftmark}} \else - \fancyhead[L]{\small\normalfont\pkuthss@int@setcase{\leftmark}} - \fancyhead[R]{\small\normalfont\pkuthss@int@setcase{\rightmark}} - \fancyfoot[C]{\small\normalfont --~\thepage~--} + \fancyhead[C]{\zihao{5}\normalfont\pkuthss@int@setcase{\leftmark}} \fi } - \pagestyle{pkuthss} + \pagestyle{plain} } + % `\MakeUppercase' works problematically. % eg. it converts `\cite{ctex}' into `\cite{CTEX}'. % This option can disable `\MakeUppercase' in left/right heading marks. @@ -159,7 +179,7 @@ \def\pkuthss@int@infoitemb#1{ \define@key{pkuthss@info}{#1}{\@namedef{#1}{##1}} } -% Setting document information entries. +% Set up document information entries. \pkuthss@int@infoitema{ctitle} \pkuthss@int@infoitema{etitle} \pkuthss@int@infoitema{cauthor} @@ -180,7 +200,7 @@ \pkuthss@int@infoitemb{ethesisname} \pkuthss@int@infoitemb{cabstractname} \pkuthss@int@infoitemb{eabstractname} -% Set document information using the `key = value' grammar. +% Set up document information using the `key = value' grammar. \newcommand*{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}} % Usage: \pkuthss@int@fillinblank{(number of lines)}{(line width)}{(contents)} @@ -208,7 +228,7 @@ % Add PDF bookmark for the title page. \pdfbookmark[1]{\titlepagename}{titlepage} \begin{titlepage} - % It will be more nice to use this line skip level in the title page. + % 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} @@ -229,55 +249,52 @@ % Information about the author. { % Slightly adjust the line skip when using new font size. - \zihao{-2}\linespread{1.75}\selectfont + \zihao{3}\linespread{1.75}\selectfont \def\pkuthss@tmp@len{0.56\textwidth} \begin{tabular}{l@{\extracolsep{0.2em}}c} - {\label@cauthor} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@cauthor} \\ - {\label@studentid} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@studentid} \\ - {\label@school} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@school} \\ - {\label@cmajor} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@cmajor} \\ - {\label@direction} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@direction} \\ - {\label@cmentor} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@cmentor} \\ + {\heiti\label@cauthor} & + \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cauthor} \\ + {\heiti\label@studentid} & + \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@studentid} \\ + {\heiti\label@school} & + \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@school} \\ + {\heiti\label@cmajor} & + \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmajor} \\ + {\heiti\label@direction} & + \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@direction} \\ + {\heiti\label@cmentor} & + \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmentor} \\ \end{tabular} } \vfill % Date. - {\kaishu\zihao{2}\@date} + {\zihao{-2}\@date} \end{center} \end{titlepage} } -% Typesetting the Chinese abstract. +% Typeset the Chinese abstract. \newenvironment{cabstract}{ \cleardoublepage \pdfbookmark[1]{\cabstractname}{cabstract} - \chapter*{\zihao{-2}\cabstractname} + \chapter*{\cabstractname} \markboth{\cabstractname}{} }{% Keywords at the bottom of the page. \vfill\noindent\textbf{\label@ckeywords}{\@ckeywords} } -% Typesetting the English abstract. +% Typeset the English abstract. \newenvironment{eabstract}{ \cleardoublepage \pdfbookmark[1]{\eabstractname}{eabstract} - \chapter*{\zihao{-2}\@etitle} + \chapter*{\sffamily\@etitle} \markboth{\eabstractname}{} - \vspace{-2em}\par \begin{center} - \zihao{-3} {\@eauthor} ({\@emajor})\\ - {\label@ementor}{\@ementor} + {\label@ementor}{\@ementor}\\[2em] + \textbf{\sffamily\eabstractname} \end{center} - \vspace{1em}\par - \section*{\zihao{4}\eabstractname} - \vskip 0.5em + \par }{% Keywords at the bottom of the page. \vfill\noindent\textbf{\label@ekeywords}{\@ekeywords} } diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf Binary files differindex a7ce97296f5..c6d5dfae2f6 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf |