From 726a80388ced028b0e604d4f96fe69d71ed91b7b Mon Sep 17 00:00:00 2001
From: Edward Longman <el7g15@soton.ac.uk>
Date: Tue, 29 Jan 2019 11:09:20 +0000
Subject: [PATCH] Add vol in title, bibentry to authorship + small edits

  + Volume implememnted with \volno and \volof definitions
  + bibentry is to print full citation in the authorship
  + Hyperlinks removed if they are likely to go out of date quickly
---
 source/latex/ecsdocs/ecsdocs.dtx       | 38 +++++++++++++++++---------
 templates/latex/ecsdocs/Article.tex    |  1 +
 templates/latex/ecsdocs/GDP.tex        |  6 +++-
 templates/latex/ecsdocs/MiniThesis.tex |  6 +++-
 templates/latex/ecsdocs/Progress.tex   |  1 +
 templates/latex/ecsdocs/Project.tex    |  6 +++-
 templates/latex/ecsdocs/Report.tex     |  6 +++-
 templates/latex/ecsdocs/Thesis.tex     | 12 ++++----
 tex/latex/ecsdocs/ecsarticle.cls       | 18 +++++-------
 tex/latex/ecsdocs/ecsgdp.cls           | 16 ++++-------
 tex/latex/ecsdocs/ecsgdpsummary.cls    | 16 ++++-------
 tex/latex/ecsdocs/ecsminithesis.cls    | 18 +++++-------
 tex/latex/ecsdocs/ecsprogress.cls      | 18 +++++-------
 tex/latex/ecsdocs/ecsproject.cls       | 16 ++++-------
 tex/latex/ecsdocs/ecsreport.cls        | 23 ++++++++--------
 tex/latex/ecsdocs/ecsthesis.cls        | 23 ++++++++--------
 16 files changed, 115 insertions(+), 109 deletions(-)

