From 55e6004af11d3b1560d9595f5ef0bcd0bb7ec3bb Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Wed, 26 Jul 2006 03:45:43 +0000 Subject: Update to the latest variant from the project CVS --- www/WebMagick/files/patch-aa | 98 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 85 insertions(+), 13 deletions(-) (limited to 'www/WebMagick/files/patch-aa') diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa index 28c8c8a32471..7b7ae2c11f1c 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.153 -diff -u -r1.117 -r1.153 +retrieving revision 1.154 +diff -u -r1.117 -r1.154 --- webmagick.in 23 Oct 2002 16:14:47 -0000 1.117 -+++ webmagick.in 28 Dec 2005 21:44:47 -0000 1.153 ++++ webmagick.in 26 Jul 2006 03:36:05 -0000 1.154 @@ -1,6 +1,6 @@ #! @PERL@ # -# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $ -+# $Id: webmagick.in,v 1.153 2005/12/28 21:44:47 ache Exp $ ++# $Id: webmagick.in,v 1.154 2006/07/26 03:36:05 ache Exp $ # # You are looking at the main PERL script for WebMagick, a package to # intelligently create HTML and JavaScript index files and imagemaps @@ -585,7 +585,7 @@ diff -u -r1.117 -r1.153 " file is missing\n") if $opt_debug; ++$doMontage; -@@ -1975,7 +2073,8 @@ +@@ -1975,9 +2073,10 @@ # get indexname of parent directory my $upindexname = get_rc_var('..', 'opt_indexname', "$opt_indexname"); @@ -593,8 +593,29 @@ diff -u -r1.117 -r1.153 + + unless ( "$upindexname" eq 'NOLINK' || "$opt_forcenouplink" || ( cwd() eq "$opt_rootpath" && ! "$opt_forceuplink" ) ) { $uphtml = "" . +- "SRC=\"$iconImageUrls{'up'}\" $iconImageSizes{'up'} ALT=\"^\" BORDER=0>" . ++ "SRC=\"$iconImageUrls{'up'}\" $iconImageSizes{'up'} TITLE=\"^\" ALT=\"^\" BORDER=0>" . " ${opt_msg_up}
\n"; + } + +@@ -1987,7 +2086,7 @@ + my $helphtml = ''; + if( $haveReadme ) { + $helphtml .= "" . ++ "SRC=\"$iconImageUrls{'help'}\" $iconImageSizes{'help'} TITLE=\"?\" ALT=\"?\" BORDER=0>" . + " ${opt_msg_readme}
\n"; + } + +@@ -1997,7 +2096,7 @@ + my $nexthtml = ''; + if( $haveReadme && $haveImages && $opt_framefmt_frames{$opt_framestyle}<=2 ) { + $nexthtml .= "" . ++ "SRC=\"$iconImageUrls{'next'}\" $iconImageSizes{'next'} TITLE=\"*\" ALT=\"*\" BORDER=0>" . + " ${opt_msg_images}
"; + } + @@ -2023,20 +2122,19 @@ } else { $dirtitle=$subdir; @@ -611,7 +632,8 @@ diff -u -r1.117 -r1.153 # If a bullet icon is defined, then use it # otherwise use plain text only if( defined( $iconImageUrls{'ball'} ) ) { - $dirhtml .= "\"*\""; +- $dirhtml .= "\"*\""; ++ $dirhtml .= "\"*\""; } - $dirhtml .= "$dirtitle
\n"; + $dirhtml .= "$dirtitle
\n"; @@ -755,7 +777,42 @@ diff -u -r1.117 -r1.153 # Must be visible at each page, if no frames if (!$opt_frames) { -@@ -2329,8 +2422,6 @@ +@@ -2287,7 +2380,7 @@ + # --- readme link --- + if ( $haveReadme ) { + $indexbar .= "\n"; ++ "SRC=\"$iconImageUrls{'help'}\" $iconImageSizes{'help'} TITLE=\"${opt_msg_readme}\" ALT=\"${opt_msg_readme}\" BORDER=0>\n"; + } + + # --- up link --- +@@ -2295,7 +2388,7 @@ + + if ( "$upindexname" ne 'NOLINK' ) { + $indexbar .= "\n"; ++ "SRC=\"$iconImageUrls{'up'}\" $iconImageSizes{'up'} TITLE=\"${opt_msg_up}\" ALT=\"${opt_msg_up}\" BORDER=0>\n"; + } + + } +@@ -2312,7 +2405,7 @@ + $indexbar .= " TARGET=\"$frameTargets{'thumbview'}\"" + if ($opt_frames); + $indexbar .= ">\n"; ++ "SRC=\"$iconImageUrls{'prev'}\" $iconImageSizes{'prev'} TITLE=\"${opt_msg_prev}\" ALT=\"${opt_msg_prev}\" BORDER=0>\n"; + } + + # --- next link --- +@@ -2322,15 +2415,13 @@ + $indexbar .= " TARGET=\"$frameTargets{'thumbview'}\"" + if ($opt_frames); + $indexbar .= ">\n"; ++ "SRC=\"$iconImageUrls{'next'}\" $iconImageSizes{'next'} TITLE=\"${opt_msg_next}\" ALT=\"${opt_msg_next}\" BORDER=0>\n"; + } else { + # Print a grayed out arrow to maintain alignment + $indexbar .= "\"\"\n"; } } @@ -958,7 +1015,13 @@ diff -u -r1.117 -r1.153 # Must be visible at each page, if no frames if (!$opt_frames) { -@@ -2507,7 +2630,7 @@ +@@ -2502,12 +2625,12 @@ + # --- readme link --- + if ( $haveReadme ) { + print (PICHTML "\n"); ++ "SRC=\"$iconImageUrls{'help'}\" $iconImageSizes{'help'} TITLE=\"${opt_msg_readme}\" ALT=\"${opt_msg_readme}\" BORDER=0>\n"); + } } # up @@ -967,7 +1030,14 @@ diff -u -r1.117 -r1.153 if ($opt_frames) { print ( PICHTML "\"${opt_msg_up}\"\n"); ++ " $iconImageSizes{'up'} TITLE=\"${opt_msg_up}\" ALT=\"${opt_msg_up}\" BORDER=0>\n"); + + } # prev if (($imageNum == 0) && ($pageNumber == 1)) { @@ -998,7 +1068,8 @@ diff -u -r1.117 -r1.153 } print ( PICHTML $opt_pichtmlext); print ( PICHTML "\">\"${opt_msg_prev}\"\n"); +- " $iconImageSizes{'prev'} ALT=\"${opt_msg_prev}\" BORDER=0>\n"); ++ " $iconImageSizes{'prev'} TITLE=\"${opt_msg_prev}\" ALT=\"${opt_msg_prev}\" BORDER=0>\n"); } - @@ -1012,7 +1083,7 @@ diff -u -r1.117 -r1.153 + print ( PICHTML "\"${opt_msg_up}\"\n"); ++ " $iconImageSizes{'up'} TITLE=\"${opt_msg_up}\" ALT=\"${opt_msg_up}\" BORDER=0>\n"); + + } + @@ -1045,7 +1116,8 @@ diff -u -r1.117 -r1.153 } print ( PICHTML $opt_pichtmlext); print ( PICHTML "\">\"${opt_msg_next}\"\n"); +- " $iconImageSizes{'next'} ALT=\"${opt_msg_next}\" BORDER=0>\n"); ++ " $iconImageSizes{'next'} TITLE=\"${opt_msg_next}\" ALT=\"${opt_msg_next}\" BORDER=0>\n"); } - -- cgit v1.2.3