bangorcsthesis (19mar15)

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

1 files changed, 46 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/latex/bangorcsthesis/bangorcsthesis.cls b/Master/texmf-dist/tex/latex/bangorcsthesis/bangorcsthesis.cls
index 0bae1b9273d..9949f3ad89f 100644
--- a/Master/texmf-dist/tex/latex/bangorcsthesis/bangorcsthesis.cls
+++ b/Master/texmf-dist/tex/latex/bangorcsthesis/bangorcsthesis.cls
@@ -7,7 +7,7 @@
 %% bangorcsthesis.dtx  (with options: `bangorcsthesis.cls,package')
 %% 
 %%  bangorcsthesis.dtx
-%%  Copyright 2014 Cameron Gray/Bangor University <c.gray@bangor.ac.uk>
+%%  Copyright 2014-15 Cameron Gray/Bangor University <c.gray@bangor.ac.uk>
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -45,11 +45,11 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\def\version{1.1.0}
+\def\version{1.2.0}
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesClass{bangorcsthesis}[2014/12/01 \version C. Gray]
+\ProvidesClass{bangorcsthesis}[2015/03/18 \version C. Gray]
 
 
 \def\degreeScheme#1{\def\@scheme{#1}}
@@ -65,6 +65,7 @@
 \RequirePackage[UKenglish]{babel}
 \RequirePackage[UKenglish]{isodate}
 \RequirePackage[utf8]{inputenc}
+\RequirePackage{xparse}
 
 \DeclareOption{bsc}{
 \newcommand{\degree}{Bachelor of Science}
@@ -112,6 +113,10 @@
 \setboolean{@sansserif}{true}
 \DeclareOption{serif}{\setboolean{@sansserif}{false}}
 
+\newboolean{@sansserifheadings}
+\setboolean{@sansserifheadings}{true}
+\DeclareOption{serifheadings}{\setboolean{@sansserifheadings}{false}}
+
 \DeclareOption{twoside}{
 \PassOptionsToClass{\CurrentOption}{report}
 }
@@ -159,8 +164,12 @@
 \RequirePackage{charter}   % font set: Charter
 \newcommand{\tgherosfont}{\fontfamily{bch}\selectfont}
 }
-
+\ifthenelse{\boolean{@sansserifheadings}}%
+{%
 \newcommand{\tgherosfontfoot}{\fontfamily{fvs}\selectfont}
+}{%
+\newcommand{\tgherosfontfoot}{\fontfamily{bch}\selectfont}
+}
 
 \RequirePackage{graphicx,url,csquotes,fixltx2e,microtype,setspace,fancyhdr,enumitem,amsmath}
 \RequirePackage[hidelinks,bookmarks=true,colorlinks=false]{hyperref}
@@ -182,8 +191,21 @@ marginparsep=10pt, %  - space between notes and body text (content)
 footskip=1cm %  - footer skip size
 ]{geometry}
 
-\newcommand{\bibliographySetup}{%
-    \RequirePackage[     % use biblatex for bibliography
+\DeclareDocumentCommand{\bibliographySetup}{ O{} }{%
+     \ifthenelse{\equal{#1}{compressed}}{%
+         \RequirePackage[     % use biblatex for bibliography
+             backend=biber, %  - use biber backend (bibtex replacement) or bibtex
+             bibencoding=utf8, %  - use auto file encode
+             natbib=true,     %  - allow natbib commands
+             hyperref=true, %  - activate hyperref support
+             backref=true, %  - activate backrefs
+             urldate=long, %  - display type for dates
+             style=ieee,
+             citestyle=numeric,%
+             sorting=nyt
+        ]{biblatex}
+     }{%
+     \RequirePackage[     % use biblatex for bibliography
          backend=biber, %  - use biber backend (bibtex replacement) or bibtex
          bibencoding=utf8, %  - use auto file encode
          natbib=true,     %  - allow natbib commands
@@ -193,6 +215,8 @@ footskip=1cm %  - footer skip size
          style=ieee,
          sorting=nyt
     ]{biblatex}
+     }
+
     \DefineBibliographyStrings{english} {
         backrefpage  = {p.}, % for single page number
         backrefpages = {pp.},% for multiple page numbers
@@ -278,14 +302,14 @@ singlelinecheck=false %  - no centered single-lined captions
 arg1=#1, arg2=#2, arg3=#3%
 }
 
-\newcommand{\helv}{\fontfamily{phv}\fontsize{9}{11}\selectfont}
-\newcommand{\book}{\fontfamily{pbk}\fontseries{m}\fontsize{11}{13}\selectfont}
+\newcommand{\helv}{\tgherosfontfoot\fontsize{9}{11}\selectfont}
+\newcommand{\book}{\tgherosfontfoot\fontseries{m}\fontsize{11}{13}\selectfont}
 
 \newcommand{\thesispartlabelfont}{\book\fontsize{60}{60}\selectfont}
 \newcommand{\thesispartfont}{\huge \tgherosfont\selectfont}
-\newcommand{\thesischapterfont}{\huge \fontfamily{fvs}\selectfont}
-\newcommand{\thesissectionfont}{\LARGE\bfseries \fontfamily{pbk}}
-\newcommand{\thesissubsectionfont}{\Large \fontfamily{pbk}}
+\newcommand{\thesischapterfont}{\huge \tgherosfontfoot\selectfont}
+\newcommand{\thesissectionfont}{\LARGE\bfseries \tgherosfontfoot}
+\newcommand{\thesissubsectionfont}{\Large \tgherosfontfoot}
 \newcommand{\thesisparagraphfont}{\tgherosfont\small\bfseries}
 
 %% **************************************************
@@ -314,6 +338,8 @@ arg1=#1, arg2=#2, arg3=#3%
 \cftsetindents{table}{0em}{3em}
 
 \renewcommand{\cfttoctitlefont}{\thesischapterfont}
+\renewcommand{\cftloftitlefont}{\thesischapterfont}
+\renewcommand{\cftlottitlefont}{\thesischapterfont}
 
 \newcommand{\hugequote}{%
 {\book\fontsize{75}{80}\selectfont%
@@ -3642,7 +3668,7 @@ bookmarksopen=true %
 
 \vfill
 
-{\setstretch{1.0}\LARGE \fontfamily{fvs}\textbf{\@title} \\[10mm]}
+{\setstretch{1.0}\LARGE \tgherosfontfoot\textbf{\@title} \\[10mm]}
 \begin{center}\vspace{-0.4cm}
         \rule{0.6\textwidth}{.4pt}
     \end{center}\vspace{-4mm}
@@ -3669,7 +3695,12 @@ bookmarksopen=true %
 }
 
 \RequirePackage{framed}
-\newcommand{\statements}{
+\DeclareDocumentCommand{\statements}{ O{} }{%
+    \ifthenelse{\equal{#1}{}}{%
+        \newcommand{\sig}{\vspace{2cm}}
+    }{%
+        \newcommand{\sig}{\includegraphics[height=2cm]{#1}}
+    }
     \cleardoublepage
     \pdfbookmark[0]{Statement of Originality \& Availability}{Statements}
     %\chapter*{Statements}
@@ -3691,7 +3722,7 @@ bookmarksopen=true %
 
         \noindent Student:
 
-        \vspace{2cm}
+        \sig
 
         \noindent\@author
     \end{framed}
@@ -3712,7 +3743,7 @@ bookmarksopen=true %
 
         \noindent Student:
 
-        \vspace{2cm}
+        \sig
 
         \noindent\@author
     \end{framed}
@@ -3751,7 +3782,6 @@ bookmarksopen=true %
     }
     {}
 
-\RequirePackage{xparse}
 \DeclareDocumentCommand{\acknowledgements}{ O{} O{} m }{%
     \cleardoublepage
     \pagenumbering{roman}