diff --git a/source/latex/ecsdocs/ecsdocs.dtx b/source/latex/ecsdocs/ecsdocs.dtx
index 4967fc3..483cc50 100644
--- a/source/latex/ecsdocs/ecsdocs.dtx
+++ b/source/latex/ecsdocs/ecsdocs.dtx
@@ -588,6 +588,7 @@
 \newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
 \newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\volume}[2]{\def\volno{#1}\def\volof{#2}}
 \newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
@@ -646,21 +647,16 @@
 \authors     {}
 \qualifications{}
 \orcidid{}
-\university  {\texorpdfstring{\href{http://www.soton.ac.uk}
+\volume{}{}
+\university  {\texorpdfstring{\href{http://www.southampton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
 \UNIVERSITY  {\MakeUppercase{\univname}}
-\department  {\texorpdfstring{\href{http://www.ecs.soton.ac.uk}
-                {School of Electronics and Computer Science}}
-                {School of Electronics and Computer Science}}
+\department  {School of Electronics and Computer Science}
 \DEPARTMENT  {\MakeUppercase{\deptname}}
-\group       {\texorpdfstring{\href{http://cps.ecs.soton.ac.uk}
-                {Cyber Physical Systems Group}}
-                {Cyber Physical Systems Group}}
+\group       {Cyber Physical Systems Group}
 \GROUP       {\MakeUppercase{\groupname}}
-\faculty     {\texorpdfstring{\href{http://www.feps.soton.ac.uk}
-                {Faculty of Engineering and Physical Science}}
-                {Faculty of Engineering and Physical Science}}
+\faculty     {Faculty of Engineering and Physical Science}
 \FACULTY     {\MakeUppercase{\facname}}
 \addresses   {}
 \subject     {}
@@ -768,7 +764,10 @@
 }
       \ifthenelse{\equal{\doicode}{}}
       {}
-      {\smallskip DOI: \doicode}
+      {\smallskip DOI: \href{http://orcid.org/\doicode}{\doicode}\par}
+      \ifthenelse{\equal{\volno}{}}
+      {}
+      {\smallskip Volume \volno{} of \volof}
       \vfill
       {\LARGE \textit{by} \par}
       \smallskip
@@ -1180,7 +1179,7 @@
 %
 %    \begin{macrocode}
 %<*thesis|minithesis|progress|report|article>
-\newcommand\listsymbolname{Nomenclature}
+\newcommand\listsymbolname{Definitions and Abbreviations}
 %</thesis|minithesis|progress|report|article>
 %<*project|gdp>
 \newcommand\listsymbolname{List of Symbols}
@@ -1460,15 +1459,24 @@ Data: Author (Year) Title. URI [dataset]}
 %<*testthesis|testminithesis|testprogress|testproject|testreport|testarticle|testgdp|testgdpsummary>
 \graphicspath{{../Figures/}}   % Location of your graphics files
 \usepackage{natbib}            % Use Natbib style for the refs.
+%<*testthesis|testminithesis|testproject|testreport|testgdp>
+\usepackage{bibentry}          % Use bibentry for prepublished works
+\nobibliography*               % Use bibentry for prepublished works
+%</testthesis|testminithesis|testproject|testreport|testgdp>
 \hypersetup{colorlinks=true}   % Set to false for black/white printing
 \input{Definitions}            % Include your abbreviations
 %% ----------------------------------------------------------------
 %% --------------------THESIS/DOC INFORMATION ---------------------
 \title      {An Investigation into \dots}
+%<*testthesis>
+\authors    {Steve R. Gunn} % Use of Soton Email unadvised, use ORCiD instead.
+%</testthesis>
+%<*testminithesis|testprogress|testproject|testreport|testarticle|testgdp|testgdpsummary>
 \authors    {\texorpdfstring
              {\href{mailto:S.R.Gunn@ecs.soton.ac.uk}{Steve R. Gunn}}
              {Steve R. Gunn}
             }
+%</testminithesis|testprogress|testproject|testreport|testarticle|testgdp|testgdpsummary>
 \addresses  {\groupname\\\deptname\\\univname}
 \date       {\today}
 %<*testminithesis|testprogress|testproject|testgdp|testgdpsummary>
@@ -1486,6 +1494,7 @@ Data: Author (Year) Title. URI [dataset]}
 %<*testthesis>
 \orcidid{0000-0002-1825-0097}
 \doi{10.1002/0470841559.ch1}
+\volume{n}{m} %Optional Volume Numbering Volume n of m
 %</testthesis>
 \subject    {}
 \keywords   {}
@@ -1511,12 +1520,15 @@ This work is all about \dots
 \addtotoc{List of Listings}
 \lstlistoflistings
 %</testthesis|testminithesis|testprogress|testproject|testreport|testgdp>
+%%Lightweight Definitions and Abbreviations see package:nomencl for alternative
 \listofsymbols{ll}{$w$ & The weight vector}
 %</testthesis|testminithesis|testprogress|testproject|testreport|testarticle|testgdp>
 %<*testthesis|testminithesis|testproject|testreport|testgdp>
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
-\authorshipdeclaration{\citep{Gunn:2001:pdflatex}, \citep{Lovell:2011:updated} and \citep{Gunn:2011:updated2}}
+%% \bibentry command must be used here with prepublished papers
+% https://www.stefaanlippens.net/bibentry/
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
diff --git a/templates/latex/ecsdocs/Article.tex b/templates/latex/ecsdocs/Article.tex
index 2e13ef4..6601b70 100644
--- a/templates/latex/ecsdocs/Article.tex
+++ b/templates/latex/ecsdocs/Article.tex
@@ -27,6 +27,7 @@
 \begin{abstract}
 This work is all about \dots
 \end{abstract}
+%%Lightweight Definitions and Abbreviations see package:nomencl for alternative
 \listofsymbols{ll}{$w$ & The weight vector}
 \mainmatter
 %% ------------------ MAIN MATTER (CONTENT) --------------------
diff --git a/templates/latex/ecsdocs/GDP.tex b/templates/latex/ecsdocs/GDP.tex
index b74d1e1..b2daf3c 100644
--- a/templates/latex/ecsdocs/GDP.tex
+++ b/templates/latex/ecsdocs/GDP.tex
@@ -5,6 +5,8 @@
 \documentclass[sotonlinks]{ecsgdp}         % Use the GDP Report Style with custom link colour
 \graphicspath{{../Figures/}}   % Location of your graphics files
 \usepackage{natbib}            % Use Natbib style for the refs.
+\usepackage{bibentry}          % Use bibentry for prepublished works
+\nobibliography*               % Use bibentry for prepublished works
 \hypersetup{colorlinks=true}   % Set to false for black/white printing
 \input{Definitions}            % Include your abbreviations
 %% ----------------------------------------------------------------
@@ -36,10 +38,12 @@ This work is all about \dots
 %% The List of listings does not, by default, appear in the ToC, so....
 \addtotoc{List of Listings}
 \lstlistoflistings
+%%Lightweight Definitions and Abbreviations see package:nomencl for alternative
 \listofsymbols{ll}{$w$ & The weight vector}
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
-\authorshipdeclaration{\citep{Gunn:2001:pdflatex}, \citep{Lovell:2011:updated} and \citep{Gunn:2011:updated2}}
+%% \bibentry command must be used here with prepublished papers
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
diff --git a/templates/latex/ecsdocs/MiniThesis.tex b/templates/latex/ecsdocs/MiniThesis.tex
index e11c9eb..ab2967c 100644
--- a/templates/latex/ecsdocs/MiniThesis.tex
+++ b/templates/latex/ecsdocs/MiniThesis.tex
@@ -5,6 +5,8 @@
 \documentclass[sotonlinks]{ecsminithesis}  % Use the minithesis Style with custom link colour
 \graphicspath{{../Figures/}}   % Location of your graphics files
 \usepackage{natbib}            % Use Natbib style for the refs.
+\usepackage{bibentry}          % Use bibentry for prepublished works
+\nobibliography*               % Use bibentry for prepublished works
 \hypersetup{colorlinks=true}   % Set to false for black/white printing
 \input{Definitions}            % Include your abbreviations
 %% ----------------------------------------------------------------
@@ -36,10 +38,12 @@ This work is all about \dots
 %% The List of listings does not, by default, appear in the ToC, so....
 \addtotoc{List of Listings}
 \lstlistoflistings
+%%Lightweight Definitions and Abbreviations see package:nomencl for alternative
 \listofsymbols{ll}{$w$ & The weight vector}
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
-\authorshipdeclaration{\citep{Gunn:2001:pdflatex}, \citep{Lovell:2011:updated} and \citep{Gunn:2011:updated2}}
+%% \bibentry command must be used here with prepublished papers
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
diff --git a/templates/latex/ecsdocs/Progress.tex b/templates/latex/ecsdocs/Progress.tex
index 3316b25..48a9f3f 100644
--- a/templates/latex/ecsdocs/Progress.tex
+++ b/templates/latex/ecsdocs/Progress.tex
@@ -36,6 +36,7 @@ This work is all about \dots
 %% The List of listings does not, by default, appear in the ToC, so....
 \addtotoc{List of Listings}
 \lstlistoflistings
+%%Lightweight Definitions and Abbreviations see package:nomencl for alternative
 \listofsymbols{ll}{$w$ & The weight vector}
 \mainmatter
 %% ------------------ MAIN MATTER (CONTENT) --------------------
diff --git a/templates/latex/ecsdocs/Project.tex b/templates/latex/ecsdocs/Project.tex
index 4933cdf..e0a5250 100644
--- a/templates/latex/ecsdocs/Project.tex
+++ b/templates/latex/ecsdocs/Project.tex
@@ -5,6 +5,8 @@
 \documentclass[sotonlinks]{ecsproject}     % Use the Project Style with custom link colour
 \graphicspath{{../Figures/}}   % Location of your graphics files
 \usepackage{natbib}            % Use Natbib style for the refs.
+\usepackage{bibentry}          % Use bibentry for prepublished works
+\nobibliography*               % Use bibentry for prepublished works
 \hypersetup{colorlinks=true}   % Set to false for black/white printing
 \input{Definitions}            % Include your abbreviations
 %% ----------------------------------------------------------------
@@ -36,10 +38,12 @@ This work is all about \dots
 %% The List of listings does not, by default, appear in the ToC, so....
 \addtotoc{List of Listings}
 \lstlistoflistings
+%%Lightweight Definitions and Abbreviations see package:nomencl for alternative
 \listofsymbols{ll}{$w$ & The weight vector}
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
-\authorshipdeclaration{\citep{Gunn:2001:pdflatex}, \citep{Lovell:2011:updated} and \citep{Gunn:2011:updated2}}
+%% \bibentry command must be used here with prepublished papers
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
diff --git a/templates/latex/ecsdocs/Report.tex b/templates/latex/ecsdocs/Report.tex
index ef371d6..9010ab0 100644
--- a/templates/latex/ecsdocs/Report.tex
+++ b/templates/latex/ecsdocs/Report.tex
@@ -5,6 +5,8 @@
 \documentclass[sotonlinks]{ecsreport}      % Use the Report Style with custom link colour
 \graphicspath{{../Figures/}}   % Location of your graphics files
 \usepackage{natbib}            % Use Natbib style for the refs.
+\usepackage{bibentry}          % Use bibentry for prepublished works
+\nobibliography*               % Use bibentry for prepublished works
 \hypersetup{colorlinks=true}   % Set to false for black/white printing
 \input{Definitions}            % Include your abbreviations
 %% ----------------------------------------------------------------
@@ -33,10 +35,12 @@ This work is all about \dots
 %% The List of listings does not, by default, appear in the ToC, so....
 \addtotoc{List of Listings}
 \lstlistoflistings
+%%Lightweight Definitions and Abbreviations see package:nomencl for alternative
 \listofsymbols{ll}{$w$ & The weight vector}
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
-\authorshipdeclaration{\citep{Gunn:2001:pdflatex}, \citep{Lovell:2011:updated} and \citep{Gunn:2011:updated2}}
+%% \bibentry command must be used here with prepublished papers
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
diff --git a/templates/latex/ecsdocs/Thesis.tex b/templates/latex/ecsdocs/Thesis.tex
index f88024e..8f82c95 100644
--- a/templates/latex/ecsdocs/Thesis.tex
+++ b/templates/latex/ecsdocs/Thesis.tex
@@ -5,21 +5,21 @@
 \documentclass[sotonlinks]{ecsthesis}      % Use the Thesis Style with custom link colour
 \graphicspath{{../Figures/}}   % Location of your graphics files
 \usepackage{natbib}            % Use Natbib style for the refs.
+\usepackage{bibentry}          % Use bibentry for prepublished works
+\nobibliography*               % Use bibentry for prepublished works
 \hypersetup{colorlinks=true}   % Set to false for black/white printing
 \input{Definitions}            % Include your abbreviations
 %% ----------------------------------------------------------------
 %% --------------------THESIS/DOC INFORMATION ---------------------
 \title      {An Investigation into \dots}
-\authors    {\texorpdfstring
-             {\href{mailto:S.R.Gunn@ecs.soton.ac.uk}{Steve R. Gunn}}
-             {Steve R. Gunn}
-            }
+\authors    {Steve R. Gunn} % Use of Soton Email unadvised, use ORCiD instead.
 \addresses  {\groupname\\\deptname\\\univname}
 \date       {\today}
 %% Optional Fields
  \qualifications{MEng PhD}
 \orcidid{0000-0002-1825-0097}
 \doi{10.1002/0470841559.ch1}
+\volume{n}{m} %Optional Volume Numbering Volume n of m
 \subject    {}
 \keywords   {}
 
@@ -38,10 +38,12 @@ This work is all about \dots
 %% The List of listings does not, by default, appear in the ToC, so....
 \addtotoc{List of Listings}
 \lstlistoflistings
+%%Lightweight Definitions and Abbreviations see package:nomencl for alternative
 \listofsymbols{ll}{$w$ & The weight vector}
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
-\authorshipdeclaration{\citep{Gunn:2001:pdflatex}, \citep{Lovell:2011:updated} and \citep{Gunn:2011:updated2}}
+%% \bibentry command must be used here with prepublished papers
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
diff --git a/tex/latex/ecsdocs/ecsarticle.cls b/tex/latex/ecsdocs/ecsarticle.cls
index 1d6f2ab..0b87142 100644
--- a/tex/latex/ecsdocs/ecsarticle.cls
+++ b/tex/latex/ecsdocs/ecsarticle.cls
@@ -158,6 +158,7 @@
 \newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
 \newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\volume}[2]{\def\volno{#1}\def\volof{#2}}
 \newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
@@ -177,21 +178,16 @@
 \authors     {}
 \qualifications{}
 \orcidid{}
-\university  {\texorpdfstring{\href{http://www.soton.ac.uk}
+\volume{}{}
+\university  {\texorpdfstring{\href{http://www.southampton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
 \UNIVERSITY  {\MakeUppercase{\univname}}
-\department  {\texorpdfstring{\href{http://www.ecs.soton.ac.uk}
-                {School of Electronics and Computer Science}}
-                {School of Electronics and Computer Science}}
+\department  {School of Electronics and Computer Science}
 \DEPARTMENT  {\MakeUppercase{\deptname}}
-\group       {\texorpdfstring{\href{http://cps.ecs.soton.ac.uk}
-                {Cyber Physical Systems Group}}
-                {Cyber Physical Systems Group}}
+\group       {Cyber Physical Systems Group}
 \GROUP       {\MakeUppercase{\groupname}}
-\faculty     {\texorpdfstring{\href{http://www.feps.soton.ac.uk}
-                {Faculty of Engineering and Physical Science}}
-                {Faculty of Engineering and Physical Science}}
+\faculty     {Faculty of Engineering and Physical Science}
 \FACULTY     {\MakeUppercase{\facname}}
 \addresses   {}
 \subject     {}
@@ -417,7 +413,7 @@
     \if@restonecol\twocolumn\fi
 }\end{spacing}
 }
-\newcommand\listsymbolname{Nomenclature}
+\newcommand\listsymbolname{Definitions and Abbreviations}
 \usepackage{longtable}
 \newcommand\listofsymbols[2]{
 \btypeout{\listsymbolname}
diff --git a/tex/latex/ecsdocs/ecsgdp.cls b/tex/latex/ecsdocs/ecsgdp.cls
index 97736fe..404bcd4 100644
--- a/tex/latex/ecsdocs/ecsgdp.cls
+++ b/tex/latex/ecsdocs/ecsgdp.cls
@@ -158,6 +158,7 @@
 \newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
 \newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\volume}[2]{\def\volno{#1}\def\volof{#2}}
 \newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
@@ -177,21 +178,16 @@
 \authors     {}
 \qualifications{}
 \orcidid{}
-\university  {\texorpdfstring{\href{http://www.soton.ac.uk}
+\volume{}{}
+\university  {\texorpdfstring{\href{http://www.southampton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
 \UNIVERSITY  {\MakeUppercase{\univname}}
-\department  {\texorpdfstring{\href{http://www.ecs.soton.ac.uk}
-                {School of Electronics and Computer Science}}
-                {School of Electronics and Computer Science}}
+\department  {School of Electronics and Computer Science}
 \DEPARTMENT  {\MakeUppercase{\deptname}}
-\group       {\texorpdfstring{\href{http://cps.ecs.soton.ac.uk}
-                {Cyber Physical Systems Group}}
-                {Cyber Physical Systems Group}}
+\group       {Cyber Physical Systems Group}
 \GROUP       {\MakeUppercase{\groupname}}
-\faculty     {\texorpdfstring{\href{http://www.feps.soton.ac.uk}
-                {Faculty of Engineering and Physical Science}}
-                {Faculty of Engineering and Physical Science}}
+\faculty     {Faculty of Engineering and Physical Science}
 \FACULTY     {\MakeUppercase{\facname}}
 \addresses   {}
 \subject     {}
diff --git a/tex/latex/ecsdocs/ecsgdpsummary.cls b/tex/latex/ecsdocs/ecsgdpsummary.cls
index 4471e4d..dc7123c 100644
--- a/tex/latex/ecsdocs/ecsgdpsummary.cls
+++ b/tex/latex/ecsdocs/ecsgdpsummary.cls
@@ -156,6 +156,7 @@
 \newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
 \newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\volume}[2]{\def\volno{#1}\def\volof{#2}}
 \newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
@@ -175,21 +176,16 @@
 \authors     {}
 \qualifications{}
 \orcidid{}
-\university  {\texorpdfstring{\href{http://www.soton.ac.uk}
+\volume{}{}
+\university  {\texorpdfstring{\href{http://www.southampton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
 \UNIVERSITY  {\MakeUppercase{\univname}}
-\department  {\texorpdfstring{\href{http://www.ecs.soton.ac.uk}
-                {School of Electronics and Computer Science}}
-                {School of Electronics and Computer Science}}
+\department  {School of Electronics and Computer Science}
 \DEPARTMENT  {\MakeUppercase{\deptname}}
-\group       {\texorpdfstring{\href{http://cps.ecs.soton.ac.uk}
-                {Cyber Physical Systems Group}}
-                {Cyber Physical Systems Group}}
+\group       {Cyber Physical Systems Group}
 \GROUP       {\MakeUppercase{\groupname}}
-\faculty     {\texorpdfstring{\href{http://www.feps.soton.ac.uk}
-                {Faculty of Engineering and Physical Science}}
-                {Faculty of Engineering and Physical Science}}
+\faculty     {Faculty of Engineering and Physical Science}
 \FACULTY     {\MakeUppercase{\facname}}
 \addresses   {}
 \subject     {}
diff --git a/tex/latex/ecsdocs/ecsminithesis.cls b/tex/latex/ecsdocs/ecsminithesis.cls
index db850ed..57a57c6 100644
--- a/tex/latex/ecsdocs/ecsminithesis.cls
+++ b/tex/latex/ecsdocs/ecsminithesis.cls
@@ -158,6 +158,7 @@
 \newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
 \newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\volume}[2]{\def\volno{#1}\def\volof{#2}}
 \newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
@@ -177,21 +178,16 @@
 \authors     {}
 \qualifications{}
 \orcidid{}
-\university  {\texorpdfstring{\href{http://www.soton.ac.uk}
+\volume{}{}
+\university  {\texorpdfstring{\href{http://www.southampton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
 \UNIVERSITY  {\MakeUppercase{\univname}}
-\department  {\texorpdfstring{\href{http://www.ecs.soton.ac.uk}
-                {School of Electronics and Computer Science}}
-                {School of Electronics and Computer Science}}
+\department  {School of Electronics and Computer Science}
 \DEPARTMENT  {\MakeUppercase{\deptname}}
-\group       {\texorpdfstring{\href{http://cps.ecs.soton.ac.uk}
-                {Cyber Physical Systems Group}}
-                {Cyber Physical Systems Group}}
+\group       {Cyber Physical Systems Group}
 \GROUP       {\MakeUppercase{\groupname}}
-\faculty     {\texorpdfstring{\href{http://www.feps.soton.ac.uk}
-                {Faculty of Engineering and Physical Science}}
-                {Faculty of Engineering and Physical Science}}
+\faculty     {Faculty of Engineering and Physical Science}
 \FACULTY     {\MakeUppercase{\facname}}
 \addresses   {}
 \subject     {}
@@ -339,7 +335,7 @@
     \cleardoublepage
 }\end{spacing}
 }
-\newcommand\listsymbolname{Nomenclature}
+\newcommand\listsymbolname{Definitions and Abbreviations}
 \usepackage{longtable}
 \newcommand\listofsymbols[2]{
 \btypeout{\listsymbolname}
diff --git a/tex/latex/ecsdocs/ecsprogress.cls b/tex/latex/ecsdocs/ecsprogress.cls
index b4f38cd..3b25188 100644
--- a/tex/latex/ecsdocs/ecsprogress.cls
+++ b/tex/latex/ecsdocs/ecsprogress.cls
@@ -158,6 +158,7 @@
 \newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
 \newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\volume}[2]{\def\volno{#1}\def\volof{#2}}
 \newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
@@ -177,21 +178,16 @@
 \authors     {}
 \qualifications{}
 \orcidid{}
-\university  {\texorpdfstring{\href{http://www.soton.ac.uk}
+\volume{}{}
+\university  {\texorpdfstring{\href{http://www.southampton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
 \UNIVERSITY  {\MakeUppercase{\univname}}
-\department  {\texorpdfstring{\href{http://www.ecs.soton.ac.uk}
-                {School of Electronics and Computer Science}}
-                {School of Electronics and Computer Science}}
+\department  {School of Electronics and Computer Science}
 \DEPARTMENT  {\MakeUppercase{\deptname}}
-\group       {\texorpdfstring{\href{http://cps.ecs.soton.ac.uk}
-                {Cyber Physical Systems Group}}
-                {Cyber Physical Systems Group}}
+\group       {Cyber Physical Systems Group}
 \GROUP       {\MakeUppercase{\groupname}}
-\faculty     {\texorpdfstring{\href{http://www.feps.soton.ac.uk}
-                {Faculty of Engineering and Physical Science}}
-                {Faculty of Engineering and Physical Science}}
+\faculty     {Faculty of Engineering and Physical Science}
 \FACULTY     {\MakeUppercase{\facname}}
 \addresses   {}
 \subject     {}
@@ -339,7 +335,7 @@
     \cleardoublepage
 }\end{spacing}
 }
-\newcommand\listsymbolname{Nomenclature}
+\newcommand\listsymbolname{Definitions and Abbreviations}
 \usepackage{longtable}
 \newcommand\listofsymbols[2]{
 \btypeout{\listsymbolname}
diff --git a/tex/latex/ecsdocs/ecsproject.cls b/tex/latex/ecsdocs/ecsproject.cls
index 0e3be33..d098ece 100644
--- a/tex/latex/ecsdocs/ecsproject.cls
+++ b/tex/latex/ecsdocs/ecsproject.cls
@@ -158,6 +158,7 @@
 \newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
 \newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\volume}[2]{\def\volno{#1}\def\volof{#2}}
 \newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
@@ -177,21 +178,16 @@
 \authors     {}
 \qualifications{}
 \orcidid{}
-\university  {\texorpdfstring{\href{http://www.soton.ac.uk}
+\volume{}{}
+\university  {\texorpdfstring{\href{http://www.southampton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
 \UNIVERSITY  {\MakeUppercase{\univname}}
-\department  {\texorpdfstring{\href{http://www.ecs.soton.ac.uk}
-                {School of Electronics and Computer Science}}
-                {School of Electronics and Computer Science}}
+\department  {School of Electronics and Computer Science}
 \DEPARTMENT  {\MakeUppercase{\deptname}}
-\group       {\texorpdfstring{\href{http://cps.ecs.soton.ac.uk}
-                {Cyber Physical Systems Group}}
-                {Cyber Physical Systems Group}}
+\group       {Cyber Physical Systems Group}
 \GROUP       {\MakeUppercase{\groupname}}
-\faculty     {\texorpdfstring{\href{http://www.feps.soton.ac.uk}
-                {Faculty of Engineering and Physical Science}}
-                {Faculty of Engineering and Physical Science}}
+\faculty     {Faculty of Engineering and Physical Science}
 \FACULTY     {\MakeUppercase{\facname}}
 \addresses   {}
 \subject     {}
diff --git a/tex/latex/ecsdocs/ecsreport.cls b/tex/latex/ecsdocs/ecsreport.cls
index b0dc737..9e6e301 100644
--- a/tex/latex/ecsdocs/ecsreport.cls
+++ b/tex/latex/ecsdocs/ecsreport.cls
@@ -158,6 +158,7 @@
 \newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
 \newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\volume}[2]{\def\volno{#1}\def\volof{#2}}
 \newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
@@ -177,21 +178,16 @@
 \authors     {}
 \qualifications{}
 \orcidid{}
-\university  {\texorpdfstring{\href{http://www.soton.ac.uk}
+\volume{}{}
+\university  {\texorpdfstring{\href{http://www.southampton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
 \UNIVERSITY  {\MakeUppercase{\univname}}
-\department  {\texorpdfstring{\href{http://www.ecs.soton.ac.uk}
-                {School of Electronics and Computer Science}}
-                {School of Electronics and Computer Science}}
+\department  {School of Electronics and Computer Science}
 \DEPARTMENT  {\MakeUppercase{\deptname}}
-\group       {\texorpdfstring{\href{http://cps.ecs.soton.ac.uk}
-                {Cyber Physical Systems Group}}
-                {Cyber Physical Systems Group}}
+\group       {Cyber Physical Systems Group}
 \GROUP       {\MakeUppercase{\groupname}}
-\faculty     {\texorpdfstring{\href{http://www.feps.soton.ac.uk}
-                {Faculty of Engineering and Physical Science}}
-                {Faculty of Engineering and Physical Science}}
+\faculty     {Faculty of Engineering and Physical Science}
 \FACULTY     {\MakeUppercase{\facname}}
 \addresses   {}
 \subject     {}
@@ -222,7 +218,10 @@
 }
       \ifthenelse{\equal{\doicode}{}}
       {}
-      {\smallskip DOI: \doicode}
+      {\smallskip DOI: \href{http://orcid.org/\doicode}{\doicode}\par}
+      \ifthenelse{\equal{\volno}{}}
+      {}
+      {\smallskip Volume \volno{} of \volof}
       \vfill
       {\LARGE \textit{by} \par}
       \smallskip
@@ -347,7 +346,7 @@
     \cleardoublepage
 }\end{spacing}
 }
-\newcommand\listsymbolname{Nomenclature}
+\newcommand\listsymbolname{Definitions and Abbreviations}
 \usepackage{longtable}
 \newcommand\listofsymbols[2]{
 \btypeout{\listsymbolname}
diff --git a/tex/latex/ecsdocs/ecsthesis.cls b/tex/latex/ecsdocs/ecsthesis.cls
index 8851624..c9e9926 100644
--- a/tex/latex/ecsdocs/ecsthesis.cls
+++ b/tex/latex/ecsdocs/ecsthesis.cls
@@ -162,6 +162,7 @@
 \newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
 \newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\volume}[2]{\def\volno{#1}\def\volof{#2}}
 \newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
@@ -181,21 +182,16 @@
 \authors     {}
 \qualifications{}
 \orcidid{}
-\university  {\texorpdfstring{\href{http://www.soton.ac.uk}
+\volume{}{}
+\university  {\texorpdfstring{\href{http://www.southampton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
 \UNIVERSITY  {\MakeUppercase{\univname}}
-\department  {\texorpdfstring{\href{http://www.ecs.soton.ac.uk}
-                {School of Electronics and Computer Science}}
-                {School of Electronics and Computer Science}}
+\department  {School of Electronics and Computer Science}
 \DEPARTMENT  {\MakeUppercase{\deptname}}
-\group       {\texorpdfstring{\href{http://cps.ecs.soton.ac.uk}
-                {Cyber Physical Systems Group}}
-                {Cyber Physical Systems Group}}
+\group       {Cyber Physical Systems Group}
 \GROUP       {\MakeUppercase{\groupname}}
-\faculty     {\texorpdfstring{\href{http://www.feps.soton.ac.uk}
-                {Faculty of Engineering and Physical Science}}
-                {Faculty of Engineering and Physical Science}}
+\faculty     {Faculty of Engineering and Physical Science}
 \FACULTY     {\MakeUppercase{\facname}}
 \addresses   {}
 \subject     {}
@@ -229,7 +225,10 @@
 }
       \ifthenelse{\equal{\doicode}{}}
       {}
-      {\smallskip DOI: \doicode}
+      {\smallskip DOI: \href{http://orcid.org/\doicode}{\doicode}\par}
+      \ifthenelse{\equal{\volno}{}}
+      {}
+      {\smallskip Volume \volno{} of \volof}
       \vfill
       {\LARGE \textit{by} \par}
       \smallskip
@@ -353,7 +352,7 @@
     \cleardoublepage
 }\end{spacing}
 }
-\newcommand\listsymbolname{Nomenclature}
+\newcommand\listsymbolname{Definitions and Abbreviations}
 \usepackage{longtable}
 \newcommand\listofsymbols[2]{
 \btypeout{\listsymbolname}
-- 
GitLab