uwa-letterhead (28sep21)

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

6 files changed, 71 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/uwa-letterhead/README b/Master/texmf-dist/doc/latex/uwa-letterhead/README
index 5aa003f531d..15b9f212d27 100644
--- a/Master/texmf-dist/doc/latex/uwa-letterhead/README
+++ b/Master/texmf-dist/doc/latex/uwa-letterhead/README
@@ -20,4 +20,5 @@ This work has the LPPL maintenance status `maintained'.
 The Current Maintainer of this work is Anthony Di Pietro.
 
 This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+uwa-letterhead.pdf.
diff --git a/Master/texmf-dist/doc/latex/uwa-letterhead/example.tex b/Master/texmf-dist/doc/latex/uwa-letterhead/uwa-letterhead-example.tex
index 9168e2d7d13..3a467e0eebe 100644
--- a/Master/texmf-dist/doc/latex/uwa-letterhead/example.tex
+++ b/Master/texmf-dist/doc/latex/uwa-letterhead/uwa-letterhead-example.tex
@@ -13,7 +13,8 @@
 % The Current Maintainer of this work is Anthony Di Pietro.
 %
 % This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-% example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+% uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+% uwa-letterhead.pdf.
 
 \documentclass[a4paper,11pt]{article}
 \usepackage{uwa-letterhead}
@@ -22,7 +23,6 @@
 \school{School of Psychological Science}
 \mbdp{000}
 \phone{+61 8 6488 0000}
-\mobile{+61 000 000 000}
 \email{john.smith@uwa.edu.au}
 
 \begin{document}
diff --git a/Master/texmf-dist/doc/latex/uwa-letterhead/uwa-letterhead.pdf b/Master/texmf-dist/doc/latex/uwa-letterhead/uwa-letterhead.pdf
index 1325f7aa0de..cdc994b8cd7 100644
--- a/Master/texmf-dist/doc/latex/uwa-letterhead/uwa-letterhead.pdf
+++ b/Master/texmf-dist/doc/latex/uwa-letterhead/uwa-letterhead.pdf
diff --git a/Master/texmf-dist/source/latex/uwa-letterhead/uwa-letterhead.dtx b/Master/texmf-dist/source/latex/uwa-letterhead/uwa-letterhead.dtx
index 87f044cc856..7f3a1e4073f 100644
--- a/Master/texmf-dist/source/latex/uwa-letterhead/uwa-letterhead.dtx
+++ b/Master/texmf-dist/source/latex/uwa-letterhead/uwa-letterhead.dtx
@@ -14,7 +14,8 @@
 % The Current Maintainer of this work is Anthony Di Pietro.
 %
 % This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-% example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+% uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+% uwa-letterhead.pdf.
 % \fi
 %
 % \iffalse
@@ -24,7 +25,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{uwa-letterhead}
 %<*package>
-    [2019/08/31 1.0.0 UWA Letterhead]
+    [2021/09/13 1.0.1 UWA Letterhead]
 %</package>
 %
 %<*driver>
@@ -38,7 +39,7 @@
         regular,
         nouwafont,
         noarial
-]{uwa-letterhead}[2019/08/31]
+]{uwa-letterhead}[2021/09/13]
 \GetFileInfo{uwa-letterhead.dtx}
 \setcounter{secnumdepth}{3}
 \geometry{
@@ -59,7 +60,7 @@
 \DisableCrossrefs
 \CodelineIndex
 \RecordChanges
-\CheckSum{545}
+\CheckSum{561}
 \begin{document}
         \DocInput{uwa-letterhead.dtx}
 \end{document}
@@ -83,6 +84,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \changes{1.0.0}{2019/08/31}{Initial version}
+% \changes{1.0.1}{2021/09/13}{Make first-page footer optional}
 %
 % \maketitle
 %
@@ -104,7 +106,7 @@
 % typeface for the first-page footer and the
 % \href{https://www.brand.uwa.edu.au/}{UWA Slab} typeface for headings.
 % The fonts must be installed on the system for this to work. Arial is
-% available as part of Microsoft's TypeType core fonts for the web
+% available as part of Microsoft's TrueType core fonts for the web
 % (\url{https://sourceforge.net/projects/mscorefonts2/}), and UWA Slab is
 % available from the UWA website
 % (\url{https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/fonts/uwa/}).
@@ -132,6 +134,13 @@
 %         \item |nouwafont|: Use the body text typeface for headings.
 % \end{itemize}
 %
+% You can pass the following options to specify whether to include the
+% first-page footer:
+% \begin{itemize}
+%         \item |footer|: Include the first-page footer.
+%         \item |nofooter|: Do not include the first-page footer (default).
+% \end{itemize}
+%
 % You can pass the following options to specify whether to use Arial
 % for the first-page footer:
 % \begin{itemize}
@@ -241,14 +250,17 @@
 %
 % \begin{minipage}{\textwidth}
 % \begin{macro}{\uwalh@uwafont}
+% \begin{macro}{\uwalh@footer}
 % \begin{macro}{\uwalh@arialfont}
 % Define conditionals for the package options.
 %    \begin{macrocode}
 \newif\ifuwalh@uwafont
+\newif\ifuwalh@footer
 \newif\ifuwalh@arialfont
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 % \end{minipage}
 %
 % The |uwafont| and |nouwafont| options respectively enable and disable
@@ -262,6 +274,17 @@
 }
 %    \end{macrocode}
 %
+% The |footer| and |nofooter| options respectively enable and disable
+% the first-page footer.
+%    \begin{macrocode}
+\DeclareOption{footer}{
+        \uwalh@footertrue
+}
+\DeclareOption{nofooter}{
+        \uwalh@footerfalse
+}
+%    \end{macrocode}
+%
 % The |arial| and |noarial| options respectively enable and disable
 % using Arial for the first-page footer.
 %    \begin{macrocode}
@@ -301,14 +324,17 @@
         }{sourcecodepro}
 }
 %    \end{macrocode}
-% Use the |uwafont|, |arial|, and |light| options by default.
+%
+% Use the |uwafont|, |nofooter|, |arial|, and |light| options by default.
 %    \begin{macrocode}
 \ExecuteOptions{
         uwafont,
+        nofooter,
         arial,
         light
 }
 %    \end{macrocode}
+%
 % Complete option processing.
 %    \begin{macrocode}
 \ProcessOptions\relax
@@ -355,8 +381,12 @@
 %
 % Set font for first-page footer.
 %    \begin{macrocode}
-\ifuwalh@arialfont
-        \newfontfamily{\uwalh@arial}{Arial}
+\ifuwalh@footer
+        \ifuwalh@arialfont
+                \newfontfamily{\uwalh@arial}{Arial}
+        \else
+                \newcommand*{\uwalh@arial}{\sffamily}
+        \fi
 \else
         \newcommand*{\uwalh@arial}{\sffamily}
 \fi
@@ -385,6 +415,7 @@
 \titlespacing*{\section}{0em}{2\baselineskip}{0em}
 \titlespacing*{\subsection}{0em}{\baselineskip}{0em}
 %    \end{macrocode}
+%
 % Disable section numbering.
 %    \begin{macrocode}
 \setcounter{secnumdepth}{0}
@@ -424,11 +455,13 @@
 %    \begin{macrocode}
 \RequirePackage{stringstrings}
 %    \end{macrocode}
+%
 % Use |textpos| in |absolute| mode to place letterhead elements
 % at arbitrary positions on the page.
 %    \begin{macrocode}
 \RequirePackage[absolute]{textpos}
 %    \end{macrocode}
+%
 % Use |graphicx| to add the university logo.
 %    \begin{macrocode}
 \RequirePackage{graphicx}
@@ -590,6 +623,7 @@
 % \begin{macro}{\address}
 % \begin{macro}{\phone}
 % \begin{macro}{\mobile}
+% \changes{1.0.1}{2021/09/13}{Make mobile optional without first-page footer}
 % \begin{macro}{\email}
 % \begin{macro}{\website}
 % \begin{macro}{\footeraddress}
@@ -858,7 +892,7 @@
         \uwalh@checkfield{\uwalh@school}{\noexpand\school}
         \uwalh@checkfield{\uwalh@mbdp}{\noexpand\mbdp}
         \uwalh@checkfield{\uwalh@phone}{\noexpand\phone}
-        \uwalh@checkfield{\uwalh@mobile}{\noexpand\mobile}
+        \ifuwalh@footer\uwalh@checkfield{\uwalh@mobile}{\noexpand\mobile}\fi
         \uwalh@checkfield{\uwalh@email}{\noexpand\email}
 }
 %    \end{macrocode}
@@ -874,7 +908,7 @@
         \uwalh@bar{}%
         \uwalh@logo{}%
         \uwalh@addressblock{}%
-        \uwalh@firstpagefooter{}%
+        \ifuwalh@footer\uwalh@firstpagefooter{}\fi%
         \vspace*{\uwalh@vspaceatstart}%
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/uwa-letterhead/uwa-letterhead.ins b/Master/texmf-dist/source/latex/uwa-letterhead/uwa-letterhead.ins
index fbf81d2c00d..914719e130a 100644
--- a/Master/texmf-dist/source/latex/uwa-letterhead/uwa-letterhead.ins
+++ b/Master/texmf-dist/source/latex/uwa-letterhead/uwa-letterhead.ins
@@ -13,7 +13,8 @@
 %% The Current Maintainer of this work is Anthony Di Pietro.
 %%
 %% This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-%% example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+%% uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+%% uwa-letterhead.pdf.
 
 \input docstrip.tex
 \keepsilent
@@ -37,7 +38,8 @@ This work has the LPPL maintenance status `maintained'.
 The Current Maintainer of this work is Anthony Di Pietro.
 
 This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+uwa-letterhead.pdf.
 
 \endpreamble
 
