FreeBSD Mail Archives

Date:      Sun, 23 May 2004 14:10:49 +0300 (EEST)
From:      "Vladimir I. Chukharev" <chu@h33.erkki.ton.tut.fi>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/67070: [Patch] WebMagick generates nonstandard html
Message-ID:  <200405231110.i4NBAnPM015190@svak.h33.erkki.ton.tut.fi>
Resent-Message-ID: <200405231110.i4NBARt5076413@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help


>Number:         67070
>Category:       ports
>Synopsis:       [Patch] WebMagick generates nonstandard html
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 23 04:10:27 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Vladimir I. Chukharev
>Release:        FreeBSD 4.10-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD svak.h33.erkki.ton.tut.fi 4.10-PRERELEASE FreeBSD 4.10-PRERELEASE #0: Thu Apr 29 20:29:02 EEST 2004 root@svak.h33.erkki.ton.tut.fi:/usr/obj/usr/src/sys/SVAK i386

>Description:
	WebMagick script generates html pages, which are not valid html. They lack
DOCTYPE declaration, include non-standard elements, some of the tags are in
wrong elements etc.

The proposed patch (which can be just placed in files directory of the port) makes
the generated html-files be valid html 4.01.

Changes in brief.
 - add DOCTYPE declaration at the beginning of each generated html-file
 - change default charset to iso-8859-1 (from default not use charset at all)
 - do not use non-standard <NOBR> element
 - change case of case sensitive tags (border, frameborder)
 - move tags border, frameborder from <FRAMESET> to <FRAME>
 - delete nonstandard FRAMESPACING tag
 - add ALT tags where missed
 - add TYPE tag to <SCRYPT> elements
 - avoid empty <HEAD> element by use of <META> and <TITLE> in it
 - change <HR> to <BR> in one place; I did not check why the validator dislikes <HR> here

Please note that FRAMESPACING tag is introduced by files/patch-aa
Please also note complains from
    portlint -AC /usr/ports/www/WebMagick



>How-To-Repeat:
	Feed an URL of a WebMagick-generated page to http://validator.w3.org/ e.g.
http://validator.w3.org/check?uri=http://webmagick.sourceforge.net/samples/one/
(this is a sample from WebMagick homepage).

>Fix:

	

--- patch-ad begins here ---
--- webmagick.in.orig1	Sun May 23 12:23:54 2004
+++ webmagick.in	Sun May 23 12:29:56 2004
@@ -513,7 +513,7 @@
 # Meta-tag defaults
 #
 $opt_metaauthor = '';			# Page author
-$opt_metacharset = '';                  # Page character set
+$opt_metacharset = 'iso-8859-1';	# Page character set
 $opt_metaclassification = '';		# Page classification
 $opt_metadescription = '';		# Page description
 $opt_metaexpires = '';			# Date page expires (e.g "Tue, 20 Aug 1996 14:25:27 GMT")
@@ -580,7 +580,7 @@
 #
 # 
 # <A HREF=\"./\" TARGET=\"thumbnail\">
-#    <IMG SRC=\"$iconImageUrls{dir}.gif\" $iconImageSizes{dir} ALT=\"\" BORDER=0></A>
+#    <IMG SRC=\"$iconImageUrls{dir}.gif\" $iconImageSizes{dir} ALT=\"\" border=0></A>
 #    <A HREF=\"./\" TARGET=\"thumbnail\">Dir Listing</A><BR>
 #
 
@@ -610,10 +610,10 @@
 # |  |          |
 #  -------------
 $opt_framefmt{1}=
-'<FRAMESET COLS=\"132,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
- <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\"
+'<FRAMESET COLS=\"132,*\">
+ <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\" frameborder=${opt_frameborder}
    MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
- <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_imageview}\"
+ <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_imageview}\" frameborder=${opt_frameborder}
    MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>';
 $opt_framefmt_frames{1}=2;	# Number of frames expressed by this frame format
 
@@ -629,14 +629,14 @@
 # |  |          |
 #  -------------
 $opt_framefmt{2}=
-'<FRAMESET COLS=\"145,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
- <FRAMESET ROWS=\"20%,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
-  <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\"
+'<FRAMESET COLS=\"145,*\">
+ <FRAMESET ROWS=\"20%,*\">
+  <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\" frameborder=${opt_frameborder}
     MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
-  <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_thumbview}\"
+  <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_thumbview}\" frameborder=${opt_frameborder}
     MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
  </FRAMESET>
- <FRAME SRC=\"${imageFrameLink}\" NAME=\"${opt_frame_name_imageview}\"
+ <FRAME SRC=\"${imageFrameLink}\" NAME=\"${opt_frame_name_imageview}\" frameborder=${opt_frameborder}
    MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>';
 $opt_framefmt_frames{2}=3;	# Number of frames expressed by this frame format
 
@@ -652,13 +652,13 @@
 # |  |          |
 #  -------------
 $opt_framefmt{3}=
-'<FRAMESET COLS=\"132,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
- <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\"
+'<FRAMESET COLS=\"132,*\">
+ <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\" frameborder=${opt_frameborder}
    MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
- <FRAMESET ROWS=\"150,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
-   <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_thumbview}\"
+ <FRAMESET ROWS=\"150,*\">
+   <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_thumbview}\" frameborder=${opt_frameborder}
      MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
-   <FRAME SRC=\"${imageFrameLink}\" NAME=\"${opt_frame_name_imageview}\"
+   <FRAME SRC=\"${imageFrameLink}\" NAME=\"${opt_frame_name_imageview}\" frameborder=${opt_frameborder}
      MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
  </FRAMESET>';
 $opt_framefmt_frames{3}=3;	# Number of frames expressed by this frame format
@@ -675,13 +675,13 @@
 # |  |          |
 #  -------------
 $opt_framefmt{4}=
-'<FRAMESET ROWS=\"172,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
- <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_thumbview}\"
+'<FRAMESET ROWS=\"172,*\">
+ <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_thumbview}\" frameborder=${opt_frameborder}
    MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
- <FRAMESET COLS=\"132,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
-   <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\"
+ <FRAMESET COLS=\"132,*\">
+   <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\" frameborder=${opt_frameborder}
      MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
-   <FRAME SRC=\"${imageFrameLink}\" NAME=\"${opt_frame_name_imageview}\"
+   <FRAME SRC=\"${imageFrameLink}\" NAME=\"${opt_frame_name_imageview}\" frameborder=${opt_frameborder}
      MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
  </FRAMESET>';
 $opt_framefmt_frames{4}=3;	# Number of frames expressed by this frame format
@@ -2003,7 +2003,7 @@
 	     get_rc_var('..', 'opt_indexname', "$opt_indexname");
     unless ( "$upindexname" eq 'NOLINK' ) {
        $uphtml = "<A HREF=\"../${upindexname}\"><IMG\n" .
-	  "SRC=\"$iconImageUrls{'up'}\" $iconImageSizes{'up'} ALT=\"^\" BORDER=0></A>" .
+	  "SRC=\"$iconImageUrls{'up'}\" $iconImageSizes{'up'} ALT=\"^\" border=0></A>" .
 	  " <A HREF=\"../${upindexname}\">${opt_msg_up}</A><BR>\n";
     }
 
@@ -2013,7 +2013,7 @@
     my $helphtml = '';
     if( $haveReadme ) {
 	$helphtml .= "<A HREF=\"" . escapeurl(${opt_readme}) . "\" TARGET=\"$frameTargets{'readmeview'}\"><IMG\n" .
-	    "SRC=\"$iconImageUrls{'help'}\" $iconImageSizes{'help'} ALT=\"?\" BORDER=0></A>" .
+	    "SRC=\"$iconImageUrls{'help'}\" $iconImageSizes{'help'} ALT=\"?\" border=0></A>" .
 	    " <A HREF=\"" . escapeurl(${opt_readme}) . "\" TARGET=\"$frameTargets{'readmeview'}\">${opt_msg_readme}</A><BR>\n";
     }
 
