Skip to content
Snippets Groups Projects
Verified Commit 77c14804 authored by John Swinbank's avatar John Swinbank
Browse files

Merge branch 'u/swinbank/texmf-tidy' into trunk

parents c399a917 e416c30d
No related branches found
No related tags found
1 merge request!33Tidy up texmf tree
Hide whitespace changes
Inline Side-by-side
texmf/tex/latex/astron/astron.cls
+ 92
− 92
View file @ 77c14804
......@@ -32,8 +32,8 @@
\begin{minipage}{\dimexpr\linewidth-2\fboxrule-2\fboxsep}
\begin{center}
\begin{small}
This technical note expresses the opinions of the authors on the date of writing.\\
It is not binding on the SDC Program, and may not accurately reflect future developments.
This technical note expresses the opinions of the authors on the date of writing.\\
It is not binding on the SDC Program, and may not accurately reflect future developments.
\end{small}
\end{center}
\end{minipage}%
......@@ -50,8 +50,8 @@
\begin{minipage}{\dimexpr\linewidth-2\fboxrule-2\fboxsep}
\begin{center}
\begin{small}
This document proposes a change to the technical baseline of the SDC Program.\\
It is not binding on the Program until approved by a change control process.
This document proposes a change to the technical baseline of the SDC Program.\\
It is not binding on the Program until approved by a change control process.
\end{small}
\end{center}
\end{minipage}%
......@@ -68,9 +68,9 @@
\begin{minipage}{\dimexpr\linewidth-2\fboxrule-2\fboxsep}
\begin{center}
\begin{small}
This document is part of the technical baseline of the SDC Program.\\
It is binding on the activities of the Program.\\
It may only be modified through a formal change control process.
This document is part of the technical baseline of the SDC Program.\\
It is binding on the activities of the Program.\\
It may only be modified through a formal change control process.
\end{small}
\end{center}
\end{minipage}%
......@@ -89,12 +89,12 @@
\newcommand{\docRevision}{Set the document revision with \texttt{\textbackslash{}setDocRevision}}
\newcommand{\setDocRevision}[1]{
\renewcommand{\docRevision}{#1}
\renewcommand{\docRevision}{#1}
}
\newcommand{\docProgram}{Set the document program with \texttt{\textbackslash{}setDocProgram}}
\newcommand{\setDocProgram}[1]{
\renewcommand{\docProgram}{#1}
\renewcommand{\docProgram}{#1}
}
%
......@@ -103,56 +103,56 @@
\providecommand{\addPerson}[3]{ #1 & #2 & #3 \tabularnewline}
\newcommand{\docAuthors}{
... & ... & ... \tabularnewline
... & ... & ... \tabularnewline
}
\newcommand{\setDocAuthors}[1]{\renewcommand{\docAuthors}
{
#1
}}
{
#1
}}
\newcommand{\docCheckers}{
... & ... & ... \tabularnewline
... & ... & ... \tabularnewline
}
\newcommand{\setDocCheckers}[1]{\renewcommand{\docCheckers}
{
#1
}}
{
#1
}}
\newcommand{\docApprovers}{
... & ... & ... \tabularnewline
... & ... & ... \tabularnewline
}
\newcommand{\setDocApprovers}[1]{\renewcommand{\docApprovers}
{
#1
}}
{
#1
}}
\newcommand{\docAuthorizers}{
... & ... & ... \tabularnewline
... & ... & ... \tabularnewline
}
\newcommand{\setDocAuthorizers}[1]{\renewcommand{\docAuthorizers}
{
#1
}}
{
#1
}}
\newcommand{\authorTable}{%
\begin{tabularx}{\textwidth}{|p{0.35\textwidth}|p{0.35\textwidth}|X|}
\cline{2-3} \cline{3-3}
\multicolumn{1}{c|}{} &
\textbf{\footnotesize{}Organisatie / Organization} &
\multicolumn{1}{c|}{} &
\textbf{\footnotesize{}Organisatie / Organization} &
\textbf{\footnotesize{}Datum / Date} \tabularnewline
\hline
\textbf{\footnotesize{}Auteur(s) / Author(s):\vspace{0.2cm}} & & \tabularnewline
\textbf{\footnotesize{}Auteur(s) / Author(s):\vspace{0.2cm}} & & \tabularnewline
\docAuthors
\hline
\textbf{\footnotesize{}Controle / Checked:\vspace{0.2cm}} & & \tabularnewline
\textbf{\footnotesize{}Controle / Checked:\vspace{0.2cm}} & & \tabularnewline
\docCheckers
\hline
\textbf{\footnotesize{}Goedkeuring / Approval:\vspace{0.2cm}} & & \tabularnewline
\textbf{\footnotesize{}Goedkeuring / Approval:\vspace{0.2cm}} & & \tabularnewline
\docApprovers
\hline
\textbf{\footnotesize{}Autorisatie / Authorization:} & & \tabularnewline
\textbf{\footnotesize{}Autorisatie / Authorization:} & & \tabularnewline
\docAuthorizers
\textbf{\footnotesize{}Handtekening / Signature:\vspace{1cm}} & & \tabularnewline
\textbf{\footnotesize{}Handtekening / Signature:\vspace{1cm}} & & \tabularnewline
\hline
\end{tabularx}
}
......@@ -164,13 +164,13 @@
\fancyhf{}
\lfoot{\thepage \hspace{1pt} / \pageref{LastPage}}
\rfoot{
\renewcommand{\arraystretch}{1}
\begin{tabular}{>{\raggedright}ll}
Doc. Nr.: & \docNumber{}\tabularnewline
Rev.: & \docRevision{}\tabularnewline
Date: & \docDate{}\tabularnewline
Doc. Type: & \docType{}\tabularnewline
\end{tabular}
\renewcommand{\arraystretch}{1}
\begin{tabular}{>{\raggedright}ll}
Doc. Nr.: & \docNumber{}\tabularnewline
Rev.: & \docRevision{}\tabularnewline
Date: & \docDate{}\tabularnewline
Doc. Type: & \docType{}\tabularnewline
\end{tabular}
}
\rhead{\includegraphics[width=8cm]{astron-logo}}
......@@ -183,61 +183,61 @@
% Construct the title page, history, etc.
%
\renewcommand{\maketitle}{
\vspace*{4cm}
\begin{center}
\begin{minipage}{0.7\textwidth}
\centering\LARGE\textbf{\docTitle{}}
\end{minipage}
\end{center}
% This position was determined by trial and error; a bit unsatisfying.
\newlength{\copyrightBoxPosition}
\setlength{\copyrightBoxPosition}{25.2cm}
% Add the copyright notice towards the bottom of the page.
\begin{textblock*}{1\textwidth}(\sideMargin, \copyrightBoxPosition)
\fbox{%
\begin{minipage}{\dimexpr\linewidth-2\fboxrule-2\fboxsep}
\begin{center}
\begin{small}
\ifthenelse{\equal{\vcsFirstYear}{\vcsLastYear}}
\vspace*{4cm}
\begin{center}
\begin{minipage}{0.7\textwidth}
\centering\LARGE\textbf{\docTitle{}}
\end{minipage}
\end{center}
% This position was determined by trial and error; a bit unsatisfying.
\newlength{\copyrightBoxPosition}
\setlength{\copyrightBoxPosition}{25.2cm}
% Add the copyright notice towards the bottom of the page.
\begin{textblock*}{1\textwidth}(\sideMargin, \copyrightBoxPosition)
\fbox{%
\begin{minipage}{\dimexpr\linewidth-2\fboxrule-2\fboxsep}
\begin{center}
\begin{small}
\ifthenelse{\equal{\vcsFirstYear}{\vcsLastYear}}
{\textcopyright{} ASTRON \vcsFirstYear.\\}
{\textcopyright{} ASTRON \vcsFirstYear--\vcsLastYear.\\}
All rights are reserved. Reproduction in whole or in part is\\
prohibited without written consent of the copyright owner.
\end{small}
\end{center}
\end{minipage}%
}
\end{textblock*}
% We generate the author table once (but don't print it) to measure its height,
% then use that to position the textblock* which ultimately contains the table.
% Note the measured height is (approximately) half the full height.
\newlength{\authorTableHalfHeight}
\settoheight{\authorTableHalfHeight}{\authorTable}
\if@hastype
\newlength{\docTypeHalfHeight}
\settoheight{\docTypeHalfHeight}{\docTypeDescription}
\begin{textblock*}{1\textwidth}(\sideMargin,
\dimexpr\copyrightBoxPosition-2\docTypeHalfHeight+\fboxsep)
\docTypeDescription
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin,
\dimexpr\copyrightBoxPosition-2\docTypeHalfHeight-2\authorTableHalfHeight+2\fboxsep)
\authorTable
\end{textblock*}
\else
\begin{textblock*}{1\textwidth}(\sideMargin,
\dimexpr\copyrightBoxPosition-2\authorTableHalfHeight+\fboxsep)
\authorTable
All rights are reserved. Reproduction in whole or in part is\\
prohibited without written consent of the copyright owner.
\end{small}
\end{center}
\end{minipage}%
}
\end{textblock*}
\fi
\clearpage
\changeRecord
% We generate the author table once (but don't print it) to measure its height,
% then use that to position the textblock* which ultimately contains the table.
% Note the measured height is (approximately) half the full height.
\newlength{\authorTableHalfHeight}
\settoheight{\authorTableHalfHeight}{\authorTable}
\if@hastype
\newlength{\docTypeHalfHeight}
\settoheight{\docTypeHalfHeight}{\docTypeDescription}
\begin{textblock*}{1\textwidth}(\sideMargin,
\dimexpr\copyrightBoxPosition-2\docTypeHalfHeight+\fboxsep)
\docTypeDescription
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin,
\dimexpr\copyrightBoxPosition-2\docTypeHalfHeight-2\authorTableHalfHeight+2\fboxsep)
\authorTable
\end{textblock*}
\else
\begin{textblock*}{1\textwidth}(\sideMargin,
\dimexpr\copyrightBoxPosition-2\authorTableHalfHeight+\fboxsep)
\authorTable
\end{textblock*}
\fi
\clearpage
\changeRecord
}
texmf/tex/latex/astron/common.tex
+ 14
− 14
View file @ 77c14804
......@@ -60,7 +60,7 @@
% Link to document repositories for appropriate e-prints in the bibliography
\DeclareFieldFormat{eprint:sdc-handle}{%
Doc handle\addcolon\space
\href{https://git.astron.nl/astron-sdc/docs/#1/-/releases}{#1}%
\href{https://git.astron.nl/astron-sdc/docs/#1/-/releases}{#1}%
}
% Standard bibliography files included in this package
......@@ -77,26 +77,26 @@
\urlstyle{same}
\geometry{tmargin=\topMargin,
bmargin=\bottomMargin,
lmargin=\sideMargin,
rmargin=\sideMargin,
footskip=\footSkip,
headsep=\headSep,
headheight=\headHeight}
bmargin=\bottomMargin,
lmargin=\sideMargin,
rmargin=\sideMargin,
footskip=\footSkip,
headsep=\headSep,
headheight=\headHeight}
\newcommand{\docTitle}{Set the document title with \texttt{\textbackslash{}setDocTitle}}
\newcommand{\setDocTitle}[1]{
\renewcommand{\docTitle}{#1}
\renewcommand{\docTitle}{#1}
}
\newcommand{\docNumber}{Set the document number with \texttt{\textbackslash{}setDocNumber}}
\newcommand{\setDocNumber}[1]{
\renewcommand{\docNumber}{#1}
\renewcommand{\docNumber}{#1}
}
\newcommand{\docDate}{Set the document date with \texttt{\textbackslash{}setDocDate}}
\newcommand{\setDocDate}[1]{
\renewcommand{\docDate}{#1}
\renewcommand{\docDate}{#1}
}
%
......@@ -104,12 +104,12 @@
%
\providecommand{\addChangeRecord}[3]{ #1 & #2 & #3 \tabularnewline \hline}
\newcommand{\docChangeRecord}{
... & ... & ... \tabularnewline \hline
... & ... & ... \tabularnewline \hline
}
\newcommand{\setDocChangeRecord}[1]{\renewcommand{\docChangeRecord}
{
#1
}}
{
#1
}}
\newcommand{\changeRecord}{%
\clearpage
......
texmf/tex/latex/astron/escape-galaxy-mind.jpeg 0 → 100644
+ 0
− 0
View file @ 77c14804
texmf/tex/latex/astron/escape-galaxy-mind.jpeg

260 KiB

texmf/tex/latex/astron/escape-galaxy-mind.png deleted 100644 → 0
+ 0
− 0
View file @ c399a917
texmf/tex/latex/astron/escape-galaxy-mind.png

1.41 MiB

texmf/tex/latex/astron/escape-logo.png
+ 0
− 0
View replaced file @ c399a917 View file @ 77c14804
texmf/tex/latex/astron/escape-logo.png

177 KiB | W: | H:

texmf/tex/latex/astron/escape-logo.png

140 KiB | W: | H:

texmf/tex/latex/astron/escape-logo.png
texmf/tex/latex/astron/escape-logo.png
texmf/tex/latex/astron/escape-logo.png
texmf/tex/latex/astron/escape-logo.png
  • 2-up
  • Swipe
  • Onion skin
texmf/tex/latex/astron/escape.cls
+ 96
− 96
View file @ 77c14804
......@@ -4,7 +4,7 @@
% Basic project details
%
% These refer to ESCAPE, but in principle we could reuse the document class for some other project.
\newcommand{\projectTitle}{European Science Cluster of Astronomy \& Particle physics ESFRI research Infrastructure}
\newcommand{\projectTitle}{European Science Cluster of Astronomy \& Particle physics ESFRI research Infrastructures}
\newcommand{\projectAcronym}{ESCAPE}
\newcommand{\grantAgreement}{824064}
\newcommand{\projectInstrument}{Research and Innovation Action (RIA)}
......@@ -12,6 +12,7 @@
\newcommand{\projectStart}{2019-02-04}
\newcommand{\projectDuration}{42 Months}
\newcommand{\projectWeb}{\href{https://www.projectescape.eu}{www.projectescape.eu}}
\newcommand{\disclaimer}{\projectAcronym{} -- \projectTitle{} has received funding from the European Union’s Horizon 2020 research and innovation programme under the Grant Agreement n° \grantAgreement{}.}
\newcommand{\changeRecordName}{Versioning and contribution history}
......@@ -21,23 +22,23 @@
% Must be set by the user
\newcommand{\workPackage}{Set the work package with \texttt{\textbackslash{}setWorkPackage}}
\newcommand{\setWorkPackage}[1]{
\renewcommand{\workPackage}{#1}
\renewcommand{\workPackage}{#1}
}
\newcommand{\leadAuthor}{Set the document author with \texttt{\textbackslash{}setLeadAuthor}}
\newcommand{\setLeadAuthor}[1]{
\renewcommand{\leadAuthor}{#1}
\renewcommand{\leadAuthor}{#1}
}
\newcommand{\otherAuthors}{Set the contributing authors with \texttt{\textbackslash{}setOtherAuthors}}
\newcommand{\setOtherAuthors}[1]{
\renewcommand{\otherAuthors}{#1}
\renewcommand{\otherAuthors}{#1}
}
\newcommand{\dueDate}{Set the due date with \texttt{\textbackslash{}setDueDate}}
\newcommand{\setDueDate}[1]{
\renewcommand{\dueDate}{#1}
\renewcommand{\dueDate}{#1}
}
\newcommand{\dueMonth}{Set the due month with \texttt{\textbackslash{}setDueMonth}}
\newcommand{\setDueMonth}[1]{
\renewcommand{\dueMonth}{#1}
\renewcommand{\dueMonth}{#1}
}
%
......@@ -97,32 +98,32 @@
\fancyhf{}
\lhead{
\useArial
\fontsize{8}{10}\selectfont
\includegraphics[width=2.0cm]{escape-logo.png}\\
\docNumber{} -- \docTitle{}}
\useArial
\fontsize{8}{10}\selectfont
\includegraphics[width=2.0cm]{escape-logo.png}\\
\docNumber{} -- \docTitle{}}
\rhead{
\raisebox{1.8cm}{
\useArial
\fontsize{8}{10}\selectfont
\renewcommand{\arraystretch}{1.5}
\begin{tabular}{>{\raggedright}ll}
Project No & 824064\tabularnewline
Date & \docDate{}\tabularnewline
\end{tabular}
}}
\raisebox{1.8cm}{
\useArial
\fontsize{8}{10}\selectfont
\renewcommand{\arraystretch}{1.5}
\begin{tabular}{>{\raggedright}ll}
Project No & \grantAgreement{}\tabularnewline
Date & \docDate{}\tabularnewline
\end{tabular}
}}
\cfoot{
\useCalibri
\begin{tabularx}{\textwidth}{@{}lXll@{}}
\includegraphics[width=1cm]{flag-eu}\hspace{0.3cm} &
\fontsize{8}{10}\selectfont
\parbox[][1.3cm][t]{14.2cm}{\raggedright{ESCAPE -- The European Science Cluster of Astronomy \& Particle Physics ESFRI Research Infrastructures has received funding from the European Union’s Horizon 2020 research and innovation programme under the Grant Agreement n° 824064}} &
\parbox[][1.2cm][t]{0.5cm}{\thepage} &
\includegraphics[width=1cm]{escape-galaxy-mind}
\tabularnewline
\end{tabularx}
\useCalibri
\begin{tabularx}{\textwidth}{@{}lXll@{}}
\includegraphics[width=1cm]{flag-eu}\hspace{0.3cm} &
\fontsize{8}{10}\selectfont
\parbox[][1.3cm][t]{14.2cm}{\raggedright{\disclaimer{}}} &
\parbox[][1.2cm][t]{0.5cm}{\thepage} &
\includegraphics[width=1cm]{escape-galaxy-mind.jpeg}
\tabularnewline
\end{tabularx}
}
\renewcommand{\headrulewidth}{0.25pt}
......@@ -135,72 +136,71 @@
% with a title which spans two lines, but will probably break otherwise.
%
\renewcommand{\maketitle}{
\thispagestyle{empty}
\begin{textblock*}{1\textwidth}(\sideMargin, 2cm)
\begin{center}
\includegraphics[width=6cm]{escape-logo.png}
\end{center}
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin, 9cm){
\useArial
\fontsize{10}{12}\selectfont
\renewcommand{\arraystretch}{1.5}
\hyphenpenalty=10000
\begin{tabularx}{\textwidth}{p{0.25\textwidth}X}
Project Title & \projectTitle{}\tabularnewline
Project Acronym & \projectAcronym{}\tabularnewline
Grant Agreement No & \grantAgreement{}\tabularnewline
Instrument & \projectInstrument{}\tabularnewline
Topic & \projectTopic{}\tabularnewline
Start Date of Project & \projectStart{}\tabularnewline
Duration of Project & \projectDuration{}\tabularnewline
Project Website & \projectWeb{}\tabularnewline
\end{tabularx}}
\renewcommand{\arraystretch}{1}
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin, 15.2cm)
\centering
\begin{minipage}{0.7\textwidth}
\centering
\hyphenpenalty=10000
\LARGE\textbf{\docNumber{} -- \docTitle{}}
\end{minipage}
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin, 17.5cm)
\renewcommand{\arraystretch}{1.5}
\hyphenpenalty=10000
\begin{tabularx}{\textwidth}{p{0.25\textwidth}X}
Work Package & \workPackage{}\tabularnewline
Lead Author (Org) & \leadAuthor{}\tabularnewline
\raggedright{Contributing Author(s) (Org)} & \otherAuthors{}\tabularnewline
Due Date & \dueDate{} (\dueMonth{}) \tabularnewline
Date & \docDate{} \tabularnewline
Version & \vcsRevision{} \tabularnewline
\end{tabularx}
\renewcommand{\arraystretch}{1}
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin, 23.5cm)
\begin{tabular}{lll}
\multicolumn{3}{l}{Dissemination Level}\tabularnewline
\fbox{\pu{}} & PU: & Public\tabularnewline
\fbox{\pp{}} & PP: & Restricted to other programme participants (including the Commission)\tabularnewline
\fbox{\re{}} & RE: & Restricted to a group specified by the consortium (including the Commission)\tabularnewline
\fbox{\co{}} & CO: & Confidential, only for members of the consortium (including the Commission)\tabularnewline
\end{tabular}
\end{textblock*}
\phantom{Need some text to clear the page}
\clearpage
\changeRecord
\section*{Disclaimer}
ESCAPE - The European Science Cluster of Astronomy \& Particle Physics ESFRI Research Infrastructures has received funding from the European Union’s Horizon 2020 research and innovation programme under the Grant Agreement n° 210506816.
\clearpage
\thispagestyle{empty}
\begin{textblock*}{1\textwidth}(\sideMargin, 2cm)
\begin{center}
\includegraphics[width=6cm]{escape-logo.png}
\end{center}
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin, 9cm)
\useArial
\fontsize{10}{12}\selectfont
\renewcommand{\arraystretch}{1.5}
\hyphenpenalty=10000
\begin{tabularx}{\textwidth}{p{0.25\textwidth}X}
Project Title & \projectTitle{}\tabularnewline
Project Acronym & \projectAcronym{}\tabularnewline
Grant Agreement No & \grantAgreement{}\tabularnewline
Instrument & \projectInstrument{}\tabularnewline
Topic & \projectTopic{}\tabularnewline
Start Date of Project & \projectStart{}\tabularnewline
Duration of Project & \projectDuration{}\tabularnewline
Project Website & \projectWeb{}\tabularnewline
\end{tabularx}
\renewcommand{\arraystretch}{1}
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin, 15.2cm)
\centering
\begin{minipage}{0.7\textwidth}
\centering
\hyphenpenalty=10000
\LARGE\textbf{\docNumber{} -- \docTitle{}}
\end{minipage}
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin, 17.5cm)
\renewcommand{\arraystretch}{1.5}
\hyphenpenalty=10000
\begin{tabularx}{\textwidth}{p{0.25\textwidth}X}
Work Package & \workPackage{}\tabularnewline
Lead Author (Org) & \leadAuthor{}\tabularnewline
\raggedright{Contributing Author(s) (Org)} & \otherAuthors{}\tabularnewline
Due Date & \dueDate{} (\dueMonth{}) \tabularnewline
Date & \docDate{} \tabularnewline
Version & \vcsRevision{} \tabularnewline
\end{tabularx}
\renewcommand{\arraystretch}{1}
\end{textblock*}
\begin{textblock*}{1\textwidth}(\sideMargin, 23.5cm)
\begin{tabular}{lll}
\multicolumn{3}{l}{Dissemination Level}\tabularnewline
\fbox{\pu{}} & PU: & Public\tabularnewline
\fbox{\pp{}} & PP: & Restricted to other programme participants (including the Commission)\tabularnewline
\fbox{\re{}} & RE: & Restricted to a group specified by the consortium (including the Commission)\tabularnewline
\fbox{\co{}} & CO: & Confidential, only for members of the consortium (including the Commission)\tabularnewline
\end{tabular}
\end{textblock*}
\phantom{Need some text to clear the page}
\clearpage
\changeRecord
\section*{Disclaimer}
\disclaimer{}
\clearpage
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment