Merge branch 'u/swinbank/escape-logo' into trunk

texmf/tex/latex/astron/escape.cls

@@ -82,7 +82,12 @@
 
 % Default font for ESCAPE documents is Calibri
 % But if we can't find it (e.g. in CI), don't worry about it
-\IfFontExistsTF{Calibri}{\setmainfont{Calibri}}{}
+% Attempt to cache the results of the font check; it is very slow
+\newcommand{\useCalibri}{}
+\IfFontExistsTF{Calibri}{\renewcommand{\useCalibri}{\setmainfont{Calibri}}}{}
+\newcommand{\useArial}{}
+\IfFontExistsTF{Arial}{\renewcommand{\useArial}{\setmainfont{Arial}}}{}
+\useCalibri
 
 
 %
@@ -92,14 +97,14 @@
 \fancyhf{}
 
 \lhead{
-\IfFontExistsTF{Arial}{\setmainfont{Arial}}{}
+\useArial
 \fontsize{8}{10}\selectfont
 \includegraphics[width=2.0cm]{escape-logo.png}\\
 \docNumber{} -- \docTitle{}}
 
 \rhead{
 \raisebox{1.8cm}{
-\IfFontExistsTF{Arial}{\setmainfont{Arial}}{}
+\useArial
 \fontsize{8}{10}\selectfont
 \renewcommand{\arraystretch}{1.5}
 \begin{tabular}{>{\raggedright}ll}
@@ -109,7 +114,7 @@
 }}
 
 \cfoot{
-\IfFontExistsTF{Calibri}{\setmainfont{Calibri}}{}
+\useCalibri
 \begin{tabularx}{\textwidth}{@{}lXll@{}}
 \includegraphics[width=1cm]{flag-eu}\hspace{0.3cm} &
 \fontsize{8}{10}\selectfont
@@ -132,14 +137,14 @@
 \renewcommand{\maketitle}{
 \thispagestyle{empty}
 
-\begin{textblock*}{1\textwidth}(\sideMargin, 1cm)
+\begin{textblock*}{1\textwidth}(\sideMargin, 2cm)
 \begin{center}
 \includegraphics[width=6cm]{escape-logo.png}
 \end{center}
 \end{textblock*}
 
-\begin{textblock*}{1\textwidth}(\sideMargin, 8cm){
-\IfFontExistsTF{Arial}{\setmainfont{Arial}}{}
+\begin{textblock*}{1\textwidth}(\sideMargin, 9cm){
+\useArial
 \fontsize{10}{12}\selectfont
 \renewcommand{\arraystretch}{1.5}
 \hyphenpenalty=10000
@@ -156,7 +161,7 @@ Project Website & \projectWeb{}\tabularnewline
 \renewcommand{\arraystretch}{1}
 \end{textblock*}
 
-\begin{textblock*}{1\textwidth}(\sideMargin, 14.2cm)
+\begin{textblock*}{1\textwidth}(\sideMargin, 15.2cm)
 \centering
 \begin{minipage}{0.7\textwidth}
 \centering
@@ -165,7 +170,7 @@ Project Website & \projectWeb{}\tabularnewline
 \end{minipage}
 \end{textblock*}
 
-\begin{textblock*}{1\textwidth}(\sideMargin, 16.5cm)
+\begin{textblock*}{1\textwidth}(\sideMargin, 17.5cm)
 \renewcommand{\arraystretch}{1.5}
 \hyphenpenalty=10000
 \begin{tabularx}{\textwidth}{p{0.25\textwidth}X}
@@ -179,7 +184,7 @@ Version & \vcsRevision{} \tabularnewline
 \renewcommand{\arraystretch}{1}
 \end{textblock*}
 
-\begin{textblock*}{1\textwidth}(\sideMargin, 22.5cm)
+\begin{textblock*}{1\textwidth}(\sideMargin, 23.5cm)
 \begin{tabular}{lll}
 \multicolumn{3}{l}{Dissemination Level}\tabularnewline
 \fbox{\pu{}} & PU: & Public\tabularnewline