@@ -2022,8 +2022,8 @@
     #
     my $nexthtml = '';
     if( $haveReadme && $haveImages && $opt_framefmt_frames{$opt_framestyle}<=2 ) {
-	$nexthtml .= "<A HREF=\"${opt_pageindexname}1$opt_htmlext\" TARGET=\"$frameTargets{'thumbview'}\"><IMG\n" .
-	    "SRC=\"$iconImageUrls{'next'}\" $iconImageSizes{'next'} ALT=\"*\" BORDER=0></A>" .
+	$nexthtml .= "<A HREF=\"${opt_pageindexname}1$opt_htmlext\" TARGET=\"$frameTargets{'thumbview'}\">\n<IMG " .
+	    "SRC=\"$iconImageUrls{'next'}\" $iconImageSizes{'next'} ALT=\"*\" border=0></A>" .
 	    " <A HREF=\"${opt_pageindexname}1$opt_htmlext\" TARGET=\"$frameTargets{'thumbview'}\">${opt_msg_images}</A><BR>";
     }
 
@@ -2056,13 +2056,12 @@
 
 	    unless ( "$subindexname" eq 'NOLINK' ) {
 		my $url = escapeurl("$subdir/${subindexname}");
-		$dirhtml .= '<NOBR>';
 		# If a bullet icon is defined, then use it
 		# otherwise use plain text only
 		if( defined( $iconImageUrls{'ball'} ) ) {
-		    $dirhtml .= "<A HREF=\"${url}\"><IMG SRC=\"$iconImageUrls{'ball'}\" $iconImageSizes{'ball'} ALT=\"*\" BORDER=0></A>";
+		    $dirhtml .= "<A HREF=\"${url}\"><IMG SRC=\"$iconImageUrls{'ball'}\" $iconImageSizes{'ball'} ALT=\"*\" border=0></A>";
 		}
-		$dirhtml .= "<A HREF=\"${url}\">$dirtitle</A></NOBR><BR>\n";
+		$dirhtml .= "<A HREF=\"${url}\">$dirtitle</A><BR>\n";
 	    } 
 	}
     }
@@ -2154,7 +2153,7 @@
     #
     open( INDEX, ">${opt_indexname}")
 	|| die("$0: Failed to open file ${opt_indexname} for output\n$@\n");
-    print( INDEX "<HTML>\n<HEAD>\n" );
+    print( INDEX "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\">\n<HTML>\n<HEAD>\n" );
     # Charset is better before title
     print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
 	if( "$opt_metacharset" ne '' );
@@ -2181,7 +2180,7 @@
     # If in JavaScript mode, output code to switch to JavaScript pages
     # Currently knows about certain browsers.
     if( $opt_javascript ) {
-	print( INDEX '<SCRIPT LANGUAGE="JavaScript1.1">' . "\n" );
+	print( INDEX '<SCRIPT LANGUAGE="JavaScript1.1" TYPE="text/javascript">' . "\n" );
 	print( INDEX '<!--' . "\n" );
 	print( INDEX '  var browserName = navigator.appName;', "\n" );
 	print( INDEX '  var browserVersion = parseInt(navigator.appVersion);', "\n" );
@@ -2219,12 +2218,15 @@
     if( $opt_javascript ) {
     open( INDEX, ">$fileNames{'jsDirIndex'}")
 	|| die("$0: Failed to open file $fileNames{'jsDirIndex'} for output\n$@\n");
-    print( INDEX "<HTML>\n" );
+    print( INDEX "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n" );
     print( INDEX "<HEAD>\n" );
+    print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
+	if( "$opt_metacharset" ne '' );
+    print( INDEX "  <TITLE>${pageTitle}</TITLE>\n" );
     print( INDEX "</HEAD>\n" );
-    print( INDEX q/<SCRIPT LANGUAGE="JavaScript" SRC="/ . $fileNames{'jsVariables'} . q!"></SCRIPT>! . "\n" );
-    print( INDEX q/<SCRIPT LANGUAGE="JavaScript" SRC="/ . $fileNames{'jsFunctions'}    . q!"></SCRIPT>! . "\n" );
-    print( INDEX "<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+    print( INDEX q/<SCRIPT LANGUAGE="JavaScript" TYPE="text\/javascript" SRC="/ . $fileNames{'jsVariables'} . q!"></SCRIPT>! . "\n" );
+    print( INDEX q/<SCRIPT LANGUAGE="JavaScript" TYPE="text\/javascript" SRC="/ . $fileNames{'jsFunctions'}    . q!"></SCRIPT>! . "\n" );
+    print( INDEX "<SCRIPT LANGUAGE=\"JavaScript\" TYPE=\"text/javascript\">\n" );
     print( INDEX q/document.write(returnFrameHTML());/ . "\n" );
     print( INDEX q/document.close();/ . "\n" );
     print( INDEX "</SCRIPT>\n" );
@@ -2238,7 +2240,7 @@
     open( INDEX, ">${opt_pageindexname}dir${opt_dirhtmlext}")
 	|| die("$0: Failed to open file \"${opt_pageindexname}dir${opt_dirhtmlext}\"",
                 " for output\n$@\n");
-    print( INDEX "<HTML>\n<HEAD>\n" );
+    print( INDEX "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n<HEAD>\n" );
     # Charset is better before title
     print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
 	if( "$opt_metacharset" ne '' );
@@ -2301,23 +2303,23 @@
     # Calculate page index bar
     # No link for current page
     # Nothing at all when there is only one page.
-    $indexbar = "<NOBR>";
+    $indexbar = "";
 
     # Must be visible at each page, if no frames
     if (!$opt_frames) {
 
 	# --- readme link ---
 	if ( $haveReadme ) {
-	    $indexbar .= "<A HREF=\"${opt_readme}\"><IMG\n" .
-		"SRC=\"$iconImageUrls{'help'}\" $iconImageSizes{'help'} ALT=\"${opt_msg_readme}\" BORDER=0></A>\n";
+	    $indexbar .= "<A HREF=\"${opt_readme}\">\n<IMG " .
+		"SRC=\"$iconImageUrls{'help'}\" $iconImageSizes{'help'} ALT=\"${opt_msg_readme}\" border=0></A>\n";
 	}
 
 	# --- up link ---
 	my $upindexname = get_rc_var('..', 'opt_indexname', "$opt_indexname");
 
 	if ( "$upindexname" ne 'NOLINK' ) {
-	    $indexbar .= "<A HREF=\"../${upindexname}\"><IMG\n" .
-		"SRC=\"$iconImageUrls{'up'}\" $iconImageSizes{'up'} ALT=\"${opt_msg_up}\" BORDER=0></A>\n";
+	    $indexbar .= "<A HREF=\"../${upindexname}\">\n<IMG " .
+		"SRC=\"$iconImageUrls{'up'}\" $iconImageSizes{'up'} ALT=\"${opt_msg_up}\" border=0></A>\n";
 	}
 
     }
@@ -2326,15 +2328,15 @@
     if( $pageNumber == 1 ) {
 	if ($numPages > 1) {
 	    # Print a grayed out arrow to maintain alignment
-	    $indexbar .= "<IMG SRC=\"$iconImageUrls{'prev_gray'}\" $iconImageSizes{'prev_gray'} ALT=\"\" BORDER=0>\n";
+	    $indexbar .= "<IMG SRC=\"$iconImageUrls{'prev_gray'}\" $iconImageSizes{'prev_gray'} ALT=\"\" border=0>\n";
 	}
     } else {
         # Go to preceding page
 	$indexbar .= "<A HREF=\"$fileNames{'htmlPrevIndex'}\"";
 	$indexbar .= " TARGET=\"$frameTargets{'thumbview'}\""
 	    if ($opt_frames);
-	$indexbar .= "><IMG\n" .
-	    "SRC=\"$iconImageUrls{'prev'}\" $iconImageSizes{'prev'} ALT=\"${opt_msg_prev}\" BORDER=0></A>\n";
+	$indexbar .= ">\n<IMG " .
+	    "SRC=\"$iconImageUrls{'prev'}\" $iconImageSizes{'prev'} ALT=\"${opt_msg_prev}\" border=0></A>\n";
     }
 
     # --- next link ---
@@ -2343,15 +2345,14 @@
 	    $indexbar .= "<A HREF=\"$fileNames{'htmlNextIndex'}\"";
 	    $indexbar .= " TARGET=\"$frameTargets{'thumbview'}\""
 		if ($opt_frames);
-	    $indexbar .= "><IMG\n" .
-		"SRC=\"$iconImageUrls{'next'}\" $iconImageSizes{'next'} ALT=\"${opt_msg_next}\" BORDER=0></A>\n";
+	    $indexbar .= ">\n<IMG " .
+		"SRC=\"$iconImageUrls{'next'}\" $iconImageSizes{'next'} ALT=\"${opt_msg_next}\" border=0></A>\n";
 	} else {
 	    # Print a grayed out arrow to maintain alignment
-	    $indexbar .= "<IMG SRC=\"$iconImageUrls{'next_gray'}\" $iconImageSizes{'next_gray'} ALT=\"\" BORDER=0>\n";
+	    $indexbar .= "<IMG SRC=\"$iconImageUrls{'next_gray'}\" $iconImageSizes{'next_gray'} ALT=\"\" border=0>\n";
         }
     }
 
-    $indexbar .= "</NOBR>";
 
     # --- page links ---
     if( $numPages > 1 ) {
@@ -2374,7 +2375,7 @@
     
     open( INDEX, ">$fileNames{'htmlCurrentIndex'}")
         || die("$0: Failed to open file $fileNames{'htmlCurrentIndex'} for output\n$@\n");
-    print( INDEX "<HTML>\n<HEAD>\n" );
+    print( INDEX "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n<HEAD>\n" );
     # Charset is better before title
     print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
 	if( "$opt_metacharset" ne '' );
@@ -2450,7 +2451,7 @@
 		}
 		print( INDEX
 		      "<IMG SRC=\"$montageImages[$pageNumber - 1]\" $montageImageSizes[$pageNumber - 1]",
-		      " USEMAP=\"#${mapname}\" BORDER=0 ISMAP>" );
+		      " USEMAP=\"#${mapname}\" border=0 ALT=\"${mapname}\" ISMAP>" );
 		print( INDEX "</A>" ) if ($opt_serversidemap);
 		print( INDEX "\n<MAP NAME=\"${mapname}\">\n" );
 	} # unless ( $opt_tables )
