mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

23827: allow all arguments to options to either immediately follow the option letter or be the next word.

Browse source
This commit is contained in:
Clint Adams 2007-09-25 14:44:09 +00:00
parent 55c6f279ff
commit e29ee5795e
2 changed files with 42 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-09-25 Clint Adams <clint@zsh.org>
* Mikael Magnusson: 23827: Completion/Unix/Command/_vorbis:
allow all arguments to options to either immediately follow
the option letter or be the next word.
2007-09-23 Clint Adams <clint@zsh.org>
* 23824: Completion/Unix/Command/_git: merge in git rerere

72
Completion/Unix/Command/_vorbis
View file

@ -8,59 +8,59 @@ case $service in
'(- *)'{-h,--help}'[show help]' \
'(- *)'{-v,--version}'[display version information]' \
'(-r --raw)'{-r,--raw}'[assume input data is raw, little-endian with no header information]' \
'(-B --raw-bits)'{-B,--raw-bits=}'[set raw mode input sample size in bits]:sample size:(8 16)' \
'(-C --raw-chan)'{-C,--raw-chan=}'[set raw mode input number of channels]:number of channels' \
'(-R --raw-rate)'{-R,--raw-rate=}'[set raw mode input sample rate]:sample rate:(44100 48000)' \
'(-B --raw-bits)'{-B+,--raw-bits=}'[set raw mode input sample size in bits]:sample size:(8 16)' \
'(-C --raw-chan)'{-C+,--raw-chan=}'[set raw mode input number of channels]:number of channels' \
'(-R --raw-rate)'{-R+,--raw-rate=}'[set raw mode input sample rate]:sample rate:(44100 48000)' \
'--raw-endianness[set raw mode endianness]:endianness:((0\:big\ endian 1\:little\ endian))' \
'(-Q --quiet)'{-Q,--quiet}'[quiet mode]' \
'(-b --bitrate)'{-b,--bitrate=}'[set encoding to the bitrate closest to that specified]:bitrate (kb/s)' \
'(-m --min-bitrate)'{-m,--min-bitrate=}'[set minimum bitrate]:bitrate (kb/s)' \
'(-M --max-bitrate)'{-M,--max-bitrate=}'[set maximum bitrate]:bitrate (kb/s)' \
'(-b --bitrate)'{-b+,--bitrate=}'[set encoding to the bitrate closest to that specified]:bitrate (kb/s)' \
'(-m --min-bitrate)'{-m+,--min-bitrate=}'[set minimum bitrate]:bitrate (kb/s)' \
'(-M --max-bitrate)'{-M+,--max-bitrate=}'[set maximum bitrate]:bitrate (kb/s)' \
'--managed[turn off the normal VBR encoding]' \
'(-q --quality)'{-q,--quality=}'[set encoding quality]:quality:(0 1 2 3 4 5 6 7 8 9 10)' \
'(-q --quality)'{-q+,--quality=}'[set encoding quality]:quality:(0 1 2 3 4 5 6 7 8 9 10)' \
'--resample[resample input to the given sample rate before encoding]:sample rate (Hz)' \
'--downmix[down mix input from stereo to mono]' \
'--advanced-encode-option:option name:_values option "bitrate_average_window[set the managed bitrate window]\:number (seconds)" "lowpass_frequency[set the lowpass frequency]\:frequency (kHz)"' \
'(-s --serial)'{-s,--serial}'[force a specific serial number in the output stream]' \
'(-s --serial)'{-s+,--serial=}'[force a specific serial number in the output stream]' \
"--discard-comments[don't copy comments from FLAC file to output Ogg Vorbis file]" \
'(-o --output)'{-o,--output=}'[write the Ogg Vorbis stream to output_file]:files:->oggfiles' \
'(-n --names)'{-n,--names=}'[specify pattern for producing filenames]:string' \
'(-X --name-remove)'{-X,--name-remove=}'[remove specified characters from output filenames]:characters' \
'(-P --name-replace)'{-P,--name-replace=}'[specify replacement characters for those removed]:characters' \
'(-c --comment)'{-c,--comment}'[add the string comment as an extra comment]:comment' \
'(-a --artist)'{-a,--artist}'[set the artist comment field in the comments to artist]:artist' \
'(-G --genre)'{-G,--genre}'[set the genre comment field in the comments to genre]:genre' \
'(-d --date)'{-d,--date}'[set the date comment field to the given value]:date' \
'(-N --tracknum)'{-N,--tracknum}'[set the track number comment field to the given value]:track number' \
'(-t --title)'{-t,--title}'[set the track title comment field to title]:title' \
'(-l --album)'{-l,--album}'[set the album comment field to album]' \
'(-o --output)'{-o+,--output=}'[write the Ogg Vorbis stream to output_file]:files:->oggfiles' \
'(-n --names)'{-n+,--names=}'[specify pattern for producing filenames]:string' \
'(-X --name-remove)'{-X+,--name-remove=}'[remove specified characters from output filenames]:characters' \
'(-P --name-replace)'{-P+,--name-replace=}'[specify replacement characters for those removed]:characters' \
'(-c --comment)'{-c+,--comment}'[add the string comment as an extra comment]:comment' \
'(-a --artist)'{-a+,--artist}'[set the artist comment field in the comments to artist]:artist' \
'(-G --genre)'{-G+,--genre}'[set the genre comment field in the comments to genre]:genre' \
'(-d --date)'{-d+,--date}'[set the date comment field to the given value]:date' \
'(-N --tracknum)'{-N+,--tracknum}'[set the track number comment field to the given value]:track number' \
'(-t --title)'{-t+,--title}'[set the track title comment field to title]:title' \
'(-l --album)'{-l+,--album}'[set the album comment field to album]' \
'*:input file:_files -g "(#i)*.(flac|wav|aiff)(-.)"' && ret=0
;;
ogg123)
_arguments -C -s \
'(- *)'{-h,--help}'[show help]' \
'(- *)'{-V,--version}'[display version information]' \
\*{-d,--device}'[output device]:device:((null\:discard\ all\ data oss\:open\ sound\ system sun\:sun\ audio alsa\:advanced\ linux\ sound\ architecture irix\:IRIX\ audio arts\:aRts\ sound\ daemon esd\:enlightened\ sound\ daemon au\:sun\ audio\ file raw\:raw\ sample wav\:wav\ file))' \
\*{-f,--files=}'[output filename for a previously specified file device]:output filename:_files -g "(#i)*.(wav|au|raw)(-.)"' \
'(-k --skip)'{-k,--skip}"[skip the first 'n' seconds (or to hh:mm:ss)]:seconds" \
'(-K --end)'{-K,--end}"[end at 'n' seconds (or hh:mm:ss)]:seconds" \
'(-b --buffer)'{-b,--buffer}'[size of input buffer]:kilobytes' \
'(-p --prebuffer)'{-p,--prebuffer}'[prebuffer percentage]:percent' \
\*{-d+,--device}'[output device]:device:((null\:discard\ all\ data oss\:open\ sound\ system sun\:sun\ audio alsa\:advanced\ linux\ sound\ architecture irix\:IRIX\ audio arts\:aRts\ sound\ daemon esd\:enlightened\ sound\ daemon au\:sun\ audio\ file raw\:raw\ sample wav\:wav\ file))' \
\*{-f+,--files=}'[output filename for a previously specified file device]:output filename:_files -g "(#i)*.(wav|au|raw)(-.)"' \
'(-k --skip)'{-k+,--skip}"[skip the first 'n' seconds (or to hh:mm:ss)]:seconds" \
'(-K --end)'{-K+,--end}"[end at 'n' seconds (or hh:mm:ss)]:seconds" \
'(-b --buffer)'{-b+,--buffer}'[size of input buffer]:kilobytes' \
'(-p --prebuffer)'{-p+,--prebuffer}'[prebuffer percentage]:percent' \
'(-q --quiet)*'{-v,--verbose}'[increase verbosity]' \
'(-q --quiet -v --verbose)'{--quiet,-q}'[quiet mode]' \
'(-x --nth)'{-x,--nth}'[block decode intervall]:number' \
'(-y --ntimes)'{-y,--ntimes}'[block repeat count]:number' \
'(-x --nth)'{-x+,--nth}'[block decode intervall]:number' \
'(-y --ntimes)'{-y+,--ntimes}'[block repeat count]:number' \
'(-z --shuffle)'{-z,--shuffle}'[shuffle play]' \
'(-l --delay)'{-l,--delay=}'[set delay between two SIGINTs to quit]:delay (ms)' \
'(-@ --list)'{-@,--list}'[play all of the files from a playlist]:playlist:_files' \
'--audio-buffer[size of output audio buffer]:kilobytes' \
'(-l --delay)'{-l+,--delay=}'[set delay between two SIGINTs to quit]:delay (ms)' \
'(-@ --list)'{-@+,--list}'[play all of the files from a playlist]:playlist:_files' \
'--audio-buffer=[size of output audio buffer]:kilobytes' \
\*{-o,--device-option=}'[assign device option values]:device option:->devopts' \
'*:sound file or directory:_files -g "(#i)*.(ogg|flac)"' && ret=0
;;
ogginfo)
_arguments \
'(- *)-h[show a help and usage message]' \
'(-)*-q[quiet mode]' \
'(-)*-q[quiet mode]' \
'(-)-v[verbose mode]' \
'*:ogg vorbis file:_files -g "(#i)*.ogg(-.)"' && ret=0
;;
@ -69,11 +69,11 @@ case $service in
'(-Q --quiet)'{-Q,--quiet}'[quiet mode]' \
'(- *)'{-h,--help}'[print help information]' \
'(- *)'{-v,--version}'[display version information]' \
'(-b --bits)'{-b,--bits=}'[bits per sample]:bits per sample:(8 16)' \
'(-e --endian)'{-e,--endian=}'[set endianness for 16-bit output]:endianness:((0\:\(default\)\ little-endian\ \(Intel\ byte\ order\) 1\:big-endian\ \(sane\ byte\ order\)))' \
'(-R --raw)'{-R,--raw=}'[output in raw format]' \
'(-o --output)'{-o,--output=}'[write output to specified filename]:output filename:_files' \
'(-s --sign)'{-s,--sign=}'[set signedness for output]:signedness:((0\:unsigned 1\:signed\ \(default\)))' \
'(-b --bits)'{-b+,--bits=}'[bits per sample]:bits per sample:(8 16)' \
'(-e --endian)'{-e+,--endian=}'[set endianness for 16-bit output]:endianness:((0\:\(default\)\ little-endian\ \(Intel\ byte\ order\) 1\:big-endian\ \(sane\ byte\ order\)))' \
'(-R --raw)'{-R+,--raw=}'[output in raw format]' \
'(-o --output)'{-o+,--output=}'[write output to specified filename]:output filename:_files' \
'(-s --sign)'{-s+,--sign=}'[set signedness for output]:signedness:((0\:unsigned 1\:signed\ \(default\)))' \
'*:ogg vorbis file:_files -g "(#i)*.ogg(-.)"' && ret=0
;;
esac