Merge pull request #2 from nmfs-opensci/delete

update to quarto_titlepages 3.3.10

_extensions/nmfs-opensci/titlepage/_author-affiliation-themes.tex

@@ -13,74 +13,75 @@
 $endif$
 $if(titlepage-style-code.author.plain)$
 \newcommand{\titlepageauthorblock}{
-\authorstyle{$for(by-author)$$by-author.name.literal$$sep$$titlepage-theme.author-sep$$endfor$\\}
+$if(titlepage-theme.author-color)$\textcolor{$titlepage-theme.author-color$}$endif${\authorstyle{$for(by-author)$\nohyphens{$by-author.name.literal$}$sep$$titlepage-theme.author-sep$$if(titlepage-theme.author-space-between)$~\\ \vspace{$titlepage-theme.author-space-between$}$endif$$endfor$\\}}
 }
 $endif$
 $if(titlepage-style-code.author.plain-with-and)$
 \newcommand{\titlepageauthorblock}{
-\authorstyle{$if(by-author/allbutlast)$$for(by-author/allbutlast)$$by-author.name.literal$$sep$$titlepage-theme.author-sep$ $endfor$$for(by-author/last)$ and $by-author.name.literal$$endfor$$else$$for(by-author/last)$$by-author.name.literal$$endfor$$endif$}
+$if(titlepage-theme.author-color)$\textcolor{$titlepage-theme.author-color$}$endif${\authorstyle{$if(by-author/allbutlast)$$for(by-author/allbutlast)$\nohyphens{$by-author.name.literal$}$sep$$titlepage-theme.author-sep$ $if(titlepage-theme.author-space-between)$~\\ \vspace{$titlepage-theme.author-space-between$}$endif$$endfor$$for(by-author/last)$ and \nohyphens{$by-author.name.literal$}$endfor$$else$$for(by-author/last)$\nohyphens{$by-author.name.literal$}$if(titlepage-theme.author-space-between)$~\\ \vspace{$titlepage-theme.author-space-between$}$endif$$endfor$$endif$}}
 }
 $endif$
 $if(titlepage-style-code.author.superscript)$
 \newcommand{\titlepageauthorblock}{
-\authorstyle{$for(by-author)$$by-author.name.literal$$for(by-author.affiliations)${\textsuperscript{$it.number$}}$sep${\textsuperscript{,}}$endfor$$if(by-author.email)$$if(by-author.affiliations)$\textsuperscript{,}$endif${\textsuperscript{*}}$endif$$sep$$titlepage-theme.author-sep$  $endfor$}
+$if(titlepage-theme.author-color)$\textcolor{$titlepage-theme.author-color$}$endif${\authorstyle{$for(by-author)$\nohyphens{$by-author.name.literal$}$for(by-author.affiliations)${\textsuperscript{$it.number$}}$sep${\textsuperscript{,}}$endfor$$if(by-author.email)$$if(by-author.affiliations)$\textsuperscript{,}$endif${\textsuperscript{*}}$endif$$sep$$titlepage-theme.author-sep$  $if(titlepage-theme.author-space-between)$~\\ \vspace{$titlepage-theme.author-space-between$}$endif$$endfor$}}
 }
 $endif$
 $if(titlepage-style-code.author.superscript-with-and)$
 \newcommand{\titlepageauthorblock}{
-\authorstyle{$if(by-author/allbutlast)$$for(by-author/allbutlast)$$by-author.name.literal$$for(by-author.affiliations)${\textsuperscript{$it.number$}}$sep$\textsuperscript{,}$endfor$$if(by-author.email)$$if(by-author.affiliations)$\textsuperscript{,}$endif${\textsuperscript{*}}$endif$$sep$$titlepage-theme.author-sep$ $endfor$$for(by-author/last)$ and $by-author.name.literal$$for(by-author.affiliations)${\textsuperscript{$it.number$}}$sep$\textsuperscript{,}$endfor$$if(by-author.email)$$if(by-author.affiliations)$\textsuperscript{,}$endif${\textsuperscript{*}}$endif$$endfor$%
-$else$%
-$for(by-author/last)$$by-author.name.literal$$for(by-author.affiliations)${\textsuperscript{$it.number$}}$sep$\textsuperscript{,}$endfor$$if(by-author.email)$$if(by-author.affiliations)$\textsuperscript{,}$endif${\textsuperscript{,*}}$endif$$endfor$$endif$
-}}
+$if(titlepage-theme.author-color)$\textcolor{$titlepage-theme.author-color$}$endif${\authorstyle{$if(by-author/allbutlast)$$for(by-author/allbutlast)$\nohyphens{$by-author.name.literal$}$for(by-author.affiliations)${\textsuperscript{$it.number$}}$sep$\textsuperscript{,}$endfor$$if(by-author.email)$$if(by-author.affiliations)$\textsuperscript{,}$endif${\textsuperscript{*}}$endif$$sep$$titlepage-theme.author-sep$ $if(titlepage-theme.author-space-between)$~\\ \vspace{$titlepage-theme.author-space-between$}$endif$$endfor$$for(by-author/last)$ and $if(titlepage-theme.author-space-between)$~\\ \vspace{$titlepage-theme.author-space-between$}$endif$\nohyphens{$by-author.name.literal$}$for(by-author.affiliations)${\textsuperscript{$it.number$}}$sep$\textsuperscript{,}$endfor$$if(by-author.email)$$if(by-author.affiliations)$\textsuperscript{,}$endif${\textsuperscript{*}}$endif$$endfor$$else$$for(by-author/last)$\nohyphens{$by-author.name.literal$}$for(by-author.affiliations)${\textsuperscript{$it.number$}}$sep$\textsuperscript{,}$endfor$$if(by-author.email)$$if(by-author.affiliations)$\textsuperscript{,}$endif${\textsuperscript{,*}}$endif$$endfor$$endif$}}}
 $endif$
 $if(titlepage-style-code.author.author-address)$
 \newcommand{\titlepageauthorblock}{
-\authorstyle{
-$for(by-author)$$by-author.name.literal$$if(by-author.affiliations)$,~$for(by-author.affiliations)$$by-author.affiliations.name$$if(by-affiliations.department)$,~$by-author.affiliations.department$$endif$$if(by-affiliations.address)$,~$by-author.affiliations.address$$endif$$sep$;~$endfor$$endif$$if(by-author.email)$~$by-author.email$$endif$$sep$\\
-$endfor$}}
+$if(titlepage-theme.author-color)$\textcolor{$titlepage-theme.author-color$}$endif${\authorstyle{
+$for(by-author)$$by-author.name.literal$$if(by-author.affiliations)$$titlepage-theme.affiliation-sep$$for(by-author.affiliations)$$by-author.affiliations.name$$if(by-author.affiliations.department)$$titlepage-theme.affiliation-sep$$by-author.affiliations.department$$endif$$if(by-author.affiliations.address)$$titlepage-theme.affiliation-sep$$for(by-author.affiliations.address)$$by-author.affiliations.address$$sep$$titlepage-theme.affiliation-sep$$endfor$$endif$$sep$$titlepage-theme.affiliation-sep$$endfor$$endif$$if(by-author.email)$$titlepage-theme.affiliation-sep$$by-author.email$$endif$$sep$\\
+$if(titlepage-theme.author-space-between)$\vspace{$titlepage-theme.author-space-between$}$endif$$endfor$}}}
 $endif$
 $if(titlepage-style-code.author.two-column)$
