summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/cquthesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-08-27 22:15:55 +0000
committerKarl Berry <karl@freefriends.org>2016-08-27 22:15:55 +0000
commit11c9c4d9505fbae8b108824303315d6203a2a655 (patch)
tree0d6139f60080d4acfe0f1eaa4af6b6808b9fc037 /Master/texmf-dist/tex/latex/cquthesis
parent5fd39aa8867152c78c0dd8676a185880b9a797b6 (diff)
cquthesis (27aug16)
git-svn-id: svn://tug.org/texlive/trunk@41938 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/cquthesis')
-rw-r--r--Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg12
-rw-r--r--Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls104
2 files changed, 99 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
index c31fb325562..763888259ff 100644
--- a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
+++ b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
@@ -22,10 +22,17 @@
%% This is the configuration file of the cquthesis package with LaTeX2e.
%%
\ProvidesFile{cquthesis.cfg}
-[2016/06/09 v0.9.7 Chongqing University Thesis Template]
+[2016/08/18 v1.14 Chongqing University Thesis Template]
\def\cqueqshortname {式}
\def\cqu@denotation@name {主要符号对照表}
+\def\shorttablename {表}
+\def\shorttablenameEN {Table}
+\def\shortfigurename {图}
+\def\shortfigurenameEN {Figure}
\def\listofequationsname {重要算式索引}
+\def\listofequationsnameEN {\textbf{List of Equations}}
+\def\listoffiguresnameEN {\textbf{List of Figures}}
+\def\listoftablesnameEN {\textbf{List of Tables}}
\def\cqu@bib@name {参考文献}
\def\cqu@tocnameinbkmark {目{ }录}
\newcommand{\parenthesesthis}[1]{(#1)}
@@ -199,6 +206,9 @@ range-phrase = {$ \sim $},
\def\cqu@studentnumCN{学号}
\def\cqu@supervisorCN{指导教师}
\def\cqu@supervisorEN{Supervisor}
+\def\cqu@assistsupervisorCN{助理指导教师}
+\def\cqu@extrasupervisorCN{校外指导教师}
+\def\cqu@assistsupervisorEN{Assistant Supervisor}
\def\cqu@majorCN{专业}
\def\cqu@majorEN{Major}
\def\cqu@universitynameCN{重庆大学}
diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
index 702854e3f7b..6445c6db8c0 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/06/09 v0.9.7 Chongqing University Thesis Template]
+[2016/08/18 v1.14 Chongqing University Thesis Template]
\hyphenation{Cqu-Thesis}
\newcommand{\cquthesis}{\textsc{CquThesis}}
-\def\version{0.9.7}
+\def\version{1.14}
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
family=cqu,
@@ -51,6 +51,13 @@ setkeys=\kvsetkeys}
\DeclareBoolOption[false]{secret}
\DeclareBoolOption[false]{seriftoc}
\DeclareBoolOption{continuoustoc}
+\newif\if@bioff
+\newif\if@bicombined
+\newif\if@biapart
+\@biofffalse\@bicombinedfalse\@biapartfalse
+\define@key{cqu}{bilinguallist}{%
+\@biofffalse\@bicombinedfalse\@biapartfalse
+\expandafter\csname @bi#1true\endcsname}
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}}
\kvsetkeys{cqu}{}
\ProcessKeyvalOptions*
@@ -79,6 +86,16 @@ printmode=[oneside|twoside|auto]}{}
\fi
\fi
\fi
+\if@bioff\relax\else
+\if@bicombined\relax\else
+\if@biapart\relax\else
+\kvsetkeys{cqu}{bilinguallist=off,}
+\ClassWarning{cquthesis}%
+{Unexpected or missing bilingual list mode, processing with OFF: \MessageBreak
+bilinguallist=[off|combined|apart]}{}
+\fi
+\fi
+\fi
\RequirePackage{etoolbox}
\RequirePackage{xparse}
\RequirePackage{environ}
@@ -90,7 +107,10 @@ printmode=[oneside|twoside|auto]}{}
\RequirePackage{newtxmath}
\RequirePackage{pifont}
\RequirePackage{CJKfntef}
+\RequirePackage{newfloat}
+\RequirePackage{caption}
\RequirePackage[labelformat=simple]{subcaption}
+\RequirePackage{bicaption}
\RequirePackage{array}
\RequirePackage{tabularx}
\RequirePackage{booktabs}
@@ -277,9 +297,9 @@ text-micro = {\textmu},
\setlength{\floatsep}{20bp \@plus4pt \@minus1pt}
\setlength{\intextsep}{24bp \@plus4pt \@minus2pt}
\setlength{\textfloatsep}{20bp \@plus4pt \@minus2pt}
-\setlength{\@fptop}{0bp \@plus1.0fil}
-\setlength{\@fpsep}{12bp \@plus2.0fil}
-\setlength{\@fpbot}{0bp \@plus1.0fil}
+\setlength{\@fptop}{6bp \@plus2bp}
+\setlength{\@fpsep}{12bp \@plus2bp}
+\setlength{\@fpbot}{6bp \@plus2bp}
\renewcommand{\textfraction}{0.15}
\renewcommand{\topfraction}{0.85}
\renewcommand{\bottomfraction}{0.65}
@@ -305,15 +325,39 @@ text-micro = {\textmu},
\fi}
}
\def\cqu@tabular{\zihao{5}\@tabular}
-\DeclareCaptionLabelFormat{cqu}{{\zihao{5}\songti #1~\rmfamily #2}}
+\DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti \textbf{#1~#2}}}
\DeclareCaptionLabelSeparator{cqu}{\hspace{\ccwd}}
-\DeclareCaptionFont{cqu}{\zihao{5}}
+\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[sub]{font=cqu,skip=6bp}
\renewcommand{\thesubfigure}{(\alph{subfigure})}
\renewcommand{\thesubtable}{(\alph{subtable})}
+\captionsetup[bi-first]{bi-first}
+\captionsetup[bi-second]{bi-second}
+\DeclareCaptionOption{bi-first}[]{%
+\def\tablename{\shorttablename}
+\def\figurename{\shortfigurename}
+}%bi-first
+\DeclareCaptionOption{bi-second}[]{%
+\def\tablename{\shorttablenameEN}
+\def\figurename{\shortfigurenameEN}
+}%bi-second
+\DeclareFloatingEnvironment[fileext=lofEN]{figuresEN}[\shortfigurenameEN][\listoffiguresnameEN]
+\DeclareFloatingEnvironment[fileext=lotEN]{tablesEN}[\shorttablenameEN][\listoftablesnameEN]
+\if@bicombined\relax
+\else
+\captionsetup[bi-second]{listtype+=sEN}
+\fi
+\if@biapart\relax
+\else
+\AtBeginDocument{%
+\let\listoffiguresEN\relax
+\let\listoftablesEN\relax
+\let\listofequationsEN\relax
+}%AtBeginDocument
+\fi
\AtBeginEnvironment{tabularx}{\begingroup\zihao{5}}
\AtEndEnvironment{tabularx}{\endgroup}
\setlength{\tabcolsep}{12pt}
@@ -321,11 +365,13 @@ text-micro = {\textmu},
\newcommand{\bigcell}[1]{\vspace{6pt}\begin{varwidth}{\linewidth}#1\end{varwidth}\vspace{6pt}}
\newcommand{\headcell}[1]{\multicolumn{1}{c}{\heiti #1}}
\newcommand{\colsep}[1][12pt]{\setlength{\tabcolsep}{#1}}
+\setlength{\LTpre}{\bigskipamount}
+\setlength{\LTpost}{\bigskipamount}
\let\cqu@LT@array\LT@array
\def\LT@array{\zihao{5}\cqu@LT@array}
\RequirePackage{listings}
\lstdefinestyle{lstStyleBase}{%
-basicstyle=\scriptsize\ttfamily,
+basicstyle=\footnotesize\ttfamily,
aboveskip=\medskipamount,
belowskip=\medskipamount,
lineskip=0pt,
@@ -417,6 +463,9 @@ language=Python}
\cqu@def@term{studentid}
\cqu@def@term{csupervisor}
\cqu@def@term{esupervisor}
+\cqu@def@term{cassistsupervisor}
+\cqu@def@term{cextrasupervisor}
+\cqu@def@term{eassistsupervisor}
\cqu@def@term{cpsupervisor}
\cqu@def@term{epsupervisor}
\cqu@def@term{cmajor}
@@ -445,7 +494,7 @@ language=Python}
\thispagestyle{style@empty}
\begin{center}
\rule{0mm}{15mm}
-\heiti
+\sffamily\heiti
\ifcqu@bachelor
\zihao{-2}\cqu@thesistypenameCN
\\ \vspace{\stretch{1}}
@@ -469,6 +518,8 @@ language=Python}
\cqu@studentCN\cqu@title@separatorCN\\
\cqu@studentnumCN\cqu@title@separatorCN\\
\cqu@supervisorCN\cqu@title@separatorCN\\
+\ifdefstring{\cqu@cassistsupervisor}{}{\relax}{{\zihao{5}\begin{CJKfilltwosides}{66bp}\cqu@assistsupervisorCN\end{CJKfilltwosides}}\hfill\cqu@title@separatorCN\\}
+\ifdefstring{\cqu@cextrasupervisor}{}{\relax}{{\zihao{5}\begin{CJKfilltwosides}{66bp}\cqu@extrasupervisorCN\end{CJKfilltwosides}}\hfill\cqu@title@separatorCN\\}
\cqu@majorCN\cqu@title@separatorCN
\end{CJKfilltwosides}
\end{varwidth}
@@ -491,9 +542,13 @@ language=Python}
\zihao{3}
\begin{varwidth}{\textwidth}%
\mbox{\cqu@cauthor}\\
-\ifcqu@bachelor\mbox{\cqu@studentid}\\\fi
+\ifcqu@bachelor\cqu@studentid\\\fi
\cqu@csupervisor\\ %不要放在盒子里
\ifcqu@academic %这里有点复杂
+\ifcqu@bachelor
+\ifdefstring{\cqu@cassistsupervisor}{}{\relax}{\cqu@cassistsupervisor\\}
+\ifdefstring{\cqu@cextrasupervisor}{}{\relax}{\cqu@cextrasupervisor\\}
+\fi
\mbox{\cqu@cmajor}
\ifcqu@bachelor\relax\else\\\cqu@cclass\fi
\else
@@ -521,6 +576,7 @@ language=Python}
\\ \vspace{\stretch{2}}
\zihao{3}\textbf{\cqu@studentEN\cqu@title@separatorEN\mbox{\cqu@eauthor}}\\
\cqu@supervisorEN\cqu@title@separatorEN\mbox{\cqu@esupervisor}\\
+\ifdefstring{\cqu@eassistsupervisor}{}{\relax}{\cqu@assistsupervisorEN\cqu@title@separatorEN\mbox{\cqu@eassistsupervisor}\\}
\cqu@majorEN\cqu@title@separatorEN\mbox{\cqu@emajor}
\else
\zihao{-1}\textbf{\cqu@etitle}
@@ -664,20 +720,36 @@ itemindent = 0mm,
\renewcommand{\cftsubsecfont}{\zihao{5}}
\fi
\newlistof[chapter]{equations}{equ}{\listofequationsname}
-\newcommand{\listeq}[1]{%
-\addcontentsline{equ}{equations}{\protect\numberline{\theequation}#1}\par}
+\newlistof[chapter]{equationsEN}{equEN}{\listofequationsnameEN}
+\DeclareDocumentCommand{\listeq}{ m o }{%
+\addcontentsline{equ}{equations}{\protect\numberline{\theequation}#1}\par
+\IfNoValueTF{#2}{%
+\relax
+}{%
+\if@bicombined
+\addcontentsline{equ}{equations}{\protect\numberline{\theequation}#2}\par
+\else
+\if@biapart
+\addcontentsline{equEN}{equationsEN}{\protect\numberline{\theequation}#2}\par
+\fi
+\fi
+}
+}%listeq
\setlength{\cftequationsnumwidth}{2.5em}
+\setlength{\cftequationsENnumwidth}{2.5em}
\let\eqlist\listeq
\tocloftpagestyle{style@normal}
\renewcommand{\cfttoctitlefont}{%
-\phantomsection\pdfbookmark[0]{\cqu@tocnameinbkmark}{toc}\cqu@fixhead\hfill\heiti\zihao{3}}
-\renewcommand{\cftloftitlefont}{\cqu@fixhead\hfill\heiti\zihao{3}}
-\renewcommand{\cftlottitlefont}{\cqu@fixhead\hfill\heiti\zihao{3}}
-\renewcommand{\cftequtitlefont}{\cqu@fixhead\hfill\heiti\zihao{3}}
+\phantomsection\pdfbookmark[0]{\cqu@tocnameinbkmark}{toc}\cqu@fixhead\hfill\bfseries\sffamily\heiti\zihao{3}}
+\renewcommand{\cftloftitlefont}{\cqu@fixhead\hfill\sffamily\heiti\zihao{3}}
+\renewcommand{\cftlottitlefont}{\cqu@fixhead\hfill\sffamily\heiti\zihao{3}}
+\renewcommand{\cftequtitlefont}{\cqu@fixhead\hfill\sffamily\heiti\zihao{3}}
+\renewcommand{\cftequENtitlefont}{\cqu@fixhead\hfill\sffamily\heiti\zihao{3}}
\renewcommand{\cftaftertoctitle}{\hfill}
\renewcommand{\cftafterloftitle}{\hfill}
\renewcommand{\cftafterlottitle}{\hfill}
\renewcommand{\cftafterequtitle}{\hfill}
+\renewcommand{\cftafterequENtitle}{\hfill}
\ifcqu@continuoustoc\relax\else
\renewcommand{\@cfttocstart}{\clearpage}
\renewcommand{\@cfttocfinish}{\clearpage}