From 950e18a5b57ae1358bb9a046e2013b47d17fd547 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Mon, 29 Nov 1999 11:13:29 +0000 Subject: fix HTML error generated --- www/WebMagick/files/patch-aa | 84 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 17 deletions(-) (limited to 'www/WebMagick') diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa index c853c8bf7545..ab358cdf747b 100644 --- a/www/WebMagick/files/patch-aa +++ b/www/WebMagick/files/patch-aa @@ -1,5 +1,5 @@ --- webmagick.in.orig Sun Oct 17 23:55:14 1999 -+++ webmagick.in Sat Nov 27 07:28:05 1999 ++++ webmagick.in Mon Nov 29 13:50:46 1999 @@ -127,6 +127,7 @@ $opt_dircolorlink, $opt_dircolorvlink, @@ -65,7 +65,15 @@ $opt_pichtml = 0; # Write separate HTML for each picture $opt_pichtmlext = '.html'; # Use .shtml for SSI $opt_pichtmltarget = ''; -@@ -658,6 +666,7 @@ +@@ -572,6 +580,7 @@ + + ${uphtml} + ${nexthtml} ++ +

+ ${dirhtml} + '; +@@ -658,6 +667,7 @@ 'dircolorfore=s' => \$opt_dircolorfore, 'dircolorlink=s' => \$opt_dircolorlink, 'dircolorvlink=s' => \$opt_dircolorvlink, @@ -73,7 +81,7 @@ 'dirindexname=s' => \$opt_dirindexname, 'footer=s' => \$opt_footer, 'forcecache!' => \$opt_forcecache, -@@ -674,13 +683,16 @@ +@@ -674,13 +684,16 @@ 'help!' => \$opt_help, 'htimage=s' => \$opt_htimage, 'htmlext=s' => \$opt_htmlext, @@ -90,7 +98,7 @@ 'pageindexname=s' => \$opt_pageindexname, 'pichtml!' => \$opt_pichtml, 'pichtmlbottom=s' => \$opt_pichtmlbottom, -@@ -870,7 +882,7 @@ +@@ -870,7 +883,7 @@ # for each directory ignoring hidden directories use File::Find; print( "Processing directory tree $opt_srcdir ...\n" ) if $opt_debug; @@ -99,7 +107,7 @@ } else { print( "Processing directory $opt_srcdir ...\n" ) if $opt_debug; $sourceDirectory = $opt_srcdir; -@@ -934,7 +946,7 @@ +@@ -934,7 +947,7 @@ sub wanted { my($dev,$ino,$mode,$nlink,$uid,$gid); ($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_); @@ -108,7 +116,7 @@ if( $_ ne '.' && get_rc_var('.', 'opt_prune', 0) ) { $File::Find::prune=1; # following funny logic is to avoid warnings about $prune -@@ -1137,14 +1149,22 @@ +@@ -1137,14 +1150,22 @@ # $opt_maptype = "\L${opt_maptype}"; @@ -139,7 +147,7 @@ } # -@@ -1425,6 +1445,7 @@ +@@ -1425,6 +1446,7 @@ 'dircolorfore' => $opt_dircolorfore, 'dircolorlink' => $opt_dircolorlink, 'dircolorvlink' => $opt_dircolorvlink, @@ -147,7 +155,7 @@ 'dirindexname' => $opt_dirindexname, 'footer' => $opt_footer, 'framemarginwidth' => $opt_framemarginwidth, -@@ -1434,6 +1455,7 @@ +@@ -1434,6 +1456,7 @@ 'framestyle' => $opt_framestyle, 'header' => $opt_header, 'htmlext' => $opt_htmlext, @@ -155,7 +163,7 @@ 'imgindexname' => $opt_imgindexname, 'indexname' => $opt_indexname, 'jsdirindex' => $fileNames{'jsDirIndex'}, -@@ -1450,7 +1472,7 @@ +@@ -1450,7 +1473,7 @@ 'readme' => $opt_readme, 'readmepresent' => $haveReadme, 'readmevisible' => $opt_readmevisible, @@ -164,7 +172,7 @@ 'subdirectories' => join(' ',@dirNames), 'title' => $pageTitle, 'version' => $webmagickInfo{'version'}, -@@ -1694,7 +1716,7 @@ +@@ -1694,7 +1717,7 @@ sub writeTopIndexes { print( STDERR "Writing Index Files ${opt_indexname} & ", @@ -173,7 +181,7 @@ if $opt_debug; #---- Generate the Variables for Format Options ---- -@@ -1805,7 +1827,7 @@ +@@ -1805,7 +1828,7 @@ # Pull README into thumbnail frame if it exists, and is # either marked always visible or there are no images. # @@ -182,7 +190,7 @@ if( $opt_framefmt_frames{$opt_framestyle} <= 2 ) { if( $haveReadme && ( $opt_readmevisible || ! $haveImages ) ) { -@@ -1923,8 +1945,8 @@ +@@ -1923,8 +1946,8 @@ # ----- Output Frame Directory File (usally ".indexdir.html") ------ # @@ -193,7 +201,49 @@ " for output\n$@\n"); print( INDEX "\n\n" ); print( INDEX " ${pageTitle}\n" ); -@@ -2143,6 +2165,7 @@ +@@ -1985,24 +2008,24 @@ + + # --- readme link --- + if ( $haveReadme ) { +- $indexbar .= "\"ReadMe\"\n"; ++ $indexbar .= "\"ReadMe\"\n"; + } + # --- prev link --- + if( $pageNumber == 1 ) { + # Go to base index page if on first page +- $indexbar .= "\"Prev\"\n"; ++ $indexbar .= "\"Prev\"\n"; + } else { + # Go to preceding page +- $indexbar .= "\"Prev\"\n"; ++ $indexbar .= "\"Prev\"\n"; + } + # --- next link --- + if( $numPages > 1 ) { + if( $pageNumber < $numPages ) { +- $indexbar .= "\"Next\"\n"; ++ $indexbar .= "\"Next\"\n"; + } else { + # Print a grayed out arrow to maintain alignment + $indexbar .= "\"\"\n"; +@@ -2058,7 +2081,7 @@ + # Total HACK!!! + if( $opt_framestyle == 1 ) { + print( INDEX "