+\newcommand{\titlepageauthorblock}{
 \newlength{\miniA}
 \setlength{\miniA}{0pt}
 \newlength{\namelen}
 $for(by-author)$\settowidth{\namelen}{$by-author.name.literal$}\setlength{\miniA}{\maxof{\miniA}{\namelen}}$endfor$
 \setlength{\miniA}{\miniA+0.05\textwidth}
 \newlength{\miniB}
-\setlength{\miniB}{0.9\textwidth-\miniA}
-\newcommand{\titlepageauthorblock}{
+\setlength{\miniB}{0.99\textwidth - \miniA}
 \begin{minipage}{\miniA}
 \begin{flushleft}
-\authorstyle{$for(by-author)$$by-author.name.literal$$sep$\\ $endfor$}
+$if(titlepage-theme.author-color)$\textcolor{$titlepage-theme.author-color$}$endif${\authorstyle{$for(by-author)$$by-author.name.literal$$sep$\\ $if(titlepage-theme.author-space-between)$
+\vspace{$titlepage-theme.author-space-between$}$endif$$endfor$}}
 \end{flushleft}
 \end{minipage}
-~
 \begin{minipage}{\miniB}
 \begin{flushright}
-\affiliationstyle{$for(by-author)$$for(by-author.affiliations/first)$$by-author.affiliations.name$
+$if(titlepage-theme.affiliation-color)$\textcolor{$titlepage-theme.affiliation-color$}$endif${\affiliationstyle{$for(by-author)$$for(by-author.affiliations/first)$$by-author.affiliations.name$
 $endfor$$sep$\\
-$endfor$\\}
+$if(titlepage-theme.affiliation-space-between)$\vspace{$titlepage-theme.affiliation-space-between$}
+$endif$$endfor$\\}}
 \end{flushright}
-\end{minipage}
-}
+\end{minipage}}
 $endif$
 
