2 files changed, 157 insertions, 62 deletions

diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 97ccb3391868..dbab6cc409dc 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p3
-PORTREVISION=	41
+PORTREVISION=	42
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}-beta/2.03pre3
diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa
index 9a775e8bc252..2213d0be176d 100644
--- a/www/WebMagick/files/patch-aa
+++ b/www/WebMagick/files/patch-aa
@@ -2,15 +2,15 @@ Index: webmagick.in
 ===================================================================
 RCS file: /cvsroot/webmagick/WebMagick/webmagick.in,v
 retrieving revision 1.117
-retrieving revision 1.163
-diff -u -r1.117 -r1.163
+retrieving revision 1.165
+diff -u -r1.117 -r1.165
 --- webmagick.in	23 Oct 2002 16:14:47 -0000	1.117
-+++ webmagick.in	5 Apr 2011 13:53:47 -0000	1.163
++++ webmagick.in	6 Apr 2011 06:58:30 -0000	1.165
 @@ -1,6 +1,6 @@
  #! @PERL@ 
  #
 -# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $
-+# $Id: webmagick.in,v 1.163 2011/04/05 13:53:47 ache Exp $
++# $Id: webmagick.in,v 1.165 2011/04/06 06:58:30 ache Exp $
  #
  # You are looking at the main PERL script for WebMagick, a package to
  # intelligently create HTML and JavaScript index files and imagemaps
@@ -332,6 +332,22 @@ diff -u -r1.117 -r1.163
  		'thumbtexture=s'	=> \$opt_thumbtexture,
  		'thumbbackground=s'	=> \$opt_thumbbackground,
  		'thumbborderwidth=i'	=> \$opt_thumbborderwidth,
+@@ -1153,12 +1206,12 @@
+ 	'|(\.eps2$)|(\.epsf$)|(\.epsi$)|(\.ept$)|(\.fax$)|(\.fig$)' .
+         '|(\.fits$)|(\.fpx$)|(\.g3$)|(\.gif$)|(\.gplt$)|(\.hdf$)' .
+         '|(\.hpgl$)|(\.ico$)|(\.im1$)|(\.im24$)|(\.im8$)|(\.jbg$)' .
+-        '|(\.jbig$)|(\.jpeg$)|(\.jpg$)|(\.m2v$)|(\.man$)|(\.mif$)' .
+-        '|(\.miff$)|(\.mng$)|(\.mpeg$)|(\.mpg$)|(\.mtv$)|(\.p7$)' .
++	'|(\.jbig$)|(\.jpeg?$)|(\.jpg$)|(\.m2v$)|(\.man$)|(\.mif$)' .
++	'|(\.miff$)|(\.mng$)|(\.mpe?g$)|(\.mtv$)|(\.p7$)' .
+         '|(\.pbm$)|(\.pcd$)|(\.pcds$)|(\.pcx$)|(\.pdf$)|(\.pgm$)' .
+         '|(\.pic$)|(\.pict$)|(\.pix$)|(\.png$)|(\.pnm$)|(\.pov$)' .
+         '|(\.ppm$)|(\.ps$)|(\.psd$)|(\.rad$)|(\.rla$)|(\.rle$)' .
+-        '|(\.sgi$)|(\.sun$)|(\.tga$)|(\.tif$)|(\.tiff$)|(\.tim$)' .
++	'|(\.sgi$)|(\.sun$)|(\.tga$)|(\.tiff?$)|(\.tim$)' .
+         '|(\.ttf$)|(\.vicar$)|(\.viff$)|(\.wmf$)|(\.xbm$)|(\.xpm$)' .
+         '|(\.xwd$)';
+ 
 @@ -1187,7 +1240,6 @@
  
      evaluateRcFiles();
@@ -681,7 +697,7 @@ diff -u -r1.117 -r1.163
  	    } 
  	}
      }
-@@ -2128,14 +2238,15 @@
+@@ -2128,25 +2238,26 @@
      #
      open( INDEX, ">${opt_indexname}")
  	|| die("$0: Failed to open file ${opt_indexname} for output\n$@\n");
@@ -694,11 +710,27 @@ diff -u -r1.117 -r1.163
  
      # Meta tags
 -    print( INDEX "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" );
-+    print( INDEX "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" )
+-    print( INDEX "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
++    print( INDEX "  <META NAME=\"generator\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" )
 +	if (!$opt_anonymous);
-     print( INDEX "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
++    print( INDEX "  <META NAME=\"author\" CONTENT=\"${opt_metaauthor}\">\n" )
  	if( "$opt_metaauthor" ne '' );
-     print( INDEX "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
+-    print( INDEX "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
++    print( INDEX "  <META NAME=\"description\" CONTENT=\"${opt_metadescription}\">\n" )
+ 	if( "$opt_metadescription" ne '' );
+-    print( INDEX "  <META NAME=\"Keywords\" CONTENT=\"${opt_metakeywords}\">\n" )
++    print( INDEX "  <META NAME=\"keywords\" CONTENT=\"${opt_metakeywords}\">\n" )
+ 	if( "$opt_metakeywords" ne '' );
+-    print( INDEX "  <META NAME=\"Classification\" CONTENT=\"${opt_metaclassification}\">\n" )
++    print( INDEX "  <META NAME=\"classification\" CONTENT=\"${opt_metaclassification}\">\n" )
+ 	if( "$opt_metaclassification" ne '' );
+     # The value of $opt_metaexpires should be similar to:
+     #   "Tue, 20 Aug 1996 14:25:27 GMT"
+-    print( INDEX "  <META HTTP-EQUIV=\"Expires\" CONTENT=\"${opt_metaexpires}\">\n" )
++    print( INDEX "  <META HTTP-EQUIV=\"expires\" CONTENT=\"${opt_metaexpires}\">\n" )
+ 	if( "$opt_metaexpires" ne '' );
+     print( INDEX "  <LINK REL=\"stylesheet\" type=\"text/css\" HREF=\"${opt_stylesheet}\">\n")
+ 	if ("$opt_stylesheet" ne '');
 @@ -2154,7 +2265,7 @@
      # If in JavaScript mode, output code to switch to JavaScript pages
      # Currently knows about certain browsers.
@@ -773,17 +805,29 @@ diff -u -r1.117 -r1.163
      # Charset is better before title
      print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
  	if( "$opt_metacharset" ne '' );
-@@ -2224,7 +2331,8 @@
+@@ -2224,35 +2331,37 @@
      print( INDEX "  <BASE TARGET=\"$opt_frame_name_top\">\n" );
  
      # Meta tags
 -    print( INDEX "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" );
-+    print( INDEX "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" )
+-    print( INDEX "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
++    print( INDEX "  <META NAME=\"generator\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" )
 +	if (!$opt_anonymous);
-     print( INDEX "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
++    print( INDEX "  <META NAME=\"author\" CONTENT=\"${opt_metaauthor}\">\n" )
  	if( "$opt_metaauthor" ne '' );
-     print( INDEX "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
-@@ -2239,20 +2347,21 @@
+-    print( INDEX "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
++    print( INDEX "  <META NAME=\"description\" CONTENT=\"${opt_metadescription}\">\n" )
+ 	if( "$opt_metadescription" ne '' );
+-    print( INDEX "  <META NAME=\"Keywords\" CONTENT=\"${opt_metakeywords}\">\n" )
++    print( INDEX "  <META NAME=\"keywords\" CONTENT=\"${opt_metakeywords}\">\n" )
+ 	if( "$opt_metakeywords" ne '' );
+-    print( INDEX "  <META NAME=\"Classification\" CONTENT=\"${opt_metaclassification}\">\n" )
++    print( INDEX "  <META NAME=\"classification\" CONTENT=\"${opt_metaclassification}\">\n" )
+ 	if( "$opt_metaclassification" ne '' );
+     # The value of $opt_metaexpires should be similar to:
+     #   "Tue, 20 Aug 1996 14:25:27 GMT"
+-    print( INDEX "  <META HTTP-EQUIV=\"Expires\" CONTENT=\"${opt_metaexpires}\">\n" )
++    print( INDEX "  <META HTTP-EQUIV=\"expires\" CONTENT=\"${opt_metaexpires}\">\n" )
  	if( "$opt_metaexpires" ne '' );
      print( INDEX "  <LINK REL=\"stylesheet\" type=\"text/css\" HREF=\"${opt_stylesheet}\">\n")
  	if ("$opt_stylesheet" ne '');
@@ -879,17 +923,29 @@ diff -u -r1.117 -r1.163
      # Charset is better before title
      print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
  	if( "$opt_metacharset" ne '' );
-@@ -2361,7 +2468,8 @@
+@@ -2361,50 +2468,86 @@
  	if ($opt_frames);
  
      # Meta tags
 -    print( INDEX "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" );
-+    print( INDEX "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" )
+-    print( INDEX "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
++    print( INDEX "  <META NAME=\"generator\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" )
 +	if (!$opt_anonymous);
-     print( INDEX "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
++    print( INDEX "  <META NAME=\"author\" CONTENT=\"${opt_metaauthor}\">\n" )
  	if( "$opt_metaauthor" ne '' );
-     print( INDEX "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
-@@ -2376,35 +2484,70 @@
+-    print( INDEX "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
++    print( INDEX "  <META NAME=\"description\" CONTENT=\"${opt_metadescription}\">\n" )
+ 	if( "$opt_metadescription" ne '' );
+-    print( INDEX "  <META NAME=\"Keywords\" CONTENT=\"${opt_metakeywords}\">\n" )
++    print( INDEX "  <META NAME=\"keywords\" CONTENT=\"${opt_metakeywords}\">\n" )
+ 	if( "$opt_metakeywords" ne '' );
+-    print( INDEX "  <META NAME=\"Classification\" CONTENT=\"${opt_metaclassification}\">\n" )
++    print( INDEX "  <META NAME=\"classification\" CONTENT=\"${opt_metaclassification}\">\n" )
+ 	if( "$opt_metaclassification" ne '' );
+     # The value of $opt_metaexpires should be similar to:
+     #   "Tue, 20 Aug 1996 14:25:27 GMT"
+-    print( INDEX "  <META HTTP-EQUIV=\"Expires\" CONTENT=\"${opt_metaexpires}\">\n" )
++    print( INDEX "  <META HTTP-EQUIV=\"expires\" CONTENT=\"${opt_metaexpires}\">\n" )
  	if( "$opt_metaexpires" ne '' );
      print( INDEX "  <LINK REL=\"stylesheet\" type=\"text/css\" HREF=\"${opt_stylesheet}\">\n")
  	if ("$opt_stylesheet" ne '');
@@ -931,8 +987,7 @@ diff -u -r1.117 -r1.163
 +	if( $imageCaptions{'pageTitle'} ne '') {
 +	    print( INDEX "<p><FONT SIZE=\"+3\">$imageCaptions{'pageTitle'}</FONT></p>\n");
 +	    print( STDERR "Using custom PageDescription\n") if $opt_debug;
- 	}
--	print( INDEX "$indexbar<BR>\n" );
++	}
 +
 +	if( $imageCaptions{'pageTitle'} eq '' &&
 +	    $opt_indexinfo && (!$opt_frames || $opt_framestyle == 1) ) {
@@ -955,7 +1010,8 @@ diff -u -r1.117 -r1.163
 +	    print( INDEX "<DIV class='wm_msgindex'>${opt_msg_index_of_files}\"",
 +		   $desc1, "\" ${opt_msg_index_through}", " \"", $desc2,
 +		   "\"</DIV>\n" );
-+	}
+ 	}
+-	print( INDEX "$indexbar<BR>\n" );
 +	print( INDEX "<DIV class='wm_indexbar'>$indexbar</DIV>\n" );
  
  	if ($opt_tables)
@@ -976,7 +1032,7 @@ diff -u -r1.117 -r1.163
  	}
  	else
  	{
-@@ -2423,35 +2566,47 @@
+@@ -2423,78 +2566,84 @@
  		}
  		print( INDEX
  		      "<IMG SRC=\"$montageImages[$pageNumber - 1]\" $montageImageSizes[$pageNumber - 1]",
@@ -988,10 +1044,11 @@ diff -u -r1.117 -r1.163
  
  	my $imageNum;
 -	for( $imageNum = 0; $imageNum <= $#{$imageNames[$pageNumber - 1]}; ++$imageNum ) {
+-	
 +	my $maxNum = $#{$imageNames[$pageNumber-1]};
 +
 +	for( $imageNum = 0; $imageNum <= ${maxNum}; ++$imageNum ) {
- 	
++
  	    my $pic = $imageNames[$pageNumber - 1][$imageNum];
  	    my $pichtml;
 +	    my $altlabel;
@@ -1003,7 +1060,7 @@ diff -u -r1.117 -r1.163
 +	    if (defined($imageLabels{$pic})) {
 +		$altlabel = $imageLabels{$pic};
 +	    } else {
-+		($altlabel = $pic) =~ s/(.*)\.\w+$/$1/i;
++		($altlabel = $pic) =~ s/(.*)\.\w+$/$1/;
 +		$altlabel =~ s/$opt_pichtmlaltdrop//;
 +		$altlabel =~ y/_/ /; # Usual space replacement in file name
 +	    }
@@ -1011,8 +1068,10 @@ diff -u -r1.117 -r1.163
  
  	    if ( $opt_pichtml ) {
  			
- 			$pichtml = $pic . $opt_pichtmlext;
+-			$pichtml = $pic . $opt_pichtmlext;
 -
++			($pichtml = $pic) =~ s/(.*)\.\w+$/$1/;
++			$pichtml .= $opt_pichtmlext;
  			open( PICHTML, ">$pichtml")
  			    || die("$0: Failed to open file $pichtml for output\n$@\n");
 -			print( PICHTML "<HTML>\n<HEAD>\n" );
@@ -1025,12 +1084,24 @@ diff -u -r1.117 -r1.163
  
  			# Meta tags
 -			print( PICHTML "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" );
-+			print( PICHTML "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" )
+-			print( PICHTML "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
++			print( PICHTML "  <META NAME=\"generator\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" )
 +			    if (!$opt_anonymous);
- 			print( PICHTML "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
++			print( PICHTML "  <META NAME=\"author\" CONTENT=\"${opt_metaauthor}\">\n" )
  			    if( "$opt_metaauthor" ne '' );
- 			print( PICHTML "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
-@@ -2466,35 +2621,26 @@
+-			print( PICHTML "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
++			print( PICHTML "  <META NAME=\"description\" CONTENT=\"${opt_metadescription}\">\n" )
+ 			    if( "$opt_metadescription" ne '' );
+-			print( PICHTML "  <META NAME=\"Keywords\" CONTENT=\"${opt_metakeywords}\">\n" )
++			print( PICHTML "  <META NAME=\"keywords\" CONTENT=\"${opt_metakeywords}\">\n" )
+ 			    if( "$opt_metakeywords" ne '' );
+-			print( PICHTML "  <META NAME=\"Classification\" CONTENT=\"${opt_metaclassification}\">\n" )
++			print( PICHTML "  <META NAME=\"classification\" CONTENT=\"${opt_metaclassification}\">\n" )
+ 			    if( "$opt_metaclassification" ne '' );
+ 			# The value of $opt_metaexpires should be similar to:
+ 			#   "Tue, 20 Aug 1996 14:25:27 GMT"
+-			print( PICHTML "  <META HTTP-EQUIV=\"Expires\" CONTENT=\"${opt_metaexpires}\">\n" )
++			print( PICHTML "  <META HTTP-EQUIV=\"expires\" CONTENT=\"${opt_metaexpires}\">\n" )
  			    if( "$opt_metaexpires" ne '' );
  			print( PICHTML "  <LINK REL=\"stylesheet\" type=\"text/css\" HREF=\"${opt_stylesheet}\">\n")
  			    if ("$opt_stylesheet" ne '');
@@ -1074,11 +1145,13 @@ diff -u -r1.117 -r1.163
 -
  			if ($opt_pichtmlnav) {
 -				print ( PICHTML "<P><NOBR>");
++				my $url;
++
 +				print ( PICHTML "<P>");
  					
  				# Must be visible at each page, if no frames
  				if (!$opt_frames) {
-@@ -2502,12 +2648,12 @@
+@@ -2502,12 +2651,12 @@
  				    # --- readme link ---
  				    if ( $haveReadme ) {
  					print (PICHTML "<A HREF=\"${opt_readme}\"><IMG\n",
@@ -1093,7 +1166,7 @@ diff -u -r1.117 -r1.163
  					if ($opt_frames) {
  					    print ( PICHTML "<A HREF=\"${opt_pageindexname}${pageNumber}${opt_htmlext}\"");
  					    print ( PICHTML " TARGET=\"$frameTargets{'thumbview'}\"")
-@@ -2515,51 +2661,100 @@
+@@ -2515,51 +2664,102 @@
  					    print ( PICHTML "<A HREF=\"${pNumber}${opt_indexname}\"");
  					}
  					print ( PICHTML "><IMG SRC=\"$iconImageUrls{'up'}\"",
@@ -1124,12 +1197,14 @@ diff -u -r1.117 -r1.163
  					print ( PICHTML "<A${target} HREF=\"");
  					if ($imageNum == 0 && $pageNumber != 1) {
 -						print ( PICHTML $imageNames[$pageNumber - 2][$#{$imageNames[$pageNumber - 2]}]);
-+						print ( PICHTML escapeurl($imageNames[$pageNumber - 2][$#{$imageNames[$pageNumber - 2]}]) );
++						$url = $imageNames[$pageNumber - 2][$#{$imageNames[$pageNumber - 2]}];
  					} else {
 -						print ( PICHTML $imageNames[$pageNumber - 1][${imageNum} - 1]);
-+						print ( PICHTML escapeurl($imageNames[$pageNumber - 1][${imageNum} - 1]) );
++						$url = $imageNames[$pageNumber - 1][${imageNum} - 1];
  					}
- 					print ( PICHTML $opt_pichtmlext);
+-					print ( PICHTML $opt_pichtmlext);
++					$url =~ s/(.*)\.\w+$/$1/;
++					print ( PICHTML escapeurl($url . $opt_pichtmlext));
  					print ( PICHTML "\"><IMG SRC=\"$iconImageUrls{'prev'}\"",
 -						" $iconImageSizes{'prev'} ALT=\"${opt_msg_prev}\" BORDER=0></A>\n");
 +						" $iconImageSizes{'prev'} TITLE=\"${opt_msg_prev}\" ALT=\"${opt_msg_prev}\" BORDER=0></A>\n");
@@ -1172,12 +1247,14 @@ diff -u -r1.117 -r1.163
  					print ( PICHTML "<A${target} HREF=\"");
  					if (($imageNum == $#{$imageNames[$pageNumber - 1]}) && $pageNumber != $numPages) {
 -						print ( PICHTML $imageNames[$pageNumber][0]);
-+						print ( PICHTML escapeurl($imageNames[$pageNumber][0]) );
++						$url = $imageNames[$pageNumber][0];
  					} else {
 -						print ( PICHTML $imageNames[$pageNumber - 1][${imageNum} + 1]);
-+						print ( PICHTML escapeurl($imageNames[$pageNumber - 1][${imageNum} + 1]) );
++						$url = $imageNames[$pageNumber - 1][${imageNum} + 1];
  					}
- 					print ( PICHTML $opt_pichtmlext);
+-					print ( PICHTML $opt_pichtmlext);
++					$url =~ s/(.*)\.\w+$/$1/;
++					print ( PICHTML escapeurl($url . $opt_pichtmlext));
  					print ( PICHTML "\"><IMG SRC=\"$iconImageUrls{'next'}\"",
 -						" $iconImageSizes{'next'} ALT=\"${opt_msg_next}\" BORDER=0></A>\n");
 +						" $iconImageSizes{'next'} TITLE=\"${opt_msg_next}\" ALT=\"${opt_msg_next}\" BORDER=0></A>\n");
@@ -1195,7 +1272,7 @@ diff -u -r1.117 -r1.163
 +			    print ( PICHTML "<BR>");
 +			}
 +
-+			if ($pic =~ /\.(jpg|jpeg?|gif|xbm|png)$/i) {
++			if ($pic =~ /\.(jpg|jpeg?|gif|xbm|png|bmp|ico)$/i) {
 +			    print( PICHTML "<A HREF=\"$opt_pichtmllink\">")
 +				if ($opt_pichtmllink ne '');
 +			    print( PICHTML "<IMG SRC=\"", escapeurl($pic), "\" BORDER=0 ALT=\"${altlabel}\" TITLE=\"${altlabel}\">" );
@@ -1211,7 +1288,7 @@ diff -u -r1.117 -r1.163
  			}
  
  			print( PICHTML "$opt_pichtmlbottom\n") if ("$opt_pichtmlbottom" ne '');
-@@ -2570,15 +2765,15 @@
+@@ -2570,15 +2770,15 @@
  
  			unless ($opt_tables)
  			{				
@@ -1231,7 +1308,7 @@ diff -u -r1.117 -r1.163
  		    } 
  	    }
  	    
-@@ -2590,7 +2785,7 @@
+@@ -2590,7 +2790,7 @@
  				print INDEX "<TR ALIGN=CENTER VALIGN=TOP>";
  			}
  				
@@ -1240,7 +1317,7 @@ diff -u -r1.117 -r1.163
  			
  			if ($opt_pichtml) {
  				print (INDEX "<A${target} HREF=\"", escapeurl($pichtml), "\">");
-@@ -2601,17 +2796,34 @@
+@@ -2601,17 +2801,34 @@
  			# TODO: make sure the thumbnails are created, and get some image sizes
  			# TODO: save the labels in a new array, maybe same with sizes
  			if ( $thumbImageSizes{$pic}) {
@@ -1280,7 +1357,7 @@ diff -u -r1.117 -r1.163
  		} # if ($opt_tables)
  	
  	} # for each picture
-@@ -2622,6 +2834,13 @@
+@@ -2622,6 +2839,13 @@
  		{
  			print INDEX "</TR>";
  		}
@@ -1294,7 +1371,7 @@ diff -u -r1.117 -r1.163
  		print (INDEX "</TABLE>\n")
  	} else {print( INDEX "</MAP>\n" );}
      }
-@@ -2630,6 +2849,9 @@
+@@ -2630,6 +2854,9 @@
  
      # Print Copyright info on non-blank pages.
      if( $numimages > 0 ) {
@@ -1304,7 +1381,7 @@ diff -u -r1.117 -r1.163
         if( "${opt_address}" ne '' ) {
  	   print( INDEX "<BR><ADDRESS>${opt_address}</ADDRESS>\n" );
         }
-@@ -2642,13 +2864,17 @@
+@@ -2642,13 +2869,17 @@
         # If anonymous, don't show copyright and address info
         if( ! $opt_anonymous ) {
  	   print( INDEX "<HR>\n${opt_msg_produced_by} " );
@@ -1324,7 +1401,7 @@ diff -u -r1.117 -r1.163
      }
  
      print( INDEX "</BODY>\n" );
-@@ -2674,13 +2900,12 @@
+@@ -2674,13 +2905,12 @@
      open( JSINDEX, ">$fileNames{'jsPageIndex'}")
          || die("$0: Failed to open file $fileNames{'jsPageIndex'} for output\n$@\n");
  
@@ -1342,7 +1419,7 @@ diff -u -r1.117 -r1.163
      print( JSINDEX "  top.drawWindows();\n");
      print( JSINDEX "</SCRIPT>\n");
      print( JSINDEX "</BODY>\n");
-@@ -2714,6 +2939,8 @@
+@@ -2714,6 +2944,8 @@
  
      # Image labels
      print( JSVARS "\n// image titles\n", jsHash( 'imageLabels', \%imageLabels ) );
@@ -1351,7 +1428,7 @@ diff -u -r1.117 -r1.163
  
  	# Image labels
      #print( JSVARS "\n// table image titles\n", jsHash( 'tableImageLabels', \%tableImageLabels ) );
-@@ -2803,6 +3030,8 @@
+@@ -2803,6 +3035,8 @@
  
      # Image labels
      print( PERLVARS "\n# image titles\n", plHash( 'imageLabels', \%imageLabels ) );
@@ -1360,7 +1437,7 @@ diff -u -r1.117 -r1.163
  
  	# Table image labels
      print( PERLVARS "\n# table image titles\n", plHash( 'tableImageLabels', \%tableImageLabels ) );
-@@ -3062,7 +3291,7 @@
+@@ -3062,7 +3296,7 @@
  		# Copy image so we can play with it without effecting original
  		print( STDERR "Copying montage to scratch ...\n" )
  		    if $opt_debug;
@@ -1369,7 +1446,25 @@ diff -u -r1.117 -r1.163
  		handleMagickError( __FILE__, __LINE__, "", $image) unless ref($image);
  		last MONTAGE unless ref($image);
  	
-@@ -3465,6 +3694,10 @@
+@@ -3191,12 +3425,16 @@
+     }
+     my $imageNum;
+     for( $imageNum = 0; $imageNum <= $#{$imageNames[$pageNumber - 1]}; ++$imageNum ) {
+-	my $url = escapeurl($imageNames[$pageNumber - 1][$imageNum]);
++	my $url;
+ 	my($x1,$y1,$x2,$y2);
++
+ 	($x1,$y1,$x2,$y2) = split(',', $imageThumbCoords[$pageNumber - 1][$imageNum]);
++	$url = $imageNames[$pageNumber - 1][$imageNum];
+ 	if( $opt_pichtml ) {
++	    $url =~ s/(.*)\.\w+$/$1/;
+ 	    $url .= $opt_pichtmlext;
+ 	}
++	$url = escapeurl($url);
+ 	if( $opt_maptype eq 'ncsa' ) {
+ 	    if ( "${opt_htimage}" ne '' ) {
+ 		print( IMAGEMAP "rect "
+@@ -3465,6 +3703,10 @@
  sub sortDir {
      if(defined($dirOrder{$a}) && defined($dirOrder{$b})) {
  	$dirOrder{$a} <=> $dirOrder{$b}
@@ -1380,7 +1475,7 @@ diff -u -r1.117 -r1.163
      } else {
  	lc($a) cmp lc($b);
      }
-@@ -3476,7 +3709,11 @@
+@@ -3476,7 +3718,11 @@
  sub sortImages {
      if(defined($imageOrder{$a}) && defined($imageOrder{$b})) {
  	$imageOrder{$a} <=> $imageOrder{$b}
@@ -1393,7 +1488,7 @@ diff -u -r1.117 -r1.163
  	lc($a) cmp lc($b);
      }
  }
-@@ -3533,6 +3770,9 @@
+@@ -3533,6 +3779,9 @@
  sub compareHash {
      my( $hash1, $hash2) = @_;
  
@@ -1403,7 +1498,7 @@ diff -u -r1.117 -r1.163
      if(scalar(keys(%$hash1)) != scalar(keys(%$hash2))) {
  	return( 1 ); # different length
      }
-@@ -3868,7 +4108,7 @@
+@@ -3868,7 +4117,7 @@
  	# Set image label
  	#
  	my $label = '';
@@ -1412,7 +1507,7 @@ diff -u -r1.117 -r1.163
  	    if( defined( $imageLabels{$imagename} ) ) {
  		# Set image specific label
  		$label = $imageLabels{$imagename};
-@@ -3922,7 +4162,7 @@
+@@ -3922,7 +4171,7 @@
  
  	    # put our label into the table image hash
  
@@ -1421,7 +1516,7 @@ diff -u -r1.117 -r1.163
  	    $tableImageLabels{$imagename} =~ s/\n/<BR>/g;
  
  	    print( STDERR "Applying image label: \"${label}\"\n" )
-@@ -4073,6 +4313,7 @@
+@@ -4073,6 +4322,7 @@
    --[no]forcehtml    Force HTML files to be generated (default off)
    --[no]forcemontage Force montage (default off)
    --[no]ignorefp     Ignore directories with names like _vti (FrontPage directories) (default on)
@@ -1429,7 +1524,7 @@ diff -u -r1.117 -r1.163
    --[no]help         Display usage message (default off)
    --[no]recurse      Recurse directory tree (default off)
    --srcdir	     Image directory to process
-@@ -4093,6 +4334,8 @@
+@@ -4093,6 +4343,8 @@
  Filenames:
    --dirindexname     Directory-name to title cross-reference file name
    --imgindexname     Image-name to thumbnail label cross-reference file name
@@ -1438,7 +1533,7 @@ diff -u -r1.117 -r1.163
    --indexname	     Name of master index files (default server index)
    --pageindexname    Base name of page-related index files
    --readme	     Name of directory info file
-@@ -4138,7 +4381,9 @@
+@@ -4138,7 +4390,9 @@
  
  HTML Colors & Appearance:
    --address          Optional user address info
@@ -1448,7 +1543,7 @@ diff -u -r1.117 -r1.163
    --coloralink	     Link (active) color
    --colorback	     Background color (also applied to JPEG montage background)
    --colorfore	     Foreground text color
-@@ -4150,31 +4395,46 @@
+@@ -4150,31 +4404,46 @@
    --dircolorlink     Link (unvisited) color (directory frame)
    --dircolorvlink    Link (visited) color (directory frame)
    --dirhtmlext       Extension for directory frame
@@ -1503,7 +1598,7 @@ diff -u -r1.117 -r1.163
    --framestyle       Frame style to use (out of those available)
    --[no]allowconfig  Allow user to configure framestyle, columns and rows (requires javascript and tables) (default off)
  
-@@ -4296,6 +4556,7 @@
+@@ -4296,6 +4565,7 @@
      s/&/&amp;/g;
      s/>/&gt;/g;
      s/</&lt;/g;
@@ -1511,7 +1606,7 @@ diff -u -r1.117 -r1.163
      return( $_ );
  }
  
-@@ -4324,23 +4585,11 @@
+@@ -4324,23 +4594,11 @@
  # Escape unsafe characters in URLs
  #		
  sub escapeurl {
@@ -1539,7 +1634,7 @@ diff -u -r1.117 -r1.163
      return( $_ );
  }
  
-@@ -4387,7 +4636,6 @@
+@@ -4387,7 +4645,6 @@
      my $rc;
      foreach $rc (@_) {
          next if ( ! -r $rc || ! -f $rc );
@@ -1547,7 +1642,7 @@ diff -u -r1.117 -r1.163
  	eval ( get_rc($rc) );
  	if( $@ ) {
  	    print( STDERR "Bad Eval for file \"${rc}\"...\n$@\n" );
-@@ -4468,7 +4716,7 @@
+@@ -4468,7 +4725,7 @@
      my $path=$top;
      $direlem='';
      do {