Commit 50bd403a authored by Johnson, Seth R.'s avatar Johnson, Seth R.
Browse files

Improve spacing for header/footer pages

parent ced81d90
Loading
Loading
Loading
Loading
+32 −18
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@
\newcommand{\reportdraft}{\@reportdrafttrue}



%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Added for CRADA (remains blank if CRADA is undefined)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -66,9 +65,6 @@
\@cradadefinedfalse
\newcommand{\crada}[1]{\def\@crada{#1}\@cradadefinedtrue}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Added for CUI (remains blank if CUI is undefined)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -83,7 +79,6 @@
\else\relax
\fi%
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Use the \restrict command to add qualifications to the document's restriction.
@@ -95,10 +90,10 @@

% Creating \printrestrict command to simplify restricted footer
\newcommand{\printrestrict}{
\if@cuidefined{} % CUI supersedes restrict, so do nothing if CUI.
\else
\if@cuidefined % CUI supersedes restrict, so do nothing if CUI.
\else%
\if@restrictdefined{\centering\large\textbsf{\@restrict}\par}
\else\relax
\else\relax%
\fi%
\fi
}
@@ -133,6 +128,11 @@
  \fancyhf{}
}

\newcommand{\@restrictfootwarning}[1]{%
  \vspace{-2\baselineskip}\par
  \makebox[\textwidth][c]{\textbsf{#1}}\par
}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Header and footer for fancy pages
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -140,13 +140,20 @@

\fancyhead{}
% Adding CUI to header if defined.
\chead{\makebox[\textwidth][c]{\if@cuidefined{\textbsf{\@cui}}\else\fi}}
\chead{%
  \if@cuidefined%
    \makebox[\textwidth][c]{\textbsf{\@cui}}
  \fi%
}
% Adding CUI or restricted to footer if defined. CUI supersedes restrict.
\fancyfoot{}
\cfoot{\vspace{-1.3cm}
\makebox[\textwidth][c]{\if@cuidefined{\textbsf{\@cui}}\else %If no CUI, then
\if@restrictdefined{\textbsf{\@restrict}}\fi\fi} \\ % New line for page no.
\makebox[\textwidth][c]{\thepage{}} % Print page number
\cfoot{%
  \if@cuidefined%
    \@restrictfootwarning{\@cui}%
  \else\if@restrictdefined%
    \@restrictfootwarning{\@restrict}%
  \fi\fi%
  \thepage{}%
}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -158,13 +165,20 @@

\fancyhead{}
% Adding CUI to header if defined.
\chead{\makebox[\textwidth][c]{\if@cuidefined{\textbsf{\@cui}}\else\fi}}
\chead{%
 \if@cuidefined%
   \makebox[\textwidth][c]{\textbsf{\@cui}}%
 \fi%
}
% Adding CUI or restricted to footer if defined.
\fancyfoot{}
\cfoot{\vspace{-1.3cm}
\makebox[\textwidth][c]{\if@cuidefined{\textbsf{\@cui}}\else %If no CUI, then
\if@restrictdefined{\textbsf{\@restrict}}\fi\fi} \\ % New line for page no.
\makebox[\textwidth][c]{\thepage{}} % Print page number
\cfoot{%
  \if@cuidefined%
    \@restrictfootwarning{\@cui}%
  \else\if@restrictdefined%
    \@restrictfootwarning{\@restrict}%
  \fi\fi%
  \thepage{}%
}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%