+$if(titlepage-style-code.affiliation.none)$
+\newcommand{\titlepageaffiliationblock}{}
+$endif$
 $if(titlepage-style-code.affiliation.numbered-list)$
 \newcommand{\titlepageaffiliationblock}{
 \hangindent=1em
 \hangafter=1
-\affiliationstyle{
-$for(by-affiliation)${$it.number$}.~$if(by-affiliation.name)$$it.name$$endif$$if(by-affiliation.department)$$if(by-affiliation.name)$, $endif$$it.department$$endif$$if(by-affiliation.address)$$if(by-affiliation.name)$, $else$$if(by-affiliation.department)$, $endif$$endif$$it.address$$endif$%
-$sep$\par\hangindent=1em\hangafter=1
+\affiliationstyle{$for(by-affiliation)${$it.number$}.~$if(by-affiliation.name)$$it.name$$endif$$if(by-affiliation.department)$$if(by-affiliation.name)$$titlepage-theme.affiliation-sep$$endif$$it.department$$endif$$if(by-affiliation.address)$$if(by-affiliation.name)$$titlepage-theme.affiliation-sep$$else$$if(by-affiliation.department)$$titlepage-theme.affiliation-sep$$endif$$endif$$it.address$$endif$%
+$sep$\par\hangindent=1em\hangafter=1$if(titlepage-theme.affiliation-space-between)$
+\vspace{$titlepage-theme.affiliation-space-between$}$endif$
 $endfor$
 }}
 $endif$
 $if(titlepage-style-code.affiliation.numbered-list-with-correspondence)$
 \newcommand{\titlepageaffiliationblock}{
 \hangindent=1em
 \hangafter=1
-\affiliationstyle{
-$for(by-affiliation)${$it.number$}.~$if(by-affiliation.name)$$it.name$$endif$$if(by-affiliation.department)$$if(by-affiliation.name)$, $endif$$it.department$$endif$$if(by-affiliation.address)$$if(by-affiliation.name)$,  $else$$if(by-affiliation.department)$, $endif$$endif$$it.address$$endif$
-$sep$\par\hangindent=1em\hangafter=1%
+{\affiliationstyle{
+$for(by-affiliation)${$it.number$}.~$if(by-affiliation.name)$$it.name$$endif$$if(by-affiliation.department)$$if(by-affiliation.name)$$titlepage-theme.affiliation-sep$$endif$$it.department$$endif$$if(by-affiliation.address)$$if(by-affiliation.name)$$titlepage-theme.affiliation-sep$$else$$if(by-affiliation.department)$$titlepage-theme.affiliation-sep$$endif$$endif$$it.address$$endif$
+$sep$\par\hangindent=1em\hangafter=1$if(titlepage-theme.affiliation-space-between)$
+\vspace{$titlepage-theme.affiliation-space-between$}$endif$
 $endfor$
 
 \vspace{1\baselineskip} 
@@ -89,6 +90,6 @@
 $if(by-author.email)$
 * \textit{Correspondence:}~$by-author.name.literal$~$by-author.email$
 $endif$$endfor$$endif$
-}
+}}
 }
 $endif$

_extensions/nmfs-opensci/titlepage/_coverpage.tex

@@ -35,11 +35,10 @@
 \newcommand{\titlelocationbottom}{$coverpage-theme.title-bottom$}
 \newcommand{\titlealign}{$coverpage-theme.title-align$}
 
-\begin{scope}
-{%
+\begin{scope}{%
 $if(coverpage-theme.title-fontsize)$\fontsize{$coverpage-theme.title-fontsize$}{$coverpage-theme.title-spacing$}\selectfont
 $endif$$if(coverpage-theme.title-fontfamily)$\coverpagetitlefont
-$endif$\node[anchor=$coverpage-theme.title-anchor$, align=$coverpage-theme.title-align$, rotate=$coverpage-theme.title-rotate$] (Title1) at ($$(current page.south west)+(\titlelocationleft,\titlelocationbottom)$$)  [text width = $coverpage-theme.title-width$]  {$if(coverpage-theme.title-color)$\textcolor{$coverpage-theme.title-color$}$endif${$for(coverpage-theme.title-fontstyle)$\$coverpage-theme.title-fontstyle${$endfor$\nohyphens{$coverpage-title$}$for(coverpage-theme.title-fontstyle)$}$endfor$}};
+$endif$\node[anchor=$coverpage-theme.title-anchor$, align=$coverpage-theme.title-align$, rotate=$coverpage-theme.title-rotate$] (Title1) at ($$(current page.south west)+(\titlelocationleft,\titlelocationbottom)$$)  [text width = $coverpage-theme.title-width$$if(coverpage-theme.title-node-spec)$, $coverpage-theme.title-node-spec$$endif$]  {$if(coverpage-theme.title-color)$\textcolor{$coverpage-theme.title-color$}$endif${$for(coverpage-theme.title-fontstyle)$\$coverpage-theme.title-fontstyle${$endfor$\nohyphens{$coverpage-title$}$for(coverpage-theme.title-fontstyle)$}$endfor$}};
 }
 \end{scope}
 $endif$
@@ -56,7 +55,7 @@
 {%
 $if(coverpage-theme.author-fontsize)$\fontsize{$coverpage-theme.author-fontsize$}{$coverpage-theme.author-spacing$}\selectfont
 $endif$$if(coverpage-theme.author-fontfamily)$\coverpageauthorfont
-$endif$\node[anchor=$coverpage-theme.author-anchor$, align=$coverpage-theme.author-align$, rotate=$coverpage-theme.author-rotate$] (Author1) at ($$(current page.south west)+(\authorlocationleft,\authorlocationbottom)$$)  [text width = $coverpage-theme.author-width$]  {
+$endif$\node[anchor=$coverpage-theme.author-anchor$, align=$coverpage-theme.author-align$, rotate=$coverpage-theme.author-rotate$] (Author1) at ($$(current page.south west)+(\authorlocationleft,\authorlocationbottom)$$)  [text width = $coverpage-theme.author-width$$if(coverpage-theme.author-node-spec)$, $coverpage-theme.author-node-spec$$endif$]  {
 $if(coverpage-theme.author-color)$\textcolor{$coverpage-theme.author-color$}$endif$\coverauthorstyle{$for(coverpage-author)$$coverpage-author$$sep$$coverpage-theme.author-sep$$endfor$\\}};
 }
 \end{scope}
@@ -75,7 +74,7 @@
 $if(coverpage-theme.header-fontsize)$\fontsize{$coverpage-theme.header-fontsize$}{$coverpage-theme.header-spacing$}\selectfont
 $endif$ $if(coverpage-theme.header-fontfamily)$\coverpageheaderfont
 $endif$\node[anchor=$coverpage-theme.header-anchor$, align=$coverpage-theme.header-align$, rotate=$coverpage-theme.header-rotate$] (Header1) at %
-($$(current page.south west)+(\headerlocationleft,\headerlocationbottom)$$)  [text width = $coverpage-theme.header-width$]  {$if(coverpage-theme.header-color)$\textcolor{$coverpage-theme.header-color$}$endif${$for(coverpage-theme.header-fontstyle)$\$coverpage-theme.header-fontstyle${$endfor$\nohyphens{$coverpage-header$}$for(coverpage-theme.header-fontstyle)$}$endfor$}};
+($$(current page.south west)+(\headerlocationleft,\headerlocationbottom)$$)  [text width = $coverpage-theme.header-width$$if(coverpage-theme.header-node-spec)$, $coverpage-theme.header-node-spec$$endif$]  {$if(coverpage-theme.header-color)$\textcolor{$coverpage-theme.header-color$}$endif${$for(coverpage-theme.header-fontstyle)$\$coverpage-theme.header-fontstyle${$endfor$\nohyphens{$coverpage-header$}$for(coverpage-theme.header-fontstyle)$}$endfor$}};
 }
 \end{scope}
 $endif$
@@ -93,7 +92,25 @@
 $if(coverpage-theme.footer-fontsize)$\fontsize{$coverpage-theme.footer-fontsize$}{$coverpage-theme.footer-spacing$}\selectfont
 $endif$ $if(coverpage-theme.footer-fontfamily)$\coverpagefooterfont
 $endif$\node[anchor=$coverpage-theme.footer-anchor$, align=$coverpage-theme.footer-align$, rotate=$coverpage-theme.footer-rotate$] (Footer1) at %
-($$(current page.south west)+(\footerlocationleft,\footerlocationbottom)$$)  [text width = $coverpage-theme.footer-width$]  {$if(coverpage-theme.footer-color)$\textcolor{$coverpage-theme.footer-color$}$endif${$for(coverpage-theme.footer-fontstyle)$\$coverpage-theme.footer-fontstyle${$endfor$\nohyphens{$coverpage-footer$}$for(coverpage-theme.footer-fontstyle)$}$endfor$}};
+($$(current page.south west)+(\footerlocationleft,\footerlocationbottom)$$)  [text width = $coverpage-theme.footer-width$$if(coverpage-theme.footer-node-spec)$, $coverpage-theme.footer-node-spec$$endif$]  {$if(coverpage-theme.footer-color)$\textcolor{$coverpage-theme.footer-color$}$endif${$for(coverpage-theme.footer-fontstyle)$\$coverpage-theme.footer-fontstyle${$endfor$\nohyphens{$coverpage-footer$}$for(coverpage-theme.footer-fontstyle)$}$endfor$}};
+}
+\end{scope}
+$endif$
+$endif$
+$if(coverpage-style-code.date.plain)$
+$if(coverpage-date)$
+
+% Date
+\newcommand{\datelocationleft}{$coverpage-theme.date-left$}
+\newcommand{\datelocationbottom}{$coverpage-theme.date-bottom$}
+\newcommand{\datelocationalign}{$coverpage-theme.date-align$}
+
+\begin{scope}
+{%
+$if(coverpage-theme.date-fontsize)$\fontsize{$coverpage-theme.date-fontsize$}{$coverpage-theme.date-spacing$}\selectfont
+$endif$ $if(coverpage-theme.date-fontfamily)$\coverpagedatefont
+$endif$\node[anchor=$coverpage-theme.date-anchor$, align=$coverpage-theme.date-align$, rotate=$coverpage-theme.date-rotate$] (Date1) at %
+($$(current page.south west)+(\datelocationleft,\datelocationbottom)$$)  [text width = $coverpage-theme.date-width$$if(coverpage-theme.date-node-spec)$, $coverpage-theme.date-node-spec$$endif$]  {$if(coverpage-theme.date-color)$\textcolor{$coverpage-theme.date-color$}$endif${$for(coverpage-theme.date-fontstyle)$\$coverpage-theme.date-fontstyle${$endfor$\nohyphens{$coverpage-date$}$for(coverpage-theme.date-fontstyle)$}$endfor$}};
 }
 \end{scope}
 $endif$

_extensions/nmfs-opensci/titlepage/_extension.yml

@@ -1,6 +1,7 @@
 title: titlepage
 author: Eli Holmes
-version: 3.3.3
+quarto-required: ">=1.1.0"
+version: 3.3.10
 contributes:
   format:
     pdf:
@@ -15,3 +16,5 @@ contributes:
         - "_titlepage.tex"
         - "before-body.tex"
         - "pandoc.tex"
+      format-resources:
+        - "fonts/qualitype/opentype/QTDublinIrish.otf"

_extensions/nmfs-opensci/titlepage/_title-themes.tex

@@ -16,7 +16,7 @@
 \vspace{\betweentitlesubtitle}
 {
 $if(titlepage-theme.subtitle-fontsize)$\fontsize{$titlepage-theme.subtitle-fontsize$}{$titlepage-theme.subtitle-spacing$}\selectfont
-$endif${$for(titlepage-theme.subtitle-fontstyle)$\$titlepage-theme.subtitle-fontstyle${$endfor$\nohyphens{$subtitle$}$for(titlepage-theme.subtitle-fontstyle)$}$endfor$}\par
+$endif$$if(titlepage-theme.subtitle-color)$\textcolor{$titlepage-theme.subtitle-color$}$endif${$for(titlepage-theme.subtitle-fontstyle)$\$titlepage-theme.subtitle-fontstyle${$endfor$\nohyphens{$subtitle$}$for(titlepage-theme.subtitle-fontstyle)$}$endfor$}\par
 }$endif$}
 $--
 $if(titlepage-style-code.title.none)$

