From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 10882 invoked from network); 8 Jul 2021 23:07:19 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 8 Jul 2021 23:07:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Message-ID:Date: Content-Transfer-Encoding:Content-ID:Content-Type:MIME-Version:Subject:To: From:Reply-To:Cc:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=POWlfltm8nnsbL9W6afq/hvZ4hYS4QSxqNgc8Nr3btg=; b=m9QYtALJpMK0SiCN9oOjZYPNJ6 66pEsFSBJ8nte88JvVyORAo6EZ6ywqjKwita1b7NlzmgolbdRkfJWJXVMCwNWuqVTbI4UkLvCJcso DTT2Vh7+w42XJBOooLolNGl7Lw/VKyaxmqgm4UG3XPdv5m9eW6RQSIn9fWKp8AThTbKmq4bVVVHf8 +VCL7uZUALfr9B4xWF7dvHm4FyhXjmo4kkjqRQGLaG7iEdSd+zyROh4EL0Rbnz52e7r9aLGuRFejN JVt5QiDQSMZMGjQ7CZNqzro0kVX4nkcdYeDgfdrqsJYAHfilFNYAxpaGeuL4lw93Gfdhdmw/ldaPu 4aCZXOHw==; Received: from authenticated user by zero.zsh.org with local id 1m1d6z-0003zr-Nm; Thu, 08 Jul 2021 23:07:17 +0000 Received: from authenticated user by zero.zsh.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1m1d6S-0003es-DW; Thu, 08 Jul 2021 23:06:44 +0000 Received: from [192.168.178.21] (helo=hydra) by mail.kiddle.eu with esmtp(Exim 4.94.2) (envelope-from ) id 1m1d6R-0008QL-PR for zsh-workers@zsh.org; Fri, 09 Jul 2021 01:06:43 +0200 From: Oliver Kiddle To: Zsh workers Subject: PATCH: make wider use of the convention of square brackets for defaults MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <32383.1625785603.1@hydra> Content-Transfer-Encoding: quoted-printable Date: Fri, 09 Jul 2021 01:06:43 +0200 Message-ID: <32384-1625785603.785500@qfYj.PoKf.VtS6> X-Seq: 49156 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: It is often useful to make default values explicit from completions. At some point I adopted the approach of putting them in square brackets in the match group description and this was subsequently documented in Etc/completion-style-guide. With this patch, I've changed instances of other styles such as "(default 2)" to conform. If anyone feels strongly that some other style would be preferable, = it may be better to investigate whether it can be made configurable via zformat strings and zstyle. Though that could be tricky to do in a backward compatible way. There are also plenty of cases where we've indicated a default in per-match descriptions rather than the group headings which I've mostly not touched. I've also left things alone where the default is not a valid literal value (e.g the default is something like all where you can only specify a number for a specific one). Oliver diff --git a/Completion/Cygwin/Command/_cygserver b/Completion/Cygwin/Comm= and/_cygserver index 1c2744c8f..392bf5cbd 100644 --- a/Completion/Cygwin/Command/_cygserver +++ b/Completion/Cygwin/Command/_cygserver @@ -3,14 +3,14 @@ # cygwin 1.5.25 = _arguments -s -S \ - '(--config-file -f)'{-f,--config-file}'[use specified file as config fi= le (default /etc/cygserver.conf)]:config file:_files -g "*.conf(-.)"' \ - '(--cleanup-threads -c)'{-c,--cleanup-threads}'[number of cleanup threa= ds to use (default 2)]:number of threads:' \ + '(--config-file -f)'{-f,--config-file}'[use specified config file]:conf= ig file [/etc/cygserver.conf]:_files -g "*.conf(-.)"' \ + '(--cleanup-threads -c)'{-c,--cleanup-threads}'[number of cleanup threa= ds to use]:number of threads [2]' \ '(--process-cache -p)'{-p,--process-cache}'[size of process cache]:cach= e size:' \ - '(--request-threads -r)'{-r,--request-threads}'[number of request threa= ds to use (default 10)]:number of threads:' \ + '(--request-threads -r)'{-r,--request-threads}'[number of request threa= ds to use]:number of threads [10]' \ '(--debug -d)'{-d,--debug}'[log debug messages to stderr]' \ '(--stderr -e --no-stderr -E)'{-e,--stderr}'[log to stderr (default if = stderr is a tty)]' \ '(--stderr -e --no-stderr -E)'{-E,--no-stderr}"[don't log to stderr (se= e -y, -Y options)]" \ - '(--log-level -l)'{-l,--log-level}'[verbosity of logging (1..7) (defaul= t 6)]:verbosity level:({1..7})' \ + '(--log-level -l)'{-l,--log-level}'[specify log verbosity]:verbosity le= vel [6]:({1..7})' \ '(--syslog -y --no-syslog -Y)'{-y,--syslog}'[log to syslog (default if = stderr is no tty)]' \ '(--syslog -y --no-syslog -Y)'{-Y,--no-syslog}"[don't log to syslog (se= e -e, -E options)]" \ '(--no-sharedmem -m)'{-m,--no-sharedmem}"[don't start XSI Shared Memory= support]" \ diff --git a/Completion/Debian/Command/_git-buildpackage b/Completion/Debi= an/Command/_git-buildpackage index c38edc1cc..81bf7dac9 100644 --- a/Completion/Debian/Command/_git-buildpackage +++ b/Completion/Debian/Command/_git-buildpackage @@ -13,14 +13,14 @@ _arguments \ '--git-sign-tags[sign tags]' \ '--git-no-sign-tags[negates --git-sign-tags]' \ '--git-keyid=3D-[GPG keyid to sign tags with]:GPG key:' \ - '--git-debian-tag=3D-[format string for debian tags]:default is debian/= %(version)s:' \ - '--git-upstream-tag=3D-[format string for upstream tags]:default is ups= tream/%(version)s:' \ + '--git-debian-tag=3D-[format string for debian tags]:format string [deb= ian/%%(version)s]' \ + '--git-upstream-tag=3D-[format string for upstream tags]:format string = [upstream/%%(version)s]' \ '--git-pristine-tar[use pristine-tar to create .orig.tar.gz]' \ '--git-no-pristine-tar[negates --git-pristine-tar]' \ '--git-force-create[force creation of orig.tar.gz]' \ '--git-no-create-orig[do not create orig.tar.gz]' \ '--git-tarball-dir=3D-[location to look for external tarballs]:tarball = directory:_files -/' \ - '--git-compression=3D-[compression type]:compression:(auto gzip bzip2 l= zma xz)' \ + '--git-compression=3D-[compression type]:compression type [auto]:(auto = gzip bzip2 lzma xz)' \ '--git-compression-level=3D-[set compression level]:level:(1 2 3 4 5 6 = 7 8 9)' \ '--git-upstream-branch=3D-[upstream branch]::' \ '--git-debian-branch=3D-[branch the Debian package is being developed o= n]::' \ diff --git a/Completion/Linux/Command/_alsa-utils b/Completion/Linux/Comma= nd/_alsa-utils index 91bb0b86c..dd5c26866 100644 --- a/Completion/Linux/Command/_alsa-utils +++ b/Completion/Linux/Command/_alsa-utils @@ -38,7 +38,7 @@ opts=3D( --disable-format'[disable automatic format conversions]' --disable-softvol'[disable software volume control (softvol)]' --test-position'[test ring buffer position]' - --test-coef=3D'[test coefficient for ring buffer position (default 8)]' + --test-coef=3D'[test coefficient for ring buffer position]:coefficient = [8]' --test-nowait'[do not wait for ring buffer - eats whole CPU]' --max-file-time=3D'[start another output file when the old file has rec= orded]' --process-id-file=3D'[write the process ID here]' diff --git a/Completion/Linux/Command/_ipset b/Completion/Linux/Command/_i= pset index 061d16799..a40480904 100644 --- a/Completion/Linux/Command/_ipset +++ b/Completion/Linux/Command/_ipset @@ -4,7 +4,7 @@ local offset=3D0 local -a args from_to hash cmds listopts addopts = _set_types () { - _values -S \ "Set type" \ + _values -S \ "set type" \ 'bitmap\:ip[uses a memory range to store IPv4 host (default) or IPv4 su= bnet addresses up to 65536 elements]'\ 'bitmap\:ip,mac[uses a memory range to store an IPv4 host/subnet and ma= c address pair up to 65536 elements]'\ 'bitmap\:port[uses a memory range to store port numbers independent of = L4 protocol at up to 65536 elements]'\ @@ -37,18 +37,11 @@ from_to=3D('(--network)--from[from IP or network (with= --netmask)]:IP' '(--from --to)--network[network]:IP/mask' ) = -_addressfamily () { - vals=3D( inet - inet6 - ) - _describe -t addressfamily "Address Family" vals -} - -hash=3D( '--hashsize[the initial hash size aligned to a power of 2(defaul= t 1024)]:hashsize' - '--maxelem[the maximum number of elements in the set (default 65536)]:ma= xelements' - '--family[the protocol family of addresses to be stored in the set (defa= ult inet)]:addressfamily:_addressfamily' +hash=3D( '--hashsize[the initial hash size aligned to a power of 2]:hashs= ize [1024]' + '--maxelem[the maximum number of elements in the set]:max elements [6553= 6]' + '--family[the protocol family of addresses to be stored in the se= t]:address family [inet]:(inet inet6)' '--timeout[adds timeout support to the set with your specified value as = default, (0 =3D forever)]:entrytimeout' - '--probes[max number of tries to resolve clashing, altering this is disc= ouraged (default 8)]:probes' + '--probes[max number of tries to resolve clashing, altering this is disc= ouraged]:tries [8]' '--resize[ratio of increasing hash size after unsuccessful of d= ouble-hashing, altering discouraged]:percent' ) = @@ -100,7 +93,7 @@ case $words[offset+2]; in args=3D( $hash ) ;; list\:set) - args=3D( '--size[size of the new setlist (default 8)]:size' ) + args=3D( '--size[size of the new setlist]:size [8]' ) ;; esac ;; diff --git a/Completion/Solaris/Command/_dtrace b/Completion/Solaris/Comma= nd/_dtrace index 6a6636af3..06e0dc4f6 100644 --- a/Completion/Solaris/Command/_dtrace +++ b/Completion/Solaris/Command/_dtrace @@ -12,7 +12,7 @@ case $OSTYPE in '-X+[specify ISO C conformance settings for preprocessor]:ISO C con= formance:((a\:"ISO plus K&R extensions (default)" c\:"Strictly conformant = ISO C" s\:"K&R C only" t\:"ISO plus K&R extensions"))' ) xopts=3D( - 'errexit[exit on error with specified status code (default 1)]::sta= tus' + 'errexit[exit on error with specified status code]::status [1]' 'noresolve[do not perform user address symbol resolution]' 'uresolve[specify resolution of user addresses]:how:(no symbol base= name absolute)' ) diff --git a/Completion/Solaris/Command/_prstat b/Completion/Solaris/Comma= nd/_prstat index 1eb38845c..12be9c5a4 100644 --- a/Completion/Solaris/Command/_prstat +++ b/Completion/Solaris/Command/_prstat @@ -9,7 +9,7 @@ _prstat() ) = sort_key=3D( - "cpu"\:"process CPU usage (default)" + "cpu"\:"process CPU usage" "pri"\:"process priority" "rss"\:"resident set size" "size"\:"size of process image" @@ -32,8 +32,8 @@ _prstat() '-p[only processes whose process ID is in the list]:PID list' \ '-P[only processes or lwps which have most recently executed on a CPU i= n the list]:CPU list' \ '-R[Put prstat in the real time scheduling class]' \ - '-s[Sort key (descending)]:key:(($sort_key))' \ - '-S[Sort key (ascending)]:key:(($sort_key))' \ + '-s[sort key (descending)]:sort key [cpu]:(($sort_key))' \ + '-S[sort key (ascending)]:sort key [cpu]:(($sort_key))' \ '-t[total usage summary for each user]' \ '-T[information about processes and tasks]' \ '-u[only processes whose effective user ID is in the list]:UID:_users' = \ diff --git a/Completion/Unix/Command/_adb b/Completion/Unix/Command/_adb index 21cd68761..1375813bb 100644 --- a/Completion/Unix/Command/_adb +++ b/Completion/Unix/Command/_adb @@ -446,8 +446,8 @@ _adb_dispatch_logcat() { _arguments \ '(-c -g)-s[set default filter to silent]' \ '(-c -g)-f[log output to file (defaults to stdout)]:logfile:_files' = \ - '(-c -g -d)-r[rotate log every kbytes (default 16, requires -f)]:log= size:_guard "[0-9]#" "numeric value"' \ - '(-c -g -d)-n[max number of rotated logs (default 4)]:number :_guard= "[0-9]#" "numeric value"' \ + '(-c -g -d)-r[rotate log at specified size, requires -f]:log size (k= bytes) [16]' \ + '(-c -g -d)-n[specify max number of rotated logs]:number [4]' \ '(-c -g -d)-v[log format]:format: _values "format" brief process tag= thread raw time threadtime long' \ '(-d -t -g)-c[clear log]' \ '(-c -g)-d[dump log]' \ diff --git a/Completion/Unix/Command/_ant b/Completion/Unix/Command/_ant index 080ce6857..7401c7449 100644 --- a/Completion/Unix/Command/_ant +++ b/Completion/Unix/Command/_ant @@ -56,7 +56,7 @@ _arguments -C \ '-propertyfile[load all properties from specified file with -D properti= es taking precedence]:property file:_files -g "*.properties(-.)"' \ '-inputhandler[specify class which will handle input requests]:class:->= class' \ '(-s -find -f -file -buildfile)'{-s,-find}'[search for specified build = file towards the root of filesystem]:build file:(build.xml)' \ - '-nice[specify a niceness value for the main thread]:niceness value (de= fault 5):({1..10})' \ + '-nice[specify a niceness value for the main thread]:niceness value [5]= :({1..10})' \ '-nouserlib[run ant without using the jar files from ${user.home}/.ant/= lib]' \ '-noclasspath[run ant without using CLASSPATH]' \ '-autoproxy[Java1.5+: use the OS proxy settings]' \ diff --git a/Completion/Unix/Command/_django b/Completion/Unix/Command/_dj= ango index 9eaa2284a..1d5cf7311 100644 --- a/Completion/Unix/Command/_django +++ b/Completion/Unix/Command/_django @@ -146,9 +146,9 @@ case $state in args+=3D( $locale $verbosity - {-d,--domain=3D}'[domain of the message files (default: "django= ")]:domain' + {-d,--domain=3D}'[domain of the message files]:domain [django]:= (django djangojs)' {-a,--all}'[re-examine all code and templates]' - {-e,--extensions=3D}'[file extension(s) to examine (default: ".= html")]:extension' + {-e,--extensions=3D}'[file extension(s) to examine]:extension [= html]' ) ;; = diff --git a/Completion/Unix/Command/_dtruss b/Completion/Unix/Command/_dt= russ index bd1ae8bc5..b56e713d2 100644 --- a/Completion/Unix/Command/_dtruss +++ b/Completion/Unix/Command/_dtruss @@ -2,7 +2,7 @@ = _arguments -s : \ '-a[print all details]' \ - '-b+[specify dynamic variable buffer size]:buffer size (default 4m)' \ + '-b+[specify dynamic variable buffer size]:buffer size [4m]' \ '-c[print system call counts]' \ '-d[print relative timestamps]' \ '-e[print elapsed times]' \ diff --git a/Completion/Unix/Command/_gcc b/Completion/Unix/Command/_gcc index 22d3083de..b6f1da2c6 100644 --- a/Completion/Unix/Command/_gcc +++ b/Completion/Unix/Command/_gcc @@ -1643,7 +1643,7 @@ args+=3D( '+e-[control how virtual function definitions are used]:virtual functio= n definitions in classes:((0\:only\ interface 1\:generate\ code))' {-e,--entry}'[specify program entry point is entry]:entry' {-E,--preprocess}'[preprocess only; do not compile, assemble or link]' - '-fabi-version=3D-[use version of the C++ ABI (default: 2)]:ABI ver= sion:(1 2 3 4 5 6)' + '-fabi-version=3D-[use specified C++ ABI version]:ABI version [0]:(0 1 = 2 3 4 5 6 7 8 9 10 11 12 13)' '-fada-spec-parent=3D[dump Ada specs as child units of given parent]' '-faggressive-loop-optimizations[aggressively optimize loops using lang= uage constraints]' '-falign-functions[align the start of functions]' @@ -1737,11 +1737,11 @@ args+=3D( '-feliminate-unused-debug-types[perform unused type elimination in debu= g info]' '-femit-class-debug-always[do not suppress C++ class debug information]= ' '-femit-struct-debug-baseonly[aggressive reduced debug info for structs= ]' - '-femit-struct-debug-detailed=3D[detailed reduced debug info for struct= s]:spec list' + '-femit-struct-debug-detailed=3D-[detailed reduced debug info for struc= ts]:spec list [all]' '-femit-struct-debug-reduced[conservative reduced debug info for struct= s]' '-fexceptions[enable exception handling]' '-fexcess-precision=3D-[specify handling of excess floating-point preci= sion]:precision handling:(fast standard)' - '-fexec-charset=3D[convert all strings and character constants to chara= cter set]:character set' + '-fexec-charset=3D-[convert all strings and character constants to char= acter set]:character set [UTF-8]' '-fexpensive-optimizations[perform a number of minor, expensive optimiz= ations]' '-fextended-identifiers[permit universal character names in identifiers= ]' '-ffast-math[sets -fno-math-errno, -funsafe-math-optimizations, -ffinit= e-math-only, -fno-rounding-math, -fno-signaling-nans and -fcx-limited-rang= e]' @@ -1750,8 +1750,7 @@ args+=3D( '-ffixed--[mark as being unavailable to the compiler]:regist= er' '-ffloat-store[don'\''t allocate floats and doubles in extended- precis= ion registers]' '-fforward-propagate[perform a forward propagation pass on RTL]' - '-ffp-contract=3D-[perform floating- point expression contraction (defa= ult: fast)]:style:(on off fast)' - '-ffp-contract=3D[perform floating-point expression contraction]:style:= (off on fast)' + '-ffp-contract=3D-[perform floating-point expression contraction]:style= [fast]:(on off fast)' '-ffp-int-builtin-inexact[allow built-in functions ceil, floor, round, = trunc to raise "inexact" exceptions]' '-ffreestanding[do not assume that standard C libraries and main exist]= ' '-ffunction-cse[allow function addresses to be held in registers]' diff --git a/Completion/Unix/Command/_gnupod b/Completion/Unix/Command/_gn= upod index f53ae6c59..22ccabb9d 100644 --- a/Completion/Unix/Command/_gnupod +++ b/Completion/Unix/Command/_gnupod @@ -30,8 +30,8 @@ case "$service" in '(-b --set-bookmarkable)'{-b,--set-bookmarkable}'[set this song as bo= okmarkable (=3D Remember position)]' --set-shuffleskip'[exclude this file in shuffle-mode]' --set-compilation'[mark songs as being part of a compilation]' - --min-vol-adj=3D'[minimum volume adjustment allowed by ID3v2.4 RVA2 t= ag (range -100 to 100, default 0)]' - --max-vol-adj=3D'[maximum volume adjustment allowed by ID3v2.4 RVA2 t= ag (range -100 to 100, default 0)]' + --min-vol-adj=3D'[minimum volume adjustment allowed by ID3v2.4 RVA2 t= ag]:adjustment (-100..100) [0]' + --max-vol-adj=3D'[maximum volume adjustment allowed by ID3v2.4 RVA2 t= ag]:adjustment (-100..100) [0]' --artwork=3D'[use FILE as album cover]:artwork:_files' '*:file to add:_files' ) diff --git a/Completion/Unix/Command/_initctl b/Completion/Unix/Command/_i= nitctl index b404c0c16..b60bdbc5b 100644 --- a/Completion/Unix/Command/_initctl +++ b/Completion/Unix/Command/_initctl @@ -157,7 +157,7 @@ _initctl() '--system[talk via DBUS system bus instead of socket]' '(-q --quiet)'{-q,--quiet}'[reduce output to errors only]' '(-v --verbose)'{-v,--verbose}'[increase output to include informatio= nal messages]' - '--dest=3D[D-Bus name for init, defaults to com.ubuntu.Upstart]' + '--dest=3D[specify D-Bus name for init]:D-Bus name [com.ubuntu.Upstar= t]' '--help[display help and exit]' '--version[output version information and exit]' ) diff --git a/Completion/Unix/Command/_mysqldiff b/Completion/Unix/Command/= _mysqldiff index 52b96ef21..2515834e0 100644 --- a/Completion/Unix/Command/_mysqldiff +++ b/Completion/Unix/Command/_mysqldiff @@ -6,7 +6,7 @@ _mysqldiff () { {-p{,1,2},--password{,1,2}=3D}':server password: ' \ {-u{,1,2},--user{,1,2}=3D}':server username:_mysql_users' \ {-s{,1,2},--socket{,1,2}=3D}':server socket:_directories' \ - {-d,--debug=3D}':debugging level (default 1):(1 2 3 4 5 6 7 8)' \ + {-d,--debug=3D}':debugging level [1]:(1 2 3 4 5 6 7 8)' \ {-i,--tolerant}':ignore DEFAULT and formatting changes: ' \ {-k,--keep-old-tables}":don\'t output DROP TABLE commands: " \ {-n,--no-old-defs}"[don't output old defs as comments]" \ diff --git a/Completion/Unix/Command/_pandoc b/Completion/Unix/Command/_pa= ndoc index bdd261322..98e5abc70 100644 --- a/Completion/Unix/Command/_pandoc +++ b/Completion/Unix/Command/_pandoc @@ -134,11 +134,11 @@ _pandoc_top_level_division(){ _pandoc_email_obfusication(){ local -a policies policies=3D( - 'none:(default) leaves mailto: links as they are' + 'none:leave mailto: links as they are' 'javascript:obfuscates them using JavaScript' 'references:obfuscates them by printing their letters as decimal or h= exadecimal character references' ) - _describe 'obfusication' policies + _describe 'obfuscation policy [none]' policies } = # choose wrapping policy @@ -146,11 +146,11 @@ _pandoc_email_obfusication(){ _pandoc_wrap() { local -a policies policies=3D( - 'auto:(default) wrap lines to the column width specified by --columns= (default 72)' + 'auto:wrap lines to the column width specified by --columns (default = 72)' "none:don't wrap lines at all" 'preserve:attempt to preserve the wrapping from the source document' ) - _describe 'policy' policies + _describe 'policy [auto]' policies } = # choose eol policy @@ -170,11 +170,11 @@ _pandoc_eol() { _pandoc_track_changes() { local -a policies policies=3D( - 'accept:(default) inserts all insertions, and ignores all deletions' + 'accept:insert all insertions, and ignore all deletions' 'reject:inserts all deletions and ignores insertions' 'all:puts in insertions, deletions, and comments, wrapped in spans wi= th insertion, deletion, comment-start, and comment-end classes, respective= ly' ) - _describe 'policy' policies + _describe 'policy [accept]' policies } = # The real thing @@ -185,7 +185,7 @@ _arguments -s \ '--data-dir=3D[specify the user data directory to search for pandoc dat= a files]:data directory:_files -/' \ {-d+,--defauls=3D}'[read default from YAMAL file]: :_pandoc_defaults_fi= le' \ '--shift-heading-level-by=3D[shift heading levels by specified number]:= positive or negative integer: ' \ - '!--base-header-level=3D[(deprecated) specify the base level for header= s]:number (default 1):(1 2 3 4 5)' \ + '!--base-header-level=3D:number [1]:(1 2 3 4 5)' \ '!--strip-empty-paragraphs[deprecated. Use the +empty_paragraphs extens= ion instead]' \ '--indented-code-classes=3D[classes to use for indented code blocks]:cl= ass:{_message "Classes separated with ,"}' \ '--default-image-extension=3D[specify a default extension to use when i= mage paths/URLs have no extension]:extension: ' \ @@ -195,7 +195,7 @@ _arguments -s \ {\*-M+,\*--metadata=3D}'[set the metadata field KEY to the value VALUE]= :key\:value: ' \ '*--metadata_file=3D[read metadata from file]:YAML or JSON file:_files'= \ {-p,--preserve-tabs}'[preserve tabs instead of converting them to space= s]' \ - '--tab-stop=3D[specify the number of spaces per tab (default is 4)]:num= ber:{_message -r "choose a number equals to or greater then 1"}' \ + '--tab-stop=3D[specify the number of spaces per tab]:spaces [4]' \ '--track-changes=3D[specifies what to do with insertions, deletions, an= d comments produced by the MS Word "Track Changes" feature]: :_pandoc_trac= k_changes' \ '--extract-media=3D[extract media in source document to specified direc= tory]:directory:_files -/' \ '--abbreviations=3D[specifies a custom abbreviations file]:file:_files = ' \ @@ -207,7 +207,7 @@ _arguments -s \ '--eol=3D[manually specify line endings (crlf|lf|native)]: :_pandoc_eol= ' \ '--dpi=3D[specify the dpi (dots per inch) value for conversion from pix= els to inch/centimeters and vice versa]:number: ' \ '--wrap=3D[determine how text is wrapped in the output (the source code= , not the rendered version)]: :_pandoc_wrap ' \ - '--columns=3D[specify length of lines in characters (default 72)]:numbe= r: ' \ + '--columns=3D[specify length of lines in characters]:length [72]' \ {--toc,--table-of-contents}'[include an automatically generated table o= f contents]' \ '--toc-depth=3D[specify the number of section levels to include in the = table of contents]:number:{_message -r "choose a number equals to or great= er then 1"}' \ '--strip-comments[strip out HTML comments in the Markdown or Textile so= urce]' \ @@ -226,11 +226,11 @@ _arguments -s \ '--ascii[use only ASCII characters in output, supported only for HTML a= nd DocBook output]' \ '--reference-links[use reference-style links, rather than inline links]= ' \ '--reference-location=3D[specify where footnotes (and references, if re= ference-links is set) are placed (block|section|document)]: :_pandoc_refer= ence_location' \ - '--markdown-headings[specify style for level1 and 2 headings in markdow= n output]:style (default atx):(setext atx)' \ + '--markdown-headings[specify style for level1 and 2 headings in markdow= n output]:style [atx]:(setext atx)' \ '!--atx-headers[use ATX-style headers in Markdown and AsciiDoc output]'= \ '--top-level-division=3D[treat top-level headers as the given division = type in LaTeX, ConTeXt, DocBook, and TEI output]: :_pandoc_top_level_divis= ion' \ {-N,--number-sections}'[number section headings in LaTeX, ConTeXt, HTML= , or EPUB output]' \ - '--number-offset=3D[offset for section headings in HTML output (ignored= in other output formats)]:number[number,...] (default 0): ' \ + '--number-offset=3D[offset for section headings in HTML output (ignored= in other output formats)]:number[number,...] [0]' \ '--listings[use the listings package for LaTeX code blocks]' \ {-i,--incremental}'[make list items in slide shows display incrementall= y (one by one)]' \ '--slide-level=3D[specifies that headers with the specified level creat= e slides (for beamer, s5, slidy, slideous, dzslides)]:slide level:(1 2 3 4= 5 6)' \ diff --git a/Completion/Unix/Command/_pbm b/Completion/Unix/Command/_pbm index 62004f79e..8b5576c5f 100644 --- a/Completion/Unix/Command/_pbm +++ b/Completion/Unix/Command/_pbm @@ -740,7 +740,7 @@ ppmtomitsu) _arguments \ '-sharpness:sharpness:(1 2 3 4)' \ '-enlarge:enlargement factor:(1 2 3)' \ - '-media:output media (default\: 1184x1350):((A\:1216x1350 A4\:1184x14= 52 AS\:1216x1650 A4S\:1184x1754))' \ + '-media:output media [1184x1350]:((A\:1216x1350 A4\:1184x1452 AS\:121= 6x1650 A4S\:1184x1754))' \ '-copy:number of copies:(1 2 3 4 5 6 7 8 9)' \ -{dpi300,tiny} ':file:_pbm' ;; diff --git a/Completion/Unix/Command/_perforce b/Completion/Unix/Command/_= perforce index 4e69dee78..cb6cdb79f 100644 --- a/Completion/Unix/Command/_perforce +++ b/Completion/Unix/Command/_perforce @@ -2551,7 +2551,7 @@ _perforce_cmd_logstat() { (( $+functions[_perforce_cmd_logtail] )) || _perforce_cmd_logtail() { _arguments -s : \ - '-b[specify block size, default 8192]:block size: ' \ + '-b[specify block size]:block size [8192]' \ '-s[specify start offset]:offset: ' \ '-m[specify max blocks]:max blocks: ' } diff --git a/Completion/Unix/Command/_qemu b/Completion/Unix/Command/_qemu index 30fcd6757..7bc02c30c 100644 --- a/Completion/Unix/Command/_qemu +++ b/Completion/Unix/Command/_qemu @@ -19,8 +19,8 @@ _arguments \ '-boot[specify which image to boot from]:boot device:((a\:floppy\ image= \ a c\:hard\ disk d\:cdrom))' \ '-snapshot[write to temporary files instead of disk image files]' \ '-no-fd-bootchk[disable boot sig checking for floppies in Bochs BIOS]' = \ - '-m[virtual RAM size (default=3D128)]:megs:' \ - '-smp[set the number of CPUs (default=3D1)]:number of CPUs:' \ + '-m[specify virtual RAM size]:size (MB) [128]' \ + '-smp[set the number of CPUs]:number of CPUs [1]' \ '-nographic[disable graphical output]' \ '-vnc[listen on VNC display]:display:' \ '-k[use keyboard layout]:keyboard layout language:(ar de-ch es fo fr-ca= hu ja mk no pt-br sv da en-gb et fr fr-ch is lt nl pl ru th de en-us fi f= r-be hr it lv nl-be pt sl tr)' \ diff --git a/Completion/Unix/Command/_ruby b/Completion/Unix/Command/_ruby index 3ed25a3f0..a57bffcda 100644 --- a/Completion/Unix/Command/_ruby +++ b/Completion/Unix/Command/_ruby @@ -21,7 +21,7 @@ common=3D( ) = opts=3D( - '-0-[specify record separator]:input record separator in octal [default= \0]' + '-0-[specify record separator]:input record separator in octal [\0]' '-a[autosplit mode with -n or -p (splits $_ into $F)]' '-c[check syntax only]' '-C+[cd to directory before executing your script]:directory:_files -/' diff --git a/Completion/Unix/Command/_tidy b/Completion/Unix/Command/_tidy index 3998ccdb3..35ceb7e51 100644 --- a/Completion/Unix/Command/_tidy +++ b/Completion/Unix/Command/_tidy @@ -12,7 +12,7 @@ opts=3D( ${(M)opts:#*:*} ) = _arguments -s -A "-*" --$^opts \ '(-indent -i)'{-indent,-i}'[indent element content]' \ - '-wrap[wrap text at the specified (default is 68)]:column:' \ + '-wrap[wrap text at the specified column]:column [68]' \ '(-upper -u)'{-upper,-u}'[force tags to upper case (default is lower ca= se)]' \ '(-clean -c)'{-clean,-c}'[replace FONT, NOBR and CENTER tags by CSS]' \ '(-bare -b)'{-bare,-b}'[strip out smart quotes and em dashes, etc.]' \ diff --git a/Completion/Unix/Command/_w3m b/Completion/Unix/Command/_w3m index 8b45ad730..eff9901ca 100644 --- a/Completion/Unix/Command/_w3m +++ b/Completion/Unix/Command/_w3m @@ -8,7 +8,7 @@ typeset -A opt_args _arguments -C \ '-t[set tab width]:tab width:' \ '-r[ignore backspace effect]' \ - '-l[specify number of preserved lines]:number of lines (default 10000):= ' \ + '-l[specify number of preserved lines]:number of lines [10000]' \ '-I[document charset]:charset:->charset' \ '-O[display/output charset]:charset:->charset' \ '( -s -j)-e[EUC-JP]' \ diff --git a/Completion/X/Command/_vnc b/Completion/X/Command/_vnc index 9263ab930..7d818cfe7 100644 --- a/Completion/X/Command/_vnc +++ b/Completion/X/Command/_vnc @@ -65,10 +65,10 @@ case $service in '-rfbauth[use authentication on RFB protocol]:passwd-file:_files' \ '-httpd[serve files via HTTP from here]:dir:_files -/' \ '-httpport[port for HTTP]:port:' \ - '-deferupdate[time in ms to defer updates (default 40)]:time (ms):' \ + '-deferupdate[specify time to defer updates by]:time (ms) [40]' \ '-economictranslate[less memory-hungry translation]' \ '-lazytight[disable "gradient" filter in tight encoding]' \ - '-desktop[VNC desktop name (default x11)]:name:' \ + '-desktop[specify VNC desktop name]:name [x11]' \ '-alwaysshared[always treat new clients as shared]' \ '-nevershared[never treat new clients as shared]' \ "-dontdisconnect[don't disconnect existing clients for new non-shared co= nnections]" \ diff --git a/Completion/X/Command/_xdvi b/Completion/X/Command/_xdvi index d55c99485..c33e67bcc 100644 --- a/Completion/X/Command/_xdvi +++ b/Completion/X/Command/_xdvi @@ -9,7 +9,7 @@ _xt_arguments \ '-cr:cursor color:_x_color' \ '-debug:debugging bitmask:((1\:bitmaps 2\:dvi\ translation 4\:pk\ readi= ng 8\:batch\ operation 16\:events 32\:file\ opening 64\:PostScript\ commun= ication 128\:Kpathsea\ statistics 256\:Kpathsea\ hash\ table\ lookups 512\= :Kpathsea\ path\ definitions 1024\:Kpathsea\ path\ expansion 2048\:Kpathse= a\ searches))' \ '-density:font shrink density' \ - '-gamma:anti-aliasing factor (default 1.0)' \ + '-gamma:anti-aliasing factor [1.0]' \ -grid{1,2,3}':grid color:_x_color' \ '-gspalette:Ghostscript palette:(Color Greyscale Monochrome)' \ '-hl:page highlight color:_x_color' \