summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-12-01 22:53:06 +0000
committerKarl Berry <karl@freefriends.org>2015-12-01 22:53:06 +0000
commitb9e437e9bfed776213b65bdbf349eb6fcd96e116 (patch)
treedc99a9fa262beb225a2b2c066d53fc6cc7b15485
parent94f455394d07e225b266259cad4c188b9cd0a4db (diff)
bangorcsthesis (1dec15)
git-svn-id: svn://tug.org/texlive/trunk@38993 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/bangorcsthesis/README6
-rw-r--r--Master/texmf-dist/doc/latex/bangorcsthesis/bangorcsthesis.pdfbin285717 -> 286203 bytes
-rw-r--r--Master/texmf-dist/source/latex/bangorcsthesis/bangorcsthesis.dtx53
-rw-r--r--Master/texmf-dist/tex/latex/bangorcsthesis/bangorcsthesis.cls41
4 files changed, 68 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/latex/bangorcsthesis/README b/Master/texmf-dist/doc/latex/bangorcsthesis/README
index 81910062682..07ed7d9e16e 100644
--- a/Master/texmf-dist/doc/latex/bangorcsthesis/README
+++ b/Master/texmf-dist/doc/latex/bangorcsthesis/README
@@ -44,8 +44,10 @@ pages. This is highly recommended until the document is final.
[⟨serif⟩] - Convert the thesis to use serif fonts for the main body text.
[⟨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.
-[(serifheadings)] -
-
+[(serifheadings)] - Convert the thesis to use serif fornts for the headings.
+[(nocentredcaptions)] - Make all captions left-aligned, including one line
+captions.
+w
2 Usage - Preamble Macros
The class includes several macros that must be used in the preamble, the portion
diff --git a/Master/texmf-dist/doc/latex/bangorcsthesis/bangorcsthesis.pdf b/Master/texmf-dist/doc/latex/bangorcsthesis/bangorcsthesis.pdf
index b523654327c..7eb254d24fa 100644
--- a/Master/texmf-dist/doc/latex/bangorcsthesis/bangorcsthesis.pdf
+++ b/Master/texmf-dist/doc/latex/bangorcsthesis/bangorcsthesis.pdf
Binary files differ
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}
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}