From 139e61a63e6ea8d0dd99a5104160a711c5fcd173 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Dec 2017 22:45:47 +0000 Subject: thuthesis (24dec17) git-svn-id: svn://tug.org/texlive/trunk@46132 c570f23f-e606-0410-a88d-b1316a301751 --- .../bibtex/bst/thuthesis/thuthesis-author-year.bst | 25 +------------------ .../bibtex/bst/thuthesis/thuthesis-numeric.bst | 25 +------------------ Master/texmf-dist/doc/latex/thuthesis/main.pdf | Bin 938275 -> 938367 bytes Master/texmf-dist/doc/latex/thuthesis/shuji.pdf | Bin 4383 -> 4443 bytes .../texmf-dist/doc/latex/thuthesis/thuthesis.pdf | Bin 563268 -> 563400 bytes .../source/latex/thuthesis/thuthesis.dtx | 27 +++++++++++---------- .../texmf-dist/tex/latex/thuthesis/thuthesis.cfg | 2 +- .../texmf-dist/tex/latex/thuthesis/thuthesis.cls | 4 +-- 8 files changed, 19 insertions(+), 64 deletions(-) diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst index 8d9428f3ec0..51652863734 100644 --- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst +++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst @@ -436,31 +436,8 @@ FUNCTION {format.url} if$ } -FUNCTION {is.doi.in.url} -{ url empty$ - { #0 } - { doi text.length$ 'stringlength := - url text.length$ 'charptr := - { url charptr stringlength substring$ doi = not - charptr #0 > - and - } - { charptr #1 - 'charptr := } - while$ - charptr - } - if$ -} - FUNCTION {format.doi} -{ doi empty$ - { "" } - { is.doi.in.url - { "" } - { new.block "\doi{" doi * "}" * } - if$ - } - if$ +{ "" } FUNCTION {format.title} diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst index 3b9f761670b..73a96082be9 100644 --- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst +++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst @@ -435,31 +435,8 @@ FUNCTION {format.url} if$ } -FUNCTION {is.doi.in.url} -{ url empty$ - { #0 } - { doi text.length$ 'stringlength := - url text.length$ 'charptr := - { url charptr stringlength substring$ doi = not - charptr #0 > - and - } - { charptr #1 - 'charptr := } - while$ - charptr - } - if$ -} - FUNCTION {format.doi} -{ doi empty$ - { "" } - { is.doi.in.url - { "" } - { new.block "\doi{" doi * "}" * } - if$ - } - if$ +{ "" } FUNCTION {format.title} diff --git a/Master/texmf-dist/doc/latex/thuthesis/main.pdf b/Master/texmf-dist/doc/latex/thuthesis/main.pdf index 0a9a26d94ae..6d8580f5930 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 544ef76c4ba..8cc3c816430 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 aa05c68b723..ded7c3c4f9c 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 9d33a81f578..8bc7c52cba4 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/18 5.4.2 Tsinghua University Thesis Template] +\ProvidesFile{thuthesis.dtx}[2017/12/24 5.4.3 Tsinghua University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -353,15 +353,15 @@ % \label{sec:updgrade} % \thuthesis\ 升级非常简单,可以通过 \TeX 发行版的包管理工具自动更新发行版,也可 % 以下载最新的开发版, -% 将 \file{thuthesis.ins},\file{thuthesis.dtx} 和 \file{bst/} 拷贝至工作目录覆盖 -% 相应的文件,然后运行: +% 将 \file{thuthesis.ins},\file{thuthesis.dtx},\file{thuthesis-author-year.bst} +% 和 \file{thuthesis-numeric.bst} 拷贝至工作目录覆盖相应的文件,然后运行: % \begin{shell} % $ latex thuthesis.ins % \end{shell} % % 生成新的类文件和配置文件即可。也可以直接拷 -% 贝 \file{thuthesis.cls},\file{thuthesis.cfg} 和 \file{bst/},免去上面命令的执 -% 行。 +% 贝 \file{thuthesis.cls},\file{thuthesis.cfg},\file{thuthesis-author-year.bst} +% 和 \file{thuthesis-numeric.bst},免去上面命令的执行。 % % % \section{使用说明} @@ -381,11 +381,13 @@ % % \subsection{示例文件} % \label{sec:userguide} -% 模板核心文件有:\file{thuthesis.cls},\file{thuthesis.cfg} 和 \file{bst/},但是 -% 如果没有示例文档用户会发现很难下手。所以推荐新用户从模板自带的示例文档入手,里 -% 面包括了论文写作用到的所有命令及其使用方法,只需要用自己的内容进行相应替换就可 -% 以。对于不清楚的命令可以查阅本手册。下面的例子描述了模板中章节的组织形式,来自 -% 于示例文档,具体内容可以参考模板附带的 \file{main.tex} 和 \file{data/}。 +% 模板核心文件 +% 有:\file{thuthesis.cls},\file{thuthesis.cfg},\file{thuthesis-numeric.bst} 和 +% \file{thuthesis-author-year.bst},但是如果没有示例文档用户会发现很难下手。所以推 +% 荐新用户从模板自带的示例文档入手,里面包括了论文写作用到的所有命令及其使用方法, +% 只需要用自己的内容进行相应替换就可以。对于不清楚的命令可以查阅本手册。下面的例 +% 子描述了模板中章节的组织形式,来自于示例文档,具体内容可以参考模板附带 +% 的 \file{main.tex} 和 \file{data/}。 % % \lstinputlisting[style=lstStyleLaTeX]{main.tex} % @@ -451,7 +453,6 @@ % 模板支持两种引用方式,分别为理工科常用的“数字式 [1]”和文科常用 % 的“作者-年份 (Zhang, 2008)”。使用者可通过 \cs{bibliographystyle} 来选择: % \begin{latex} -% % 两个样式文件都置于 bst/,故引用时许注意路径。 % % 数字式 % \bibliographystyle{thuthesis-numeric} % @@ -1107,7 +1108,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{thuthesis} %\ProvidesFile{thuthesis.cfg} -%[2017/12/18 5.4.2 Tsinghua University Thesis Template] +%[2017/12/24 5.4.3 Tsinghua University Thesis Template] % \end{macrocode} % % \subsection{定义选项} @@ -1126,7 +1127,7 @@ %<*cls> \hyphenation{Thu-Thesis} \def\thuthesis{\textsc{ThuThesis}} -\def\version{5.4.2} +\def\version{5.4.3} \RequirePackage{kvoptions} \SetupKeyvalOptions{ diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg index 68c2d55d4a3..21f0238eadc 100644 --- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg +++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg @@ -21,7 +21,7 @@ %% This is the configuration file of the ThuThesis package with LaTeX2e. %% \ProvidesFile{thuthesis.cfg} -[2017/12/18 5.4.2 Tsinghua University Thesis Template] +[2017/12/24 5.4.3 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 988f662a226..3a487f17c8e 100644 --- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls +++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls @@ -23,10 +23,10 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{thuthesis} -[2017/12/18 5.4.2 Tsinghua University Thesis Template] +[2017/12/24 5.4.3 Tsinghua University Thesis Template] \hyphenation{Thu-Thesis} \def\thuthesis{\textsc{ThuThesis}} -\def\version{5.4.2} +\def\version{5.4.3} \RequirePackage{kvoptions} \SetupKeyvalOptions{ -- cgit v1.2.3