diff options
| author | Karl Berry <karl@freefriends.org> | 2013-12-26 23:20:04 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-12-26 23:20:04 +0000 |
| commit | 407b969501bb500853f34eb44afffd3db568c9a8 (patch) | |
| tree | 76472579fdb941ba0d0a1d2f1cf31293b9262940 /Master | |
| parent | b52d30f89f74e929a7d66242dea6c39c8df9adfb (diff) | |
pkuthss (26dec13)
git-svn-id: svn://tug.org/texlive/trunk@32492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
28 files changed, 619 insertions, 363 deletions
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt index 7e291576aeb..e19aeb5b3eb 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt @@ -1,3 +1,20 @@ +2013-12-26, v1.4 rc4 + + * API Changes: + - Add `caption' option to customise caption fonts. + - Remove `\label@cmentorb'; `\label@cmentora' -> `\label@cmentor'. + - Move `[no]uppermark' to pkuthss.cls. + + * Changes to package code: + - Consider `oneside' in page style. + + * Changes to documentation: + - Add support for 2-dimensional bar code. + - Add and refine lots of hints. + + * Misc: + - Minor fixes and improvements. + 2013-04-07, v1.4 rc3 * Misc: diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/Make.bat index 711a52c2bd9..4fc74078fc9 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/Make.bat @@ -1,48 +1,48 @@ -@echo off
-
-@rem vim:ts=4:sw=4
-@rem
-@rem Copyright (c) 2008-2009 solvethis
-@rem Copyright (c) 2010-2012 Casper Ti. Vector
-@rem Public domain.
-
-set JOBNAME=pkuthss
-@rem 这个变量的值可以为 latex 或 pdflatex。
-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)
-
-:doc
-cd img
-call Make.bat
-cd ..
-%LATEX% %JOBNAME%
-%BIBTEX% %JOBNAME%
-%DOGBK2UNI%
-%LATEX% %JOBNAME%
-%LATEX% %JOBNAME%
-%DODVIPDF%
-goto end
-
-:clear
-del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out
-del missfont.log chap\*.aux
-goto end
-
-:usage
-echo %0 [doc] [clear]
-goto end
-
-:end
-
+@echo off + +@rem vim:ts=4:sw=4 +@rem +@rem Copyright (c) 2008-2009 solvethis +@rem Copyright (c) 2010-2012 Casper Ti. Vector +@rem Public domain. + +set JOBNAME=pkuthss +@rem 这个变量的值可以为 latex 或 pdflatex。 +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) + +:doc +cd img +call Make.bat +cd .. +%LATEX% %JOBNAME% +%BIBTEX% %JOBNAME% +%DOGBK2UNI% +%LATEX% %JOBNAME% +%LATEX% %JOBNAME% +%DODVIPDF% +goto end + +:clear +del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out +del missfont.log chap\*.aux +goto end + +:usage +echo %0 [doc] [clear] +goto end + +:end + diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/abstract.tex index 6d12b07ef7f..f9c06e1a2ff 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/abstract.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/abstract.tex @@ -1,22 +1,18 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2012 Casper Ti. Vector +% Copyright (c) 2010-2013 Casper Ti. Vector % Public domain. \begin{cabstract} - 本文介绍了 pkuthss 文档模版所提供的功能， 并以自身为例演示了该模版的使用。 - \end{cabstract} \begin{eabstract} - This paper describes the the functions provided by the pkuthss document template, and provides itself as an example to illustrate the usage of the document class. - \end{eabstract} diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex index 446d7eaeb63..07853befb2f 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex @@ -93,6 +93,7 @@ texdoc pkuthss 被 Make 工具调用的 Makefile，用于使编译工作自动化。 \item \verb|Make.bat|：% Windows 下的伪“Makefile”，用 Windows 批处理实现。 + \item \verb|chap/|：目录，包含各章节内容： \begin{itemize} \item \verb|copyright.tex|： @@ -102,11 +103,18 @@ texdoc pkuthss 符合学校要求的一个版权声明已经放在此文件中， 但用 \texttt{\string\iffalse{} ...\ \string\fi} % 注释掉了， - 用户可以考虑使用那个版本。 + 用户可以考虑使用这个版本。 }。 \item \verb|originauth.tex|： 原创性声明和使用授权说明部分\supercite{pku-originauth}。 \end{itemize} + \myemph{% + 注：% + pkuthss 文档模版支持排版学校要求的二维码， + 请参考 \texttt{copyright.tex} 和 + \texttt{originauth.tex} 中的相关注释。% + } + \item \verb|img/|：目录，包含论文中所有图片： \begin{itemize} \item \verb|Makefile|：图片部分的 Makefile。 @@ -115,15 +123,15 @@ texdoc pkuthss \item \verb|pkulogo.eps|：北京大学校徽。 \item \verb|pkuword.eps|：“北京大学”字样。 \end{itemize} - \myemph{% - 注：% - pdf\LaTeX{} 方式编译（见第 \ref{sec:compile} 节） - 可能需要将 eps 图片转换为 pdf 格式， - 而使用 Makefile 或伪“Makefile”时这些图片可以自动生成； - 不使用 Makefile 的用户可以手动运行 % - \texttt{img/} 目录中的 Makefile 或伪“Makefile” - 来生成这些图片。% - } + \myemph{% + 注：% + pdf\LaTeX{} 方式编译（见第 \ref{sec:compile} 节） + 可能需要将 eps 图片转换为 pdf 格式， + 而使用 Makefile 或伪“Makefile”时这些图片可以自动生成； + 不使用 Makefile 的用户可以手动运行 % + \texttt{img/} 目录中的 Makefile 或伪“Makefile” + 来生成这些图片。% + } \end{itemize} \section{编译方式}\label{sec:compile} @@ -132,7 +140,16 @@ texdoc pkuthss \begin{itemize} \item \LaTeX{} -- dvipdfmx 方式：\\ 依次执行 \verb|latex|，\verb|biber|（或 \verb|bibtex|），% - \verb|latex|，\verb|latex| 和 \verb|dvipdfmx|。 + \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|pdflatex|，\verb|biber|（或 \verb|bibtex|），% \verb|pdflatex| 和 \verb|pdflatex|。 @@ -141,7 +158,7 @@ texdoc pkuthss \verb|xelatex| 和 \verb|xelatex|。\\ \myemph{% 注意：Xe\LaTeX{} 对非 UTF-8 的编码支持不好， - 因此 Xe\LaTeX{} 方式的编译不支持 GBK 编码。 + 因此 Xe\LaTeX{} 方式的编译不支持 GBK 编码。% } \end{itemize} diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap2.tex index 94e5746b117..a336bee5590 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap2.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap2.tex @@ -15,6 +15,22 @@ 用户如果不需要自动载入 pkuthss-extra 宏包， 则需要在载入 pkuthss 时加上 \verb|noextra| 选项。 + \item \textbf{\texttt{[no]uppermark}}： + 是否在页眉中将章节名中的小写字母转换为大写字母。 + 就目前而言， + 这样的转换存在着一些较为严重的缺陷\footnote{% + 准确地说是 \texttt{\string\MakeUppercase} 宏的问题， + 其在某些地方的转换不够健壮， + 例如 \texttt{\string\cite\string{ctex\string}} + 会被转换成 \texttt{\string\cite\string{CTEX\string}}。% + }， + 因此不建议使用。 + 基于上述考虑，% + \myemph{% + pkuthss 文档类默认启用 \texttt{nouppermark} 选项， + 即在不在页眉中使用大写的章节名% + }。 + \item \textbf{pkuthss-extra 宏包提供的选项}： 这些选项将被传递给 pkuthss-extra 宏包 （用户需要启用 \verb|extra| 选项）。 @@ -73,6 +89,21 @@ 启用 \verb|tightlist| 选项后， 将去掉这些环境中额外增加的（垂直）间隔。 + \item \textbf{\texttt{[no]caption}}： + 是否使图表标题使用和正文不同的字体 + （此处设为中文楷书、英文斜体， + 如图 \ref{fig:example} 所示）。 + 根据排版中常见的审美原则， + 一般应使图表标题的字体、字号轻 + （例如楷书之于宋体、五号字之于小四号字）于正文， + 图表内容的字体、字号轻于图表标题。 + + \begin{figure}[htbp!] + \centering + \includegraphics[width = 0.5\textwidth]{img/pkuword} + \caption{示例插图}\label{fig:example} + \end{figure} + \item \textbf{\texttt{[no]pdftoc}}\footnote{% 此选项部分等价于 1.4 alpha2 及以前版本 pkuthss-extra 宏包% 的 \texttt{[no]tocbibind} 选项。 @@ -83,22 +114,6 @@ 用 \verb|\tableofcontents| 命令生成目录时% 会自动添加“目录”的 pdf 书签。 - \item \textbf{\texttt{[no]uppermark}}： - 是否在页眉中将章节名中的小写字母转换为大写字母。 - 就目前而言， - 这样的转换存在着一些较为严重的缺陷\footnote{% - 准确地说是 \texttt{\string\MakeUppercase} 宏的问题， - 其在某些地方的转换不够健壮， - 例如 \texttt{\string\cite\string{ctex\string}} - 会被转换成 \texttt{\string\cite\string{CTEX\string}}。% - }， - 因此不建议使用。 - 基于上述考虑，% - \myemph{% - pkuthss-extra 宏包默认启用 \texttt{nouppermark} 选项， - 即在不在页眉中使用大写的章节名% - }。 - \item \textbf{\texttt{[no]spechap}}\footnote{% “spechap”是“\textbf{spec}ial \textbf{chap}ter”的缩写。% }： @@ -117,7 +132,7 @@ 若用户不调用 \texttt{\string\maketitle}， 则需在设定完文档信息之后自行调用% 第 \ref{ssec:misc} 小节中介绍的 % - \texttt{\string\setpdfproperties} 命令以完成% + \texttt{\string\setpdfproperties} 命令以完成 pdf 文档属性的设定。% } @@ -131,10 +146,11 @@ \end{itemize} 例如，在提交打印版的论文时， - 彩色的链接文字在黑白打印出来之后可能颜色会很浅。 + 彩色的链接文字在黑白打印出来之后可能颜色会很浅； + 北大图书馆也要求提交的电子版论文目录使用黑色字体。 此时用户\myemph{% - 可以启用 pkuthss-extra 宏包的 nocolorlinks 选项， - 使所有的链接变为黑色，以免影响打印% + 可以启用 pkuthss-extra 宏包的 \texttt{nocolorlinks} 选项， + 使所有的链接变为黑色，以免影响打印或提交% }： \begin{Verbatim}[frame = single] \documentclass[..., nocolorlinks]{pkuthss} % “...”代表其它的选项。 @@ -273,7 +289,7 @@ 例如，用户如果想将目录的标题改为“目{\quad\quad}录”， 则可以使用 ctexbook 文档类提供的 \verb|\CTEXoptions| 命令： \begin{Verbatim}[frame = single] -\CTEXoptions{contentsname = {目{\quad\quad}录}} +\CTEXoptions[contentsname = {目{\quad\quad}录}] \end{Verbatim} 在默认的配置下，% @@ -299,6 +315,8 @@ setspace 和 footmisc\supercite{footmisc} 宏包。 \item 启用 \verb|tightlist| 选项时会调用 % enumitem\supercite{enumitem} 宏包。 + \item 启用 \verb|caption| 选项时会调用 % + caption\supercite{caption} 宏包。 \end{itemize} 因此在启用相应选项时，用户可以使用对应宏包所提供的功能。 diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex index 34e8c5feb1c..e69004d8b07 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex @@ -7,6 +7,7 @@ \chapter{问题及其解决} \section{文档中已经提到的常见问题（按重要性排序）} + 北大图书馆要求上传的论文中目录采用黑色字体； 在默认设置（启用 \verb|colorlinks| 选项）下， 黑白打印时文档中的部分彩色链接可能会变成浅灰色， 解决方式见第 \ref{ssec:extra} 小节。 @@ -30,6 +31,8 @@ 而未引用的文献按照英文文献在前、中文文献在后排序这样的需求， 见第 \ref{ssec:thirdparty} 小节。 + 无法使用 biber 的用户可以使用 bibtex，具体设置方式请见第 \ref{sec:compile} 节。 + 一些高级设置， 如封面中部分内容长度超过预设空间容量时的设置， 见第 \ref{sec:advanced} 节。 @@ -51,9 +54,56 @@ 此文件通常和执行 \verb|texdoc hyperref| % 时打开的 pdf 文件位于同一目录中。 + 使用 Xe\LaTeX{} 的用户可能遇到形如（其中 xxxxxxxx 为具体字体名） +\begin{Verbatim}[frame = single, fontsize = {\small}] +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! +! fontspec error: "font-not-found" +! +! The font "xxxxxxxx" cannot be found. +! +! See the fontspec documentation for further information. +! +! For immediate help type H <return>. +!............................................... +\end{Verbatim} + 的错误。 + 这种错误一般是（主要是非 Windows 平台的）用户采用了自定义的（包括大小写 + 不同于原文件的）字体文件名， + 并改动 ctex.cfg 等配置文件之后没有在调用 pkuthss 文档类时加入 + \verb|nofonts| 选项， + 又使用 Xe\LaTeX{} 编译造成的，使用 +\begin{Verbatim}[frame = single] +\documentclass[nofonts, ...]{pkuthss} % “...”代表其它的选项。 +\end{Verbatim} + 即可解决此问题。 + + biber 运行时有一定概率出现形如（目录名可能稍有不同） +\begin{Verbatim}[frame = single, fontsize = {\small}] +data source .../par-xxxxxxxx/cache-xxxxxxxx/ + inc/lib/Biber/LaTeX/recode_data.xml not found in . +\end{Verbatim} + 的错误。 + 这种错误一般是 biber 在自解压阶段被终止之后， + 未删除临时目录 \verb|.../par-xxxxxxxx/| 就重新运行 biber 时出现。 + 遇到这种情况时，删除掉上述临时目录及其所有内容， + 再重新运行 biber 通常便可解决问题。 + + caption 宏包\supercite{caption}对于其不认识的宏包均会提示 +\begin{Verbatim}[frame = single, fontsize = {\small}] +Package caption Warning: Unsupported document class (or package) detected, +(caption) usage of the caption package is not recommended. +See the caption package documentation for explanation. +\end{Verbatim} + pkuthss 文档模版基于 ctexbook 文档类， + 而后者基于标准的 book 文档类。 + 因此，这个警告并不影响用户正常使用\footnote{% + \url{http://bbs.ctex.org/forum.php?mod=redirect&goto=findpost&ptid=63117&pid=402145}.% + }。 + \subsection{文档格式可能存在的问题} - 研究生手册和其电子版\supercite{pku-thesisstyle}要求的论文封面并不一致。 + 研究生手册和其电子版\supercite{pku-thesisstyle}要求的论文封面可能并不一致， 这里以电子版为准。 \subsection{其它一些问题} diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/copyright.tex index 4610b6e58e8..3a96f9c2196 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/copyright.tex @@ -39,6 +39,11 @@ 亦不得随意复制、抄录、拍照或以任何方式传播。 否则一旦引起有碍作者著作权之问题，将可能承担法律责任。 \par + % 若需排版二维码，请将二维码图片重命名为“barcode”， + % 转为合适的图片格式，并放在 img/ 目录中，然后去掉下面 3 行的注释。 + %\vfill\noindent + %\includegraphics[height = 5em]{img/barcode} + %\par \fi 版权所有 \copyright\ 2008--2009 solvethis \par diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/encl1.tex index 7eea433999d..5c7d6aaf467 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/encl1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/encl1.tex @@ -24,7 +24,7 @@ \VerbatimInput[ frame = lines, fontsize = {\footnotesize}, tabsize = 2, baselinestretch = 1, firstline = 25, numbers = left - ]{pkuthss-gbk.def} + ]{pkuthss-utf8.def} \subsection{\texttt{pkuthss-extra.sty}} \VerbatimInput[ diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/originauth.tex index ef69a5ce10c..9dabb205dc5 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/originauth.tex @@ -1,7 +1,7 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2012 Casper Ti. Vector +% Copyright (c) 2010-2013 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -31,12 +31,14 @@ % 原创性声明和使用授权说明页不需要装订到论文中，故不显示页码。 \cleardoublepage\thispagestyle{empty} +\newgeometry{height = 240mm, width = 150mm, ignoreheadfoot, vcentering} { - \linespread{1.5}\selectfont - \section*{北京大学学位论文原创性声明和使用授权说明} + \vspace*{\fill}\linespread{1.5}\selectfont + \centerline{\bfseries\Large 北京大学学位论文原创性声明和使用授权说明} - \vfill - \section*{原创性声明} + \vskip 4em + \centerline{\bfseries\Large 原创性声明} + \vskip 1em 本人郑重声明： 所呈交的学位论文，是本人在导师的指导下，独立进行研究工作所取得的成果。 @@ -44,18 +46,17 @@ 本论文不含任何其他个人或集体已经发表或撰写过的作品或成果。 对本文的研究做出重要贡献的个人和集体，均已在文中以明确方式标明。 本声明的法律结果由本人承担。 - \vspace{2.5em}\par + \vskip 1em \rightline {% 论文作者签名：\hspace{5em}% 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日% } - \vfill - \section*{学位论文使用授权说明} - \vspace{-1em}\par + \vskip 4em + \centerline{\bfseries\Large 学位论文使用授权说明} \centerline{\zihao{-4}（必须装订在提交学校图书馆的印刷本）} - \vspace{1em}\par + \vskip 1em 本人完全了解北京大学关于收集、保存、使用学位论文的规定，即： \begin{itemize} @@ -69,12 +70,19 @@ $\square$\nobreakspace{}三年以后在校园网上全文发布。 \end{itemize} \par（保密论文在解密后遵守此规定） - \vspace{2.5em}\par + \vskip 1em \rightline {% 论文作者签名：\hspace{5em}导师签名：\hspace{5em}% 日期：\hspace{2em}年\hspace{2em}月\hspace{2em}日% } - \par + + % 若需排版二维码，请将二维码图片重命名为“barcode”， + % 转为合适的图片格式，并放在 img/ 目录中，然后去掉下面 2 行的注释。 + %\vskip 4em \noindent + %\includegraphics[height = 5em]{img/barcode} + + \vspace*{\fill}\par } +\restoregeometry diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/img/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/img/Make.bat index c5f78b3a9ea..dd14e3db220 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/img/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/img/Make.bat @@ -1,31 +1,31 @@ -@echo off
-
-@rem vim:ts=4:sw=4
-@rem
-@rem Copyright (c) 2008-2009 solvethis
-@rem Copyright (c) 2010-2012 Casper Ti. Vector
-@rem Public domain.
-
-set GS=gswin32c
-set GSOPTS=-q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite
-set WIDTHOPT=-dDEVICEWIDTHPOINTS=
-set HEIGHTOPT=-dDEVICEHEIGHTPOINTS=
-set OUTPUTOPT=-sOutputFile=
-
-if "%1"=="" goto pdf
-if "%1"=="clean" (goto clean) else (goto usage)
-
-:pdf
-%GS% %GSOPTS% %WIDTHOPT%400 %HEIGHTOPT%400 %OUTPUTOPT%pkulogo.pdf -f pkulogo.eps
-%GS% %GSOPTS% %WIDTHOPT%525 %HEIGHTOPT%150 %OUTPUTOPT%pkuword.pdf -f pkuword.eps
-goto end
-
-:clean
-del pkulogo.pdf pkuword.pdf
-goto end
-
-:usage
-echo %0 [pdf] [clean]
-
-:end
-
+@echo off + +@rem vim:ts=4:sw=4 +@rem +@rem Copyright (c) 2008-2009 solvethis +@rem Copyright (c) 2010-2012 Casper Ti. Vector +@rem Public domain. + +set GS=gswin32c +set GSOPTS=-q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite +set WIDTHOPT=-dDEVICEWIDTHPOINTS= +set HEIGHTOPT=-dDEVICEHEIGHTPOINTS= +set OUTPUTOPT=-sOutputFile= + +if "%1"=="" goto pdf +if "%1"=="clean" (goto clean) else (goto usage) + +:pdf +%GS% %GSOPTS% %WIDTHOPT%400 %HEIGHTOPT%400 %OUTPUTOPT%pkulogo.pdf -f pkulogo.eps +%GS% %GSOPTS% %WIDTHOPT%525 %HEIGHTOPT%150 %OUTPUTOPT%pkuword.pdf -f pkuword.eps +goto end + +:clean +del pkulogo.pdf pkuword.pdf +goto end + +:usage +echo %0 [pdf] [clean] + +:end + diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib index 8837da6caa1..08c26dfb15d 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib @@ -28,6 +28,15 @@ vim:ts=4:sw=4 userf = {zh}, } +@online{caption, + author = {Sommerfeldt, Alex}, + title = {Customizing captions of floating environments}, + type = {M/OL}, + date = {2011-11-02}, + url = {http://mirror.ctan.org/macros/latex/contrib/caption}, + urldate = {2013-06-03}, +} + @online{ctex, author = {{ctex.org}}, title = {ctex 宏包说明（v1.02c）}, diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex index 083979f2e95..78824d1c112 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex @@ -12,14 +12,24 @@ % 调出。 % 在黑白打印时彩色链接可能变成浅灰色，此时可将“colorlinks”改为“nocolorlinks”。 +% 北大图书馆要求上传的电子版论文中目录采用黑色字体，可以用同样的方法处理。 +% +% 采用了自定义的（包括大小写不同于原文件的）字体文件名， +% 并改动 ctex.cfg 等配置文件的用户请自行加入 nofonts 选项； +% 其它用户不用加入 nofonts 选项，加入之后反而会产生错误。 \documentclass[GBK, colorlinks]{pkuthss} % 使用 biblatex 排版参考文献，并规定其格式。 +% +% 如果无法使用 biber，可以把“backend = biber”改为“backend = bibtex”， +% 并改用 bibtex 产生参考文献，详见 pkuthss 的文档。 +% 使用 biber 时，请去掉所有的 sorting 选项，否则会出错。 +% % 默认按照引用顺序排序（“sorting = none”），详见 biblatex-caspervector 的文档 % （因为是默认设置所以其实不用写，不过出于完备性的考虑仍然在这里列出）。 % 若需要按照英文文献在前，中文文献在后排序，请设置“sorting = ecnty”； % 若需要按照中文文献在前，英文文献在后排序，请设置“sorting = centy”。 -\usepackage[backend = biber, style = caspervector, gbk, sorting = none]{biblatex} +\usepackage[backend = biber, style = caspervector, utf8, sorting = none]{biblatex} % 使得打字机粗体可以被使用。 \usepackage{lmodern} % 产生 originauth.tex 里的 \square。 @@ -27,11 +37,12 @@ % 提供 Verbatim 环境和 \VerbatimInput 命令。 \usepackage{fancyvrb} -% 使被强调的内容为红色。 +% 使被强调的内容为红色。hyperref 宏包在设置了 colorlinks 时会引入 xcolor 宏包， +% 后者定义了 \textcolor 命令，故不用单独引入宏包。 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} % pkuthss 文档模版的版本。 -\newcommand{\docversion}{v1.4 rc3} +\newcommand{\docversion}{v1.4 rc4} % 设定文档的基本信息。 \pkuthssinfo{ cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, @@ -47,9 +58,9 @@ cauthor = {盖茨波 $\cdot$ 钛 $\cdot$ 维克托}, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {二〇一三年四月}, + date = {二〇一三年十二月}, school = {化学与分子工程学院}, - cmajor = {化学（？）}, emajor = {Chemistry}, + cmajor = {化学（？）}, emajor = {Chemistry ... ?}, direction = {据说 Casper 自己也不知道}, cmentor = {XX 教授}, ementor = {Prof.\ XX}, ckeywords = {\LaTeX2e{}，排版，文档类，\CTeX{}}, @@ -94,6 +105,7 @@ % 注：只有同时使用 2.x 或之后版本的 biblatex 和相应兼容版本的 biber， % 才能对每个 \printbibliography 命令采用不同的排序方案， % 否则只能在导入 biblatex 宏包时就（全局）指定排序方案。 + % 在这样的情况下，请去掉所有的 sorting 选项，否则可能出错。 sorting = ecnty ] % 各附录。 diff --git a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf Binary files differindex d598880ecc9..5dbdb473d96 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt index 30aedaeb1e6..4ceab9aaa0e 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt @@ -1,3 +1,20 @@ +2013-12-26, v1.4 rc4 + + * API Changes: + - Add `caption' option to customise caption fonts. + - Remove `\label@cmentorb'; `\label@cmentora' -> `\label@cmentor'. + - Move `[no]uppermark' to pkuthss.cls. + + * Changes to package code: + - Consider `oneside' in page style. + + * Changes to documentation: + - Add support for 2-dimensional bar code. + - Add and refine lots of hints. + + * Misc: + - Minor fixes and improvements. + 2013-04-07, v1.4 rc3 * Misc: diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/Make.bat index 711a52c2bd9..4fc74078fc9 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/Make.bat @@ -1,48 +1,48 @@ -@echo off
-
-@rem vim:ts=4:sw=4
-@rem
-@rem Copyright (c) 2008-2009 solvethis
-@rem Copyright (c) 2010-2012 Casper Ti. Vector
-@rem Public domain.
-
-set JOBNAME=pkuthss
-@rem 这个变量的值可以为 latex 或 pdflatex。
-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)
-
-:doc
-cd img
-call Make.bat
-cd ..
-%LATEX% %JOBNAME%
-%BIBTEX% %JOBNAME%
-%DOGBK2UNI%
-%LATEX% %JOBNAME%
-%LATEX% %JOBNAME%
-%DODVIPDF%
-goto end
-
-:clear
-del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out
-del missfont.log chap\*.aux
-goto end
-
-:usage
-echo %0 [doc] [clear]
-goto end
-
-:end
-
+@echo off + +@rem vim:ts=4:sw=4 +@rem +@rem Copyright (c) 2008-2009 solvethis +@rem Copyright (c) 2010-2012 Casper Ti. Vector +@rem Public domain. + +set JOBNAME=pkuthss +@rem 这个变量的值可以为 latex 或 pdflatex。 +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) + +:doc +cd img +call Make.bat +cd .. +%LATEX% %JOBNAME% +%BIBTEX% %JOBNAME% +%DOGBK2UNI% +%LATEX% %JOBNAME% +%LATEX% %JOBNAME% +%DODVIPDF% +goto end + +:clear +del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out +del missfont.log chap\*.aux +goto end + +:usage +echo %0 [doc] [clear] +goto end + +:end + diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/abstract.tex index 02e7a87712d..14d9a299d31 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/abstract.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/abstract.tex @@ -1,22 +1,18 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2012 Casper Ti. Vector +% Copyright (c) 2010-2013 Casper Ti. Vector % Public domain. \begin{cabstract} - 鏈枃浠嬬粛浜 pkuthss 鏂囨。妯＄増鎵鎻愪緵鐨勫姛鑳斤紝 骞朵互鑷韩涓轰緥婕旂ず浜嗚妯＄増鐨勪娇鐢ㄣ - \end{cabstract} \begin{eabstract} - This paper describes the the functions provided by the pkuthss document template, and provides itself as an example to illustrate the usage of the document class. - \end{eabstract} diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex index 53bb81697f9..fd640c269a9 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex @@ -93,6 +93,7 @@ texdoc pkuthss 琚 Make 宸ュ叿璋冪敤鐨 Makefile锛岀敤浜庝娇缂栬瘧宸ヤ綔鑷姩鍖栥 \item \verb|Make.bat|锛% Windows 涓嬬殑浼淢akefile鈥濓紝鐢 Windows 鎵瑰鐞嗗疄鐜般 + \item \verb|chap/|锛氱洰褰曪紝鍖呭惈鍚勭珷鑺傚唴瀹癸細 \begin{itemize} \item \verb|copyright.tex|锛 @@ -102,11 +103,18 @@ texdoc pkuthss 绗﹀悎瀛︽牎瑕佹眰鐨勪竴涓増鏉冨０鏄庡凡缁忔斁鍦ㄦ鏂囦欢涓紝 浣嗙敤 \texttt{\string\iffalse{} ...\ \string\fi} % 娉ㄩ噴鎺変簡锛 - 鐢ㄦ埛鍙互鑰冭檻浣跨敤閭ｄ釜鐗堟湰銆 + 鐢ㄦ埛鍙互鑰冭檻浣跨敤杩欎釜鐗堟湰銆 }銆 \item \verb|originauth.tex|锛 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑閮ㄥ垎\supercite{pku-originauth}銆 \end{itemize} + \myemph{% + 娉細% + pkuthss 鏂囨。妯＄増鏀寔鎺掔増瀛︽牎瑕佹眰鐨勪簩缁寸爜锛 + 璇峰弬鑰 \texttt{copyright.tex} 鍜 + \texttt{originauth.tex} 涓殑鐩稿叧娉ㄩ噴銆% + } + \item \verb|img/|锛氱洰褰曪紝鍖呭惈璁烘枃涓墍鏈夊浘鐗囷細 \begin{itemize} \item \verb|Makefile|锛氬浘鐗囬儴鍒嗙殑 Makefile銆 @@ -115,15 +123,15 @@ texdoc pkuthss \item \verb|pkulogo.eps|锛氬寳浜ぇ瀛︽牎寰姐 \item \verb|pkuword.eps|锛氣滃寳浜ぇ瀛︹濆瓧鏍枫 \end{itemize} - \myemph{% - 娉細% - pdf\LaTeX{} 鏂瑰紡缂栬瘧锛堣绗 \ref{sec:compile} 鑺傦級 - 鍙兘闇瑕佸皢 eps 鍥剧墖杞崲涓 pdf 鏍煎紡锛 - 鑰屼娇鐢 Makefile 鎴栦吉鈥淢akefile鈥濇椂杩欎簺鍥剧墖鍙互鑷姩鐢熸垚锛 - 涓嶄娇鐢 Makefile 鐨勭敤鎴峰彲浠ユ墜鍔ㄨ繍琛 % - \texttt{img/} 鐩綍涓殑 Makefile 鎴栦吉鈥淢akefile鈥 - 鏉ョ敓鎴愯繖浜涘浘鐗囥% - } + \myemph{% + 娉細% + pdf\LaTeX{} 鏂瑰紡缂栬瘧锛堣绗 \ref{sec:compile} 鑺傦級 + 鍙兘闇瑕佸皢 eps 鍥剧墖杞崲涓 pdf 鏍煎紡锛 + 鑰屼娇鐢 Makefile 鎴栦吉鈥淢akefile鈥濇椂杩欎簺鍥剧墖鍙互鑷姩鐢熸垚锛 + 涓嶄娇鐢 Makefile 鐨勭敤鎴峰彲浠ユ墜鍔ㄨ繍琛 % + \texttt{img/} 鐩綍涓殑 Makefile 鎴栦吉鈥淢akefile鈥 + 鏉ョ敓鎴愯繖浜涘浘鐗囥% + } \end{itemize} \section{缂栬瘧鏂瑰紡}\label{sec:compile} @@ -132,7 +140,16 @@ texdoc pkuthss \begin{itemize} \item \LaTeX{} -- dvipdfmx 鏂瑰紡锛歕\ 渚濇鎵ц \verb|latex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝% - \verb|latex|锛孿verb|latex| 鍜 \verb|dvipdfmx|銆 + \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|pdflatex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝% \verb|pdflatex| 鍜 \verb|pdflatex|銆 @@ -141,7 +158,7 @@ texdoc pkuthss \verb|xelatex| 鍜 \verb|xelatex|銆俓\ \myemph{% 娉ㄦ剰锛歑e\LaTeX{} 瀵归潪 UTF-8 鐨勭紪鐮佹敮鎸佷笉濂斤紝 - 鍥犳 Xe\LaTeX{} 鏂瑰紡鐨勭紪璇戜笉鏀寔 GBK 缂栫爜銆 + 鍥犳 Xe\LaTeX{} 鏂瑰紡鐨勭紪璇戜笉鏀寔 GBK 缂栫爜銆% } \end{itemize} diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap2.tex index 1949e2e4aa3..771967e3f0d 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap2.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap2.tex @@ -15,6 +15,22 @@ 鐢ㄦ埛濡傛灉涓嶉渶瑕佽嚜鍔ㄨ浇鍏 pkuthss-extra 瀹忓寘锛 鍒欓渶瑕佸湪杞藉叆 pkuthss 鏃跺姞涓 \verb|noextra| 閫夐」銆 + \item \textbf{\texttt{[no]uppermark}}锛 + 鏄惁鍦ㄩ〉鐪変腑灏嗙珷鑺傚悕涓殑灏忓啓瀛楁瘝杞崲涓哄ぇ鍐欏瓧姣嶃 + 灏辩洰鍓嶈岃█锛 + 杩欐牱鐨勮浆鎹㈠瓨鍦ㄧ潃涓浜涜緝涓轰弗閲嶇殑缂洪櫡\footnote{% + 鍑嗙‘鍦拌鏄 \texttt{\string\MakeUppercase} 瀹忕殑闂锛 + 鍏跺湪鏌愪簺鍦版柟鐨勮浆鎹笉澶熷仴澹紝 + 渚嬪 \texttt{\string\cite\string{ctex\string}} + 浼氳杞崲鎴 \texttt{\string\cite\string{CTEX\string}}銆% + }锛 + 鍥犳涓嶅缓璁娇鐢ㄣ + 鍩轰簬涓婅堪鑰冭檻锛% + \myemph{% + pkuthss 鏂囨。绫婚粯璁ゅ惎鐢 \texttt{nouppermark} 閫夐」锛 + 鍗冲湪涓嶅湪椤电湁涓娇鐢ㄥぇ鍐欑殑绔犺妭鍚% + }銆 + \item \textbf{pkuthss-extra 瀹忓寘鎻愪緵鐨勯夐」}锛 杩欎簺閫夐」灏嗚浼犻掔粰 pkuthss-extra 瀹忓寘 锛堢敤鎴烽渶瑕佸惎鐢 \verb|extra| 閫夐」锛夈 @@ -73,6 +89,21 @@ 鍚敤 \verb|tightlist| 閫夐」鍚庯紝 灏嗗幓鎺夎繖浜涚幆澧冧腑棰濆澧炲姞鐨勶紙鍨傜洿锛夐棿闅斻 + \item \textbf{\texttt{[no]caption}}锛 + 鏄惁浣垮浘琛ㄦ爣棰樹娇鐢ㄥ拰姝ｆ枃涓嶅悓鐨勫瓧浣 + 锛堟澶勮涓轰腑鏂囨シ涔︺佽嫳鏂囨枩浣擄紝 + 濡傚浘 \ref{fig:example} 鎵绀猴級銆 + 鏍规嵁鎺掔増涓父瑙佺殑瀹＄編鍘熷垯锛 + 涓鑸簲浣垮浘琛ㄦ爣棰樼殑瀛椾綋銆佸瓧鍙疯交 + 锛堜緥濡傛シ涔︿箣浜庡畫浣撱佷簲鍙峰瓧涔嬩簬灏忓洓鍙峰瓧锛変簬姝ｆ枃锛 + 鍥捐〃鍐呭鐨勫瓧浣撱佸瓧鍙疯交浜庡浘琛ㄦ爣棰樸 + + \begin{figure}[htbp!] + \centering + \includegraphics[width = 0.5\textwidth]{img/pkuword} + \caption{绀轰緥鎻掑浘}\label{fig:example} + \end{figure} + \item \textbf{\texttt{[no]pdftoc}}\footnote{% 姝ら夐」閮ㄥ垎绛変环浜 1.4 alpha2 鍙婁互鍓嶇増鏈 pkuthss-extra 瀹忓寘% 鐨 \texttt{[no]tocbibind} 閫夐」銆 @@ -83,22 +114,6 @@ 鐢 \verb|\tableofcontents| 鍛戒护鐢熸垚鐩綍鏃% 浼氳嚜鍔ㄦ坊鍔犫滅洰褰曗濈殑 pdf 涔︾銆 - \item \textbf{\texttt{[no]uppermark}}锛 - 鏄惁鍦ㄩ〉鐪変腑灏嗙珷鑺傚悕涓殑灏忓啓瀛楁瘝杞崲涓哄ぇ鍐欏瓧姣嶃 - 灏辩洰鍓嶈岃█锛 - 杩欐牱鐨勮浆鎹㈠瓨鍦ㄧ潃涓浜涜緝涓轰弗閲嶇殑缂洪櫡\footnote{% - 鍑嗙‘鍦拌鏄 \texttt{\string\MakeUppercase} 瀹忕殑闂锛 - 鍏跺湪鏌愪簺鍦版柟鐨勮浆鎹笉澶熷仴澹紝 - 渚嬪 \texttt{\string\cite\string{ctex\string}} - 浼氳杞崲鎴 \texttt{\string\cite\string{CTEX\string}}銆% - }锛 - 鍥犳涓嶅缓璁娇鐢ㄣ - 鍩轰簬涓婅堪鑰冭檻锛% - \myemph{% - pkuthss-extra 瀹忓寘榛樿鍚敤 \texttt{nouppermark} 閫夐」锛 - 鍗冲湪涓嶅湪椤电湁涓娇鐢ㄥぇ鍐欑殑绔犺妭鍚% - }銆 - \item \textbf{\texttt{[no]spechap}}\footnote{% 鈥渟pechap鈥濇槸鈥淺textbf{spec}ial \textbf{chap}ter鈥濈殑缂╁啓銆% }锛 @@ -117,7 +132,7 @@ 鑻ョ敤鎴蜂笉璋冪敤 \texttt{\string\maketitle}锛 鍒欓渶鍦ㄨ瀹氬畬鏂囨。淇℃伅涔嬪悗鑷璋冪敤% 绗 \ref{ssec:misc} 灏忚妭涓粙缁嶇殑 % - \texttt{\string\setpdfproperties} 鍛戒护浠ュ畬鎴% + \texttt{\string\setpdfproperties} 鍛戒护浠ュ畬鎴 pdf 鏂囨。灞炴х殑璁惧畾銆% } @@ -131,10 +146,11 @@ \end{itemize} 渚嬪锛屽湪鎻愪氦鎵撳嵃鐗堢殑璁烘枃鏃讹紝 - 褰╄壊鐨勯摼鎺ユ枃瀛楀湪榛戠櫧鎵撳嵃鍑烘潵涔嬪悗鍙兘棰滆壊浼氬緢娴呫 + 褰╄壊鐨勯摼鎺ユ枃瀛楀湪榛戠櫧鎵撳嵃鍑烘潵涔嬪悗鍙兘棰滆壊浼氬緢娴咃紱 + 鍖楀ぇ鍥句功棣嗕篃瑕佹眰鎻愪氦鐨勭數瀛愮増璁烘枃鐩綍浣跨敤榛戣壊瀛椾綋銆 姝ゆ椂鐢ㄦ埛\myemph{% - 鍙互鍚敤 pkuthss-extra 瀹忓寘鐨 nocolorlinks 閫夐」锛 - 浣挎墍鏈夌殑閾炬帴鍙樹负榛戣壊锛屼互鍏嶅奖鍝嶆墦鍗% + 鍙互鍚敤 pkuthss-extra 瀹忓寘鐨 \texttt{nocolorlinks} 閫夐」锛 + 浣挎墍鏈夌殑閾炬帴鍙樹负榛戣壊锛屼互鍏嶅奖鍝嶆墦鍗版垨鎻愪氦% }锛 \begin{Verbatim}[frame = single] \documentclass[..., nocolorlinks]{pkuthss} % 鈥...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆 @@ -273,7 +289,7 @@ 渚嬪锛岀敤鎴峰鏋滄兂灏嗙洰褰曠殑鏍囬鏀逛负鈥滅洰{\quad\quad}褰曗濓紝 鍒欏彲浠ヤ娇鐢 ctexbook 鏂囨。绫绘彁渚涚殑 \verb|\CTEXoptions| 鍛戒护锛 \begin{Verbatim}[frame = single] -\CTEXoptions{contentsname = {鐩畕\quad\quad}褰晑} +\CTEXoptions[contentsname = {鐩畕\quad\quad}褰晑] \end{Verbatim} 鍦ㄩ粯璁ょ殑閰嶇疆涓嬶紝% @@ -299,6 +315,8 @@ setspace 鍜 footmisc\supercite{footmisc} 瀹忓寘銆 \item 鍚敤 \verb|tightlist| 閫夐」鏃朵細璋冪敤 % enumitem\supercite{enumitem} 瀹忓寘銆 + \item 鍚敤 \verb|caption| 閫夐」鏃朵細璋冪敤 % + caption\supercite{caption} 瀹忓寘銆 \end{itemize} 鍥犳鍦ㄥ惎鐢ㄧ浉搴旈夐」鏃讹紝鐢ㄦ埛鍙互浣跨敤瀵瑰簲瀹忓寘鎵鎻愪緵鐨勫姛鑳姐 diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex index 9eeedf85687..35f2f1df6ba 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex @@ -7,6 +7,7 @@ \chapter{闂鍙婂叾瑙ｅ喅} \section{鏂囨。涓凡缁忔彁鍒扮殑甯歌闂锛堟寜閲嶈鎬ф帓搴忥級} + 鍖楀ぇ鍥句功棣嗚姹備笂浼犵殑璁烘枃涓洰褰曢噰鐢ㄩ粦鑹插瓧浣擄紱 鍦ㄩ粯璁よ缃紙鍚敤 \verb|colorlinks| 閫夐」锛変笅锛 榛戠櫧鎵撳嵃鏃舵枃妗ｄ腑鐨勯儴鍒嗗僵鑹查摼鎺ュ彲鑳戒細鍙樻垚娴呯伆鑹诧紝 瑙ｅ喅鏂瑰紡瑙佺 \ref{ssec:extra} 灏忚妭銆 @@ -30,6 +31,8 @@ 鑰屾湭寮曠敤鐨勬枃鐚寜鐓ц嫳鏂囨枃鐚湪鍓嶃佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇姹傦紝 瑙佺 \ref{ssec:thirdparty} 灏忚妭銆 + 鏃犳硶浣跨敤 biber 鐨勭敤鎴峰彲浠ヤ娇鐢 bibtex锛屽叿浣撹缃柟寮忚瑙佺 \ref{sec:compile} 鑺傘 + 涓浜涢珮绾ц缃紝 濡傚皝闈腑閮ㄥ垎鍐呭闀垮害瓒呰繃棰勮绌洪棿瀹归噺鏃剁殑璁剧疆锛 瑙佺 \ref{sec:advanced} 鑺傘 @@ -51,9 +54,56 @@ 姝ゆ枃浠堕氬父鍜屾墽琛 \verb|texdoc hyperref| % 鏃舵墦寮鐨 pdf 鏂囦欢浣嶄簬鍚屼竴鐩綍涓 + 浣跨敤 Xe\LaTeX{} 鐨勭敤鎴峰彲鑳介亣鍒板舰濡傦紙鍏朵腑 xxxxxxxx 涓哄叿浣撳瓧浣撳悕锛 +\begin{Verbatim}[frame = single, fontsize = {\small}] +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! +! fontspec error: "font-not-found" +! +! The font "xxxxxxxx" cannot be found. +! +! See the fontspec documentation for further information. +! +! For immediate help type H <return>. +!............................................... +\end{Verbatim} + 鐨勯敊璇 + 杩欑閿欒涓鑸槸锛堜富瑕佹槸闈 Windows 骞冲彴鐨勶級鐢ㄦ埛閲囩敤浜嗚嚜瀹氫箟鐨勶紙鍖呮嫭澶у皬鍐 + 涓嶅悓浜庡師鏂囦欢鐨勶級瀛椾綋鏂囦欢鍚嶏紝 + 骞舵敼鍔 ctex.cfg 绛夐厤缃枃浠朵箣鍚庢病鏈夊湪璋冪敤 pkuthss 鏂囨。绫绘椂鍔犲叆 + \verb|nofonts| 閫夐」锛 + 鍙堜娇鐢 Xe\LaTeX{} 缂栬瘧閫犳垚鐨勶紝浣跨敤 +\begin{Verbatim}[frame = single] +\documentclass[nofonts, ...]{pkuthss} % 鈥...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆 +\end{Verbatim} + 鍗冲彲瑙ｅ喅姝ら棶棰樸 + + biber 杩愯鏃舵湁涓瀹氭鐜囧嚭鐜板舰濡傦紙鐩綍鍚嶅彲鑳界◢鏈変笉鍚岋級 +\begin{Verbatim}[frame = single, fontsize = {\small}] +data source .../par-xxxxxxxx/cache-xxxxxxxx/ + inc/lib/Biber/LaTeX/recode_data.xml not found in . +\end{Verbatim} + 鐨勯敊璇 + 杩欑閿欒涓鑸槸 biber 鍦ㄨ嚜瑙ｅ帇闃舵琚粓姝箣鍚庯紝 + 鏈垹闄や复鏃剁洰褰 \verb|.../par-xxxxxxxx/| 灏遍噸鏂拌繍琛 biber 鏃跺嚭鐜般 + 閬囧埌杩欑鎯呭喌鏃讹紝鍒犻櫎鎺変笂杩颁复鏃剁洰褰曞強鍏舵墍鏈夊唴瀹癸紝 + 鍐嶉噸鏂拌繍琛 biber 閫氬父渚垮彲瑙ｅ喅闂銆 + + caption 瀹忓寘\supercite{caption}瀵逛簬鍏朵笉璁よ瘑鐨勫畯鍖呭潎浼氭彁绀 +\begin{Verbatim}[frame = single, fontsize = {\small}] +Package caption Warning: Unsupported document class (or package) detected, +(caption) usage of the caption package is not recommended. +See the caption package documentation for explanation. +\end{Verbatim} + pkuthss 鏂囨。妯＄増鍩轰簬 ctexbook 鏂囨。绫伙紝 + 鑰屽悗鑰呭熀浜庢爣鍑嗙殑 book 鏂囨。绫汇 + 鍥犳锛岃繖涓鍛婂苟涓嶅奖鍝嶇敤鎴锋甯镐娇鐢╘footnote{% + \url{http://bbs.ctex.org/forum.php?mod=redirect&goto=findpost&ptid=63117&pid=402145}.% + }銆 + \subsection{鏂囨。鏍煎紡鍙兘瀛樺湪鐨勯棶棰榼 - 鐮旂┒鐢熸墜鍐屽拰鍏剁數瀛愮増\supercite{pku-thesisstyle}瑕佹眰鐨勮鏂囧皝闈㈠苟涓嶄竴鑷淬 + 鐮旂┒鐢熸墜鍐屽拰鍏剁數瀛愮増\supercite{pku-thesisstyle}瑕佹眰鐨勮鏂囧皝闈㈠彲鑳藉苟涓嶄竴鑷达紝 杩欓噷浠ョ數瀛愮増涓哄噯銆 \subsection{鍏跺畠涓浜涢棶棰榼 diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/copyright.tex index 7cc86a31373..15d4289aa88 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/copyright.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/copyright.tex @@ -39,6 +39,11 @@ 浜︿笉寰楅殢鎰忓鍒躲佹妱褰曘佹媿鐓ф垨浠ヤ换浣曟柟寮忎紶鎾 鍚﹀垯涓鏃﹀紩璧锋湁纰嶄綔鑰呰憲浣滄潈涔嬮棶棰橈紝灏嗗彲鑳芥壙鎷呮硶寰嬭矗浠汇 \par + % 鑻ラ渶鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 + % 杞负鍚堥傜殑鍥剧墖鏍煎紡锛屽苟鏀惧湪 img/ 鐩綍涓紝鐒跺悗鍘绘帀涓嬮潰 3 琛岀殑娉ㄩ噴銆 + %\vfill\noindent + %\includegraphics[height = 5em]{img/barcode} + %\par \fi 鐗堟潈鎵鏈 \copyright\ 2008--2009 solvethis \par diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/originauth.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/originauth.tex index 64de6219f20..f73b5f95591 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/originauth.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/originauth.tex @@ -1,7 +1,7 @@ % vim:ts=4:sw=4 % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2012 Casper Ti. Vector +% Copyright (c) 2010-2013 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -31,12 +31,14 @@ % 鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑椤典笉闇瑕佽璁㈠埌璁烘枃涓紝鏁呬笉鏄剧ず椤电爜銆 \cleardoublepage\thispagestyle{empty} +\newgeometry{height = 240mm, width = 150mm, ignoreheadfoot, vcentering} { - \linespread{1.5}\selectfont - \section*{鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} + \vspace*{\fill}\linespread{1.5}\selectfont + \centerline{\bfseries\Large 鍖椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄庡拰浣跨敤鎺堟潈璇存槑} - \vfill - \section*{鍘熷垱鎬у０鏄巬 + \vskip 4em + \centerline{\bfseries\Large 鍘熷垱鎬у０鏄巬 + \vskip 1em 鏈汉閮戦噸澹版槑锛 鎵鍛堜氦鐨勫浣嶈鏂囷紝鏄湰浜哄湪瀵煎笀鐨勬寚瀵间笅锛岀嫭绔嬭繘琛岀爺绌跺伐浣滄墍鍙栧緱鐨勬垚鏋溿 @@ -44,18 +46,17 @@ 鏈鏂囦笉鍚换浣曞叾浠栦釜浜烘垨闆嗕綋宸茬粡鍙戣〃鎴栨挵鍐欒繃鐨勪綔鍝佹垨鎴愭灉銆 瀵规湰鏂囩殑鐮旂┒鍋氬嚭閲嶈璐＄尞鐨勪釜浜哄拰闆嗕綋锛屽潎宸插湪鏂囦腑浠ユ槑纭柟寮忔爣鏄庛 鏈０鏄庣殑娉曞緥缁撴灉鐢辨湰浜烘壙鎷呫 - \vspace{2.5em}\par + \vskip 1em \rightline {% 璁烘枃浣滆呯鍚嶏細\hspace{5em}% 鏃ユ湡锛歕hspace{2em}骞碶hspace{2em}鏈圽hspace{2em}鏃% } - \vfill - \section*{瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑} - \vspace{-1em}\par + \vskip 4em + \centerline{\bfseries\Large 瀛︿綅璁烘枃浣跨敤鎺堟潈璇存槑} \centerline{\zihao{-4}锛堝繀椤昏璁㈠湪鎻愪氦瀛︽牎鍥句功棣嗙殑鍗板埛鏈級} - \vspace{1em}\par + \vskip 1em 鏈汉瀹屽叏浜嗚В鍖椾含澶у鍏充簬鏀堕泦銆佷繚瀛樸佷娇鐢ㄥ浣嶈鏂囩殑瑙勫畾锛屽嵆锛 \begin{itemize} @@ -69,12 +70,19 @@ $\square$\nobreakspace{}涓夊勾浠ュ悗鍦ㄦ牎鍥綉涓婂叏鏂囧彂甯冦 \end{itemize} \par锛堜繚瀵嗚鏂囧湪瑙ｅ瘑鍚庨伒瀹堟瑙勫畾锛 - \vspace{2.5em}\par + \vskip 1em \rightline {% 璁烘枃浣滆呯鍚嶏細\hspace{5em}瀵煎笀绛惧悕锛歕hspace{5em}% 鏃ユ湡锛歕hspace{2em}骞碶hspace{2em}鏈圽hspace{2em}鏃% } - \par + + % 鑻ラ渶鎺掔増浜岀淮鐮侊紝璇峰皢浜岀淮鐮佸浘鐗囬噸鍛藉悕涓衡渂arcode鈥濓紝 + % 杞负鍚堥傜殑鍥剧墖鏍煎紡锛屽苟鏀惧湪 img/ 鐩綍涓紝鐒跺悗鍘绘帀涓嬮潰 2 琛岀殑娉ㄩ噴銆 + %\vskip 4em \noindent + %\includegraphics[height = 5em]{img/barcode} + + \vspace*{\fill}\par } +\restoregeometry diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/img/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/img/Make.bat index c5f78b3a9ea..dd14e3db220 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/img/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/img/Make.bat @@ -1,31 +1,31 @@ -@echo off
-
-@rem vim:ts=4:sw=4
-@rem
-@rem Copyright (c) 2008-2009 solvethis
-@rem Copyright (c) 2010-2012 Casper Ti. Vector
-@rem Public domain.
-
-set GS=gswin32c
-set GSOPTS=-q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite
-set WIDTHOPT=-dDEVICEWIDTHPOINTS=
-set HEIGHTOPT=-dDEVICEHEIGHTPOINTS=
-set OUTPUTOPT=-sOutputFile=
-
-if "%1"=="" goto pdf
-if "%1"=="clean" (goto clean) else (goto usage)
-
-:pdf
-%GS% %GSOPTS% %WIDTHOPT%400 %HEIGHTOPT%400 %OUTPUTOPT%pkulogo.pdf -f pkulogo.eps
-%GS% %GSOPTS% %WIDTHOPT%525 %HEIGHTOPT%150 %OUTPUTOPT%pkuword.pdf -f pkuword.eps
-goto end
-
-:clean
-del pkulogo.pdf pkuword.pdf
-goto end
-
-:usage
-echo %0 [pdf] [clean]
-
-:end
-
+@echo off + +@rem vim:ts=4:sw=4 +@rem +@rem Copyright (c) 2008-2009 solvethis +@rem Copyright (c) 2010-2012 Casper Ti. Vector +@rem Public domain. + +set GS=gswin32c +set GSOPTS=-q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite +set WIDTHOPT=-dDEVICEWIDTHPOINTS= +set HEIGHTOPT=-dDEVICEHEIGHTPOINTS= +set OUTPUTOPT=-sOutputFile= + +if "%1"=="" goto pdf +if "%1"=="clean" (goto clean) else (goto usage) + +:pdf +%GS% %GSOPTS% %WIDTHOPT%400 %HEIGHTOPT%400 %OUTPUTOPT%pkulogo.pdf -f pkulogo.eps +%GS% %GSOPTS% %WIDTHOPT%525 %HEIGHTOPT%150 %OUTPUTOPT%pkuword.pdf -f pkuword.eps +goto end + +:clean +del pkulogo.pdf pkuword.pdf +goto end + +:usage +echo %0 [pdf] [clean] + +:end + diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib index bb3b1fd2031..b2257f0d00a 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib @@ -28,6 +28,15 @@ vim:ts=4:sw=4 userf = {zh}, } +@online{caption, + author = {Sommerfeldt, Alex}, + title = {Customizing captions of floating environments}, + type = {M/OL}, + date = {2011-11-02}, + url = {http://mirror.ctan.org/macros/latex/contrib/caption}, + urldate = {2013-06-03}, +} + @online{ctex, author = {{ctex.org}}, title = {ctex 瀹忓寘璇存槑锛坴1.02c锛墋, diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex index 52962d677e9..4643c1f6b31 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex @@ -12,9 +12,19 @@ % 璋冨嚭銆 % 鍦ㄩ粦鐧芥墦鍗版椂褰╄壊閾炬帴鍙兘鍙樻垚娴呯伆鑹诧紝姝ゆ椂鍙皢鈥渃olorlinks鈥濇敼涓衡渘ocolorlinks鈥濄 +% 鍖楀ぇ鍥句功棣嗚姹備笂浼犵殑鐢靛瓙鐗堣鏂囦腑鐩綍閲囩敤榛戣壊瀛椾綋锛屽彲浠ョ敤鍚屾牱鐨勬柟娉曞鐞嗐 +% +% 閲囩敤浜嗚嚜瀹氫箟鐨勶紙鍖呮嫭澶у皬鍐欎笉鍚屼簬鍘熸枃浠剁殑锛夊瓧浣撴枃浠跺悕锛 +% 骞舵敼鍔 ctex.cfg 绛夐厤缃枃浠剁殑鐢ㄦ埛璇疯嚜琛屽姞鍏 nofonts 閫夐」锛 +% 鍏跺畠鐢ㄦ埛涓嶇敤鍔犲叆 nofonts 閫夐」锛屽姞鍏ヤ箣鍚庡弽鑰屼細浜х敓閿欒銆 \documentclass[UTF8, colorlinks]{pkuthss} % 浣跨敤 biblatex 鎺掔増鍙傝冩枃鐚紝骞惰瀹氬叾鏍煎紡銆 +% +% 濡傛灉鏃犳硶浣跨敤 biber锛屽彲浠ユ妸鈥渂ackend = biber鈥濇敼涓衡渂ackend = bibtex鈥濓紝 +% 骞舵敼鐢 bibtex 浜х敓鍙傝冩枃鐚紝璇﹁ pkuthss 鐨勬枃妗ｃ +% 浣跨敤 biber 鏃讹紝璇峰幓鎺夋墍鏈夌殑 sorting 閫夐」锛屽惁鍒欎細鍑洪敊銆 +% % 榛樿鎸夌収寮曠敤椤哄簭鎺掑簭锛堚渟orting = none鈥濓級锛岃瑙 biblatex-caspervector 鐨勬枃妗 % 锛堝洜涓烘槸榛樿璁剧疆鎵浠ュ叾瀹炰笉鐢ㄥ啓锛屼笉杩囧嚭浜庡畬澶囨х殑鑰冭檻浠嶇劧鍦ㄨ繖閲屽垪鍑猴級銆 % 鑻ラ渶瑕佹寜鐓ц嫳鏂囨枃鐚湪鍓嶏紝涓枃鏂囩尞鍦ㄥ悗鎺掑簭锛岃璁剧疆鈥渟orting = ecnty鈥濓紱 @@ -27,11 +37,12 @@ % 鎻愪緵 Verbatim 鐜鍜 \VerbatimInput 鍛戒护銆 \usepackage{fancyvrb} -% 浣胯寮鸿皟鐨勫唴瀹逛负绾㈣壊銆 +% 浣胯寮鸿皟鐨勫唴瀹逛负绾㈣壊銆俬yperref 瀹忓寘鍦ㄨ缃簡 colorlinks 鏃朵細寮曞叆 xcolor 瀹忓寘锛 +% 鍚庤呭畾涔変簡 \textcolor 鍛戒护锛屾晠涓嶇敤鍗曠嫭寮曞叆瀹忓寘銆 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} % pkuthss 鏂囨。妯＄増鐨勭増鏈 -\newcommand{\docversion}{v1.4 rc3} +\newcommand{\docversion}{v1.4 rc4} % 璁惧畾鏂囨。鐨勫熀鏈俊鎭 \pkuthssinfo{ cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis}, @@ -47,9 +58,9 @@ cauthor = {鐩栬尐娉 $\cdot$ 閽 $\cdot$ 缁村厠鎵榼, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {浜屻囦竴涓夊勾鍥涙湀}, + date = {浜屻囦竴涓夊勾鍗佷簩鏈坿, school = {鍖栧涓庡垎瀛愬伐绋嬪闄, - cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry}, + cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry ... ?}, direction = {鎹 Casper 鑷繁涔熶笉鐭ラ亾}, cmentor = {XX 鏁欐巿}, ementor = {Prof.\ XX}, ckeywords = {\LaTeX2e{}锛屾帓鐗堬紝鏂囨。绫伙紝\CTeX{}}, @@ -94,6 +105,7 @@ % 娉細鍙湁鍚屾椂浣跨敤 2.x 鎴栦箣鍚庣増鏈殑 biblatex 鍜岀浉搴斿吋瀹圭増鏈殑 biber锛 % 鎵嶈兘瀵规瘡涓 \printbibliography 鍛戒护閲囩敤涓嶅悓鐨勬帓搴忔柟妗堬紝 % 鍚﹀垯鍙兘鍦ㄥ鍏 biblatex 瀹忓寘鏃跺氨锛堝叏灞锛夋寚瀹氭帓搴忔柟妗堛 + % 鍦ㄨ繖鏍风殑鎯呭喌涓嬶紝璇峰幓鎺夋墍鏈夌殑 sorting 閫夐」锛屽惁鍒欏彲鑳藉嚭閿欍 sorting = ecnty ] % 鍚勯檮褰曘 diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty index 47910fefebf..0515be72cfb 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{pkuthss-extra} - [2013/04/07 v1.4-rc3 Common extra settings for the pkuthss document class] + [2013/12/26 v1.4-rc4 Common extra settings for the pkuthss document class] % Check the dependency of pkuthss. \@ifclassloaded{pkuthss}{}{ @@ -47,10 +47,10 @@ \pkuthssextra@int@boolopt{spacing}{true} % Whether to use list environments that are tighter than LaTeX defaults. \pkuthssextra@int@boolopt{tightlist}{true} +% Whether to let captions use a different font from the main text. +\pkuthssextra@int@boolopt{caption}{true} % Add PDF bookmark for table of contents. \pkuthssextra@int@boolopt{pdftoc}{true} -% Whether to enable `\Uppercase' (works problematically) in heading marks. -\pkuthssextra@int@boolopt{uppermark}{false} % Whether to enable the `\spacialchap' command. \pkuthssextra@int@boolopt{spechap}{true} % Whether to automatically set properties for generated PDF from user defined @@ -85,6 +85,12 @@ \setlist{nolistsep} \fi +\ifpkuthssextra@opt@caption + % According to common aesthetics of typography, it is nice to make the font of + % captions lighter than main text, and tables lighter than captions. + \RequirePackage[font = it]{caption} +\fi + \ifpkuthssextra@opt@pdftoc % Add PDF bookmark for table of contents. \let\pkuthssextra@tmp@tableofcontents\tableofcontents @@ -108,33 +114,6 @@ \fi \AtBeginDocument{ - % `\MakeUppercase' works problematically. - % eg. it converts `\cite{ctex}' into `\cite{CTEX}'. - % This option can disable `\MakeUppercase' in left/right heading marks. - \unless\ifpkuthssextra@opt@uppermark - % Code modified from part of ctex-book.def in `ctex' package. - % The main difference is the deletion of calls to `\MakeUppercase' here. - \if@twoside - \renewcommand\chaptermark[1]{% - \markboth{% - \ifnum\value{secnumdepth}>-1 \if@mainmatter \CTEXthechapter \quad \fi\fi - #1% - }{}% - } - \renewcommand\sectionmark[1]{% - \markright{\ifnum\value{secnumdepth}>-1 \CTEXthesection \quad \fi #1}% - } - % One side typesetting should also be considered. - \else - \renewcommand\chaptermark[1]{% - \markright{% - \ifnum\value{secnumdepth}>-1 \if@mainmatter \CTEXthechapter \quad \fi\fi - #1% - }% - } - \fi - \fi - \ifpkuthssextra@opt@pdfprop % Automatically generate properties for generated PDF. % Use English properties to avoid problems with character encodings. @@ -158,7 +137,7 @@ \else % Set hyperlink colour to black in order to prevent hyperlinks from being too % hard-to-recognise in printed thesis. - \hypersetup{colorlinks = false, pdfborder = {0 0 0}} + \hypersetup{hidelinks = true} \fi } diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def index d18b26501af..d98f7b75b41 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def @@ -23,7 +23,7 @@ % pkuthss-extra.sty \ProvidesFile{pkuthss-gbk.def} - [2013/04/07 v1.4-rc3 Labels and captions in GBK encoding + [2013/12/26 v1.4-rc4 Labels and captions in GBK encoding for the pkuthss document class] \def\label@ctitle{题目：} @@ -32,8 +32,7 @@ \def\label@school{院\hphantom{汉字}系：} \def\label@cmajor{专\hphantom{汉字}业：} \def\label@direction{研究方向：} -\def\label@cmentora{导\hphantom{汉字}师：} -\def\label@cmentorb{导师：} +\def\label@cmentor{导\hphantom{汉字}师：} \def\label@ementor{Directed by\ } \def\label@ckeywords{关键词：} \def\label@ekeywords{Keywords:\ } diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def index 794d79a65ab..4d2e7067f81 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def @@ -23,7 +23,7 @@ % pkuthss-extra.sty \ProvidesFile{pkuthss-utf8.def} - [2013/04/07 v1.4-rc3 Labels and captions in UTF-8 encoding + [2013/12/26 v1.4-rc4 Labels and captions in UTF-8 encoding for the pkuthss document class] \def\label@ctitle{棰樼洰锛殅 @@ -32,8 +32,7 @@ \def\label@school{闄hphantom{姹夊瓧}绯伙細} \def\label@cmajor{涓揬hphantom{姹夊瓧}涓氾細} \def\label@direction{鐮旂┒鏂瑰悜锛殅 -\def\label@cmentora{瀵糪hphantom{姹夊瓧}甯堬細} -\def\label@cmentorb{瀵煎笀锛殅 +\def\label@cmentor{瀵糪hphantom{姹夊瓧}甯堬細} \def\label@ementor{Directed by\ } \def\label@ckeywords{鍏抽敭璇嶏細} \def\label@ekeywords{Keywords:\ } diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls index b7cfc3e9186..0df8967a097 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls @@ -24,13 +24,17 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2013/04/07 v1.4-rc3 Peking University dissertation document class] + [2013/12/26 v1.4-rc4 Peking University dissertation document class] % 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}} +% Whether to enable `\Uppercase' (works problematically) in heading marks. +\newif\ifpkuthss@opt@uppermark \pkuthss@opt@uppermarkfalse +\DeclareOption{uppermark}{\pkuthss@opt@uppermarktrue} +\DeclareOption{nouppermark}{\pkuthss@opt@uppermarkfalse} % Whether to enable the default extra settings. \newif\ifpkuthss@opt@extra \pkuthss@opt@extratrue \DeclareOption{extra}{\pkuthss@opt@extratrue} @@ -47,7 +51,6 @@ \pkuthss@int@extraopt{spacing} \pkuthss@int@extraopt{tightlist} \pkuthss@int@extraopt{pdftoc} -\pkuthss@int@extraopt{uppermark} \pkuthss@int@extraopt{spechap} \pkuthss@int@extraopt{pdfprop} \pkuthss@int@extraopt{colorlinks} @@ -56,10 +59,10 @@ % Process all class options now. \ProcessOptions\relax -% pkuthss is based on ctexbook; We use A4 paper, and `xiao 4' as default font size. +% pkuthss is based on ctexbook; We use `xiao 4' as default font size. % CJKfntef provides \CJKunderline used in \maketitle. % fancyhdr provides utilities for setting headers and footers. -\LoadClass[hyperref, a4paper, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11] +\LoadClass[hyperref, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11] % Provide support for `key = val' grammar. \RequirePackage{keyval} % Graphics support. @@ -87,18 +90,48 @@ } % Set page layout. -\geometry{height = 240mm, width = 150mm, includeheadfoot, headheight = 1.2em} -% Set headers and footers. -\pagestyle{fancy}\fancyhf{} -\fancyhead[LE]{\small\normalfont\leftmark} -\fancyhead[RO]{\small\normalfont\rightmark} -\fancyhead[LO,RE]{\small\normalfont\cuniversity\cthesisname} -\fancyfoot[RO,LE]{\small\normalfont --~\thepage~--} -% Set the headers and footers on the first page in every chapter. -\fancypagestyle{plain}{ - \fancyhf{}\renewcommand{\headrulewidth}{0pt} - \fancyfoot[RO,LE]{\small\normalfont --~\thepage~--} +\geometry{ + a4paper, height = 240mm, width = 150mm, includeheadfoot, headheight = 1.2em } +% Internal command to set headers and footers. +\def\pkuthss@int@setpagestyle{ + % Set the headers and footers on the first page in every chapter. + \fancypagestyle{plain}{ + \fancyhf{}\renewcommand{\headrulewidth}{0pt} + \if@twoside + \fancyfoot[RO,LE]{\small\normalfont --~\thepage~--} + \else + \fancyfoot[C]{\small\normalfont --~\thepage~--} + \fi + } + % Set the headers and footers on other pages. + \fancypagestyle{pkuthss}{ + \fancyhf{} + \if@twoside + \fancyhead[LE]{\small\normalfont\pkuthss@int@setcase{\leftmark}} + \fancyhead[RO]{\small\normalfont\pkuthss@int@setcase{\rightmark}} + \fancyhead[LO,RE]{% + \small\normalfont\pkuthss@int@setcase{\cuniversity\cthesisname}% + } + \fancyfoot[RO,LE]{\small\normalfont --~\thepage~--} + \else + \fancyhead[L]{\small\normalfont\pkuthss@int@setcase{\leftmark}} + \fancyhead[R]{\small\normalfont\pkuthss@int@setcase{\rightmark}} + \fancyfoot[C]{\small\normalfont --~\thepage~--} + \fi + } + \pagestyle{pkuthss} +} +% `\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 +\else + \def\pkuthss@int@setcase#1{\nouppercase{#1}} + \pkuthss@int@setpagestyle +\fi % eg. `\pkuthss@int@infoitema{ctitle}' will expand to: % \def\ctitle#1{\def\@ctitle{#1}} @@ -190,12 +223,12 @@ {\label@studentid} & \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@studentid} \\ {\label@school} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@school} \\ + \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@school} \\ {\label@cmajor} & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@cmajor} \\ + \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@cmajor} \\ {\label@direction} & \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@direction} \\ - {\label@cmentora} & + {\label@cmentor} & \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@cmentor} \\ \end{tabular} } @@ -206,51 +239,33 @@ \end{titlepage} } -% Internal environment for typesetting abstracts. -\newenvironment{pkuthss@int@abstract}{ +% Typesetting the Chinese abstract. +\newenvironment{cabstract}{ + \cleardoublepage + \pdfbookmark[1]{\cabstractname}{cabstract} + \chapter*{\zihao{-2}\cabstractname} + \markboth{\cabstractname}{} +}{% Keywords at the bottom of the page. + \vfill\noindent\textbf{\label@ckeywords}{\@ckeywords} +} + +% Typesetting the English abstract. +\newenvironment{eabstract}{ \cleardoublepage - \pdfbookmark[1]{\pkuthss@tmp@abstractname}{\pkuthss@tmp@abstlabel} - \chapter*{\zihao{-2}\pkuthss@tmp@title} - \markboth{\pkuthss@tmp@abstractname}{} + \pdfbookmark[1]{\eabstractname}{eabstract} + \chapter*{\zihao{-2}\@etitle} + \markboth{\eabstractname}{} \vspace{-2em}\par \begin{center} - \zihao{-3} - {\pkuthss@tmp@author}\quad{\pkuthss@tmp@major}\\ - {\pkuthss@tmp@label@mentor}{\pkuthss@tmp@mentor} + \zihao{-3} + {\@eauthor} ({\@emajor})\\ + {\label@ementor}{\@ementor} \end{center} \vspace{1em}\par - \section*{\zihao{4}\pkuthss@tmp@abstractname} + \section*{\zihao{4}\eabstractname} \vskip 0.5em }{% Keywords at the bottom of the page. - \vfill\noindent\textbf{\pkuthss@tmp@label@keywords}{\pkuthss@tmp@keywords} + \vfill\noindent\textbf{\label@ekeywords}{\@ekeywords} } -% Typesetting the Chinese abstract. -\newenvironment{cabstract}{ - \def\pkuthss@tmp@abstlabel{cabstract} - \let\pkuthss@tmp@title\@ctitle - \let\pkuthss@tmp@author\@cauthor - \let\pkuthss@tmp@major\@cmajor - \let\pkuthss@tmp@mentor\@cmentor - \let\pkuthss@tmp@keywords\@ckeywords - \let\pkuthss@tmp@label@mentor\label@cmentorb - \let\pkuthss@tmp@label@keywords\label@ckeywords - \let\pkuthss@tmp@abstractname\cabstractname - \begin{pkuthss@int@abstract} -}{\end{pkuthss@int@abstract}} - -% Typesetting the English abstract. -\newenvironment{eabstract}{ - \def\pkuthss@tmp@abstlabel{eabstract} - \let\pkuthss@tmp@title\@etitle - \let\pkuthss@tmp@author\@eauthor - \let\pkuthss@tmp@major\@emajor - \let\pkuthss@tmp@mentor\@ementor - \let\pkuthss@tmp@keywords\@ekeywords - \let\pkuthss@tmp@label@mentor\label@ementor - \let\pkuthss@tmp@label@keywords\label@ekeywords - \let\pkuthss@tmp@abstractname\eabstractname - \begin{pkuthss@int@abstract} -}{\end{pkuthss@int@abstract}} - \endinput |