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

Merge upstream changes

parents 77e44b20 4aadf533
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@

% Specify authors below.
% Note: multiple authors are separated with the \and command. 
\author{First Author \and Second Author \and Third Author}
% Per ORNL guidance, please keep the number of authors below six.
\author{First Author \and Second Author \and Third Author \and Fourth Author \and Fifth Author \and Sixth Author}

% Specify title.
% Note: if using an explicit line break in the title, you must use the \protect
@@ -87,7 +88,9 @@
% Add a CUI notice to the header and footer. Use % to toggle on or off. Note: CUI supercedes restrict. If both are enabled, only CUI will print.
% Update with appropriate category for your document.

% \cui{CUI//CATEGORY/SUBCATEGORY//DISSEM}
% \cui{CUI//CATEGORY/SUBCATEGORY//DISSEM} % Replace with appropriate markings.
% \cuiDA{Authority Name, ORNL} % Define the CUI designating authority. Can be organization, individual, or both.
% \cuiPh{(XXX)~XXX-XXXX} % Define phone number for designated authority.

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

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@

\RequirePackage{geometry}
\geometry{margin=1in,footskip=.75in}
\addtolength{\headheight}{1.6pt}
\addtolength{\topmargin}{-1.6pt}
% \overfullrule=2pt

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+47 −31
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

\RequirePackage{wallpaper} % background on cover page
\RequirePackage{adjustbox} % used to keep author block within front cover
\RequirePackage{fancyhdr} % headers and footers
\RequirePackage{emptypage} % hide footers on blank pages
\RequirePackage[pdfusetitle]{hyperref} % url and links in PDF
@@ -78,13 +79,25 @@
\@cuidefinedfalse
\newcommand{\cui}[1]{\def\@cui{#1}\@cuidefinedtrue}

\newif\if@cuiDAdefined
\@cuiDAdefinedfalse
\def\@cuiDA{CUI DA UNDEFINED%
\PackageWarning{ornltm}{No CUI designated authority has been defined.}}
\newcommand{\cuiDA}[1]{\def\@cuiDA{#1}\@cuiDAdefinedtrue}

\newif\if@cuiPhdefined
\@cuiPhdefinedfalse
\def\@cuiPh{CUI DA PHONE UNDEFINED%
\PackageWarning{ornltm}{No CUI designated authority phone number has been defined.}}
\newcommand{\cuiPh}[1]{\def\@cuiPh{#1}\@cuiPhdefinedtrue}

% Creating \printcui command to simplify CUI implementation
\newcommand{\printcui}{%
\begin{center}%
\if@cuidefined{\large\textbsf{\par\@cui}}%
\else%
\newcommand{\printcui}{
\begin{center}
\if@cuidefined{\large\textbsf{\par\@cui}}
\else
\fi%
\end{center}%
\end{center}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

@@ -185,11 +198,14 @@
\printcui

%% REPORT NUMBER %%
\begin{minipage}[c][1in]{\textwidth}
\vspace*{0.5\baselineskip plus 1\baselineskip}
\begin{minipage}{\textwidth}
\raggedleft
\large\textbsf{\@reportnum}
\end{minipage}%

\vspace*{0.5\baselineskip plus 0.5fill}

%% TITLE %%
\begin{minipage}{\textwidth}%
  \Huge\textbsf{%
@@ -197,11 +213,11 @@
  }
\end{minipage}%

%\vspace*{2\baselineskip} % might not need this
\vspace*{1\baselineskip plus 1\baselineskip minus 1\baselineskip}

%%% GRADIENT LINE %%%
\hspace*{-1.25in}\includegraphics[width=8.5in, height=0.13in]{ltr-gradient-bar.png}%
\vspace*{4.0in}
\vspace*{3.25in}

%%% NOTICES %%%
% If restrict and draft, show restrict + draft
@@ -209,17 +225,18 @@
% If not restrict and draft, show draft
% If not restrict and not draft, show ``approved for public release"


%%% AUTHOR AND DATE %%%
\begin{minipage}[c]{3in}%
  \def\and{\\}% Newline between authors
  \large\sffamily%
  \setlength\tabcolsep{0pt}%
  \maxsizebox*{!}{2.5in}{%
  \begin{tabular}[t]{l}%
  \@author%
  \end{tabular}
  }

\vspace{2\baselineskip}
\vspace*{1\baselineskip \@plus 1\baselineskip \@minus 1\baselineskip}

\large\textbsf{\@date}
\end{minipage}%
@@ -229,11 +246,10 @@

% Check if document is a draft to determine boxed notices.
\if@reportdraft{
\begin{framed}
\begin{center}
  \textbsf{\large Draft. Document has not been reviewed and approved for public release.}%
\end{center}
\end{framed}
\vspace{1em}
}
\fi

@@ -241,47 +257,45 @@
\if@cuidefined{% No CUI notice needed, so do nothing.
}\else % Otherwise, check for restrict.
\if@restrictdefined{% If restrict is defined in document, then print box.
\begin{framed}
\begin{center}
\printrestrict%
\end{center}
\end{framed}
\vspace{1em}
}
\fi
\fi

\if@cradadefined{% CRADA is independent. Print box if defined.
\begin{framed}
\begin{center}
\textbsf{\large\par CRADA final report for \\
\@crada}%
\@crada \vspace{1em}}%
\end{center}
\end{framed}
}
\fi


% Ensure restricted and CUI documents are *not* marked for public release
% if the document is *not* marked as draft.
\if@restrictdefined{%
}\else%
\if@cuidefined{%
\begin{center}
\textbsf{\large Controlled by: \@cuiDA, \@cuiPh}%
\end{center}
}\else%
\if@restrictdefined{%
}\else%
\if@reportdraft\relax\else{%
\begin{framed}
\begin{center}
\textbsf{% If not draft, CUI, or otherwise restricted, then unlimited distro.
\textbsf{\large% If not draft, CUI, or otherwise restricted, then unlimited distro.
  Approved for public release. \\
  Distribution is unlimited.}%
\end{center}
\end{framed}
}\fi%
\fi%
\fi

\end{minipage}

\vspace{\stretch{1}}
\vspace*{0pt \@plus 1fill}

\begin{minipage}{\textwidth}%
\hspace*{-0.25in}\textcolor{white}{{\footnotesize\sffamily ORNL IS MANAGED BY UT-BATTELLE LLC FOR THE US~DEPARTMENT OF ENERGY}}
@@ -394,12 +408,14 @@ agency thereof.}}

%%% TITLE %%%
{\Large\textbf{\MakeUppercase{\@title}}}
\vspace{3\baselineskip}%
\vspace{\stretch{1}}%

%%% TITLE %%%
%%% AUTHOR %%%
\maxsizebox*{!}{3.75in}{% Restrict size of author box.
\begin{tabular}[t]{c}%
 \@author%
\end{tabular}%
}

\vspace{\stretch{.5}}

ornlltr/ornltm-titlephoto.jpg

deleted100644 → 0
−2.06 MiB
Loading image diff...
+10 −6
Original line number Diff line number Diff line
@@ -39,12 +39,13 @@

% Specify authors below.
% Note: multiple authors are separated with the \and command.
\author{First Author \and Second Author \and Third Author}
% Per ORNL guidance, please keep the number of authors below six.
\author{First Author \and Second Author \and Third Author \and Fourth Author \and Fifth Author \and Sixth Author}

% Specify title.
% Note: if using an explicit line break in the title, you must use the \protect
% command before it.
\title{Oak Ridge National Laboratory \protect\\ Official SPR Template: \protect\\ Title Must Match RESolution Title}
\title{Oak Ridge National Laboratory \protect\\ Official SPR Template: \protect\\ Title Must Match RESolution Title \protect \\}

% Specify date of publication.
%\date{September 16, 2016}
@@ -89,10 +90,13 @@
% \crada{CRADA number NFE-XX-XXXXX}

%%% CUI
% Add a CUI notice to the header and footer. Use % to toggle on or off. Note: CUI supercedes restrict. If both are enabled, only CUI will print.
% Update with appropriate category for your document.
% Add a CUI notice to the header and footer. Use % to toggle on or off. 
% Note: CUI supercedes restrict. If both are enabled, only CUI will print.
% Update with appropriate category and designating authority for your document.

% \cui{CUI//CATEGORY/SUBCATEGORY//DISSEM}
% \cui{CUI//CATEGORY/SUBCATEGORY//DISSEM} % Replace with appropriate markings.
% \cuiDA{Authority Name, ORNL} % Define the CUI designating authority. Can be organization, individual, or both.
% \cuiPh{(XXX)~XXX-XXXX} % Define phone number for designated authority.

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

Loading