From 811a25516a4454cdba0b70f9c45da1552cad1308 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 8 Aug 2014 21:23:59 +0000 Subject: dccpaper (8aug14) git-svn-id: svn://tug.org/texlive/trunk@34876 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/dccpaper/dccpaper-base.doc | 95 ++++++++++++++++----- Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf | Bin 314946 -> 322811 bytes Master/texmf-dist/doc/latex/dccpaper/idcc.doc | 10 ++- Master/texmf-dist/doc/latex/dccpaper/ijdc-v9.doc | 4 +- 4 files changed, 84 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/dccpaper/dccpaper-base.doc b/Master/texmf-dist/doc/latex/dccpaper/dccpaper-base.doc index 9ac5b197fca..337bc0ba863 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}[2014/04/23 automatically generated with makedoc.sty] +\ProvidesFile{dccpaper-base.doc}[2014/08/08 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{2014/04/11 v1.2} +\def\Version{2014/08/07 v1.3} \ProvidesFile{dccpaper-base.tex} [\Version\space Common class code for IJDC and IDCC papers.] \end{lstlisting} @@ -164,6 +164,13 @@ the headers. \newcommand{\MainAuthor}{} \end{lstlisting} +The |\dccp@author| command, meanwhile, collects a full list of authors for the +PDF metatdata. + +\begin{lstlisting}[firstnumber=last] +\newcommand{\dccp@author}{} +\end{lstlisting} + We define counters for \begin{itemize} \item the total number of authors defined; @@ -195,10 +202,14 @@ 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|. + \begin{lstlisting}[firstnumber=last] \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}% @@ -405,12 +416,14 @@ code from Hideo Umeki's \textsf{geometry} package (2002/07/08 v3.2). \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 } \end{lstlisting} @@ -425,6 +438,13 @@ context makes the paper more pleasant to read on screen). \setlength{\evensidemargin}{30mm - \hoffset - 1in} \end{lstlisting} +It is rare to have marginal notes, but in case we ever do, we centre them in +the margin. + +\begin{lstlisting}[firstnumber=last] +\setlength{\marginparwidth}{30mm - 2\marginparsep} +\end{lstlisting} + 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. @@ -582,7 +602,7 @@ measure (i.e.\ |\dccp@firstpagehead|, |\dccp@firstpagefoot|, \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} @@ -603,7 +623,6 @@ We can now set the geometry of the title page\dots - \headheight - \headsep - \footskip - + \baselineskip } \end{lstlisting} @@ -613,38 +632,42 @@ pages. \begin{lstlisting}[firstnumber=last] \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 } } \end{lstlisting} -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. \begin{lstlisting}[firstnumber=last] +\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}% } \end{lstlisting} @@ -796,13 +819,45 @@ We use the \textsf{caption} package to give captions the right format. \end{lstlisting} -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. \begin{lstlisting}[firstnumber=last] -\renewcommand\@makefntext[1]{% - \parindent 1em% - \noindent - \@makefnmark~#1% +\RequirePackage[hang,bottom]{footmisc} +\settowidth{\footnotemargin}{\footnotesize\textsuperscript{99}\space} +\renewcommand{\footnotelayout}{\raggedyright} +\end{lstlisting} + +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. + +\begin{lstlisting}[firstnumber=last] +\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 + } } \end{lstlisting} @@ -812,6 +867,8 @@ By default lists are quite loose. These settings help to tighten them. \begin{lstlisting}[firstnumber=last] \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} \end{lstlisting} @@ -1001,7 +1058,7 @@ PDF metadata. \AtBeginDocument{% \hypersetup { pdftitle={\thetitle} - , pdfauthor={\MainAuthor} + , pdfauthor={\dccp@author} , pdfsubject={\dccp@subject} } \end{lstlisting} diff --git a/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf b/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf index 54b805084aa..2caaa79d575 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 c888a600b92..867b7088105 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}[2014/04/23 automatically generated with makedoc.sty] +\ProvidesFile{idcc.doc}[2014/08/08 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{2014/04/11 v1.2} +\def\Version{2014/08/07 v1.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{idcc} [\Version\space Class for submissions to the International Digital Curation Conference.] @@ -53,8 +53,10 @@ The |practice| option is redundant, but included for symmetry. \begin{lstlisting}[firstnumber=last] \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}} \end{lstlisting} @@ -66,8 +68,8 @@ associated option for overriding the fallback definitions for \begin{lstlisting}[firstnumber=last] \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 diff --git a/Master/texmf-dist/doc/latex/dccpaper/ijdc-v9.doc b/Master/texmf-dist/doc/latex/dccpaper/ijdc-v9.doc index 106a466298e..61212c7db0f 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}[2014/04/23 automatically generated with makedoc.sty] +\ProvidesFile{ijdc-v9.doc}[2014/08/08 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{2014/04/11 v1.2} +\def\Version{2014/08/07 v1.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ijdc-v9} [\Version\space Class for submissions to the International Journal of Digital Curation, volume 9 onwards.] -- cgit v1.2.3