_extensions/nmfs-opensci/titlepage/_titlepage.tex

@@ -99,7 +99,7 @@
 $else$$endif$}
 
 \newcommand{\affiliationblock}{$if(author)$
-{$if(titlepage-theme.afiliation-align)$\titlepageaffiliationalign
+$if(titlepage-theme.affiliation-color)$\textcolor{$titlepage-theme.affiliation-color$}$endif${$if(titlepage-theme.affiliation-align)$\titlepageaffiliationalign
 $endif$$if(titlepage-theme.affiliation-fontfamily)$\titlepageaffiliationfont
 $endif$\titlepageaffiliationblock}
 
@@ -114,23 +114,23 @@
 $else$$endif$}
 
 \newcommand{\footerblock}{$if(titlepage-footer)$
-{$if(titlepage-theme.footer-align)$\titlepagefooteralign
+$if(titlepage-theme.footer-color)$\textcolor{$titlepage-theme.footer-color$}$endif${$if(titlepage-theme.footer-align)$\titlepagefooteralign
 $endif$$if(titlepage-theme.footer-fontfamily)$\titlepagefooterfont
 $endif$\titlepagefooterblock}
 
 \vspace{$if(titlepage-theme.footer-space-after)$$titlepage-theme.footer-space-after$$else$0pt$endif$}
 $else$$endif$}
 
 \newcommand{\dateblock}{$if(date)$
-{$if(titlepage-theme.date-align)$\titlepagedatealign
+$if(titlepage-theme.date-color)$\textcolor{$titlepage-theme.date-color$}$endif${$if(titlepage-theme.date-align)$\titlepagedatealign
 $endif$$if(titlepage-theme.date-fontfamily)$\titlepagedatefont
 $endif$\titlepagedateblock}
 
 \vspace{$if(titlepage-theme.date-space-after)$$titlepage-theme.date-space-after$$else$0pt$endif$}
 $else$$endif$}
 
 \newcommand{\headerblock}{$if(titlepage-header)$
-{$if(titlepage-theme.header-align)$\titlepageheaderalign
+$if(titlepage-theme.header-color)$\textcolor{$titlepage-theme.header-color$}$endif${$if(titlepage-theme.header-align)$\titlepageheaderalign
 $endif$$if(titlepage-theme.header-fontfamily)$\titlepageheaderfont$endif$\titlepageheaderblock
 
 \vspace{$if(titlepage-theme.header-space-after)$$titlepage-theme.header-space-after$$else$0pt$endif$}

_extensions/nmfs-opensci/titlepage/before-body.tex

@@ -36,3 +36,4 @@
 $endif$
 
 %%%%% end titlepage extension code
+