dccpaper (3may18)

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

8 files changed, 336 insertions, 112 deletions

diff --git a/Master/texmf-dist/doc/latex/dccpaper/README.md b/Master/texmf-dist/doc/latex/dccpaper/README.md
index ab37bcf2cbf..77cc53df71d 100644
--- a/Master/texmf-dist/doc/latex/dccpaper/README.md
+++ b/Master/texmf-dist/doc/latex/dccpaper/README.md
@@ -71,7 +71,7 @@ A makefile is provided which you can use with the Make utility:
 
 ## Licence
 
-Copyright 2016 Digital Curation Centre, University of Edinburgh.
+Copyright 2018 Digital Curation Centre, University of Edinburgh.
 
 This work consists of the image files dccpaper-by.eps and
 dccpaper-by.pdf, the documented LaTeX file dccpaper.dtx and a Makefile.
diff --git a/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf b/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf
index 0f67bd34f31..f0356bf8aac 100644
--- a/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf
+++ b/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf
diff --git a/Master/texmf-dist/source/latex/dccpaper/Makefile b/Master/texmf-dist/source/latex/dccpaper/Makefile
index 948b2eab78d..74787deb292 100644
--- a/Master/texmf-dist/source/latex/dccpaper/Makefile
+++ b/Master/texmf-dist/source/latex/dccpaper/Makefile
@@ -22,13 +22,23 @@ $(NAME).pdf: $(NAME).dtx ijdc-v9.cls $(NAME)-biblatex.bib $(NAME)-by.pdf
 	biber $(NAME)
 	lualatex -recorder -interaction=batchmode $(NAME).dtx >/dev/null
 	lualatex -recorder -interaction=batchmode $(NAME).dtx >/dev/null
+	@echo "Compilation of PDF finished."
+
+apacitetest.pdf: clean $(NAME).dtx ijdc-v9.cls $(NAME)-apacite.bib $(NAME)-by.pdf
+	lualatex -recorder -interaction=batchmode '\newif\ifapacite\input $(NAME).dtx' >/dev/null
+	bibtex $(NAME)
+	lualatex -recorder -interaction=batchmode '\newif\ifapacite\input $(NAME).dtx' >/dev/null
+	lualatex -recorder -interaction=batchmode '\newif\ifapacite\input $(NAME).dtx' >/dev/null
+	mv $(NAME).pdf apacitetest.pdf
+	$(MAKE) clean
+	@echo "Compilation of PDF finished."
 
 clean:
 	rm -f $(NAME).{aux,bbl,bcf,blg,fdb_latexmk,fls,glo,gls,hd,idx,ilg,ind,ins,lsttemp,log,markdown.in,markdown.lua,markdown.out,out,run.xml,synctex.gz} $(NAME)-base.doc ijdc-v9.doc idcc.doc
 	rm -rf _markdown_$(NAME)
 
 distclean: clean
-	rm -f $(NAME).pdf ijdc-v9.cls idcc.cls $(NAME)-base.sty $(NAME)-{biblatex,apacite}.bib
+	rm -f $(NAME).pdf apacitetest.pdf ijdc-v9.cls idcc.cls $(NAME)-base.sty $(NAME)-{biblatex,apacite}.bib
 
 inst: all
 	mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
diff --git a/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx b/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx
index 60edc5ce984..ea3f15dfc7b 100644
--- a/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx
+++ b/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %<*internal|ijdc9|idcc|base>
-\def\Version{2017/10/20 v1.6}
+\def\Version{2018/05/01 v1.7}
 %</internal|ijdc9|idcc|base>
 %<*internal>
 \iffalse
@@ -240,7 +240,7 @@ See:     http://www.latex-project.org/lppl.txt
 \endpreamble
 \postamble
 
-Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
+Copyright (C) 2018 Digital Curation Centre, University of Edinburgh
 <info@dcc.ac.uk>
 \endpostamble
 
@@ -276,8 +276,6 @@ Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
 \documentclass{ijdc-v9}
 \let\DccpaperMaketitle=\maketitle
 
-\usepackage[utf8]{luainputenc}
-
 % For typesetting the documentation generally
 \usepackage{doc}
 \usepackage{enumitem}
@@ -417,7 +415,7 @@ Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
 \usepackage{dcolumn,csquotes}
 \usepackage[iso,british]{isodate}
 \usepackage[expansion=false]{microtype}