diff --git a/Master/texmf-dist/tex/latex/uwa-letterhead/uwa-letterhead.sty b/Master/texmf-dist/tex/latex/uwa-letterhead/uwa-letterhead.sty
index 0a4ed8a2ded..58cd87d7512 100644
--- a/Master/texmf-dist/tex/latex/uwa-letterhead/uwa-letterhead.sty
+++ b/Master/texmf-dist/tex/latex/uwa-letterhead/uwa-letterhead.sty
@@ -21,12 +21,14 @@
 %% The Current Maintainer of this work is Anthony Di Pietro.
 %% 
 %% This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-%% example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+%% uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+%% uwa-letterhead.pdf.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{uwa-letterhead}
-    [2019/08/31 1.0.0 UWA Letterhead]
+    [2021/09/13 1.0.1 UWA Letterhead]
 \newif\ifuwalh@uwafont
+\newif\ifuwalh@footer
 \newif\ifuwalh@arialfont
 \DeclareOption{uwafont}{
         \uwalh@uwafonttrue
@@ -34,6 +36,12 @@
 \DeclareOption{nouwafont}{
         \uwalh@uwafontfalse
 }
+\DeclareOption{footer}{
+        \uwalh@footertrue
+}
+\DeclareOption{nofooter}{
+        \uwalh@footerfalse
+}
 \DeclareOption{arial}{
         \uwalh@arialfonttrue
 }
@@ -64,6 +72,7 @@
 }
 \ExecuteOptions{
         uwafont,
+        nofooter,
         arial,
         light
 }