Index of files \"$imageNames[$pageNumber - 1][0]\" through", +- " \"$imageNames[$pageNumber - 1][$numimages-1]\"

\n" ); ++ " \"$imageNames[$pageNumber - 1][$numimages-1]\"

\n" ); + } + print( INDEX "\n$indexbar
\n\n" ); + +@@ -2143,6 +2166,7 @@ ">WebMagick" ); print( INDEX " $webmagickInfo{version}, Copyright © Bob Friesenhahn\n" ); } @@ -201,7 +251,7 @@ print( INDEX "\n" ); } -@@ -2762,7 +2785,7 @@ +@@ -2762,7 +2786,7 @@ $status = $montage->Write( filename=>"JPEG:$fileNames{'montageJPEG'}", interlace=>'Plane', @@ -210,7 +260,7 @@ ); handleMagickError( __FILE__, __LINE__, $fileNames{'montageJPEG'}, $status) if "$status"; last MONTAGE if "$status"; -@@ -3346,6 +3369,7 @@ +@@ -3346,6 +3370,7 @@ Paths: --iconpath Relative path under rootdir to webmagick icons @@ -218,7 +268,7 @@ --prefixpath Path to prepend to generated URLs (e.g. /~username) --rootpath Absolute path to server root (NCSA DocumentRoot) -@@ -3369,6 +3393,8 @@ +@@ -3369,6 +3394,8 @@ Montage: --forcegif Force imagemap to be in GIF format @@ -227,7 +277,7 @@ --maxgif Maximum size of GIF imagemap before trying JPEG --columns Montage columns --rows Montage rows (max) -@@ -3408,9 +3434,11 @@ +@@ -3408,9 +3435,11 @@ --dircolorfore Foreground color (directory frame) --dircolorlink Link (unvisited) color (directory frame) --dircolorvlink Link (visited) color (directory frame) -- cgit v1.2.3