dccpaper (8aug14)

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

1 files changed, 108 insertions, 33 deletions

diff --git a/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx b/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx
index 9776ea65b7e..453de0d70fc 100644
--- a/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx
+++ b/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx
@@ -1,9 +1,10 @@
 % \iffalse meta-comment
+%<*internal|ijdc9|idcc|base>
+\def\Version{2014/08/07 v1.3}
+%</internal|ijdc9|idcc|base>
 %<*internal>
-\def\Version{2014/04/11 v1.2}
 \iffalse
 %</internal>
-%<ijdc9|idcc|base>\def\Version{2014/04/11 v1.2}
 %<*readme>
 The dccpaper bundle: LaTeX classes for submissions to IJDC and IDCC
 ===================================================================
@@ -199,8 +200,10 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % The |practice| option is redundant, but included for symmetry.
 %
 \DeclareOption{research}{\def\dccp@type{Research Paper}}
+\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}}
 %
@@ -210,8 +213,8 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 %
 \DeclareOption{15}{%
   \def\dccp@publ@short{IDCC15}
-  \def\dccp@publ@msg{The 10th \dccp@publ@long\ takes place on [TBC] in [TBC].
-  URL: \url{http://www.dcc.ac.uk/events/idcc15/}}
+  \def\dccp@publ@msg{The 10th \dccp@publ@long\ takes place on 9--12 February
+  2014 in London. URL: \url{http://www.dcc.ac.uk/events/idcc15/}}
   \def\dccp@subject{10th \dccp@publ@long, 2015}
 }
 \ProcessOptions\relax
@@ -342,6 +345,11 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 %
 \newcommand{\MainAuthor}{}
 %
+% The |\dccp@author| command, meanwhile, collects a full list of authors for the
+% PDF metatdata.
+% 
+\newcommand{\dccp@author}{}
+%
 % We define counters for 
 % \begin{itemize}
 % \item the total number of authors defined;
@@ -366,10 +374,14 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 % If this is the first or second |\author| command, we add the name to our 
 % abbreviated list of authors. Otherwise, we replace the name of the second 
 % and subsequent authors with `et al.' in that list.
+% 
+% At the same time, we use a simpler technique to populate |\dccp@author|.
 %
   \ifnum\theauthors=0
+    \def\dccp@author{#1}%
     \def\MainAuthor{#1}%
   \else
+    \appto\dccp@author{, #1}%
     \ifnum\theauthors=1%
       \def\OtherMainAuthors{ and #1}%
       \appto\MainAuthor{\OtherMainAuthors}%
@@ -550,12 +562,14 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
   \setlength\@tempdimb{\baselineskip}%
   \multiply\@tempdimb\@tempcnta
   \advance\@tempdima-\@tempdimb
+  \global\advance\footskip\@tempdima
   \multiply\@tempdima\tw@
   \ifdim\@tempdima>\baselineskip
     \addtolength\@tempdimb{\baselineskip}%
+    \global\advance\footskip-\baselineskip
   \fi
   \addtolength\@tempdimb{\topskip}%
-  \textheight\@tempdimb
+  \global\textheight\@tempdimb
 }
 
 %
@@ -567,6 +581,11 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 \setlength{\oddsidemargin}{30mm - \hoffset - 1in}
 \setlength{\evensidemargin}{30mm - \hoffset - 1in}
 %
+% It is rare to have marginal notes, but in case we ever do, we centre them in
+% the margin.
+%
+\setlength{\marginparwidth}{30mm - 2\marginparsep}
+%
 % We also want a distance of 15mm from the top of the page to the top of the 
 % header, and two blank lines between the bottom of the header and the top of 
 % the textblock.
@@ -711,7 +730,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
   \newsavebox{\dccp@firstpagehead}
   \sbox\dccp@firstpagehead{\normalfont\TitleHead}
   \newsavebox{\dccp@firstpagefoot}
-  \sbox\dccp@firstpagehead{\normalfont
+  \sbox\dccp@firstpagefoot{\normalfont
     \def\email#1{#1}\def\url#1{#1}\def\href#1#2{#2}\TitleFoot}
   \newsavebox{\dccp@restpagehead}
   \sbox\dccp@restpagehead{\normalfont\NormalHead}
@@ -730,7 +749,6 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
     - \headheight
     - \headsep
     - \footskip
-    + \baselineskip
   }
 %
 % {\dots}and provide a macro that will reset the geometry for the remaining 
@@ -738,36 +756,40 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 %
   \def\dccp@resetgeometry{%
     \setlength{\headheight}{\ht\dccp@restpagehead + \dp\dccp@restpagehead}
+    \global\headheight=\headheight
     \setlength{\footskip}{%
-      2\baselineskip + \ht\dccp@firstpagefoot + \dp\dccp@firstpagefoot
+      2\baselineskip + \ht\dccp@restpagefoot
     }
+    \global\footskip=\footskip
     \setlength{\textheight}{%
       \paperheight
       - 30mm % 15mm top and bottom
       - \headheight
       - \headsep
       - \footskip
-      + \baselineskip
     }
     \FixTextHeight
+    \global\textheight=\textheight
   }
 }
 
 %
-% The |\maketitle| command is redefined to to correct formatting. At the end it
-% resets the geometry, but this only takes effect on the second page. It is here 
-% rather than at the end of the abstract in case the abstract itself spills over 
-% to the second page.
+% The |\maketitle| command is redefined to the correct formatting. At the end it
+% sets a hook that will reset the geometry when the first page is shipped out,
+% i.e.\ with effect from the second page. It is here rather than at the end of
+% the abstract in case the abstract itself spills over to the second page.
 %
+\RequirePackage{atbegshi}
 \renewcommand{\maketitle}{%
   \null\nobreak\vspace*{-0.528\baselineskip}%
   \begingroup
     \centering
-    { \Large\thetitle\par}
+    {\Large\thetitle\par}
     \vspace{0.7\baselineskip}
     \AuthorBlock\par
     \vspace{1.7\baselineskip}
-  \endgroup\dccp@resetgeometry
+  \endgroup
+  \AtBeginShipoutNext{\dccp@resetgeometry}%
 }
 
 %
@@ -902,12 +924,42 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
   ]{caption}
 
 %
-% Footnotes should be set right up against the left margin
+% Footnotes should be set right up against the left margin. They should be
+% set hung and in the same half-ragged style as the main text. They should also,
+% for neatness, be at the bottom of the page regardless of how short it is. The
+% \textsf{footmisc} package helps here.
+%
+\RequirePackage[hang,bottom]{footmisc}
+\settowidth{\footnotemargin}{\footnotesize\textsuperscript{99}\space}
+\renewcommand{\footnotelayout}{\raggedyright}
 %
-\renewcommand\@makefntext[1]{%
-  \parindent 1em%
-  \noindent
-  \@makefnmark~#1%
+% Also, if multiple footnotes are set at once, the markers should be separated
+% with superscript commas. The \textsf{footmisc} package should help here but
+% its solution is clobbered by \textsf{hyperref}. So after a footnote is set,
+% we check to see if the next token is also a footnote, and if so, slip a comma
+% in before it.\footnote{This solution was provided at 
+% \url{http://tex.stackexchange.com/q/40072}} This tweak needs to be done late,
+% |\AtBeginDocument|. Note that the \textsf{newtx} superior figures are a bit
+% lower than normal superscript text.
+%
+\AtBeginDocument{
+  \let\dccp@footnote\footnote
+  \def\dccp@next@token{\relax}%
+  \def\dccp@supercomma{\textsuperscript{,}}%
+  \IfFileExists{newtxtext.sty}%
+    {\def\dccp@supercomma{\raisebox{-0.2ex}{\textsuperscript{,}}}}%
+    {}
+
+  \newcommand\dccp@check@for@footnote{%
+    \ifx\footnote\dccp@next@token
+      \dccp@supercomma
+    \fi
+  }
+
+  \renewcommand\footnote[1]{%
+    \dccp@footnote{#1}%
+    \futurelet\dccp@next@token\dccp@check@for@footnote
+  }
 }
 
 %
@@ -915,6 +967,8 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 %
 \topsep = \z@
 \partopsep = \z@
+\appto{\enumerate}{\itemsep = 0.5ex plus 0.25ex minus 0.25ex}
+\appto{\itemize}{\itemsep = 0.5ex plus 0.25ex minus 0.25ex}
 
 %
 % A DCC paper should either be using \textsf{biblatex} or \textsf{apacite} for
@@ -1080,7 +1134,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
 \AtBeginDocument{%
   \hypersetup
     { pdftitle={\thetitle}
-    , pdfauthor={\MainAuthor}
+    , pdfauthor={\dccp@author}
     , pdfsubject={\dccp@subject}
     }
 %
@@ -1590,6 +1644,7 @@ Copyright (C) 2014 Digital Curation Centre, University of Edinburgh
   , texcsstyle=*\color{red!75!black}
   , moretexcs=
     { affil
+    , conference
     , correspondence
     , submitted
     , received
@@ -1694,10 +1749,12 @@ The \LaTeX\ class \textsf{ijdc-v9} produces camera-ready papers and articles sui
 Certain aspects of the template design have been implemented using third-party packages, aside from those that are required parts of the \LaTeX\ system. Therefore you should ensure that you have these packages installed on your system before attempting to use the class.
 
 \begin{itemize}
-\item\textsf{titlesec} is used to format the section headings.
+\item\textsf{atbegshi} is used for switching geometry between pages.
 \item Tables in your document must be formatted according to the design principles promoted and supported by the \textsf{booktabs} package.
 \item\textsf{caption} is used to format the figure and table captions.
 \item\textsf{etoolbox} is used behind the scenes for patching commands.
+\item\textsf{footmisc} is used to format the footnotes.
+\item\textsf{titlesec} is used to format the section headings.
 \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.
@@ -1733,10 +1790,14 @@ Two types of option are available for \textsf{idcc}. The first relates to the ty
 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.
+\item[data]
+Use this for data paper abstracts and full data papers.
 \item[poster]
 Use this for poster abstracts.
 \item[demo]
 Use this for demonstration proposals.
+\item[bof]
+Use this for Birds of a Feather session abstracts.
 \item[workshop]
 Use this for workshop proposals.
 \end{description}
@@ -1785,6 +1846,16 @@ The affiliation (institution, company) of the immediately preceding author(s). T
 Name, address and email address of the corresponding author. This information appears in the footer of the cover page.
 \end{description}
 
+If an IJDC submission is a reworked conference paper (that has not already been formally published), for reasons of transparency the name of the conference should be given.
+
+\begin{description}
+\item[]
+\hskip-\labelsep
+\lstinline|\conference{$\subtext{name of conference}$}|
+\hskip\labelsep
+The conference at which the earlier version of the paper was presented, e.g.\ ‘the 10th International Digital Curation Conference’.
+\end{description}
+
 For IDCC papers, authors are invited to record the date on which they made their submission.
 
 \begin{description}
@@ -1993,10 +2064,11 @@ Any acknowledgements should be placed in a section immediately before the refere
 %%\bibliography{dccpaper-apacite.bib}
 
 \newpage
-\section{Appendix}
-\subsection{Change History}
+\section{Appendix A: Change History}
 
 \begin{description}
+\item[v1.3] 2014-08-07\\
+Added documentation of \lstinline|\conference| command. Improved display of footnotes, footnote markers and \texttt{itemize}\slash \texttt{enumerate} lists. Fixed a bug in the handling of author information. Fixed and improved how the transition from first to subsequent page geometry is achieved. Updated the details of IDCC 2015.
 \item[v1.2] 2014-04-11\\
 Added implementation, installation and licence sections to the Appendix of the documentation. Moved the majority of the file postamble information to the README, and synchronized the latter with the GitHub version. Improved the adaptation of \textsf{apacite} referencing to the house style.
 \item[v1.1] 2014-03-06\\
@@ -2005,7 +2077,8 @@ Refactored the source for distribution through CTAN, and to allow the addition o
 First public release of \textsf{ijdc-v9} class.
 \end{description}
 
-\subsection{Implementation}
+\newpage
+\section{Appendix B: Implementation}
 
 \lstset
   { aboveskip=1em plus 0.5em minus 0.2em
@@ -2019,26 +2092,27 @@ First public release of \textsf{ijdc-v9} class.
   }%
 \useNiceVerb
 
-\subsubsection{ijdc-v9.cls}
+\subsection{ijdc-v9.cls}
 
 \renewcommand*{\mdJobName}{ijdc-v9}
 \MakeInputJobDoc[cls]{0}{\ProcessInputWith{PScomment}}
 
-\subsubsection{idcc.cls}
+\subsection{idcc.cls}
 
 \renewcommand*{\mdJobName}{idcc}
 \MakeInputJobDoc[cls]{0}{\ProcessInputWith{PScomment}}
 
-\subsubsection{dccpaper-base.tex}
+\subsection{dccpaper-base.tex}
 
 \renewcommand*{\mdJobName}{dccpaper-base}
 \MakeInputJobDoc[tex]{0}{\ProcessInputWith{PScomment}}
 
 \noNiceVerb
 
-\subsection{Installation}
+\newpage
+\section{Appendix C: Installation}
 
-\subsubsection{Managed way}
+\subsection{Managed way}
 
 The latest stable release of the dccpaper bundle has been packaged for
 \TeX\ Live and MiK\TeX. If you are running \TeX\ Live and have \texttt{tlmgr}
@@ -2048,7 +2122,7 @@ install the bundle by running \texttt{mpm -{}-install=dccpaper}. Both
 \texttt{tlmgr} and \texttt{mpm} have GUI versions that you might find
 friendlier.
 
-\subsubsection{Automated way}
+\subsection{Automated way}
 
 A makefile is provided which you can use with the Make utility:
 
@@ -2079,7 +2153,7 @@ A makefile is provided which you can use with the Make utility:
   tree.
 \end{itemize}
 
-\subsubsection{Manual way}
+\subsection{Manual way}
 
 \begin{enumerate}
 \item
@@ -2107,7 +2181,8 @@ A makefile is provided which you can use with the Make utility:
   before \TeX\ and friends can see the files.
 \end{enumerate}
 
-\subsection{Licence}
+\newpage
+\section{Appendix D: Licence}
 
 Copyright \textcopyright\ 2014 Digital Curation Centre, University of Edinburgh.