From 92b35aa42d6d9f68b1d1f730dd47da06d2d3aa23 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 9 Dec 2014 23:19:39 +0000
Subject: thuthesis (9dec14)

git-svn-id: svn://tug.org/texlive/trunk@35774 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/latex/thuthesis/README       |   3 +++
 .../texmf-dist/doc/latex/thuthesis/dtx-style.sty   |   2 +-
 Master/texmf-dist/doc/latex/thuthesis/fontname.def |  21 ---------------------
 Master/texmf-dist/doc/latex/thuthesis/main.pdf     | Bin 777273 -> 777263 bytes
 Master/texmf-dist/doc/latex/thuthesis/shuji.pdf    | Bin 23082 -> 19093 bytes
 Master/texmf-dist/doc/latex/thuthesis/shuji.tex    |   2 +-
 .../texmf-dist/doc/latex/thuthesis/thuthesis.pdf   | Bin 501707 -> 501993 bytes
 Master/texmf-dist/doc/latex/thuthesis/zhfonts.py   |   6 +++---
 8 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 Master/texmf-dist/doc/latex/thuthesis/fontname.def

(limited to 'Master/texmf-dist/doc/latex/thuthesis')

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/fontname.def b/Master/texmf-dist/doc/latex/thuthesis/fontname.def
deleted file mode 100644
index c249172092d..00000000000
--- a/Master/texmf-dist/doc/latex/thuthesis/fontname.def
+++ /dev/null
@@ -1,21 +0,0 @@
-% vim: set ft=tex:
-% This file is modified from ctex's ctex-xecjk-winfonts.def.
-
-\ProvidesFile{fontname.def}
-\setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
-\setCJKsansfont{SimHei}
-\setCJKmonofont{FangSong}
-
-\setCJKfamilyfont{zhsong}{SimSun}
-\setCJKfamilyfont{zhhei}{SimHei}
-\setCJKfamilyfont{zhkai}{KaiTi}
-\setCJKfamilyfont{zhfs}{FangSong}
-\setCJKfamilyfont{zhli}{LiSu}
-\setCJKfamilyfont{zhyou}{YouYuan}
-
-\newcommand*{\songti}{\CJKfamily{zhsong}}
-\newcommand*{\heiti}{\CJKfamily{zhhei}}
-\newcommand*{\kaishu}{\CJKfamily{zhkai}}
-\newcommand*{\fangsong}{\CJKfamily{zhfs}}
-\newcommand*{\lishu}{\CJKfamily{zhli}}
-\newcommand*{\youyuan}{\CJKfamily{zhyou}}
diff --git a/Master/texmf-dist/doc/latex/thuthesis/main.pdf b/Master/texmf-dist/doc/latex/thuthesis/main.pdf
index 4164ffe6941..bd96ca1db9c 100644
Binary files a/Master/texmf-dist/doc/latex/thuthesis/main.pdf and b/Master/texmf-dist/doc/latex/thuthesis/main.pdf differ
diff --git a/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf b/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
index a6d22393a6c..95bd3a728c5 100644
Binary files a/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf and b/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf differ
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
Binary files a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf and b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf differ
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')
-- 
cgit v1.2.3