diff options
| author | Karl Berry <karl@freefriends.org> | 2018-07-02 20:40:31 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-07-02 20:40:31 +0000 |
| commit | ac544cb2d59279cb23cd8c4a1ebfedef22ff81f6 (patch) | |
| tree | 1cc90013c4a0365a52fcf872c407faaedca4d65f | |
| parent | 6bcb7fafe11bbc913072dca4f243b91c57f087b9 (diff) | |
pkuthss (2jul18)
git-svn-id: svn://tug.org/texlive/trunk@48124 c570f23f-e606-0410-a88d-b1316a301751
39 files changed, 810 insertions, 462 deletions
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf Binary files differindex ce9feee2439..2dd693f222b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/example.pdf diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat index 2794c7c502a..e57cca77a41 100755 --- a/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat @@ -4,23 +4,23 @@ @rem Copyright (c) 2010-2012 Casper Ti. Vector
@rem Public domain.
-set JOBNAME=thesis
-@rem 这个变量的值可以为 latex 或 pdflatex。
+set JOB=thesis
+@rem 这个变量的值可以为 latex、pdflatex 或 xelatex。
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
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
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/Makefile b/Master/texmf-dist/doc/latex/pkuthss/example/Makefile index d0425ee541b..7437115a332 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/Makefile +++ b/Master/texmf-dist/doc/latex/pkuthss/example/Makefile @@ -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銆乸dflatex 鎴 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 @@ else 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 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex index b93065422d3..305792f8360 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/abstract.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex @@ -2,7 +2,7 @@ % Public domain. \begin{cabstract} - \pkuthssffaq % 涓枃娴嬭瘯鏂囧瓧 + \pkuthssffaq % 涓枃娴嬭瘯鏂囧瓧銆 \end{cabstract} \begin{eabstract} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/ack.tex index 4af4d39cd82..4af4d39cd82 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/acknowledge.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/ack.tex 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 85f70084a8d..3d631f38fd2 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap1.tex @@ -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 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap2.tex index 93941bc4e72..85f70084a8d 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/conclusion.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap2.tex @@ -1,7 +1,7 @@ % Copyright (c) 2014,2016 Casper Ti. Vector % Public domain. -\specialchap{缁撹} +\chapter{绔犺妭} \pkuthssffaq % 涓枃娴嬭瘯鏂囧瓧銆 % vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap3.tex new file mode 100644 index 00000000000..ed66f12d781 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/chap3.tex @@ -0,0 +1,7 @@ +% Copyright (c) 2014,2016,2018 Casper Ti. Vector +% Public domain. + +\chapter{缁撹鍜屽睍鏈泒 +\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/copy.tex index 6e0f2781c5e..8204715289e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/copy.tex @@ -29,7 +29,7 @@ % 姝ゅ涓嶇敤 \specialchap锛屽洜涓哄鏍¤姹傜洰褰曚笉鍖呮嫭鍏惰嚜宸卞強鍏朵箣鍓嶇殑鍐呭銆 \chapter*{鐗堟潈澹版槑} -% 缁煎悎瀛︽牎鐨勪功闈㈣姹傚強 Word 妯＄増鏉ョ湅锛岀増鏉冨０鏄庨〉涓嶉渶鍔犻〉鐪夈侀〉鑴氥 +% 缁煎悎瀛︽牎鐨勪功闈㈣姹傚強 Word 妯＄増鏉ョ湅锛岀増鏉冨０鏄庨〉涓嶇敤鍔犻〉鐪夈侀〉鑴氥 \thispagestyle{empty} 浠讳綍鏀跺瓨鍜屼繚绠℃湰璁烘枃鍚勭鐗堟湰鐨勫崟浣嶅拰涓汉锛 @@ -37,7 +37,7 @@ 浜︿笉寰楅殢鎰忓鍒躲佹妱褰曘佹媿鐓ф垨浠ヤ换浣曟柟寮忎紶鎾 鍚﹀垯涓鏃﹀紩璧锋湁纰嶄綔鑰呰憲浣滄潈涔嬮棶棰橈紝灏嗗彲鑳芥壙鎷呮硶寰嬭矗浠汇 -% 鑻ラ渶鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 +% 鑻ラ』鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 % 杞负鍚堥傜殑鍥剧墖鏍煎紡锛屽苟鏀惧湪褰撳墠鐩綍涓嬶紝鐒跺悗鍘绘帀涓嬮潰 2 琛岀殑娉ㄩ噴銆 %\vfill\noindent %\includegraphics[height = 5em]{barcode} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex deleted file mode 100644 index c0e033ed85b..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/introduction.tex +++ /dev/null @@ -1,7 +0,0 @@ -% Copyright (c) 2014,2016 Casper Ti. Vector -% Public domain. - -\specialchap{搴忚█} -\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/origin.tex index db9f7354982..49d25b54251 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex @@ -61,7 +61,7 @@ \item 瀛︽牎鏈夋潈淇濆瓨瀛︿綅璁烘枃鐨勫嵃鍒锋湰鍜岀數瀛愮増锛 骞舵彁渚涚洰褰曟绱笌闃呰鏈嶅姟锛屽湪鏍″洯缃戜笂鎻愪緵鏈嶅姟锛 \item 瀛︽牎鍙互閲囩敤褰卞嵃銆佺缉鍗般佹暟瀛楀寲鎴栧叾瀹冨鍒舵墜娈典繚瀛樿鏂囷紱 - \item 鍥犳煇绉嶇壒娈婂師鍥犻渶瑕佸欢杩熷彂甯冨浣嶈鏂囩數瀛愮増锛 + \item 鍥犳煇绉嶇壒娈婂師鍥犻』瑕佸欢杩熷彂甯冨浣嶈鏂囩數瀛愮増锛 鎺堟潈瀛︽牎鍦 $\Box$\nobreakspace{}涓骞 / $\Box$\nobreakspace{}涓ゅ勾 / $\Box$\nobreakspace{}涓夊勾浠ュ悗鍦ㄦ牎鍥綉涓婂叏鏂囧彂甯冦 @@ -73,7 +73,7 @@ 鏃ユ湡锛歕hspace{2em}骞碶hspace{2em}鏈圽hspace{2em}鏃% } - % 鑻ラ渶鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 + % 鑻ラ』鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 % 杞负鍚堥傜殑鍥剧墖鏍煎紡锛屽苟鏀惧湪褰撳墠鐩綍涓嬶紝鐒跺悗鍘绘帀涓嬮潰 2 琛岀殑娉ㄩ噴銆 %\vfill\noindent %\includegraphics[height = 5em]{barcode} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def b/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def index 2febb6122d5..2febb6122d5 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def +++ b/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctexopts.cfg b/Master/texmf-dist/doc/latex/pkuthss/example/ctexopts.cfg index 0dc8094ed5e..0dc8094ed5e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctexopts.cfg +++ b/Master/texmf-dist/doc/latex/pkuthss/example/ctexopts.cfg 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 deleted file mode 100644 index 6c0c8173910..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/example/misc/ctex-xecjk-winfonts.def +++ /dev/null @@ -1,20 +0,0 @@ -\setCJKmainfont[BoldFont={SimHei},ItalicFont={[simkai.ttf]}]{SimSun} -\setCJKsansfont{SimHei} -\setCJKmonofont{[simfang.ttf]} - -\setCJKfamilyfont{zhsong}{SimSun} -\setCJKfamilyfont{zhhei}{SimHei} -\setCJKfamilyfont{zhkai}{[simkai.ttf]} -\setCJKfamilyfont{zhfs}{[simfang.ttf]} -%\setCJKfamilyfont{zhli}{LiSu} -%\setCJKfamilyfont{zhyou}{YouYuan} - -\newcommand*{\songti}{\CJKfamily{zhsong}} -\newcommand*{\heiti}{\CJKfamily{zhhei}} -\newcommand*{\kaishu}{\CJKfamily{zhkai}} -\newcommand*{\fangsong}{\CJKfamily{zhfs}} -%\newcommand*{\lishu}{\CJKfamily{zhli}} -%\newcommand*{\youyuan}{\CJKfamily{zhyou}} - -\endinput -% vim:ft=tex diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex b/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex new file mode 100644 index 00000000000..27b28feac3c --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex @@ -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 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex index a06092ccc5d..30e05dec555 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex @@ -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 鐨勬枃妗ｏ級銆 -% 杩欓噷鎸夌収鑻辨枃鏂囩尞鍦ㄥ墠锛屼腑鏂囨枃鐚湪鍚庢帓搴忥紙鈥渟orting = ecnty鈥濓級锛 -% 鑻ラ渶鎸夌収涓枃鏂囩尞鍦ㄥ墠锛岃嫳鏂囨枃鐚湪鍚庢帓搴忥紝璇疯缃渟orting = centy鈥濓紱 -% 鑻ラ渶鎸夌収寮曠敤椤哄簭鎺掑簭锛岃璁剧疆鈥渟orting = none鈥濄 -% 鑻ラ渶鍦ㄦ帓搴忎腑瀹炵幇鏇村鏉傜殑闇姹傦紝璇峰弬鑰 biblatex-caspervector 鐨勬枃妗ｃ -\usepackage[backend = biber, style = caspervector, utf8, sorting = ecnty]{biblatex} +% 杩欓噷鎸夌収瑗挎枃鏂囩尞鍦ㄥ墠锛屼腑鏂囨枃鐚湪鍚庢帓搴忥紙鈥渟orting = ecnyt鈥濓級锛 +% 鑻ラ』鎸夌収涓枃鏂囩尞鍦ㄥ墠锛岃タ鏂囨枃鐚湪鍚庢帓搴忥紝璇疯缃渟orting = cenyt鈥濓紱 +% 鑻ラ』鎸夌収寮曠敤椤哄簭鎺掑簭锛岃璁剧疆鈥渟orting = 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 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf Binary files differindex 3ca347843b9..54815bdc7ee 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt index e29c893068a..f1f002704c1 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt @@ -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@...' -> `thss@...' + + * 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. diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile b/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile index ba05e4fc80e..8835cd28e63 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile @@ -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 @@ else 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 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex index db9f7354982..49d25b54251 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex @@ -61,7 +61,7 @@ \item 瀛︽牎鏈夋潈淇濆瓨瀛︿綅璁烘枃鐨勫嵃鍒锋湰鍜岀數瀛愮増锛 骞舵彁渚涚洰褰曟绱笌闃呰鏈嶅姟锛屽湪鏍″洯缃戜笂鎻愪緵鏈嶅姟锛 \item 瀛︽牎鍙互閲囩敤褰卞嵃銆佺缉鍗般佹暟瀛楀寲鎴栧叾瀹冨鍒舵墜娈典繚瀛樿鏂囷紱 - \item 鍥犳煇绉嶇壒娈婂師鍥犻渶瑕佸欢杩熷彂甯冨浣嶈鏂囩數瀛愮増锛 + \item 鍥犳煇绉嶇壒娈婂師鍥犻』瑕佸欢杩熷彂甯冨浣嶈鏂囩數瀛愮増锛 鎺堟潈瀛︽牎鍦 $\Box$\nobreakspace{}涓骞 / $\Box$\nobreakspace{}涓ゅ勾 / $\Box$\nobreakspace{}涓夊勾浠ュ悗鍦ㄦ牎鍥綉涓婂叏鏂囧彂甯冦 @@ -73,7 +73,7 @@ 鏃ユ湡锛歕hspace{2em}骞碶hspace{2em}鏈圽hspace{2em}鏃% } - % 鑻ラ渶鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 + % 鑻ラ』鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 % 杞负鍚堥傜殑鍥剧墖鏍煎紡锛屽苟鏀惧湪褰撳墠鐩綍涓嬶紝鐒跺悗鍘绘帀涓嬮潰 2 琛岀殑娉ㄩ噴銆 %\vfill\noindent %\includegraphics[height = 5em]{barcode} diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex index 352915cc4b3..5dc80d52856 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abstract.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex @@ -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 \begin{cabstract} 鏈枃浠嬬粛浜 pkuthss 鏂囨。妯＄増鎵鎻愪緵鐨勫姛鑳姐 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex index 89c423504a9..0fd606b7b0f 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-acknowledge.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex @@ -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{鑷磋阿} diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex index d22d2503315..3eaa29114be 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex @@ -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,26 +37,26 @@ \item 涓枃瀛椾綋銆 \item 濡傛灉瑕佷娇鐢 biblatex 杩涜鏂囩尞鍒楄〃鍜屽紩鐢ㄧ殑鎺掔増鐨勮瘽锛 杩橀渶瑕 biblatex\supercite{biblatex} 瀹忓寘锛 - \item 濡傛灉闇瑕佸涓枃鏂囩尞杩涜鎸夋眽璇嫾闊崇殑鎺掑簭鐨勮瘽锛 + \item 濡傛灉瑕佸涓枃鏂囩尞杩涜鎸夋眽璇嫾闊崇殑鎺掑簭鐨勮瘽锛 杩橀渶瑕 biber\supercite{biber} 绋嬪簭銆 \item 濡傛灉浣跨敤榛樿鐨勬枃鐚垪琛ㄥ拰寮曠敤鏍峰紡鐨勮瘽锛岃繕闇瑕佷綔鑰呯紪鍐欑殑 biblatex 鏍峰紡 锛坆iblatex-caspervector\supercite{biblatex-caspervector}锛夛紝 姝ゆ牱寮忚姹備娇鐢 biber 绋嬪簭銆 - \item 濡傛灉闇瑕佷娇鐢 Makefile 鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯紝杩橀渶瑕 Make 宸ュ叿锛 + \item 濡傛灉椤昏浣跨敤 Makefile 鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯紝杩橀渶瑕 Make 宸ュ叿锛 浣嗗鏋滀娇鐢ㄧ敱鎵瑰鐞嗗疄鐜扮殑浼淢akefile鈥濆氨涓嶇敤浜嗐 \end{itemize} \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{% 涓轰簡鑾峰緱鏈濂界殑鏀寔锛 鎴戜滑寤鸿鐢ㄦ埛浣跨敤鏈鏂般佸畬鍏ㄧ増鐨 \hologo{TeX} 绯荤粺鍜屽悇瀹忓寘銆% } -涓枃瀛椾綋闇瑕佺敤鎴疯嚜琛岃幏寰椼俓myemph{% +涓枃瀛椾綋椤昏鐢ㄦ埛鑷鑾峰緱銆俓myemph{% 娉細涓浜涗腑鏂囧瓧浣撶殑瀛楀簱涓嶅叏锛屽彧鏈 GB2312 瀛楃闆嗗唴瀛楃鐨勫瓧浣撲俊鎭 杩欑鎯呭喌閫氬父浼氶犳垚缂栬瘧鐢熸垚鐨 pdf 鏂囦欢涓己灏戦儴鍒嗗瓧绗︼紝 鍏朵腑涓绉嶅吀鍨嬬棁鐘舵槸鈥溿団濆瓧鏄剧ず涓嶅嚭鏉ャ @@ -154,7 +154,7 @@ pkuthss 鏂囨。妯＄増鏀寔涓夌缂栬瘧鏂瑰紡锛屽嵆 } pkuthss 鏂囨。妯＄増闄勫甫鐨 Makefile 涓凡缁忓杩欎笁绉嶇紪璇戞柟寮忚繘琛屼簡瀹屾暣鐨勯厤缃 -鐢ㄦ埛鍙渶瑕佸湪 Makefile 涓氳繃璁惧畾鍙橀噺 \verb|JOBNAME| 鐨勫兼寚瀹氳缂栬瘧鐨勪富鏂囦欢鍚嶏紝 +鐢ㄦ埛鍙』瑕佸湪 Makefile 涓氳繃璁惧畾鍙橀噺 \verb|JOB| 鐨勫兼寚瀹氳缂栬瘧鐨勪富鏂囦欢鍚嶏紝 骞堕氳繃璁惧畾鍙橀噺 \verb|LATEX| 鐨勫兼寚瀹氶噰鐢ㄥ摢绉嶇紪璇戞柟寮忥紝 鍗冲彲閫氳繃鍦ㄤ富鏂囦欢鎵鍦ㄧ洰褰曡皟鐢 Make 宸ュ叿鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯細 濡傛灉鏄湪绫 UNIX 鐜涓嬶紝鍒欑敤鎴峰簲璇ヨ皟鐢ㄧ殑鍛戒护鍚嶄负 \verb|make|锛 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex index 71d44beb6e3..1ab1b3e9cd3 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex @@ -1,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 鏂囧瓧涔嬮棿鐨勭┖鐧借 - 淇濈暀锛圕JK 鏂囧瓧涓庤嫳鏂囦箣闂寸瓑鐨勶級鍏跺畠绌虹櫧銆 + 淇濈暀锛圕JK 鏂囧瓧涓庤タ鏂囦箣闂寸瓑鐨勶級鍏跺畠绌虹櫧銆 \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} 渚嬪锛屽鏋滆璁惧畾涓撲笟涓衡滃寲瀛︹濓紙鈥淐hemistry鈥濓級锛屽垯鍙互浣跨敤浠ヤ笅鍛戒护锛 @@ -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 @@ pkuthss 鏂囨。妯＄増浣跨敤浣滆呯紪鍐欑殑 biblatex\supercite{biblatex} 鏍峰紡% 灏辩洰鍓嶈岃█锛屽湪\myemph{闄 3.0--3.3 涔嬪鐗堟湰鐨剗 biblatex 涓紝 閫氳繃鏇村鏉傜殑璁剧疆锛岃繕鍙互婊¤冻渚嬪琚紩鐢ㄧ殑鏂囩尞鎸夌収寮曠敤椤哄簭鎺掑簭锛 -鑰屾湭寮曠敤鐨勬枃鐚寜鐓ц嫳鏂囨枃鐚湪鍓嶃佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇姹傦紝 +鑰屾湭寮曠敤鐨勬枃鐚寜鐓цタ鏂囨枃鐚湪鍓嶃佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇姹傦紝 璇﹁ biblatex-caspervector 鐨勬枃妗supercite{biblatex-caspervector}銆 -pkuthss 鏂囨。绫诲彲鑳借皟鐢ㄤ互涓嬭繖浜涘畯鍖咃細 +闄ゆ涔嬪锛宲kuthss 鏂囨。绫昏繕鍙兘璋冪敤浠ヤ笅杩欎簺瀹忓寘锛 \begin{itemize} \item 鍚敤 \verb|pkufont| 閫夐」鏃朵細璋冪敤 newtxtext 鍜 newtxmath\supercite{newtx} 瀹忓寘锛 @@ -313,7 +313,7 @@ pkuthss 鏂囨。妯＄増鐨勫疄鐜版槸绠娲併佹竻鏅般佺伒娲荤殑銆 鍋囪 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 @@ C:\texlive\2015\texmf-dist \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 @@ $TEXMFDIST/doc/latex/pkuthss/ 鑳借繖鏍峰仛鐨勫師鍥犳槸鐩墠甯哥敤鐨 \hologo{TeX} 绯荤粺鍦ㄨ鍙栫紪璇戠敤鍒扮殑鏂囦欢鏃讹紝 浼氫紭鍏堣冭檻宸ヤ綔鐩綍锛堝嵆涓绘枃浠舵墍鍦ㄧ洰褰曪級涓殑鏂囦欢銆% }銆傝繖鏍峰仛鐨勭洰鐨勪富瑕佹槸浣跨敤鎴蜂笉蹇呭湪姣忔璋冩暣鏂囨。绫绘枃浠舵椂閮藉幓涓婅堪璺緞淇敼锛 -鍚屾椂杩欐牱涔熷彲浠ュ湪锛堜竾涓闇瑕侊級鏇存柊 \hologo{TeX} 绯荤粺鏃讹紝 +鍚屾椂杩欐牱涔熷彲浠ュ湪锛堜竾涓椤昏锛夋洿鏂 \hologo{TeX} 绯荤粺鏃讹紝 闃叉鐢ㄦ埛淇敼杩囩殑鏂囨。绫绘枃浠跺湪鏇存柊涓鑷姩瑕嗙洊鎺夈 涓涓父瑙佺殑闇姹傛槸灏侀潰涓儴鍒嗗唴瀹癸紙鐗瑰埆鏄鏂囩殑鏍囬銆佷笓涓氬拰鐮旂┒鏂瑰悜锛夊お闀匡紝 瓒呭嚭浜嗗湪棰勮鐨勭┖闂淬 姝ゆ椂锛岀敤鎴峰彲浠ヤ慨鏀 \verb|pkuthss.cls| 閲 \verb|\maketitle| 瀹氫箟涓 -\verb|\pkuthss@int@fillinblank| 瀹忕殑鍙傛暟鏉ユ敼鍙 +\verb|\thss@int@fillinblank| 瀹忕殑鍙傛暟鏉ユ敼鍙 甯︿笅鍒掔嚎鐨勭┖鐧界殑琛屾暟鍜岃瀹斤紝鍏惰娉曚负锛 \begin{Verbatim}[frame = single] -\pkuthss@int@fillinblank{琛屾暟}{琛屽}{鍐呭} +\thss@int@fillinblank{琛屾暟}{琛屽}{鍐呭} \end{Verbatim} 渚嬪锛屽鏋溾滅爺绌舵柟鍚戔濅竴鏍忛渶瑕佷袱琛岀殑绌虹櫧锛 鍙互灏 \verb|pkuthss.cls| 閲岀殑 \begin{Verbatim}[frame = single] -\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@direction} +\thss@int@fillinblank{1}{\thss@tmp@len}{\kaishu\@direction} \end{Verbatim} 鏀逛负 \begin{Verbatim}[frame = single] -\pkuthss@int@fillinblank{2}{\pkuthss@tmp@len}{\kaishu\@direction} +\thss@int@fillinblank{2}{\thss@tmp@len}{\kaishu\@direction} \end{Verbatim} 褰撶劧锛屼负浜嗙編瑙傦紝鍙互灏嗗浜庝竴琛岀殑閮ㄥ垎绉诲埌灏侀潰涓綔鑰呬俊鎭儴鍒嗙殑鏈涓嬫柟銆 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex index 6ed6273abde..bde028dd985 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex @@ -1,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} 鑺傘 涓浜涢珮绾ц缃紝濡傚皝闈腑閮ㄥ垎鍐呭闀垮害瓒呰繃棰勮绌洪棿瀹归噺鏃剁殑璁剧疆锛 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex index dd0619af61a..4d71382198b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-conclusion.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-concl.tex @@ -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,19 +16,19 @@ % % 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 \specialchap{缁撹} pkuthss 鏂囨。妯＄増缁撴瀯杈冧负绠娲併佹竻鏅般佺伒娲伙紝杈冧负鏄撲簬瀛︿範鍜屼娇鐢ㄣ -甯屾湜瀹冭兘涓哄悇浣嶉渶瑕佷娇鐢 \hologo{LaTeX} 鎾板啓瀛︿綅璁烘枃鐨勫悓瀛︽彁渚涗竴浜涘府鍔┿ +甯屾湜瀹冭兘涓哄悇浣嶉』瑕佷娇鐢 \hologo{LaTeX} 鎾板啓瀛︿綅璁烘枃鐨勫悓瀛︽彁渚涗竴浜涘府鍔┿ % vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex index b646a1cb3a7..74b2cc186a6 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex @@ -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*{鐗堟潈澹版槑} \thispagestyle{empty} diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex index 1f35d09b70a..30c397b6e1f 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex @@ -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 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex index 41bc23e4622..db16f7776be 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex @@ -1,13 +1,13 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2012,2014-2015 Casper Ti. Vector +% 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 -% 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 \specialchap{搴忚█} @@ -49,7 +49,7 @@ texdoc pkuthss \item \textbf{璁烘枃妯＄増}锛 妯＄増鐨勬簮浠ｇ爜锛堝強鐢辨鐢熸垚鐨 pdf 鏂囨。锛 鍜屾湰鏂囨。鐨 pdf 鏂囦欢澶勪簬鍚屼竴鐩綍涓嬨 - 鐢ㄦ埛鍙渶鎸夌収妯＄増涓殑妗嗘灦淇敼浠ｇ爜锛屽嵆鍙啓鍑鸿嚜宸辩殑璁烘枃銆 + 鐢ㄦ埛鍙』鎸夌収妯＄増涓殑妗嗘灦淇敼浠ｇ爜锛屽嵆鍙啓鍑鸿嚜宸辩殑璁烘枃銆 \end{itemize} 鍦ㄦ涔嬪墠锛屽寘鎷 dypang\supercite{dypang}銆丗erretL\supercite{FerretL}銆% diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch new file mode 100644 index 00000000000..a4c13c03574 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch @@ -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}, + } + +-@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 鐨勬枃妗ｏ級銆 +-% 杩欓噷鎸夌収瑗挎枃鏂囩尞鍦ㄥ墠锛屼腑鏂囨枃鐚湪鍚庢帓搴忥紙鈥渟orting = ecnyt鈥濓級锛 +-% 鑻ラ』鎸夌収涓枃鏂囩尞鍦ㄥ墠锛岃タ鏂囨枃鐚湪鍚庢帓搴忥紝璇疯缃渟orting = cenyt鈥濓紱 +-% 鑻ラ』鎸夌収寮曠敤椤哄簭鎺掑簭锛岃璁剧疆鈥渟orting = 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 + % 鎺掔増鍙傝冩枃鐚垪琛ㄣ俠ibintoc 閫夐」浣库滃弬鑰冩枃鐚濆嚭鐜板湪鐩綍涓紱 + % 濡傛灉鍚屾椂瑕佷娇鍙傝冩枃鐚垪琛ㄥ弬涓庣珷鑺傜紪鍙凤紝鍙皢鈥渂ibintoc鈥濇敼涓衡渂ibnumbered鈥濄 +- \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@ctitle{棰樼洰锛殅 +-\def\label@cauthor{濮揬hphantom{姹夊瓧}鍚嶏細} +-\def\label@studentid{瀛hphantom{姹夊瓧}鍙凤細} +-\def\label@school{闄hphantom{姹夊瓧}绯伙細} +-\def\label@cmajor{涓揬hphantom{姹夊瓧}涓氾細} +-\def\label@direction{鐮旂┒鏂瑰悜锛殅 +-\def\label@cmentor{瀵糪hphantom{姹夊瓧}甯堬細} ++\def\label@ctitle{Title: } ++\def\label@cauthor{Name} ++\def\label@studentid{Student ID} ++\def\label@school{Affiliation} ++\def\label@cmajor{Major} ++\def\label@direction{Research Division} ++\def\label@cmentor{Supervisor} + \def\label@ementor{Directed by\ } + \def\label@ckeywords{鍏抽敭璇嶏細} + \def\label@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@twoside +- \fancyhead[CE]{\zihao{5}\normalfont{\cuniversity\cthesisname}} ++ \fancyhead[CE]{\zihao{5}\normalfont{{\euniversity} {\ethesisname}}} + \fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}} + \else + \fancyhead[C]{\zihao{5}\normalfont\thss@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@ctitle}% +- \thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}% ++ \thss@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@tmp@len{0.56\textwidth} +- \begin{tabular}{l@{\extracolsep{0.2em}}c} +- {\bfseries\label@cauthor} & +- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cauthor} \\ +- {\bfseries\label@studentid} & ++ \begin{tabular}{c@{\extracolsep{0.2em}}c@{\extracolsep{0.2em}}c} ++ {\bfseries\label@cauthor} & : & ++ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@eauthor} \\ ++ {\bfseries\label@studentid} & : & + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@studentid} \\ +- {\bfseries\label@school} & ++ {\bfseries\label@school} & : & + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@school} \\ +- {\bfseries\label@cmajor} & +- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmajor} \\ +- {\bfseries\label@direction} & ++ {\bfseries\label@cmajor} & : & ++ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@emajor} \\ ++ {\bfseries\label@direction} & : & + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction} \\ +- {\bfseries\label@cmentor} & +- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor} \\ ++ {\bfseries\label@cmentor} & : & ++ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@ementor} \\ + \end{tabular}% + } + \vfill diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib index bf6a9f3b2f5..ea9e83124ae 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib @@ -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 鍙傝冩枃鐚拰寮曠敤鏍峰紡锛歝aspervector v0.2.5}, + title = {biblatex 鍙傝冩枃鐚拰寮曠敤鏍峰紡锛歝aspervector}, + 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 濂椾欢鎵嬪唽锛坴2.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,28 +57,30 @@ 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}, } @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}, } diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex index e1396306b73..bf0cd252a0f 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex @@ -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} -\setlength{\bibitemsep}{3bp} \renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont} +\setlength{\bibitemsep}{3bp} \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,29 +68,29 @@ \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] \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 diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.eps b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.eps index ddb5832e713..35c1a90dfba 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.eps +++ b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.eps @@ -12,7 +12,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. % @@ -27,7 +27,7 @@ % pkuword.eps % 璁剧疆鍖楀ぇ绾㈢殑鑹插硷紙http://web5.pku.edu.cn/bs/cjwt/锛岄棶棰 5锛夈 -% 瑕佹兂灏嗛鑹叉敼涓洪粦鑹诧紝鍙渶灏嗕笅闈竴琛屾敼涓衡0 setgray鈥濆嵆鍙 +% 瑕佹兂灏嗛鑹叉敼涓洪粦鑹诧紝鍙』灏嗕笅闈竴琛屾敼涓衡0 setgray鈥濆嵆鍙 0.0 1.0 1.0 0.45 setcmykcolor % 璁剧疆绾跨殑灞炴с 1 setlinecap diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf Binary files differindex 1b67cd82a6a..4d4fd3a58a5 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-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def index 11d201e22b6..8c39301e69c 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def @@ -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@ctitle{题目：} diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def index c56160cb52a..b6996850e46 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def @@ -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@ctitle{棰樼洰锛殅 diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls index d449071a4bc..9e68dc3585c 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls @@ -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,48 +23,48 @@ \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@int@boolopt{spacing}{true}' will expand to: -% \newif\ifpkuthss@opt@spacing \pkuthss@opt@spacingtrue -% \DeclareOption{spacing}{\pkuthss@opt@spacingtrue} -% \DeclareOption{nospacing}{\pkuthss@opt@spacingfalse} -\def\pkuthss@int@boolopt#1#2{ - \expandafter\newif\csname ifpkuthss@opt@#1\endcsname - \@nameuse{pkuthss@opt@#1#2} - \DeclareOption{#1}{\@nameuse{pkuthss@opt@#1true}} - \DeclareOption{no#1}{\@nameuse{pkuthss@opt@#1false}} +% eg. `\thss@int@boolopt{spacing}{true}' will expand to: +% \newif\ifthss@opt@spacing \thss@opt@spacingtrue +% \DeclareOption{spacing}{\thss@opt@spacingtrue} +% \DeclareOption{nospacing}{\thss@opt@spacingfalse} +\def\thss@int@boolopt#1#2{ + \expandafter\newif\csname ifthss@opt@#1\endcsname + \@nameuse{thss@opt@#1#2} + \DeclareOption{#1}{\@nameuse{thss@opt@#1true}} + \DeclareOption{no#1}{\@nameuse{thss@opt@#1false}} } % Process the encoding options. -\newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue -\DeclareOption{GBK}{\pkuthss@opt@gbktrue\PassOptionsToClass{GBK}{ctexbook}} -\DeclareOption{UTF8}{\pkuthss@opt@gbkfalse\PassOptionsToClass{UTF8}{ctexbook}} +\newif\ifthss@opt@gbk \thss@opt@gbktrue +\DeclareOption{GBK}{\thss@opt@gbktrue\PassOptionsToClass{GBK}{ctexbook}} +\DeclareOption{UTF8}{\thss@opt@gbkfalse\PassOptionsToClass{UTF8}{ctexbook}} % Whether to enable `\Uppercase' (works problematically) in heading marks. -\pkuthss@int@boolopt{uppermark}{false} +\thss@int@boolopt{uppermark}{false} % Whether to modify fonts according to school regulation. -\pkuthss@int@boolopt{pkufont}{true} +\thss@int@boolopt{pkufont}{true} % Whether to modify footnote format according to school regulation. -\pkuthss@int@boolopt{pkufoot}{true} +\thss@int@boolopt{pkufoot}{true} % Whether to modify spacing according to school regulation. -\pkuthss@int@boolopt{pkuspace}{true} +\thss@int@boolopt{pkuspace}{true} % Whether to use some common settings for adjusting spacing. -\pkuthss@int@boolopt{spacing}{true} +\thss@int@boolopt{spacing}{true} % Add PDF bookmark for table of contents. -\pkuthss@int@boolopt{pdftoc}{true} +\thss@int@boolopt{pdftoc}{true} % Whether to enable the `\spacialchap' command. -\pkuthss@int@boolopt{spechap}{true} +\thss@int@boolopt{spechap}{true} % Whether to automatically set up properties for generated PDF from user % defined document information (author, title, etc.). -\pkuthss@int@boolopt{pdfprop}{true} +\thss@int@boolopt{pdfprop}{true} % Whether to disable some infractions intended to make the style less ugly. -\pkuthss@int@boolopt{ugly}{false} +\thss@int@boolopt{ugly}{false} % Pass all other options to `ctexbook' document class. \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}} % Process all class options now. \ProcessOptions\relax % Prevent fontspec (loaded by xeCJK) from interfering with newtxmath. -\ifpkuthss@opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi +\ifthss@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@opt@gbk +\ifthss@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@opt@pkufont +\ifthss@opt@pkufont % Use Times New Roman / Arial according to school regulation. % Option used to prevent newtxtext from manipulating footnote marks. \RequirePackage[defaultsups]{newtxtext} @@ -107,14 +107,14 @@ \RequirePackage{latexsym} \fi -\ifpkuthss@opt@pkufoot +\ifthss@opt@pkufoot % 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*\pkuthss@int@circled[1]{% + \newcommand*\thss@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@int@circled{\arabic{footnote}}} + {\protect\thss@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@opt@pkuspace +\ifthss@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@opt@spacing +\ifthss@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@opt@spechap +\ifthss@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@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 + % Set up spacing for displayed formulae. + \setlength{\abovedisplayskip}{\belowdisplayshortskip} + \setlength{\belowdisplayskip}{\abovedisplayskip} - \ifpkuthss@opt@pdftoc + \ifthss@opt@pdftoc % Add PDF bookmark for table of contents. - \let\pkuthss@tmp@tableofcontents\tableofcontents + \let\thss@tmp@tableofcontents\tableofcontents \renewcommand{\tableofcontents}{% - \pkuthss@int@pdfmark{\contentsname}{contents} - \pkuthss@tmp@tableofcontents% + \thss@int@pdfmark{\contentsname}{contents} + \thss@tmp@tableofcontents% } \fi - \ifpkuthss@opt@pdfprop + \ifthss@opt@pdfprop % Automatically generate properties for generated PDF. % Use English properties to avoid problems with character encodings. \newcommand*{\setpdfproperties}{% @@ -203,225 +198,207 @@ } % Set up the properties when generating the title page because the document % information should have been all defined before this. - \let\pkuthss@tmp@maketitle\maketitle - % NOTE: `\hypersetup' must appear before `\maketitle', otherwise it might not - % act as wished. - \renewcommand\maketitle{\setpdfproperties\pkuthss@tmp@maketitle} + \let\thss@tmp@maketitle\maketitle + % NOTE: `\hypersetup' must appear before `\maketitle', otherwise it might + % not act as expected. + \renewcommand\maketitle{\setpdfproperties\thss@tmp@maketitle} \fi } -% eg. `\pkuthss@int@infoitema{ctitle}' will expand to: +% eg. `\thss@int@infoitema{ctitle}' will expand to: % \def\ctitle#1{\def\@ctitle{#1}} -% \define@key{pkuthss@info}{ctitle}{\ctitle{#1}} -\def\pkuthss@int@infoitema#1{ +% \define@key{thss@info}{ctitle}{\ctitle{#1}} +\def\thss@int@infoitema#1{ \@namedef{#1}##1{\@namedef{@#1}{##1}} - \define@key{pkuthss@info}{#1}{\@nameuse{#1}{##1}} + \define@key{thss@info}{#1}{\@nameuse{#1}{##1}} } -% eg. `\pkuthss@int@infoitemb{cuniversity}' will expand to: -% \define@key{pkuthss@info}{cuniversity}{\def\cuniversity{#1}} -\def\pkuthss@int@infoitemb#1{ - \define@key{pkuthss@info}{#1}{\@namedef{#1}{##1}} +% eg. `\thss@int@infoitemb{cuniversity}' will expand to: +% \define@key{thss@info}{cuniversity}{\def\cuniversity{#1}} +\def\thss@int@infoitemb#1{ + \define@key{thss@info}{#1}{\@namedef{#1}{##1}} } % Set up document information entries. -\pkuthss@int@infoitema{ctitle} -\pkuthss@int@infoitema{etitle} -\pkuthss@int@infoitema{cauthor} -\pkuthss@int@infoitema{eauthor} -\pkuthss@int@infoitema{studentid} -\pkuthss@int@infoitema{date} -\pkuthss@int@infoitema{school} -\pkuthss@int@infoitema{cmajor} -\pkuthss@int@infoitema{emajor} -\pkuthss@int@infoitema{direction} -\pkuthss@int@infoitema{cmentor} -\pkuthss@int@infoitema{ementor} -\pkuthss@int@infoitema{ckeywords} -\pkuthss@int@infoitema{ekeywords} -\pkuthss@int@infoitemb{cuniversity} -\pkuthss@int@infoitemb{euniversity} -\pkuthss@int@infoitemb{cthesisname} -\pkuthss@int@infoitemb{ethesisname} -\pkuthss@int@infoitemb{cabstractname} -\pkuthss@int@infoitemb{eabstractname} +\thss@int@infoitema{ctitle} +\thss@int@infoitema{etitle} +\thss@int@infoitema{cauthor} +\thss@int@infoitema{eauthor} +\thss@int@infoitema{studentid} +\thss@int@infoitema{date} +\thss@int@infoitema{school} +\thss@int@infoitema{cmajor} +\thss@int@infoitema{emajor} +\thss@int@infoitema{direction} +\thss@int@infoitema{cmentor} +\thss@int@infoitema{ementor} +\thss@int@infoitema{ckeywords} +\thss@int@infoitema{ekeywords} +\thss@int@infoitemb{cuniversity} +\thss@int@infoitemb{euniversity} +\thss@int@infoitemb{cthesisname} +\thss@int@infoitemb{ethesisname} +\thss@int@infoitemb{cabstractname} +\thss@int@infoitemb{eabstractname} % Set up document information using the `key = value' grammar. -\newcommand*{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}} +\newcommand*{\pkuthssinfo}[1]{\setkeys{thss@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}}, subsubsection = {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}} } -\ifpkuthss@opt@ugly +\ifthss@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}} } \fi -% Internal command to set up headers and footers. -\def\pkuthss@int@setpagestyle{ - % The actual setup commands. - \fancypagestyle{plain}{ - \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp} - \fancyfoot[C]{\zihao{5}\normalfont{\thepage}} - \if@twoside - \fancyhead[CE]{\zihao{5}\normalfont{\cuniversity\cthesisname}} - \fancyhead[CO]{\zihao{5}\normalfont\pkuthss@int@setcase{\leftmark}} - \else - \fancyhead[C]{\zihao{5}\normalfont\pkuthss@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@opt@uppermark - \def\pkuthss@int@setcase#1{#1} - \pkuthss@int@setpagestyle +\ifthss@opt@uppermark + \def\thss@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@int@setcase#1{% + \def\thss@int@setcase#1{% \let\MakeUppercase\relax% \expandafter\let\csname MakeUppercase \endcsname\relax% #1% } - \pkuthss@int@setpagestyle \fi +% The actual page style setup. +\fancypagestyle{plain}{ + \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp} + \fancyfoot[C]{\zihao{5}\normalfont{\thepage}} + \if@twoside + \fancyhead[CE]{\zihao{5}\normalfont{\cuniversity\cthesisname}} + \fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}} + \else + \fancyhead[C]{\zihao{5}\normalfont\thss@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@int@pdfmark#1#2{% +\def\thss@int@pdfmark#1#2{% \if@openright\cleardoublepage\else\clearpage\fi \pdfbookmark[0]{#1}{#2}% } -% Usage: \pkuthss@int@fillinblank{(number of lines)}{(line width)}{(contents)} -\def\pkuthss@int@fillinblank#1#2#3{% +% Usage: \thss@int@fillinblank{(number of lines)}{(line width)}{(contents)} +\def\thss@int@fillinblank#1#2#3{% \makebox[0pt][l]{\parbox[t]{#2}{\centering{#3}}}\mbox{}% \parbox[t]{#2}{% - \newcount\pkuthss@tmp@linecount - \pkuthss@tmp@linecount=#1 - \loop\ifnum\pkuthss@tmp@linecount>0 + \newcount\thss@tmp@linecount + \thss@tmp@linecount=#1 + \loop\ifnum\thss@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@tmp@linecount=1 + \ifnum\thss@tmp@linecount=1 \uline{\makebox[#2]{}} \else \uline{\makebox[#2]{}}\\ \fi - \advance\pkuthss@tmp@linecount by -1\relax + \advance\thss@tmp@linecount by -1\relax \repeat% }% } % Set up format of the title page (cover). \renewcommand{\maketitle}{% - \pkuthss@int@pdfmark{\titlepagename}{titlepage} - \begin{titlepage} - % It will be nicer to use this line skip level in the title page. - \linespread{1.6}\selectfont - % Make the title page centered. - \begin{center} - % Emblem and inscription of the university, and type of thesis. - {% - \zihao{1}% - \includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}% - \raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em] - {\bfseries{\cthesisname}}% - } - \vfill - % Title of the thesis. - {% - \zihao{2}{\label@ctitle}% - \pkuthss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}% - } - \vfill - % Information about the author. - {% - % Slightly adjust the line skip when using new font size. - \zihao{3}\linespread{1.75}\selectfont - \def\pkuthss@tmp@len{0.56\textwidth} - \begin{tabular}{l@{\extracolsep{0.2em}}c} - {\bfseries\label@cauthor} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cauthor} \\ - {\bfseries\label@studentid} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@studentid} \\ - {\bfseries\label@school} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@school} \\ - {\bfseries\label@cmajor} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmajor} \\ - {\bfseries\label@direction} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@direction} \\ - {\bfseries\label@cmentor} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmentor} \\ - \end{tabular}% - } - \vfill - % Date. - {\zihao{-2}\@date} - \end{center} - \end{titlepage}% + \thss@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@ctitle}\linespread{1.6}\selectfont% + \thss@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@tmp@len{0.56\textwidth} + \begin{tabular}{l@{\extracolsep{0.2em}}c} + {\bfseries\label@cauthor} & + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cauthor} \\ + {\bfseries\label@studentid} & + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@studentid} \\ + {\bfseries\label@school} & + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@school} \\ + {\bfseries\label@cmajor} & + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmajor} \\ + {\bfseries\label@direction} & + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction} \\ + {\bfseries\label@cmentor} & + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor} \\ + \end{tabular}% + } + \vfill + % Date. + {\zihao{-2}\@date} + \end{center}\end{titlepage}% } % Typeset the Chinese abstract. \newenvironment{cabstract}{% - \pkuthss@int@pdfmark{\cabstractname}{cabstract} - \chapter*{\cabstractname} - \markboth{\cabstractname}{}% + \thss@int@pdfmark{\cabstractname}{cabstract} + \chapter*{\cabstractname}\markboth{\cabstractname}{}% }{% Keywords at the bottom of the page. \vfill\noindent\textbf{\label@ckeywords}{\@ckeywords}% } % Typeset the English abstract. \newenvironment{eabstract}{% - \pkuthss@int@pdfmark{\eabstractname}{eabstract} - \chapter*{\sffamily\@etitle} - \markboth{\eabstractname}{} + \thss@int@pdfmark{\eabstractname}{eabstract} + \chapter*{\sffamily\@etitle}\markboth{\eabstractname}{} \begin{center} {\@eauthor} ({\@emajor})\\ {\label@ementor}{\@ementor}\\[2em] \textbf{\sffamily\eabstractname} - \end{center} - \par% + \end{center}\par% }{% Keywords at the bottom of the page. \vfill\noindent\textbf{\label@ekeywords}{\@ekeywords}% } diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.eps b/Master/texmf-dist/tex/latex/pkuthss/pkuword.eps index ab9ebcfe17b..88bbca5d12e 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.eps +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.eps @@ -12,7 +12,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. % @@ -27,7 +27,7 @@ % pkuword.eps % 璁剧疆鍖楀ぇ绾㈢殑鑹插硷紙http://web5.pku.edu.cn/bs/cjwt/锛岄棶棰 5锛夈 -% 瑕佹兂灏嗛鑹叉敼涓洪粦鑹诧紝鍙渶灏嗕笅闈竴琛屾敼涓衡0 setgray鈥濆嵆鍙 +% 瑕佹兂灏嗛鑹叉敼涓洪粦鑹诧紝鍙』灏嗕笅闈竴琛屾敼涓衡0 setgray鈥濆嵆鍙 0.0 1.0 1.0 0.45 setcmykcolor % 缂╂斁鍜屽钩绉汇 0.702957 0.602957 scale diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf Binary files differindex c32ce0de7cd..d8bfa5fd174 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf |