thuthesis (4dec17)

git-svn-id: svn://tug.org/texlive/trunk@45983 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 22 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/thuthesis/bst/author-year.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst
index 9f1c7eaa6c9..9f1c7eaa6c9 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/bst/author-year.bst
+++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst
diff --git a/Master/texmf-dist/doc/latex/thuthesis/bst/numeric.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst
index 1c3d27a5c18..1c3d27a5c18 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/bst/numeric.bst
+++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst
diff --git a/Master/texmf-dist/doc/latex/thuthesis/Makefile b/Master/texmf-dist/doc/latex/thuthesis/Makefile
index ec0fc5362a6..2237a9d993f 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/Makefile
+++ b/Master/texmf-dist/doc/latex/thuthesis/Makefile
@@ -15,7 +15,7 @@ THESISCONTENTS=$(THESISMAIN).tex data/*.tex $(FIGURES)
 # NOTE: update this to reflect your local file types.
 FIGURES=$(wildcard figures/*.eps figures/*.pdf)
 BIBFILE=ref/*.bib
-BSTFILE=bst/*.bst
+BSTFILE=*.bst
 SHUJICONTENTS=$(SHUJIMAIN).tex
 CLSFILES=dtx-style.sty $(PACKAGE).cls $(PACKAGE).cfg
 
diff --git a/Master/texmf-dist/doc/latex/thuthesis/data/chap01.tex b/Master/texmf-dist/doc/latex/thuthesis/data/chap01.tex
index 99ca5483b55..42f4bf3a3e4 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/data/chap01.tex
+++ b/Master/texmf-dist/doc/latex/thuthesis/data/chap01.tex
@@ -86,8 +86,8 @@
       thuthesis.dtx & 所有的一切都在这里面\footnote{再来一个}。\\
       thuthesis.cls & 模板类文件。\\
       thuthesis.cfg & 模板配置文。cls 和 cfg 由前两个文件生成。\\
-      bst/numeric.bst    & 参考文献 BIB\TeX\ 样式文件。\\
-      bst/author-year.bst    & 参考文献 BIB\TeX\ 样式文件。\\
+      thuthesis-numeric.bst    & 参考文献 BIB\TeX\ 样式文件。\\
+      thuthesis-author-year.bst    & 参考文献 BIB\TeX\ 样式文件。\\
       thuthesis.sty   & 常用的包和命令写在这里，减轻主文件的负担。\\
       \bottomrule[1.5pt]
     \end{tabularx}
@@ -503,7 +503,7 @@ V_j & = v_j, & \qquad X_j & = x_j,
 写。
 
 本模板推荐使用 BIB\TeX，分别提供数字引用（\texttt{thuthesis-numeric.bst}）和作
-者年份引用（\texttt{thuthesis-authoryear.bst}）样式，基本符合学校的参考文献格式
+者年份引用（\texttt{thuthesis-author-year.bst}）样式，基本符合学校的参考文献格式
 （如专利等引用未加详细测试）。看看这个例子，关于书的~\cite{tex, companion,
   ColdSources}，还有这些~\cite{Krasnogor2004e, clzs, zjsw}，关于杂志
 的~\cite{ELIDRISSI94, MELLINGER96, SHELL02}，硕士论文~\cite{zhubajie,
diff --git a/Master/texmf-dist/doc/latex/thuthesis/main.pdf b/Master/texmf-dist/doc/latex/thuthesis/main.pdf
index a8b4b14588d..3769a377238 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/main.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/main.pdf
diff --git a/Master/texmf-dist/doc/latex/thuthesis/main.tex b/Master/texmf-dist/doc/latex/thuthesis/main.tex
index cb6f8574a02..051d05acb4e 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/main.tex
+++ b/Master/texmf-dist/doc/latex/thuthesis/main.tex
@@ -55,9 +55,9 @@
 % 注意：至少需要引用一篇参考文献，否则下面两行可能引起编译错误。
 % 如果不需要参考文献，请将下面两行删除或注释掉。
 % 数字式引用
-\bibliographystyle{bst/numeric}
+\bibliographystyle{thuthesis-numeric}
 % 作者-年份式引用
-% \bibliographystyle{bst/author-year}
+% \bibliographystyle{thuthesis-author-year}
 \bibliography{ref/refs}
 
 
diff --git a/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf b/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
index 972e17729cc..936dba266f7 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
index ed29da92b2c..ceb9923e798 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
diff --git a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
index 8e9cb1c6bd8..0c54176cb0b 100644
--- a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
+++ b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
@@ -16,7 +16,7 @@
 %
 % \iffalse
 %<*driver>
-\ProvidesFile{thuthesis.dtx}[2017/12/3 5.4.0 Tsinghua University Thesis Template]
+\ProvidesFile{thuthesis.dtx}[2017/12/4 5.4.1 Tsinghua University Thesis Template]
 \documentclass{ltxdoc}
 \usepackage{dtx-style}
 
@@ -238,8 +238,8 @@
 % thuthesis.dtx & \textsc{DocStrip} 源文件（开发用）\\\midrule
 % thuthesis.cls & 模板类文件\\
 % thuthesis.cfg & 模板配置文件\\
-% bst/numeric.bst & 参考文献样式文件\\
-% bst/author-year.bst & 参考文献样式文件\\\midrule
+% thuthesis-numeric.bst & 参考文献样式文件\\
+% thuthesis-author-year.bst & 参考文献样式文件\\\midrule
 % main.tex & 示例文档主文件\\
 % shuji.tex & 书脊示例文档\\
 % ref/ & 示例文档参考文献目录\\
@@ -268,7 +268,7 @@
 %
 % 模板解压缩后生成文件夹 \file{thuthesis-vX.Y.Z}\footnote{\texttt{vX.Y.Z} 为版本
 % 号。}，其中包括：模板源文件（\file{thuthesis.ins} 和 \file{thuthesis.dtx}），参
-% 考文献样式 \file{bst/numeric.bst} 和 \file{bst/author-year.bst}，示例文档
+% 考文献样式 \file{thuthesis-numeric.bst} 和 \file{thuthesis-author-year.bst}，示例文档
 % （\file{main.tex}，\file{shuji.tex}，\file{thuthesis.sty}\footnote{可能用到的包
 % 以及一些命令定义都放在这里，以免 \file{thuthesis.cls} 过分臃
 % 肿。}，\file{data/} 和 \file{figures/} 和 \file{ref/}）。在使用之前需要先生成模
@@ -452,10 +452,10 @@
 % \begin{latex}
 % % 两个样式文件都置于 bst/，故引用时许注意路径。
 % % 数字式
-% \bibliographystyle{bst/numeric}
+% \bibliographystyle{thuthesis-numeric}
 %
 % % 作者-年份
-% \bibliographystyle{bst/author-year}
+% \bibliographystyle{thuthesis-author-year}
 % \end{latex}
 %
 % \DescribeMacro{\inlinecite}
@@ -1107,7 +1107,7 @@
 %<cls>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<cls>\ProvidesClass{thuthesis}
 %<cfg>\ProvidesFile{thuthesis.cfg}
-%<cls|cfg>[2017/12/3 5.4.0 Tsinghua University Thesis Template]
+%<cls|cfg>[2017/12/4 5.4.1 Tsinghua University Thesis Template]
 %    \end{macrocode}
 %
 % \subsection{定义选项}
@@ -1126,7 +1126,7 @@
 %<*cls>
 \hyphenation{Thu-Thesis}
 \def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.4.0}
+\def\version{5.4.1}
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -3124,10 +3124,11 @@
 %    \end{macrocode}
 %
 % 两种引用样式：
+% \changes{v5.4.1}{2017/12/04}{bst 在 ctan 上不分路径，故加前缀。}
 %    \begin{macrocode}
-\expandafter\newcommand\csname bibstyle@numeric\endcsname{%
+\expandafter\newcommand\csname bibstyle@thuthesis-numeric\endcsname{%
   \bibpunct{[}{]}{,}{s}{,}{\textsuperscript{,}}}
-\expandafter\newcommand\csname bibstyle@author-year\endcsname{%
+\expandafter\newcommand\csname bibstyle@thuthesis-author-year\endcsname{%
   \bibpunct{(}{)}{;}{a}{,}{,}}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
index 48412d43d45..57f517655df 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
@@ -23,7 +23,7 @@
 %% This is the configuration file of the thuthesis package with LaTeX2e.
 %% 
 \ProvidesFile{thuthesis.cfg}
-[2017/12/3 5.4.0 Tsinghua University Thesis Template]
+[2017/12/4 5.4.1 Tsinghua University Thesis Template]
 \theorembodyfont{\normalfont}
 \theoremheaderfont{\normalfont\heiti}
 \theoremsymbol{\ensuremath{\square}}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
index dd9e397ed41..791cc50f1ea 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
@@ -25,10 +25,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{thuthesis}
-[2017/12/3 5.4.0 Tsinghua University Thesis Template]
+[2017/12/4 5.4.1 Tsinghua University Thesis Template]
 \hyphenation{Thu-Thesis}
 \def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.4.0}
+\def\version{5.4.1}
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -823,9 +823,9 @@
 \setlength\bibhang{2\ccwd}
 \addtolength{\bibsep}{-0.7em}
 \setlength{\labelsep}{0.4em}
-\expandafter\newcommand\csname bibstyle@numeric\endcsname{%
+\expandafter\newcommand\csname bibstyle@thuthesis-numeric\endcsname{%
   \bibpunct{[}{]}{,}{s}{,}{\textsuperscript{,}}}
-\expandafter\newcommand\csname bibstyle@author-year\endcsname{%
+\expandafter\newcommand\csname bibstyle@thuthesis-author-year\endcsname{%
   \bibpunct{(}{)}{;}{a}{,}{,}}
 \patchcmd\NAT@citexnum{%
   \@ifnum{\NAT@ctype=\z@}{%