From e0ef5aa5395ccd3aa5d931352f510bdec4f5140d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Mar 2016 23:04:09 +0000 Subject: thuthesis (9mar16) git-svn-id: svn://tug.org/texlive/trunk@40010 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/thuthesis/data/cover.tex | 4 +-- Master/texmf-dist/doc/latex/thuthesis/main.pdf | Bin 704234 -> 704309 bytes Master/texmf-dist/doc/latex/thuthesis/shuji.pdf | Bin 11729 -> 11733 bytes .../texmf-dist/doc/latex/thuthesis/thuthesis.pdf | Bin 700159 -> 699905 bytes .../source/latex/thuthesis/thuthesis.dtx | 27 +++++++++++---------- .../texmf-dist/tex/latex/thuthesis/thuthesis.cfg | 8 +++--- .../texmf-dist/tex/latex/thuthesis/thuthesis.cls | 6 ++--- 7 files changed, 23 insertions(+), 22 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/thuthesis/data/cover.tex b/Master/texmf-dist/doc/latex/thuthesis/data/cover.tex index 0205f5c5306..35ae3571f47 100644 --- a/Master/texmf-dist/doc/latex/thuthesis/data/cover.tex +++ b/Master/texmf-dist/doc/latex/thuthesis/data/cover.tex @@ -8,8 +8,8 @@ %===== % 秘级 %===== - secretlevel={绝密}, - secretyear={2100}, + secretlevel={秘密}, + secretyear={10}, % %========= % 中文信息 diff --git a/Master/texmf-dist/doc/latex/thuthesis/main.pdf b/Master/texmf-dist/doc/latex/thuthesis/main.pdf index c122a73f4f9..53ca2d4b3eb 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 73ee6a5186b..2e95701aae6 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/thuthesis.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf index 00c07af7f86..3c8e738cb1b 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/source/latex/thuthesis/thuthesis.dtx b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx index 1417c1de67c..914b19fae3e 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}[2016/02/27 5.2.3 Tsinghua University Thesis Template] +\ProvidesFile{thuthesis.dtx}[2016/03/12 5.3.0 Tsinghua University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -420,19 +420,19 @@ % % \DescribeOption{secret} % 涉秘论文开关(默认:关闭)。第 \ref{sec:setup-secret} 节两个配置(或命 -% 令)\cs{secretlevel}\marg{级别} 和 \cs{secretyear}\marg{年份} 分别用来指定保 -% 密级别和时间。若不设置,则二者取默认值,分别为“\textbf{秘密}”和当前年份。 +% 令)\cs{secretlevel}\marg{级别} 和 \cs{secretyear}\marg{年数} 分别用来指定保 +% 密级别和时限。若不设置,则二者取默认值,分别为“\textbf{秘密}”和当前年份。 % \begin{latex} % \documentclass[secret]{thuthesis} % 打开保密 % \documentclass[secret=false]{thuthesis} % 关闭保密 % % \thusetup{ % secretlevel=公开, -% secretyear=2020 +% secretyear=10 % } % % 或者 % \secretlevel{保密} -% \secretyear{2020} +% \secretyear{10} % \end{latex} % % \DescribeOption{pifootnote} @@ -613,11 +613,11 @@ % 定义秘密级别和年限,需要打开论文的 \option{secret} 选项。 % \begin{latex} % \thusetup{ -% secretyear=2020, +% secretyear=10, % secretlevel={内部}, % } % % 以下命令方式与上面的等价: -% \secretyear{2020} +% \secretyear{10} % \secretlevel{内部} % \end{latex} % @@ -1172,7 +1172,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{thuthesis} %\ProvidesFile{thuthesis.cfg} -%[2016/02/27 5.2.3 Tsinghua University Thesis Template] +%[2016/03/12 5.3.0 Tsinghua University Thesis Template] % \end{macrocode} % % \subsection{定义选项} @@ -1191,7 +1191,7 @@ %<*cls> \hyphenation{Thu-Thesis} \def\thuthesis{\textsc{ThuThesis}} -\def\version{5.2.3} +\def\version{5.3.0} \RequirePackage{kvoptions} \SetupKeyvalOptions{ @@ -2422,6 +2422,7 @@ % \changes{v4.6}{2011/04/26}{增加博士后相关配置。} % \changes{v4.7}{2012/05/27}{修正本科生作者信息名称。} % \changes{v4.7}{2012/05/27}{本科生关键字也用分号分割了。} +% \changes{v5.3.0}{2016/03/11}{更新到研究生院 2016.3 指南。} % 定义封面用到的各种文字。 % \begin{macrocode} %<*cfg> @@ -2452,10 +2453,10 @@ \fi \def\thu@postdoctor@first@discipline@title{流动站(一级学科)名称} \def\thu@postdoctor@second@discipline@title{专\hspace{1em}业(二级学科)名称} -\def\thu@secretlevel@inner{内部} \def\thu@secret@content{% - \ifx\thu@secretlevel\thu@secretlevel@inner\relax\else ★\fi% - \hspace{2em}\thu@secretyear\hspace{1em}年} + \unskip\ifthu@master$\bigstar$ \fi% + \ifthu@doctor$\bigstar$ \fi% + \thu@secretyear 年} \def\thu@apply{(申请清华大学\thu@cdegree 学位论文)} \ifthu@bachelor \def\thu@department@title{系别} @@ -2583,7 +2584,7 @@ \begin{center} \vspace*{-1.6cm} \parbox[b][2.4cm][t]{\textwidth}{% - \ifthu@secret\hfill{\sihao\thu@secretlevel\thu@secret@content}\else\rule{1cm}{0cm}\fi} + \ifthu@secret{\heiti\sanhao\thu@secretlevel\thu@secret@content}\else\rule{1cm}{0cm}\fi} \ifthu@bachelor \vskip0.45cm {\yihao\lishu\ziju{0.3846}\thu@schoolname} diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg index cabc2ca00c9..fafe73e3f11 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} -[2016/02/27 5.2.3 Tsinghua University Thesis Template] +[2016/03/12 5.3.0 Tsinghua University Thesis Template] \theoremsymbol{\ensuremath{\square}} \newtheorem*{proof}{证明} \theoremstyle{plain} @@ -100,10 +100,10 @@ \fi \def\thu@postdoctor@first@discipline@title{流动站(一级学科)名称} \def\thu@postdoctor@second@discipline@title{专\hspace{1em}业(二级学科)名称} -\def\thu@secretlevel@inner{内部} \def\thu@secret@content{% - \ifx\thu@secretlevel\thu@secretlevel@inner\relax\else ★\fi% - \hspace{2em}\thu@secretyear\hspace{1em}年} + \unskip\ifthu@master$\bigstar$ \fi% + \ifthu@doctor$\bigstar$ \fi% + \thu@secretyear 年} \def\thu@apply{(申请清华大学\thu@cdegree 学位论文)} \ifthu@bachelor \def\thu@department@title{系别} diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls index e081ea0739c..9f8a34a2411 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} -[2016/02/27 5.2.3 Tsinghua University Thesis Template] +[2016/03/12 5.3.0 Tsinghua University Thesis Template] \hyphenation{Thu-Thesis} \def\thuthesis{\textsc{ThuThesis}} -\def\version{5.2.3} +\def\version{5.3.0} \RequirePackage{kvoptions} \SetupKeyvalOptions{ @@ -523,7 +523,7 @@ \begin{center} \vspace*{-1.6cm} \parbox[b][2.4cm][t]{\textwidth}{% - \ifthu@secret\hfill{\sihao\thu@secretlevel\thu@secret@content}\else\rule{1cm}{0cm}\fi} + \ifthu@secret{\heiti\sanhao\thu@secretlevel\thu@secret@content}\else\rule{1cm}{0cm}\fi} \ifthu@bachelor \vskip0.45cm {\yihao\lishu\ziju{0.3846}\thu@schoolname} -- cgit v1.2.3