diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/User/_tiff | 40 | ||||
| -rw-r--r-- | Completion/X/_xv | 84 |
3 files changed, 38 insertions, 89 deletions
diff --git a/ChangeLog b/ChangeLog index 64c57fb9e..8eb18827a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-10-06 Sven Wischnowsky <wischnow@zsh.org> + * 12919: Completion/User/_tiff, Completion/X/_xv: search for *.tif + files, too + * 12917: Completion/Bsd/_bsd_pkg, Completion/Bsd/_kld, Completion/Builtins/_autoload, Completion/Builtins/_cd, Completion/Builtins/_compdef, Completion/Builtins/_popd, diff --git a/Completion/User/_tiff b/Completion/User/_tiff index 608325fdf..f780f6bca 100644 --- a/Completion/User/_tiff +++ b/Completion/User/_tiff @@ -31,8 +31,8 @@ tiff2bw) '-R[specify percentage of red channel]:percentage of red channel:' \ '-G[specify percentage of green channel]:percentage of green channel:' \ '-B[specify percentage of blue channel]:percentage of blue channel:' \ - ':input file:_files -g \*.\(\#i\)tiff' \ - ':output file:_files -g \*.\(\#i\)tiff' && ret=0 + ':input file:_files -g \*.\(\#i\)tif\(\|f\)' \ + ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; tiff2ps) _arguments \ @@ -47,17 +47,17 @@ tiff2ps) '-w[set page width]:page width:' \ '-8[disable use of ASCII85 encoding]' \ '-D[print two pages per sheet]' \ - '-O[specify output file]:output file:_files -g \*.\(\#i\)' \ + '-O[specify output file]:output file:_files -g \*.\(\#i\)ps' \ '-s[generate output for a single image]' \ '-T[print pages for top edge binding]' \ - '*:input TIFF file:_files -g \*.\(\#i\)' && ret=0 + '*:input TIFF file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; tiffcmp) _arguments \ '-l[list all differing bytes]' \ '-t[ignore differences in directories]' \ - ':first input TIFF file:_files -g \*.\(\#i\)' \ - ':second input TIFF file:_files -g \*.\(\#i\)' && ret=0 + ':first input TIFF file:_files -g \*.\(\#i\)tif\(\|f\)' \ + ':second input TIFF file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; tiffcp) _arguments -C \ @@ -72,7 +72,7 @@ tiffcp) '-w[specify output tile width]:output tile width:' \ '-l[specify output tile length]:output tile length:' \ '-f[specify fill order]:fill order:(lsb2msb msb2lsb)' \ - '*:input TIFF file:_files -g \*.\(\#i\)' && ret=0 + '*:input TIFF file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; tiffdither) _arguments -C \ @@ -80,14 +80,14 @@ tiffdither) '-f[specify fill order]:fill order:(lsb2msb msb2lsb)' \ '-r[specify rows per strip]:rows per strip:' \ '-t[set threshold for dithering]:dither threshold value:' \ - ':input file:_files -g \*.\(\#i\)tiff' \ - ':output file:_files -g \*.\(\#i\)tiff' && ret=0 + ':input file:_files -g \*.\(\#i\)tif\(\|f\)' \ + ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; tiffdump) _arguments \ '-o[set initial TIFF directory (file offset)]:file offset:' \ '-h[print numbers in hexadecimal]' \ - '*:input TIFF file:_files -g \*.\(\#i\)' && ret=0 + '*:input TIFF file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; tiffinfo) _arguments \ @@ -100,7 +100,7 @@ tiffinfo) '-i[ignore read errors]' \ '-f[force fill order]:fill order:(lsb2msb msb2lsb)' \ '-w[display raw data in words]' \ - '*:input TIFF file:_files -g \*.\(\#i\)' && ret=0 + '*:input TIFF file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; tiffmedian) _arguments -C \ @@ -108,12 +108,12 @@ tiffmedian) '-C[specify number of colormap entries]:number of colormap entries:' \ '-c[specify compression scheme]:compression scheme:->compress' \ '-f[use Floyd-Steinberg dithering]' \ - ':input file:_files -g \*.\(\#i\)tiff' \ - ':output file:_files -g \*.\(\#i\)tiff' && ret=0 + ':input file:_files -g \*.\(\#i\)tif\(\|f\)' \ + ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; tiffsplit) _arguments \ - ':input file:_files -g \*.\(\#i\)tiff' \ + ':input file:_files -g \*.\(\#i\)tif\(\|f\)' \ ':output file prefix:' && ret=0 ;; fax2tiff) @@ -126,7 +126,7 @@ fax2tiff) '(-M)-L[input is lsb-to-msb]' \ '(-L)-M[input is msb-to-lsb]' \ '-R[specify resolution]:resolution (lines per inch):' \ - '-o[specify output file]:output file:_files -g \*.\(\#i\)' \ + '-o[specify output file]:output file:_files -g \*.\(\#i\)tif\(\|f\)' \ '(-f)-c[generate `classic'"'"' TIFF format]' \ '(-c)-f[generate TIFF Class F format]' \ '-m[output in msb-to-lsb order]' \ @@ -140,7 +140,7 @@ gif2tiff) '-r[specify rows per strip]:rows per strip:' \ '-c[specify compression scheme]:compression scheme:->compress' \ ':input GIF file:_files -g \*.\(\#i\)gif' \ - ':output file:_files -g \*.\(\#i\)tiff' && ret=0 + ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; ppm2tiff) _arguments -C \ @@ -148,14 +148,14 @@ ppm2tiff) '-c[specify compression scheme]:compression scheme:->compress' \ '-R[specify resolution]:resolution:' \ ':input GIF file:_files -g \*.\(\#i\)ppm' \ - ':output file:_files -g \*.\(\#i\)tiff' && ret=0 + ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; ras2tiff) _arguments -C \ '-r[specify rows per strip]:rows per strip:' \ '-c[specify compression scheme]:compression scheme:->compress' \ ':input raster image file:_files -g \*.\(\#i\)ras\(\|t\)' \ - ':output file:_files -g \*.\(\#i\)tiff' && ret=0 + ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; pal2rgb) _arguments -C \ @@ -163,8 +163,8 @@ pal2rgb) '-p[set sample packing]:sample packing:(contig separate)' \ '-c[specify compression scheme]:compression scheme:->compress' \ '-r[specify rows per strip]:rows per strip:' \ - ':input file:_files -g \*.\(\#i\)tiff' \ - ':output file:_files -g \*.\(\#i\)tiff' && ret=0 + ':input file:_files -g \*.\(\#i\)tif\(\|f\)' \ + ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 ;; *) _description files expl 'picture file' diff --git a/Completion/X/_xv b/Completion/X/_xv index ebaee4d8d..832374267 100644 --- a/Completion/X/_xv +++ b/Completion/X/_xv @@ -1,99 +1,45 @@ #compdef xv -_x_options \ - '-help' \ - '-fg:foreground color:_colors' \ - '-bg:background color:_colors' \ - '-hi:top left shadow color:_colors' \ - '-lo:bottom right shadow color:_colors' \ +_x_arguments \ + -{help,quick24,slow24,best24,noqcheck,pkludge,RM} \ + -+{fixed,rw,perfect,owncmap,stdcmap,cecmap,ninstall,8,24,root,noresetroot,max,maxpect,quit,clear,cmap,imap,cemap,cmtmap,vsmap,nopos,dither,smooth,raw,acrop,4x3,hflip,vflip,norm,hist,mono,rv,wloop,random,loadclear,nofreecols,rgb,hsv,lbrowse,nostat,2xlimit,nolimits,close,iconic,viewonly,poll,vsperfect,vsdisable,nodecor} \ + '-fg:foreground color:_x_color' \ + '-bg:background color:_x_color' \ + '-hi:top left shadow color:_x_color' \ + '-lo:bottom right shadow color:_x_color' \ '-bw:border width:' \ '-geometry:geometry:_x_geometry' \ - '-fixed' '+fixed' \ '-expand:expansion factor:' \ '-aspect:aspect ratio (e.g. 4:3):' \ '-ncols:maximum number of colors used:' \ - '-rw' '+rw' \ - '-perfect' '+perfect' \ - '-owncmap' '+owncmap' \ - '-stdcmap' '+stdcmap' \ - '-cecmap' '+cecmap' \ - '-ninstall' '+ninstall' \ - '-8' '+8' \ - '-24' '+24' \ - '-quick24' \ - '-slow24' \ - '-best24' \ - '-noqcheck' \ - '-root' '+root' \ - '-rmode:root display mode:((0\:tiling 1\:integer\ tiling 2\:mirrored\ tiling 3\:integer\ mirrored\ tiling 4\:centered\ tiling 5\:centered\ tiling\ on\ solid\ background 6\:centered\ tiling\ on\ '"'"'warp'"'"'\ background 7\:centered\ tiling\ on\ '"'"'brick'"'"'\ background 8\:symmetrical\ tiling 9\:symmetrical\ mirrored\ tiling))' \ - '-noresetroot' '+noresetroot' \ - '-rfg:root foreground color:_colors' \ - '-rbg:root background color:_colors' \ - '-max' '+max' \ - '-maxpect' '+maxpect' \ - '-quit' '+quit' \ - '-clear' '+clear' \ - '-cmap' '+cmap' \ + '-rmode:root display mode:((0\:tiling 1\:integer\ tiling 2\:mirrored\ tiling 3\:integer\ mirrored\ tiling 4\:centered\ tiling 5\:centered\ tiling\ on\ solid\ background 6\:centered\ tiling\ on\ '\\\''warp'\\\''\ background 7\:centered\ tiling\ on\ '\\\''brick'\\\''\ background 8\:symmetrical\ tiling 9\:symmetrical\ mirrored\ tiling))' \ + '-rfg:root foreground color:_x_color' \ + '-rbg:root background color:_x_color' \ '-cgeom:control window geometry:_x_geometry' \ - '-imap' '+imap' \ '-igeom:info window geometry:_x_geometry' \ - '-cemap' '+cemap' \ '-cegeom:color editor window geometry:_x_geometry' \ - '-cmtmap' '+cmtmap' \ '-cmtgeometry:comments window geometry:_x_geometry' \ '-tgeometry:text view window geometry:_x_geometry' \ - '-vsmap' '+vsmap' \ '-vsgeometry:visual schauzer geometry:_x_geometry' \ - '-nopos' '+nopos' \ - '-dither' '+dither' \ - '-smooth' '+smooth' \ - '-raw' '+raw' \ '-crop:left border: :top border: :width: :height:' \ - '-acrop' '+acrop' \ - '-4x3' '+4x3' \ - '-hflip' '+hflip' \ - '-vflip' '+vflip' \ '-rotate:rotation angle:(0 90 -90 +90 180 -180 +180 270 -270 +270)' \ - '-norm' '+norm' \ - '-hist' '+hist' \ '-gamma:gamma value:' \ '-cgamma:red gamma value: :green gamma value: :blue gamma value:' \ '-preset:default preset (1-4):(1 2 3 4)' \ - '-mono' '+mono' \ - '-rv' '+rv' \ - '-white:'"'"'white'"'"' color:_colors' \ - '-black:'"'"'black'"'"' color:_colors' \ + '-white:'"'"'white'"'"' color:_x_color' \ + '-black:'"'"'black'"'"' color:_x_color' \ '-wait:seconds to wait:' \ - '-wloop' '+wloop' \ - '-random' '+random' \ - '-loadclear' '+loadclear' \ - '-nofreecols' '+nofreecols' \ - '-rgb' '+rgb' \ - '-hsv' '+hsv' \ - '-lbrowse' '+lbrowse' \ - '-nostat' '+nostat' \ - '-visual:visual:(TrueColor StaticColor DirectColor StaticGray GrayScale PseudoColor)' \ + '-visual:visual:(TrueColor StaticColor DirectColor StaticGray GrayScale PseudoColor)' \ '-cursor:cursor character number:' \ - '-2xlimit' '+2xlimit' \ - '-nolimits' '+nolimits' \ - '-close' '+close' \ - '-iconic' '+iconic' \ '-icgeometry:icon geometry:_x_geometry' \ '-dir:directory:_files -/' \ '-flist:file list file:_files' \ '-drift:x movement correction: :y movement correction:' \ - '-pkludge' \ '-mfn:mono spaced font:_x_font' \ '-name:window name:_x_name' \ - '-viewonly' '+viewonly' \ - '-grabdelay:grab delay (seconds):' '+grabdelay:grab delay (seconds):' \ - '-poll' '+poll' \ - '-vsperfect' '+vsperfect' \ - '-vsdisable' '+vsdisable' \ + '-+grabdelay:grab delay (seconds):' \ '-gsdev:ghostscript device:' \ '-gsres:ghostscript resolution:' \ '-gsgeom:ghostscript page size:' \ - '-nodecor' '+nodecor' \ - '-RM' \ '-DEBUG:debug level:' \ - '*:picture file:_files -g \*.\(\#i\)\(gif\|jpeg\|tiff\|pbm\|pgm\|ppm\|xbm\|xpm\|ras\(\|t\)\|tga\|rle\|rgb\|bmp\|pcx\|fits\|pm\)' + '*:picture file:_files -g \*.\(\#i\)\(png\|gif\|jpeg\|jpg\|tiff\|tif\|pbm\|pgm\|ppm\|xbm\|xpm\|ras\(\|t\)\|tga\|rle\|rgb\|bmp\|pcx\|fits\|pm\)' |