moved length definitions forward

1 files changed, 27 insertions, 26 deletions

diff --git a/wmletterhead.cls b/wmletterhead.cls
index 0949621..526e509 100644
--- a/wmletterhead.cls
+++ b/wmletterhead.cls
@@ -15,6 +15,32 @@
 % Recomended use:
 % \documentclass[12pt,fullcolor]{wmletterhead}
 
+% --------------------------------------------------
+% New length to be used for WM specific things
+
+% Page layout specific
+\newlength{\wmtopmargin} % start position for address or logo
+\newlength{\wmleftmargin}
+\newlength{\wmrightmargin}
+\newlength{\wmbottommargin}
+\newlength{\wmlogoseparation} % distance between logo/from address to the main letter
+
+% WM logos parameters
+\newlength{\wmlogoheight}
+\newlength{\wmlogowidth}
+\newlength{\wmlogohpos}
+\newlength{\wmlogovpos}
+\newlength{\wmlogoWhpos} % distance from the left logo edge to the 'W' in William
+\newlength{\wmlogoWvpos} % distance from the top  logo edge to the 'W' in William
+
+% --------------------------------------------------
+% internal use sizes to lineup logo and from (W&M) address
+\newlength{\wmaddressheight} % to be calculated at the opening
+\newlength{\wmaddresstotalheight}
+\newlength{\wmaddresswidth}
+\newlength{\wmaddresshpos}
+
+
 %-------------- define WM header logo file ---------------------------------
 \providecommand{\wmheaderlogo}{}% nologo
 
@@ -71,14 +97,6 @@
 \setlength{\longindentation}{0pt} % this is indent of signature
 
 % --------------------------------------------------
-% WM logos parameters
-\newlength{\wmlogoheight}
-\newlength{\wmlogowidth}
-\newlength{\wmlogohpos}
-\newlength{\wmlogovpos}
-\newlength{\wmlogoWhpos} % distance from the left logo edge to the 'W' in William
-\newlength{\wmlogoWvpos} % distance from the top  logo edge to the 'W' in William
-
 % below are measured in the Word template
 \setlength{\wmlogoheight}{0.65in} 
 \setlength{\wmlogowidth}{3.64in}% ideally should be scaled from \wmlogoheight
@@ -89,32 +107,15 @@
 
 % --------------------------------------------------
 % Required by WM
-\newlength{\wmlogoseparation}
 \setlength{\wmlogoseparation}{0.5in} % header text from main text separation
-
-\newlength{\wmleftmargin}
 \setlength{\wmleftmargin}{1.64in}
-
-\newlength{\wmrightmargin}
 \setlength{\wmrightmargin}{1.0in}
-
-\newlength{\wmbottommargin}
 \setlength{\wmbottommargin}{1.0in} % guessed
-
-\newlength{\wmtopmargin} %start position for address or logo
 \setlength{\wmtopmargin}{1.0in}
 
 \colorlet{wmtaglinecolor}{WMgold}
 
 % --------------------------------------------------
-% internal use sizes to lineup logo and from (W&M) address
-\newlength{\wmaddressheight} % to be calculated at the opening
-\newlength{\wmaddresstotalheight}
-\newlength{\wmaddresswidth}
-\newlength{\wmaddresshpos}
-% --------------------------------------------------
-
-% --------------------------------------------------
 % Let's calculate/set page layout
 
 \geometry{
@@ -151,7 +152,7 @@
   \setwmaddresssizes
     \raisebox{\wmaddressheight-\wmlogoheight+\wmlogoWvpos}[\wmaddressheight]{
       \hskip -\wmlogoWhpos%
-        \includegraphics[height=\wmlogoheight{},keepaspectratio=true]{\wmheaderlogo}
+      \includegraphics[height=\wmlogoheight{},keepaspectratio=true]{\wmheaderlogo}%
     }
   \hfill\wmaddress{}%
 }