From f2621414ee5f2f601424c22f00e207903e3b6104 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 03:03:18 +0200
Subject: Merging upstream version 1:2.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 completions/convert | 280 +++++++++++++++++++++++++---------------------------
 1 file changed, 136 insertions(+), 144 deletions(-)

(limited to 'completions/convert')

diff --git a/completions/convert b/completions/convert
index ef7baea..b01633b 100644
--- a/completions/convert
+++ b/completions/convert
@@ -1,125 +1,118 @@
 # bash completion for ImageMagick                          -*- shell-script -*-
 
-_ImageMagick()
+_comp_cmd_convert__common_options()
 {
     case $prev in
         -channel)
-            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur"))
+            _comp_compgen -- -W 'Red Green Blue Opacity Matte Cyan Magenta
+                Yellow Black'
             return
             ;;
         -colormap)
-            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
+            _comp_compgen -- -W 'shared private'
             return
             ;;
         -colorspace)
-            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur"))
+            _comp_compgen -- -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ YPbPr
+                YUV CMYK'
             return
             ;;
         -compose)
-            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
-                Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur"))
+            _comp_compgen -- -W 'Over In Out Atop Xor Plus Minus Add Subtract
+                Difference Multiply Bumpmap Copy CopyRed CopyGreen CopyBlue
+                CopyOpacity'
             return
             ;;
         -compress)
-            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur"))
+            _comp_compgen -- -W 'None BZip Fax Group4 JPEG Lossless LZW RLE
+                Zip'
             return
             ;;
         -dispose)
-            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
-                -- "$cur"))
+            _comp_compgen -- -W 'Undefined None Background Previous'
             return
             ;;
         -encoding)
-            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            _comp_compgen -- -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur"))
+                Wansung'
             return
             ;;
         -endian)
-            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
+            _comp_compgen -- -W 'MSB LSB'
             return
             ;;
         -filter)
-            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
-                Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur"))
+            _comp_compgen -- -W 'Point Box Triangle Hermite Hanning Hamming
+                Blackman Gaussian Quadratic Cubic Catrom Mitchell Lanczos
+                Bessel Sinc'
             return
             ;;
         -format)
-            COMPREPLY=($(compgen -W "$(convert -list format | awk \
-                '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur"))
+            _comp_compgen_split -- "$(convert -list format | _comp_awk \
+                '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')"
             return
             ;;
         -gravity)
-            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur"))
+            _comp_compgen -- -W 'Northwest North NorthEast West Center East
+                SouthWest South SouthEast'
             return
             ;;
         -intent)
-            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur"))
+            _comp_compgen -- -W 'Absolute Perceptual Relative Saturation'
             return
             ;;
         -interlace)
-            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
+            _comp_compgen -- -W 'None Line Plane Partition'
             return
             ;;
         -limit)
-            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
+            _comp_compgen -- -W 'Disk File Map Memory'
             return
             ;;
         -list)
-            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur"))
+            _comp_compgen -- -W 'Delegate Format Magic Module Resource Type'
             return
             ;;
         -map)
-            COMPREPLY=($(compgen -W 'best default gray red green blue' \
-                -- "$cur"))
-            _filedir
+            _comp_compgen -- -W 'best default gray red green blue'
+            _comp_compgen -a filedir
             return
             ;;
         -noise)
-            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur"))
+            _comp_compgen -- -W 'Uniform Gaussian Multiplicative Impulse
+                Laplacian Poisson'
             return
             ;;
         -preview)
-            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
-                Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
-                ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
-                Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur"))
+            _comp_compgen -- -W 'Rotate Shear Roll Hue Saturation Brightness
+                Gamma Spiff Dull Grayscale Quantize Despeckle ReduceNoise
+                AddNoise Sharpen Blur Threshold EdgeDetect Spread Shade Raise
+                Segment Solarize Swirl Implode Wave OilPaint CharcoalDrawing
+                JPEG'
             return
             ;;
         -mask | -profile | -texture | -tile | -write)
-            _filedir
+            _comp_compgen_filedir
             return
             ;;
         -type)
-            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            _comp_compgen -- -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur"))
+                Optimize'
             return
             ;;
         -units)
-            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur"))
+            _comp_compgen -- -W 'Undefined PixelsPerInch PixelsPerCentimeter'
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
+            _comp_compgen -- -W 'Constant Edge mirror tile'
             return
             ;;
         -visual)
-            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
-                PseudoColor TrueColor DirectColor defaut visualid' \
-                -- "$cur"))
+            _comp_compgen -- -W 'StaticGray GrayScale StaticColor PseudoColor
+                TrueColor DirectColor default visualid'
             return
             ;;
     esac
@@ -127,198 +120,197 @@ _ImageMagick()
     return 1
 }
 
-_convert()
+_comp_cmd_convert()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
-            +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur"))
+        _comp_compgen -- -W '+adjoin +append +compress +contrast +debug +dither
+            +endian +gamma +label +map +mask +matte +negate +noise +page +raise
+            +render +write'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _convert convert
+    complete -F _comp_cmd_convert convert
 
-_mogrify()
+_comp_cmd_mogrify()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
+        _comp_compgen -- -W '+compress +contrast +debug +dither +endian +gamma
+            +label +map +mask +matte +negate +page +raise'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _mogrify mogrify
+    complete -F _comp_cmd_mogrify mogrify
 
-_display()
+_comp_cmd_display()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
+        _comp_compgen -- -W '+compress +contrast +debug +dither +endian +gamma
+            +label +map +matte +negate +page +raise +write'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _display display
+    complete -F _comp_cmd_display display
 
-_animate()
+_comp_cmd_animate()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur"))
+        _comp_compgen -- -W '+debug +dither +gamma +map +matte'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _animate animate
+    complete -F _comp_cmd_animate animate
 
-_identify()
+_comp_cmd_identify()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
+        _comp_compgen -- -W '+debug'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _identify identify
+    complete -F _comp_cmd_identify identify
 
-_montage()
+_comp_cmd_montage()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur"))
+        _comp_compgen -- -W '+adjoin +compress +debug +dither +endian +gamma
+            +label +matte +page'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _montage montage
+    complete -F _comp_cmd_montage montage
 
-_composite()
+_comp_cmd_composite()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur"))
+        _comp_compgen -- -W '+compress +debug +dither +endian +label +matte
+            +negate +page +write'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _composite composite
+    complete -F _comp_cmd_composite composite
 
-_compare()
+_comp_cmd_compare()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
+        _comp_compgen -- -W '+debug'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _compare compare
+    complete -F _comp_cmd_compare compare
 
-_conjure()
+_comp_cmd_conjure()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
+        _comp_compgen -- -W '+debug'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _conjure conjure
+    complete -F _comp_cmd_conjure conjure
 
-_import()
+_comp_cmd_import()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
+        _comp_compgen -- -W '+debug'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _import import
+    complete -F _comp_cmd_import import
 
-_stream()
+_comp_cmd_stream()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    _ImageMagick && return
+    _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
+        _comp_compgen -- -W '+debug'
     else
-        _filedir
+        _comp_compgen_filedir
     fi
 } &&
-    complete -F _stream stream
+    complete -F _comp_cmd_stream stream
 
 # ex: filetype=sh
-- 
cgit v1.2.3