-\DisableLigatures{family=tt*}
+\ifXeTeX\else\DisableLigatures{family=tt*}\fi
 \usepackage[tightLists=false]{markdown}
 \markdownSetup{rendererPrototypes={%
  link = {#1\footnote{\ifx\empty#4\empty\else#4:
@@ -426,14 +424,16 @@ Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
 \def\T#1{}  % Work around bug where \T1 inserted as control sequence
 \usepackage{fnpct}
 
-\usepackage[style=apa]{biblatex}
-\addbibresource{dccpaper-biblatex.bib}
-\DeclareLanguageMapping{british}{british-apa}
-
-%%\usepackage{apacite}
-%%\bibliographystyle{apacite}
-%%\let\textcite=\citeA
-%%\let\autocite=\cite
+\ifx\undefined\apacitefalse
+  \usepackage[style=apa]{biblatex}
+  \addbibresource{dccpaper-biblatex.bib}
+  \DeclareLanguageMapping{british}{british-apa}
+\else
+  \usepackage{apacite}
+  \bibliographystyle{apacite}
+  \let\textcite=\citeA
+  \let\autocite=\cite
+\fi
 
 \title[The \textsf{dccpaper} bundle]{The \protect\textsf{dccpaper} bundle: Classes for submissions to IJDC and IDCC}
 
@@ -481,18 +481,21 @@ Certain aspects of the template design have been implemented using third-party p
 \item\pkg{etoolbox} is used behind the scenes for patching commands.
 \item\pkg{footmisc} is used to format the footnotes.
 \item\pkg{titlesec} is used to format the section headings.
+\item\pkg{iftex} is used to test which \TeX\ engine you are using.
+If you use Lua\LaTeX\ or \XeLaTeX\, you will also need \pkg{fontspec}.
 \end{itemize}
 
 In some cases the class prefers to use packages that are not part of the base installation (but are nevertheless commonly available in \TeX\ distributions), but will fall back to their base equivalents if necessary.
 
 \begin{itemize}
 \item
-\pkg{newtx} will be used if available in place of \pkg{times}.
+\pkg{newtx} will be used if available in place of \pkg{times}, and
+\pkg{tgheros} will be used in place of \pkg{helvet}.
 \item
 \pkg{xcolor} will be used if available in place of \pkg{color}.
 \end{itemize}
 
-For referencing, you are encouraged to use either \pkg{biblatex} using the styles provided by \pkg{biblatex-apa} (preferred), or \pkg{apacite}.
+For referencing, you are encouraged to use either \pkg{biblatex-apa} (preferred) or \pkg{apacite}.
 
 \section{Loading the Classes}
 
@@ -515,38 +518,34 @@ Use this for an editorial.
 
 The class is loaded in the usual way with
 \lstinline|\documentclass[$\meta{options}$]{idcc}|.
-Two types of option are available. The first relates to the type of submission:
+Two types of option are available. The first relates to the conference to which the submission will be made:
+\begin{description}[font=\normalfont]
+  \item[\key{15}, \key{16}, \key{17}, \key{18}, \key{19}]
+  Use this to select the year of the conference, e.g.\@ \key{19} for 2019.
+\end{description}
+
+The second relates to the type of submission:
 \begin{description}[font=\normalfont\key]
+\item[abstract]
+Use this for research and practice paper extended abstracts. It is normally the default.
 \item[research]
 Use this for full research papers.
 \item[practice]
-Use this for extended abstracts of practice papers, and full practice papers. The class defaults to this state, making this option even more optional than normal.
+Use this for full practice papers. This becomes the default if you select one of the options for the 2015 to 2018 conferences inclusive.
+\item[lightning]
+Use this for lightning talk proposals.
 \item[data]
-Use this for data paper abstracts and full data papers.
+(Legacy.) Use this for data paper abstracts and full data papers.
 \item[poster]
-Use this for poster abstracts.
+Use this for poster proposals.
 \item[demo]
 Use this for demonstration proposals.
 \item[bof]
-Use this for Birds of a Feather session abstracts.
+(Legacy.) Use this for Birds of a Feather session proposals.
 \item[workshop]
 Use this for workshop proposals.
 \end{description}
 
-The second type of option relates to the conference to which the submission will be made:
-\begin{multicols}{2}
-\begin{description}[font=\normalfont\key]
-\item[15]
-Use this for the 2015 conference.
-\item[16]
-Use this for the 2016 conference.
-\item[17]
-Use this for the 2017 conference.
-\item[18]
-Use this for the 2018 conference.
-\end{description}
-\end{multicols}
-
 \section{Preamble Commands}
 
 The following commands should be given in the preamble to fill out the document metadata.
@@ -651,9 +650,10 @@ The number of the IJDC issue in which the submission will be published.
 The year in which the submission will be published.
 \end{description}
 
+\newpage
 \section{Document Body}
 
-When it comes to writing the body of the submission, the template should allow you to use the usual \LaTeX\ markup without much adaptation. So, for example, you would start as in Figure~\ref{fig:start-paper}.
+When it comes to writing the body of the submission, the template should allow you to use the usual \LaTeX\ markup without much adaptation. So, for example, for a full paper or an IDCC extended abstract, you would start as in Figure~\ref{fig:start-paper}.
 
 \begin{figure}[ht]
 \begin{lstlisting}[frame=single]
@@ -668,11 +668,11 @@ Text of the abstract\dots
 
 The text of the introduction starts here\dots
 \end{lstlisting}
-\caption{Sample code for the beginning of an IJDC submission or IDCC full paper.}
+\caption{Sample code for the beginning of an IJDC submission or IDCC paper.}
 \label{fig:start-paper}
 \end{figure}
 
-Please note that if submitting an abstract or proposal to the IDCC instead of a full paper, you should \emph{not} use the \texttt{abstract} environment. Instead, start with a section headed `Abstract' as in Figure~\ref{fig:start-abstract}. Further guidance on how to write such submissions is given on the conference website.
+Please note that if submitting a poster, lightning talk or demonstration proposal to the IDCC instead of a paper, you should \emph{not} use the \texttt{abstract} environment. Instead, start with a section headed `Abstract' as in Figure~\ref{fig:start-abstract} (for posters or lightning talks) or Figure~\ref{fig:start-demo} (for demonstrations). Further guidance on how to write such submissions is given on the conference website.
 
 \begin{figure}[ht]
 \begin{lstlisting}[frame=single]
@@ -681,12 +681,72 @@ Please note that if submitting an abstract or proposal to the IDCC instead of a
 
 \section{Abstract}
 
-The text of the abstract or proposal starts here\dots
+The text of the proposal starts here\dots
 \end{lstlisting}
-\caption{Sample code for the beginning of an IDCC abstract or proposal.}
+\caption{Sample code for the beginning of an IDCC proposal.}
 \label{fig:start-abstract}
 \end{figure}
 
+If submitting a workshop proposal to the IDCC, there is a specific set of information you need to include. Figure~\ref{fig:workshop} provides the bare bones of the template you will need to complete, but please refer to the corresponding Word template for guidance on how to complete it.
+
+\begin{figure}[p]
+  \begin{lstlisting}[frame=single]
+  \begin{document}
+  \maketitle
+  \begin{description}
+  \item[Demo Organiser(s):]~\\
+  Name, position, organization.
+  \end{description}
+  \section{Abstract}
+  
+  The text of the proposal starts here\dots
+  \end{lstlisting}
+  \caption{Sample code for the beginning of an IDCC demonstration proposal.}
+  \label{fig:start-demo}
+\end{figure}
+
+\begin{figure}[p]
+\begin{lstlisting}[frame=single]
+\begin{document}
+\begin{description}
+\item[Workshop Organiser(s):]~\\
+Name, position, organization.
+
+\item[Workshop title:]~\\ 
+Title.
+
+\item[Brief description:]~\\
+60 words or fewer.
+
+\item[Long description:]~\\
+About 500 words.
+
+\item[Room layout/workshop style:]~\\
+Cabaret, classroom, boardroom, other.
+
+\item[Minimum/maximum number of delegates:]~\\
+Minimum for viability, maximum for workability. 
+
+\item[Number of speakers:]~\\
+Number.
+
+\item[Equipment requirements:]~\\
+Projectors, sound, flipcharts, whiteboards etc.
+
+\item[Workshop length:]~\\
+Half day or full day.
+
+\item[Funding model:]~\\
+Fully funded, part funded (subsidised) or delegate fee.
+\end{description}
+\end{document}
+\end{lstlisting}
+\caption{Template for an IDCC workshop proposal.}
+\label{fig:workshop}
+\end{figure}
+
+\clearpage
+\noindent
 IJDC and IDCC papers follow the formatting conventions specified by the \textcite{apa6ed}, with a few minor changes. There are some instances where this affects how you write your submission.
 
 \subsection{Headings}
@@ -715,12 +775,12 @@ Where decked (subdivided) headings are used, there should be a border beneath th
 \item
 Empty cells can either be left blank or represented by an em dash. A blank cell indicates non-applicability, while an em dash signifies that the data was not collected or has been omitted.
 \item
-Captions should end in a full stop\slash period.
+Captions should end in a full stop\slash period and appear above the table.
 \end{itemize}
 
-Table~\ref{tab:issues} demonstrates these features. The code used to produce the table is shown in Figure~\ref{fig:table} (note that the \pkg{dcolumn} package was loaded in the preamble).
+Table~\ref{tab:issues} on the following page demonstrates these features. The code used to produce the table is shown in Figure~\ref{fig:table} (the \pkg{dcolumn} package was loaded in the preamble). Note the different relative positions of the table and figure captions.
 
-\begin{table}[ht]
+\begin{table}[p!]
 \caption{Papers and articles published in the IJDC in 2008 and 2009.}
 \label{tab:issues}
 \centering\small
@@ -741,7 +801,7 @@ Issue
 \end{tabular}
 \end{table}
 
-\begin{figure}[h]
+\begin{figure}[p!]
 \begin{lstlisting}[frame=single]
 \begin{table}
 \caption{Papers and articles published in the IJDC in 2008 and 2009.}
@@ -768,30 +828,36 @@ Issue
 \label{fig:table}
 \end{figure}
 
-Note the different relative positions of the table and figure captions.
-
 \subsection{Reference List and Citations}
 
+As mentioned above, you are encouraged to use either \pkg{biblatex-apa} (with \pkg{biblatex}\slash\pkg{biber}) or \pkg{apacite} (with Bib\TeX) to generate your reference list and citations.
+
+\begin{itemize}
+\item
 To use \pkg{biblatex} for your reference list, add the following to your preamble:
 \begin{lstlisting}
 \usepackage[style=apa]{biblatex}
 \addbibresource{$\meta{bib file}$.bib}
+\end{lstlisting}
+Prior to the release of \pkg{biblatex-apa} v7.5, you also needed this line:
+\begin{lstlisting}
 \DeclareLanguageMapping{british}{british-apa}
 \end{lstlisting}
-and include \lstinline|\printbibliography| at the end of the document.
-
+Include \lstinline|\printbibliography| at the end of the document to print the list.
+\item
 To use \pkg{apacite} for your reference list, add the following to your preamble:
 \begin{lstlisting}
 \usepackage{apacite}
 \bibliographystyle{apacite}
 \end{lstlisting}
 and include \lstinline|\bibliography{$\meta{bib file}$}| at the end of the document.
+\end{itemize}
 
 In-text citations are given parenthetically in author–date format. If author forms part of the narrative, as with \textcite{rinaldo.etal2011rsc}, only the date is added in parenthesis, otherwise both author and date are given \autocite{smith.etal2003das}. Where multiple citations are given at once, the order should be the same as in the reference list, i.e.\ alphabetically by author, with co-authored works coming after singly-authored works, then chronologically \autocite{borgman.etal2006bdl, dcc2005dcp, mazairac.beetzIPboq, santini2004sas, santini2004saa, smith.etal2003das, witten.frank2005dmp}. Please consult the documentation of the package you are using for how to achieve this.
 
-Please do not cite entire websites through the reference list mechanism. Instead, provide the title of the website (in English) and the URL in a footnote.\footnote{Digital Curation Centre: \url{http://www.dcc.ac.uk/}} If the title of the website is not clear from the visible pages, the contents of the HTML title element may be used. Other explanatory notes, whether about the body text or cited items, should also be given as footnotes rather than as endnotes or reference list annotations.\footnote{This avoids unnecessary page turning or scrolling.}
+Please \textbf{do not cite entire websites} through the reference list mechanism. Instead, provide the title of the website (in English) and the URL in a footnote.\footnote{Digital Curation Centre: \url{http://www.dcc.ac.uk/}} If the title of the website is not clear from the visible pages, the contents of the HTML title element may be used. Other explanatory notes, whether about the body text or cited items, should also be given as footnotes rather than as endnotes or reference list annotations.\footnote{This avoids unnecessary page turning or scrolling.}
 
-Please provide digital object identifiers (DOIs) for referenced items where available.
+Please \textbf{provide digital object identifiers} (DOIs) for referenced items where available.
 
 The data underlying the results presented in the submission should be placed in an appropriate custodial environment and cited \autocite{waterton.etal2013ual}, with the reference placed in the reference list. The \pkg{biblatex-apa} package provides a \texttt{data} entry type which should be used for datasets; the \texttt{entrysubtype} value should be \enquote{\texttt{Data set}} or similar. If using \pkg{apacite}, use the \texttt{misc} entry type with a \texttt{type} value of \enquote{\texttt{Data set}} or similar.
 
@@ -799,13 +865,18 @@ The data underlying the results presented in the submission should be placed in
 
 Any acknowledgements should be placed in a section immediately before the references.\nocite{*}
 
-\printbibliography
-%%\bibliography{dccpaper-apacite.bib}
+\ifx\undefined\apacitefalse
+  \printbibliography
+\else
+  \bibliography{dccpaper-apacite.bib}
+\fi
 
 \newpage
 \section{Appendix A: Change History}
 
 \begin{description}
+\item[v1.7] 2018-05-01\\
+Added details of IDCC 2019, along with new formatting and submission types.
 \item[v1.6] 2017-10-20\\
 Added details of IDCC 2018. Allowed files to be unpacked by \TeX\ without compiling. Refactored some documentation commands for efficiency.
 \item[v1.5] 2016-08-05\\
@@ -956,7 +1027,7 @@ Any acknowledgements should be placed here\dots
 %<readme>## Licence
 %<readme>
 %<*driver|readme>
-Copyright 2016 Digital Curation Centre, University of Edinburgh.
+Copyright 2018 Digital Curation Centre, University of Edinburgh.
 
 This work consists of the image files dccpaper-by.eps and
 dccpaper-by.pdf, the documented LaTeX file dccpaper.dtx and a Makefile.
@@ -1005,6 +1076,19 @@ The file dccpaper.pdf, generated by this work, is licensed as shown on page 1.
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{ifdcp@proposal}
+% \begin{macro}{dcp@proposaltrue}
+% \begin{macro}{dcp@proposalfalse}
+% We provide a boolean for switching formatting depending on whether this
+% document is an IDCC proposal or not.
+%
+%    \begin{macrocode}
+\newif\ifdcp@proposal
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 % \begin{optionkey}{editorial}
 % \begin{optionkey}{paper}
 % \begin{optionkey}{article}
@@ -1052,7 +1136,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
   \thedate, Vol.\ \thevolume, Iss.\ \theissue, \thepage--\thelastpage.%
 }
 \def\dccp@titlefoot@doi{%
-  \url{http://dx.doi.org/\thedoi}\\
+  \url{https://doi.org/\thedoi}\\
   DOI: \thedoi
 }
 \def\dccp@normhead@doi{doi:\thedoi}
@@ -1084,7 +1168,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % The rest of the formatting happens in the following file.
 %
 %    \begin{macrocode}
-\usepackage{dccpaper-base}
+\RequirePackage{dccpaper-base}
 %    \end{macrocode}
 % \iffalse
 %</ijdc9>
@@ -1121,16 +1205,34 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{dccp@type@fallback}
 % \begin{macro}{dccp@type}
 % Paper type is recorded in \cs{dccp@type}. The values can be
 % `Research Paper', `Practice Paper', `Poster', `Demonstration', or `Workshop'.
 %
 %    \begin{macrocode}
-\def\dccp@type{Practice Paper}
+\def\dccp@type@fallback{Extended Abstract}
+\def\dccp@type{\dccp@type@fallback}
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
+%
+% \begin{macro}{ifdcp@proposal}
+% \begin{macro}{dcp@proposaltrue}
+% \begin{macro}{dcp@proposalfalse}
+% We provide a boolean for switching formatting depending on whether this
+% document is an IDCC proposal or not.
+%
+%    \begin{macrocode}
+\newif\ifdcp@proposal
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
 %
+% \begin{optionkey}{abstract}
 % \begin{optionkey}{research}
+% \begin{optionkey}{lightning}
 % \begin{optionkey}{data}
 % \begin{optionkey}{poster}
 % \begin{optionkey}{demo}
@@ -1141,13 +1243,15 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % The \key{practice} option is redundant, but included for symmetry.
 %
 %    \begin{macrocode}
+\DeclareOption{abstract}{\def\dccp@type{Extended Abstract}}
 \DeclareOption{research}{\def\dccp@type{Research Paper}}
+\DeclareOption{lightning}{\def\dccp@type{Lightning Talk}\dcp@proposaltrue}
 \DeclareOption{data}{\def\dccp@type{Data Paper}}
-\DeclareOption{poster}{\def\dccp@type{Poster}}
-\DeclareOption{demo}{\def\dccp@type{Demonstration}}
-\DeclareOption{bof}{\def\dccp@type{Birds of a Feather}}
-\DeclareOption{workshop}{\def\dccp@type{Workshop}}
-\DeclareOption{practice}{\def\dccp@type{Practice Paper}}
+\DeclareOption{poster}{\def\dccp@type{Poster}\dcp@proposaltrue}
+\DeclareOption{demo}{\def\dccp@type{Demonstration}\dcp@proposaltrue}
+\DeclareOption{bof}{\def\dccp@type{Birds of a Feather}\dcp@proposaltrue}
+\DeclareOption{workshop}{\def\dccp@type{Workshop}\dcp@proposaltrue}
+\DeclareOption{practice}{\def\dccp@type{Practice Paper}\dcp@proposaltrue}
 %    \end{macrocode}
 % \end{optionkey}
 % \end{optionkey}
@@ -1156,11 +1260,14 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % \end{optionkey}
 % \end{optionkey}
 % \end{optionkey}
+% \end{optionkey}
+% \end{optionkey}
 %
 % \begin{optionkey}{15}
 % \begin{optionkey}{16}
 % \begin{optionkey}{17}
 % \begin{optionkey}{18}
+% \begin{optionkey}{19}
 % The details for each conference are slightly different, so they each have an
 % associated option for overriding the fallback definitions for
 % \cs{dccp@publ@short}, \cs{dccp@publ@msg} and \cs{dccp@subject}.
@@ -1171,24 +1278,34 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
   \def\dccp@publ@msg{The 10th \dccp@publ@long\ takes place on 9--12 February
   2015 in London. URL: \url{http://www.dcc.ac.uk/events/idcc15/}}
   \def\dccp@subject{10th \dccp@publ@long, 2015}
+  \def\dccp@type@fallback{Practice Paper}
 }
 \DeclareOption{16}{%
   \def\dccp@publ@short{IDCC16}
   \def\dccp@publ@msg{The 11th \dccp@publ@long\ takes place on 22--25 February
   2016 in Amsterdam. URL: \url{http://www.dcc.ac.uk/events/idcc16/}}
   \def\dccp@subject{11th \dccp@publ@long, 2016}
+  \def\dccp@type@fallback{Practice Paper}
 }
 \DeclareOption{17}{%
   \def\dccp@publ@short{IDCC17}
   \def\dccp@publ@msg{The 12th \dccp@publ@long\ takes place on 20--23 February
   2017 in Edinburgh. URL: \url{http://www.dcc.ac.uk/events/idcc17/}}
   \def\dccp@subject{12th \dccp@publ@long, 2017}
+  \def\dccp@type@fallback{Practice Paper}
 }
 \DeclareOption{18}{%
   \def\dccp@publ@short{IDCC18}
   \def\dccp@publ@msg{The 13th \dccp@publ@long\ takes place on 19--22 February
     2018 in Barcelona. URL: \url{http://www.dcc.ac.uk/events/idcc18/}}
   \def\dccp@subject{13th \dccp@publ@long, 2018}
+  \def\dccp@type@fallback{Practice Paper}
+}
+\DeclareOption{19}{%
+  \def\dccp@publ@short{IDCC19}
+  \def\dccp@publ@msg{The 14th \dccp@publ@long\ takes place on 4--7 February
+    2019 in Melbourne. URL: \url{http://www.dcc.ac.uk/events/idcc19/}}
+  \def\dccp@subject{14th \dccp@publ@long, 2019}
 }
 \ProcessOptions\relax
 
@@ -1197,6 +1314,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % \end{optionkey}
 % \end{optionkey}
 % \end{optionkey}
+% \end{optionkey}
 %
 % \begin{macro}{@clearglobaloption}
 % The \key{demo} option, if passed, would be passed on to the \pkg{graphics}
@@ -1235,7 +1353,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % The rest of the formatting happens in the following file.
 %
 %    \begin{macrocode}
-\usepackage{dccpaper-base}
+\RequirePackage{dccpaper-base}
 %    \end{macrocode}
 % \iffalse
 %</idcc>
@@ -1268,12 +1386,40 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % monospaced.
 %
 %    \begin{macrocode}
-\RequirePackage[T1]{fontenc}
-\IfFileExists{newtxtext.sty}%
-  {\RequirePackage{newtxtext,newtxmath}}%
-  {\RequirePackage{times}}
-\RequirePackage[scaled=0.92]{helvet}
-\renewcommand{\ttdefault}{cmtt}
+\RequirePackage{iftex}
+\ifPDFTeX
+  \RequirePackage[T1]{fontenc}
+  \IfFileExists{newtxtext.sty}%
+    {\RequirePackage{newtxtext,newtxmath}}%
+    {\RequirePackage{times}}
+  \IfFileExists{tgheros.sty}%
+    {\ifx\undefined\qhv@scale\RequirePackage[scale=0.92]{tgheros}\fi}
+    {\RequirePackage[scaled=0.92]{helvet}}
+  \renewcommand{\ttdefault}{cmtt}
+\else
+  \RequirePackage[no-math]{fontspec}
+  \IfFileExists{newtxtext.sty}{%
+    \setmainfont{TeXGyreTermesX}
+    \RequirePackage{newtxmath}
+  }{%
+    \RequirePackage[T1]{fontenc}
+    \RequirePackage{times}
+    \renewcommand{\ttdefault}{cmtt}
+  }
+  \IfFontExistsTF{texgyreheros-regular.otf}{%
+    \setsansfont{texgyreheros}%
+      [ Extension = .otf
+      , UprightFont = *-regular
+      , ItalicFont = *-italic
+      , BoldFont = *-bold
+      , BoldItalicFont = *-bolditalic
+      , Scale = 0.92
+      ]
+  }{%
+    \RequirePackage[T1]{fontenc}
+    \RequirePackage[scaled=0.92]{helvet}
+  }
+\fi
 %    \end{macrocode}
 %
 % We will need support for included graphics and colour. The structural elements
@@ -1285,8 +1431,13 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 \IfFileExists{xcolor.sty}%
   {\RequirePackage{xcolor}}%
   {\RequirePackage{color}}
-\definecolor[named]{struct}{rgb}{0,0.5,0.5}
-\definecolor[named]{links}{rgb}{0,0.4,0.4}
+\ifdcp@proposal
+  \definecolor[named]{struct}{rgb}{0.862,0.420,0.184}
+  \definecolor[named]{links}{rgb}{0.862,0.420,0.184}
+\else
+  \definecolor[named]{struct}{rgb}{0,0.5,0.5}
+  \definecolor[named]{links}{rgb}{0,0.4,0.4}
+\fi
 %    \end{macrocode}
 %
 % We will calculate some lengths later.
@@ -1342,14 +1493,22 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % \end{macro}
 %
 % Pdf\TeX\ 1.40.15 introduced the facility to include dummy interword spaces
-% to improve text extraction and reflow. We test for this facility and use it
-% if available.
+% to improve text extraction and reflow. It would be really, really nice if
+% we could switch this on if available, but unfortunately it triggers a
+% long-standing bug in MikTeX: https://tex.stackexchange.com/q/318425
 %
 %    \begin{macrocode}
 \RequirePackage{ifpdf}
-\ifpdf
-  \ifdef{\pdfinterwordspaceon}{\pdfinterwordspaceon}{}
-\fi
+\newtoggle{dccp@dummyspaces}
+\def\fixspaces{\toggletrue{dccp@dummyspaces}}
+\def\nofixspaces{\togglefalse{dccp@dummyspaces}}
+\AtBeginDocument{%
+\iftoggle{dccp@dummyspaces}{%
+  \ifpdf
+    \ifdef{\pdfinterwordspaceon}{\pdfinterwordspaceon}{}%
+  \fi
+}{}%
+}
 
 %    \end{macrocode}
 %
@@ -1617,7 +1776,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 \newcommand*{\theissue}{0}
 \newcommand*{\issue}[1]{\renewcommand*{\theissue}{#1}}
 \newcommand*{\thesubno}{0}
-\newcommand*{\subno}[1]{\renewcommand*{\thesubno}{#1}}
+\newcommand*{\subno}[1]{\renewcommand*{\thesubno}{#1}\fixspaces}
 \newcommand*{\thedoi}{10.2218/ijdc.v\thevolume i\theissue .\thesubno}
 %    \end{macrocode}
 % \end{macro}
@@ -2244,7 +2403,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 %    \begin{macrocode}
     \DeclareFieldFormat{doi}{%
       \ifhyperref{%
-        \href{http://dx.doi.org/#1}{\nolinkurl{doi:#1}}%
+        \href{https://doi.org/#1}{\nolinkurl{doi:#1}}%
       }{%
         \nolinkurl{doi:#1}%
       }%
@@ -2366,7 +2525,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % to remove the one inserted by \cs{doiprefix}.
 %
 %    \begin{macrocode}
-      \newcommand{\doi}[1]{\href{http://dx.doi.org/#1}{\nolinkurl{doi:#1}}}%
+      \newcommand{\doi}[1]{\href{https://doi.org/#1}{\nolinkurl{doi:#1}}}%
       \renewcommand{\doiprefix}{\unskip}%
     }{}%
   }%
@@ -2400,7 +2559,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % bookmarks, metadata, etc.
 %
 %    \begin{macrocode}
-\usepackage
+\RequirePackage
   [ colorlinks=true
   , linkcolor=black
   , anchorcolor=black
diff --git a/Master/texmf-dist/source/latex/dccpaper/dccpaper.ins b/Master/texmf-dist/source/latex/dccpaper/dccpaper.ins
index af8de0a5e21..64675d74e5c 100644
--- a/Master/texmf-dist/source/latex/dccpaper/dccpaper.ins
+++ b/Master/texmf-dist/source/latex/dccpaper/dccpaper.ins
@@ -30,7 +30,7 @@ See:     http://www.latex-project.org/lppl.txt
 \endpreamble
 \postamble
 
-Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
+Copyright (C) 2018 Digital Curation Centre, University of Edinburgh
 <info@dcc.ac.uk>
 \endpostamble
 
@@ -42,7 +42,7 @@ Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
 }
 \endbatchfile
 %% 
-%% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2018 Digital Curation Centre, University of Edinburgh
 %% <info@dcc.ac.uk>
 %%
 %% End of file `dccpaper.ins'.
diff --git a/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty b/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty
index c368b048892..be0915c1067 100644
--- a/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty
+++ b/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty
@@ -14,24 +14,57 @@
 %% See:     http://www.latex-project.org/lppl.txt
 %% ----------------------------------------------------------------
 %% 
-\def\Version{2017/10/20 v1.6}
+\def\Version{2018/05/01 v1.7}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{dccpaper-base}
     [\Version\space Common class code for IJDC and IDCC papers.]
 \RequirePackage[british]{babel}
 \RequirePackage{etoolbox}
-\RequirePackage[T1]{fontenc}
-\IfFileExists{newtxtext.sty}%
-  {\RequirePackage{newtxtext,newtxmath}}%
-  {\RequirePackage{times}}
-\RequirePackage[scaled=0.92]{helvet}
-\renewcommand{\ttdefault}{cmtt}
+\RequirePackage{iftex}
+\ifPDFTeX
+  \RequirePackage[T1]{fontenc}
+  \IfFileExists{newtxtext.sty}%
+    {\RequirePackage{newtxtext,newtxmath}}%
+    {\RequirePackage{times}}
+  \IfFileExists{tgheros.sty}%
+    {\ifx\undefined\qhv@scale\RequirePackage[scale=0.92]{tgheros}\fi}
+    {\RequirePackage[scaled=0.92]{helvet}}
+  \renewcommand{\ttdefault}{cmtt}
+\else
+  \RequirePackage[no-math]{fontspec}
+  \IfFileExists{newtxtext.sty}{%
+    \setmainfont{TeXGyreTermesX}
+    \RequirePackage{newtxmath}
+  }{%
+    \RequirePackage[T1]{fontenc}
+    \RequirePackage{times}
+    \renewcommand{\ttdefault}{cmtt}
+  }
+  \IfFontExistsTF{texgyreheros-regular.otf}{%
+    \setsansfont{texgyreheros}%
+      [ Extension = .otf
+      , UprightFont = *-regular
+      , ItalicFont = *-italic
+      , BoldFont = *-bold
+      , BoldItalicFont = *-bolditalic
+      , Scale = 0.92
+      ]
+  }{%
+    \RequirePackage[T1]{fontenc}
+    \RequirePackage[scaled=0.92]{helvet}
+  }
+\fi
 \RequirePackage{graphicx}
 \IfFileExists{xcolor.sty}%
   {\RequirePackage{xcolor}}%
   {\RequirePackage{color}}
-\definecolor[named]{struct}{rgb}{0,0.5,0.5}
-\definecolor[named]{links}{rgb}{0,0.4,0.4}
+\ifdcp@proposal
+  \definecolor[named]{struct}{rgb}{0.862,0.420,0.184}
+  \definecolor[named]{links}{rgb}{0.862,0.420,0.184}
+\else
+  \definecolor[named]{struct}{rgb}{0,0.5,0.5}
+  \definecolor[named]{links}{rgb}{0,0.4,0.4}
+\fi
 \RequirePackage{calc}
 
 \let\OrigLineBreak\\
@@ -53,9 +86,16 @@
   \everypar{}}
 
 \RequirePackage{ifpdf}
-\ifpdf
-  \ifdef{\pdfinterwordspaceon}{\pdfinterwordspaceon}{}
-\fi
+\newtoggle{dccp@dummyspaces}
+\def\fixspaces{\toggletrue{dccp@dummyspaces}}
+\def\nofixspaces{\togglefalse{dccp@dummyspaces}}
+\AtBeginDocument{%
+\iftoggle{dccp@dummyspaces}{%
+  \ifpdf
+    \ifdef{\pdfinterwordspaceon}{\pdfinterwordspaceon}{}%
+  \fi
+}{}%
+}
 
 \def\thecorrespondence{}
 \newcommand*{\correspondence}[1]{\def\thecorrespondence{#1}}
@@ -147,7 +187,7 @@
 \newcommand*{\theissue}{0}
 \newcommand*{\issue}[1]{\renewcommand*{\theissue}{#1}}
 \newcommand*{\thesubno}{0}
-\newcommand*{\subno}[1]{\renewcommand*{\thesubno}{#1}}
+\newcommand*{\subno}[1]{\renewcommand*{\thesubno}{#1}\fixspaces}
 \newcommand*{\thedoi}{10.2218/ijdc.v\thevolume i\theissue .\thesubno}
 \newcounter{lastpage}
 \setcounter{lastpage}{0}
@@ -479,7 +519,7 @@
     \defbibheading{bibliography}[\refname]{\section{#1}}%
     \DeclareFieldFormat{doi}{%
       \ifhyperref{%
-        \href{http://dx.doi.org/#1}{\nolinkurl{doi:#1}}%
+        \href{https://doi.org/#1}{\nolinkurl{doi:#1}}%
       }{%
         \nolinkurl{doi:#1}%
       }%
@@ -558,7 +598,7 @@
         }%
         \urlstyle{APACrm}
        }%
-      \newcommand{\doi}[1]{\href{http://dx.doi.org/#1}{\nolinkurl{doi:#1}}}%
+      \newcommand{\doi}[1]{\href{https://doi.org/#1}{\nolinkurl{doi:#1}}}%
       \renewcommand{\doiprefix}{\unskip}%
     }{}%
   }%
@@ -569,7 +609,7 @@
 }
 \PassOptionsToPackage{numberedbib}{apacite}
 
-\usepackage
+\RequirePackage
   [ colorlinks=true
   , linkcolor=black
   , anchorcolor=black
@@ -761,7 +801,7 @@
   \endgroup
 }
 %% 
-%% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2018 Digital Curation Centre, University of Edinburgh
 %% <info@dcc.ac.uk>
 %%
 %% End of file `dccpaper-base.sty'.
diff --git a/Master/texmf-dist/tex/latex/dccpaper/idcc.cls b/Master/texmf-dist/tex/latex/dccpaper/idcc.cls
index 365b8ad2823..7e4b7d82d3e 100644
--- a/Master/texmf-dist/tex/latex/dccpaper/idcc.cls
+++ b/Master/texmf-dist/tex/latex/dccpaper/idcc.cls
@@ -14,7 +14,7 @@
 %% See:     http://www.latex-project.org/lppl.txt
 %% ----------------------------------------------------------------
 %% 
-\def\Version{2017/10/20 v1.6}
+\def\Version{2018/05/01 v1.7}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{idcc}
     [\Version\space Class for submissions to the International Digital Curation Conference.]
@@ -24,37 +24,51 @@
 \url{http://www.dcc.ac.uk/events/international-digital-curation-conference-idcc}}
 \def\dccp@subject{\dccp@publ@long}
 
-\def\dccp@type{Practice Paper}
+\def\dccp@type@fallback{Extended Abstract}
+\def\dccp@type{\dccp@type@fallback}
+\newif\ifdcp@proposal
+\DeclareOption{abstract}{\def\dccp@type{Extended Abstract}}
 \DeclareOption{research}{\def\dccp@type{Research Paper}}
+\DeclareOption{lightning}{\def\dccp@type{Lightning Talk}\dcp@proposaltrue}
 \DeclareOption{data}{\def\dccp@type{Data Paper}}
-\DeclareOption{poster}{\def\dccp@type{Poster}}
-\DeclareOption{demo}{\def\dccp@type{Demonstration}}
-\DeclareOption{bof}{\def\dccp@type{Birds of a Feather}}
-\DeclareOption{workshop}{\def\dccp@type{Workshop}}
-\DeclareOption{practice}{\def\dccp@type{Practice Paper}}
+\DeclareOption{poster}{\def\dccp@type{Poster}\dcp@proposaltrue}
+\DeclareOption{demo}{\def\dccp@type{Demonstration}\dcp@proposaltrue}
+\DeclareOption{bof}{\def\dccp@type{Birds of a Feather}\dcp@proposaltrue}
+\DeclareOption{workshop}{\def\dccp@type{Workshop}\dcp@proposaltrue}
+\DeclareOption{practice}{\def\dccp@type{Practice Paper}\dcp@proposaltrue}
 \DeclareOption{15}{%
   \def\dccp@publ@short{IDCC15}
   \def\dccp@publ@msg{The 10th \dccp@publ@long\ takes place on 9--12 February
   2015 in London. URL: \url{http://www.dcc.ac.uk/events/idcc15/}}
   \def\dccp@subject{10th \dccp@publ@long, 2015}
+  \def\dccp@type@fallback{Practice Paper}
 }
 \DeclareOption{16}{%
   \def\dccp@publ@short{IDCC16}
   \def\dccp@publ@msg{The 11th \dccp@publ@long\ takes place on 22--25 February
   2016 in Amsterdam. URL: \url{http://www.dcc.ac.uk/events/idcc16/}}
   \def\dccp@subject{11th \dccp@publ@long, 2016}
+  \def\dccp@type@fallback{Practice Paper}
 }
 \DeclareOption{17}{%
   \def\dccp@publ@short{IDCC17}
   \def\dccp@publ@msg{The 12th \dccp@publ@long\ takes place on 20--23 February
   2017 in Edinburgh. URL: \url{http://www.dcc.ac.uk/events/idcc17/}}
   \def\dccp@subject{12th \dccp@publ@long, 2017}
+  \def\dccp@type@fallback{Practice Paper}
 }
 \DeclareOption{18}{%
   \def\dccp@publ@short{IDCC18}
   \def\dccp@publ@msg{The 13th \dccp@publ@long\ takes place on 19--22 February
     2018 in Barcelona. URL: \url{http://www.dcc.ac.uk/events/idcc18/}}
   \def\dccp@subject{13th \dccp@publ@long, 2018}
+  \def\dccp@type@fallback{Practice Paper}
+}
+\DeclareOption{19}{%
+  \def\dccp@publ@short{IDCC19}
+  \def\dccp@publ@msg{The 14th \dccp@publ@long\ takes place on 4--7 February
+    2019 in Melbourne. URL: \url{http://www.dcc.ac.uk/events/idcc19/}}
+  \def\dccp@subject{14th \dccp@publ@long, 2019}
 }
 \ProcessOptions\relax
 
@@ -77,9 +91,9 @@
 
 \LoadClass[a4paper,12pt,twoside]{article}
 
-\usepackage{dccpaper-base}
+\RequirePackage{dccpaper-base}
 %% 
-%% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2018 Digital Curation Centre, University of Edinburgh
 %% <info@dcc.ac.uk>
 %%
 %% End of file `idcc.cls'.
diff --git a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls
index c7b3534bfd1..ca087ecc1c2 100644
--- a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls
+++ b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls
@@ -14,12 +14,13 @@
 %% See:     http://www.latex-project.org/lppl.txt
 %% ----------------------------------------------------------------
 %% 
-\def\Version{2017/10/20 v1.6}
+\def\Version{2018/05/01 v1.7}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{ijdc-v9}
     [\Version\space Class for submissions to the International Journal of Digital Curation, volume 9 onwards.]
 \def\dccp@type{General Article}
 \def\dccp@editorial{Editorial}
+\newif\ifdcp@proposal
 \DeclareOption{editorial}{\let\dccp@type=\dccp@editorial%
   \AtBeginDocument{% Editorials use Roman numerals for page numbers
     \pagenumbering{roman}%
@@ -42,7 +43,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
   \thedate, Vol.\ \thevolume, Iss.\ \theissue, \thepage--\thelastpage.%
 }
 \def\dccp@titlefoot@doi{%
-  \url{http://dx.doi.org/\thedoi}\\
+  \url{https://doi.org/\thedoi}\\
   DOI: \thedoi
 }
 \def\dccp@normhead@doi{doi:\thedoi}
@@ -50,9 +51,9 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 
 \LoadClass[a4paper,12pt,twoside]{article}
 
-\usepackage{dccpaper-base}
+\RequirePackage{dccpaper-base}
 %% 
-%% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2018 Digital Curation Centre, University of Edinburgh
 %% <info@dcc.ac.uk>
 %%
 %% End of file `ijdc-v9.cls'.