@@ -2479,7 +2480,7 @@
 			$pichtml = $pic . $opt_pichtmlext;
 			open( PICHTML, ">$pichtml")
 			    || die("$0: Failed to open file $pichtml for output\n$@\n");
-			print( PICHTML "<HTML>\n<HEAD>\n" );
+			print( PICHTML "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n<HEAD>\n" );
 			# Charset is better before title
 			print( PICHTML "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
 			    if( "$opt_metacharset" ne '' );
@@ -2521,15 +2522,15 @@
 			}
 
 			if ($opt_pichtmlnav) {
-				print ( PICHTML "<P><NOBR>");
+				print ( PICHTML "<P>");
 					
 				# Must be visible at each page, if no frames
 				if (!$opt_frames) {
 
 				    # --- readme link ---
 				    if ( $haveReadme ) {
-					print (PICHTML "<A HREF=\"${opt_readme}\"><IMG\n",
-					    "SRC=\"$iconImageUrls{'help'}\" $iconImageSizes{'help'} ALT=\"${opt_msg_readme}\" BORDER=0></A>\n");
+					print (PICHTML "<A HREF=\"${opt_readme}\">\n<IMG ",
+					    "SRC=\"$iconImageUrls{'help'}\" $iconImageSizes{'help'} ALT=\"${opt_msg_readme}\" border=0></A>\n");
 				    }
 				}
 
@@ -2542,14 +2543,14 @@
 					    print ( PICHTML "<A HREF=\"${pNumber}${opt_indexname}\"");
 					}
 					print ( PICHTML "><IMG SRC=\"$iconImageUrls{'up'}\"",
-						" $iconImageSizes{'up'} ALT=\"${opt_msg_up}\" BORDER=0></A>\n");
+						" $iconImageSizes{'up'} ALT=\"${opt_msg_up}\" border=0></A>\n");
 					
 				}
 				
 				# prev
 				if (($imageNum == 0) && ($pageNumber == 1)) {
 					print ( PICHTML "<IMG SRC=\"$iconImageUrls{'prev_gray'}\"",
-						" $iconImageSizes{'prev_gray'} BORDER=0>\n");
+						" $iconImageSizes{'prev_gray'} border=0 alt=\"$iconImageUrls{'prev_gray'}\">\n");
 				} else {
 					print ( PICHTML "<A${target} HREF=\"");
 					if ($imageNum == 0 && $pageNumber != 1) {
@@ -2559,14 +2560,14 @@
 					}
 					print ( PICHTML $opt_pichtmlext);
 					print ( PICHTML "\"><IMG SRC=\"$iconImageUrls{'prev'}\"",
-						" $iconImageSizes{'prev'} ALT=\"${opt_msg_prev}\" BORDER=0></A>\n");
+						" $iconImageSizes{'prev'} ALT=\"${opt_msg_prev}\" border=0></A>\n");
 						
 				}
 				
 				#next
 				if (($pageNumber == $numPages) && ($imageNum == $#{$imageNames[$pageNumber - 1]})) {
 					print ( PICHTML "<IMG SRC=\"$iconImageUrls{'next_gray'}\"",
-						" $iconImageSizes{'next_gray'} BORDER=0>\n");
+						" $iconImageSizes{'next_gray'} border=0 ALT=\"$iconImageUrls{'next_gray'}\">\n");
 				} else {
 					print ( PICHTML "<A${target} HREF=\"");
 					if (($imageNum == $#{$imageNames[$pageNumber - 1]}) && $pageNumber != $numPages) {
@@ -2576,17 +2577,18 @@
 					}
 					print ( PICHTML $opt_pichtmlext);
 					print ( PICHTML "\"><IMG SRC=\"$iconImageUrls{'next'}\"",
-						" $iconImageSizes{'next'} ALT=\"${opt_msg_next}\" BORDER=0></A>\n");
+						" $iconImageSizes{'next'} ALT=\"${opt_msg_next}\" border=0></A>\n");
 						
 				}
 				
