From eaffc13f37b5616be731d10453b43ea2379c3d92 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 21 Jan 2015 23:40:27 +0000 Subject: dccpaper (21jan15) git-svn-id: svn://tug.org/texlive/trunk@36109 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/dccpaper/Makefile | 2 +- .../texmf-dist/source/latex/dccpaper/dccpaper.dtx | 52 +++++++++++++--------- 2 files changed, 33 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/source/latex/dccpaper') diff --git a/Master/texmf-dist/source/latex/dccpaper/Makefile b/Master/texmf-dist/source/latex/dccpaper/Makefile index 4ad993a5953..82c9bf97151 100644 --- a/Master/texmf-dist/source/latex/dccpaper/Makefile +++ b/Master/texmf-dist/source/latex/dccpaper/Makefile @@ -1,7 +1,7 @@ NAME = dccpaper SHELL = bash PWD = $(shell pwd) -TEMP := $(shell mktemp -d) +TEMP := $(shell mktemp -d -t tmp.XXXXXXXXXX) TDIR = $(TEMP)/$(NAME) VERS = $(shell ltxfileinfo -v $(NAME).dtx) LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL) diff --git a/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx b/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx index 7eaa709ed48..c1608026c83 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{2014/10/14 v1.3.1} +\def\Version{2015/01/21 v1.3.2} % %<*internal> \iffalse @@ -456,6 +456,16 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: \protected@xdef\thetitle{#2} \endgroup\endgroup } +% +% To prevent \LaTeX\ throwing an error if no title is supplied, we supply a +% fallback value and issue a warning instead. +% +\def\thetitle{% + Please supply a title + \ClassWarning{dccpaper}{% + Please supply a title in the preamble with \noexpand\title{}% + } +} % % We make |\thedate| persistent, borrowing the technique used in Peter Wilson's @@ -859,7 +869,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: \filcenter\normalfont\Large\bfseries } {\thesection} - {\quad} + {1em} {} % % The others use a |\normalsize| font so that makes life easier. The format @@ -878,25 +888,25 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: \normalfont\normalsize\bfseries } {\thesubsection} - {\quad} + {1em} {} \titleformat{\subsubsection} [block] {\normalfont\normalsize\bfseries} {\thesubsubsection} - {\quad} + {1em} {} \titleformat{\paragraph} [block] {\normalfont\normalsize\bfseries\itshape} {\thesubsubsection} - {\quad} + {1em} {} \titleformat{\subparagraph} [block] {\normalfont\normalsize\itshape} {\thesubsubsection} - {\quad} + {1em} {} % % DCC papers do not typically number their sections. @@ -1622,7 +1632,7 @@ Copyright (C) 2014 Digital Curation Centre, University of Edinburgh \revised{10 December 2013} \accepted{1 January 2014} -\usepackage{siunitx,csquotes} +\usepackage{dcolumn,csquotes} \usepackage[utf8]{inputenc} \usepackage[style=apa]{biblatex} @@ -1677,8 +1687,8 @@ Copyright (C) 2014 Digital Curation Centre, University of Edinburgh % For typesetting the implementation \usepackage{metalogo} -\usepackage{makedoc} -\usepackage{niceverb} +\usepackage{makedoc}[2012/04/03] +\usepackage{niceverb}[2012/08/27] \renewcommand{\SetOffInlineCmdBox}{\textcolor{red!75!black}} \renewcommand*{\TreatAsCode}[1]{% \ifPackageCode @@ -1929,7 +1939,7 @@ 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.} +\caption{Sample code for the beginning of an IJDC submission or IDCC full paper.} \label{fig:start-paper} \end{figure} @@ -1979,18 +1989,19 @@ Empty cells can either be left blank or represented by an em dash. A blank cell Captions should end in a full stop\slash period. \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 \textsf{siunitx} package was loaded in the preamble). +Table~\ref{tab:issues} demonstrates these features. The code used to produce the table is shown in Figure~\ref{fig:table} (note that the \textsf{dcolumn} package was loaded in the preamble). \begin{table}[ht] \caption{Papers and articles published in the IJDC in 2008 and 2009.} \label{tab:issues} -\sisetup{table-number-alignment=center,table-figures-integer=2,table-figures-decimal=0}% \centering\small -\begin{tabular}{lSSS[table-figures-decimal=1]S[table-figures-decimal=1]} +\begin{tabular}{lD..{2.0}D..{2.0}D..{2.1}D..{2.1}} \toprule & \multicolumn{2}{c}{Frequency} & \multicolumn{2}{c}{Percentage} \\ \cmidrule(lr){2-3}\cmidrule(l){4-5} -Issue & {Peer-reviewed} & {General} & {Peer-reviewed} & {General} \\ +Issue + & \multicolumn{1}{c}{Peer-reviewed} & \multicolumn{1}{c}{General} + & \multicolumn{1}{c}{Peer-reviewed} & \multicolumn{1}{c}{General} \\ \midrule 3(1) & 9 & 7 & 56.3 & 43.8 \\ 3(2) & 5 & 7 & 41.7 & 58.3 \\ @@ -2006,15 +2017,14 @@ Issue & {Peer-reviewed} & {General} & {Peer-reviewed} & {General} \\ \begin{table} \caption{Papers and articles published in the IJDC in 2008 and 2009.} \label{tab:issues} -\sisetup{table-number-alignment=center,table-figures-integer=2,% - table-figures-decimal=0}% \centering\small -\begin{tabular}{lSSS[table-figures-decimal=1]% - S[table-figures-decimal=1]} +\begin{tabular}{lD..{2.0}D..{2.0}D..{2.1}D..{2.1}} \toprule - & \multicolumn{2}{c}{Frequency} & \multicolumn{2}{c}{Percentage} \\ +& \multicolumn{2}{c}{Frequency} & \multicolumn{2}{c}{Percentage} \\ \cmidrule(lr){2-3}\cmidrule(l){4-5} -Issue & {Peer-reviewed} & {General} & {Peer-reviewed} & {General} \\ +Issue +& \multicolumn{1}{c}{Peer-reviewed} & \multicolumn{1}{c}{General} +& \multicolumn{1}{c}{Peer-reviewed} & \multicolumn{1}{c}{General} \\ \midrule 3(1) & 9 & 7 & 56.3 & 43.8 \\ 3(2) & 5 & 7 & 41.7 & 58.3 \\ @@ -2067,6 +2077,8 @@ Any acknowledgements should be placed in a section immediately before the refere \section{Appendix A: Change History} \begin{description} +\item[v1.3.2] 2015-01-21\\ +Removed dependence on user supplying a title. Fixed bug triggered by numbered sections. \item[v1.3.1] 2014-10-14\\ Fixed typographical error relating to details of IDCC 2015. \item[v1.3] 2014-08-07\\ -- cgit v1.2.3