summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/stex/workaddress/workaddress.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/stex/workaddress/workaddress.dtx')
-rw-r--r--Master/texmf-dist/source/latex/stex/workaddress/workaddress.dtx363
1 files changed, 141 insertions, 222 deletions
diff --git a/Master/texmf-dist/source/latex/stex/workaddress/workaddress.dtx b/Master/texmf-dist/source/latex/stex/workaddress/workaddress.dtx
index 78e09ed1322..d3fa2fb6b37 100644
--- a/Master/texmf-dist/source/latex/stex/workaddress/workaddress.dtx
+++ b/Master/texmf-dist/source/latex/stex/workaddress/workaddress.dtx
@@ -1,30 +1,29 @@
% \iffalse meta-comment
% An Infrastructure for managing addresses and affiliations in LaTeX
-% $URL: https://svn.kwarc.info/repos/stex/trunk/sty/workaddress/workaddress.dtx $
-% $Rev: 1999 $; last modified by $Author: kohlhase $
-% $Date: 2012-01-28 08:32:11 +0100 (Sat, 28 Jan 2012) $
% Copyright (c) 2011 Michael Kohlhase, all rights reserved
% this file is released under the
% LaTeX Project Public License (LPPL)
+% The original of this file is in the public repository at
+% http://github.com/KWARC/sTeX/
% \fi
%
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{workaddress}[2012/01/28 v0.4 WorkAddress]
+\ProvidesPackage{workaddress}[2016/04/07 v0.4 WorkAddress]
%</package>
%<*driver>
\documentclass{ltxdoc}
\usepackage{workaddress,sref,url,array,float}
\usepackage[show]{ed}
\usepackage[hyperref=auto,style=alphabetic]{biblatex}
-\bibliography{kwarc}
-\usepackage{../ctansvn}
+\addbibresource{kwarcpubs.bib}
+\addbibresource{extpubs.bib}
+\addbibresource{kwarccrossrefs.bib}
+\addbibresource{extcrossrefs.bib}
+\usepackage{ctangit}
\usepackage{hyperref}
\usepackage{stex-logo}
-\usepackage[eso-foot,today]{svninfo}
-\svnInfo $Id: workaddress.dtx 1999 2012-01-28 07:32:11Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/stex/trunk/sty/workaddress/workaddress.dtx $
\makeindex
\floatstyle{boxed}
\newfloat{exfig}{thp}{lop}
@@ -49,7 +48,7 @@
%</driver>
% \fi
%
-%\CheckSum{341}
+%\CheckSum{334}
%
% \changes{v0.4}{2011/11/04}{Extracting from dcm.sty}
% \changes{v0.4}{2012/01/18}{new functionality for logos}
@@ -180,7 +179,7 @@
%
% In this section we document known limitations. If you want to help alleviate them,
% please feel free to contact the package author. Some of them are currently discussed in
-% the \sTeX TRAC~\cite{sTeX:online}.
+% the \sTeX GitHub repository~\cite{sTeX:github:on}.
% \begin{compactenum}
% \item none reported yet
% \end{compactenum}
@@ -189,13 +188,6 @@
%
% \section{The Implementation}\label{sec:impl}
%
-% The |workaddress| package generates two files: the {\LaTeX} package (all the code between
-% {\textsf{$\langle$*package$\rangle$}} and {\textsf{$\langle$/package$\rangle$}}) and the
-% {\latexml} bindings (between {\textsf{$\langle$*ltxml$\rangle$ and
-% $\langle$/ltxml$\rangle$}}). We keep the corresponding code fragments together,
-% since the documentation applies to both of them and to prevent them from getting out of
-% sync.
-%
% \subsection{Package Options}\label{sec:impl.options}
% The first step is to declare (a few) package options that handle whether certain
% information is printed or not. They all come with their own conditionals that are set by
@@ -203,26 +195,14 @@
%
% \begin{macrocode}
%<*package>
-\DeclareOption{showmeta}{\PassOptionsToPackage{\CurrentOption}{metakeys}}
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{sref}}
\ProcessOptions
-%</package>
% \end{macrocode}
%
% The first measure is to ensure that the |KeyVal| package is loaded (in the right
-% version). For {\latexml} we also initialize the package inclusions.
+% version). For {\latexml} we also initialize the package inclusions.
% \begin{macrocode}
-%<*package>
\RequirePackage{sref}
-\RequirePackage{pgf}
-%</package>
-%<*ltxml>
-# -*- CPERL -*-
-package LaTeXML::Package::Pool;
-use strict;
-use LaTeXML::Global;
-use LaTeXML::Package;
-RequirePackage('sref');
-%</ltxml>
% \end{macrocode}
%
% \subsection{Persons}
@@ -230,23 +210,22 @@ RequirePackage('sref');
% To implement the |\WAperson| macro, we need to implement its keywords.
%
% \begin{macrocode}
-%<*package>
-\addmetakey{wa@person}{id}
-\addmetakey{wa@person}{birthdate}
-\addmetakey{wa@person}{email}
-\addmetakey{wa@person}{url}
-\addmetakey{wa@person}{affiliation}
-\addmetakey{wa@person}{personaltitle}
-\addmetakey{wa@person}{academictitle}
-\addmetakey{wa@person}{department}
-\addmetakey{wa@person}{workaddress}
-\addmetakey{wa@person}{privaddress}
-\addmetakey{wa@person}{worktel}
-\addmetakey{wa@person}{privtel}
-\addmetakey{wa@person}{workfax}
-\addmetakey{wa@person}{privfax}
-\addmetakey{wa@person}{worktelfax}
-\addmetakey{wa@person}{privtelfax}
+\addmetakey*{wa@person}{id}
+\addmetakey*{wa@person}{birthdate}
+\addmetakey*{wa@person}{email}
+\addmetakey*{wa@person}{url}
+\addmetakey*{wa@person}{affiliation}
+\addmetakey*{wa@person}{personaltitle}
+\addmetakey*{wa@person}{academictitle}
+\addmetakey*{wa@person}{department}
+\addmetakey*{wa@person}{workaddress}
+\addmetakey*{wa@person}{privaddress}
+\addmetakey*{wa@person}{worktel}
+\addmetakey*{wa@person}{privtel}
+\addmetakey*{wa@person}{workfax}
+\addmetakey*{wa@person}{privfax}
+\addmetakey*{wa@person}{worktelfax}
+\addmetakey*{wa@person}{privtelfax}
% \end{macrocode}
%
% \begin{macro}{\wa@def}
@@ -254,34 +233,6 @@ RequirePackage('sref');
% register.
% \begin{macrocode}
\def\wa@def#1#2#3#4{\expandafter\xdef\csname wa@#1@#2@#3\endcsname{#4}}
-%</package>
-% \end{macrocode}
-%
-% At the {\latexml} side we have a function |ExportMetadata| that does a similar job,
-% fishing out the metadata keys from the keyval arguments and storing them in a safe place
-% so they can be accessed later.
-%
-% \begin{macrocode}
-%<*ltxml>
- sub getKeyValue_noDelim {
- my ($keyval,$key)=@_;
- my $valuelist = $keyval && ToString($keyval->getValue($key));
- $valuelist =~ s/^{(.*)}$/$1/g if $valuelist;
- return $valuelist;
-}
-sub ExportMetadata {
- my $keys = shift;
- my($id, $email,$affill,$address,$url,$name)=$keys
- && map(getKeyValue_noDelim($keys,$_),qw(id email affiliation address url name));
- if ($id) {
- AssignValue('WA_'.$id.'_email',$email,'global') if $email;
- AssignValue('WA_'.$id.'_affiliation',$affill,'global') if $affill;
- AssignValue('WA_'.$id.'_address',$email,'global') if $email;
- AssignValue('WA_'.$id.'_url',$url,'global') if $url;
- AssignValue('WA_'.$id.'_name',$name,'global') if $name;
- } else {print STDERR "Warning: key 'id' undefined in \\WAperson\n"};
- return;}#$
-%</ltxml>
% \end{macrocode}
% \end{macro}
%
@@ -290,13 +241,13 @@ sub ExportMetadata {
% This macro tests whether the information specified is defined, and gives an error
% message else.
% \begin{macrocode}
-%<*package>
\def\wa@ref@test#1#2#3{%
-\@ifundefined{wa@#1@#2@#3}%
-{\PackageError{workaddress}{reference to undefined #3 of #1 #2}%
-{you must define a #1 with #2=#3\MessageBreak%
-via the macro \protect\WA#1, before you can use it!}}
-{}}
+ \@ifundefined{wa@#1@#2@#3}{%
+ \PackageError{workaddress}{reference to undefined #3 of #1 #2}%
+ {you must define a #1 with #2=#3\MessageBreak%
+ via the macro \protect\WA#1, before you can use it!}
+ }{}%
+}%
% \end{macrocode}
% \end{macro}
%
@@ -304,7 +255,10 @@ via the macro \protect\WA#1, before you can use it!}}
%
% \begin{macro}{\wa@ref}
% \begin{macrocode}
-\def\wa@ref#1#2#3{\wa@ref@test{#1}{#2}{#3}\csname wa@#1@#2@#3\endcsname}
+\def\wa@ref#1#2#3{%
+ \wa@ref@test{#1}{#2}{#3}%
+ \csname wa@#1@#2@#3\endcsname%
+}%
% \end{macrocode}
% \end{macro}
%
@@ -315,62 +269,41 @@ via the macro \protect\WA#1, before you can use it!}}
% \begin{macro}{WAperson}
% \begin{macrocode}
\let\wa@persons=\relax
-\newcommand{\WAperson}[2][]{\metasetkeys{wa@person}{#1}
-\ifx\wa@person@id\@empty\@latex@warning{key 'id' undefined in WAperson}\else
-\wa@def{person}\wa@person@id{id}{\wa@person@id}% redundant, but useful for checking
-\wa@def{person}\wa@person@id{name}{#2}
-\wa@def{person}\wa@person@id{email}{\wa@person@email}
-\wa@def{person}\wa@person@id{birthdate}{\wa@person@birthdate}
-\wa@def{person}\wa@person@id{url}{\wa@person@url}
-\wa@def{person}\wa@person@id{affiliation}{\wa@person@affiliation}
-\wa@def{person}\wa@person@id{workaddress}{\wa@person@workaddress}
-\wa@def{person}\wa@person@id{privaddress}{\wa@person@privaddress}
-\wa@def{person}\wa@person@id{personaltitle}{\wa@person@personaltitle}
-\wa@def{person}\wa@person@id{academictitle}{\wa@person@academictitle}
-\wa@def{person}\wa@person@id{department}{\wa@person@department}
-\wa@def{person}\wa@person@id{workaddress}{\wa@person@workaddress}
-\wa@def{person}\wa@person@id{privaddress}{\wa@person@privaddress}
-\wa@def{person}\wa@person@id{worktel}{\wa@person@worktel}
-\wa@def{person}\wa@person@id{privtel}{\wa@person@privtel}
-\wa@def{person}\wa@person@id{workfax}{\wa@person@workfax}
-\wa@def{person}\wa@person@id{privfax}{\wa@person@privfax}
-\wa@def{person}\wa@person@id{worktelfax}{\wa@person@worktelfax}
-\wa@def{person}\wa@person@id{privtelfax}{\wa@person@privtelfax}
-\@ifundefined{wa@persons}
-{\xdef\wa@persons{\wa@person@id}}
-{\xdef\wa@persons{\wa@persons,\wa@person@id}}
-\fi}
-\newcommand\DCMperson[2][]{\WAperson[#1]{#2}%
-\PackageWarning{workaddress}{\protect\DCMperson\space is deprecated, use \protect\WAperson\space instead}}
-%</package>
-%<*ltxml>
-DefKeyVal('wa@person','id','Semiverbatim');
-DefKeyVal('wa@person','birthdate','Semiverbatim');
-DefKeyVal('wa@person','email','Semiverbatim');
-DefKeyVal('wa@person','url','Semiverbatim');
-DefKeyVal('wa@person','affiliation','Semiverbatim');
-DefKeyVal('wa@person','personaltitle','Semiverbatim');
-DefKeyVal('wa@person','academictitle','Semiverbatim');
-DefKeyVal('wa@person','department','Semiverbatim');
-DefKeyVal('wa@person','workaddress','Semiverbatim');
-DefKeyVal('wa@person','privaddress','Semiverbatim');
-DefKeyVal('wa@person','worktel','Semiverbatim');
-DefKeyVal('wa@person','privtel','Semiverbatim');
-DefKeyVal('wa@person','workfax','Semiverbatim');
-DefKeyVal('wa@person','privfax','Semiverbatim');
-DefKeyVal('wa@person','worktelfax','Semiverbatim');
-DefKeyVal('wa@person','privtelfax','Semiverbatim');
-
-DefConstructor('\WAperson OptionalKeyVals:wa@person {}','',
-afterDigest=>sub {
- my ($stomach,$whatsit)=@_;
- my $keys=$whatsit->getArg(1);
- my $name=ToString($whatsit->getArg(2));
- $keys->setValue('name',$name);
- ExportMetadata($keys);
- return;
-});#$
-%</ltxml>
+\newcommand\WAperson[2][]{%
+ \metasetkeys{wa@person}{#1}%
+ \ifx\wa@person@id\@empty%
+ \@latex@warning{key 'id' undefined in WAperson}%
+ \else%
+ \wa@def{person}\wa@person@id{id}{\wa@person@id}% redundant, but useful for checking
+ \wa@def{person}\wa@person@id{name}{#2}
+ \wa@def{person}\wa@person@id{email}{\wa@person@email}
+ \wa@def{person}\wa@person@id{birthdate}{\wa@person@birthdate}
+ \wa@def{person}\wa@person@id{url}{\wa@person@url}
+ \wa@def{person}\wa@person@id{affiliation}{\wa@person@affiliation}
+ \wa@def{person}\wa@person@id{workaddress}{\wa@person@workaddress}
+ \wa@def{person}\wa@person@id{privaddress}{\wa@person@privaddress}
+ \wa@def{person}\wa@person@id{personaltitle}{\wa@person@personaltitle}
+ \wa@def{person}\wa@person@id{academictitle}{\wa@person@academictitle}
+ \wa@def{person}\wa@person@id{department}{\wa@person@department}
+ \wa@def{person}\wa@person@id{workaddress}{\wa@person@workaddress}
+ \wa@def{person}\wa@person@id{privaddress}{\wa@person@privaddress}
+ \wa@def{person}\wa@person@id{worktel}{\wa@person@worktel}
+ \wa@def{person}\wa@person@id{privtel}{\wa@person@privtel}
+ \wa@def{person}\wa@person@id{workfax}{\wa@person@workfax}
+ \wa@def{person}\wa@person@id{privfax}{\wa@person@privfax}
+ \wa@def{person}\wa@person@id{worktelfax}{\wa@person@worktelfax}
+ \wa@def{person}\wa@person@id{privtelfax}{\wa@person@privtelfax}
+ \@ifundefined{wa@persons}{%
+ \xdef\wa@persons{\wa@person@id}%
+ }{%
+ \xdef\wa@persons{\wa@persons,\wa@person@id}%
+ }%
+ \fi%
+}%
+\newcommand\DCMperson[2][]{%
+ \WAperson[#1]{#2}%
+ \PackageWarning{workaddress}{\protect\DCMperson\space is deprecated, use \protect\WAperson\space instead}
+}%
% \end{macrocode}
% \end{macro}
%
@@ -379,18 +312,17 @@ afterDigest=>sub {
% To implement the |\WAinstitution| macro, we need to implement its keywords first.
%
% \begin{macrocode}
-%<*package>
-\addmetakey{wa@institution}{id}
-\addmetakey{wa@institution}{shortname}
-\addmetakey{wa@institution}{acronym}
-\addmetakey{wa@institution}{url}
-\addmetakey{wa@institution}{partof}
-\addmetakey{wa@institution}{countryshort}
-\addmetakey{wa@institution}{logo}
-\addmetakey{wa@institution}{streetaddress}
-\addmetakey{wa@institution}{townzip}
-\addmetakey{wa@institution}{type}
-\addmetakey{wa@institution}{country}
+\addmetakey*{wa@institution}{id}
+\addmetakey*{wa@institution}{shortname}
+\addmetakey*{wa@institution}{acronym}
+\addmetakey*{wa@institution}{url}
+\addmetakey*{wa@institution}{partof}
+\addmetakey*{wa@institution}{countryshort}
+\addmetakey*{wa@institution}{logo}
+\addmetakey*{wa@institution}{streetaddress}
+\addmetakey*{wa@institution}{townzip}
+\addmetakey*{wa@institution}{type}
+\addmetakey*{wa@institution}{country}
% \end{macrocode}
% and we proceed as for |\WAperson|,
% \begin{macrocode}
@@ -399,41 +331,34 @@ afterDigest=>sub {
%
% \begin{macro}{WAinstitution}
% \begin{macrocode}
-\newcommand{\WAinstitution}[2][]{\metasetkeys{wa@institution}{#1}
-\ifx\wa@institution@id\@empty\@latex@warning{key 'id' undefined in WAinstitution}\else
-\wa@def{institution}\wa@institution@id{id}{\wa@institution@id}% redundant, but useful for checking
-\wa@def{institution}\wa@institution@id{name}{#2}
-\wa@def{institution}\wa@institution@id{shortname}{\wa@institution@shortname}
-\wa@def{institution}\wa@institution@id{acronym}{\wa@institution@acronym}
-\wa@def{institution}\wa@institution@id{url}{\wa@institution@url}
-\wa@def{institution}\wa@institution@id{partof}{\wa@institution@partof}
-\wa@def{institution}\wa@institution@id{countryshort}{\wa@institution@countryshort}
-\wa@def{institution}\wa@institution@id{logo}{\wa@institution@logo}
-\wa@def{institution}\wa@institution@id{townzip}{\wa@institution@townzip}
-\wa@def{institution}\wa@institution@id{streetaddress}{\wa@institution@streetaddress}
-\wa@def{institution}\wa@institution@id{country}{\wa@institution@country}
-\wa@def{institution}\wa@institution@id{type}{\wa@institution@type}
-\@ifundefined{wa@institutions}
-{\xdef\wa@institutions{\wa@institution@id}}
-{\xdef\wa@institutions{\wa@institutions,\wa@institution@id}}
-\fi}
-\newcommand\DCMinstitution[2][]{\WAinstitution[#1]{#2}%
-\PackageWarning{workaddress}{\protect\DCMinstitution\space is deprecated, use \protect\WAinstitution\space instead}}
-%</package>
-%<*ltxml>
-DefKeyVal('wa@institution','id','Semiverbatim');
-DefKeyVal('wa@institution','url','Semiverbatim');
-DefKeyVal('wa@institution','partof','Semiverbatim');
-DefConstructor('\WAinstitution OptionalKeyVals:wa@institution {}','',
-afterDigest=>sub {
- my ($stomach,$whatsit)=@_;
- my $keys=$whatsit->getArg(1);
- my $name=ToString($whatsit->getArg(2));
- $keys->setValue('name',$name);
- ExportMetadata($keys);
- return;
-});#$
-%</ltxml>
+\newcommand\WAinstitution[2][]{%
+ \metasetkeys{wa@institution}{#1}%
+ \ifx\wa@institution@id\@empty%
+ \@latex@warning{key 'id' undefined in WAinstitution}%
+ \else%
+ \wa@def{institution}\wa@institution@id{id}{\wa@institution@id}% redundant, but useful for checking
+ \wa@def{institution}\wa@institution@id{name}{#2}
+ \wa@def{institution}\wa@institution@id{shortname}{\wa@institution@shortname}
+ \wa@def{institution}\wa@institution@id{acronym}{\wa@institution@acronym}
+ \wa@def{institution}\wa@institution@id{url}{\wa@institution@url}
+ \wa@def{institution}\wa@institution@id{partof}{\wa@institution@partof}
+ \wa@def{institution}\wa@institution@id{countryshort}{\wa@institution@countryshort}
+ \wa@def{institution}\wa@institution@id{logo}{\wa@institution@logo}
+ \wa@def{institution}\wa@institution@id{townzip}{\wa@institution@townzip}
+ \wa@def{institution}\wa@institution@id{streetaddress}{\wa@institution@streetaddress}
+ \wa@def{institution}\wa@institution@id{country}{\wa@institution@country}
+ \wa@def{institution}\wa@institution@id{type}{\wa@institution@type}
+ \@ifundefined{wa@institutions}{%
+ \xdef\wa@institutions{\wa@institution@id}%
+ }{%
+ \xdef\wa@institutions{\wa@institutions,\wa@institution@id}%
+ }%
+ \fi%
+}%
+\newcommand\DCMinstitution[2][]{%
+ \WAinstitution[#1]{#2}%
+ \PackageWarning{workaddress}{\protect\DCMinstitution\space is deprecated, use \protect\WAinstitution\space instead}%
+}%
% \end{macrocode}
% \end{macro}
%
@@ -443,74 +368,68 @@ afterDigest=>sub {
% This internal macro builds an author block from a list of |\WAperson| labels in
% |\wa@creators|.
% \begin{macrocode}
-%<*package>
\addmetakey[false]{WAauthorblock}{dept}[true]
\addmetakey[false]{WAauthorblock}{aff}[true]
\addmetakey[false]{WAauthorblock}{url}[true]
\def\@true{true}
\newcounter{authors}
\newcommand\WAauthorblock[2][]{%
-\metasetkeys{WAauthorblock}{#1}
-{\let\tabularnewline\relax
- \@for\@I:=#2\do{\stepcounter{authors}}
- \def\@authors{}\def\@affs{}\def\@depts{}\def\@urls{}
- \@for\@I:=#2\do
- {\xdef\@authors{\@authors&\wa@ref{person}\@I{name}}
- \xdef\@@dept{\wa@ref{person}\@I{department}}
- \xdef\@shortname{\csname wa@institution@\@@dept @shortname\endcsname}
- \xdef\@dept{\ifx\@shortname\@empty\wa@ref{institution}\@@dept{name}\else\@shortname\fi}
- \xdef\@depts{\@depts&\@dept}
- \xdef\@@aff{\wa@ref{person}\@I{affiliation}}
- \xdef\@shortname{\csname wa@institution@\@@aff @shortname\endcsname}
- \xdef\@aff{\ifx\@shortname\@empty\wa@ref{institution}\@@aff{name}\else\@shortname\fi}
- \xdef\@affs{\@affs&\@aff}
- \xdef\@urls{\@urls&\wa@ref{person}\@I{url}}}
- \message{\theauthors authors: \@authors}}
+ \metasetkeys{WAauthorblock}{#1}
+ {\let\tabularnewline\relax
+ \@for\@I:=#2\do{\stepcounter{authors}}
+ \def\@authors{}%
+ \def\@affs{}%
+ \def\@depts{}%
+ \def\@urls{}%
+ \@for\@I:=#2\do{%
+ \xdef\@authors{\@authors&\wa@ref{person}\@I{name}}
+ \xdef\@@dept{\wa@ref{person}\@I{department}}
+ \xdef\@shortname{\csname wa@institution@\@@dept @shortname\endcsname}
+ \xdef\@dept{\ifx\@shortname\@empty\wa@ref{institution}\@@dept{name}\else\@shortname\fi}
+ \xdef\@depts{\@depts&\@dept}
+ \xdef\@@aff{\wa@ref{person}\@I{affiliation}}
+ \xdef\@shortname{\csname wa@institution@\@@aff @shortname\endcsname}
+ \xdef\@aff{\ifx\@shortname\@empty\wa@ref{institution}\@@aff{name}\else\@shortname\fi}
+ \xdef\@affs{\@affs&\@aff}
+ \xdef\@urls{\@urls&\wa@ref{person}\@I{url}}
+ }%
+ \message{\theauthors authors: \@authors}%
+ }%
\begin{tabular}[t]{l*{\theauthors}{c}}
\@authors\\
\ifx\WAauthorblock@dept\@true\@depts\\\fi
\ifx\WAauthorblock@aff\@true\@affs\\\fi
\ifx\WAauthorblock@url\@true\@urls\\\fi
-\end{tabular}}
-%</package>
+ \end{tabular}
+}%
% \begin{macrocode}
% \end{macro}
%
% \begin{macro}{\wapname}
% \begin{macrocode}
-%<*package>
\newcommand\wapname[1]{\wa@ref{person}{#1}{name}}
-%</package>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\waptname}
% \begin{macrocode}
-%<*package>
\newcommand\waptname[1]{\wa@ref{person}{#1}{personaltitle} \wa@ref{person}{#1}{name}}
-%</package>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\wa@institution@logo}
-% \ednote{this code should probably be refactored into workaddress.dtx}
% \begin{macrocode}
-%<*package>
\newcommand\wa@institution@logo[2][]{%
-\pgfdeclareimage[#1]{logo}{\wa@ref{institution}{#2}{logo}}
-\IfFileExists{\wa@ref{institution}{#2}{logo}}%
-{\pgfuseimage{logo}}
-{\fbox{#2 logo}\message{still need logo for #2}}}
+ \IfFileExists{\wa@ref{institution}{#2}{logo}}{%
+ \includegraphics{\wa@ref{institution}{#2}{logo}}%
+ }{%
+ \fbox{#2 logo}\message{still need logo for #2}%
+ }%
+}%
%</package>
% \end{macrocode}
% \end{macro}
%
-%\subsection{Finale}
-%
-% Finally, we need to terminate the file with a success mark for perl.
-% \begin{macrocode}
-%<ltxml>1;
-% \end{macrocode}
% \Finale
\endinput
% \iffalse