bangorcsthesis (19mar15)

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

2 files changed, 67 insertions, 44 deletions

diff --git a/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.dtx b/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.dtx
index 10548b86a2c..68245cc536e 100644
--- a/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.dtx
+++ b/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.dtx
@@ -1,14 +1,4 @@
 %\iffalse
-% bangorcsthesis.dtx generated using makedtx version 0.94b (c) Nicola Talbot
-% Command line args:
-%   -src "bangorcsthesis\.cls=>bangorcsthesis.cls"
-%   -src "Bangor-Logo.tex=>Bangor-Logo.tex"
-%   -doc "doc.tex"
-%   -author "Cameron Gray <c.gray@bangor.ac.uk>"
-%   bangorcsthesis
-% Created on 2014/8/17 21:22
-%\fi
-%\iffalse
 %<*package>
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -50,14 +40,15 @@
 \end{document}
 %</driver>
 %\fi
-%\CheckSum{539}
+%\CheckSum{566}
 %\RecordChanges
 %\changes{v1.0}{2014/07/01}{Initial version.}
 %\changes{v1.0.1}{2014/09/01}{Repackaged to remove external logo file.}
+%\changes{v1.2.0}{2015/03/18}{Added serif headings and compressed cite style}
 %\pagestyle{fancy}
 %\title{Bangor University Computer Science Department\\ Thesis Document Class}
 %\author{Cameron Gray \texttt{<c.gray@bangor.ac.uk>}}
-%\date{December 1, 2014}
+%\date{March 18, 2015}
 %\maketitle
 %
 %\begin{abstract}
@@ -101,6 +92,7 @@
 %\oarg{draft} - Mark the document as draft, this includes adding a watermark
 %    to all pages.  This is highly recommended until the document is final.\\
 %\oarg{serif} - Convert the thesis to use serif fonts for the main body text.\\
+%\oarg{serifheadings} - Convert the thesis to use serif fonts for the headings.\\
 %\oarg{twoside} - Make the output `two-sided', much like a book.  This may only
 %    be required for the final copy to be deposited in certain libraries.\\
 %
@@ -144,11 +136,13 @@
 %
 %\ \\
 %
-%\DescribeMacro{\bibliographySetup} This macro configures |BibLaTeX|, the successor
+%\DescribeMacro{\bibliographySetup\\\oarg{compressed}} This macro configures |BibLaTeX|, the successor
 %to BibTeX, to departmental standards.  The Computer Science department have
 %standardised on IEEE referencing, using Name, Year, Title ordering.  This means
 %that the first citation to appear \emph{may} not be numbered [1] in the thesis. Use
-%of this macro is \textbf{required}.
+%of this macro is \textbf{required}.  If the |compressed| option is set the bibliography style
+%will be altered to produce one set of brackets for multiple citations in one command.  Please note,
+%this violates the IEEE style guide.
 %
 %\ \\
 %
@@ -168,10 +162,11 @@
 %
 %\ \\
 %
-%\DescribeMacro{\statements} This macro creates the \textbf{required} statements
+%\DescribeMacro{\statements\\\oarg{signature image filename}} This macro creates the \textbf{required} statements
 %page for the front matter of a thesis.  This must be included, failure to do so can
 %result in the thesis being rejected as it cannot be accepted into the University
-%library or other depositories.
+%library or other depositories.  If the signature image filename parameter is included, this image
+%is included instead of a white space for you to sign manually.
 %
 %\ \\
 %
@@ -259,11 +254,11 @@
 %    \end{macrocode}
 %\fi
 %    \begin{macrocode}
-\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]
 
 % Originally inspired by Clean Thesis 
 % - http://cleanthesis.der-ric.de/
@@ -282,7 +277,7 @@
 \RequirePackage[UKenglish]{babel}
 \RequirePackage[UKenglish]{isodate}
 \RequirePackage[utf8]{inputenc}
-
+\RequirePackage{xparse}
 
 % **************************************************
 % Degree Scheme Options
@@ -336,6 +331,9 @@
 \setboolean{@sansserif}{true}
 \DeclareOption{serif}{\setboolean{@sansserif}{false}}
 
+\newboolean{@sansserifheadings}
+\setboolean{@sansserifheadings}{true}
+\DeclareOption{serifheadings}{\setboolean{@sansserifheadings}{false}}
 
 \DeclareOption{twoside}{
 	\PassOptionsToClass{\CurrentOption}{report}
@@ -386,8 +384,13 @@
 	%\RequirePackage{fourier}	% font set: (basically improved utopia)
 	\newcommand{\tgherosfont}{\fontfamily{bch}\selectfont}
 }
-
-\newcommand{\tgherosfontfoot}{\fontfamily{fvs}\selectfont}
+\ifthenelse{\boolean{@sansserifheadings}}%
+{%
+	% Using sans-serif fonts
+	\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}
@@ -415,17 +418,33 @@
 % **************************************************
 % Bibliography Options - use IEEE (NYT) Bibliography style.
 % **************************************************
-\newcommand{\bibliographySetup}{%
-    \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,
-        	sorting=nyt
+\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
+         hyperref=true, %  - activate hyperref support
+         backref=true, %  - activate backrefs
+         urldate=long, %  - display type for dates
+         style=ieee,
+         sorting=nyt
     ]{biblatex}
+     }
+    
+
     \DefineBibliographyStrings{english} {
         backrefpage  = {p.}, % for single page number
         backrefpages = {pp.},% for multiple page numbers
@@ -524,14 +543,14 @@
 }
 
 % own font definitions
-\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}
 
 
@@ -578,6 +597,8 @@
 \cftsetindents{table}{0em}{3em}
 
 \renewcommand{\cfttoctitlefont}{\thesischapterfont}
+\renewcommand{\cftloftitlefont}{\thesischapterfont}
+\renewcommand{\cftlottitlefont}{\thesischapterfont}
 
 % Clean chapter quotations
 \newcommand{\hugequote}{%
@@ -3911,7 +3932,7 @@
 	
 	\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}
@@ -3938,7 +3959,12 @@
 }
 
 \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}
@@ -3960,7 +3986,7 @@
         
         \noindent Student:
         
-        \vspace{2cm}
+        \sig
         
         \noindent\@author
     \end{framed}
@@ -3981,7 +4007,7 @@
         
         \noindent Student:
         
-        \vspace{2cm}
+        \sig
         
         \noindent\@author
     \end{framed}
@@ -4020,9 +4046,6 @@
     }
     {}
 
-    
-
-\RequirePackage{xparse}
 \DeclareDocumentCommand{\acknowledgements}{ O{} O{} m }{%
     \cleardoublepage
     \pagenumbering{roman}
diff --git a/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.ins b/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.ins
index 784df203962..dc75ada5652 100644
--- a/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.ins
+++ b/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.ins
@@ -4,7 +4,7 @@
 \preamble
 
  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