grant (4nov20)

git-svn-id: svn://tug.org/texlive/trunk@56852 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 821 insertions, 123 deletions

diff --git a/Master/texmf-dist/doc/latex/grant/LICENSE b/Master/texmf-dist/doc/latex/grant/LICENSE
index 1e5a0997655..f72ac7c28c3 100644
--- a/Master/texmf-dist/doc/latex/grant/LICENSE
+++ b/Master/texmf-dist/doc/latex/grant/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Karr Lab
+Copyright (c) 2016-2019 Karr Lab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Master/texmf-dist/doc/latex/grant/VERSION b/Master/texmf-dist/doc/latex/grant/VERSION
deleted file mode 100644
index 6812f8122ef..00000000000
--- a/Master/texmf-dist/doc/latex/grant/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.0.3
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/grant/grant.pdf b/Master/texmf-dist/doc/latex/grant/grant.pdf
index 73387da30b2..d3b74161928 100644
--- a/Master/texmf-dist/doc/latex/grant/grant.pdf
+++ b/Master/texmf-dist/doc/latex/grant/grant.pdf
diff --git a/Master/texmf-dist/source/latex/grant/grant.dtx b/Master/texmf-dist/source/latex/grant/grant.dtx
index 6c8a96d5f4a..153a3d780e8 100644
--- a/Master/texmf-dist/source/latex/grant/grant.dtx
+++ b/Master/texmf-dist/source/latex/grant/grant.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 % -----------------------------------------------------------
 %
 % This file may be distributed and/or modified under the conditions of
@@ -18,7 +18,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[2003/12/01]
 %<package>\ProvidesPackage{grant}
 %<*package>
-    [2016/08/22 v0.0.3 Grant package for formatting federal grant applications]
+    [2019/02/26 v0.0.5 Grant package for formatting federal grant applications]
 %</package>
 %
 %
@@ -53,7 +53,11 @@
 %%   Right brace   \}     Tilde         \~}
 
 
-% \changes{v0.0.2}{2016/08/17}{Initial version}
+% \changes{v0.0.5}{2019/02/26}{Adding examples}
+% \changes{v0.0.4}{2016/09/26}{Debugging class renaming and .dtx file for pdf compilation}
+% \changes{v0.0.3}{2016/08/22}{Rename classes to grant-*.cls}
+% \changes{v0.0.2}{2016/08/17}{Packaging with ins, dtx files}
+% \changes{v0.0.1}{2016/08/17}{Initial version}
 %
 % \GetFileInfo{grant.dtx}
 %
@@ -69,7 +73,8 @@
 %
 % This package provides LaTeX classes to format grant applications for the following federal agencies:
 % \begin{description}[labelindent=0.25in]
-% \item[\texttt{grant-arl}]: Army Research Laboratory
+% \item[\texttt{grant-afosr}]: Air Force Office of Scientific Research
+% \item[\texttt{grant-aro}]: Army Research Office
 % \item[\texttt{grant-darpa}]: Defense Advanced Research Projects Agency
 % \item[\texttt{grant-doe}]: Department of Energy
 % \item[\texttt{grant-nih}]: National Institutes of Health
@@ -109,7 +114,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant}[2016/01/12 grant class]
+\ProvidesClass{grant}[2019/02/26 grant class]
 
 %%%%%%%%%%%%%%%%%%%%%%
 %% options
@@ -128,14 +133,21 @@
     {\booltrue{isdraft}}
 \DeclareOption{isnotdraft}
     {\boolfalse{isdraft}}
-    
+
+\newbool{iswhitepaper}
+\boolfalse{iswhitepaper}
+\DeclareOption{iswhitepaper}
+    {\booltrue{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}
+    {\boolfalse{iswhitepaper}}
+
 \newbool{issectioncompact}
 \boolfalse{issectioncompact}
 \DeclareOption{issectioncompact}
     {\booltrue{issectioncompact}}
 \DeclareOption{isnotsectioncompact}
     {\boolfalse{issectioncompact}}
-    
+
 \newbool{isbibcompact}
 \boolfalse{isbibcompact}
 \DeclareOption{isbibcompact}
@@ -143,7 +155,7 @@
 \DeclareOption{isnotbibcompact}
     {\boolfalse{isbibcompact}}
 
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
 \ProcessOptions
 
 %%%%%%%%%%%%%%%%%%%%%%
@@ -165,6 +177,16 @@
 %underline
 \usepackage[normalem]{ulem}
 \usepackage{soul}
+\soulregister\cite7
+
+%highlighting
+\usepackage{xcolor}
+\usepackage{framed}
+\definecolor{hlcolor}{rgb}{1, 1, 0}
+\sethlcolor{hlcolor}
+\colorlet{shadecolor}{hlcolor}
+\setlength{\fboxsep}{0.05ex}
+\setlength{\OuterFrameSep}{-\fboxsep}
 
 %spacing
 \usepackage{setspace}
@@ -241,13 +263,18 @@
 \subsubsection*{#2}%
 }
 
+\ifbool{iswhitepaper}{
+    \titleformat{\section}[runin]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[:]
+}{
+    \usepackage[auto]{chappg}
+}
+
 \ifbool{issectioncompact}{
     \titleformat{\section}[runin]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[.]
     \titlespacing*{\section}{0pt}{*0.0}{*0.5}
 }{}
 
 %page numbering
-\usepackage[auto]{chappg}
 
 %header/footer
 \usepackage{fancyhdr}
@@ -262,6 +289,12 @@
     \rfoot{\small\thepage}
 }{}
 