@@ -84,8 +93,12 @@
 \else
         \newcommand*{\uwalh@uwa}{\sffamily}
 \fi
-\ifuwalh@arialfont
-        \newfontfamily{\uwalh@arial}{Arial}
+\ifuwalh@footer
+        \ifuwalh@arialfont
+                \newfontfamily{\uwalh@arial}{Arial}
+        \else
+                \newcommand*{\uwalh@arial}{\sffamily}
+        \fi
 \else
         \newcommand*{\uwalh@arial}{\sffamily}
 \fi
@@ -322,7 +335,7 @@
         \uwalh@checkfield{\uwalh@school}{\noexpand\school}
         \uwalh@checkfield{\uwalh@mbdp}{\noexpand\mbdp}
         \uwalh@checkfield{\uwalh@phone}{\noexpand\phone}
-        \uwalh@checkfield{\uwalh@mobile}{\noexpand\mobile}
+        \ifuwalh@footer\uwalh@checkfield{\uwalh@mobile}{\noexpand\mobile}\fi
         \uwalh@checkfield{\uwalh@email}{\noexpand\email}
 }
 \newcommand{\uwalh@makeletterhead}{%
@@ -330,7 +343,7 @@
         \uwalh@bar{}%
         \uwalh@logo{}%
         \uwalh@addressblock{}%
-        \uwalh@firstpagefooter{}%
+        \ifuwalh@footer\uwalh@firstpagefooter{}\fi%
         \vspace*{\uwalh@vspaceatstart}%
 }
 \AtBeginDocument{\uwalh@makeletterhead}