bangorcsthesis (1dec15)

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

1 files changed, 28 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/bangorcsthesis/bangorcsthesis.cls b/Master/texmf-dist/tex/latex/bangorcsthesis/bangorcsthesis.cls
index d9585025175..efb6c1fbaf8 100644
--- a/Master/texmf-dist/tex/latex/bangorcsthesis/bangorcsthesis.cls
+++ b/Master/texmf-dist/tex/latex/bangorcsthesis/bangorcsthesis.cls
@@ -45,11 +45,11 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\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]
 
 
 \def\degreeScheme#1{\def\@scheme{#1}}
@@ -60,7 +60,6 @@
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}
 \RequirePackage[dvipsnames]{xcolor}
-\RequirePackage{draftwatermark}
 \RequirePackage[T1]{fontenc} % font types and character verification
 \RequirePackage[UKenglish]{babel}
 \RequirePackage[UKenglish]{isodate}
@@ -106,6 +105,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}
 
@@ -129,13 +132,6 @@
 
 \LoadClass[12pt]{report}
 
-\if@draft
-    \SetWatermarkText{DRAFT}
-    \SetWatermarkScale{1}
-\else
-    \SetWatermarkText{}
-\fi
-
 \if@nohyphen
     \tolerance=1
     \sloppy
@@ -191,6 +187,14 @@ marginparsep=10pt, %  - space between notes and body text (content)
 footskip=1cm %  - footer skip size
 ]{geometry}
 
+\RequirePackage{draftwatermark}
+\if@draft
+    \SetWatermarkText{DRAFT}
+    \SetWatermarkScale{1}
+\else
+    \SetWatermarkText{}
+\fi
+
 \DeclareDocumentCommand{\bibliographySetup}{ O{} }{%
      \ifthenelse{\equal{#1}{compressed}}{%
          \RequirePackage[     % use biblatex for bibliography
@@ -299,12 +303,23 @@ footskip=1cm %  - footer skip size
     }
 }
 
+\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
+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
+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}
+}
 
 \newcommand*{\ctSetFont}[3]{%
 arg1=#1, arg2=#2, arg3=#3%
@@ -337,7 +352,7 @@ arg1=#1, arg2=#2, arg3=#3%
 \RequirePackage{titlesec}
 
 \titleformat{\chapter}[display]
-{\huge\thesischapterfont}{\chaptertitlename\ \thechapter}{-4mm}{\Huge}
+{\raggedright\huge\thesischapterfont}{\chaptertitlename\ \thechapter}{-4mm}{\Huge}
 
 \titlespacing*{\chapter} {0pt}{2mm}{10mm}