-				print ( PICHTML "</NOBR><BR>");
+#				print ( PICHTML "</NOBR><BR>");
+				print ( PICHTML "<BR>");
 			}
 
 			if ($pic =~ /\.(jpg|jpeg?|gif|xbm|png)$/i) {
 			    print( PICHTML "<A HREF=\"$opt_pichtmllink\">")
 				if ($opt_pichtmllink ne '');
-			    print( PICHTML "<IMG SRC=\"", escapeurl($pic), "\" BORDER=0 ALT=\"${altlabel}\">" );
+			    print( PICHTML "<IMG SRC=\"", escapeurl($pic), "\" border=0 ALT=\"${altlabel}\">" );
 			    print( PICHTML "</A>")
 				if ($opt_pichtmllink ne '');
 			} else {
@@ -2601,15 +2603,17 @@
 
 			unless ($opt_tables)
 			{				
-				print( INDEX "  <AREA${target} HREF=\"",
-				       escapeurl($pichtml), "\" SHAPE=RECT COORDS=", $imageThumbCoords[$pageNumber - 1][$imageNum],">\n" );
+				print( INDEX "  <AREA${target} HREF=\"", escapeurl($pichtml),
+					"\" SHAPE=RECT COORDS=\"", $imageThumbCoords[$pageNumber - 1][$imageNum],
+					"\" alt=\"", escapeurl($pic), "\">\n" );
 			}
 	    } else 
 	    { 
 		    unless ($opt_tables) 
 		    {
 				print( INDEX "  <AREA HREF=\"", escapeurl($pic),
-				       "\" SHAPE=RECT COORDS=", $imageThumbCoords[$pageNumber - 1][$imageNum],">\n" );
+					"\" SHAPE=RECT COORDS=\"", $imageThumbCoords[$pageNumber - 1][$imageNum],
+					"\" alt=\"", escapeurl($pic), "\">\n" );
 		    } 
 	    }
 	    
@@ -2633,10 +2637,10 @@
 			# TODO: save the labels in a new array, maybe same with sizes
 			if ( $thumbImageSizes{$pic}) {
 				print (INDEX "<IMG SRC=\"", $opt_cachedir, "/", escapeurl($pic), ".\L${opt_cacheformat}",
-				       "\" $thumbImageSizes{$pic} ALT=\"${altlabel}\" BORDER=0>");
+				       "\" $thumbImageSizes{$pic} ALT=\"${altlabel}\" border=0>");
 			} else {
 				print (INDEX "<IMG SRC=\"", escapeurl($pic),
-				       "\" ALT=\"${altlabel}\" BORDER=0>");
+				       "\" ALT=\"${altlabel}\" border=0>");
 			}
 			
 			print (INDEX "</A>");
@@ -2681,10 +2685,10 @@
        }
        # If anonymous, don't show copyright and address info
        if( ! $opt_anonymous ) {
-	   print( INDEX "<HR>\n${opt_msg_produced_by} " );
-	   print( INDEX "<NOBR><A HREF=\"http://webmagick.sourceforge.net/\"",
+	   print( INDEX "<BR>\n${opt_msg_produced_by} " );
+	   print( INDEX "<A HREF=\"http://webmagick.sourceforge.net/\"",
 		 " TARGET=\"_top\">WebMagick</A>" );
-	   print( INDEX " $webmagickInfo{version}</NOBR>, <NOBR>${opt_msg_copyright}&copy;</NOBR> <NOBR>Bob Friesenhahn</NOBR>\n" );
+	   print( INDEX " $webmagickInfo{version}, ${opt_msg_copyright}&copy; Bob Friesenhahn\n" );
        }
        if( "$htmlOpts{'dateText'}" ne '' || !$opt_anonymous) {
 	   print( INDEX "</FONT>\n" );
@@ -2714,13 +2718,16 @@
     open( JSINDEX, ">$fileNames{'jsPageIndex'}")
         || die("$0: Failed to open file $fileNames{'jsPageIndex'} for output\n$@\n");
 
-    print( JSINDEX "<HTML>\n");
+    print( JSINDEX "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n");
     print( JSINDEX "<HEAD>\n");
-    print( JSINDEX "<SCRIPT LANGUAGE=\"JavaScript\" SRC=\"$fileNames{'jsVariables'}\"></SCRIPT>\n");
-    print( JSINDEX "<SCRIPT LANGUAGE=\"JavaScript\" SRC=\"$fileNames{'jsFunctions'}\"></SCRIPT>\n");
+    print( JSINDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
+	if( "$opt_metacharset" ne '' );
+    print( JSINDEX "  <TITLE>${pageTitle}</TITLE>\n" );
+    print( JSINDEX "<SCRIPT LANGUAGE=\"JavaScript\" TYPE=\"text/javascript\" SRC=\"$fileNames{'jsVariables'}\"></SCRIPT>\n");
+    print( JSINDEX "<SCRIPT LANGUAGE=\"JavaScript\" TYPE=\"text/javascript\" SRC=\"$fileNames{'jsFunctions'}\"></SCRIPT>\n");
     print( JSINDEX "</HEAD>\n");
     print( JSINDEX "<BODY>\n");
-    print( JSINDEX "<SCRIPT LANGUAGE=\"JavaScript\">\n");
+    print( JSINDEX "<SCRIPT LANGUAGE=\"JavaScript\" TYPE=\"text/javascript\">\n");
     print( JSINDEX "  top.drawWindows();\n");
     print( JSINDEX "</SCRIPT>\n");
     print( JSINDEX "</BODY>\n");
--- patch-ad ends here ---

--- patch-ae begins here ---
--- webmagickrc.in.orig1	Sun May 23 06:21:46 2004
+++ webmagickrc.in	Sun May 23 11:22:00 2004
@@ -214,7 +214,7 @@
 # Meta-tag defaults
 #
 # $opt_metaauthor = '';			# Page author
-# $opt_metacharset = '';                # Page character set
+# $opt_metacharset = 'iso-8859-1';	# Page character set
 # $opt_metaclassification = '';		# Page classification
 # $opt_metadescription = '';		# Page description
 # $opt_metaexpires = '';			# Date page expires (e.g "Tue, 20 Aug 1996 14:25:27 GMT")
--- patch-ae ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405231110.i4NBAnPM015190>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation