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

texmf/tex/latex/astron/escape.cls

 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{escape}[ESCAPE document class]
+
 %
 % Basic project details
 %
@@ -138,14 +139,14 @@
 \renewcommand{\maketitle}{
   \thispagestyle{empty}
 
-  \begin{textblock*}{1\textwidth}(\sideMargin, 2cm)
+  \newcommand{\printLogo}{
     \begin{center}
       \includegraphics[width=6cm]{escape-logo.png}
     \end{center}
-  \end{textblock*}
+  }
 
-  \begin{textblock*}{1\textwidth}(\sideMargin, 9cm)
-    \useArial
+  \newcommand{\projectSummary}{
+      {\useArial
       \fontsize{10}{12}\selectfont
       \renewcommand{\arraystretch}{1.5}
       \hyphenpenalty=10000
@@ -159,20 +160,21 @@
         Duration of Project   & \projectDuration{}\tabularnewline
         Project Website       & \projectWeb{}\tabularnewline
       \end{tabularx}
-    \renewcommand{\arraystretch}{1}
-  \end{textblock*}
+      \renewcommand{\arraystretch}{1}}
+  }
 
-  \begin{textblock*}{1\textwidth}(\sideMargin, 15.2cm)
-    \centering
+  \newcommand{\docHeading}{
+      \begin{center}
         \begin{minipage}{0.7\textwidth}
           \centering
           \hyphenpenalty=10000
           \LARGE\textbf{\docNumber{} -- \docTitle{}}
         \end{minipage}
-  \end{textblock*}
+      \end{center}
+  }
 
-  \begin{textblock*}{1\textwidth}(\sideMargin, 17.5cm)
-    \renewcommand{\arraystretch}{1.5}
+  \newcommand{\docDetails}{
+    {\renewcommand{\arraystretch}{1.5}
     \hyphenpenalty=10000
     \begin{tabularx}{\textwidth}{p{0.25\textwidth}X}
       Work Package                               & \workPackage{}\tabularnewline
@@ -182,10 +184,10 @@
       Date                                       & \docDate{} \tabularnewline
       Version                                    & \vcsRevision{} \tabularnewline
     \end{tabularx}
-    \renewcommand{\arraystretch}{1}
-  \end{textblock*}
+    \renewcommand{\arraystretch}{1}}
+  }
 
-  \begin{textblock*}{1\textwidth}(\sideMargin, 23.5cm)
+  \newcommand{\disseminationLevel}{
     \begin{tabular}{lll}
       \multicolumn{3}{l}{Dissemination Level}\tabularnewline
       \fbox{\pu{}} & PU: & Public\tabularnewline
@@ -193,14 +195,29 @@
       \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}
+  }
+
+  \vspace*{-2cm}
+  \printLogo
+
+  \vspace{0.5cm}
+  \projectSummary
+
+  \vspace{0.5cm}
+  \docHeading
+
+  \vspace{0.5cm}
+  \docDetails
+
+  \begin{textblock*}{1\textwidth}(\sideMargin, 25.5cm)
+    \disseminationLevel
   \end{textblock*}
 
-  \phantom{Need some text to clear the page}
   \clearpage
 
   \changeRecord
-
   \section*{Disclaimer}
   \disclaimer{}
+
   \clearpage
 }