--- igal Tue Apr 27 13:11:55 2004 +++ kigal Tue Apr 27 13:15:25 2004 @@ -435,13 +435,13 @@ if ($opt_bigy) { $slide = $slideprefix . $imgfiles[$i]; if ($HAVEIM) { - $line =~ s/(<.*)(.)(.*>)/$1$slide$2 width=$xdim[$i] height=$ydim[$i] alt=\"$title\" title=\"click to see full-size\"$3<\/a>/; + $line =~ s/(<.*)(.)(.*>)/$1$slide$2 width=\"$xdim[$i]\" height=\"$ydim[$i]\" alt=\"$title\" title=\"click to see full-size\"$3<\/a>/; } else { - $line =~ s/(<.*)(.)(.*>)/$1$slide$2 alt=\"$title\" title=\"click to see full-size\"$3<\/a>/; + $line =~ s/(<.*)(.)(.*>)/$1$slide$2 alt=\"$title\" title=\"click to see full-size\"$3<\/a>/; } } else { if ($HAVEIM) { - $line =~ s/(.)/$imgfiles[$i]$1 width=$xdim[$i] height=$ydim[$i] alt=\"$title\"/g; + $line =~ s/(.)/$imgfiles[$i]$1 width=\"$xdim[$i]\" height=\"$ydim[$i]\" alt=\"$title\"/g; } else { $line =~ s//$imgfiles[$i]/g; } @@ -521,15 +521,15 @@ } # write out the tables with full rows for ($i = 1; $i <= $rows; $i++) { - print IXW "\n"; - print IXW " \n" unless ($opt_r); - print IXW " \n \n"; + print IXW "
 
 
\n"; + print IXW " \n" unless ($opt_r); + print IXW " \n \n"; for ($j = 1; $j <= $opt_w; $j++) { - print IXW " \n"; + print IXW "\n"; } - print IXW " \n \n"; - print IXW " \n" unless ($opt_r); + print IXW " \n \n"; + print IXW " \n" unless ($opt_r); if (($opt_a or $opt_ad or $opt_as) and $HAVEIM) { - print IXW " \n \n"; + print IXW " \n \n"; for ($j = 1; $j <= $opt_w; $j++) { - print IXW " \n"; + print IXW "\n"; } - print IXW " \n"; + print IXW " \n"; } # write image captions under images if option -u is given if ($opt_u) { - print IXW " \n \n"; + print IXW " \n \n"; for ($j = 1; $j <= $opt_w; $j++) { - print IXW " \n"; + print IXW " \n"; } - print IXW " \n"; + print IXW " \n"; } - print IXW "
 
 \n "; + print IXW " \n "; if ($opt_s) { - print IXW ""; + print IXW ""; } else { - print IXW ""; + print IXW ""; } print "."; $altname = $captions[($i-1)*$opt_w+$j-1]; @@ -537,47 +537,47 @@ if ($HAVEIM) { $temp = `identify -ping -format \"\%wx\%h\" \"$opt_d/$thumb\"`; $temp =~ m/(\d+)x(\d+)/; $x=$1; $y=$2; - print IXW "\"$altname\""; + print IXW "\"$altname\""; } else { - print IXW "\"$altname\""; + print IXW "\"$altname\""; } - print IXW " 
 
 
 
 
 "; + print IXW " "; $printdim = "$isiz[($i-1)*$opt_w+$j-1]" if $opt_as; $printdim = "$xdim[($i-1)*$opt_w+$j-1]x$ydim[($i-1)*$opt_w+$j-1]" if $opt_ad; $printdim = "$xdim[($i-1)*$opt_w+$j-1]x$ydim[($i-1)*$opt_w+$j-1] ($isiz[($i-1)*$opt_w+$j-1])" if $opt_a; print IXW $printdim; - print IXW "
 
 $captions[($i-1)*$opt_w+$j-1]$captions[($i-1)*$opt_w+$j-1]
\n
\n"; + print IXW "\n
\n"; } # write out the incomplete row if it exists if ($rem >= 1) { - print IXW "\n"; - print IXW " \n" if (! $opt_r); - print IXW " \n \n"; + print IXW "
 
 
\n"; + print IXW " \n" if (! $opt_r); + print IXW " \n \n"; for ($i = 1; $i <= $rem; $i++) { - print IXW " \n"; + print IXW "\n"; } - print IXW " \n \n"; - print IXW " \n" if (! $opt_r); + print IXW " \n \n"; + print IXW " \n" if (! $opt_r); if (($opt_a or $opt_ad or $opt_as) and $HAVEIM) { - print IXW " \n \n"; + print IXW " \n \n"; for ($i = 1; $i <= $rem; $i++) { - print IXW " \n"; + print IXW "\n"; } - print IXW " \n"; + print IXW " \n"; } # write image captions under images if option -u is given if ($opt_u) { - print IXW " \n \n"; + print IXW " \n \n"; for ($i = 1; $i <= $rem; $i++) { - print IXW " \n"; + print IXW " \n"; } - print IXW " \n"; + print IXW " \n"; } - print IXW "
 
 \n "; + print IXW " \n "; if ($opt_s) { - print IXW ""; + print IXW ""; } else { - print IXW ""; + print IXW ""; } print "."; $altname = $captions[$rows*$opt_w+$i-1]; @@ -585,35 +585,35 @@ if ($HAVEIM) { $temp = `identify -ping -format \"\%wx\%h\" \"$opt_d/$thumb\"`; $temp =~ m/(\d+)x(\d+)/; $x=$1; $y=$2; - print IXW "\"$altname\""; + print IXW "\"$altname\""; } else { - print IXW "\"$altname\""; + print IXW "\"$altname\""; } - print IXW " 
 
 
 
 
 "; + print IXW " "; $printdim = "$isiz[$rows*$opt_w+$i-1]" if $opt_as; $printdim = "$xdim[$rows*$opt_w+$i-1]x$ydim[$rows*$opt_w+$i-1]" if $opt_ad; $printdim = "$xdim[$rows*$opt_w+$i-1]x$ydim[$rows*$opt_w+$i-1] ($isiz[$rows*$opt_w+$i-1])" if $opt_a; print IXW $printdim; - print IXW "
 
 $captions[$rows*$opt_w+$i-1]$captions[$rows*$opt_w+$i-1]
\n
\n"; + print IXW "\n
\n"; } while (!( =~ m/\*{10}/)) {}; while (defined($line = )) {