diff options
author | Karl Berry <karl@freefriends.org> | 2016-12-11 22:29:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-12-11 22:29:13 +0000 |
commit | d37c6883e597645a04f685a5e473402cd4ff9944 (patch) | |
tree | 0b355f4d891e0807eae36cf0c6e6ef241fc7cda6 /Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls | |
parent | 0df6dc0d707011cb72a49784ac75db416893c449 (diff) |
cquthesis (11dec16)
git-svn-id: svn://tug.org/texlive/trunk@42676 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls | 33 |
1 files changed, 17 insertions, 16 deletions
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 |