updated zsh completion

3 files changed, 38 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db1572f11578..c02b3e6569cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@
 pkgbase = dngconverter
 	pkgdesc = Adobe DNG Converter
 	pkgver = 9.12
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.adobe.com/go/dng_converter_win/
 	arch = x86_64
 	license = custom: commercial
diff --git a/PKGBUILD b/PKGBUILD
index b420300815af..443140fd6668 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: rsteube <rsteube@users.noreply.github.com>
 pkgname=dngconverter
 pkgver=9.12
-pkgrel=1
+pkgrel=2
 pkgdesc='Adobe DNG Converter'
 arch=('x86_64')
 url='http://www.adobe.com/go/dng_converter_win/'
diff --git a/_dngconverter b/_dngconverter
index 20a78a3dac26..46eee7a27ce6 100644
--- a/_dngconverter
+++ b/_dngconverter
@@ -1,39 +1,42 @@
 #compdef dngconverter
 
-# currently just a basic overview of command line options
 # see: https://wwwimages.adobe.com/content/dam/Adobe/en/products/photoshop/pdfs/dng_commandline.pdf
-#
-command_opts="\
-  -c\\:'output compressed (default)'\
-  -u\\:'output uncompressed'\
-  -l\\:'output linear'\
-  -e\\:'embed original'\
-  -p0\\:'no preview'\
-  -p1\\:'medium size preview (default)'\
-  -p2\\:'full size preview'\
-  -fl\\:'embed fast load data'\
-  -lossy\\:'use lossy compression (preserves pixel count by default)'\
-  -side\\:'<pixels> long-side pixels value (32 to 65000)'\
-  -count\\:'<pixels> megapixels limit (1024 or greater)'\
-  -cr2.4\\:'raw compability 2.4 or later'\
-  -cr4.1\\:'raw compability 4.1 or later'\
-  -cr4.6\\:'raw compability 4.6 or later'\
-  -cr5.4\\:'raw compability 5.4 or later'\
-  -cr6.6\\:'raw compability 6.6 or later'\
-  -cr7.1\\:'raw compability 7.1 or later (default)'\
-  -dng1.1\\:'backward version 1.1'\
-  -dng1.3\\:'backward version 1.3'\
-  -dng1.4\\:'backward version 1.4 (default)'\
-  -x\\:'extract embedded raw'\
-  -d\\:'<directory> output directory (defaults to parent directory of input files)'\
-  -o\\:'<filename> (base-)name of output file(s)'\
-"
-
-_dngconverter() {
-  local curcontext="$curcontext" state line
-  typeset -A opt_args
-
-  _arguments "*: :(($command_opts))"
+
+_dngconverter(){
+  local opts=('-d[directory]:directory:_directories'\
+              '-f[file name]:()'\
+              '-e[embed original]'\
+              '-fl[embed fast load data]'\
+              '-lossy[use lossy compression (preserves pixel count by default)]'\
+              '-side[long-side pixels value (32 to 65000)]:pixels:()'\
+              "-count[megapixels limit 1024 or greater]:pixels:($(seq 2084 2048 36900))"\
+              '-x[extract embedded raw]'\
+              '-o[<filename> (base-)name of output file(s)]:()')
+
+  [[ $words =~ -cr[0-9]\.[0-9] ]] \
+    || opts+=('-cr2.4[raw compability 2.4 or later]'\
+              '-cr4.1[raw compability 4.1 or later]'\
+              '-cr4.6[raw compability 4.6 or later]'\
+              '-cr5.4[raw compability 5.4 or later]'\
+              '-cr6.6[raw compability 6.6 or later]'\
+              '-cr7.1[raw compability 7.1 or later (default)]')
+
+  [[ $words =~ -dng[0-9]\.[0-9] ]] \
+    || opts+=('-dng1.1[backward version 1.1]'\
+              '-dng1.3[backward version 1.3]'\
+              '-dng1.4[backward version 1.4 (default)]')
+
+  [[ $words =~ (-c|-u|-l) ]] \
+    || opts+=('-c[output compressed (default)]' \
+              '-u[output uncompressed]' \
+              '-l[output linear]')
+
+  [[ $words =~ (-p0|-p1|-p2) ]] \
+    || opts+=('-p0[no preview]'\
+              '-p1[medium size preview (default)]'\
+              '-p2[full size preview]')
+
+  _arguments $opts
 }
 
 _dngconverter