cquthesis (11dec16)

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

2 files changed, 30 insertions, 27 deletions

diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
index 763888259ff..38f2a8e55a7 100644
--- a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
+++ b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
@@ -22,13 +22,13 @@
 %% This is the configuration file of the cquthesis package with LaTeX2e.
 %% 
 \ProvidesFile{cquthesis.cfg}
-[2016/08/18 v1.14 Chongqing University Thesis Template]
+[2016/12/07 v1.16 Chongqing University Thesis Template]
 \def\cqueqshortname {式}
 \def\cqu@denotation@name {主要符号对照表}
 \def\shorttablename {表}
 \def\shorttablenameEN {Table}
 \def\shortfigurename {图}
-\def\shortfigurenameEN {Figure}
+\def\shortfigurenameEN {Fig.}
 \def\listofequationsname {重要算式索引}
 \def\listofequationsnameEN {\textbf{List of Equations}}
 \def\listoffiguresnameEN {\textbf{List of Figures}}
@@ -55,8 +55,8 @@ nameformat = \bfseries\zihao{-3},
 titleformat = \zihao{-3},
 aftername = \hskip\ccwd,
 number = {\ifcqu@liberalformat\parenthesesthis{\chinese{section}}\else\thesection\fi},
-beforeskip = 24bp \@plus 1ex \@minus .2ex,
-afterskip = 6bp \@plus .2ex,
+beforeskip = 24bp plus 1ex minus .2ex,
+afterskip = 6bp plus .2ex,
 },
 subsection = {%
 name = {},
@@ -65,8 +65,9 @@ nameformat = \bfseries\zihao{4},
 titleformat = \zihao{4},
 aftername = \hskip\ccwd,
 number = {\ifcqu@liberalformat\arabic{subsection}\else\thesubsection\fi},
-beforeskip = 16bp \@plus 1ex \@minus .2ex,
-afterskip = 6bp \@plus .2ex,
+beforeskip = 12bp plus 1bp,
+afterskip = 10bp,
+fixskip = true,
 },
 subsubsection = {
 name = {},
@@ -76,8 +77,9 @@ aftertitle = {},
 numbering = true,
 number = {\ifcqu@liberalformat\parenthesesthis{\arabic{subsubsection}}\else\@circlenum{subsubsection}\fi},
 numberformat+ = {\ifcqu@liberalformat\relax\else\zihao{4}\fi},
-beforeskip = 1ex plus 0.5ex minus .2ex,
-afterskip = 1bp \@plus .1ex,
+beforeskip = 10bp plus .5bp,
+afterskip = 10bp,
+fixskip = true,
 },
 appendix = {%
 numbering = false,
@@ -205,7 +207,7 @@ range-phrase = {$ \sim $},
 \def\cqu@studentEN{Undergraduate}
 \def\cqu@studentnumCN{学号}
 \def\cqu@supervisorCN{指导教师}
-\def\cqu@supervisorEN{Supervisor}
+\def\cqu@supervisorEN{Supervised by{ }}
 \def\cqu@assistsupervisorCN{助理指导教师}
 \def\cqu@extrasupervisorCN{校外指导教师}
 \def\cqu@assistsupervisorEN{Assistant Supervisor}
@@ -221,7 +223,7 @@ in Partial Fulfillment of the Requirement for%
 \ifcqu@academic{ }the\fi\\\cqu@edgree}
 \def\cqu@studentCN{学生姓名}
 \def\cqu@supervisorCN{指导教师}
-\def\cqu@supervisorEN{Supervisor}
+\def\cqu@supervisorEN{Supervised by{ }}
 \def\cqu@psupervisorCN{兼职导师}
 \def\cqu@psupervisorEN{Pluralistic~Supervisor}
 \def\cqu@majorCN{专业}
@@ -243,7 +245,7 @@ in Partial Fulfillment of the Requirement for the\\\cqu@edgree}
 \def\cqu@studentCN{学生姓名}
 \def\cqu@studentEN{Ph.D. Candidate}
 \def\cqu@supervisorCN{指导教师}
-\def\cqu@supervisorEN{Supervisor}
+\def\cqu@supervisorEN{Supervised by{ }}
 \def\cqu@majorCN{学科专业}
 \def\cqu@majorclassCN{学科门类}
 \def\cqu@majorEN{Specialty}
diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
index 6445c6db8c0..73b71cc8c00 100644
--- a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
+++ b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
@@ -21,10 +21,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{cquthesis}
-[2016/08/18 v1.14 Chongqing University Thesis Template]
+[2016/12/07 v1.16 Chongqing University Thesis Template]
 \hyphenation{Cqu-Thesis}
 \newcommand{\cquthesis}{\textsc{CquThesis}}
-\def\version{1.14}
+\def\version{1.16}
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
 family=cqu,
@@ -294,12 +294,12 @@ math-micro = {\upmu},
 text-micro = {\textmu},
 }%\sisetup
 \fi
-\setlength{\floatsep}{20bp \@plus4pt \@minus1pt}
-\setlength{\intextsep}{24bp \@plus4pt \@minus2pt}
-\setlength{\textfloatsep}{20bp \@plus4pt \@minus2pt}
-\setlength{\@fptop}{6bp \@plus2bp}
-\setlength{\@fpsep}{12bp \@plus2bp}
-\setlength{\@fpbot}{6bp \@plus2bp}
+\setlength{\floatsep}{20bp plus2bp minus2bp}
+\setlength{\intextsep}{20bp plus2bp minus2bp}
+\setlength{\textfloatsep}{20bp plus2bp minus2bp}
+\setlength{\@fptop}{6bp plus2bp}
+\setlength{\@fpsep}{12bp plus2bp}
+\setlength{\@fpbot}{6bp plus2bp}
 \renewcommand{\textfraction}{0.15}
 \renewcommand{\topfraction}{0.85}
 \renewcommand{\bottomfraction}{0.65}
@@ -325,12 +325,12 @@ text-micro = {\textmu},
 \fi}
 }
 \def\cqu@tabular{\zihao{5}\@tabular}
-\DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti \textbf{#1~#2}}}
+\DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti #1~#2}}
 \DeclareCaptionLabelSeparator{cqu}{\hspace{\ccwd}}
 \DeclareCaptionFont{cqu}{\zihao{5}\rmfamily\songti}
 \captionsetup{labelformat=cqu,labelsep=cqu,font=cqu}
-\captionsetup[table]{position=top,belowskip={12bp-\intextsep},aboveskip=6bp}
-\captionsetup[figure]{position=bottom,belowskip={12bp-\intextsep},aboveskip=6bp}
+\captionsetup[table]{position=top,belowskip=6bp,aboveskip=0bp}
+\captionsetup[figure]{position=bottom,belowskip=0bp,aboveskip=6bp}
 \captionsetup[sub]{font=cqu,skip=6bp}
 \renewcommand{\thesubfigure}{(\alph{subfigure})}
 \renewcommand{\thesubtable}{(\alph{subtable})}
@@ -412,8 +412,9 @@ style=lstStyleBase,
 frame=l,
 rulecolor=\color{cyan},
 language=Python}
-\lstnewenvironment{Cplus}{\lstset{style=lstStylePython}}{}
-\lstnewenvironment{Python}{\lstset{style=lstStyleCplus}}{}
+\lstnewenvironment{C++}{\lstset{style=lstStyleCplus}}{}
+\lstnewenvironment{Cplus}{\lstset{style=lstStyleCplus}}{}
+\lstnewenvironment{Python}{\lstset{style=lstStylePython}}{}
 \newcounter{cquXuHao}
 \newcounter{cquXuHaoType}
 \setcounter{cquXuHaoType}{1}
@@ -575,7 +576,7 @@ language=Python}
 \includegraphics[width=5cm]{CQUbadge.pdf}
 \\ \vspace{\stretch{2}}
 \zihao{3}\textbf{\cqu@studentEN\cqu@title@separatorEN\mbox{\cqu@eauthor}}\\
-\cqu@supervisorEN\cqu@title@separatorEN\mbox{\cqu@esupervisor}\\
+\cqu@supervisorEN\mbox{\cqu@esupervisor}\\
 \ifdefstring{\cqu@eassistsupervisor}{}{\relax}{\cqu@assistsupervisorEN\cqu@title@separatorEN\mbox{\cqu@eassistsupervisor}\\}
 \cqu@majorEN\cqu@title@separatorEN\mbox{\cqu@emajor}
 \else
@@ -585,11 +586,11 @@ language=Python}
 \\ \vspace{\stretch{2}}
 \zihao{3}\cqu@thesistypenameEN
 \\[1mm]
-\cqu@workby
+\textbf{\cqu@workby}
 \\[2mm]
 \zihao{3}\mbox{\textbf{\cqu@eauthor}}
 \\ \vspace{\stretch{1}}
-\textbf{\cqu@supervisorEN\cqu@title@separatorEN}\textbf{\cqu@esupervisor}\\
+\textbf{\cqu@supervisorEN}\textbf{\cqu@esupervisor}\\
 \ifcqu@academic\relax\else\textbf{\cqu@psupervisorEN\cqu@title@separatorEN\cqu@epsupervisor}\\\fi
 \textbf{\cqu@majorEN\cqu@title@separatorEN}\mbox{\textbf{\cqu@emajor}}
 \fi