summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-16 22:27:33 +0000
committerKarl Berry <karl@freefriends.org>2013-05-16 22:27:33 +0000
commitb270fa2262972ce19c18ccd488b85e1f96f9a36d (patch)
tree52916be3f2c58d322c0605908b47a851e2861e06 /Master/texmf-dist
parent52652942c9ae20b76c5d722386d43252e1137db4 (diff)
uestcthesis (16may13)
git-svn-id: svn://tug.org/texlive/trunk@30507 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/uestcthesis/doc/chapters/tuition.tex8
-rw-r--r--Master/texmf-dist/doc/latex/uestcthesis/doc/contents/acknowledgements.tex16
-rw-r--r--Master/texmf-dist/doc/latex/uestcthesis/doc/uestcthesis-doc.pdfbin1104015 -> 1103789 bytes
-rw-r--r--Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.dtx19
-rw-r--r--Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.ins144
-rw-r--r--Master/texmf-dist/tex/latex/uestcthesis/uestcthesis.cls17
6 files changed, 114 insertions, 90 deletions
diff --git a/Master/texmf-dist/doc/latex/uestcthesis/doc/chapters/tuition.tex b/Master/texmf-dist/doc/latex/uestcthesis/doc/chapters/tuition.tex
index 86b81b45ccd..ad1bdd03b24 100644
--- a/Master/texmf-dist/doc/latex/uestcthesis/doc/chapters/tuition.tex
+++ b/Master/texmf-dist/doc/latex/uestcthesis/doc/chapters/tuition.tex
@@ -2,6 +2,14 @@
\chapter{更新日志}
\noindent
+2013年5月14日:v0.4.2
+\begin{enumerate}
+\item 修复BUG:此版本之前,当目录只有一页时目录的页眉显示成主要符号表。
+\item 上一版本在使用WinEdt等自带的编译功能时不显示LOGO,但是会引起封面多出一页。此版本装饰了这个问题,在不使用正确编译的编译脚本编译时在LOGO处显示一段说明文字。
+
+\end{enumerate}
+
+\noindent
2013年5月4日:v0.4.1
\begin{enumerate}
\item 将封面所需的两个png文件去掉。采用pstricks宏包生成的矢量图,并嵌入到cls文类中。感谢周光耀同学帮忙!
diff --git a/Master/texmf-dist/doc/latex/uestcthesis/doc/contents/acknowledgements.tex b/Master/texmf-dist/doc/latex/uestcthesis/doc/contents/acknowledgements.tex
index 025c2842cc6..5d1ca1f6733 100644
--- a/Master/texmf-dist/doc/latex/uestcthesis/doc/contents/acknowledgements.tex
+++ b/Master/texmf-dist/doc/latex/uestcthesis/doc/contents/acknowledgements.tex
@@ -1,8 +1,8 @@
-% !Mode:: "TeX:UTF-8"
-
-历时将近两个月的时间终于将这篇论文写完,在论文的写作过程中遇到了无数的困难和障碍,都在同学和老师的帮助下度过了。尤其要强烈感谢我的论文指导老师—XX老师,她对我进行了无私的指导和帮助,不厌其烦的帮助进行论文的修改和改进。另外,在校图书馆查找资料的时候,图书馆的老师也给我提供了很多方面的支持与帮助。在此向帮助和指导过我的各位老师表示最中心的感谢!
-
-感谢这篇论文所涉及到的各位学者。本文引用了数位学者的研究文献,如果没有各位学者的研究成果的帮助和启发,我将很难完成本篇论文的写作。
-
-感谢我的同学和朋友,在我写论文的过程中给予我了很多你问素材,还在论文的撰写和排版灯过程中提供热情的帮助。
-由于我的学术水平有限,所写论文难免有不足之处,恳请各位老师和学友批评和指正!
+% !Mode:: "TeX:UTF-8"
+
+历时将近两个月的时间终于将这篇论文写完,在论文的写作过程中遇到了无数的困难和障碍,都在同学和老师的帮助下度过了。尤其要强烈感谢我的论文指导老师—XX老师,她对我进行了无私的指导和帮助,不厌其烦的帮助进行论文的修改和改进。另外,在校图书馆查找资料的时候,图书馆的老师也给我提供了很多方面的支持与帮助。在此向帮助和指导过我的各位老师表示最中心的感谢!
+
+感谢这篇论文所涉及到的各位学者。本文引用了数位学者的研究文献,如果没有各位学者的研究成果的帮助和启发,我将很难完成本篇论文的写作。
+
+感谢我的同学和朋友,在我写论文的过程中给予我了很多你问素材,还在论文的撰写和排版灯过程中提供热情的帮助。
+由于我的学术水平有限,所写论文难免有不足之处,恳请各位老师和学友批评和指正!
diff --git a/Master/texmf-dist/doc/latex/uestcthesis/doc/uestcthesis-doc.pdf b/Master/texmf-dist/doc/latex/uestcthesis/doc/uestcthesis-doc.pdf
index 8e01ef69b9d..3cf5a9575f0 100644
--- a/Master/texmf-dist/doc/latex/uestcthesis/doc/uestcthesis-doc.pdf
+++ b/Master/texmf-dist/doc/latex/uestcthesis/doc/uestcthesis-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.dtx b/Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.dtx
index aaf554008ef..749d5f0578e 100644
--- a/Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.dtx
+++ b/Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.dtx
@@ -30,7 +30,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2011/06/27]
%<class>\ProvidesClass{uestcthesis}
%<*class>
- [2013/05/04 v0.4.1 UESTC thesis class]
+ [2013/05/14 v0.4.2 UESTC thesis class]
%</class>
%<*driver>
\documentclass{ltxdoc}
@@ -3114,12 +3114,21 @@
\end{filecontents*}
\immediate\write18{latex logo}%
\immediate\write18{dvips logo}%
+%\changes{v0.4.2}{针对默认编译器不能使用write18命令的情况,在不能正常显示logo时显示一段说明文字。}
+ \IfFileExists{logo.dvi}{
\immediate\write18{ps2pdf logo.ps}%
+ }{}
\newcommand{\uestclogo}{
-\includegraphics[width=13cm]{logo.pdf}
+\IfFileExists{logo.pdf}{\includegraphics[width=13cm]{logo.pdf}}{
+{\zihao{6}此文档不是用正确编译脚本生成的。请用compile.bat或compile.sh生成才能保证编译结果完全正确,包括此处的LOGO。
+如果您是从MikTeX或CTAN.org处得到的此模板,请访问\url{https://github.com/shifujun/UESTCthesis}获取最新版本和相应的编译脚本。}
+}
}
\newcommand{\uestclogobadge}{
-\includegraphics*[height=5cm,trim=0 0 140cm 0]{logo.pdf}
+\IfFileExists{logo.pdf}{\includegraphics*[height=5cm,trim=0 0 140cm 0]{logo.pdf}}{
+{\zihao{6}此文档不是用正确编译脚本生成的。请用compile.bat或compile.sh生成才能保证编译结果完全正确,包括此处的LOGO。
+如果您是从MikTeX或CTAN.org处得到的此模板,请访问\url{https://github.com/shifujun/UESTCthesis}获取最新版本和相应的编译脚本。}
+}
}
% \end{macrocode}
% \end{macro}
@@ -3674,12 +3683,12 @@ pdfpagelayout={TwoPageRight}
\include{contents/Eabstract}%插入英文摘要
\tocmatter%目录版式
\tableofcontents%插入目录
-\ifblank{\ifusingglossary}{}{%如果没有使用过\fuhao命令,则不插入主要符号表
+%\changes{v0.4.2}{修复只有单页目录时页眉显示主要符号表的问题。}
+\newpage%目录之后另起一页,这样无论目录后有没有主要符号表,主要符号表的页眉设置命令都会应用到下一页。
%此处遇到问题:目录之后到正文之前如果加入章节,这些章节的版式不受传统版式设置控制。估计是BUG。此处耗时6小时20分钟,终于找到了修正方案。
\glossarymatterfancy%设置主要符号表版式。
\printglossary%插入主要符号表
\mainmatter%修正主要符号表版式,这里是受目录版式的影响,必须在此加入\mainmatter。
-}%
\end{CJK}
\mainmatter%正文区版式
\makeatletter
diff --git a/Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.ins b/Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.ins
index 1fbf7fefbeb..83f26ad5406 100644
--- a/Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.ins
+++ b/Master/texmf-dist/doc/latex/uestcthesis/source/uestcthesis.ins
@@ -1,72 +1,72 @@
-% !Mode:: "TeX:UTF-8:INS"
-
-%%% uestcthesis.ins
-%%% Copyright 2012-2013 Shi Fujun <shifujun@foxmail.com>
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainer of this work is Shi Fujun <shifujun@foxmail.com>.
-%%
-%% This work consists of the files uestcthesis.dtx, uestcthesis.ins and
-%% GBT7714-2005NLang-UESTC.bst.
-%% and the derived file uestcthesis.cls.
-%% Other files in this work's package are belongs to the respective owners.
-\input docstrip.tex
-\keepsilent
-\askforoverwritefalse
-
-\usedir{tex/latex/uestcthesis}
-
-\preamble
-
-This is a generated file.
-
- Copyright 2012-2013 Shi Fujun <shifujun@foxmail.com>
-
- This work may be distributed and/or modified under the
- conditions of the LaTeX Project Public License, either version 1.3
- of this license or (at your option) any later version.
- The latest version of this license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3 or later is part of all distributions of LaTeX
- version 2005/12/01 or later.
-
- This work has the LPPL maintenance status `maintained'.
-
- The Current Maintainer of this work is Shi Fujun <shifujun@foxmail.com>.
-
- This work consists of the files uestcthesis.dtx, uestcthesis.ins
- and the derived file uestcthesis.cls and uestcthesis.bst.
- Other files in this work's package are belongs to the respective owners.
-
-\endpreamble
-
-\generate{\file{uestcthesis.cls}{\from{uestcthesis.dtx}{class}}}
-\generate{\file{uestcthesis.bst}{\from{uestcthesis.dtx}{bst}}}
-
-\obeyspaces
-\Msg{*************************************************************}
-\Msg{* *}
-\Msg{* To finish the installation you have to move the following *}
-\Msg{* file into a directory searched by TeX: *}
-\Msg{* *}
-\Msg{* uestcthesis.cls uestcthesis.bst UESTC.png UESTC_LOGO.png *}
-\Msg{* UESTC.png and UESTC_LOGO.png should be moved into the same*}
-\Msg{* directory as the uestcthesis.cls. *}
-\Msg{* *}
-\Msg{* To produce the documentation run the file uestcthesis.dtx *}
-\Msg{* through LaTeX. *}
-\Msg{* *}
-\Msg{* Happy TeXing! *}
-\Msg{* *}
-\Msg{*************************************************************}
-
-\endbatchfile
+% !Mode:: "TeX:UTF-8:INS"
+
+%%% uestcthesis.ins
+%%% Copyright 2012-2013 Shi Fujun <shifujun@foxmail.com>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Shi Fujun <shifujun@foxmail.com>.
+%%
+%% This work consists of the files uestcthesis.dtx, uestcthesis.ins and
+%% GBT7714-2005NLang-UESTC.bst.
+%% and the derived file uestcthesis.cls.
+%% Other files in this work's package are belongs to the respective owners.
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+
+\usedir{tex/latex/uestcthesis}
+
+\preamble
+
+This is a generated file.
+
+ Copyright 2012-2013 Shi Fujun <shifujun@foxmail.com>
+
+ This work may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either version 1.3
+ of this license or (at your option) any later version.
+ The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+ and version 1.3 or later is part of all distributions of LaTeX
+ version 2005/12/01 or later.
+
+ This work has the LPPL maintenance status `maintained'.
+
+ The Current Maintainer of this work is Shi Fujun <shifujun@foxmail.com>.
+
+ This work consists of the files uestcthesis.dtx, uestcthesis.ins
+ and the derived file uestcthesis.cls and uestcthesis.bst.
+ Other files in this work's package are belongs to the respective owners.
+
+\endpreamble
+
+\generate{\file{uestcthesis.cls}{\from{uestcthesis.dtx}{class}}}
+\generate{\file{uestcthesis.bst}{\from{uestcthesis.dtx}{bst}}}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{* *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* file into a directory searched by TeX: *}
+\Msg{* *}
+\Msg{* uestcthesis.cls uestcthesis.bst UESTC.png UESTC_LOGO.png *}
+\Msg{* UESTC.png and UESTC_LOGO.png should be moved into the same*}
+\Msg{* directory as the uestcthesis.cls. *}
+\Msg{* *}
+\Msg{* To produce the documentation run the file uestcthesis.dtx *}
+\Msg{* through LaTeX. *}
+\Msg{* *}
+\Msg{* Happy TeXing! *}
+\Msg{* *}
+\Msg{*************************************************************}
+
+\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/uestcthesis/uestcthesis.cls b/Master/texmf-dist/tex/latex/uestcthesis/uestcthesis.cls
index 8d534447d61..b5144a4f4d0 100644
--- a/Master/texmf-dist/tex/latex/uestcthesis/uestcthesis.cls
+++ b/Master/texmf-dist/tex/latex/uestcthesis/uestcthesis.cls
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
\ProvidesClass{uestcthesis}
- [2013/05/04 v0.4.1 UESTC thesis class]
+ [2013/05/14 v0.4.2 UESTC thesis class]
\LoadClass[cs4size,UTF8,fancyhdr,hyperref,fntef,openany]{ctexbook}
\RequirePackage{etoolbox}
\RequirePackage{ifthen}
@@ -2693,12 +2693,20 @@
\end{filecontents*}
\immediate\write18{latex logo}%
\immediate\write18{dvips logo}%
+ \IfFileExists{logo.dvi}{
\immediate\write18{ps2pdf logo.ps}%
+ }{}
\newcommand{\uestclogo}{
-\includegraphics[width=13cm]{logo.pdf}
+\IfFileExists{logo.pdf}{\includegraphics[width=13cm]{logo.pdf}}{
+{\zihao{6}此文档不是用正确编译脚本生成的。请用compile.bat或compile.sh生成才能保证编译结果完全正确,包括此处的LOGO。
+如果您是从MikTeX或CTAN.org处得到的此模板,请访问\url{https://github.com/shifujun/UESTCthesis}获取最新版本和相应的编译脚本。}
+}
}
\newcommand{\uestclogobadge}{
-\includegraphics*[height=5cm,trim=0 0 140cm 0]{logo.pdf}
+\IfFileExists{logo.pdf}{\includegraphics*[height=5cm,trim=0 0 140cm 0]{logo.pdf}}{
+{\zihao{6}此文档不是用正确编译脚本生成的。请用compile.bat或compile.sh生成才能保证编译结果完全正确,包括此处的LOGO。
+如果您是从MikTeX或CTAN.org处得到的此模板,请访问\url{https://github.com/shifujun/UESTCthesis}获取最新版本和相应的编译脚本。}
+}
}
\ifdefstring{\degree@uestcthesis}{bachelor}{
\renewcommand{\bachelortitlepage@uestcthesis}{
@@ -3092,11 +3100,10 @@ pdfpagelayout={TwoPageRight}
\include{contents/Eabstract}%插入英文摘要
\tocmatter%目录版式
\tableofcontents%插入目录
-\ifblank{\ifusingglossary}{}{%如果没有使用过\fuhao命令,则不插入主要符号表
+\newpage%目录之后另起一页,这样无论目录后有没有主要符号表,主要符号表的页眉设置命令都会应用到下一页。
\glossarymatterfancy%设置主要符号表版式。
\printglossary%插入主要符号表
\mainmatter%修正主要符号表版式,这里是受目录版式的影响,必须在此加入\mainmatter。
-}%
\end{CJK}
\mainmatter%正文区版式
\makeatletter