header redone

1 files changed, 13 insertions, 7 deletions

diff --git a/wmletterhead.cls b/wmletterhead.cls
index 5edf14b..a48af69 100644
--- a/wmletterhead.cls
+++ b/wmletterhead.cls
@@ -83,7 +83,7 @@
 \setlength{\wmlogohpos}{0.76in}%  ideally should be calculated from \wmleftmargin and \wmlogoheight
 \setlength{\wmlogovpos}{0.75in}%  same as above
 \setlength{\wmlogoWhpos}{0.82in}% same as above
-\setlength{\wmlogoWvpos}{0.50in}% same as above
+\setlength{\wmlogoWvpos}{.15in}% same as above
 
 % --------------------------------------------------
 % Required by WM
@@ -132,7 +132,6 @@
   \ifx\@empty\fromaddress
     {}
   \else
-  \raggedleft%
     \begin{tabular}{l@{}}\ignorespaces
       \fromaddress%
     \end{tabular}%
@@ -146,11 +145,18 @@
 
 \newcommand{\wmfromwithlogo}{
   \setwmaddresssizes
-  \hskip -\wmlogoWhpos
-  \includegraphics[height=\wmlogoheight{},keepaspectratio=true]{\wmheaderlogo}
-  \hfill
-  \parbox[t]{\wmaddresswidth}{
-    \wmaddress{}
+    %\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}
+    }
+    }
+      \parbox[t]{\wmaddresswidth}{
+        \wmaddress{}
+      }
   }
 }