From 63b336243fdf5e60058472fa456ed11e75280189 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Wed, 21 Jan 2004 13:53:28 +0000 Subject: 19387: add (-.) glob qualifier to globs where only files are directly applicable --- Completion/Unix/Command/_tiff | 104 +++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'Completion/Unix/Command/_tiff') diff --git a/Completion/Unix/Command/_tiff b/Completion/Unix/Command/_tiff index 0b3d55df3..588476d5a 100644 --- a/Completion/Unix/Command/_tiff +++ b/Completion/Unix/Command/_tiff @@ -3,9 +3,9 @@ local pat expl ret=1 if [[ "$service" = *2tiff ]]; then - pat="*.(#i)${service}" + pat="*.(#i)${service}(-.)" else - pat="*.(#i)tiff" + pat='*.(#i)tiff(-.)' fi if [[ $# -ne 0 || $+_in_tiff -ne 0 ]]; then @@ -14,7 +14,7 @@ if [[ $# -ne 0 || $+_in_tiff -ne 0 ]]; then set -- "$expl[@]" fi _wanted files expl 'picture file' _path_files "$@" -g "$pat" - || - _files "$@" "$expl[@]" -g '*.(#i)tiff' + _files "$@" "$expl[@]" -g '*.(#i)tiff(-.)' return fi @@ -27,67 +27,67 @@ case "$service" in tiff2bw) _arguments -C \ '-c[specify compression scheme]:compression scheme:->compress' \ - '-r[specify rows per strip]:rows per strip:' \ - '-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\)tif\(\|f\)' \ - ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 + '-r[specify rows per strip]:rows per strip' \ + '-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)tif(|f)(-.)"' \ + ':output file:_files -g "*.(#i)tif(|f)(-.)"' && ret=0 ;; tiff2ps) _arguments \ '-1[generate PostScript Level I output]' \ '-2[generate PostScript Level II output]' \ '-a[generate output for all IFDs]' \ - '-d[set initial TIFF directory]:initial TIFF directory:' \ + '-d[set initial TIFF directory]:initial TIFF directory' \ '(-p)-e[generate Encapsulated PostScript]' \ - '-o[set initial TIFF directory (file offset)]:file offset:' \ + '-o[set initial TIFF directory (file offset)]:file offset' \ '(-e)-p[generate non-Encapsulated PostScript]' \ - '-h[set page height]:page height:' \ - '-w[set page width]:page width:' \ + '-h[set page height]:page height' \ + '-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\)ps' \ + '-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\)tif\(\|f\)' && 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\)tif\(\|f\)' \ - ':second input TIFF file:_files -g \*.\(\#i\)tif\(\|f\)' && 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 \ '-B[write output in bin-endian byte order]' \ '-c[specify compression scheme]:compression scheme:->compress' \ - '-o[set initial TIFF directory (file offset)]:file offset:' \ + '-o[set initial TIFF directory (file offset)]:file offset' \ '-p[set sample packing]:sample packing:(contig separate)' \ '(-t)-s[write output in strips]' \ '(-s)-t[write output in tiles]' \ '-i[ignore read errors]' \ - '-r[specify rows per strip]:rows per strip:' \ - '-w[specify output tile width]:output tile width:' \ - '-l[specify output tile length]:output tile length:' \ + '-r[specify rows per strip]:rows per strip' \ + '-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\)tif\(\|f\)' && ret=0 + '*:input TIFF file:_files -g "*.(#i)tif(|f)(-.)"' && ret=0 ;; tiffdither) _arguments -C \ '-c[specify compression scheme]:compression scheme:->compress' \ '-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\)tif\(\|f\)' \ - ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 + '-r[specify rows per strip]:rows per strip' \ + '-t[set threshold for dithering]:dither threshold value' \ + ':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\)tif\(\|f\)' && ret=0 + '*:input TIFF file:_files -g "*.(#i)tif(|f)(-.)"' && ret=0 ;; tiffinfo) _arguments \ @@ -95,26 +95,26 @@ tiffinfo) '-D[read and decompress data]' \ '-d[print decompressed data]' \ '-j[display JPEG-related tags]' \ - '-o[set initial TIFF directory (file offset)]:file offset:' \ + '-o[set initial TIFF directory (file offset)]:file offset' \ '-s[display offsets and byte counts for all data strips]' \ '-i[ignore read errors]' \ '-f[force fill order]:fill order:(lsb2msb msb2lsb)' \ '-w[display raw data in words]' \ - '*:input TIFF file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 + '*:input TIFF file:_files -g "*.(#i)tif(|f)(-.)"' && ret=0 ;; tiffmedian) _arguments -C \ - '-r[specify rows per strip]:rows per strip:' \ - '-C[specify number of colormap entries]:number of colormap entries:' \ + '-r[specify rows per strip]:rows per strip' \ + '-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\)tif\(\|f\)' \ - ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && 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\)tif\(\|f\)' \ - ':output file prefix:' && ret=0 + ':input file:_files -g "*.(#i)tif(|f)(-.)"' \ + ':output file prefix' && ret=0 ;; fax2tiff) _arguments \ @@ -125,46 +125,46 @@ fax2tiff) '(-B)-W[0 in input is white]' \ '(-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\)tif\(\|f\)' \ + '-R[specify resolution]:resolution (lines per inch)' \ + '-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]' \ - '-p[don'"'"'t align EOL codes]' \ + "-p[don't align EOL codes]" \ '-s[duplicate all rows]' \ '-v[verbose mode]' \ - ':FAX input file:_files -g \*.\(\#i\)\(g\[34\]\|fax\)' && ret=0 + ':FAX input file:_files -g "*.(#i)(g[34]|fax)(-.)"' && ret=0 ;; gif2tiff) _arguments -C \ - '-r[specify rows per strip]:rows per strip:' \ + '-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\)tif\(\|f\)' && ret=0 + ':input GIF file:_files -g "*.(#i)gif(-.)"' \ + ':output file:_files -g "*.(#i)tif(|f)(-.)"' && ret=0 ;; ppm2tiff) _arguments -C \ - '-r[specify rows per strip]:rows per strip:' \ + '-r[specify rows per strip]:rows per strip' \ '-c[specify compression scheme]:compression scheme:->compress' \ '-R[specify resolution]:resolution:' \ - ':input GIF file:_files -g \*.\(\#i\)ppm' \ - ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 + ':input GIF file:_files -g "*.(#i)ppm(-.)"' \ + ':output file:_files -g "*.(#i)tif(|f)(-.)"' && ret=0 ;; ras2tiff) _arguments -C \ - '-r[specify rows per strip]:rows per strip:' \ + '-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\)tif\(\|f\)' && ret=0 + ':input raster image file:_files -g "*.(#i)ras(|t)(-.)"' \ + ':output file:_files -g "*.(#i)tif(|f)(-.)"' && ret=0 ;; pal2rgb) _arguments -C \ '-C[specify number of bits for colormap entries]:bits for colormap entries:(8 16)' \ '-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\)tif\(\|f\)' \ - ':output file:_files -g \*.\(\#i\)tif\(\|f\)' && ret=0 + '-r[specify rows per strip]:rows per strip' \ + ':input file:_files -g "*.(#i)tif(|f)(-.)"' \ + ':output file:_files -g "*.(#i)tif(|f)(-.)"' && ret=0 ;; *) _description files expl 'picture file' @@ -185,7 +185,7 @@ if [[ -n "$state" ]]; then 'fill[byte-align EOL codes]' && ret=0 ;; jpeg) - _message -e values 'compression quality (0-100), or `r'"'"' (output RGB)' + _message -e values "compression quality (0-100), or \`r' (output RGB)" ret=0 ;; lzw|zip) -- cgit 1.4.1