diff options
Diffstat (limited to 'Master')
17 files changed, 68 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt index 7d1941c98ae..2183d691603 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt @@ -1,3 +1,13 @@ +2013-01-10, v1.4 rc1 + + * Changes to documentation: + - Remove troublesome `hologo' package. + - chap3.tex: add notice about biblatex's `\bibname' issue. + - introduction.tex: update info about location of example source code. + + * Misc: + - README: add not-intended-as-documentation notice. + 2012-11-12, v1.4 beta3 * Misc: @@ -5,6 +15,7 @@ - utils/dist: Fix date conversion code again. 2012-10-11, v1.4 beta2 + * Changes to package code: - Adjust pkulogo/pkuword typesetting according to <http://web5.pku.edu.cn/bs/images/cgzs/images1/13.png> 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 9b5982f91f4..ae535f7a057 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex @@ -10,7 +10,7 @@ ��ȷ������Ҫ���¼����֣� \begin{itemize} \item һ�������� \TeX{} ���а档 - \item CJK �� XeCJK���� \hologo{XeLaTeX} ʹ�ã������ + \item CJK �� XeCJK���� Xe\LaTeX{} ʹ�ã������ \item ctex ���\supercite{ctex,ctex-faq}���ṩ�� ctexbook �ĵ��ࣩ�� \item �������塣 \item ���Ҫʹ�� biblatex ���������б������õ��Ű�Ļ��� @@ -120,7 +120,7 @@ texdoc pkuthss \end{itemize} \myemph{% ע��% - \hologo{pdfLaTeX} ��ʽ���루���� \ref{sec:compile} �ڣ� + pdf\LaTeX{} ��ʽ���루���� \ref{sec:compile} �ڣ� ������Ҫ�� eps ͼƬת��Ϊ pdf ��ʽ�� ��ʹ�� Makefile ��α��Makefile��ʱ��ЩͼƬ�����Զ����ɣ� ��ʹ�� Makefile ���û������ֶ����� % @@ -136,15 +136,15 @@ texdoc pkuthss \item \LaTeX{} -- dvipdfmx ��ʽ��\\ ����ִ�� \verb|latex|��\verb|biber|���� \verb|bibtex|����% \verb|latex|��\verb|latex| �� \verb|dvipdfmx|�� - \item \hologo{pdfLaTeX} ��ʽ��\\ + \item pdf\LaTeX{} ��ʽ��\\ ����ִ�� \verb|pdflatex|��\verb|biber|���� \verb|bibtex|����% \verb|pdflatex| �� \verb|pdflatex|�� - \item \hologo{XeLaTeX} ��ʽ��\\ + \item Xe\LaTeX{} ��ʽ��\\ ����ִ�� \verb|xelatex|��\verb|biber|���� \verb|bibtex|����% \verb|xelatex| �� \verb|xelatex|��\\ \myemph{% - ע�⣺\hologo{XeLaTeX} �Է� UTF-8 �ı���֧�ֲ��ã� - ��� \hologo{XeLaTeX} ��ʽ�ı��벻֧�� GBK ���롣 + ע�⣺Xe\LaTeX{} �Է� UTF-8 �ı���֧�ֲ��ã� + ��� Xe\LaTeX{} ��ʽ�ı��벻֧�� GBK ���롣 } \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 5a85109c458..704b1d83d2b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex @@ -30,6 +30,14 @@ ������в������ݳ��ȳ���Ԥ��ռ�����ʱ�����ã� ���� \ref{sec:advanced} �ڡ� + biblatex ���\cite{biblatex}�������趨 \verb|\bibname|�� + �ʻḲ��ͨ�� \verb|\CTEXoptions| �趨�IJο������б����⡣ + ʹ�� biblatex ���û�����ʹ�� \verb|\printbibliography| �� + \verb|title| ѡ�����ֶ��趨�ο������б��ı��⣬���磺 +\begin{Verbatim}[frame = single] +\printbibliography[title = {����}, ...] % ��...��Ϊ����ѡ� +\end{Verbatim} + \section{�������ܴ��ڵ�����} \subsection{���κ���������������} @@ -50,7 +58,7 @@ \subsection{����һЩ����} - ʹ�� GBK ����� \hologo{pdfLaTeX} ���뷽ʽʱ��Ҫ�û�% + ʹ�� GBK ����� pdf\LaTeX{} ���뷽ʽʱ��Ҫ�û�% ���� \verb|gbk2uni| ������ת�� \verb|.out| �ļ��� �������ɵ� pdf ��ǩ�������롣 ���ǵ��û�����û�� \verb|gbk2uni| ���������û�ʹ�� UTF-8 ���룬 diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/introduction.tex index e2485963cfe..4ea0950ea76 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/introduction.tex @@ -26,7 +26,7 @@ pkuthss �ĵ�ģ���������ֹ��ɣ� texdoc pkuthss \end{Verbatim} ͬʱ�� - ���ĵ���Դ���루λ�� \verb|doc/| Ŀ¼�£�% + ���ĵ���Դ���루λ�ͱ��ĵ��� pdf �ļ�����ͬһĿ¼�£�% Ҳ�����û�д�Լ���ѧλ����ʱ��һ��ģ�棺 �û�ֻ�谴��ģ���еĿ���Ĵ��룬 ����д���Լ������ġ� diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib index 3a3d501cd8b..62356815231 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib @@ -20,11 +20,11 @@ vim:ts=4:sw=4 @online{biblatex-caspervector, author = {Vector, Casper Ti.}, - title = {biblatex �ο�����������ʽ��caspervector v0.1.4}, + title = {biblatex �ο�����������ʽ��caspervector v0.1.6}, type = {M/OL}, date = {2012-10-11}, - url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.4.zip}, - urldate = {2012-10-11}, + url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.6.zip}, + urldate = {2013-01-10}, userf = {zh}, } diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex index 2be40dd793b..c16f3deeb14 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex @@ -22,14 +22,12 @@ \usepackage{amssymb} % �ṩ Verbatim ������ \VerbatimInput ��� \usepackage{fancyvrb} -% �ṩ���� TeX logo���ر��� XeTeX ϵ�Ĺ��� logo�� -\usepackage{hologo} % ʹ��ǿ��������Ϊ��ɫ�� \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} % pkuthss �ĵ�ģ��İ汾�� -\newcommand{\docversion}{v1.4 beta3} +\newcommand{\docversion}{v1.4 rc1} % �趨�ĵ��Ļ�����Ϣ�� \pkuthssinfo{ cthesisname = {��������ҵ����}, ethesisname = {Undergraduate Thesis}, @@ -45,7 +43,7 @@ cauthor = {�ǴIJ� $\cdot$ �� $\cdot$ ά����}, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {����һ����ʮһ��}, + date = {����һ����һ��}, school = {��ѧ����ӹ���ѧԺ}, cmajor = {��ѧ������}, emajor = {Chemistry}, direction = {��˵ Casper �Լ�Ҳ��֪��}, diff --git a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf Binary files differindex c22b0734538..662467b582b 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 a78adf57699..23d5699498b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt @@ -1,3 +1,13 @@ +2013-01-10, v1.4 rc1 + + * Changes to documentation: + - Remove troublesome `hologo' package. + - chap3.tex: add notice about biblatex's `\bibname' issue. + - introduction.tex: update info about location of example source code. + + * Misc: + - README: add not-intended-as-documentation notice. + 2012-11-12, v1.4 beta3 * Misc: @@ -5,6 +15,7 @@ - utils/dist: Fix date conversion code again. 2012-10-11, v1.4 beta2 + * Changes to package code: - Adjust pkulogo/pkuword typesetting according to <http://web5.pku.edu.cn/bs/images/cgzs/images1/13.png> 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 28e17061046..fc06ee0afb7 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex @@ -10,7 +10,7 @@ 正确编译需要以下几部分: \begin{itemize} \item 一个基本的 \TeX{} 发行版。 - \item CJK 或 XeCJK(供 \hologo{XeLaTeX} 使用)宏包。 + \item CJK 或 XeCJK(供 Xe\LaTeX{} 使用)宏包。 \item ctex 宏包\supercite{ctex,ctex-faq}(提供了 ctexbook 文档类)。 \item 中文字体。 \item 如果要使用 biblatex 进行文献列表和引用的排版的话, @@ -120,7 +120,7 @@ texdoc pkuthss \end{itemize} \myemph{% 注:% - \hologo{pdfLaTeX} 方式编译(见第 \ref{sec:compile} 节) + pdf\LaTeX{} 方式编译(见第 \ref{sec:compile} 节) 可能需要将 eps 图片转换为 pdf 格式, 而使用 Makefile 或伪“Makefile”时这些图片可以自动生成; 不使用 Makefile 的用户可以手动运行 % @@ -136,15 +136,15 @@ texdoc pkuthss \item \LaTeX{} -- dvipdfmx 方式:\\ 依次执行 \verb|latex|,\verb|biber|(或 \verb|bibtex|),% \verb|latex|,\verb|latex| 和 \verb|dvipdfmx|。 - \item \hologo{pdfLaTeX} 方式:\\ + \item pdf\LaTeX{} 方式:\\ 依次执行 \verb|pdflatex|,\verb|biber|(或 \verb|bibtex|),% \verb|pdflatex| 和 \verb|pdflatex|。 - \item \hologo{XeLaTeX} 方式:\\ + \item Xe\LaTeX{} 方式:\\ 依次执行 \verb|xelatex|,\verb|biber|(或 \verb|bibtex|),% \verb|xelatex| 和 \verb|xelatex|。\\ \myemph{% - 注意:\hologo{XeLaTeX} 对非 UTF-8 的编码支持不好, - 因此 \hologo{XeLaTeX} 方式的编译不支持 GBK 编码。 + 注意:Xe\LaTeX{} 对非 UTF-8 的编码支持不好, + 因此 Xe\LaTeX{} 方式的编译不支持 GBK 编码。 } \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 21b076f2711..9562ed6e451 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex @@ -30,6 +30,14 @@ 如封面中部分内容长度超过预设空间容量时的设置, 见第 \ref{sec:advanced} 节。 + biblatex 宏包\cite{biblatex}会自行设定 \verb|\bibname|, + 故会覆盖通过 \verb|\CTEXoptions| 设定的参考文献列表标题。 + 使用 biblatex 的用户可以使用 \verb|\printbibliography| 的 + \verb|title| 选项来手动设定参考文献列表的标题,例如: +\begin{Verbatim}[frame = single] +\printbibliography[title = {文献}, ...] % “...”为其它选项。 +\end{Verbatim} + \section{其它可能存在的问题} \subsection{上游宏包可能引起的问题} @@ -50,7 +58,7 @@ \subsection{其它一些问题} - 使用 GBK 编码和 \hologo{pdfLaTeX} 编译方式时需要用户% + 使用 GBK 编码和 pdf\LaTeX{} 编译方式时需要用户% 运行 \verb|gbk2uni| 程序来转换 \verb|.out| 文件, 否则生成的 pdf 书签可能乱码。 考虑到用户可能没有 \verb|gbk2uni| 程序,且有用户使用 UTF-8 编码, diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/introduction.tex index b940144f3d2..df62312cbb7 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/introduction.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/introduction.tex @@ -26,7 +26,7 @@ pkuthss 文档模版由三部分构成: texdoc pkuthss \end{Verbatim} 同时, - 本文档的源代码(位于 \verb|doc/| 目录下)% + 本文档的源代码(位和本文档的 pdf 文件处于同一目录下)% 也正是用户撰写自己的学位论文时的一个模版: 用户只需按照模版中的框架修改代码, 即可写出自己的论文。 diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib index d9aee4ee4fa..ef693b0d830 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib @@ -20,11 +20,11 @@ vim:ts=4:sw=4 @online{biblatex-caspervector, author = {Vector, Casper Ti.}, - title = {biblatex 参考文献和引用样式:caspervector v0.1.4}, + title = {biblatex 参考文献和引用样式:caspervector v0.1.6}, type = {M/OL}, date = {2012-10-11}, - url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.4.zip}, - urldate = {2012-10-11}, + url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.6.zip}, + urldate = {2013-01-10}, userf = {zh}, } diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex index 4e3604094a0..9d5a35d9813 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex @@ -22,14 +22,12 @@ \usepackage{amssymb} % 提供 Verbatim 环境和 \VerbatimInput 命令。 \usepackage{fancyvrb} -% 提供各种 TeX logo,特别是 XeTeX 系的诡异 logo。 -\usepackage{hologo} % 使被强调的内容为红色。 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} % pkuthss 文档模版的版本。 -\newcommand{\docversion}{v1.4 beta3} +\newcommand{\docversion}{v1.4 rc1} % 设定文档的基本信息。 \pkuthssinfo{ cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, @@ -45,7 +43,7 @@ cauthor = {盖茨波 $\cdot$ 钛 $\cdot$ 维克托}, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {二〇一二年十一月}, + date = {二〇一三年一月}, school = {化学与分子工程学院}, cmajor = {化学(?)}, emajor = {Chemistry}, direction = {据说 Casper 自己也不知道}, diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty index 0d8eec78528..a2d40ebaba5 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} - [2012/11/12 v1.4-beta3 Common extra settings for the pkuthss document class] + [2013/01/10 v1.4-rc1 Common extra settings for the pkuthss document class] % Check the dependency of pkuthss. \@ifclassloaded{pkuthss}{}{ diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def index 9a798b50352..d6c0e41a99c 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} - [2012/11/12 v1.4-beta3 Labels and captions in GBK encoding + [2013/01/10 v1.4-rc1 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 6be580aeb68..db040732fd6 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} - [2012/11/12 v1.4-beta3 Labels and captions in UTF-8 encoding + [2013/01/10 v1.4-rc1 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 d958ac8b784..be6a7f28955 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2012/11/12 v1.4-beta3 Peking University dissertation document class] + [2013/01/10 v1.4-rc1 Peking University dissertation document class] % Process the encoding options. \newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue |