From d2ce88d73b5923b144961ab22dbb9198bcc761ce Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 19 Dec 2017 00:05:45 +0000 Subject: thuthesis (18dec17) git-svn-id: svn://tug.org/texlive/trunk@46093 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/thuthesis/thuthesis.cfg | 19 +++---- .../texmf-dist/tex/latex/thuthesis/thuthesis.cls | 60 +++++++++++----------- 2 files changed, 38 insertions(+), 41 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg index 57f517655df..68c2d55d4a3 100644 --- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg +++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg @@ -10,20 +10,18 @@ %% %% Copyright (C) 2005-2017 by Xue Ruini %% -%% This file may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3a +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. -%% The latest version of this license is in: +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. %% -%% http://www.latex-project.org/lppl.txt -%% -%% and version 1.3a or later is part of all distributions of LaTeX -%% version 2004/10/01 or later. -%% -%% This is the configuration file of the thuthesis package with LaTeX2e. +%% This is the configuration file of the ThuThesis package with LaTeX2e. %% \ProvidesFile{thuthesis.cfg} -[2017/12/4 5.4.1 Tsinghua University Thesis Template] +[2017/12/18 5.4.2 Tsinghua University Thesis Template] \theorembodyfont{\normalfont} \theoremheaderfont{\normalfont\heiti} \theoremsymbol{\ensuremath{\square}} @@ -178,7 +176,6 @@ \newcommand{\thu@resume@title}{个人简历、在学期间发表的学术论文与研究成果} \fi \fi -\newcommand{\pozhehao}{——} \endinput %% %% End of file `thuthesis.cfg'. diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls index 791cc50f1ea..988f662a226 100644 --- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls +++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls @@ -10,25 +10,23 @@ %% %% Copyright (C) 2005-2017 by Ruini Xue %% -%% This file may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3a +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. -%% The latest version of this license is in: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% and version 1.3a or later is part of all distributions of LaTeX -%% version 2004/10/01 or later. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. %% %% To produce the documentation run the original source files ending with `.dtx' %% through LaTeX. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{thuthesis} -[2017/12/4 5.4.1 Tsinghua University Thesis Template] +[2017/12/18 5.4.2 Tsinghua University Thesis Template] \hyphenation{Thu-Thesis} \def\thuthesis{\textsc{ThuThesis}} -\def\version{5.4.1} +\def\version{5.4.2} \RequirePackage{kvoptions} \SetupKeyvalOptions{ @@ -39,31 +37,22 @@ \newif\ifthu@master \newif\ifthu@doctor \newif\ifthu@postdoctor -\define@key{thu}{type}{% +\define@key{thu}{degree}{% \thu@bachelorfalse \thu@masterfalse \thu@doctorfalse \thu@postdoctorfalse - \expandafter\csname thu@#1true\endcsname - \ifthu@bachelor\relax\else - \ifthu@master\relax\else - \ifthu@doctor\relax\else - \ifthu@postdoctor\relax\else - \ClassError{thuthesis}% - {Please specify thesis type in option: \MessageBreak - type=[bachelor | master | doctor | postdoctor]}{} - \fi - \fi - \fi - \fi} -\def\thu@deprecated@type@option{% - \kvsetkeys{thu}{type=\CurrentOption} % for compatability. + \expandafter\csname thu@#1true\endcsname} +\define@key{thu}{type}{% + \ClassError{thuthesis}{'type' is deprecated, \MessageBreak + please use 'degree=#1' instead}{}} +\def\thu@deprecated@degree@option{% \ClassError{thuthesis}{Option '\CurrentOption' is deprecated, \MessageBreak - please use 'type=\CurrentOption' instead}{}} -\DeclareVoidOption{bachelor}{\thu@deprecated@type@option} -\DeclareVoidOption{master}{\thu@deprecated@type@option} -\DeclareVoidOption{doctor}{\thu@deprecated@type@option} -\DeclareVoidOption{postdoctor}{\thu@deprecated@type@option} + please use 'degree=\CurrentOption' instead}{}} +\DeclareVoidOption{bachelor}{\thu@deprecated@degree@option} +\DeclareVoidOption{master}{\thu@deprecated@degree@option} +\DeclareVoidOption{doctor}{\thu@deprecated@degree@option} +\DeclareVoidOption{postdoctor}{\thu@deprecated@degree@option} \DeclareBoolOption{secret} \DeclareBoolOption{arialtoc} \DeclareBoolOption{arialtitle} @@ -75,6 +64,17 @@ raggedbottom, arialtitle} \ProcessKeyvalOptions* +\ifthu@bachelor\relax\else + \ifthu@master\relax\else + \ifthu@doctor\relax\else + \ifthu@postdoctor\relax\else + \ClassError{thuthesis}% + {Please specify thesis degree in option: \MessageBreak + degree=[bachelor | master | doctor | postdoctor]}{} + \fi + \fi + \fi +\fi \PassOptionsToPackage{no-math}{fontspec} \LoadClass[a4paper,openany,UTF8,zihao=-4,scheme=plain]{ctexbook} \RequirePackage{etoolbox} -- cgit v1.2.3