Add DOI, ORCiD and metadata inclusion

ecsdocs.dtx

@@ -526,7 +526,7 @@
 }
 %    \end{macrocode}
 %
-% \section{Internal Names}
+% \section{Internal Names}\label{IntNames}
 %
 % \begin{macro}{\supervisor}
 % \begin{macro}{\examiner}
@@ -550,13 +550,14 @@
 %
 %    \begin{macrocode}
 %% --------------------- Organisational Structure ----------------------
-%% This should be changed in the ecsdocs.dtx file and then all the files
-%% should be recompilled with the new details.
 \newcommand*{\supervisor}[1]{\def\supname{#1}}
 \newcommand*{\examiner}[1]{\def\examname{#1}}
 \newcommand*{\degree}[1]{\def\degreename{#1}}
 \newcommand*{\authors}[1]{\def\authornames{#1}}
+\newcommand*{\qualifications}[1]{\def\quals{#1}}
 \newcommand*{\addresses}[1]{\def\addressnames{#1}}
+\newcommand*{\doi}[1]{\def\doicode{#1}}
+\newcommand*{\orcidid}[1]{\def\orcid{#1}}
 \newcommand*{\university}[1]{\def\univname{#1}}
 \newcommand*{\UNIVERSITY}[1]{\def\UNIVNAME{#1}}
 \newcommand*{\department}[1]{\def\deptname{#1}}
@@ -604,14 +605,16 @@
 %    The internal names of the elements are set
 %    to defaults appropriate to the Department of Electronics and Computer Science.
 %
+%    By running these commands at the top of your tex file it will overwrite the defaults.
 %    \begin{macrocode}
 %% --------------------- Organisational Structure ----------------------
-%% This should be changed in the ecsdocs.dtx file and then all the files
-%% should be recompilled with the new details. TODO: Fix capitalisation of URL
+\doi{}
 \supervisor  {}
 \examiner    {}
 \degree      {}
 \authors     {}
+\qualifications{}
+\orcidid{}
 \university  {\texorpdfstring{\href{http://www.soton.ac.uk}
                 {University of Southampton}}
                 {University of Southampton}}
@@ -663,12 +666,15 @@
 %
 %   \begin{macrocode}
 %<*thesis|minithesis|progress|project|report|gdp|gdpsummary>}
+\usepackage{titling}
+\AtBeginDocument{
+  \hypersetup{pdftitle={\thetitle}}
+  \hypersetup{pdfsubject={\subjectname}}
+  \hypersetup{pdfauthor={\authornames}}
+  \hypersetup{pdfkeywords={\keywordnames}}
+}
 \renewcommand\maketitle{
   \btypeout{Title Page}
-  \hypersetup{pdftitle={\@title}}
-  \hypersetup{pdfsubject=\subjectname}
-  \hypersetup{pdfauthor=\authornames}
-  \hypersetup{pdfkeywords=\keywordnames}
   \thispagestyle{empty}
   \begin{titlepage}
     \let\footnotesize\small
@@ -727,11 +733,25 @@
       \parbox[t][95mm][s]{89mm}{}
 %</minithesis|progress|project|gdp|gdpsummary>
 %<*thesis|report>
-      {\huge \bf \@title \par}
+      {\huge \bf \@title \par
+}
+      \ifthenelse{\equal{\doicode}{}}
+      {}
+      {\smallskip DOI: \doicode}
       \vfill
       {\LARGE \textit{by} \par}
       \smallskip
-      {\LARGE \textbf\authornames \par}
+      {\LARGE \textbf\authornames
+        \ifthenelse{\equal{\quals}{}}
+        {}
+        {\par\Large
+        \quals}
+      \par}
+        \ifthenelse{\equal{\orcid}{}}
+        {}
+        {\smallskip
+        ORCiD: \href{http://orcid.org/\orcid}{\orcid}}
+
       \vfill
 %<*thesis>
       {\large \textit{A thesis for the degree of} \par}
@@ -742,12 +762,12 @@
 \bigskip
       {\large \facname \par}
       {\large \deptname \par}
+%</report>
       \bigskip
       \bigskip
       \bigskip
       {\Large \@date \par}
       \bigskip
-%</report>
 %</thesis|report>
     \end{center}
     \par
@@ -771,10 +791,6 @@
 \if@titlepage
   \renewcommand\maketitle{
     \btypeout{Title Page}
-    \hypersetup{pdftitle={\@title}}
-    \hypersetup{pdfsubject={\subjectname}}
-    \hypersetup{pdfauthor={\authornames}}
-    \hypersetup{pdfkeywords={\keywordnames}}
     \markboth{\authornames}{\@title}
     \begin{titlepage}
     \thispagestyle{empty}
@@ -825,10 +841,6 @@
 \else
   \renewcommand\maketitle{
     \btypeout{Title Page}
-    \hypersetup{pdftitle={\@title}}
-    \hypersetup{pdfsubject=\subjectname}
-    \hypersetup{pdfauthor=\authornames}
-    \hypersetup{pdfkeywords=\keywordnames}
     \markboth{\authornames}{\@title}
     \thispagestyle{empty}
     \par
@@ -911,7 +923,7 @@
     \setlength{\parskip}{0pt}
     {\textsc\normalsize \univname \par}
     \bigskip
-    {\underline{ABSTRACT} \par}
+    {\underline{Abstract} \par}
     \bigskip
     {\textsc\normalsize \facname \par}
 %<*thesis|minithesis|progress|project|report>
@@ -1169,13 +1181,12 @@
 % Taken from Modified Template by Lovell TODO: Complete reference
 % TODO: Consider a separate dissertation class for non techinical?
 % TODO: Provide extra argument for putting the date into the Declaration
-% TODO: ensure if first argument is empty then second arg still works
 % TODO: make slightly different declarations for theses and projects
 %
 % This Authorship macro takes one argument for the case of People
 % who have published part of their thesis already (perhaps in a paper).
 %
-% xifthen else package used for the ifempty command
+% xifthen else package used for the isempty command
 %
 %    \begin{macrocode}
 %<*thesis|minithesis|progress|report|article>
@@ -1425,13 +1436,7 @@ PhD Thesis, pagination. }
 \hypersetup{colorlinks=true}   % Set to false for black/white printing
 \input{Definitions}            % Include your abbreviations
 %% ----------------------------------------------------------------
-\begin{document}
-%<*testthesis>
-%% TODO: Add ORCiD and DOI options
-\pagenumbering{gobble} % removes page number
-\copyrightDeclaration{} % !!! Comment this line when printing the hardcopy !!!
-%</testthesis>
-\frontmatter
+
 \title      {An Investigation into \dots}
 \authors    {\texorpdfstring
              {\href{mailto:S.R.Gunn@ecs.soton.ac.uk}{Steve R. Gunn}}
@@ -1439,8 +1444,6 @@ PhD Thesis, pagination. }
             }
 \addresses  {\groupname\\\deptname\\\univname}
 \date       {\today}
-\subject    {}
-\keywords   {}
 %<*testminithesis|testprogress|testproject|testgdp|testgdpsummary>
 \supervisor {Mr Beavis}
 \examiner   {Dr Butthead}
@@ -1451,6 +1454,21 @@ PhD Thesis, pagination. }
 %<*testgdp|testgdpsummary>
 \degree     {Master of Engineering}
 %</testgdp|testgdpsummary>
+%% Optional Fields
+%<testthesis|testminithesis|testprogress> \qualifications{MEng PhD}
+%<*testthesis>
+\orcidid{0000-0002-1825-0097}
+\doi{10.1002/0470841559.ch1}
+%</testthesis>
+\subject    {}
+\keywords   {}
+
+\begin{document}
+%<*testthesis>
+\pagenumbering{gobble} % removes page number
+\copyrightDeclaration{} % !!! Comment this line when printing the hardcopy !!!
+%</testthesis>
+\frontmatter
 \maketitle
 %</testthesis|testminithesis|testprogress|testproject|testreport|testarticle|testgdp|testgdpsummary>
 %<*testthesis|testminithesis|testprogress|testproject|testreport|testarticle|testgdp>