aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wmletterhead.cls20
1 files changed, 7 insertions, 13 deletions
diff --git a/wmletterhead.cls b/wmletterhead.cls
index 0faa98a..c0d654a 100644
--- a/wmletterhead.cls
+++ b/wmletterhead.cls
@@ -104,6 +104,7 @@
\newlength{\wmaddressheight} % to be calculated at the opening
+\newlength{\wmaddresstotalheight}
\newlength{\wmaddresswidth}
\newlength{\wmaddresshpos}
% --------------------------------------------------
@@ -139,25 +140,18 @@
}
\newcommand{\setwmaddresssizes}{
- \settototalheight{\wmaddressheight}{\hbox{\wmaddress}}%
+ \settototalheight{\wmaddresstotalheight}{\hbox{\wmaddress}}%
+ \settoheight{\wmaddressheight}{\hbox{\wmaddress}}%
\settowidth{\wmaddresswidth}{\hbox{\wmaddress}}%
}
\newcommand{\wmfromwithlogo}{
\setwmaddresssizes
- %\hskip -\wmlogoWhpos
- %\includegraphics[height=\wmlogoheight{},keepaspectratio=true]{\wmheaderlogo}
- \parbox[t]{\textwidth}{
- \raisebox{\wmlogoWvpos}{
- \parbox[t]{\textwidth-\wmaddresswidth}{
- \hskip -\wmlogoWhpos
- \includegraphics[height=\wmlogoheight{},keepaspectratio=true]{\wmheaderlogo}
- }
+ \raisebox{\wmaddressheight-\wmlogoheight+\wmlogoWvpos}[\wmaddressheight]{
+ \hskip -\wmlogoWhpos%
+ \includegraphics[height=\wmlogoheight{},keepaspectratio=true]{\wmheaderlogo}
}
- \parbox[t]{\wmaddresswidth}{
- \wmaddress{}
- }
- }
+ \hfill\wmaddress{}%
}