+\ifbool{iswhitepaper}{
+    \lfoot{}
+    \rfoot{}
+    \cfoot{\small\thepage}
+}{}
+
 %lists
 \usepackage{paralist}
 \usepackage{enumitem}
@@ -314,10 +347,17 @@
     \renewcommand{\bibfont}{\footnotesize}
   
     \ExecuteBibliographyOptions{maxbibnames=1,minbibnames=1}
+    
     \DeclareFieldFormat[article]{title}{}
     \DeclareFieldFormat[article]{pages}{}
     \DeclareFieldFormat[article]{volume}{}
     \DeclareFieldFormat[article]{number}{}
+    
+    \DeclareFieldFormat[inproceedings]{title}{}
+    \DeclareFieldFormat[inproceedings]{pages}{}
+    \DeclareFieldFormat[inproceedings]{volume}{}
+    \DeclareFieldFormat[inproceedings]{number}{}
+    
     \DeclareFieldFormat[online]{url}{}
     \DeclareFieldFormat[online]{urldate}{}
 
@@ -474,6 +514,8 @@
 \newcommand{\PoEmail}{}
 \newcommand{\PoPhone}{}
 
+\newcommand{\FundingIdTitle}{\FundingId\ifdefempty{\FundingTitle}{}{: \FundingTitle}}
+
 \newcommand{\makecoverpage}{
     {\LARGE\bfseries
     
@@ -483,7 +525,7 @@
     \vskip1ex
     \uline{Funding opportunity}
     \\\FundingAgency
-    \\{\FundingTitle} (\href{\FundingUrl}{\FundingId})
+    \\\FundingIdTitle (\href{\FundingUrl}{\FundingId})
     \\\FundingDeadline
 
     \uline{Applicant}
@@ -503,12 +545,36 @@
     \\\PoPhone
 }
 
+\newcommand{\AbstractName}{Abstract}
+\newcommand{\AbstractOtherPersonnelName}{Other key personnel and primary subcontractors}
+\providetoggle{AbstractIsCentered}
+\providetoggle{AbstractShowAdminPOC}
+\providetoggle{AbstractShowLeadOrg}
+\providetoggle{AbstractShowOtherPersonnel}
+\providetoggle{AbstractShowDuration}
+\providetoggle{AbstractShowCost}
+\settoggle{AbstractIsCentered}{false}
+\settoggle{AbstractShowAdminPOC}{true}
+\settoggle{AbstractShowLeadOrg}{true}
+\settoggle{AbstractShowOtherPersonnel}{true}
+\settoggle{AbstractShowDuration}{true}
+\settoggle{AbstractShowCost}{true}
+
+
 \newcommand{\makeabstractcoverpage}{
-    \begin{center}\LARGE\textbf{
-    ABSTRACT\\[0.5ex]
-    \FundingId: \FundingTitle\\[0.5ex]
-    \ProposalTitle
+    {\setlength{\parskip}{12pt}
+   
+    \iftoggle{AbstractIsCentered}{
+    \centering
+    }{}
+    
+    \begin{center}\textbf{
+    \LARGE{\MakeUppercase{\AbstractName}}\\[18pt]
+    \LARGE{\FundingId}\\
+    \large{\FundingTitle}\\[18pt]
+    \LARGE{\ProposalTitle}
     }\end{center}
+    \vskip-8pt
     
     \textbf{Technical point of contact: \PiName}\\
     \PiTitle\\
@@ -517,25 +583,32 @@
     \PiAddress\\
     Tel: \PiPhone, Fax: \PiFax, Email: \href{mailto:\PiEmail}{\PiEmail}, Web: \href{http://www.\PiUrl}{\PiUrl} 
     
+    \iftoggle{AbstractShowAdminPOC}{
     \textbf{Administrative point of contact: \AdminName}\\
     \AdminTitle\\
     \AdminAddress\\
     \AdminInstitution\\
     Tel: \AdminPhone, Fax: \AdminFax, Email: \href{mailto:\AdminEmail}{\AdminEmail}
+    }{}
     
+    \iftoggle{AbstractShowLeadOrg}{
     \textbf{Lead organization: \LeadOrganizationName}\\
     \LeadOrganizationAddress\\
     DUNS number: \LeadOrganizationDUNS\\
     Taxpayer identification number: \LeadOrganizationTIN\\
     CAGE code: \LeadOrganizationCAGE
+    }{}
     
-    \textbf{Other key personnel and primary subcontractors}\\
+    \iftoggle{AbstractShowOtherPersonnel}{
+    \textbf{\AbstractOtherPersonnelName}\\
     \OtherKeyPersonnel
+    }{}
     
-    \textbf{Duration: {\ProposalDurationInYears} years}
+    \iftoggle{AbstractShowDuration}{\textbf{Duration: {\ProposalDurationInYears} years}}{}
     
-    \textbf{Estimated cost: \${\ProposalCostInMillions} million in total costs}
+    \iftoggle{AbstractShowCost}{\textbf{Estimated cost: \${\ProposalCostInMillions} million in total costs}}{}
     
+    }
     \clearpage
 }
 
@@ -544,18 +617,88 @@
 %</grant>
 % \end{macrocode}
 
+% \begin{macrocode}
+%<*grant-afosr>
+% \end{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-afosr}[2019/02/26 AFOSR class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+%geometry
+\geometry{margin=1in}
+
+%font
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+%paragraph skip
+\setlength{\parskip}{4pt}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% abstract
+%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\AbstractName}{White paper}
+\settoggle{AbstractIsCentered}{true}
+\settoggle{AbstractShowAdminPOC}{false}
+\settoggle{AbstractShowLeadOrg}{false}
+\settoggle{AbstractShowOtherPersonnel}{false}
+\settoggle{AbstractShowDuration}{false}
+\settoggle{AbstractShowCost}{false}
+
+\ifbool{iswhitepaper}{
+    \titleformat{\section}[block]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[]
+    \titleformat{\subsection}[runin]{\bfseries}{\thesubsection.~}{0ex}{#1}[.]
+    \titleformat{\subsubsection}[runin]{}{\uline{\thesubsubsection.~}}{0ex}{\uline{#1}}[.]
+    
+    \titlespacing*{\section}{0pt}{*0.0}{*-1}
+    
+    \renewcommand{\bibfont}{\normalsize}
+}{}
+
 
 % \begin{macrocode}
-%<*grant-arl>
+%</grant-afosr>
 % \end{macrocode}
 
+
+% \begin{macrocode}
+%<*grant-aro>
+% \end{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-arl}[2016/01/19 ARL class]
+\ProvidesClass{grant-aro}[2019/02/26 ARO class]
 
 \newcommand{\draftstatus}{isnotdraft}
 \DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
 \DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
 
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
 \newcommand{\sectioncompactstatus}{isnotsectioncompact}
 \DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
 \DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -564,10 +707,10 @@
 \DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
 \DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
 
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
 \ProcessOptions
 
-\LoadClass[12pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
 
 %%%%%%%%%%%%%%%%%%%%%%
 %% formatting
@@ -583,8 +726,30 @@
 %paragraph skip
 \setlength{\parskip}{4pt}
 
+%%%%%%%%%%%%%%%%%%%%%%
+%% abstract
+%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\AbstractName}{White paper}
+\settoggle{AbstractIsCentered}{true}
+\settoggle{AbstractShowAdminPOC}{true}
+\settoggle{AbstractShowLeadOrg}{true}
+\settoggle{AbstractShowOtherPersonnel}{true}
+\settoggle{AbstractShowDuration}{false}
+\settoggle{AbstractShowCost}{false}
+
+\ifbool{iswhitepaper}{
+    \titleformat{\section}[block]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[]
+    \titleformat{\subsection}[runin]{\bfseries}{\thesubsection.~}{0ex}{#1}[.]
+    \titleformat{\subsubsection}[runin]{}{\uline{\thesubsubsection.~}}{0ex}{\uline{#1}}[.]
+    
+    \titlespacing*{\section}{0pt}{*0.0}{*-1}
+    
+    \renewcommand{\bibfont}{\normalsize}
+}{}
+
+
 % \begin{macrocode}
-%</grant-arl>
+%</grant-aro>
 % \end{macrocode}
 
 
@@ -592,12 +757,16 @@
 %<*grant-darpa>
 % \end{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-darpa}[2016/01/12 DARPA class]
+\ProvidesClass{grant-darpa}[2019/02/26 DARPA class]
 
 \newcommand{\draftstatus}{isnotdraft}
 \DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
 \DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
 
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
 \newcommand{\sectioncompactstatus}{isnotsectioncompact}
 \DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
 \DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -606,10 +775,10 @@
 \DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
 \DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
 
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
 \ProcessOptions
 
-\LoadClass[12pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
 
 %%%%%%%%%%%%%%%%%%%%%%
 %% formatting
@@ -633,12 +802,16 @@
 %<*grant-doe>
 % \end{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-doe}[2016/01/12 DOE class]
+\ProvidesClass{grant-doe}[2019/02/26 DOE class]
 
 \newcommand{\draftstatus}{isnotdraft}
 \DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
 \DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
 
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
 \newcommand{\sectioncompactstatus}{isnotsectioncompact}
 \DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
 \DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -647,10 +820,10 @@
 \DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
 \DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
 
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
 \ProcessOptions
 
-\LoadClass[\draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[11pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
 
 %%%%%%%%%%%%%%%%%%%%%%
 %% formatting
@@ -658,6 +831,26 @@
 
 %geometry
 \geometry{margin=1in}
+
+%font
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+%%%%%%%%%%%%%%%%%%%%%
+%% cover page
+%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\makeabstractcoverpage}{    
+    \titlespacing*{\chapter}{0pt}{-4.4ex}{*-1}
+    {\centering
+    \chapter*{\centerline{\ProposalTitle}}
+    \PiName, \PiTitle\\
+    \PiDepartment, \PiInstitution\\
+    \PiPhone, \href{mailto:\PiEmail}{\PiEmail}, \href{http://www.\PiUrl}{\PiUrl}\\
+    DOE/Office of Science Program Office\\
+    Funding Opportunity Announcement Number: \FundingId\\
+    }
+}
+
 % \begin{macrocode}
 %</grant-doe>
 % \end{macrocode}
@@ -667,12 +860,16 @@
 %<*grant-nih>
 % \end{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-nih}[2016/01/12 NIH class]
+\ProvidesClass{grant-nih}[2019/02/26 NIH class]
 
 \newcommand{\draftstatus}{isnotdraft}
 \DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
 \DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
 
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
 \newcommand{\sectioncompactstatus}{isnotsectioncompact}
 \DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
 \DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -681,10 +878,10 @@
 \DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
 \DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
 
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
 \ProcessOptions
 
-\LoadClass[\draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[\draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
 
 %%%%%%%%%%%%%%%%%%%%%%
 %% formatting
@@ -702,12 +899,16 @@
 %<*grant-nrl>
 % \end{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-nrl}[2016/01/19 NRL class]
+\ProvidesClass{grant-nrl}[2019/02/26 NRL class]
 
 \newcommand{\draftstatus}{isnotdraft}
 \DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
 \DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
 
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
 \newcommand{\sectioncompactstatus}{isnotsectioncompact}
 \DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
 \DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -716,10 +917,10 @@
 \DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
 \DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
 
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
 \ProcessOptions
 
-\LoadClass[12pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
 
 %%%%%%%%%%%%%%%%%%%%%%
 %% formatting
@@ -743,12 +944,16 @@
 %<*grant-nsf>
 % \end{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-nsf}[2016/01/12 NSF class]
+\ProvidesClass{grant-nsf}[2019/02/26 NSF class]
 
 \newcommand{\draftstatus}{isnotdraft}
 \DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
 \DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
 
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
 \newcommand{\sectioncompactstatus}{isnotsectioncompact}
 \DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
 \DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -757,10 +962,10 @@
 \DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
 \DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
 
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
 \ProcessOptions
 
-\LoadClass[10pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[10pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
 
 %%%%%%%%%%%%%%%%%%%%%%
 %% formatting
@@ -777,12 +982,16 @@
 %<*grant-onr>
 % \end{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-onr}[2016/01/19 ONR class]
+\ProvidesClass{grant-onr}[2019/02/26 ONR class]
 
 \newcommand{\draftstatus}{isnotdraft}
 \DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
 \DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
 
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
 \newcommand{\sectioncompactstatus}{isnotsectioncompact}
 \DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
 \DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -791,10 +1000,10 @@
 \DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
 \DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
 
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
 \ProcessOptions
 
-\LoadClass[12pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
 
 %%%%%%%%%%%%%%%%%%%%%%
 %% formatting
@@ -809,6 +1018,29 @@
 
 %paragraph skip
 \setlength{\parskip}{4pt}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% abstract
+%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\AbstractName}{White paper}
+\settoggle{AbstractIsCentered}{true}
+\settoggle{AbstractShowAdminPOC}{false}
+\settoggle{AbstractShowLeadOrg}{false}
+\settoggle{AbstractShowOtherPersonnel}{false}
+\settoggle{AbstractShowDuration}{false}
+\settoggle{AbstractShowCost}{false}
+
+\ifbool{iswhitepaper}{
+    \titleformat{\section}[block]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[]
+    \titleformat{\subsection}[runin]{\bfseries}{\thesubsection.~}{0ex}{#1}[.]
+    \titleformat{\subsubsection}[runin]{}{\uline{\thesubsubsection.~}}{0ex}{\uline{#1}}[.]
+    
+    \titlespacing*{\section}{0pt}{*0.0}{*-1}
+    
+    \renewcommand{\bibfont}{\normalsize}
+}{}
+
+
 % \begin{macrocode}
 %</grant-onr>
 % \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/grant/grant.ins b/Master/texmf-dist/source/latex/grant/grant.ins
index 74f5035994a..a726dbff3a7 100644
--- a/Master/texmf-dist/source/latex/grant/grant.ins
+++ b/Master/texmf-dist/source/latex/grant/grant.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 %%
 %% This file may be distributed and/or modified under the conditions of
 %% the MIT License. The latest version of this license is in:
@@ -16,7 +16,7 @@
 
 This is a generated file.
 
-Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 
 This file may be distributed and/or modified under the conditions of
 the MIT License. The latest version of this license is in:
@@ -26,13 +26,14 @@ the MIT License. The latest version of this license is in:
 \endpreamble
 
 \generate{\file{grant.cls}{\from{grant.dtx}{grant}}}
-\generate{\file{grant-arl.cls}{\from{grant.dtx}{arl}}}
-\generate{\file{grant-darpa.cls}{\from{grant.dtx}{darpa}}}
-\generate{\file{grant-doe.cls}{\from{grant.dtx}{doe}}}
-\generate{\file{grant-nih.cls}{\from{grant.dtx}{nih}}}
-\generate{\file{grant-nrl.cls}{\from{grant.dtx}{nrl}}}
-\generate{\file{grant-nsf.cls}{\from{grant.dtx}{nsf}}}
-\generate{\file{grant-onr.cls}{\from{grant.dtx}{onr}}}
+\generate{\file{grant-afosr.cls}{\from{grant.dtx}{grant-afosr}}}
+\generate{\file{grant-aro.cls}{\from{grant.dtx}{grant-aro}}}
+\generate{\file{grant-darpa.cls}{\from{grant.dtx}{grant-darpa}}}
+\generate{\file{grant-doe.cls}{\from{grant.dtx}{grant-doe}}}
+\generate{\file{grant-nih.cls}{\from{grant.dtx}{grant-nih}}}
+\generate{\file{grant-nrl.cls}{\from{grant.dtx}{grant-nrl}}}
+\generate{\file{grant-nsf.cls}{\from{grant.dtx}{grant-nsf}}}
+\generate{\file{grant-onr.cls}{\from{grant.dtx}{grant-onr}}}
 
 \obeyspaces
 \Msg{*************************************************************}
@@ -41,7 +42,8 @@ the MIT License. The latest version of this license is in:
 \Msg{* files into a directory searched by TeX: *}
 \Msg{* *}
 \Msg{* grant.cls *}
-\Msg{* grant-arl.cls *}
+\Msg{* grant-afosr.cls *}
+\Msg{* grant-aro.cls *}
 \Msg{* grant-darpa.cls *}
 \Msg{* grant-doe.cls *}
 \Msg{* grant-nih.cls *}
diff --git a/Master/texmf-dist/tex/latex/grant/grant-afosr.cls b/Master/texmf-dist/tex/latex/grant/grant-afosr.cls
new file mode 100644
index 00000000000..8928c9195e9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/grant/grant-afosr.cls
@@ -0,0 +1,104 @@
+%%
+%% This is file `grant-afosr.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% grant.dtx  (with options: `grant-afosr')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
+%% 
+%% This file may be distributed and/or modified under the conditions of
+%% the MIT License. The latest version of this license is in:
+%% 
+%%     https://github.com/KarrLab/latex-grant/blob/master/LICENSE
+%% 
+
+
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+
+
+
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-afosr}[2019/02/26 AFOSR class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+\geometry{margin=1in}
+
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+\setlength{\parskip}{4pt}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% abstract
+%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\AbstractName}{White paper}
+\settoggle{AbstractIsCentered}{true}
+\settoggle{AbstractShowAdminPOC}{false}
+\settoggle{AbstractShowLeadOrg}{false}
+\settoggle{AbstractShowOtherPersonnel}{false}
+\settoggle{AbstractShowDuration}{false}
+\settoggle{AbstractShowCost}{false}
+
+\ifbool{iswhitepaper}{
+    \titleformat{\section}[block]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[]
+    \titleformat{\subsection}[runin]{\bfseries}{\thesubsection.~}{0ex}{#1}[.]
+    \titleformat{\subsubsection}[runin]{}{\uline{\thesubsubsection.~}}{0ex}{\uline{#1}}[.]
+
+    \titlespacing*{\section}{0pt}{*0.0}{*-1}
+
+    \renewcommand{\bibfont}{\normalsize}
+}{}
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `grant-afosr.cls'.
diff --git a/Master/texmf-dist/tex/latex/grant/grant-arl.cls b/Master/texmf-dist/tex/latex/grant/grant-arl.cls
deleted file mode 100644
index b460ee775aa..00000000000
--- a/Master/texmf-dist/tex/latex/grant/grant-arl.cls
+++ /dev/null
@@ -1,47 +0,0 @@
-%%
-%% This is file `grant-arl.cls',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% grant.dtx  (with options: `arl')
-%% 
-%% This is a generated file.
-%% 
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
-%% 
-%% This file may be distributed and/or modified under the conditions of
-%% the MIT License. The latest version of this license is in:
-%% 
-%%     https://github.com/KarrLab/latex-grant/blob/master/LICENSE
-%% 
-
-
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-
-
-
-
-
-
-
-
-
-
-\endinput
-%%
-%% End of file `grant-arl.cls'.
diff --git a/Master/texmf-dist/tex/latex/grant/grant-aro.cls b/Master/texmf-dist/tex/latex/grant/grant-aro.cls
new file mode 100644
index 00000000000..d3247858929
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/grant/grant-aro.cls
@@ -0,0 +1,104 @@
+%%
+%% This is file `grant-aro.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% grant.dtx  (with options: `grant-aro')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
+%% 
+%% This file may be distributed and/or modified under the conditions of
+%% the MIT License. The latest version of this license is in:
+%% 
+%%     https://github.com/KarrLab/latex-grant/blob/master/LICENSE
+%% 
+
+
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+
+
+
+
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-aro}[2019/02/26 ARO class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+\geometry{margin=1in}
+
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+\setlength{\parskip}{4pt}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% abstract
+%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\AbstractName}{White paper}
+\settoggle{AbstractIsCentered}{true}
+\settoggle{AbstractShowAdminPOC}{true}
+\settoggle{AbstractShowLeadOrg}{true}
+\settoggle{AbstractShowOtherPersonnel}{true}
+\settoggle{AbstractShowDuration}{false}
+\settoggle{AbstractShowCost}{false}
+
+\ifbool{iswhitepaper}{
+    \titleformat{\section}[block]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[]
+    \titleformat{\subsection}[runin]{\bfseries}{\thesubsection.~}{0ex}{#1}[.]
+    \titleformat{\subsubsection}[runin]{}{\uline{\thesubsubsection.~}}{0ex}{\uline{#1}}[.]
+
+    \titlespacing*{\section}{0pt}{*0.0}{*-1}
+
+    \renewcommand{\bibfont}{\normalsize}
+}{}
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `grant-aro.cls'.
diff --git a/Master/texmf-dist/tex/latex/grant/grant-darpa.cls b/Master/texmf-dist/tex/latex/grant/grant-darpa.cls
index 3816c0df544..76ee716a84d 100644
--- a/Master/texmf-dist/tex/latex/grant/grant-darpa.cls
+++ b/Master/texmf-dist/tex/latex/grant/grant-darpa.cls
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% grant.dtx  (with options: `darpa')
+%% grant.dtx  (with options: `grant-darpa')
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the MIT License. The latest version of this license is in:
@@ -38,6 +38,41 @@
 
 
 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-darpa}[2019/02/26 DARPA class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+\geometry{margin=1in}
+
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+\setlength{\parskip}{4pt}
+
 
 
 
diff --git a/Master/texmf-dist/tex/latex/grant/grant-doe.cls b/Master/texmf-dist/tex/latex/grant/grant-doe.cls
index e02eafae990..cd585c7590b 100644
--- a/Master/texmf-dist/tex/latex/grant/grant-doe.cls
+++ b/Master/texmf-dist/tex/latex/grant/grant-doe.cls
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% grant.dtx  (with options: `doe')
+%% grant.dtx  (with options: `grant-doe')
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the MIT License. The latest version of this license is in:
@@ -39,6 +39,55 @@
 
 
 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-doe}[2019/02/26 DOE class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[11pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+\geometry{margin=1in}
+
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+%%%%%%%%%%%%%%%%%%%%%
+%% cover page
+%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\makeabstractcoverpage}{
+    \titlespacing*{\chapter}{0pt}{-4.4ex}{*-1}
+    {\centering
+    \chapter*{\centerline{\ProposalTitle}}
+    \PiName, \PiTitle\\
+    \PiDepartment, \PiInstitution\\
+    \PiPhone, \href{mailto:\PiEmail}{\PiEmail}, \href{http://www.\PiUrl}{\PiUrl}\\
+    DOE/Office of Science Program Office\\
+    Funding Opportunity Announcement Number: \FundingId\\
+    }
+}
+
+
 
 
 
diff --git a/Master/texmf-dist/tex/latex/grant/grant-nih.cls b/Master/texmf-dist/tex/latex/grant/grant-nih.cls
index 5d9f5f38049..a09ab832640 100644
--- a/Master/texmf-dist/tex/latex/grant/grant-nih.cls
+++ b/Master/texmf-dist/tex/latex/grant/grant-nih.cls
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% grant.dtx  (with options: `nih')
+%% grant.dtx  (with options: `grant-nih')
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the MIT License. The latest version of this license is in:
@@ -40,6 +40,37 @@
 
 
 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-nih}[2019/02/26 NIH class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[\draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+\geometry{margin=0.5in}
+\setlength{\parskip}{4pt}
+
 
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/grant/grant-nrl.cls b/Master/texmf-dist/tex/latex/grant/grant-nrl.cls
index f874634648f..003d6e541db 100644
--- a/Master/texmf-dist/tex/latex/grant/grant-nrl.cls
+++ b/Master/texmf-dist/tex/latex/grant/grant-nrl.cls
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% grant.dtx  (with options: `nrl')
+%% grant.dtx  (with options: `grant-nrl')
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the MIT License. The latest version of this license is in:
@@ -41,6 +41,41 @@
 
 
 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-nrl}[2019/02/26 NRL class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+\geometry{margin=1in}
+
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+\setlength{\parskip}{4pt}
+
 
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/grant/grant-nsf.cls b/Master/texmf-dist/tex/latex/grant/grant-nsf.cls
index d89dda72c25..9d891fce29f 100644
--- a/Master/texmf-dist/tex/latex/grant/grant-nsf.cls
+++ b/Master/texmf-dist/tex/latex/grant/grant-nsf.cls
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% grant.dtx  (with options: `nsf')
+%% grant.dtx  (with options: `grant-nsf')
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the MIT License. The latest version of this license is in:
@@ -42,6 +42,36 @@
 
 
 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-nsf}[2019/02/26 NSF class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[10pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+\geometry{margin=1in}
+
 \endinput
 %%
 %% End of file `grant-nsf.cls'.
diff --git a/Master/texmf-dist/tex/latex/grant/grant-onr.cls b/Master/texmf-dist/tex/latex/grant/grant-onr.cls
index 5bbe8c427f6..7ee94618b4f 100644
--- a/Master/texmf-dist/tex/latex/grant/grant-onr.cls
+++ b/Master/texmf-dist/tex/latex/grant/grant-onr.cls
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% grant.dtx  (with options: `onr')
+%% grant.dtx  (with options: `grant-onr')
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the MIT License. The latest version of this license is in:
@@ -42,6 +42,63 @@
 
 
 
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-onr}[2019/02/26 ONR class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+\geometry{margin=1in}
+
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+\setlength{\parskip}{4pt}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% abstract
+%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\AbstractName}{White paper}
+\settoggle{AbstractIsCentered}{true}
+\settoggle{AbstractShowAdminPOC}{false}
+\settoggle{AbstractShowLeadOrg}{false}
+\settoggle{AbstractShowOtherPersonnel}{false}
+\settoggle{AbstractShowDuration}{false}
+\settoggle{AbstractShowCost}{false}
+
+\ifbool{iswhitepaper}{
+    \titleformat{\section}[block]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[]
+    \titleformat{\subsection}[runin]{\bfseries}{\thesubsection.~}{0ex}{#1}[.]
+    \titleformat{\subsubsection}[runin]{}{\uline{\thesubsubsection.~}}{0ex}{\uline{#1}}[.]
+
+    \titlespacing*{\section}{0pt}{*0.0}{*-1}
+
+    \renewcommand{\bibfont}{\normalsize}
+}{}
+
 \endinput
 %%
 %% End of file `grant-onr.cls'.
diff --git a/Master/texmf-dist/tex/latex/grant/grant.cls b/Master/texmf-dist/tex/latex/grant/grant.cls
index 7daa0b01a16..04d2f3d65fc 100644
--- a/Master/texmf-dist/tex/latex/grant/grant.cls
+++ b/Master/texmf-dist/tex/latex/grant/grant.cls
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the MIT License. The latest version of this license is in:
@@ -37,7 +37,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant}[2016/01/12 grant class]
+\ProvidesClass{grant}[2019/02/26 grant class]
 
 %%%%%%%%%%%%%%%%%%%%%%
 %% options
@@ -57,6 +57,13 @@
 \DeclareOption{isnotdraft}
     {\boolfalse{isdraft}}
 
+\newbool{iswhitepaper}
+\boolfalse{iswhitepaper}
+\DeclareOption{iswhitepaper}
+    {\booltrue{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}
+    {\boolfalse{iswhitepaper}}
+
 \newbool{issectioncompact}
 \boolfalse{issectioncompact}
 \DeclareOption{issectioncompact}
@@ -71,7 +78,7 @@
 \DeclareOption{isnotbibcompact}
     {\boolfalse{isbibcompact}}
 
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
 \ProcessOptions
 
 %%%%%%%%%%%%%%%%%%%%%%
@@ -91,6 +98,15 @@
 
 \usepackage[normalem]{ulem}
 \usepackage{soul}
+\soulregister\cite7
+
+\usepackage{xcolor}
+\usepackage{framed}
+\definecolor{hlcolor}{rgb}{1, 1, 0}
+\sethlcolor{hlcolor}
+\colorlet{shadecolor}{hlcolor}
+\setlength{\fboxsep}{0.05ex}
+\setlength{\OuterFrameSep}{-\fboxsep}
 
 \usepackage{setspace}
 \singlespacing
@@ -163,12 +179,17 @@
 \subsubsection*{#2}%
 }
 
+\ifbool{iswhitepaper}{
+    \titleformat{\section}[runin]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[:]
+}{
+    \usepackage[auto]{chappg}
+}
+
 \ifbool{issectioncompact}{
     \titleformat{\section}[runin]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[.]
     \titlespacing*{\section}{0pt}{*0.0}{*0.5}
 }{}
 
-\usepackage[auto]{chappg}
 
 \usepackage{fancyhdr}
 \pagestyle{fancy}
@@ -182,6 +203,12 @@
     \rfoot{\small\thepage}
 }{}
 
+\ifbool{iswhitepaper}{
+    \lfoot{}
+    \rfoot{}
+    \cfoot{\small\thepage}
+}{}
+
 \usepackage{paralist}
 \usepackage{enumitem}
 \setlist[itemize]{topsep=0pt, partopsep=0ex, parsep=0ex, itemsep=0ex, leftmargin=1em}
@@ -230,10 +257,17 @@
     \renewcommand{\bibfont}{\footnotesize}
 
     \ExecuteBibliographyOptions{maxbibnames=1,minbibnames=1}
+
     \DeclareFieldFormat[article]{title}{}
     \DeclareFieldFormat[article]{pages}{}
     \DeclareFieldFormat[article]{volume}{}
     \DeclareFieldFormat[article]{number}{}
+
+    \DeclareFieldFormat[inproceedings]{title}{}
+    \DeclareFieldFormat[inproceedings]{pages}{}
+    \DeclareFieldFormat[inproceedings]{volume}{}
+    \DeclareFieldFormat[inproceedings]{number}{}
+
     \DeclareFieldFormat[online]{url}{}
     \DeclareFieldFormat[online]{urldate}{}
 
@@ -379,6 +413,8 @@
 \newcommand{\PoEmail}{}
 \newcommand{\PoPhone}{}
 
+\newcommand{\FundingIdTitle}{\FundingId\ifdefempty{\FundingTitle}{}{: \FundingTitle}}
+
 \newcommand{\makecoverpage}{
     {\LARGE\bfseries
 
@@ -388,7 +424,7 @@
     \vskip1ex
     \uline{Funding opportunity}
     \\\FundingAgency
-    \\{\FundingTitle} (\href{\FundingUrl}{\FundingId})
+    \\\FundingIdTitle (\href{\FundingUrl}{\FundingId})
     \\\FundingDeadline
 
     \uline{Applicant}
@@ -408,12 +444,35 @@
     \\\PoPhone
 }
 
+\newcommand{\AbstractName}{Abstract}
+\newcommand{\AbstractOtherPersonnelName}{Other key personnel and primary subcontractors}
+\providetoggle{AbstractIsCentered}
+\providetoggle{AbstractShowAdminPOC}
+\providetoggle{AbstractShowLeadOrg}
+\providetoggle{AbstractShowOtherPersonnel}
+\providetoggle{AbstractShowDuration}
+\providetoggle{AbstractShowCost}
+\settoggle{AbstractIsCentered}{false}
+\settoggle{AbstractShowAdminPOC}{true}
+\settoggle{AbstractShowLeadOrg}{true}
+\settoggle{AbstractShowOtherPersonnel}{true}
+\settoggle{AbstractShowDuration}{true}
+\settoggle{AbstractShowCost}{true}
+
 \newcommand{\makeabstractcoverpage}{
-    \begin{center}\LARGE\textbf{
-    ABSTRACT\\[0.5ex]
-    \FundingId: \FundingTitle\\[0.5ex]
-    \ProposalTitle
+    {\setlength{\parskip}{12pt}
+
+    \iftoggle{AbstractIsCentered}{
+    \centering
+    }{}
+
+    \begin{center}\textbf{
+    \LARGE{\MakeUppercase{\AbstractName}}\\[18pt]
+    \LARGE{\FundingId}\\
+    \large{\FundingTitle}\\[18pt]
+    \LARGE{\ProposalTitle}
     }\end{center}
+    \vskip-8pt
 
     \textbf{Technical point of contact: \PiName}\\
     \PiTitle\\
@@ -422,25 +481,32 @@
     \PiAddress\\
     Tel: \PiPhone, Fax: \PiFax, Email: \href{mailto:\PiEmail}{\PiEmail}, Web: \href{http://www.\PiUrl}{\PiUrl}
 
+    \iftoggle{AbstractShowAdminPOC}{
     \textbf{Administrative point of contact: \AdminName}\\
     \AdminTitle\\
     \AdminAddress\\
     \AdminInstitution\\
     Tel: \AdminPhone, Fax: \AdminFax, Email: \href{mailto:\AdminEmail}{\AdminEmail}
+    }{}
 
+    \iftoggle{AbstractShowLeadOrg}{
     \textbf{Lead organization: \LeadOrganizationName}\\
     \LeadOrganizationAddress\\
     DUNS number: \LeadOrganizationDUNS\\
     Taxpayer identification number: \LeadOrganizationTIN\\
     CAGE code: \LeadOrganizationCAGE
+    }{}
 
-    \textbf{Other key personnel and primary subcontractors}\\
+    \iftoggle{AbstractShowOtherPersonnel}{
+    \textbf{\AbstractOtherPersonnelName}\\
     \OtherKeyPersonnel
+    }{}
 
-    \textbf{Duration: {\ProposalDurationInYears} years}
+    \iftoggle{AbstractShowDuration}{\textbf{Duration: {\ProposalDurationInYears} years}}{}
 
-    \textbf{Estimated cost: \${\ProposalCostInMillions} million in total costs}
+    \iftoggle{AbstractShowCost}{\textbf{Estimated cost: \${\ProposalCostInMillions} million in total costs}}{}
 
+    }
     \clearpage
 }
 
@@ -451,6 +517,7 @@
 
 
 
+
 \endinput
 %%
 %% End of file `grant.cls'.