From ea32b55b277e9aa4632ffb94c29ab1da34b8f604 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 11 Jul 2014 22:37:20 +0000 Subject: pkuthss git-svn-id: svn://tug.org/texlive/trunk@34574 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/pkuthss/example-gbk/chap/abstract.tex | 5 ++-- .../latex/pkuthss/example-gbk/chap/acknowledge.tex | 4 +-- .../doc/latex/pkuthss/example-gbk/chap/chap1.tex | 5 ++-- .../latex/pkuthss/example-gbk/chap/conclusion.tex | 4 +-- .../doc/latex/pkuthss/example-gbk/chap/encl1.tex | 4 +-- .../pkuthss/example-gbk/chap/introduction.tex | 4 +-- .../doc/latex/pkuthss/example-gbk/thesis.tex | 30 ++++++++++++++++----- .../latex/pkuthss/example-utf8/chap/abstract.tex | 5 ++-- .../pkuthss/example-utf8/chap/acknowledge.tex | 4 +-- .../doc/latex/pkuthss/example-utf8/chap/chap1.tex | 5 ++-- .../latex/pkuthss/example-utf8/chap/conclusion.tex | 4 +-- .../doc/latex/pkuthss/example-utf8/chap/encl1.tex | 4 +-- .../pkuthss/example-utf8/chap/introduction.tex | 4 +-- .../doc/latex/pkuthss/example-utf8/thesis.tex | 30 ++++++++++++++++----- Master/texmf-dist/doc/latex/pkuthss/example.pdf | Bin 83526 -> 97335 bytes .../doc/latex/pkuthss/readme-src/ChangeLog.txt | 16 +++++++++++ .../doc/latex/pkuthss/readme-src/chap/chap2.tex | 6 ++--- .../doc/latex/pkuthss/readme-src/chap/chap3.tex | 3 +-- .../doc/latex/pkuthss/readme-src/pkuthss.tex | 2 +- Master/texmf-dist/doc/latex/pkuthss/readme.pdf | Bin 355758 -> 355866 bytes 20 files changed, 93 insertions(+), 46 deletions(-) (limited to 'Master/texmf-dist/doc/latex/pkuthss') diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/abstract.tex index 6f1ff5c8706..4a40f3e415e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/abstract.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/abstract.tex @@ -3,10 +3,11 @@ % Public domain. \begin{cabstract} - 测试一下。 + % 中文测试文字。 + \pkuthssffaq \end{cabstract} \begin{eabstract} - Have a test. + Test of the English abstract. \end{eabstract} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/acknowledge.tex index f49402ebcb1..3c41379b7e8 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/acknowledge.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/acknowledge.tex @@ -3,6 +3,6 @@ % Public domain. \chapter{致谢} - -感谢党,感谢国家;感谢 CCTV,感谢 MTV。 +% 中文测试文字。 +\pkuthssffaq 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 9c6f2317999..326698b75c1 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 @@ -3,7 +3,6 @@ % Public domain. \chapter{章节} - -% 三个命令分别产生未格式化的、带方括号的和上标且带方括号的引用标记。 -测试一下:\cite{test-en},\parencite{test-zh},\supercite{test-en, test-zh}。 +% 中文测试文字。 +\pkuthssffaq diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/conclusion.tex index 87118017db8..0394566970d 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/conclusion.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/conclusion.tex @@ -3,6 +3,6 @@ % Public domain. \specialchap{结论} - -测试一下。 +% 中文测试文字。 +\pkuthssffaq diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/encl1.tex index 01f329d7776..a28631e9057 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/encl1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/encl1.tex @@ -3,6 +3,6 @@ % Public domain. \chapter{附件} - -测试一下。 +% 中文测试文字。 +\pkuthssffaq diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/introduction.tex index cfcb4d81282..5e448d3b897 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/chap/introduction.tex @@ -3,6 +3,6 @@ % Public domain. \specialchap{序言} - -测试一下。 +% 中文测试文字。 +\pkuthssffaq 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 6d91d1219b8..dda235d21c6 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex @@ -11,11 +11,13 @@ % texdoc biblatex-caspervector % 调出。 -% 在黑白打印时彩色链接可能变成浅灰色,此时可将“colorlinks”改为“nocolorlinks”。 -% % 采用了自定义的(包括大小写不同于原文件的)字体文件名, % 并改动 ctex.cfg 等配置文件的用户请自行加入 nofonts 选项; % 其它用户不用加入 nofonts 选项,加入之后反而会产生错误。 +% +% 图书馆要求电子版论文的目录必须为黑色, +% 且某些教务要求打印版论文的文字部分为纯黑色而非灰度打印, +% 【因此最终打印和提交论文前,请将“colorlinks”改为“nocolorlinks”。】 \documentclass[GBK, colorlinks]{pkuthss} % 使用 biblatex 排版参考文献,并规定其格式。 @@ -49,6 +51,24 @@ % 导入参考文献数据库(注意不要省略“.bib”)。 \addbibresource{thesis.bib} +% 普通用户可删除此段。 +\def\pkuthssffaq{% + \emph{\textcolor{red}{pkuthss 文档模版最常见问题:}} + + 最终打印和提交论文前, + 请将 pkuthss 文档类选项中的 % + \texttt{colorlinks} 改为 \texttt{nocolorlinks}, + 因为图书馆要求电子版论文的目录必须为黑色, + 且某些教务要求打印版论文的文字部分为纯黑色而非灰度打印。 + + \texttt{\string\cite}、\texttt{\string\parencite} % + 和 \texttt{\string\supercite} 三个命令分别产生% + 未格式化的、带方括号的和上标且带方括号的引用标记:% + \cite{test-en},\parencite{test-zh}、\supercite{test-en, test-zh}。% + + 若要避免章末空白页,请在调用 pkuthss 文档类时加入 \texttt{oneside} 选项。 +} + \begin{document} % 以下为正文之前的部分。 \frontmatter @@ -60,16 +80,12 @@ % 中英文摘要。 \include{chap/abstract} % 自动生成目录。 - \begingroup - % 使目录条目为黑色。 - \hypersetup{hidelinks} \tableofcontents - \endgroup % 以下为正文。 \mainmatter - % 绪言。 + % 序言。 \include{chap/introduction} % 各章节。 \include{chap/chap1} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/abstract.tex index 6ae3da72974..8f3a0286ac2 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/abstract.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/abstract.tex @@ -3,10 +3,11 @@ % Public domain. \begin{cabstract} - 娴嬭瘯涓涓嬨 + % 涓枃娴嬭瘯鏂囧瓧銆 + \pkuthssffaq \end{cabstract} \begin{eabstract} - Have a test. + Test of the English abstract. \end{eabstract} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/acknowledge.tex index 5745cf63ccc..2a0d65c5675 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/acknowledge.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/acknowledge.tex @@ -3,6 +3,6 @@ % Public domain. \chapter{鑷磋阿} - -鎰熻阿鍏氾紝鎰熻阿鍥藉锛涙劅璋 CCTV锛屾劅璋 MTV銆 +% 涓枃娴嬭瘯鏂囧瓧銆 +\pkuthssffaq 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 691206c7b7d..275b02acf0f 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 @@ -3,7 +3,6 @@ % Public domain. \chapter{绔犺妭} - -% 涓変釜鍛戒护鍒嗗埆浜х敓鏈牸寮忓寲鐨勩佸甫鏂规嫭鍙风殑鍜屼笂鏍囦笖甯︽柟鎷彿鐨勫紩鐢ㄦ爣璁般 -娴嬭瘯涓涓嬶細\cite{test-en}锛孿parencite{test-zh}锛孿supercite{test-en, test-zh}銆 +% 涓枃娴嬭瘯鏂囧瓧銆 +\pkuthssffaq diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/conclusion.tex index 35cb13eb6f0..6b0ccd90c2a 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/conclusion.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/conclusion.tex @@ -3,6 +3,6 @@ % Public domain. \specialchap{缁撹} - -娴嬭瘯涓涓嬨 +% 涓枃娴嬭瘯鏂囧瓧銆 +\pkuthssffaq diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/encl1.tex index 760af0b8f1d..f7fd04cb136 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/encl1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/encl1.tex @@ -3,6 +3,6 @@ % Public domain. \chapter{闄勪欢} - -娴嬭瘯涓涓嬨 +% 涓枃娴嬭瘯鏂囧瓧銆 +\pkuthssffaq diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/introduction.tex index d7732c616ff..eae329b6720 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/chap/introduction.tex @@ -3,6 +3,6 @@ % Public domain. \specialchap{搴忚█} - -娴嬭瘯涓涓嬨 +% 涓枃娴嬭瘯鏂囧瓧銆 +\pkuthssffaq 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 aa384b93bee..328d76e54cf 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex @@ -11,11 +11,13 @@ % texdoc biblatex-caspervector % 璋冨嚭銆 -% 鍦ㄩ粦鐧芥墦鍗版椂褰╄壊閾炬帴鍙兘鍙樻垚娴呯伆鑹诧紝姝ゆ椂鍙皢鈥渃olorlinks鈥濇敼涓衡渘ocolorlinks鈥濄 -% % 閲囩敤浜嗚嚜瀹氫箟鐨勶紙鍖呮嫭澶у皬鍐欎笉鍚屼簬鍘熸枃浠剁殑锛夊瓧浣撴枃浠跺悕锛 % 骞舵敼鍔 ctex.cfg 绛夐厤缃枃浠剁殑鐢ㄦ埛璇疯嚜琛屽姞鍏 nofonts 閫夐」锛 % 鍏跺畠鐢ㄦ埛涓嶇敤鍔犲叆 nofonts 閫夐」锛屽姞鍏ヤ箣鍚庡弽鑰屼細浜х敓閿欒銆 +% +% 鍥句功棣嗚姹傜數瀛愮増璁烘枃鐨勭洰褰曞繀椤讳负榛戣壊锛 +% 涓旀煇浜涙暀鍔¤姹傛墦鍗扮増璁烘枃鐨勬枃瀛楅儴鍒嗕负绾粦鑹茶岄潪鐏板害鎵撳嵃锛 +% 銆愬洜姝ゆ渶缁堟墦鍗板拰鎻愪氦璁烘枃鍓嶏紝璇峰皢鈥渃olorlinks鈥濇敼涓衡渘ocolorlinks鈥濄傘 \documentclass[UTF8, colorlinks]{pkuthss} % 浣跨敤 biblatex 鎺掔増鍙傝冩枃鐚紝骞惰瀹氬叾鏍煎紡銆 @@ -49,6 +51,24 @@ % 瀵煎叆鍙傝冩枃鐚暟鎹簱锛堟敞鎰忎笉瑕佺渷鐣モ.bib鈥濓級銆 \addbibresource{thesis.bib} +% 鏅氱敤鎴峰彲鍒犻櫎姝ゆ銆 +\def\pkuthssffaq{% + \emph{\textcolor{red}{pkuthss 鏂囨。妯$増鏈甯歌闂锛殅} + + 鏈缁堟墦鍗板拰鎻愪氦璁烘枃鍓嶏紝 + 璇峰皢 pkuthss 鏂囨。绫婚夐」涓殑 % + \texttt{colorlinks} 鏀逛负 \texttt{nocolorlinks}锛 + 鍥犱负鍥句功棣嗚姹傜數瀛愮増璁烘枃鐨勭洰褰曞繀椤讳负榛戣壊锛 + 涓旀煇浜涙暀鍔¤姹傛墦鍗扮増璁烘枃鐨勬枃瀛楅儴鍒嗕负绾粦鑹茶岄潪鐏板害鎵撳嵃銆 + + \texttt{\string\cite}銆乗texttt{\string\parencite} % + 鍜 \texttt{\string\supercite} 涓変釜鍛戒护鍒嗗埆浜х敓% + 鏈牸寮忓寲鐨勩佸甫鏂规嫭鍙风殑鍜屼笂鏍囦笖甯︽柟鎷彿鐨勫紩鐢ㄦ爣璁帮細% + \cite{test-en}锛孿parencite{test-zh}銆乗supercite{test-en, test-zh}銆% + + 鑻ヨ閬垮厤绔犳湯绌虹櫧椤碉紝璇峰湪璋冪敤 pkuthss 鏂囨。绫绘椂鍔犲叆 \texttt{oneside} 閫夐」銆 +} + \begin{document} % 浠ヤ笅涓烘鏂囦箣鍓嶇殑閮ㄥ垎銆 \frontmatter @@ -60,16 +80,12 @@ % 涓嫳鏂囨憳瑕併 \include{chap/abstract} % 鑷姩鐢熸垚鐩綍銆 - \begingroup - % 浣跨洰褰曟潯鐩负榛戣壊銆 - \hypersetup{hidelinks} \tableofcontents - \endgroup % 浠ヤ笅涓烘鏂囥 \mainmatter - % 缁█銆 + % 搴忚█銆 \include{chap/introduction} % 鍚勭珷鑺傘 \include{chap/chap1} diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf index 3bdb93bfe3b..04290288127 100644 Binary files a/Master/texmf-dist/doc/latex/pkuthss/example.pdf and b/Master/texmf-dist/doc/latex/pkuthss/example.pdf differ 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 dbc03774193..97b952c7ede 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt @@ -1,3 +1,19 @@ +2014-07-07, v1.5.5 + + * Changes to example template: + - Use the most frequently asked questions as the sample text. + - revert the black TOC, considering the new sample text. + + * Changes to package code: + - pkuthss.cls: use `PassOptionsToPackage' for *packages*. + - pkuthss-extra.sty: `hidelinks' does not hold a value. + + * Changes to documentation: + - update info on `colorlinks'. + + * Misc: + - Minor improvements. + 2014-07-04, v1.5.4 * Changes to example template: 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 af98936c847..acc86ec0319 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 @@ -169,11 +169,11 @@ 鏄惁鍦ㄧ敓鎴愮殑 pdf 鏂囨。涓娇鐢ㄥ僵鑹茬殑閾炬帴銆 \end{itemize} - 渚嬪锛屽湪鎻愪氦鎵撳嵃鐗堢殑璁烘枃鏃讹紝 - 褰╄壊鐨勯摼鎺ユ枃瀛楀湪榛戠櫧鎵撳嵃鍑烘潵涔嬪悗鍙兘棰滆壊浼氬緢娴呫 + 渚嬪锛屽浘涔﹂瑕佹眰鐢靛瓙鐗堣鏂囩殑鐩綍蹇呴』涓洪粦鑹诧紝 + 涓旀煇浜涙暀鍔¤姹傛墦鍗扮増璁烘枃鐨勬枃瀛楅儴鍒嗕负绾粦鑹茶岄潪鐏板害鎵撳嵃銆 姝ゆ椂鐢ㄦ埛\myemph{% 鍙互鍚敤 pkuthss-extra 瀹忓寘鐨 \texttt{nocolorlinks} 閫夐」锛 - 浣挎墍鏈夌殑閾炬帴鍙樹负榛戣壊锛屼互鍏嶅奖鍝嶆墦鍗% + 浣挎墍鏈夌殑閾炬帴鍙樹负榛戣壊锛屼互鍏嶅奖鍝嶆彁浜% }锛 \begin{Verbatim}[frame = single] \documentclass[..., nocolorlinks]{pkuthss} % 鈥...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆 diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex index 24bda395883..a9dc2f809d2 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 @@ -32,8 +32,7 @@ \section{鏂囨。涓凡缁忔彁鍒扮殑甯歌闂锛堟寜閲嶈鎬ф帓搴忥級} 鏂囨。榛樿鎯呭喌涓嬫槸鍙岄潰妯″紡锛岀珷鏈彲鑳戒骇鐢熺┖鐧介〉锛岃瑙佺 \ref{ssec:options} 灏忚妭銆 - 鍦ㄩ粯璁よ缃紙鍚敤 \verb|colorlinks| 閫夐」锛変笅锛 - 榛戠櫧鎵撳嵃鏃舵枃妗d腑鐨勯儴鍒嗗僵鑹查摼鎺ュ彲鑳戒細鍙樻垚娴呯伆鑹诧紝 + 鏈缁堟墦鍗板拰鎻愪氦璁烘枃鍓嶏紝闇浣跨敤 pkuthss-extra 瀹忓寘鐨 \verb|nocolorlinks| 閫夐」銆 瑙e喅鏂瑰紡瑙佺 \ref{ssec:extra} 灏忚妭銆 閫氳繃涓浜涜缃紝杩樺彲浠ユ弧瓒充緥濡傝寮曠敤鐨勬枃鐚寜鐓у紩鐢ㄩ『搴忔帓搴忥紝 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 664cb6f220c..71e8cfdbe30 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex @@ -37,7 +37,7 @@ \usepackage{hologo} \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} -\newcommand{\docversion}{v1.5.4} +\newcommand{\docversion}{v1.5.5} \pkuthssinfo{ cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis}, diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf index 2fdf99546d3..0b4c01ef812 100644 Binary files a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf and b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf differ -- cgit v1.2.3