diff options
28 files changed, 177 insertions, 163 deletions
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Make.bat index 1fae167b28d..a32a482514d 100755 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Make.bat @@ -11,14 +11,10 @@ set JOBNAME=thesis set LATEX=latex
@rem 如果无法使用 biber，可以改为“bibtex”。
set BIBTEX=biber -l zh__pinyin
-set GBK2UNI=gbk2uni
set DVIPDF=dvipdfmx
if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOBNAME%
) else (set DODVIPDF=echo No need to run %DVIPDF%.)
-@rem 用 pdflatex 时可能需要使用 gbk2uni 转换 .out 文件编码以防书签乱码。
-if "%LATEX%"=="pdflatex" (@rem set DOGBK2UNI=%GBK2UNI% %JOBNAME%
-) else (set DOGBK2UNI=echo No need to run %GBK2UNI%.)
if "%1"=="" goto doc
if "%1"=="doc" goto doc
if "%1"=="clear" (goto clear) else (goto usage)
@@ -26,7 +22,6 @@ if "%1"=="clear" (goto clear) else (goto usage) :doc
%LATEX% %JOBNAME%
%BIBTEX% %JOBNAME%
-%DOGBK2UNI%
%LATEX% %JOBNAME%
%LATEX% %JOBNAME%
%DODVIPDF%
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Makefile b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Makefile index 2997b3a3432..27cd5e3ade5 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Makefile +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/Makefile @@ -10,7 +10,6 @@ JOBNAME = thesis LATEX = latex # 如果无法使用 biber，可以改为“bibtex”。 BIBTEX = biber -l zh__pinyin -GBK2UNI = gbk2uni DVIPDF = dvipdfmx # 如果用 LaTeX 编译，则使用 dvipdfmx 将 dvi 转成 pdf。 @@ -18,15 +17,6 @@ ifeq ($(LATEX), latex) DODVIPDF = $(DVIPDF) $(JOBNAME) endif -# 使用 GBK 编码和 pdflatex 编译方式时，可能需要使用 gbk2uni 转换 .out -# 文件编码，以防书签乱码。 -ifeq ($(LATEX), pdflatex) - # 考虑到可能有用户未安装 gbk2uni，且有用户使用 UTF-8 编码， - # 默认用“#”注释掉了 DOGBK2UNI 的定义。 - # 用户可以手动取消其注释（去掉下一行中的“#”）。 - #DOGBK2UNI = $(GBK2UNI) $(JOBNAME) -endif - # 区分是 Windows 环境还是类 UNIX 环境。 # 如果是后者，则 GNU make 将可以检测到已经定义 PATH 环境变量。 ifdef PATH @@ -40,7 +30,6 @@ endif doc: $(LATEX) $(JOBNAME) $(BIBTEX) $(JOBNAME) - $(DOGBK2UNI) $(LATEX) $(JOBNAME) $(LATEX) $(JOBNAME) $(DODVIPDF) diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/chap1.tex index b82579c9f19..9c6f2317999 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/chap1.tex @@ -4,5 +4,6 @@ \chapter{章节} -测试一下。 +% 三个命令分别产生未格式化的、带方括号的和上标且带方括号的引用标记。 +测试一下：\cite{test-en}，\parencite{test-zh}，\supercite{test-en, test-zh}。 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.bib b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.bib index e8476794aa8..c8b9ea2dbef 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.bib @@ -1,10 +1,20 @@ -vim:ts=4:sw=4 +% vim:ts=4:sw=4 -@article{test, +@article{test-en, author = {Author}, title = {Title}, type = {J}, journal = {Journal}, date = {2014-04-01}, + language = {english}, +} + +@article{test-zh, + author = {作者}, + title = {标题}, + type = {J}, + journal = {期刊}, + date = {2014-04-01}, + language = {chinese}, } diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex index e5086b65f3a..35ad0537b52 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex @@ -42,7 +42,7 @@ studentid = {0123456789}, date = {某年某月}, school = {某某学院}, - cmajor = {某某专业}, emajor = {Some major}, + cmajor = {某某专业}, emajor = {Some Major}, direction = {某某方向}, cmentor = {某某教授}, ementor = {Prof.\ Somebody}, ckeywords = {某某}, ekeywords = {Something} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Make.bat index 1fae167b28d..a32a482514d 100755 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Make.bat @@ -11,14 +11,10 @@ set JOBNAME=thesis set LATEX=latex
@rem 如果无法使用 biber，可以改为“bibtex”。
set BIBTEX=biber -l zh__pinyin
-set GBK2UNI=gbk2uni
set DVIPDF=dvipdfmx
if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOBNAME%
) else (set DODVIPDF=echo No need to run %DVIPDF%.)
-@rem 用 pdflatex 时可能需要使用 gbk2uni 转换 .out 文件编码以防书签乱码。
-if "%LATEX%"=="pdflatex" (@rem set DOGBK2UNI=%GBK2UNI% %JOBNAME%
-) else (set DOGBK2UNI=echo No need to run %GBK2UNI%.)
if "%1"=="" goto doc
if "%1"=="doc" goto doc
if "%1"=="clear" (goto clear) else (goto usage)
@@ -26,7 +22,6 @@ if "%1"=="clear" (goto clear) else (goto usage) :doc
%LATEX% %JOBNAME%
%BIBTEX% %JOBNAME%
-%DOGBK2UNI%
%LATEX% %JOBNAME%
%LATEX% %JOBNAME%
%DODVIPDF%
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Makefile b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Makefile index e33d92748c6..addafb49f9c 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Makefile +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/Makefile @@ -10,7 +10,6 @@ JOBNAME = thesis LATEX = latex # 濡傛灉鏃犳硶浣跨敤 biber锛屽彲浠ユ敼涓衡渂ibtex鈥濄 BIBTEX = biber -l zh__pinyin -GBK2UNI = gbk2uni DVIPDF = dvipdfmx # 濡傛灉鐢 LaTeX 缂栬瘧锛屽垯浣跨敤 dvipdfmx 灏 dvi 杞垚 pdf銆 @@ -18,15 +17,6 @@ ifeq ($(LATEX), latex) DODVIPDF = $(DVIPDF) $(JOBNAME) endif -# 浣跨敤 GBK 缂栫爜鍜 pdflatex 缂栬瘧鏂瑰紡鏃讹紝鍙兘闇瑕佷娇鐢 gbk2uni 杞崲 .out -# 鏂囦欢缂栫爜锛屼互闃蹭功绛句贡鐮併 -ifeq ($(LATEX), pdflatex) - # 鑰冭檻鍒板彲鑳芥湁鐢ㄦ埛鏈畨瑁 gbk2uni锛屼笖鏈夌敤鎴蜂娇鐢 UTF-8 缂栫爜锛 - # 榛樿鐢ㄢ#鈥濇敞閲婃帀浜 DOGBK2UNI 鐨勫畾涔夈 - # 鐢ㄦ埛鍙互鎵嬪姩鍙栨秷鍏舵敞閲婏紙鍘绘帀涓嬩竴琛屼腑鐨勨#鈥濓級銆 - #DOGBK2UNI = $(GBK2UNI) $(JOBNAME) -endif - # 鍖哄垎鏄 Windows 鐜杩樻槸绫 UNIX 鐜銆 # 濡傛灉鏄悗鑰咃紝鍒 GNU make 灏嗗彲浠ユ娴嬪埌宸茬粡瀹氫箟 PATH 鐜鍙橀噺銆 ifdef PATH @@ -40,7 +30,6 @@ endif doc: $(LATEX) $(JOBNAME) $(BIBTEX) $(JOBNAME) - $(DOGBK2UNI) $(LATEX) $(JOBNAME) $(LATEX) $(JOBNAME) $(DODVIPDF) diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/chap1.tex index 5a0061565d6..691206c7b7d 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/chap1.tex @@ -4,5 +4,6 @@ \chapter{绔犺妭} -娴嬭瘯涓涓嬨 +% 涓変釜鍛戒护鍒嗗埆浜х敓鏈牸寮忓寲鐨勩佸甫鏂规嫭鍙风殑鍜屼笂鏍囦笖甯︽柟鎷彿鐨勫紩鐢ㄦ爣璁般 +娴嬭瘯涓涓嬶細\cite{test-en}锛孿parencite{test-zh}锛孿supercite{test-en, test-zh}銆 diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.bib b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.bib index e8476794aa8..4e8d0fd3e0e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.bib @@ -1,10 +1,20 @@ -vim:ts=4:sw=4 +% vim:ts=4:sw=4 -@article{test, +@article{test-en, author = {Author}, title = {Title}, type = {J}, journal = {Journal}, date = {2014-04-01}, + language = {english}, +} + +@article{test-zh, + author = {浣滆厎, + title = {鏍囬}, + type = {J}, + journal = {鏈熷垔}, + date = {2014-04-01}, + language = {chinese}, } diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex index f209cb8737d..9f97c2a960b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex @@ -42,7 +42,7 @@ studentid = {0123456789}, date = {鏌愬勾鏌愭湀}, school = {鏌愭煇瀛﹂櫌}, - cmajor = {鏌愭煇涓撲笟}, emajor = {Some major}, + cmajor = {鏌愭煇涓撲笟}, emajor = {Some Major}, direction = {鏌愭煇鏂瑰悜}, cmentor = {鏌愭煇鏁欐巿}, ementor = {Prof.\ Somebody}, ckeywords = {鏌愭煇}, ekeywords = {Something} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf Binary files differindex 53b724e0636..9b74a4eea7d 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/example.pdf diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt index 0d42b961414..dbafc76c61e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt @@ -1,4 +1,23 @@ -2014-04-16, v1.5.2 +2014-05-23, v1.5.3 + + * Changes to package code: + - Use `\newcommand*'/`\renewcommand*' when appropriate. + - Fix bookmarks in pdflatex/gbk compilation by introducing xCJK2uni. + + * Changes to example template: + - No longer require gbk2uni. + - Exemplify `\cite', `\parencite' and `\supercite'. + + * Changes to documentation: + - No longer recommend the CTeX Suite. + - Remove install hints (already included in TeX Live). + - Discourage bibtex usage with UTF-8. + - hologo is back, and now we have proper XeLaTeX logo. + + * Misc: + - Minor fixes and improvements. + +2014-04-17, v1.5.2 * Changes to example template: - Barcode moved to current dir instead of (removed) img/. diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/Makefile b/Master/texmf-dist/doc/latex/pkuthss/readme-src/Makefile index f63e6ac9a81..13d068a9067 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/Makefile +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/Makefile @@ -7,7 +7,6 @@ JOBNAME = pkuthss LATEX = latex BIBTEX = biber -l zh__pinyin -GBK2UNI = gbk2uni DVIPDF = dvipdfmx MAKE = make RM = rm -f @@ -15,14 +14,10 @@ RM = rm -f ifeq ($(LATEX), latex) DODVIPDF = $(DVIPDF) $(JOBNAME) endif -ifeq ($(LATEX), pdflatex) - DOGBK2UNI = $(GBK2UNI) $(JOBNAME) -endif doc: $(LATEX) $(JOBNAME) $(BIBTEX) $(JOBNAME) - $(DOGBK2UNI) $(LATEX) $(JOBNAME) $(LATEX) $(JOBNAME) $(DODVIPDF) diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex index 8738ae5e04a..8b620834910 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex @@ -33,8 +33,8 @@ 姝ｇ‘缂栬瘧闇瑕佷互涓嬪嚑閮ㄥ垎锛 \begin{itemize} - \item 涓涓熀鏈殑 \TeX{} 鍙戣鐗堛 - \item CJK 鎴 XeCJK锛堜緵 Xe\LaTeX{} 浣跨敤锛夊畯鍖呫 + \item 涓涓熀鏈殑 \hologo{TeX} 鍙戣鐗堛 + \item CJK 鎴 XeCJK锛堜緵 \hologo{XeLaTeX} 浣跨敤锛夊畯鍖呫 \item ctex 瀹忓寘\supercite{ctex,ctex-faq}锛堟彁渚涗簡 ctexbook 鏂囨。绫伙級銆 \item 涓枃瀛椾綋銆 \item 濡傛灉瑕佷娇鐢 biblatex 杩涜鏂囩尞鍒楄〃鍜屽紩鐢ㄧ殑鎺掔増鐨勮瘽锛 @@ -48,15 +48,15 @@ 浣嗗鏋滀娇鐢ㄧ敱鎵瑰鐞嗗疄鐜扮殑浼淢akefile鈥濆氨涓嶇敤浜嗐 \end{itemize} - \myemph{鏈鏂皚鐨刓myemph{瀹屽叏鐗坿 \TeX{}Live 绯荤粺锛圽myemph{% + \myemph{鏈鏂皚鐨刓myemph{瀹屽叏鐗坿 \hologo{TeX} Live 绯荤粺锛圽myemph{% 娉細 - 鏌愪簺 Linux 鍙戣鐗堣蒋浠朵粨搴撲腑鐨 \TeX{}Live 鏈夐棶棰橈紝 - 寤鸿浣跨敤鐙珛瀹夎鐗堢殑 \TeX{}Live% + 鏌愪簺 Linux 鍙戣鐗堣蒋浠朵粨搴撲腑鐨 \hologo{TeX} Live 鏈夐棶棰橈紝 + 寤鸿浣跨敤鐙珛瀹夎鐗堢殑 \hologo{TeX} Live% \footnote{\url{http://www.tug.org/texlive/}.}銆% - }锛夊拰 \CTeX{} 濂楄閮藉凡缁忓寘鍚櫎涓枃瀛椾綋鍜 Make 涔嬪鎵鏈夎姹傜殑椤圭洰銆% + }锛夐兘宸茬粡鍖呭惈闄や腑鏂囧瓧浣撳拰 Make 涔嬪鎵鏈夎姹傜殑椤圭洰銆% \myemph{% 涓轰簡鑾峰緱鏈濂界殑鏀寔锛 - 鎴戜滑寤鸿鐢ㄦ埛浣跨敤鏈鏂板畬鍏ㄧ増鐨 \TeX{} 绯荤粺鍜屽悇瀹忓寘銆% + 鎴戜滑寤鸿鐢ㄦ埛浣跨敤鏈鏂板畬鍏ㄧ増鐨 \hologo{TeX} 绯荤粺鍜屽悇瀹忓寘銆% } 涓枃瀛椾綋闇瑕佺敤鎴疯嚜琛岃幏寰椼俓myemph{% @@ -78,20 +78,6 @@ \hspace*{\parindent}% \url{http://gnuwin32.sourceforge.net/packages/make.htm} - \section{瀹夎鏂规硶}\label{sec:inst} - - 浣跨敤 \TeX{}Live 鐨勭敤鎴峰彲浠ラ氳繃鍦ㄧ粓绔腑浠ョ鐞嗗憳鏉冮檺鎵ц -\begin{Verbatim}[frame = single] -tlmgr install pkuthss -\end{Verbatim} - 鏉ュ畨瑁 pkuthss 鏂囨。妯＄増銆 - - 浣跨敤 \CTeX{} 濂楄鐨勭敤鎴峰彲浠ラ氳繃鍦ㄥ懡浠ゆ彁绀虹涓墽琛 -\begin{Verbatim}[frame = single] -mpm --install=pkuthss -\end{Verbatim} - 鏉ュ畨瑁 pkuthss 鏂囨。妯＄増銆 - \section{妯＄増鏂囦欢}\label{sec:doc-dir} 鍦ㄦ纭畨瑁 pkuthss 鏂囨。妯＄増涔嬪悗锛屽湪缁堢/鍛戒护鎻愮ず绗︿腑鎵ц @@ -99,7 +85,7 @@ mpm --install=pkuthss texdoc pkuthss \end{Verbatim} 鎵鎵撳紑鐨 pdf 鏂囦欢鎵鍦ㄧ殑鍚屼竴鐩綍涓寘鍚笁涓瓙鐩綍鍜屼袱涓 pdf 鏂囦欢锛 - 鍏朵腑 \verb|doc-src| 涓鸿鏄庢枃妗ｏ紙鍗虫湰鏂囨。锛夌殑婧愪唬鐮侊紝 + 鍏朵腑 \verb|doc-src/| 涓鸿鏄庢枃妗ｏ紙鍗虫湰鏂囨。锛夌殑婧愪唬鐮侊紝 \verb|example-utf8/| 鍜 \verb|example-gbk/| 涓烘ā鐗堟枃妗ｇ殑婧愪唬鐮侊紝 \verb|readme.pdf| 鍜 \verb|example.pdf| 鍒嗗埆涓鸿鏄庢枃妗ｅ拰妯＄増鏂囨。鐨 pdf 鏂囦欢銆 @@ -148,30 +134,33 @@ texdoc pkuthss pkuthss 鏂囨。妯＄増鏀寔涓夌缂栬瘧鏂瑰紡锛屽嵆 \begin{itemize} - \item \LaTeX{} -- dvipdfmx 鏂瑰紡锛歕\ + \item \hologo{LaTeX} -- dvipdfmx 鏂瑰紡锛歕\ 渚濇鎵ц \verb|latex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝% - \verb|latex|锛孿verb|latex| 鍜 \verb|dvipdfmx|銆俓\ - \myemph{% - 娉ㄦ剰锛氶櫎闈炴棤娉曚娇鐢 biber锛屽惁鍒欎笉寤鸿浣跨敤 bibtex銆 - 濡傛灉鐨勭‘瑕佷娇鐢 bibtex锛岃灏 biblatex 瀹忓寘鐨刓texttt{backend} - 閫夐」浠 \texttt{biber} 鏀逛负 \texttt{bibtex}锛 - 鍦 Makefile 涓皢鍙橀噺 \texttt{BIBTEX} 鐨勫兼敼涓 \texttt{bibtex}锛 - 骞跺幓鎺 biblatex 瀹忓寘鍜 \texttt{\string\printbibliography} 鍛戒护 - 鐨 \texttt{sorting} 閫夐」銆 - 浠ヤ笅鍚勭紪璇戞柟寮忎篃瀛樺湪绫讳技鐨勬敞鎰忎簨椤癸紝涓嶅啀閲嶅璇存槑銆% - } - \item pdf\LaTeX{} 鏂瑰紡锛歕\ + \verb|latex|锛孿verb|latex| 鍜 \verb|dvipdfmx|銆 + \item \hologo{pdfLaTeX} 鏂瑰紡锛歕\ 渚濇鎵ц \verb|pdflatex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝% \verb|pdflatex| 鍜 \verb|pdflatex|銆 - \item Xe\LaTeX{} 鏂瑰紡锛歕\ + \item \hologo{XeLaTeX} 鏂瑰紡锛歕\ 渚濇鎵ц \verb|xelatex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝% - \verb|xelatex| 鍜 \verb|xelatex|銆俓\ - \myemph{% - 娉ㄦ剰锛歑e\LaTeX{} 瀵归潪 UTF-8 鐨勭紪鐮佹敮鎸佷笉濂斤紝 - 鍥犳 Xe\LaTeX{} 鏂瑰紡鐨勭紪璇戜笉鏀寔 GBK 缂栫爜銆% - } + \verb|xelatex| 鍜 \verb|xelatex|銆 \end{itemize} + \myemph{% + 娉ㄦ剰锛 + \begin{itemize} + \item 闄ら潪鏃犳硶浣跨敤 biber锛屽惁鍒欎笉寤鸿浣跨敤 bibtex銆 + 濡傛灉鐨勭‘瑕佷娇鐢 bibtex锛岃灏 biblatex 瀹忓寘鐨刓texttt{backend} + 閫夐」浠 \texttt{biber} 鏀逛负 \texttt{bibtex}锛 + 鍦 Makefile 涓皢鍙橀噺 \texttt{BIBTEX} 鐨勫兼敼涓 \texttt{bibtex}锛 + 骞跺幓鎺 biblatex 瀹忓寘鍜 \texttt{\string\printbibliography} 鍛戒护 + 鐨 \texttt{sorting} 閫夐」銆% + \item bibtex 瀵 UTF-8 缂栫爜鐨勬敮鎸佷笉濂斤紝 + 鍥犳涓嶅缓璁湪缂栬瘧 UTF-8 缂栫爜鐨勬簮鏂囦欢鏃朵娇鐢 bibtex銆 + \item \hologo{XeLaTeX} 瀵归潪 UTF-8 缂栫爜鐨勬敮鎸佷笉濂斤紝 + 鍥犳 \hologo{XeLaTeX} 鏂瑰紡鐨勭紪璇戜笉鏀寔 GBK 缂栫爜銆 + \end{itemize}% + } + pkuthss 鏂囨。妯＄増闄勫甫鐨 Makefile 涓凡缁忓杩欎笁绉嶇紪璇戞柟寮忚繘琛屼簡瀹屾暣鐨勯厤缃 鐢ㄦ埛鍙渶瑕佸湪 Makefile 涓氳繃璁惧畾鍙橀噺 \verb|JOBNAME| 鐨勫% 鎸囧畾琚紪璇戠殑涓绘枃浠跺悕锛 @@ -206,7 +195,7 @@ make 浣嗗弻鍑绘枃浠跺浘鏍囨墽琛屾椂灏变細鍑洪敊銆 浣滆呭湪 Google Code 鍜屽寳澶ф湭鍚 BBS 涓婂彂甯冪殑鍘嬬缉鍖呬腑 \texttt{Make.bat} 鍧囨槸 CRLF锛圽texttt{\string\r\string\n}锛夋崲琛岋紝 - 浣 \TeX{}Live銆乗CTeX{} 濂楄涓畨瑁呯殑 \texttt{Make.bat} 鍜 + 浣 \hologo{TeX} Live 涓畨瑁呯殑 \texttt{Make.bat} 鍜 CTAN 涓婃彁渚涚殑鍘嬬缉鍖呴噷鐨 \texttt{Make.bat} 鍙兘鏄 LF锛圽texttt{\string\n}锛夋崲琛岀殑銆% } diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex index 0322f10f1dc..7086c8600b6 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex @@ -106,7 +106,7 @@ \end{itemize} \item \textbf{\texttt{[no]tightlist}}锛 - 鏄惁閲囩敤姣 \LaTeX{} 榛樿璁惧畾鏇村姞绱у瘑鐨勬灇涓剧幆澧冦 + 鏄惁閲囩敤姣 \hologo{LaTeX} 榛樿璁惧畾鏇村姞绱у瘑鐨勬灇涓剧幆澧冦 鍦ㄦ灇涓剧幆澧冿紙itemize銆乪numerate 鍜 description锛変腑锛 姣忎釜鏉＄洰鐨勫唴瀹硅緝灏戞椂锛屾潯鐩線寰鏄惧緱绋鐤忥紱 鍦ㄥ弬鑰冩枃鐚垪琛ㄤ腑涔熸湁绫讳技鐨勭幇璞° @@ -304,7 +304,9 @@ pkuthss 鏂囨。绫诲缓绔嬪湪 ctexbook\supercite{ctex} 鏂囨。绫荤殑鍩虹涓婏紝 骞惰皟鐢ㄤ簡 CJKfntef銆% graphicx\supercite{graphicx}銆乬eometry\supercite{geometry} 鍜 % - fancyhdr\supercite{fancyhdr} 绛夊嚑涓畯鍖呫 + fancyhdr\supercite{fancyhdr} 绛夊嚑涓畯鍖咃紱 + 浣跨敤 \hologo{pdfLaTeX} 鏂瑰紡缂栬瘧 GBK 缂栫爜鐨勬簮鏂囦欢鏃惰繕浼氳皟鐢 + xCJK2uni\supercite{xCJK2uni} 瀹忓寘銆 鍥犳锛宑texbook 鏂囨。绫诲拰杩欎簺瀹忓寘鎵鎻愪緵鐨勫姛鑳藉潎鍙互浣跨敤銆 渚嬪锛岀敤鎴峰鏋滄兂灏嗙洰褰曠殑鏍囬鏀逛负鈥滅洰{\quad\quad}褰曗濓紝 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex index 8be06126ed5..8d3aef9a21a 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex @@ -48,8 +48,8 @@ 鍥犳寤鸿鐢ㄦ埛浣跨敤鏀寔 LF 鎹㈣鐨勬枃鏈紪杈戝櫒缂栬緫鏂囦欢锛 璇﹁绗 \ref{sec:doc-dir} 鑺傘 - 浣跨敤杩囨棫鐨 \TeX{} 绯荤粺鍜屽悇瀹忓寘锛 - 鎴栦娇鐢ㄦ煇浜 Linux 鍙戣鐗堣蒋浠朵粨搴撴墍鎻愪緵鐨 \TeX{}Live 鏃讹紝 + 浣跨敤杩囨棫鐨 \hologo{TeX} 绯荤粺鍜屽悇瀹忓寘锛 + 鎴栦娇鐢ㄦ煇浜 Linux 鍙戣鐗堣蒋浠朵粨搴撴墍鎻愪緵鐨 \hologo{TeX} Live 鏃讹紝 鍙兘寮曡捣涓浜涢棶棰橈紝 璇﹁绗 \ref{sec:req} 鑺傘 @@ -59,7 +59,8 @@ 鑰屾湭寮曠敤鐨勬枃鐚寜鐓ц嫳鏂囨枃鐚湪鍓嶃佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇姹傦紝 瑙佺 \ref{ssec:thirdparty} 灏忚妭銆 - 鏃犳硶浣跨敤 biber 鐨勭敤鎴峰彲浠ヤ娇鐢 bibtex锛屽叿浣撹缃柟寮忚瑙佺 \ref{sec:compile} 鑺傘 + 鏃犳硶浣跨敤 biber 鐨勭敤鎴峰彲浠ヤ娇鐢 bibtex锛岃繖绉嶆儏鍐典笅寤鸿浣跨敤 GBK 缂栫爜锛 + 鍏蜂綋璁剧疆鏂瑰紡璇疯绗 \ref{sec:compile} 鑺傘 涓浜涢珮绾ц缃紝 濡傚皝闈腑閮ㄥ垎鍐呭闀垮害瓒呰繃棰勮绌洪棿瀹归噺鏃剁殑璁剧疆锛 @@ -82,7 +83,7 @@ 姝ゆ枃浠堕氬父鍜屾墽琛 \verb|texdoc hyperref| % 鏃舵墦寮鐨 pdf 鏂囦欢浣嶄簬鍚屼竴鐩綍涓 - 浣跨敤 Xe\LaTeX{} 鐨勭敤鎴峰彲鑳藉湪宸茬粡瀹夎瀛椾綋鐨勬儏鍐典笅閬囧埌褰㈠锛堝叾涓 + 浣跨敤 \hologo{XeLaTeX} 鐨勭敤鎴峰彲鑳藉湪宸茬粡瀹夎瀛椾綋鐨勬儏鍐典笅閬囧埌褰㈠锛堝叾涓 \verb|xxxxxxxx| 涓哄叿浣撳瓧浣撳悕锛 \begin{Verbatim}[frame = single, fontsize = {\small}] ! fontspec error: "font-not-found" @@ -95,7 +96,7 @@ 涓嶅悓浜庡師鏂囦欢鐨勶級瀛椾綋鏂囦欢鍚嶏紝 骞舵敼鍔 ctex.cfg 绛夐厤缃枃浠朵箣鍚庢病鏈夊湪璋冪敤 pkuthss 鏂囨。绫绘椂鍔犲叆 \verb|nofonts| 閫夐」锛 - 鍙堜娇鐢 Xe\LaTeX{} 缂栬瘧閫犳垚鐨勶紝浣跨敤 + 鍙堜娇鐢 \hologo{XeLaTeX} 缂栬瘧閫犳垚鐨勶紝浣跨敤 \begin{Verbatim}[frame = single] \documentclass[nofonts, ...]{pkuthss} % 鈥...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆 \end{Verbatim} @@ -129,15 +130,6 @@ See the caption package documentation for explanation. 鐮旂┒鐢熸墜鍐屽拰鍏剁數瀛愮増\supercite{pku-thesisstyle}瑕佹眰鐨勮鏂囧皝闈㈠彲鑳藉苟涓嶄竴鑷达紝 杩欓噷浠ョ數瀛愮増涓哄噯銆 - \subsection{鍏跺畠涓浜涢棶棰榼 - - 浣跨敤 GBK 缂栫爜鍜 pdf\LaTeX{} 缂栬瘧鏂瑰紡鏃堕渶瑕佺敤鎴% - 杩愯 \verb|gbk2uni| 绋嬪簭鏉ヨ浆鎹 \verb|.out| 鏂囦欢锛 - 鍚﹀垯鐢熸垚鐨 pdf 涔︾鍙兘涔辩爜銆 - 鑰冭檻鍒扮敤鎴峰彲鑳芥病鏈 \verb|gbk2uni| 绋嬪簭锛屼笖鏈夌敤鎴蜂娇鐢 UTF-8 缂栫爜锛 - 榛樿鐨 \verb|Makefile| 鍜 \verb|Make.bat| 涓皢鐩稿叧浠ｇ爜娉ㄩ噴鎺変簡锛 - 鐢ㄦ埛鍙互鑷鍘绘帀鐩稿簲鐨勬敞閲娿 - \section{鍙嶉鎰忚鍜屽缓璁畗 鍏充簬 pkuthss 鏂囨。妯＄増鐨勬剰瑙佸拰寤鸿锛 @@ -157,7 +149,7 @@ See the caption package documentation for explanation. 璇风粰 issue 鍔犱笂 \verb|Proj-Pkuthss| 鏍囩銆 濡傛灉鏄敊璇姤鍛婏紝 璇疯鏄庢墍浣跨敤 pkuthss 妯＄増鐨勭増鏈 - 鑷繁浣跨敤鐨勬搷浣滅郴缁熷拰 \TeX{} 绯荤粺鐨勭被鍨嬪拰鐗堟湰锛 + 鑷繁浣跨敤鐨勬搷浣滅郴缁熷拰 \hologo{TeX} 绯荤粺鐨勭被鍨嬪拰鐗堟湰锛 鍚屾椂寮虹儓寤鸿闄勪笂涓涓嚭閿欑殑鏈灏忎緥瀛愬強鍏剁浉搴旂殑缂栬瘧鏃ュ織锛圽verb|.log| 鏂囦欢锛夛紝 鍦ㄦ枃浠惰緝闀挎椂璇蜂娇鐢ㄩ檮浠躲 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/conclusion.tex index 2910672db37..50d93d09641 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/conclusion.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/conclusion.tex @@ -31,5 +31,5 @@ \specialchap{缁撹} pkuthss 鏂囨。妯＄増缁撴瀯杈冧负绠娲併佹竻鏅般佺伒娲伙紝杈冧负鏄撲簬瀛︿範鍜屼娇鐢ㄣ -甯屾湜瀹冭兘涓哄悇浣嶉渶瑕佷娇鐢 \LaTeX{} 鎾板啓瀛︿綅璁烘枃鐨勫悓瀛︽彁渚涗竴浜涘府鍔┿ +甯屾湜瀹冭兘涓哄悇浣嶉渶瑕佷娇鐢 \hologo{LaTeX} 鎾板啓瀛︿綅璁烘枃鐨勫悓瀛︽彁渚涗竴浜涘府鍔┿ diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex index c9b22fe6fa4..8df44c8ce76 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/copyright.tex @@ -38,7 +38,7 @@ \vskip 1em pkuthss 鏂囨。绫汇乸kuthss-extra 瀹忓寘鍙婂叾璇存槑鏂囨。鍧囦互 % - \LaTeX{} Project Public License 鍙戝竷銆 + \hologo{LaTeX} Project Public License 鍙戝竷銆 闅 pkuthss 鎻愪緵鐨勬ā鐗堟簮浠ｇ爜涓紝闄や互涓嬫枃浠 \begin{itemize} \item \verb|chap/copyright.tex| diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex index 3ee9d28bbce..172e311d561 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/introduction.tex @@ -43,7 +43,7 @@ pkuthss 鏂囨。妯＄増鐢卞洓閮ㄥ垎鏋勬垚锛 鑷姩鏍规嵁鐢ㄦ埛璁惧畾鐨勬枃妗ｄ俊鎭鎵鐢熸垚 pdf 鐨勪綔鑰呫佹爣棰樼瓑灞炴ц繘琛岃缃瓑銆 \item \textbf{璇存槑鏂囨。}锛 璇存槑鏂囨。鍗虫湰鏂囨。锛 - 鍦ㄥ畨瑁咃紙瑙佺 \ref{sec:inst} 鑺傦級涔嬪悗搴旇鍙互鐢 \TeX{} 绯荤粺鎻愪緵鐨 + 鍦ㄥ畨瑁咃紙瑙佺 \ref{sec:req} 鑺傦級涔嬪悗搴旇鍙互鐢 \hologo{TeX} 绯荤粺鎻愪緵鐨 \verb|texdoc| 鍛戒护璋冨嚭锛 \begin{Verbatim}[frame=single] texdoc pkuthss diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib index 11f16a92954..822bd9ae32c 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.bib @@ -1,31 +1,33 @@ -vim:ts=4:sw=4 +% vim:ts=4:sw=4 @online{biber, author = {Kime, Philip and Charette, Fran\c{c}ois}, - title = {Biber: A backend bibliography processor for biblatex (Version 0.9.9)}, + title = {Biber: A backend bibliography processor for biblatex (Version 1.8)}, type = {M/OL}, - date = {2012-03-29}, + date = {2013-10-18}, url = {http://mirror.ctan.org/biblio/biber/}, - urldate = {2012-08-01}, + urldate = {2014-05-24}, + language = {english}, } @online{biblatex, author = {Lehman, Philipp}, - title = {The biblatex Package: Programmable Bibliographies and Citations (Version 1.7)}, + title = {The biblatex Package: Programmable Bibliographies and Citations (Version 2.8a)}, type = {M/OL}, - date = {2011-11-13}, + date = {2013-11-25}, url = {http://mirror.ctan.org/macros/latex/exptl/biblatex/}, - urldate = {2012-08-01}, + urldate = {2014-05-24}, + language = {english}, } @online{biblatex-caspervector, author = {Vector, Casper Ti.}, - title = {biblatex 鍙傝冩枃鐚拰寮曠敤鏍峰紡锛歝aspervector v0.1.9}, + title = {biblatex 鍙傝冩枃鐚拰寮曠敤鏍峰紡锛歝aspervector v0.2.0}, type = {M/OL}, - date = {2013-12-27}, - url = {https://caspervector.googlecode.com/files/biblatex-caspervector-0.1.9.zip}, - urldate = {2013-12-27}, - userf = {zh}, + date = {2014-05-24}, + url = {https://caspervector-dist.googlecode.com/git/biblatex-caspervector/biblatex-caspervector-0.2.0.zip}, + urldate = {2014-05-24}, + language = {chinese}, } @online{caption, @@ -35,6 +37,7 @@ vim:ts=4:sw=4 date = {2011-11-02}, url = {http://mirror.ctan.org/macros/latex/contrib/caption}, urldate = {2013-06-03}, + language = {english}, } @online{ctex, @@ -44,7 +47,7 @@ vim:ts=4:sw=4 date = {2011-03-11}, url = {http://mirror.ctan.org/language/chinese/ctex/}, urldate = {2012-08-01}, - userf = {zh}, + language = {chinese}, } @online{ctex-faq, @@ -54,7 +57,7 @@ vim:ts=4:sw=4 date = {2007-01-30}, url = {http://mirror.ctan.org/info/ctex-faq/}, urldate = {2012-08-01}, - userf = {zh}, + language = {chinese}, } @online{enumitem, @@ -64,24 +67,27 @@ vim:ts=4:sw=4 date = {2011-09-28}, url = {http://mirror.ctan.org/macros/latex/contrib/enumitem/}, urldate = {2012-08-01}, + language = {english}, } @online{fancyhdr, author = {van Oostrum, Piet}, - title = {Page layout in \LaTeX{}}, + title = {Page layout in \hologo{LaTeX}}, type = {M/OL}, date = {2004-03-02}, url = {http://mirror.ctan.org/macros/latex/contrib/fancyhdr/}, urldate = {2012-08-01}, + language = {english}, } @online{footmisc, author = {Fairbairns, Robin}, - title = {footmisc --- a portmanteau package for customising footnotes in \LaTeX{}}, + title = {footmisc --- a portmanteau package for customising footnotes in \hologo{LaTeX}}, type = {M/OL}, date = {2011-07-06}, url = {http://mirror.ctan.org/macros/latex/contrib/footmisc/}, urldate = {2012-08-01}, + language = {english}, } @online{geometry, @@ -91,6 +97,7 @@ vim:ts=4:sw=4 date = {2010-09-12}, url = {http://mirror.ctan.org/macros/latex/contrib/geometry/}, urldate = {2012-08-01}, + language = {english}, } @online{graphicx, @@ -100,15 +107,27 @@ vim:ts=4:sw=4 date = {2005-11-14}, url = {http://mirror.ctan.org/macros/latex/required/graphics/}, urldate = {2012-08-01}, + language = {english}, } @online{hyperref, author = {Rahtz, Sebastian and Oberdiek, Heiko}, - title = {Hypertext marks in \LaTeX{}: a manual for hyperref (v6.82q)}, + title = {Hypertext marks in \hologo{LaTeX}: a manual for hyperref (v6.82q)}, type = {M/OL}, date = {2012-05-13}, url = {http://mirror.ctan.org/macros/latex/contrib/hyperref/}, urldate = {2012-08-01}, + language = {english}, +} + +@online{xCJK2uni, + author = {鏉庢竻}, + title = {xCJK2uni 瀹忓寘锛坴0.1锛墋, + type = {M/OL}, + date = {2013-08-17}, + url = {http://mirror.ctan.org/macros/latex/contrib/xcjk2uni/}, + urldate = {2014-05-10}, + language = {chinese}, } @online{dypang, @@ -118,7 +137,7 @@ vim:ts=4:sw=4 date = {2005-04-05}, url = {http://bdwm.net/a.php?b/Thesis/M.1112645491.A/D10F612.rar}, urldate = {2012-08-01}, - userf = {zh}, + language = {chinese}, } @online{FerretL, @@ -128,7 +147,7 @@ vim:ts=4:sw=4 date = {2007-03-27}, url = {http://bdwm.net/a.php?b/Thesis/M.1174982168.A/4270722.rar}, urldate = {2012-08-01}, - userf = {zh}, + language = {chinese}, } @online{lwolf, @@ -138,7 +157,7 @@ vim:ts=4:sw=4 date = {2007-05-15}, url = {http://bdwm.net/a.php?b/MathTools/M.1179239165.A/5A2D5A2.rar}, urldate = {2012-08-01}, - userf = {zh}, + language = {chinese}, } @online{Langpku, @@ -148,7 +167,7 @@ vim:ts=4:sw=4 date = {2007-06-01}, url = {http://bdwm.net/a.php?b/MathTools/M.1180676700.A/DBB7810.zip}, urldate = {2012-08-01}, - userf = {zh}, + language = {chinese}, } @online{solvethis, @@ -158,40 +177,40 @@ vim:ts=4:sw=4 date = {2008-03-13}, url = {http://bdwm.net/a.php?b/Thesis/M.1205377509.A/9413ED2.rar}, urldate = {2012-08-01}, - userf = {zh}, + language = {chinese}, } @online{pku-copyright, author = {鍖椾含澶у鐮旂┒鐢熼櫌}, title = {鍖椾含澶у瀛︿綅璁烘枃鐗堟潈澹版槑(棣栭〉)}, type = {M/OL}, - year = {2010}, - url = {http://grs.pku.edu.cn/document/20101110143928832634.doc}, - urldate = {2012-08-01}, - userf = {zh}, + year = {2014}, + url = {http://grs.pku.edu.cn/document/20140416145103446514.doc}, + urldate = {2014-05-24}, + language = {chinese}, } @online{pku-originauth, author = {鍖椾含澶у鐮旂┒鐢熼櫌}, - title = {鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑(鏈〉)}, + title = {鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑}, type = {M/OL}, - year = {2010}, - url = {http://grs.pku.edu.cn/document/20101110143844053593.doc}, - urldate = {2012-08-01}, - userf = {zh}, + year = {2014}, + url = {http://grs.pku.edu.cn/document/20140416145000135438.doc}, + urldate = {2014-05-24}, + language = {chinese}, } @incollection{pku-thesisstyle, author = {鍖椾含澶у鐮旂┒鐢熼櫌}, - title = {鍖椾含澶у鐮旂┒鐢熷浣嶈鏂囩殑鍩烘湰瑕佹眰涓庝功鍐欐牸寮弣, + title = {鍖椾含澶у鐮旂┒鐢熷浣嶈鏂囩殑鍩烘湰瑕佹眰涓庝功鍐欐牸寮忥紙2007 骞 6 鏈堜慨璁級}, type = {M/OL}, bookauthor = {鍖椾含澶у鐮旂┒鐢熼櫌}, booktitle = {鍖椾含澶у鐮旂┒鐢熸墜鍐寎, publisher = {鍖椾含澶у}, - year = {2011}, - pages = {27-31}, - url = {http://grs.pku.edu.cn/document/20110829160841775796.doc}, - urldate = {2012-08-01}, - userf = {zh}, + year = {2013}, + pages = {30-35}, + url = {http://grs.pku.edu.cn/document/20131031200524521428.pdf}, + urldate = {2014-05-24}, + language = {chinese}, } diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex index 50485f6e9d5..9166bbe39b5 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex @@ -34,9 +34,10 @@ \usepackage{lmodern} \usepackage{amssymb} \usepackage{fancyvrb} +\usepackage{hologo} \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} -\newcommand{\docversion}{v1.5.2} +\newcommand{\docversion}{v1.5.3} \pkuthssinfo{ cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis}, @@ -48,7 +49,7 @@ cauthor = {鐩栬尐娉⒙烽挍路缁村厠鎵榼, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {浜屻囦竴鍥涘勾鍥涙湀}, + date = {浜屻囦竴鍥涘勾浜旀湀}, school = {鍖栧涓庡垎瀛愬伐绋嬪闄, cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry ... ?}, direction = {鎹 Casper 鑷繁涔熶笉鐭ラ亾}, diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf Binary files differindex ad21af0fa49..c8fb38f7e7f 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf Binary files differindex d8222fc52f4..b039a54ae45 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf +++ b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty index 7b072b8ab3e..7092b2c94d8 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty @@ -26,7 +26,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{pkuthss-extra} - [2014/04/17 v1.5.2 Common extra settings for the pkuthss document class] + [2014/05/24 v1.5.3 Common extra settings for the pkuthss document class] % Check the dependency of pkuthss. \@ifclassloaded{pkuthss}{}{ @@ -76,7 +76,7 @@ \linespread{1.41}\selectfont % Automatically insert a space between the label and the text in footnotes. \RequirePackage{footmisc} - \renewcommand{\footnotelayout}{\ } + \renewcommand*{\footnotelayout}{\ } \fi \ifpkuthssextra@opt@tightlist @@ -119,7 +119,7 @@ \ifpkuthssextra@opt@pdfprop % Automatically generate properties for generated PDF. % Use English properties to avoid problems with character encodings. - \newcommand{\setpdfproperties}{ + \newcommand*{\setpdfproperties}{ \hypersetup{ pdfauthor = {\@eauthor}, pdftitle = {\@etitle}, pdfsubject = {\euniversity\ \ethesisname}, pdfkeywords = {\@ekeywords} diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def index 4b16b451e6a..40f73dc55bc 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def @@ -25,7 +25,7 @@ % pkuword.eps \ProvidesFile{pkuthss-gbk.def} - [2014/04/17 v1.5.2 Labels and captions in GBK encoding + [2014/05/24 v1.5.3 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 44a597b06c4..5f730d38244 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def @@ -25,7 +25,7 @@ % pkuword.eps \ProvidesFile{pkuthss-utf8.def} - [2014/04/17 v1.5.2 Labels and captions in UTF-8 encoding + [2014/05/24 v1.5.3 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 cfa2a97f1c1..034113d3a6e 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls @@ -26,7 +26,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2014/04/17 v1.5.2 Peking University dissertation document class] + [2014/05/24 v1.5.3 Peking University dissertation document class] % Process the encoding options. \newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue @@ -74,15 +74,22 @@ % Whether to enable the default extra settings. \ifpkuthss@opt@extra\RequirePackage{pkuthss-extra}\fi -\ifxetex\ifpkuthss@opt@gbk - % No support for XeLaTeX compilation in non-unicode encoding, i.e. GBK. - \ClassError{pkuthss}% - {XeLaTeX compilation is not supported without UTF-8}% - {% - XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak - Therefore please use UTF-8 encoding for the LaTeX code.% - } -\fi\fi +\ifpkuthss@opt@gbk + \ifxetex + % No support for XeLaTeX compilation in non-unicode encoding, i.e. GBK. + \ClassError{pkuthss}% + {XeLaTeX compilation is not supported without UTF-8}% + {% + XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak + Therefore please use UTF-8 encoding for the LaTeX code.% + } + \else\ifpdf + % Fix garbled text in bookmarks for pdfLaTeX compilation in GBK. + % Temporary fix until release of ctex 2.x, which will by itself + % load xCJK2uni when necessary. + \RequirePackage{xCJK2uni} + \fi\fi +\fi \AtEndOfClass{ % Setting chinese captions and labels. @@ -99,7 +106,7 @@ \def\pkuthss@int@setpagestyle{ % Set the headers and footers on the first page in every chapter. \fancypagestyle{plain}{ - \fancyhf{}\renewcommand{\headrulewidth}{0pt} + \fancyhf{}\renewcommand*{\headrulewidth}{0pt} \if@twoside \fancyfoot[RO,LE]{\small\normalfont --~\thepage~--} \else @@ -174,7 +181,7 @@ \pkuthss@int@infoitemb{cabstractname} \pkuthss@int@infoitemb{eabstractname} % Set document information using the `key = value' grammar. -\newcommand{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}} +\newcommand*{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}} % Usage: \pkuthss@int@fillinblank{(number of lines)}{(line width)}{(contents)} \def\pkuthss@int@fillinblank#1#2#3{ diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf Binary files differindex c8be82e9ca6..88ddebc5b6f 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf |