diff options
| author | Karl Berry <karl@freefriends.org> | 2019-11-15 21:37:15 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-11-15 21:37:15 +0000 |
| commit | ad0cc2635a7a6ba53d891f339d362a41da71cacb (patch) | |
| tree | 0b5256ee13ef2d73f9c23106761f9f34c769298a | |
| parent | af83420127315731ca4168d56cd4f95f748d49e7 (diff) | |
pkuthss (15nov19)
git-svn-id: svn://tug.org/texlive/trunk@52804 c570f23f-e606-0410-a88d-b1316a301751
26 files changed, 285 insertions, 308 deletions
diff --git a/Master/texmf-dist/doc/latex/pkuthss/README b/Master/texmf-dist/doc/latex/pkuthss/README new file mode 100644 index 00000000000..4f7e832a456 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/README @@ -0,0 +1,18 @@ +pkuthss: LaTeX template for dissertations in Peking University +-------------------------------------------------------------- + +Maintainer: Casper Ti. Vector <CasperVector@gmail.com> +Homepage: <https://gitea.com/CasperVector/pkuthss> + +Licence: +* New BSD Licence for `copy.tex' and `origin.tex'. +* LaTeX Project Public Licence 1.3 or later for files in `tex/' and + `doc/readme/', except for those mentioned above. +* Public domain for all other files. + +This package provides a simple, clear and flexible LaTeX template for +dissertations in Peking University. + +This file (README) is *NOT* intended as the documentation for this +package; please see the file `pkuthss.pdf' instead. + diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf Binary files differindex 2dd693f222b..f4e66e5d319 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 e57cca77a41..efbd3dfa4ad 100755 --- a/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/example/Make.bat @@ -1,32 +1,19 @@ @echo off
@rem Copyright (c) 2008-2009 solvethis
-@rem Copyright (c) 2010-2012 Casper Ti. Vector
+@rem Copyright (c) 2010-2012,2019 Casper Ti. Vector
@rem Public domain.
-set JOB=thesis
-@rem 这个变量的值可以为 latex、pdflatex 或 xelatex。
-set LATEX=latex
-set BIBTEX=biber -l zh__pinyin --output-safechars
-set DVIPDF=dvipdfmx
-
-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% %JOB%
-%BIBTEX% %JOB%
-%LATEX% %JOB%
-%LATEX% %JOB%
-%DODVIPDF%
+latexmk
goto end
:clean
-del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out
-del missfont.log chap\*.aux
+latexmk -c
goto end
:usage
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def b/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def index 2febb6122d5..b503fc729aa 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def +++ b/Master/texmf-dist/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def @@ -36,13 +36,13 @@ } { \setCJKmainfont - [ BoldFont = SimHei , ItalicFont = [ simkai.ttf ] ] { SimSun } + [ BoldFont = SimHei , ItalicFont = KaiTi ] { SimSun } \setCJKsansfont { SimHei } - \setCJKmonofont { [ simfang.ttf ] } + \setCJKmonofont { FangSong } \setCJKfamilyfont { zhsong } { SimSun } \setCJKfamilyfont { zhhei } { SimHei } - \setCJKfamilyfont { zhkai } { [ simkai.ttf ] } - \setCJKfamilyfont { zhfs } { [ simfang.ttf ] } + \setCJKfamilyfont { zhkai } { KaiTi } + \setCJKfamilyfont { zhfs } { FangSong } %\setCJKfamilyfont { zhli } { LiSu } %\setCJKfamilyfont { zhyou } { YouYuan } } diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/latexmkrc b/Master/texmf-dist/doc/latex/pkuthss/example/latexmkrc new file mode 100644 index 00000000000..8df2c242c2c --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/example/latexmkrc @@ -0,0 +1,14 @@ +# Copyright (c) 2019 Casper Ti. Vector +# Public domain. + +@default_files = ('thesis'); +# 5锛歺elatex锛3锛歭atex锛+ dvipdfmx锛夛紱1锛歱dflatex銆 +$pdf_mode = 5; +# 鐢 latex 妯″紡缂栬瘧鏃讹紝浣跨敤 dvipdfmx 鑰岄潪榛樿鐨 dvipdf銆 +$dvipdf = "dvipdfmx %O -o %D %S"; +# 姝ら夐」鐩稿叧璇存槑瑙 texdoc latexmk銆 +$bibtex_use = 1.5; +$biber = "biber -l zh__pinyin --output-safechars %O %S"; +# latexmk -c 鏃惰嚜鍔ㄥ垹闄 .run.xml 鏂囦欢銆 +$clean_ext = "run.xml"; + diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex b/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex index 27b28feac3c..005e4c3950f 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example/spine.tex @@ -1,13 +1,13 @@ -% Copyright (c) 2018 Casper Ti. Vector +% Copyright (c) 2018-2019 Casper Ti. Vector % Public domain. -\documentclass[zihao = -4]{ctexart} +\documentclass[UTF8, zihao = -4]{ctexart} \usepackage{calc, geometry, graphicx} \usepackage[defaultsups]{newtxtext} \usepackage[cmintegrals, varg]{newtxmath} \pagestyle{empty} \newlength{\colpad} -\newcommand{\colwidth}{\ccwd} +\newcommand{\colwidth}{0.99\ccwd} % 璁惧畾璁烘枃绾稿昂瀵搞 \geometry{paperwidth = 460mm, paperheight = 297mm, margin = 0cm} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex index 30e05dec555..9c5f042cb4e 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,2018 Casper Ti. Vector +% Copyright (c) 2010-2016,2018-2019 Casper Ti. Vector % Public domain. % % 浣跨敤鍓嶈鍏堜粩缁嗛槄璇 pkuthss 鍜 biblatex-caspervector 鐨勬枃妗ｏ紝 @@ -9,12 +9,8 @@ % texdoc biblatex-caspervector % 璋冨嚭銆 -% 閲囩敤浜嗚嚜瀹氫箟鐨勶紙鍖呮嫭澶у皬鍐欎笉鍚屼簬鍘熸枃浠剁殑锛夊瓧浣撴枃浠跺悕锛 -% 骞舵敼鍔 ctex.cfg 绛夐厤缃枃浠剁殑鐢ㄦ埛璇疯嚜琛屽姞鍏 nofonts 閫夐」锛 -% 鍏跺畠鐢ㄦ埛涓嶇敤鍔犲叆 nofonts 閫夐」锛屽姞鍏ヤ箣鍚庡弽鑰屼細浜х敓閿欒銆 \documentclass[UTF8]{pkuthss} % 濡傛灉鐨勭‘椤昏浣胯剼娉ㄦ寜椤电紪鍙风殑璇濓紝鍙互鍘绘帀鍚庨潰 footmisc 鍖呯殑娉ㄩ噴銆 -% 娉ㄦ剰锛氬湪鍚敤姝よ瀹氱殑鎯呭喌涓嬶紝鍙兘瑕佸缂栬瘧涓娆′互浜х敓姝ｇ‘鐨勮剼娉ㄧ紪鍙枫 %\usepackage[perpage]{footmisc} % 浣跨敤 biblatex 鎺掔増鍙傝冩枃鐚紝骞惰瀹氬叾鏍煎紡锛堣瑙 biblatex-caspervector 鐨勬枃妗ｏ級銆 diff --git a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf Binary files differnew file mode 100644 index 00000000000..e8620481199 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf Binary files differdeleted file mode 100644 index 54815bdc7ee..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt index f1f002704c1..57eac504cab 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt @@ -1,3 +1,25 @@ +2019-11-15, v1.8.1 + + * Changes to example template: + - Migrate to latexmk (also for packaging). + - ctex-fontset-pkuthss.def: `[ simkai.ttf ]' etc is no longer supported. + - spine.tex: fix garbled characters and hbox warnings with pdflatex. + + * Changes to package code: + - pkuthss.cls: work around the `\lvert already defined' error. + - pkuthss.cls: fix section title spacing below the page header. + - pkuthss.cls: adjust titlepage spacing. + + * Changes to documentation: + - Synchronise with the current code. + - Use \mbox around \supercite by default. + - Improve verbatims. + + * Misc: + - Completion of some previous commits. + - Migrate to Gitea, "for obvious reasons". + - Minor fixes and cosmetics. + 2018-07-02, v1.8.0 * Changes to example template: diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile b/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile deleted file mode 100644 index 8835cd28e63..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2008-2009 solvethis -# Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector -# Public domain. - -JOB = pkuthss -BIBTEX = biber -l zh__pinyin --output-safechars -DVIPDF = dvipdfmx -MAKE = make -RM = rm -f - -ifndef LATEX - LATEX1 = latex - LATEX2 = xelatex -else - LATEX1 = $(LATEX) - LATEX2 = $(LATEX) -endif - -ifeq ($(LATEX), latex) - DODVIPDF = $(DVIPDF) $(JOB) -endif - -doc: - $(LATEX1) $(JOB) - $(BIBTEX) $(JOB) - $(LATEX2) $(JOB) - $(LATEX2) $(JOB) - $(DODVIPDF) - -clean: - $(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) $(JOB).pdf - -# vim:ts=4:sw=4 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 3eaa29114be..2e5152ece51 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,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2018 Casper Ti. Vector +% Copyright (c) 2010-2019 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 @@ -33,24 +33,23 @@ \begin{itemize} \item 涓涓熀鏈殑 \hologo{TeX} 鍙戣鐗堛 \item CJK 鎴 XeCJK锛堜緵 \hologo{XeLaTeX} 浣跨敤锛夊畯鍖呫 - \item ctex\supercite{ctex} 瀹忓寘锛堟彁渚涗簡 ctexbook 鏂囨。绫伙級銆 + \item ctex\cupercite{ctex} 瀹忓寘锛堟彁渚涗簡 ctexbook 鏂囨。绫伙級銆 \item 涓枃瀛椾綋銆 \item 濡傛灉瑕佷娇鐢 biblatex 杩涜鏂囩尞鍒楄〃鍜屽紩鐢ㄧ殑鎺掔増鐨勮瘽锛 - 杩橀渶瑕 biblatex\supercite{biblatex} 瀹忓寘锛 + 杩橀渶瑕 biblatex\cupercite{biblatex} 瀹忓寘锛 \item 濡傛灉瑕佸涓枃鏂囩尞杩涜鎸夋眽璇嫾闊崇殑鎺掑簭鐨勮瘽锛 - 杩橀渶瑕 biber\supercite{biber} 绋嬪簭銆 + 杩橀渶瑕 biber\cupercite{biber} 绋嬪簭銆 \item 濡傛灉浣跨敤榛樿鐨勬枃鐚垪琛ㄥ拰寮曠敤鏍峰紡鐨勮瘽锛岃繕闇瑕佷綔鑰呯紪鍐欑殑 biblatex 鏍峰紡 - 锛坆iblatex-caspervector\supercite{biblatex-caspervector}锛夛紝 + 锛坆iblatex-caspervector\cupercite{biblatex-caspervector}锛夛紝 姝ゆ牱寮忚姹備娇鐢 biber 绋嬪簭銆 - \item 濡傛灉椤昏浣跨敤 Makefile 鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯紝杩橀渶瑕 Make 宸ュ叿锛 - 浣嗗鏋滀娇鐢ㄧ敱鎵瑰鐞嗗疄鐜扮殑浼淢akefile鈥濆氨涓嶇敤浜嗐 + \item 濡傛灉椤昏浣跨敤 latexmk 鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯紝杩橀渶瑕 latexmk 宸ュ叿銆 \end{itemize} \myemph{鏈鏂皚鐨刓myemph{瀹屽叏鐗坿 \hologo{TeX} Live 绯荤粺锛圽myemph{% 娉細鏌愪簺 Linux 鍙戣鐗堣蒋浠朵粨搴撲腑鐨 \hologo{TeX} Live 鏈夐棶棰橈紝 寤鸿浣跨敤鐙珛瀹夎鐗堢殑 \hologo{TeX} Live% \unemph{\footnote{\url{https://www.tug.org/texlive/}.}}銆% -}锛夐兘宸茬粡鍖呭惈闄や腑鏂囧瓧浣撳拰 Make 涔嬪鎵鏈夎姹傜殑椤圭洰銆% +}锛夐兘宸茬粡鍖呭惈闄や腑鏂囧瓧浣撲箣澶栨墍鏈夎姹傜殑椤圭洰銆% \myemph{% 涓轰簡鑾峰緱鏈濂界殑鏀寔锛 鎴戜滑寤鸿鐢ㄦ埛浣跨敤鏈鏂般佸畬鍏ㄧ増鐨 \hologo{TeX} 绯荤粺鍜屽悇瀹忓寘銆% @@ -66,22 +65,16 @@ 杩欎簺瀛椾綋鏄 GB18030 瀛楃闆嗙殑锛屼笉瀛樺湪涓婅堪闂銆% } -Linux 鐢ㄦ埛鍙互浠庤蒋浠舵簮鑾峰緱 GNU 鐨 make锛 -鍏跺畠绫 UNIX 绯荤粺搴旇涔熶細鎻愪緵 make 宸ュ叿锛岃鍙傞槄鐩稿簲鐨勬枃妗ｄ互鑾峰緱甯姪銆% -Windows 鐢ㄦ埛鍙互浠庝互涓嬪湴鍧涓嬭浇 Windows 涓嬬殑 GNU make 宸ュ叿锛歕\ -\hspace*{\parindent}% -\url{http://gnuwin32.sourceforge.net/packages/make.htm} - \section{妯＄増鏂囦欢}\label{sec:doc-dir} 鍦ㄦ纭畨瑁 pkuthss 鏂囨。妯＄増涔嬪悗锛屽湪缁堢/鍛戒护鎻愮ず绗︿腑鎵ц -\begin{Verbatim}[frame = single] +\begin{Verbatim} texdoc pkuthss \end{Verbatim} 鎵鎵撳紑鐨 pdf 鏂囦欢鎵鍦ㄧ殑鍚屼竴鐩綍涓寘鍚袱涓瓙鐩綍鍜岀浉搴旂殑涓や釜 pdf 鏂囦欢锛 鍏朵腑 \verb|readme/| 涓鸿鏄庢枃妗ｏ紙鍗虫湰鏂囨。锛夌殑婧愪唬鐮侊紝% \verb|example/| 涓烘枃妗ｆā鐗堢殑婧愪唬鐮侊紝% -\verb|readme.pdf| 鍜 \verb|example.pdf| +\verb|pkuthss.pdf| 鍜 \verb|example.pdf| 鍒嗗埆涓鸿鏄庢枃妗ｅ拰鏂囨。妯＄増鐨 pdf 鏂囦欢銆 \verb|example/| 鐩綍涓嬬殑婧愪唬鐮佷娇鐢ㄧ殑鏄 UTF-8 缂栫爜锛 @@ -98,44 +91,32 @@ texdoc pkuthss 鍥犳 pkuthss 鏂囨。妯＄増鐨勪綔鑰呭缓璁敤鎴蜂娇鐢ㄦ敮鎸 LF 鎹㈣鐨勬枃鏈紪杈戝櫒缂栬緫鏂囦欢銆% } -妯＄増涓殑閲嶈鏂囦欢鏈夛細 +妯＄増涓殑鍏抽敭鏂囦欢鏈夛細 \begin{itemize} - \item \verb|Makefile|锛 - 琚 Make 宸ュ叿璋冪敤鐨 Makefile锛岀敤浜庝娇缂栬瘧宸ヤ綔鑷姩鍖栥 + \item \verb|ctexopts.cfg|銆乗verb|ctex-fontset-pkuthss.def|锛 + 姣旇緝甯哥敤鐨勫瓧浣撻厤缃紝閫傜敤浜 2.0 鍙婁互鍚庣増鏈殑 + ctex\cupercite{ctex} 瀹忓寘銆 + \item \verb|latexmkrc|锛 + 琚 latexmk 宸ュ叿璇诲彇鐨勯厤缃枃浠讹紝鐢ㄤ簬浣跨紪璇戝伐浣滆嚜鍔ㄥ寲銆 \item \verb|Make.bat|锛% - Windows 涓嬬殑浼淢akefile鈥濓紝鐢 Windows 鎵瑰鐞嗗疄鐜般 + 鏂逛究 Windows 鐢ㄦ埛浣跨敤鐨勬壒澶勭悊鏂囦欢锛屼細璋冪敤 latexmk銆 + \item \verb|spine.tex|锛氫功鑴婄殑婧愭枃浠讹紝鍏蜂綋鐢ㄦ硶璇峰弬鑰冨叾涓唬鐮併 + \item \verb|thesis.tex|锛氱ず渚嬫ā鐗堢殑涓绘枃浠躲 \item \verb|chap/|锛氱洰褰曪紝鍖呭惈鍚勭珷鑺傚唴瀹癸細 \begin{itemize} - \item \verb|copyright.tex|锛氱増鏉冨０鏄庨儴鍒嗐 - \item \verb|originauth.tex|锛 - 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑閮ㄥ垎\supercite{pku-originauth}銆 + \item \verb|copy.tex|锛氱増鏉冨０鏄庨儴鍒嗐 + \item \verb|origin.tex|锛 + 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑閮ㄥ垎\cupercite{pku-originauth}銆 \end{itemize} \myemph{% - 娉細pkuthss 鏂囨。妯＄増鏀寔鎺掔増瀛︽牎瑕佹眰鐨勪簩缁寸爜锛 - 璇峰弬鑰 \texttt{copyright.tex} 鍜 - \texttt{originauth.tex} 涓殑鐩稿叧娉ㄩ噴銆% + 娉細pkuthss 鏂囨。妯＄増鍙帓鐗堝鏍¤姹傜殑浜岀淮鐮侊紝 + 璇峰弬鑰 \texttt{copy.tex} 鍜 \texttt{origin.tex} 涓殑鐩稿叧娉ㄩ噴銆% } - - \item \verb|misc/|锛 - 鐩綍锛岀洰鍓嶅寘鍚瘮杈冨父鐢ㄧ殑瀛椾綋閰嶇疆锛 - \begin{itemize} - \item \verb|ctexopts.cfg|銆乗verb|ctex-fontset-pkuthss.def|锛 - 閫傜敤浜 2.0 鍙婁互鍚庣増鏈殑 ctex\supercite{ctex} 瀹忓寘銆 - \item \verb|ctex-xecjk-windows.def|锛 - 閫傜敤浜 2.0 浠ュ墠鐗堟湰鐨 ctex 瀹忓寘銆 - \end{itemize} - 浣跨敤鏃讹紝 - 璇峰皢鍜岀敤鎴风郴缁熶腑 ctex 瀹忓寘鐗堟湰鐩稿尮閰嶇殑\myemph{鎵鏈墋閰嶇疆鏂囦欢 - 澶嶅埗鍒版ā鐗堢殑涓荤洰褰曚腑銆 \end{itemize} \section{缂栬瘧鏂瑰紡}\label{sec:compile} -棣栨缂栬瘧鍓嶏紝璇峰皢 \verb|misc/| 鐩綍涓拰鐢ㄦ埛绯荤粺涓 -ctex 瀹忓寘鐗堟湰鐩稿尮閰嶇殑閰嶇疆鏂囦欢澶嶅埗鍒版ā鐗堢殑涓荤洰褰曚腑锛 -璇﹁绗 \ref{sec:doc-dir} 鑺傘 - pkuthss 鏂囨。妯＄増鏀寔涓夌缂栬瘧鏂瑰紡锛屽嵆 \begin{itemize} \item \hologo{LaTeX} -- dvipdfmx 鏂瑰紡锛歕\ @@ -149,42 +130,36 @@ pkuthss 鏂囨。妯＄増鏀寔涓夌缂栬瘧鏂瑰紡锛屽嵆 \verb|xelatex| 鍜 \verb|xelatex|銆 \end{itemize} \myemph{% - 娉ㄦ剰锛歕hologo{XeLaTeX} 瀵归潪 UTF-8 缂栫爜鐨勬敮鎸佷笉濂斤紝 + 娉ㄦ剰锛氬湪鐗瑰畾鎯呭舰涓嬶紝\texttt{latex}/\texttt{pdflatex}/\texttt{xelatex} + 姝ラ鍙兘椤昏鎵ц澶氫簬 2 娆★紝鑰屼笅鏂囨帹鑽愮殑 latexmk 宸ュ叿浼氳嚜鍔ㄥ鐞嗚繖绫绘儏褰€ + 姝ゅ锛孿hologo{XeLaTeX} 瀵归潪 UTF-8 缂栫爜鐨勬敮鎸佷笉濂斤紝 鍥犳 \hologo{XeLaTeX} 鏂瑰紡鐨勭紪璇戜笉鏀寔 GBK 缂栫爜銆% } -pkuthss 鏂囨。妯＄増闄勫甫鐨 Makefile 涓凡缁忓杩欎笁绉嶇紪璇戞柟寮忚繘琛屼簡瀹屾暣鐨勯厤缃 -鐢ㄦ埛鍙』瑕佸湪 Makefile 涓氳繃璁惧畾鍙橀噺 \verb|JOB| 鐨勫兼寚瀹氳缂栬瘧鐨勪富鏂囦欢鍚嶏紝 -骞堕氳繃璁惧畾鍙橀噺 \verb|LATEX| 鐨勫兼寚瀹氶噰鐢ㄥ摢绉嶇紪璇戞柟寮忥紝 -鍗冲彲閫氳繃鍦ㄤ富鏂囦欢鎵鍦ㄧ洰褰曡皟鐢 Make 宸ュ叿鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯細 -濡傛灉鏄湪绫 UNIX 鐜涓嬶紝鍒欑敤鎴峰簲璇ヨ皟鐢ㄧ殑鍛戒护鍚嶄负 \verb|make|锛 -\begin{Verbatim}[frame = single] +pkuthss 鏂囨。妯＄増闄勫甫鐨 \verb|latexmkrc| 涓凡缁忓杩欎笁绉嶇紪璇戞柟寮忚繘琛屼簡瀹屾暣鐨 +閰嶇疆銆傜敤鎴峰彧椤昏鍦 \verb|latexmkrc| 涓氳繃璁惧畾鍙橀噺 \verb|default_files| +鐨勫兼寚瀹氳缂栬瘧鐨勪富鏂囦欢鍚嶏紝骞堕氳繃璁惧畾鍙橀噺 \verb|pdf_mode| 鐨勫兼寚瀹氶噰鐢 +鍝缂栬瘧鏂瑰紡锛屽嵆鍙氳繃鍦ㄤ富鏂囦欢鎵鍦ㄧ洰褰曡皟鐢 latexmk 宸ュ叿鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯細 +绫 UNIX 鐜涓嬪ぇ鑷村涓 +\begin{Verbatim} cd /path/to/directory/with/thesis.tex -make +latexmk \end{Verbatim} -鑰屽鏋滄槸鍦 Windows 鐜涓嬶紝鍒欑敤鎴峰簲璇ヨ皟鐢ㄧ殑鍛戒护鍚嶅彲鑳戒负 \verb|mingw32-make|锛 -\begin{Verbatim}[frame = single] +鑰屽湪 Windows 鐜涓嬪ぇ鑷村涓 +\begin{Verbatim} cd \path\to\directory\with\thesis.tex -mingw32-make +latexmk \end{Verbatim} -鐢ㄦ埛濡傛灉涓嶆兂閰嶇疆 Windows 涓嬬殑 GNU Make锛 -鍒欎篃鍙互浣跨敤鐢 Windows 鎵瑰鐞嗗疄鐜扮殑浼淢akefile鈥濓紝 -閫氳繃鍦ㄤ富鏂囦欢鎵鍦ㄧ洰褰曡皟鐢 \verb|make|\footnote{% - Windows 灏嗘壒澶勭悊鏂囦欢浣滀负鍙墽琛屾枃浠讹紝璋冪敤鏃跺彲浠ヤ笉鏄惧紡鍦版寚鍑烘墿灞曞悕銆% -}锛 -\begin{Verbatim}[frame = single] -cd \path\to\directory\with\thesis.tex -make -\end{Verbatim} -\myemph{% +Windows 鐢ㄦ埛涔熷彲浠ヤ娇鐢ㄦ壒澶勭悊鏂囦欢 \verb|Make.bat|锛 +鍦ㄤ富鏂囦欢鎵鍦ㄧ洰褰曞弻鍑绘鏂囦欢锛屽畠渚夸細璋冪敤 latexmk 杩涜缂栬瘧銆俓myemph{% 娉ㄦ剰锛% Windows 鎵瑰鐞嗗浜 LF锛圽texttt{\string\n}锛夋崲琛岀殑鎵瑰鐞嗘枃浠舵敮鎸佹湁闂銆 鍦ㄥ懡浠ゆ彁绀虹锛坈md锛変笅鎵ц杩欎簺鎵瑰鐞嗘枃浠舵椂娌℃湁闂锛 浣嗗弻鍑绘枃浠跺浘鏍囨墽琛屾椂鍙兘灏变細鍑洪敊銆 \hologo{TeX} Live 涓畨瑁呯殑 \texttt{Make.bat} 鍜 CTAN 涓婃彁渚涚殑鍘嬬缉鍖呴噷鐨 \texttt{Make.bat} - 鏈夊彲鑳芥槸 LF锛圽texttt{\string\n}锛夋崲琛岀殑銆% + 鍦ㄦ甯告儏鍐典笅搴旇鏄 CRLF锛圽texttt{\string\r\string\n}锛夋崲琛岀殑銆% } % vim:ts=4:sw=4 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 1ab1b3e9cd3..4455b376b7e 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,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2018 Casper Ti. Vector +% Copyright (c) 2010-2019 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 @@ -46,7 +46,7 @@ }銆 \item \textbf{\texttt{[no]pkufont}}锛 - 鏄惁鏍规嵁瀛︽牎瀵硅鏂囨牸寮忕殑瑕佹眰\mbox{\supercite{pku-thesisstyle}}% + 鏄惁鏍规嵁瀛︽牎瀵硅鏂囨牸寮忕殑瑕佹眰\cupercite{pku-thesisstyle}% 灏嗚タ鏂囧瓧浣撴敼涓虹被浼间簬 Times New Roman / Arial 鐨勫瓧浣撱 \item \textbf{\texttt{[no]pkufoot}}\footnote{% @@ -54,7 +54,7 @@ \texttt{[no]footfmt} 閫夐」锛 鏇存敼鍚嶇О鏄负浜嗕娇鏂囨。绫婚夐」鍚嶆洿鍔犺鍒欍% }锛 - 鏄惁鏍规嵁瀛︽牎瀵硅鏂囨牸寮忕殑瑕佹眰\mbox{\supercite{pku-thesisstyle}}% + 鏄惁鏍规嵁瀛︽牎瀵硅鏂囨牸寮忕殑瑕佹眰\cupercite{pku-thesisstyle}% 淇敼鍜岃剼娉ㄧ浉鍏崇殑涓浜涙牸寮忋 鍏蜂綋鍦拌锛屽惎鐢 \verb|pkufoot| 閫夐」鍚庝細杩涜浠ヤ笅鍑犻」璁剧疆锛 \begin{itemize} @@ -64,7 +64,7 @@ \end{itemize} \item \textbf{\texttt{[no]pkuspace}}锛 - 鏄惁鏍规嵁瀛︽牎瀵硅鏂囨牸寮忕殑瑕佹眰\mbox{\supercite{pku-thesisstyle}}% + 鏄惁鏍规嵁瀛︽牎瀵硅鏂囨牸寮忕殑瑕佹眰\cupercite{pku-thesisstyle}% 淇敼鎺掔増涓殑涓浜涢棿璺濆強鐩稿叧璁剧疆銆 鍏蜂綋鍦拌锛屽惎鐢 \verb|pkuspace| 閫夐」鍚庝細鎸 \parencite{pku-thesisstyle} 涓殑瑕佹眰淇敼浠ヤ笅鍑犻」璁剧疆锛 @@ -89,8 +89,6 @@ 鏄惁閲囩敤涓浜涘父鐢ㄧ殑璋冩暣闂磋窛鐨勯澶栫増寮忚瀹氥 鍏蜂綋鍦拌锛屽惎鐢 \verb|spacing| 閫夐」鍚庝細杩涜浠ヤ笅鍑犻」璁剧疆锛 \begin{itemize} - \item 鑷姩蹇界暐 CJK 鏂囧瓧涔嬮棿鐨勭┖鐧借 - 淇濈暀锛圕JK 鏂囧瓧涓庤タ鏂囦箣闂寸瓑鐨勶級鍏跺畠绌虹櫧銆 \item 璋冪敤 setspace 瀹忓寘浠ヤ娇鏌愪簺缁嗚妭澶勭殑绌洪棿瀹夋帓鏇寸編瑙傘 \item 閲囩敤姣 \hologo{LaTeX} 榛樿璁惧畾鏇村姞绱у瘑鐨勬灇涓剧幆澧% \footnote{% @@ -100,6 +98,7 @@ 鍚敤 \texttt{spacing} 閫夐」鍚庯紝 灏嗗幓鎺夎繖浜涚幆澧冧腑棰濆澧炲姞鐨勶紙鍨傜洿锛夐棿闅斻% }銆 + \item 璋冩暣鏋氫妇鐜鐨勭缉杩涳紝浠ラ傚簲涓枃鎺掔増涓殑涔犳儻銆 \end{itemize} \item \textbf{\texttt{[no]spechap}}\footnote{% @@ -139,13 +138,13 @@ 渚嬪锛屽鏋滈』瑕佷娇鐢 UTF-8 缂栫爜鎾板啓璁烘枃锛 鍒欏簲鍦ㄨ浇鍏 pkuthss 鏂囨。绫绘椂鍔犱笂 \verb|UTF8| 閫夐」锛 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \documentclass[UTF8, ...]{pkuthss} % 鈥...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆 \end{Verbatim} 鍙堜緥濡傦紝鏂囨。榛樿鎯呭喌涓嬫槸鍙岄潰妯″紡锛屾瘡绔犻兘浠庡彸椤碉紙濂囨暟椤碉級寮濮嬨 濡傛灉甯屾湜鏀规垚涓绔犲彲浠ヤ粠浠绘剰椤靛紑濮嬶紝鍙互杩欐牱璁剧疆锛 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \documentclass[openany, ...]{pkuthss} % 姣忕珷浠庝换鎰忛〉寮濮嬨 \end{Verbatim} @@ -153,7 +152,7 @@ \subsection{璁惧畾鏂囨。淇℃伅鐨勫懡浠 杩欎竴绫诲懡浠ょ殑璇硶涓 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \commandname{鍏蜂綋淇℃伅} % commandname 涓哄叿浣撳懡浠ょ殑鍚嶇О銆 \end{Verbatim} @@ -176,7 +175,7 @@ \end{itemize} 渚嬪锛屽鏋滆璁惧畾涓撲笟涓衡滃寲瀛︹濓紙鈥淐hemistry鈥濓級锛屽垯鍙互浣跨敤浠ヤ笅鍛戒护锛 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \cmajor{鍖栧} \emajor{Chemistry} \end{Verbatim} @@ -184,7 +183,7 @@ \subsection{鑷韩瀛樺偍鏂囨。淇℃伅鐨勫懡浠 杩欎竴绫诲懡浠ょ殑璇硶涓 -\begin{Verbatim}[frame = single] +\begin{Verbatim} % commandname 涓哄叿浣撶殑鍛戒护鍚嶃 \renewcommand{\commandname}{鍏蜂綋淇℃伅} \end{Verbatim} @@ -202,7 +201,7 @@ 渚嬪锛 濡傛灉瑕佽瀹氳鏂囩殑绫诲埆涓衡滄湰绉戠敓姣曚笟璁烘枃鈥濓紙鈥淯ndergraduate Thesis鈥濓級锛 鍒欏彲浠ヤ娇鐢ㄤ互涓嬪懡浠わ細 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \renewcommand{\cthesisname}{鏈鐢熸瘯涓氳鏂噠 \renewcommand{\ethesisname}{Undergraduate Thesis} \end{Verbatim} @@ -210,7 +209,7 @@ \subsection{浠モ渒ey = value鈥濇牸寮忚缃枃妗ｄ俊鎭瘆 鐢ㄦ埛鍙互閫氳繃 \verb|\pkuthssinfo| 鍛戒护闆嗕腑璁惧畾鏂囨。淇℃伅锛屽叾璇硶涓猴細 -\begin{Verbatim}[frame = single] +\begin{Verbatim} % key1銆乲ey2銆乿alue1銆乿alue2 绛変负鍏蜂綋鏂囨。淇℃伅鐨勯」鐩悕鍜屽唴瀹广 \pkuthssinfo{key1 = value1, key2 = value2, ...} \end{Verbatim} @@ -224,7 +223,7 @@ } 渚嬪锛屽墠闈㈡彁鍒扮殑鏂囨。淇℃伅鐨勮缃彲浠ラ泦涓湴鍐欐垚锛 -\begin{Verbatim}[frame = single, tabsize = 4] +\begin{Verbatim} \pkuthssinfo{ ..., % 鈥...鈥濅唬琛ㄥ叾瀹冪殑璁惧畾銆 cthesisname = {鏈鐢熸瘯涓氳鏂噠, @@ -260,46 +259,46 @@ \section{浠庡叾瀹冩枃妗ｇ被鍜屽畯鍖呯户鎵跨殑鍔熻兘}\label{sec:thirdparty} -pkuthss 鏂囨。绫诲缓绔嬪湪 ctexbook\supercite{ctex} 鏂囨。绫讳箣涓婏紝 -骞惰皟鐢ㄤ簡 geometry\supercite{geometry}銆乫ancyhdr\supercite{fancyhdr}銆% -hyperref\supercite{hyperref}銆乬raphicx\supercite{graphicx} -鍜 ulem\supercite{ulem} 绛夊嚑涓畯鍖呫 +pkuthss 鏂囨。绫诲缓绔嬪湪 ctexbook\cupercite{ctex} 鏂囨。绫讳箣涓婏紝 +骞惰皟鐢ㄤ簡 geometry\cupercite{geometry}銆乫ancyhdr\cupercite{fancyhdr}銆% +hyperref\cupercite{hyperref}銆乬raphicx\cupercite{graphicx} +鍜 ulem\cupercite{ulem} 绛夊嚑涓畯鍖呫 鍥犳锛宑texbook 鏂囨。绫诲拰杩欎簺瀹忓寘鎵鎻愪緵鐨勫姛鑳藉潎鍙互浣跨敤銆 渚嬪锛岀敤鎴峰鏋滄兂灏嗙洰褰曠殑鏍囬鏀逛负鈥滅洰{\quad\quad}褰曗濓紝 鍒欏彲浠ヤ娇鐢 ctexbook 鏂囨。绫绘彁渚涚殑 \verb|\ctexset| 鍛戒护锛 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \ctexset[contentsname = {鐩畕\quad\quad}褰晑] \end{Verbatim} 鍦ㄩ粯璁ょ殑閰嶇疆涓嬶紝% -pkuthss 鏂囨。妯＄増浣跨敤浣滆呯紪鍐欑殑 biblatex\supercite{biblatex} 鏍峰紡% -\mbox{\supercite{biblatex-caspervector}}杩涜鍙傝冩枃鐚拰寮曠敤鐨勬帓鐗堬紝 +pkuthss 鏂囨。妯＄増浣跨敤浣滆呯紪鍐欑殑 biblatex\cupercite{biblatex} 鏍峰紡% +\cupercite{biblatex-caspervector}杩涜鍙傝冩枃鐚拰寮曠敤鐨勬帓鐗堬紝 鐢ㄦ埛鍙互浣跨敤瀹冧互鍙 biblatex 鏈韩鎵鎻愪緵鐨勫姛鑳姐 渚嬪锛岀敤鎴峰彲浠ュ垎鍒娇鐢 \verb|\cite|銆乗verb|\parencite| 鍜 \verb|\supercite| 鐢熸垚鏈牸寮忓寲鐨勩佸甫鏂规嫭鍙风殑鍜屼笂鏍囦笖甯︽柟鎷彿鐨勫紩鐢ㄦ爣璁帮細 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \cite{ctex}锛孿parencite{ctex}锛孿supercite{ctex} \end{Verbatim} 鍦ㄦ湰鏂囦腑灏嗕骇鐢熲淺cite{ctex}锛孿parencite{ctex}锛孿supercite{ctex}鈥濄 -灏辩洰鍓嶈岃█锛屽湪\myemph{闄 3.0--3.3 涔嬪鐗堟湰鐨剗 biblatex 涓紝 -閫氳繃鏇村鏉傜殑璁剧疆锛岃繕鍙互婊¤冻渚嬪琚紩鐢ㄧ殑鏂囩尞鎸夌収寮曠敤椤哄簭鎺掑簭锛 +灏辩洰鍓嶈岃█锛屽湪 biblatex 涓紝閫氳繃鏇村鏉傜殑璁剧疆锛 +杩樺彲浠ユ弧瓒充緥濡傝寮曠敤鐨勬枃鐚寜鐓у紩鐢ㄩ『搴忔帓搴忥紝 鑰屾湭寮曠敤鐨勬枃鐚寜鐓цタ鏂囨枃鐚湪鍓嶃佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇姹傦紝 -璇﹁ biblatex-caspervector 鐨勬枃妗supercite{biblatex-caspervector}銆 +璇﹁ biblatex-caspervector 鐨勬枃妗cupercite{biblatex-caspervector}銆 闄ゆ涔嬪锛宲kuthss 鏂囨。绫昏繕鍙兘璋冪敤浠ヤ笅杩欎簺瀹忓寘锛 \begin{itemize} \item 鍚敤 \verb|pkufont| 閫夐」鏃朵細璋冪敤 - newtxtext 鍜 newtxmath\supercite{newtx} 瀹忓寘锛 - 鍚﹀垯浼氳皟鐢 latexsym\supercite{latexsym} 瀹忓寘銆 + newtxtext 鍜 newtxmath\cupercite{newtx} 瀹忓寘锛 + 鍚﹀垯浼氳皟鐢 latexsym\cupercite{latexsym} 瀹忓寘銆 \item 鍚敤 \verb|pkufoot| 閫夐」鏃朵細璋冪敤 - tikz\supercite{tikz} 鍜 scrextend\supercite{scrextend} 瀹忓寘銆 + tikz\cupercite{tikz} 鍜 scrextend\cupercite{scrextend} 瀹忓寘銆 \item 鍚敤 \verb|pkuspace| 閫夐」鏃朵細璋冪敤 - tocloft\supercite{tocloft}銆乧aption\supercite{caption} 鍜 - subcaption\supercite{subcaption} 瀹忓寘銆 + tocloft\cupercite{tocloft}銆乧aption\cupercite{caption} 鍜 + subcaption\cupercite{subcaption} 瀹忓寘銆 \item 鍚敤 \verb|spacing| 閫夐」鏃朵細璋冪敤 setspace 鍜 - enumitem\supercite{enumitem} 瀹忓寘銆 + enumitem\cupercite{enumitem} 瀹忓寘銆 \end{itemize} 鍥犳鍦ㄥ惎鐢ㄧ浉搴旈夐」鏃讹紝鐢ㄦ埛鍙互浣跨敤瀵瑰簲瀹忓寘鎵鎻愪緵鐨勫姛鑳姐 @@ -311,7 +310,7 @@ pkuthss 鏂囨。妯＄増鐨勫疄鐜版槸绠娲併佹竻鏅般佺伒娲荤殑銆 閫氳繃淇敼 pkuthss 鏂囨。绫荤殑婧愭枃浠惰繘琛岃嚜瀹氫箟銆 鍦ㄧ洰鍓嶅父鐢ㄧ殑 \hologo{TeX} 绯荤粺涓紝 鍋囪 pkuthss 鐨勮鏄庢枃妗ｆ墍鍦ㄧ洰褰曞叿鏈変笅杩板舰寮忕殑璺緞锛 -\begin{Verbatim}[frame = single] +\begin{Verbatim} # 璇存槑鏂囨。鎵鍦ㄧ洰褰曪紙$TEXMFDIST 鐨勫舰寮忚涓嬮潰鍑犺锛夛細 $TEXMFDIST/doc/latex/pkuthss/ # 鑻ョ敤鎴蜂娇鐢 Windows 涓嬬殑 TeX Live 绯荤粺锛屽垯 $TEXMFDIST 涓鑸被浼间簬锛 @@ -320,7 +319,7 @@ C:\texlive\2015\texmf-dist /usr/local/texlive/2015/texmf-dist \end{Verbatim} 鍒欏叾婧愭枃浠舵墍鍦ㄧ洰褰曞簲璇ヤ綅浜庝互涓嬬洰褰曪細 -\begin{Verbatim}[frame = single] +\begin{Verbatim} $TEXMFDIST/tex/latex/pkuthss/ \end{Verbatim} @@ -340,16 +339,16 @@ $TEXMFDIST/tex/latex/pkuthss/ 姝ゆ椂锛岀敤鎴峰彲浠ヤ慨鏀 \verb|pkuthss.cls| 閲 \verb|\maketitle| 瀹氫箟涓 \verb|\thss@int@fillinblank| 瀹忕殑鍙傛暟鏉ユ敼鍙 甯︿笅鍒掔嚎鐨勭┖鐧界殑琛屾暟鍜岃瀹斤紝鍏惰娉曚负锛 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \thss@int@fillinblank{琛屾暟}{琛屽}{鍐呭} \end{Verbatim} 渚嬪锛屽鏋溾滅爺绌舵柟鍚戔濅竴鏍忛渶瑕佷袱琛岀殑绌虹櫧锛 鍙互灏 \verb|pkuthss.cls| 閲岀殑 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \thss@int@fillinblank{1}{\thss@tmp@len}{\kaishu\@direction} \end{Verbatim} 鏀逛负 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \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 bde028dd985..77de4b04611 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,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2018 Casper Ti. Vector +% Copyright (c) 2010-2019 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 @@ -46,7 +46,7 @@ 鍙兘寮曡捣涓浜涢棶棰橈紝璇﹁绗 \ref{sec:req} 鑺傘 Windows 鎵瑰鐞嗗浜 LF锛圽texttt{\string\n}锛夋崲琛岀殑鎵瑰鐞嗘枃浠舵敮鎸佹湁闂锛 -瑙ｅ喅鏂瑰紡瑙佺 \ref{sec:compile} 鑺傘 +璇婃柇鏂瑰紡瑙佺 \ref{sec:compile} 鑺傘 Windows 鐨勨滆浜嬫湰鈥濈▼搴忓湪鏌ョ湅 LF锛圽texttt{\string\n}锛 鎹㈣鐨勬枃鏈枃浠舵椂瀛樺湪鐫涓浜涢棶棰橈紝 鍥犳寤鸿鐢ㄦ埛浣跨敤鏀寔 LF 鎹㈣鐨勬枃鏈紪杈戝櫒缂栬緫鏂囦欢锛 @@ -54,41 +54,22 @@ Windows 鐨勨滆浜嬫湰鈥濈▼搴忓湪鏌ョ湅 LF锛圽texttt{\string\n}锛 \section{涓婃父瀹忓寘鍙兘寮曡捣鐨勯棶棰榼 -biblatex\supercite{biblatex} 瀹忓寘浼氳嚜琛岃瀹 \verb|\bibname|锛 +biblatex\cupercite{biblatex} 瀹忓寘浼氳嚜琛岃瀹 \verb|\bibname|锛 鏁呬細瑕嗙洊閫氳繃 \verb|\ctexset| 璁惧畾鐨勫弬鑰冩枃鐚垪琛ㄦ爣棰樸 浣跨敤 biblatex 鐨勭敤鎴峰彲浠ヤ娇鐢 \verb|\printbibliography| 鐨 \verb|title| 閫夐」鏉ユ墜鍔ㄨ瀹氬弬鑰冩枃鐚垪琛ㄧ殑鏍囬锛屼緥濡傦細 -\begin{Verbatim}[frame = single] +\begin{Verbatim} \printbibliography[title = {鏂囩尞}, ...] % 鈥...鈥濅负鍏跺畠閫夐」銆 \end{Verbatim} -hyperref\supercite{hyperref} 瀹忓寘鍜屼竴浜涘畯鍖呭彲鑳藉彂鐢熷啿绐併 +hyperref\cupercite{hyperref} 瀹忓寘鍜屼竴浜涘畯鍖呭彲鑳藉彂鐢熷啿绐併 鍏充簬濡備綍閬垮厤杩欎簺鍐茬獊锛 鍙互鍙傝 hyperref 瀹忓寘 README 鏂囦欢涓殑鈥淧ackage Compatibility鈥濅竴鑺傘 姝ゆ枃浠堕氬父鍜屾墽琛 \verb|texdoc hyperref| 鏃舵墦寮鐨 pdf 鏂囦欢浣嶄簬鍚屼竴鐩綍涓 -浣跨敤 \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 骞冲彴鐨勶級鐢ㄦ埛閲囩敤浜嗚嚜瀹氫箟鐨 -锛堝寘鎷ぇ灏忓啓涓嶅悓浜庡師鏂囦欢鐨勶級瀛椾綋鏂囦欢鍚嶏紝 -骞舵敼鍔 \verb|ctex.cfg| 绛夐厤缃枃浠朵箣鍚庢病鏈夊湪璋冪敤 -pkuthss 鏂囨。绫绘椂鍔犲叆 \verb|nofonts| 閫夐」锛 -鍙堜娇鐢 \verb|xelatex| 缂栬瘧閫犳垚鐨勶紝浣跨敤 -\begin{Verbatim}[frame = single] -\documentclass[nofonts, ...]{pkuthss} % 鈥...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆 -\end{Verbatim} -鍗冲彲瑙ｅ喅姝ら棶棰樸 - biber 杩愯鏃舵湁涓瀹氭鐜囧嚭鐜板舰濡傦紙鐩綍鍚嶅彲鑳界◢鏈変笉鍚岋級 -\begin{Verbatim}[frame = single, fontsize = {\small}] +\begin{Verbatim} data source .../par-xxxxxxxx/cache-xxxxxxxx/ inc/lib/Biber/LaTeX/recode_data.xml not found in . \end{Verbatim} @@ -98,25 +79,29 @@ data source .../par-xxxxxxxx/cache-xxxxxxxx/ 閬囧埌杩欑鎯呭喌鏃讹紝鍒犻櫎鎺変笂杩颁复鏃剁洰褰曞強鍏舵墍鏈夊唴瀹癸紝 鍐嶉噸鏂拌繍琛 biber 閫氬父渚垮彲瑙ｅ喅闂銆 -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. +灏辩洰鍓嶈岃█锛宎msthm\cupercite{amsthm} 瀹忓寘鍦ㄥ悗浜 newtxmath\cupercite{newtx} +瀹忓寘琚皟鐢ㄦ椂浼氬鑷翠互涓嬬殑閿欒锛 +\begin{Verbatim} +! LaTeX Error: Command \openbox already defined. + Or name \end... illegal, see p.192 of the manual. +\end{Verbatim} +瑙ｅ喅姝ら棶棰樼殑鏈绠鍗曟柟娉曟槸鍦ㄩ氳繃 +\begin{Verbatim} +\usepackage{amsthm} +\end{Verbatim} +璋冪敤 amsthm 瀹忓寘涔嬪墠鍔犲叆浠ヤ笅鍛戒护锛 +\begin{Verbatim} +\let\openbox\relax \end{Verbatim} -pkuthss 鏂囨。妯＄増鍩轰簬 ctexbook 鏂囨。绫伙紝鑰屽悗鑰呭熀浜庢爣鍑嗙殑 book 鏂囨。绫伙紝 -鍥犳杩欎釜璀﹀憡骞朵笉褰卞搷鐢ㄦ埛姝ｅ父浣跨敤\footnote{% - \url{http://bbs.ctex.org/forum.php?mod=redirect&goto=findpost&ptid=63117&pid=402145}.% -}銆 \section{鏂囨。鏍煎紡鍙兘瀛樺湪鐨勯棶棰榼 -瀛︽牎瀵瑰浣嶈鏂囨牸寮忕殑瑙勫畾\mbox{\supercite{pku-thesisstyle}}% +瀛︽牎瀵瑰浣嶈鏂囨牸寮忕殑瑙勫畾\cupercite{pku-thesisstyle}% 鏄剧劧娌℃湁鑰冭檻鍒伴潪 MS Word 绫绘帓鐗堝伐鍏风殑宸ヤ綔鏂瑰紡锛 鍥犳 pkuthss 鏂囨。妯＄増鍙槸瀵瑰叾瑕佹眰鐨勬牸寮忚繘琛屾ā浠匡紝 鑰屽湪涓浜涘皬鐨勭粏鑺備笂鍙兘鏈夋墍鍑哄叆銆 -biblatex-caspervector\supercite{biblatex-caspervector} 鎵瀹炵幇鐨勬牸寮忓拰 +biblatex-caspervector\cupercite{biblatex-caspervector} 鎵瀹炵幇鐨勬牸寮忓拰 \parencite{pku-thesisstyle} 鐨勮瀹氬苟涓嶄竴鑷达紝 浣嗗叾浣滆呮殏鏃舵病鏈夌簿鍔涗篃涓嶆効鎰忓幓瀹炵幇鍚庤呮墍瑙勫畾鐨勬瘮鍘熸牸寮忔洿涓戦檵寰楀鐨勬牸寮忋 @@ -124,7 +109,7 @@ biblatex-caspervector\supercite{biblatex-caspervector} 鎵瀹炵幇鐨勬牸寮忓拰 鍏充簬 pkuthss 鏂囨。妯＄増鐨勬剰瑙佸拰寤鸿锛 璇峰湪鍖楀ぇ鏈悕 BBS 鐨 MathTools 鐗堟垨 pkuthss 椤圭洰涓婚〉鐨 issue tracker% -\footnote{\url{https://gitlab.com/CasperVector/pkuthss/issues}.}% +\footnote{\url{https://gitea.com/CasperVector/pkuthss/issues}.}% 涓婃彁鍑猴紝 鎴栭氳繃鐢靛瓙閭欢\footnote% {\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.}% diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex index 74b2cc186a6..736ee4c2980 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex @@ -31,14 +31,14 @@ 鐗堟潈鎵鏈 \copyright\ 2008--2009 solvethis \par -鐗堟潈鎵鏈 \copyright\ 2010--2017 Casper Ti. Vector +鐗堟潈鎵鏈 \copyright\ 2010--2019 Casper Ti. Vector \vskip 1em pkuthss 鏂囨。绫诲強鍏惰鏄庢枃妗ｅ潎浠 \hologo{LaTeX} Project Public License 鍙戝竷銆 闅 pkuthss 鎻愪緵鐨勬ā鐗堟簮浠ｇ爜涓紝闄や互涓嬫枃浠 \begin{itemize} - \item \verb|chap/copyright.tex| - \item \verb|chap/originauth.tex| + \item \verb|chap/copy.tex| + \item \verb|chap/origin.tex| \end{itemize} 浠 New BSD License 鍙戝竷锛 浠ュ強鍙傝冩枃鐚拰寮曠敤鍒楄〃浣跨敤鐨勬牱寮忔枃浠剁増鏉冨０鏄庤鐩稿簲鏂囦欢涓鏄庝互澶栵紝 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 30c397b6e1f..f87f67472f0 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 @@ -30,14 +30,10 @@ \raggedbottom \section{1.3 鐗堜互鍚庣殑鏇存柊璁板綍} -\VerbatimInput[ - tabsize = 4, fontsize = {\small}, baselinestretch = 1 -]{ChangeLog.txt} +\VerbatimInput{ChangeLog.txt} \section{1.3 鍙婂叾浠ュ墠鐗堟湰鐨勬洿鏂拌褰晑 -\VerbatimInput[ - tabsize = 4, fontsize = {\small}, baselinestretch = 1.1 -]{ChangeLog-upto-1.3.txt} +\VerbatimInput[baselinestretch = 1.1]{ChangeLog-upto-1.3.txt} \flushbottom diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex index db16f7776be..c5485c2a3fc 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex @@ -1,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector +% Copyright (c) 2010-2012,2014-2015,2018-2019 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 @@ -33,7 +33,7 @@ pkuthss 鏂囨。妯＄増鐢变笁閮ㄥ垎鏋勬垚锛 \begin{itemize} \item \textbf{pkuthss 鏂囨。绫粆锛 - 鍏朵腑鏍规嵁瀛︽牎鐨勬牸寮忚鑼僜mbox{\supercite{pku-thesisstyle}}% + 鍏朵腑鏍规嵁瀛︽牎鐨勬牸寮忚鑼僜cupercite{pku-thesisstyle}% 瀹炵幇浜嗗浣嶈鏂囨墍闇鐨勫熀鏈牸寮忚姹傦紝 涓昏鍖呮嫭瀵规帓鐗堟牸寮忕殑璁惧畾鍜屾彁渚涜缃鏂囦俊鎭殑鍛戒护锛 姝ゅ涔熷疄鐜颁簡瀛︿綅璁烘枃涓敤鎴峰彲鑳借緝澶氱敤鍒扮殑涓浜涢澶栧姛鑳斤紝 @@ -43,7 +43,7 @@ pkuthss 鏂囨。妯＄増鐢变笁閮ㄥ垎鏋勬垚锛 璇存槑鏂囨。鍗虫湰鏂囨。锛 鍦ㄥ畨瑁咃紙瑙佺 \ref{sec:req} 鑺傦級涔嬪悗搴旇鍙互鐢 \hologo{TeX} 绯荤粺鎻愪緵鐨 \verb|texdoc| 鍛戒护璋冨嚭锛 -\begin{Verbatim}[frame = single] +\begin{Verbatim} texdoc pkuthss \end{Verbatim} \item \textbf{璁烘枃妯＄増}锛 @@ -52,16 +52,16 @@ texdoc pkuthss 鐢ㄦ埛鍙』鎸夌収妯＄増涓殑妗嗘灦淇敼浠ｇ爜锛屽嵆鍙啓鍑鸿嚜宸辩殑璁烘枃銆 \end{itemize} -鍦ㄦ涔嬪墠锛屽寘鎷 dypang\supercite{dypang}銆丗erretL\supercite{FerretL}銆% -lwolf\supercite{lwolf}銆丩angpku\supercite{Langpku}銆% -solvethis\supercite{solvethis} 绛夌殑鏁颁綅缃戝弸鍧囧仛杩囧浣嶈鏂囨ā鐗堢殑宸ヤ綔銆 +鍦ㄦ涔嬪墠锛屽寘鎷 dypang\cupercite{dypang}銆丗erretL\cupercite{FerretL}銆% +lwolf\cupercite{lwolf}銆丩angpku\cupercite{Langpku}銆% +solvethis\cupercite{solvethis} 绛夌殑鏁颁綅缃戝弸鍧囧仛杩囧浣嶈鏂囨ā鐗堢殑宸ヤ綔銆 鏈鏂囨ā鐗堟槸 solvethis 鐨 pkuthss 妯＄増鐨勬洿鏂扮増鏈紝 鏇存柊鐨勯噸鐐规槸閲嶆瀯鍜屽鏂版枃妗ｇ被銆佸畯鍖呯殑鏀寔銆 pkuthss 鏂囨。妯＄増鐜板湪鐨勭淮鎶よ呮槸 Casper Ti. Vector\footnote% {\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.}銆% -pkuthss 鏂囨。妯＄増鐩墠鎵樼鍦 GitLab 涓婏紝 +pkuthss 鏂囨。妯＄増鐩墠鎵樼鍦 Gitea 涓婏紝 鍏堕」鐩富椤垫槸锛歕\ -\hspace*{\parindent}\url{https://gitlab.com/CasperVector/pkuthss} +\hspace*{\parindent}\url{https://gitea.com/CasperVector/pkuthss} % vim:ts=4:sw=4 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/latexmkrc b/Master/texmf-dist/doc/latex/pkuthss/readme/latexmkrc new file mode 100644 index 00000000000..0f25b84f672 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/latexmkrc @@ -0,0 +1,10 @@ +# Copyright (c) 2019 Casper Ti. Vector +# Public domain. + +@default_files = ('pkuthss'); +$pdf_mode = 5; +$dvipdf = "dvipdfmx %O -o %D %S"; +$bibtex_use = 1.5; +$biber = "biber -l zh__pinyin --output-safechars %O %S"; +$clean_ext = "run.xml"; + diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch index a4c13c03574..67174bdfbc1 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch @@ -1,12 +1,12 @@ diff --git a/doc/example/chap/abs.tex b/doc/example/chap/abs.tex -index b930654..cfa6cd3 100644 +index 305792f..cfa6cd3 100644 --- a/doc/example/chap/abs.tex +++ b/doc/example/chap/abs.tex @@ -2,7 +2,7 @@ % Public domain. \begin{cabstract} -- \pkuthssffaq % 涓枃娴嬭瘯鏂囧瓧 +- \pkuthssffaq % 涓枃娴嬭瘯鏂囧瓧銆 + 涓枃鎽樿銆 \end{cabstract} @@ -100,13 +100,14 @@ index ac5b0c9..9d2ad60 100644 - % vim:ts=4:sw=4 diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex -index d7a575f..baed091 100644 +index 30e05de..4d6ee53 100644 --- a/doc/example/thesis.tex +++ b/doc/example/thesis.tex -@@ -14,53 +14,44 @@ - % 鍏跺畠鐢ㄦ埛涓嶇敤鍔犲叆 nofonts 閫夐」锛屽姞鍏ヤ箣鍚庡弽鑰屼細浜х敓閿欒銆 - \documentclass[UTF8]{pkuthss} - +@@ -16,54 +16,44 @@ + % 濡傛灉鐨勭‘椤昏浣胯剼娉ㄦ寜椤电紪鍙风殑璇濓紝鍙互鍘绘帀鍚庨潰 footmisc 鍖呯殑娉ㄩ噴銆 + % 娉ㄦ剰锛氬湪鍚敤姝よ瀹氱殑鎯呭喌涓嬶紝鍙兘瑕佸缂栬瘧涓娆′互浜х敓姝ｇ‘鐨勮剼娉ㄧ紪鍙枫 + %\usepackage[perpage]{footmisc} +- -% 浣跨敤 biblatex 鎺掔増鍙傝冩枃鐚紝骞惰瀹氬叾鏍煎紡锛堣瑙 biblatex-caspervector 鐨勬枃妗ｏ級銆 -% 杩欓噷鎸夌収瑗挎枃鏂囩尞鍦ㄥ墠锛屼腑鏂囨枃鐚湪鍚庢帓搴忥紙鈥渟orting = ecnyt鈥濓級锛 -% 鑻ラ』鎸夌収涓枃鏂囩尞鍦ㄥ墠锛岃タ鏂囨枃鐚湪鍚庢帓搴忥紝璇疯缃渟orting = cenyt鈥濓紱 @@ -116,10 +117,10 @@ index d7a575f..baed091 100644 +% 浣跨敤 biblatex 鎺掔増鍙傝冩枃鐚紝骞惰瀹氬叾鏍煎紡锛堣瑙 biblatex 鐨勬枃妗ｏ級銆 +\usepackage[backend = biber]{biblatex} - % 鎸夊鏍¤姹傝瀹氬弬鑰冩枃鐚垪琛ㄤ腑鐨勬潯鐩箣鍐呭強涔嬮棿鐨勮窛绂汇 - \setlength{\bibitemsep}{3bp} % 瀵逛簬 linespread 鍊肩殑璁＄畻杩囩▼鏈夊叴瓒ｇ殑鍚屽鍙互鍙傝 pkuthss.cls銆 \renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont} + % 鎸夊鏍¤姹傝瀹氬弬鑰冩枃鐚垪琛ㄧ殑娈甸棿璺濄 + \setlength{\bibitemsep}{3bp} +\ctexset{ + contentsname = {Contents}, @@ -180,21 +181,12 @@ index d7a575f..baed091 100644 \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 +index b699685..e4e58b6 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 + [2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding for the pkuthss document class] -\def\label@ctitle{棰樼洰锛殅 @@ -215,10 +207,10 @@ index c2c951b..d453918 100644 \def\label@ckeywords{鍏抽敭璇嶏細} \def\label@ekeywords{KEYWORDS:\ } diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls -index 6208799..a785d69 100644 +index 9e68dc3..4b8cb00 100644 --- a/tex/pkuthss.cls +++ b/tex/pkuthss.cls -@@ -300,7 +300,7 @@ +@@ -301,7 +301,7 @@ \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp} \fancyfoot[C]{\zihao{5}\normalfont{\thepage}} \if@twoside @@ -227,49 +219,49 @@ index 6208799..a785d69 100644 \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 +@@ -347,13 +347,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}\linespread{1.6}\selectfont% +- \thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}% ++ \thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@etitle}}% + } + \vfill + % Information about the author. +@@ -361,19 +361,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 ea9e83124ae..a85359a66e1 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib @@ -1,3 +1,14 @@ +@online{amsthm, + author = {{Publications Technical Group, American Mathematical Society}}, + title = {Using the amsthm Package}, + edition = {Ver.\ 2.20.3}, + type = {M/OL}, + date = {2017-09}, + url = {https://ctan.org/pkg/amsthm}, + urldate = {2019-11-15}, + language = {english}, +} + @online{biber, author = {Kime, Philip and Charette, Fran\c{c}ois}, title = {Biber: A backend bibliography processor for biblatex}, diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex index bf0cd252a0f..70989bac571 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex @@ -1,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016,2018 Casper Ti. Vector +% Copyright (c) 2010-2016,2018-2019 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,18 +31,25 @@ backend = biber, style = caspervector, utf8, sorting = ecnyt, giveninits = true, sortgiveninits = true ]{biblatex} -\usepackage{fancyvrb, hologo} +\usepackage{iftex, fancyvrb, hologo} -\setlength{\hfuzz}{3pt} +\hypersetup{colorlinks = true, allcolors = blue} \ctexset{linestretch = 2\ccwd} -\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont} +\setlength{\hfuzz}{3pt} \setlength{\bibitemsep}{3bp} +\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont} -\hypersetup{colorlinks = true, allcolors = blue} +\newcommand*{\cupercite}[1]{\supercite{#1}\mbox{}} \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} \newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}} -\newcommand{\docversion}{v1.8.0} +\RecustomVerbatimEnvironment{Verbatim}{Verbatim}% + {frame = single, tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}} +\RecustomVerbatimCommand{\VerbatimInput}{VerbatimInput}{ + fontsize = {\small}, baselinestretch = 1, + tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi} +} +\newcommand*{\docversion}{v1.8.0} \pkuthssinfo{ cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis}, ctitle = {鍖椾含澶у瀛︿綅璁烘枃妯＄増\\pkuthss \docversion}, @@ -53,7 +60,7 @@ cauthor = {鐩栬尐娉⒙烽挍路缁村厠鎵榼, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {\zhdigits{2018}骞碶zhnumber{7}鏈坿, + date = {\zhdigits{2019} 骞 \zhnumber{11} 鏈坿, school = {鍖栧涓庡垎瀛愬伐绋嬪闄, cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry ... ?}, direction = {鎹 Casper 鑷繁涔熶笉鐭ラ亾}, diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf Binary files differindex 4d4fd3a58a5..629fab21e05 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 8c39301e69c..8ebb0f6ea20 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def @@ -22,7 +22,7 @@ % pkuword.eps \ProvidesFile{pkuthss-gbk.def} - [2018/07/02 v1.8.0 Labels and captions in GBK encoding + [2019/11/15 v1.8.1 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 b6996850e46..64cbcf129b5 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def @@ -22,7 +22,7 @@ % pkuword.eps \ProvidesFile{pkuthss-utf8.def} - [2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding + [2019/11/15 v1.8.1 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 9e68dc3585c..0e0c766eec1 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls @@ -1,7 +1,7 @@ % Peking University dissertation document class % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2018 Casper Ti. Vector +% Copyright (c) 2010-2019 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 @@ -23,7 +23,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2018/07/02 v1.8.0 Peking University dissertation document class] + [2019/11/15 v1.8.1 Peking University dissertation document class] % eg. `\thss@int@boolopt{spacing}{true}' will expand to: % \newif\ifthss@opt@spacing \thss@opt@spacingtrue @@ -65,6 +65,9 @@ % Prevent fontspec (loaded by xeCJK) from interfering with newtxmath. \ifthss@opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi +% Work around the `\lvert already defined' error. +% cf. <https://github.com/CTeX-org/ctex-kit/issues/454>. +\ifthss@opt@pkufont\RequirePackage{amsmath}\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. @@ -123,7 +126,7 @@ } % Use circled numbers as footnote symbols. Does not affect title page, but % footnote is rarely used in dissertation covers ;) - \renewcommand\thefootnote% + \renewcommand*{\thefootnote}% {\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. @@ -167,7 +170,7 @@ \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]{% + \newcommand{\specialchap}[1]{% \chapter*{#1}\addcontentsline{toc}{chapter}{#1} \markboth{#1}{}\phantomsection% } @@ -201,7 +204,7 @@ \let\thss@tmp@maketitle\maketitle % NOTE: `\hypersetup' must appear before `\maketitle', otherwise it might % not act as expected. - \renewcommand\maketitle{\setpdfproperties\thss@tmp@maketitle} + \renewcommand{\maketitle}{\setpdfproperties\thss@tmp@maketitle} \fi } @@ -244,7 +247,7 @@ % Set up page layout. \geometry{ a4paper, hmargin = 2.6cm, top = 2.92cm, bottom = 3.03cm, - headheight = 0.45cm, headsep = 0.55cm, footskip = 1.05cm + headheight = 0.45cm, headsep = 0.59cm, footskip = 1.05cm } % Set up chapter/section/... captions. @@ -259,11 +262,11 @@ beforeskip = {0bp}, afterskip = {18bp plus 0.2ex}, nameformat = {}, titleformat = {} }, section = - {beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}}, + {beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}}, subsection = - {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}}, + {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}}, subsubsection = - {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}} + {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}} } \ifthss@opt@ugly \ctexset{ @@ -341,7 +344,7 @@ \renewcommand{\maketitle}{% \thss@int@pdfmark{\titlepagename}{titlepage} % Make the title page centered. - \begin{titlepage}\begin{center} + \begin{titlepage}\begingroup\centering % Emblem and inscription of the university, and type of thesis. {% \zihao{1}% @@ -379,7 +382,7 @@ \vfill % Date. {\zihao{-2}\@date} - \end{center}\end{titlepage}% + \par\endgroup\end{titlepage}% } % Typeset the Chinese abstract. diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf Binary files differindex d8bfa5fd174..e38fdcef3e1 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf |