From 94e7dfb978a1bd4455d0198c8d17938f35a78386 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 23 Jun 2015 18:19:20 +0000 Subject: dccpaper (22jun15) git-svn-id: svn://tug.org/texlive/trunk@37647 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/dccpaper/README | 2 +- Master/texmf-dist/doc/latex/dccpaper/README.txt | 2 +- .../doc/latex/dccpaper/dccpaper-base.doc | 36 ++++++++++++++++---- Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf | Bin 312572 -> 390772 bytes Master/texmf-dist/doc/latex/dccpaper/idcc.doc | 37 +++++++++++++++++++-- Master/texmf-dist/doc/latex/dccpaper/ijdc-v9.doc | 6 ++-- 6 files changed, 69 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/latex/dccpaper/README b/Master/texmf-dist/doc/latex/dccpaper/README index 3ffe5054a5d..82534a45b68 100644 --- a/Master/texmf-dist/doc/latex/dccpaper/README +++ b/Master/texmf-dist/doc/latex/dccpaper/README @@ -69,7 +69,7 @@ Manual way Licence ------- -Copyright 2014 Digital Curation Centre, University of Edinburgh. +Copyright 2015 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/README.txt b/Master/texmf-dist/doc/latex/dccpaper/README.txt index 3ffe5054a5d..82534a45b68 100644 --- a/Master/texmf-dist/doc/latex/dccpaper/README.txt +++ b/Master/texmf-dist/doc/latex/dccpaper/README.txt @@ -69,7 +69,7 @@ Manual way Licence ------- -Copyright 2014 Digital Curation Centre, University of Edinburgh. +Copyright 2015 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-base.doc b/Master/texmf-dist/doc/latex/dccpaper/dccpaper-base.doc index 19e84582887..f2a5297f37a 100644 --- a/Master/texmf-dist/doc/latex/dccpaper/dccpaper-base.doc +++ b/Master/texmf-dist/doc/latex/dccpaper/dccpaper-base.doc @@ -1,4 +1,4 @@ -\ProvidesFile{dccpaper-base.doc}[2015/01/22 automatically generated with makedoc.sty] +\ProvidesFile{dccpaper-base.doc}[2015/06/23 automatically generated with makedoc.sty] \begin{lstlisting}[firstnumber=1] %% %% This is file `dccpaper-base.tex', @@ -16,7 +16,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2015/01/21 v1.3.2} +\def\Version{2015/06/22 v1.4.1} \ProvidesFile{dccpaper-base.tex} [\Version\space Common class code for IJDC and IDCC papers.] \end{lstlisting} @@ -119,6 +119,18 @@ needed. \end{lstlisting} +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. + +\begin{lstlisting}[firstnumber=last] +\RequirePackage{ifpdf} +\ifpdf + \ifdef{\pdfinterwordspaceon}{\pdfinterwordspaceon}{} +\fi + +\end{lstlisting} + The classes have some special metadata requirements. We start with the author information. @@ -233,7 +245,7 @@ space. \begin{lstlisting}[firstnumber=last] \ifnum\theauthorsinblock=0% \stepcounter{block}% - \expandafter\def\csname block\roman{block}@auth\endcsname{#1}% + \expandafter\def\csname block\roman{block}@auth\endcsname{\Authfont#1}% \ifnum\theblock>1\appto\AuthorBlock{\quad}\fi \appto\AuthorBlock{% \stepcounter{block}% @@ -895,11 +907,23 @@ PDF bookmarks. \AtBeginDocument{ \@ifpackageloaded{biblatex}{% \defbibheading{bibliography}[\refname]{\section{#1}}% +\end{lstlisting} + +We also move the ‘doi:’ portion of a DOI inside the hyperlink. + +\begin{lstlisting}[firstnumber=last] + \DeclareFieldFormat{doi}{% + \ifhyperref{% + \href{http://dx.doi.org/#1}{\nolinkurl{doi:#1}}% + }{% + \nolinkurl{doi:#1}% + }% + } }{% \end{lstlisting} -If \textsf{apacite} is used, we can do the same with a package option (see -below). But there are a few other adaptations we need to make. +If \textsf{apacite} is used, there are a few other adaptations we need to +make. \begin{lstlisting}[firstnumber=last] \@ifpackageloaded{apacite}{% @@ -1338,7 +1362,7 @@ to embed the XMP packet. \endgroup } %% -%% Copyright (C) 2014 Digital Curation Centre, University of Edinburgh +%% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh %% %% %% End of file `dccpaper-base.tex'. diff --git a/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf b/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf index 03c29c3f96d..80c989538b8 100644 Binary files a/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf and b/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf differ diff --git a/Master/texmf-dist/doc/latex/dccpaper/idcc.doc b/Master/texmf-dist/doc/latex/dccpaper/idcc.doc index c832cb6ee59..ae8164a32b6 100644 --- a/Master/texmf-dist/doc/latex/dccpaper/idcc.doc +++ b/Master/texmf-dist/doc/latex/dccpaper/idcc.doc @@ -1,4 +1,4 @@ -\ProvidesFile{idcc.doc}[2015/01/22 automatically generated with makedoc.sty] +\ProvidesFile{idcc.doc}[2015/06/23 automatically generated with makedoc.sty] \begin{lstlisting}[firstnumber=1] %% %% This is file `idcc.cls', @@ -16,7 +16,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2015/01/21 v1.3.2} +\def\Version{2015/06/22 v1.4.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{idcc} [\Version\space Class for submissions to the International Digital Curation Conference.] @@ -72,16 +72,47 @@ associated option for overriding the fallback definitions for 2015 in London. URL: \url{http://www.dcc.ac.uk/events/idcc15/}} \def\dccp@subject{10th \dccp@publ@long, 2015} } +\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} +} \ProcessOptions\relax \end{lstlisting} +The |demo| option, if passed, would be passed on to the \textsf{graphics} +package wreaking havoc with each and every included image. To avoid this, +we clear it from the list of class options using +\href{http://tex.stackexchange.com/q/33245}{code from Enrico Gregorio}. + +\begin{lstlisting}[firstnumber=last] +\def\@clearglobaloption#1{% + \def\@tempa{#1}% + \def\@tempb{\@gobble}% + \@for\next:=\@classoptionslist\do{% + \ifx\next\@tempa + \message{Option \next\space has been hidden from subsequent packages}% + \else + \edef\@tempb{\@tempb,\next}% + \fi + }% + \let\@classoptionslist\@tempb + \expandafter\ifx\@tempb\@gobble + \let\@classoptionslist\@empty + \fi +} +\@clearglobaloption{demo} + +\end{lstlisting} + The rest of the formatting happens in the following file. \begin{lstlisting}[firstnumber=last] \input{dccpaper-base} %% -%% Copyright (C) 2014 Digital Curation Centre, University of Edinburgh +%% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh %% %% %% End of file `idcc.cls'. diff --git a/Master/texmf-dist/doc/latex/dccpaper/ijdc-v9.doc b/Master/texmf-dist/doc/latex/dccpaper/ijdc-v9.doc index 3be00313c74..ca9bec0975b 100644 --- a/Master/texmf-dist/doc/latex/dccpaper/ijdc-v9.doc +++ b/Master/texmf-dist/doc/latex/dccpaper/ijdc-v9.doc @@ -1,4 +1,4 @@ -\ProvidesFile{ijdc-v9.doc}[2015/01/22 automatically generated with makedoc.sty] +\ProvidesFile{ijdc-v9.doc}[2015/06/23 automatically generated with makedoc.sty] \begin{lstlisting}[firstnumber=1] %% %% This is file `ijdc-v9.cls', @@ -16,7 +16,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2015/01/21 v1.3.2} +\def\Version{2015/06/22 v1.4.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ijdc-v9} [\Version\space Class for submissions to the International Journal of Digital Curation, volume 9 onwards.] @@ -85,7 +85,7 @@ The rest of the formatting happens in the following file. \begin{lstlisting}[firstnumber=last] \input{dccpaper-base} %% -%% Copyright (C) 2014 Digital Curation Centre, University of Edinburgh +%% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh %% %% %% End of file `ijdc-v9.cls'. -- cgit v1.2.3