thuthesis (9dec14)

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

13 files changed, 28 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/thuthesis/README b/Master/texmf-dist/doc/latex/thuthesis/README
index 560436eeee5..2ef45b76024 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/README
+++ b/Master/texmf-dist/doc/latex/thuthesis/README
@@ -1,3 +1,6 @@
+# What's ThuThesis?
+ThuThesis is a LaTeX thesis template package for Tsinghua University supporting from bachelor, master, doctor dissertations to post-doc report. Since the users of this package are supposed to be Chinese or those understand Chinese, the following of this file and all other documents are written in Chinese only.
+
 # ThuThesis是什么？
 ThuThesis为 <b>T</b>sing<b>h</b>ua <b>U</b>niversity <b>Thesis</b> LaTeX Template之缩写。
 
diff --git a/Master/texmf-dist/doc/latex/thuthesis/dtx-style.sty b/Master/texmf-dist/doc/latex/thuthesis/dtx-style.sty
index 91635739c90..f24e76f91d8 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/dtx-style.sty
+++ b/Master/texmf-dist/doc/latex/thuthesis/dtx-style.sty
@@ -9,7 +9,7 @@
 
 \ifxetex
   \RequirePackage[nofonts,UTF8,hyperref]{ctex}
-  \input{fontname.def}
+  \input{thufonts.def}
 \else
   \RequirePackage[winfonts,UTF8,hyperref]{ctex}
   \RequirePackage{txfonts}
diff --git a/Master/texmf-dist/doc/latex/thuthesis/main.pdf b/Master/texmf-dist/doc/latex/thuthesis/main.pdf
index 4164ffe6941..bd96ca1db9c 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/shuji.pdf b/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
index a6d22393a6c..95bd3a728c5 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/shuji.tex b/Master/texmf-dist/doc/latex/thuthesis/shuji.tex
index ed6b6e343c1..ee1476c39a1 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/shuji.tex
+++ b/Master/texmf-dist/doc/latex/thuthesis/shuji.tex
@@ -1,5 +1,5 @@
 \documentclass[doctor]{thuthesis}
-% 如果要用 fontname.def，使用 nofonts 选项
+% 如果要用 thufonts.def，使用 nofonts 选项
 
 \ifxetex
   \setCJKfamilyfont{zhfs}[RawFeature={vertical:}]{FangSong}
diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
index ce215791fbd..35aaf3f9bc8 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/doc/latex/thuthesis/zhfonts.py b/Master/texmf-dist/doc/latex/thuthesis/zhfonts.py
index 43df37270b8..5ecbd31b9a6 100755
--- a/Master/texmf-dist/doc/latex/thuthesis/zhfonts.py
+++ b/Master/texmf-dist/doc/latex/thuthesis/zhfonts.py
@@ -136,11 +136,11 @@ if not all((final_fonts['songti']['font'],
     print('错误：缺少宋体、黑体或楷体字体。')
     exit(2)
 
-print('>> 生成字体文件fontname.def')
-with open('fontname.def', 'w') as f:
+print('>> 生成字体文件thufonts.def')
+with open('thufonts.def', 'w') as f:
     f.write('% vim: set ft=tex:\n')
     f.write('% This file is auto-generated by zhfonts.py script\n\n')
-    f.write('\\ProvidesFile{fontname.def}\n')
+    f.write('\\ProvidesFile{thufonts.def}\n')
 
     f.write('\\setCJKmainfont[BoldFont={' + final_fonts['heiti']['font'] + '},ItalicFont={' + final_fonts['kaiti']['font'] + '}]{' + final_fonts['songti']['font'] + '}\n')
     f.write('\\setCJKsansfont{' + final_fonts['heiti']['font'] + '}\n')
diff --git a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
index c87d26e2928..7d197c9cec4 100644
--- a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
+++ b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
@@ -35,7 +35,7 @@
 %
 % \iffalse
 %<*driver>
-\ProvidesFile{thuthesis.dtx}[2014/11/27 4.8 Tsinghua University Thesis Template]
+\ProvidesFile{thuthesis.dtx}[2014/12/09 4.8.1 Tsinghua University Thesis Template]
 \documentclass[10pt]{ltxdoc}
 \usepackage{dtx-style}
 \EnableCrossrefs
@@ -222,7 +222,7 @@
 % thuthesis.dtx & 模板文档代码的混合文件\\
 % thuthesis.cls & 模板类文件\\
 % thuthesis.cfg & 模板配置文件\\
-% fontname.def & 中文字体配置文件\\
+% thufonts.def & 中文字体配置文件\\
 % thubib.bst & 参考文献样式文件\\\hline
 % main.tex & 示例文档主文件\\
 % shuji.tex & 书脊示例文档\\
@@ -273,7 +273,7 @@
 % 模板解压缩后生成文件夹 \file{thuthesis-VERSION}\footnote{VERSION 为版本号。}，
 % 其中包括：模板源文件（\file{thuthesis.ins} 和 \file{thuthesis.dtx}），参考文献
 % 样式 \file{thubib.bst}，示例文档
-% （\file{main.tex}，\file{shuji.tex}，\file{fontname.def}\footnote{Xe\LaTeX 中文
+% （\file{main.tex}，\file{shuji.tex}，\file{thufonts.def}\footnote{Xe\LaTeX 中文
 % 字体配置文件}，\file{thutils.sty}\footnote{可能用到的包以及一些命令定义都放在这
 % 里，以免 \file{thuthesis.cls} 过分臃
 % 肿。}，\file{data/} 和 \file{figures/} 和 \file{ref/}）。在使用之前需要先生成模
@@ -406,7 +406,7 @@
 % \subsection{\thuthesis{} 示例文件}
 % \label{sec:userguide1}
 % 模板核心文件有四
-% 个：\file{thuthesis.cls}，\file{thuthesis.cfg}，\file{fontname.def} 和
+% 个：\file{thuthesis.cls}，\file{thuthesis.cfg}，\file{thufonts.def} 和
 % \file{thubib.bst}，但是如果没有示例文档用户会发现很难下手。所以推荐新用户从模板
 % 自带的示例文档入手，里面包括了论文写作用到的所有命令及其使用方法，只需要用自己
 % 的内容进行相应替换就可以。对于不清楚的命令可以查阅本手册。下面的例子描述了模板
@@ -572,10 +572,10 @@
 % 文字库，缺省为 \option{winfonts} 有效，使用中易字体。当使用 xelatex 编译
 % 时，\option{winfonts} 只有中易的四款字体（宋体、黑体、楷书和仿宋）可用，而本科
 % 生需要用到幼圆，另外 Linux 系统缺少上述字体，这些用户可以通过指
-% 定 \option{nofonts} 选项，利用 \file{fontname.def} 文件配置所需字体。使用中易
+% 定 \option{nofonts} 选项，利用 \file{thufonts.def} 文件配置所需字体。使用中易
 % 六种字体的配置如下：
 % \begin{example}
-% \ProvidesFile{fontname.def}
+% \ProvidesFile{thufonts.def}
 % \setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
 % \setCJKsansfont{SimHei}
 % \setCJKmonofont{FangSong}
@@ -597,7 +597,7 @@
 % 为 |FangSong_GB2312|。
 %
 % 宏包中包含了 \file{zhfonts.py} 脚本，为 Linux/Mac 用户提供一种交互式的方式从系
-% 统中文字体中选择合适的六种字体，最终生成对应的 \file{fontname.def}文件。要使用
+% 统中文字体中选择合适的六种字体，最终生成对应的 \file{thufonts.def}文件。要使用
 % 它，只需在命令行输入该脚本的完整路径即可。
 %
 % 另外，用户也可以通过命令
@@ -1034,7 +1034,7 @@
 %<cls>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<cls>\ProvidesClass{thuthesis}
 %<cfg>\ProvidesFile{thuthesis.cfg}
-%<cls|cfg>[2014/11/27 4.8 Tsinghua University Thesis Template]
+%<cls|cfg>[2014/12/09 4.8.1 Tsinghua University Thesis Template]
 %    \end{macrocode}
 %
 % \subsection{定义选项}
@@ -1048,11 +1048,12 @@
 % \changes{v3.0}{2007/05/12}{删除 submit 选项。}
 % \changes{v4.6}{2011/04/26}{增加 postdoctor 选项。}
 % \changes{v4.8}{2014/11/25}{v4.7曾经想发布，但是一直没有做，于是就被跳过了，算是造一个段子吧。}
+% \changes{v4.8.1}{2014/12/09}{按照 CTAN 的要求整理一下文件。}
 %    \begin{macrocode}
 %<*cls>
 \hyphenation{Thu-Thesis}
 \def\thuthesis{\textsc{ThuThesis}}
-\def\version{4.8}
+\def\version{4.8.1}
 \newif\ifthu@bachelor\thu@bachelorfalse
 \newif\ifthu@master\thu@masterfalse
 \newif\ifthu@doctor\thu@doctorfalse
@@ -1193,11 +1194,12 @@
   \def\CJK@null{\kern\CJKnullspace\Unicode{48}{7}\kern\CJKnullspace}
   \defaultfontfeatures{Mapping=tex-text} % use TeX --
 %    \end{macrocode}
-% 默认采用中易的四款 (宋，黑，楷，仿宋) 免费字体。本科生还需要隶书，需要手工
-% 修改 fontname.def 文件。缺少中文字体的 Linux 用户可以通过 fontname.def 文件定义字体。
+% 默认采用中易的四款 (宋，黑，楷，仿宋) 免费字体。本科生还需要隶书，需要手工修
+% 改 \file{thufonts.def} 文件。缺少中文字体的 Linux 用户可以通
+% 过 \file{thufonts.def} 文件定义字体。
 %    \begin{macrocode}
   \ifCTEX@nofonts
-    \input{fontname.def}
+    \input{thufonts.def}
   \fi
 
   \setmainfont{Times New Roman}
@@ -3125,7 +3127,7 @@
 
 \ifxetex
   \RequirePackage[nofonts,UTF8,hyperref]{ctex}
-  \input{fontname.def}
+  \input{thufonts.def}
 \else
   \RequirePackage[winfonts,UTF8,hyperref]{ctex}
   \RequirePackage{txfonts}
diff --git a/Master/texmf-dist/source/latex/thuthesis/thuthesis.ins b/Master/texmf-dist/source/latex/thuthesis/thuthesis.ins
index 991cc29ccf7..88d5b105d37 100644
--- a/Master/texmf-dist/source/latex/thuthesis/thuthesis.ins
+++ b/Master/texmf-dist/source/latex/thuthesis/thuthesis.ins
@@ -83,7 +83,6 @@ This is the configuration file of the thuthesis package with LaTeX2e.
 \Msg{*}
 \Msg{* \space\space thuthesis.cls}
 \Msg{* \space\space thuthesis.cfg}
-\Msg{* \space\space fontname.def}
 \Msg{*}
 \Msg{* To produce the documentation run the files ending with}
 \Msg{* `.dtx' through LaTeX.}
diff --git a/Master/texmf-dist/doc/latex/thuthesis/fontname.def b/Master/texmf-dist/tex/latex/thuthesis/thufonts.def
index c249172092d..c7a619ed07a 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/fontname.def
+++ b/Master/texmf-dist/tex/latex/thuthesis/thufonts.def
@@ -1,7 +1,7 @@
 % vim: set ft=tex:
 % This file is modified from ctex's ctex-xecjk-winfonts.def.
 
-\ProvidesFile{fontname.def}
+\ProvidesFile{thufonts.def}
 \setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
 \setCJKsansfont{SimHei}
 \setCJKmonofont{FangSong}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
index 3cdef155137..f5477c83dac 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
@@ -25,7 +25,7 @@
 %% 
 
 \ProvidesFile{thuthesis.cfg}
-[2014/11/27 4.8 Tsinghua University Thesis Template]
+[2014/12/09 4.8.1 Tsinghua University Thesis Template]
 \theoremsymbol{\ensuremath{\square}}
 \newtheorem*{proof}{证明}
 \theoremstyle{plain}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
index 198f833cc08..a9382e445bd 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
@@ -26,10 +26,10 @@
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{thuthesis}
-[2014/11/27 4.8 Tsinghua University Thesis Template]
+[2014/12/09 4.8.1 Tsinghua University Thesis Template]
 \hyphenation{Thu-Thesis}
 \def\thuthesis{\textsc{ThuThesis}}
-\def\version{4.8}
+\def\version{4.8.1}
 \newif\ifthu@bachelor\thu@bachelorfalse
 \newif\ifthu@master\thu@masterfalse
 \newif\ifthu@doctor\thu@doctorfalse
@@ -84,7 +84,7 @@
   \def\CJK@null{\kern\CJKnullspace\Unicode{48}{7}\kern\CJKnullspace}
   \defaultfontfeatures{Mapping=tex-text} % use TeX --
   \ifCTEX@nofonts
-    \input{fontname.def}
+    \input{thufonts.def}
   \fi
 
   \setmainfont{Times New Roman}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 70644463963..b8a37d56250 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1625,7 +1625,6 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'thesis-ekf',  '\.cls',		  # not magyar.ldf
  'thesis-titlepage-fhac',       'LOGO.*|' . $standardtex,
  'threeparttable',      '^..[^s].*\.sty', # not miscdoc.sty
- 'thuthesis',   '\.(cfg|cls|sty)$',	  # not fontname.def
  'ticket',      '\.tdf|' . $standardtex,
  'tikz-cd',     'tikz-cd.sty|tikzlibrarycd.code.tex',   # not pgfmanual.sty
  'tikz-qtree',  '(pgf|tikz-)(subpic|q?tree(-compat)?)\.(tex|sty)',