--- Maste/album.th	Wed Oct  3 22:30:49 2001
+++ /homes/e/mac/www/trips/Maste-mk/album.th	Thu Jan 30 11:23:25 2003
@@ -23,15 +23,4 @@
   sub img_src { print "<img src='$PATH/$_[0]' width='$_[1]' height='$_[2]' $_[3] border='0'>" if ($_[1]); }
 
-  # Thumbnail border
-  $X = Image_Page() ? Image_Width() : Get_Opt('x');
-  $Y = Image_Page() ? Image_Height() : Get_Opt('y');
-  @ThBord_L =   ("ThBord_L.gif", 11, $Y-0-0);
-  @ThBord_R =   ("ThBord_R.gif", 13, $Y-0-0);
-  @ThBord_TL =  ("ThBord_TL.gif", 11, 11);
-  @ThBord_TR =  ("ThBord_TR.gif", 13, 11);
-  @ThBord_BL =  ("ThBord_BL.gif", 11, 13);
-  @ThBord_BR =  ("ThBord_BR.gif", 13, 13);
-  @ThBord_T =   ("ThBord_T.gif", $X+11+13-11-13, 11);
-  @ThBord_B =   ("ThBord_B.gif", $X+11+13-11-13, 13);
 :>//
 <html>
@@ -113,5 +102,18 @@
 
       <tr>
-  <: while (Images()) { _:>//
+<: while (Images()) { 
+  # Thumbnail border computation
+  $X = Image_Page() ? Image_Width() : Image_Thumb_Width();
+  $Y = Image_Page() ? Image_Height() : Image_Thumb_Height();
+  @ThBord_L =   ("ThBord_L.gif", 11, $Y-0-0);
+  @ThBord_R =   ("ThBord_R.gif", 13, $Y-0-0);
+  @ThBord_TL =  ("ThBord_TL.gif", 11, 11);
+  @ThBord_TR =  ("ThBord_TR.gif", 13, 11);
+  @ThBord_BL =  ("ThBord_BL.gif", 11, 13);
+  @ThBord_BR =  ("ThBord_BR.gif", 13, 13);
+  @ThBord_T =   ("ThBord_T.gif", $X, 11);
+  @ThBord_B =   ("ThBord_B.gif", $X, 13);
+:>//
+
         <td valign="top" width="<:=$Col_Perc:>">
           <div align="center">
