cquthesis (31may17)

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

2 files changed, 37 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
index 38f2a8e55a7..214030683c7 100644
--- a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
+++ b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016-2016 by Zhennan Li <i@nanmu.me>
+%% Copyright (C) 2016-2017 by Zhennan Li <i@nanmu.me>
 %% This file 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
@@ -22,7 +22,7 @@
 %% This is the configuration file of the cquthesis package with LaTeX2e.
 %% 
 \ProvidesFile{cquthesis.cfg}
-[2016/12/07 v1.16 Chongqing University Thesis Template]
+[2017/05/30 v1.20 Chongqing University Thesis Template]
 \def\cqueqshortname {式}
 \def\cqu@denotation@name {主要符号对照表}
 \def\shorttablename {表}
@@ -246,7 +246,7 @@ in Partial Fulfillment of the Requirement for the\\\cqu@edgree}
 \def\cqu@studentEN{Ph.D. Candidate}
 \def\cqu@supervisorCN{指导教师}
 \def\cqu@supervisorEN{Supervised by{ }}
-\def\cqu@majorCN{学科专业}
+\def\cqu@majorCN{专业}
 \def\cqu@majorclassCN{学科门类}
 \def\cqu@majorEN{Specialty}
 \def\cqu@universitynameCN{重庆大学}
diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
index 73b71cc8c00..1874fee805f 100644
--- a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
+++ b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016-2016 by Zhennan Li <i@nanmu.me>
+%% Copyright (C) 2016-2017 by Zhennan Li <i@nanmu.me>
 %% This file 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
@@ -21,10 +21,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{cquthesis}
-[2016/12/07 v1.16 Chongqing University Thesis Template]
+[2017/05/30 v1.20 Chongqing University Thesis Template]
 \hyphenation{Cqu-Thesis}
 \newcommand{\cquthesis}{\textsc{CquThesis}}
-\def\version{1.16}
+\def\version{1.20}
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
 family=cqu,
@@ -39,9 +39,11 @@ setkeys=\kvsetkeys}
 \DeclareBoolOption{liberalformat}
 \DeclareBoolOption[true]{academic}
 \DeclareComplementaryOption{proffesionalmaster}{academic}
-\DeclareBoolOption[true]{openany}
+\DeclareBoolOption[false]{openany}
 \DeclareComplementaryOption{openright}{openany}
+\DeclareBoolOption[false]{blankleft}
 \DeclareBoolOption[false]{abstractopenright}
+\DeclareBoolOption[false]{blindtrail}
 \newif\if@onesideprint
 \newif\if@twosideprint
 \newif\if@autoprint
@@ -160,11 +162,11 @@ CJKbookmarks=false}
 \fi
 \let\cqu@cleardoublepage\cleardoublepage
 \renewcommand{\cleardoublepage}{%
-\clearpage{\pagestyle{style@empty}\cqu@cleardoublepage}
+\clearpage{\ifcqu@blankleft\pagestyle{style@empty}\fi\cqu@cleardoublepage}
 }%\cleardoublepage
 \newcommand\cqu@addblankpage{%
 \afterpage{%
-{\null\pagestyle{style@empty}\clearpage}}}
+{\null\ifcqu@blankleft\pagestyle{style@empty}\fi\clearpage}}}
 \newif\if@backmatter
 \renewcommand{\frontmatter}{%
 \@backmatterfalse
@@ -192,8 +194,8 @@ subsection/number = \CTEXthesection{}\arabic{subsection},}%
 \RequirePackage{geometry}
 \geometry{
 a4paper, ignoreall, nomarginpar,
-inner=25mm, outer=25mm, top=30mm, bottom=25mm,
-bindingoffset=10mm, head=16mm, headsep=5mm, foot=15mm, footnotesep=5mm}
+inner=25mm, outer=25mm, top=30mm, bottom=28mm,
+bindingoffset=10mm, head=16mm, headsep=11mm, foot=12mm, footnotesep=5mm}
 \RequirePackage{totcount}
 \regtotcounter[auxfile=maxpage.aux]{page}
 \if@autoprint
@@ -326,8 +328,9 @@ text-micro = {\textmu},
 }
 \def\cqu@tabular{\zihao{5}\@tabular}
 \DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti #1~#2}}
-\DeclareCaptionLabelSeparator{cqu}{\hspace{\ccwd}}
+\DeclareCaptionLabelSeparator{cqu}{\hspace{0.5\ccwd}}
 \DeclareCaptionFont{cqu}{\zihao{5}\rmfamily\songti}
+\captionsetup{justification=centerlast}
 \captionsetup{labelformat=cqu,labelsep=cqu,font=cqu}
 \captionsetup[table]{position=top,belowskip=6bp,aboveskip=0bp}
 \captionsetup[figure]{position=bottom,belowskip=0bp,aboveskip=6bp}
@@ -452,6 +455,21 @@ language=Python}
 \let\rownumtype\xuhaotype
 \let\setxuhao\xuhaotype
 \let\rownumseparator\xuhaoseparator
+\newcommand{\secretize}[1]{%
+\ifcqu@blindtrail
+{***}
+\else
+{#1}
+\fi
+}
+\newcommand{\cqu@@secretizeenv}[1]{\long\gdef\cqu@secretizeenv{#1}}
+\newenvironment{secretizeEnv}{\Collect@Body\cqu@@secretizeenv}{%
+\ifcqu@blindtrail
+\relax
+\else
+\cqu@secretizeenv
+\fi
+}
 \def\cqu@def@term #1{%
 \define@key{cqu}{#1}{\csname #1\endcsname{##1}}
 \expandafter\gdef\csname #1\endcsname##1{%
@@ -751,9 +769,14 @@ itemindent = 0mm,
 \renewcommand{\cftafterlottitle}{\hfill}
 \renewcommand{\cftafterequtitle}{\hfill}
 \renewcommand{\cftafterequENtitle}{\hfill}
+\renewcommand{\cftdot}{…}
+\renewcommand{\cftdotsep}{0}
+\renewcommand{\cftchapdotsep}{\cftdotsep}
+\renewcommand{\cftchapleader}{\cftdotfill{\cftchapdotsep}}
+\renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}}
 \ifcqu@continuoustoc\relax\else
-\renewcommand{\@cfttocstart}{\clearpage}
-\renewcommand{\@cfttocfinish}{\clearpage}
+\renewcommand{\@cfttocstart}{\cleardoublepage}
+\renewcommand{\@cfttocfinish}{\cleardoublepage}
 \fi
 \newcommand{\chapterstar}[1]{%
 \chapter*{#1}%