From a60c899015aeb03e242f1df83e8670f6c00a8bce Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 May 2018 22:38:57 +0000 Subject: dccpaper (14may18) git-svn-id: svn://tug.org/texlive/trunk@47717 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf | Bin 244779 -> 243878 bytes .../texmf-dist/source/latex/dccpaper/dccpaper.dtx | 131 +++++++++++++++++---- .../tex/latex/dccpaper/dccpaper-base.sty | 85 ++++++++++--- Master/texmf-dist/tex/latex/dccpaper/idcc.cls | 2 +- Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls | 2 +- 5 files changed, 177 insertions(+), 43 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf b/Master/texmf-dist/doc/latex/dccpaper/dccpaper.pdf index f0356bf8aac..97e6fea0022 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/source/latex/dccpaper/dccpaper.dtx b/Master/texmf-dist/source/latex/dccpaper/dccpaper.dtx index ea3f15dfc7b..9b64a0b18b0 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{2018/05/01 v1.7} +\def\Version{2018/05/14 v1.7.1} % %<*internal> \iffalse @@ -489,7 +489,7 @@ In some cases the class prefers to use packages that are not part of the base in \begin{itemize} \item -\pkg{newtx} will be used if available in place of \pkg{times}, and +\pkg{newtx} will be used if available in place of \pkg{mathptmx}, and \pkg{tgheros} will be used in place of \pkg{helvet}. \item \pkg{xcolor} will be used if available in place of \pkg{color}. @@ -875,6 +875,8 @@ Any acknowledgements should be placed in a section immediately before the refere \section{Appendix A: Change History} \begin{description} +\item[v1.7.1] 2018-05-14\\ +Fixed loading of maths fonts. Reverted experimental formatting. \item[v1.7] 2018-05-01\\ Added details of IDCC 2019, along with new formatting and submission types. \item[v1.6] 2017-10-20\\ @@ -1380,31 +1382,116 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: % \end{macrocode} % % The \pkg{dccpaper} classes use Times as the main text font. We prefer -% \pkg{newtx} as it provides support for mathematics, but the standard -% \pkg{times} package will do. In case they are needed, we also provide -% Helvetica for the sans serif font and Computer Modern Teletype for the -% monospaced. +% \pkg{newtx} as it is available in both legacy form (for PDF\LaTeX) and OTF +% (for Lua\LaTeX and \XeLaTeX), but the standard \pkg{mathptmx} package will do. +% In case they are needed, we also provide \TeX\ Gyre Heros\slash Helvetica for +% the sans serif font and Latin\slash Computer Modern Teletype for the +% monospaced. The code is a little complicated to cope with several variations of +% what people might have installed. +% +% Unfortunately, \textsf{newtxmath} (since v1.55) loads \pkg{etextools} which breaks +% \pkg{biblatex}, so we save \cs{forlistloop} and restore it later. +% +% \begin{macrocode} +\let\origforlistloop\forlistloop +\PassOptionsToPackage{noerroretextools=true}{biblatex} +% \end{macrocode} +% +% Things are straightforward when PDF\LaTeX\ is used. Note that \textsf{newtxtext} +% emulates \pkg{tgheros} so all we have to do is set the scaling factor. It also +% switches the monospaced font, so we switch it back. % % \begin{macrocode} \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}} + \IfFileExists{newtxtext.sty}{% + \RequirePackage{newtxtext,newtxmath} + }{% + \RequirePackage{mathptmx}} + \IfFileExists{tgheros.sty}{% + \ifx\undefined\qhv@scale + \RequirePackage[scale=0.92]{tgheros}\else + \def\qhv@scale{0.92}\fi + }{% + \RequirePackage[scaled=0.92]{helvet}} \renewcommand{\ttdefault}{cmtt} +% \end{macrocode} +% +% To avoid problems with input and output encodings, if \LuaTeX\ or \XeLaTeX\ is used, +% we switch to using the \textsf{newtxtext} OTF font for text, if available. +% +% \begin{macrocode} \else - \RequirePackage[no-math]{fontspec} + \RequirePackage{fontspec} \IfFileExists{newtxtext.sty}{% \setmainfont{TeXGyreTermesX} +% \end{macrocode} +% +% Using \textsf{newtxmath} for mathematics generally works, but the package assumes +% certain characters will fall back to text equivalents, which works under T1 encoding +% but not under the TU encoding used by \pkg{fontspec}. This solution is from egreg's +% answer on TeX.se: \url{https://tex.stackexchange.com/a/394139}. +% +% \begin{macrocode} \RequirePackage{newtxmath} + \DeclareSymbolFont{oldoperators}{OT1}{ntxtlf}{m}{n} + \SetSymbolFont{oldoperators}{bold}{OT1}{ntxtlf}{b}{n} + \AtBeginDocument{% +\DeclareMathSymbol{0}{\mathalpha}{operators}{`0}% +\DeclareMathSymbol{1}{\mathalpha}{operators}{`1}% +\DeclareMathSymbol{2}{\mathalpha}{operators}{`2}% +\DeclareMathSymbol{3}{\mathalpha}{operators}{`3}% +\DeclareMathSymbol{4}{\mathalpha}{operators}{`4}% +\DeclareMathSymbol{5}{\mathalpha}{operators}{`5}% +\DeclareMathSymbol{6}{\mathalpha}{operators}{`6}% +\DeclareMathSymbol{7}{\mathalpha}{operators}{`7}% +\DeclareMathSymbol{8}{\mathalpha}{operators}{`8}% +\DeclareMathSymbol{9}{\mathalpha}{operators}{`9}% +\DeclareMathSymbol{\Gamma}{\mathalpha}{oldoperators}{"00}% +\DeclareMathSymbol{\Delta}{\mathalpha}{oldoperators}{"01}% +\DeclareMathSymbol{\Theta}{\mathalpha}{oldoperators}{"02}% +\DeclareMathSymbol{\Lambda}{\mathalpha}{oldoperators}{"03}% +\DeclareMathSymbol{\Xi}{\mathalpha}{oldoperators}{"04}% +\DeclareMathSymbol{\Pi}{\mathalpha}{oldoperators}{"05}% +\DeclareMathSymbol{\Sigma}{\mathalpha}{oldoperators}{"06}% +\DeclareMathSymbol{\Upsilon}{\mathalpha}{oldoperators}{"07}% +\DeclareMathSymbol{\Phi}{\mathalpha}{oldoperators}{"08}% +\DeclareMathSymbol{\Psi}{\mathalpha}{oldoperators}{"09}% +\DeclareMathSymbol{\Omega}{\mathalpha}{oldoperators}{"0A}% +\DeclareMathSymbol{!}{\mathclose}{operators}{"21}% +\DeclareMathSymbol{+}{\mathbin}{operators}{"2B}% +\DeclareMathSymbol{:}{\mathrel}{operators}{"3A}% +\DeclareMathSymbol{;}{\mathpunct}{operators}{"3B}% +\DeclareMathSymbol{=}{\mathrel}{operators}{"3D}% +\DeclareMathSymbol{?}{\mathclose}{operators}{"3F}% +\DeclareMathDelimiter{(}{\mathopen} {operators}{"28}{largesymbols}{"00}% +\DeclareMathDelimiter{)}{\mathclose}{operators}{"29}{largesymbols}{"01}% +\DeclareMathDelimiter{[}{\mathopen} {operators}{"5B}{largesymbols}{"02}% +\DeclareMathDelimiter{]}{\mathclose}{operators}{"5D}{largesymbols}{"03}% +\DeclareMathAccent{\acute}{\mathalpha}{operators}{"B4}% +\ifLuaTeX\DeclareMathAccent{\grave}{\mathalpha}{operators}{"60}\fi +\DeclareMathAccent{\ddot}{\mathalpha}{operators}{"A8}% +\DeclareMathAccent{\tilde}{\mathalpha}{oldoperators}{"7E}% +\DeclareMathAccent{\bar}{\mathalpha}{oldoperators}{"16}% +\DeclareMathAccent{\breve}{\mathalpha}{oldoperators}{"15}% +\DeclareMathAccent{\check}{\mathalpha}{oldoperators}{"14}% +\DeclareMathAccent{\hat}{\mathalpha}{oldoperators}{"5E}% +\DeclareMathAccent{\dot}{\mathalpha}{oldoperators}{"5F}% +\DeclareMathAccent{\mathring}{\mathalpha}{oldoperators}{"17}% +\DeclareMathSymbol{\mathdollar}{\mathord}{operators}{"24}% + } +% \end{macrocode} +% +% If \pkg{newtx} is not installed we admit defeat and revert to \pkg{mathptmx}. +% If \TeX\ Gyre Heros is available in OTF form we use that, otherwise we fall +% back to \pkg{helvet}; we use a gentle hack to force the the right encoding. +% The monospaced font is left untouched as the \pkg{fontspec} default. +% +% \begin{macrocode} }{% \RequirePackage[T1]{fontenc} - \RequirePackage{times} - \renewcommand{\ttdefault}{cmtt} + \RequirePackage{mathptmx} } \IfFontExistsTF{texgyreheros-regular.otf}{% \setsansfont{texgyreheros}% @@ -1416,10 +1503,13 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: , Scale = 0.92 ] }{% - \RequirePackage[T1]{fontenc} + \IfFileExists{newtxtext.sty}{% + \appto\sffamily{\fontencoding{T1}\selectfont}% + }{} \RequirePackage[scaled=0.92]{helvet} } \fi +\let\forlistloop\origforlistloop % \end{macrocode} % % We will need support for included graphics and colour. The structural elements @@ -1431,13 +1521,8 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: \IfFileExists{xcolor.sty}% {\RequirePackage{xcolor}}% {\RequirePackage{color}} -\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 +\definecolor[named]{struct}{rgb}{0,0.5,0.5} +\definecolor[named]{links}{rgb}{0,0.4,0.4} % \end{macrocode} % % We will calculate some lengths later. diff --git a/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty b/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty index be0915c1067..11a76d8cb31 100644 --- a/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty +++ b/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty @@ -14,31 +14,82 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/05/01 v1.7} +\def\Version{2018/05/14 v1.7.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{dccpaper-base} [\Version\space Common class code for IJDC and IDCC papers.] \RequirePackage[british]{babel} \RequirePackage{etoolbox} +\let\origforlistloop\forlistloop +\PassOptionsToPackage{noerroretextools=true}{biblatex} \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}} + \IfFileExists{newtxtext.sty}{% + \RequirePackage{newtxtext,newtxmath} + }{% + \RequirePackage{mathptmx}} + \IfFileExists{tgheros.sty}{% + \ifx\undefined\qhv@scale + \RequirePackage[scale=0.92]{tgheros}\else + \def\qhv@scale{0.92}\fi + }{% + \RequirePackage[scaled=0.92]{helvet}} \renewcommand{\ttdefault}{cmtt} \else - \RequirePackage[no-math]{fontspec} + \RequirePackage{fontspec} \IfFileExists{newtxtext.sty}{% \setmainfont{TeXGyreTermesX} \RequirePackage{newtxmath} + \DeclareSymbolFont{oldoperators}{OT1}{ntxtlf}{m}{n} + \SetSymbolFont{oldoperators}{bold}{OT1}{ntxtlf}{b}{n} + \AtBeginDocument{% +\DeclareMathSymbol{0}{\mathalpha}{operators}{`0}% +\DeclareMathSymbol{1}{\mathalpha}{operators}{`1}% +\DeclareMathSymbol{2}{\mathalpha}{operators}{`2}% +\DeclareMathSymbol{3}{\mathalpha}{operators}{`3}% +\DeclareMathSymbol{4}{\mathalpha}{operators}{`4}% +\DeclareMathSymbol{5}{\mathalpha}{operators}{`5}% +\DeclareMathSymbol{6}{\mathalpha}{operators}{`6}% +\DeclareMathSymbol{7}{\mathalpha}{operators}{`7}% +\DeclareMathSymbol{8}{\mathalpha}{operators}{`8}% +\DeclareMathSymbol{9}{\mathalpha}{operators}{`9}% +\DeclareMathSymbol{\Gamma}{\mathalpha}{oldoperators}{"00}% +\DeclareMathSymbol{\Delta}{\mathalpha}{oldoperators}{"01}% +\DeclareMathSymbol{\Theta}{\mathalpha}{oldoperators}{"02}% +\DeclareMathSymbol{\Lambda}{\mathalpha}{oldoperators}{"03}% +\DeclareMathSymbol{\Xi}{\mathalpha}{oldoperators}{"04}% +\DeclareMathSymbol{\Pi}{\mathalpha}{oldoperators}{"05}% +\DeclareMathSymbol{\Sigma}{\mathalpha}{oldoperators}{"06}% +\DeclareMathSymbol{\Upsilon}{\mathalpha}{oldoperators}{"07}% +\DeclareMathSymbol{\Phi}{\mathalpha}{oldoperators}{"08}% +\DeclareMathSymbol{\Psi}{\mathalpha}{oldoperators}{"09}% +\DeclareMathSymbol{\Omega}{\mathalpha}{oldoperators}{"0A}% +\DeclareMathSymbol{!}{\mathclose}{operators}{"21}% +\DeclareMathSymbol{+}{\mathbin}{operators}{"2B}% +\DeclareMathSymbol{:}{\mathrel}{operators}{"3A}% +\DeclareMathSymbol{;}{\mathpunct}{operators}{"3B}% +\DeclareMathSymbol{=}{\mathrel}{operators}{"3D}% +\DeclareMathSymbol{?}{\mathclose}{operators}{"3F}% +\DeclareMathDelimiter{(}{\mathopen} {operators}{"28}{largesymbols}{"00}% +\DeclareMathDelimiter{)}{\mathclose}{operators}{"29}{largesymbols}{"01}% +\DeclareMathDelimiter{[}{\mathopen} {operators}{"5B}{largesymbols}{"02}% +\DeclareMathDelimiter{]}{\mathclose}{operators}{"5D}{largesymbols}{"03}% +\DeclareMathAccent{\acute}{\mathalpha}{operators}{"B4}% +\ifLuaTeX\DeclareMathAccent{\grave}{\mathalpha}{operators}{"60}\fi +\DeclareMathAccent{\ddot}{\mathalpha}{operators}{"A8}% +\DeclareMathAccent{\tilde}{\mathalpha}{oldoperators}{"7E}% +\DeclareMathAccent{\bar}{\mathalpha}{oldoperators}{"16}% +\DeclareMathAccent{\breve}{\mathalpha}{oldoperators}{"15}% +\DeclareMathAccent{\check}{\mathalpha}{oldoperators}{"14}% +\DeclareMathAccent{\hat}{\mathalpha}{oldoperators}{"5E}% +\DeclareMathAccent{\dot}{\mathalpha}{oldoperators}{"5F}% +\DeclareMathAccent{\mathring}{\mathalpha}{oldoperators}{"17}% +\DeclareMathSymbol{\mathdollar}{\mathord}{operators}{"24}% + } }{% \RequirePackage[T1]{fontenc} - \RequirePackage{times} - \renewcommand{\ttdefault}{cmtt} + \RequirePackage{mathptmx} } \IfFontExistsTF{texgyreheros-regular.otf}{% \setsansfont{texgyreheros}% @@ -50,21 +101,19 @@ , Scale = 0.92 ] }{% - \RequirePackage[T1]{fontenc} + \IfFileExists{newtxtext.sty}{% + \appto\sffamily{\fontencoding{T1}\selectfont}% + }{} \RequirePackage[scaled=0.92]{helvet} } \fi +\let\forlistloop\origforlistloop \RequirePackage{graphicx} \IfFileExists{xcolor.sty}% {\RequirePackage{xcolor}}% {\RequirePackage{color}} -\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 +\definecolor[named]{struct}{rgb}{0,0.5,0.5} +\definecolor[named]{links}{rgb}{0,0.4,0.4} \RequirePackage{calc} \let\OrigLineBreak\\ diff --git a/Master/texmf-dist/tex/latex/dccpaper/idcc.cls b/Master/texmf-dist/tex/latex/dccpaper/idcc.cls index 7e4b7d82d3e..92a1cd5928f 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{2018/05/01 v1.7} +\def\Version{2018/05/14 v1.7.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{idcc} [\Version\space Class for submissions to the International Digital Curation Conference.] diff --git a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls index ca087ecc1c2..59f291d80e3 100644 --- a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls +++ b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls @@ -14,7 +14,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/05/01 v1.7} +\def\Version{2018/05/14 v1.7.1} \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