bangorcsthesis (1dec15)

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

1 files changed, 36 insertions, 17 deletions

diff --git a/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.dtx b/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.dtx
index e869f890ff4..a98eca5f2dd 100644
--- a/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.dtx
+++ b/Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.dtx
@@ -40,12 +40,13 @@
 \end{document}
 %</driver>
 %\fi
-%\CheckSum{577}
+%\CheckSum{586}
 %\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.}
 %\changes{v1.3.0}{2015/04/06}{Added small references style.}
+%\changes{v1.4.0}{2015/04/06}{Added centred captions option.}
 %\pagestyle{fancy}
 %\title{Bangor University Computer Science Department\\ Thesis Document Class}
 %\author{Cameron Gray \texttt{<c.gray@bangor.ac.uk>}}
@@ -96,6 +97,8 @@
 %\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.\\
+%\oarg{nocentredcaptions} - Make all captions left-aligned, including one line
+%	 captions.\\
 %
 %\section{Usage - Preamble Macros}
 %The class includes several macros that must be used in the preamble, the portion
@@ -256,15 +259,15 @@
 %    \end{macrocode}
 %\fi
 %    \begin{macrocode}
-\def\version{1.3.0}
+\def\version{1.4.0}
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesClass{bangorcsthesis}[2015/04/06 \version C. Gray]
+\ProvidesClass{bangorcsthesis}[2015/12/01 \version C. Gray]
 
 % Originally inspired by Clean Thesis 
 % - http://cleanthesis.der-ric.de/
-% Developed by C. Gray
+% Developed further by C. Gray
 
 \def\degreeScheme#1{\def\@scheme{#1}}
 \RequirePackage{fifo-stack}
@@ -274,7 +277,6 @@
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}
 \RequirePackage[dvipsnames]{xcolor}
-\RequirePackage{draftwatermark}
 \RequirePackage[T1]{fontenc}		% font types and character verification
 \RequirePackage[UKenglish]{babel}
 \RequirePackage[UKenglish]{isodate}
@@ -323,6 +325,10 @@
 \setboolean{@noindent}{false}
 \DeclareOption{noindent}{\setboolean{@noindent}{true}}
 
+\newboolean{@centredcaptions}
+\setboolean{@centredcaptions}{true}
+\DeclareOption{nocentredcaptions}{\setboolean{@centredcaptions}{false}}
+
 \define@choicekey*{bangorcs}{figuresep}{none,colon,period,space,quad,newline,endash}[colon]{\def\bangorcs@figuresep{#1}}
 \setkeys{bangorcs}{figuresep=colon}
 
@@ -349,12 +355,7 @@
 
 \LoadClass[12pt]{report}
 
-\if@draft
-    \SetWatermarkText{DRAFT}
-    \SetWatermarkScale{1}
-\else
-    \SetWatermarkText{}
-\fi
+
 
 \if@nohyphen 
     \tolerance=1
@@ -416,6 +417,13 @@
 	footskip=1cm					% 	- footer skip size
 ]{geometry}
 
+\RequirePackage{draftwatermark}
+\if@draft
+    \SetWatermarkText{DRAFT}
+    \SetWatermarkScale{1}
+\else
+    \SetWatermarkText{}
+\fi
 
 % **************************************************
 % Bibliography Options - use IEEE (NYT) Bibliography style.
@@ -536,12 +544,23 @@
     }
 }
 
-\RequirePackage[					% modify figure and table captions
-	font={small}, 				% 	- small font size
-	labelfont={bf,sf},            % 	- label in bold, sans-serif and accessory colour
-	labelsep=\bangorcs@figuresep,	% 	- separator: none, colon, period, space, quad, newline, endash
-	singlelinecheck=false			% 	- no centered single-lined captions
+\ifthenelse{\boolean{@centredcaptions}}
+{
+\RequirePackage[ % modify figure and table captions
+font={small},  %  - small font size
+labelfont={bf,sf},             %  - label in bold, sans-serif and accessory colour
+labelsep=\bangorcs@figuresep, %  - separator: none, colon, period, space, quad, newline, endash
+singlelinecheck=true %  - no centred single-lined captions
+]{caption}
+}
+{
+\RequirePackage[ % modify figure and table captions
+font={small},  %  - small font size
+labelfont={bf,sf},             %  - label in bold, sans-serif and accessory colour
+labelsep=\bangorcs@figuresep, %  - separator: none, colon, period, space, quad, newline, endash
+singlelinecheck=false %  - no centred single-lined captions
 ]{caption}
+}
 
 
 % **************************************************
@@ -582,7 +601,7 @@
 \RequirePackage{titlesec}
 
 \titleformat{\chapter}[display]
-{\huge\thesischapterfont}{\chaptertitlename\ \thechapter}{-4mm}{\Huge}
+{\raggedright\huge\thesischapterfont}{\chaptertitlename\ \thechapter}{-4mm}{\Huge}
 
 \titlespacing*{\chapter} {0pt}{2mm}{10mm}