grant (4nov20)

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

1 files changed, 79 insertions, 12 deletions

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'.